diff --git a/src/main/java/dk/camelot64/kickc/Compiler.java b/src/main/java/dk/camelot64/kickc/Compiler.java
index 3b643b110..9b0362173 100644
--- a/src/main/java/dk/camelot64/kickc/Compiler.java
+++ b/src/main/java/dk/camelot64/kickc/Compiler.java
@@ -151,7 +151,6 @@ public class Compiler {
       new Pass1GenerateControlFlowGraph(program).execute();
       new Pass1ResolveForwardReferences(program).execute();
       new Pass1UnwindBlockScopes(program).execute();
-
       new Pass1TypeInference(program).execute();
 
       if(getLog().isVerbosePass1CreateSsa()) {
@@ -375,6 +374,7 @@ public class Compiler {
       // Phi mem coalesce removes as many variables introduced by phi lifting as possible - as long as their live ranges do not overlap
       new Pass3PhiMemCoalesce(program).step();
       new Pass2CullEmptyBlocks(program).step();
+      new PassNRenumberLabels(program).execute();
       new PassNBlockSequencePlanner(program).step();
       new Pass3AddNopBeforeCallOns(program).generate();
       new PassNStatementIndices(program).execute();
diff --git a/src/main/java/dk/camelot64/kickc/model/iterator/ProgramValue.java b/src/main/java/dk/camelot64/kickc/model/iterator/ProgramValue.java
index bbadebdd5..a6499b3d9 100644
--- a/src/main/java/dk/camelot64/kickc/model/iterator/ProgramValue.java
+++ b/src/main/java/dk/camelot64/kickc/model/iterator/ProgramValue.java
@@ -634,6 +634,26 @@ public abstract class ProgramValue {
       }
    }
 
+   public static class PhiValuePredecessor extends ProgramValue {
+      private final StatementPhiBlock.PhiVariable phiVariable;
+      private final int i;
+
+      PhiValuePredecessor(StatementPhiBlock.PhiVariable phiVariable, int i) {
+         this.phiVariable = phiVariable;
+         this.i = i;
+      }
+
+      @Override
+      public Value get() {
+         return phiVariable.getValues().get(i).getPredecessor();
+      }
+
+      @Override
+      public void set(Value value) {
+         phiVariable.getValues().get(i).setPredecessor((LabelRef) value);
+      }
+   }
+
    /**
     * LValue as part of an assignment statement (or a call).
     */
diff --git a/src/main/java/dk/camelot64/kickc/model/iterator/ProgramValueIterator.java b/src/main/java/dk/camelot64/kickc/model/iterator/ProgramValueIterator.java
index fff65cc8f..cbfe5bc53 100644
--- a/src/main/java/dk/camelot64/kickc/model/iterator/ProgramValueIterator.java
+++ b/src/main/java/dk/camelot64/kickc/model/iterator/ProgramValueIterator.java
@@ -118,6 +118,7 @@ public class ProgramValueIterator {
          for(StatementPhiBlock.PhiVariable phiVariable : ((StatementPhiBlock) statement).getPhiVariables()) {
             int size = phiVariable.getValues().size();
             for(int i = 0; i < size; i++) {
+               execute(new ProgramValue.PhiValuePredecessor(phiVariable, i), handler, statement, statementsIt, block);
                execute(new ProgramValue.PhiValue(phiVariable, i), handler, statement, statementsIt, block);
             }
             execute(new ProgramValue.PhiVariable(phiVariable), handler, statement, statementsIt, block);
diff --git a/src/main/java/dk/camelot64/kickc/model/symbols/Scope.java b/src/main/java/dk/camelot64/kickc/model/symbols/Scope.java
index 379c56f76..78982f4b9 100644
--- a/src/main/java/dk/camelot64/kickc/model/symbols/Scope.java
+++ b/src/main/java/dk/camelot64/kickc/model/symbols/Scope.java
@@ -362,6 +362,14 @@ public abstract class Scope implements Symbol {
       return symbols.values();
    }
 
+   /**
+    * Set the value of the counter used to number intermediate labels
+    * @param intermediateLabelCount The new counter value
+    */
+   public void setIntermediateLabelCount(int intermediateLabelCount) {
+      this.intermediateLabelCount = intermediateLabelCount;
+   }
+
    @Override
    public boolean equals(Object o) {
       if(this == o) {
diff --git a/src/main/java/dk/camelot64/kickc/passes/PassNRenumberLabels.java b/src/main/java/dk/camelot64/kickc/passes/PassNRenumberLabels.java
new file mode 100644
index 000000000..ff538f911
--- /dev/null
+++ b/src/main/java/dk/camelot64/kickc/passes/PassNRenumberLabels.java
@@ -0,0 +1,74 @@
+package dk.camelot64.kickc.passes;
+
+import dk.camelot64.kickc.model.Program;
+import dk.camelot64.kickc.model.iterator.ProgramValueIterator;
+import dk.camelot64.kickc.model.symbols.Label;
+import dk.camelot64.kickc.model.symbols.Scope;
+import dk.camelot64.kickc.model.symbols.Symbol;
+import dk.camelot64.kickc.model.values.LabelRef;
+import dk.camelot64.kickc.model.values.Value;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Renumber all labels in the program
+ */
+public class PassNRenumberLabels extends Pass2SsaOptimization {
+
+   public PassNRenumberLabels(Program program) {
+      super(program);
+   }
+
+   @Override
+   public boolean step() {
+      Map<LabelRef, LabelRef> renamed = new LinkedHashMap<>();
+      renumberLabels(getScope(), renamed);
+      for(Scope scope : getScope().getAllScopes(true)) {
+         renumberLabels(scope, renamed);
+      }
+      ProgramValueIterator.execute(getGraph(), (programValue, currentStmt, stmtIt, currentBlock) -> {
+         Value value = programValue.get();
+         if(value instanceof LabelRef) {
+                  LabelRef newLabelRef = renamed.get(value);
+                  if(newLabelRef!=null) {
+                     programValue.set(newLabelRef);
+                  }
+               }
+            }
+      );
+      return false;
+   }
+
+   private void renumberLabels(Scope scope, Map<LabelRef, LabelRef> renamed) {
+      int labelIdx = 1;
+      List<Label> oldLabels = new ArrayList<>();
+      List<Label> newLabels = new ArrayList<>();
+      for(Symbol symbol : scope.getAllSymbols()) {
+         if(symbol instanceof Label) {
+            Label oldLabel = (Label) symbol;
+            if(oldLabel.isIntermediate()) {
+               String newName = "@" + labelIdx++;
+               if(!oldLabel.getLocalName().equals(newName)) {
+                  Label newLabel = new Label(newName, scope, true);
+                  oldLabels.add(oldLabel);
+                  newLabels.add(newLabel);
+                  renamed.put((oldLabel).getRef(), newLabel.getRef());
+                  getLog().append("Renumbering block "+oldLabel.getFullName()+" to "+newLabel.getFullName());
+               }
+            }
+         }
+      }
+      for(Label oldLabel : oldLabels) {
+         scope.remove(oldLabel);
+      }
+      for(Label newLabel : newLabels) {
+         scope.add(newLabel);
+      }
+      scope.setIntermediateLabelCount(labelIdx);
+   }
+
+
+}
diff --git a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
index cf50e484b..582d169d8 100644
--- a/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
+++ b/src/test/java/dk/camelot64/kickc/test/TestPrograms.java
@@ -33,8 +33,8 @@ public class TestPrograms {
    }
 
    @Test
-   public void testNoLocalScope() throws IOException, URISyntaxException {
-      compileAndCompare("localscope-loops");
+   public void testLocalScopeLoops() throws IOException, URISyntaxException {
+      compileAndCompare("localscope-loops", getLogSysout());
    }
 
    @Test
diff --git a/src/test/kc/localscope-loops.kc b/src/test/kc/localscope-loops.kc
index fe83b653a..9178a434e 100644
--- a/src/test/kc/localscope-loops.kc
+++ b/src/test/kc/localscope-loops.kc
@@ -1,10 +1,9 @@
 // Illustrates introducing local scopes inside loops etc
 
-import "print"
-
+const byte* SCREEN = $400;
 void main() {
     for (byte i: 0..5)
-        print_ln();
+        SCREEN[i] = 'a';
     for (byte i: 0..5)
-        print_str_ln(" xxxxx@");
+        SCREEN[40+i] = 'b';
 }
\ No newline at end of file
diff --git a/src/test/ref/assignment-compound.cfg b/src/test/ref/assignment-compound.cfg
index 3d1355214..dad87b49b 100644
--- a/src/test/ref/assignment-compound.cfg
+++ b/src/test/ref/assignment-compound.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call test 
   to:main::@1
@@ -60,11 +60,11 @@ test: scope:[test]  from main main::@1 main::@10 main::@2 main::@3 main::@4 main
   [28] *((const byte*) screen1#0 + (byte) test::i#11) ← (byte) test::a#11
   [29] *((const byte*) screen2#0 + (byte) test::i#11) ← *((const byte[]) ref#0 + (byte) test::i#11)
   [30] if(*((const byte[]) ref#0 + (byte) test::i#11)==(byte) test::a#11) goto test::@1
-  to:test::@3
-test::@3: scope:[test]  from test
+  to:test::@2
+test::@2: scope:[test]  from test
   [31] *((const byte*) cols#0 + (byte) test::i#11) ← (const byte) RED#0
   to:test::@return
-test::@return: scope:[test]  from test::@1 test::@3
+test::@return: scope:[test]  from test::@1 test::@2
   [32] return 
   to:@return
 test::@1: scope:[test]  from test
diff --git a/src/test/ref/assignment-compound.log b/src/test/ref/assignment-compound.log
index 5c258f2bb..e2acc6c8e 100644
--- a/src/test/ref/assignment-compound.log
+++ b/src/test/ref/assignment-compound.log
@@ -509,8 +509,10 @@ Calls in [main] to test:5 test:7 test:9 test:11 test:13 test:15 test:17 test:19
 
 Created 2 initial phi equivalence classes
 Coalesced down to 2 phi equivalence classes
+Renumbering block @2 to @1
+Renumbering block test::@3 to test::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -527,14 +529,14 @@ Adding NOP phi() at start of main::@10
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call test 
   to:main::@1
@@ -587,11 +589,11 @@ test: scope:[test]  from main main::@1 main::@10 main::@2 main::@3 main::@4 main
   [28] *((const byte*) screen1#0 + (byte) test::i#11) ← (byte) test::a#11
   [29] *((const byte*) screen2#0 + (byte) test::i#11) ← *((const byte[]) ref#0 + (byte) test::i#11)
   [30] if(*((const byte[]) ref#0 + (byte) test::i#11)==(byte) test::a#11) goto test::@1
-  to:test::@3
-test::@3: scope:[test]  from test
+  to:test::@2
+test::@2: scope:[test]  from test
   [31] *((const byte*) cols#0 + (byte) test::i#11) ← (const byte) RED#0
   to:test::@return
-test::@return: scope:[test]  from test::@1 test::@3
+test::@return: scope:[test]  from test::@1 test::@2
   [32] return 
   to:@return
 test::@1: scope:[test]  from test
@@ -639,17 +641,17 @@ INITIAL ASM
   .label screen2 = screen1+$28
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -839,9 +841,9 @@ test: {
     lda ref,y
     cmp a
     beq b1
-    jmp b3
-  //SEG81 test::@3
-  b3:
+    jmp b2
+  //SEG81 test::@2
+  b2:
   //SEG82 [31] *((const byte*) cols#0 + (byte) test::i#11) ← (const byte) RED#0 -- pbuc1_derefidx_vbuz1=vbuc2 
     lda #RED
     ldy i
@@ -902,17 +904,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen2 = screen1+$28
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1087,9 +1089,9 @@ test: {
     lda ref,x
     cmp a
     beq b1
-    jmp b3
-  //SEG81 test::@3
-  b3:
+    jmp b2
+  //SEG81 test::@2
+  b2:
   //SEG82 [31] *((const byte*) cols#0 + (byte) test::i#11) ← (const byte) RED#0 -- pbuc1_derefidx_vbuxx=vbuc2 
     lda #RED
     sta cols,x
@@ -1108,7 +1110,7 @@ test: {
   ref: .byte 3, 4, 3, $12, 9, 1, 4, 2, 4, 5, 1, 0
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -1121,13 +1123,13 @@ Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp breturn
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction test_from_b1:
 Removing instruction b2_from_b1:
@@ -1162,7 +1164,7 @@ Removing instruction b8:
 Removing instruction b9:
 Removing instruction b10:
 Removing instruction breturn:
-Removing instruction b3:
+Removing instruction b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
@@ -1171,7 +1173,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte) GREEN
@@ -1202,7 +1204,7 @@ FINAL SYMBOL TABLE
 (const byte*) screen2#0 screen2 = (const byte*) screen1#0+(byte/signed byte/word/signed word/dword/signed dword) $28
 (void()) test((byte) test::i , (byte) test::a)
 (label) test::@1
-(label) test::@3
+(label) test::@2
 (label) test::@return
 (byte) test::a
 (byte) test::a#11 a zp ZP_BYTE:2 1.3333333333333333
@@ -1229,11 +1231,11 @@ Score: 199
   .const RED = 2
   .label screen2 = screen1+$28
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -1363,7 +1365,7 @@ test: {
     lda ref,x
     cmp a
     beq b1
-  //SEG81 test::@3
+  //SEG81 test::@2
   //SEG82 [31] *((const byte*) cols#0 + (byte) test::i#11) ← (const byte) RED#0 -- pbuc1_derefidx_vbuxx=vbuc2 
     lda #RED
     sta cols,x
diff --git a/src/test/ref/assignment-compound.sym b/src/test/ref/assignment-compound.sym
index 0ad626c48..596cd45ff 100644
--- a/src/test/ref/assignment-compound.sym
+++ b/src/test/ref/assignment-compound.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte) GREEN
@@ -29,7 +29,7 @@
 (const byte*) screen2#0 screen2 = (const byte*) screen1#0+(byte/signed byte/word/signed word/dword/signed dword) $28
 (void()) test((byte) test::i , (byte) test::a)
 (label) test::@1
-(label) test::@3
+(label) test::@2
 (label) test::@return
 (byte) test::a
 (byte) test::a#11 a zp ZP_BYTE:2 1.3333333333333333
diff --git a/src/test/ref/bgblack.cfg b/src/test/ref/bgblack.cfg
index c43e128d8..0397c4415 100644
--- a/src/test/ref/bgblack.cfg
+++ b/src/test/ref/bgblack.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] *((const byte*) BGCOL#0) ← (const byte) BLACK#0
   to:main::@return
 main::@return: scope:[main]  from main
diff --git a/src/test/ref/bgblack.log b/src/test/ref/bgblack.log
index 4e111c4ed..f9d225462 100644
--- a/src/test/ref/bgblack.log
+++ b/src/test/ref/bgblack.log
@@ -352,21 +352,22 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @5 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @5
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] *((const byte*) BGCOL#0) ← (const byte) BLACK#0
   to:main::@return
 main::@return: scope:[main]  from main
@@ -471,15 +472,15 @@ INITIAL ASM
   .const BLACK = 0
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -517,15 +518,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const BLACK = 0
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -542,13 +543,13 @@ main: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b5
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b5_from_bbegin:
-Removing instruction b5:
-Removing instruction bend_from_b5:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction breturn:
@@ -560,7 +561,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -662,10 +663,10 @@ Score: 12
   // The colors of the C64
   .const BLACK = 0
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-//SEG5 @5
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @5 to @end [phi:@5->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
diff --git a/src/test/ref/bgblack.sym b/src/test/ref/bgblack.sym
index 651af6a29..92d02f1ca 100644
--- a/src/test/ref/bgblack.sym
+++ b/src/test/ref/bgblack.sym
@@ -1,4 +1,4 @@
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
diff --git a/src/test/ref/bitmap-plotter.asm b/src/test/ref/bitmap-plotter.asm
index 4137503a7..4554d3c63 100644
--- a/src/test/ref/bitmap-plotter.asm
+++ b/src/test/ref/bitmap-plotter.asm
@@ -22,14 +22,14 @@ main: {
     sta D018
     jsr init_screen
     jsr init_plot_tables
-  b2:
+  b1:
     lda #$ff
     cmp RASTER
-    bne b2
+    bne b1
     inc BGCOL
     jsr plots
     dec BGCOL
-    jmp b2
+    jmp b1
 }
 plots: {
     ldx #0
@@ -107,7 +107,7 @@ init_plot_tables: {
     sta yoffs
     sta yoffs+1
     tax
-  b5:
+  b3:
     lda #7
     sax _6
     lda yoffs
@@ -118,7 +118,7 @@ init_plot_tables: {
     txa
     and #7
     cmp #7
-    bne b6
+    bne b4
     clc
     lda yoffs
     adc #<$28*8
@@ -126,10 +126,10 @@ init_plot_tables: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  b6:
+  b4:
     inx
     cpx #0
-    bne b5
+    bne b3
     rts
 }
 init_screen: {
@@ -157,7 +157,7 @@ init_screen: {
     sta c
     lda #>SCREEN
     sta c+1
-  b3:
+  b2:
     lda #$14
     ldy #0
     sta (c),y
@@ -167,10 +167,10 @@ init_screen: {
   !:
     lda c+1
     cmp #>SCREEN+$400
-    bne b3
+    bne b2
     lda c
     cmp #<SCREEN+$400
-    bne b3
+    bne b2
     rts
 }
   plots_x: .byte $3c, $50, $6e, $50, $3c, $28, $a, $28
diff --git a/src/test/ref/bitmap-plotter.cfg b/src/test/ref/bitmap-plotter.cfg
index cb8087580..91f128b42 100644
--- a/src/test/ref/bitmap-plotter.cfg
+++ b/src/test/ref/bitmap-plotter.cfg
@@ -1,47 +1,47 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [5] *((const byte*) FGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [6] *((const byte*) D011#0) ← (const byte) BMM#0|(const byte) DEN#0|(const byte) RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [7] *((const byte*) D018#0) ← ((byte))((word))(const byte*) SCREEN#0/(byte/signed byte/word/signed word/dword/signed dword) $40|((word))(const byte*) BITMAP#0/(word/signed word/dword/signed dword) $400
   [8] call init_screen 
-  to:main::@5
-main::@5: scope:[main]  from main
+  to:main::@3
+main::@3: scope:[main]  from main
   [9] phi()
   [10] call init_plot_tables 
+  to:main::@1
+main::@1: scope:[main]  from main::@1 main::@3 main::@4
+  [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main::@2 main::@5 main::@7
-  [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
-  to:main::@3
-main::@3: scope:[main]  from main::@2
+main::@2: scope:[main]  from main::@1
   [12] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   [13] call plots 
-  to:main::@7
-main::@7: scope:[main]  from main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@2
   [14] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0)
-  to:main::@2
-plots: scope:[plots]  from main::@3
+  to:main::@1
+plots: scope:[plots]  from main::@2
   [15] phi()
   to:plots::@1
-plots::@1: scope:[plots]  from plots plots::@3
-  [16] (byte) plots::i#2 ← phi( plots/(byte/signed byte/word/signed word/dword/signed dword) 0 plots::@3/(byte) plots::i#1 )
+plots::@1: scope:[plots]  from plots plots::@2
+  [16] (byte) plots::i#2 ← phi( plots/(byte/signed byte/word/signed word/dword/signed dword) 0 plots::@2/(byte) plots::i#1 )
   [17] (byte) plot::x#0 ← *((const byte[]) plots_x#0 + (byte) plots::i#2)
   [18] (byte) plot::y#0 ← *((const byte[]) plots_y#0 + (byte) plots::i#2)
   [19] call plot 
-  to:plots::@3
-plots::@3: scope:[plots]  from plots::@1
+  to:plots::@2
+plots::@2: scope:[plots]  from plots::@1
   [20] (byte) plots::i#1 ← ++ (byte) plots::i#2
   [21] if((byte) plots::i#1<(const byte) plots_cnt#0) goto plots::@1
   to:plots::@return
-plots::@return: scope:[plots]  from plots::@3
+plots::@return: scope:[plots]  from plots::@2
   [22] return 
   to:@return
 plot: scope:[plot]  from plots::@1
@@ -60,7 +60,7 @@ plot: scope:[plot]  from plots::@1
 plot::@return: scope:[plot]  from plot
   [34] return 
   to:@return
-init_plot_tables: scope:[init_plot_tables]  from main::@5
+init_plot_tables: scope:[init_plot_tables]  from main::@3
   [35] phi()
   to:init_plot_tables::@1
 init_plot_tables::@1: scope:[init_plot_tables]  from init_plot_tables init_plot_tables::@2
@@ -71,16 +71,16 @@ init_plot_tables::@1: scope:[init_plot_tables]  from init_plot_tables init_plot_
   [39] *((const byte[$100]) plot_xhi#0 + (byte) init_plot_tables::x#2) ← >(const byte*) BITMAP#0
   [40] *((const byte[$100]) plot_bit#0 + (byte) init_plot_tables::x#2) ← (byte) init_plot_tables::bits#3
   [41] (byte) init_plot_tables::bits#1 ← (byte) init_plot_tables::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [42] if((byte) init_plot_tables::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@10
+  [42] if((byte) init_plot_tables::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@6
   to:init_plot_tables::@2
-init_plot_tables::@2: scope:[init_plot_tables]  from init_plot_tables::@1 init_plot_tables::@10
-  [43] (byte) init_plot_tables::bits#4 ← phi( init_plot_tables::@10/(byte) init_plot_tables::bits#1 init_plot_tables::@1/(byte/word/signed word/dword/signed dword) $80 )
+init_plot_tables::@2: scope:[init_plot_tables]  from init_plot_tables::@1 init_plot_tables::@6
+  [43] (byte) init_plot_tables::bits#4 ← phi( init_plot_tables::@6/(byte) init_plot_tables::bits#1 init_plot_tables::@1/(byte/word/signed word/dword/signed dword) $80 )
   [44] (byte) init_plot_tables::x#1 ← ++ (byte) init_plot_tables::x#2
   [45] if((byte) init_plot_tables::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@1
-  to:init_plot_tables::@5
-init_plot_tables::@5: scope:[init_plot_tables]  from init_plot_tables::@2 init_plot_tables::@6
-  [46] (byte*) init_plot_tables::yoffs#2 ← phi( init_plot_tables::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 init_plot_tables::@6/(byte*) init_plot_tables::yoffs#4 )
-  [46] (byte) init_plot_tables::y#2 ← phi( init_plot_tables::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 init_plot_tables::@6/(byte) init_plot_tables::y#1 )
+  to:init_plot_tables::@3
+init_plot_tables::@3: scope:[init_plot_tables]  from init_plot_tables::@2 init_plot_tables::@4
+  [46] (byte*) init_plot_tables::yoffs#2 ← phi( init_plot_tables::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 init_plot_tables::@4/(byte*) init_plot_tables::yoffs#4 )
+  [46] (byte) init_plot_tables::y#2 ← phi( init_plot_tables::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 init_plot_tables::@4/(byte) init_plot_tables::y#1 )
   [47] (byte~) init_plot_tables::$6 ← (byte) init_plot_tables::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [48] (byte~) init_plot_tables::$7 ← < (byte*) init_plot_tables::yoffs#2
   [49] (byte~) init_plot_tables::$8 ← (byte~) init_plot_tables::$6 | (byte~) init_plot_tables::$7
@@ -88,20 +88,20 @@ init_plot_tables::@5: scope:[init_plot_tables]  from init_plot_tables::@2 init_p
   [51] (byte~) init_plot_tables::$9 ← > (byte*) init_plot_tables::yoffs#2
   [52] *((const byte[$100]) plot_yhi#0 + (byte) init_plot_tables::y#2) ← (byte~) init_plot_tables::$9
   [53] (byte~) init_plot_tables::$10 ← (byte) init_plot_tables::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [54] if((byte~) init_plot_tables::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto init_plot_tables::@6
-  to:init_plot_tables::@7
-init_plot_tables::@7: scope:[init_plot_tables]  from init_plot_tables::@5
+  [54] if((byte~) init_plot_tables::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto init_plot_tables::@4
+  to:init_plot_tables::@5
+init_plot_tables::@5: scope:[init_plot_tables]  from init_plot_tables::@3
   [55] (byte*) init_plot_tables::yoffs#1 ← (byte*) init_plot_tables::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:init_plot_tables::@6
-init_plot_tables::@6: scope:[init_plot_tables]  from init_plot_tables::@5 init_plot_tables::@7
-  [56] (byte*) init_plot_tables::yoffs#4 ← phi( init_plot_tables::@5/(byte*) init_plot_tables::yoffs#2 init_plot_tables::@7/(byte*) init_plot_tables::yoffs#1 )
+  to:init_plot_tables::@4
+init_plot_tables::@4: scope:[init_plot_tables]  from init_plot_tables::@3 init_plot_tables::@5
+  [56] (byte*) init_plot_tables::yoffs#4 ← phi( init_plot_tables::@3/(byte*) init_plot_tables::yoffs#2 init_plot_tables::@5/(byte*) init_plot_tables::yoffs#1 )
   [57] (byte) init_plot_tables::y#1 ← ++ (byte) init_plot_tables::y#2
-  [58] if((byte) init_plot_tables::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@5
+  [58] if((byte) init_plot_tables::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@3
   to:init_plot_tables::@return
-init_plot_tables::@return: scope:[init_plot_tables]  from init_plot_tables::@6
+init_plot_tables::@return: scope:[init_plot_tables]  from init_plot_tables::@4
   [59] return 
   to:@return
-init_plot_tables::@10: scope:[init_plot_tables]  from init_plot_tables::@1
+init_plot_tables::@6: scope:[init_plot_tables]  from init_plot_tables::@1
   [60] phi()
   to:init_plot_tables::@2
 init_screen: scope:[init_screen]  from main
@@ -112,13 +112,13 @@ init_screen::@1: scope:[init_screen]  from init_screen init_screen::@1
   [63] *((byte*) init_screen::b#2) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [64] (byte*) init_screen::b#1 ← ++ (byte*) init_screen::b#2
   [65] if((byte*) init_screen::b#1!=(const byte*) BITMAP#0+(word/signed word/dword/signed dword) $2000) goto init_screen::@1
-  to:init_screen::@3
-init_screen::@3: scope:[init_screen]  from init_screen::@1 init_screen::@3
-  [66] (byte*) init_screen::c#2 ← phi( init_screen::@1/(const byte*) SCREEN#0 init_screen::@3/(byte*) init_screen::c#1 )
+  to:init_screen::@2
+init_screen::@2: scope:[init_screen]  from init_screen::@1 init_screen::@2
+  [66] (byte*) init_screen::c#2 ← phi( init_screen::@1/(const byte*) SCREEN#0 init_screen::@2/(byte*) init_screen::c#1 )
   [67] *((byte*) init_screen::c#2) ← (byte/signed byte/word/signed word/dword/signed dword) $14
   [68] (byte*) init_screen::c#1 ← ++ (byte*) init_screen::c#2
-  [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@3
+  [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@2
   to:init_screen::@return
-init_screen::@return: scope:[init_screen]  from init_screen::@3
+init_screen::@return: scope:[init_screen]  from init_screen::@2
   [70] return 
   to:@return
diff --git a/src/test/ref/bitmap-plotter.log b/src/test/ref/bitmap-plotter.log
index 757ea8a21..425fbefa6 100644
--- a/src/test/ref/bitmap-plotter.log
+++ b/src/test/ref/bitmap-plotter.log
@@ -562,60 +562,71 @@ Culled Empty Block (label) init_plot_tables::@12
 Culled Empty Block (label) init_plot_tables::@9
 Culled Empty Block (label) init_screen::@6
 Culled Empty Block (label) init_screen::@5
+Renumbering block @5 to @1
+Renumbering block main::@2 to main::@1
+Renumbering block main::@3 to main::@2
+Renumbering block main::@5 to main::@3
+Renumbering block main::@7 to main::@4
+Renumbering block plots::@3 to plots::@2
+Renumbering block init_plot_tables::@5 to init_plot_tables::@3
+Renumbering block init_plot_tables::@6 to init_plot_tables::@4
+Renumbering block init_plot_tables::@7 to init_plot_tables::@5
+Renumbering block init_plot_tables::@10 to init_plot_tables::@6
+Renumbering block init_screen::@3 to init_screen::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @5
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
-Adding NOP phi() at start of main::@5
+Adding NOP phi() at start of main::@3
 Adding NOP phi() at start of plots
 Adding NOP phi() at start of init_plot_tables
-Adding NOP phi() at start of init_plot_tables::@10
+Adding NOP phi() at start of init_plot_tables::@6
 Adding NOP phi() at start of init_screen
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [5] *((const byte*) FGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [6] *((const byte*) D011#0) ← (const byte) BMM#0|(const byte) DEN#0|(const byte) RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [7] *((const byte*) D018#0) ← ((byte))((word))(const byte*) SCREEN#0/(byte/signed byte/word/signed word/dword/signed dword) $40|((word))(const byte*) BITMAP#0/(word/signed word/dword/signed dword) $400
   [8] call init_screen 
-  to:main::@5
-main::@5: scope:[main]  from main
+  to:main::@3
+main::@3: scope:[main]  from main
   [9] phi()
   [10] call init_plot_tables 
+  to:main::@1
+main::@1: scope:[main]  from main::@1 main::@3 main::@4
+  [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main::@2 main::@5 main::@7
-  [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
-  to:main::@3
-main::@3: scope:[main]  from main::@2
+main::@2: scope:[main]  from main::@1
   [12] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   [13] call plots 
-  to:main::@7
-main::@7: scope:[main]  from main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@2
   [14] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0)
-  to:main::@2
-plots: scope:[plots]  from main::@3
+  to:main::@1
+plots: scope:[plots]  from main::@2
   [15] phi()
   to:plots::@1
-plots::@1: scope:[plots]  from plots plots::@3
-  [16] (byte) plots::i#2 ← phi( plots/(byte/signed byte/word/signed word/dword/signed dword) 0 plots::@3/(byte) plots::i#1 )
+plots::@1: scope:[plots]  from plots plots::@2
+  [16] (byte) plots::i#2 ← phi( plots/(byte/signed byte/word/signed word/dword/signed dword) 0 plots::@2/(byte) plots::i#1 )
   [17] (byte) plot::x#0 ← *((const byte[]) plots_x#0 + (byte) plots::i#2)
   [18] (byte) plot::y#0 ← *((const byte[]) plots_y#0 + (byte) plots::i#2)
   [19] call plot 
-  to:plots::@3
-plots::@3: scope:[plots]  from plots::@1
+  to:plots::@2
+plots::@2: scope:[plots]  from plots::@1
   [20] (byte) plots::i#1 ← ++ (byte) plots::i#2
   [21] if((byte) plots::i#1<(const byte) plots_cnt#0) goto plots::@1
   to:plots::@return
-plots::@return: scope:[plots]  from plots::@3
+plots::@return: scope:[plots]  from plots::@2
   [22] return 
   to:@return
 plot: scope:[plot]  from plots::@1
@@ -634,7 +645,7 @@ plot: scope:[plot]  from plots::@1
 plot::@return: scope:[plot]  from plot
   [34] return 
   to:@return
-init_plot_tables: scope:[init_plot_tables]  from main::@5
+init_plot_tables: scope:[init_plot_tables]  from main::@3
   [35] phi()
   to:init_plot_tables::@1
 init_plot_tables::@1: scope:[init_plot_tables]  from init_plot_tables init_plot_tables::@2
@@ -645,16 +656,16 @@ init_plot_tables::@1: scope:[init_plot_tables]  from init_plot_tables init_plot_
   [39] *((const byte[$100]) plot_xhi#0 + (byte) init_plot_tables::x#2) ← >(const byte*) BITMAP#0
   [40] *((const byte[$100]) plot_bit#0 + (byte) init_plot_tables::x#2) ← (byte) init_plot_tables::bits#3
   [41] (byte) init_plot_tables::bits#1 ← (byte) init_plot_tables::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [42] if((byte) init_plot_tables::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@10
+  [42] if((byte) init_plot_tables::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@6
   to:init_plot_tables::@2
-init_plot_tables::@2: scope:[init_plot_tables]  from init_plot_tables::@1 init_plot_tables::@10
-  [43] (byte) init_plot_tables::bits#4 ← phi( init_plot_tables::@10/(byte) init_plot_tables::bits#1 init_plot_tables::@1/(byte/word/signed word/dword/signed dword) $80 )
+init_plot_tables::@2: scope:[init_plot_tables]  from init_plot_tables::@1 init_plot_tables::@6
+  [43] (byte) init_plot_tables::bits#4 ← phi( init_plot_tables::@6/(byte) init_plot_tables::bits#1 init_plot_tables::@1/(byte/word/signed word/dword/signed dword) $80 )
   [44] (byte) init_plot_tables::x#1 ← ++ (byte) init_plot_tables::x#2
   [45] if((byte) init_plot_tables::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@1
-  to:init_plot_tables::@5
-init_plot_tables::@5: scope:[init_plot_tables]  from init_plot_tables::@2 init_plot_tables::@6
-  [46] (byte*) init_plot_tables::yoffs#2 ← phi( init_plot_tables::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 init_plot_tables::@6/(byte*) init_plot_tables::yoffs#4 )
-  [46] (byte) init_plot_tables::y#2 ← phi( init_plot_tables::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 init_plot_tables::@6/(byte) init_plot_tables::y#1 )
+  to:init_plot_tables::@3
+init_plot_tables::@3: scope:[init_plot_tables]  from init_plot_tables::@2 init_plot_tables::@4
+  [46] (byte*) init_plot_tables::yoffs#2 ← phi( init_plot_tables::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 init_plot_tables::@4/(byte*) init_plot_tables::yoffs#4 )
+  [46] (byte) init_plot_tables::y#2 ← phi( init_plot_tables::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 init_plot_tables::@4/(byte) init_plot_tables::y#1 )
   [47] (byte~) init_plot_tables::$6 ← (byte) init_plot_tables::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [48] (byte~) init_plot_tables::$7 ← < (byte*) init_plot_tables::yoffs#2
   [49] (byte~) init_plot_tables::$8 ← (byte~) init_plot_tables::$6 | (byte~) init_plot_tables::$7
@@ -662,20 +673,20 @@ init_plot_tables::@5: scope:[init_plot_tables]  from init_plot_tables::@2 init_p
   [51] (byte~) init_plot_tables::$9 ← > (byte*) init_plot_tables::yoffs#2
   [52] *((const byte[$100]) plot_yhi#0 + (byte) init_plot_tables::y#2) ← (byte~) init_plot_tables::$9
   [53] (byte~) init_plot_tables::$10 ← (byte) init_plot_tables::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [54] if((byte~) init_plot_tables::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto init_plot_tables::@6
-  to:init_plot_tables::@7
-init_plot_tables::@7: scope:[init_plot_tables]  from init_plot_tables::@5
+  [54] if((byte~) init_plot_tables::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto init_plot_tables::@4
+  to:init_plot_tables::@5
+init_plot_tables::@5: scope:[init_plot_tables]  from init_plot_tables::@3
   [55] (byte*) init_plot_tables::yoffs#1 ← (byte*) init_plot_tables::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:init_plot_tables::@6
-init_plot_tables::@6: scope:[init_plot_tables]  from init_plot_tables::@5 init_plot_tables::@7
-  [56] (byte*) init_plot_tables::yoffs#4 ← phi( init_plot_tables::@5/(byte*) init_plot_tables::yoffs#2 init_plot_tables::@7/(byte*) init_plot_tables::yoffs#1 )
+  to:init_plot_tables::@4
+init_plot_tables::@4: scope:[init_plot_tables]  from init_plot_tables::@3 init_plot_tables::@5
+  [56] (byte*) init_plot_tables::yoffs#4 ← phi( init_plot_tables::@3/(byte*) init_plot_tables::yoffs#2 init_plot_tables::@5/(byte*) init_plot_tables::yoffs#1 )
   [57] (byte) init_plot_tables::y#1 ← ++ (byte) init_plot_tables::y#2
-  [58] if((byte) init_plot_tables::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@5
+  [58] if((byte) init_plot_tables::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@3
   to:init_plot_tables::@return
-init_plot_tables::@return: scope:[init_plot_tables]  from init_plot_tables::@6
+init_plot_tables::@return: scope:[init_plot_tables]  from init_plot_tables::@4
   [59] return 
   to:@return
-init_plot_tables::@10: scope:[init_plot_tables]  from init_plot_tables::@1
+init_plot_tables::@6: scope:[init_plot_tables]  from init_plot_tables::@1
   [60] phi()
   to:init_plot_tables::@2
 init_screen: scope:[init_screen]  from main
@@ -686,14 +697,14 @@ init_screen::@1: scope:[init_screen]  from init_screen init_screen::@1
   [63] *((byte*) init_screen::b#2) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [64] (byte*) init_screen::b#1 ← ++ (byte*) init_screen::b#2
   [65] if((byte*) init_screen::b#1!=(const byte*) BITMAP#0+(word/signed word/dword/signed dword) $2000) goto init_screen::@1
-  to:init_screen::@3
-init_screen::@3: scope:[init_screen]  from init_screen::@1 init_screen::@3
-  [66] (byte*) init_screen::c#2 ← phi( init_screen::@1/(const byte*) SCREEN#0 init_screen::@3/(byte*) init_screen::c#1 )
+  to:init_screen::@2
+init_screen::@2: scope:[init_screen]  from init_screen::@1 init_screen::@2
+  [66] (byte*) init_screen::c#2 ← phi( init_screen::@1/(const byte*) SCREEN#0 init_screen::@2/(byte*) init_screen::c#1 )
   [67] *((byte*) init_screen::c#2) ← (byte/signed byte/word/signed word/dword/signed dword) $14
   [68] (byte*) init_screen::c#1 ← ++ (byte*) init_screen::c#2
-  [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@3
+  [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@2
   to:init_screen::@return
-init_screen::@return: scope:[init_screen]  from init_screen::@3
+init_screen::@return: scope:[init_screen]  from init_screen::@2
   [70] return 
   to:@return
 
@@ -873,15 +884,15 @@ INITIAL ASM
   .const plots_cnt = 8
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -903,37 +914,37 @@ main: {
   //SEG15 [61] phi from main to init_screen [phi:main->init_screen]
   init_screen_from_main:
     jsr init_screen
-  //SEG16 [9] phi from main to main::@5 [phi:main->main::@5]
-  b5_from_main:
-    jmp b5
-  //SEG17 main::@5
-  b5:
+  //SEG16 [9] phi from main to main::@3 [phi:main->main::@3]
+  b3_from_main:
+    jmp b3
+  //SEG17 main::@3
+  b3:
   //SEG18 [10] call init_plot_tables 
-  //SEG19 [35] phi from main::@5 to init_plot_tables [phi:main::@5->init_plot_tables]
-  init_plot_tables_from_b5:
+  //SEG19 [35] phi from main::@3 to init_plot_tables [phi:main::@3->init_plot_tables]
+  init_plot_tables_from_b3:
     jsr init_plot_tables
-    jmp b2
-  //SEG20 main::@2
-  b2:
-  //SEG21 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG20 main::@1
+  b1:
+  //SEG21 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b2
-    jmp b3
-  //SEG22 main::@3
-  b3:
+    bne b1
+    jmp b2
+  //SEG22 main::@2
+  b2:
   //SEG23 [12] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
   //SEG24 [13] call plots 
-  //SEG25 [15] phi from main::@3 to plots [phi:main::@3->plots]
-  plots_from_b3:
+  //SEG25 [15] phi from main::@2 to plots [phi:main::@2->plots]
+  plots_from_b2:
     jsr plots
-    jmp b7
-  //SEG26 main::@7
-  b7:
+    jmp b4
+  //SEG26 main::@4
+  b4:
   //SEG27 [14] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BGCOL
-    jmp b2
+    jmp b1
 }
 //SEG28 plots
 plots: {
@@ -944,9 +955,9 @@ plots: {
     lda #0
     sta i
     jmp b1
-  //SEG31 [16] phi from plots::@3 to plots::@1 [phi:plots::@3->plots::@1]
-  b1_from_b3:
-  //SEG32 [16] phi (byte) plots::i#2 = (byte) plots::i#1 [phi:plots::@3->plots::@1#0] -- register_copy 
+  //SEG31 [16] phi from plots::@2 to plots::@1 [phi:plots::@2->plots::@1]
+  b1_from_b2:
+  //SEG32 [16] phi (byte) plots::i#2 = (byte) plots::i#1 [phi:plots::@2->plots::@1#0] -- register_copy 
     jmp b1
   //SEG33 plots::@1
   b1:
@@ -960,15 +971,15 @@ plots: {
     sta plot.y
   //SEG36 [19] call plot 
     jsr plot
-    jmp b3
-  //SEG37 plots::@3
-  b3:
+    jmp b2
+  //SEG37 plots::@2
+  b2:
   //SEG38 [20] (byte) plots::i#1 ← ++ (byte) plots::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG39 [21] if((byte) plots::i#1<(const byte) plots_cnt#0) goto plots::@1 -- vbuz1_lt_vbuc1_then_la1 
     lda i
     cmp #plots_cnt
-    bcc b1_from_b3
+    bcc b1_from_b2
     jmp breturn
   //SEG40 plots::@return
   breturn:
@@ -1096,10 +1107,10 @@ init_plot_tables: {
     sta plot_bit,y
   //SEG68 [41] (byte) init_plot_tables::bits#1 ← (byte) init_plot_tables::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr bits
-  //SEG69 [42] if((byte) init_plot_tables::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@10 -- vbuz1_neq_0_then_la1 
+  //SEG69 [42] if((byte) init_plot_tables::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@6 -- vbuz1_neq_0_then_la1 
     lda bits
     cmp #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG70 [43] phi from init_plot_tables::@1 to init_plot_tables::@2 [phi:init_plot_tables::@1->init_plot_tables::@2]
   b2_from_b1:
   //SEG71 [43] phi (byte) init_plot_tables::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:init_plot_tables::@1->init_plot_tables::@2#0] -- vbuz1=vbuc1 
@@ -1114,24 +1125,24 @@ init_plot_tables: {
     lda x
     cmp #0
     bne b1_from_b2
-  //SEG75 [46] phi from init_plot_tables::@2 to init_plot_tables::@5 [phi:init_plot_tables::@2->init_plot_tables::@5]
-  b5_from_b2:
-  //SEG76 [46] phi (byte*) init_plot_tables::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@5#0] -- pbuz1=pbuc1 
+  //SEG75 [46] phi from init_plot_tables::@2 to init_plot_tables::@3 [phi:init_plot_tables::@2->init_plot_tables::@3]
+  b3_from_b2:
+  //SEG76 [46] phi (byte*) init_plot_tables::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     lda #>0
     sta yoffs+1
-  //SEG77 [46] phi (byte) init_plot_tables::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@5#1] -- vbuz1=vbuc1 
+  //SEG77 [46] phi (byte) init_plot_tables::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@3#1] -- vbuz1=vbuc1 
     lda #0
     sta y
-    jmp b5
-  //SEG78 [46] phi from init_plot_tables::@6 to init_plot_tables::@5 [phi:init_plot_tables::@6->init_plot_tables::@5]
-  b5_from_b6:
-  //SEG79 [46] phi (byte*) init_plot_tables::yoffs#2 = (byte*) init_plot_tables::yoffs#4 [phi:init_plot_tables::@6->init_plot_tables::@5#0] -- register_copy 
-  //SEG80 [46] phi (byte) init_plot_tables::y#2 = (byte) init_plot_tables::y#1 [phi:init_plot_tables::@6->init_plot_tables::@5#1] -- register_copy 
-    jmp b5
-  //SEG81 init_plot_tables::@5
-  b5:
+    jmp b3
+  //SEG78 [46] phi from init_plot_tables::@4 to init_plot_tables::@3 [phi:init_plot_tables::@4->init_plot_tables::@3]
+  b3_from_b4:
+  //SEG79 [46] phi (byte*) init_plot_tables::yoffs#2 = (byte*) init_plot_tables::yoffs#4 [phi:init_plot_tables::@4->init_plot_tables::@3#0] -- register_copy 
+  //SEG80 [46] phi (byte) init_plot_tables::y#2 = (byte) init_plot_tables::y#1 [phi:init_plot_tables::@4->init_plot_tables::@3#1] -- register_copy 
+    jmp b3
+  //SEG81 init_plot_tables::@3
+  b3:
   //SEG82 [47] (byte~) init_plot_tables::$6 ← (byte) init_plot_tables::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuz2_band_vbuc1 
     lda #7
     and y
@@ -1158,13 +1169,13 @@ init_plot_tables: {
     lda #7
     and y
     sta _10
-  //SEG89 [54] if((byte~) init_plot_tables::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto init_plot_tables::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG89 [54] if((byte~) init_plot_tables::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto init_plot_tables::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp _10
-    bne b6_from_b5
-    jmp b7
-  //SEG90 init_plot_tables::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG90 init_plot_tables::@5
+  b5:
   //SEG91 [55] (byte*) init_plot_tables::yoffs#1 ← (byte*) init_plot_tables::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -1173,32 +1184,32 @@ init_plot_tables: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG92 [56] phi from init_plot_tables::@5 init_plot_tables::@7 to init_plot_tables::@6 [phi:init_plot_tables::@5/init_plot_tables::@7->init_plot_tables::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG93 [56] phi (byte*) init_plot_tables::yoffs#4 = (byte*) init_plot_tables::yoffs#2 [phi:init_plot_tables::@5/init_plot_tables::@7->init_plot_tables::@6#0] -- register_copy 
-    jmp b6
-  //SEG94 init_plot_tables::@6
-  b6:
+  //SEG92 [56] phi from init_plot_tables::@3 init_plot_tables::@5 to init_plot_tables::@4 [phi:init_plot_tables::@3/init_plot_tables::@5->init_plot_tables::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG93 [56] phi (byte*) init_plot_tables::yoffs#4 = (byte*) init_plot_tables::yoffs#2 [phi:init_plot_tables::@3/init_plot_tables::@5->init_plot_tables::@4#0] -- register_copy 
+    jmp b4
+  //SEG94 init_plot_tables::@4
+  b4:
   //SEG95 [57] (byte) init_plot_tables::y#1 ← ++ (byte) init_plot_tables::y#2 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG96 [58] if((byte) init_plot_tables::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@5 -- vbuz1_neq_0_then_la1 
+  //SEG96 [58] if((byte) init_plot_tables::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@3 -- vbuz1_neq_0_then_la1 
     lda y
     cmp #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG97 init_plot_tables::@return
   breturn:
   //SEG98 [59] return 
     rts
-  //SEG99 [60] phi from init_plot_tables::@1 to init_plot_tables::@10 [phi:init_plot_tables::@1->init_plot_tables::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG100 init_plot_tables::@10
-  b10:
-  //SEG101 [43] phi from init_plot_tables::@10 to init_plot_tables::@2 [phi:init_plot_tables::@10->init_plot_tables::@2]
-  b2_from_b10:
-  //SEG102 [43] phi (byte) init_plot_tables::bits#4 = (byte) init_plot_tables::bits#1 [phi:init_plot_tables::@10->init_plot_tables::@2#0] -- register_copy 
+  //SEG99 [60] phi from init_plot_tables::@1 to init_plot_tables::@6 [phi:init_plot_tables::@1->init_plot_tables::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG100 init_plot_tables::@6
+  b6:
+  //SEG101 [43] phi from init_plot_tables::@6 to init_plot_tables::@2 [phi:init_plot_tables::@6->init_plot_tables::@2]
+  b2_from_b6:
+  //SEG102 [43] phi (byte) init_plot_tables::bits#4 = (byte) init_plot_tables::bits#1 [phi:init_plot_tables::@6->init_plot_tables::@2#0] -- register_copy 
     jmp b2
 }
 //SEG103 init_screen
@@ -1235,20 +1246,20 @@ init_screen: {
     lda b
     cmp #<BITMAP+$2000
     bne b1_from_b1
-  //SEG112 [66] phi from init_screen::@1 to init_screen::@3 [phi:init_screen::@1->init_screen::@3]
-  b3_from_b1:
-  //SEG113 [66] phi (byte*) init_screen::c#2 = (const byte*) SCREEN#0 [phi:init_screen::@1->init_screen::@3#0] -- pbuz1=pbuc1 
+  //SEG112 [66] phi from init_screen::@1 to init_screen::@2 [phi:init_screen::@1->init_screen::@2]
+  b2_from_b1:
+  //SEG113 [66] phi (byte*) init_screen::c#2 = (const byte*) SCREEN#0 [phi:init_screen::@1->init_screen::@2#0] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta c
     lda #>SCREEN
     sta c+1
-    jmp b3
-  //SEG114 [66] phi from init_screen::@3 to init_screen::@3 [phi:init_screen::@3->init_screen::@3]
-  b3_from_b3:
-  //SEG115 [66] phi (byte*) init_screen::c#2 = (byte*) init_screen::c#1 [phi:init_screen::@3->init_screen::@3#0] -- register_copy 
-    jmp b3
-  //SEG116 init_screen::@3
-  b3:
+    jmp b2
+  //SEG114 [66] phi from init_screen::@2 to init_screen::@2 [phi:init_screen::@2->init_screen::@2]
+  b2_from_b2:
+  //SEG115 [66] phi (byte*) init_screen::c#2 = (byte*) init_screen::c#1 [phi:init_screen::@2->init_screen::@2#0] -- register_copy 
+    jmp b2
+  //SEG116 init_screen::@2
+  b2:
   //SEG117 [67] *((byte*) init_screen::c#2) ← (byte/signed byte/word/signed word/dword/signed dword) $14 -- _deref_pbuz1=vbuc1 
     lda #$14
     ldy #0
@@ -1258,13 +1269,13 @@ init_screen: {
     bne !+
     inc c+1
   !:
-  //SEG119 [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@3 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG119 [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@2 -- pbuz1_neq_pbuc1_then_la1 
     lda c+1
     cmp #>SCREEN+$400
-    bne b3_from_b3
+    bne b2_from_b2
     lda c
     cmp #<SCREEN+$400
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG120 init_screen::@return
   breturn:
@@ -1285,7 +1296,7 @@ Statement [4] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dw
 Statement [5] *((const byte*) FGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [6] *((const byte*) D011#0) ← (const byte) BMM#0|(const byte) DEN#0|(const byte) RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [7] *((const byte*) D018#0) ← ((byte))((word))(const byte*) SCREEN#0/(byte/signed byte/word/signed word/dword/signed dword) $40|((word))(const byte*) BITMAP#0/(word/signed word/dword/signed dword) $400 [ ] ( main:2 [ ] ) always clobbers reg byte a 
-Statement [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [26] (byte*) plot::plotter_x#2 ← (byte*) plot::plotter_x#1 lo= (byte~) plot::$7 [ plot::x#0 plot::y#0 plot::plotter_x#2 ] ( main:2::plots:13::plot:19 [ plots::i#2 plot::x#0 plot::y#0 plot::plotter_x#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ plots::i#2 plots::i#1 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:12 [ plot::x#0 ]
@@ -1304,12 +1315,12 @@ Removing always clobbered register reg byte a as potential for zp ZP_BYTE:5 [ in
 Statement [63] *((byte*) init_screen::b#2) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ init_screen::b#2 ] ( main:2::init_screen:8 [ init_screen::b#2 ] ) always clobbers reg byte a reg byte y 
 Statement [65] if((byte*) init_screen::b#1!=(const byte*) BITMAP#0+(word/signed word/dword/signed dword) $2000) goto init_screen::@1 [ init_screen::b#1 ] ( main:2::init_screen:8 [ init_screen::b#1 ] ) always clobbers reg byte a 
 Statement [67] *((byte*) init_screen::c#2) ← (byte/signed byte/word/signed word/dword/signed dword) $14 [ init_screen::c#2 ] ( main:2::init_screen:8 [ init_screen::c#2 ] ) always clobbers reg byte a reg byte y 
-Statement [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@3 [ init_screen::c#1 ] ( main:2::init_screen:8 [ init_screen::c#1 ] ) always clobbers reg byte a 
+Statement [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@2 [ init_screen::c#1 ] ( main:2::init_screen:8 [ init_screen::c#1 ] ) always clobbers reg byte a 
 Statement [4] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [5] *((const byte*) FGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [6] *((const byte*) D011#0) ← (const byte) BMM#0|(const byte) DEN#0|(const byte) RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [7] *((const byte*) D018#0) ← ((byte))((word))(const byte*) SCREEN#0/(byte/signed byte/word/signed word/dword/signed dword) $40|((word))(const byte*) BITMAP#0/(word/signed word/dword/signed dword) $400 [ ] ( main:2 [ ] ) always clobbers reg byte a 
-Statement [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [26] (byte*) plot::plotter_x#2 ← (byte*) plot::plotter_x#1 lo= (byte~) plot::$7 [ plot::x#0 plot::y#0 plot::plotter_x#2 ] ( main:2::plots:13::plot:19 [ plots::i#2 plot::x#0 plot::y#0 plot::plotter_x#2 ] ) always clobbers reg byte a 
 Statement [30] (word) plot::plotter_y#2 ← (word) plot::plotter_y#1 lo= (byte~) plot::$9 [ plot::x#0 plot::plotter_x#2 plot::plotter_y#2 ] ( main:2::plots:13::plot:19 [ plots::i#2 plot::x#0 plot::plotter_x#2 plot::plotter_y#2 ] ) always clobbers reg byte a 
 Statement [31] (byte*) plot::plotter#0 ← (byte*) plot::plotter_x#2 + (word) plot::plotter_y#2 [ plot::x#0 plot::plotter#0 ] ( main:2::plots:13::plot:19 [ plots::i#2 plot::x#0 plot::plotter#0 ] ) always clobbers reg byte a 
@@ -1324,7 +1335,7 @@ Statement [55] (byte*) init_plot_tables::yoffs#1 ← (byte*) init_plot_tables::y
 Statement [63] *((byte*) init_screen::b#2) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ init_screen::b#2 ] ( main:2::init_screen:8 [ init_screen::b#2 ] ) always clobbers reg byte a reg byte y 
 Statement [65] if((byte*) init_screen::b#1!=(const byte*) BITMAP#0+(word/signed word/dword/signed dword) $2000) goto init_screen::@1 [ init_screen::b#1 ] ( main:2::init_screen:8 [ init_screen::b#1 ] ) always clobbers reg byte a 
 Statement [67] *((byte*) init_screen::c#2) ← (byte/signed byte/word/signed word/dword/signed dword) $14 [ init_screen::c#2 ] ( main:2::init_screen:8 [ init_screen::c#2 ] ) always clobbers reg byte a reg byte y 
-Statement [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@3 [ init_screen::c#1 ] ( main:2::init_screen:8 [ init_screen::c#1 ] ) always clobbers reg byte a 
+Statement [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@2 [ init_screen::c#1 ] ( main:2::init_screen:8 [ init_screen::c#1 ] ) always clobbers reg byte a 
 Potential registers zp ZP_BYTE:2 [ plots::i#2 plots::i#1 ] : zp ZP_BYTE:2 , reg byte x , 
 Potential registers zp ZP_BYTE:3 [ init_plot_tables::x#2 init_plot_tables::x#1 ] : zp ZP_BYTE:3 , reg byte x , reg byte y , 
 Potential registers zp ZP_BYTE:4 [ init_plot_tables::bits#3 init_plot_tables::bits#4 init_plot_tables::bits#1 ] : zp ZP_BYTE:4 , reg byte x , reg byte y , 
@@ -1419,15 +1430,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const plots_cnt = 8
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -1449,37 +1460,37 @@ main: {
   //SEG15 [61] phi from main to init_screen [phi:main->init_screen]
   init_screen_from_main:
     jsr init_screen
-  //SEG16 [9] phi from main to main::@5 [phi:main->main::@5]
-  b5_from_main:
-    jmp b5
-  //SEG17 main::@5
-  b5:
+  //SEG16 [9] phi from main to main::@3 [phi:main->main::@3]
+  b3_from_main:
+    jmp b3
+  //SEG17 main::@3
+  b3:
   //SEG18 [10] call init_plot_tables 
-  //SEG19 [35] phi from main::@5 to init_plot_tables [phi:main::@5->init_plot_tables]
-  init_plot_tables_from_b5:
+  //SEG19 [35] phi from main::@3 to init_plot_tables [phi:main::@3->init_plot_tables]
+  init_plot_tables_from_b3:
     jsr init_plot_tables
-    jmp b2
-  //SEG20 main::@2
-  b2:
-  //SEG21 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG20 main::@1
+  b1:
+  //SEG21 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b2
-    jmp b3
-  //SEG22 main::@3
-  b3:
+    bne b1
+    jmp b2
+  //SEG22 main::@2
+  b2:
   //SEG23 [12] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
   //SEG24 [13] call plots 
-  //SEG25 [15] phi from main::@3 to plots [phi:main::@3->plots]
-  plots_from_b3:
+  //SEG25 [15] phi from main::@2 to plots [phi:main::@2->plots]
+  plots_from_b2:
     jsr plots
-    jmp b7
-  //SEG26 main::@7
-  b7:
+    jmp b4
+  //SEG26 main::@4
+  b4:
   //SEG27 [14] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BGCOL
-    jmp b2
+    jmp b1
 }
 //SEG28 plots
 plots: {
@@ -1488,9 +1499,9 @@ plots: {
   //SEG30 [16] phi (byte) plots::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:plots->plots::@1#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
-  //SEG31 [16] phi from plots::@3 to plots::@1 [phi:plots::@3->plots::@1]
-  b1_from_b3:
-  //SEG32 [16] phi (byte) plots::i#2 = (byte) plots::i#1 [phi:plots::@3->plots::@1#0] -- register_copy 
+  //SEG31 [16] phi from plots::@2 to plots::@1 [phi:plots::@2->plots::@1]
+  b1_from_b2:
+  //SEG32 [16] phi (byte) plots::i#2 = (byte) plots::i#1 [phi:plots::@2->plots::@1#0] -- register_copy 
     jmp b1
   //SEG33 plots::@1
   b1:
@@ -1502,14 +1513,14 @@ plots: {
     sta plot.y
   //SEG36 [19] call plot 
     jsr plot
-    jmp b3
-  //SEG37 plots::@3
-  b3:
+    jmp b2
+  //SEG37 plots::@2
+  b2:
   //SEG38 [20] (byte) plots::i#1 ← ++ (byte) plots::i#2 -- vbuxx=_inc_vbuxx 
     inx
   //SEG39 [21] if((byte) plots::i#1<(const byte) plots_cnt#0) goto plots::@1 -- vbuxx_lt_vbuc1_then_la1 
     cpx #plots_cnt
-    bcc b1_from_b3
+    bcc b1_from_b2
     jmp breturn
   //SEG40 plots::@return
   breturn:
@@ -1603,9 +1614,9 @@ init_plot_tables: {
     tya
     lsr
     tay
-  //SEG69 [42] if((byte) init_plot_tables::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@10 -- vbuyy_neq_0_then_la1 
+  //SEG69 [42] if((byte) init_plot_tables::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@6 -- vbuyy_neq_0_then_la1 
     cpy #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG70 [43] phi from init_plot_tables::@1 to init_plot_tables::@2 [phi:init_plot_tables::@1->init_plot_tables::@2]
   b2_from_b1:
   //SEG71 [43] phi (byte) init_plot_tables::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:init_plot_tables::@1->init_plot_tables::@2#0] -- vbuyy=vbuc1 
@@ -1618,23 +1629,23 @@ init_plot_tables: {
   //SEG74 [45] if((byte) init_plot_tables::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1_from_b2
-  //SEG75 [46] phi from init_plot_tables::@2 to init_plot_tables::@5 [phi:init_plot_tables::@2->init_plot_tables::@5]
-  b5_from_b2:
-  //SEG76 [46] phi (byte*) init_plot_tables::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@5#0] -- pbuz1=pbuc1 
+  //SEG75 [46] phi from init_plot_tables::@2 to init_plot_tables::@3 [phi:init_plot_tables::@2->init_plot_tables::@3]
+  b3_from_b2:
+  //SEG76 [46] phi (byte*) init_plot_tables::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     lda #>0
     sta yoffs+1
-  //SEG77 [46] phi (byte) init_plot_tables::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@5#1] -- vbuxx=vbuc1 
+  //SEG77 [46] phi (byte) init_plot_tables::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@3#1] -- vbuxx=vbuc1 
     ldx #0
-    jmp b5
-  //SEG78 [46] phi from init_plot_tables::@6 to init_plot_tables::@5 [phi:init_plot_tables::@6->init_plot_tables::@5]
-  b5_from_b6:
-  //SEG79 [46] phi (byte*) init_plot_tables::yoffs#2 = (byte*) init_plot_tables::yoffs#4 [phi:init_plot_tables::@6->init_plot_tables::@5#0] -- register_copy 
-  //SEG80 [46] phi (byte) init_plot_tables::y#2 = (byte) init_plot_tables::y#1 [phi:init_plot_tables::@6->init_plot_tables::@5#1] -- register_copy 
-    jmp b5
-  //SEG81 init_plot_tables::@5
-  b5:
+    jmp b3
+  //SEG78 [46] phi from init_plot_tables::@4 to init_plot_tables::@3 [phi:init_plot_tables::@4->init_plot_tables::@3]
+  b3_from_b4:
+  //SEG79 [46] phi (byte*) init_plot_tables::yoffs#2 = (byte*) init_plot_tables::yoffs#4 [phi:init_plot_tables::@4->init_plot_tables::@3#0] -- register_copy 
+  //SEG80 [46] phi (byte) init_plot_tables::y#2 = (byte) init_plot_tables::y#1 [phi:init_plot_tables::@4->init_plot_tables::@3#1] -- register_copy 
+    jmp b3
+  //SEG81 init_plot_tables::@3
+  b3:
   //SEG82 [47] (byte~) init_plot_tables::$6 ← (byte) init_plot_tables::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _6
@@ -1651,12 +1662,12 @@ init_plot_tables: {
   //SEG88 [53] (byte~) init_plot_tables::$10 ← (byte) init_plot_tables::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG89 [54] if((byte~) init_plot_tables::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto init_plot_tables::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG89 [54] if((byte~) init_plot_tables::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto init_plot_tables::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6_from_b5
-    jmp b7
-  //SEG90 init_plot_tables::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG90 init_plot_tables::@5
+  b5:
   //SEG91 [55] (byte*) init_plot_tables::yoffs#1 ← (byte*) init_plot_tables::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -1665,31 +1676,31 @@ init_plot_tables: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG92 [56] phi from init_plot_tables::@5 init_plot_tables::@7 to init_plot_tables::@6 [phi:init_plot_tables::@5/init_plot_tables::@7->init_plot_tables::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG93 [56] phi (byte*) init_plot_tables::yoffs#4 = (byte*) init_plot_tables::yoffs#2 [phi:init_plot_tables::@5/init_plot_tables::@7->init_plot_tables::@6#0] -- register_copy 
-    jmp b6
-  //SEG94 init_plot_tables::@6
-  b6:
+  //SEG92 [56] phi from init_plot_tables::@3 init_plot_tables::@5 to init_plot_tables::@4 [phi:init_plot_tables::@3/init_plot_tables::@5->init_plot_tables::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG93 [56] phi (byte*) init_plot_tables::yoffs#4 = (byte*) init_plot_tables::yoffs#2 [phi:init_plot_tables::@3/init_plot_tables::@5->init_plot_tables::@4#0] -- register_copy 
+    jmp b4
+  //SEG94 init_plot_tables::@4
+  b4:
   //SEG95 [57] (byte) init_plot_tables::y#1 ← ++ (byte) init_plot_tables::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG96 [58] if((byte) init_plot_tables::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@5 -- vbuxx_neq_0_then_la1 
+  //SEG96 [58] if((byte) init_plot_tables::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG97 init_plot_tables::@return
   breturn:
   //SEG98 [59] return 
     rts
-  //SEG99 [60] phi from init_plot_tables::@1 to init_plot_tables::@10 [phi:init_plot_tables::@1->init_plot_tables::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG100 init_plot_tables::@10
-  b10:
-  //SEG101 [43] phi from init_plot_tables::@10 to init_plot_tables::@2 [phi:init_plot_tables::@10->init_plot_tables::@2]
-  b2_from_b10:
-  //SEG102 [43] phi (byte) init_plot_tables::bits#4 = (byte) init_plot_tables::bits#1 [phi:init_plot_tables::@10->init_plot_tables::@2#0] -- register_copy 
+  //SEG99 [60] phi from init_plot_tables::@1 to init_plot_tables::@6 [phi:init_plot_tables::@1->init_plot_tables::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG100 init_plot_tables::@6
+  b6:
+  //SEG101 [43] phi from init_plot_tables::@6 to init_plot_tables::@2 [phi:init_plot_tables::@6->init_plot_tables::@2]
+  b2_from_b6:
+  //SEG102 [43] phi (byte) init_plot_tables::bits#4 = (byte) init_plot_tables::bits#1 [phi:init_plot_tables::@6->init_plot_tables::@2#0] -- register_copy 
     jmp b2
 }
 //SEG103 init_screen
@@ -1726,20 +1737,20 @@ init_screen: {
     lda b
     cmp #<BITMAP+$2000
     bne b1_from_b1
-  //SEG112 [66] phi from init_screen::@1 to init_screen::@3 [phi:init_screen::@1->init_screen::@3]
-  b3_from_b1:
-  //SEG113 [66] phi (byte*) init_screen::c#2 = (const byte*) SCREEN#0 [phi:init_screen::@1->init_screen::@3#0] -- pbuz1=pbuc1 
+  //SEG112 [66] phi from init_screen::@1 to init_screen::@2 [phi:init_screen::@1->init_screen::@2]
+  b2_from_b1:
+  //SEG113 [66] phi (byte*) init_screen::c#2 = (const byte*) SCREEN#0 [phi:init_screen::@1->init_screen::@2#0] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta c
     lda #>SCREEN
     sta c+1
-    jmp b3
-  //SEG114 [66] phi from init_screen::@3 to init_screen::@3 [phi:init_screen::@3->init_screen::@3]
-  b3_from_b3:
-  //SEG115 [66] phi (byte*) init_screen::c#2 = (byte*) init_screen::c#1 [phi:init_screen::@3->init_screen::@3#0] -- register_copy 
-    jmp b3
-  //SEG116 init_screen::@3
-  b3:
+    jmp b2
+  //SEG114 [66] phi from init_screen::@2 to init_screen::@2 [phi:init_screen::@2->init_screen::@2]
+  b2_from_b2:
+  //SEG115 [66] phi (byte*) init_screen::c#2 = (byte*) init_screen::c#1 [phi:init_screen::@2->init_screen::@2#0] -- register_copy 
+    jmp b2
+  //SEG116 init_screen::@2
+  b2:
   //SEG117 [67] *((byte*) init_screen::c#2) ← (byte/signed byte/word/signed word/dword/signed dword) $14 -- _deref_pbuz1=vbuc1 
     lda #$14
     ldy #0
@@ -1749,13 +1760,13 @@ init_screen: {
     bne !+
     inc c+1
   !:
-  //SEG119 [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@3 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG119 [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@2 -- pbuz1_neq_pbuc1_then_la1 
     lda c+1
     cmp #>SCREEN+$400
-    bne b3_from_b3
+    bne b2_from_b2
     lda c
     cmp #<SCREEN+$400
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG120 init_screen::@return
   breturn:
@@ -1771,25 +1782,25 @@ init_screen: {
   plot_bit: .fill $100, 0
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b5
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b5
-Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp b7
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp b4
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp b5
-Removing instruction jmp b7
+Removing instruction jmp b4
+Removing instruction jmp breturn
 Removing instruction jmp b6
-Removing instruction jmp breturn
-Removing instruction jmp b10
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
@@ -1799,68 +1810,68 @@ Removing instruction lda #>0
 Replacing instruction ldx #0 with TAX
 Replacing instruction ldy #0 with TAY
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b1_from_b3 with b1
-Replacing label b10_from_b1 with b10
 Replacing label b1_from_b2 with b1
-Replacing label b6_from_b5 with b6
-Replacing label b5_from_b6 with b5
+Replacing label b6_from_b1 with b6
+Replacing label b1_from_b2 with b1
+Replacing label b4_from_b3 with b4
+Replacing label b3_from_b4 with b3
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Replacing label b3_from_b3 with b3
-Replacing label b3_from_b3 with b3
-Removing instruction b5_from_bbegin:
-Removing instruction b5:
-Removing instruction bend_from_b5:
-Removing instruction b5_from_main:
-Removing instruction init_plot_tables_from_b5:
-Removing instruction b1_from_b3:
+Replacing label b2_from_b2 with b2
+Replacing label b2_from_b2 with b2
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction b3_from_main:
+Removing instruction init_plot_tables_from_b3:
 Removing instruction b1_from_b2:
-Removing instruction b5_from_b6:
-Removing instruction b6_from_b5:
-Removing instruction b6_from_b7:
-Removing instruction b10_from_b1:
-Removing instruction b2_from_b10:
+Removing instruction b1_from_b2:
+Removing instruction b3_from_b4:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b5:
+Removing instruction b6_from_b1:
+Removing instruction b2_from_b6:
 Removing instruction b1_from_b1:
-Removing instruction b3_from_b3:
+Removing instruction b2_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction init_screen_from_main:
-Removing instruction b5:
 Removing instruction b3:
-Removing instruction plots_from_b3:
-Removing instruction b7:
+Removing instruction b2:
+Removing instruction plots_from_b2:
+Removing instruction b4:
 Removing instruction b1_from_plots:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b1_from_init_plot_tables:
 Removing instruction b2_from_b1:
-Removing instruction b5_from_b2:
-Removing instruction b7:
+Removing instruction b3_from_b2:
+Removing instruction b5:
 Removing instruction breturn:
 Removing instruction b1_from_init_screen:
-Removing instruction b3_from_b1:
+Removing instruction b2_from_b1:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b2 in bne b10
+Skipping double jump to b2 in bne b6
 Succesful ASM optimization Pass5DoubleJumpElimination
 Removing instruction jmp b1
 Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b1
 Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
-Removing instruction b10:
+Removing instruction b6:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b2
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -1897,11 +1908,11 @@ FINAL SYMBOL TABLE
 (byte~) init_plot_tables::$8 reg byte a 22.0
 (byte~) init_plot_tables::$9 reg byte a 22.0
 (label) init_plot_tables::@1
-(label) init_plot_tables::@10
 (label) init_plot_tables::@2
+(label) init_plot_tables::@3
+(label) init_plot_tables::@4
 (label) init_plot_tables::@5
 (label) init_plot_tables::@6
-(label) init_plot_tables::@7
 (label) init_plot_tables::@return
 (byte) init_plot_tables::bits
 (byte) init_plot_tables::bits#1 reg byte y 11.0
@@ -1919,7 +1930,7 @@ FINAL SYMBOL TABLE
 (byte*) init_plot_tables::yoffs#4 yoffs zp ZP_WORD:2 11.0
 (void()) init_screen()
 (label) init_screen::@1
-(label) init_screen::@3
+(label) init_screen::@2
 (label) init_screen::@return
 (byte*) init_screen::b
 (byte*) init_screen::b#1 b zp ZP_WORD:2 16.5
@@ -1928,10 +1939,10 @@ FINAL SYMBOL TABLE
 (byte*) init_screen::c#1 c zp ZP_WORD:2 16.5
 (byte*) init_screen::c#2 c zp ZP_WORD:2 16.5
 (void()) main()
+(label) main::@1
 (label) main::@2
 (label) main::@3
-(label) main::@5
-(label) main::@7
+(label) main::@4
 (void()) plot((byte) plot::x , (byte) plot::y)
 (byte~) plot::$5 reg byte a 4.0
 (byte~) plot::$6 reg byte a 4.0
@@ -1963,7 +1974,7 @@ FINAL SYMBOL TABLE
 (const byte[$100]) plot_ylo#0 plot_ylo = { fill( $100, 0) }
 (void()) plots()
 (label) plots::@1
-(label) plots::@3
+(label) plots::@2
 (label) plots::@return
 (byte) plots::i
 (byte) plots::i#1 reg byte x 151.5
@@ -2016,10 +2027,10 @@ Score: 6181
   .label BITMAP = $2000
   .const plots_cnt = 8
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-//SEG5 @5
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @5 to @end [phi:@5->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -2037,35 +2048,35 @@ main: {
   //SEG14 [8] call init_screen 
   //SEG15 [61] phi from main to init_screen [phi:main->init_screen]
     jsr init_screen
-  //SEG16 [9] phi from main to main::@5 [phi:main->main::@5]
-  //SEG17 main::@5
+  //SEG16 [9] phi from main to main::@3 [phi:main->main::@3]
+  //SEG17 main::@3
   //SEG18 [10] call init_plot_tables 
-  //SEG19 [35] phi from main::@5 to init_plot_tables [phi:main::@5->init_plot_tables]
+  //SEG19 [35] phi from main::@3 to init_plot_tables [phi:main::@3->init_plot_tables]
     jsr init_plot_tables
-  //SEG20 main::@2
-  b2:
-  //SEG21 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG20 main::@1
+  b1:
+  //SEG21 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b2
-  //SEG22 main::@3
+    bne b1
+  //SEG22 main::@2
   //SEG23 [12] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
   //SEG24 [13] call plots 
-  //SEG25 [15] phi from main::@3 to plots [phi:main::@3->plots]
+  //SEG25 [15] phi from main::@2 to plots [phi:main::@2->plots]
     jsr plots
-  //SEG26 main::@7
+  //SEG26 main::@4
   //SEG27 [14] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BGCOL
-    jmp b2
+    jmp b1
 }
 //SEG28 plots
 plots: {
   //SEG29 [16] phi from plots to plots::@1 [phi:plots->plots::@1]
   //SEG30 [16] phi (byte) plots::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:plots->plots::@1#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG31 [16] phi from plots::@3 to plots::@1 [phi:plots::@3->plots::@1]
-  //SEG32 [16] phi (byte) plots::i#2 = (byte) plots::i#1 [phi:plots::@3->plots::@1#0] -- register_copy 
+  //SEG31 [16] phi from plots::@2 to plots::@1 [phi:plots::@2->plots::@1]
+  //SEG32 [16] phi (byte) plots::i#2 = (byte) plots::i#1 [phi:plots::@2->plots::@1#0] -- register_copy 
   //SEG33 plots::@1
   b1:
   //SEG34 [17] (byte) plot::x#0 ← *((const byte[]) plots_x#0 + (byte) plots::i#2) -- vbuz1=pbuc1_derefidx_vbuxx 
@@ -2076,7 +2087,7 @@ plots: {
     sta plot.y
   //SEG36 [19] call plot 
     jsr plot
-  //SEG37 plots::@3
+  //SEG37 plots::@2
   //SEG38 [20] (byte) plots::i#1 ← ++ (byte) plots::i#2 -- vbuxx=_inc_vbuxx 
     inx
   //SEG39 [21] if((byte) plots::i#1<(const byte) plots_cnt#0) goto plots::@1 -- vbuxx_lt_vbuc1_then_la1 
@@ -2165,7 +2176,7 @@ init_plot_tables: {
     tya
     lsr
     tay
-  //SEG69 [42] if((byte) init_plot_tables::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@10 -- vbuyy_neq_0_then_la1 
+  //SEG69 [42] if((byte) init_plot_tables::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@6 -- vbuyy_neq_0_then_la1 
     cpy #0
     bne b2
   //SEG70 [43] phi from init_plot_tables::@1 to init_plot_tables::@2 [phi:init_plot_tables::@1->init_plot_tables::@2]
@@ -2178,18 +2189,18 @@ init_plot_tables: {
   //SEG74 [45] if((byte) init_plot_tables::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1
-  //SEG75 [46] phi from init_plot_tables::@2 to init_plot_tables::@5 [phi:init_plot_tables::@2->init_plot_tables::@5]
-  //SEG76 [46] phi (byte*) init_plot_tables::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@5#0] -- pbuz1=pbuc1 
+  //SEG75 [46] phi from init_plot_tables::@2 to init_plot_tables::@3 [phi:init_plot_tables::@2->init_plot_tables::@3]
+  //SEG76 [46] phi (byte*) init_plot_tables::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     sta yoffs+1
-  //SEG77 [46] phi (byte) init_plot_tables::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@5#1] -- vbuxx=vbuc1 
+  //SEG77 [46] phi (byte) init_plot_tables::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_plot_tables::@2->init_plot_tables::@3#1] -- vbuxx=vbuc1 
     tax
-  //SEG78 [46] phi from init_plot_tables::@6 to init_plot_tables::@5 [phi:init_plot_tables::@6->init_plot_tables::@5]
-  //SEG79 [46] phi (byte*) init_plot_tables::yoffs#2 = (byte*) init_plot_tables::yoffs#4 [phi:init_plot_tables::@6->init_plot_tables::@5#0] -- register_copy 
-  //SEG80 [46] phi (byte) init_plot_tables::y#2 = (byte) init_plot_tables::y#1 [phi:init_plot_tables::@6->init_plot_tables::@5#1] -- register_copy 
-  //SEG81 init_plot_tables::@5
-  b5:
+  //SEG78 [46] phi from init_plot_tables::@4 to init_plot_tables::@3 [phi:init_plot_tables::@4->init_plot_tables::@3]
+  //SEG79 [46] phi (byte*) init_plot_tables::yoffs#2 = (byte*) init_plot_tables::yoffs#4 [phi:init_plot_tables::@4->init_plot_tables::@3#0] -- register_copy 
+  //SEG80 [46] phi (byte) init_plot_tables::y#2 = (byte) init_plot_tables::y#1 [phi:init_plot_tables::@4->init_plot_tables::@3#1] -- register_copy 
+  //SEG81 init_plot_tables::@3
+  b3:
   //SEG82 [47] (byte~) init_plot_tables::$6 ← (byte) init_plot_tables::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _6
@@ -2206,10 +2217,10 @@ init_plot_tables: {
   //SEG88 [53] (byte~) init_plot_tables::$10 ← (byte) init_plot_tables::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG89 [54] if((byte~) init_plot_tables::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto init_plot_tables::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG89 [54] if((byte~) init_plot_tables::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto init_plot_tables::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6
-  //SEG90 init_plot_tables::@7
+    bne b4
+  //SEG90 init_plot_tables::@5
   //SEG91 [55] (byte*) init_plot_tables::yoffs#1 ← (byte*) init_plot_tables::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -2218,22 +2229,22 @@ init_plot_tables: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG92 [56] phi from init_plot_tables::@5 init_plot_tables::@7 to init_plot_tables::@6 [phi:init_plot_tables::@5/init_plot_tables::@7->init_plot_tables::@6]
-  //SEG93 [56] phi (byte*) init_plot_tables::yoffs#4 = (byte*) init_plot_tables::yoffs#2 [phi:init_plot_tables::@5/init_plot_tables::@7->init_plot_tables::@6#0] -- register_copy 
-  //SEG94 init_plot_tables::@6
-  b6:
+  //SEG92 [56] phi from init_plot_tables::@3 init_plot_tables::@5 to init_plot_tables::@4 [phi:init_plot_tables::@3/init_plot_tables::@5->init_plot_tables::@4]
+  //SEG93 [56] phi (byte*) init_plot_tables::yoffs#4 = (byte*) init_plot_tables::yoffs#2 [phi:init_plot_tables::@3/init_plot_tables::@5->init_plot_tables::@4#0] -- register_copy 
+  //SEG94 init_plot_tables::@4
+  b4:
   //SEG95 [57] (byte) init_plot_tables::y#1 ← ++ (byte) init_plot_tables::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG96 [58] if((byte) init_plot_tables::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@5 -- vbuxx_neq_0_then_la1 
+  //SEG96 [58] if((byte) init_plot_tables::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto init_plot_tables::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5
+    bne b3
   //SEG97 init_plot_tables::@return
   //SEG98 [59] return 
     rts
-  //SEG99 [60] phi from init_plot_tables::@1 to init_plot_tables::@10 [phi:init_plot_tables::@1->init_plot_tables::@10]
-  //SEG100 init_plot_tables::@10
-  //SEG101 [43] phi from init_plot_tables::@10 to init_plot_tables::@2 [phi:init_plot_tables::@10->init_plot_tables::@2]
-  //SEG102 [43] phi (byte) init_plot_tables::bits#4 = (byte) init_plot_tables::bits#1 [phi:init_plot_tables::@10->init_plot_tables::@2#0] -- register_copy 
+  //SEG99 [60] phi from init_plot_tables::@1 to init_plot_tables::@6 [phi:init_plot_tables::@1->init_plot_tables::@6]
+  //SEG100 init_plot_tables::@6
+  //SEG101 [43] phi from init_plot_tables::@6 to init_plot_tables::@2 [phi:init_plot_tables::@6->init_plot_tables::@2]
+  //SEG102 [43] phi (byte) init_plot_tables::bits#4 = (byte) init_plot_tables::bits#1 [phi:init_plot_tables::@6->init_plot_tables::@2#0] -- register_copy 
 }
 //SEG103 init_screen
 init_screen: {
@@ -2265,16 +2276,16 @@ init_screen: {
     lda b
     cmp #<BITMAP+$2000
     bne b1
-  //SEG112 [66] phi from init_screen::@1 to init_screen::@3 [phi:init_screen::@1->init_screen::@3]
-  //SEG113 [66] phi (byte*) init_screen::c#2 = (const byte*) SCREEN#0 [phi:init_screen::@1->init_screen::@3#0] -- pbuz1=pbuc1 
+  //SEG112 [66] phi from init_screen::@1 to init_screen::@2 [phi:init_screen::@1->init_screen::@2]
+  //SEG113 [66] phi (byte*) init_screen::c#2 = (const byte*) SCREEN#0 [phi:init_screen::@1->init_screen::@2#0] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta c
     lda #>SCREEN
     sta c+1
-  //SEG114 [66] phi from init_screen::@3 to init_screen::@3 [phi:init_screen::@3->init_screen::@3]
-  //SEG115 [66] phi (byte*) init_screen::c#2 = (byte*) init_screen::c#1 [phi:init_screen::@3->init_screen::@3#0] -- register_copy 
-  //SEG116 init_screen::@3
-  b3:
+  //SEG114 [66] phi from init_screen::@2 to init_screen::@2 [phi:init_screen::@2->init_screen::@2]
+  //SEG115 [66] phi (byte*) init_screen::c#2 = (byte*) init_screen::c#1 [phi:init_screen::@2->init_screen::@2#0] -- register_copy 
+  //SEG116 init_screen::@2
+  b2:
   //SEG117 [67] *((byte*) init_screen::c#2) ← (byte/signed byte/word/signed word/dword/signed dword) $14 -- _deref_pbuz1=vbuc1 
     lda #$14
     ldy #0
@@ -2284,13 +2295,13 @@ init_screen: {
     bne !+
     inc c+1
   !:
-  //SEG119 [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@3 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG119 [69] if((byte*) init_screen::c#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $400) goto init_screen::@2 -- pbuz1_neq_pbuc1_then_la1 
     lda c+1
     cmp #>SCREEN+$400
-    bne b3
+    bne b2
     lda c
     cmp #<SCREEN+$400
-    bne b3
+    bne b2
   //SEG120 init_screen::@return
   //SEG121 [70] return 
     rts
diff --git a/src/test/ref/bitmap-plotter.sym b/src/test/ref/bitmap-plotter.sym
index f556a0271..87ca6449d 100644
--- a/src/test/ref/bitmap-plotter.sym
+++ b/src/test/ref/bitmap-plotter.sym
@@ -1,4 +1,4 @@
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -35,11 +35,11 @@
 (byte~) init_plot_tables::$8 reg byte a 22.0
 (byte~) init_plot_tables::$9 reg byte a 22.0
 (label) init_plot_tables::@1
-(label) init_plot_tables::@10
 (label) init_plot_tables::@2
+(label) init_plot_tables::@3
+(label) init_plot_tables::@4
 (label) init_plot_tables::@5
 (label) init_plot_tables::@6
-(label) init_plot_tables::@7
 (label) init_plot_tables::@return
 (byte) init_plot_tables::bits
 (byte) init_plot_tables::bits#1 reg byte y 11.0
@@ -57,7 +57,7 @@
 (byte*) init_plot_tables::yoffs#4 yoffs zp ZP_WORD:2 11.0
 (void()) init_screen()
 (label) init_screen::@1
-(label) init_screen::@3
+(label) init_screen::@2
 (label) init_screen::@return
 (byte*) init_screen::b
 (byte*) init_screen::b#1 b zp ZP_WORD:2 16.5
@@ -66,10 +66,10 @@
 (byte*) init_screen::c#1 c zp ZP_WORD:2 16.5
 (byte*) init_screen::c#2 c zp ZP_WORD:2 16.5
 (void()) main()
+(label) main::@1
 (label) main::@2
 (label) main::@3
-(label) main::@5
-(label) main::@7
+(label) main::@4
 (void()) plot((byte) plot::x , (byte) plot::y)
 (byte~) plot::$5 reg byte a 4.0
 (byte~) plot::$6 reg byte a 4.0
@@ -101,7 +101,7 @@
 (const byte[$100]) plot_ylo#0 plot_ylo = { fill( $100, 0) }
 (void()) plots()
 (label) plots::@1
-(label) plots::@3
+(label) plots::@2
 (label) plots::@return
 (byte) plots::i
 (byte) plots::i#1 reg byte x 151.5
diff --git a/src/test/ref/bool-const.cfg b/src/test/ref/bool-const.cfg
index d99db6c59..5982f328e 100644
--- a/src/test/ref/bool-const.cfg
+++ b/src/test/ref/bool-const.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @4
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @4
+main: scope:[main]  from @1
   [4] phi()
   [5] call bool_const_if 
   to:main::@1
@@ -33,11 +33,11 @@ bool_const_inline::@return: scope:[bool_const_inline]  from bool_const_inline::@
   to:@return
 bool_const_vars: scope:[bool_const_vars]  from main::@1
   [14] phi()
-  to:bool_const_vars::@3
-bool_const_vars::@3: scope:[bool_const_vars]  from bool_const_vars
+  to:bool_const_vars::@1
+bool_const_vars::@1: scope:[bool_const_vars]  from bool_const_vars
   [15] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) 'f'
   to:bool_const_vars::@return
-bool_const_vars::@return: scope:[bool_const_vars]  from bool_const_vars::@3
+bool_const_vars::@return: scope:[bool_const_vars]  from bool_const_vars::@1
   [16] return 
   to:@return
 bool_const_if: scope:[bool_const_if]  from main
diff --git a/src/test/ref/bool-const.log b/src/test/ref/bool-const.log
index eecc7b58f..d7fa4ee46 100644
--- a/src/test/ref/bool-const.log
+++ b/src/test/ref/bool-const.log
@@ -236,8 +236,10 @@ Calls in [main] to bool_const_if:5 bool_const_vars:7 bool_const_inline:9
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @4 to @1
+Renumbering block bool_const_vars::@3 to bool_const_vars::@1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @4
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -249,14 +251,14 @@ Adding NOP phi() at start of bool_const_if
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @4
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @4
+main: scope:[main]  from @1
   [4] phi()
   [5] call bool_const_if 
   to:main::@1
@@ -282,11 +284,11 @@ bool_const_inline::@return: scope:[bool_const_inline]  from bool_const_inline::@
   to:@return
 bool_const_vars: scope:[bool_const_vars]  from main::@1
   [14] phi()
-  to:bool_const_vars::@3
-bool_const_vars::@3: scope:[bool_const_vars]  from bool_const_vars
+  to:bool_const_vars::@1
+bool_const_vars::@1: scope:[bool_const_vars]  from bool_const_vars
   [15] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) 'f'
   to:bool_const_vars::@return
-bool_const_vars::@return: scope:[bool_const_vars]  from bool_const_vars::@3
+bool_const_vars::@return: scope:[bool_const_vars]  from bool_const_vars::@1
   [16] return 
   to:@return
 bool_const_if: scope:[bool_const_if]  from main
@@ -327,17 +329,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-b4_from_bbegin:
-  jmp b4
-//SEG5 @4
-b4:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @4 to main [phi:@4->main]
-main_from_b4:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @4 to @end [phi:@4->@end]
-bend_from_b4:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -389,9 +391,9 @@ bool_const_inline: {
 //SEG28 bool_const_vars
 // A bunch of constant boolean vars (used in an if)
 bool_const_vars: {
-    jmp b3
-  //SEG29 bool_const_vars::@3
-  b3:
+    jmp b1
+  //SEG29 bool_const_vars::@1
+  b1:
   //SEG30 [15] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) 'f' -- _deref_pbuc1=vbuc2 
     lda #'f'
     sta SCREEN+1
@@ -446,17 +448,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-b4_from_bbegin:
-  jmp b4
-//SEG5 @4
-b4:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @4 to main [phi:@4->main]
-main_from_b4:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @4 to @end [phi:@4->@end]
-bend_from_b4:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -508,9 +510,9 @@ bool_const_inline: {
 //SEG28 bool_const_vars
 // A bunch of constant boolean vars (used in an if)
 bool_const_vars: {
-    jmp b3
-  //SEG29 bool_const_vars::@3
-  b3:
+    jmp b1
+  //SEG29 bool_const_vars::@1
+  b1:
   //SEG30 [15] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) 'f' -- _deref_pbuc1=vbuc2 
     lda #'f'
     sta SCREEN+1
@@ -537,22 +539,22 @@ bool_const_if: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b4
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b4_from_bbegin:
-Removing instruction b4:
-Removing instruction main_from_b4:
-Removing instruction bend_from_b4:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction bool_const_vars_from_b1:
 Removing instruction b2_from_b1:
@@ -565,7 +567,7 @@ Removing instruction b2:
 Removing instruction breturn:
 Removing instruction b1:
 Removing instruction breturn:
-Removing instruction b3:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction b1:
 Removing instruction breturn:
@@ -577,7 +579,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @4
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -591,7 +593,7 @@ FINAL SYMBOL TABLE
 (label) bool_const_inline::@return
 (byte) bool_const_inline::a
 (void()) bool_const_vars()
-(label) bool_const_vars::@3
+(label) bool_const_vars::@1
 (label) bool_const_vars::@return
 (byte) bool_const_vars::a
 (bool) bool_const_vars::b
@@ -616,11 +618,11 @@ Score: 60
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-//SEG5 @4
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @4 to main [phi:@4->main]
-//SEG8 [3] phi from @4 to @end [phi:@4->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -655,7 +657,7 @@ bool_const_inline: {
 //SEG28 bool_const_vars
 // A bunch of constant boolean vars (used in an if)
 bool_const_vars: {
-  //SEG29 bool_const_vars::@3
+  //SEG29 bool_const_vars::@1
   //SEG30 [15] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) 'f' -- _deref_pbuc1=vbuc2 
     lda #'f'
     sta SCREEN+1
diff --git a/src/test/ref/bool-const.sym b/src/test/ref/bool-const.sym
index 5128d4f47..01e6b90db 100644
--- a/src/test/ref/bool-const.sym
+++ b/src/test/ref/bool-const.sym
@@ -1,4 +1,4 @@
-(label) @4
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -12,7 +12,7 @@
 (label) bool_const_inline::@return
 (byte) bool_const_inline::a
 (void()) bool_const_vars()
-(label) bool_const_vars::@3
+(label) bool_const_vars::@1
 (label) bool_const_vars::@return
 (byte) bool_const_vars::a
 (bool) bool_const_vars::b
diff --git a/src/test/ref/bool-function.cfg b/src/test/ref/bool-function.cfg
index 22e24a7c8..a1e973273 100644
--- a/src/test/ref/bool-function.cfg
+++ b/src/test/ref/bool-function.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@3
@@ -17,12 +17,12 @@ main::@1: scope:[main]  from main main::@3
   [8] (byte) isSet::i#0 ← (byte) main::i#2
   [9] call isSet 
   [10] (bool) isSet::return#0 ← (bool) isSet::return#1
-  to:main::@7
-main::@7: scope:[main]  from main::@1
+  to:main::@5
+main::@5: scope:[main]  from main::@1
   [11] (bool~) main::$2 ← (bool) isSet::return#0
   [12] if((bool~) main::$2) goto main::@2
   to:main::@4
-main::@4: scope:[main]  from main::@7
+main::@4: scope:[main]  from main::@5
   [13] *((const byte*) main::screen#0 + (byte) main::i#2) ← (byte) ' '
   to:main::@3
 main::@3: scope:[main]  from main::@2 main::@4
@@ -32,7 +32,7 @@ main::@3: scope:[main]  from main::@2 main::@4
 main::@return: scope:[main]  from main::@3
   [16] return 
   to:@return
-main::@2: scope:[main]  from main::@7
+main::@2: scope:[main]  from main::@5
   [17] *((const byte*) main::screen#0 + (byte) main::i#2) ← (byte) '*'
   to:main::@3
 isSet: scope:[isSet]  from main::@1
diff --git a/src/test/ref/bool-function.log b/src/test/ref/bool-function.log
index 7ad9e9913..2e3bc63d7 100644
--- a/src/test/ref/bool-function.log
+++ b/src/test/ref/bool-function.log
@@ -138,22 +138,24 @@ Created 1 initial phi equivalence classes
 Coalesced [17] main::i#7 ← main::i#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) main::@8
+Renumbering block @2 to @1
+Renumbering block main::@7 to main::@5
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@3
@@ -163,12 +165,12 @@ main::@1: scope:[main]  from main main::@3
   [8] (byte) isSet::i#0 ← (byte) main::i#2
   [9] call isSet 
   [10] (bool) isSet::return#0 ← (bool) isSet::return#1
-  to:main::@7
-main::@7: scope:[main]  from main::@1
+  to:main::@5
+main::@5: scope:[main]  from main::@1
   [11] (bool~) main::$2 ← (bool) isSet::return#0
   [12] if((bool~) main::$2) goto main::@2
   to:main::@4
-main::@4: scope:[main]  from main::@7
+main::@4: scope:[main]  from main::@5
   [13] *((const byte*) main::screen#0 + (byte) main::i#2) ← (byte) ' '
   to:main::@3
 main::@3: scope:[main]  from main::@2 main::@4
@@ -178,7 +180,7 @@ main::@3: scope:[main]  from main::@2 main::@4
 main::@return: scope:[main]  from main::@3
   [16] return 
   to:@return
-main::@2: scope:[main]  from main::@7
+main::@2: scope:[main]  from main::@5
   [17] *((const byte*) main::screen#0 + (byte) main::i#2) ← (byte) '*'
   to:main::@3
 isSet: scope:[isSet]  from main::@1
@@ -250,17 +252,17 @@ INITIAL ASM
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -302,9 +304,9 @@ main: {
   //SEG20 [10] (bool) isSet::return#0 ← (bool) isSet::return#1 -- vboz1=vboz2 
     lda isSet.return_1
     sta isSet.return
-    jmp b7
-  //SEG21 main::@7
-  b7:
+    jmp b5
+  //SEG21 main::@5
+  b5:
   //SEG22 [11] (bool~) main::$2 ← (bool) isSet::return#0 -- vboz1=vboz2 
     lda isSet.return
     sta _2
@@ -419,17 +421,17 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -461,9 +463,9 @@ main: {
   //SEG19 [9] call isSet 
     jsr isSet
   //SEG20 [10] (bool) isSet::return#0 ← (bool) isSet::return#1
-    jmp b7
-  //SEG21 main::@7
-  b7:
+    jmp b5
+  //SEG21 main::@5
+  b5:
   //SEG22 [11] (bool~) main::$2 ← (bool) isSet::return#0
   //SEG23 [12] if((bool~) main::$2) goto main::@2 -- vboaa_then_la1 
     cmp #0
@@ -518,25 +520,25 @@ isSet: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b7
+Removing instruction jmp b5
 Removing instruction jmp b4
 Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b3 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b3:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b7:
+Removing instruction b5:
 Removing instruction b4:
 Removing instruction breturn:
 Removing instruction breturn:
@@ -550,7 +552,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (bool()) isSet((byte) isSet::i , (bool) isSet::b)
@@ -571,7 +573,7 @@ FINAL SYMBOL TABLE
 (label) main::@2
 (label) main::@3
 (label) main::@4
-(label) main::@7
+(label) main::@5
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
@@ -601,11 +603,11 @@ Score: 540
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -631,7 +633,7 @@ main: {
   //SEG19 [9] call isSet 
     jsr isSet
   //SEG20 [10] (bool) isSet::return#0 ← (bool) isSet::return#1
-  //SEG21 main::@7
+  //SEG21 main::@5
   //SEG22 [11] (bool~) main::$2 ← (bool) isSet::return#0
   //SEG23 [12] if((bool~) main::$2) goto main::@2 -- vboaa_then_la1 
     cmp #0
diff --git a/src/test/ref/bool-function.sym b/src/test/ref/bool-function.sym
index 224553dba..b1c710519 100644
--- a/src/test/ref/bool-function.sym
+++ b/src/test/ref/bool-function.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (bool()) isSet((byte) isSet::i , (bool) isSet::b)
@@ -19,7 +19,7 @@
 (label) main::@2
 (label) main::@3
 (label) main::@4
-(label) main::@7
+(label) main::@5
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
diff --git a/src/test/ref/bool-ifs.asm b/src/test/ref/bool-ifs.asm
index 286ce827e..c5dacee64 100644
--- a/src/test/ref/bool-ifs.asm
+++ b/src/test/ref/bool-ifs.asm
@@ -19,8 +19,8 @@ bool_complex: {
     tya
     and #1
     cpy #$a
-    bcc b8
-  b7:
+    bcc b6
+  b5:
     cpy #$a
     bcc b4
     cmp #0
@@ -37,10 +37,10 @@ bool_complex: {
     lda #' '
     sta screen,y
     jmp b3
-  b8:
+  b6:
     cpx #0
     beq b2
-    jmp b7
+    jmp b5
 }
 bool_not: {
     .label screen = $450
@@ -93,7 +93,7 @@ bool_and: {
     txa
     and #1
     cpx #$a
-    bcc b7
+    bcc b5
   b4:
     lda #' '
     sta screen,x
@@ -102,7 +102,7 @@ bool_and: {
     cpx #$15
     bne b1
     rts
-  b7:
+  b5:
     cmp #0
     beq b2
     jmp b4
diff --git a/src/test/ref/bool-ifs.cfg b/src/test/ref/bool-ifs.cfg
index eb4ccaa69..58b164eee 100644
--- a/src/test/ref/bool-ifs.cfg
+++ b/src/test/ref/bool-ifs.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] phi()
   [5] call bool_and 
   to:main::@1
@@ -33,15 +33,15 @@ bool_complex::@1: scope:[bool_complex]  from bool_complex bool_complex::@3
   [14] (byte) bool_complex::i#2 ← phi( bool_complex/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_complex::@3/(byte) bool_complex::i#1 )
   [15] (byte~) bool_complex::$1 ← (byte) bool_complex::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [16] (byte~) bool_complex::$5 ← (byte) bool_complex::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [17] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@8
-  to:bool_complex::@7
-bool_complex::@7: scope:[bool_complex]  from bool_complex::@1 bool_complex::@8
+  [17] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@6
+  to:bool_complex::@5
+bool_complex::@5: scope:[bool_complex]  from bool_complex::@1 bool_complex::@6
   [18] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@4
-  to:bool_complex::@9
-bool_complex::@9: scope:[bool_complex]  from bool_complex::@7
+  to:bool_complex::@7
+bool_complex::@7: scope:[bool_complex]  from bool_complex::@5
   [19] if((byte~) bool_complex::$5==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_complex::@4
   to:bool_complex::@2
-bool_complex::@2: scope:[bool_complex]  from bool_complex::@8 bool_complex::@9
+bool_complex::@2: scope:[bool_complex]  from bool_complex::@6 bool_complex::@7
   [20] *((const byte*) bool_complex::screen#0 + (byte) bool_complex::i#2) ← (byte) '*'
   to:bool_complex::@3
 bool_complex::@3: scope:[bool_complex]  from bool_complex::@2 bool_complex::@4
@@ -51,12 +51,12 @@ bool_complex::@3: scope:[bool_complex]  from bool_complex::@2 bool_complex::@4
 bool_complex::@return: scope:[bool_complex]  from bool_complex::@3
   [23] return 
   to:@return
-bool_complex::@4: scope:[bool_complex]  from bool_complex::@7 bool_complex::@9
+bool_complex::@4: scope:[bool_complex]  from bool_complex::@5 bool_complex::@7
   [24] *((const byte*) bool_complex::screen#0 + (byte) bool_complex::i#2) ← (byte) ' '
   to:bool_complex::@3
-bool_complex::@8: scope:[bool_complex]  from bool_complex::@1
+bool_complex::@6: scope:[bool_complex]  from bool_complex::@1
   [25] if((byte~) bool_complex::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_complex::@2
-  to:bool_complex::@7
+  to:bool_complex::@5
 bool_not: scope:[bool_not]  from main::@2
   [26] phi()
   to:bool_not::@1
@@ -64,11 +64,11 @@ bool_not::@1: scope:[bool_not]  from bool_not bool_not::@3
   [27] (byte) bool_not::i#2 ← phi( bool_not/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_not::@3/(byte) bool_not::i#1 )
   [28] (byte~) bool_not::$1 ← (byte) bool_not::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [29] if((byte) bool_not::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_not::@4
-  to:bool_not::@7
-bool_not::@7: scope:[bool_not]  from bool_not::@1
+  to:bool_not::@5
+bool_not::@5: scope:[bool_not]  from bool_not::@1
   [30] if((byte~) bool_not::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_not::@4
   to:bool_not::@2
-bool_not::@2: scope:[bool_not]  from bool_not::@7
+bool_not::@2: scope:[bool_not]  from bool_not::@5
   [31] *((const byte*) bool_not::screen#0 + (byte) bool_not::i#2) ← (byte) '*'
   to:bool_not::@3
 bool_not::@3: scope:[bool_not]  from bool_not::@2 bool_not::@4
@@ -78,7 +78,7 @@ bool_not::@3: scope:[bool_not]  from bool_not::@2 bool_not::@4
 bool_not::@return: scope:[bool_not]  from bool_not::@3
   [34] return 
   to:@return
-bool_not::@4: scope:[bool_not]  from bool_not::@1 bool_not::@7
+bool_not::@4: scope:[bool_not]  from bool_not::@1 bool_not::@5
   [35] *((const byte*) bool_not::screen#0 + (byte) bool_not::i#2) ← (byte) ' '
   to:bool_not::@3
 bool_or: scope:[bool_or]  from main::@1
@@ -88,11 +88,11 @@ bool_or::@1: scope:[bool_or]  from bool_or bool_or::@3
   [37] (byte) bool_or::i#2 ← phi( bool_or/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_or::@3/(byte) bool_or::i#1 )
   [38] (byte~) bool_or::$1 ← (byte) bool_or::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [39] if((byte) bool_or::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_or::@2
-  to:bool_or::@7
-bool_or::@7: scope:[bool_or]  from bool_or::@1
+  to:bool_or::@5
+bool_or::@5: scope:[bool_or]  from bool_or::@1
   [40] if((byte~) bool_or::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_or::@2
   to:bool_or::@4
-bool_or::@4: scope:[bool_or]  from bool_or::@7
+bool_or::@4: scope:[bool_or]  from bool_or::@5
   [41] *((const byte*) bool_or::screen#0 + (byte) bool_or::i#2) ← (byte) ' '
   to:bool_or::@3
 bool_or::@3: scope:[bool_or]  from bool_or::@2 bool_or::@4
@@ -102,7 +102,7 @@ bool_or::@3: scope:[bool_or]  from bool_or::@2 bool_or::@4
 bool_or::@return: scope:[bool_or]  from bool_or::@3
   [44] return 
   to:@return
-bool_or::@2: scope:[bool_or]  from bool_or::@1 bool_or::@7
+bool_or::@2: scope:[bool_or]  from bool_or::@1 bool_or::@5
   [45] *((const byte*) bool_or::screen#0 + (byte) bool_or::i#2) ← (byte) '*'
   to:bool_or::@3
 bool_and: scope:[bool_and]  from main
@@ -111,9 +111,9 @@ bool_and: scope:[bool_and]  from main
 bool_and::@1: scope:[bool_and]  from bool_and bool_and::@3
   [47] (byte) bool_and::i#2 ← phi( bool_and/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_and::@3/(byte) bool_and::i#1 )
   [48] (byte~) bool_and::$1 ← (byte) bool_and::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [49] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@7
+  [49] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@5
   to:bool_and::@4
-bool_and::@4: scope:[bool_and]  from bool_and::@1 bool_and::@7
+bool_and::@4: scope:[bool_and]  from bool_and::@1 bool_and::@5
   [50] *((const byte*) bool_and::screen#0 + (byte) bool_and::i#2) ← (byte) ' '
   to:bool_and::@3
 bool_and::@3: scope:[bool_and]  from bool_and::@2 bool_and::@4
@@ -123,9 +123,9 @@ bool_and::@3: scope:[bool_and]  from bool_and::@2 bool_and::@4
 bool_and::@return: scope:[bool_and]  from bool_and::@3
   [53] return 
   to:@return
-bool_and::@7: scope:[bool_and]  from bool_and::@1
+bool_and::@5: scope:[bool_and]  from bool_and::@1
   [54] if((byte~) bool_and::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_and::@2
   to:bool_and::@4
-bool_and::@2: scope:[bool_and]  from bool_and::@7
+bool_and::@2: scope:[bool_and]  from bool_and::@5
   [55] *((const byte*) bool_and::screen#0 + (byte) bool_and::i#2) ← (byte) '*'
   to:bool_and::@3
diff --git a/src/test/ref/bool-ifs.log b/src/test/ref/bool-ifs.log
index 2e8e477b5..8b8b02031 100644
--- a/src/test/ref/bool-ifs.log
+++ b/src/test/ref/bool-ifs.log
@@ -348,8 +348,15 @@ Culled Empty Block (label) bool_complex::@10
 Culled Empty Block (label) bool_not::@8
 Culled Empty Block (label) bool_or::@8
 Culled Empty Block (label) bool_and::@8
+Renumbering block @5 to @1
+Renumbering block bool_and::@7 to bool_and::@5
+Renumbering block bool_or::@7 to bool_or::@5
+Renumbering block bool_not::@7 to bool_not::@5
+Renumbering block bool_complex::@7 to bool_complex::@5
+Renumbering block bool_complex::@8 to bool_complex::@6
+Renumbering block bool_complex::@9 to bool_complex::@7
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @5
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -363,14 +370,14 @@ Adding NOP phi() at start of bool_and
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] phi()
   [5] call bool_and 
   to:main::@1
@@ -396,15 +403,15 @@ bool_complex::@1: scope:[bool_complex]  from bool_complex bool_complex::@3
   [14] (byte) bool_complex::i#2 ← phi( bool_complex/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_complex::@3/(byte) bool_complex::i#1 )
   [15] (byte~) bool_complex::$1 ← (byte) bool_complex::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [16] (byte~) bool_complex::$5 ← (byte) bool_complex::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [17] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@8
-  to:bool_complex::@7
-bool_complex::@7: scope:[bool_complex]  from bool_complex::@1 bool_complex::@8
+  [17] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@6
+  to:bool_complex::@5
+bool_complex::@5: scope:[bool_complex]  from bool_complex::@1 bool_complex::@6
   [18] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@4
-  to:bool_complex::@9
-bool_complex::@9: scope:[bool_complex]  from bool_complex::@7
+  to:bool_complex::@7
+bool_complex::@7: scope:[bool_complex]  from bool_complex::@5
   [19] if((byte~) bool_complex::$5==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_complex::@4
   to:bool_complex::@2
-bool_complex::@2: scope:[bool_complex]  from bool_complex::@8 bool_complex::@9
+bool_complex::@2: scope:[bool_complex]  from bool_complex::@6 bool_complex::@7
   [20] *((const byte*) bool_complex::screen#0 + (byte) bool_complex::i#2) ← (byte) '*'
   to:bool_complex::@3
 bool_complex::@3: scope:[bool_complex]  from bool_complex::@2 bool_complex::@4
@@ -414,12 +421,12 @@ bool_complex::@3: scope:[bool_complex]  from bool_complex::@2 bool_complex::@4
 bool_complex::@return: scope:[bool_complex]  from bool_complex::@3
   [23] return 
   to:@return
-bool_complex::@4: scope:[bool_complex]  from bool_complex::@7 bool_complex::@9
+bool_complex::@4: scope:[bool_complex]  from bool_complex::@5 bool_complex::@7
   [24] *((const byte*) bool_complex::screen#0 + (byte) bool_complex::i#2) ← (byte) ' '
   to:bool_complex::@3
-bool_complex::@8: scope:[bool_complex]  from bool_complex::@1
+bool_complex::@6: scope:[bool_complex]  from bool_complex::@1
   [25] if((byte~) bool_complex::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_complex::@2
-  to:bool_complex::@7
+  to:bool_complex::@5
 bool_not: scope:[bool_not]  from main::@2
   [26] phi()
   to:bool_not::@1
@@ -427,11 +434,11 @@ bool_not::@1: scope:[bool_not]  from bool_not bool_not::@3
   [27] (byte) bool_not::i#2 ← phi( bool_not/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_not::@3/(byte) bool_not::i#1 )
   [28] (byte~) bool_not::$1 ← (byte) bool_not::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [29] if((byte) bool_not::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_not::@4
-  to:bool_not::@7
-bool_not::@7: scope:[bool_not]  from bool_not::@1
+  to:bool_not::@5
+bool_not::@5: scope:[bool_not]  from bool_not::@1
   [30] if((byte~) bool_not::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_not::@4
   to:bool_not::@2
-bool_not::@2: scope:[bool_not]  from bool_not::@7
+bool_not::@2: scope:[bool_not]  from bool_not::@5
   [31] *((const byte*) bool_not::screen#0 + (byte) bool_not::i#2) ← (byte) '*'
   to:bool_not::@3
 bool_not::@3: scope:[bool_not]  from bool_not::@2 bool_not::@4
@@ -441,7 +448,7 @@ bool_not::@3: scope:[bool_not]  from bool_not::@2 bool_not::@4
 bool_not::@return: scope:[bool_not]  from bool_not::@3
   [34] return 
   to:@return
-bool_not::@4: scope:[bool_not]  from bool_not::@1 bool_not::@7
+bool_not::@4: scope:[bool_not]  from bool_not::@1 bool_not::@5
   [35] *((const byte*) bool_not::screen#0 + (byte) bool_not::i#2) ← (byte) ' '
   to:bool_not::@3
 bool_or: scope:[bool_or]  from main::@1
@@ -451,11 +458,11 @@ bool_or::@1: scope:[bool_or]  from bool_or bool_or::@3
   [37] (byte) bool_or::i#2 ← phi( bool_or/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_or::@3/(byte) bool_or::i#1 )
   [38] (byte~) bool_or::$1 ← (byte) bool_or::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [39] if((byte) bool_or::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_or::@2
-  to:bool_or::@7
-bool_or::@7: scope:[bool_or]  from bool_or::@1
+  to:bool_or::@5
+bool_or::@5: scope:[bool_or]  from bool_or::@1
   [40] if((byte~) bool_or::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_or::@2
   to:bool_or::@4
-bool_or::@4: scope:[bool_or]  from bool_or::@7
+bool_or::@4: scope:[bool_or]  from bool_or::@5
   [41] *((const byte*) bool_or::screen#0 + (byte) bool_or::i#2) ← (byte) ' '
   to:bool_or::@3
 bool_or::@3: scope:[bool_or]  from bool_or::@2 bool_or::@4
@@ -465,7 +472,7 @@ bool_or::@3: scope:[bool_or]  from bool_or::@2 bool_or::@4
 bool_or::@return: scope:[bool_or]  from bool_or::@3
   [44] return 
   to:@return
-bool_or::@2: scope:[bool_or]  from bool_or::@1 bool_or::@7
+bool_or::@2: scope:[bool_or]  from bool_or::@1 bool_or::@5
   [45] *((const byte*) bool_or::screen#0 + (byte) bool_or::i#2) ← (byte) '*'
   to:bool_or::@3
 bool_and: scope:[bool_and]  from main
@@ -474,9 +481,9 @@ bool_and: scope:[bool_and]  from main
 bool_and::@1: scope:[bool_and]  from bool_and bool_and::@3
   [47] (byte) bool_and::i#2 ← phi( bool_and/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_and::@3/(byte) bool_and::i#1 )
   [48] (byte~) bool_and::$1 ← (byte) bool_and::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [49] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@7
+  [49] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@5
   to:bool_and::@4
-bool_and::@4: scope:[bool_and]  from bool_and::@1 bool_and::@7
+bool_and::@4: scope:[bool_and]  from bool_and::@1 bool_and::@5
   [50] *((const byte*) bool_and::screen#0 + (byte) bool_and::i#2) ← (byte) ' '
   to:bool_and::@3
 bool_and::@3: scope:[bool_and]  from bool_and::@2 bool_and::@4
@@ -486,10 +493,10 @@ bool_and::@3: scope:[bool_and]  from bool_and::@2 bool_and::@4
 bool_and::@return: scope:[bool_and]  from bool_and::@3
   [53] return 
   to:@return
-bool_and::@7: scope:[bool_and]  from bool_and::@1
+bool_and::@5: scope:[bool_and]  from bool_and::@1
   [54] if((byte~) bool_and::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_and::@2
   to:bool_and::@4
-bool_and::@2: scope:[bool_and]  from bool_and::@7
+bool_and::@2: scope:[bool_and]  from bool_and::@5
   [55] *((const byte*) bool_and::screen#0 + (byte) bool_and::i#2) ← (byte) '*'
   to:bool_and::@3
 
@@ -562,17 +569,17 @@ INITIAL ASM
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-main_from_b5:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -641,20 +648,20 @@ bool_complex: {
     lda #1
     and i
     sta _5
-  //SEG35 [17] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@8 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG35 [17] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@6 -- vbuz1_lt_vbuc1_then_la1 
     lda i
     cmp #$a
-    bcc b8
-    jmp b7
-  //SEG36 bool_complex::@7
-  b7:
+    bcc b6
+    jmp b5
+  //SEG36 bool_complex::@5
+  b5:
   //SEG37 [18] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@4 -- vbuz1_lt_vbuc1_then_la1 
     lda i
     cmp #$a
     bcc b4
-    jmp b9
-  //SEG38 bool_complex::@9
-  b9:
+    jmp b7
+  //SEG38 bool_complex::@7
+  b7:
   //SEG39 [19] if((byte~) bool_complex::$5==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_complex::@4 -- vbuz1_eq_0_then_la1 
     lda _5
     cmp #0
@@ -687,13 +694,13 @@ bool_complex: {
     ldy i
     sta screen,y
     jmp b3
-  //SEG49 bool_complex::@8
-  b8:
+  //SEG49 bool_complex::@6
+  b6:
   //SEG50 [25] if((byte~) bool_complex::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_complex::@2 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
     beq b2
-    jmp b7
+    jmp b5
 }
 //SEG51 bool_not
 bool_not: {
@@ -720,9 +727,9 @@ bool_not: {
     lda i
     cmp #$a
     bcc b4
-    jmp b7
-  //SEG59 bool_not::@7
-  b7:
+    jmp b5
+  //SEG59 bool_not::@5
+  b5:
   //SEG60 [30] if((byte~) bool_not::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_not::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
@@ -781,9 +788,9 @@ bool_or: {
     lda i
     cmp #$a
     bcc b2
-    jmp b7
-  //SEG78 bool_or::@7
-  b7:
+    jmp b5
+  //SEG78 bool_or::@5
+  b5:
   //SEG79 [40] if((byte~) bool_or::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_or::@2 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
@@ -838,10 +845,10 @@ bool_and: {
     lda #1
     and i
     sta _1
-  //SEG96 [49] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@7 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG96 [49] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@5 -- vbuz1_lt_vbuc1_then_la1 
     lda i
     cmp #$a
-    bcc b7
+    bcc b5
     jmp b4
   //SEG97 bool_and::@4
   b4:
@@ -863,8 +870,8 @@ bool_and: {
   breturn:
   //SEG103 [53] return 
     rts
-  //SEG104 bool_and::@7
-  b7:
+  //SEG104 bool_and::@5
+  b5:
   //SEG105 [54] if((byte~) bool_and::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_and::@2 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
@@ -954,17 +961,17 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-main_from_b5:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1028,18 +1035,18 @@ bool_complex: {
   //SEG34 [16] (byte~) bool_complex::$5 ← (byte) bool_complex::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuyy_band_vbuc1 
     tya
     and #1
-  //SEG35 [17] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@8 -- vbuyy_lt_vbuc1_then_la1 
+  //SEG35 [17] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@6 -- vbuyy_lt_vbuc1_then_la1 
     cpy #$a
-    bcc b8
-    jmp b7
-  //SEG36 bool_complex::@7
-  b7:
+    bcc b6
+    jmp b5
+  //SEG36 bool_complex::@5
+  b5:
   //SEG37 [18] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@4 -- vbuyy_lt_vbuc1_then_la1 
     cpy #$a
     bcc b4
-    jmp b9
-  //SEG38 bool_complex::@9
-  b9:
+    jmp b7
+  //SEG38 bool_complex::@7
+  b7:
   //SEG39 [19] if((byte~) bool_complex::$5==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_complex::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b4
@@ -1068,12 +1075,12 @@ bool_complex: {
     lda #' '
     sta screen,y
     jmp b3
-  //SEG49 bool_complex::@8
-  b8:
+  //SEG49 bool_complex::@6
+  b6:
   //SEG50 [25] if((byte~) bool_complex::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_complex::@2 -- vbuxx_eq_0_then_la1 
     cpx #0
     beq b2
-    jmp b7
+    jmp b5
 }
 //SEG51 bool_not
 bool_not: {
@@ -1095,9 +1102,9 @@ bool_not: {
   //SEG58 [29] if((byte) bool_not::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_not::@4 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
     bcc b4
-    jmp b7
-  //SEG59 bool_not::@7
-  b7:
+    jmp b5
+  //SEG59 bool_not::@5
+  b5:
   //SEG60 [30] if((byte~) bool_not::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_not::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b4
@@ -1147,9 +1154,9 @@ bool_or: {
   //SEG77 [39] if((byte) bool_or::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_or::@2 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
     bcc b2
-    jmp b7
-  //SEG78 bool_or::@7
-  b7:
+    jmp b5
+  //SEG78 bool_or::@5
+  b5:
   //SEG79 [40] if((byte~) bool_or::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_or::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b2
@@ -1196,9 +1203,9 @@ bool_and: {
   //SEG95 [48] (byte~) bool_and::$1 ← (byte) bool_and::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG96 [49] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@7 -- vbuxx_lt_vbuc1_then_la1 
+  //SEG96 [49] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@5 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
-    bcc b7
+    bcc b5
     jmp b4
   //SEG97 bool_and::@4
   b4:
@@ -1218,8 +1225,8 @@ bool_and: {
   breturn:
   //SEG103 [53] return 
     rts
-  //SEG104 bool_and::@7
-  b7:
+  //SEG104 bool_and::@5
+  b5:
   //SEG105 [54] if((byte~) bool_and::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_and::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b2
@@ -1233,25 +1240,25 @@ bool_and: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b5
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b7
-Removing instruction jmp b9
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b1
+Removing instruction jmp b5
 Removing instruction jmp b7
 Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b7
+Removing instruction jmp b5
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b5
 Removing instruction jmp b4
 Removing instruction jmp b3
 Removing instruction jmp breturn
@@ -1264,10 +1271,10 @@ Replacing label b1_from_b3 with b1
 Replacing label b1_from_b3 with b1
 Replacing label b1_from_b3 with b1
 Replacing label b1_from_b3 with b1
-Removing instruction b5_from_bbegin:
-Removing instruction b5:
-Removing instruction main_from_b5:
-Removing instruction bend_from_b5:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction bool_or_from_b1:
 Removing instruction b2_from_b1:
@@ -1286,14 +1293,14 @@ Removing instruction b2:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_bool_complex:
-Removing instruction b9:
+Removing instruction b7:
 Removing instruction breturn:
 Removing instruction b1_from_bool_not:
-Removing instruction b7:
+Removing instruction b5:
 Removing instruction b2:
 Removing instruction breturn:
 Removing instruction b1_from_bool_or:
-Removing instruction b7:
+Removing instruction b5:
 Removing instruction b4:
 Removing instruction breturn:
 Removing instruction b1_from_bool_and:
@@ -1311,7 +1318,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (void()) bool_and()
@@ -1320,7 +1327,7 @@ FINAL SYMBOL TABLE
 (label) bool_and::@2
 (label) bool_and::@3
 (label) bool_and::@4
-(label) bool_and::@7
+(label) bool_and::@5
 (label) bool_and::@return
 (byte) bool_and::i
 (byte) bool_and::i#1 reg byte x 16.5
@@ -1334,9 +1341,9 @@ FINAL SYMBOL TABLE
 (label) bool_complex::@2
 (label) bool_complex::@3
 (label) bool_complex::@4
+(label) bool_complex::@5
+(label) bool_complex::@6
 (label) bool_complex::@7
-(label) bool_complex::@8
-(label) bool_complex::@9
 (label) bool_complex::@return
 (byte) bool_complex::i
 (byte) bool_complex::i#1 reg byte y 16.5
@@ -1349,7 +1356,7 @@ FINAL SYMBOL TABLE
 (label) bool_not::@2
 (label) bool_not::@3
 (label) bool_not::@4
-(label) bool_not::@7
+(label) bool_not::@5
 (label) bool_not::@return
 (byte) bool_not::i
 (byte) bool_not::i#1 reg byte x 16.5
@@ -1362,7 +1369,7 @@ FINAL SYMBOL TABLE
 (label) bool_or::@2
 (label) bool_or::@3
 (label) bool_or::@4
-(label) bool_or::@7
+(label) bool_or::@5
 (label) bool_or::@return
 (byte) bool_or::i
 (byte) bool_or::i#1 reg byte x 16.5
@@ -1397,11 +1404,11 @@ Score: 1804
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-//SEG5 @5
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -1444,15 +1451,15 @@ bool_complex: {
   //SEG34 [16] (byte~) bool_complex::$5 ← (byte) bool_complex::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuyy_band_vbuc1 
     tya
     and #1
-  //SEG35 [17] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@8 -- vbuyy_lt_vbuc1_then_la1 
+  //SEG35 [17] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@6 -- vbuyy_lt_vbuc1_then_la1 
     cpy #$a
-    bcc b8
-  //SEG36 bool_complex::@7
-  b7:
+    bcc b6
+  //SEG36 bool_complex::@5
+  b5:
   //SEG37 [18] if((byte) bool_complex::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_complex::@4 -- vbuyy_lt_vbuc1_then_la1 
     cpy #$a
     bcc b4
-  //SEG38 bool_complex::@9
+  //SEG38 bool_complex::@7
   //SEG39 [19] if((byte~) bool_complex::$5==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_complex::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b4
@@ -1477,12 +1484,12 @@ bool_complex: {
     lda #' '
     sta screen,y
     jmp b3
-  //SEG49 bool_complex::@8
-  b8:
+  //SEG49 bool_complex::@6
+  b6:
   //SEG50 [25] if((byte~) bool_complex::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_complex::@2 -- vbuxx_eq_0_then_la1 
     cpx #0
     beq b2
-    jmp b7
+    jmp b5
 }
 //SEG51 bool_not
 bool_not: {
@@ -1500,7 +1507,7 @@ bool_not: {
   //SEG58 [29] if((byte) bool_not::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_not::@4 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
     bcc b4
-  //SEG59 bool_not::@7
+  //SEG59 bool_not::@5
   //SEG60 [30] if((byte~) bool_not::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_not::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b4
@@ -1541,7 +1548,7 @@ bool_or: {
   //SEG77 [39] if((byte) bool_or::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_or::@2 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
     bcc b2
-  //SEG78 bool_or::@7
+  //SEG78 bool_or::@5
   //SEG79 [40] if((byte~) bool_or::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_or::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b2
@@ -1579,9 +1586,9 @@ bool_and: {
   //SEG95 [48] (byte~) bool_and::$1 ← (byte) bool_and::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG96 [49] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@7 -- vbuxx_lt_vbuc1_then_la1 
+  //SEG96 [49] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@5 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
-    bcc b7
+    bcc b5
   //SEG97 bool_and::@4
   b4:
   //SEG98 [50] *((const byte*) bool_and::screen#0 + (byte) bool_and::i#2) ← (byte) ' ' -- pbuc1_derefidx_vbuxx=vbuc2 
@@ -1597,8 +1604,8 @@ bool_and: {
   //SEG102 bool_and::@return
   //SEG103 [53] return 
     rts
-  //SEG104 bool_and::@7
-  b7:
+  //SEG104 bool_and::@5
+  b5:
   //SEG105 [54] if((byte~) bool_and::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_and::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b2
diff --git a/src/test/ref/bool-ifs.sym b/src/test/ref/bool-ifs.sym
index c68163ac2..b2804df73 100644
--- a/src/test/ref/bool-ifs.sym
+++ b/src/test/ref/bool-ifs.sym
@@ -1,4 +1,4 @@
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (void()) bool_and()
@@ -7,7 +7,7 @@
 (label) bool_and::@2
 (label) bool_and::@3
 (label) bool_and::@4
-(label) bool_and::@7
+(label) bool_and::@5
 (label) bool_and::@return
 (byte) bool_and::i
 (byte) bool_and::i#1 reg byte x 16.5
@@ -21,9 +21,9 @@
 (label) bool_complex::@2
 (label) bool_complex::@3
 (label) bool_complex::@4
+(label) bool_complex::@5
+(label) bool_complex::@6
 (label) bool_complex::@7
-(label) bool_complex::@8
-(label) bool_complex::@9
 (label) bool_complex::@return
 (byte) bool_complex::i
 (byte) bool_complex::i#1 reg byte y 16.5
@@ -36,7 +36,7 @@
 (label) bool_not::@2
 (label) bool_not::@3
 (label) bool_not::@4
-(label) bool_not::@7
+(label) bool_not::@5
 (label) bool_not::@return
 (byte) bool_not::i
 (byte) bool_not::i#1 reg byte x 16.5
@@ -49,7 +49,7 @@
 (label) bool_or::@2
 (label) bool_or::@3
 (label) bool_or::@4
-(label) bool_or::@7
+(label) bool_or::@5
 (label) bool_or::@return
 (byte) bool_or::i
 (byte) bool_or::i#1 reg byte x 16.5
diff --git a/src/test/ref/bool-nullpointer-exception.asm b/src/test/ref/bool-nullpointer-exception.asm
index 78a4bb0bb..e0837d456 100644
--- a/src/test/ref/bool-nullpointer-exception.asm
+++ b/src/test/ref/bool-nullpointer-exception.asm
@@ -4,11 +4,11 @@
 .pc = $80d "Program"
 main: {
     lda #1
-    jmp b6
+    jmp b2
   b1:
     lda #0
-  b6:
+  b2:
     cmp #0
     bne b1
-    jmp b6
+    jmp b2
 }
diff --git a/src/test/ref/bool-nullpointer-exception.cfg b/src/test/ref/bool-nullpointer-exception.cfg
index 0a731e475..3bc534b50 100644
--- a/src/test/ref/bool-nullpointer-exception.cfg
+++ b/src/test/ref/bool-nullpointer-exception.cfg
@@ -10,9 +10,9 @@
 main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@6
-  [5] (bool) framedone#2 ← phi( main/true main::@6/false )
-  to:main::@6
-main::@6: scope:[main]  from main::@1 main::@6
+main::@1: scope:[main]  from main main::@2
+  [5] (bool) framedone#2 ← phi( main/true main::@2/false )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
   [6] if((bool) framedone#2) goto main::@1
-  to:main::@6
+  to:main::@2
diff --git a/src/test/ref/bool-nullpointer-exception.log b/src/test/ref/bool-nullpointer-exception.log
index 7ebae87b3..ffdd4f248 100644
--- a/src/test/ref/bool-nullpointer-exception.log
+++ b/src/test/ref/bool-nullpointer-exception.log
@@ -105,6 +105,7 @@ Calls in [] to main:2
 
 Created 1 initial phi equivalence classes
 Coalesced down to 1 phi equivalence classes
+Renumbering block main::@6 to main::@2
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -123,12 +124,12 @@ FINAL CONTROL FLOW GRAPH
 main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@6
-  [5] (bool) framedone#2 ← phi( main/true main::@6/false )
-  to:main::@6
-main::@6: scope:[main]  from main::@1 main::@6
+main::@1: scope:[main]  from main main::@2
+  [5] (bool) framedone#2 ← phi( main/true main::@2/false )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
   [6] if((bool) framedone#2) goto main::@1
-  to:main::@6
+  to:main::@2
 
 
 VARIABLE REGISTER WEIGHTS
@@ -175,22 +176,22 @@ main: {
     lda #1
     sta framedone
     jmp b1
-  //SEG13 [5] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  b1_from_b6:
-  //SEG14 [5] phi (bool) framedone#2 = false [phi:main::@6->main::@1#0] -- vboz1=vboc1 
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG14 [5] phi (bool) framedone#2 = false [phi:main::@2->main::@1#0] -- vboz1=vboc1 
     lda #0
     sta framedone
     jmp b1
   //SEG15 main::@1
   b1:
-    jmp b6
-  //SEG16 main::@6
-  b6:
+    jmp b2
+  //SEG16 main::@2
+  b2:
   //SEG17 [6] if((bool) framedone#2) goto main::@1 -- vboz1_then_la1 
     lda framedone
     cmp #0
-    bne b1_from_b6
-    jmp b6
+    bne b1_from_b2
+    jmp b2
 }
 
 REGISTER UPLIFT POTENTIAL REGISTERS
@@ -234,29 +235,29 @@ main: {
   //SEG12 [5] phi (bool) framedone#2 = true [phi:main->main::@1#0] -- vboaa=vboc1 
     lda #1
     jmp b1
-  //SEG13 [5] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  b1_from_b6:
-  //SEG14 [5] phi (bool) framedone#2 = false [phi:main::@6->main::@1#0] -- vboaa=vboc1 
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG14 [5] phi (bool) framedone#2 = false [phi:main::@2->main::@1#0] -- vboaa=vboc1 
     lda #0
     jmp b1
   //SEG15 main::@1
   b1:
-    jmp b6
-  //SEG16 main::@6
-  b6:
+    jmp b2
+  //SEG16 main::@2
+  b2:
   //SEG17 [6] if((bool) framedone#2) goto main::@1 -- vboaa_then_la1 
     cmp #0
-    bne b1_from_b6
-    jmp b6
+    bne b1_from_b2
+    jmp b2
 }
 
 ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b6
+Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1 with b6
+Replacing label b1 with b2
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
@@ -269,7 +270,7 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Relabelling long label b1_from_b6 to b1
+Relabelling long label b1_from_b2 to b1
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -282,7 +283,7 @@ FINAL SYMBOL TABLE
 (bool) framedone#2 reg byte a 50.5
 (void()) main()
 (label) main::@1
-(label) main::@6
+(label) main::@2
 
 reg byte a [ framedone#2 ]
 
@@ -309,17 +310,17 @@ main: {
   //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
   //SEG12 [5] phi (bool) framedone#2 = true [phi:main->main::@1#0] -- vboaa=vboc1 
     lda #1
-    jmp b6
-  //SEG13 [5] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+    jmp b2
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
   b1:
-  //SEG14 [5] phi (bool) framedone#2 = false [phi:main::@6->main::@1#0] -- vboaa=vboc1 
+  //SEG14 [5] phi (bool) framedone#2 = false [phi:main::@2->main::@1#0] -- vboaa=vboc1 
     lda #0
   //SEG15 main::@1
-  //SEG16 main::@6
-  b6:
+  //SEG16 main::@2
+  b2:
   //SEG17 [6] if((bool) framedone#2) goto main::@1 -- vboaa_then_la1 
     cmp #0
     bne b1
-    jmp b6
+    jmp b2
 }
 
diff --git a/src/test/ref/bool-nullpointer-exception.sym b/src/test/ref/bool-nullpointer-exception.sym
index 2e29aa25c..1bbdd53d6 100644
--- a/src/test/ref/bool-nullpointer-exception.sym
+++ b/src/test/ref/bool-nullpointer-exception.sym
@@ -5,6 +5,6 @@
 (bool) framedone#2 reg byte a 50.5
 (void()) main()
 (label) main::@1
-(label) main::@6
+(label) main::@2
 
 reg byte a [ framedone#2 ]
diff --git a/src/test/ref/bool-pointer.asm b/src/test/ref/bool-pointer.asm
index 9359652cd..7cf1fabd6 100644
--- a/src/test/ref/bool-pointer.asm
+++ b/src/test/ref/bool-pointer.asm
@@ -10,10 +10,10 @@ main: {
     lda #1
     sta $400+2
     cmp #0
-    bne b2
+    bne b1
   breturn:
     rts
-  b2:
+  b1:
     lda #1
     sta $400+2+1
     jmp breturn
diff --git a/src/test/ref/bool-pointer.cfg b/src/test/ref/bool-pointer.cfg
index a393a4a24..9f8adefc2 100644
--- a/src/test/ref/bool-pointer.cfg
+++ b/src/test/ref/bool-pointer.cfg
@@ -11,11 +11,11 @@ main: scope:[main]  from @1
   [4] *(((bool*))(word/signed word/dword/signed dword) $400) ← true
   [5] *(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 1) ← false
   [6] *(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true
-  [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@2
+  [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main main::@2
+main::@return: scope:[main]  from main main::@1
   [8] return 
   to:@return
-main::@2: scope:[main]  from main
+main::@1: scope:[main]  from main
   [9] *(++((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true
   to:main::@return
diff --git a/src/test/ref/bool-pointer.log b/src/test/ref/bool-pointer.log
index b1bf53d55..488426ef6 100644
--- a/src/test/ref/bool-pointer.log
+++ b/src/test/ref/bool-pointer.log
@@ -78,6 +78,7 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block main::@2 to main::@1
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -96,12 +97,12 @@ main: scope:[main]  from @1
   [4] *(((bool*))(word/signed word/dword/signed dword) $400) ← true
   [5] *(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 1) ← false
   [6] *(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true
-  [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@2
+  [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main main::@2
+main::@return: scope:[main]  from main main::@1
   [8] return 
   to:@return
-main::@2: scope:[main]  from main
+main::@1: scope:[main]  from main
   [9] *(++((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true
   to:main::@return
 
@@ -146,17 +147,17 @@ main: {
   //SEG12 [6] *(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true -- _deref_pboc1=vboc2 
     lda #1
     sta $400+2
-  //SEG13 [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@2 -- _deref_pboc1_then_la1 
+  //SEG13 [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@1 -- _deref_pboc1_then_la1 
     lda $400+2
     cmp #0
-    bne b2
+    bne b1
     jmp breturn
   //SEG14 main::@return
   breturn:
   //SEG15 [8] return 
     rts
-  //SEG16 main::@2
-  b2:
+  //SEG16 main::@1
+  b1:
   //SEG17 [9] *(++((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true -- _deref_pboc1=vboc2 
     lda #1
     sta $400+2+1
@@ -167,7 +168,7 @@ REGISTER UPLIFT POTENTIAL REGISTERS
 Statement [4] *(((bool*))(word/signed word/dword/signed dword) $400) ← true [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [5] *(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 1) ← false [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [6] *(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true [ ] ( main:2 [ ] ) always clobbers reg byte a 
-Statement [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@2 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@1 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [9] *(++((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true [ ] ( main:2 [ ] ) always clobbers reg byte a 
 
 REGISTER UPLIFT SCOPES
@@ -210,17 +211,17 @@ main: {
   //SEG12 [6] *(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true -- _deref_pboc1=vboc2 
     lda #1
     sta $400+2
-  //SEG13 [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@2 -- _deref_pboc1_then_la1 
+  //SEG13 [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@1 -- _deref_pboc1_then_la1 
     lda $400+2
     cmp #0
-    bne b2
+    bne b1
     jmp breturn
   //SEG14 main::@return
   breturn:
   //SEG15 [8] return 
     rts
-  //SEG16 main::@2
-  b2:
+  //SEG16 main::@1
+  b1:
   //SEG17 [9] *(++((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true -- _deref_pboc1=vboc2 
     lda #1
     sta $400+2+1
@@ -251,7 +252,7 @@ FINAL SYMBOL TABLE
 (label) @begin
 (label) @end
 (void()) main()
-(label) main::@2
+(label) main::@1
 (label) main::@return
 (bool*) main::bscreen
 
@@ -284,15 +285,15 @@ main: {
   //SEG12 [6] *(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true -- _deref_pboc1=vboc2 
     lda #1
     sta $400+2
-  //SEG13 [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@2 -- _deref_pboc1_then_la1 
+  //SEG13 [7] if(*(((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2)) goto main::@1 -- _deref_pboc1_then_la1 
     cmp #0
-    bne b2
+    bne b1
   //SEG14 main::@return
   breturn:
   //SEG15 [8] return 
     rts
-  //SEG16 main::@2
-  b2:
+  //SEG16 main::@1
+  b1:
   //SEG17 [9] *(++((bool*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 2) ← true -- _deref_pboc1=vboc2 
     lda #1
     sta $400+2+1
diff --git a/src/test/ref/bool-pointer.sym b/src/test/ref/bool-pointer.sym
index 604e55279..d36475ab9 100644
--- a/src/test/ref/bool-pointer.sym
+++ b/src/test/ref/bool-pointer.sym
@@ -2,7 +2,7 @@
 (label) @begin
 (label) @end
 (void()) main()
-(label) main::@2
+(label) main::@1
 (label) main::@return
 (bool*) main::bscreen
 
diff --git a/src/test/ref/bool-vars.asm b/src/test/ref/bool-vars.asm
index 04b58e34a..8d19ed6d0 100644
--- a/src/test/ref/bool-vars.asm
+++ b/src/test/ref/bool-vars.asm
@@ -30,8 +30,8 @@ bool_complex: {
     sta o2
     lda o1
     cmp #0
-    bne b8
-  b7:
+    bne b6
+  b5:
     lda o1
     cmp #0
     bne b4
@@ -50,11 +50,11 @@ bool_complex: {
     lda #' '
     sta screen,x
     jmp b3
-  b8:
+  b6:
     lda o2
     cmp #0
     bne b2
-    jmp b7
+    jmp b5
 }
 bool_not: {
     .label screen = $450
@@ -107,7 +107,7 @@ bool_and: {
     txa
     and #1
     cpx #$a
-    bcc b7
+    bcc b5
   b4:
     lda #' '
     sta screen,x
@@ -116,7 +116,7 @@ bool_and: {
     cpx #$15
     bne b1
     rts
-  b7:
+  b5:
     cmp #0
     beq b2
     jmp b4
diff --git a/src/test/ref/bool-vars.cfg b/src/test/ref/bool-vars.cfg
index ce8cc7f43..5ba58649e 100644
--- a/src/test/ref/bool-vars.cfg
+++ b/src/test/ref/bool-vars.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] phi()
   [5] call bool_and 
   to:main::@1
@@ -34,15 +34,15 @@ bool_complex::@1: scope:[bool_complex]  from bool_complex bool_complex::@3
   [15] (bool) bool_complex::o1#0 ← (byte) bool_complex::i#2 < (byte/signed byte/word/signed word/dword/signed dword) $a
   [16] (byte~) bool_complex::$1 ← (byte) bool_complex::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [17] (bool) bool_complex::o2#0 ← (byte~) bool_complex::$1 == (byte/signed byte/word/signed word/dword/signed dword) 0
-  [18] if((bool) bool_complex::o1#0) goto bool_complex::@8
-  to:bool_complex::@7
-bool_complex::@7: scope:[bool_complex]  from bool_complex::@1 bool_complex::@8
+  [18] if((bool) bool_complex::o1#0) goto bool_complex::@6
+  to:bool_complex::@5
+bool_complex::@5: scope:[bool_complex]  from bool_complex::@1 bool_complex::@6
   [19] if((bool) bool_complex::o1#0) goto bool_complex::@4
-  to:bool_complex::@9
-bool_complex::@9: scope:[bool_complex]  from bool_complex::@7
+  to:bool_complex::@7
+bool_complex::@7: scope:[bool_complex]  from bool_complex::@5
   [20] if((bool) bool_complex::o2#0) goto bool_complex::@4
   to:bool_complex::@2
-bool_complex::@2: scope:[bool_complex]  from bool_complex::@8 bool_complex::@9
+bool_complex::@2: scope:[bool_complex]  from bool_complex::@6 bool_complex::@7
   [21] *((const byte*) bool_complex::screen#0 + (byte) bool_complex::i#2) ← (byte) '*'
   to:bool_complex::@3
 bool_complex::@3: scope:[bool_complex]  from bool_complex::@2 bool_complex::@4
@@ -52,12 +52,12 @@ bool_complex::@3: scope:[bool_complex]  from bool_complex::@2 bool_complex::@4
 bool_complex::@return: scope:[bool_complex]  from bool_complex::@3
   [24] return 
   to:@return
-bool_complex::@4: scope:[bool_complex]  from bool_complex::@7 bool_complex::@9
+bool_complex::@4: scope:[bool_complex]  from bool_complex::@5 bool_complex::@7
   [25] *((const byte*) bool_complex::screen#0 + (byte) bool_complex::i#2) ← (byte) ' '
   to:bool_complex::@3
-bool_complex::@8: scope:[bool_complex]  from bool_complex::@1
+bool_complex::@6: scope:[bool_complex]  from bool_complex::@1
   [26] if((bool) bool_complex::o2#0) goto bool_complex::@2
-  to:bool_complex::@7
+  to:bool_complex::@5
 bool_not: scope:[bool_not]  from main::@2
   [27] phi()
   to:bool_not::@1
@@ -65,11 +65,11 @@ bool_not::@1: scope:[bool_not]  from bool_not bool_not::@3
   [28] (byte) bool_not::i#2 ← phi( bool_not/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_not::@3/(byte) bool_not::i#1 )
   [29] (byte~) bool_not::$1 ← (byte) bool_not::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [30] if((byte) bool_not::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_not::@4
-  to:bool_not::@7
-bool_not::@7: scope:[bool_not]  from bool_not::@1
+  to:bool_not::@5
+bool_not::@5: scope:[bool_not]  from bool_not::@1
   [31] if((byte~) bool_not::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_not::@4
   to:bool_not::@2
-bool_not::@2: scope:[bool_not]  from bool_not::@7
+bool_not::@2: scope:[bool_not]  from bool_not::@5
   [32] *((const byte*) bool_not::screen#0 + (byte) bool_not::i#2) ← (byte) '*'
   to:bool_not::@3
 bool_not::@3: scope:[bool_not]  from bool_not::@2 bool_not::@4
@@ -79,7 +79,7 @@ bool_not::@3: scope:[bool_not]  from bool_not::@2 bool_not::@4
 bool_not::@return: scope:[bool_not]  from bool_not::@3
   [35] return 
   to:@return
-bool_not::@4: scope:[bool_not]  from bool_not::@1 bool_not::@7
+bool_not::@4: scope:[bool_not]  from bool_not::@1 bool_not::@5
   [36] *((const byte*) bool_not::screen#0 + (byte) bool_not::i#2) ← (byte) ' '
   to:bool_not::@3
 bool_or: scope:[bool_or]  from main::@1
@@ -89,11 +89,11 @@ bool_or::@1: scope:[bool_or]  from bool_or bool_or::@3
   [38] (byte) bool_or::i#2 ← phi( bool_or/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_or::@3/(byte) bool_or::i#1 )
   [39] (byte~) bool_or::$1 ← (byte) bool_or::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [40] if((byte) bool_or::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_or::@2
-  to:bool_or::@7
-bool_or::@7: scope:[bool_or]  from bool_or::@1
+  to:bool_or::@5
+bool_or::@5: scope:[bool_or]  from bool_or::@1
   [41] if((byte~) bool_or::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_or::@2
   to:bool_or::@4
-bool_or::@4: scope:[bool_or]  from bool_or::@7
+bool_or::@4: scope:[bool_or]  from bool_or::@5
   [42] *((const byte*) bool_or::screen#0 + (byte) bool_or::i#2) ← (byte) ' '
   to:bool_or::@3
 bool_or::@3: scope:[bool_or]  from bool_or::@2 bool_or::@4
@@ -103,7 +103,7 @@ bool_or::@3: scope:[bool_or]  from bool_or::@2 bool_or::@4
 bool_or::@return: scope:[bool_or]  from bool_or::@3
   [45] return 
   to:@return
-bool_or::@2: scope:[bool_or]  from bool_or::@1 bool_or::@7
+bool_or::@2: scope:[bool_or]  from bool_or::@1 bool_or::@5
   [46] *((const byte*) bool_or::screen#0 + (byte) bool_or::i#2) ← (byte) '*'
   to:bool_or::@3
 bool_and: scope:[bool_and]  from main
@@ -112,9 +112,9 @@ bool_and: scope:[bool_and]  from main
 bool_and::@1: scope:[bool_and]  from bool_and bool_and::@3
   [48] (byte) bool_and::i#2 ← phi( bool_and/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_and::@3/(byte) bool_and::i#1 )
   [49] (byte~) bool_and::$1 ← (byte) bool_and::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [50] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@7
+  [50] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@5
   to:bool_and::@4
-bool_and::@4: scope:[bool_and]  from bool_and::@1 bool_and::@7
+bool_and::@4: scope:[bool_and]  from bool_and::@1 bool_and::@5
   [51] *((const byte*) bool_and::screen#0 + (byte) bool_and::i#2) ← (byte) ' '
   to:bool_and::@3
 bool_and::@3: scope:[bool_and]  from bool_and::@2 bool_and::@4
@@ -124,9 +124,9 @@ bool_and::@3: scope:[bool_and]  from bool_and::@2 bool_and::@4
 bool_and::@return: scope:[bool_and]  from bool_and::@3
   [54] return 
   to:@return
-bool_and::@7: scope:[bool_and]  from bool_and::@1
+bool_and::@5: scope:[bool_and]  from bool_and::@1
   [55] if((byte~) bool_and::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_and::@2
   to:bool_and::@4
-bool_and::@2: scope:[bool_and]  from bool_and::@7
+bool_and::@2: scope:[bool_and]  from bool_and::@5
   [56] *((const byte*) bool_and::screen#0 + (byte) bool_and::i#2) ← (byte) '*'
   to:bool_and::@3
diff --git a/src/test/ref/bool-vars.log b/src/test/ref/bool-vars.log
index 7bebac4d8..70116322e 100644
--- a/src/test/ref/bool-vars.log
+++ b/src/test/ref/bool-vars.log
@@ -394,8 +394,15 @@ Culled Empty Block (label) bool_complex::@10
 Culled Empty Block (label) bool_not::@8
 Culled Empty Block (label) bool_or::@8
 Culled Empty Block (label) bool_and::@8
+Renumbering block @5 to @1
+Renumbering block bool_and::@7 to bool_and::@5
+Renumbering block bool_or::@7 to bool_or::@5
+Renumbering block bool_not::@7 to bool_not::@5
+Renumbering block bool_complex::@7 to bool_complex::@5
+Renumbering block bool_complex::@8 to bool_complex::@6
+Renumbering block bool_complex::@9 to bool_complex::@7
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @5
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -409,14 +416,14 @@ Adding NOP phi() at start of bool_and
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] phi()
   [5] call bool_and 
   to:main::@1
@@ -443,15 +450,15 @@ bool_complex::@1: scope:[bool_complex]  from bool_complex bool_complex::@3
   [15] (bool) bool_complex::o1#0 ← (byte) bool_complex::i#2 < (byte/signed byte/word/signed word/dword/signed dword) $a
   [16] (byte~) bool_complex::$1 ← (byte) bool_complex::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [17] (bool) bool_complex::o2#0 ← (byte~) bool_complex::$1 == (byte/signed byte/word/signed word/dword/signed dword) 0
-  [18] if((bool) bool_complex::o1#0) goto bool_complex::@8
-  to:bool_complex::@7
-bool_complex::@7: scope:[bool_complex]  from bool_complex::@1 bool_complex::@8
+  [18] if((bool) bool_complex::o1#0) goto bool_complex::@6
+  to:bool_complex::@5
+bool_complex::@5: scope:[bool_complex]  from bool_complex::@1 bool_complex::@6
   [19] if((bool) bool_complex::o1#0) goto bool_complex::@4
-  to:bool_complex::@9
-bool_complex::@9: scope:[bool_complex]  from bool_complex::@7
+  to:bool_complex::@7
+bool_complex::@7: scope:[bool_complex]  from bool_complex::@5
   [20] if((bool) bool_complex::o2#0) goto bool_complex::@4
   to:bool_complex::@2
-bool_complex::@2: scope:[bool_complex]  from bool_complex::@8 bool_complex::@9
+bool_complex::@2: scope:[bool_complex]  from bool_complex::@6 bool_complex::@7
   [21] *((const byte*) bool_complex::screen#0 + (byte) bool_complex::i#2) ← (byte) '*'
   to:bool_complex::@3
 bool_complex::@3: scope:[bool_complex]  from bool_complex::@2 bool_complex::@4
@@ -461,12 +468,12 @@ bool_complex::@3: scope:[bool_complex]  from bool_complex::@2 bool_complex::@4
 bool_complex::@return: scope:[bool_complex]  from bool_complex::@3
   [24] return 
   to:@return
-bool_complex::@4: scope:[bool_complex]  from bool_complex::@7 bool_complex::@9
+bool_complex::@4: scope:[bool_complex]  from bool_complex::@5 bool_complex::@7
   [25] *((const byte*) bool_complex::screen#0 + (byte) bool_complex::i#2) ← (byte) ' '
   to:bool_complex::@3
-bool_complex::@8: scope:[bool_complex]  from bool_complex::@1
+bool_complex::@6: scope:[bool_complex]  from bool_complex::@1
   [26] if((bool) bool_complex::o2#0) goto bool_complex::@2
-  to:bool_complex::@7
+  to:bool_complex::@5
 bool_not: scope:[bool_not]  from main::@2
   [27] phi()
   to:bool_not::@1
@@ -474,11 +481,11 @@ bool_not::@1: scope:[bool_not]  from bool_not bool_not::@3
   [28] (byte) bool_not::i#2 ← phi( bool_not/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_not::@3/(byte) bool_not::i#1 )
   [29] (byte~) bool_not::$1 ← (byte) bool_not::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [30] if((byte) bool_not::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_not::@4
-  to:bool_not::@7
-bool_not::@7: scope:[bool_not]  from bool_not::@1
+  to:bool_not::@5
+bool_not::@5: scope:[bool_not]  from bool_not::@1
   [31] if((byte~) bool_not::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_not::@4
   to:bool_not::@2
-bool_not::@2: scope:[bool_not]  from bool_not::@7
+bool_not::@2: scope:[bool_not]  from bool_not::@5
   [32] *((const byte*) bool_not::screen#0 + (byte) bool_not::i#2) ← (byte) '*'
   to:bool_not::@3
 bool_not::@3: scope:[bool_not]  from bool_not::@2 bool_not::@4
@@ -488,7 +495,7 @@ bool_not::@3: scope:[bool_not]  from bool_not::@2 bool_not::@4
 bool_not::@return: scope:[bool_not]  from bool_not::@3
   [35] return 
   to:@return
-bool_not::@4: scope:[bool_not]  from bool_not::@1 bool_not::@7
+bool_not::@4: scope:[bool_not]  from bool_not::@1 bool_not::@5
   [36] *((const byte*) bool_not::screen#0 + (byte) bool_not::i#2) ← (byte) ' '
   to:bool_not::@3
 bool_or: scope:[bool_or]  from main::@1
@@ -498,11 +505,11 @@ bool_or::@1: scope:[bool_or]  from bool_or bool_or::@3
   [38] (byte) bool_or::i#2 ← phi( bool_or/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_or::@3/(byte) bool_or::i#1 )
   [39] (byte~) bool_or::$1 ← (byte) bool_or::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
   [40] if((byte) bool_or::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_or::@2
-  to:bool_or::@7
-bool_or::@7: scope:[bool_or]  from bool_or::@1
+  to:bool_or::@5
+bool_or::@5: scope:[bool_or]  from bool_or::@1
   [41] if((byte~) bool_or::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_or::@2
   to:bool_or::@4
-bool_or::@4: scope:[bool_or]  from bool_or::@7
+bool_or::@4: scope:[bool_or]  from bool_or::@5
   [42] *((const byte*) bool_or::screen#0 + (byte) bool_or::i#2) ← (byte) ' '
   to:bool_or::@3
 bool_or::@3: scope:[bool_or]  from bool_or::@2 bool_or::@4
@@ -512,7 +519,7 @@ bool_or::@3: scope:[bool_or]  from bool_or::@2 bool_or::@4
 bool_or::@return: scope:[bool_or]  from bool_or::@3
   [45] return 
   to:@return
-bool_or::@2: scope:[bool_or]  from bool_or::@1 bool_or::@7
+bool_or::@2: scope:[bool_or]  from bool_or::@1 bool_or::@5
   [46] *((const byte*) bool_or::screen#0 + (byte) bool_or::i#2) ← (byte) '*'
   to:bool_or::@3
 bool_and: scope:[bool_and]  from main
@@ -521,9 +528,9 @@ bool_and: scope:[bool_and]  from main
 bool_and::@1: scope:[bool_and]  from bool_and bool_and::@3
   [48] (byte) bool_and::i#2 ← phi( bool_and/(byte/signed byte/word/signed word/dword/signed dword) 0 bool_and::@3/(byte) bool_and::i#1 )
   [49] (byte~) bool_and::$1 ← (byte) bool_and::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [50] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@7
+  [50] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@5
   to:bool_and::@4
-bool_and::@4: scope:[bool_and]  from bool_and::@1 bool_and::@7
+bool_and::@4: scope:[bool_and]  from bool_and::@1 bool_and::@5
   [51] *((const byte*) bool_and::screen#0 + (byte) bool_and::i#2) ← (byte) ' '
   to:bool_and::@3
 bool_and::@3: scope:[bool_and]  from bool_and::@2 bool_and::@4
@@ -533,10 +540,10 @@ bool_and::@3: scope:[bool_and]  from bool_and::@2 bool_and::@4
 bool_and::@return: scope:[bool_and]  from bool_and::@3
   [54] return 
   to:@return
-bool_and::@7: scope:[bool_and]  from bool_and::@1
+bool_and::@5: scope:[bool_and]  from bool_and::@1
   [55] if((byte~) bool_and::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_and::@2
   to:bool_and::@4
-bool_and::@2: scope:[bool_and]  from bool_and::@7
+bool_and::@2: scope:[bool_and]  from bool_and::@5
   [56] *((const byte*) bool_and::screen#0 + (byte) bool_and::i#2) ← (byte) '*'
   to:bool_and::@3
 
@@ -627,17 +634,17 @@ INITIAL ASM
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-main_from_b5:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -718,20 +725,20 @@ bool_complex: {
   !:
     eor #1
     sta o2
-  //SEG36 [18] if((bool) bool_complex::o1#0) goto bool_complex::@8 -- vboz1_then_la1 
+  //SEG36 [18] if((bool) bool_complex::o1#0) goto bool_complex::@6 -- vboz1_then_la1 
     lda o1
     cmp #0
-    bne b8
-    jmp b7
-  //SEG37 bool_complex::@7
-  b7:
+    bne b6
+    jmp b5
+  //SEG37 bool_complex::@5
+  b5:
   //SEG38 [19] if((bool) bool_complex::o1#0) goto bool_complex::@4 -- vboz1_then_la1 
     lda o1
     cmp #0
     bne b4
-    jmp b9
-  //SEG39 bool_complex::@9
-  b9:
+    jmp b7
+  //SEG39 bool_complex::@7
+  b7:
   //SEG40 [20] if((bool) bool_complex::o2#0) goto bool_complex::@4 -- vboz1_then_la1 
     lda o2
     cmp #0
@@ -764,13 +771,13 @@ bool_complex: {
     ldy i
     sta screen,y
     jmp b3
-  //SEG50 bool_complex::@8
-  b8:
+  //SEG50 bool_complex::@6
+  b6:
   //SEG51 [26] if((bool) bool_complex::o2#0) goto bool_complex::@2 -- vboz1_then_la1 
     lda o2
     cmp #0
     bne b2
-    jmp b7
+    jmp b5
 }
 //SEG52 bool_not
 bool_not: {
@@ -797,9 +804,9 @@ bool_not: {
     lda i
     cmp #$a
     bcc b4
-    jmp b7
-  //SEG60 bool_not::@7
-  b7:
+    jmp b5
+  //SEG60 bool_not::@5
+  b5:
   //SEG61 [31] if((byte~) bool_not::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_not::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
@@ -858,9 +865,9 @@ bool_or: {
     lda i
     cmp #$a
     bcc b2
-    jmp b7
-  //SEG79 bool_or::@7
-  b7:
+    jmp b5
+  //SEG79 bool_or::@5
+  b5:
   //SEG80 [41] if((byte~) bool_or::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_or::@2 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
@@ -915,10 +922,10 @@ bool_and: {
     lda #1
     and i
     sta _1
-  //SEG97 [50] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@7 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG97 [50] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@5 -- vbuz1_lt_vbuc1_then_la1 
     lda i
     cmp #$a
-    bcc b7
+    bcc b5
     jmp b4
   //SEG98 bool_and::@4
   b4:
@@ -940,8 +947,8 @@ bool_and: {
   breturn:
   //SEG104 [54] return 
     rts
-  //SEG105 bool_and::@7
-  b7:
+  //SEG105 bool_and::@5
+  b5:
   //SEG106 [55] if((byte~) bool_and::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_and::@2 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
@@ -962,7 +969,7 @@ Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ bo
 Statement [16] (byte~) bool_complex::$1 ← (byte) bool_complex::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::$1 ] ( main:2::bool_complex:11 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::$1 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BOOL:6 [ bool_complex::o1#0 ]
 Statement [17] (bool) bool_complex::o2#0 ← (byte~) bool_complex::$1 == (byte/signed byte/word/signed word/dword/signed dword) 0 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ( main:2::bool_complex:11 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ) always clobbers reg byte a 
-Statement [18] if((bool) bool_complex::o1#0) goto bool_complex::@8 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ( main:2::bool_complex:11 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ) always clobbers reg byte a 
+Statement [18] if((bool) bool_complex::o1#0) goto bool_complex::@6 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ( main:2::bool_complex:11 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BOOL:8 [ bool_complex::o2#0 ]
 Statement [19] if((bool) bool_complex::o1#0) goto bool_complex::@4 [ bool_complex::i#2 bool_complex::o2#0 ] ( main:2::bool_complex:11 [ bool_complex::i#2 bool_complex::o2#0 ] ) always clobbers reg byte a 
 Statement [20] if((bool) bool_complex::o2#0) goto bool_complex::@4 [ bool_complex::i#2 ] ( main:2::bool_complex:11 [ bool_complex::i#2 ] ) always clobbers reg byte a 
@@ -981,7 +988,7 @@ Statement [56] *((const byte*) bool_and::screen#0 + (byte) bool_and::i#2) ← (b
 Statement [15] (bool) bool_complex::o1#0 ← (byte) bool_complex::i#2 < (byte/signed byte/word/signed word/dword/signed dword) $a [ bool_complex::i#2 bool_complex::o1#0 ] ( main:2::bool_complex:11 [ bool_complex::i#2 bool_complex::o1#0 ] ) always clobbers reg byte a 
 Statement [16] (byte~) bool_complex::$1 ← (byte) bool_complex::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::$1 ] ( main:2::bool_complex:11 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::$1 ] ) always clobbers reg byte a 
 Statement [17] (bool) bool_complex::o2#0 ← (byte~) bool_complex::$1 == (byte/signed byte/word/signed word/dword/signed dword) 0 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ( main:2::bool_complex:11 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ) always clobbers reg byte a 
-Statement [18] if((bool) bool_complex::o1#0) goto bool_complex::@8 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ( main:2::bool_complex:11 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ) always clobbers reg byte a 
+Statement [18] if((bool) bool_complex::o1#0) goto bool_complex::@6 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ( main:2::bool_complex:11 [ bool_complex::i#2 bool_complex::o1#0 bool_complex::o2#0 ] ) always clobbers reg byte a 
 Statement [19] if((bool) bool_complex::o1#0) goto bool_complex::@4 [ bool_complex::i#2 bool_complex::o2#0 ] ( main:2::bool_complex:11 [ bool_complex::i#2 bool_complex::o2#0 ] ) always clobbers reg byte a 
 Statement [20] if((bool) bool_complex::o2#0) goto bool_complex::@4 [ bool_complex::i#2 ] ( main:2::bool_complex:11 [ bool_complex::i#2 ] ) always clobbers reg byte a 
 Statement [21] *((const byte*) bool_complex::screen#0 + (byte) bool_complex::i#2) ← (byte) '*' [ bool_complex::i#2 ] ( main:2::bool_complex:11 [ bool_complex::i#2 ] ) always clobbers reg byte a 
@@ -1034,17 +1041,17 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-main_from_b5:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1119,20 +1126,20 @@ bool_complex: {
   !:
     eor #1
     sta o2
-  //SEG36 [18] if((bool) bool_complex::o1#0) goto bool_complex::@8 -- vboz1_then_la1 
+  //SEG36 [18] if((bool) bool_complex::o1#0) goto bool_complex::@6 -- vboz1_then_la1 
     lda o1
     cmp #0
-    bne b8
-    jmp b7
-  //SEG37 bool_complex::@7
-  b7:
+    bne b6
+    jmp b5
+  //SEG37 bool_complex::@5
+  b5:
   //SEG38 [19] if((bool) bool_complex::o1#0) goto bool_complex::@4 -- vboz1_then_la1 
     lda o1
     cmp #0
     bne b4
-    jmp b9
-  //SEG39 bool_complex::@9
-  b9:
+    jmp b7
+  //SEG39 bool_complex::@7
+  b7:
   //SEG40 [20] if((bool) bool_complex::o2#0) goto bool_complex::@4 -- vboz1_then_la1 
     lda o2
     cmp #0
@@ -1162,13 +1169,13 @@ bool_complex: {
     lda #' '
     sta screen,x
     jmp b3
-  //SEG50 bool_complex::@8
-  b8:
+  //SEG50 bool_complex::@6
+  b6:
   //SEG51 [26] if((bool) bool_complex::o2#0) goto bool_complex::@2 -- vboz1_then_la1 
     lda o2
     cmp #0
     bne b2
-    jmp b7
+    jmp b5
 }
 //SEG52 bool_not
 bool_not: {
@@ -1190,9 +1197,9 @@ bool_not: {
   //SEG59 [30] if((byte) bool_not::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_not::@4 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
     bcc b4
-    jmp b7
-  //SEG60 bool_not::@7
-  b7:
+    jmp b5
+  //SEG60 bool_not::@5
+  b5:
   //SEG61 [31] if((byte~) bool_not::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_not::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b4
@@ -1242,9 +1249,9 @@ bool_or: {
   //SEG78 [40] if((byte) bool_or::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_or::@2 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
     bcc b2
-    jmp b7
-  //SEG79 bool_or::@7
-  b7:
+    jmp b5
+  //SEG79 bool_or::@5
+  b5:
   //SEG80 [41] if((byte~) bool_or::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_or::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b2
@@ -1291,9 +1298,9 @@ bool_and: {
   //SEG96 [49] (byte~) bool_and::$1 ← (byte) bool_and::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG97 [50] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@7 -- vbuxx_lt_vbuc1_then_la1 
+  //SEG97 [50] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@5 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
-    bcc b7
+    bcc b5
     jmp b4
   //SEG98 bool_and::@4
   b4:
@@ -1313,8 +1320,8 @@ bool_and: {
   breturn:
   //SEG104 [54] return 
     rts
-  //SEG105 bool_and::@7
-  b7:
+  //SEG105 bool_and::@5
+  b5:
   //SEG106 [55] if((byte~) bool_and::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_and::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b2
@@ -1328,25 +1335,25 @@ bool_and: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b5
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b7
-Removing instruction jmp b9
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b1
+Removing instruction jmp b5
 Removing instruction jmp b7
 Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b7
+Removing instruction jmp b5
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b5
 Removing instruction jmp b4
 Removing instruction jmp b3
 Removing instruction jmp breturn
@@ -1359,10 +1366,10 @@ Replacing label b1_from_b3 with b1
 Replacing label b1_from_b3 with b1
 Replacing label b1_from_b3 with b1
 Replacing label b1_from_b3 with b1
-Removing instruction b5_from_bbegin:
-Removing instruction b5:
-Removing instruction main_from_b5:
-Removing instruction bend_from_b5:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction bool_or_from_b1:
 Removing instruction b2_from_b1:
@@ -1381,14 +1388,14 @@ Removing instruction b2:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_bool_complex:
-Removing instruction b9:
+Removing instruction b7:
 Removing instruction breturn:
 Removing instruction b1_from_bool_not:
-Removing instruction b7:
+Removing instruction b5:
 Removing instruction b2:
 Removing instruction breturn:
 Removing instruction b1_from_bool_or:
-Removing instruction b7:
+Removing instruction b5:
 Removing instruction b4:
 Removing instruction breturn:
 Removing instruction b1_from_bool_and:
@@ -1406,7 +1413,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (void()) bool_and()
@@ -1415,7 +1422,7 @@ FINAL SYMBOL TABLE
 (label) bool_and::@2
 (label) bool_and::@3
 (label) bool_and::@4
-(label) bool_and::@7
+(label) bool_and::@5
 (label) bool_and::@return
 (byte) bool_and::i
 (byte) bool_and::i#1 reg byte x 16.5
@@ -1431,9 +1438,9 @@ FINAL SYMBOL TABLE
 (label) bool_complex::@2
 (label) bool_complex::@3
 (label) bool_complex::@4
+(label) bool_complex::@5
+(label) bool_complex::@6
 (label) bool_complex::@7
-(label) bool_complex::@8
-(label) bool_complex::@9
 (label) bool_complex::@return
 (byte) bool_complex::i
 (byte) bool_complex::i#1 reg byte x 16.5
@@ -1453,7 +1460,7 @@ FINAL SYMBOL TABLE
 (label) bool_not::@2
 (label) bool_not::@3
 (label) bool_not::@4
-(label) bool_not::@7
+(label) bool_not::@5
 (label) bool_not::@return
 (byte) bool_not::i
 (byte) bool_not::i#1 reg byte x 16.5
@@ -1469,7 +1476,7 @@ FINAL SYMBOL TABLE
 (label) bool_or::@2
 (label) bool_or::@3
 (label) bool_or::@4
-(label) bool_or::@7
+(label) bool_or::@5
 (label) bool_or::@return
 (byte) bool_or::i
 (byte) bool_or::i#1 reg byte x 16.5
@@ -1508,11 +1515,11 @@ Score: 2089
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-//SEG5 @5
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -1566,17 +1573,17 @@ bool_complex: {
   !:
     eor #1
     sta o2
-  //SEG36 [18] if((bool) bool_complex::o1#0) goto bool_complex::@8 -- vboz1_then_la1 
+  //SEG36 [18] if((bool) bool_complex::o1#0) goto bool_complex::@6 -- vboz1_then_la1 
     lda o1
     cmp #0
-    bne b8
-  //SEG37 bool_complex::@7
-  b7:
+    bne b6
+  //SEG37 bool_complex::@5
+  b5:
   //SEG38 [19] if((bool) bool_complex::o1#0) goto bool_complex::@4 -- vboz1_then_la1 
     lda o1
     cmp #0
     bne b4
-  //SEG39 bool_complex::@9
+  //SEG39 bool_complex::@7
   //SEG40 [20] if((bool) bool_complex::o2#0) goto bool_complex::@4 -- vboz1_then_la1 
     lda o2
     cmp #0
@@ -1602,13 +1609,13 @@ bool_complex: {
     lda #' '
     sta screen,x
     jmp b3
-  //SEG50 bool_complex::@8
-  b8:
+  //SEG50 bool_complex::@6
+  b6:
   //SEG51 [26] if((bool) bool_complex::o2#0) goto bool_complex::@2 -- vboz1_then_la1 
     lda o2
     cmp #0
     bne b2
-    jmp b7
+    jmp b5
 }
 //SEG52 bool_not
 bool_not: {
@@ -1626,7 +1633,7 @@ bool_not: {
   //SEG59 [30] if((byte) bool_not::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_not::@4 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
     bcc b4
-  //SEG60 bool_not::@7
+  //SEG60 bool_not::@5
   //SEG61 [31] if((byte~) bool_not::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_not::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b4
@@ -1667,7 +1674,7 @@ bool_or: {
   //SEG78 [40] if((byte) bool_or::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_or::@2 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
     bcc b2
-  //SEG79 bool_or::@7
+  //SEG79 bool_or::@5
   //SEG80 [41] if((byte~) bool_or::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_or::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b2
@@ -1705,9 +1712,9 @@ bool_and: {
   //SEG96 [49] (byte~) bool_and::$1 ← (byte) bool_and::i#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG97 [50] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@7 -- vbuxx_lt_vbuc1_then_la1 
+  //SEG97 [50] if((byte) bool_and::i#2<(byte/signed byte/word/signed word/dword/signed dword) $a) goto bool_and::@5 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$a
-    bcc b7
+    bcc b5
   //SEG98 bool_and::@4
   b4:
   //SEG99 [51] *((const byte*) bool_and::screen#0 + (byte) bool_and::i#2) ← (byte) ' ' -- pbuc1_derefidx_vbuxx=vbuc2 
@@ -1723,8 +1730,8 @@ bool_and: {
   //SEG103 bool_and::@return
   //SEG104 [54] return 
     rts
-  //SEG105 bool_and::@7
-  b7:
+  //SEG105 bool_and::@5
+  b5:
   //SEG106 [55] if((byte~) bool_and::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto bool_and::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b2
diff --git a/src/test/ref/bool-vars.sym b/src/test/ref/bool-vars.sym
index 63e7701a0..63f49cb16 100644
--- a/src/test/ref/bool-vars.sym
+++ b/src/test/ref/bool-vars.sym
@@ -1,4 +1,4 @@
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (void()) bool_and()
@@ -7,7 +7,7 @@
 (label) bool_and::@2
 (label) bool_and::@3
 (label) bool_and::@4
-(label) bool_and::@7
+(label) bool_and::@5
 (label) bool_and::@return
 (byte) bool_and::i
 (byte) bool_and::i#1 reg byte x 16.5
@@ -23,9 +23,9 @@
 (label) bool_complex::@2
 (label) bool_complex::@3
 (label) bool_complex::@4
+(label) bool_complex::@5
+(label) bool_complex::@6
 (label) bool_complex::@7
-(label) bool_complex::@8
-(label) bool_complex::@9
 (label) bool_complex::@return
 (byte) bool_complex::i
 (byte) bool_complex::i#1 reg byte x 16.5
@@ -45,7 +45,7 @@
 (label) bool_not::@2
 (label) bool_not::@3
 (label) bool_not::@4
-(label) bool_not::@7
+(label) bool_not::@5
 (label) bool_not::@return
 (byte) bool_not::i
 (byte) bool_not::i#1 reg byte x 16.5
@@ -61,7 +61,7 @@
 (label) bool_or::@2
 (label) bool_or::@3
 (label) bool_or::@4
-(label) bool_or::@7
+(label) bool_or::@5
 (label) bool_or::@return
 (byte) bool_or::i
 (byte) bool_or::i#1 reg byte x 16.5
diff --git a/src/test/ref/c64dtv-8bppcharstretch.asm b/src/test/ref/c64dtv-8bppcharstretch.asm
index 125647160..d60ee9464 100644
--- a/src/test/ref/c64dtv-8bppcharstretch.asm
+++ b/src/test/ref/c64dtv-8bppcharstretch.asm
@@ -110,13 +110,13 @@ main: {
     sta VIC_MEMORY
     ldx #0
   // DTV Palette - Grey Tones
-  b6:
+  b2:
     txa
     sta DTV_PALETTE,x
     inx
     cpx #$10
-    bne b6
-  b2:
+    bne b2
+  b1:
     // Stabilize Raster
     ldx #$ff
   rff:
@@ -158,10 +158,10 @@ main: {
     sta VIC_CONTROL
     lda #0
     sta BORDERCOL
-  b8:
+  b3:
     lda #$42
     cmp RASTER
-    bne b8
+    bne b3
     nop
     nop
     nop
@@ -180,7 +180,7 @@ main: {
     nop
     nop
     nop
-  b11:
+  b5:
     ldx RASTER
     txa
     and #7
@@ -208,8 +208,8 @@ main: {
     nop
     nop
     cpx #$f2
-    bne b11
-    jmp b2
+    bne b5
+    jmp b1
 }
 // Initialize the different graphics in the memory
 gfx_init: {
diff --git a/src/test/ref/c64dtv-8bppcharstretch.cfg b/src/test/ref/c64dtv-8bppcharstretch.cfg
index e1a8b09a1..75e495969 100644
--- a/src/test/ref/c64dtv-8bppcharstretch.cfg
+++ b/src/test/ref/c64dtv-8bppcharstretch.cfg
@@ -1,19 +1,19 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@9
-@9: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @9
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @9
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
   [7] call gfx_init 
-  to:main::@17
-main::@17: scope:[main]  from main
+  to:main::@6
+main::@6: scope:[main]  from main
   [8] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
   [9] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_BADLINE_OFF#0
   [10] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
@@ -33,25 +33,25 @@ main::@17: scope:[main]  from main
   [24] *((const byte*) CIA2_PORT_A_DDR#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3
   [25] *((const byte*) CIA2_PORT_A#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3^((byte))((word))(const byte*) SCREEN#0/(word/signed word/dword/signed dword) $4000
   [26] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) SCREEN#0&(word/signed word/dword/signed dword) $3fff>>(byte/signed byte/word/signed word/dword/signed dword) 6|>((word))(const byte*) SCREEN#0&(word/signed word/dword/signed dword) $3fff>>(byte/signed byte/word/signed word/dword/signed dword) 2
-  to:main::@6
-main::@6: scope:[main]  from main::@17 main::@6
-  [27] (byte) main::j#2 ← phi( main::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::j#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@2 main::@6
+  [27] (byte) main::j#2 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::j#1 )
   [28] *((const byte*) DTV_PALETTE#0 + (byte) main::j#2) ← (byte) main::j#2
   [29] (byte) main::j#1 ← ++ (byte) main::j#2
-  [30] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@6
-  to:main::@2
-main::@2: scope:[main]  from main::@11 main::@6
+  [30] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@2 main::@5
   asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  }
   [32] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [33] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:main::@8
-main::@8: scope:[main]  from main::@2 main::@8
-  [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8
-  to:main::@10
-main::@10: scope:[main]  from main::@8
+  to:main::@3
+main::@3: scope:[main]  from main::@1 main::@3
+  [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
-  to:main::@11
-main::@11: scope:[main]  from main::@10 main::@11
+  to:main::@5
+main::@5: scope:[main]  from main::@4 main::@5
   [36] (byte) main::rst#1 ← *((const byte*) RASTER#0)
   [37] (byte~) main::$32 ← (byte) main::rst#1 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [38] (byte~) main::$33 ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0 | (byte~) main::$32
@@ -59,8 +59,8 @@ main::@11: scope:[main]  from main::@10 main::@11
   [40] (byte~) main::$34 ← (byte) main::rst#1 << (byte/signed byte/word/signed word/dword/signed dword) 4
   [41] *((const byte*) BORDERCOL#0) ← (byte~) main::$34
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
-  [43] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@11
-  to:main::@2
+  [43] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@5
+  to:main::@1
 gfx_init: scope:[gfx_init]  from main
   [44] phi()
   [45] call gfx_init_screen0 
diff --git a/src/test/ref/c64dtv-8bppcharstretch.log b/src/test/ref/c64dtv-8bppcharstretch.log
index 420cce0b8..5b7642ce9 100644
--- a/src/test/ref/c64dtv-8bppcharstretch.log
+++ b/src/test/ref/c64dtv-8bppcharstretch.log
@@ -1431,8 +1431,15 @@ Culled Empty Block (label) gfx_init_plane_charset8::@12
 Culled Empty Block (label) gfx_init_plane_charset8::@13
 Culled Empty Block (label) gfx_init_screen0::@5
 Culled Empty Block (label) gfx_init_screen0::@6
+Renumbering block @9 to @1
+Renumbering block main::@2 to main::@1
+Renumbering block main::@6 to main::@2
+Renumbering block main::@8 to main::@3
+Renumbering block main::@10 to main::@4
+Renumbering block main::@11 to main::@5
+Renumbering block main::@17 to main::@6
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @9
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of gfx_init
 Adding NOP phi() at start of gfx_init::@1
@@ -1442,20 +1449,20 @@ Adding NOP phi() at start of gfx_init_screen0
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@9
-@9: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @9
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @9
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
   [7] call gfx_init 
-  to:main::@17
-main::@17: scope:[main]  from main
+  to:main::@6
+main::@6: scope:[main]  from main
   [8] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
   [9] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_BADLINE_OFF#0
   [10] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
@@ -1475,25 +1482,25 @@ main::@17: scope:[main]  from main
   [24] *((const byte*) CIA2_PORT_A_DDR#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3
   [25] *((const byte*) CIA2_PORT_A#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3^((byte))((word))(const byte*) SCREEN#0/(word/signed word/dword/signed dword) $4000
   [26] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) SCREEN#0&(word/signed word/dword/signed dword) $3fff>>(byte/signed byte/word/signed word/dword/signed dword) 6|>((word))(const byte*) SCREEN#0&(word/signed word/dword/signed dword) $3fff>>(byte/signed byte/word/signed word/dword/signed dword) 2
-  to:main::@6
-main::@6: scope:[main]  from main::@17 main::@6
-  [27] (byte) main::j#2 ← phi( main::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::j#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@2 main::@6
+  [27] (byte) main::j#2 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::j#1 )
   [28] *((const byte*) DTV_PALETTE#0 + (byte) main::j#2) ← (byte) main::j#2
   [29] (byte) main::j#1 ← ++ (byte) main::j#2
-  [30] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@6
-  to:main::@2
-main::@2: scope:[main]  from main::@11 main::@6
+  [30] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@2 main::@5
   asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  }
   [32] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [33] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:main::@8
-main::@8: scope:[main]  from main::@2 main::@8
-  [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8
-  to:main::@10
-main::@10: scope:[main]  from main::@8
+  to:main::@3
+main::@3: scope:[main]  from main::@1 main::@3
+  [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
-  to:main::@11
-main::@11: scope:[main]  from main::@10 main::@11
+  to:main::@5
+main::@5: scope:[main]  from main::@4 main::@5
   [36] (byte) main::rst#1 ← *((const byte*) RASTER#0)
   [37] (byte~) main::$32 ← (byte) main::rst#1 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [38] (byte~) main::$33 ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0 | (byte~) main::$32
@@ -1501,8 +1508,8 @@ main::@11: scope:[main]  from main::@10 main::@11
   [40] (byte~) main::$34 ← (byte) main::rst#1 << (byte/signed byte/word/signed word/dword/signed dword) 4
   [41] *((const byte*) BORDERCOL#0) ← (byte~) main::$34
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
-  [43] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@11
-  to:main::@2
+  [43] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@5
+  to:main::@1
 gfx_init: scope:[gfx_init]  from main
   [44] phi()
   [45] call gfx_init_screen0 
@@ -1980,15 +1987,15 @@ INITIAL ASM
   .label CHARSET8 = $8000
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @9 [phi:@begin->@9]
-b9_from_bbegin:
-  jmp b9
-//SEG5 @9
-b9:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @9 to @end [phi:@9->@end]
-bend_from_b9:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -2013,9 +2020,9 @@ main: {
   //SEG14 [44] phi from main to gfx_init [phi:main->gfx_init]
   gfx_init_from_main:
     jsr gfx_init
-    jmp b17
-  //SEG15 main::@17
-  b17:
+    jmp b6
+  //SEG15 main::@6
+  b6:
   //SEG16 [8] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0 -- _deref_pbuc1=vbuc2 
     // Enable DTV extended modes
     lda #DTV_FEATURE_ENABLE
@@ -2081,32 +2088,32 @@ main: {
     // VIC memory
     lda #(SCREEN&$3fff)>>6|(>(SCREEN&$3fff))>>2
     sta VIC_MEMORY
-  //SEG35 [27] phi from main::@17 to main::@6 [phi:main::@17->main::@6]
-  b6_from_b17:
-  //SEG36 [27] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@6#0] -- vbuz1=vbuc1 
+  //SEG35 [27] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
+  b2_from_b6:
+  //SEG36 [27] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-    jmp b6
+    jmp b2
   // DTV Palette - Grey Tones
-  //SEG37 [27] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  b6_from_b6:
-  //SEG38 [27] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@6->main::@6#0] -- register_copy 
-    jmp b6
-  //SEG39 main::@6
-  b6:
+  //SEG37 [27] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG38 [27] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG39 main::@2
+  b2:
   //SEG40 [28] *((const byte*) DTV_PALETTE#0 + (byte) main::j#2) ← (byte) main::j#2 -- pbuc1_derefidx_vbuz1=vbuz1 
     ldy j
     tya
     sta DTV_PALETTE,y
   //SEG41 [29] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG42 [30] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG42 [30] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$10
     cmp j
-    bne b6_from_b6
-    jmp b2
-  //SEG43 main::@2
-  b2:
+    bne b2_from_b2
+    jmp b1
+  //SEG43 main::@1
+  b1:
   //SEG44 asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  }
     // Stabilize Raster
     ldx #$ff
@@ -2151,16 +2158,16 @@ main: {
   //SEG46 [33] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta BORDERCOL
-    jmp b8
-  //SEG47 main::@8
-  b8:
-  //SEG48 [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b3
+  //SEG47 main::@3
+  b3:
+  //SEG48 [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$42
     cmp RASTER
-    bne b8
-    jmp b10
-  //SEG49 main::@10
-  b10:
+    bne b3
+    jmp b4
+  //SEG49 main::@4
+  b4:
   //SEG50 asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
     nop
     nop
@@ -2180,9 +2187,9 @@ main: {
     nop
     nop
     nop
-    jmp b11
-  //SEG51 main::@11
-  b11:
+    jmp b5
+  //SEG51 main::@5
+  b5:
   //SEG52 [36] (byte) main::rst#1 ← *((const byte*) RASTER#0) -- vbuz1=_deref_pbuc1 
     lda RASTER
     sta rst
@@ -2223,11 +2230,11 @@ main: {
     nop
     nop
     nop
-  //SEG59 [43] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG59 [43] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #$f2
     cmp rst
-    bne b11
-    jmp b2
+    bne b5
+    jmp b1
 }
 //SEG60 gfx_init
 // Initialize the different graphics in the memory
@@ -2571,7 +2578,7 @@ Statement [26] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) S
 Statement asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  } always clobbers reg byte x 
 Statement [32] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [33] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
-Statement [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [38] (byte~) main::$33 ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0 | (byte~) main::$32 [ main::rst#1 main::$33 ] ( main:2 [ main::rst#1 main::$33 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:18 [ main::rst#1 ]
 Statement [40] (byte~) main::$34 ← (byte) main::rst#1 << (byte/signed byte/word/signed word/dword/signed dword) 4 [ main::rst#1 main::$34 ] ( main:2 [ main::rst#1 main::$34 ] ) always clobbers reg byte a 
@@ -2620,7 +2627,7 @@ Statement [26] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) S
 Statement asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  } always clobbers reg byte x 
 Statement [32] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [33] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
-Statement [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [37] (byte~) main::$32 ← (byte) main::rst#1 & (byte/signed byte/word/signed word/dword/signed dword) 7 [ main::rst#1 main::$32 ] ( main:2 [ main::rst#1 main::$32 ] ) always clobbers reg byte a 
 Statement [38] (byte~) main::$33 ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0 | (byte~) main::$32 [ main::rst#1 main::$33 ] ( main:2 [ main::rst#1 main::$33 ] ) always clobbers reg byte a 
 Statement [40] (byte~) main::$34 ← (byte) main::rst#1 << (byte/signed byte/word/signed word/dword/signed dword) 4 [ main::rst#1 main::$34 ] ( main:2 [ main::rst#1 main::$34 ] ) always clobbers reg byte a 
@@ -2762,15 +2769,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label CHARSET8 = $8000
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @9 [phi:@begin->@9]
-b9_from_bbegin:
-  jmp b9
-//SEG5 @9
-b9:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @9 to @end [phi:@9->@end]
-bend_from_b9:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -2790,9 +2797,9 @@ main: {
   //SEG14 [44] phi from main to gfx_init [phi:main->gfx_init]
   gfx_init_from_main:
     jsr gfx_init
-    jmp b17
-  //SEG15 main::@17
-  b17:
+    jmp b6
+  //SEG15 main::@6
+  b6:
   //SEG16 [8] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0 -- _deref_pbuc1=vbuc2 
     // Enable DTV extended modes
     lda #DTV_FEATURE_ENABLE
@@ -2858,29 +2865,29 @@ main: {
     // VIC memory
     lda #(SCREEN&$3fff)>>6|(>(SCREEN&$3fff))>>2
     sta VIC_MEMORY
-  //SEG35 [27] phi from main::@17 to main::@6 [phi:main::@17->main::@6]
-  b6_from_b17:
-  //SEG36 [27] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@6#0] -- vbuxx=vbuc1 
+  //SEG35 [27] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
+  b2_from_b6:
+  //SEG36 [27] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@2#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b6
+    jmp b2
   // DTV Palette - Grey Tones
-  //SEG37 [27] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  b6_from_b6:
-  //SEG38 [27] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@6->main::@6#0] -- register_copy 
-    jmp b6
-  //SEG39 main::@6
-  b6:
+  //SEG37 [27] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG38 [27] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG39 main::@2
+  b2:
   //SEG40 [28] *((const byte*) DTV_PALETTE#0 + (byte) main::j#2) ← (byte) main::j#2 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta DTV_PALETTE,x
   //SEG41 [29] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG42 [30] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG42 [30] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b6_from_b6
-    jmp b2
-  //SEG43 main::@2
-  b2:
+    bne b2_from_b2
+    jmp b1
+  //SEG43 main::@1
+  b1:
   //SEG44 asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  }
     // Stabilize Raster
     ldx #$ff
@@ -2925,16 +2932,16 @@ main: {
   //SEG46 [33] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta BORDERCOL
-    jmp b8
-  //SEG47 main::@8
-  b8:
-  //SEG48 [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b3
+  //SEG47 main::@3
+  b3:
+  //SEG48 [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$42
     cmp RASTER
-    bne b8
-    jmp b10
-  //SEG49 main::@10
-  b10:
+    bne b3
+    jmp b4
+  //SEG49 main::@4
+  b4:
   //SEG50 asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
     nop
     nop
@@ -2954,9 +2961,9 @@ main: {
     nop
     nop
     nop
-    jmp b11
-  //SEG51 main::@11
-  b11:
+    jmp b5
+  //SEG51 main::@5
+  b5:
   //SEG52 [36] (byte) main::rst#1 ← *((const byte*) RASTER#0) -- vbuxx=_deref_pbuc1 
     ldx RASTER
   //SEG53 [37] (byte~) main::$32 ← (byte) main::rst#1 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
@@ -2990,10 +2997,10 @@ main: {
     nop
     nop
     nop
-  //SEG59 [43] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG59 [43] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@5 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$f2
-    bne b11
-    jmp b2
+    bne b5
+    jmp b1
 }
 //SEG60 gfx_init
 // Initialize the different graphics in the memory
@@ -3287,14 +3294,14 @@ gfx_init_screen0: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b9
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b17
 Removing instruction jmp b6
 Removing instruction jmp b2
-Removing instruction jmp b8
-Removing instruction jmp b10
-Removing instruction jmp b11
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b9
@@ -3319,16 +3326,16 @@ Removing instruction lda #0
 Removing instruction lda #0
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b6_from_b6 with b6
+Replacing label b2_from_b2 with b2
 Replacing label b3_from_b4 with b3
 Replacing label b2_from_b6 with b2
 Replacing label b1_from_b7 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
-Removing instruction b9_from_bbegin:
-Removing instruction b9:
-Removing instruction bend_from_b9:
-Removing instruction b6_from_b6:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction b2_from_b2:
 Removing instruction b1_from_gfx_init:
 Removing instruction gfx_init_plane_charset8_from_b1:
 Removing instruction b1_from_b7:
@@ -3341,9 +3348,9 @@ Removing instruction b2_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction gfx_init_from_main:
-Removing instruction b17:
-Removing instruction b6_from_b17:
-Removing instruction b10:
+Removing instruction b6:
+Removing instruction b2_from_b6:
+Removing instruction b4:
 Removing instruction gfx_init_screen0_from_gfx_init:
 Removing instruction b1:
 Removing instruction breturn:
@@ -3368,7 +3375,7 @@ Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Relabelling long label b4_from_b3 to b5
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b6
+Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
@@ -3379,7 +3386,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @9
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -3674,12 +3681,12 @@ FINAL SYMBOL TABLE
 (byte~) main::$32 reg byte a 202.0
 (byte~) main::$33 reg byte a 202.0
 (byte~) main::$34 reg byte a 202.0
-(label) main::@10
-(label) main::@11
-(label) main::@17
+(label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
-(label) main::@8
 (byte) main::j
 (byte) main::j#1 reg byte x 16.5
 (byte) main::j#2 reg byte x 22.0
@@ -3773,10 +3780,10 @@ Score: 75377
   // Plane with all pixels
   .label CHARSET8 = $8000
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @9 [phi:@begin->@9]
-//SEG5 @9
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @9 to @end [phi:@9->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -3793,7 +3800,7 @@ main: {
   //SEG13 [7] call gfx_init 
   //SEG14 [44] phi from main to gfx_init [phi:main->gfx_init]
     jsr gfx_init
-  //SEG15 main::@17
+  //SEG15 main::@6
   //SEG16 [8] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0 -- _deref_pbuc1=vbuc2 
     // Enable DTV extended modes
     lda #DTV_FEATURE_ENABLE
@@ -3855,24 +3862,24 @@ main: {
     // VIC memory
     lda #(SCREEN&$3fff)>>6|(>(SCREEN&$3fff))>>2
     sta VIC_MEMORY
-  //SEG35 [27] phi from main::@17 to main::@6 [phi:main::@17->main::@6]
-  //SEG36 [27] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@6#0] -- vbuxx=vbuc1 
+  //SEG35 [27] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
+  //SEG36 [27] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@2#0] -- vbuxx=vbuc1 
     ldx #0
   // DTV Palette - Grey Tones
-  //SEG37 [27] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  //SEG38 [27] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@6->main::@6#0] -- register_copy 
-  //SEG39 main::@6
-  b6:
+  //SEG37 [27] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  //SEG38 [27] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@2->main::@2#0] -- register_copy 
+  //SEG39 main::@2
+  b2:
   //SEG40 [28] *((const byte*) DTV_PALETTE#0 + (byte) main::j#2) ← (byte) main::j#2 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta DTV_PALETTE,x
   //SEG41 [29] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG42 [30] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG42 [30] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b6
-  //SEG43 main::@2
-  b2:
+    bne b2
+  //SEG43 main::@1
+  b1:
   //SEG44 asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  }
     // Stabilize Raster
     ldx #$ff
@@ -3917,13 +3924,13 @@ main: {
   //SEG46 [33] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta BORDERCOL
-  //SEG47 main::@8
-  b8:
-  //SEG48 [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG47 main::@3
+  b3:
+  //SEG48 [34] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$42
     cmp RASTER
-    bne b8
-  //SEG49 main::@10
+    bne b3
+  //SEG49 main::@4
   //SEG50 asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
     nop
     nop
@@ -3943,8 +3950,8 @@ main: {
     nop
     nop
     nop
-  //SEG51 main::@11
-  b11:
+  //SEG51 main::@5
+  b5:
   //SEG52 [36] (byte) main::rst#1 ← *((const byte*) RASTER#0) -- vbuxx=_deref_pbuc1 
     ldx RASTER
   //SEG53 [37] (byte~) main::$32 ← (byte) main::rst#1 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
@@ -3978,10 +3985,10 @@ main: {
     nop
     nop
     nop
-  //SEG59 [43] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG59 [43] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@5 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$f2
-    bne b11
-    jmp b2
+    bne b5
+    jmp b1
 }
 //SEG60 gfx_init
 // Initialize the different graphics in the memory
diff --git a/src/test/ref/c64dtv-8bppcharstretch.sym b/src/test/ref/c64dtv-8bppcharstretch.sym
index e0586f3c8..6a29f0da6 100644
--- a/src/test/ref/c64dtv-8bppcharstretch.sym
+++ b/src/test/ref/c64dtv-8bppcharstretch.sym
@@ -1,4 +1,4 @@
-(label) @9
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -293,12 +293,12 @@
 (byte~) main::$32 reg byte a 202.0
 (byte~) main::$33 reg byte a 202.0
 (byte~) main::$34 reg byte a 202.0
-(label) main::@10
-(label) main::@11
-(label) main::@17
+(label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
-(label) main::@8
 (byte) main::j
 (byte) main::j#1 reg byte x 16.5
 (byte) main::j#2 reg byte x 22.0
diff --git a/src/test/ref/c64dtv-8bppchunkystretch.asm b/src/test/ref/c64dtv-8bppchunkystretch.asm
index 6d4ae8c34..b1e738efa 100644
--- a/src/test/ref/c64dtv-8bppchunkystretch.asm
+++ b/src/test/ref/c64dtv-8bppchunkystretch.asm
@@ -88,13 +88,13 @@ main: {
     sta VIC_MEMORY
     ldx #0
   // DTV Palette - Grey Tones
-  b6:
+  b2:
     txa
     sta DTV_PALETTE,x
     inx
     cpx #$10
-    bne b6
-  b2:
+    bne b2
+  b1:
     // Stabilize Raster
     ldx #$ff
   rff:
@@ -136,10 +136,10 @@ main: {
     sta VIC_CONTROL
     lda #0
     sta BORDERCOL
-  b8:
+  b3:
     lda #$42
     cmp RASTER
-    bne b8
+    bne b3
     nop
     nop
     nop
@@ -158,7 +158,7 @@ main: {
     nop
     nop
     nop
-  b11:
+  b5:
     ldx RASTER
     txa
     and #7
@@ -186,8 +186,8 @@ main: {
     nop
     nop
     cpx #$f2
-    bne b11
-    jmp b2
+    bne b5
+    jmp b1
 }
 // Initialize Plane with 8bpp chunky
 gfx_init_chunky: {
diff --git a/src/test/ref/c64dtv-8bppchunkystretch.cfg b/src/test/ref/c64dtv-8bppchunkystretch.cfg
index d2121457f..f3a5427c5 100644
--- a/src/test/ref/c64dtv-8bppchunkystretch.cfg
+++ b/src/test/ref/c64dtv-8bppchunkystretch.cfg
@@ -1,19 +1,19 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@7
-@7: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @7
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @7
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
   [7] call gfx_init_chunky 
-  to:main::@17
-main::@17: scope:[main]  from main
+  to:main::@6
+main::@6: scope:[main]  from main
   [8] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
   [9] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_COLORRAM_OFF#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_BADLINE_OFF#0
   [10] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
@@ -27,25 +27,25 @@ main::@17: scope:[main]  from main
   [18] *((const byte*) CIA2_PORT_A_DDR#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3
   [19] *((const byte*) CIA2_PORT_A#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3^((byte))((word))(const byte*) CHUNKY#0/(word/signed word/dword/signed dword) $4000
   [20] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) CHUNKY#0&(word/signed word/dword/signed dword) $3fff>>(byte/signed byte/word/signed word/dword/signed dword) 6|>((word))(const byte*) CHUNKY#0&(word/signed word/dword/signed dword) $3fff>>(byte/signed byte/word/signed word/dword/signed dword) 2
-  to:main::@6
-main::@6: scope:[main]  from main::@17 main::@6
-  [21] (byte) main::j#2 ← phi( main::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::j#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@2 main::@6
+  [21] (byte) main::j#2 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::j#1 )
   [22] *((const byte*) DTV_PALETTE#0 + (byte) main::j#2) ← (byte) main::j#2
   [23] (byte) main::j#1 ← ++ (byte) main::j#2
-  [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@6
-  to:main::@2
-main::@2: scope:[main]  from main::@11 main::@6
+  [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@2 main::@5
   asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  }
   [26] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [27] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:main::@8
-main::@8: scope:[main]  from main::@2 main::@8
-  [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8
-  to:main::@10
-main::@10: scope:[main]  from main::@8
+  to:main::@3
+main::@3: scope:[main]  from main::@1 main::@3
+  [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
-  to:main::@11
-main::@11: scope:[main]  from main::@10 main::@11
+  to:main::@5
+main::@5: scope:[main]  from main::@4 main::@5
   [30] (byte) main::rst#1 ← *((const byte*) RASTER#0)
   [31] (byte~) main::$31 ← (byte) main::rst#1 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [32] (byte~) main::$32 ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0 | (byte~) main::$31
@@ -53,8 +53,8 @@ main::@11: scope:[main]  from main::@10 main::@11
   [34] (byte~) main::$33 ← (byte) main::rst#1 << (byte/signed byte/word/signed word/dword/signed dword) 4
   [35] *((const byte*) BORDERCOL#0) ← (byte~) main::$33
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
-  [37] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@11
-  to:main::@2
+  [37] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@5
+  to:main::@1
 gfx_init_chunky: scope:[gfx_init_chunky]  from main
   [38] phi()
   [39] call dtvSetCpuBankSegment1 
@@ -73,13 +73,13 @@ gfx_init_chunky::@2: scope:[gfx_init_chunky]  from gfx_init_chunky::@1 gfx_init_
 gfx_init_chunky::@4: scope:[gfx_init_chunky]  from gfx_init_chunky::@2
   [43] (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 ← (byte) gfx_init_chunky::gfxbCpuBank#4
   [44] call dtvSetCpuBankSegment1 
-  to:gfx_init_chunky::@8
-gfx_init_chunky::@8: scope:[gfx_init_chunky]  from gfx_init_chunky::@4
+  to:gfx_init_chunky::@7
+gfx_init_chunky::@7: scope:[gfx_init_chunky]  from gfx_init_chunky::@4
   [45] (byte) gfx_init_chunky::gfxbCpuBank#2 ← ++ (byte) gfx_init_chunky::gfxbCpuBank#4
   to:gfx_init_chunky::@3
-gfx_init_chunky::@3: scope:[gfx_init_chunky]  from gfx_init_chunky::@2 gfx_init_chunky::@8
-  [46] (byte) gfx_init_chunky::gfxbCpuBank#8 ← phi( gfx_init_chunky::@2/(byte) gfx_init_chunky::gfxbCpuBank#4 gfx_init_chunky::@8/(byte) gfx_init_chunky::gfxbCpuBank#2 )
-  [46] (byte*) gfx_init_chunky::gfxb#4 ← phi( gfx_init_chunky::@2/(byte*) gfx_init_chunky::gfxb#3 gfx_init_chunky::@8/((byte*))(word/signed word/dword/signed dword) $4000 )
+gfx_init_chunky::@3: scope:[gfx_init_chunky]  from gfx_init_chunky::@2 gfx_init_chunky::@7
+  [46] (byte) gfx_init_chunky::gfxbCpuBank#8 ← phi( gfx_init_chunky::@2/(byte) gfx_init_chunky::gfxbCpuBank#4 gfx_init_chunky::@7/(byte) gfx_init_chunky::gfxbCpuBank#2 )
+  [46] (byte*) gfx_init_chunky::gfxb#4 ← phi( gfx_init_chunky::@2/(byte*) gfx_init_chunky::gfxb#3 gfx_init_chunky::@7/((byte*))(word/signed word/dword/signed dword) $4000 )
   [47] (word~) gfx_init_chunky::$9 ← (word) gfx_init_chunky::x#2 + (byte) gfx_init_chunky::y#6
   [48] (byte) gfx_init_chunky::c#0 ← ((byte)) (word~) gfx_init_chunky::$9
   [49] *((byte*) gfx_init_chunky::gfxb#4) ← (byte) gfx_init_chunky::c#0
diff --git a/src/test/ref/c64dtv-8bppchunkystretch.log b/src/test/ref/c64dtv-8bppchunkystretch.log
index 328e6e4ba..f5e22f34e 100644
--- a/src/test/ref/c64dtv-8bppchunkystretch.log
+++ b/src/test/ref/c64dtv-8bppchunkystretch.log
@@ -1199,8 +1199,16 @@ Culled Empty Block (label) main::@18
 Culled Empty Block (label) gfx_init_chunky::@10
 Culled Empty Block (label) gfx_init_chunky::@11
 Culled Empty Block (label) gfx_init_chunky::@12
+Renumbering block @7 to @1
+Renumbering block main::@2 to main::@1
+Renumbering block main::@6 to main::@2
+Renumbering block main::@8 to main::@3
+Renumbering block main::@10 to main::@4
+Renumbering block main::@11 to main::@5
+Renumbering block main::@17 to main::@6
+Renumbering block gfx_init_chunky::@8 to gfx_init_chunky::@7
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @7
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of gfx_init_chunky
 Adding NOP phi() at start of gfx_init_chunky::@6
@@ -1208,20 +1216,20 @@ Adding NOP phi() at start of gfx_init_chunky::@6
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@7
-@7: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @7
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @7
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
   [7] call gfx_init_chunky 
-  to:main::@17
-main::@17: scope:[main]  from main
+  to:main::@6
+main::@6: scope:[main]  from main
   [8] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
   [9] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_COLORRAM_OFF#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_BADLINE_OFF#0
   [10] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
@@ -1235,25 +1243,25 @@ main::@17: scope:[main]  from main
   [18] *((const byte*) CIA2_PORT_A_DDR#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3
   [19] *((const byte*) CIA2_PORT_A#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3^((byte))((word))(const byte*) CHUNKY#0/(word/signed word/dword/signed dword) $4000
   [20] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) CHUNKY#0&(word/signed word/dword/signed dword) $3fff>>(byte/signed byte/word/signed word/dword/signed dword) 6|>((word))(const byte*) CHUNKY#0&(word/signed word/dword/signed dword) $3fff>>(byte/signed byte/word/signed word/dword/signed dword) 2
-  to:main::@6
-main::@6: scope:[main]  from main::@17 main::@6
-  [21] (byte) main::j#2 ← phi( main::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::j#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@2 main::@6
+  [21] (byte) main::j#2 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::j#1 )
   [22] *((const byte*) DTV_PALETTE#0 + (byte) main::j#2) ← (byte) main::j#2
   [23] (byte) main::j#1 ← ++ (byte) main::j#2
-  [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@6
-  to:main::@2
-main::@2: scope:[main]  from main::@11 main::@6
+  [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@2 main::@5
   asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  }
   [26] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [27] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:main::@8
-main::@8: scope:[main]  from main::@2 main::@8
-  [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8
-  to:main::@10
-main::@10: scope:[main]  from main::@8
+  to:main::@3
+main::@3: scope:[main]  from main::@1 main::@3
+  [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
-  to:main::@11
-main::@11: scope:[main]  from main::@10 main::@11
+  to:main::@5
+main::@5: scope:[main]  from main::@4 main::@5
   [30] (byte) main::rst#1 ← *((const byte*) RASTER#0)
   [31] (byte~) main::$31 ← (byte) main::rst#1 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [32] (byte~) main::$32 ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0 | (byte~) main::$31
@@ -1261,8 +1269,8 @@ main::@11: scope:[main]  from main::@10 main::@11
   [34] (byte~) main::$33 ← (byte) main::rst#1 << (byte/signed byte/word/signed word/dword/signed dword) 4
   [35] *((const byte*) BORDERCOL#0) ← (byte~) main::$33
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
-  [37] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@11
-  to:main::@2
+  [37] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@5
+  to:main::@1
 gfx_init_chunky: scope:[gfx_init_chunky]  from main
   [38] phi()
   [39] call dtvSetCpuBankSegment1 
@@ -1281,13 +1289,13 @@ gfx_init_chunky::@2: scope:[gfx_init_chunky]  from gfx_init_chunky::@1 gfx_init_
 gfx_init_chunky::@4: scope:[gfx_init_chunky]  from gfx_init_chunky::@2
   [43] (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 ← (byte) gfx_init_chunky::gfxbCpuBank#4
   [44] call dtvSetCpuBankSegment1 
-  to:gfx_init_chunky::@8
-gfx_init_chunky::@8: scope:[gfx_init_chunky]  from gfx_init_chunky::@4
+  to:gfx_init_chunky::@7
+gfx_init_chunky::@7: scope:[gfx_init_chunky]  from gfx_init_chunky::@4
   [45] (byte) gfx_init_chunky::gfxbCpuBank#2 ← ++ (byte) gfx_init_chunky::gfxbCpuBank#4
   to:gfx_init_chunky::@3
-gfx_init_chunky::@3: scope:[gfx_init_chunky]  from gfx_init_chunky::@2 gfx_init_chunky::@8
-  [46] (byte) gfx_init_chunky::gfxbCpuBank#8 ← phi( gfx_init_chunky::@2/(byte) gfx_init_chunky::gfxbCpuBank#4 gfx_init_chunky::@8/(byte) gfx_init_chunky::gfxbCpuBank#2 )
-  [46] (byte*) gfx_init_chunky::gfxb#4 ← phi( gfx_init_chunky::@2/(byte*) gfx_init_chunky::gfxb#3 gfx_init_chunky::@8/((byte*))(word/signed word/dword/signed dword) $4000 )
+gfx_init_chunky::@3: scope:[gfx_init_chunky]  from gfx_init_chunky::@2 gfx_init_chunky::@7
+  [46] (byte) gfx_init_chunky::gfxbCpuBank#8 ← phi( gfx_init_chunky::@2/(byte) gfx_init_chunky::gfxbCpuBank#4 gfx_init_chunky::@7/(byte) gfx_init_chunky::gfxbCpuBank#2 )
+  [46] (byte*) gfx_init_chunky::gfxb#4 ← phi( gfx_init_chunky::@2/(byte*) gfx_init_chunky::gfxb#3 gfx_init_chunky::@7/((byte*))(word/signed word/dword/signed dword) $4000 )
   [47] (word~) gfx_init_chunky::$9 ← (word) gfx_init_chunky::x#2 + (byte) gfx_init_chunky::y#6
   [48] (byte) gfx_init_chunky::c#0 ← ((byte)) (word~) gfx_init_chunky::$9
   [49] *((byte*) gfx_init_chunky::gfxb#4) ← (byte) gfx_init_chunky::c#0
@@ -1619,15 +1627,15 @@ INITIAL ASM
   .label CHUNKY = $8000
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-b7_from_bbegin:
-  jmp b7
-//SEG5 @7
-b7:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @7 to @end [phi:@7->@end]
-bend_from_b7:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -1652,9 +1660,9 @@ main: {
   //SEG14 [38] phi from main to gfx_init_chunky [phi:main->gfx_init_chunky]
   gfx_init_chunky_from_main:
     jsr gfx_init_chunky
-    jmp b17
-  //SEG15 main::@17
-  b17:
+    jmp b6
+  //SEG15 main::@6
+  b6:
   //SEG16 [8] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0 -- _deref_pbuc1=vbuc2 
     // Enable DTV extended modes
     lda #DTV_FEATURE_ENABLE
@@ -1701,32 +1709,32 @@ main: {
     // VIC memory
     lda #(CHUNKY&$3fff)>>6|(0)>>2
     sta VIC_MEMORY
-  //SEG29 [21] phi from main::@17 to main::@6 [phi:main::@17->main::@6]
-  b6_from_b17:
-  //SEG30 [21] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@6#0] -- vbuz1=vbuc1 
+  //SEG29 [21] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
+  b2_from_b6:
+  //SEG30 [21] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-    jmp b6
+    jmp b2
   // DTV Palette - Grey Tones
-  //SEG31 [21] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  b6_from_b6:
-  //SEG32 [21] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@6->main::@6#0] -- register_copy 
-    jmp b6
-  //SEG33 main::@6
-  b6:
+  //SEG31 [21] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG32 [21] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG33 main::@2
+  b2:
   //SEG34 [22] *((const byte*) DTV_PALETTE#0 + (byte) main::j#2) ← (byte) main::j#2 -- pbuc1_derefidx_vbuz1=vbuz1 
     ldy j
     tya
     sta DTV_PALETTE,y
   //SEG35 [23] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG36 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG36 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$10
     cmp j
-    bne b6_from_b6
-    jmp b2
-  //SEG37 main::@2
-  b2:
+    bne b2_from_b2
+    jmp b1
+  //SEG37 main::@1
+  b1:
   //SEG38 asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  }
     // Stabilize Raster
     ldx #$ff
@@ -1771,16 +1779,16 @@ main: {
   //SEG40 [27] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta BORDERCOL
-    jmp b8
-  //SEG41 main::@8
-  b8:
-  //SEG42 [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b3
+  //SEG41 main::@3
+  b3:
+  //SEG42 [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$42
     cmp RASTER
-    bne b8
-    jmp b10
-  //SEG43 main::@10
-  b10:
+    bne b3
+    jmp b4
+  //SEG43 main::@4
+  b4:
   //SEG44 asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
     nop
     nop
@@ -1800,9 +1808,9 @@ main: {
     nop
     nop
     nop
-    jmp b11
-  //SEG45 main::@11
-  b11:
+    jmp b5
+  //SEG45 main::@5
+  b5:
   //SEG46 [30] (byte) main::rst#1 ← *((const byte*) RASTER#0) -- vbuz1=_deref_pbuc1 
     lda RASTER
     sta rst
@@ -1843,11 +1851,11 @@ main: {
     nop
     nop
     nop
-  //SEG53 [37] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG53 [37] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #$f2
     cmp rst
-    bne b11
-    jmp b2
+    bne b5
+    jmp b1
 }
 //SEG54 gfx_init_chunky
 // Initialize Plane with 8bpp chunky
@@ -1923,15 +1931,15 @@ gfx_init_chunky: {
   dtvSetCpuBankSegment1_from_b4:
   //SEG81 [58] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#3 = (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:gfx_init_chunky::@4->dtvSetCpuBankSegment1#0] -- register_copy 
     jsr dtvSetCpuBankSegment1
-    jmp b8
-  //SEG82 gfx_init_chunky::@8
-  b8:
+    jmp b7
+  //SEG82 gfx_init_chunky::@7
+  b7:
   //SEG83 [45] (byte) gfx_init_chunky::gfxbCpuBank#2 ← ++ (byte) gfx_init_chunky::gfxbCpuBank#4 -- vbuz1=_inc_vbuz1 
     inc gfxbCpuBank
-  //SEG84 [46] phi from gfx_init_chunky::@8 to gfx_init_chunky::@3 [phi:gfx_init_chunky::@8->gfx_init_chunky::@3]
-  b3_from_b8:
-  //SEG85 [46] phi (byte) gfx_init_chunky::gfxbCpuBank#8 = (byte) gfx_init_chunky::gfxbCpuBank#2 [phi:gfx_init_chunky::@8->gfx_init_chunky::@3#0] -- register_copy 
-  //SEG86 [46] phi (byte*) gfx_init_chunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_chunky::@8->gfx_init_chunky::@3#1] -- pbuz1=pbuc1 
+  //SEG84 [46] phi from gfx_init_chunky::@7 to gfx_init_chunky::@3 [phi:gfx_init_chunky::@7->gfx_init_chunky::@3]
+  b3_from_b7:
+  //SEG85 [46] phi (byte) gfx_init_chunky::gfxbCpuBank#8 = (byte) gfx_init_chunky::gfxbCpuBank#2 [phi:gfx_init_chunky::@7->gfx_init_chunky::@3#0] -- register_copy 
+  //SEG86 [46] phi (byte*) gfx_init_chunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_chunky::@7->gfx_init_chunky::@3#1] -- pbuz1=pbuc1 
     lda #<$4000
     sta gfxb
     lda #>$4000
@@ -2045,7 +2053,7 @@ Statement [20] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) C
 Statement asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  } always clobbers reg byte x 
 Statement [26] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [27] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
-Statement [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [32] (byte~) main::$32 ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0 | (byte~) main::$31 [ main::rst#1 main::$32 ] ( main:2 [ main::rst#1 main::$32 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:10 [ main::rst#1 ]
 Statement [34] (byte~) main::$33 ← (byte) main::rst#1 << (byte/signed byte/word/signed word/dword/signed dword) 4 [ main::rst#1 main::$33 ] ( main:2 [ main::rst#1 main::$33 ] ) always clobbers reg byte a 
@@ -2077,7 +2085,7 @@ Statement [20] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) C
 Statement asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  } always clobbers reg byte x 
 Statement [26] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [27] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
-Statement [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [31] (byte~) main::$31 ← (byte) main::rst#1 & (byte/signed byte/word/signed word/dword/signed dword) 7 [ main::rst#1 main::$31 ] ( main:2 [ main::rst#1 main::$31 ] ) always clobbers reg byte a 
 Statement [32] (byte~) main::$32 ← (const byte) VIC_DEN#0|(const byte) VIC_ECM#0|(const byte) VIC_RSEL#0 | (byte~) main::$31 [ main::rst#1 main::$32 ] ( main:2 [ main::rst#1 main::$32 ] ) always clobbers reg byte a 
 Statement [34] (byte~) main::$33 ← (byte) main::rst#1 << (byte/signed byte/word/signed word/dword/signed dword) 4 [ main::rst#1 main::$33 ] ( main:2 [ main::rst#1 main::$33 ] ) always clobbers reg byte a 
@@ -2173,15 +2181,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label CHUNKY = $8000
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-b7_from_bbegin:
-  jmp b7
-//SEG5 @7
-b7:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @7 to @end [phi:@7->@end]
-bend_from_b7:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -2201,9 +2209,9 @@ main: {
   //SEG14 [38] phi from main to gfx_init_chunky [phi:main->gfx_init_chunky]
   gfx_init_chunky_from_main:
     jsr gfx_init_chunky
-    jmp b17
-  //SEG15 main::@17
-  b17:
+    jmp b6
+  //SEG15 main::@6
+  b6:
   //SEG16 [8] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0 -- _deref_pbuc1=vbuc2 
     // Enable DTV extended modes
     lda #DTV_FEATURE_ENABLE
@@ -2250,29 +2258,29 @@ main: {
     // VIC memory
     lda #(CHUNKY&$3fff)>>6|(0)>>2
     sta VIC_MEMORY
-  //SEG29 [21] phi from main::@17 to main::@6 [phi:main::@17->main::@6]
-  b6_from_b17:
-  //SEG30 [21] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@6#0] -- vbuxx=vbuc1 
+  //SEG29 [21] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
+  b2_from_b6:
+  //SEG30 [21] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@2#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b6
+    jmp b2
   // DTV Palette - Grey Tones
-  //SEG31 [21] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  b6_from_b6:
-  //SEG32 [21] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@6->main::@6#0] -- register_copy 
-    jmp b6
-  //SEG33 main::@6
-  b6:
+  //SEG31 [21] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG32 [21] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG33 main::@2
+  b2:
   //SEG34 [22] *((const byte*) DTV_PALETTE#0 + (byte) main::j#2) ← (byte) main::j#2 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta DTV_PALETTE,x
   //SEG35 [23] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG36 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG36 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b6_from_b6
-    jmp b2
-  //SEG37 main::@2
-  b2:
+    bne b2_from_b2
+    jmp b1
+  //SEG37 main::@1
+  b1:
   //SEG38 asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  }
     // Stabilize Raster
     ldx #$ff
@@ -2317,16 +2325,16 @@ main: {
   //SEG40 [27] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta BORDERCOL
-    jmp b8
-  //SEG41 main::@8
-  b8:
-  //SEG42 [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b3
+  //SEG41 main::@3
+  b3:
+  //SEG42 [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$42
     cmp RASTER
-    bne b8
-    jmp b10
-  //SEG43 main::@10
-  b10:
+    bne b3
+    jmp b4
+  //SEG43 main::@4
+  b4:
   //SEG44 asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
     nop
     nop
@@ -2346,9 +2354,9 @@ main: {
     nop
     nop
     nop
-    jmp b11
-  //SEG45 main::@11
-  b11:
+    jmp b5
+  //SEG45 main::@5
+  b5:
   //SEG46 [30] (byte) main::rst#1 ← *((const byte*) RASTER#0) -- vbuxx=_deref_pbuc1 
     ldx RASTER
   //SEG47 [31] (byte~) main::$31 ← (byte) main::rst#1 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
@@ -2382,10 +2390,10 @@ main: {
     nop
     nop
     nop
-  //SEG53 [37] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG53 [37] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@5 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$f2
-    bne b11
-    jmp b2
+    bne b5
+    jmp b1
 }
 //SEG54 gfx_init_chunky
 // Initialize Plane with 8bpp chunky
@@ -2456,15 +2464,15 @@ gfx_init_chunky: {
   dtvSetCpuBankSegment1_from_b4:
   //SEG81 [58] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#3 = (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:gfx_init_chunky::@4->dtvSetCpuBankSegment1#0] -- register_copy 
     jsr dtvSetCpuBankSegment1
-    jmp b8
-  //SEG82 gfx_init_chunky::@8
-  b8:
+    jmp b7
+  //SEG82 gfx_init_chunky::@7
+  b7:
   //SEG83 [45] (byte) gfx_init_chunky::gfxbCpuBank#2 ← ++ (byte) gfx_init_chunky::gfxbCpuBank#4 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG84 [46] phi from gfx_init_chunky::@8 to gfx_init_chunky::@3 [phi:gfx_init_chunky::@8->gfx_init_chunky::@3]
-  b3_from_b8:
-  //SEG85 [46] phi (byte) gfx_init_chunky::gfxbCpuBank#8 = (byte) gfx_init_chunky::gfxbCpuBank#2 [phi:gfx_init_chunky::@8->gfx_init_chunky::@3#0] -- register_copy 
-  //SEG86 [46] phi (byte*) gfx_init_chunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_chunky::@8->gfx_init_chunky::@3#1] -- pbuz1=pbuc1 
+  //SEG84 [46] phi from gfx_init_chunky::@7 to gfx_init_chunky::@3 [phi:gfx_init_chunky::@7->gfx_init_chunky::@3]
+  b3_from_b7:
+  //SEG85 [46] phi (byte) gfx_init_chunky::gfxbCpuBank#8 = (byte) gfx_init_chunky::gfxbCpuBank#2 [phi:gfx_init_chunky::@7->gfx_init_chunky::@3#0] -- register_copy 
+  //SEG86 [46] phi (byte*) gfx_init_chunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_chunky::@7->gfx_init_chunky::@3#1] -- pbuz1=pbuc1 
     lda #<$4000
     sta gfxb
     lda #>$4000
@@ -2555,18 +2563,18 @@ dtvSetCpuBankSegment1: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b7
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b17
 Removing instruction jmp b6
 Removing instruction jmp b2
-Removing instruction jmp b8
-Removing instruction jmp b10
-Removing instruction jmp b11
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b4
-Removing instruction jmp b8
+Removing instruction jmp b7
 Removing instruction jmp b3
 Removing instruction jmp b5
 Removing instruction jmp b6
@@ -2576,16 +2584,16 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b6_from_b6 with b6
+Replacing label b2_from_b2 with b2
 Replacing label b3_from_b2 with b3
 Replacing label b3_from_b2 with b3
 Replacing label b2_from_b3 with b2
 Replacing label b2_from_b3 with b2
 Replacing label b1_from_b5 with b1
-Removing instruction b7_from_bbegin:
-Removing instruction b7:
-Removing instruction bend_from_b7:
-Removing instruction b6_from_b6:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction b2_from_b2:
 Removing instruction b1_from_b5:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b3:
@@ -2595,15 +2603,15 @@ Removing instruction dtvSetCpuBankSegment1_from_b6:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction gfx_init_chunky_from_main:
-Removing instruction b17:
-Removing instruction b6_from_b17:
-Removing instruction b10:
+Removing instruction b6:
+Removing instruction b2_from_b6:
+Removing instruction b4:
 Removing instruction dtvSetCpuBankSegment1_from_gfx_init_chunky:
 Removing instruction b1_from_gfx_init_chunky:
 Removing instruction b4:
 Removing instruction dtvSetCpuBankSegment1_from_b4:
-Removing instruction b8:
-Removing instruction b3_from_b8:
+Removing instruction b7:
+Removing instruction b3_from_b7:
 Removing instruction b5:
 Removing instruction b6:
 Removing instruction breturn:
@@ -2612,7 +2620,7 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Removing instruction jmp b6
+Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
@@ -2621,7 +2629,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @7
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -2846,7 +2854,7 @@ FINAL SYMBOL TABLE
 (label) gfx_init_chunky::@4
 (label) gfx_init_chunky::@5
 (label) gfx_init_chunky::@6
-(label) gfx_init_chunky::@8
+(label) gfx_init_chunky::@7
 (label) gfx_init_chunky::@return
 (byte) gfx_init_chunky::c
 (byte) gfx_init_chunky::c#0 reg byte a 202.0
@@ -2870,12 +2878,12 @@ FINAL SYMBOL TABLE
 (byte~) main::$31 reg byte a 202.0
 (byte~) main::$32 reg byte a 202.0
 (byte~) main::$33 reg byte a 202.0
-(label) main::@10
-(label) main::@11
-(label) main::@17
+(label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
-(label) main::@8
 (byte) main::j
 (byte) main::j#1 reg byte x 16.5
 (byte) main::j#2 reg byte x 22.0
@@ -2950,10 +2958,10 @@ Score: 19882
   // Plane with all pixels
   .label CHUNKY = $8000
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-//SEG5 @7
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @7 to @end [phi:@7->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -2970,7 +2978,7 @@ main: {
   //SEG13 [7] call gfx_init_chunky 
   //SEG14 [38] phi from main to gfx_init_chunky [phi:main->gfx_init_chunky]
     jsr gfx_init_chunky
-  //SEG15 main::@17
+  //SEG15 main::@6
   //SEG16 [8] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0 -- _deref_pbuc1=vbuc2 
     // Enable DTV extended modes
     lda #DTV_FEATURE_ENABLE
@@ -3016,24 +3024,24 @@ main: {
     // VIC memory
     lda #(CHUNKY&$3fff)>>6|(0)>>2
     sta VIC_MEMORY
-  //SEG29 [21] phi from main::@17 to main::@6 [phi:main::@17->main::@6]
-  //SEG30 [21] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@6#0] -- vbuxx=vbuc1 
+  //SEG29 [21] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
+  //SEG30 [21] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@2#0] -- vbuxx=vbuc1 
     ldx #0
   // DTV Palette - Grey Tones
-  //SEG31 [21] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  //SEG32 [21] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@6->main::@6#0] -- register_copy 
-  //SEG33 main::@6
-  b6:
+  //SEG31 [21] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  //SEG32 [21] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@2->main::@2#0] -- register_copy 
+  //SEG33 main::@2
+  b2:
   //SEG34 [22] *((const byte*) DTV_PALETTE#0 + (byte) main::j#2) ← (byte) main::j#2 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta DTV_PALETTE,x
   //SEG35 [23] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG36 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG36 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b6
-  //SEG37 main::@2
-  b2:
+    bne b2
+  //SEG37 main::@1
+  b1:
   //SEG38 asm { ldx#$ff rff: cpxRASTER bnerff stabilize: nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop cpxRASTER beqeat+0 eat: inx cpx#$08 bnestabilize  }
     // Stabilize Raster
     ldx #$ff
@@ -3078,13 +3086,13 @@ main: {
   //SEG40 [27] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta BORDERCOL
-  //SEG41 main::@8
-  b8:
-  //SEG42 [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG41 main::@3
+  b3:
+  //SEG42 [28] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $42) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$42
     cmp RASTER
-    bne b8
-  //SEG43 main::@10
+    bne b3
+  //SEG43 main::@4
   //SEG44 asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
     nop
     nop
@@ -3104,8 +3112,8 @@ main: {
     nop
     nop
     nop
-  //SEG45 main::@11
-  b11:
+  //SEG45 main::@5
+  b5:
   //SEG46 [30] (byte) main::rst#1 ← *((const byte*) RASTER#0) -- vbuxx=_deref_pbuc1 
     ldx RASTER
   //SEG47 [31] (byte~) main::$31 ← (byte) main::rst#1 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
@@ -3139,10 +3147,10 @@ main: {
     nop
     nop
     nop
-  //SEG53 [37] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG53 [37] if((byte) main::rst#1!=(byte/word/signed word/dword/signed dword) $f2) goto main::@5 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$f2
-    bne b11
-    jmp b2
+    bne b5
+    jmp b1
 }
 //SEG54 gfx_init_chunky
 // Initialize Plane with 8bpp chunky
@@ -3200,12 +3208,12 @@ gfx_init_chunky: {
   //SEG80 [58] phi from gfx_init_chunky::@4 to dtvSetCpuBankSegment1 [phi:gfx_init_chunky::@4->dtvSetCpuBankSegment1]
   //SEG81 [58] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#3 = (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:gfx_init_chunky::@4->dtvSetCpuBankSegment1#0] -- register_copy 
     jsr dtvSetCpuBankSegment1
-  //SEG82 gfx_init_chunky::@8
+  //SEG82 gfx_init_chunky::@7
   //SEG83 [45] (byte) gfx_init_chunky::gfxbCpuBank#2 ← ++ (byte) gfx_init_chunky::gfxbCpuBank#4 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG84 [46] phi from gfx_init_chunky::@8 to gfx_init_chunky::@3 [phi:gfx_init_chunky::@8->gfx_init_chunky::@3]
-  //SEG85 [46] phi (byte) gfx_init_chunky::gfxbCpuBank#8 = (byte) gfx_init_chunky::gfxbCpuBank#2 [phi:gfx_init_chunky::@8->gfx_init_chunky::@3#0] -- register_copy 
-  //SEG86 [46] phi (byte*) gfx_init_chunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_chunky::@8->gfx_init_chunky::@3#1] -- pbuz1=pbuc1 
+  //SEG84 [46] phi from gfx_init_chunky::@7 to gfx_init_chunky::@3 [phi:gfx_init_chunky::@7->gfx_init_chunky::@3]
+  //SEG85 [46] phi (byte) gfx_init_chunky::gfxbCpuBank#8 = (byte) gfx_init_chunky::gfxbCpuBank#2 [phi:gfx_init_chunky::@7->gfx_init_chunky::@3#0] -- register_copy 
+  //SEG86 [46] phi (byte*) gfx_init_chunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_chunky::@7->gfx_init_chunky::@3#1] -- pbuz1=pbuc1 
     lda #<$4000
     sta gfxb
     lda #>$4000
diff --git a/src/test/ref/c64dtv-8bppchunkystretch.sym b/src/test/ref/c64dtv-8bppchunkystretch.sym
index bf0a908db..1b187f97a 100644
--- a/src/test/ref/c64dtv-8bppchunkystretch.sym
+++ b/src/test/ref/c64dtv-8bppchunkystretch.sym
@@ -1,4 +1,4 @@
-(label) @7
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -223,7 +223,7 @@
 (label) gfx_init_chunky::@4
 (label) gfx_init_chunky::@5
 (label) gfx_init_chunky::@6
-(label) gfx_init_chunky::@8
+(label) gfx_init_chunky::@7
 (label) gfx_init_chunky::@return
 (byte) gfx_init_chunky::c
 (byte) gfx_init_chunky::c#0 reg byte a 202.0
@@ -247,12 +247,12 @@
 (byte~) main::$31 reg byte a 202.0
 (byte~) main::$32 reg byte a 202.0
 (byte~) main::$33 reg byte a 202.0
-(label) main::@10
-(label) main::@11
-(label) main::@17
+(label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
-(label) main::@8
 (byte) main::j
 (byte) main::j#1 reg byte x 16.5
 (byte) main::j#2 reg byte x 22.0
diff --git a/src/test/ref/c64dtv-blittermin.asm b/src/test/ref/c64dtv-blittermin.asm
index c5c28a2ce..b74c1966c 100644
--- a/src/test/ref/c64dtv-blittermin.asm
+++ b/src/test/ref/c64dtv-blittermin.asm
@@ -138,17 +138,17 @@ main: {
     sta DTV_BLITTER_CONTROL2
     ldx #0
   // wait til blitter is ready
-  b2:
+  b1:
     lda #DTV_BLIT_STATUS_BUSY
     and DTV_BLITTER_CONTROL2
     cmp #0
-    bne b2
+    bne b1
     // restart
     lda #DTV_BLIT_FORCE_START|DTV_BLIT_SRCA_FWD|DTV_BLIT_SRCB_FWD|DTV_BLIT_DEST_FWD
     sta DTV_BLITTER_CONTROL
     inx
     cpx #8
-    bne b2
+    bne b1
     rts
 }
   SRCA: .byte 'c', 'a', 'm', 'e', 'l', 'o', 't', '!', ' '
diff --git a/src/test/ref/c64dtv-blittermin.cfg b/src/test/ref/c64dtv-blittermin.cfg
index 68876a61d..5081fb80c 100644
--- a/src/test/ref/c64dtv-blittermin.cfg
+++ b/src/test/ref/c64dtv-blittermin.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   [4] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
   [5] *((const byte*) DTV_BLITTER_CONTROL2#0) ← (const byte) DTV_BLIT_CLEAR_IRQ#0
   [6] *((const byte*) DTV_BLITTER_SRCA_LO#0) ← <(const byte[]) SRCA#0
@@ -40,17 +40,17 @@ main: scope:[main]  from @6
   [33] *((const byte*) DTV_BLITTER_TRANSPARANCY#0) ← (const byte) DTV_BLIT_TRANSPARANCY_NONE#0
   [34] *((const byte*) DTV_BLITTER_CONTROL#0) ← (const byte) DTV_BLIT_FORCE_START#0|(const byte) DTV_BLIT_SRCA_FWD#0|(const byte) DTV_BLIT_SRCB_FWD#0|(const byte) DTV_BLIT_DEST_FWD#0
   [35] *((const byte*) DTV_BLITTER_CONTROL2#0) ← (const byte) DTV_BLIT_DEST_CONT#0
-  to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@3
-  [36] (byte) main::r#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::r#1 )
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@2
+  [36] (byte) main::r#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::r#1 )
   [37] (byte~) main::$15 ← *((const byte*) DTV_BLITTER_CONTROL2#0) & (const byte) DTV_BLIT_STATUS_BUSY#0
-  [38] if((byte~) main::$15!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
-  to:main::@3
-main::@3: scope:[main]  from main::@2
+  [38] if((byte~) main::$15!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [39] *((const byte*) DTV_BLITTER_CONTROL#0) ← (const byte) DTV_BLIT_FORCE_START#0|(const byte) DTV_BLIT_SRCA_FWD#0|(const byte) DTV_BLIT_SRCB_FWD#0|(const byte) DTV_BLIT_DEST_FWD#0
   [40] (byte) main::r#1 ← ++ (byte) main::r#2
-  [41] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@2
+  [41] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [42] return 
   to:@return
diff --git a/src/test/ref/c64dtv-blittermin.log b/src/test/ref/c64dtv-blittermin.log
index e89d9d3c9..960e74c62 100644
--- a/src/test/ref/c64dtv-blittermin.log
+++ b/src/test/ref/c64dtv-blittermin.log
@@ -912,21 +912,24 @@ Created 1 initial phi equivalence classes
 Coalesced [43] main::r#5 ← main::r#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) main::@5
+Renumbering block @6 to @1
+Renumbering block main::@2 to main::@1
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @6
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   [4] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
   [5] *((const byte*) DTV_BLITTER_CONTROL2#0) ← (const byte) DTV_BLIT_CLEAR_IRQ#0
   [6] *((const byte*) DTV_BLITTER_SRCA_LO#0) ← <(const byte[]) SRCA#0
@@ -959,18 +962,18 @@ main: scope:[main]  from @6
   [33] *((const byte*) DTV_BLITTER_TRANSPARANCY#0) ← (const byte) DTV_BLIT_TRANSPARANCY_NONE#0
   [34] *((const byte*) DTV_BLITTER_CONTROL#0) ← (const byte) DTV_BLIT_FORCE_START#0|(const byte) DTV_BLIT_SRCA_FWD#0|(const byte) DTV_BLIT_SRCB_FWD#0|(const byte) DTV_BLIT_DEST_FWD#0
   [35] *((const byte*) DTV_BLITTER_CONTROL2#0) ← (const byte) DTV_BLIT_DEST_CONT#0
-  to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@3
-  [36] (byte) main::r#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::r#1 )
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@2
+  [36] (byte) main::r#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::r#1 )
   [37] (byte~) main::$15 ← *((const byte*) DTV_BLITTER_CONTROL2#0) & (const byte) DTV_BLIT_STATUS_BUSY#0
-  [38] if((byte~) main::$15!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
-  to:main::@3
-main::@3: scope:[main]  from main::@2
+  [38] if((byte~) main::$15!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [39] *((const byte*) DTV_BLITTER_CONTROL#0) ← (const byte) DTV_BLIT_FORCE_START#0|(const byte) DTV_BLIT_SRCA_FWD#0|(const byte) DTV_BLIT_SRCB_FWD#0|(const byte) DTV_BLIT_DEST_FWD#0
   [40] (byte) main::r#1 ← ++ (byte) main::r#2
-  [41] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@2
+  [41] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [42] return 
   to:@return
 
@@ -1248,15 +1251,15 @@ INITIAL ASM
   .const SRCA_LEN = 9
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -1366,43 +1369,43 @@ main: {
     // Instruct blitter to continue at DEST and restart SRC A/B
     lda #DTV_BLIT_DEST_CONT
     sta DTV_BLITTER_CONTROL2
-  //SEG42 [36] phi from main to main::@2 [phi:main->main::@2]
-  b2_from_main:
-  //SEG43 [36] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#0] -- vbuz1=vbuc1 
+  //SEG42 [36] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG43 [36] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta r
-    jmp b2
+    jmp b1
   // wait til blitter is ready
-  //SEG44 [36] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  b2_from_b2:
-    jmp b2
-  //SEG45 [36] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
-  b2_from_b3:
-  //SEG46 [36] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@3->main::@2#0] -- register_copy 
-    jmp b2
-  //SEG47 main::@2
-  b2:
+  //SEG44 [36] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG45 [36] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG46 [36] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@2->main::@1#0] -- register_copy 
+    jmp b1
+  //SEG47 main::@1
+  b1:
   //SEG48 [37] (byte~) main::$15 ← *((const byte*) DTV_BLITTER_CONTROL2#0) & (const byte) DTV_BLIT_STATUS_BUSY#0 -- vbuz1=_deref_pbuc1_band_vbuc2 
     lda #DTV_BLIT_STATUS_BUSY
     and DTV_BLITTER_CONTROL2
     sta _15
-  //SEG49 [38] if((byte~) main::$15!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2 -- vbuz1_neq_0_then_la1 
+  //SEG49 [38] if((byte~) main::$15!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuz1_neq_0_then_la1 
     lda _15
     cmp #0
-    bne b2_from_b2
-    jmp b3
-  //SEG50 main::@3
-  b3:
+    bne b1_from_b1
+    jmp b2
+  //SEG50 main::@2
+  b2:
   //SEG51 [39] *((const byte*) DTV_BLITTER_CONTROL#0) ← (const byte) DTV_BLIT_FORCE_START#0|(const byte) DTV_BLIT_SRCA_FWD#0|(const byte) DTV_BLIT_SRCB_FWD#0|(const byte) DTV_BLIT_DEST_FWD#0 -- _deref_pbuc1=vbuc2 
     // restart
     lda #DTV_BLIT_FORCE_START|DTV_BLIT_SRCA_FWD|DTV_BLIT_SRCB_FWD|DTV_BLIT_DEST_FWD
     sta DTV_BLITTER_CONTROL
   //SEG52 [40] (byte) main::r#1 ← ++ (byte) main::r#2 -- vbuz1=_inc_vbuz1 
     inc r
-  //SEG53 [41] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG53 [41] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp r
-    bne b2_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG54 main::@return
   breturn:
@@ -1571,15 +1574,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const SRCA_LEN = 9
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -1687,39 +1690,39 @@ main: {
     // Instruct blitter to continue at DEST and restart SRC A/B
     lda #DTV_BLIT_DEST_CONT
     sta DTV_BLITTER_CONTROL2
-  //SEG42 [36] phi from main to main::@2 [phi:main->main::@2]
-  b2_from_main:
-  //SEG43 [36] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#0] -- vbuxx=vbuc1 
+  //SEG42 [36] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG43 [36] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b2
+    jmp b1
   // wait til blitter is ready
-  //SEG44 [36] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  b2_from_b2:
-    jmp b2
-  //SEG45 [36] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
-  b2_from_b3:
-  //SEG46 [36] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@3->main::@2#0] -- register_copy 
-    jmp b2
-  //SEG47 main::@2
-  b2:
+  //SEG44 [36] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG45 [36] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG46 [36] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@2->main::@1#0] -- register_copy 
+    jmp b1
+  //SEG47 main::@1
+  b1:
   //SEG48 [37] (byte~) main::$15 ← *((const byte*) DTV_BLITTER_CONTROL2#0) & (const byte) DTV_BLIT_STATUS_BUSY#0 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #DTV_BLIT_STATUS_BUSY
     and DTV_BLITTER_CONTROL2
-  //SEG49 [38] if((byte~) main::$15!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2 -- vbuaa_neq_0_then_la1 
+  //SEG49 [38] if((byte~) main::$15!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b2_from_b2
-    jmp b3
-  //SEG50 main::@3
-  b3:
+    bne b1_from_b1
+    jmp b2
+  //SEG50 main::@2
+  b2:
   //SEG51 [39] *((const byte*) DTV_BLITTER_CONTROL#0) ← (const byte) DTV_BLIT_FORCE_START#0|(const byte) DTV_BLIT_SRCA_FWD#0|(const byte) DTV_BLIT_SRCB_FWD#0|(const byte) DTV_BLIT_DEST_FWD#0 -- _deref_pbuc1=vbuc2 
     // restart
     lda #DTV_BLIT_FORCE_START|DTV_BLIT_SRCA_FWD|DTV_BLIT_SRCB_FWD|DTV_BLIT_DEST_FWD
     sta DTV_BLITTER_CONTROL
   //SEG52 [40] (byte) main::r#1 ← ++ (byte) main::r#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG53 [41] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG53 [41] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #8
-    bne b2_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG54 main::@return
   breturn:
@@ -1730,10 +1733,10 @@ main: {
   SRCB: .byte $80
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b6
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b3
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
@@ -1743,35 +1746,35 @@ Removing instruction lda #0
 Removing instruction lda #0
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b2_from_b3 with b2
-Removing instruction b6_from_bbegin:
-Removing instruction b6:
-Removing instruction bend_from_b6:
-Removing instruction b2_from_b3:
+Replacing label b1_from_b2 with b1
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b2_from_main:
-Removing instruction b3:
+Removing instruction b1_from_main:
+Removing instruction b2:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b2 in bne b2_from_b2
+Skipping double jump to b1 in bne b1_from_b1
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b2_from_b2 to b1
+Relabelling long label b1_from_b1 to b2
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b2
+Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b1:
+Removing instruction b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing instruction jmp b2
+Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 
 FINAL SYMBOL TABLE
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -1999,8 +2002,8 @@ FINAL SYMBOL TABLE
 (byte) YELLOW
 (void()) main()
 (byte~) main::$15 reg byte a 202.0
+(label) main::@1
 (label) main::@2
-(label) main::@3
 (label) main::@return
 (byte) main::r
 (byte) main::r#1 reg byte x 16.5
@@ -2090,10 +2093,10 @@ Score: 1561
   .label SCREEN = $400
   .const SRCA_LEN = 9
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-//SEG5 @6
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -2193,31 +2196,31 @@ main: {
     // Instruct blitter to continue at DEST and restart SRC A/B
     lda #DTV_BLIT_DEST_CONT
     sta DTV_BLITTER_CONTROL2
-  //SEG42 [36] phi from main to main::@2 [phi:main->main::@2]
-  //SEG43 [36] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#0] -- vbuxx=vbuc1 
+  //SEG42 [36] phi from main to main::@1 [phi:main->main::@1]
+  //SEG43 [36] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
   // wait til blitter is ready
-  //SEG44 [36] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  //SEG45 [36] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
-  //SEG46 [36] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@3->main::@2#0] -- register_copy 
-  //SEG47 main::@2
-  b2:
+  //SEG44 [36] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  //SEG45 [36] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  //SEG46 [36] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG47 main::@1
+  b1:
   //SEG48 [37] (byte~) main::$15 ← *((const byte*) DTV_BLITTER_CONTROL2#0) & (const byte) DTV_BLIT_STATUS_BUSY#0 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #DTV_BLIT_STATUS_BUSY
     and DTV_BLITTER_CONTROL2
-  //SEG49 [38] if((byte~) main::$15!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2 -- vbuaa_neq_0_then_la1 
+  //SEG49 [38] if((byte~) main::$15!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b2
-  //SEG50 main::@3
+    bne b1
+  //SEG50 main::@2
   //SEG51 [39] *((const byte*) DTV_BLITTER_CONTROL#0) ← (const byte) DTV_BLIT_FORCE_START#0|(const byte) DTV_BLIT_SRCA_FWD#0|(const byte) DTV_BLIT_SRCB_FWD#0|(const byte) DTV_BLIT_DEST_FWD#0 -- _deref_pbuc1=vbuc2 
     // restart
     lda #DTV_BLIT_FORCE_START|DTV_BLIT_SRCA_FWD|DTV_BLIT_SRCB_FWD|DTV_BLIT_DEST_FWD
     sta DTV_BLITTER_CONTROL
   //SEG52 [40] (byte) main::r#1 ← ++ (byte) main::r#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG53 [41] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG53 [41] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #8
-    bne b2
+    bne b1
   //SEG54 main::@return
   //SEG55 [42] return 
     rts
diff --git a/src/test/ref/c64dtv-blittermin.sym b/src/test/ref/c64dtv-blittermin.sym
index b21724ae9..c29c63819 100644
--- a/src/test/ref/c64dtv-blittermin.sym
+++ b/src/test/ref/c64dtv-blittermin.sym
@@ -1,4 +1,4 @@
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -226,8 +226,8 @@
 (byte) YELLOW
 (void()) main()
 (byte~) main::$15 reg byte a 202.0
+(label) main::@1
 (label) main::@2
-(label) main::@3
 (label) main::@return
 (byte) main::r
 (byte) main::r#1 reg byte x 16.5
diff --git a/src/test/ref/c64dtv-color.asm b/src/test/ref/c64dtv-color.asm
index 723d8115c..142c067de 100644
--- a/src/test/ref/c64dtv-color.asm
+++ b/src/test/ref/c64dtv-color.asm
@@ -20,15 +20,15 @@ main: {
     sta DTV_FEATURE
     lda #DTV_HIGHCOLOR|DTV_BORDER_OFF|DTV_BADLINE_OFF
     sta DTV_CONTROL
-  b6:
+  b1:
     lda #$40
     cmp RASTER
-    bne b6
+    bne b1
     // Create rasterbars
     lda #0
     sta BGCOL
     ldx #$31
-  b9:
+  b3:
     nop
     nop
     nop
@@ -57,16 +57,16 @@ main: {
     inc BGCOL
     inx
     cpx #0
-    bne b9
+    bne b3
     ldx #0
   // Rotate palette
-  b11:
+  b4:
     lda palette,x
     sta DTV_PALETTE,x
     inc palette,x
     inx
     cpx #$10
-    bne b11
-    jmp b6
+    bne b4
+    jmp b1
     palette: .byte 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, $a, $b, $c, $d, $e, $f
 }
diff --git a/src/test/ref/c64dtv-color.cfg b/src/test/ref/c64dtv-color.cfg
index b272159e8..134d55230 100644
--- a/src/test/ref/c64dtv-color.cfg
+++ b/src/test/ref/c64dtv-color.cfg
@@ -1,34 +1,34 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
   [6] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_BORDER_OFF#0|(const byte) DTV_BADLINE_OFF#0
-  to:main::@6
-main::@6: scope:[main]  from main main::@11 main::@6
-  [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6
-  to:main::@8
-main::@8: scope:[main]  from main::@6
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@4
+  [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:main::@9
-main::@9: scope:[main]  from main::@8 main::@9
-  [9] (byte) main::r#2 ← phi( main::@8/(byte/signed byte/word/signed word/dword/signed dword) $31 main::@9/(byte) main::r#1 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@3
+  [9] (byte) main::r#2 ← phi( main::@2/(byte/signed byte/word/signed word/dword/signed dword) $31 main::@3/(byte) main::r#1 )
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
   [11] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   [12] (byte) main::r#1 ← ++ (byte) main::r#2
-  [13] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9
-  to:main::@11
-main::@11: scope:[main]  from main::@11 main::@9
-  [14] (byte) main::c#2 ← phi( main::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@11/(byte) main::c#1 )
+  [13] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@4
+  [14] (byte) main::c#2 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::c#1 )
   [15] *((const byte*) DTV_PALETTE#0 + (byte) main::c#2) ← *((const byte[$10]) main::palette#0 + (byte) main::c#2)
   [16] *((const byte[$10]) main::palette#0 + (byte) main::c#2) ← ++ *((const byte[$10]) main::palette#0 + (byte) main::c#2)
   [17] (byte) main::c#1 ← ++ (byte) main::c#2
-  [18] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@11
-  to:main::@6
+  [18] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@4
+  to:main::@1
diff --git a/src/test/ref/c64dtv-color.log b/src/test/ref/c64dtv-color.log
index 09f90260c..d7ccc87b5 100644
--- a/src/test/ref/c64dtv-color.log
+++ b/src/test/ref/c64dtv-color.log
@@ -841,45 +841,50 @@ Coalesced [20] main::r#3 ← main::r#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@18
 Culled Empty Block (label) main::@17
+Renumbering block @6 to @1
+Renumbering block main::@6 to main::@1
+Renumbering block main::@8 to main::@2
+Renumbering block main::@9 to main::@3
+Renumbering block main::@11 to main::@4
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @6
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
   [6] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_BORDER_OFF#0|(const byte) DTV_BADLINE_OFF#0
-  to:main::@6
-main::@6: scope:[main]  from main main::@11 main::@6
-  [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6
-  to:main::@8
-main::@8: scope:[main]  from main::@6
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@4
+  [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:main::@9
-main::@9: scope:[main]  from main::@8 main::@9
-  [9] (byte) main::r#2 ← phi( main::@8/(byte/signed byte/word/signed word/dword/signed dword) $31 main::@9/(byte) main::r#1 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@3
+  [9] (byte) main::r#2 ← phi( main::@2/(byte/signed byte/word/signed word/dword/signed dword) $31 main::@3/(byte) main::r#1 )
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
   [11] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   [12] (byte) main::r#1 ← ++ (byte) main::r#2
-  [13] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9
-  to:main::@11
-main::@11: scope:[main]  from main::@11 main::@9
-  [14] (byte) main::c#2 ← phi( main::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@11/(byte) main::c#1 )
+  [13] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@4
+  [14] (byte) main::c#2 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::c#1 )
   [15] *((const byte*) DTV_PALETTE#0 + (byte) main::c#2) ← *((const byte[$10]) main::palette#0 + (byte) main::c#2)
   [16] *((const byte[$10]) main::palette#0 + (byte) main::c#2) ← ++ *((const byte[$10]) main::palette#0 + (byte) main::c#2)
   [17] (byte) main::c#1 ← ++ (byte) main::c#2
-  [18] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@11
-  to:main::@6
+  [18] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@4
+  to:main::@1
 
 
 VARIABLE REGISTER WEIGHTS
@@ -1097,15 +1102,15 @@ INITIAL ASM
   .label DTV_PALETTE = $d200
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -1121,32 +1126,32 @@ main: {
   //SEG12 [6] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_BORDER_OFF#0|(const byte) DTV_BADLINE_OFF#0 -- _deref_pbuc1=vbuc2 
     lda #DTV_HIGHCOLOR|DTV_BORDER_OFF|DTV_BADLINE_OFF
     sta DTV_CONTROL
-    jmp b6
-  //SEG13 main::@6
-  b6:
-  //SEG14 [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG13 main::@1
+  b1:
+  //SEG14 [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$40
     cmp RASTER
-    bne b6
-    jmp b8
-  //SEG15 main::@8
-  b8:
+    bne b1
+    jmp b2
+  //SEG15 main::@2
+  b2:
   //SEG16 [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Create rasterbars
     lda #0
     sta BGCOL
-  //SEG17 [9] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  b9_from_b8:
-  //SEG18 [9] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) $31 [phi:main::@8->main::@9#0] -- vbuz1=vbuc1 
+  //SEG17 [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG18 [9] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) $31 [phi:main::@2->main::@3#0] -- vbuz1=vbuc1 
     lda #$31
     sta r
-    jmp b9
-  //SEG19 [9] phi from main::@9 to main::@9 [phi:main::@9->main::@9]
-  b9_from_b9:
-  //SEG20 [9] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@9->main::@9#0] -- register_copy 
-    jmp b9
-  //SEG21 main::@9
-  b9:
+    jmp b3
+  //SEG19 [9] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
+  b3_from_b3:
+  //SEG20 [9] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@3->main::@3#0] -- register_copy 
+    jmp b3
+  //SEG21 main::@3
+  b3:
   //SEG22 asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
     nop
     nop
@@ -1177,23 +1182,23 @@ main: {
     inc BGCOL
   //SEG24 [12] (byte) main::r#1 ← ++ (byte) main::r#2 -- vbuz1=_inc_vbuz1 
     inc r
-  //SEG25 [13] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9 -- vbuz1_neq_0_then_la1 
+  //SEG25 [13] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuz1_neq_0_then_la1 
     lda r
     cmp #0
-    bne b9_from_b9
-  //SEG26 [14] phi from main::@9 to main::@11 [phi:main::@9->main::@11]
-  b11_from_b9:
-  //SEG27 [14] phi (byte) main::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@9->main::@11#0] -- vbuz1=vbuc1 
+    bne b3_from_b3
+  //SEG26 [14] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG27 [14] phi (byte) main::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta c
-    jmp b11
+    jmp b4
   // Rotate palette
-  //SEG28 [14] phi from main::@11 to main::@11 [phi:main::@11->main::@11]
-  b11_from_b11:
-  //SEG29 [14] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@11->main::@11#0] -- register_copy 
-    jmp b11
-  //SEG30 main::@11
-  b11:
+  //SEG28 [14] phi from main::@4 to main::@4 [phi:main::@4->main::@4]
+  b4_from_b4:
+  //SEG29 [14] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@4->main::@4#0] -- register_copy 
+    jmp b4
+  //SEG30 main::@4
+  b4:
   //SEG31 [15] *((const byte*) DTV_PALETTE#0 + (byte) main::c#2) ← *((const byte[$10]) main::palette#0 + (byte) main::c#2) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz1 
     ldy c
     lda palette,y
@@ -1203,24 +1208,24 @@ main: {
     inc palette,x
   //SEG33 [17] (byte) main::c#1 ← ++ (byte) main::c#2 -- vbuz1=_inc_vbuz1 
     inc c
-  //SEG34 [18] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG34 [18] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #$10
     cmp c
-    bne b11_from_b11
-    jmp b6
+    bne b4_from_b4
+    jmp b1
     palette: .byte 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, $a, $b, $c, $d, $e, $f
 }
 
 REGISTER UPLIFT POTENTIAL REGISTERS
 Statement [5] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [6] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_BORDER_OFF#0|(const byte) DTV_BADLINE_OFF#0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@1 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [15] *((const byte*) DTV_PALETTE#0 + (byte) main::c#2) ← *((const byte[$10]) main::palette#0 + (byte) main::c#2) [ main::c#2 ] ( main:2 [ main::c#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:3 [ main::c#2 main::c#1 ]
 Statement [5] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [6] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_BORDER_OFF#0|(const byte) DTV_BADLINE_OFF#0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@1 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [15] *((const byte*) DTV_PALETTE#0 + (byte) main::c#2) ← *((const byte[$10]) main::palette#0 + (byte) main::c#2) [ main::c#2 ] ( main:2 [ main::c#2 ] ) always clobbers reg byte a 
 Potential registers zp ZP_BYTE:2 [ main::r#2 main::r#1 ] : zp ZP_BYTE:2 , reg byte a , reg byte x , reg byte y , 
@@ -1255,15 +1260,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label DTV_PALETTE = $d200
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -1277,31 +1282,31 @@ main: {
   //SEG12 [6] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_BORDER_OFF#0|(const byte) DTV_BADLINE_OFF#0 -- _deref_pbuc1=vbuc2 
     lda #DTV_HIGHCOLOR|DTV_BORDER_OFF|DTV_BADLINE_OFF
     sta DTV_CONTROL
-    jmp b6
-  //SEG13 main::@6
-  b6:
-  //SEG14 [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG13 main::@1
+  b1:
+  //SEG14 [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$40
     cmp RASTER
-    bne b6
-    jmp b8
-  //SEG15 main::@8
-  b8:
+    bne b1
+    jmp b2
+  //SEG15 main::@2
+  b2:
   //SEG16 [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Create rasterbars
     lda #0
     sta BGCOL
-  //SEG17 [9] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  b9_from_b8:
-  //SEG18 [9] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) $31 [phi:main::@8->main::@9#0] -- vbuxx=vbuc1 
+  //SEG17 [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG18 [9] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) $31 [phi:main::@2->main::@3#0] -- vbuxx=vbuc1 
     ldx #$31
-    jmp b9
-  //SEG19 [9] phi from main::@9 to main::@9 [phi:main::@9->main::@9]
-  b9_from_b9:
-  //SEG20 [9] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@9->main::@9#0] -- register_copy 
-    jmp b9
-  //SEG21 main::@9
-  b9:
+    jmp b3
+  //SEG19 [9] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
+  b3_from_b3:
+  //SEG20 [9] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@3->main::@3#0] -- register_copy 
+    jmp b3
+  //SEG21 main::@3
+  b3:
   //SEG22 asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
     nop
     nop
@@ -1332,21 +1337,21 @@ main: {
     inc BGCOL
   //SEG24 [12] (byte) main::r#1 ← ++ (byte) main::r#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG25 [13] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9 -- vbuxx_neq_0_then_la1 
+  //SEG25 [13] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b9_from_b9
-  //SEG26 [14] phi from main::@9 to main::@11 [phi:main::@9->main::@11]
-  b11_from_b9:
-  //SEG27 [14] phi (byte) main::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@9->main::@11#0] -- vbuxx=vbuc1 
+    bne b3_from_b3
+  //SEG26 [14] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG27 [14] phi (byte) main::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b11
+    jmp b4
   // Rotate palette
-  //SEG28 [14] phi from main::@11 to main::@11 [phi:main::@11->main::@11]
-  b11_from_b11:
-  //SEG29 [14] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@11->main::@11#0] -- register_copy 
-    jmp b11
-  //SEG30 main::@11
-  b11:
+  //SEG28 [14] phi from main::@4 to main::@4 [phi:main::@4->main::@4]
+  b4_from_b4:
+  //SEG29 [14] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@4->main::@4#0] -- register_copy 
+    jmp b4
+  //SEG30 main::@4
+  b4:
   //SEG31 [15] *((const byte*) DTV_PALETTE#0 + (byte) main::c#2) ← *((const byte[$10]) main::palette#0 + (byte) main::c#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda palette,x
     sta DTV_PALETTE,x
@@ -1354,45 +1359,45 @@ main: {
     inc palette,x
   //SEG33 [17] (byte) main::c#1 ← ++ (byte) main::c#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG34 [18] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG34 [18] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b11_from_b11
-    jmp b6
+    bne b4_from_b4
+    jmp b1
     palette: .byte 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, $a, $b, $c, $d, $e, $f
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b6
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b11
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b9_from_b9 with b9
-Replacing label b11_from_b11 with b11
-Removing instruction b6_from_bbegin:
-Removing instruction b6:
-Removing instruction bend_from_b6:
-Removing instruction b9_from_b9:
-Removing instruction b11_from_b11:
+Replacing label b3_from_b3 with b3
+Replacing label b4_from_b4 with b4
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction b3_from_b3:
+Removing instruction b4_from_b4:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b8:
-Removing instruction b9_from_b8:
-Removing instruction b11_from_b9:
+Removing instruction b2:
+Removing instruction b3_from_b2:
+Removing instruction b4_from_b3:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Removing instruction jmp b9
-Removing instruction jmp b11
+Removing instruction jmp b3
+Removing instruction jmp b4
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -1579,10 +1584,10 @@ FINAL SYMBOL TABLE
 (byte) WHITE
 (byte) YELLOW
 (void()) main()
-(label) main::@11
-(label) main::@6
-(label) main::@8
-(label) main::@9
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
 (byte) main::c
 (byte) main::c#1 reg byte x 151.5
 (byte) main::c#2 reg byte x 201.99999999999997
@@ -1619,10 +1624,10 @@ Score: 10174
   // Defines colors for the 16 first colors ($00-$0f)
   .label DTV_PALETTE = $d200
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-//SEG5 @6
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -1634,24 +1639,24 @@ main: {
   //SEG12 [6] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_BORDER_OFF#0|(const byte) DTV_BADLINE_OFF#0 -- _deref_pbuc1=vbuc2 
     lda #DTV_HIGHCOLOR|DTV_BORDER_OFF|DTV_BADLINE_OFF
     sta DTV_CONTROL
-  //SEG13 main::@6
-  b6:
-  //SEG14 [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG13 main::@1
+  b1:
+  //SEG14 [7] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$40
     cmp RASTER
-    bne b6
-  //SEG15 main::@8
+    bne b1
+  //SEG15 main::@2
   //SEG16 [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Create rasterbars
     lda #0
     sta BGCOL
-  //SEG17 [9] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  //SEG18 [9] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) $31 [phi:main::@8->main::@9#0] -- vbuxx=vbuc1 
+  //SEG17 [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  //SEG18 [9] phi (byte) main::r#2 = (byte/signed byte/word/signed word/dword/signed dword) $31 [phi:main::@2->main::@3#0] -- vbuxx=vbuc1 
     ldx #$31
-  //SEG19 [9] phi from main::@9 to main::@9 [phi:main::@9->main::@9]
-  //SEG20 [9] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@9->main::@9#0] -- register_copy 
-  //SEG21 main::@9
-  b9:
+  //SEG19 [9] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
+  //SEG20 [9] phi (byte) main::r#2 = (byte) main::r#1 [phi:main::@3->main::@3#0] -- register_copy 
+  //SEG21 main::@3
+  b3:
   //SEG22 asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
     nop
     nop
@@ -1682,17 +1687,17 @@ main: {
     inc BGCOL
   //SEG24 [12] (byte) main::r#1 ← ++ (byte) main::r#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG25 [13] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9 -- vbuxx_neq_0_then_la1 
+  //SEG25 [13] if((byte) main::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b9
-  //SEG26 [14] phi from main::@9 to main::@11 [phi:main::@9->main::@11]
-  //SEG27 [14] phi (byte) main::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@9->main::@11#0] -- vbuxx=vbuc1 
+    bne b3
+  //SEG26 [14] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG27 [14] phi (byte) main::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuxx=vbuc1 
     ldx #0
   // Rotate palette
-  //SEG28 [14] phi from main::@11 to main::@11 [phi:main::@11->main::@11]
-  //SEG29 [14] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@11->main::@11#0] -- register_copy 
-  //SEG30 main::@11
-  b11:
+  //SEG28 [14] phi from main::@4 to main::@4 [phi:main::@4->main::@4]
+  //SEG29 [14] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@4->main::@4#0] -- register_copy 
+  //SEG30 main::@4
+  b4:
   //SEG31 [15] *((const byte*) DTV_PALETTE#0 + (byte) main::c#2) ← *((const byte[$10]) main::palette#0 + (byte) main::c#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda palette,x
     sta DTV_PALETTE,x
@@ -1700,10 +1705,10 @@ main: {
     inc palette,x
   //SEG33 [17] (byte) main::c#1 ← ++ (byte) main::c#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG34 [18] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG34 [18] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b11
-    jmp b6
+    bne b4
+    jmp b1
     palette: .byte 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, $a, $b, $c, $d, $e, $f
 }
 
diff --git a/src/test/ref/c64dtv-color.sym b/src/test/ref/c64dtv-color.sym
index 7c63fd650..db7ccb6e3 100644
--- a/src/test/ref/c64dtv-color.sym
+++ b/src/test/ref/c64dtv-color.sym
@@ -1,4 +1,4 @@
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -185,10 +185,10 @@
 (byte) WHITE
 (byte) YELLOW
 (void()) main()
-(label) main::@11
-(label) main::@6
-(label) main::@8
-(label) main::@9
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
 (byte) main::c
 (byte) main::c#1 reg byte x 151.5
 (byte) main::c#2 reg byte x 201.99999999999997
diff --git a/src/test/ref/c64dtv-gfxexplorer.asm b/src/test/ref/c64dtv-gfxexplorer.asm
index e5af66969..143311171 100644
--- a/src/test/ref/c64dtv-gfxexplorer.asm
+++ b/src/test/ref/c64dtv-gfxexplorer.asm
@@ -437,9 +437,9 @@ gfx_mode: {
     sta col
     lda #>COLS
     sta col+1
-  b26:
+  b19:
     ldx #0
-  b27:
+  b20:
     ldy #0
     lda (vic_colors),y
     sta (col),y
@@ -453,11 +453,11 @@ gfx_mode: {
   !:
     inx
     cpx #$28
-    bne b27
+    bne b20
     inc cy
     lda #$19
     cmp cy
-    bne b26
+    bne b19
     // Background colors
     lda #0
     sta BORDERCOL
@@ -495,31 +495,31 @@ gfx_mode: {
     beq b13
     ldx #0
   // DTV Palette - Grey Tones
-  b31:
+  b23:
     txa
     sta DTV_PALETTE,x
     inx
     cpx #$10
-    bne b31
-  b36:
+    bne b23
+  b25:
     lda #$ff
     cmp RASTER
-    bne b36
+    bne b25
     jsr keyboard_event_scan
     jsr keyboard_event_get
     cmp #KEY_SPACE
-    bne b36
+    bne b25
     rts
   // DTV Palette - default
   b13:
     ldx #0
-  b34:
+  b24:
     lda DTV_PALETTE_DEFAULT,x
     sta DTV_PALETTE,x
     inx
     cpx #$10
-    bne b34
-    jmp b36
+    bne b24
+    jmp b25
 }
 // Get the next event from the keyboard event buffer.
 // Returns $ff if there is no event waiting. As all events are <$7f it is enough to examine bit 7 when determining if there is any event to process.
@@ -548,7 +548,7 @@ keyboard_event_scan: {
     lda #0
     sta keycode
     sta row
-  b8:
+  b7:
     ldx row
     jsr keyboard_matrix_read
     sta row_scan
@@ -558,11 +558,11 @@ keyboard_event_scan: {
     lax keycode
     axs #-[8]
     stx keycode
-  b10:
+  b8:
     inc row
     lda #8
     cmp row
-    bne b8
+    bne b7
     lda #KEY_LSHIFT
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
@@ -604,43 +604,43 @@ keyboard_event_scan: {
   // Something has changed on the keyboard row - check each column
   b6:
     ldx #0
-  b11:
+  b9:
     lda row_scan
     ldy row
     eor keyboard_scan_values,y
     and keyboard_matrix_col_bitmask,x
     cmp #0
-    beq b12
+    beq b10
     lda #8
     cmp keyboard_events_size
-    beq b12
+    beq b10
     lda keyboard_matrix_col_bitmask,x
     and row_scan
     cmp #0
-    beq b14
+    beq b11
     // Key pressed
     lda keycode
     ldy keyboard_events_size
     sta keyboard_events,y
     inc keyboard_events_size
-  b12:
+  b10:
     inc keycode
     inx
     cpx #8
-    bne b11
+    bne b9
     // Store the current keyboard status for the row to debounce
     lda row_scan
     ldy row
     sta keyboard_scan_values,y
-    jmp b10
-  b14:
+    jmp b8
+  b11:
     lda #$40
     ora keycode
     // Key released
     ldy keyboard_events_size
     sta keyboard_events,y
     inc keyboard_events_size
-    jmp b12
+    jmp b10
 }
 // Determine if a specific key is currently pressed based on the last keyboard_event_scan()
 // Returns 0 is not pressed and non-0 if pressed
@@ -680,39 +680,39 @@ keyboard_matrix_read: {
 get_vic_screen: {
     .label return = 3
     cmp #0
-    beq b1
-    cmp #1
     beq b2
-    cmp #2
+    cmp #1
     beq b3
-    cmp #3
+    cmp #2
     beq b4
+    cmp #3
+    beq b5
     cmp #4
-    bne b1
+    bne b2
     lda #<VIC_SCREEN4
     sta return
     lda #>VIC_SCREEN4
     sta return+1
     jmp breturn
-  b1:
+  b2:
     lda #<VIC_SCREEN0
     sta return
     lda #>VIC_SCREEN0
     sta return+1
     jmp breturn
-  b2:
+  b3:
     lda #<VIC_SCREEN1
     sta return
     lda #>VIC_SCREEN1
     sta return+1
     jmp breturn
-  b3:
+  b4:
     lda #<VIC_SCREEN2
     sta return
     lda #>VIC_SCREEN2
     sta return+1
     jmp breturn
-  b4:
+  b5:
     lda #<VIC_SCREEN3
     sta return
     lda #>VIC_SCREEN3
@@ -725,15 +725,15 @@ get_vic_screen: {
 get_vic_charset: {
     .label return = 3
     cmp #0
-    beq b1
+    beq b2
     cmp #1
-    bne b1
+    bne b2
     lda #<VIC_BITMAP
     sta return
     lda #>VIC_BITMAP
     sta return+1
     jmp breturn
-  b1:
+  b2:
     lda #<VIC_CHARSET_ROM
     sta return
     lda #>VIC_CHARSET_ROM
@@ -746,55 +746,49 @@ get_vic_charset: {
 get_plane: {
     .label return = 9
     cmp #0
-    beq b1
-    cmp #1
     beq b2
-    cmp #2
-    bne !b3+
-    jmp b3
-  !b3:
-    cmp #3
-    bne !b4+
-    jmp b4
-  !b4:
-    cmp #4
-    bne !b5+
-    jmp b5
-  !b5:
-    cmp #5
-    bne !b6+
-    jmp b6
-  !b6:
-    cmp #6
+    cmp #1
     bne !b7+
     jmp b7
   !b7:
-    cmp #7
+    cmp #2
     bne !b8+
     jmp b8
   !b8:
-    cmp #8
+    cmp #3
     bne !b9+
     jmp b9
   !b9:
-    cmp #9
+    cmp #4
     bne !b10+
     jmp b10
   !b10:
-    cmp #$a
+    cmp #5
     bne !b11+
     jmp b11
   !b11:
-    cmp #$b
+    cmp #6
     bne !b12+
     jmp b12
   !b12:
-    cmp #$c
+    cmp #7
     bne !b13+
     jmp b13
   !b13:
+    cmp #8
+    bne !b14+
+    jmp b14
+  !b14:
+    cmp #9
+    beq b3
+    cmp #$a
+    beq b4
+    cmp #$b
+    beq b5
+    cmp #$c
+    beq b6
     cmp #$d
-    bne b1
+    bne b2
     lda #<PLANE_FULL
     sta return
     lda #>PLANE_FULL
@@ -804,7 +798,7 @@ get_plane: {
     lda #>PLANE_FULL>>$10
     sta return+3
     jmp breturn
-  b1:
+  b2:
     lda #<$ffffffff&VIC_SCREEN0
     sta return
     lda #>$ffffffff&VIC_SCREEN0
@@ -814,87 +808,7 @@ get_plane: {
     lda #>$ffffffff&VIC_SCREEN0>>$10
     sta return+3
     jmp breturn
-  b2:
-    lda #<$ffffffff&VIC_SCREEN1
-    sta return
-    lda #>$ffffffff&VIC_SCREEN1
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN1>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN1>>$10
-    sta return+3
-    jmp breturn
   b3:
-    lda #<$ffffffff&VIC_SCREEN2
-    sta return
-    lda #>$ffffffff&VIC_SCREEN2
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN2>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN2>>$10
-    sta return+3
-    jmp breturn
-  b4:
-    lda #<$ffffffff&VIC_SCREEN3
-    sta return
-    lda #>$ffffffff&VIC_SCREEN3
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN3>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN3>>$10
-    sta return+3
-    jmp breturn
-  b5:
-    lda #<$ffffffff&VIC_BITMAP
-    sta return
-    lda #>$ffffffff&VIC_BITMAP
-    sta return+1
-    lda #<$ffffffff&VIC_BITMAP>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_BITMAP>>$10
-    sta return+3
-    jmp breturn
-  b6:
-    lda #<$ffffffff&VIC_CHARSET_ROM
-    sta return
-    lda #>$ffffffff&VIC_CHARSET_ROM
-    sta return+1
-    lda #<$ffffffff&VIC_CHARSET_ROM>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_CHARSET_ROM>>$10
-    sta return+3
-    jmp breturn
-  b7:
-    lda #<PLANE_8BPP_CHUNKY
-    sta return
-    lda #>PLANE_8BPP_CHUNKY
-    sta return+1
-    lda #<PLANE_8BPP_CHUNKY>>$10
-    sta return+2
-    lda #>PLANE_8BPP_CHUNKY>>$10
-    sta return+3
-    jmp breturn
-  b8:
-    lda #<PLANE_HORISONTAL
-    sta return
-    lda #>PLANE_HORISONTAL
-    sta return+1
-    lda #<PLANE_HORISONTAL>>$10
-    sta return+2
-    lda #>PLANE_HORISONTAL>>$10
-    sta return+3
-    jmp breturn
-  b9:
-    lda #<PLANE_VERTICAL
-    sta return
-    lda #>PLANE_VERTICAL
-    sta return+1
-    lda #<PLANE_VERTICAL>>$10
-    sta return+2
-    lda #>PLANE_VERTICAL>>$10
-    sta return+3
-    jmp breturn
-  b10:
     lda #<PLANE_HORISONTAL2
     sta return
     lda #>PLANE_HORISONTAL2
@@ -904,7 +818,7 @@ get_plane: {
     lda #>PLANE_HORISONTAL2>>$10
     sta return+3
     jmp breturn
-  b11:
+  b4:
     lda #<PLANE_VERTICAL2
     sta return
     lda #>PLANE_VERTICAL2
@@ -914,7 +828,7 @@ get_plane: {
     lda #>PLANE_VERTICAL2>>$10
     sta return+3
     jmp breturn
-  b12:
+  b5:
     lda #<PLANE_CHARSET8
     sta return
     lda #>PLANE_CHARSET8
@@ -924,7 +838,7 @@ get_plane: {
     lda #>PLANE_CHARSET8>>$10
     sta return+3
     jmp breturn
-  b13:
+  b6:
     lda #<PLANE_BLANK
     sta return
     lda #>PLANE_BLANK
@@ -933,6 +847,86 @@ get_plane: {
     sta return+2
     lda #>PLANE_BLANK>>$10
     sta return+3
+    jmp breturn
+  b7:
+    lda #<$ffffffff&VIC_SCREEN1
+    sta return
+    lda #>$ffffffff&VIC_SCREEN1
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN1>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN1>>$10
+    sta return+3
+    jmp breturn
+  b8:
+    lda #<$ffffffff&VIC_SCREEN2
+    sta return
+    lda #>$ffffffff&VIC_SCREEN2
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN2>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN2>>$10
+    sta return+3
+    jmp breturn
+  b9:
+    lda #<$ffffffff&VIC_SCREEN3
+    sta return
+    lda #>$ffffffff&VIC_SCREEN3
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN3>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN3>>$10
+    sta return+3
+    jmp breturn
+  b10:
+    lda #<$ffffffff&VIC_BITMAP
+    sta return
+    lda #>$ffffffff&VIC_BITMAP
+    sta return+1
+    lda #<$ffffffff&VIC_BITMAP>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_BITMAP>>$10
+    sta return+3
+    jmp breturn
+  b11:
+    lda #<$ffffffff&VIC_CHARSET_ROM
+    sta return
+    lda #>$ffffffff&VIC_CHARSET_ROM
+    sta return+1
+    lda #<$ffffffff&VIC_CHARSET_ROM>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_CHARSET_ROM>>$10
+    sta return+3
+    jmp breturn
+  b12:
+    lda #<PLANE_8BPP_CHUNKY
+    sta return
+    lda #>PLANE_8BPP_CHUNKY
+    sta return+1
+    lda #<PLANE_8BPP_CHUNKY>>$10
+    sta return+2
+    lda #>PLANE_8BPP_CHUNKY>>$10
+    sta return+3
+    jmp breturn
+  b13:
+    lda #<PLANE_HORISONTAL
+    sta return
+    lda #>PLANE_HORISONTAL
+    sta return+1
+    lda #<PLANE_HORISONTAL>>$10
+    sta return+2
+    lda #>PLANE_HORISONTAL>>$10
+    sta return+3
+    jmp breturn
+  b14:
+    lda #<PLANE_VERTICAL
+    sta return
+    lda #>PLANE_VERTICAL
+    sta return+1
+    lda #<PLANE_VERTICAL>>$10
+    sta return+2
+    lda #>PLANE_VERTICAL>>$10
+    sta return+3
   breturn:
     rts
 }
@@ -1000,12 +994,12 @@ form_mode: {
     sta DTV_PLANEA_START_HI
     tax
   // DTV Palette - default
-  b7:
+  b2:
     lda DTV_PALETTE_DEFAULT,x
     sta DTV_PALETTE,x
     inx
     cpx #$10
-    bne b7
+    bne b2
     // Screen colors
     lda #0
     sta BGCOL
@@ -1013,26 +1007,26 @@ form_mode: {
     lda form_fields_val
     sta preset_current
   // Let the user change values in the form
-  b9:
+  b4:
     lda #$ff
     cmp RASTER
-    bne b9
+    bne b4
     jsr form_control
     txa
     cmp #0
-    beq b12
+    beq b6
     rts
-  b12:
+  b6:
     lda form_fields_val
     cmp preset_current
-    beq b9
+    beq b4
     jsr apply_preset
     lda form_fields_val
     sta preset_current
     jsr form_render_values
     lda form_fields_val
     jsr render_preset_name
-    jmp b9
+    jmp b4
 }
 // Render form preset name in the form
 // idx is the ID of the preset
@@ -1040,93 +1034,93 @@ form_mode: {
 render_preset_name: {
     .label name = 3
     cmp #0
-    beq b33
+    beq b12
     cmp #1
-    beq b1
-    cmp #2
-    beq b2
-    cmp #3
-    beq b3
-    cmp #4
     beq b4
-    cmp #5
+    cmp #2
     beq b5
-    cmp #6
+    cmp #3
     beq b6
-    cmp #7
+    cmp #4
     beq b7
-    cmp #8
+    cmp #5
     beq b8
-    cmp #9
+    cmp #6
     beq b9
-    cmp #$a
+    cmp #7
     beq b10
-  b33:
+    cmp #8
+    beq b11
+    cmp #9
+    beq b2
+    cmp #$a
+    beq b3
+  b12:
     lda #<name_1
     sta name
     lda #>name_1
     sta name+1
-    jmp b22
-  b1:
-    lda #<name_2
-    sta name
-    lda #>name_2
-    sta name+1
-    jmp b22
+    jmp b1
   b2:
-    lda #<name_3
-    sta name
-    lda #>name_3
-    sta name+1
-    jmp b22
-  b3:
-    lda #<name_4
-    sta name
-    lda #>name_4
-    sta name+1
-    jmp b22
-  b4:
-    lda #<name_5
-    sta name
-    lda #>name_5
-    sta name+1
-    jmp b22
-  b5:
-    lda #<name_6
-    sta name
-    lda #>name_6
-    sta name+1
-    jmp b22
-  b6:
-    lda #<name_7
-    sta name
-    lda #>name_7
-    sta name+1
-    jmp b22
-  b7:
-    lda #<name_8
-    sta name
-    lda #>name_8
-    sta name+1
-    jmp b22
-  b8:
-    lda #<name_9
-    sta name
-    lda #>name_9
-    sta name+1
-    jmp b22
-  b9:
     lda #<name_10
     sta name
     lda #>name_10
     sta name+1
-    jmp b22
-  b10:
+    jmp b1
+  b3:
     lda #<name_11
     sta name
     lda #>name_11
     sta name+1
-  b22:
+    jmp b1
+  b4:
+    lda #<name_2
+    sta name
+    lda #>name_2
+    sta name+1
+    jmp b1
+  b5:
+    lda #<name_3
+    sta name
+    lda #>name_3
+    sta name+1
+    jmp b1
+  b6:
+    lda #<name_4
+    sta name
+    lda #>name_4
+    sta name+1
+    jmp b1
+  b7:
+    lda #<name_5
+    sta name
+    lda #>name_5
+    sta name+1
+    jmp b1
+  b8:
+    lda #<name_6
+    sta name
+    lda #>name_6
+    sta name+1
+    jmp b1
+  b9:
+    lda #<name_7
+    sta name
+    lda #>name_7
+    sta name+1
+    jmp b1
+  b10:
+    lda #<name_8
+    sta name
+    lda #>name_8
+    sta name+1
+    jmp b1
+  b11:
+    lda #<name_9
+    sta name
+    lda #>name_9
+    sta name+1
+  b1:
     jsr print_str_at
     rts
     name_1: .text "Standard Charset              @"
@@ -1216,101 +1210,101 @@ form_field_ptr: {
 apply_preset: {
     .label preset = 3
     cmp #0
-    beq b33
+    beq b12
     cmp #1
-    beq b1
-    cmp #2
-    beq b2
-    cmp #3
-    beq b3
-    cmp #4
     beq b4
-    cmp #5
+    cmp #2
     beq b5
-    cmp #6
+    cmp #3
     beq b6
-    cmp #7
+    cmp #4
     beq b7
-    cmp #8
+    cmp #5
     beq b8
-    cmp #9
+    cmp #6
     beq b9
-    cmp #$a
+    cmp #7
     beq b10
-  b33:
+    cmp #8
+    beq b11
+    cmp #9
+    beq b2
+    cmp #$a
+    beq b3
+  b12:
     lda #<preset_stdchar
     sta preset
     lda #>preset_stdchar
     sta preset+1
-    jmp b22
-  b1:
-    lda #<preset_ecmchar
-    sta preset
-    lda #>preset_ecmchar
-    sta preset+1
-    jmp b22
+    jmp b1
   b2:
-    lda #<preset_stdbm
-    sta preset
-    lda #>preset_stdbm
-    sta preset+1
-    jmp b22
-  b3:
-    lda #<preset_mcbm
-    sta preset
-    lda #>preset_mcbm
-    sta preset+1
-    jmp b22
-  b4:
-    lda #<preset_hi_stdchar
-    sta preset
-    lda #>preset_hi_stdchar
-    sta preset+1
-    jmp b22
-  b5:
-    lda #<preset_hi_ecmchar
-    sta preset
-    lda #>preset_hi_ecmchar
-    sta preset+1
-    jmp b22
-  b6:
-    lda #<preset_twoplane
-    sta preset
-    lda #>preset_twoplane
-    sta preset+1
-    jmp b22
-  b7:
-    lda #<preset_chunky
-    sta preset
-    lda #>preset_chunky
-    sta preset+1
-    jmp b22
-  b8:
-    lda #<preset_sixsfred
-    sta preset
-    lda #>preset_sixsfred
-    sta preset+1
-    jmp b22
-  b9:
     lda #<preset_sixsfred2
     sta preset
     lda #>preset_sixsfred2
     sta preset+1
-    jmp b22
-  b10:
+    jmp b1
+  b3:
     lda #<preset_8bpppixelcell
     sta preset
     lda #>preset_8bpppixelcell
     sta preset+1
-  b22:
+    jmp b1
+  b4:
+    lda #<preset_ecmchar
+    sta preset
+    lda #>preset_ecmchar
+    sta preset+1
+    jmp b1
+  b5:
+    lda #<preset_stdbm
+    sta preset
+    lda #>preset_stdbm
+    sta preset+1
+    jmp b1
+  b6:
+    lda #<preset_mcbm
+    sta preset
+    lda #>preset_mcbm
+    sta preset+1
+    jmp b1
+  b7:
+    lda #<preset_hi_stdchar
+    sta preset
+    lda #>preset_hi_stdchar
+    sta preset+1
+    jmp b1
+  b8:
+    lda #<preset_hi_ecmchar
+    sta preset
+    lda #>preset_hi_ecmchar
+    sta preset+1
+    jmp b1
+  b9:
+    lda #<preset_twoplane
+    sta preset
+    lda #>preset_twoplane
+    sta preset+1
+    jmp b1
+  b10:
+    lda #<preset_chunky
+    sta preset
+    lda #>preset_chunky
+    sta preset+1
+    jmp b1
+  b11:
+    lda #<preset_sixsfred
+    sta preset
+    lda #>preset_sixsfred
+    sta preset+1
+  b1:
     ldy #0
   // Copy preset values into the fields
-  b45:
+  b13:
     lda (preset),y
     sta form_fields_val,y
     iny
     cpy #form_fields_cnt
-    bne b45
+    bne b13
     rts
 }
 // Reads keyboard and allows the user to navigate and change the fields of the form
@@ -1352,43 +1346,43 @@ form_control: {
     txa
     and #KEY_MODIFIER_SHIFT
     cmp #0
-    beq b19
+    beq b12
     dec form_field_idx
     lda #$ff
     cmp form_field_idx
-    bne b22
+    bne b13
     lda #form_fields_cnt-1
     sta form_field_idx
-  b22:
+  b13:
     lda #FORM_CURSOR_BLINK/2
     sta form_cursor_count
     ldx #0
   breturn:
     rts
-  b19:
+  b12:
     inc form_field_idx
     lda #form_fields_cnt
     cmp form_field_idx
-    bne b22
+    bne b13
     lda #0
     sta form_field_idx
-    jmp b22
+    jmp b13
   b4:
     cmp #KEY_CRSR_RIGHT
     bne b5
     txa
     and #KEY_MODIFIER_SHIFT
     cmp #0
-    beq b26
+    beq b14
     ldx form_field_idx
     dec form_fields_val,x
     lda #$ff
     ldy form_field_idx
     cmp form_fields_val,y
-    bne b29
+    bne b15
     lda form_fields_max,y
     sta form_fields_val,y
-  b29:
+  b15:
     // Render field value
     ldx form_field_idx
     ldy form_fields_val,x
@@ -1398,17 +1392,17 @@ form_control: {
   b6:
     ldx #0
     jmp breturn
-  b26:
+  b14:
     ldx form_field_idx
     inc form_fields_val,x
     ldy form_field_idx
     lda form_fields_val,y
     cmp form_fields_max,y
-    bcc b29
-    beq b29
+    bcc b15
+    beq b15
     lda #0
     sta form_fields_val,y
-    jmp b29
+    jmp b15
   b5:
     cmp #KEY_SPACE
     bne b6
@@ -1460,9 +1454,9 @@ print_str_lines: {
     ldy #0
     lda (str),y
     cmp #'@'
-    bne b6
+    bne b2
     rts
-  b6:
+  b2:
     ldy #0
     lda (str),y
     inc str
@@ -1470,16 +1464,16 @@ print_str_lines: {
     inc str+1
   !:
     cmp #'@'
-    beq b7
+    beq b3
     ldy #0
     sta (print_char_cursor),y
     inc print_char_cursor
     bne !+
     inc print_char_cursor+1
   !:
-  b7:
+  b3:
     cmp #'@'
-    bne b6
+    bne b2
     jsr print_ln
     lda print_line_cursor
     sta print_char_cursor
@@ -2001,12 +1995,12 @@ bitmap_line: {
     sta xd
     lda y0
     cmp y1
-    bcc b10
+    bcc b7
     sec
     sbc y1
     tay
     cpy xd
-    bcc b11
+    bcc b8
     lda y1
     sta bitmap_line_ydxi.y
     lda y0
@@ -2015,20 +2009,20 @@ bitmap_line: {
     jsr bitmap_line_ydxi
   breturn:
     rts
-  b11:
+  b8:
     stx bitmap_line_xdyi.x
     lda y1
     sta bitmap_line_xdyi.y
     sty bitmap_line_xdyi.yd
     jsr bitmap_line_xdyi
     jmp breturn
-  b10:
+  b7:
     lda y1
     sec
     sbc y0
     tay
     cpy xd
-    bcc b15
+    bcc b9
     lda y0
     sta bitmap_line_ydxd.y
     ldx x0
@@ -2037,7 +2031,7 @@ bitmap_line: {
     sty bitmap_line_ydxd.yd
     jsr bitmap_line_ydxd
     jmp breturn
-  b15:
+  b9:
     stx bitmap_line_xdyd.x
     lda y1
     sta bitmap_line_xdyd.y
@@ -2051,38 +2045,38 @@ bitmap_line: {
     sta xd
     lda y0
     cmp y1
-    bcc b20
+    bcc b11
     sec
     sbc y1
     tay
     cpy xd
-    bcc b21
+    bcc b12
     lda y1
     sta bitmap_line_ydxd.y
     sty bitmap_line_ydxd.yd
     jsr bitmap_line_ydxd
     jmp breturn
-  b21:
+  b12:
     lda x0
     sta bitmap_line_xdyd.x
     stx bitmap_line_xdyd.x1
     sty bitmap_line_xdyd.yd
     jsr bitmap_line_xdyd
     jmp breturn
-  b20:
+  b11:
     lda y1
     sec
     sbc y0
     tay
     cpy xd
-    bcc b25
+    bcc b13
     lda y0
     sta bitmap_line_ydxi.y
     ldx x0
     sty bitmap_line_ydxi.yd
     jsr bitmap_line_ydxi
     jmp breturn
-  b25:
+  b13:
     lda x0
     sta bitmap_line_xdyi.x
     stx bitmap_line_xdyi.x1
@@ -2312,7 +2306,7 @@ bitmap_init: {
     sta yoffs
     sta yoffs+1
     tax
-  b5:
+  b3:
     lda #7
     sax _6
     lda yoffs
@@ -2323,7 +2317,7 @@ bitmap_init: {
     txa
     and #7
     cmp #7
-    bne b6
+    bne b4
     clc
     lda yoffs
     adc #<$28*8
@@ -2331,10 +2325,10 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  b6:
+  b4:
     inx
     cpx #0
-    bne b5
+    bne b3
     rts
 }
 gfx_init_charset: {
diff --git a/src/test/ref/c64dtv-gfxexplorer.cfg b/src/test/ref/c64dtv-gfxexplorer.cfg
index 43b18cc8c..969b81a15 100644
--- a/src/test/ref/c64dtv-gfxexplorer.cfg
+++ b/src/test/ref/c64dtv-gfxexplorer.cfg
@@ -1,110 +1,110 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@68
-@68: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @68
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @68
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
   [7] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
   [8] call keyboard_init 
-  to:main::@7
-main::@7: scope:[main]  from main
+  to:main::@3
+main::@3: scope:[main]  from main
   [9] phi()
   [10] call gfx_init 
   to:main::@1
-main::@1: scope:[main]  from main::@7 main::@9
-  [11] (byte) form_field_idx#1 ← phi( main::@9/(byte) form_field_idx#18 main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [11] (byte) keyboard_events_size#27 ← phi( main::@9/(byte) keyboard_events_size#24 main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [11] (signed byte) form_cursor_count#1 ← phi( main::@9/(signed byte) form_cursor_count#16 main::@7/(const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 )
+main::@1: scope:[main]  from main::@3 main::@4
+  [11] (byte) form_field_idx#1 ← phi( main::@4/(byte) form_field_idx#18 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [11] (byte) keyboard_events_size#27 ← phi( main::@4/(byte) keyboard_events_size#24 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [11] (signed byte) form_cursor_count#1 ← phi( main::@4/(signed byte) form_cursor_count#16 main::@3/(const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 )
   to:main::@2
 main::@2: scope:[main]  from main::@1
   [12] phi()
   [13] call form_mode 
-  to:main::@9
-main::@9: scope:[main]  from main::@2
+  to:main::@4
+main::@4: scope:[main]  from main::@2
   [14] phi()
   [15] call gfx_mode 
   to:main::@1
-gfx_mode: scope:[gfx_mode]  from main::@9
+gfx_mode: scope:[gfx_mode]  from main::@4
   [16] if(*((const byte*) form_ctrl_line#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@1
-  to:gfx_mode::@15
-gfx_mode::@15: scope:[gfx_mode]  from gfx_mode
+  to:gfx_mode::@10
+gfx_mode::@10: scope:[gfx_mode]  from gfx_mode
   [17] phi()
   to:gfx_mode::@1
-gfx_mode::@1: scope:[gfx_mode]  from gfx_mode gfx_mode::@15
-  [18] (byte) gfx_mode::dtv_control#14 ← phi( gfx_mode/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@15/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) DTV_LINEAR#0 )
+gfx_mode::@1: scope:[gfx_mode]  from gfx_mode gfx_mode::@10
+  [18] (byte) gfx_mode::dtv_control#14 ← phi( gfx_mode/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@10/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) DTV_LINEAR#0 )
   [19] if(*((const byte*) form_ctrl_borof#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@2
-  to:gfx_mode::@16
-gfx_mode::@16: scope:[gfx_mode]  from gfx_mode::@1
+  to:gfx_mode::@11
+gfx_mode::@11: scope:[gfx_mode]  from gfx_mode::@1
   [20] (byte) gfx_mode::dtv_control#2 ← (byte) gfx_mode::dtv_control#14 | (const byte) DTV_BORDER_OFF#0
   to:gfx_mode::@2
-gfx_mode::@2: scope:[gfx_mode]  from gfx_mode::@1 gfx_mode::@16
-  [21] (byte) gfx_mode::dtv_control#15 ← phi( gfx_mode::@1/(byte) gfx_mode::dtv_control#14 gfx_mode::@16/(byte) gfx_mode::dtv_control#2 )
+gfx_mode::@2: scope:[gfx_mode]  from gfx_mode::@1 gfx_mode::@11
+  [21] (byte) gfx_mode::dtv_control#15 ← phi( gfx_mode::@1/(byte) gfx_mode::dtv_control#14 gfx_mode::@11/(byte) gfx_mode::dtv_control#2 )
   [22] if(*((const byte*) form_ctrl_hicol#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@3
-  to:gfx_mode::@17
-gfx_mode::@17: scope:[gfx_mode]  from gfx_mode::@2
+  to:gfx_mode::@12
+gfx_mode::@12: scope:[gfx_mode]  from gfx_mode::@2
   [23] (byte) gfx_mode::dtv_control#3 ← (byte) gfx_mode::dtv_control#15 | (const byte) DTV_HIGHCOLOR#0
   to:gfx_mode::@3
-gfx_mode::@3: scope:[gfx_mode]  from gfx_mode::@17 gfx_mode::@2
-  [24] (byte) gfx_mode::dtv_control#10 ← phi( gfx_mode::@17/(byte) gfx_mode::dtv_control#3 gfx_mode::@2/(byte) gfx_mode::dtv_control#15 )
+gfx_mode::@3: scope:[gfx_mode]  from gfx_mode::@12 gfx_mode::@2
+  [24] (byte) gfx_mode::dtv_control#10 ← phi( gfx_mode::@12/(byte) gfx_mode::dtv_control#3 gfx_mode::@2/(byte) gfx_mode::dtv_control#15 )
   [25] if(*((const byte*) form_ctrl_overs#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@4
-  to:gfx_mode::@18
-gfx_mode::@18: scope:[gfx_mode]  from gfx_mode::@3
+  to:gfx_mode::@13
+gfx_mode::@13: scope:[gfx_mode]  from gfx_mode::@3
   [26] (byte) gfx_mode::dtv_control#4 ← (byte) gfx_mode::dtv_control#10 | (const byte) DTV_OVERSCAN#0
   to:gfx_mode::@4
-gfx_mode::@4: scope:[gfx_mode]  from gfx_mode::@18 gfx_mode::@3
-  [27] (byte) gfx_mode::dtv_control#11 ← phi( gfx_mode::@18/(byte) gfx_mode::dtv_control#4 gfx_mode::@3/(byte) gfx_mode::dtv_control#10 )
+gfx_mode::@4: scope:[gfx_mode]  from gfx_mode::@13 gfx_mode::@3
+  [27] (byte) gfx_mode::dtv_control#11 ← phi( gfx_mode::@13/(byte) gfx_mode::dtv_control#4 gfx_mode::@3/(byte) gfx_mode::dtv_control#10 )
   [28] if(*((const byte*) form_ctrl_colof#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@5
-  to:gfx_mode::@19
-gfx_mode::@19: scope:[gfx_mode]  from gfx_mode::@4
+  to:gfx_mode::@14
+gfx_mode::@14: scope:[gfx_mode]  from gfx_mode::@4
   [29] (byte) gfx_mode::dtv_control#5 ← (byte) gfx_mode::dtv_control#11 | (const byte) DTV_COLORRAM_OFF#0
   to:gfx_mode::@5
-gfx_mode::@5: scope:[gfx_mode]  from gfx_mode::@19 gfx_mode::@4
-  [30] (byte) gfx_mode::dtv_control#13 ← phi( gfx_mode::@19/(byte) gfx_mode::dtv_control#5 gfx_mode::@4/(byte) gfx_mode::dtv_control#11 )
+gfx_mode::@5: scope:[gfx_mode]  from gfx_mode::@14 gfx_mode::@4
+  [30] (byte) gfx_mode::dtv_control#13 ← phi( gfx_mode::@14/(byte) gfx_mode::dtv_control#5 gfx_mode::@4/(byte) gfx_mode::dtv_control#11 )
   [31] if(*((const byte*) form_ctrl_chunk#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@6
-  to:gfx_mode::@20
-gfx_mode::@20: scope:[gfx_mode]  from gfx_mode::@5
+  to:gfx_mode::@15
+gfx_mode::@15: scope:[gfx_mode]  from gfx_mode::@5
   [32] (byte) gfx_mode::dtv_control#6 ← (byte) gfx_mode::dtv_control#13 | (const byte) DTV_CHUNKY#0
   to:gfx_mode::@6
-gfx_mode::@6: scope:[gfx_mode]  from gfx_mode::@20 gfx_mode::@5
-  [33] (byte) gfx_mode::dtv_control#12 ← phi( gfx_mode::@20/(byte) gfx_mode::dtv_control#6 gfx_mode::@5/(byte) gfx_mode::dtv_control#13 )
+gfx_mode::@6: scope:[gfx_mode]  from gfx_mode::@15 gfx_mode::@5
+  [33] (byte) gfx_mode::dtv_control#12 ← phi( gfx_mode::@15/(byte) gfx_mode::dtv_control#6 gfx_mode::@5/(byte) gfx_mode::dtv_control#13 )
   [34] *((const byte*) DTV_CONTROL#0) ← (byte) gfx_mode::dtv_control#12
   [35] if(*((const byte*) form_ctrl_ecm#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@7
-  to:gfx_mode::@21
-gfx_mode::@21: scope:[gfx_mode]  from gfx_mode::@6
+  to:gfx_mode::@16
+gfx_mode::@16: scope:[gfx_mode]  from gfx_mode::@6
   [36] phi()
   to:gfx_mode::@7
-gfx_mode::@7: scope:[gfx_mode]  from gfx_mode::@21 gfx_mode::@6
-  [37] (byte) gfx_mode::vic_control#5 ← phi( gfx_mode::@21/(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3|(const byte) VIC_ECM#0 gfx_mode::@6/(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 )
+gfx_mode::@7: scope:[gfx_mode]  from gfx_mode::@16 gfx_mode::@6
+  [37] (byte) gfx_mode::vic_control#5 ← phi( gfx_mode::@16/(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3|(const byte) VIC_ECM#0 gfx_mode::@6/(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 )
   [38] if(*((const byte*) form_ctrl_bmm#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@8
-  to:gfx_mode::@22
-gfx_mode::@22: scope:[gfx_mode]  from gfx_mode::@7
+  to:gfx_mode::@17
+gfx_mode::@17: scope:[gfx_mode]  from gfx_mode::@7
   [39] (byte) gfx_mode::vic_control#2 ← (byte) gfx_mode::vic_control#5 | (const byte) VIC_BMM#0
   to:gfx_mode::@8
-gfx_mode::@8: scope:[gfx_mode]  from gfx_mode::@22 gfx_mode::@7
-  [40] (byte) gfx_mode::vic_control#4 ← phi( gfx_mode::@22/(byte) gfx_mode::vic_control#2 gfx_mode::@7/(byte) gfx_mode::vic_control#5 )
+gfx_mode::@8: scope:[gfx_mode]  from gfx_mode::@17 gfx_mode::@7
+  [40] (byte) gfx_mode::vic_control#4 ← phi( gfx_mode::@17/(byte) gfx_mode::vic_control#2 gfx_mode::@7/(byte) gfx_mode::vic_control#5 )
   [41] *((const byte*) VIC_CONTROL#0) ← (byte) gfx_mode::vic_control#4
   [42] if(*((const byte*) form_ctrl_mcm#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@9
-  to:gfx_mode::@23
-gfx_mode::@23: scope:[gfx_mode]  from gfx_mode::@8
+  to:gfx_mode::@18
+gfx_mode::@18: scope:[gfx_mode]  from gfx_mode::@8
   [43] phi()
   to:gfx_mode::@9
-gfx_mode::@9: scope:[gfx_mode]  from gfx_mode::@23 gfx_mode::@8
-  [44] (byte) gfx_mode::vic_control2#2 ← phi( gfx_mode::@23/(const byte) VIC_CSEL#0|(const byte) VIC_MCM#0 gfx_mode::@8/(const byte) VIC_CSEL#0 )
+gfx_mode::@9: scope:[gfx_mode]  from gfx_mode::@18 gfx_mode::@8
+  [44] (byte) gfx_mode::vic_control2#2 ← phi( gfx_mode::@18/(const byte) VIC_CSEL#0|(const byte) VIC_MCM#0 gfx_mode::@8/(const byte) VIC_CSEL#0 )
   [45] *((const byte*) VIC_CONTROL2#0) ← (byte) gfx_mode::vic_control2#2
   [46] (byte~) gfx_mode::$20 ← *((const byte*) form_a_start_hi#0) << (byte/signed byte/word/signed word/dword/signed dword) 4
   [47] (byte) gfx_mode::plane_a_offs#0 ← (byte~) gfx_mode::$20 | *((const byte*) form_a_start_lo#0)
   [48] (byte) get_plane::idx#0 ← *((const byte*) form_a_pattern#0)
   [49] call get_plane 
   [50] (dword) get_plane::return#16 ← (dword) get_plane::return#14
-  to:gfx_mode::@46
-gfx_mode::@46: scope:[gfx_mode]  from gfx_mode::@9
+  to:gfx_mode::@27
+gfx_mode::@27: scope:[gfx_mode]  from gfx_mode::@9
   [51] (dword~) gfx_mode::$22 ← (dword) get_plane::return#16
   [52] (dword) gfx_mode::plane_a#0 ← (dword~) gfx_mode::$22 + (byte) gfx_mode::plane_a_offs#0
   [53] (word~) gfx_mode::$24 ← < (dword) gfx_mode::plane_a#0
@@ -128,8 +128,8 @@ gfx_mode::@46: scope:[gfx_mode]  from gfx_mode::@9
   [71] (byte) get_plane::idx#1 ← *((const byte*) form_b_pattern#0)
   [72] call get_plane 
   [73] (dword) get_plane::return#17 ← (dword) get_plane::return#14
-  to:gfx_mode::@47
-gfx_mode::@47: scope:[gfx_mode]  from gfx_mode::@46
+  to:gfx_mode::@28
+gfx_mode::@28: scope:[gfx_mode]  from gfx_mode::@27
   [74] (dword~) gfx_mode::$36 ← (dword) get_plane::return#17
   [75] (dword) gfx_mode::plane_b#0 ← (dword~) gfx_mode::$36 + (byte) gfx_mode::plane_b_offs#0
   [76] (word~) gfx_mode::$38 ← < (dword) gfx_mode::plane_b#0
@@ -153,8 +153,8 @@ gfx_mode::@47: scope:[gfx_mode]  from gfx_mode::@46
   [94] (byte) get_vic_screen::idx#0 ← *((const byte*) form_vic_screen#0)
   [95] call get_vic_screen 
   [96] (byte*) get_vic_screen::return#10 ← (byte*) get_vic_screen::return#5
-  to:gfx_mode::@48
-gfx_mode::@48: scope:[gfx_mode]  from gfx_mode::@47
+  to:gfx_mode::@29
+gfx_mode::@29: scope:[gfx_mode]  from gfx_mode::@28
   [97] (byte*~) gfx_mode::$52 ← (byte*) get_vic_screen::return#10
   [98] (word~) gfx_mode::$54 ← (word)(byte*~) gfx_mode::$52 & (word/signed word/dword/signed dword) $3fff
   [99] (word~) gfx_mode::$55 ← (word~) gfx_mode::$54 >> (byte/signed byte/word/signed word/dword/signed dword) 6
@@ -162,8 +162,8 @@ gfx_mode::@48: scope:[gfx_mode]  from gfx_mode::@47
   [101] (byte) get_vic_charset::idx#0 ← *((const byte*) form_vic_gfx#0)
   [102] call get_vic_charset 
   [103] (byte*) get_vic_charset::return#4 ← (byte*) get_vic_charset::return#2
-  to:gfx_mode::@49
-gfx_mode::@49: scope:[gfx_mode]  from gfx_mode::@48
+  to:gfx_mode::@30
+gfx_mode::@30: scope:[gfx_mode]  from gfx_mode::@29
   [104] (byte*~) gfx_mode::$57 ← (byte*) get_vic_charset::return#4
   [105] (word~) gfx_mode::$59 ← (word)(byte*~) gfx_mode::$57 & (word/signed word/dword/signed dword) $3fff
   [106] (byte~) gfx_mode::$60 ← > (word~) gfx_mode::$59
@@ -173,30 +173,30 @@ gfx_mode::@49: scope:[gfx_mode]  from gfx_mode::@48
   [110] (byte) get_vic_screen::idx#1 ← *((const byte*) form_vic_cols#0)
   [111] call get_vic_screen 
   [112] (byte*) get_vic_screen::return#11 ← (byte*) get_vic_screen::return#5
-  to:gfx_mode::@50
-gfx_mode::@50: scope:[gfx_mode]  from gfx_mode::@49
+  to:gfx_mode::@31
+gfx_mode::@31: scope:[gfx_mode]  from gfx_mode::@30
   [113] (byte*) gfx_mode::vic_colors#0 ← (byte*) get_vic_screen::return#11
-  to:gfx_mode::@26
-gfx_mode::@26: scope:[gfx_mode]  from gfx_mode::@28 gfx_mode::@50
-  [114] (byte) gfx_mode::cy#4 ← phi( gfx_mode::@28/(byte) gfx_mode::cy#1 gfx_mode::@50/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [114] (byte*) gfx_mode::col#3 ← phi( gfx_mode::@28/(byte*) gfx_mode::col#1 gfx_mode::@50/(const byte*) COLS#0 )
-  [114] (byte*) gfx_mode::vic_colors#3 ← phi( gfx_mode::@28/(byte*) gfx_mode::vic_colors#1 gfx_mode::@50/(byte*) gfx_mode::vic_colors#0 )
-  to:gfx_mode::@27
-gfx_mode::@27: scope:[gfx_mode]  from gfx_mode::@26 gfx_mode::@27
-  [115] (byte) gfx_mode::cx#2 ← phi( gfx_mode::@26/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@27/(byte) gfx_mode::cx#1 )
-  [115] (byte*) gfx_mode::col#2 ← phi( gfx_mode::@26/(byte*) gfx_mode::col#3 gfx_mode::@27/(byte*) gfx_mode::col#1 )
-  [115] (byte*) gfx_mode::vic_colors#2 ← phi( gfx_mode::@26/(byte*) gfx_mode::vic_colors#3 gfx_mode::@27/(byte*) gfx_mode::vic_colors#1 )
+  to:gfx_mode::@19
+gfx_mode::@19: scope:[gfx_mode]  from gfx_mode::@21 gfx_mode::@31
+  [114] (byte) gfx_mode::cy#4 ← phi( gfx_mode::@21/(byte) gfx_mode::cy#1 gfx_mode::@31/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [114] (byte*) gfx_mode::col#3 ← phi( gfx_mode::@21/(byte*) gfx_mode::col#1 gfx_mode::@31/(const byte*) COLS#0 )
+  [114] (byte*) gfx_mode::vic_colors#3 ← phi( gfx_mode::@21/(byte*) gfx_mode::vic_colors#1 gfx_mode::@31/(byte*) gfx_mode::vic_colors#0 )
+  to:gfx_mode::@20
+gfx_mode::@20: scope:[gfx_mode]  from gfx_mode::@19 gfx_mode::@20
+  [115] (byte) gfx_mode::cx#2 ← phi( gfx_mode::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@20/(byte) gfx_mode::cx#1 )
+  [115] (byte*) gfx_mode::col#2 ← phi( gfx_mode::@19/(byte*) gfx_mode::col#3 gfx_mode::@20/(byte*) gfx_mode::col#1 )
+  [115] (byte*) gfx_mode::vic_colors#2 ← phi( gfx_mode::@19/(byte*) gfx_mode::vic_colors#3 gfx_mode::@20/(byte*) gfx_mode::vic_colors#1 )
   [116] *((byte*) gfx_mode::col#2) ← *((byte*) gfx_mode::vic_colors#2)
   [117] (byte*) gfx_mode::col#1 ← ++ (byte*) gfx_mode::col#2
   [118] (byte*) gfx_mode::vic_colors#1 ← ++ (byte*) gfx_mode::vic_colors#2
   [119] (byte) gfx_mode::cx#1 ← ++ (byte) gfx_mode::cx#2
-  [120] if((byte) gfx_mode::cx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_mode::@27
-  to:gfx_mode::@28
-gfx_mode::@28: scope:[gfx_mode]  from gfx_mode::@27
+  [120] if((byte) gfx_mode::cx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_mode::@20
+  to:gfx_mode::@21
+gfx_mode::@21: scope:[gfx_mode]  from gfx_mode::@20
   [121] (byte) gfx_mode::cy#1 ← ++ (byte) gfx_mode::cy#4
-  [122] if((byte) gfx_mode::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto gfx_mode::@26
-  to:gfx_mode::@29
-gfx_mode::@29: scope:[gfx_mode]  from gfx_mode::@28
+  [122] if((byte) gfx_mode::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto gfx_mode::@19
+  to:gfx_mode::@22
+gfx_mode::@22: scope:[gfx_mode]  from gfx_mode::@21
   [123] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [124] (byte~) gfx_mode::$64 ← *((const byte*) form_vic_bg0_hi#0) << (byte/signed byte/word/signed word/dword/signed dword) 4
   [125] (byte~) gfx_mode::$65 ← (byte~) gfx_mode::$64 | *((const byte*) form_vic_bg0_lo#0)
@@ -210,162 +210,162 @@ gfx_mode::@29: scope:[gfx_mode]  from gfx_mode::@28
   [133] (byte~) gfx_mode::$70 ← *((const byte*) form_vic_bg3_hi#0) << (byte/signed byte/word/signed word/dword/signed dword) 4
   [134] (byte~) gfx_mode::$71 ← (byte~) gfx_mode::$70 | *((const byte*) form_vic_bg3_lo#0)
   [135] *((const byte*) BGCOL4#0) ← (byte~) gfx_mode::$71
-  [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@34
-  to:gfx_mode::@31
-gfx_mode::@31: scope:[gfx_mode]  from gfx_mode::@29 gfx_mode::@31
-  [137] (byte) gfx_mode::j#2 ← phi( gfx_mode::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@31/(byte) gfx_mode::j#1 )
+  [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@24
+  to:gfx_mode::@23
+gfx_mode::@23: scope:[gfx_mode]  from gfx_mode::@22 gfx_mode::@23
+  [137] (byte) gfx_mode::j#2 ← phi( gfx_mode::@22/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@23/(byte) gfx_mode::j#1 )
   [138] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::j#2) ← (byte) gfx_mode::j#2
   [139] (byte) gfx_mode::j#1 ← ++ (byte) gfx_mode::j#2
-  [140] if((byte) gfx_mode::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@31
-  to:gfx_mode::@36
-gfx_mode::@36: scope:[gfx_mode]  from gfx_mode::@31 gfx_mode::@34 gfx_mode::@36 gfx_mode::@52
-  [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@36
-  to:gfx_mode::@38
-gfx_mode::@38: scope:[gfx_mode]  from gfx_mode::@36
+  [140] if((byte) gfx_mode::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@23
+  to:gfx_mode::@25
+gfx_mode::@25: scope:[gfx_mode]  from gfx_mode::@23 gfx_mode::@24 gfx_mode::@25 gfx_mode::@33
+  [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@25
+  to:gfx_mode::@26
+gfx_mode::@26: scope:[gfx_mode]  from gfx_mode::@25
   [142] phi()
   [143] call keyboard_event_scan 
-  to:gfx_mode::@51
-gfx_mode::@51: scope:[gfx_mode]  from gfx_mode::@38
+  to:gfx_mode::@32
+gfx_mode::@32: scope:[gfx_mode]  from gfx_mode::@26
   [144] phi()
   [145] call keyboard_event_get 
   [146] (byte) keyboard_event_get::return#3 ← (byte) keyboard_event_get::return#2
-  to:gfx_mode::@52
-gfx_mode::@52: scope:[gfx_mode]  from gfx_mode::@51
+  to:gfx_mode::@33
+gfx_mode::@33: scope:[gfx_mode]  from gfx_mode::@32
   [147] (byte) gfx_mode::keyboard_event#0 ← (byte) keyboard_event_get::return#3
-  [148] if((byte) gfx_mode::keyboard_event#0!=(const byte) KEY_SPACE#0) goto gfx_mode::@36
+  [148] if((byte) gfx_mode::keyboard_event#0!=(const byte) KEY_SPACE#0) goto gfx_mode::@25
   to:gfx_mode::@return
-gfx_mode::@return: scope:[gfx_mode]  from gfx_mode::@52
+gfx_mode::@return: scope:[gfx_mode]  from gfx_mode::@33
   [149] return 
   to:@return
-gfx_mode::@34: scope:[gfx_mode]  from gfx_mode::@29 gfx_mode::@34
-  [150] (byte) gfx_mode::i#2 ← phi( gfx_mode::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@34/(byte) gfx_mode::i#1 )
+gfx_mode::@24: scope:[gfx_mode]  from gfx_mode::@22 gfx_mode::@24
+  [150] (byte) gfx_mode::i#2 ← phi( gfx_mode::@22/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@24/(byte) gfx_mode::i#1 )
   [151] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) gfx_mode::i#2)
   [152] (byte) gfx_mode::i#1 ← ++ (byte) gfx_mode::i#2
-  [153] if((byte) gfx_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@34
-  to:gfx_mode::@36
-keyboard_event_get: scope:[keyboard_event_get]  from form_control::@34 gfx_mode::@51
+  [153] if((byte) gfx_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@24
+  to:gfx_mode::@25
+keyboard_event_get: scope:[keyboard_event_get]  from form_control::@18 gfx_mode::@32
   [154] if((byte) keyboard_events_size#100==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_get::@return
-  to:keyboard_event_get::@3
-keyboard_event_get::@3: scope:[keyboard_event_get]  from keyboard_event_get
+  to:keyboard_event_get::@1
+keyboard_event_get::@1: scope:[keyboard_event_get]  from keyboard_event_get
   [155] (byte) keyboard_events_size#4 ← -- (byte) keyboard_events_size#100
   [156] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4)
   to:keyboard_event_get::@return
-keyboard_event_get::@return: scope:[keyboard_event_get]  from keyboard_event_get keyboard_event_get::@3
-  [157] (byte) keyboard_events_size#24 ← phi( keyboard_event_get/(byte) keyboard_events_size#100 keyboard_event_get::@3/(byte) keyboard_events_size#4 )
-  [157] (byte) keyboard_event_get::return#2 ← phi( keyboard_event_get/(byte/word/signed word/dword/signed dword) $ff keyboard_event_get::@3/(byte) keyboard_event_get::return#1 )
+keyboard_event_get::@return: scope:[keyboard_event_get]  from keyboard_event_get keyboard_event_get::@1
+  [157] (byte) keyboard_events_size#24 ← phi( keyboard_event_get/(byte) keyboard_events_size#100 keyboard_event_get::@1/(byte) keyboard_events_size#4 )
+  [157] (byte) keyboard_event_get::return#2 ← phi( keyboard_event_get/(byte/word/signed word/dword/signed dword) $ff keyboard_event_get::@1/(byte) keyboard_event_get::return#1 )
   [158] return 
   to:@return
-keyboard_event_scan: scope:[keyboard_event_scan]  from form_control::@3 gfx_mode::@38
-  [159] (byte) keyboard_events_size#110 ← phi( form_control::@3/(byte) keyboard_events_size#47 gfx_mode::@38/(byte) keyboard_events_size#24 )
-  to:keyboard_event_scan::@8
-keyboard_event_scan::@8: scope:[keyboard_event_scan]  from keyboard_event_scan keyboard_event_scan::@10
-  [160] (byte) keyboard_events_size#119 ← phi( keyboard_event_scan/(byte) keyboard_events_size#110 keyboard_event_scan::@10/(byte) keyboard_events_size#100 )
-  [160] (byte) keyboard_event_scan::keycode#11 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@10/(byte) keyboard_event_scan::keycode#14 )
-  [160] (byte) keyboard_event_scan::row#2 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@10/(byte) keyboard_event_scan::row#1 )
+keyboard_event_scan: scope:[keyboard_event_scan]  from form_control::@3 gfx_mode::@26
+  [159] (byte) keyboard_events_size#110 ← phi( form_control::@3/(byte) keyboard_events_size#47 gfx_mode::@26/(byte) keyboard_events_size#24 )
+  to:keyboard_event_scan::@7
+keyboard_event_scan::@7: scope:[keyboard_event_scan]  from keyboard_event_scan keyboard_event_scan::@8
+  [160] (byte) keyboard_events_size#119 ← phi( keyboard_event_scan/(byte) keyboard_events_size#110 keyboard_event_scan::@8/(byte) keyboard_events_size#100 )
+  [160] (byte) keyboard_event_scan::keycode#11 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@8/(byte) keyboard_event_scan::keycode#14 )
+  [160] (byte) keyboard_event_scan::row#2 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@8/(byte) keyboard_event_scan::row#1 )
   [161] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_event_scan::row#2
   [162] call keyboard_matrix_read 
   [163] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_event_scan::@25
-keyboard_event_scan::@25: scope:[keyboard_event_scan]  from keyboard_event_scan::@8
+  to:keyboard_event_scan::@19
+keyboard_event_scan::@19: scope:[keyboard_event_scan]  from keyboard_event_scan::@7
   [164] (byte) keyboard_event_scan::row_scan#0 ← (byte) keyboard_matrix_read::return#2
-  [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11
-  to:keyboard_event_scan::@21
-keyboard_event_scan::@21: scope:[keyboard_event_scan]  from keyboard_event_scan::@25
+  [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9
+  to:keyboard_event_scan::@16
+keyboard_event_scan::@16: scope:[keyboard_event_scan]  from keyboard_event_scan::@19
   [166] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8
-  to:keyboard_event_scan::@10
-keyboard_event_scan::@10: scope:[keyboard_event_scan]  from keyboard_event_scan::@20 keyboard_event_scan::@21
-  [167] (byte) keyboard_events_size#100 ← phi( keyboard_event_scan::@20/(byte) keyboard_events_size#118 keyboard_event_scan::@21/(byte) keyboard_events_size#119 )
-  [167] (byte) keyboard_event_scan::keycode#14 ← phi( keyboard_event_scan::@20/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@21/(byte) keyboard_event_scan::keycode#1 )
+  to:keyboard_event_scan::@8
+keyboard_event_scan::@8: scope:[keyboard_event_scan]  from keyboard_event_scan::@15 keyboard_event_scan::@16
+  [167] (byte) keyboard_events_size#100 ← phi( keyboard_event_scan::@15/(byte) keyboard_events_size#118 keyboard_event_scan::@16/(byte) keyboard_events_size#119 )
+  [167] (byte) keyboard_event_scan::keycode#14 ← phi( keyboard_event_scan::@15/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@16/(byte) keyboard_event_scan::keycode#1 )
   [168] (byte) keyboard_event_scan::row#1 ← ++ (byte) keyboard_event_scan::row#2
-  [169] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8
-  to:keyboard_event_scan::@23
-keyboard_event_scan::@23: scope:[keyboard_event_scan]  from keyboard_event_scan::@10
+  [169] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7
+  to:keyboard_event_scan::@17
+keyboard_event_scan::@17: scope:[keyboard_event_scan]  from keyboard_event_scan::@8
   [170] phi()
   [171] call keyboard_event_pressed 
   [172] (byte) keyboard_event_pressed::return#0 ← (byte) keyboard_event_pressed::return#10
-  to:keyboard_event_scan::@26
-keyboard_event_scan::@26: scope:[keyboard_event_scan]  from keyboard_event_scan::@23
+  to:keyboard_event_scan::@20
+keyboard_event_scan::@20: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
   [173] (byte~) keyboard_event_scan::$0 ← (byte) keyboard_event_pressed::return#0
   [174] if((byte~) keyboard_event_scan::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@1
-  to:keyboard_event_scan::@24
-keyboard_event_scan::@24: scope:[keyboard_event_scan]  from keyboard_event_scan::@26
+  to:keyboard_event_scan::@18
+keyboard_event_scan::@18: scope:[keyboard_event_scan]  from keyboard_event_scan::@20
   [175] phi()
   to:keyboard_event_scan::@1
-keyboard_event_scan::@1: scope:[keyboard_event_scan]  from keyboard_event_scan::@24 keyboard_event_scan::@26
-  [176] (byte) keyboard_modifiers#18 ← phi( keyboard_event_scan::@24/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 keyboard_event_scan::@26/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+keyboard_event_scan::@1: scope:[keyboard_event_scan]  from keyboard_event_scan::@18 keyboard_event_scan::@20
+  [176] (byte) keyboard_modifiers#18 ← phi( keyboard_event_scan::@18/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 keyboard_event_scan::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [177] call keyboard_event_pressed 
   [178] (byte) keyboard_event_pressed::return#1 ← (byte) keyboard_event_pressed::return#10
-  to:keyboard_event_scan::@27
-keyboard_event_scan::@27: scope:[keyboard_event_scan]  from keyboard_event_scan::@1
+  to:keyboard_event_scan::@21
+keyboard_event_scan::@21: scope:[keyboard_event_scan]  from keyboard_event_scan::@1
   [179] (byte~) keyboard_event_scan::$3 ← (byte) keyboard_event_pressed::return#1
   [180] if((byte~) keyboard_event_scan::$3==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@2
-  to:keyboard_event_scan::@5
-keyboard_event_scan::@5: scope:[keyboard_event_scan]  from keyboard_event_scan::@27
+  to:keyboard_event_scan::@4
+keyboard_event_scan::@4: scope:[keyboard_event_scan]  from keyboard_event_scan::@21
   [181] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#18 | (const byte) KEY_MODIFIER_RSHIFT#0
   to:keyboard_event_scan::@2
-keyboard_event_scan::@2: scope:[keyboard_event_scan]  from keyboard_event_scan::@27 keyboard_event_scan::@5
-  [182] (byte) keyboard_modifiers#19 ← phi( keyboard_event_scan::@27/(byte) keyboard_modifiers#18 keyboard_event_scan::@5/(byte) keyboard_modifiers#3 )
+keyboard_event_scan::@2: scope:[keyboard_event_scan]  from keyboard_event_scan::@21 keyboard_event_scan::@4
+  [182] (byte) keyboard_modifiers#19 ← phi( keyboard_event_scan::@21/(byte) keyboard_modifiers#18 keyboard_event_scan::@4/(byte) keyboard_modifiers#3 )
   [183] call keyboard_event_pressed 
   [184] (byte) keyboard_event_pressed::return#2 ← (byte) keyboard_event_pressed::return#10
-  to:keyboard_event_scan::@28
-keyboard_event_scan::@28: scope:[keyboard_event_scan]  from keyboard_event_scan::@2
+  to:keyboard_event_scan::@22
+keyboard_event_scan::@22: scope:[keyboard_event_scan]  from keyboard_event_scan::@2
   [185] (byte~) keyboard_event_scan::$6 ← (byte) keyboard_event_pressed::return#2
   [186] if((byte~) keyboard_event_scan::$6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@3
-  to:keyboard_event_scan::@6
-keyboard_event_scan::@6: scope:[keyboard_event_scan]  from keyboard_event_scan::@28
+  to:keyboard_event_scan::@5
+keyboard_event_scan::@5: scope:[keyboard_event_scan]  from keyboard_event_scan::@22
   [187] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#19 | (const byte) KEY_MODIFIER_CTRL#0
   to:keyboard_event_scan::@3
-keyboard_event_scan::@3: scope:[keyboard_event_scan]  from keyboard_event_scan::@28 keyboard_event_scan::@6
-  [188] (byte) keyboard_modifiers#20 ← phi( keyboard_event_scan::@28/(byte) keyboard_modifiers#19 keyboard_event_scan::@6/(byte) keyboard_modifiers#4 )
+keyboard_event_scan::@3: scope:[keyboard_event_scan]  from keyboard_event_scan::@22 keyboard_event_scan::@5
+  [188] (byte) keyboard_modifiers#20 ← phi( keyboard_event_scan::@22/(byte) keyboard_modifiers#19 keyboard_event_scan::@5/(byte) keyboard_modifiers#4 )
   [189] call keyboard_event_pressed 
   [190] (byte) keyboard_event_pressed::return#3 ← (byte) keyboard_event_pressed::return#10
-  to:keyboard_event_scan::@29
-keyboard_event_scan::@29: scope:[keyboard_event_scan]  from keyboard_event_scan::@3
+  to:keyboard_event_scan::@23
+keyboard_event_scan::@23: scope:[keyboard_event_scan]  from keyboard_event_scan::@3
   [191] (byte~) keyboard_event_scan::$9 ← (byte) keyboard_event_pressed::return#3
   [192] if((byte~) keyboard_event_scan::$9==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@return
-  to:keyboard_event_scan::@7
-keyboard_event_scan::@7: scope:[keyboard_event_scan]  from keyboard_event_scan::@29
+  to:keyboard_event_scan::@6
+keyboard_event_scan::@6: scope:[keyboard_event_scan]  from keyboard_event_scan::@23
   [193] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#20 | (const byte) KEY_MODIFIER_COMMODORE#0
   to:keyboard_event_scan::@return
-keyboard_event_scan::@return: scope:[keyboard_event_scan]  from keyboard_event_scan::@29 keyboard_event_scan::@7
-  [194] (byte) keyboard_modifiers#21 ← phi( keyboard_event_scan::@29/(byte) keyboard_modifiers#20 keyboard_event_scan::@7/(byte) keyboard_modifiers#5 )
+keyboard_event_scan::@return: scope:[keyboard_event_scan]  from keyboard_event_scan::@23 keyboard_event_scan::@6
+  [194] (byte) keyboard_modifiers#21 ← phi( keyboard_event_scan::@23/(byte) keyboard_modifiers#20 keyboard_event_scan::@6/(byte) keyboard_modifiers#5 )
   [195] return 
   to:@return
-keyboard_event_scan::@11: scope:[keyboard_event_scan]  from keyboard_event_scan::@12 keyboard_event_scan::@25
-  [196] (byte) keyboard_events_size#18 ← phi( keyboard_event_scan::@12/(byte) keyboard_events_size#118 keyboard_event_scan::@25/(byte) keyboard_events_size#119 )
-  [196] (byte) keyboard_event_scan::keycode#10 ← phi( keyboard_event_scan::@12/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@25/(byte) keyboard_event_scan::keycode#11 )
-  [196] (byte) keyboard_event_scan::col#2 ← phi( keyboard_event_scan::@12/(byte) keyboard_event_scan::col#1 keyboard_event_scan::@25/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+keyboard_event_scan::@9: scope:[keyboard_event_scan]  from keyboard_event_scan::@10 keyboard_event_scan::@19
+  [196] (byte) keyboard_events_size#18 ← phi( keyboard_event_scan::@10/(byte) keyboard_events_size#118 keyboard_event_scan::@19/(byte) keyboard_events_size#119 )
+  [196] (byte) keyboard_event_scan::keycode#10 ← phi( keyboard_event_scan::@10/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@19/(byte) keyboard_event_scan::keycode#11 )
+  [196] (byte) keyboard_event_scan::col#2 ← phi( keyboard_event_scan::@10/(byte) keyboard_event_scan::col#1 keyboard_event_scan::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [197] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)
   [198] (byte~) keyboard_event_scan::$16 ← (byte~) keyboard_event_scan::$15 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2)
-  [199] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@12
-  to:keyboard_event_scan::@16
-keyboard_event_scan::@16: scope:[keyboard_event_scan]  from keyboard_event_scan::@11
-  [200] if((byte) keyboard_events_size#18==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12
-  to:keyboard_event_scan::@17
-keyboard_event_scan::@17: scope:[keyboard_event_scan]  from keyboard_event_scan::@16
+  [199] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@10
+  to:keyboard_event_scan::@12
+keyboard_event_scan::@12: scope:[keyboard_event_scan]  from keyboard_event_scan::@9
+  [200] if((byte) keyboard_events_size#18==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10
+  to:keyboard_event_scan::@13
+keyboard_event_scan::@13: scope:[keyboard_event_scan]  from keyboard_event_scan::@12
   [201] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2)
-  [202] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@14
-  to:keyboard_event_scan::@18
-keyboard_event_scan::@18: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
+  [202] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@11
+  to:keyboard_event_scan::@14
+keyboard_event_scan::@14: scope:[keyboard_event_scan]  from keyboard_event_scan::@13
   [203] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#18) ← (byte) keyboard_event_scan::keycode#10
   [204] (byte) keyboard_events_size#2 ← ++ (byte) keyboard_events_size#18
-  to:keyboard_event_scan::@12
-keyboard_event_scan::@12: scope:[keyboard_event_scan]  from keyboard_event_scan::@11 keyboard_event_scan::@14 keyboard_event_scan::@16 keyboard_event_scan::@18
-  [205] (byte) keyboard_events_size#118 ← phi( keyboard_event_scan::@11/(byte) keyboard_events_size#18 keyboard_event_scan::@16/(byte) keyboard_events_size#18 keyboard_event_scan::@14/(byte) keyboard_events_size#1 keyboard_event_scan::@18/(byte) keyboard_events_size#2 )
+  to:keyboard_event_scan::@10
+keyboard_event_scan::@10: scope:[keyboard_event_scan]  from keyboard_event_scan::@11 keyboard_event_scan::@12 keyboard_event_scan::@14 keyboard_event_scan::@9
+  [205] (byte) keyboard_events_size#118 ← phi( keyboard_event_scan::@9/(byte) keyboard_events_size#18 keyboard_event_scan::@12/(byte) keyboard_events_size#18 keyboard_event_scan::@11/(byte) keyboard_events_size#1 keyboard_event_scan::@14/(byte) keyboard_events_size#2 )
   [206] (byte) keyboard_event_scan::keycode#15 ← ++ (byte) keyboard_event_scan::keycode#10
   [207] (byte) keyboard_event_scan::col#1 ← ++ (byte) keyboard_event_scan::col#2
-  [208] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@11
-  to:keyboard_event_scan::@20
-keyboard_event_scan::@20: scope:[keyboard_event_scan]  from keyboard_event_scan::@12
+  [208] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@9
+  to:keyboard_event_scan::@15
+keyboard_event_scan::@15: scope:[keyboard_event_scan]  from keyboard_event_scan::@10
   [209] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0
-  to:keyboard_event_scan::@10
-keyboard_event_scan::@14: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
+  to:keyboard_event_scan::@8
+keyboard_event_scan::@11: scope:[keyboard_event_scan]  from keyboard_event_scan::@13
   [210] (byte/word/dword~) keyboard_event_scan::$23 ← (byte) keyboard_event_scan::keycode#10 | (byte/signed byte/word/signed word/dword/signed dword) $40
   [211] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#18) ← (byte/word/dword~) keyboard_event_scan::$23
   [212] (byte) keyboard_events_size#1 ← ++ (byte) keyboard_events_size#18
-  to:keyboard_event_scan::@12
-keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan::@1 keyboard_event_scan::@2 keyboard_event_scan::@23 keyboard_event_scan::@3
-  [213] (byte) keyboard_event_pressed::keycode#4 ← phi( keyboard_event_scan::@1/(const byte) KEY_RSHIFT#0 keyboard_event_scan::@2/(const byte) KEY_CTRL#0 keyboard_event_scan::@23/(const byte) KEY_LSHIFT#0 keyboard_event_scan::@3/(const byte) KEY_COMMODORE#0 )
+  to:keyboard_event_scan::@10
+keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan::@1 keyboard_event_scan::@17 keyboard_event_scan::@2 keyboard_event_scan::@3
+  [213] (byte) keyboard_event_pressed::keycode#4 ← phi( keyboard_event_scan::@1/(const byte) KEY_RSHIFT#0 keyboard_event_scan::@2/(const byte) KEY_CTRL#0 keyboard_event_scan::@17/(const byte) KEY_LSHIFT#0 keyboard_event_scan::@3/(const byte) KEY_COMMODORE#0 )
   [214] (byte~) keyboard_event_pressed::$0 ← (byte) keyboard_event_pressed::keycode#4 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [215] (byte) keyboard_event_pressed::row_bits#0 ← *((const byte[8]) keyboard_scan_values#0 + (byte~) keyboard_event_pressed::$0)
   [216] (byte~) keyboard_event_pressed::$1 ← (byte) keyboard_event_pressed::keycode#4 & (byte/signed byte/word/signed word/dword/signed dword) 7
@@ -374,136 +374,136 @@ keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan
 keyboard_event_pressed::@return: scope:[keyboard_event_pressed]  from keyboard_event_pressed
   [218] return 
   to:@return
-keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_event_scan::@8
+keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_event_scan::@7
   [219] *((const byte*) CIA1_PORT_A#0) ← *((const byte[8]) keyboard_matrix_row_bitmask#0 + (byte) keyboard_matrix_read::rowid#0)
   [220] (byte) keyboard_matrix_read::return#0 ← ~ *((const byte*) CIA1_PORT_B#0)
   to:keyboard_matrix_read::@return
 keyboard_matrix_read::@return: scope:[keyboard_matrix_read]  from keyboard_matrix_read
   [221] return 
   to:@return
-get_vic_screen: scope:[get_vic_screen]  from gfx_mode::@47 gfx_mode::@49
-  [222] (byte) get_vic_screen::idx#2 ← phi( gfx_mode::@47/(byte) get_vic_screen::idx#0 gfx_mode::@49/(byte) get_vic_screen::idx#1 )
+get_vic_screen: scope:[get_vic_screen]  from gfx_mode::@28 gfx_mode::@30
+  [222] (byte) get_vic_screen::idx#2 ← phi( gfx_mode::@28/(byte) get_vic_screen::idx#0 gfx_mode::@30/(byte) get_vic_screen::idx#1 )
   [223] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_vic_screen::@return
-  to:get_vic_screen::@10
-get_vic_screen::@10: scope:[get_vic_screen]  from get_vic_screen
+  to:get_vic_screen::@2
+get_vic_screen::@2: scope:[get_vic_screen]  from get_vic_screen
   [224] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_screen::@return
-  to:get_vic_screen::@11
-get_vic_screen::@11: scope:[get_vic_screen]  from get_vic_screen::@10
+  to:get_vic_screen::@3
+get_vic_screen::@3: scope:[get_vic_screen]  from get_vic_screen::@2
   [225] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 2) goto get_vic_screen::@return
-  to:get_vic_screen::@12
-get_vic_screen::@12: scope:[get_vic_screen]  from get_vic_screen::@11
+  to:get_vic_screen::@4
+get_vic_screen::@4: scope:[get_vic_screen]  from get_vic_screen::@3
   [226] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 3) goto get_vic_screen::@return
-  to:get_vic_screen::@13
-get_vic_screen::@13: scope:[get_vic_screen]  from get_vic_screen::@12
-  [227] if((byte) get_vic_screen::idx#2!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_vic_screen::@9
+  to:get_vic_screen::@5
+get_vic_screen::@5: scope:[get_vic_screen]  from get_vic_screen::@4
+  [227] if((byte) get_vic_screen::idx#2!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_vic_screen::@1
   to:get_vic_screen::@return
-get_vic_screen::@return: scope:[get_vic_screen]  from get_vic_screen get_vic_screen::@10 get_vic_screen::@11 get_vic_screen::@12 get_vic_screen::@13 get_vic_screen::@9
-  [228] (byte*) get_vic_screen::return#5 ← phi( get_vic_screen/(const byte*) VIC_SCREEN0#0 get_vic_screen::@13/(const byte*) VIC_SCREEN4#0 get_vic_screen::@10/(const byte*) VIC_SCREEN1#0 get_vic_screen::@11/(const byte*) VIC_SCREEN2#0 get_vic_screen::@12/(const byte*) VIC_SCREEN3#0 get_vic_screen::@9/(const byte*) VIC_SCREEN0#0 )
+get_vic_screen::@return: scope:[get_vic_screen]  from get_vic_screen get_vic_screen::@1 get_vic_screen::@2 get_vic_screen::@3 get_vic_screen::@4 get_vic_screen::@5
+  [228] (byte*) get_vic_screen::return#5 ← phi( get_vic_screen/(const byte*) VIC_SCREEN0#0 get_vic_screen::@5/(const byte*) VIC_SCREEN4#0 get_vic_screen::@2/(const byte*) VIC_SCREEN1#0 get_vic_screen::@3/(const byte*) VIC_SCREEN2#0 get_vic_screen::@4/(const byte*) VIC_SCREEN3#0 get_vic_screen::@1/(const byte*) VIC_SCREEN0#0 )
   [229] return 
   to:@return
-get_vic_screen::@9: scope:[get_vic_screen]  from get_vic_screen::@13
+get_vic_screen::@1: scope:[get_vic_screen]  from get_vic_screen::@5
   [230] phi()
   to:get_vic_screen::@return
-get_vic_charset: scope:[get_vic_charset]  from gfx_mode::@48
+get_vic_charset: scope:[get_vic_charset]  from gfx_mode::@29
   [231] if((byte) get_vic_charset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_vic_charset::@return
-  to:get_vic_charset::@4
-get_vic_charset::@4: scope:[get_vic_charset]  from get_vic_charset
-  [232] if((byte) get_vic_charset::idx#0!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_charset::@3
+  to:get_vic_charset::@2
+get_vic_charset::@2: scope:[get_vic_charset]  from get_vic_charset
+  [232] if((byte) get_vic_charset::idx#0!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_charset::@1
   to:get_vic_charset::@return
-get_vic_charset::@return: scope:[get_vic_charset]  from get_vic_charset get_vic_charset::@3 get_vic_charset::@4
-  [233] (byte*) get_vic_charset::return#2 ← phi( get_vic_charset/(const byte*) VIC_CHARSET_ROM#0 get_vic_charset::@3/(const byte*) VIC_CHARSET_ROM#0 get_vic_charset::@4/(const byte*) VIC_BITMAP#0 )
+get_vic_charset::@return: scope:[get_vic_charset]  from get_vic_charset get_vic_charset::@1 get_vic_charset::@2
+  [233] (byte*) get_vic_charset::return#2 ← phi( get_vic_charset/(const byte*) VIC_CHARSET_ROM#0 get_vic_charset::@1/(const byte*) VIC_CHARSET_ROM#0 get_vic_charset::@2/(const byte*) VIC_BITMAP#0 )
   [234] return 
   to:@return
-get_vic_charset::@3: scope:[get_vic_charset]  from get_vic_charset::@4
+get_vic_charset::@1: scope:[get_vic_charset]  from get_vic_charset::@2
   [235] phi()
   to:get_vic_charset::@return
-get_plane: scope:[get_plane]  from gfx_mode::@46 gfx_mode::@9
-  [236] (byte) get_plane::idx#10 ← phi( gfx_mode::@46/(byte) get_plane::idx#1 gfx_mode::@9/(byte) get_plane::idx#0 )
+get_plane: scope:[get_plane]  from gfx_mode::@27 gfx_mode::@9
+  [236] (byte) get_plane::idx#10 ← phi( gfx_mode::@27/(byte) get_plane::idx#1 gfx_mode::@9/(byte) get_plane::idx#0 )
   [237] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_plane::@return
-  to:get_plane::@28
-get_plane::@28: scope:[get_plane]  from get_plane
+  to:get_plane::@2
+get_plane::@2: scope:[get_plane]  from get_plane
   [238] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_plane::@return
-  to:get_plane::@29
-get_plane::@29: scope:[get_plane]  from get_plane::@28
+  to:get_plane::@3
+get_plane::@3: scope:[get_plane]  from get_plane::@2
   [239] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto get_plane::@return
-  to:get_plane::@30
-get_plane::@30: scope:[get_plane]  from get_plane::@29
+  to:get_plane::@4
+get_plane::@4: scope:[get_plane]  from get_plane::@3
   [240] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto get_plane::@return
-  to:get_plane::@31
-get_plane::@31: scope:[get_plane]  from get_plane::@30
+  to:get_plane::@5
+get_plane::@5: scope:[get_plane]  from get_plane::@4
   [241] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_plane::@return
-  to:get_plane::@32
-get_plane::@32: scope:[get_plane]  from get_plane::@31
+  to:get_plane::@6
+get_plane::@6: scope:[get_plane]  from get_plane::@5
   [242] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto get_plane::@return
-  to:get_plane::@33
-get_plane::@33: scope:[get_plane]  from get_plane::@32
+  to:get_plane::@7
+get_plane::@7: scope:[get_plane]  from get_plane::@6
   [243] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto get_plane::@return
-  to:get_plane::@34
-get_plane::@34: scope:[get_plane]  from get_plane::@33
+  to:get_plane::@8
+get_plane::@8: scope:[get_plane]  from get_plane::@7
   [244] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto get_plane::@return
-  to:get_plane::@35
-get_plane::@35: scope:[get_plane]  from get_plane::@34
+  to:get_plane::@9
+get_plane::@9: scope:[get_plane]  from get_plane::@8
   [245] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto get_plane::@return
-  to:get_plane::@36
-get_plane::@36: scope:[get_plane]  from get_plane::@35
+  to:get_plane::@10
+get_plane::@10: scope:[get_plane]  from get_plane::@9
   [246] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto get_plane::@return
-  to:get_plane::@37
-get_plane::@37: scope:[get_plane]  from get_plane::@36
+  to:get_plane::@11
+get_plane::@11: scope:[get_plane]  from get_plane::@10
   [247] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto get_plane::@return
-  to:get_plane::@38
-get_plane::@38: scope:[get_plane]  from get_plane::@37
+  to:get_plane::@12
+get_plane::@12: scope:[get_plane]  from get_plane::@11
   [248] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $b) goto get_plane::@return
-  to:get_plane::@39
-get_plane::@39: scope:[get_plane]  from get_plane::@38
+  to:get_plane::@13
+get_plane::@13: scope:[get_plane]  from get_plane::@12
   [249] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $c) goto get_plane::@return
-  to:get_plane::@40
-get_plane::@40: scope:[get_plane]  from get_plane::@39
-  [250] if((byte) get_plane::idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $d) goto get_plane::@27
+  to:get_plane::@14
+get_plane::@14: scope:[get_plane]  from get_plane::@13
+  [250] if((byte) get_plane::idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $d) goto get_plane::@1
   to:get_plane::@return
-get_plane::@return: scope:[get_plane]  from get_plane get_plane::@27 get_plane::@28 get_plane::@29 get_plane::@30 get_plane::@31 get_plane::@32 get_plane::@33 get_plane::@34 get_plane::@35 get_plane::@36 get_plane::@37 get_plane::@38 get_plane::@39 get_plane::@40
-  [251] (dword) get_plane::return#14 ← phi( get_plane/((dword))(const byte*) VIC_SCREEN0#0 get_plane::@36/((dword))(const dword) PLANE_HORISONTAL2#0 get_plane::@37/((dword))(const dword) PLANE_VERTICAL2#0 get_plane::@38/((dword))(const dword) PLANE_CHARSET8#0 get_plane::@39/((dword))(const dword) PLANE_BLANK#0 get_plane::@28/((dword))(const byte*) VIC_SCREEN1#0 get_plane::@27/((dword))(const byte*) VIC_SCREEN0#0 get_plane::@29/((dword))(const byte*) VIC_SCREEN2#0 get_plane::@30/((dword))(const byte*) VIC_SCREEN3#0 get_plane::@40/((dword))(const dword) PLANE_FULL#0 get_plane::@31/((dword))(const byte*) VIC_BITMAP#0 get_plane::@32/((dword))(const byte*) VIC_CHARSET_ROM#0 get_plane::@33/((dword))(const dword) PLANE_8BPP_CHUNKY#0 get_plane::@34/((dword))(const dword) PLANE_HORISONTAL#0 get_plane::@35/((dword))(const dword) PLANE_VERTICAL#0 )
+get_plane::@return: scope:[get_plane]  from get_plane get_plane::@1 get_plane::@10 get_plane::@11 get_plane::@12 get_plane::@13 get_plane::@14 get_plane::@2 get_plane::@3 get_plane::@4 get_plane::@5 get_plane::@6 get_plane::@7 get_plane::@8 get_plane::@9
+  [251] (dword) get_plane::return#14 ← phi( get_plane/((dword))(const byte*) VIC_SCREEN0#0 get_plane::@10/((dword))(const dword) PLANE_HORISONTAL2#0 get_plane::@11/((dword))(const dword) PLANE_VERTICAL2#0 get_plane::@12/((dword))(const dword) PLANE_CHARSET8#0 get_plane::@13/((dword))(const dword) PLANE_BLANK#0 get_plane::@2/((dword))(const byte*) VIC_SCREEN1#0 get_plane::@1/((dword))(const byte*) VIC_SCREEN0#0 get_plane::@3/((dword))(const byte*) VIC_SCREEN2#0 get_plane::@4/((dword))(const byte*) VIC_SCREEN3#0 get_plane::@14/((dword))(const dword) PLANE_FULL#0 get_plane::@5/((dword))(const byte*) VIC_BITMAP#0 get_plane::@6/((dword))(const byte*) VIC_CHARSET_ROM#0 get_plane::@7/((dword))(const dword) PLANE_8BPP_CHUNKY#0 get_plane::@8/((dword))(const dword) PLANE_HORISONTAL#0 get_plane::@9/((dword))(const dword) PLANE_VERTICAL#0 )
   [252] return 
   to:@return
-get_plane::@27: scope:[get_plane]  from get_plane::@40
+get_plane::@1: scope:[get_plane]  from get_plane::@14
   [253] phi()
   to:get_plane::@return
 form_mode: scope:[form_mode]  from main::@2
   [254] phi()
   [255] call print_set_screen 
-  to:form_mode::@21
-form_mode::@21: scope:[form_mode]  from form_mode
+  to:form_mode::@8
+form_mode::@8: scope:[form_mode]  from form_mode
   [256] phi()
   [257] call print_cls 
-  to:form_mode::@22
-form_mode::@22: scope:[form_mode]  from form_mode::@21
+  to:form_mode::@9
+form_mode::@9: scope:[form_mode]  from form_mode::@8
   [258] phi()
   [259] call print_str_lines 
-  to:form_mode::@23
-form_mode::@23: scope:[form_mode]  from form_mode::@22
+  to:form_mode::@10
+form_mode::@10: scope:[form_mode]  from form_mode::@9
   [260] phi()
   [261] call print_set_screen 
-  to:form_mode::@24
-form_mode::@24: scope:[form_mode]  from form_mode::@23
+  to:form_mode::@11
+form_mode::@11: scope:[form_mode]  from form_mode::@10
   [262] phi()
   [263] call print_cls 
-  to:form_mode::@25
-form_mode::@25: scope:[form_mode]  from form_mode::@24
+  to:form_mode::@12
+form_mode::@12: scope:[form_mode]  from form_mode::@11
   [264] phi()
   [265] call print_str_lines 
-  to:form_mode::@26
-form_mode::@26: scope:[form_mode]  from form_mode::@25
+  to:form_mode::@13
+form_mode::@13: scope:[form_mode]  from form_mode::@12
   [266] phi()
   [267] call form_set_screen 
-  to:form_mode::@27
-form_mode::@27: scope:[form_mode]  from form_mode::@26
+  to:form_mode::@14
+form_mode::@14: scope:[form_mode]  from form_mode::@13
   [268] phi()
   [269] call form_render_values 
-  to:form_mode::@28
-form_mode::@28: scope:[form_mode]  from form_mode::@27
+  to:form_mode::@15
+form_mode::@15: scope:[form_mode]  from form_mode::@14
   [270] (byte) render_preset_name::idx#0 ← *((const byte[]) form_fields_val#0)
   [271] call render_preset_name 
-  to:form_mode::@29
-form_mode::@29: scope:[form_mode]  from form_mode::@28
+  to:form_mode::@16
+form_mode::@16: scope:[form_mode]  from form_mode::@15
   [272] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) FORM_CHARSET#0/(dword/signed dword) $10000
   [273] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
   [274] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
@@ -516,100 +516,100 @@ form_mode::@29: scope:[form_mode]  from form_mode::@28
   [281] *((const byte*) DTV_PLANEA_START_LO#0) ← <(const byte*) FORM_SCREEN#0
   [282] *((const byte*) DTV_PLANEA_START_MI#0) ← >(const byte*) FORM_SCREEN#0
   [283] *((const byte*) DTV_PLANEA_START_HI#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:form_mode::@7
-form_mode::@7: scope:[form_mode]  from form_mode::@29 form_mode::@7
-  [284] (byte) form_mode::i#2 ← phi( form_mode::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 form_mode::@7/(byte) form_mode::i#1 )
+  to:form_mode::@2
+form_mode::@2: scope:[form_mode]  from form_mode::@16 form_mode::@2
+  [284] (byte) form_mode::i#2 ← phi( form_mode::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 form_mode::@2/(byte) form_mode::i#1 )
   [285] *((const byte*) DTV_PALETTE#0 + (byte) form_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) form_mode::i#2)
   [286] (byte) form_mode::i#1 ← ++ (byte) form_mode::i#2
-  [287] if((byte) form_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto form_mode::@7
-  to:form_mode::@8
-form_mode::@8: scope:[form_mode]  from form_mode::@7
+  [287] if((byte) form_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto form_mode::@2
+  to:form_mode::@3
+form_mode::@3: scope:[form_mode]  from form_mode::@2
   [288] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [289] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [290] (byte) form_mode::preset_current#0 ← *((const byte[]) form_fields_val#0)
   to:form_mode::@1
-form_mode::@1: scope:[form_mode]  from form_mode::@12 form_mode::@32 form_mode::@8
-  [291] (byte) form_mode::preset_current#7 ← phi( form_mode::@32/(byte) form_mode::preset_current#1 form_mode::@8/(byte) form_mode::preset_current#0 )
-  [291] (byte) form_field_idx#28 ← phi( form_mode::@12/(byte) form_field_idx#18 form_mode::@32/(byte) form_field_idx#18 form_mode::@8/(byte) form_field_idx#1 )
-  [291] (byte) keyboard_events_size#47 ← phi( form_mode::@12/(byte) keyboard_events_size#24 form_mode::@32/(byte) keyboard_events_size#24 form_mode::@8/(byte) keyboard_events_size#27 )
-  [291] (signed byte) form_cursor_count#21 ← phi( form_mode::@12/(signed byte) form_cursor_count#16 form_mode::@32/(signed byte) form_cursor_count#16 form_mode::@8/(signed byte) form_cursor_count#1 )
-  to:form_mode::@9
-form_mode::@9: scope:[form_mode]  from form_mode::@1 form_mode::@9
-  [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@9
-  to:form_mode::@11
-form_mode::@11: scope:[form_mode]  from form_mode::@9
+form_mode::@1: scope:[form_mode]  from form_mode::@19 form_mode::@3 form_mode::@6
+  [291] (byte) form_mode::preset_current#7 ← phi( form_mode::@19/(byte) form_mode::preset_current#1 form_mode::@3/(byte) form_mode::preset_current#0 )
+  [291] (byte) form_field_idx#28 ← phi( form_mode::@6/(byte) form_field_idx#18 form_mode::@19/(byte) form_field_idx#18 form_mode::@3/(byte) form_field_idx#1 )
+  [291] (byte) keyboard_events_size#47 ← phi( form_mode::@6/(byte) keyboard_events_size#24 form_mode::@19/(byte) keyboard_events_size#24 form_mode::@3/(byte) keyboard_events_size#27 )
+  [291] (signed byte) form_cursor_count#21 ← phi( form_mode::@6/(signed byte) form_cursor_count#16 form_mode::@19/(signed byte) form_cursor_count#16 form_mode::@3/(signed byte) form_cursor_count#1 )
+  to:form_mode::@4
+form_mode::@4: scope:[form_mode]  from form_mode::@1 form_mode::@4
+  [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@4
+  to:form_mode::@5
+form_mode::@5: scope:[form_mode]  from form_mode::@4
   [293] phi()
   [294] call form_control 
   [295] (byte) form_control::return#0 ← (byte) form_control::return#2
-  to:form_mode::@30
-form_mode::@30: scope:[form_mode]  from form_mode::@11
+  to:form_mode::@17
+form_mode::@17: scope:[form_mode]  from form_mode::@5
   [296] (byte~) form_mode::$36 ← (byte) form_control::return#0
-  [297] if((byte~) form_mode::$36==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_mode::@12
+  [297] if((byte~) form_mode::$36==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_mode::@6
   to:form_mode::@return
-form_mode::@return: scope:[form_mode]  from form_mode::@30
+form_mode::@return: scope:[form_mode]  from form_mode::@17
   [298] return 
   to:@return
-form_mode::@12: scope:[form_mode]  from form_mode::@30
+form_mode::@6: scope:[form_mode]  from form_mode::@17
   [299] if((byte) form_mode::preset_current#7==*((const byte[]) form_fields_val#0)) goto form_mode::@1
-  to:form_mode::@19
-form_mode::@19: scope:[form_mode]  from form_mode::@12
+  to:form_mode::@7
+form_mode::@7: scope:[form_mode]  from form_mode::@6
   [300] (byte) apply_preset::idx#0 ← *((const byte[]) form_fields_val#0)
   [301] call apply_preset 
-  to:form_mode::@31
-form_mode::@31: scope:[form_mode]  from form_mode::@19
+  to:form_mode::@18
+form_mode::@18: scope:[form_mode]  from form_mode::@7
   [302] (byte) form_mode::preset_current#1 ← *((const byte[]) form_fields_val#0)
   [303] call form_render_values 
-  to:form_mode::@32
-form_mode::@32: scope:[form_mode]  from form_mode::@31
+  to:form_mode::@19
+form_mode::@19: scope:[form_mode]  from form_mode::@18
   [304] (byte) render_preset_name::idx#1 ← *((const byte[]) form_fields_val#0)
   [305] call render_preset_name 
   to:form_mode::@1
-render_preset_name: scope:[render_preset_name]  from form_mode::@28 form_mode::@32
-  [306] (byte) render_preset_name::idx#10 ← phi( form_mode::@28/(byte) render_preset_name::idx#0 form_mode::@32/(byte) render_preset_name::idx#1 )
-  [307] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_preset_name::@22
-  to:render_preset_name::@23
-render_preset_name::@23: scope:[render_preset_name]  from render_preset_name
-  [308] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto render_preset_name::@22
-  to:render_preset_name::@24
-render_preset_name::@24: scope:[render_preset_name]  from render_preset_name::@23
-  [309] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_preset_name::@22
-  to:render_preset_name::@25
-render_preset_name::@25: scope:[render_preset_name]  from render_preset_name::@24
-  [310] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto render_preset_name::@22
-  to:render_preset_name::@26
-render_preset_name::@26: scope:[render_preset_name]  from render_preset_name::@25
-  [311] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_preset_name::@22
-  to:render_preset_name::@27
-render_preset_name::@27: scope:[render_preset_name]  from render_preset_name::@26
-  [312] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto render_preset_name::@22
-  to:render_preset_name::@28
-render_preset_name::@28: scope:[render_preset_name]  from render_preset_name::@27
-  [313] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto render_preset_name::@22
-  to:render_preset_name::@29
-render_preset_name::@29: scope:[render_preset_name]  from render_preset_name::@28
-  [314] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto render_preset_name::@22
-  to:render_preset_name::@30
-render_preset_name::@30: scope:[render_preset_name]  from render_preset_name::@29
-  [315] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto render_preset_name::@22
-  to:render_preset_name::@31
-render_preset_name::@31: scope:[render_preset_name]  from render_preset_name::@30
-  [316] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto render_preset_name::@22
-  to:render_preset_name::@32
-render_preset_name::@32: scope:[render_preset_name]  from render_preset_name::@31
-  [317] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto render_preset_name::@22
-  to:render_preset_name::@33
-render_preset_name::@33: scope:[render_preset_name]  from render_preset_name::@32
+render_preset_name: scope:[render_preset_name]  from form_mode::@15 form_mode::@19
+  [306] (byte) render_preset_name::idx#10 ← phi( form_mode::@15/(byte) render_preset_name::idx#0 form_mode::@19/(byte) render_preset_name::idx#1 )
+  [307] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_preset_name::@1
+  to:render_preset_name::@2
+render_preset_name::@2: scope:[render_preset_name]  from render_preset_name
+  [308] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto render_preset_name::@1
+  to:render_preset_name::@3
+render_preset_name::@3: scope:[render_preset_name]  from render_preset_name::@2
+  [309] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_preset_name::@1
+  to:render_preset_name::@4
+render_preset_name::@4: scope:[render_preset_name]  from render_preset_name::@3
+  [310] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto render_preset_name::@1
+  to:render_preset_name::@5
+render_preset_name::@5: scope:[render_preset_name]  from render_preset_name::@4
+  [311] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_preset_name::@1
+  to:render_preset_name::@6
+render_preset_name::@6: scope:[render_preset_name]  from render_preset_name::@5
+  [312] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto render_preset_name::@1
+  to:render_preset_name::@7
+render_preset_name::@7: scope:[render_preset_name]  from render_preset_name::@6
+  [313] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto render_preset_name::@1
+  to:render_preset_name::@8
+render_preset_name::@8: scope:[render_preset_name]  from render_preset_name::@7
+  [314] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto render_preset_name::@1
+  to:render_preset_name::@9
+render_preset_name::@9: scope:[render_preset_name]  from render_preset_name::@8
+  [315] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto render_preset_name::@1
+  to:render_preset_name::@10
+render_preset_name::@10: scope:[render_preset_name]  from render_preset_name::@9
+  [316] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto render_preset_name::@1
+  to:render_preset_name::@11
+render_preset_name::@11: scope:[render_preset_name]  from render_preset_name::@10
+  [317] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto render_preset_name::@1
+  to:render_preset_name::@12
+render_preset_name::@12: scope:[render_preset_name]  from render_preset_name::@11
   [318] phi()
-  to:render_preset_name::@22
-render_preset_name::@22: scope:[render_preset_name]  from render_preset_name render_preset_name::@23 render_preset_name::@24 render_preset_name::@25 render_preset_name::@26 render_preset_name::@27 render_preset_name::@28 render_preset_name::@29 render_preset_name::@30 render_preset_name::@31 render_preset_name::@32 render_preset_name::@33
-  [319] (byte*) render_preset_name::name#13 ← phi( render_preset_name/(const byte*) render_preset_name::name#1 render_preset_name::@31/(const byte*) render_preset_name::name#10 render_preset_name::@32/(const byte*) render_preset_name::name#11 render_preset_name::@23/(const byte*) render_preset_name::name#2 render_preset_name::@24/(const byte*) render_preset_name::name#3 render_preset_name::@33/(const byte*) render_preset_name::name#1 render_preset_name::@25/(const byte*) render_preset_name::name#4 render_preset_name::@26/(const byte*) render_preset_name::name#5 render_preset_name::@27/(const byte*) render_preset_name::name#6 render_preset_name::@28/(const byte*) render_preset_name::name#7 render_preset_name::@29/(const byte*) render_preset_name::name#8 render_preset_name::@30/(const byte*) render_preset_name::name#9 )
+  to:render_preset_name::@1
+render_preset_name::@1: scope:[render_preset_name]  from render_preset_name render_preset_name::@10 render_preset_name::@11 render_preset_name::@12 render_preset_name::@2 render_preset_name::@3 render_preset_name::@4 render_preset_name::@5 render_preset_name::@6 render_preset_name::@7 render_preset_name::@8 render_preset_name::@9
+  [319] (byte*) render_preset_name::name#13 ← phi( render_preset_name/(const byte*) render_preset_name::name#1 render_preset_name::@10/(const byte*) render_preset_name::name#10 render_preset_name::@11/(const byte*) render_preset_name::name#11 render_preset_name::@2/(const byte*) render_preset_name::name#2 render_preset_name::@3/(const byte*) render_preset_name::name#3 render_preset_name::@12/(const byte*) render_preset_name::name#1 render_preset_name::@4/(const byte*) render_preset_name::name#4 render_preset_name::@5/(const byte*) render_preset_name::name#5 render_preset_name::@6/(const byte*) render_preset_name::name#6 render_preset_name::@7/(const byte*) render_preset_name::name#7 render_preset_name::@8/(const byte*) render_preset_name::name#8 render_preset_name::@9/(const byte*) render_preset_name::name#9 )
   [320] (byte*) print_str_at::str#1 ← (byte*) render_preset_name::name#13
   [321] call print_str_at 
   to:render_preset_name::@return
-render_preset_name::@return: scope:[render_preset_name]  from render_preset_name::@22
+render_preset_name::@return: scope:[render_preset_name]  from render_preset_name::@1
   [322] return 
   to:@return
-print_str_at: scope:[print_str_at]  from render_preset_name::@22
+print_str_at: scope:[print_str_at]  from render_preset_name::@1
   [323] phi()
   to:print_str_at::@1
 print_str_at::@1: scope:[print_str_at]  from print_str_at print_str_at::@2
@@ -625,22 +625,22 @@ print_str_at::@2: scope:[print_str_at]  from print_str_at::@1
   [328] (byte*) print_str_at::at#0 ← ++ (byte*) print_str_at::at#2
   [329] (byte*) print_str_at::str#0 ← ++ (byte*) print_str_at::str#2
   to:print_str_at::@1
-form_render_values: scope:[form_render_values]  from form_mode::@27 form_mode::@31
+form_render_values: scope:[form_render_values]  from form_mode::@14 form_mode::@18
   [330] phi()
   to:form_render_values::@1
-form_render_values::@1: scope:[form_render_values]  from form_render_values form_render_values::@3
-  [331] (byte) form_render_values::idx#2 ← phi( form_render_values/(byte/signed byte/word/signed word/dword/signed dword) 0 form_render_values::@3/(byte) form_render_values::idx#1 )
+form_render_values::@1: scope:[form_render_values]  from form_render_values form_render_values::@2
+  [331] (byte) form_render_values::idx#2 ← phi( form_render_values/(byte/signed byte/word/signed word/dword/signed dword) 0 form_render_values::@2/(byte) form_render_values::idx#1 )
   [332] (byte) form_field_ptr::field_idx#0 ← (byte) form_render_values::idx#2
   [333] call form_field_ptr 
   [334] (byte*) form_field_ptr::return#2 ← (byte*) form_field_ptr::return#0
-  to:form_render_values::@3
-form_render_values::@3: scope:[form_render_values]  from form_render_values::@1
+  to:form_render_values::@2
+form_render_values::@2: scope:[form_render_values]  from form_render_values::@1
   [335] (byte*) form_render_values::field#0 ← (byte*) form_field_ptr::return#2
   [336] *((byte*) form_render_values::field#0) ← *((const byte[]) print_hextab#0 + *((const byte[]) form_fields_val#0 + (byte) form_render_values::idx#2))
   [337] (byte) form_render_values::idx#1 ← ++ (byte) form_render_values::idx#2
   [338] if((byte) form_render_values::idx#1<(const byte) form_fields_cnt#0) goto form_render_values::@1
   to:form_render_values::@return
-form_render_values::@return: scope:[form_render_values]  from form_render_values::@3
+form_render_values::@return: scope:[form_render_values]  from form_render_values::@2
   [339] return 
   to:@return
 form_field_ptr: scope:[form_field_ptr]  from form_control form_render_values::@1
@@ -653,152 +653,152 @@ form_field_ptr: scope:[form_field_ptr]  from form_control form_render_values::@1
 form_field_ptr::@return: scope:[form_field_ptr]  from form_field_ptr
   [345] return 
   to:@return
-apply_preset: scope:[apply_preset]  from form_mode::@19
-  [346] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto apply_preset::@22
-  to:apply_preset::@23
-apply_preset::@23: scope:[apply_preset]  from apply_preset
-  [347] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto apply_preset::@22
-  to:apply_preset::@24
-apply_preset::@24: scope:[apply_preset]  from apply_preset::@23
-  [348] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto apply_preset::@22
-  to:apply_preset::@25
-apply_preset::@25: scope:[apply_preset]  from apply_preset::@24
-  [349] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto apply_preset::@22
-  to:apply_preset::@26
-apply_preset::@26: scope:[apply_preset]  from apply_preset::@25
-  [350] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto apply_preset::@22
-  to:apply_preset::@27
-apply_preset::@27: scope:[apply_preset]  from apply_preset::@26
-  [351] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 5) goto apply_preset::@22
-  to:apply_preset::@28
-apply_preset::@28: scope:[apply_preset]  from apply_preset::@27
-  [352] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 6) goto apply_preset::@22
-  to:apply_preset::@29
-apply_preset::@29: scope:[apply_preset]  from apply_preset::@28
-  [353] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 7) goto apply_preset::@22
-  to:apply_preset::@30
-apply_preset::@30: scope:[apply_preset]  from apply_preset::@29
-  [354] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 8) goto apply_preset::@22
-  to:apply_preset::@31
-apply_preset::@31: scope:[apply_preset]  from apply_preset::@30
-  [355] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 9) goto apply_preset::@22
-  to:apply_preset::@32
-apply_preset::@32: scope:[apply_preset]  from apply_preset::@31
-  [356] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) $a) goto apply_preset::@22
-  to:apply_preset::@33
-apply_preset::@33: scope:[apply_preset]  from apply_preset::@32
+apply_preset: scope:[apply_preset]  from form_mode::@7
+  [346] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto apply_preset::@1
+  to:apply_preset::@2
+apply_preset::@2: scope:[apply_preset]  from apply_preset
+  [347] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto apply_preset::@1
+  to:apply_preset::@3
+apply_preset::@3: scope:[apply_preset]  from apply_preset::@2
+  [348] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto apply_preset::@1
+  to:apply_preset::@4
+apply_preset::@4: scope:[apply_preset]  from apply_preset::@3
+  [349] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto apply_preset::@1
+  to:apply_preset::@5
+apply_preset::@5: scope:[apply_preset]  from apply_preset::@4
+  [350] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto apply_preset::@1
+  to:apply_preset::@6
+apply_preset::@6: scope:[apply_preset]  from apply_preset::@5
+  [351] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 5) goto apply_preset::@1
+  to:apply_preset::@7
+apply_preset::@7: scope:[apply_preset]  from apply_preset::@6
+  [352] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 6) goto apply_preset::@1
+  to:apply_preset::@8
+apply_preset::@8: scope:[apply_preset]  from apply_preset::@7
+  [353] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 7) goto apply_preset::@1
+  to:apply_preset::@9
+apply_preset::@9: scope:[apply_preset]  from apply_preset::@8
+  [354] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 8) goto apply_preset::@1
+  to:apply_preset::@10
+apply_preset::@10: scope:[apply_preset]  from apply_preset::@9
+  [355] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 9) goto apply_preset::@1
+  to:apply_preset::@11
+apply_preset::@11: scope:[apply_preset]  from apply_preset::@10
+  [356] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) $a) goto apply_preset::@1
+  to:apply_preset::@12
+apply_preset::@12: scope:[apply_preset]  from apply_preset::@11
   [357] phi()
-  to:apply_preset::@22
-apply_preset::@22: scope:[apply_preset]  from apply_preset apply_preset::@23 apply_preset::@24 apply_preset::@25 apply_preset::@26 apply_preset::@27 apply_preset::@28 apply_preset::@29 apply_preset::@30 apply_preset::@31 apply_preset::@32 apply_preset::@33
-  [358] (byte*) apply_preset::preset#14 ← phi( apply_preset/(const byte[]) preset_stdchar#0 apply_preset::@31/(const byte[]) preset_sixsfred2#0 apply_preset::@32/(const byte[]) preset_8bpppixelcell#0 apply_preset::@23/(const byte[]) preset_ecmchar#0 apply_preset::@24/(const byte[]) preset_stdbm#0 apply_preset::@33/(const byte[]) preset_stdchar#0 apply_preset::@25/(const byte[]) preset_mcbm#0 apply_preset::@26/(const byte[]) preset_hi_stdchar#0 apply_preset::@27/(const byte[]) preset_hi_ecmchar#0 apply_preset::@28/(const byte[]) preset_twoplane#0 apply_preset::@29/(const byte[]) preset_chunky#0 apply_preset::@30/(const byte[]) preset_sixsfred#0 )
-  to:apply_preset::@45
-apply_preset::@45: scope:[apply_preset]  from apply_preset::@22 apply_preset::@45
-  [359] (byte) apply_preset::i#2 ← phi( apply_preset::@22/(byte/signed byte/word/signed word/dword/signed dword) 0 apply_preset::@45/(byte) apply_preset::i#1 )
+  to:apply_preset::@1
+apply_preset::@1: scope:[apply_preset]  from apply_preset apply_preset::@10 apply_preset::@11 apply_preset::@12 apply_preset::@2 apply_preset::@3 apply_preset::@4 apply_preset::@5 apply_preset::@6 apply_preset::@7 apply_preset::@8 apply_preset::@9
+  [358] (byte*) apply_preset::preset#14 ← phi( apply_preset/(const byte[]) preset_stdchar#0 apply_preset::@10/(const byte[]) preset_sixsfred2#0 apply_preset::@11/(const byte[]) preset_8bpppixelcell#0 apply_preset::@2/(const byte[]) preset_ecmchar#0 apply_preset::@3/(const byte[]) preset_stdbm#0 apply_preset::@12/(const byte[]) preset_stdchar#0 apply_preset::@4/(const byte[]) preset_mcbm#0 apply_preset::@5/(const byte[]) preset_hi_stdchar#0 apply_preset::@6/(const byte[]) preset_hi_ecmchar#0 apply_preset::@7/(const byte[]) preset_twoplane#0 apply_preset::@8/(const byte[]) preset_chunky#0 apply_preset::@9/(const byte[]) preset_sixsfred#0 )
+  to:apply_preset::@13
+apply_preset::@13: scope:[apply_preset]  from apply_preset::@1 apply_preset::@13
+  [359] (byte) apply_preset::i#2 ← phi( apply_preset::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 apply_preset::@13/(byte) apply_preset::i#1 )
   [360] *((const byte[]) form_fields_val#0 + (byte) apply_preset::i#2) ← *((byte*) apply_preset::preset#14 + (byte) apply_preset::i#2)
   [361] (byte) apply_preset::i#1 ← ++ (byte) apply_preset::i#2
-  [362] if((byte) apply_preset::i#1!=(const byte) form_fields_cnt#0) goto apply_preset::@45
+  [362] if((byte) apply_preset::i#1!=(const byte) form_fields_cnt#0) goto apply_preset::@13
   to:apply_preset::@return
-apply_preset::@return: scope:[apply_preset]  from apply_preset::@45
+apply_preset::@return: scope:[apply_preset]  from apply_preset::@13
   [363] return 
   to:@return
-form_control: scope:[form_control]  from form_mode::@11
+form_control: scope:[form_control]  from form_mode::@5
   [364] (byte) form_field_ptr::field_idx#1 ← (byte) form_field_idx#28
   [365] call form_field_ptr 
   [366] (byte*) form_field_ptr::return#3 ← (byte*) form_field_ptr::return#0
-  to:form_control::@33
-form_control::@33: scope:[form_control]  from form_control
+  to:form_control::@17
+form_control::@17: scope:[form_control]  from form_control
   [367] (byte*) form_control::field#0 ← (byte*) form_field_ptr::return#3
   [368] (signed byte) form_cursor_count#5 ← -- (signed byte) form_cursor_count#21
-  [369] if((signed byte) form_cursor_count#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@36
+  [369] if((signed byte) form_cursor_count#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@20
   to:form_control::@1
-form_control::@1: scope:[form_control]  from form_control::@33 form_control::@36
-  [370] (signed byte) form_cursor_count#15 ← phi( form_control::@36/(signed byte) form_cursor_count#5 form_control::@33/(const signed byte) FORM_CURSOR_BLINK#0 )
+form_control::@1: scope:[form_control]  from form_control::@17 form_control::@20
+  [370] (signed byte) form_cursor_count#15 ← phi( form_control::@20/(signed byte) form_cursor_count#5 form_control::@17/(const signed byte) FORM_CURSOR_BLINK#0 )
   [371] if((signed byte) form_cursor_count#15<(const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2) goto form_control::@2
-  to:form_control::@8
-form_control::@8: scope:[form_control]  from form_control::@1
+  to:form_control::@6
+form_control::@6: scope:[form_control]  from form_control::@1
   [372] (byte~) form_control::$13 ← *((byte*) form_control::field#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
   [373] *((byte*) form_control::field#0) ← (byte~) form_control::$13
   to:form_control::@3
-form_control::@3: scope:[form_control]  from form_control::@2 form_control::@8
+form_control::@3: scope:[form_control]  from form_control::@2 form_control::@6
   [374] phi()
   [375] call keyboard_event_scan 
-  to:form_control::@34
-form_control::@34: scope:[form_control]  from form_control::@3
+  to:form_control::@18
+form_control::@18: scope:[form_control]  from form_control::@3
   [376] phi()
   [377] call keyboard_event_get 
   [378] (byte) keyboard_event_get::return#4 ← (byte) keyboard_event_get::return#2
-  to:form_control::@35
-form_control::@35: scope:[form_control]  from form_control::@34
+  to:form_control::@19
+form_control::@19: scope:[form_control]  from form_control::@18
   [379] (byte) form_control::key_event#0 ← (byte) keyboard_event_get::return#4
   [380] if((byte) form_control::key_event#0!=(const byte) KEY_CRSR_DOWN#0) goto form_control::@4
-  to:form_control::@10
-form_control::@10: scope:[form_control]  from form_control::@35
+  to:form_control::@7
+form_control::@7: scope:[form_control]  from form_control::@19
   [381] (byte~) form_control::$15 ← *((byte*) form_control::field#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
   [382] *((byte*) form_control::field#0) ← (byte~) form_control::$15
   [383] (byte~) form_control::$16 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0
-  [384] if((byte~) form_control::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@19
-  to:form_control::@11
-form_control::@11: scope:[form_control]  from form_control::@10
+  [384] if((byte~) form_control::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@12
+  to:form_control::@8
+form_control::@8: scope:[form_control]  from form_control::@7
   [385] (byte) form_field_idx#44 ← -- (byte) form_field_idx#28
-  [386] if((byte) form_field_idx#44!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@37
-  to:form_control::@22
-form_control::@22: scope:[form_control]  from form_control::@11 form_control::@19 form_control::@37 form_control::@38
-  [387] (byte) form_field_idx#31 ← phi( form_control::@11/(const byte) form_fields_cnt#0-(byte/signed byte/word/signed word/dword/signed dword) 1 form_control::@37/(byte) form_field_idx#44 form_control::@38/(byte) form_field_idx#45 form_control::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [386] if((byte) form_field_idx#44!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@21
+  to:form_control::@13
+form_control::@13: scope:[form_control]  from form_control::@12 form_control::@21 form_control::@22 form_control::@8
+  [387] (byte) form_field_idx#31 ← phi( form_control::@8/(const byte) form_fields_cnt#0-(byte/signed byte/word/signed word/dword/signed dword) 1 form_control::@21/(byte) form_field_idx#44 form_control::@22/(byte) form_field_idx#45 form_control::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   to:form_control::@return
-form_control::@return: scope:[form_control]  from form_control::@22 form_control::@29 form_control::@39 form_control::@5
-  [388] (byte) form_field_idx#18 ← phi( form_control::@5/(byte) form_field_idx#28 form_control::@22/(byte) form_field_idx#31 form_control::@29/(byte) form_field_idx#28 form_control::@39/(byte) form_field_idx#28 )
-  [388] (signed byte) form_cursor_count#16 ← phi( form_control::@5/(signed byte) form_cursor_count#15 form_control::@22/(const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 form_control::@29/(signed byte) form_cursor_count#15 form_control::@39/(signed byte) form_cursor_count#15 )
-  [388] (byte) form_control::return#2 ← phi( form_control::@5/(byte/word/signed word/dword/signed dword) $ff form_control::@22/(byte/signed byte/word/signed word/dword/signed dword) 0 form_control::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 form_control::@39/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+form_control::@return: scope:[form_control]  from form_control::@13 form_control::@15 form_control::@23 form_control::@5
+  [388] (byte) form_field_idx#18 ← phi( form_control::@5/(byte) form_field_idx#28 form_control::@13/(byte) form_field_idx#31 form_control::@15/(byte) form_field_idx#28 form_control::@23/(byte) form_field_idx#28 )
+  [388] (signed byte) form_cursor_count#16 ← phi( form_control::@5/(signed byte) form_cursor_count#15 form_control::@13/(const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 form_control::@15/(signed byte) form_cursor_count#15 form_control::@23/(signed byte) form_cursor_count#15 )
+  [388] (byte) form_control::return#2 ← phi( form_control::@5/(byte/word/signed word/dword/signed dword) $ff form_control::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 form_control::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 form_control::@23/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [389] return 
   to:@return
-form_control::@37: scope:[form_control]  from form_control::@11
+form_control::@21: scope:[form_control]  from form_control::@8
   [390] phi()
-  to:form_control::@22
-form_control::@19: scope:[form_control]  from form_control::@10
-  [391] (byte) form_field_idx#45 ← ++ (byte) form_field_idx#28
-  [392] if((byte) form_field_idx#45!=(const byte) form_fields_cnt#0) goto form_control::@38
-  to:form_control::@22
-form_control::@38: scope:[form_control]  from form_control::@19
-  [393] phi()
-  to:form_control::@22
-form_control::@4: scope:[form_control]  from form_control::@35
-  [394] if((byte) form_control::key_event#0!=(const byte) KEY_CRSR_RIGHT#0) goto form_control::@5
   to:form_control::@13
-form_control::@13: scope:[form_control]  from form_control::@4
+form_control::@12: scope:[form_control]  from form_control::@7
+  [391] (byte) form_field_idx#45 ← ++ (byte) form_field_idx#28
+  [392] if((byte) form_field_idx#45!=(const byte) form_fields_cnt#0) goto form_control::@22
+  to:form_control::@13
+form_control::@22: scope:[form_control]  from form_control::@12
+  [393] phi()
+  to:form_control::@13
+form_control::@4: scope:[form_control]  from form_control::@19
+  [394] if((byte) form_control::key_event#0!=(const byte) KEY_CRSR_RIGHT#0) goto form_control::@5
+  to:form_control::@9
+form_control::@9: scope:[form_control]  from form_control::@4
   [395] (byte~) form_control::$24 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0
-  [396] if((byte~) form_control::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@26
-  to:form_control::@14
-form_control::@14: scope:[form_control]  from form_control::@13
+  [396] if((byte~) form_control::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@14
+  to:form_control::@10
+form_control::@10: scope:[form_control]  from form_control::@9
   [397] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← -- *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)
-  [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@29
-  to:form_control::@15
-form_control::@15: scope:[form_control]  from form_control::@14
+  [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@15
+  to:form_control::@11
+form_control::@11: scope:[form_control]  from form_control::@10
   [399] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← *((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)
-  to:form_control::@29
-form_control::@29: scope:[form_control]  from form_control::@14 form_control::@15 form_control::@26 form_control::@31
+  to:form_control::@15
+form_control::@15: scope:[form_control]  from form_control::@10 form_control::@11 form_control::@14 form_control::@16
   [400] *((byte*) form_control::field#0) ← *((const byte[]) print_hextab#0 + *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28))
   to:form_control::@return
-form_control::@26: scope:[form_control]  from form_control::@13
+form_control::@14: scope:[form_control]  from form_control::@9
   [401] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← ++ *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)
-  [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@29
-  to:form_control::@31
-form_control::@31: scope:[form_control]  from form_control::@26
+  [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@15
+  to:form_control::@16
+form_control::@16: scope:[form_control]  from form_control::@14
   [403] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:form_control::@29
+  to:form_control::@15
 form_control::@5: scope:[form_control]  from form_control::@4
-  [404] if((byte) form_control::key_event#0!=(const byte) KEY_SPACE#0) goto form_control::@39
+  [404] if((byte) form_control::key_event#0!=(const byte) KEY_SPACE#0) goto form_control::@23
   to:form_control::@return
-form_control::@39: scope:[form_control]  from form_control::@5
+form_control::@23: scope:[form_control]  from form_control::@5
   [405] phi()
   to:form_control::@return
 form_control::@2: scope:[form_control]  from form_control::@1
   [406] (byte/word/dword~) form_control::$14 ← *((byte*) form_control::field#0) | (byte/word/signed word/dword/signed dword) $80
   [407] *((byte*) form_control::field#0) ← (byte/word/dword~) form_control::$14
   to:form_control::@3
-form_control::@36: scope:[form_control]  from form_control::@33
+form_control::@20: scope:[form_control]  from form_control::@17
   [408] phi()
   to:form_control::@1
-form_set_screen: scope:[form_set_screen]  from form_mode::@26
+form_set_screen: scope:[form_set_screen]  from form_mode::@13
   [409] phi()
   to:form_set_screen::@1
 form_set_screen::@1: scope:[form_set_screen]  from form_set_screen form_set_screen::@1
@@ -815,40 +815,40 @@ form_set_screen::@1: scope:[form_set_screen]  from form_set_screen form_set_scre
 form_set_screen::@return: scope:[form_set_screen]  from form_set_screen::@1
   [418] return 
   to:@return
-print_str_lines: scope:[print_str_lines]  from form_mode::@22 form_mode::@25
-  [419] (byte*) print_str_lines::str#5 ← phi( form_mode::@22/(const byte[]) FORM_COLS#0 form_mode::@25/(const byte[]) FORM_TEXT#0 )
+print_str_lines: scope:[print_str_lines]  from form_mode::@12 form_mode::@9
+  [419] (byte*) print_str_lines::str#5 ← phi( form_mode::@9/(const byte[]) FORM_COLS#0 form_mode::@12/(const byte[]) FORM_TEXT#0 )
   [420] (byte*~) print_char_cursor#77 ← (byte*) print_set_screen::screen#2
   to:print_str_lines::@1
-print_str_lines::@1: scope:[print_str_lines]  from print_str_lines print_str_lines::@9
-  [421] (byte*) print_line_cursor#2 ← phi( print_str_lines/(byte*) print_set_screen::screen#2 print_str_lines::@9/(byte*) print_line_cursor#22 )
-  [421] (byte*) print_char_cursor#22 ← phi( print_str_lines/(byte*~) print_char_cursor#77 print_str_lines::@9/(byte*~) print_char_cursor#78 )
-  [421] (byte*) print_str_lines::str#3 ← phi( print_str_lines/(byte*) print_str_lines::str#5 print_str_lines::@9/(byte*) print_str_lines::str#0 )
-  [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@6
+print_str_lines::@1: scope:[print_str_lines]  from print_str_lines print_str_lines::@5
+  [421] (byte*) print_line_cursor#2 ← phi( print_str_lines/(byte*) print_set_screen::screen#2 print_str_lines::@5/(byte*) print_line_cursor#22 )
+  [421] (byte*) print_char_cursor#22 ← phi( print_str_lines/(byte*~) print_char_cursor#77 print_str_lines::@5/(byte*~) print_char_cursor#78 )
+  [421] (byte*) print_str_lines::str#3 ← phi( print_str_lines/(byte*) print_str_lines::str#5 print_str_lines::@5/(byte*) print_str_lines::str#0 )
+  [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@2
   to:print_str_lines::@return
 print_str_lines::@return: scope:[print_str_lines]  from print_str_lines::@1
   [423] return 
   to:@return
-print_str_lines::@6: scope:[print_str_lines]  from print_str_lines::@1 print_str_lines::@7
-  [424] (byte*) print_char_cursor#20 ← phi( print_str_lines::@1/(byte*) print_char_cursor#22 print_str_lines::@7/(byte*) print_char_cursor#38 )
-  [424] (byte*) print_str_lines::str#4 ← phi( print_str_lines::@1/(byte*) print_str_lines::str#3 print_str_lines::@7/(byte*) print_str_lines::str#0 )
+print_str_lines::@2: scope:[print_str_lines]  from print_str_lines::@1 print_str_lines::@3
+  [424] (byte*) print_char_cursor#20 ← phi( print_str_lines::@1/(byte*) print_char_cursor#22 print_str_lines::@3/(byte*) print_char_cursor#38 )
+  [424] (byte*) print_str_lines::str#4 ← phi( print_str_lines::@1/(byte*) print_str_lines::str#3 print_str_lines::@3/(byte*) print_str_lines::str#0 )
   [425] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#4)
   [426] (byte*) print_str_lines::str#0 ← ++ (byte*) print_str_lines::str#4
-  [427] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@7
-  to:print_str_lines::@8
-print_str_lines::@8: scope:[print_str_lines]  from print_str_lines::@6
+  [427] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@3
+  to:print_str_lines::@4
+print_str_lines::@4: scope:[print_str_lines]  from print_str_lines::@2
   [428] *((byte*) print_char_cursor#20) ← (byte) print_str_lines::ch#0
   [429] (byte*) print_char_cursor#1 ← ++ (byte*) print_char_cursor#20
-  to:print_str_lines::@7
-print_str_lines::@7: scope:[print_str_lines]  from print_str_lines::@6 print_str_lines::@8
-  [430] (byte*) print_char_cursor#38 ← phi( print_str_lines::@6/(byte*) print_char_cursor#20 print_str_lines::@8/(byte*) print_char_cursor#1 )
-  [431] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@6
-  to:print_str_lines::@9
-print_str_lines::@9: scope:[print_str_lines]  from print_str_lines::@7
+  to:print_str_lines::@3
+print_str_lines::@3: scope:[print_str_lines]  from print_str_lines::@2 print_str_lines::@4
+  [430] (byte*) print_char_cursor#38 ← phi( print_str_lines::@2/(byte*) print_char_cursor#20 print_str_lines::@4/(byte*) print_char_cursor#1 )
+  [431] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@2
+  to:print_str_lines::@5
+print_str_lines::@5: scope:[print_str_lines]  from print_str_lines::@3
   [432] phi()
   [433] call print_ln 
   [434] (byte*~) print_char_cursor#78 ← (byte*) print_line_cursor#22
   to:print_str_lines::@1
-print_ln: scope:[print_ln]  from print_str_lines::@9
+print_ln: scope:[print_ln]  from print_str_lines::@5
   [435] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -859,7 +859,7 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [439] return 
   to:@return
-print_cls: scope:[print_cls]  from form_mode::@21 form_mode::@24
+print_cls: scope:[print_cls]  from form_mode::@11 form_mode::@8
   [440] (byte*) print_cls::sc#0 ← (byte*) print_set_screen::screen#2
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -872,13 +872,13 @@ print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
 print_cls::@return: scope:[print_cls]  from print_cls::@1
   [446] return 
   to:@return
-print_set_screen: scope:[print_set_screen]  from form_mode form_mode::@23
-  [447] (byte*) print_set_screen::screen#2 ← phi( form_mode/(const byte*) COLS#0 form_mode::@23/(const byte*) FORM_SCREEN#0 )
+print_set_screen: scope:[print_set_screen]  from form_mode form_mode::@10
+  [447] (byte*) print_set_screen::screen#2 ← phi( form_mode/(const byte*) COLS#0 form_mode::@10/(const byte*) FORM_SCREEN#0 )
   to:print_set_screen::@return
 print_set_screen::@return: scope:[print_set_screen]  from print_set_screen
   [448] return 
   to:@return
-gfx_init: scope:[gfx_init]  from main::@7
+gfx_init: scope:[gfx_init]  from main::@3
   [449] phi()
   [450] call gfx_init_screen0 
   to:gfx_init::@1
@@ -987,8 +987,8 @@ gfx_init_plane_fill::@4: scope:[gfx_init_plane_fill]  from gfx_init_plane_fill::
 gfx_init_plane_fill::@return: scope:[gfx_init_plane_fill]  from gfx_init_plane_fill::@4
   [504] return 
   to:@return
-dtvSetCpuBankSegment1: scope:[dtvSetCpuBankSegment1]  from gfx_init_plane_8bppchunky gfx_init_plane_8bppchunky::@4 gfx_init_plane_8bppchunky::@6 gfx_init_plane_charset8 gfx_init_plane_charset8::@8 gfx_init_plane_fill gfx_init_plane_fill::@4 gfx_init_plane_horisontal gfx_init_plane_horisontal2 gfx_init_plane_horisontal2::@4 gfx_init_plane_horisontal::@8 gfx_init_plane_vertical gfx_init_plane_vertical::@4
-  [505] (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 ← phi( gfx_init_plane_8bppchunky/((byte))(const dword) PLANE_8BPP_CHUNKY#0/(word/signed word/dword/signed dword) $4000 gfx_init_plane_8bppchunky::@4/(byte) dtvSetCpuBankSegment1::cpuBankIdx#1 gfx_init_plane_8bppchunky::@6/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_charset8/(const byte) gfx_init_plane_charset8::gfxbCpuBank#0 gfx_init_plane_charset8::@8/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_fill/(byte) dtvSetCpuBankSegment1::cpuBankIdx#11 gfx_init_plane_fill::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_horisontal/(const byte) gfx_init_plane_horisontal::gfxbCpuBank#0 gfx_init_plane_horisontal2/(const byte) gfx_init_plane_horisontal2::gfxbCpuBank#0 gfx_init_plane_horisontal2::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_horisontal::@8/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_vertical/(const byte) gfx_init_plane_vertical::gfxbCpuBank#0 gfx_init_plane_vertical::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 )
+dtvSetCpuBankSegment1: scope:[dtvSetCpuBankSegment1]  from gfx_init_plane_8bppchunky gfx_init_plane_8bppchunky::@4 gfx_init_plane_8bppchunky::@6 gfx_init_plane_charset8 gfx_init_plane_charset8::@8 gfx_init_plane_fill gfx_init_plane_fill::@4 gfx_init_plane_horisontal gfx_init_plane_horisontal2 gfx_init_plane_horisontal2::@4 gfx_init_plane_horisontal::@7 gfx_init_plane_vertical gfx_init_plane_vertical::@4
+  [505] (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 ← phi( gfx_init_plane_8bppchunky/((byte))(const dword) PLANE_8BPP_CHUNKY#0/(word/signed word/dword/signed dword) $4000 gfx_init_plane_8bppchunky::@4/(byte) dtvSetCpuBankSegment1::cpuBankIdx#1 gfx_init_plane_8bppchunky::@6/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_charset8/(const byte) gfx_init_plane_charset8::gfxbCpuBank#0 gfx_init_plane_charset8::@8/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_fill/(byte) dtvSetCpuBankSegment1::cpuBankIdx#11 gfx_init_plane_fill::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_horisontal/(const byte) gfx_init_plane_horisontal::gfxbCpuBank#0 gfx_init_plane_horisontal2/(const byte) gfx_init_plane_horisontal2::gfxbCpuBank#0 gfx_init_plane_horisontal2::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_horisontal::@7/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_vertical/(const byte) gfx_init_plane_vertical::gfxbCpuBank#0 gfx_init_plane_vertical::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 )
   [506] *((const byte*) dtvSetCpuBankSegment1::cpuBank#0) ← (byte) dtvSetCpuBankSegment1::cpuBankIdx#13
   asm { .byte$32,$dd lda$ff .byte$32,$00  }
   to:dtvSetCpuBankSegment1::@return
@@ -1069,9 +1069,9 @@ gfx_init_plane_horisontal: scope:[gfx_init_plane_horisontal]  from gfx_init::@9
   [543] phi()
   [544] call dtvSetCpuBankSegment1 
   to:gfx_init_plane_horisontal::@1
-gfx_init_plane_horisontal::@1: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal gfx_init_plane_horisontal::@7
-  [545] (byte*) gfx_init_plane_horisontal::gfxa#6 ← phi( gfx_init_plane_horisontal::@7/(byte*) gfx_init_plane_horisontal::gfxa#7 gfx_init_plane_horisontal/((byte*))(word/signed word/dword/signed dword) $4000+(const dword) PLANE_HORISONTAL#0&(word/signed word/dword/signed dword) $3fff )
-  [545] (byte) gfx_init_plane_horisontal::ay#4 ← phi( gfx_init_plane_horisontal::@7/(byte) gfx_init_plane_horisontal::ay#1 gfx_init_plane_horisontal/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+gfx_init_plane_horisontal::@1: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal gfx_init_plane_horisontal::@6
+  [545] (byte*) gfx_init_plane_horisontal::gfxa#6 ← phi( gfx_init_plane_horisontal::@6/(byte*) gfx_init_plane_horisontal::gfxa#7 gfx_init_plane_horisontal/((byte*))(word/signed word/dword/signed dword) $4000+(const dword) PLANE_HORISONTAL#0&(word/signed word/dword/signed dword) $3fff )
+  [545] (byte) gfx_init_plane_horisontal::ay#4 ← phi( gfx_init_plane_horisontal::@6/(byte) gfx_init_plane_horisontal::ay#1 gfx_init_plane_horisontal/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   to:gfx_init_plane_horisontal::@2
 gfx_init_plane_horisontal::@2: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@1 gfx_init_plane_horisontal::@4
   [546] (byte) gfx_init_plane_horisontal::ax#2 ← phi( gfx_init_plane_horisontal::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_init_plane_horisontal::@4/(byte) gfx_init_plane_horisontal::ax#1 )
@@ -1087,16 +1087,16 @@ gfx_init_plane_horisontal::@4: scope:[gfx_init_plane_horisontal]  from gfx_init_
   [551] (byte*) gfx_init_plane_horisontal::gfxa#7 ← phi( gfx_init_plane_horisontal::@3/(byte*) gfx_init_plane_horisontal::gfxa#1 gfx_init_plane_horisontal::@5/(byte*) gfx_init_plane_horisontal::gfxa#2 )
   [552] (byte) gfx_init_plane_horisontal::ax#1 ← ++ (byte) gfx_init_plane_horisontal::ax#2
   [553] if((byte) gfx_init_plane_horisontal::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_init_plane_horisontal::@2
-  to:gfx_init_plane_horisontal::@7
-gfx_init_plane_horisontal::@7: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@4
+  to:gfx_init_plane_horisontal::@6
+gfx_init_plane_horisontal::@6: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@4
   [554] (byte) gfx_init_plane_horisontal::ay#1 ← ++ (byte) gfx_init_plane_horisontal::ay#4
   [555] if((byte) gfx_init_plane_horisontal::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto gfx_init_plane_horisontal::@1
-  to:gfx_init_plane_horisontal::@8
-gfx_init_plane_horisontal::@8: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@7
+  to:gfx_init_plane_horisontal::@7
+gfx_init_plane_horisontal::@7: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@6
   [556] phi()
   [557] call dtvSetCpuBankSegment1 
   to:gfx_init_plane_horisontal::@return
-gfx_init_plane_horisontal::@return: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@8
+gfx_init_plane_horisontal::@return: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@7
   [558] return 
   to:@return
 gfx_init_plane_horisontal::@3: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@2
@@ -1177,13 +1177,13 @@ gfx_init_plane_8bppchunky::@2: scope:[gfx_init_plane_8bppchunky]  from gfx_init_
 gfx_init_plane_8bppchunky::@4: scope:[gfx_init_plane_8bppchunky]  from gfx_init_plane_8bppchunky::@2
   [591] (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 ← (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#4
   [592] call dtvSetCpuBankSegment1 
-  to:gfx_init_plane_8bppchunky::@8
-gfx_init_plane_8bppchunky::@8: scope:[gfx_init_plane_8bppchunky]  from gfx_init_plane_8bppchunky::@4
+  to:gfx_init_plane_8bppchunky::@7
+gfx_init_plane_8bppchunky::@7: scope:[gfx_init_plane_8bppchunky]  from gfx_init_plane_8bppchunky::@4
   [593] (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 ← ++ (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#4
   to:gfx_init_plane_8bppchunky::@3
-gfx_init_plane_8bppchunky::@3: scope:[gfx_init_plane_8bppchunky]  from gfx_init_plane_8bppchunky::@2 gfx_init_plane_8bppchunky::@8
-  [594] (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#8 ← phi( gfx_init_plane_8bppchunky::@2/(byte) gfx_init_plane_8bppchunky::gfxbCpuBank#4 gfx_init_plane_8bppchunky::@8/(byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 )
-  [594] (byte*) gfx_init_plane_8bppchunky::gfxb#4 ← phi( gfx_init_plane_8bppchunky::@2/(byte*) gfx_init_plane_8bppchunky::gfxb#3 gfx_init_plane_8bppchunky::@8/((byte*))(word/signed word/dword/signed dword) $4000 )
+gfx_init_plane_8bppchunky::@3: scope:[gfx_init_plane_8bppchunky]  from gfx_init_plane_8bppchunky::@2 gfx_init_plane_8bppchunky::@7
+  [594] (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#8 ← phi( gfx_init_plane_8bppchunky::@2/(byte) gfx_init_plane_8bppchunky::gfxbCpuBank#4 gfx_init_plane_8bppchunky::@7/(byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 )
+  [594] (byte*) gfx_init_plane_8bppchunky::gfxb#4 ← phi( gfx_init_plane_8bppchunky::@2/(byte*) gfx_init_plane_8bppchunky::gfxb#3 gfx_init_plane_8bppchunky::@7/((byte*))(word/signed word/dword/signed dword) $4000 )
   [595] (word~) gfx_init_plane_8bppchunky::$9 ← (word) gfx_init_plane_8bppchunky::x#2 + (byte) gfx_init_plane_8bppchunky::y#6
   [596] (byte) gfx_init_plane_8bppchunky::c#0 ← ((byte)) (word~) gfx_init_plane_8bppchunky::$9
   [597] *((byte*) gfx_init_plane_8bppchunky::gfxb#4) ← (byte) gfx_init_plane_8bppchunky::c#0
@@ -1205,38 +1205,38 @@ gfx_init_plane_8bppchunky::@return: scope:[gfx_init_plane_8bppchunky]  from gfx_
 gfx_init_vic_bitmap: scope:[gfx_init_vic_bitmap]  from gfx_init::@6
   [606] phi()
   [607] call bitmap_init 
-  to:gfx_init_vic_bitmap::@3
-gfx_init_vic_bitmap::@3: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap
+  to:gfx_init_vic_bitmap::@2
+gfx_init_vic_bitmap::@2: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap
   [608] phi()
   [609] call bitmap_clear 
   to:gfx_init_vic_bitmap::@1
-gfx_init_vic_bitmap::@1: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@3 gfx_init_vic_bitmap::@5
-  [610] (byte) gfx_init_vic_bitmap::l#2 ← phi( gfx_init_vic_bitmap::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_init_vic_bitmap::@5/(byte) gfx_init_vic_bitmap::l#1 )
+gfx_init_vic_bitmap::@1: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@2 gfx_init_vic_bitmap::@3
+  [610] (byte) gfx_init_vic_bitmap::l#2 ← phi( gfx_init_vic_bitmap::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_init_vic_bitmap::@3/(byte) gfx_init_vic_bitmap::l#1 )
   [611] (byte) bitmap_line::x0#0 ← *((const byte[]) gfx_init_vic_bitmap::lines_x#0 + (byte) gfx_init_vic_bitmap::l#2)
   [612] (byte) bitmap_line::x1#0 ← *((const byte[]) gfx_init_vic_bitmap::lines_x#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) gfx_init_vic_bitmap::l#2)
   [613] (byte) bitmap_line::y0#0 ← *((const byte[]) gfx_init_vic_bitmap::lines_y#0 + (byte) gfx_init_vic_bitmap::l#2)
   [614] (byte) bitmap_line::y1#0 ← *((const byte[]) gfx_init_vic_bitmap::lines_y#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) gfx_init_vic_bitmap::l#2)
   [615] call bitmap_line 
-  to:gfx_init_vic_bitmap::@5
-gfx_init_vic_bitmap::@5: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@1
+  to:gfx_init_vic_bitmap::@3
+gfx_init_vic_bitmap::@3: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@1
   [616] (byte) gfx_init_vic_bitmap::l#1 ← ++ (byte) gfx_init_vic_bitmap::l#2
   [617] if((byte) gfx_init_vic_bitmap::l#1<(const byte) gfx_init_vic_bitmap::lines_cnt#0) goto gfx_init_vic_bitmap::@1
   to:gfx_init_vic_bitmap::@return
-gfx_init_vic_bitmap::@return: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@5
+gfx_init_vic_bitmap::@return: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@3
   [618] return 
   to:@return
 bitmap_line: scope:[bitmap_line]  from gfx_init_vic_bitmap::@1
   [619] if((byte) bitmap_line::x0#0<(byte) bitmap_line::x1#0) goto bitmap_line::@1
-  to:bitmap_line::@3
-bitmap_line::@3: scope:[bitmap_line]  from bitmap_line
+  to:bitmap_line::@2
+bitmap_line::@2: scope:[bitmap_line]  from bitmap_line
   [620] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0
-  [621] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10
+  [621] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7
+  to:bitmap_line::@3
+bitmap_line::@3: scope:[bitmap_line]  from bitmap_line::@2
+  [622] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
+  [623] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8
   to:bitmap_line::@4
 bitmap_line::@4: scope:[bitmap_line]  from bitmap_line::@3
-  [622] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [623] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11
-  to:bitmap_line::@5
-bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [624] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0
   [625] (byte) bitmap_line_ydxi::x#0 ← (byte) bitmap_line::x1#0
   [626] (byte) bitmap_line_ydxi::y1#0 ← (byte) bitmap_line::y0#0
@@ -1244,10 +1244,10 @@ bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [628] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   [629] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@11 bitmap_line::@15 bitmap_line::@17 bitmap_line::@21 bitmap_line::@25 bitmap_line::@27 bitmap_line::@5 bitmap_line::@8
+bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@10 bitmap_line::@12 bitmap_line::@13 bitmap_line::@14 bitmap_line::@4 bitmap_line::@6 bitmap_line::@8 bitmap_line::@9
   [630] return 
   to:@return
-bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
+bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@3
   [631] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0
   [632] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0
   [633] (byte) bitmap_line_xdyi::x1#0 ← (byte) bitmap_line::x0#0
@@ -1255,11 +1255,11 @@ bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
   [635] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2
   [636] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@3
+bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@2
   [637] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [638] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15
-  to:bitmap_line::@17
-bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
+  [638] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9
+  to:bitmap_line::@10
+bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@7
   [639] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0
   [640] (byte) bitmap_line_ydxd::x#0 ← (byte) bitmap_line::x0#0
   [641] (byte) bitmap_line_ydxd::y1#0 ← (byte) bitmap_line::y1#0
@@ -1267,7 +1267,7 @@ bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
   [643] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   [644] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
+bitmap_line::@9: scope:[bitmap_line]  from bitmap_line::@7
   [645] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0
   [646] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0
   [647] (byte) bitmap_line_xdyd::x1#0 ← (byte) bitmap_line::x0#0
@@ -1277,13 +1277,13 @@ bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
   to:bitmap_line::@return
 bitmap_line::@1: scope:[bitmap_line]  from bitmap_line
   [651] (byte) bitmap_line::xd#1 ← (byte) bitmap_line::x1#0 - (byte) bitmap_line::x0#0
-  [652] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20
-  to:bitmap_line::@7
-bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@1
+  [652] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11
+  to:bitmap_line::@5
+bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@1
   [653] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [654] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21
-  to:bitmap_line::@8
-bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
+  [654] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12
+  to:bitmap_line::@6
+bitmap_line::@6: scope:[bitmap_line]  from bitmap_line::@5
   [655] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0
   [656] (byte) bitmap_line_ydxd::x#1 ← (byte) bitmap_line::x1#0
   [657] (byte) bitmap_line_ydxd::y1#1 ← (byte) bitmap_line::y0#0
@@ -1291,7 +1291,7 @@ bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
   [659] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   [660] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
+bitmap_line::@12: scope:[bitmap_line]  from bitmap_line::@5
   [661] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0
   [662] (byte) bitmap_line_xdyd::y#1 ← (byte) bitmap_line::y0#0
   [663] (byte) bitmap_line_xdyd::x1#1 ← (byte) bitmap_line::x1#0
@@ -1299,11 +1299,11 @@ bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
   [665] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10
   [666] call bitmap_line_xdyd 
   to:bitmap_line::@return
-bitmap_line::@20: scope:[bitmap_line]  from bitmap_line::@1
+bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@1
   [667] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [668] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25
-  to:bitmap_line::@27
-bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
+  [668] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13
+  to:bitmap_line::@14
+bitmap_line::@14: scope:[bitmap_line]  from bitmap_line::@11
   [669] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0
   [670] (byte) bitmap_line_ydxi::x#1 ← (byte) bitmap_line::x0#0
   [671] (byte) bitmap_line_ydxi::y1#1 ← (byte) bitmap_line::y1#0
@@ -1311,7 +1311,7 @@ bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
   [673] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   [674] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
+bitmap_line::@13: scope:[bitmap_line]  from bitmap_line::@11
   [675] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0
   [676] (byte) bitmap_line_xdyi::y#1 ← (byte) bitmap_line::y0#0
   [677] (byte) bitmap_line_xdyi::x1#1 ← (byte) bitmap_line::x1#0
@@ -1319,12 +1319,12 @@ bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
   [679] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11
   [680] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@11 bitmap_line::@25
-  [681] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x1#1 )
-  [681] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::xd#1 )
-  [681] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::y#0 bitmap_line::@25/(byte) bitmap_line_xdyi::y#1 )
-  [681] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x#1 )
-  [681] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::yd#1 )
+bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@13 bitmap_line::@8
+  [681] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x1#1 )
+  [681] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::xd#1 )
+  [681] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::y#0 bitmap_line::@13/(byte) bitmap_line_xdyi::y#1 )
+  [681] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x#1 )
+  [681] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::yd#1 )
   [682] (byte) bitmap_line_xdyi::e#0 ← (byte) bitmap_line_xdyi::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyi::@1
 bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_line_xdyi::@2
@@ -1334,19 +1334,19 @@ bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_lin
   [684] (byte) bitmap_plot::x#0 ← (byte) bitmap_line_xdyi::x#3
   [685] (byte) bitmap_plot::y#0 ← (byte) bitmap_line_xdyi::y#3
   [686] call bitmap_plot 
-  to:bitmap_line_xdyi::@5
-bitmap_line_xdyi::@5: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
+  to:bitmap_line_xdyi::@4
+bitmap_line_xdyi::@4: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
   [687] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3
   [688] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2
   [689] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2
   to:bitmap_line_xdyi::@3
-bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@5
+bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@4
   [690] (byte) bitmap_line_xdyi::y#2 ← ++ (byte) bitmap_line_xdyi::y#3
   [691] (byte) bitmap_line_xdyi::e#2 ← (byte) bitmap_line_xdyi::e#1 - (byte) bitmap_line_xdyi::xd#5
   to:bitmap_line_xdyi::@2
-bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5
-  [692] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::e#1 )
-  [692] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::y#3 )
+bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4
+  [692] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::e#1 )
+  [692] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::y#3 )
   [693] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6 ← (byte) bitmap_line_xdyi::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [694] if((byte) bitmap_line_xdyi::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6) goto bitmap_line_xdyi::@1
   to:bitmap_line_xdyi::@return
@@ -1365,12 +1365,12 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line_xdyd::@1 bitmap_line_xdyi::@1
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [702] return 
   to:@return
-bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@27 bitmap_line::@5
-  [703] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y1#0 )
-  [703] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::yd#0 )
-  [703] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y#0 )
-  [703] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::x#1 bitmap_line::@5/(byte) bitmap_line_ydxi::x#0 )
-  [703] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::xd#0 )
+bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@14 bitmap_line::@4
+  [703] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y1#0 )
+  [703] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::yd#0 )
+  [703] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y#0 )
+  [703] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::x#1 bitmap_line::@4/(byte) bitmap_line_ydxi::x#0 )
+  [703] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::xd#0 )
   [704] (byte) bitmap_line_ydxi::e#0 ← (byte) bitmap_line_ydxi::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxi::@1
 bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_line_ydxi::@2
@@ -1380,31 +1380,31 @@ bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_lin
   [706] (byte) bitmap_plot::x#2 ← (byte) bitmap_line_ydxi::x#3
   [707] (byte) bitmap_plot::y#2 ← (byte) bitmap_line_ydxi::y#3
   [708] call bitmap_plot 
-  to:bitmap_line_ydxi::@5
-bitmap_line_ydxi::@5: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
+  to:bitmap_line_ydxi::@4
+bitmap_line_ydxi::@4: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
   [709] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3
   [710] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2
   [711] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2
   to:bitmap_line_ydxi::@3
-bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@5
+bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@4
   [712] (byte) bitmap_line_ydxi::x#2 ← ++ (byte) bitmap_line_ydxi::x#3
   [713] (byte) bitmap_line_ydxi::e#2 ← (byte) bitmap_line_ydxi::e#1 - (byte) bitmap_line_ydxi::yd#5
   to:bitmap_line_ydxi::@2
-bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5
-  [714] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::e#1 )
-  [714] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::x#3 )
+bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4
+  [714] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::e#1 )
+  [714] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::x#3 )
   [715] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6 ← (byte) bitmap_line_ydxi::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [716] if((byte) bitmap_line_ydxi::y#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6) goto bitmap_line_ydxi::@1
   to:bitmap_line_ydxi::@return
 bitmap_line_ydxi::@return: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@2
   [717] return 
   to:@return
-bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@15 bitmap_line::@21
-  [718] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x1#1 )
-  [718] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::xd#1 )
-  [718] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::y#0 bitmap_line::@21/(byte) bitmap_line_xdyd::y#1 )
-  [718] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x#1 )
-  [718] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::yd#1 )
+bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@12 bitmap_line::@9
+  [718] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x1#1 )
+  [718] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::xd#1 )
+  [718] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::y#0 bitmap_line::@12/(byte) bitmap_line_xdyd::y#1 )
+  [718] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x#1 )
+  [718] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::yd#1 )
   [719] (byte) bitmap_line_xdyd::e#0 ← (byte) bitmap_line_xdyd::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyd::@1
 bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_line_xdyd::@2
@@ -1414,31 +1414,31 @@ bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_lin
   [721] (byte) bitmap_plot::x#1 ← (byte) bitmap_line_xdyd::x#3
   [722] (byte) bitmap_plot::y#1 ← (byte) bitmap_line_xdyd::y#3
   [723] call bitmap_plot 
-  to:bitmap_line_xdyd::@5
-bitmap_line_xdyd::@5: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
+  to:bitmap_line_xdyd::@4
+bitmap_line_xdyd::@4: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
   [724] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3
   [725] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2
   [726] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2
   to:bitmap_line_xdyd::@3
-bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@5
+bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@4
   [727] (byte) bitmap_line_xdyd::y#2 ← -- (byte) bitmap_line_xdyd::y#3
   [728] (byte) bitmap_line_xdyd::e#2 ← (byte) bitmap_line_xdyd::e#1 - (byte) bitmap_line_xdyd::xd#5
   to:bitmap_line_xdyd::@2
-bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5
-  [729] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::e#1 )
-  [729] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::y#3 )
+bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4
+  [729] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::e#1 )
+  [729] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::y#3 )
   [730] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6 ← (byte) bitmap_line_xdyd::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [731] if((byte) bitmap_line_xdyd::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6) goto bitmap_line_xdyd::@1
   to:bitmap_line_xdyd::@return
 bitmap_line_xdyd::@return: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@2
   [732] return 
   to:@return
-bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@17 bitmap_line::@8
-  [733] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y1#1 )
-  [733] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::yd#1 )
-  [733] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y#1 )
-  [733] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::x#0 bitmap_line::@8/(byte) bitmap_line_ydxd::x#1 )
-  [733] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::xd#1 )
+bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@10 bitmap_line::@6
+  [733] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y1#1 )
+  [733] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::yd#1 )
+  [733] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y#1 )
+  [733] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::x#0 bitmap_line::@6/(byte) bitmap_line_ydxd::x#1 )
+  [733] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::xd#1 )
   [734] (byte) bitmap_line_ydxd::e#0 ← (byte) bitmap_line_ydxd::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxd::@1
 bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_line_ydxd::@2
@@ -1448,26 +1448,26 @@ bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_lin
   [736] (byte) bitmap_plot::x#3 ← (byte) bitmap_line_ydxd::x#3
   [737] (byte) bitmap_plot::y#3 ← (byte) bitmap_line_ydxd::y#2
   [738] call bitmap_plot 
-  to:bitmap_line_ydxd::@5
-bitmap_line_ydxd::@5: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
+  to:bitmap_line_ydxd::@4
+bitmap_line_ydxd::@4: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
   [739] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2
   [740] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2
   [741] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2
   to:bitmap_line_ydxd::@3
-bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@5
+bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@4
   [742] (byte) bitmap_line_ydxd::x#2 ← -- (byte) bitmap_line_ydxd::x#3
   [743] (byte) bitmap_line_ydxd::e#2 ← (byte) bitmap_line_ydxd::e#1 - (byte) bitmap_line_ydxd::yd#5
   to:bitmap_line_ydxd::@2
-bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5
-  [744] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::e#1 )
-  [744] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::x#3 )
+bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4
+  [744] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::e#1 )
+  [744] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::x#3 )
   [745] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6 ← (byte) bitmap_line_ydxd::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [746] if((byte) bitmap_line_ydxd::y#3!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6) goto bitmap_line_ydxd::@1
   to:bitmap_line_ydxd::@return
 bitmap_line_ydxd::@return: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@2
   [747] return 
   to:@return
-bitmap_clear: scope:[bitmap_clear]  from gfx_init_vic_bitmap::@3
+bitmap_clear: scope:[bitmap_clear]  from gfx_init_vic_bitmap::@2
   [748] (word~) bitmap_clear::$3 ← *((const byte[$100]) bitmap_plot_xhi#0) w= *((const byte[$100]) bitmap_plot_xlo#0)
   [749] (byte*~) bitmap_clear::bitmap#5 ← (byte*)(word~) bitmap_clear::$3
   to:bitmap_clear::@1
@@ -1501,16 +1501,16 @@ bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
   [763] *((const byte[$100]) bitmap_plot_xhi#0 + (byte) bitmap_init::x#2) ← >(const byte*) VIC_BITMAP#0
   [764] *((const byte[$100]) bitmap_plot_bit#0 + (byte) bitmap_init::x#2) ← (byte) bitmap_init::bits#3
   [765] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [766] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10
+  [766] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6
   to:bitmap_init::@2
-bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@10
-  [767] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@10/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
+bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@6
+  [767] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@6/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
   [768] (byte) bitmap_init::x#1 ← ++ (byte) bitmap_init::x#2
   [769] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1
-  to:bitmap_init::@5
-bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
-  [770] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte*) bitmap_init::yoffs#4 )
-  [770] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte) bitmap_init::y#1 )
+  to:bitmap_init::@3
+bitmap_init::@3: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@4
+  [770] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte*) bitmap_init::yoffs#4 )
+  [770] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte) bitmap_init::y#1 )
   [771] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [772] (byte~) bitmap_init::$7 ← < (byte*) bitmap_init::yoffs#2
   [773] (byte~) bitmap_init::$8 ← (byte~) bitmap_init::$6 | (byte~) bitmap_init::$7
@@ -1518,20 +1518,20 @@ bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
   [775] (byte~) bitmap_init::$9 ← > (byte*) bitmap_init::yoffs#2
   [776] *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_init::y#2) ← (byte~) bitmap_init::$9
   [777] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [778] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6
-  to:bitmap_init::@7
-bitmap_init::@7: scope:[bitmap_init]  from bitmap_init::@5
+  [778] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4
+  to:bitmap_init::@5
+bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@3
   [779] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:bitmap_init::@6
-bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@5 bitmap_init::@7
-  [780] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@5/(byte*) bitmap_init::yoffs#2 bitmap_init::@7/(byte*) bitmap_init::yoffs#1 )
+  to:bitmap_init::@4
+bitmap_init::@4: scope:[bitmap_init]  from bitmap_init::@3 bitmap_init::@5
+  [780] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@3/(byte*) bitmap_init::yoffs#2 bitmap_init::@5/(byte*) bitmap_init::yoffs#1 )
   [781] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2
-  [782] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5
+  [782] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3
   to:bitmap_init::@return
-bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@6
+bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@4
   [783] return 
   to:@return
-bitmap_init::@10: scope:[bitmap_init]  from bitmap_init::@1
+bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@1
   [784] phi()
   to:bitmap_init::@2
 gfx_init_charset: scope:[gfx_init_charset]  from gfx_init::@5
diff --git a/src/test/ref/c64dtv-gfxexplorer.log b/src/test/ref/c64dtv-gfxexplorer.log
index fa07582e9..824dc4078 100644
--- a/src/test/ref/c64dtv-gfxexplorer.log
+++ b/src/test/ref/c64dtv-gfxexplorer.log
@@ -9914,43 +9914,204 @@ Culled Empty Block (label) gfx_init_screen1::@5
 Culled Empty Block (label) gfx_init_screen1::@6
 Culled Empty Block (label) gfx_init_screen0::@5
 Culled Empty Block (label) gfx_init_screen0::@6
+Renumbering block @68 to @1
+Renumbering block print_str_lines::@6 to print_str_lines::@2
+Renumbering block print_str_lines::@7 to print_str_lines::@3
+Renumbering block print_str_lines::@8 to print_str_lines::@4
+Renumbering block print_str_lines::@9 to print_str_lines::@5
+Renumbering block keyboard_event_scan::@5 to keyboard_event_scan::@4
+Renumbering block keyboard_event_scan::@6 to keyboard_event_scan::@5
+Renumbering block keyboard_event_scan::@7 to keyboard_event_scan::@6
+Renumbering block keyboard_event_scan::@8 to keyboard_event_scan::@7
+Renumbering block keyboard_event_scan::@10 to keyboard_event_scan::@8
+Renumbering block keyboard_event_scan::@11 to keyboard_event_scan::@9
+Renumbering block keyboard_event_scan::@12 to keyboard_event_scan::@10
+Renumbering block keyboard_event_scan::@14 to keyboard_event_scan::@11
+Renumbering block keyboard_event_scan::@16 to keyboard_event_scan::@12
+Renumbering block keyboard_event_scan::@17 to keyboard_event_scan::@13
+Renumbering block keyboard_event_scan::@18 to keyboard_event_scan::@14
+Renumbering block keyboard_event_scan::@20 to keyboard_event_scan::@15
+Renumbering block keyboard_event_scan::@21 to keyboard_event_scan::@16
+Renumbering block keyboard_event_scan::@23 to keyboard_event_scan::@17
+Renumbering block keyboard_event_scan::@24 to keyboard_event_scan::@18
+Renumbering block keyboard_event_scan::@25 to keyboard_event_scan::@19
+Renumbering block keyboard_event_scan::@26 to keyboard_event_scan::@20
+Renumbering block keyboard_event_scan::@27 to keyboard_event_scan::@21
+Renumbering block keyboard_event_scan::@28 to keyboard_event_scan::@22
+Renumbering block keyboard_event_scan::@29 to keyboard_event_scan::@23
+Renumbering block keyboard_event_get::@3 to keyboard_event_get::@1
+Renumbering block bitmap_init::@5 to bitmap_init::@3
+Renumbering block bitmap_init::@6 to bitmap_init::@4
+Renumbering block bitmap_init::@7 to bitmap_init::@5
+Renumbering block bitmap_init::@10 to bitmap_init::@6
+Renumbering block bitmap_line::@3 to bitmap_line::@2
+Renumbering block bitmap_line::@4 to bitmap_line::@3
+Renumbering block bitmap_line::@5 to bitmap_line::@4
+Renumbering block bitmap_line::@7 to bitmap_line::@5
+Renumbering block bitmap_line::@8 to bitmap_line::@6
+Renumbering block bitmap_line::@10 to bitmap_line::@7
+Renumbering block bitmap_line::@11 to bitmap_line::@8
+Renumbering block bitmap_line::@15 to bitmap_line::@9
+Renumbering block bitmap_line::@17 to bitmap_line::@10
+Renumbering block bitmap_line::@20 to bitmap_line::@11
+Renumbering block bitmap_line::@21 to bitmap_line::@12
+Renumbering block bitmap_line::@25 to bitmap_line::@13
+Renumbering block bitmap_line::@27 to bitmap_line::@14
+Renumbering block bitmap_line_xdyi::@5 to bitmap_line_xdyi::@4
+Renumbering block bitmap_line_xdyd::@5 to bitmap_line_xdyd::@4
+Renumbering block bitmap_line_ydxi::@5 to bitmap_line_ydxi::@4
+Renumbering block bitmap_line_ydxd::@5 to bitmap_line_ydxd::@4
+Renumbering block main::@7 to main::@3
+Renumbering block main::@9 to main::@4
+Renumbering block get_plane::@27 to get_plane::@1
+Renumbering block get_plane::@28 to get_plane::@2
+Renumbering block get_plane::@29 to get_plane::@3
+Renumbering block get_plane::@30 to get_plane::@4
+Renumbering block get_plane::@31 to get_plane::@5
+Renumbering block get_plane::@32 to get_plane::@6
+Renumbering block get_plane::@33 to get_plane::@7
+Renumbering block get_plane::@34 to get_plane::@8
+Renumbering block get_plane::@35 to get_plane::@9
+Renumbering block get_plane::@36 to get_plane::@10
+Renumbering block get_plane::@37 to get_plane::@11
+Renumbering block get_plane::@38 to get_plane::@12
+Renumbering block get_plane::@39 to get_plane::@13
+Renumbering block get_plane::@40 to get_plane::@14
+Renumbering block get_vic_screen::@9 to get_vic_screen::@1
+Renumbering block get_vic_screen::@10 to get_vic_screen::@2
+Renumbering block get_vic_screen::@11 to get_vic_screen::@3
+Renumbering block get_vic_screen::@12 to get_vic_screen::@4
+Renumbering block get_vic_screen::@13 to get_vic_screen::@5
+Renumbering block get_vic_charset::@3 to get_vic_charset::@1
+Renumbering block get_vic_charset::@4 to get_vic_charset::@2
+Renumbering block apply_preset::@22 to apply_preset::@1
+Renumbering block apply_preset::@23 to apply_preset::@2
+Renumbering block apply_preset::@24 to apply_preset::@3
+Renumbering block apply_preset::@25 to apply_preset::@4
+Renumbering block apply_preset::@26 to apply_preset::@5
+Renumbering block apply_preset::@27 to apply_preset::@6
+Renumbering block apply_preset::@28 to apply_preset::@7
+Renumbering block apply_preset::@29 to apply_preset::@8
+Renumbering block apply_preset::@30 to apply_preset::@9
+Renumbering block apply_preset::@31 to apply_preset::@10
+Renumbering block apply_preset::@32 to apply_preset::@11
+Renumbering block apply_preset::@33 to apply_preset::@12
+Renumbering block apply_preset::@45 to apply_preset::@13
+Renumbering block render_preset_name::@22 to render_preset_name::@1
+Renumbering block render_preset_name::@23 to render_preset_name::@2
+Renumbering block render_preset_name::@24 to render_preset_name::@3
+Renumbering block render_preset_name::@25 to render_preset_name::@4
+Renumbering block render_preset_name::@26 to render_preset_name::@5
+Renumbering block render_preset_name::@27 to render_preset_name::@6
+Renumbering block render_preset_name::@28 to render_preset_name::@7
+Renumbering block render_preset_name::@29 to render_preset_name::@8
+Renumbering block render_preset_name::@30 to render_preset_name::@9
+Renumbering block render_preset_name::@31 to render_preset_name::@10
+Renumbering block render_preset_name::@32 to render_preset_name::@11
+Renumbering block render_preset_name::@33 to render_preset_name::@12
+Renumbering block gfx_mode::@15 to gfx_mode::@10
+Renumbering block gfx_mode::@16 to gfx_mode::@11
+Renumbering block gfx_mode::@17 to gfx_mode::@12
+Renumbering block gfx_mode::@18 to gfx_mode::@13
+Renumbering block gfx_mode::@19 to gfx_mode::@14
+Renumbering block gfx_mode::@20 to gfx_mode::@15
+Renumbering block gfx_mode::@21 to gfx_mode::@16
+Renumbering block gfx_mode::@22 to gfx_mode::@17
+Renumbering block gfx_mode::@23 to gfx_mode::@18
+Renumbering block gfx_mode::@26 to gfx_mode::@19
+Renumbering block gfx_mode::@27 to gfx_mode::@20
+Renumbering block gfx_mode::@28 to gfx_mode::@21
+Renumbering block gfx_mode::@29 to gfx_mode::@22
+Renumbering block gfx_mode::@31 to gfx_mode::@23
+Renumbering block gfx_mode::@34 to gfx_mode::@24
+Renumbering block gfx_mode::@36 to gfx_mode::@25
+Renumbering block gfx_mode::@38 to gfx_mode::@26
+Renumbering block gfx_mode::@46 to gfx_mode::@27
+Renumbering block gfx_mode::@47 to gfx_mode::@28
+Renumbering block gfx_mode::@48 to gfx_mode::@29
+Renumbering block gfx_mode::@49 to gfx_mode::@30
+Renumbering block gfx_mode::@50 to gfx_mode::@31
+Renumbering block gfx_mode::@51 to gfx_mode::@32
+Renumbering block gfx_mode::@52 to gfx_mode::@33
+Renumbering block gfx_init_vic_bitmap::@3 to gfx_init_vic_bitmap::@2
+Renumbering block gfx_init_vic_bitmap::@5 to gfx_init_vic_bitmap::@3
+Renumbering block gfx_init_plane_8bppchunky::@8 to gfx_init_plane_8bppchunky::@7
+Renumbering block gfx_init_plane_horisontal::@7 to gfx_init_plane_horisontal::@6
+Renumbering block gfx_init_plane_horisontal::@8 to gfx_init_plane_horisontal::@7
+Renumbering block form_mode::@7 to form_mode::@2
+Renumbering block form_mode::@8 to form_mode::@3
+Renumbering block form_mode::@9 to form_mode::@4
+Renumbering block form_mode::@11 to form_mode::@5
+Renumbering block form_mode::@12 to form_mode::@6
+Renumbering block form_mode::@19 to form_mode::@7
+Renumbering block form_mode::@21 to form_mode::@8
+Renumbering block form_mode::@22 to form_mode::@9
+Renumbering block form_mode::@23 to form_mode::@10
+Renumbering block form_mode::@24 to form_mode::@11
+Renumbering block form_mode::@25 to form_mode::@12
+Renumbering block form_mode::@26 to form_mode::@13
+Renumbering block form_mode::@27 to form_mode::@14
+Renumbering block form_mode::@28 to form_mode::@15
+Renumbering block form_mode::@29 to form_mode::@16
+Renumbering block form_mode::@30 to form_mode::@17
+Renumbering block form_mode::@31 to form_mode::@18
+Renumbering block form_mode::@32 to form_mode::@19
+Renumbering block form_render_values::@3 to form_render_values::@2
+Renumbering block form_control::@8 to form_control::@6
+Renumbering block form_control::@10 to form_control::@7
+Renumbering block form_control::@11 to form_control::@8
+Renumbering block form_control::@13 to form_control::@9
+Renumbering block form_control::@14 to form_control::@10
+Renumbering block form_control::@15 to form_control::@11
+Renumbering block form_control::@19 to form_control::@12
+Renumbering block form_control::@22 to form_control::@13
+Renumbering block form_control::@26 to form_control::@14
+Renumbering block form_control::@29 to form_control::@15
+Renumbering block form_control::@31 to form_control::@16
+Renumbering block form_control::@33 to form_control::@17
+Renumbering block form_control::@34 to form_control::@18
+Renumbering block form_control::@35 to form_control::@19
+Renumbering block form_control::@36 to form_control::@20
+Renumbering block form_control::@37 to form_control::@21
+Renumbering block form_control::@38 to form_control::@22
+Renumbering block form_control::@39 to form_control::@23
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @68
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
-Adding NOP phi() at start of main::@7
+Adding NOP phi() at start of main::@3
 Adding NOP phi() at start of main::@2
-Adding NOP phi() at start of main::@9
-Adding NOP phi() at start of gfx_mode::@15
-Adding NOP phi() at start of gfx_mode::@21
-Adding NOP phi() at start of gfx_mode::@23
-Adding NOP phi() at start of gfx_mode::@38
-Adding NOP phi() at start of gfx_mode::@51
-Adding NOP phi() at start of keyboard_event_scan::@23
-Adding NOP phi() at start of keyboard_event_scan::@24
-Adding NOP phi() at start of get_vic_screen::@9
-Adding NOP phi() at start of get_vic_charset::@3
-Adding NOP phi() at start of get_plane::@27
+Adding NOP phi() at start of main::@4
+Adding NOP phi() at start of gfx_mode::@10
+Adding NOP phi() at start of gfx_mode::@16
+Adding NOP phi() at start of gfx_mode::@18
+Adding NOP phi() at start of gfx_mode::@26
+Adding NOP phi() at start of gfx_mode::@32
+Adding NOP phi() at start of keyboard_event_scan::@17
+Adding NOP phi() at start of keyboard_event_scan::@18
+Adding NOP phi() at start of get_vic_screen::@1
+Adding NOP phi() at start of get_vic_charset::@1
+Adding NOP phi() at start of get_plane::@1
 Adding NOP phi() at start of form_mode
-Adding NOP phi() at start of form_mode::@21
-Adding NOP phi() at start of form_mode::@22
-Adding NOP phi() at start of form_mode::@23
-Adding NOP phi() at start of form_mode::@24
-Adding NOP phi() at start of form_mode::@25
-Adding NOP phi() at start of form_mode::@26
-Adding NOP phi() at start of form_mode::@27
+Adding NOP phi() at start of form_mode::@8
+Adding NOP phi() at start of form_mode::@9
+Adding NOP phi() at start of form_mode::@10
 Adding NOP phi() at start of form_mode::@11
-Adding NOP phi() at start of render_preset_name::@33
+Adding NOP phi() at start of form_mode::@12
+Adding NOP phi() at start of form_mode::@13
+Adding NOP phi() at start of form_mode::@14
+Adding NOP phi() at start of form_mode::@5
+Adding NOP phi() at start of render_preset_name::@12
 Adding NOP phi() at start of print_str_at
 Adding NOP phi() at start of form_render_values
-Adding NOP phi() at start of apply_preset::@33
+Adding NOP phi() at start of apply_preset::@12
 Adding NOP phi() at start of form_control::@3
-Adding NOP phi() at start of form_control::@34
-Adding NOP phi() at start of form_control::@37
-Adding NOP phi() at start of form_control::@38
-Adding NOP phi() at start of form_control::@39
-Adding NOP phi() at start of form_control::@36
+Adding NOP phi() at start of form_control::@18
+Adding NOP phi() at start of form_control::@21
+Adding NOP phi() at start of form_control::@22
+Adding NOP phi() at start of form_control::@23
+Adding NOP phi() at start of form_control::@20
 Adding NOP phi() at start of form_set_screen
-Adding NOP phi() at start of print_str_lines::@9
+Adding NOP phi() at start of print_str_lines::@5
 Adding NOP phi() at start of print_ln
 Adding NOP phi() at start of gfx_init
 Adding NOP phi() at start of gfx_init::@1
@@ -9976,14 +10137,14 @@ Adding NOP phi() at start of gfx_init_plane_horisontal2::@4
 Adding NOP phi() at start of gfx_init_plane_vertical
 Adding NOP phi() at start of gfx_init_plane_vertical::@4
 Adding NOP phi() at start of gfx_init_plane_horisontal
-Adding NOP phi() at start of gfx_init_plane_horisontal::@8
+Adding NOP phi() at start of gfx_init_plane_horisontal::@7
 Adding NOP phi() at start of gfx_init_plane_charset8
 Adding NOP phi() at start of gfx_init_plane_8bppchunky
 Adding NOP phi() at start of gfx_init_plane_8bppchunky::@6
 Adding NOP phi() at start of gfx_init_vic_bitmap
-Adding NOP phi() at start of gfx_init_vic_bitmap::@3
+Adding NOP phi() at start of gfx_init_vic_bitmap::@2
 Adding NOP phi() at start of bitmap_init
-Adding NOP phi() at start of bitmap_init::@10
+Adding NOP phi() at start of bitmap_init::@6
 Adding NOP phi() at start of gfx_init_screen4
 Adding NOP phi() at start of gfx_init_screen3
 Adding NOP phi() at start of gfx_init_screen2
@@ -9993,111 +10154,111 @@ Adding NOP phi() at start of gfx_init_screen0
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@68
-@68: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @68
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @68
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
   [7] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
   [8] call keyboard_init 
-  to:main::@7
-main::@7: scope:[main]  from main
+  to:main::@3
+main::@3: scope:[main]  from main
   [9] phi()
   [10] call gfx_init 
   to:main::@1
-main::@1: scope:[main]  from main::@7 main::@9
-  [11] (byte) form_field_idx#1 ← phi( main::@9/(byte) form_field_idx#18 main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [11] (byte) keyboard_events_size#27 ← phi( main::@9/(byte) keyboard_events_size#24 main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [11] (signed byte) form_cursor_count#1 ← phi( main::@9/(signed byte) form_cursor_count#16 main::@7/(const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 )
+main::@1: scope:[main]  from main::@3 main::@4
+  [11] (byte) form_field_idx#1 ← phi( main::@4/(byte) form_field_idx#18 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [11] (byte) keyboard_events_size#27 ← phi( main::@4/(byte) keyboard_events_size#24 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [11] (signed byte) form_cursor_count#1 ← phi( main::@4/(signed byte) form_cursor_count#16 main::@3/(const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 )
   to:main::@2
 main::@2: scope:[main]  from main::@1
   [12] phi()
   [13] call form_mode 
-  to:main::@9
-main::@9: scope:[main]  from main::@2
+  to:main::@4
+main::@4: scope:[main]  from main::@2
   [14] phi()
   [15] call gfx_mode 
   to:main::@1
-gfx_mode: scope:[gfx_mode]  from main::@9
+gfx_mode: scope:[gfx_mode]  from main::@4
   [16] if(*((const byte*) form_ctrl_line#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@1
-  to:gfx_mode::@15
-gfx_mode::@15: scope:[gfx_mode]  from gfx_mode
+  to:gfx_mode::@10
+gfx_mode::@10: scope:[gfx_mode]  from gfx_mode
   [17] phi()
   to:gfx_mode::@1
-gfx_mode::@1: scope:[gfx_mode]  from gfx_mode gfx_mode::@15
-  [18] (byte) gfx_mode::dtv_control#14 ← phi( gfx_mode/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@15/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) DTV_LINEAR#0 )
+gfx_mode::@1: scope:[gfx_mode]  from gfx_mode gfx_mode::@10
+  [18] (byte) gfx_mode::dtv_control#14 ← phi( gfx_mode/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@10/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) DTV_LINEAR#0 )
   [19] if(*((const byte*) form_ctrl_borof#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@2
-  to:gfx_mode::@16
-gfx_mode::@16: scope:[gfx_mode]  from gfx_mode::@1
+  to:gfx_mode::@11
+gfx_mode::@11: scope:[gfx_mode]  from gfx_mode::@1
   [20] (byte) gfx_mode::dtv_control#2 ← (byte) gfx_mode::dtv_control#14 | (const byte) DTV_BORDER_OFF#0
   to:gfx_mode::@2
-gfx_mode::@2: scope:[gfx_mode]  from gfx_mode::@1 gfx_mode::@16
-  [21] (byte) gfx_mode::dtv_control#15 ← phi( gfx_mode::@1/(byte) gfx_mode::dtv_control#14 gfx_mode::@16/(byte) gfx_mode::dtv_control#2 )
+gfx_mode::@2: scope:[gfx_mode]  from gfx_mode::@1 gfx_mode::@11
+  [21] (byte) gfx_mode::dtv_control#15 ← phi( gfx_mode::@1/(byte) gfx_mode::dtv_control#14 gfx_mode::@11/(byte) gfx_mode::dtv_control#2 )
   [22] if(*((const byte*) form_ctrl_hicol#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@3
-  to:gfx_mode::@17
-gfx_mode::@17: scope:[gfx_mode]  from gfx_mode::@2
+  to:gfx_mode::@12
+gfx_mode::@12: scope:[gfx_mode]  from gfx_mode::@2
   [23] (byte) gfx_mode::dtv_control#3 ← (byte) gfx_mode::dtv_control#15 | (const byte) DTV_HIGHCOLOR#0
   to:gfx_mode::@3
-gfx_mode::@3: scope:[gfx_mode]  from gfx_mode::@17 gfx_mode::@2
-  [24] (byte) gfx_mode::dtv_control#10 ← phi( gfx_mode::@17/(byte) gfx_mode::dtv_control#3 gfx_mode::@2/(byte) gfx_mode::dtv_control#15 )
+gfx_mode::@3: scope:[gfx_mode]  from gfx_mode::@12 gfx_mode::@2
+  [24] (byte) gfx_mode::dtv_control#10 ← phi( gfx_mode::@12/(byte) gfx_mode::dtv_control#3 gfx_mode::@2/(byte) gfx_mode::dtv_control#15 )
   [25] if(*((const byte*) form_ctrl_overs#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@4
-  to:gfx_mode::@18
-gfx_mode::@18: scope:[gfx_mode]  from gfx_mode::@3
+  to:gfx_mode::@13
+gfx_mode::@13: scope:[gfx_mode]  from gfx_mode::@3
   [26] (byte) gfx_mode::dtv_control#4 ← (byte) gfx_mode::dtv_control#10 | (const byte) DTV_OVERSCAN#0
   to:gfx_mode::@4
-gfx_mode::@4: scope:[gfx_mode]  from gfx_mode::@18 gfx_mode::@3
-  [27] (byte) gfx_mode::dtv_control#11 ← phi( gfx_mode::@18/(byte) gfx_mode::dtv_control#4 gfx_mode::@3/(byte) gfx_mode::dtv_control#10 )
+gfx_mode::@4: scope:[gfx_mode]  from gfx_mode::@13 gfx_mode::@3
+  [27] (byte) gfx_mode::dtv_control#11 ← phi( gfx_mode::@13/(byte) gfx_mode::dtv_control#4 gfx_mode::@3/(byte) gfx_mode::dtv_control#10 )
   [28] if(*((const byte*) form_ctrl_colof#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@5
-  to:gfx_mode::@19
-gfx_mode::@19: scope:[gfx_mode]  from gfx_mode::@4
+  to:gfx_mode::@14
+gfx_mode::@14: scope:[gfx_mode]  from gfx_mode::@4
   [29] (byte) gfx_mode::dtv_control#5 ← (byte) gfx_mode::dtv_control#11 | (const byte) DTV_COLORRAM_OFF#0
   to:gfx_mode::@5
-gfx_mode::@5: scope:[gfx_mode]  from gfx_mode::@19 gfx_mode::@4
-  [30] (byte) gfx_mode::dtv_control#13 ← phi( gfx_mode::@19/(byte) gfx_mode::dtv_control#5 gfx_mode::@4/(byte) gfx_mode::dtv_control#11 )
+gfx_mode::@5: scope:[gfx_mode]  from gfx_mode::@14 gfx_mode::@4
+  [30] (byte) gfx_mode::dtv_control#13 ← phi( gfx_mode::@14/(byte) gfx_mode::dtv_control#5 gfx_mode::@4/(byte) gfx_mode::dtv_control#11 )
   [31] if(*((const byte*) form_ctrl_chunk#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@6
-  to:gfx_mode::@20
-gfx_mode::@20: scope:[gfx_mode]  from gfx_mode::@5
+  to:gfx_mode::@15
+gfx_mode::@15: scope:[gfx_mode]  from gfx_mode::@5
   [32] (byte) gfx_mode::dtv_control#6 ← (byte) gfx_mode::dtv_control#13 | (const byte) DTV_CHUNKY#0
   to:gfx_mode::@6
-gfx_mode::@6: scope:[gfx_mode]  from gfx_mode::@20 gfx_mode::@5
-  [33] (byte) gfx_mode::dtv_control#12 ← phi( gfx_mode::@20/(byte) gfx_mode::dtv_control#6 gfx_mode::@5/(byte) gfx_mode::dtv_control#13 )
+gfx_mode::@6: scope:[gfx_mode]  from gfx_mode::@15 gfx_mode::@5
+  [33] (byte) gfx_mode::dtv_control#12 ← phi( gfx_mode::@15/(byte) gfx_mode::dtv_control#6 gfx_mode::@5/(byte) gfx_mode::dtv_control#13 )
   [34] *((const byte*) DTV_CONTROL#0) ← (byte) gfx_mode::dtv_control#12
   [35] if(*((const byte*) form_ctrl_ecm#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@7
-  to:gfx_mode::@21
-gfx_mode::@21: scope:[gfx_mode]  from gfx_mode::@6
+  to:gfx_mode::@16
+gfx_mode::@16: scope:[gfx_mode]  from gfx_mode::@6
   [36] phi()
   to:gfx_mode::@7
-gfx_mode::@7: scope:[gfx_mode]  from gfx_mode::@21 gfx_mode::@6
-  [37] (byte) gfx_mode::vic_control#5 ← phi( gfx_mode::@21/(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3|(const byte) VIC_ECM#0 gfx_mode::@6/(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 )
+gfx_mode::@7: scope:[gfx_mode]  from gfx_mode::@16 gfx_mode::@6
+  [37] (byte) gfx_mode::vic_control#5 ← phi( gfx_mode::@16/(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3|(const byte) VIC_ECM#0 gfx_mode::@6/(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 )
   [38] if(*((const byte*) form_ctrl_bmm#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@8
-  to:gfx_mode::@22
-gfx_mode::@22: scope:[gfx_mode]  from gfx_mode::@7
+  to:gfx_mode::@17
+gfx_mode::@17: scope:[gfx_mode]  from gfx_mode::@7
   [39] (byte) gfx_mode::vic_control#2 ← (byte) gfx_mode::vic_control#5 | (const byte) VIC_BMM#0
   to:gfx_mode::@8
-gfx_mode::@8: scope:[gfx_mode]  from gfx_mode::@22 gfx_mode::@7
-  [40] (byte) gfx_mode::vic_control#4 ← phi( gfx_mode::@22/(byte) gfx_mode::vic_control#2 gfx_mode::@7/(byte) gfx_mode::vic_control#5 )
+gfx_mode::@8: scope:[gfx_mode]  from gfx_mode::@17 gfx_mode::@7
+  [40] (byte) gfx_mode::vic_control#4 ← phi( gfx_mode::@17/(byte) gfx_mode::vic_control#2 gfx_mode::@7/(byte) gfx_mode::vic_control#5 )
   [41] *((const byte*) VIC_CONTROL#0) ← (byte) gfx_mode::vic_control#4
   [42] if(*((const byte*) form_ctrl_mcm#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@9
-  to:gfx_mode::@23
-gfx_mode::@23: scope:[gfx_mode]  from gfx_mode::@8
+  to:gfx_mode::@18
+gfx_mode::@18: scope:[gfx_mode]  from gfx_mode::@8
   [43] phi()
   to:gfx_mode::@9
-gfx_mode::@9: scope:[gfx_mode]  from gfx_mode::@23 gfx_mode::@8
-  [44] (byte) gfx_mode::vic_control2#2 ← phi( gfx_mode::@23/(const byte) VIC_CSEL#0|(const byte) VIC_MCM#0 gfx_mode::@8/(const byte) VIC_CSEL#0 )
+gfx_mode::@9: scope:[gfx_mode]  from gfx_mode::@18 gfx_mode::@8
+  [44] (byte) gfx_mode::vic_control2#2 ← phi( gfx_mode::@18/(const byte) VIC_CSEL#0|(const byte) VIC_MCM#0 gfx_mode::@8/(const byte) VIC_CSEL#0 )
   [45] *((const byte*) VIC_CONTROL2#0) ← (byte) gfx_mode::vic_control2#2
   [46] (byte~) gfx_mode::$20 ← *((const byte*) form_a_start_hi#0) << (byte/signed byte/word/signed word/dword/signed dword) 4
   [47] (byte) gfx_mode::plane_a_offs#0 ← (byte~) gfx_mode::$20 | *((const byte*) form_a_start_lo#0)
   [48] (byte) get_plane::idx#0 ← *((const byte*) form_a_pattern#0)
   [49] call get_plane 
   [50] (dword) get_plane::return#16 ← (dword) get_plane::return#14
-  to:gfx_mode::@46
-gfx_mode::@46: scope:[gfx_mode]  from gfx_mode::@9
+  to:gfx_mode::@27
+gfx_mode::@27: scope:[gfx_mode]  from gfx_mode::@9
   [51] (dword~) gfx_mode::$22 ← (dword) get_plane::return#16
   [52] (dword) gfx_mode::plane_a#0 ← (dword~) gfx_mode::$22 + (byte) gfx_mode::plane_a_offs#0
   [53] (word~) gfx_mode::$24 ← < (dword) gfx_mode::plane_a#0
@@ -10121,8 +10282,8 @@ gfx_mode::@46: scope:[gfx_mode]  from gfx_mode::@9
   [71] (byte) get_plane::idx#1 ← *((const byte*) form_b_pattern#0)
   [72] call get_plane 
   [73] (dword) get_plane::return#17 ← (dword) get_plane::return#14
-  to:gfx_mode::@47
-gfx_mode::@47: scope:[gfx_mode]  from gfx_mode::@46
+  to:gfx_mode::@28
+gfx_mode::@28: scope:[gfx_mode]  from gfx_mode::@27
   [74] (dword~) gfx_mode::$36 ← (dword) get_plane::return#17
   [75] (dword) gfx_mode::plane_b#0 ← (dword~) gfx_mode::$36 + (byte) gfx_mode::plane_b_offs#0
   [76] (word~) gfx_mode::$38 ← < (dword) gfx_mode::plane_b#0
@@ -10146,8 +10307,8 @@ gfx_mode::@47: scope:[gfx_mode]  from gfx_mode::@46
   [94] (byte) get_vic_screen::idx#0 ← *((const byte*) form_vic_screen#0)
   [95] call get_vic_screen 
   [96] (byte*) get_vic_screen::return#10 ← (byte*) get_vic_screen::return#5
-  to:gfx_mode::@48
-gfx_mode::@48: scope:[gfx_mode]  from gfx_mode::@47
+  to:gfx_mode::@29
+gfx_mode::@29: scope:[gfx_mode]  from gfx_mode::@28
   [97] (byte*~) gfx_mode::$52 ← (byte*) get_vic_screen::return#10
   [98] (word~) gfx_mode::$54 ← (word)(byte*~) gfx_mode::$52 & (word/signed word/dword/signed dword) $3fff
   [99] (word~) gfx_mode::$55 ← (word~) gfx_mode::$54 >> (byte/signed byte/word/signed word/dword/signed dword) 6
@@ -10155,8 +10316,8 @@ gfx_mode::@48: scope:[gfx_mode]  from gfx_mode::@47
   [101] (byte) get_vic_charset::idx#0 ← *((const byte*) form_vic_gfx#0)
   [102] call get_vic_charset 
   [103] (byte*) get_vic_charset::return#4 ← (byte*) get_vic_charset::return#2
-  to:gfx_mode::@49
-gfx_mode::@49: scope:[gfx_mode]  from gfx_mode::@48
+  to:gfx_mode::@30
+gfx_mode::@30: scope:[gfx_mode]  from gfx_mode::@29
   [104] (byte*~) gfx_mode::$57 ← (byte*) get_vic_charset::return#4
   [105] (word~) gfx_mode::$59 ← (word)(byte*~) gfx_mode::$57 & (word/signed word/dword/signed dword) $3fff
   [106] (byte~) gfx_mode::$60 ← > (word~) gfx_mode::$59
@@ -10166,30 +10327,30 @@ gfx_mode::@49: scope:[gfx_mode]  from gfx_mode::@48
   [110] (byte) get_vic_screen::idx#1 ← *((const byte*) form_vic_cols#0)
   [111] call get_vic_screen 
   [112] (byte*) get_vic_screen::return#11 ← (byte*) get_vic_screen::return#5
-  to:gfx_mode::@50
-gfx_mode::@50: scope:[gfx_mode]  from gfx_mode::@49
+  to:gfx_mode::@31
+gfx_mode::@31: scope:[gfx_mode]  from gfx_mode::@30
   [113] (byte*) gfx_mode::vic_colors#0 ← (byte*) get_vic_screen::return#11
-  to:gfx_mode::@26
-gfx_mode::@26: scope:[gfx_mode]  from gfx_mode::@28 gfx_mode::@50
-  [114] (byte) gfx_mode::cy#4 ← phi( gfx_mode::@28/(byte) gfx_mode::cy#1 gfx_mode::@50/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [114] (byte*) gfx_mode::col#3 ← phi( gfx_mode::@28/(byte*) gfx_mode::col#1 gfx_mode::@50/(const byte*) COLS#0 )
-  [114] (byte*) gfx_mode::vic_colors#3 ← phi( gfx_mode::@28/(byte*) gfx_mode::vic_colors#1 gfx_mode::@50/(byte*) gfx_mode::vic_colors#0 )
-  to:gfx_mode::@27
-gfx_mode::@27: scope:[gfx_mode]  from gfx_mode::@26 gfx_mode::@27
-  [115] (byte) gfx_mode::cx#2 ← phi( gfx_mode::@26/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@27/(byte) gfx_mode::cx#1 )
-  [115] (byte*) gfx_mode::col#2 ← phi( gfx_mode::@26/(byte*) gfx_mode::col#3 gfx_mode::@27/(byte*) gfx_mode::col#1 )
-  [115] (byte*) gfx_mode::vic_colors#2 ← phi( gfx_mode::@26/(byte*) gfx_mode::vic_colors#3 gfx_mode::@27/(byte*) gfx_mode::vic_colors#1 )
+  to:gfx_mode::@19
+gfx_mode::@19: scope:[gfx_mode]  from gfx_mode::@21 gfx_mode::@31
+  [114] (byte) gfx_mode::cy#4 ← phi( gfx_mode::@21/(byte) gfx_mode::cy#1 gfx_mode::@31/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [114] (byte*) gfx_mode::col#3 ← phi( gfx_mode::@21/(byte*) gfx_mode::col#1 gfx_mode::@31/(const byte*) COLS#0 )
+  [114] (byte*) gfx_mode::vic_colors#3 ← phi( gfx_mode::@21/(byte*) gfx_mode::vic_colors#1 gfx_mode::@31/(byte*) gfx_mode::vic_colors#0 )
+  to:gfx_mode::@20
+gfx_mode::@20: scope:[gfx_mode]  from gfx_mode::@19 gfx_mode::@20
+  [115] (byte) gfx_mode::cx#2 ← phi( gfx_mode::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@20/(byte) gfx_mode::cx#1 )
+  [115] (byte*) gfx_mode::col#2 ← phi( gfx_mode::@19/(byte*) gfx_mode::col#3 gfx_mode::@20/(byte*) gfx_mode::col#1 )
+  [115] (byte*) gfx_mode::vic_colors#2 ← phi( gfx_mode::@19/(byte*) gfx_mode::vic_colors#3 gfx_mode::@20/(byte*) gfx_mode::vic_colors#1 )
   [116] *((byte*) gfx_mode::col#2) ← *((byte*) gfx_mode::vic_colors#2)
   [117] (byte*) gfx_mode::col#1 ← ++ (byte*) gfx_mode::col#2
   [118] (byte*) gfx_mode::vic_colors#1 ← ++ (byte*) gfx_mode::vic_colors#2
   [119] (byte) gfx_mode::cx#1 ← ++ (byte) gfx_mode::cx#2
-  [120] if((byte) gfx_mode::cx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_mode::@27
-  to:gfx_mode::@28
-gfx_mode::@28: scope:[gfx_mode]  from gfx_mode::@27
+  [120] if((byte) gfx_mode::cx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_mode::@20
+  to:gfx_mode::@21
+gfx_mode::@21: scope:[gfx_mode]  from gfx_mode::@20
   [121] (byte) gfx_mode::cy#1 ← ++ (byte) gfx_mode::cy#4
-  [122] if((byte) gfx_mode::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto gfx_mode::@26
-  to:gfx_mode::@29
-gfx_mode::@29: scope:[gfx_mode]  from gfx_mode::@28
+  [122] if((byte) gfx_mode::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto gfx_mode::@19
+  to:gfx_mode::@22
+gfx_mode::@22: scope:[gfx_mode]  from gfx_mode::@21
   [123] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [124] (byte~) gfx_mode::$64 ← *((const byte*) form_vic_bg0_hi#0) << (byte/signed byte/word/signed word/dword/signed dword) 4
   [125] (byte~) gfx_mode::$65 ← (byte~) gfx_mode::$64 | *((const byte*) form_vic_bg0_lo#0)
@@ -10203,162 +10364,162 @@ gfx_mode::@29: scope:[gfx_mode]  from gfx_mode::@28
   [133] (byte~) gfx_mode::$70 ← *((const byte*) form_vic_bg3_hi#0) << (byte/signed byte/word/signed word/dword/signed dword) 4
   [134] (byte~) gfx_mode::$71 ← (byte~) gfx_mode::$70 | *((const byte*) form_vic_bg3_lo#0)
   [135] *((const byte*) BGCOL4#0) ← (byte~) gfx_mode::$71
-  [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@34
-  to:gfx_mode::@31
-gfx_mode::@31: scope:[gfx_mode]  from gfx_mode::@29 gfx_mode::@31
-  [137] (byte) gfx_mode::j#2 ← phi( gfx_mode::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@31/(byte) gfx_mode::j#1 )
+  [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@24
+  to:gfx_mode::@23
+gfx_mode::@23: scope:[gfx_mode]  from gfx_mode::@22 gfx_mode::@23
+  [137] (byte) gfx_mode::j#2 ← phi( gfx_mode::@22/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@23/(byte) gfx_mode::j#1 )
   [138] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::j#2) ← (byte) gfx_mode::j#2
   [139] (byte) gfx_mode::j#1 ← ++ (byte) gfx_mode::j#2
-  [140] if((byte) gfx_mode::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@31
-  to:gfx_mode::@36
-gfx_mode::@36: scope:[gfx_mode]  from gfx_mode::@31 gfx_mode::@34 gfx_mode::@36 gfx_mode::@52
-  [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@36
-  to:gfx_mode::@38
-gfx_mode::@38: scope:[gfx_mode]  from gfx_mode::@36
+  [140] if((byte) gfx_mode::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@23
+  to:gfx_mode::@25
+gfx_mode::@25: scope:[gfx_mode]  from gfx_mode::@23 gfx_mode::@24 gfx_mode::@25 gfx_mode::@33
+  [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@25
+  to:gfx_mode::@26
+gfx_mode::@26: scope:[gfx_mode]  from gfx_mode::@25
   [142] phi()
   [143] call keyboard_event_scan 
-  to:gfx_mode::@51
-gfx_mode::@51: scope:[gfx_mode]  from gfx_mode::@38
+  to:gfx_mode::@32
+gfx_mode::@32: scope:[gfx_mode]  from gfx_mode::@26
   [144] phi()
   [145] call keyboard_event_get 
   [146] (byte) keyboard_event_get::return#3 ← (byte) keyboard_event_get::return#2
-  to:gfx_mode::@52
-gfx_mode::@52: scope:[gfx_mode]  from gfx_mode::@51
+  to:gfx_mode::@33
+gfx_mode::@33: scope:[gfx_mode]  from gfx_mode::@32
   [147] (byte) gfx_mode::keyboard_event#0 ← (byte) keyboard_event_get::return#3
-  [148] if((byte) gfx_mode::keyboard_event#0!=(const byte) KEY_SPACE#0) goto gfx_mode::@36
+  [148] if((byte) gfx_mode::keyboard_event#0!=(const byte) KEY_SPACE#0) goto gfx_mode::@25
   to:gfx_mode::@return
-gfx_mode::@return: scope:[gfx_mode]  from gfx_mode::@52
+gfx_mode::@return: scope:[gfx_mode]  from gfx_mode::@33
   [149] return 
   to:@return
-gfx_mode::@34: scope:[gfx_mode]  from gfx_mode::@29 gfx_mode::@34
-  [150] (byte) gfx_mode::i#2 ← phi( gfx_mode::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@34/(byte) gfx_mode::i#1 )
+gfx_mode::@24: scope:[gfx_mode]  from gfx_mode::@22 gfx_mode::@24
+  [150] (byte) gfx_mode::i#2 ← phi( gfx_mode::@22/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_mode::@24/(byte) gfx_mode::i#1 )
   [151] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) gfx_mode::i#2)
   [152] (byte) gfx_mode::i#1 ← ++ (byte) gfx_mode::i#2
-  [153] if((byte) gfx_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@34
-  to:gfx_mode::@36
-keyboard_event_get: scope:[keyboard_event_get]  from form_control::@34 gfx_mode::@51
+  [153] if((byte) gfx_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@24
+  to:gfx_mode::@25
+keyboard_event_get: scope:[keyboard_event_get]  from form_control::@18 gfx_mode::@32
   [154] if((byte) keyboard_events_size#100==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_get::@return
-  to:keyboard_event_get::@3
-keyboard_event_get::@3: scope:[keyboard_event_get]  from keyboard_event_get
+  to:keyboard_event_get::@1
+keyboard_event_get::@1: scope:[keyboard_event_get]  from keyboard_event_get
   [155] (byte) keyboard_events_size#4 ← -- (byte) keyboard_events_size#100
   [156] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4)
   to:keyboard_event_get::@return
-keyboard_event_get::@return: scope:[keyboard_event_get]  from keyboard_event_get keyboard_event_get::@3
-  [157] (byte) keyboard_events_size#24 ← phi( keyboard_event_get/(byte) keyboard_events_size#100 keyboard_event_get::@3/(byte) keyboard_events_size#4 )
-  [157] (byte) keyboard_event_get::return#2 ← phi( keyboard_event_get/(byte/word/signed word/dword/signed dword) $ff keyboard_event_get::@3/(byte) keyboard_event_get::return#1 )
+keyboard_event_get::@return: scope:[keyboard_event_get]  from keyboard_event_get keyboard_event_get::@1
+  [157] (byte) keyboard_events_size#24 ← phi( keyboard_event_get/(byte) keyboard_events_size#100 keyboard_event_get::@1/(byte) keyboard_events_size#4 )
+  [157] (byte) keyboard_event_get::return#2 ← phi( keyboard_event_get/(byte/word/signed word/dword/signed dword) $ff keyboard_event_get::@1/(byte) keyboard_event_get::return#1 )
   [158] return 
   to:@return
-keyboard_event_scan: scope:[keyboard_event_scan]  from form_control::@3 gfx_mode::@38
-  [159] (byte) keyboard_events_size#110 ← phi( form_control::@3/(byte) keyboard_events_size#47 gfx_mode::@38/(byte) keyboard_events_size#24 )
-  to:keyboard_event_scan::@8
-keyboard_event_scan::@8: scope:[keyboard_event_scan]  from keyboard_event_scan keyboard_event_scan::@10
-  [160] (byte) keyboard_events_size#119 ← phi( keyboard_event_scan/(byte) keyboard_events_size#110 keyboard_event_scan::@10/(byte) keyboard_events_size#100 )
-  [160] (byte) keyboard_event_scan::keycode#11 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@10/(byte) keyboard_event_scan::keycode#14 )
-  [160] (byte) keyboard_event_scan::row#2 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@10/(byte) keyboard_event_scan::row#1 )
+keyboard_event_scan: scope:[keyboard_event_scan]  from form_control::@3 gfx_mode::@26
+  [159] (byte) keyboard_events_size#110 ← phi( form_control::@3/(byte) keyboard_events_size#47 gfx_mode::@26/(byte) keyboard_events_size#24 )
+  to:keyboard_event_scan::@7
+keyboard_event_scan::@7: scope:[keyboard_event_scan]  from keyboard_event_scan keyboard_event_scan::@8
+  [160] (byte) keyboard_events_size#119 ← phi( keyboard_event_scan/(byte) keyboard_events_size#110 keyboard_event_scan::@8/(byte) keyboard_events_size#100 )
+  [160] (byte) keyboard_event_scan::keycode#11 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@8/(byte) keyboard_event_scan::keycode#14 )
+  [160] (byte) keyboard_event_scan::row#2 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@8/(byte) keyboard_event_scan::row#1 )
   [161] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_event_scan::row#2
   [162] call keyboard_matrix_read 
   [163] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_event_scan::@25
-keyboard_event_scan::@25: scope:[keyboard_event_scan]  from keyboard_event_scan::@8
+  to:keyboard_event_scan::@19
+keyboard_event_scan::@19: scope:[keyboard_event_scan]  from keyboard_event_scan::@7
   [164] (byte) keyboard_event_scan::row_scan#0 ← (byte) keyboard_matrix_read::return#2
-  [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11
-  to:keyboard_event_scan::@21
-keyboard_event_scan::@21: scope:[keyboard_event_scan]  from keyboard_event_scan::@25
+  [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9
+  to:keyboard_event_scan::@16
+keyboard_event_scan::@16: scope:[keyboard_event_scan]  from keyboard_event_scan::@19
   [166] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8
-  to:keyboard_event_scan::@10
-keyboard_event_scan::@10: scope:[keyboard_event_scan]  from keyboard_event_scan::@20 keyboard_event_scan::@21
-  [167] (byte) keyboard_events_size#100 ← phi( keyboard_event_scan::@20/(byte) keyboard_events_size#118 keyboard_event_scan::@21/(byte) keyboard_events_size#119 )
-  [167] (byte) keyboard_event_scan::keycode#14 ← phi( keyboard_event_scan::@20/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@21/(byte) keyboard_event_scan::keycode#1 )
+  to:keyboard_event_scan::@8
+keyboard_event_scan::@8: scope:[keyboard_event_scan]  from keyboard_event_scan::@15 keyboard_event_scan::@16
+  [167] (byte) keyboard_events_size#100 ← phi( keyboard_event_scan::@15/(byte) keyboard_events_size#118 keyboard_event_scan::@16/(byte) keyboard_events_size#119 )
+  [167] (byte) keyboard_event_scan::keycode#14 ← phi( keyboard_event_scan::@15/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@16/(byte) keyboard_event_scan::keycode#1 )
   [168] (byte) keyboard_event_scan::row#1 ← ++ (byte) keyboard_event_scan::row#2
-  [169] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8
-  to:keyboard_event_scan::@23
-keyboard_event_scan::@23: scope:[keyboard_event_scan]  from keyboard_event_scan::@10
+  [169] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7
+  to:keyboard_event_scan::@17
+keyboard_event_scan::@17: scope:[keyboard_event_scan]  from keyboard_event_scan::@8
   [170] phi()
   [171] call keyboard_event_pressed 
   [172] (byte) keyboard_event_pressed::return#0 ← (byte) keyboard_event_pressed::return#10
-  to:keyboard_event_scan::@26
-keyboard_event_scan::@26: scope:[keyboard_event_scan]  from keyboard_event_scan::@23
+  to:keyboard_event_scan::@20
+keyboard_event_scan::@20: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
   [173] (byte~) keyboard_event_scan::$0 ← (byte) keyboard_event_pressed::return#0
   [174] if((byte~) keyboard_event_scan::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@1
-  to:keyboard_event_scan::@24
-keyboard_event_scan::@24: scope:[keyboard_event_scan]  from keyboard_event_scan::@26
+  to:keyboard_event_scan::@18
+keyboard_event_scan::@18: scope:[keyboard_event_scan]  from keyboard_event_scan::@20
   [175] phi()
   to:keyboard_event_scan::@1
-keyboard_event_scan::@1: scope:[keyboard_event_scan]  from keyboard_event_scan::@24 keyboard_event_scan::@26
-  [176] (byte) keyboard_modifiers#18 ← phi( keyboard_event_scan::@24/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 keyboard_event_scan::@26/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+keyboard_event_scan::@1: scope:[keyboard_event_scan]  from keyboard_event_scan::@18 keyboard_event_scan::@20
+  [176] (byte) keyboard_modifiers#18 ← phi( keyboard_event_scan::@18/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 keyboard_event_scan::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [177] call keyboard_event_pressed 
   [178] (byte) keyboard_event_pressed::return#1 ← (byte) keyboard_event_pressed::return#10
-  to:keyboard_event_scan::@27
-keyboard_event_scan::@27: scope:[keyboard_event_scan]  from keyboard_event_scan::@1
+  to:keyboard_event_scan::@21
+keyboard_event_scan::@21: scope:[keyboard_event_scan]  from keyboard_event_scan::@1
   [179] (byte~) keyboard_event_scan::$3 ← (byte) keyboard_event_pressed::return#1
   [180] if((byte~) keyboard_event_scan::$3==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@2
-  to:keyboard_event_scan::@5
-keyboard_event_scan::@5: scope:[keyboard_event_scan]  from keyboard_event_scan::@27
+  to:keyboard_event_scan::@4
+keyboard_event_scan::@4: scope:[keyboard_event_scan]  from keyboard_event_scan::@21
   [181] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#18 | (const byte) KEY_MODIFIER_RSHIFT#0
   to:keyboard_event_scan::@2
-keyboard_event_scan::@2: scope:[keyboard_event_scan]  from keyboard_event_scan::@27 keyboard_event_scan::@5
-  [182] (byte) keyboard_modifiers#19 ← phi( keyboard_event_scan::@27/(byte) keyboard_modifiers#18 keyboard_event_scan::@5/(byte) keyboard_modifiers#3 )
+keyboard_event_scan::@2: scope:[keyboard_event_scan]  from keyboard_event_scan::@21 keyboard_event_scan::@4
+  [182] (byte) keyboard_modifiers#19 ← phi( keyboard_event_scan::@21/(byte) keyboard_modifiers#18 keyboard_event_scan::@4/(byte) keyboard_modifiers#3 )
   [183] call keyboard_event_pressed 
   [184] (byte) keyboard_event_pressed::return#2 ← (byte) keyboard_event_pressed::return#10
-  to:keyboard_event_scan::@28
-keyboard_event_scan::@28: scope:[keyboard_event_scan]  from keyboard_event_scan::@2
+  to:keyboard_event_scan::@22
+keyboard_event_scan::@22: scope:[keyboard_event_scan]  from keyboard_event_scan::@2
   [185] (byte~) keyboard_event_scan::$6 ← (byte) keyboard_event_pressed::return#2
   [186] if((byte~) keyboard_event_scan::$6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@3
-  to:keyboard_event_scan::@6
-keyboard_event_scan::@6: scope:[keyboard_event_scan]  from keyboard_event_scan::@28
+  to:keyboard_event_scan::@5
+keyboard_event_scan::@5: scope:[keyboard_event_scan]  from keyboard_event_scan::@22
   [187] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#19 | (const byte) KEY_MODIFIER_CTRL#0
   to:keyboard_event_scan::@3
-keyboard_event_scan::@3: scope:[keyboard_event_scan]  from keyboard_event_scan::@28 keyboard_event_scan::@6
-  [188] (byte) keyboard_modifiers#20 ← phi( keyboard_event_scan::@28/(byte) keyboard_modifiers#19 keyboard_event_scan::@6/(byte) keyboard_modifiers#4 )
+keyboard_event_scan::@3: scope:[keyboard_event_scan]  from keyboard_event_scan::@22 keyboard_event_scan::@5
+  [188] (byte) keyboard_modifiers#20 ← phi( keyboard_event_scan::@22/(byte) keyboard_modifiers#19 keyboard_event_scan::@5/(byte) keyboard_modifiers#4 )
   [189] call keyboard_event_pressed 
   [190] (byte) keyboard_event_pressed::return#3 ← (byte) keyboard_event_pressed::return#10
-  to:keyboard_event_scan::@29
-keyboard_event_scan::@29: scope:[keyboard_event_scan]  from keyboard_event_scan::@3
+  to:keyboard_event_scan::@23
+keyboard_event_scan::@23: scope:[keyboard_event_scan]  from keyboard_event_scan::@3
   [191] (byte~) keyboard_event_scan::$9 ← (byte) keyboard_event_pressed::return#3
   [192] if((byte~) keyboard_event_scan::$9==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@return
-  to:keyboard_event_scan::@7
-keyboard_event_scan::@7: scope:[keyboard_event_scan]  from keyboard_event_scan::@29
+  to:keyboard_event_scan::@6
+keyboard_event_scan::@6: scope:[keyboard_event_scan]  from keyboard_event_scan::@23
   [193] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#20 | (const byte) KEY_MODIFIER_COMMODORE#0
   to:keyboard_event_scan::@return
-keyboard_event_scan::@return: scope:[keyboard_event_scan]  from keyboard_event_scan::@29 keyboard_event_scan::@7
-  [194] (byte) keyboard_modifiers#21 ← phi( keyboard_event_scan::@29/(byte) keyboard_modifiers#20 keyboard_event_scan::@7/(byte) keyboard_modifiers#5 )
+keyboard_event_scan::@return: scope:[keyboard_event_scan]  from keyboard_event_scan::@23 keyboard_event_scan::@6
+  [194] (byte) keyboard_modifiers#21 ← phi( keyboard_event_scan::@23/(byte) keyboard_modifiers#20 keyboard_event_scan::@6/(byte) keyboard_modifiers#5 )
   [195] return 
   to:@return
-keyboard_event_scan::@11: scope:[keyboard_event_scan]  from keyboard_event_scan::@12 keyboard_event_scan::@25
-  [196] (byte) keyboard_events_size#18 ← phi( keyboard_event_scan::@12/(byte) keyboard_events_size#118 keyboard_event_scan::@25/(byte) keyboard_events_size#119 )
-  [196] (byte) keyboard_event_scan::keycode#10 ← phi( keyboard_event_scan::@12/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@25/(byte) keyboard_event_scan::keycode#11 )
-  [196] (byte) keyboard_event_scan::col#2 ← phi( keyboard_event_scan::@12/(byte) keyboard_event_scan::col#1 keyboard_event_scan::@25/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+keyboard_event_scan::@9: scope:[keyboard_event_scan]  from keyboard_event_scan::@10 keyboard_event_scan::@19
+  [196] (byte) keyboard_events_size#18 ← phi( keyboard_event_scan::@10/(byte) keyboard_events_size#118 keyboard_event_scan::@19/(byte) keyboard_events_size#119 )
+  [196] (byte) keyboard_event_scan::keycode#10 ← phi( keyboard_event_scan::@10/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@19/(byte) keyboard_event_scan::keycode#11 )
+  [196] (byte) keyboard_event_scan::col#2 ← phi( keyboard_event_scan::@10/(byte) keyboard_event_scan::col#1 keyboard_event_scan::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [197] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)
   [198] (byte~) keyboard_event_scan::$16 ← (byte~) keyboard_event_scan::$15 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2)
-  [199] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@12
-  to:keyboard_event_scan::@16
-keyboard_event_scan::@16: scope:[keyboard_event_scan]  from keyboard_event_scan::@11
-  [200] if((byte) keyboard_events_size#18==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12
-  to:keyboard_event_scan::@17
-keyboard_event_scan::@17: scope:[keyboard_event_scan]  from keyboard_event_scan::@16
+  [199] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@10
+  to:keyboard_event_scan::@12
+keyboard_event_scan::@12: scope:[keyboard_event_scan]  from keyboard_event_scan::@9
+  [200] if((byte) keyboard_events_size#18==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10
+  to:keyboard_event_scan::@13
+keyboard_event_scan::@13: scope:[keyboard_event_scan]  from keyboard_event_scan::@12
   [201] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2)
-  [202] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@14
-  to:keyboard_event_scan::@18
-keyboard_event_scan::@18: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
+  [202] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@11
+  to:keyboard_event_scan::@14
+keyboard_event_scan::@14: scope:[keyboard_event_scan]  from keyboard_event_scan::@13
   [203] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#18) ← (byte) keyboard_event_scan::keycode#10
   [204] (byte) keyboard_events_size#2 ← ++ (byte) keyboard_events_size#18
-  to:keyboard_event_scan::@12
-keyboard_event_scan::@12: scope:[keyboard_event_scan]  from keyboard_event_scan::@11 keyboard_event_scan::@14 keyboard_event_scan::@16 keyboard_event_scan::@18
-  [205] (byte) keyboard_events_size#118 ← phi( keyboard_event_scan::@11/(byte) keyboard_events_size#18 keyboard_event_scan::@16/(byte) keyboard_events_size#18 keyboard_event_scan::@14/(byte) keyboard_events_size#1 keyboard_event_scan::@18/(byte) keyboard_events_size#2 )
+  to:keyboard_event_scan::@10
+keyboard_event_scan::@10: scope:[keyboard_event_scan]  from keyboard_event_scan::@11 keyboard_event_scan::@12 keyboard_event_scan::@14 keyboard_event_scan::@9
+  [205] (byte) keyboard_events_size#118 ← phi( keyboard_event_scan::@9/(byte) keyboard_events_size#18 keyboard_event_scan::@12/(byte) keyboard_events_size#18 keyboard_event_scan::@11/(byte) keyboard_events_size#1 keyboard_event_scan::@14/(byte) keyboard_events_size#2 )
   [206] (byte) keyboard_event_scan::keycode#15 ← ++ (byte) keyboard_event_scan::keycode#10
   [207] (byte) keyboard_event_scan::col#1 ← ++ (byte) keyboard_event_scan::col#2
-  [208] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@11
-  to:keyboard_event_scan::@20
-keyboard_event_scan::@20: scope:[keyboard_event_scan]  from keyboard_event_scan::@12
+  [208] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@9
+  to:keyboard_event_scan::@15
+keyboard_event_scan::@15: scope:[keyboard_event_scan]  from keyboard_event_scan::@10
   [209] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0
-  to:keyboard_event_scan::@10
-keyboard_event_scan::@14: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
+  to:keyboard_event_scan::@8
+keyboard_event_scan::@11: scope:[keyboard_event_scan]  from keyboard_event_scan::@13
   [210] (byte/word/dword~) keyboard_event_scan::$23 ← (byte) keyboard_event_scan::keycode#10 | (byte/signed byte/word/signed word/dword/signed dword) $40
   [211] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#18) ← (byte/word/dword~) keyboard_event_scan::$23
   [212] (byte) keyboard_events_size#1 ← ++ (byte) keyboard_events_size#18
-  to:keyboard_event_scan::@12
-keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan::@1 keyboard_event_scan::@2 keyboard_event_scan::@23 keyboard_event_scan::@3
-  [213] (byte) keyboard_event_pressed::keycode#4 ← phi( keyboard_event_scan::@1/(const byte) KEY_RSHIFT#0 keyboard_event_scan::@2/(const byte) KEY_CTRL#0 keyboard_event_scan::@23/(const byte) KEY_LSHIFT#0 keyboard_event_scan::@3/(const byte) KEY_COMMODORE#0 )
+  to:keyboard_event_scan::@10
+keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan::@1 keyboard_event_scan::@17 keyboard_event_scan::@2 keyboard_event_scan::@3
+  [213] (byte) keyboard_event_pressed::keycode#4 ← phi( keyboard_event_scan::@1/(const byte) KEY_RSHIFT#0 keyboard_event_scan::@2/(const byte) KEY_CTRL#0 keyboard_event_scan::@17/(const byte) KEY_LSHIFT#0 keyboard_event_scan::@3/(const byte) KEY_COMMODORE#0 )
   [214] (byte~) keyboard_event_pressed::$0 ← (byte) keyboard_event_pressed::keycode#4 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [215] (byte) keyboard_event_pressed::row_bits#0 ← *((const byte[8]) keyboard_scan_values#0 + (byte~) keyboard_event_pressed::$0)
   [216] (byte~) keyboard_event_pressed::$1 ← (byte) keyboard_event_pressed::keycode#4 & (byte/signed byte/word/signed word/dword/signed dword) 7
@@ -10367,136 +10528,136 @@ keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan
 keyboard_event_pressed::@return: scope:[keyboard_event_pressed]  from keyboard_event_pressed
   [218] return 
   to:@return
-keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_event_scan::@8
+keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_event_scan::@7
   [219] *((const byte*) CIA1_PORT_A#0) ← *((const byte[8]) keyboard_matrix_row_bitmask#0 + (byte) keyboard_matrix_read::rowid#0)
   [220] (byte) keyboard_matrix_read::return#0 ← ~ *((const byte*) CIA1_PORT_B#0)
   to:keyboard_matrix_read::@return
 keyboard_matrix_read::@return: scope:[keyboard_matrix_read]  from keyboard_matrix_read
   [221] return 
   to:@return
-get_vic_screen: scope:[get_vic_screen]  from gfx_mode::@47 gfx_mode::@49
-  [222] (byte) get_vic_screen::idx#2 ← phi( gfx_mode::@47/(byte) get_vic_screen::idx#0 gfx_mode::@49/(byte) get_vic_screen::idx#1 )
+get_vic_screen: scope:[get_vic_screen]  from gfx_mode::@28 gfx_mode::@30
+  [222] (byte) get_vic_screen::idx#2 ← phi( gfx_mode::@28/(byte) get_vic_screen::idx#0 gfx_mode::@30/(byte) get_vic_screen::idx#1 )
   [223] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_vic_screen::@return
-  to:get_vic_screen::@10
-get_vic_screen::@10: scope:[get_vic_screen]  from get_vic_screen
+  to:get_vic_screen::@2
+get_vic_screen::@2: scope:[get_vic_screen]  from get_vic_screen
   [224] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_screen::@return
-  to:get_vic_screen::@11
-get_vic_screen::@11: scope:[get_vic_screen]  from get_vic_screen::@10
+  to:get_vic_screen::@3
+get_vic_screen::@3: scope:[get_vic_screen]  from get_vic_screen::@2
   [225] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 2) goto get_vic_screen::@return
-  to:get_vic_screen::@12
-get_vic_screen::@12: scope:[get_vic_screen]  from get_vic_screen::@11
+  to:get_vic_screen::@4
+get_vic_screen::@4: scope:[get_vic_screen]  from get_vic_screen::@3
   [226] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 3) goto get_vic_screen::@return
-  to:get_vic_screen::@13
-get_vic_screen::@13: scope:[get_vic_screen]  from get_vic_screen::@12
-  [227] if((byte) get_vic_screen::idx#2!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_vic_screen::@9
+  to:get_vic_screen::@5
+get_vic_screen::@5: scope:[get_vic_screen]  from get_vic_screen::@4
+  [227] if((byte) get_vic_screen::idx#2!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_vic_screen::@1
   to:get_vic_screen::@return
-get_vic_screen::@return: scope:[get_vic_screen]  from get_vic_screen get_vic_screen::@10 get_vic_screen::@11 get_vic_screen::@12 get_vic_screen::@13 get_vic_screen::@9
-  [228] (byte*) get_vic_screen::return#5 ← phi( get_vic_screen/(const byte*) VIC_SCREEN0#0 get_vic_screen::@13/(const byte*) VIC_SCREEN4#0 get_vic_screen::@10/(const byte*) VIC_SCREEN1#0 get_vic_screen::@11/(const byte*) VIC_SCREEN2#0 get_vic_screen::@12/(const byte*) VIC_SCREEN3#0 get_vic_screen::@9/(const byte*) VIC_SCREEN0#0 )
+get_vic_screen::@return: scope:[get_vic_screen]  from get_vic_screen get_vic_screen::@1 get_vic_screen::@2 get_vic_screen::@3 get_vic_screen::@4 get_vic_screen::@5
+  [228] (byte*) get_vic_screen::return#5 ← phi( get_vic_screen/(const byte*) VIC_SCREEN0#0 get_vic_screen::@5/(const byte*) VIC_SCREEN4#0 get_vic_screen::@2/(const byte*) VIC_SCREEN1#0 get_vic_screen::@3/(const byte*) VIC_SCREEN2#0 get_vic_screen::@4/(const byte*) VIC_SCREEN3#0 get_vic_screen::@1/(const byte*) VIC_SCREEN0#0 )
   [229] return 
   to:@return
-get_vic_screen::@9: scope:[get_vic_screen]  from get_vic_screen::@13
+get_vic_screen::@1: scope:[get_vic_screen]  from get_vic_screen::@5
   [230] phi()
   to:get_vic_screen::@return
-get_vic_charset: scope:[get_vic_charset]  from gfx_mode::@48
+get_vic_charset: scope:[get_vic_charset]  from gfx_mode::@29
   [231] if((byte) get_vic_charset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_vic_charset::@return
-  to:get_vic_charset::@4
-get_vic_charset::@4: scope:[get_vic_charset]  from get_vic_charset
-  [232] if((byte) get_vic_charset::idx#0!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_charset::@3
+  to:get_vic_charset::@2
+get_vic_charset::@2: scope:[get_vic_charset]  from get_vic_charset
+  [232] if((byte) get_vic_charset::idx#0!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_charset::@1
   to:get_vic_charset::@return
-get_vic_charset::@return: scope:[get_vic_charset]  from get_vic_charset get_vic_charset::@3 get_vic_charset::@4
-  [233] (byte*) get_vic_charset::return#2 ← phi( get_vic_charset/(const byte*) VIC_CHARSET_ROM#0 get_vic_charset::@3/(const byte*) VIC_CHARSET_ROM#0 get_vic_charset::@4/(const byte*) VIC_BITMAP#0 )
+get_vic_charset::@return: scope:[get_vic_charset]  from get_vic_charset get_vic_charset::@1 get_vic_charset::@2
+  [233] (byte*) get_vic_charset::return#2 ← phi( get_vic_charset/(const byte*) VIC_CHARSET_ROM#0 get_vic_charset::@1/(const byte*) VIC_CHARSET_ROM#0 get_vic_charset::@2/(const byte*) VIC_BITMAP#0 )
   [234] return 
   to:@return
-get_vic_charset::@3: scope:[get_vic_charset]  from get_vic_charset::@4
+get_vic_charset::@1: scope:[get_vic_charset]  from get_vic_charset::@2
   [235] phi()
   to:get_vic_charset::@return
-get_plane: scope:[get_plane]  from gfx_mode::@46 gfx_mode::@9
-  [236] (byte) get_plane::idx#10 ← phi( gfx_mode::@46/(byte) get_plane::idx#1 gfx_mode::@9/(byte) get_plane::idx#0 )
+get_plane: scope:[get_plane]  from gfx_mode::@27 gfx_mode::@9
+  [236] (byte) get_plane::idx#10 ← phi( gfx_mode::@27/(byte) get_plane::idx#1 gfx_mode::@9/(byte) get_plane::idx#0 )
   [237] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_plane::@return
-  to:get_plane::@28
-get_plane::@28: scope:[get_plane]  from get_plane
+  to:get_plane::@2
+get_plane::@2: scope:[get_plane]  from get_plane
   [238] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_plane::@return
-  to:get_plane::@29
-get_plane::@29: scope:[get_plane]  from get_plane::@28
+  to:get_plane::@3
+get_plane::@3: scope:[get_plane]  from get_plane::@2
   [239] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto get_plane::@return
-  to:get_plane::@30
-get_plane::@30: scope:[get_plane]  from get_plane::@29
+  to:get_plane::@4
+get_plane::@4: scope:[get_plane]  from get_plane::@3
   [240] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto get_plane::@return
-  to:get_plane::@31
-get_plane::@31: scope:[get_plane]  from get_plane::@30
+  to:get_plane::@5
+get_plane::@5: scope:[get_plane]  from get_plane::@4
   [241] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_plane::@return
-  to:get_plane::@32
-get_plane::@32: scope:[get_plane]  from get_plane::@31
+  to:get_plane::@6
+get_plane::@6: scope:[get_plane]  from get_plane::@5
   [242] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto get_plane::@return
-  to:get_plane::@33
-get_plane::@33: scope:[get_plane]  from get_plane::@32
+  to:get_plane::@7
+get_plane::@7: scope:[get_plane]  from get_plane::@6
   [243] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto get_plane::@return
-  to:get_plane::@34
-get_plane::@34: scope:[get_plane]  from get_plane::@33
+  to:get_plane::@8
+get_plane::@8: scope:[get_plane]  from get_plane::@7
   [244] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto get_plane::@return
-  to:get_plane::@35
-get_plane::@35: scope:[get_plane]  from get_plane::@34
+  to:get_plane::@9
+get_plane::@9: scope:[get_plane]  from get_plane::@8
   [245] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto get_plane::@return
-  to:get_plane::@36
-get_plane::@36: scope:[get_plane]  from get_plane::@35
+  to:get_plane::@10
+get_plane::@10: scope:[get_plane]  from get_plane::@9
   [246] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto get_plane::@return
-  to:get_plane::@37
-get_plane::@37: scope:[get_plane]  from get_plane::@36
+  to:get_plane::@11
+get_plane::@11: scope:[get_plane]  from get_plane::@10
   [247] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto get_plane::@return
-  to:get_plane::@38
-get_plane::@38: scope:[get_plane]  from get_plane::@37
+  to:get_plane::@12
+get_plane::@12: scope:[get_plane]  from get_plane::@11
   [248] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $b) goto get_plane::@return
-  to:get_plane::@39
-get_plane::@39: scope:[get_plane]  from get_plane::@38
+  to:get_plane::@13
+get_plane::@13: scope:[get_plane]  from get_plane::@12
   [249] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $c) goto get_plane::@return
-  to:get_plane::@40
-get_plane::@40: scope:[get_plane]  from get_plane::@39
-  [250] if((byte) get_plane::idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $d) goto get_plane::@27
+  to:get_plane::@14
+get_plane::@14: scope:[get_plane]  from get_plane::@13
+  [250] if((byte) get_plane::idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $d) goto get_plane::@1
   to:get_plane::@return
-get_plane::@return: scope:[get_plane]  from get_plane get_plane::@27 get_plane::@28 get_plane::@29 get_plane::@30 get_plane::@31 get_plane::@32 get_plane::@33 get_plane::@34 get_plane::@35 get_plane::@36 get_plane::@37 get_plane::@38 get_plane::@39 get_plane::@40
-  [251] (dword) get_plane::return#14 ← phi( get_plane/((dword))(const byte*) VIC_SCREEN0#0 get_plane::@36/((dword))(const dword) PLANE_HORISONTAL2#0 get_plane::@37/((dword))(const dword) PLANE_VERTICAL2#0 get_plane::@38/((dword))(const dword) PLANE_CHARSET8#0 get_plane::@39/((dword))(const dword) PLANE_BLANK#0 get_plane::@28/((dword))(const byte*) VIC_SCREEN1#0 get_plane::@27/((dword))(const byte*) VIC_SCREEN0#0 get_plane::@29/((dword))(const byte*) VIC_SCREEN2#0 get_plane::@30/((dword))(const byte*) VIC_SCREEN3#0 get_plane::@40/((dword))(const dword) PLANE_FULL#0 get_plane::@31/((dword))(const byte*) VIC_BITMAP#0 get_plane::@32/((dword))(const byte*) VIC_CHARSET_ROM#0 get_plane::@33/((dword))(const dword) PLANE_8BPP_CHUNKY#0 get_plane::@34/((dword))(const dword) PLANE_HORISONTAL#0 get_plane::@35/((dword))(const dword) PLANE_VERTICAL#0 )
+get_plane::@return: scope:[get_plane]  from get_plane get_plane::@1 get_plane::@10 get_plane::@11 get_plane::@12 get_plane::@13 get_plane::@14 get_plane::@2 get_plane::@3 get_plane::@4 get_plane::@5 get_plane::@6 get_plane::@7 get_plane::@8 get_plane::@9
+  [251] (dword) get_plane::return#14 ← phi( get_plane/((dword))(const byte*) VIC_SCREEN0#0 get_plane::@10/((dword))(const dword) PLANE_HORISONTAL2#0 get_plane::@11/((dword))(const dword) PLANE_VERTICAL2#0 get_plane::@12/((dword))(const dword) PLANE_CHARSET8#0 get_plane::@13/((dword))(const dword) PLANE_BLANK#0 get_plane::@2/((dword))(const byte*) VIC_SCREEN1#0 get_plane::@1/((dword))(const byte*) VIC_SCREEN0#0 get_plane::@3/((dword))(const byte*) VIC_SCREEN2#0 get_plane::@4/((dword))(const byte*) VIC_SCREEN3#0 get_plane::@14/((dword))(const dword) PLANE_FULL#0 get_plane::@5/((dword))(const byte*) VIC_BITMAP#0 get_plane::@6/((dword))(const byte*) VIC_CHARSET_ROM#0 get_plane::@7/((dword))(const dword) PLANE_8BPP_CHUNKY#0 get_plane::@8/((dword))(const dword) PLANE_HORISONTAL#0 get_plane::@9/((dword))(const dword) PLANE_VERTICAL#0 )
   [252] return 
   to:@return
-get_plane::@27: scope:[get_plane]  from get_plane::@40
+get_plane::@1: scope:[get_plane]  from get_plane::@14
   [253] phi()
   to:get_plane::@return
 form_mode: scope:[form_mode]  from main::@2
   [254] phi()
   [255] call print_set_screen 
-  to:form_mode::@21
-form_mode::@21: scope:[form_mode]  from form_mode
+  to:form_mode::@8
+form_mode::@8: scope:[form_mode]  from form_mode
   [256] phi()
   [257] call print_cls 
-  to:form_mode::@22
-form_mode::@22: scope:[form_mode]  from form_mode::@21
+  to:form_mode::@9
+form_mode::@9: scope:[form_mode]  from form_mode::@8
   [258] phi()
   [259] call print_str_lines 
-  to:form_mode::@23
-form_mode::@23: scope:[form_mode]  from form_mode::@22
+  to:form_mode::@10
+form_mode::@10: scope:[form_mode]  from form_mode::@9
   [260] phi()
   [261] call print_set_screen 
-  to:form_mode::@24
-form_mode::@24: scope:[form_mode]  from form_mode::@23
+  to:form_mode::@11
+form_mode::@11: scope:[form_mode]  from form_mode::@10
   [262] phi()
   [263] call print_cls 
-  to:form_mode::@25
-form_mode::@25: scope:[form_mode]  from form_mode::@24
+  to:form_mode::@12
+form_mode::@12: scope:[form_mode]  from form_mode::@11
   [264] phi()
   [265] call print_str_lines 
-  to:form_mode::@26
-form_mode::@26: scope:[form_mode]  from form_mode::@25
+  to:form_mode::@13
+form_mode::@13: scope:[form_mode]  from form_mode::@12
   [266] phi()
   [267] call form_set_screen 
-  to:form_mode::@27
-form_mode::@27: scope:[form_mode]  from form_mode::@26
+  to:form_mode::@14
+form_mode::@14: scope:[form_mode]  from form_mode::@13
   [268] phi()
   [269] call form_render_values 
-  to:form_mode::@28
-form_mode::@28: scope:[form_mode]  from form_mode::@27
+  to:form_mode::@15
+form_mode::@15: scope:[form_mode]  from form_mode::@14
   [270] (byte) render_preset_name::idx#0 ← *((const byte[]) form_fields_val#0)
   [271] call render_preset_name 
-  to:form_mode::@29
-form_mode::@29: scope:[form_mode]  from form_mode::@28
+  to:form_mode::@16
+form_mode::@16: scope:[form_mode]  from form_mode::@15
   [272] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) FORM_CHARSET#0/(dword/signed dword) $10000
   [273] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
   [274] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
@@ -10509,100 +10670,100 @@ form_mode::@29: scope:[form_mode]  from form_mode::@28
   [281] *((const byte*) DTV_PLANEA_START_LO#0) ← <(const byte*) FORM_SCREEN#0
   [282] *((const byte*) DTV_PLANEA_START_MI#0) ← >(const byte*) FORM_SCREEN#0
   [283] *((const byte*) DTV_PLANEA_START_HI#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:form_mode::@7
-form_mode::@7: scope:[form_mode]  from form_mode::@29 form_mode::@7
-  [284] (byte) form_mode::i#2 ← phi( form_mode::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 form_mode::@7/(byte) form_mode::i#1 )
+  to:form_mode::@2
+form_mode::@2: scope:[form_mode]  from form_mode::@16 form_mode::@2
+  [284] (byte) form_mode::i#2 ← phi( form_mode::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 form_mode::@2/(byte) form_mode::i#1 )
   [285] *((const byte*) DTV_PALETTE#0 + (byte) form_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) form_mode::i#2)
   [286] (byte) form_mode::i#1 ← ++ (byte) form_mode::i#2
-  [287] if((byte) form_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto form_mode::@7
-  to:form_mode::@8
-form_mode::@8: scope:[form_mode]  from form_mode::@7
+  [287] if((byte) form_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto form_mode::@2
+  to:form_mode::@3
+form_mode::@3: scope:[form_mode]  from form_mode::@2
   [288] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [289] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [290] (byte) form_mode::preset_current#0 ← *((const byte[]) form_fields_val#0)
   to:form_mode::@1
-form_mode::@1: scope:[form_mode]  from form_mode::@12 form_mode::@32 form_mode::@8
-  [291] (byte) form_mode::preset_current#7 ← phi( form_mode::@32/(byte) form_mode::preset_current#1 form_mode::@8/(byte) form_mode::preset_current#0 )
-  [291] (byte) form_field_idx#28 ← phi( form_mode::@12/(byte) form_field_idx#18 form_mode::@32/(byte) form_field_idx#18 form_mode::@8/(byte) form_field_idx#1 )
-  [291] (byte) keyboard_events_size#47 ← phi( form_mode::@12/(byte) keyboard_events_size#24 form_mode::@32/(byte) keyboard_events_size#24 form_mode::@8/(byte) keyboard_events_size#27 )
-  [291] (signed byte) form_cursor_count#21 ← phi( form_mode::@12/(signed byte) form_cursor_count#16 form_mode::@32/(signed byte) form_cursor_count#16 form_mode::@8/(signed byte) form_cursor_count#1 )
-  to:form_mode::@9
-form_mode::@9: scope:[form_mode]  from form_mode::@1 form_mode::@9
-  [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@9
-  to:form_mode::@11
-form_mode::@11: scope:[form_mode]  from form_mode::@9
+form_mode::@1: scope:[form_mode]  from form_mode::@19 form_mode::@3 form_mode::@6
+  [291] (byte) form_mode::preset_current#7 ← phi( form_mode::@19/(byte) form_mode::preset_current#1 form_mode::@3/(byte) form_mode::preset_current#0 )
+  [291] (byte) form_field_idx#28 ← phi( form_mode::@6/(byte) form_field_idx#18 form_mode::@19/(byte) form_field_idx#18 form_mode::@3/(byte) form_field_idx#1 )
+  [291] (byte) keyboard_events_size#47 ← phi( form_mode::@6/(byte) keyboard_events_size#24 form_mode::@19/(byte) keyboard_events_size#24 form_mode::@3/(byte) keyboard_events_size#27 )
+  [291] (signed byte) form_cursor_count#21 ← phi( form_mode::@6/(signed byte) form_cursor_count#16 form_mode::@19/(signed byte) form_cursor_count#16 form_mode::@3/(signed byte) form_cursor_count#1 )
+  to:form_mode::@4
+form_mode::@4: scope:[form_mode]  from form_mode::@1 form_mode::@4
+  [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@4
+  to:form_mode::@5
+form_mode::@5: scope:[form_mode]  from form_mode::@4
   [293] phi()
   [294] call form_control 
   [295] (byte) form_control::return#0 ← (byte) form_control::return#2
-  to:form_mode::@30
-form_mode::@30: scope:[form_mode]  from form_mode::@11
+  to:form_mode::@17
+form_mode::@17: scope:[form_mode]  from form_mode::@5
   [296] (byte~) form_mode::$36 ← (byte) form_control::return#0
-  [297] if((byte~) form_mode::$36==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_mode::@12
+  [297] if((byte~) form_mode::$36==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_mode::@6
   to:form_mode::@return
-form_mode::@return: scope:[form_mode]  from form_mode::@30
+form_mode::@return: scope:[form_mode]  from form_mode::@17
   [298] return 
   to:@return
-form_mode::@12: scope:[form_mode]  from form_mode::@30
+form_mode::@6: scope:[form_mode]  from form_mode::@17
   [299] if((byte) form_mode::preset_current#7==*((const byte[]) form_fields_val#0)) goto form_mode::@1
-  to:form_mode::@19
-form_mode::@19: scope:[form_mode]  from form_mode::@12
+  to:form_mode::@7
+form_mode::@7: scope:[form_mode]  from form_mode::@6
   [300] (byte) apply_preset::idx#0 ← *((const byte[]) form_fields_val#0)
   [301] call apply_preset 
-  to:form_mode::@31
-form_mode::@31: scope:[form_mode]  from form_mode::@19
+  to:form_mode::@18
+form_mode::@18: scope:[form_mode]  from form_mode::@7
   [302] (byte) form_mode::preset_current#1 ← *((const byte[]) form_fields_val#0)
   [303] call form_render_values 
-  to:form_mode::@32
-form_mode::@32: scope:[form_mode]  from form_mode::@31
+  to:form_mode::@19
+form_mode::@19: scope:[form_mode]  from form_mode::@18
   [304] (byte) render_preset_name::idx#1 ← *((const byte[]) form_fields_val#0)
   [305] call render_preset_name 
   to:form_mode::@1
-render_preset_name: scope:[render_preset_name]  from form_mode::@28 form_mode::@32
-  [306] (byte) render_preset_name::idx#10 ← phi( form_mode::@28/(byte) render_preset_name::idx#0 form_mode::@32/(byte) render_preset_name::idx#1 )
-  [307] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_preset_name::@22
-  to:render_preset_name::@23
-render_preset_name::@23: scope:[render_preset_name]  from render_preset_name
-  [308] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto render_preset_name::@22
-  to:render_preset_name::@24
-render_preset_name::@24: scope:[render_preset_name]  from render_preset_name::@23
-  [309] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_preset_name::@22
-  to:render_preset_name::@25
-render_preset_name::@25: scope:[render_preset_name]  from render_preset_name::@24
-  [310] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto render_preset_name::@22
-  to:render_preset_name::@26
-render_preset_name::@26: scope:[render_preset_name]  from render_preset_name::@25
-  [311] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_preset_name::@22
-  to:render_preset_name::@27
-render_preset_name::@27: scope:[render_preset_name]  from render_preset_name::@26
-  [312] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto render_preset_name::@22
-  to:render_preset_name::@28
-render_preset_name::@28: scope:[render_preset_name]  from render_preset_name::@27
-  [313] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto render_preset_name::@22
-  to:render_preset_name::@29
-render_preset_name::@29: scope:[render_preset_name]  from render_preset_name::@28
-  [314] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto render_preset_name::@22
-  to:render_preset_name::@30
-render_preset_name::@30: scope:[render_preset_name]  from render_preset_name::@29
-  [315] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto render_preset_name::@22
-  to:render_preset_name::@31
-render_preset_name::@31: scope:[render_preset_name]  from render_preset_name::@30
-  [316] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto render_preset_name::@22
-  to:render_preset_name::@32
-render_preset_name::@32: scope:[render_preset_name]  from render_preset_name::@31
-  [317] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto render_preset_name::@22
-  to:render_preset_name::@33
-render_preset_name::@33: scope:[render_preset_name]  from render_preset_name::@32
+render_preset_name: scope:[render_preset_name]  from form_mode::@15 form_mode::@19
+  [306] (byte) render_preset_name::idx#10 ← phi( form_mode::@15/(byte) render_preset_name::idx#0 form_mode::@19/(byte) render_preset_name::idx#1 )
+  [307] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_preset_name::@1
+  to:render_preset_name::@2
+render_preset_name::@2: scope:[render_preset_name]  from render_preset_name
+  [308] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto render_preset_name::@1
+  to:render_preset_name::@3
+render_preset_name::@3: scope:[render_preset_name]  from render_preset_name::@2
+  [309] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_preset_name::@1
+  to:render_preset_name::@4
+render_preset_name::@4: scope:[render_preset_name]  from render_preset_name::@3
+  [310] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto render_preset_name::@1
+  to:render_preset_name::@5
+render_preset_name::@5: scope:[render_preset_name]  from render_preset_name::@4
+  [311] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_preset_name::@1
+  to:render_preset_name::@6
+render_preset_name::@6: scope:[render_preset_name]  from render_preset_name::@5
+  [312] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto render_preset_name::@1
+  to:render_preset_name::@7
+render_preset_name::@7: scope:[render_preset_name]  from render_preset_name::@6
+  [313] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto render_preset_name::@1
+  to:render_preset_name::@8
+render_preset_name::@8: scope:[render_preset_name]  from render_preset_name::@7
+  [314] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto render_preset_name::@1
+  to:render_preset_name::@9
+render_preset_name::@9: scope:[render_preset_name]  from render_preset_name::@8
+  [315] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto render_preset_name::@1
+  to:render_preset_name::@10
+render_preset_name::@10: scope:[render_preset_name]  from render_preset_name::@9
+  [316] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto render_preset_name::@1
+  to:render_preset_name::@11
+render_preset_name::@11: scope:[render_preset_name]  from render_preset_name::@10
+  [317] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto render_preset_name::@1
+  to:render_preset_name::@12
+render_preset_name::@12: scope:[render_preset_name]  from render_preset_name::@11
   [318] phi()
-  to:render_preset_name::@22
-render_preset_name::@22: scope:[render_preset_name]  from render_preset_name render_preset_name::@23 render_preset_name::@24 render_preset_name::@25 render_preset_name::@26 render_preset_name::@27 render_preset_name::@28 render_preset_name::@29 render_preset_name::@30 render_preset_name::@31 render_preset_name::@32 render_preset_name::@33
-  [319] (byte*) render_preset_name::name#13 ← phi( render_preset_name/(const byte*) render_preset_name::name#1 render_preset_name::@31/(const byte*) render_preset_name::name#10 render_preset_name::@32/(const byte*) render_preset_name::name#11 render_preset_name::@23/(const byte*) render_preset_name::name#2 render_preset_name::@24/(const byte*) render_preset_name::name#3 render_preset_name::@33/(const byte*) render_preset_name::name#1 render_preset_name::@25/(const byte*) render_preset_name::name#4 render_preset_name::@26/(const byte*) render_preset_name::name#5 render_preset_name::@27/(const byte*) render_preset_name::name#6 render_preset_name::@28/(const byte*) render_preset_name::name#7 render_preset_name::@29/(const byte*) render_preset_name::name#8 render_preset_name::@30/(const byte*) render_preset_name::name#9 )
+  to:render_preset_name::@1
+render_preset_name::@1: scope:[render_preset_name]  from render_preset_name render_preset_name::@10 render_preset_name::@11 render_preset_name::@12 render_preset_name::@2 render_preset_name::@3 render_preset_name::@4 render_preset_name::@5 render_preset_name::@6 render_preset_name::@7 render_preset_name::@8 render_preset_name::@9
+  [319] (byte*) render_preset_name::name#13 ← phi( render_preset_name/(const byte*) render_preset_name::name#1 render_preset_name::@10/(const byte*) render_preset_name::name#10 render_preset_name::@11/(const byte*) render_preset_name::name#11 render_preset_name::@2/(const byte*) render_preset_name::name#2 render_preset_name::@3/(const byte*) render_preset_name::name#3 render_preset_name::@12/(const byte*) render_preset_name::name#1 render_preset_name::@4/(const byte*) render_preset_name::name#4 render_preset_name::@5/(const byte*) render_preset_name::name#5 render_preset_name::@6/(const byte*) render_preset_name::name#6 render_preset_name::@7/(const byte*) render_preset_name::name#7 render_preset_name::@8/(const byte*) render_preset_name::name#8 render_preset_name::@9/(const byte*) render_preset_name::name#9 )
   [320] (byte*) print_str_at::str#1 ← (byte*) render_preset_name::name#13
   [321] call print_str_at 
   to:render_preset_name::@return
-render_preset_name::@return: scope:[render_preset_name]  from render_preset_name::@22
+render_preset_name::@return: scope:[render_preset_name]  from render_preset_name::@1
   [322] return 
   to:@return
-print_str_at: scope:[print_str_at]  from render_preset_name::@22
+print_str_at: scope:[print_str_at]  from render_preset_name::@1
   [323] phi()
   to:print_str_at::@1
 print_str_at::@1: scope:[print_str_at]  from print_str_at print_str_at::@2
@@ -10618,22 +10779,22 @@ print_str_at::@2: scope:[print_str_at]  from print_str_at::@1
   [328] (byte*) print_str_at::at#0 ← ++ (byte*) print_str_at::at#2
   [329] (byte*) print_str_at::str#0 ← ++ (byte*) print_str_at::str#2
   to:print_str_at::@1
-form_render_values: scope:[form_render_values]  from form_mode::@27 form_mode::@31
+form_render_values: scope:[form_render_values]  from form_mode::@14 form_mode::@18
   [330] phi()
   to:form_render_values::@1
-form_render_values::@1: scope:[form_render_values]  from form_render_values form_render_values::@3
-  [331] (byte) form_render_values::idx#2 ← phi( form_render_values/(byte/signed byte/word/signed word/dword/signed dword) 0 form_render_values::@3/(byte) form_render_values::idx#1 )
+form_render_values::@1: scope:[form_render_values]  from form_render_values form_render_values::@2
+  [331] (byte) form_render_values::idx#2 ← phi( form_render_values/(byte/signed byte/word/signed word/dword/signed dword) 0 form_render_values::@2/(byte) form_render_values::idx#1 )
   [332] (byte) form_field_ptr::field_idx#0 ← (byte) form_render_values::idx#2
   [333] call form_field_ptr 
   [334] (byte*) form_field_ptr::return#2 ← (byte*) form_field_ptr::return#0
-  to:form_render_values::@3
-form_render_values::@3: scope:[form_render_values]  from form_render_values::@1
+  to:form_render_values::@2
+form_render_values::@2: scope:[form_render_values]  from form_render_values::@1
   [335] (byte*) form_render_values::field#0 ← (byte*) form_field_ptr::return#2
   [336] *((byte*) form_render_values::field#0) ← *((const byte[]) print_hextab#0 + *((const byte[]) form_fields_val#0 + (byte) form_render_values::idx#2))
   [337] (byte) form_render_values::idx#1 ← ++ (byte) form_render_values::idx#2
   [338] if((byte) form_render_values::idx#1<(const byte) form_fields_cnt#0) goto form_render_values::@1
   to:form_render_values::@return
-form_render_values::@return: scope:[form_render_values]  from form_render_values::@3
+form_render_values::@return: scope:[form_render_values]  from form_render_values::@2
   [339] return 
   to:@return
 form_field_ptr: scope:[form_field_ptr]  from form_control form_render_values::@1
@@ -10646,152 +10807,152 @@ form_field_ptr: scope:[form_field_ptr]  from form_control form_render_values::@1
 form_field_ptr::@return: scope:[form_field_ptr]  from form_field_ptr
   [345] return 
   to:@return
-apply_preset: scope:[apply_preset]  from form_mode::@19
-  [346] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto apply_preset::@22
-  to:apply_preset::@23
-apply_preset::@23: scope:[apply_preset]  from apply_preset
-  [347] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto apply_preset::@22
-  to:apply_preset::@24
-apply_preset::@24: scope:[apply_preset]  from apply_preset::@23
-  [348] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto apply_preset::@22
-  to:apply_preset::@25
-apply_preset::@25: scope:[apply_preset]  from apply_preset::@24
-  [349] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto apply_preset::@22
-  to:apply_preset::@26
-apply_preset::@26: scope:[apply_preset]  from apply_preset::@25
-  [350] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto apply_preset::@22
-  to:apply_preset::@27
-apply_preset::@27: scope:[apply_preset]  from apply_preset::@26
-  [351] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 5) goto apply_preset::@22
-  to:apply_preset::@28
-apply_preset::@28: scope:[apply_preset]  from apply_preset::@27
-  [352] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 6) goto apply_preset::@22
-  to:apply_preset::@29
-apply_preset::@29: scope:[apply_preset]  from apply_preset::@28
-  [353] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 7) goto apply_preset::@22
-  to:apply_preset::@30
-apply_preset::@30: scope:[apply_preset]  from apply_preset::@29
-  [354] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 8) goto apply_preset::@22
-  to:apply_preset::@31
-apply_preset::@31: scope:[apply_preset]  from apply_preset::@30
-  [355] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 9) goto apply_preset::@22
-  to:apply_preset::@32
-apply_preset::@32: scope:[apply_preset]  from apply_preset::@31
-  [356] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) $a) goto apply_preset::@22
-  to:apply_preset::@33
-apply_preset::@33: scope:[apply_preset]  from apply_preset::@32
+apply_preset: scope:[apply_preset]  from form_mode::@7
+  [346] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto apply_preset::@1
+  to:apply_preset::@2
+apply_preset::@2: scope:[apply_preset]  from apply_preset
+  [347] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto apply_preset::@1
+  to:apply_preset::@3
+apply_preset::@3: scope:[apply_preset]  from apply_preset::@2
+  [348] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto apply_preset::@1
+  to:apply_preset::@4
+apply_preset::@4: scope:[apply_preset]  from apply_preset::@3
+  [349] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto apply_preset::@1
+  to:apply_preset::@5
+apply_preset::@5: scope:[apply_preset]  from apply_preset::@4
+  [350] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto apply_preset::@1
+  to:apply_preset::@6
+apply_preset::@6: scope:[apply_preset]  from apply_preset::@5
+  [351] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 5) goto apply_preset::@1
+  to:apply_preset::@7
+apply_preset::@7: scope:[apply_preset]  from apply_preset::@6
+  [352] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 6) goto apply_preset::@1
+  to:apply_preset::@8
+apply_preset::@8: scope:[apply_preset]  from apply_preset::@7
+  [353] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 7) goto apply_preset::@1
+  to:apply_preset::@9
+apply_preset::@9: scope:[apply_preset]  from apply_preset::@8
+  [354] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 8) goto apply_preset::@1
+  to:apply_preset::@10
+apply_preset::@10: scope:[apply_preset]  from apply_preset::@9
+  [355] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 9) goto apply_preset::@1
+  to:apply_preset::@11
+apply_preset::@11: scope:[apply_preset]  from apply_preset::@10
+  [356] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) $a) goto apply_preset::@1
+  to:apply_preset::@12
+apply_preset::@12: scope:[apply_preset]  from apply_preset::@11
   [357] phi()
-  to:apply_preset::@22
-apply_preset::@22: scope:[apply_preset]  from apply_preset apply_preset::@23 apply_preset::@24 apply_preset::@25 apply_preset::@26 apply_preset::@27 apply_preset::@28 apply_preset::@29 apply_preset::@30 apply_preset::@31 apply_preset::@32 apply_preset::@33
-  [358] (byte*) apply_preset::preset#14 ← phi( apply_preset/(const byte[]) preset_stdchar#0 apply_preset::@31/(const byte[]) preset_sixsfred2#0 apply_preset::@32/(const byte[]) preset_8bpppixelcell#0 apply_preset::@23/(const byte[]) preset_ecmchar#0 apply_preset::@24/(const byte[]) preset_stdbm#0 apply_preset::@33/(const byte[]) preset_stdchar#0 apply_preset::@25/(const byte[]) preset_mcbm#0 apply_preset::@26/(const byte[]) preset_hi_stdchar#0 apply_preset::@27/(const byte[]) preset_hi_ecmchar#0 apply_preset::@28/(const byte[]) preset_twoplane#0 apply_preset::@29/(const byte[]) preset_chunky#0 apply_preset::@30/(const byte[]) preset_sixsfred#0 )
-  to:apply_preset::@45
-apply_preset::@45: scope:[apply_preset]  from apply_preset::@22 apply_preset::@45
-  [359] (byte) apply_preset::i#2 ← phi( apply_preset::@22/(byte/signed byte/word/signed word/dword/signed dword) 0 apply_preset::@45/(byte) apply_preset::i#1 )
+  to:apply_preset::@1
+apply_preset::@1: scope:[apply_preset]  from apply_preset apply_preset::@10 apply_preset::@11 apply_preset::@12 apply_preset::@2 apply_preset::@3 apply_preset::@4 apply_preset::@5 apply_preset::@6 apply_preset::@7 apply_preset::@8 apply_preset::@9
+  [358] (byte*) apply_preset::preset#14 ← phi( apply_preset/(const byte[]) preset_stdchar#0 apply_preset::@10/(const byte[]) preset_sixsfred2#0 apply_preset::@11/(const byte[]) preset_8bpppixelcell#0 apply_preset::@2/(const byte[]) preset_ecmchar#0 apply_preset::@3/(const byte[]) preset_stdbm#0 apply_preset::@12/(const byte[]) preset_stdchar#0 apply_preset::@4/(const byte[]) preset_mcbm#0 apply_preset::@5/(const byte[]) preset_hi_stdchar#0 apply_preset::@6/(const byte[]) preset_hi_ecmchar#0 apply_preset::@7/(const byte[]) preset_twoplane#0 apply_preset::@8/(const byte[]) preset_chunky#0 apply_preset::@9/(const byte[]) preset_sixsfred#0 )
+  to:apply_preset::@13
+apply_preset::@13: scope:[apply_preset]  from apply_preset::@1 apply_preset::@13
+  [359] (byte) apply_preset::i#2 ← phi( apply_preset::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 apply_preset::@13/(byte) apply_preset::i#1 )
   [360] *((const byte[]) form_fields_val#0 + (byte) apply_preset::i#2) ← *((byte*) apply_preset::preset#14 + (byte) apply_preset::i#2)
   [361] (byte) apply_preset::i#1 ← ++ (byte) apply_preset::i#2
-  [362] if((byte) apply_preset::i#1!=(const byte) form_fields_cnt#0) goto apply_preset::@45
+  [362] if((byte) apply_preset::i#1!=(const byte) form_fields_cnt#0) goto apply_preset::@13
   to:apply_preset::@return
-apply_preset::@return: scope:[apply_preset]  from apply_preset::@45
+apply_preset::@return: scope:[apply_preset]  from apply_preset::@13
   [363] return 
   to:@return
-form_control: scope:[form_control]  from form_mode::@11
+form_control: scope:[form_control]  from form_mode::@5
   [364] (byte) form_field_ptr::field_idx#1 ← (byte) form_field_idx#28
   [365] call form_field_ptr 
   [366] (byte*) form_field_ptr::return#3 ← (byte*) form_field_ptr::return#0
-  to:form_control::@33
-form_control::@33: scope:[form_control]  from form_control
+  to:form_control::@17
+form_control::@17: scope:[form_control]  from form_control
   [367] (byte*) form_control::field#0 ← (byte*) form_field_ptr::return#3
   [368] (signed byte) form_cursor_count#5 ← -- (signed byte) form_cursor_count#21
-  [369] if((signed byte) form_cursor_count#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@36
+  [369] if((signed byte) form_cursor_count#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@20
   to:form_control::@1
-form_control::@1: scope:[form_control]  from form_control::@33 form_control::@36
-  [370] (signed byte) form_cursor_count#15 ← phi( form_control::@36/(signed byte) form_cursor_count#5 form_control::@33/(const signed byte) FORM_CURSOR_BLINK#0 )
+form_control::@1: scope:[form_control]  from form_control::@17 form_control::@20
+  [370] (signed byte) form_cursor_count#15 ← phi( form_control::@20/(signed byte) form_cursor_count#5 form_control::@17/(const signed byte) FORM_CURSOR_BLINK#0 )
   [371] if((signed byte) form_cursor_count#15<(const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2) goto form_control::@2
-  to:form_control::@8
-form_control::@8: scope:[form_control]  from form_control::@1
+  to:form_control::@6
+form_control::@6: scope:[form_control]  from form_control::@1
   [372] (byte~) form_control::$13 ← *((byte*) form_control::field#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
   [373] *((byte*) form_control::field#0) ← (byte~) form_control::$13
   to:form_control::@3
-form_control::@3: scope:[form_control]  from form_control::@2 form_control::@8
+form_control::@3: scope:[form_control]  from form_control::@2 form_control::@6
   [374] phi()
   [375] call keyboard_event_scan 
-  to:form_control::@34
-form_control::@34: scope:[form_control]  from form_control::@3
+  to:form_control::@18
+form_control::@18: scope:[form_control]  from form_control::@3
   [376] phi()
   [377] call keyboard_event_get 
   [378] (byte) keyboard_event_get::return#4 ← (byte) keyboard_event_get::return#2
-  to:form_control::@35
-form_control::@35: scope:[form_control]  from form_control::@34
+  to:form_control::@19
+form_control::@19: scope:[form_control]  from form_control::@18
   [379] (byte) form_control::key_event#0 ← (byte) keyboard_event_get::return#4
   [380] if((byte) form_control::key_event#0!=(const byte) KEY_CRSR_DOWN#0) goto form_control::@4
-  to:form_control::@10
-form_control::@10: scope:[form_control]  from form_control::@35
+  to:form_control::@7
+form_control::@7: scope:[form_control]  from form_control::@19
   [381] (byte~) form_control::$15 ← *((byte*) form_control::field#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
   [382] *((byte*) form_control::field#0) ← (byte~) form_control::$15
   [383] (byte~) form_control::$16 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0
-  [384] if((byte~) form_control::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@19
-  to:form_control::@11
-form_control::@11: scope:[form_control]  from form_control::@10
+  [384] if((byte~) form_control::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@12
+  to:form_control::@8
+form_control::@8: scope:[form_control]  from form_control::@7
   [385] (byte) form_field_idx#44 ← -- (byte) form_field_idx#28
-  [386] if((byte) form_field_idx#44!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@37
-  to:form_control::@22
-form_control::@22: scope:[form_control]  from form_control::@11 form_control::@19 form_control::@37 form_control::@38
-  [387] (byte) form_field_idx#31 ← phi( form_control::@11/(const byte) form_fields_cnt#0-(byte/signed byte/word/signed word/dword/signed dword) 1 form_control::@37/(byte) form_field_idx#44 form_control::@38/(byte) form_field_idx#45 form_control::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [386] if((byte) form_field_idx#44!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@21
+  to:form_control::@13
+form_control::@13: scope:[form_control]  from form_control::@12 form_control::@21 form_control::@22 form_control::@8
+  [387] (byte) form_field_idx#31 ← phi( form_control::@8/(const byte) form_fields_cnt#0-(byte/signed byte/word/signed word/dword/signed dword) 1 form_control::@21/(byte) form_field_idx#44 form_control::@22/(byte) form_field_idx#45 form_control::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   to:form_control::@return
-form_control::@return: scope:[form_control]  from form_control::@22 form_control::@29 form_control::@39 form_control::@5
-  [388] (byte) form_field_idx#18 ← phi( form_control::@5/(byte) form_field_idx#28 form_control::@22/(byte) form_field_idx#31 form_control::@29/(byte) form_field_idx#28 form_control::@39/(byte) form_field_idx#28 )
-  [388] (signed byte) form_cursor_count#16 ← phi( form_control::@5/(signed byte) form_cursor_count#15 form_control::@22/(const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 form_control::@29/(signed byte) form_cursor_count#15 form_control::@39/(signed byte) form_cursor_count#15 )
-  [388] (byte) form_control::return#2 ← phi( form_control::@5/(byte/word/signed word/dword/signed dword) $ff form_control::@22/(byte/signed byte/word/signed word/dword/signed dword) 0 form_control::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 form_control::@39/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+form_control::@return: scope:[form_control]  from form_control::@13 form_control::@15 form_control::@23 form_control::@5
+  [388] (byte) form_field_idx#18 ← phi( form_control::@5/(byte) form_field_idx#28 form_control::@13/(byte) form_field_idx#31 form_control::@15/(byte) form_field_idx#28 form_control::@23/(byte) form_field_idx#28 )
+  [388] (signed byte) form_cursor_count#16 ← phi( form_control::@5/(signed byte) form_cursor_count#15 form_control::@13/(const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 form_control::@15/(signed byte) form_cursor_count#15 form_control::@23/(signed byte) form_cursor_count#15 )
+  [388] (byte) form_control::return#2 ← phi( form_control::@5/(byte/word/signed word/dword/signed dword) $ff form_control::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 form_control::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 form_control::@23/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [389] return 
   to:@return
-form_control::@37: scope:[form_control]  from form_control::@11
+form_control::@21: scope:[form_control]  from form_control::@8
   [390] phi()
-  to:form_control::@22
-form_control::@19: scope:[form_control]  from form_control::@10
-  [391] (byte) form_field_idx#45 ← ++ (byte) form_field_idx#28
-  [392] if((byte) form_field_idx#45!=(const byte) form_fields_cnt#0) goto form_control::@38
-  to:form_control::@22
-form_control::@38: scope:[form_control]  from form_control::@19
-  [393] phi()
-  to:form_control::@22
-form_control::@4: scope:[form_control]  from form_control::@35
-  [394] if((byte) form_control::key_event#0!=(const byte) KEY_CRSR_RIGHT#0) goto form_control::@5
   to:form_control::@13
-form_control::@13: scope:[form_control]  from form_control::@4
+form_control::@12: scope:[form_control]  from form_control::@7
+  [391] (byte) form_field_idx#45 ← ++ (byte) form_field_idx#28
+  [392] if((byte) form_field_idx#45!=(const byte) form_fields_cnt#0) goto form_control::@22
+  to:form_control::@13
+form_control::@22: scope:[form_control]  from form_control::@12
+  [393] phi()
+  to:form_control::@13
+form_control::@4: scope:[form_control]  from form_control::@19
+  [394] if((byte) form_control::key_event#0!=(const byte) KEY_CRSR_RIGHT#0) goto form_control::@5
+  to:form_control::@9
+form_control::@9: scope:[form_control]  from form_control::@4
   [395] (byte~) form_control::$24 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0
-  [396] if((byte~) form_control::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@26
-  to:form_control::@14
-form_control::@14: scope:[form_control]  from form_control::@13
+  [396] if((byte~) form_control::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@14
+  to:form_control::@10
+form_control::@10: scope:[form_control]  from form_control::@9
   [397] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← -- *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)
-  [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@29
-  to:form_control::@15
-form_control::@15: scope:[form_control]  from form_control::@14
+  [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@15
+  to:form_control::@11
+form_control::@11: scope:[form_control]  from form_control::@10
   [399] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← *((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)
-  to:form_control::@29
-form_control::@29: scope:[form_control]  from form_control::@14 form_control::@15 form_control::@26 form_control::@31
+  to:form_control::@15
+form_control::@15: scope:[form_control]  from form_control::@10 form_control::@11 form_control::@14 form_control::@16
   [400] *((byte*) form_control::field#0) ← *((const byte[]) print_hextab#0 + *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28))
   to:form_control::@return
-form_control::@26: scope:[form_control]  from form_control::@13
+form_control::@14: scope:[form_control]  from form_control::@9
   [401] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← ++ *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)
-  [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@29
-  to:form_control::@31
-form_control::@31: scope:[form_control]  from form_control::@26
+  [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@15
+  to:form_control::@16
+form_control::@16: scope:[form_control]  from form_control::@14
   [403] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:form_control::@29
+  to:form_control::@15
 form_control::@5: scope:[form_control]  from form_control::@4
-  [404] if((byte) form_control::key_event#0!=(const byte) KEY_SPACE#0) goto form_control::@39
+  [404] if((byte) form_control::key_event#0!=(const byte) KEY_SPACE#0) goto form_control::@23
   to:form_control::@return
-form_control::@39: scope:[form_control]  from form_control::@5
+form_control::@23: scope:[form_control]  from form_control::@5
   [405] phi()
   to:form_control::@return
 form_control::@2: scope:[form_control]  from form_control::@1
   [406] (byte/word/dword~) form_control::$14 ← *((byte*) form_control::field#0) | (byte/word/signed word/dword/signed dword) $80
   [407] *((byte*) form_control::field#0) ← (byte/word/dword~) form_control::$14
   to:form_control::@3
-form_control::@36: scope:[form_control]  from form_control::@33
+form_control::@20: scope:[form_control]  from form_control::@17
   [408] phi()
   to:form_control::@1
-form_set_screen: scope:[form_set_screen]  from form_mode::@26
+form_set_screen: scope:[form_set_screen]  from form_mode::@13
   [409] phi()
   to:form_set_screen::@1
 form_set_screen::@1: scope:[form_set_screen]  from form_set_screen form_set_screen::@1
@@ -10808,40 +10969,40 @@ form_set_screen::@1: scope:[form_set_screen]  from form_set_screen form_set_scre
 form_set_screen::@return: scope:[form_set_screen]  from form_set_screen::@1
   [418] return 
   to:@return
-print_str_lines: scope:[print_str_lines]  from form_mode::@22 form_mode::@25
-  [419] (byte*) print_str_lines::str#5 ← phi( form_mode::@22/(const byte[]) FORM_COLS#0 form_mode::@25/(const byte[]) FORM_TEXT#0 )
+print_str_lines: scope:[print_str_lines]  from form_mode::@12 form_mode::@9
+  [419] (byte*) print_str_lines::str#5 ← phi( form_mode::@9/(const byte[]) FORM_COLS#0 form_mode::@12/(const byte[]) FORM_TEXT#0 )
   [420] (byte*~) print_char_cursor#77 ← (byte*) print_set_screen::screen#2
   to:print_str_lines::@1
-print_str_lines::@1: scope:[print_str_lines]  from print_str_lines print_str_lines::@9
-  [421] (byte*) print_line_cursor#2 ← phi( print_str_lines/(byte*) print_set_screen::screen#2 print_str_lines::@9/(byte*) print_line_cursor#22 )
-  [421] (byte*) print_char_cursor#22 ← phi( print_str_lines/(byte*~) print_char_cursor#77 print_str_lines::@9/(byte*~) print_char_cursor#78 )
-  [421] (byte*) print_str_lines::str#3 ← phi( print_str_lines/(byte*) print_str_lines::str#5 print_str_lines::@9/(byte*) print_str_lines::str#0 )
-  [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@6
+print_str_lines::@1: scope:[print_str_lines]  from print_str_lines print_str_lines::@5
+  [421] (byte*) print_line_cursor#2 ← phi( print_str_lines/(byte*) print_set_screen::screen#2 print_str_lines::@5/(byte*) print_line_cursor#22 )
+  [421] (byte*) print_char_cursor#22 ← phi( print_str_lines/(byte*~) print_char_cursor#77 print_str_lines::@5/(byte*~) print_char_cursor#78 )
+  [421] (byte*) print_str_lines::str#3 ← phi( print_str_lines/(byte*) print_str_lines::str#5 print_str_lines::@5/(byte*) print_str_lines::str#0 )
+  [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@2
   to:print_str_lines::@return
 print_str_lines::@return: scope:[print_str_lines]  from print_str_lines::@1
   [423] return 
   to:@return
-print_str_lines::@6: scope:[print_str_lines]  from print_str_lines::@1 print_str_lines::@7
-  [424] (byte*) print_char_cursor#20 ← phi( print_str_lines::@1/(byte*) print_char_cursor#22 print_str_lines::@7/(byte*) print_char_cursor#38 )
-  [424] (byte*) print_str_lines::str#4 ← phi( print_str_lines::@1/(byte*) print_str_lines::str#3 print_str_lines::@7/(byte*) print_str_lines::str#0 )
+print_str_lines::@2: scope:[print_str_lines]  from print_str_lines::@1 print_str_lines::@3
+  [424] (byte*) print_char_cursor#20 ← phi( print_str_lines::@1/(byte*) print_char_cursor#22 print_str_lines::@3/(byte*) print_char_cursor#38 )
+  [424] (byte*) print_str_lines::str#4 ← phi( print_str_lines::@1/(byte*) print_str_lines::str#3 print_str_lines::@3/(byte*) print_str_lines::str#0 )
   [425] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#4)
   [426] (byte*) print_str_lines::str#0 ← ++ (byte*) print_str_lines::str#4
-  [427] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@7
-  to:print_str_lines::@8
-print_str_lines::@8: scope:[print_str_lines]  from print_str_lines::@6
+  [427] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@3
+  to:print_str_lines::@4
+print_str_lines::@4: scope:[print_str_lines]  from print_str_lines::@2
   [428] *((byte*) print_char_cursor#20) ← (byte) print_str_lines::ch#0
   [429] (byte*) print_char_cursor#1 ← ++ (byte*) print_char_cursor#20
-  to:print_str_lines::@7
-print_str_lines::@7: scope:[print_str_lines]  from print_str_lines::@6 print_str_lines::@8
-  [430] (byte*) print_char_cursor#38 ← phi( print_str_lines::@6/(byte*) print_char_cursor#20 print_str_lines::@8/(byte*) print_char_cursor#1 )
-  [431] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@6
-  to:print_str_lines::@9
-print_str_lines::@9: scope:[print_str_lines]  from print_str_lines::@7
+  to:print_str_lines::@3
+print_str_lines::@3: scope:[print_str_lines]  from print_str_lines::@2 print_str_lines::@4
+  [430] (byte*) print_char_cursor#38 ← phi( print_str_lines::@2/(byte*) print_char_cursor#20 print_str_lines::@4/(byte*) print_char_cursor#1 )
+  [431] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@2
+  to:print_str_lines::@5
+print_str_lines::@5: scope:[print_str_lines]  from print_str_lines::@3
   [432] phi()
   [433] call print_ln 
   [434] (byte*~) print_char_cursor#78 ← (byte*) print_line_cursor#22
   to:print_str_lines::@1
-print_ln: scope:[print_ln]  from print_str_lines::@9
+print_ln: scope:[print_ln]  from print_str_lines::@5
   [435] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -10852,7 +11013,7 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [439] return 
   to:@return
-print_cls: scope:[print_cls]  from form_mode::@21 form_mode::@24
+print_cls: scope:[print_cls]  from form_mode::@11 form_mode::@8
   [440] (byte*) print_cls::sc#0 ← (byte*) print_set_screen::screen#2
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -10865,13 +11026,13 @@ print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
 print_cls::@return: scope:[print_cls]  from print_cls::@1
   [446] return 
   to:@return
-print_set_screen: scope:[print_set_screen]  from form_mode form_mode::@23
-  [447] (byte*) print_set_screen::screen#2 ← phi( form_mode/(const byte*) COLS#0 form_mode::@23/(const byte*) FORM_SCREEN#0 )
+print_set_screen: scope:[print_set_screen]  from form_mode form_mode::@10
+  [447] (byte*) print_set_screen::screen#2 ← phi( form_mode/(const byte*) COLS#0 form_mode::@10/(const byte*) FORM_SCREEN#0 )
   to:print_set_screen::@return
 print_set_screen::@return: scope:[print_set_screen]  from print_set_screen
   [448] return 
   to:@return
-gfx_init: scope:[gfx_init]  from main::@7
+gfx_init: scope:[gfx_init]  from main::@3
   [449] phi()
   [450] call gfx_init_screen0 
   to:gfx_init::@1
@@ -10980,8 +11141,8 @@ gfx_init_plane_fill::@4: scope:[gfx_init_plane_fill]  from gfx_init_plane_fill::
 gfx_init_plane_fill::@return: scope:[gfx_init_plane_fill]  from gfx_init_plane_fill::@4
   [504] return 
   to:@return
-dtvSetCpuBankSegment1: scope:[dtvSetCpuBankSegment1]  from gfx_init_plane_8bppchunky gfx_init_plane_8bppchunky::@4 gfx_init_plane_8bppchunky::@6 gfx_init_plane_charset8 gfx_init_plane_charset8::@8 gfx_init_plane_fill gfx_init_plane_fill::@4 gfx_init_plane_horisontal gfx_init_plane_horisontal2 gfx_init_plane_horisontal2::@4 gfx_init_plane_horisontal::@8 gfx_init_plane_vertical gfx_init_plane_vertical::@4
-  [505] (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 ← phi( gfx_init_plane_8bppchunky/((byte))(const dword) PLANE_8BPP_CHUNKY#0/(word/signed word/dword/signed dword) $4000 gfx_init_plane_8bppchunky::@4/(byte) dtvSetCpuBankSegment1::cpuBankIdx#1 gfx_init_plane_8bppchunky::@6/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_charset8/(const byte) gfx_init_plane_charset8::gfxbCpuBank#0 gfx_init_plane_charset8::@8/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_fill/(byte) dtvSetCpuBankSegment1::cpuBankIdx#11 gfx_init_plane_fill::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_horisontal/(const byte) gfx_init_plane_horisontal::gfxbCpuBank#0 gfx_init_plane_horisontal2/(const byte) gfx_init_plane_horisontal2::gfxbCpuBank#0 gfx_init_plane_horisontal2::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_horisontal::@8/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_vertical/(const byte) gfx_init_plane_vertical::gfxbCpuBank#0 gfx_init_plane_vertical::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 )
+dtvSetCpuBankSegment1: scope:[dtvSetCpuBankSegment1]  from gfx_init_plane_8bppchunky gfx_init_plane_8bppchunky::@4 gfx_init_plane_8bppchunky::@6 gfx_init_plane_charset8 gfx_init_plane_charset8::@8 gfx_init_plane_fill gfx_init_plane_fill::@4 gfx_init_plane_horisontal gfx_init_plane_horisontal2 gfx_init_plane_horisontal2::@4 gfx_init_plane_horisontal::@7 gfx_init_plane_vertical gfx_init_plane_vertical::@4
+  [505] (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 ← phi( gfx_init_plane_8bppchunky/((byte))(const dword) PLANE_8BPP_CHUNKY#0/(word/signed word/dword/signed dword) $4000 gfx_init_plane_8bppchunky::@4/(byte) dtvSetCpuBankSegment1::cpuBankIdx#1 gfx_init_plane_8bppchunky::@6/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_charset8/(const byte) gfx_init_plane_charset8::gfxbCpuBank#0 gfx_init_plane_charset8::@8/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_fill/(byte) dtvSetCpuBankSegment1::cpuBankIdx#11 gfx_init_plane_fill::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_horisontal/(const byte) gfx_init_plane_horisontal::gfxbCpuBank#0 gfx_init_plane_horisontal2/(const byte) gfx_init_plane_horisontal2::gfxbCpuBank#0 gfx_init_plane_horisontal2::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_horisontal::@7/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 gfx_init_plane_vertical/(const byte) gfx_init_plane_vertical::gfxbCpuBank#0 gfx_init_plane_vertical::@4/((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 )
   [506] *((const byte*) dtvSetCpuBankSegment1::cpuBank#0) ← (byte) dtvSetCpuBankSegment1::cpuBankIdx#13
   asm { .byte$32,$dd lda$ff .byte$32,$00  }
   to:dtvSetCpuBankSegment1::@return
@@ -11062,9 +11223,9 @@ gfx_init_plane_horisontal: scope:[gfx_init_plane_horisontal]  from gfx_init::@9
   [543] phi()
   [544] call dtvSetCpuBankSegment1 
   to:gfx_init_plane_horisontal::@1
-gfx_init_plane_horisontal::@1: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal gfx_init_plane_horisontal::@7
-  [545] (byte*) gfx_init_plane_horisontal::gfxa#6 ← phi( gfx_init_plane_horisontal::@7/(byte*) gfx_init_plane_horisontal::gfxa#7 gfx_init_plane_horisontal/((byte*))(word/signed word/dword/signed dword) $4000+(const dword) PLANE_HORISONTAL#0&(word/signed word/dword/signed dword) $3fff )
-  [545] (byte) gfx_init_plane_horisontal::ay#4 ← phi( gfx_init_plane_horisontal::@7/(byte) gfx_init_plane_horisontal::ay#1 gfx_init_plane_horisontal/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+gfx_init_plane_horisontal::@1: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal gfx_init_plane_horisontal::@6
+  [545] (byte*) gfx_init_plane_horisontal::gfxa#6 ← phi( gfx_init_plane_horisontal::@6/(byte*) gfx_init_plane_horisontal::gfxa#7 gfx_init_plane_horisontal/((byte*))(word/signed word/dword/signed dword) $4000+(const dword) PLANE_HORISONTAL#0&(word/signed word/dword/signed dword) $3fff )
+  [545] (byte) gfx_init_plane_horisontal::ay#4 ← phi( gfx_init_plane_horisontal::@6/(byte) gfx_init_plane_horisontal::ay#1 gfx_init_plane_horisontal/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   to:gfx_init_plane_horisontal::@2
 gfx_init_plane_horisontal::@2: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@1 gfx_init_plane_horisontal::@4
   [546] (byte) gfx_init_plane_horisontal::ax#2 ← phi( gfx_init_plane_horisontal::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_init_plane_horisontal::@4/(byte) gfx_init_plane_horisontal::ax#1 )
@@ -11080,16 +11241,16 @@ gfx_init_plane_horisontal::@4: scope:[gfx_init_plane_horisontal]  from gfx_init_
   [551] (byte*) gfx_init_plane_horisontal::gfxa#7 ← phi( gfx_init_plane_horisontal::@3/(byte*) gfx_init_plane_horisontal::gfxa#1 gfx_init_plane_horisontal::@5/(byte*) gfx_init_plane_horisontal::gfxa#2 )
   [552] (byte) gfx_init_plane_horisontal::ax#1 ← ++ (byte) gfx_init_plane_horisontal::ax#2
   [553] if((byte) gfx_init_plane_horisontal::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_init_plane_horisontal::@2
-  to:gfx_init_plane_horisontal::@7
-gfx_init_plane_horisontal::@7: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@4
+  to:gfx_init_plane_horisontal::@6
+gfx_init_plane_horisontal::@6: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@4
   [554] (byte) gfx_init_plane_horisontal::ay#1 ← ++ (byte) gfx_init_plane_horisontal::ay#4
   [555] if((byte) gfx_init_plane_horisontal::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto gfx_init_plane_horisontal::@1
-  to:gfx_init_plane_horisontal::@8
-gfx_init_plane_horisontal::@8: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@7
+  to:gfx_init_plane_horisontal::@7
+gfx_init_plane_horisontal::@7: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@6
   [556] phi()
   [557] call dtvSetCpuBankSegment1 
   to:gfx_init_plane_horisontal::@return
-gfx_init_plane_horisontal::@return: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@8
+gfx_init_plane_horisontal::@return: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@7
   [558] return 
   to:@return
 gfx_init_plane_horisontal::@3: scope:[gfx_init_plane_horisontal]  from gfx_init_plane_horisontal::@2
@@ -11170,13 +11331,13 @@ gfx_init_plane_8bppchunky::@2: scope:[gfx_init_plane_8bppchunky]  from gfx_init_
 gfx_init_plane_8bppchunky::@4: scope:[gfx_init_plane_8bppchunky]  from gfx_init_plane_8bppchunky::@2
   [591] (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 ← (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#4
   [592] call dtvSetCpuBankSegment1 
-  to:gfx_init_plane_8bppchunky::@8
-gfx_init_plane_8bppchunky::@8: scope:[gfx_init_plane_8bppchunky]  from gfx_init_plane_8bppchunky::@4
+  to:gfx_init_plane_8bppchunky::@7
+gfx_init_plane_8bppchunky::@7: scope:[gfx_init_plane_8bppchunky]  from gfx_init_plane_8bppchunky::@4
   [593] (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 ← ++ (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#4
   to:gfx_init_plane_8bppchunky::@3
-gfx_init_plane_8bppchunky::@3: scope:[gfx_init_plane_8bppchunky]  from gfx_init_plane_8bppchunky::@2 gfx_init_plane_8bppchunky::@8
-  [594] (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#8 ← phi( gfx_init_plane_8bppchunky::@2/(byte) gfx_init_plane_8bppchunky::gfxbCpuBank#4 gfx_init_plane_8bppchunky::@8/(byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 )
-  [594] (byte*) gfx_init_plane_8bppchunky::gfxb#4 ← phi( gfx_init_plane_8bppchunky::@2/(byte*) gfx_init_plane_8bppchunky::gfxb#3 gfx_init_plane_8bppchunky::@8/((byte*))(word/signed word/dword/signed dword) $4000 )
+gfx_init_plane_8bppchunky::@3: scope:[gfx_init_plane_8bppchunky]  from gfx_init_plane_8bppchunky::@2 gfx_init_plane_8bppchunky::@7
+  [594] (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#8 ← phi( gfx_init_plane_8bppchunky::@2/(byte) gfx_init_plane_8bppchunky::gfxbCpuBank#4 gfx_init_plane_8bppchunky::@7/(byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 )
+  [594] (byte*) gfx_init_plane_8bppchunky::gfxb#4 ← phi( gfx_init_plane_8bppchunky::@2/(byte*) gfx_init_plane_8bppchunky::gfxb#3 gfx_init_plane_8bppchunky::@7/((byte*))(word/signed word/dword/signed dword) $4000 )
   [595] (word~) gfx_init_plane_8bppchunky::$9 ← (word) gfx_init_plane_8bppchunky::x#2 + (byte) gfx_init_plane_8bppchunky::y#6
   [596] (byte) gfx_init_plane_8bppchunky::c#0 ← ((byte)) (word~) gfx_init_plane_8bppchunky::$9
   [597] *((byte*) gfx_init_plane_8bppchunky::gfxb#4) ← (byte) gfx_init_plane_8bppchunky::c#0
@@ -11198,38 +11359,38 @@ gfx_init_plane_8bppchunky::@return: scope:[gfx_init_plane_8bppchunky]  from gfx_
 gfx_init_vic_bitmap: scope:[gfx_init_vic_bitmap]  from gfx_init::@6
   [606] phi()
   [607] call bitmap_init 
-  to:gfx_init_vic_bitmap::@3
-gfx_init_vic_bitmap::@3: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap
+  to:gfx_init_vic_bitmap::@2
+gfx_init_vic_bitmap::@2: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap
   [608] phi()
   [609] call bitmap_clear 
   to:gfx_init_vic_bitmap::@1
-gfx_init_vic_bitmap::@1: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@3 gfx_init_vic_bitmap::@5
-  [610] (byte) gfx_init_vic_bitmap::l#2 ← phi( gfx_init_vic_bitmap::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_init_vic_bitmap::@5/(byte) gfx_init_vic_bitmap::l#1 )
+gfx_init_vic_bitmap::@1: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@2 gfx_init_vic_bitmap::@3
+  [610] (byte) gfx_init_vic_bitmap::l#2 ← phi( gfx_init_vic_bitmap::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 gfx_init_vic_bitmap::@3/(byte) gfx_init_vic_bitmap::l#1 )
   [611] (byte) bitmap_line::x0#0 ← *((const byte[]) gfx_init_vic_bitmap::lines_x#0 + (byte) gfx_init_vic_bitmap::l#2)
   [612] (byte) bitmap_line::x1#0 ← *((const byte[]) gfx_init_vic_bitmap::lines_x#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) gfx_init_vic_bitmap::l#2)
   [613] (byte) bitmap_line::y0#0 ← *((const byte[]) gfx_init_vic_bitmap::lines_y#0 + (byte) gfx_init_vic_bitmap::l#2)
   [614] (byte) bitmap_line::y1#0 ← *((const byte[]) gfx_init_vic_bitmap::lines_y#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) gfx_init_vic_bitmap::l#2)
   [615] call bitmap_line 
-  to:gfx_init_vic_bitmap::@5
-gfx_init_vic_bitmap::@5: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@1
+  to:gfx_init_vic_bitmap::@3
+gfx_init_vic_bitmap::@3: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@1
   [616] (byte) gfx_init_vic_bitmap::l#1 ← ++ (byte) gfx_init_vic_bitmap::l#2
   [617] if((byte) gfx_init_vic_bitmap::l#1<(const byte) gfx_init_vic_bitmap::lines_cnt#0) goto gfx_init_vic_bitmap::@1
   to:gfx_init_vic_bitmap::@return
-gfx_init_vic_bitmap::@return: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@5
+gfx_init_vic_bitmap::@return: scope:[gfx_init_vic_bitmap]  from gfx_init_vic_bitmap::@3
   [618] return 
   to:@return
 bitmap_line: scope:[bitmap_line]  from gfx_init_vic_bitmap::@1
   [619] if((byte) bitmap_line::x0#0<(byte) bitmap_line::x1#0) goto bitmap_line::@1
-  to:bitmap_line::@3
-bitmap_line::@3: scope:[bitmap_line]  from bitmap_line
+  to:bitmap_line::@2
+bitmap_line::@2: scope:[bitmap_line]  from bitmap_line
   [620] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0
-  [621] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10
+  [621] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7
+  to:bitmap_line::@3
+bitmap_line::@3: scope:[bitmap_line]  from bitmap_line::@2
+  [622] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
+  [623] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8
   to:bitmap_line::@4
 bitmap_line::@4: scope:[bitmap_line]  from bitmap_line::@3
-  [622] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [623] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11
-  to:bitmap_line::@5
-bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [624] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0
   [625] (byte) bitmap_line_ydxi::x#0 ← (byte) bitmap_line::x1#0
   [626] (byte) bitmap_line_ydxi::y1#0 ← (byte) bitmap_line::y0#0
@@ -11237,10 +11398,10 @@ bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [628] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   [629] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@11 bitmap_line::@15 bitmap_line::@17 bitmap_line::@21 bitmap_line::@25 bitmap_line::@27 bitmap_line::@5 bitmap_line::@8
+bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@10 bitmap_line::@12 bitmap_line::@13 bitmap_line::@14 bitmap_line::@4 bitmap_line::@6 bitmap_line::@8 bitmap_line::@9
   [630] return 
   to:@return
-bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
+bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@3
   [631] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0
   [632] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0
   [633] (byte) bitmap_line_xdyi::x1#0 ← (byte) bitmap_line::x0#0
@@ -11248,11 +11409,11 @@ bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
   [635] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2
   [636] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@3
+bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@2
   [637] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [638] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15
-  to:bitmap_line::@17
-bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
+  [638] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9
+  to:bitmap_line::@10
+bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@7
   [639] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0
   [640] (byte) bitmap_line_ydxd::x#0 ← (byte) bitmap_line::x0#0
   [641] (byte) bitmap_line_ydxd::y1#0 ← (byte) bitmap_line::y1#0
@@ -11260,7 +11421,7 @@ bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
   [643] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   [644] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
+bitmap_line::@9: scope:[bitmap_line]  from bitmap_line::@7
   [645] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0
   [646] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0
   [647] (byte) bitmap_line_xdyd::x1#0 ← (byte) bitmap_line::x0#0
@@ -11270,13 +11431,13 @@ bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
   to:bitmap_line::@return
 bitmap_line::@1: scope:[bitmap_line]  from bitmap_line
   [651] (byte) bitmap_line::xd#1 ← (byte) bitmap_line::x1#0 - (byte) bitmap_line::x0#0
-  [652] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20
-  to:bitmap_line::@7
-bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@1
+  [652] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11
+  to:bitmap_line::@5
+bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@1
   [653] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [654] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21
-  to:bitmap_line::@8
-bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
+  [654] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12
+  to:bitmap_line::@6
+bitmap_line::@6: scope:[bitmap_line]  from bitmap_line::@5
   [655] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0
   [656] (byte) bitmap_line_ydxd::x#1 ← (byte) bitmap_line::x1#0
   [657] (byte) bitmap_line_ydxd::y1#1 ← (byte) bitmap_line::y0#0
@@ -11284,7 +11445,7 @@ bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
   [659] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   [660] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
+bitmap_line::@12: scope:[bitmap_line]  from bitmap_line::@5
   [661] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0
   [662] (byte) bitmap_line_xdyd::y#1 ← (byte) bitmap_line::y0#0
   [663] (byte) bitmap_line_xdyd::x1#1 ← (byte) bitmap_line::x1#0
@@ -11292,11 +11453,11 @@ bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
   [665] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10
   [666] call bitmap_line_xdyd 
   to:bitmap_line::@return
-bitmap_line::@20: scope:[bitmap_line]  from bitmap_line::@1
+bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@1
   [667] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [668] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25
-  to:bitmap_line::@27
-bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
+  [668] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13
+  to:bitmap_line::@14
+bitmap_line::@14: scope:[bitmap_line]  from bitmap_line::@11
   [669] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0
   [670] (byte) bitmap_line_ydxi::x#1 ← (byte) bitmap_line::x0#0
   [671] (byte) bitmap_line_ydxi::y1#1 ← (byte) bitmap_line::y1#0
@@ -11304,7 +11465,7 @@ bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
   [673] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   [674] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
+bitmap_line::@13: scope:[bitmap_line]  from bitmap_line::@11
   [675] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0
   [676] (byte) bitmap_line_xdyi::y#1 ← (byte) bitmap_line::y0#0
   [677] (byte) bitmap_line_xdyi::x1#1 ← (byte) bitmap_line::x1#0
@@ -11312,12 +11473,12 @@ bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
   [679] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11
   [680] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@11 bitmap_line::@25
-  [681] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x1#1 )
-  [681] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::xd#1 )
-  [681] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::y#0 bitmap_line::@25/(byte) bitmap_line_xdyi::y#1 )
-  [681] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x#1 )
-  [681] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::yd#1 )
+bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@13 bitmap_line::@8
+  [681] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x1#1 )
+  [681] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::xd#1 )
+  [681] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::y#0 bitmap_line::@13/(byte) bitmap_line_xdyi::y#1 )
+  [681] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x#1 )
+  [681] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::yd#1 )
   [682] (byte) bitmap_line_xdyi::e#0 ← (byte) bitmap_line_xdyi::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyi::@1
 bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_line_xdyi::@2
@@ -11327,19 +11488,19 @@ bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_lin
   [684] (byte) bitmap_plot::x#0 ← (byte) bitmap_line_xdyi::x#3
   [685] (byte) bitmap_plot::y#0 ← (byte) bitmap_line_xdyi::y#3
   [686] call bitmap_plot 
-  to:bitmap_line_xdyi::@5
-bitmap_line_xdyi::@5: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
+  to:bitmap_line_xdyi::@4
+bitmap_line_xdyi::@4: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
   [687] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3
   [688] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2
   [689] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2
   to:bitmap_line_xdyi::@3
-bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@5
+bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@4
   [690] (byte) bitmap_line_xdyi::y#2 ← ++ (byte) bitmap_line_xdyi::y#3
   [691] (byte) bitmap_line_xdyi::e#2 ← (byte) bitmap_line_xdyi::e#1 - (byte) bitmap_line_xdyi::xd#5
   to:bitmap_line_xdyi::@2
-bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5
-  [692] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::e#1 )
-  [692] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::y#3 )
+bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4
+  [692] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::e#1 )
+  [692] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::y#3 )
   [693] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6 ← (byte) bitmap_line_xdyi::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [694] if((byte) bitmap_line_xdyi::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6) goto bitmap_line_xdyi::@1
   to:bitmap_line_xdyi::@return
@@ -11358,12 +11519,12 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line_xdyd::@1 bitmap_line_xdyi::@1
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [702] return 
   to:@return
-bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@27 bitmap_line::@5
-  [703] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y1#0 )
-  [703] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::yd#0 )
-  [703] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y#0 )
-  [703] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::x#1 bitmap_line::@5/(byte) bitmap_line_ydxi::x#0 )
-  [703] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::xd#0 )
+bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@14 bitmap_line::@4
+  [703] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y1#0 )
+  [703] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::yd#0 )
+  [703] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y#0 )
+  [703] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::x#1 bitmap_line::@4/(byte) bitmap_line_ydxi::x#0 )
+  [703] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::xd#0 )
   [704] (byte) bitmap_line_ydxi::e#0 ← (byte) bitmap_line_ydxi::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxi::@1
 bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_line_ydxi::@2
@@ -11373,31 +11534,31 @@ bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_lin
   [706] (byte) bitmap_plot::x#2 ← (byte) bitmap_line_ydxi::x#3
   [707] (byte) bitmap_plot::y#2 ← (byte) bitmap_line_ydxi::y#3
   [708] call bitmap_plot 
-  to:bitmap_line_ydxi::@5
-bitmap_line_ydxi::@5: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
+  to:bitmap_line_ydxi::@4
+bitmap_line_ydxi::@4: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
   [709] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3
   [710] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2
   [711] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2
   to:bitmap_line_ydxi::@3
-bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@5
+bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@4
   [712] (byte) bitmap_line_ydxi::x#2 ← ++ (byte) bitmap_line_ydxi::x#3
   [713] (byte) bitmap_line_ydxi::e#2 ← (byte) bitmap_line_ydxi::e#1 - (byte) bitmap_line_ydxi::yd#5
   to:bitmap_line_ydxi::@2
-bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5
-  [714] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::e#1 )
-  [714] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::x#3 )
+bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4
+  [714] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::e#1 )
+  [714] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::x#3 )
   [715] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6 ← (byte) bitmap_line_ydxi::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [716] if((byte) bitmap_line_ydxi::y#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6) goto bitmap_line_ydxi::@1
   to:bitmap_line_ydxi::@return
 bitmap_line_ydxi::@return: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@2
   [717] return 
   to:@return
-bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@15 bitmap_line::@21
-  [718] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x1#1 )
-  [718] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::xd#1 )
-  [718] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::y#0 bitmap_line::@21/(byte) bitmap_line_xdyd::y#1 )
-  [718] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x#1 )
-  [718] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::yd#1 )
+bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@12 bitmap_line::@9
+  [718] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x1#1 )
+  [718] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::xd#1 )
+  [718] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::y#0 bitmap_line::@12/(byte) bitmap_line_xdyd::y#1 )
+  [718] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x#1 )
+  [718] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::yd#1 )
   [719] (byte) bitmap_line_xdyd::e#0 ← (byte) bitmap_line_xdyd::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyd::@1
 bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_line_xdyd::@2
@@ -11407,31 +11568,31 @@ bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_lin
   [721] (byte) bitmap_plot::x#1 ← (byte) bitmap_line_xdyd::x#3
   [722] (byte) bitmap_plot::y#1 ← (byte) bitmap_line_xdyd::y#3
   [723] call bitmap_plot 
-  to:bitmap_line_xdyd::@5
-bitmap_line_xdyd::@5: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
+  to:bitmap_line_xdyd::@4
+bitmap_line_xdyd::@4: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
   [724] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3
   [725] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2
   [726] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2
   to:bitmap_line_xdyd::@3
-bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@5
+bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@4
   [727] (byte) bitmap_line_xdyd::y#2 ← -- (byte) bitmap_line_xdyd::y#3
   [728] (byte) bitmap_line_xdyd::e#2 ← (byte) bitmap_line_xdyd::e#1 - (byte) bitmap_line_xdyd::xd#5
   to:bitmap_line_xdyd::@2
-bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5
-  [729] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::e#1 )
-  [729] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::y#3 )
+bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4
+  [729] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::e#1 )
+  [729] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::y#3 )
   [730] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6 ← (byte) bitmap_line_xdyd::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [731] if((byte) bitmap_line_xdyd::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6) goto bitmap_line_xdyd::@1
   to:bitmap_line_xdyd::@return
 bitmap_line_xdyd::@return: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@2
   [732] return 
   to:@return
-bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@17 bitmap_line::@8
-  [733] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y1#1 )
-  [733] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::yd#1 )
-  [733] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y#1 )
-  [733] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::x#0 bitmap_line::@8/(byte) bitmap_line_ydxd::x#1 )
-  [733] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::xd#1 )
+bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@10 bitmap_line::@6
+  [733] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y1#1 )
+  [733] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::yd#1 )
+  [733] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y#1 )
+  [733] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::x#0 bitmap_line::@6/(byte) bitmap_line_ydxd::x#1 )
+  [733] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::xd#1 )
   [734] (byte) bitmap_line_ydxd::e#0 ← (byte) bitmap_line_ydxd::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxd::@1
 bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_line_ydxd::@2
@@ -11441,26 +11602,26 @@ bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_lin
   [736] (byte) bitmap_plot::x#3 ← (byte) bitmap_line_ydxd::x#3
   [737] (byte) bitmap_plot::y#3 ← (byte) bitmap_line_ydxd::y#2
   [738] call bitmap_plot 
-  to:bitmap_line_ydxd::@5
-bitmap_line_ydxd::@5: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
+  to:bitmap_line_ydxd::@4
+bitmap_line_ydxd::@4: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
   [739] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2
   [740] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2
   [741] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2
   to:bitmap_line_ydxd::@3
-bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@5
+bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@4
   [742] (byte) bitmap_line_ydxd::x#2 ← -- (byte) bitmap_line_ydxd::x#3
   [743] (byte) bitmap_line_ydxd::e#2 ← (byte) bitmap_line_ydxd::e#1 - (byte) bitmap_line_ydxd::yd#5
   to:bitmap_line_ydxd::@2
-bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5
-  [744] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::e#1 )
-  [744] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::x#3 )
+bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4
+  [744] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::e#1 )
+  [744] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::x#3 )
   [745] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6 ← (byte) bitmap_line_ydxd::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [746] if((byte) bitmap_line_ydxd::y#3!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6) goto bitmap_line_ydxd::@1
   to:bitmap_line_ydxd::@return
 bitmap_line_ydxd::@return: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@2
   [747] return 
   to:@return
-bitmap_clear: scope:[bitmap_clear]  from gfx_init_vic_bitmap::@3
+bitmap_clear: scope:[bitmap_clear]  from gfx_init_vic_bitmap::@2
   [748] (word~) bitmap_clear::$3 ← *((const byte[$100]) bitmap_plot_xhi#0) w= *((const byte[$100]) bitmap_plot_xlo#0)
   [749] (byte*~) bitmap_clear::bitmap#5 ← (byte*)(word~) bitmap_clear::$3
   to:bitmap_clear::@1
@@ -11494,16 +11655,16 @@ bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
   [763] *((const byte[$100]) bitmap_plot_xhi#0 + (byte) bitmap_init::x#2) ← >(const byte*) VIC_BITMAP#0
   [764] *((const byte[$100]) bitmap_plot_bit#0 + (byte) bitmap_init::x#2) ← (byte) bitmap_init::bits#3
   [765] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [766] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10
+  [766] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6
   to:bitmap_init::@2
-bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@10
-  [767] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@10/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
+bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@6
+  [767] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@6/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
   [768] (byte) bitmap_init::x#1 ← ++ (byte) bitmap_init::x#2
   [769] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1
-  to:bitmap_init::@5
-bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
-  [770] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte*) bitmap_init::yoffs#4 )
-  [770] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte) bitmap_init::y#1 )
+  to:bitmap_init::@3
+bitmap_init::@3: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@4
+  [770] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte*) bitmap_init::yoffs#4 )
+  [770] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte) bitmap_init::y#1 )
   [771] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [772] (byte~) bitmap_init::$7 ← < (byte*) bitmap_init::yoffs#2
   [773] (byte~) bitmap_init::$8 ← (byte~) bitmap_init::$6 | (byte~) bitmap_init::$7
@@ -11511,20 +11672,20 @@ bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
   [775] (byte~) bitmap_init::$9 ← > (byte*) bitmap_init::yoffs#2
   [776] *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_init::y#2) ← (byte~) bitmap_init::$9
   [777] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [778] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6
-  to:bitmap_init::@7
-bitmap_init::@7: scope:[bitmap_init]  from bitmap_init::@5
+  [778] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4
+  to:bitmap_init::@5
+bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@3
   [779] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:bitmap_init::@6
-bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@5 bitmap_init::@7
-  [780] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@5/(byte*) bitmap_init::yoffs#2 bitmap_init::@7/(byte*) bitmap_init::yoffs#1 )
+  to:bitmap_init::@4
+bitmap_init::@4: scope:[bitmap_init]  from bitmap_init::@3 bitmap_init::@5
+  [780] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@3/(byte*) bitmap_init::yoffs#2 bitmap_init::@5/(byte*) bitmap_init::yoffs#1 )
   [781] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2
-  [782] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5
+  [782] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3
   to:bitmap_init::@return
-bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@6
+bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@4
   [783] return 
   to:@return
-bitmap_init::@10: scope:[bitmap_init]  from bitmap_init::@1
+bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@1
   [784] phi()
   to:bitmap_init::@2
 gfx_init_charset: scope:[gfx_init_charset]  from gfx_init::@5
@@ -13740,15 +13901,15 @@ INITIAL ASM
   .label form_field_idx = $20
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @68 [phi:@begin->@68]
-b68_from_bbegin:
-  jmp b68
-//SEG5 @68
-b68:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @68 to @end [phi:@68->@end]
-bend_from_b68:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -13770,24 +13931,24 @@ main: {
     sta DTV_FEATURE
   //SEG14 [8] call keyboard_init 
     jsr keyboard_init
-  //SEG15 [9] phi from main to main::@7 [phi:main->main::@7]
-  b7_from_main:
-    jmp b7
-  //SEG16 main::@7
-  b7:
+  //SEG15 [9] phi from main to main::@3 [phi:main->main::@3]
+  b3_from_main:
+    jmp b3
+  //SEG16 main::@3
+  b3:
   //SEG17 [10] call gfx_init 
-  //SEG18 [449] phi from main::@7 to gfx_init [phi:main::@7->gfx_init]
-  gfx_init_from_b7:
+  //SEG18 [449] phi from main::@3 to gfx_init [phi:main::@3->gfx_init]
+  gfx_init_from_b3:
     jsr gfx_init
-  //SEG19 [11] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG20 [11] phi (byte) form_field_idx#1 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@1#0] -- vbuz1=vbuc1 
+  //SEG19 [11] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG20 [11] phi (byte) form_field_idx#1 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta form_field_idx
-  //SEG21 [11] phi (byte) keyboard_events_size#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@1#1] -- vbuz1=vbuc1 
+  //SEG21 [11] phi (byte) keyboard_events_size#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta keyboard_events_size
-  //SEG22 [11] phi (signed byte) form_cursor_count#1 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@7->main::@1#2] -- vbsz1=vbuc1 
+  //SEG22 [11] phi (signed byte) form_cursor_count#1 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@3->main::@1#2] -- vbsz1=vbuc1 
     lda #FORM_CURSOR_BLINK/2
     sta form_cursor_count
     jmp b1
@@ -13802,18 +13963,18 @@ main: {
   //SEG27 [254] phi from main::@2 to form_mode [phi:main::@2->form_mode]
   form_mode_from_b2:
     jsr form_mode
-  //SEG28 [14] phi from main::@2 to main::@9 [phi:main::@2->main::@9]
-  b9_from_b2:
-    jmp b9
-  //SEG29 main::@9
-  b9:
+  //SEG28 [14] phi from main::@2 to main::@4 [phi:main::@2->main::@4]
+  b4_from_b2:
+    jmp b4
+  //SEG29 main::@4
+  b4:
   //SEG30 [15] call gfx_mode 
     jsr gfx_mode
-  //SEG31 [11] phi from main::@9 to main::@1 [phi:main::@9->main::@1]
-  b1_from_b9:
-  //SEG32 [11] phi (byte) form_field_idx#1 = (byte) form_field_idx#18 [phi:main::@9->main::@1#0] -- register_copy 
-  //SEG33 [11] phi (byte) keyboard_events_size#27 = (byte) keyboard_events_size#24 [phi:main::@9->main::@1#1] -- register_copy 
-  //SEG34 [11] phi (signed byte) form_cursor_count#1 = (signed byte) form_cursor_count#16 [phi:main::@9->main::@1#2] -- register_copy 
+  //SEG31 [11] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG32 [11] phi (byte) form_field_idx#1 = (byte) form_field_idx#18 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG33 [11] phi (byte) keyboard_events_size#27 = (byte) keyboard_events_size#24 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG34 [11] phi (signed byte) form_cursor_count#1 = (signed byte) form_cursor_count#16 [phi:main::@4->main::@1#2] -- register_copy 
     jmp b1
 }
 //SEG35 gfx_mode
@@ -13878,14 +14039,14 @@ gfx_mode: {
     lda form_ctrl_line
     cmp #0
     beq b1_from_gfx_mode
-  //SEG37 [17] phi from gfx_mode to gfx_mode::@15 [phi:gfx_mode->gfx_mode::@15]
-  b15_from_gfx_mode:
-    jmp b15
-  //SEG38 gfx_mode::@15
-  b15:
-  //SEG39 [18] phi from gfx_mode::@15 to gfx_mode::@1 [phi:gfx_mode::@15->gfx_mode::@1]
-  b1_from_b15:
-  //SEG40 [18] phi (byte) gfx_mode::dtv_control#14 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) DTV_LINEAR#0 [phi:gfx_mode::@15->gfx_mode::@1#0] -- vbuz1=vbuc1 
+  //SEG37 [17] phi from gfx_mode to gfx_mode::@10 [phi:gfx_mode->gfx_mode::@10]
+  b10_from_gfx_mode:
+    jmp b10
+  //SEG38 gfx_mode::@10
+  b10:
+  //SEG39 [18] phi from gfx_mode::@10 to gfx_mode::@1 [phi:gfx_mode::@10->gfx_mode::@1]
+  b1_from_b10:
+  //SEG40 [18] phi (byte) gfx_mode::dtv_control#14 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) DTV_LINEAR#0 [phi:gfx_mode::@10->gfx_mode::@1#0] -- vbuz1=vbuc1 
     lda #0|DTV_LINEAR
     sta dtv_control
     jmp b1
@@ -13901,17 +14062,17 @@ gfx_mode: {
     lda form_ctrl_borof
     cmp #0
     beq b2_from_b1
-    jmp b16
-  //SEG45 gfx_mode::@16
-  b16:
+    jmp b11
+  //SEG45 gfx_mode::@11
+  b11:
   //SEG46 [20] (byte) gfx_mode::dtv_control#2 ← (byte) gfx_mode::dtv_control#14 | (const byte) DTV_BORDER_OFF#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #DTV_BORDER_OFF
     ora dtv_control
     sta dtv_control
-  //SEG47 [21] phi from gfx_mode::@1 gfx_mode::@16 to gfx_mode::@2 [phi:gfx_mode::@1/gfx_mode::@16->gfx_mode::@2]
+  //SEG47 [21] phi from gfx_mode::@1 gfx_mode::@11 to gfx_mode::@2 [phi:gfx_mode::@1/gfx_mode::@11->gfx_mode::@2]
   b2_from_b1:
-  b2_from_b16:
-  //SEG48 [21] phi (byte) gfx_mode::dtv_control#15 = (byte) gfx_mode::dtv_control#14 [phi:gfx_mode::@1/gfx_mode::@16->gfx_mode::@2#0] -- register_copy 
+  b2_from_b11:
+  //SEG48 [21] phi (byte) gfx_mode::dtv_control#15 = (byte) gfx_mode::dtv_control#14 [phi:gfx_mode::@1/gfx_mode::@11->gfx_mode::@2#0] -- register_copy 
     jmp b2
   //SEG49 gfx_mode::@2
   b2:
@@ -13919,17 +14080,17 @@ gfx_mode: {
     lda form_ctrl_hicol
     cmp #0
     beq b3_from_b2
-    jmp b17
-  //SEG51 gfx_mode::@17
-  b17:
+    jmp b12
+  //SEG51 gfx_mode::@12
+  b12:
   //SEG52 [23] (byte) gfx_mode::dtv_control#3 ← (byte) gfx_mode::dtv_control#15 | (const byte) DTV_HIGHCOLOR#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #DTV_HIGHCOLOR
     ora dtv_control
     sta dtv_control
-  //SEG53 [24] phi from gfx_mode::@17 gfx_mode::@2 to gfx_mode::@3 [phi:gfx_mode::@17/gfx_mode::@2->gfx_mode::@3]
-  b3_from_b17:
+  //SEG53 [24] phi from gfx_mode::@12 gfx_mode::@2 to gfx_mode::@3 [phi:gfx_mode::@12/gfx_mode::@2->gfx_mode::@3]
+  b3_from_b12:
   b3_from_b2:
-  //SEG54 [24] phi (byte) gfx_mode::dtv_control#10 = (byte) gfx_mode::dtv_control#3 [phi:gfx_mode::@17/gfx_mode::@2->gfx_mode::@3#0] -- register_copy 
+  //SEG54 [24] phi (byte) gfx_mode::dtv_control#10 = (byte) gfx_mode::dtv_control#3 [phi:gfx_mode::@12/gfx_mode::@2->gfx_mode::@3#0] -- register_copy 
     jmp b3
   //SEG55 gfx_mode::@3
   b3:
@@ -13937,17 +14098,17 @@ gfx_mode: {
     lda form_ctrl_overs
     cmp #0
     beq b4_from_b3
-    jmp b18
-  //SEG57 gfx_mode::@18
-  b18:
+    jmp b13
+  //SEG57 gfx_mode::@13
+  b13:
   //SEG58 [26] (byte) gfx_mode::dtv_control#4 ← (byte) gfx_mode::dtv_control#10 | (const byte) DTV_OVERSCAN#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #DTV_OVERSCAN
     ora dtv_control
     sta dtv_control
-  //SEG59 [27] phi from gfx_mode::@18 gfx_mode::@3 to gfx_mode::@4 [phi:gfx_mode::@18/gfx_mode::@3->gfx_mode::@4]
-  b4_from_b18:
+  //SEG59 [27] phi from gfx_mode::@13 gfx_mode::@3 to gfx_mode::@4 [phi:gfx_mode::@13/gfx_mode::@3->gfx_mode::@4]
+  b4_from_b13:
   b4_from_b3:
-  //SEG60 [27] phi (byte) gfx_mode::dtv_control#11 = (byte) gfx_mode::dtv_control#4 [phi:gfx_mode::@18/gfx_mode::@3->gfx_mode::@4#0] -- register_copy 
+  //SEG60 [27] phi (byte) gfx_mode::dtv_control#11 = (byte) gfx_mode::dtv_control#4 [phi:gfx_mode::@13/gfx_mode::@3->gfx_mode::@4#0] -- register_copy 
     jmp b4
   //SEG61 gfx_mode::@4
   b4:
@@ -13955,17 +14116,17 @@ gfx_mode: {
     lda form_ctrl_colof
     cmp #0
     beq b5_from_b4
-    jmp b19
-  //SEG63 gfx_mode::@19
-  b19:
+    jmp b14
+  //SEG63 gfx_mode::@14
+  b14:
   //SEG64 [29] (byte) gfx_mode::dtv_control#5 ← (byte) gfx_mode::dtv_control#11 | (const byte) DTV_COLORRAM_OFF#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #DTV_COLORRAM_OFF
     ora dtv_control
     sta dtv_control
-  //SEG65 [30] phi from gfx_mode::@19 gfx_mode::@4 to gfx_mode::@5 [phi:gfx_mode::@19/gfx_mode::@4->gfx_mode::@5]
-  b5_from_b19:
+  //SEG65 [30] phi from gfx_mode::@14 gfx_mode::@4 to gfx_mode::@5 [phi:gfx_mode::@14/gfx_mode::@4->gfx_mode::@5]
+  b5_from_b14:
   b5_from_b4:
-  //SEG66 [30] phi (byte) gfx_mode::dtv_control#13 = (byte) gfx_mode::dtv_control#5 [phi:gfx_mode::@19/gfx_mode::@4->gfx_mode::@5#0] -- register_copy 
+  //SEG66 [30] phi (byte) gfx_mode::dtv_control#13 = (byte) gfx_mode::dtv_control#5 [phi:gfx_mode::@14/gfx_mode::@4->gfx_mode::@5#0] -- register_copy 
     jmp b5
   //SEG67 gfx_mode::@5
   b5:
@@ -13973,17 +14134,17 @@ gfx_mode: {
     lda form_ctrl_chunk
     cmp #0
     beq b6_from_b5
-    jmp b20
-  //SEG69 gfx_mode::@20
-  b20:
+    jmp b15
+  //SEG69 gfx_mode::@15
+  b15:
   //SEG70 [32] (byte) gfx_mode::dtv_control#6 ← (byte) gfx_mode::dtv_control#13 | (const byte) DTV_CHUNKY#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #DTV_CHUNKY
     ora dtv_control
     sta dtv_control
-  //SEG71 [33] phi from gfx_mode::@20 gfx_mode::@5 to gfx_mode::@6 [phi:gfx_mode::@20/gfx_mode::@5->gfx_mode::@6]
-  b6_from_b20:
+  //SEG71 [33] phi from gfx_mode::@15 gfx_mode::@5 to gfx_mode::@6 [phi:gfx_mode::@15/gfx_mode::@5->gfx_mode::@6]
+  b6_from_b15:
   b6_from_b5:
-  //SEG72 [33] phi (byte) gfx_mode::dtv_control#12 = (byte) gfx_mode::dtv_control#6 [phi:gfx_mode::@20/gfx_mode::@5->gfx_mode::@6#0] -- register_copy 
+  //SEG72 [33] phi (byte) gfx_mode::dtv_control#12 = (byte) gfx_mode::dtv_control#6 [phi:gfx_mode::@15/gfx_mode::@5->gfx_mode::@6#0] -- register_copy 
     jmp b6
   //SEG73 gfx_mode::@6
   b6:
@@ -13994,14 +14155,14 @@ gfx_mode: {
     lda form_ctrl_ecm
     cmp #0
     beq b7_from_b6
-  //SEG76 [36] phi from gfx_mode::@6 to gfx_mode::@21 [phi:gfx_mode::@6->gfx_mode::@21]
-  b21_from_b6:
-    jmp b21
-  //SEG77 gfx_mode::@21
-  b21:
-  //SEG78 [37] phi from gfx_mode::@21 to gfx_mode::@7 [phi:gfx_mode::@21->gfx_mode::@7]
-  b7_from_b21:
-  //SEG79 [37] phi (byte) gfx_mode::vic_control#5 = (const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3|(const byte) VIC_ECM#0 [phi:gfx_mode::@21->gfx_mode::@7#0] -- vbuz1=vbuc1 
+  //SEG76 [36] phi from gfx_mode::@6 to gfx_mode::@16 [phi:gfx_mode::@6->gfx_mode::@16]
+  b16_from_b6:
+    jmp b16
+  //SEG77 gfx_mode::@16
+  b16:
+  //SEG78 [37] phi from gfx_mode::@16 to gfx_mode::@7 [phi:gfx_mode::@16->gfx_mode::@7]
+  b7_from_b16:
+  //SEG79 [37] phi (byte) gfx_mode::vic_control#5 = (const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3|(const byte) VIC_ECM#0 [phi:gfx_mode::@16->gfx_mode::@7#0] -- vbuz1=vbuc1 
     lda #VIC_DEN|VIC_RSEL|3|VIC_ECM
     sta vic_control
     jmp b7
@@ -14017,17 +14178,17 @@ gfx_mode: {
     lda form_ctrl_bmm
     cmp #0
     beq b8_from_b7
-    jmp b22
-  //SEG84 gfx_mode::@22
-  b22:
+    jmp b17
+  //SEG84 gfx_mode::@17
+  b17:
   //SEG85 [39] (byte) gfx_mode::vic_control#2 ← (byte) gfx_mode::vic_control#5 | (const byte) VIC_BMM#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #VIC_BMM
     ora vic_control
     sta vic_control
-  //SEG86 [40] phi from gfx_mode::@22 gfx_mode::@7 to gfx_mode::@8 [phi:gfx_mode::@22/gfx_mode::@7->gfx_mode::@8]
-  b8_from_b22:
+  //SEG86 [40] phi from gfx_mode::@17 gfx_mode::@7 to gfx_mode::@8 [phi:gfx_mode::@17/gfx_mode::@7->gfx_mode::@8]
+  b8_from_b17:
   b8_from_b7:
-  //SEG87 [40] phi (byte) gfx_mode::vic_control#4 = (byte) gfx_mode::vic_control#2 [phi:gfx_mode::@22/gfx_mode::@7->gfx_mode::@8#0] -- register_copy 
+  //SEG87 [40] phi (byte) gfx_mode::vic_control#4 = (byte) gfx_mode::vic_control#2 [phi:gfx_mode::@17/gfx_mode::@7->gfx_mode::@8#0] -- register_copy 
     jmp b8
   //SEG88 gfx_mode::@8
   b8:
@@ -14038,14 +14199,14 @@ gfx_mode: {
     lda form_ctrl_mcm
     cmp #0
     beq b9_from_b8
-  //SEG91 [43] phi from gfx_mode::@8 to gfx_mode::@23 [phi:gfx_mode::@8->gfx_mode::@23]
-  b23_from_b8:
-    jmp b23
-  //SEG92 gfx_mode::@23
-  b23:
-  //SEG93 [44] phi from gfx_mode::@23 to gfx_mode::@9 [phi:gfx_mode::@23->gfx_mode::@9]
-  b9_from_b23:
-  //SEG94 [44] phi (byte) gfx_mode::vic_control2#2 = (const byte) VIC_CSEL#0|(const byte) VIC_MCM#0 [phi:gfx_mode::@23->gfx_mode::@9#0] -- vbuz1=vbuc1 
+  //SEG91 [43] phi from gfx_mode::@8 to gfx_mode::@18 [phi:gfx_mode::@8->gfx_mode::@18]
+  b18_from_b8:
+    jmp b18
+  //SEG92 gfx_mode::@18
+  b18:
+  //SEG93 [44] phi from gfx_mode::@18 to gfx_mode::@9 [phi:gfx_mode::@18->gfx_mode::@9]
+  b9_from_b18:
+  //SEG94 [44] phi (byte) gfx_mode::vic_control2#2 = (const byte) VIC_CSEL#0|(const byte) VIC_MCM#0 [phi:gfx_mode::@18->gfx_mode::@9#0] -- vbuz1=vbuc1 
     lda #VIC_CSEL|VIC_MCM
     sta vic_control2
     jmp b9
@@ -14088,9 +14249,9 @@ gfx_mode: {
     sta get_plane.return_16+2
     lda get_plane.return+3
     sta get_plane.return_16+3
-    jmp b46
-  //SEG106 gfx_mode::@46
-  b46:
+    jmp b27
+  //SEG106 gfx_mode::@27
+  b27:
   //SEG107 [51] (dword~) gfx_mode::$22 ← (dword) get_plane::return#16 -- vduz1=vduz2 
     lda get_plane.return_16
     sta _22
@@ -14193,9 +14354,9 @@ gfx_mode: {
     lda form_b_pattern
     sta get_plane.idx
   //SEG128 [72] call get_plane 
-  //SEG129 [236] phi from gfx_mode::@46 to get_plane [phi:gfx_mode::@46->get_plane]
-  get_plane_from_b46:
-  //SEG130 [236] phi (byte) get_plane::idx#10 = (byte) get_plane::idx#1 [phi:gfx_mode::@46->get_plane#0] -- register_copy 
+  //SEG129 [236] phi from gfx_mode::@27 to get_plane [phi:gfx_mode::@27->get_plane]
+  get_plane_from_b27:
+  //SEG130 [236] phi (byte) get_plane::idx#10 = (byte) get_plane::idx#1 [phi:gfx_mode::@27->get_plane#0] -- register_copy 
     jsr get_plane
   //SEG131 [73] (dword) get_plane::return#17 ← (dword) get_plane::return#14 -- vduz1=vduz2 
     lda get_plane.return
@@ -14206,9 +14367,9 @@ gfx_mode: {
     sta get_plane.return_17+2
     lda get_plane.return+3
     sta get_plane.return_17+3
-    jmp b47
-  //SEG132 gfx_mode::@47
-  b47:
+    jmp b28
+  //SEG132 gfx_mode::@28
+  b28:
   //SEG133 [74] (dword~) gfx_mode::$36 ← (dword) get_plane::return#17 -- vduz1=vduz2 
     lda get_plane.return_17
     sta _36
@@ -14308,18 +14469,18 @@ gfx_mode: {
     lda form_vic_screen
     sta get_vic_screen.idx
   //SEG154 [95] call get_vic_screen 
-  //SEG155 [222] phi from gfx_mode::@47 to get_vic_screen [phi:gfx_mode::@47->get_vic_screen]
-  get_vic_screen_from_b47:
-  //SEG156 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#0 [phi:gfx_mode::@47->get_vic_screen#0] -- register_copy 
+  //SEG155 [222] phi from gfx_mode::@28 to get_vic_screen [phi:gfx_mode::@28->get_vic_screen]
+  get_vic_screen_from_b28:
+  //SEG156 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#0 [phi:gfx_mode::@28->get_vic_screen#0] -- register_copy 
     jsr get_vic_screen
   //SEG157 [96] (byte*) get_vic_screen::return#10 ← (byte*) get_vic_screen::return#5 -- pbuz1=pbuz2 
     lda get_vic_screen.return
     sta get_vic_screen.return_10
     lda get_vic_screen.return+1
     sta get_vic_screen.return_10+1
-    jmp b48
-  //SEG158 gfx_mode::@48
-  b48:
+    jmp b29
+  //SEG158 gfx_mode::@29
+  b29:
   //SEG159 [97] (byte*~) gfx_mode::$52 ← (byte*) get_vic_screen::return#10 -- pbuz1=pbuz2 
     lda get_vic_screen.return_10
     sta _52
@@ -14356,9 +14517,9 @@ gfx_mode: {
     sta get_vic_charset.return_4
     lda get_vic_charset.return+1
     sta get_vic_charset.return_4+1
-    jmp b49
-  //SEG166 gfx_mode::@49
-  b49:
+    jmp b30
+  //SEG166 gfx_mode::@30
+  b30:
   //SEG167 [104] (byte*~) gfx_mode::$57 ← (byte*) get_vic_charset::return#4 -- pbuz1=pbuz2 
     lda get_vic_charset.return_4
     sta _57
@@ -14392,59 +14553,59 @@ gfx_mode: {
     lda form_vic_cols
     sta get_vic_screen.idx
   //SEG174 [111] call get_vic_screen 
-  //SEG175 [222] phi from gfx_mode::@49 to get_vic_screen [phi:gfx_mode::@49->get_vic_screen]
-  get_vic_screen_from_b49:
-  //SEG176 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#1 [phi:gfx_mode::@49->get_vic_screen#0] -- register_copy 
+  //SEG175 [222] phi from gfx_mode::@30 to get_vic_screen [phi:gfx_mode::@30->get_vic_screen]
+  get_vic_screen_from_b30:
+  //SEG176 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#1 [phi:gfx_mode::@30->get_vic_screen#0] -- register_copy 
     jsr get_vic_screen
   //SEG177 [112] (byte*) get_vic_screen::return#11 ← (byte*) get_vic_screen::return#5 -- pbuz1=pbuz2 
     lda get_vic_screen.return
     sta get_vic_screen.return_11
     lda get_vic_screen.return+1
     sta get_vic_screen.return_11+1
-    jmp b50
-  //SEG178 gfx_mode::@50
-  b50:
+    jmp b31
+  //SEG178 gfx_mode::@31
+  b31:
   //SEG179 [113] (byte*) gfx_mode::vic_colors#0 ← (byte*) get_vic_screen::return#11 -- pbuz1=pbuz2 
     lda get_vic_screen.return_11
     sta vic_colors
     lda get_vic_screen.return_11+1
     sta vic_colors+1
-  //SEG180 [114] phi from gfx_mode::@50 to gfx_mode::@26 [phi:gfx_mode::@50->gfx_mode::@26]
-  b26_from_b50:
-  //SEG181 [114] phi (byte) gfx_mode::cy#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@50->gfx_mode::@26#0] -- vbuz1=vbuc1 
+  //SEG180 [114] phi from gfx_mode::@31 to gfx_mode::@19 [phi:gfx_mode::@31->gfx_mode::@19]
+  b19_from_b31:
+  //SEG181 [114] phi (byte) gfx_mode::cy#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@31->gfx_mode::@19#0] -- vbuz1=vbuc1 
     lda #0
     sta cy
-  //SEG182 [114] phi (byte*) gfx_mode::col#3 = (const byte*) COLS#0 [phi:gfx_mode::@50->gfx_mode::@26#1] -- pbuz1=pbuc1 
+  //SEG182 [114] phi (byte*) gfx_mode::col#3 = (const byte*) COLS#0 [phi:gfx_mode::@31->gfx_mode::@19#1] -- pbuz1=pbuc1 
     lda #<COLS
     sta col
     lda #>COLS
     sta col+1
-  //SEG183 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#0 [phi:gfx_mode::@50->gfx_mode::@26#2] -- register_copy 
-    jmp b26
-  //SEG184 [114] phi from gfx_mode::@28 to gfx_mode::@26 [phi:gfx_mode::@28->gfx_mode::@26]
-  b26_from_b28:
-  //SEG185 [114] phi (byte) gfx_mode::cy#4 = (byte) gfx_mode::cy#1 [phi:gfx_mode::@28->gfx_mode::@26#0] -- register_copy 
-  //SEG186 [114] phi (byte*) gfx_mode::col#3 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@28->gfx_mode::@26#1] -- register_copy 
-  //SEG187 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@28->gfx_mode::@26#2] -- register_copy 
-    jmp b26
-  //SEG188 gfx_mode::@26
-  b26:
-  //SEG189 [115] phi from gfx_mode::@26 to gfx_mode::@27 [phi:gfx_mode::@26->gfx_mode::@27]
-  b27_from_b26:
-  //SEG190 [115] phi (byte) gfx_mode::cx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@26->gfx_mode::@27#0] -- vbuz1=vbuc1 
+  //SEG183 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#0 [phi:gfx_mode::@31->gfx_mode::@19#2] -- register_copy 
+    jmp b19
+  //SEG184 [114] phi from gfx_mode::@21 to gfx_mode::@19 [phi:gfx_mode::@21->gfx_mode::@19]
+  b19_from_b21:
+  //SEG185 [114] phi (byte) gfx_mode::cy#4 = (byte) gfx_mode::cy#1 [phi:gfx_mode::@21->gfx_mode::@19#0] -- register_copy 
+  //SEG186 [114] phi (byte*) gfx_mode::col#3 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@21->gfx_mode::@19#1] -- register_copy 
+  //SEG187 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@21->gfx_mode::@19#2] -- register_copy 
+    jmp b19
+  //SEG188 gfx_mode::@19
+  b19:
+  //SEG189 [115] phi from gfx_mode::@19 to gfx_mode::@20 [phi:gfx_mode::@19->gfx_mode::@20]
+  b20_from_b19:
+  //SEG190 [115] phi (byte) gfx_mode::cx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@19->gfx_mode::@20#0] -- vbuz1=vbuc1 
     lda #0
     sta cx
-  //SEG191 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#3 [phi:gfx_mode::@26->gfx_mode::@27#1] -- register_copy 
-  //SEG192 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#3 [phi:gfx_mode::@26->gfx_mode::@27#2] -- register_copy 
-    jmp b27
-  //SEG193 [115] phi from gfx_mode::@27 to gfx_mode::@27 [phi:gfx_mode::@27->gfx_mode::@27]
-  b27_from_b27:
-  //SEG194 [115] phi (byte) gfx_mode::cx#2 = (byte) gfx_mode::cx#1 [phi:gfx_mode::@27->gfx_mode::@27#0] -- register_copy 
-  //SEG195 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@27->gfx_mode::@27#1] -- register_copy 
-  //SEG196 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@27->gfx_mode::@27#2] -- register_copy 
-    jmp b27
-  //SEG197 gfx_mode::@27
-  b27:
+  //SEG191 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#3 [phi:gfx_mode::@19->gfx_mode::@20#1] -- register_copy 
+  //SEG192 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#3 [phi:gfx_mode::@19->gfx_mode::@20#2] -- register_copy 
+    jmp b20
+  //SEG193 [115] phi from gfx_mode::@20 to gfx_mode::@20 [phi:gfx_mode::@20->gfx_mode::@20]
+  b20_from_b20:
+  //SEG194 [115] phi (byte) gfx_mode::cx#2 = (byte) gfx_mode::cx#1 [phi:gfx_mode::@20->gfx_mode::@20#0] -- register_copy 
+  //SEG195 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@20->gfx_mode::@20#1] -- register_copy 
+  //SEG196 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@20->gfx_mode::@20#2] -- register_copy 
+    jmp b20
+  //SEG197 gfx_mode::@20
+  b20:
   //SEG198 [116] *((byte*) gfx_mode::col#2) ← *((byte*) gfx_mode::vic_colors#2) -- _deref_pbuz1=_deref_pbuz2 
     ldy #0
     lda (vic_colors),y
@@ -14462,22 +14623,22 @@ gfx_mode: {
   !:
   //SEG201 [119] (byte) gfx_mode::cx#1 ← ++ (byte) gfx_mode::cx#2 -- vbuz1=_inc_vbuz1 
     inc cx
-  //SEG202 [120] if((byte) gfx_mode::cx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_mode::@27 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG202 [120] if((byte) gfx_mode::cx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_mode::@20 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp cx
-    bne b27_from_b27
-    jmp b28
-  //SEG203 gfx_mode::@28
-  b28:
+    bne b20_from_b20
+    jmp b21
+  //SEG203 gfx_mode::@21
+  b21:
   //SEG204 [121] (byte) gfx_mode::cy#1 ← ++ (byte) gfx_mode::cy#4 -- vbuz1=_inc_vbuz1 
     inc cy
-  //SEG205 [122] if((byte) gfx_mode::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto gfx_mode::@26 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG205 [122] if((byte) gfx_mode::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto gfx_mode::@19 -- vbuz1_neq_vbuc1_then_la1 
     lda #$19
     cmp cy
-    bne b26_from_b28
-    jmp b29
-  //SEG206 gfx_mode::@29
-  b29:
+    bne b19_from_b21
+    jmp b22
+  //SEG206 gfx_mode::@22
+  b22:
   //SEG207 [123] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Background colors
     lda #0
@@ -14538,100 +14699,100 @@ gfx_mode: {
   //SEG219 [135] *((const byte*) BGCOL4#0) ← (byte~) gfx_mode::$71 -- _deref_pbuc1=vbuz1 
     lda _71
     sta BGCOL4
-  //SEG220 [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@34 -- _deref_pbuc1_eq_0_then_la1 
+  //SEG220 [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@24 -- _deref_pbuc1_eq_0_then_la1 
     // DTV Palette
     lda form_dtv_palet
     cmp #0
-    beq b34_from_b29
-  //SEG221 [137] phi from gfx_mode::@29 to gfx_mode::@31 [phi:gfx_mode::@29->gfx_mode::@31]
-  b31_from_b29:
-  //SEG222 [137] phi (byte) gfx_mode::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@29->gfx_mode::@31#0] -- vbuz1=vbuc1 
+    beq b24_from_b22
+  //SEG221 [137] phi from gfx_mode::@22 to gfx_mode::@23 [phi:gfx_mode::@22->gfx_mode::@23]
+  b23_from_b22:
+  //SEG222 [137] phi (byte) gfx_mode::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@22->gfx_mode::@23#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-    jmp b31
+    jmp b23
   // DTV Palette - Grey Tones
-  //SEG223 [137] phi from gfx_mode::@31 to gfx_mode::@31 [phi:gfx_mode::@31->gfx_mode::@31]
-  b31_from_b31:
-  //SEG224 [137] phi (byte) gfx_mode::j#2 = (byte) gfx_mode::j#1 [phi:gfx_mode::@31->gfx_mode::@31#0] -- register_copy 
-    jmp b31
-  //SEG225 gfx_mode::@31
-  b31:
+  //SEG223 [137] phi from gfx_mode::@23 to gfx_mode::@23 [phi:gfx_mode::@23->gfx_mode::@23]
+  b23_from_b23:
+  //SEG224 [137] phi (byte) gfx_mode::j#2 = (byte) gfx_mode::j#1 [phi:gfx_mode::@23->gfx_mode::@23#0] -- register_copy 
+    jmp b23
+  //SEG225 gfx_mode::@23
+  b23:
   //SEG226 [138] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::j#2) ← (byte) gfx_mode::j#2 -- pbuc1_derefidx_vbuz1=vbuz1 
     ldy j
     tya
     sta DTV_PALETTE,y
   //SEG227 [139] (byte) gfx_mode::j#1 ← ++ (byte) gfx_mode::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG228 [140] if((byte) gfx_mode::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@31 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG228 [140] if((byte) gfx_mode::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@23 -- vbuz1_neq_vbuc1_then_la1 
     lda #$10
     cmp j
-    bne b31_from_b31
-    jmp b36
-  //SEG229 gfx_mode::@36
-  b36:
-  //SEG230 [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@36 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b23_from_b23
+    jmp b25
+  //SEG229 gfx_mode::@25
+  b25:
+  //SEG230 [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@25 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b36
-  //SEG231 [142] phi from gfx_mode::@36 to gfx_mode::@38 [phi:gfx_mode::@36->gfx_mode::@38]
-  b38_from_b36:
-    jmp b38
-  //SEG232 gfx_mode::@38
-  b38:
+    bne b25
+  //SEG231 [142] phi from gfx_mode::@25 to gfx_mode::@26 [phi:gfx_mode::@25->gfx_mode::@26]
+  b26_from_b25:
+    jmp b26
+  //SEG232 gfx_mode::@26
+  b26:
   //SEG233 [143] call keyboard_event_scan 
-  //SEG234 [159] phi from gfx_mode::@38 to keyboard_event_scan [phi:gfx_mode::@38->keyboard_event_scan]
-  keyboard_event_scan_from_b38:
-  //SEG235 [159] phi (byte) keyboard_events_size#110 = (byte) keyboard_events_size#24 [phi:gfx_mode::@38->keyboard_event_scan#0] -- register_copy 
+  //SEG234 [159] phi from gfx_mode::@26 to keyboard_event_scan [phi:gfx_mode::@26->keyboard_event_scan]
+  keyboard_event_scan_from_b26:
+  //SEG235 [159] phi (byte) keyboard_events_size#110 = (byte) keyboard_events_size#24 [phi:gfx_mode::@26->keyboard_event_scan#0] -- register_copy 
     jsr keyboard_event_scan
-  //SEG236 [144] phi from gfx_mode::@38 to gfx_mode::@51 [phi:gfx_mode::@38->gfx_mode::@51]
-  b51_from_b38:
-    jmp b51
-  //SEG237 gfx_mode::@51
-  b51:
+  //SEG236 [144] phi from gfx_mode::@26 to gfx_mode::@32 [phi:gfx_mode::@26->gfx_mode::@32]
+  b32_from_b26:
+    jmp b32
+  //SEG237 gfx_mode::@32
+  b32:
   //SEG238 [145] call keyboard_event_get 
     jsr keyboard_event_get
   //SEG239 [146] (byte) keyboard_event_get::return#3 ← (byte) keyboard_event_get::return#2 -- vbuz1=vbuz2 
     lda keyboard_event_get.return
     sta keyboard_event_get.return_3
-    jmp b52
-  //SEG240 gfx_mode::@52
-  b52:
+    jmp b33
+  //SEG240 gfx_mode::@33
+  b33:
   //SEG241 [147] (byte) gfx_mode::keyboard_event#0 ← (byte) keyboard_event_get::return#3 -- vbuz1=vbuz2 
     lda keyboard_event_get.return_3
     sta keyboard_event
-  //SEG242 [148] if((byte) gfx_mode::keyboard_event#0!=(const byte) KEY_SPACE#0) goto gfx_mode::@36 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG242 [148] if((byte) gfx_mode::keyboard_event#0!=(const byte) KEY_SPACE#0) goto gfx_mode::@25 -- vbuz1_neq_vbuc1_then_la1 
     lda #KEY_SPACE
     cmp keyboard_event
-    bne b36
+    bne b25
     jmp breturn
   //SEG243 gfx_mode::@return
   breturn:
   //SEG244 [149] return 
     rts
   // DTV Palette - default
-  //SEG245 [150] phi from gfx_mode::@29 to gfx_mode::@34 [phi:gfx_mode::@29->gfx_mode::@34]
-  b34_from_b29:
-  //SEG246 [150] phi (byte) gfx_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@29->gfx_mode::@34#0] -- vbuz1=vbuc1 
+  //SEG245 [150] phi from gfx_mode::@22 to gfx_mode::@24 [phi:gfx_mode::@22->gfx_mode::@24]
+  b24_from_b22:
+  //SEG246 [150] phi (byte) gfx_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@22->gfx_mode::@24#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b34
-  //SEG247 [150] phi from gfx_mode::@34 to gfx_mode::@34 [phi:gfx_mode::@34->gfx_mode::@34]
-  b34_from_b34:
-  //SEG248 [150] phi (byte) gfx_mode::i#2 = (byte) gfx_mode::i#1 [phi:gfx_mode::@34->gfx_mode::@34#0] -- register_copy 
-    jmp b34
-  //SEG249 gfx_mode::@34
-  b34:
+    jmp b24
+  //SEG247 [150] phi from gfx_mode::@24 to gfx_mode::@24 [phi:gfx_mode::@24->gfx_mode::@24]
+  b24_from_b24:
+  //SEG248 [150] phi (byte) gfx_mode::i#2 = (byte) gfx_mode::i#1 [phi:gfx_mode::@24->gfx_mode::@24#0] -- register_copy 
+    jmp b24
+  //SEG249 gfx_mode::@24
+  b24:
   //SEG250 [151] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) gfx_mode::i#2) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz1 
     ldy i
     lda DTV_PALETTE_DEFAULT,y
     sta DTV_PALETTE,y
   //SEG251 [152] (byte) gfx_mode::i#1 ← ++ (byte) gfx_mode::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG252 [153] if((byte) gfx_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@34 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG252 [153] if((byte) gfx_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@24 -- vbuz1_neq_vbuc1_then_la1 
     lda #$10
     cmp i
-    bne b34_from_b34
-    jmp b36
+    bne b24_from_b24
+    jmp b25
 }
 //SEG253 keyboard_event_get
 // Get the next event from the keyboard event buffer.
@@ -14645,19 +14806,19 @@ keyboard_event_get: {
     lda keyboard_events_size
     cmp #0
     beq breturn_from_keyboard_event_get
-    jmp b3
-  //SEG255 keyboard_event_get::@3
-  b3:
+    jmp b1
+  //SEG255 keyboard_event_get::@1
+  b1:
   //SEG256 [155] (byte) keyboard_events_size#4 ← -- (byte) keyboard_events_size#100 -- vbuz1=_dec_vbuz1 
     dec keyboard_events_size
   //SEG257 [156] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4) -- vbuz1=pbuc1_derefidx_vbuz2 
     ldy keyboard_events_size
     lda keyboard_events,y
     sta return
-  //SEG258 [157] phi from keyboard_event_get::@3 to keyboard_event_get::@return [phi:keyboard_event_get::@3->keyboard_event_get::@return]
-  breturn_from_b3:
-  //SEG259 [157] phi (byte) keyboard_events_size#24 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@3->keyboard_event_get::@return#0] -- register_copy 
-  //SEG260 [157] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@3->keyboard_event_get::@return#1] -- register_copy 
+  //SEG258 [157] phi from keyboard_event_get::@1 to keyboard_event_get::@return [phi:keyboard_event_get::@1->keyboard_event_get::@return]
+  breturn_from_b1:
+  //SEG259 [157] phi (byte) keyboard_events_size#24 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@1->keyboard_event_get::@return#0] -- register_copy 
+  //SEG260 [157] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@1->keyboard_event_get::@return#1] -- register_copy 
     jmp breturn
   //SEG261 [157] phi from keyboard_event_get to keyboard_event_get::@return [phi:keyboard_event_get->keyboard_event_get::@return]
   breturn_from_keyboard_event_get:
@@ -14689,24 +14850,24 @@ keyboard_event_scan: {
     .label row = $e
     .label col = $10
     .label event_type = $100
-  //SEG267 [160] phi from keyboard_event_scan to keyboard_event_scan::@8 [phi:keyboard_event_scan->keyboard_event_scan::@8]
-  b8_from_keyboard_event_scan:
-  //SEG268 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#110 [phi:keyboard_event_scan->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG269 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#1] -- vbuz1=vbuc1 
+  //SEG267 [160] phi from keyboard_event_scan to keyboard_event_scan::@7 [phi:keyboard_event_scan->keyboard_event_scan::@7]
+  b7_from_keyboard_event_scan:
+  //SEG268 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#110 [phi:keyboard_event_scan->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG269 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#1] -- vbuz1=vbuc1 
     lda #0
     sta keycode
-  //SEG270 [160] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#2] -- vbuz1=vbuc1 
+  //SEG270 [160] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#2] -- vbuz1=vbuc1 
     lda #0
     sta row
-    jmp b8
-  //SEG271 [160] phi from keyboard_event_scan::@10 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8]
-  b8_from_b10:
-  //SEG272 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#100 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG273 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#1] -- register_copy 
-  //SEG274 [160] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#2] -- register_copy 
-    jmp b8
-  //SEG275 keyboard_event_scan::@8
-  b8:
+    jmp b7
+  //SEG271 [160] phi from keyboard_event_scan::@8 to keyboard_event_scan::@7 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7]
+  b7_from_b8:
+  //SEG272 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#100 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG273 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#1] -- register_copy 
+  //SEG274 [160] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#2] -- register_copy 
+    jmp b7
+  //SEG275 keyboard_event_scan::@7
+  b7:
   //SEG276 [161] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_event_scan::row#2 -- vbuz1=vbuz2 
     lda row
     sta keyboard_matrix_read.rowid
@@ -14715,77 +14876,77 @@ keyboard_event_scan: {
   //SEG278 [163] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return
     sta keyboard_matrix_read.return_2
-    jmp b25
-  //SEG279 keyboard_event_scan::@25
-  b25:
+    jmp b19
+  //SEG279 keyboard_event_scan::@19
+  b19:
   //SEG280 [164] (byte) keyboard_event_scan::row_scan#0 ← (byte) keyboard_matrix_read::return#2 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return_2
     sta row_scan
-  //SEG281 [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
+  //SEG281 [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
     lda row_scan
     ldy row
     cmp keyboard_scan_values,y
-    bne b11_from_b25
-    jmp b21
-  //SEG282 keyboard_event_scan::@21
-  b21:
+    bne b9_from_b19
+    jmp b16
+  //SEG282 keyboard_event_scan::@16
+  b16:
   //SEG283 [166] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
     axs #-[8]
     stx keycode
-  //SEG284 [167] phi from keyboard_event_scan::@20 keyboard_event_scan::@21 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10]
-  b10_from_b20:
-  b10_from_b21:
-  //SEG285 [167] phi (byte) keyboard_events_size#100 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#0] -- register_copy 
-  //SEG286 [167] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#1] -- register_copy 
-    jmp b10
-  //SEG287 keyboard_event_scan::@10
-  b10:
+  //SEG284 [167] phi from keyboard_event_scan::@15 keyboard_event_scan::@16 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8]
+  b8_from_b15:
+  b8_from_b16:
+  //SEG285 [167] phi (byte) keyboard_events_size#100 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#0] -- register_copy 
+  //SEG286 [167] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#1] -- register_copy 
+    jmp b8
+  //SEG287 keyboard_event_scan::@8
+  b8:
   //SEG288 [168] (byte) keyboard_event_scan::row#1 ← ++ (byte) keyboard_event_scan::row#2 -- vbuz1=_inc_vbuz1 
     inc row
-  //SEG289 [169] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG289 [169] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp row
-    bne b8_from_b10
-  //SEG290 [170] phi from keyboard_event_scan::@10 to keyboard_event_scan::@23 [phi:keyboard_event_scan::@10->keyboard_event_scan::@23]
-  b23_from_b10:
-    jmp b23
-  //SEG291 keyboard_event_scan::@23
-  b23:
+    bne b7_from_b8
+  //SEG290 [170] phi from keyboard_event_scan::@8 to keyboard_event_scan::@17 [phi:keyboard_event_scan::@8->keyboard_event_scan::@17]
+  b17_from_b8:
+    jmp b17
+  //SEG291 keyboard_event_scan::@17
+  b17:
   //SEG292 [171] call keyboard_event_pressed 
-  //SEG293 [213] phi from keyboard_event_scan::@23 to keyboard_event_pressed [phi:keyboard_event_scan::@23->keyboard_event_pressed]
-  keyboard_event_pressed_from_b23:
-  //SEG294 [213] phi (byte) keyboard_event_pressed::keycode#4 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@23->keyboard_event_pressed#0] -- vbuz1=vbuc1 
+  //SEG293 [213] phi from keyboard_event_scan::@17 to keyboard_event_pressed [phi:keyboard_event_scan::@17->keyboard_event_pressed]
+  keyboard_event_pressed_from_b17:
+  //SEG294 [213] phi (byte) keyboard_event_pressed::keycode#4 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@17->keyboard_event_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_LSHIFT
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG295 [172] (byte) keyboard_event_pressed::return#0 ← (byte) keyboard_event_pressed::return#10 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_10
     sta keyboard_event_pressed.return
-    jmp b26
-  //SEG296 keyboard_event_scan::@26
-  b26:
+    jmp b20
+  //SEG296 keyboard_event_scan::@20
+  b20:
   //SEG297 [173] (byte~) keyboard_event_scan::$0 ← (byte) keyboard_event_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return
     sta _0
   //SEG298 [174] if((byte~) keyboard_event_scan::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@1 -- vbuz1_eq_0_then_la1 
     lda _0
     cmp #0
-    beq b1_from_b26
-  //SEG299 [175] phi from keyboard_event_scan::@26 to keyboard_event_scan::@24 [phi:keyboard_event_scan::@26->keyboard_event_scan::@24]
-  b24_from_b26:
-    jmp b24
-  //SEG300 keyboard_event_scan::@24
-  b24:
-  //SEG301 [176] phi from keyboard_event_scan::@24 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1]
-  b1_from_b24:
-  //SEG302 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1#0] -- vbuz1=vbuc1 
+    beq b1_from_b20
+  //SEG299 [175] phi from keyboard_event_scan::@20 to keyboard_event_scan::@18 [phi:keyboard_event_scan::@20->keyboard_event_scan::@18]
+  b18_from_b20:
+    jmp b18
+  //SEG300 keyboard_event_scan::@18
+  b18:
+  //SEG301 [176] phi from keyboard_event_scan::@18 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1]
+  b1_from_b18:
+  //SEG302 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1#0] -- vbuz1=vbuc1 
     lda #0|KEY_MODIFIER_LSHIFT
     sta keyboard_modifiers
     jmp b1
-  //SEG303 [176] phi from keyboard_event_scan::@26 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1]
-  b1_from_b26:
-  //SEG304 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1#0] -- vbuz1=vbuc1 
+  //SEG303 [176] phi from keyboard_event_scan::@20 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1]
+  b1_from_b20:
+  //SEG304 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta keyboard_modifiers
     jmp b1
@@ -14801,27 +14962,27 @@ keyboard_event_scan: {
   //SEG309 [178] (byte) keyboard_event_pressed::return#1 ← (byte) keyboard_event_pressed::return#10 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_10
     sta keyboard_event_pressed.return_1
-    jmp b27
-  //SEG310 keyboard_event_scan::@27
-  b27:
+    jmp b21
+  //SEG310 keyboard_event_scan::@21
+  b21:
   //SEG311 [179] (byte~) keyboard_event_scan::$3 ← (byte) keyboard_event_pressed::return#1 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_1
     sta _3
   //SEG312 [180] if((byte~) keyboard_event_scan::$3==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@2 -- vbuz1_eq_0_then_la1 
     lda _3
     cmp #0
-    beq b2_from_b27
-    jmp b5
-  //SEG313 keyboard_event_scan::@5
-  b5:
+    beq b2_from_b21
+    jmp b4
+  //SEG313 keyboard_event_scan::@4
+  b4:
   //SEG314 [181] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#18 | (const byte) KEY_MODIFIER_RSHIFT#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #KEY_MODIFIER_RSHIFT
     ora keyboard_modifiers
     sta keyboard_modifiers
-  //SEG315 [182] phi from keyboard_event_scan::@27 keyboard_event_scan::@5 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2]
-  b2_from_b27:
-  b2_from_b5:
-  //SEG316 [182] phi (byte) keyboard_modifiers#19 = (byte) keyboard_modifiers#18 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2#0] -- register_copy 
+  //SEG315 [182] phi from keyboard_event_scan::@21 keyboard_event_scan::@4 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2]
+  b2_from_b21:
+  b2_from_b4:
+  //SEG316 [182] phi (byte) keyboard_modifiers#19 = (byte) keyboard_modifiers#18 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2#0] -- register_copy 
     jmp b2
   //SEG317 keyboard_event_scan::@2
   b2:
@@ -14835,27 +14996,27 @@ keyboard_event_scan: {
   //SEG321 [184] (byte) keyboard_event_pressed::return#2 ← (byte) keyboard_event_pressed::return#10 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_10
     sta keyboard_event_pressed.return_2
-    jmp b28
-  //SEG322 keyboard_event_scan::@28
-  b28:
+    jmp b22
+  //SEG322 keyboard_event_scan::@22
+  b22:
   //SEG323 [185] (byte~) keyboard_event_scan::$6 ← (byte) keyboard_event_pressed::return#2 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_2
     sta _6
   //SEG324 [186] if((byte~) keyboard_event_scan::$6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@3 -- vbuz1_eq_0_then_la1 
     lda _6
     cmp #0
-    beq b3_from_b28
-    jmp b6
-  //SEG325 keyboard_event_scan::@6
-  b6:
+    beq b3_from_b22
+    jmp b5
+  //SEG325 keyboard_event_scan::@5
+  b5:
   //SEG326 [187] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#19 | (const byte) KEY_MODIFIER_CTRL#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #KEY_MODIFIER_CTRL
     ora keyboard_modifiers
     sta keyboard_modifiers
-  //SEG327 [188] phi from keyboard_event_scan::@28 keyboard_event_scan::@6 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3]
-  b3_from_b28:
-  b3_from_b6:
-  //SEG328 [188] phi (byte) keyboard_modifiers#20 = (byte) keyboard_modifiers#19 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3#0] -- register_copy 
+  //SEG327 [188] phi from keyboard_event_scan::@22 keyboard_event_scan::@5 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3]
+  b3_from_b22:
+  b3_from_b5:
+  //SEG328 [188] phi (byte) keyboard_modifiers#20 = (byte) keyboard_modifiers#19 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3#0] -- register_copy 
     jmp b3
   //SEG329 keyboard_event_scan::@3
   b3:
@@ -14869,49 +15030,49 @@ keyboard_event_scan: {
   //SEG333 [190] (byte) keyboard_event_pressed::return#3 ← (byte) keyboard_event_pressed::return#10 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_10
     sta keyboard_event_pressed.return_3
-    jmp b29
-  //SEG334 keyboard_event_scan::@29
-  b29:
+    jmp b23
+  //SEG334 keyboard_event_scan::@23
+  b23:
   //SEG335 [191] (byte~) keyboard_event_scan::$9 ← (byte) keyboard_event_pressed::return#3 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_3
     sta _9
   //SEG336 [192] if((byte~) keyboard_event_scan::$9==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@return -- vbuz1_eq_0_then_la1 
     lda _9
     cmp #0
-    beq breturn_from_b29
-    jmp b7
-  //SEG337 keyboard_event_scan::@7
-  b7:
+    beq breturn_from_b23
+    jmp b6
+  //SEG337 keyboard_event_scan::@6
+  b6:
   //SEG338 [193] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#20 | (const byte) KEY_MODIFIER_COMMODORE#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #KEY_MODIFIER_COMMODORE
     ora keyboard_modifiers
     sta keyboard_modifiers
-  //SEG339 [194] phi from keyboard_event_scan::@29 keyboard_event_scan::@7 to keyboard_event_scan::@return [phi:keyboard_event_scan::@29/keyboard_event_scan::@7->keyboard_event_scan::@return]
-  breturn_from_b29:
-  breturn_from_b7:
-  //SEG340 [194] phi (byte) keyboard_modifiers#21 = (byte) keyboard_modifiers#20 [phi:keyboard_event_scan::@29/keyboard_event_scan::@7->keyboard_event_scan::@return#0] -- register_copy 
+  //SEG339 [194] phi from keyboard_event_scan::@23 keyboard_event_scan::@6 to keyboard_event_scan::@return [phi:keyboard_event_scan::@23/keyboard_event_scan::@6->keyboard_event_scan::@return]
+  breturn_from_b23:
+  breturn_from_b6:
+  //SEG340 [194] phi (byte) keyboard_modifiers#21 = (byte) keyboard_modifiers#20 [phi:keyboard_event_scan::@23/keyboard_event_scan::@6->keyboard_event_scan::@return#0] -- register_copy 
     jmp breturn
   //SEG341 keyboard_event_scan::@return
   breturn:
   //SEG342 [195] return 
     rts
   // Something has changed on the keyboard row - check each column
-  //SEG343 [196] phi from keyboard_event_scan::@12 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11]
-  b11_from_b12:
-  //SEG344 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG345 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG346 [196] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#2] -- register_copy 
-    jmp b11
-  //SEG347 [196] phi from keyboard_event_scan::@25 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11]
-  b11_from_b25:
-  //SEG348 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#119 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG349 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG350 [196] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#2] -- vbuz1=vbuc1 
+  //SEG343 [196] phi from keyboard_event_scan::@10 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9]
+  b9_from_b10:
+  //SEG344 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG345 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG346 [196] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#2] -- register_copy 
+    jmp b9
+  //SEG347 [196] phi from keyboard_event_scan::@19 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9]
+  b9_from_b19:
+  //SEG348 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#119 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG349 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG350 [196] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#2] -- vbuz1=vbuc1 
     lda #0
     sta col
-    jmp b11
-  //SEG351 keyboard_event_scan::@11
-  b11:
+    jmp b9
+  //SEG351 keyboard_event_scan::@9
+  b9:
   //SEG352 [197] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) -- vbuz1=vbuz2_bxor_pbuc1_derefidx_vbuz3 
     lda row_scan
     ldy row
@@ -14922,32 +15083,32 @@ keyboard_event_scan: {
     ldy col
     and keyboard_matrix_col_bitmask,y
     sta _16
-  //SEG354 [199] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@12 -- vbuz1_eq_0_then_la1 
+  //SEG354 [199] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@10 -- vbuz1_eq_0_then_la1 
     lda _16
     cmp #0
-    beq b12_from_b11
-    jmp b16
-  //SEG355 keyboard_event_scan::@16
-  b16:
-  //SEG356 [200] if((byte) keyboard_events_size#18==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12 -- vbuz1_eq_vbuc1_then_la1 
+    beq b10_from_b9
+    jmp b12
+  //SEG355 keyboard_event_scan::@12
+  b12:
+  //SEG356 [200] if((byte) keyboard_events_size#18==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10 -- vbuz1_eq_vbuc1_then_la1 
     lda #8
     cmp keyboard_events_size
-    beq b12_from_b16
-    jmp b17
-  //SEG357 keyboard_event_scan::@17
-  b17:
+    beq b10_from_b12
+    jmp b13
+  //SEG357 keyboard_event_scan::@13
+  b13:
   //SEG358 [201] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) -- vbuz1=vbuz2_band_pbuc1_derefidx_vbuz3 
     lda row_scan
     ldy col
     and keyboard_matrix_col_bitmask,y
     sta event_type
-  //SEG359 [202] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@14 -- vbuz1_eq_0_then_la1 
+  //SEG359 [202] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@11 -- vbuz1_eq_0_then_la1 
     lda event_type
     cmp #0
-    beq b14
-    jmp b18
-  //SEG360 keyboard_event_scan::@18
-  b18:
+    beq b11
+    jmp b14
+  //SEG360 keyboard_event_scan::@14
+  b14:
   //SEG361 [203] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#18) ← (byte) keyboard_event_scan::keycode#10 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Key pressed
     lda keycode
@@ -14955,34 +15116,34 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG362 [204] (byte) keyboard_events_size#2 ← ++ (byte) keyboard_events_size#18 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-  //SEG363 [205] phi from keyboard_event_scan::@11 keyboard_event_scan::@14 keyboard_event_scan::@16 keyboard_event_scan::@18 to keyboard_event_scan::@12 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12]
-  b12_from_b11:
-  b12_from_b14:
-  b12_from_b16:
-  b12_from_b18:
-  //SEG364 [205] phi (byte) keyboard_events_size#118 = (byte) keyboard_events_size#18 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12#0] -- register_copy 
-    jmp b12
-  //SEG365 keyboard_event_scan::@12
-  b12:
+  //SEG363 [205] phi from keyboard_event_scan::@11 keyboard_event_scan::@12 keyboard_event_scan::@14 keyboard_event_scan::@9 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10]
+  b10_from_b11:
+  b10_from_b12:
+  b10_from_b14:
+  b10_from_b9:
+  //SEG364 [205] phi (byte) keyboard_events_size#118 = (byte) keyboard_events_size#1 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10#0] -- register_copy 
+    jmp b10
+  //SEG365 keyboard_event_scan::@10
+  b10:
   //SEG366 [206] (byte) keyboard_event_scan::keycode#15 ← ++ (byte) keyboard_event_scan::keycode#10 -- vbuz1=_inc_vbuz1 
     inc keycode
   //SEG367 [207] (byte) keyboard_event_scan::col#1 ← ++ (byte) keyboard_event_scan::col#2 -- vbuz1=_inc_vbuz1 
     inc col
-  //SEG368 [208] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG368 [208] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp col
-    bne b11_from_b12
-    jmp b20
-  //SEG369 keyboard_event_scan::@20
-  b20:
+    bne b9_from_b10
+    jmp b15
+  //SEG369 keyboard_event_scan::@15
+  b15:
   //SEG370 [209] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Store the current keyboard status for the row to debounce
     lda row_scan
     ldy row
     sta keyboard_scan_values,y
-    jmp b10_from_b20
-  //SEG371 keyboard_event_scan::@14
-  b14:
+    jmp b8_from_b15
+  //SEG371 keyboard_event_scan::@11
+  b11:
   //SEG372 [210] (byte/word/dword~) keyboard_event_scan::$23 ← (byte) keyboard_event_scan::keycode#10 | (byte/signed byte/word/signed word/dword/signed dword) $40 -- vbuz1=vbuz2_bor_vbuc1 
     lda #$40
     ora keycode
@@ -14994,7 +15155,7 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG374 [212] (byte) keyboard_events_size#1 ← ++ (byte) keyboard_events_size#18 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-    jmp b12_from_b14
+    jmp b10_from_b11
 }
 //SEG375 keyboard_event_pressed
 // Determine if a specific key is currently pressed based on the last keyboard_event_scan()
@@ -15072,70 +15233,70 @@ get_vic_screen: {
     lda idx
     cmp #0
     beq breturn_from_get_vic_screen
-    jmp b10
-  //SEG389 get_vic_screen::@10
-  b10:
+    jmp b2
+  //SEG389 get_vic_screen::@2
+  b2:
   //SEG390 [224] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_screen::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #1
     cmp idx
-    beq breturn_from_b10
-    jmp b11
-  //SEG391 get_vic_screen::@11
-  b11:
+    beq breturn_from_b2
+    jmp b3
+  //SEG391 get_vic_screen::@3
+  b3:
   //SEG392 [225] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 2) goto get_vic_screen::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #2
     cmp idx
-    beq breturn_from_b11
-    jmp b12
-  //SEG393 get_vic_screen::@12
-  b12:
+    beq breturn_from_b3
+    jmp b4
+  //SEG393 get_vic_screen::@4
+  b4:
   //SEG394 [226] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 3) goto get_vic_screen::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #3
     cmp idx
-    beq breturn_from_b12
-    jmp b13
-  //SEG395 get_vic_screen::@13
-  b13:
-  //SEG396 [227] if((byte) get_vic_screen::idx#2!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_vic_screen::@9 -- vbuz1_neq_vbuc1_then_la1 
+    beq breturn_from_b4
+    jmp b5
+  //SEG395 get_vic_screen::@5
+  b5:
+  //SEG396 [227] if((byte) get_vic_screen::idx#2!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_vic_screen::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp idx
-    bne b9_from_b13
-  //SEG397 [228] phi from get_vic_screen::@13 to get_vic_screen::@return [phi:get_vic_screen::@13->get_vic_screen::@return]
-  breturn_from_b13:
-  //SEG398 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN4#0 [phi:get_vic_screen::@13->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+    bne b1_from_b5
+  //SEG397 [228] phi from get_vic_screen::@5 to get_vic_screen::@return [phi:get_vic_screen::@5->get_vic_screen::@return]
+  breturn_from_b5:
+  //SEG398 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN4#0 [phi:get_vic_screen::@5->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN4
     sta return
     lda #>VIC_SCREEN4
     sta return+1
     jmp breturn
-  //SEG399 [228] phi from get_vic_screen get_vic_screen::@9 to get_vic_screen::@return [phi:get_vic_screen/get_vic_screen::@9->get_vic_screen::@return]
+  //SEG399 [228] phi from get_vic_screen get_vic_screen::@1 to get_vic_screen::@return [phi:get_vic_screen/get_vic_screen::@1->get_vic_screen::@return]
   breturn_from_get_vic_screen:
-  breturn_from_b9:
-  //SEG400 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN0#0 [phi:get_vic_screen/get_vic_screen::@9->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  breturn_from_b1:
+  //SEG400 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN0#0 [phi:get_vic_screen/get_vic_screen::@1->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN0
     sta return
     lda #>VIC_SCREEN0
     sta return+1
     jmp breturn
-  //SEG401 [228] phi from get_vic_screen::@10 to get_vic_screen::@return [phi:get_vic_screen::@10->get_vic_screen::@return]
-  breturn_from_b10:
-  //SEG402 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN1#0 [phi:get_vic_screen::@10->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  //SEG401 [228] phi from get_vic_screen::@2 to get_vic_screen::@return [phi:get_vic_screen::@2->get_vic_screen::@return]
+  breturn_from_b2:
+  //SEG402 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN1#0 [phi:get_vic_screen::@2->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN1
     sta return
     lda #>VIC_SCREEN1
     sta return+1
     jmp breturn
-  //SEG403 [228] phi from get_vic_screen::@11 to get_vic_screen::@return [phi:get_vic_screen::@11->get_vic_screen::@return]
-  breturn_from_b11:
-  //SEG404 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN2#0 [phi:get_vic_screen::@11->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  //SEG403 [228] phi from get_vic_screen::@3 to get_vic_screen::@return [phi:get_vic_screen::@3->get_vic_screen::@return]
+  breturn_from_b3:
+  //SEG404 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN2#0 [phi:get_vic_screen::@3->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN2
     sta return
     lda #>VIC_SCREEN2
     sta return+1
     jmp breturn
-  //SEG405 [228] phi from get_vic_screen::@12 to get_vic_screen::@return [phi:get_vic_screen::@12->get_vic_screen::@return]
-  breturn_from_b12:
-  //SEG406 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN3#0 [phi:get_vic_screen::@12->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  //SEG405 [228] phi from get_vic_screen::@4 to get_vic_screen::@return [phi:get_vic_screen::@4->get_vic_screen::@return]
+  breturn_from_b4:
+  //SEG406 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN3#0 [phi:get_vic_screen::@4->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN3
     sta return
     lda #>VIC_SCREEN3
@@ -15145,12 +15306,12 @@ get_vic_screen: {
   breturn:
   //SEG408 [229] return 
     rts
-  //SEG409 [230] phi from get_vic_screen::@13 to get_vic_screen::@9 [phi:get_vic_screen::@13->get_vic_screen::@9]
-  b9_from_b13:
-    jmp b9
-  //SEG410 get_vic_screen::@9
-  b9:
-    jmp breturn_from_b9
+  //SEG409 [230] phi from get_vic_screen::@5 to get_vic_screen::@1 [phi:get_vic_screen::@5->get_vic_screen::@1]
+  b1_from_b5:
+    jmp b1
+  //SEG410 get_vic_screen::@1
+  b1:
+    jmp breturn_from_b1
 }
 //SEG411 get_vic_charset
 // Get the VIC charset/bitmap address from the index
@@ -15163,25 +15324,25 @@ get_vic_charset: {
     lda idx
     cmp #0
     beq breturn_from_get_vic_charset
-    jmp b4
-  //SEG413 get_vic_charset::@4
-  b4:
-  //SEG414 [232] if((byte) get_vic_charset::idx#0!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_charset::@3 -- vbuz1_neq_vbuc1_then_la1 
+    jmp b2
+  //SEG413 get_vic_charset::@2
+  b2:
+  //SEG414 [232] if((byte) get_vic_charset::idx#0!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_charset::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #1
     cmp idx
-    bne b3_from_b4
-  //SEG415 [233] phi from get_vic_charset::@4 to get_vic_charset::@return [phi:get_vic_charset::@4->get_vic_charset::@return]
-  breturn_from_b4:
-  //SEG416 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_BITMAP#0 [phi:get_vic_charset::@4->get_vic_charset::@return#0] -- pbuz1=pbuc1 
+    bne b1_from_b2
+  //SEG415 [233] phi from get_vic_charset::@2 to get_vic_charset::@return [phi:get_vic_charset::@2->get_vic_charset::@return]
+  breturn_from_b2:
+  //SEG416 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_BITMAP#0 [phi:get_vic_charset::@2->get_vic_charset::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_BITMAP
     sta return
     lda #>VIC_BITMAP
     sta return+1
     jmp breturn
-  //SEG417 [233] phi from get_vic_charset get_vic_charset::@3 to get_vic_charset::@return [phi:get_vic_charset/get_vic_charset::@3->get_vic_charset::@return]
+  //SEG417 [233] phi from get_vic_charset get_vic_charset::@1 to get_vic_charset::@return [phi:get_vic_charset/get_vic_charset::@1->get_vic_charset::@return]
   breturn_from_get_vic_charset:
-  breturn_from_b3:
-  //SEG418 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_CHARSET_ROM#0 [phi:get_vic_charset/get_vic_charset::@3->get_vic_charset::@return#0] -- pbuz1=pbuc1 
+  breturn_from_b1:
+  //SEG418 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_CHARSET_ROM#0 [phi:get_vic_charset/get_vic_charset::@1->get_vic_charset::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_CHARSET_ROM
     sta return
     lda #>VIC_CHARSET_ROM
@@ -15191,12 +15352,12 @@ get_vic_charset: {
   breturn:
   //SEG420 [234] return 
     rts
-  //SEG421 [235] phi from get_vic_charset::@4 to get_vic_charset::@3 [phi:get_vic_charset::@4->get_vic_charset::@3]
-  b3_from_b4:
-    jmp b3
-  //SEG422 get_vic_charset::@3
-  b3:
-    jmp breturn_from_b3
+  //SEG421 [235] phi from get_vic_charset::@2 to get_vic_charset::@1 [phi:get_vic_charset::@2->get_vic_charset::@1]
+  b1_from_b2:
+    jmp b1
+  //SEG422 get_vic_charset::@1
+  b1:
+    jmp breturn_from_b1
 }
 //SEG423 get_plane
 // Get plane address from a plane index (from the form)
@@ -15210,100 +15371,100 @@ get_plane: {
     lda idx
     cmp #0
     beq breturn_from_get_plane
-    jmp b28
-  //SEG425 get_plane::@28
-  b28:
+    jmp b2
+  //SEG425 get_plane::@2
+  b2:
   //SEG426 [238] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #1
     cmp idx
-    beq breturn_from_b28
-    jmp b29
-  //SEG427 get_plane::@29
-  b29:
+    beq breturn_from_b2
+    jmp b3
+  //SEG427 get_plane::@3
+  b3:
   //SEG428 [239] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #2
     cmp idx
-    beq breturn_from_b29
-    jmp b30
-  //SEG429 get_plane::@30
-  b30:
+    beq breturn_from_b3
+    jmp b4
+  //SEG429 get_plane::@4
+  b4:
   //SEG430 [240] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #3
     cmp idx
-    beq breturn_from_b30
-    jmp b31
-  //SEG431 get_plane::@31
-  b31:
+    beq breturn_from_b4
+    jmp b5
+  //SEG431 get_plane::@5
+  b5:
   //SEG432 [241] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #4
     cmp idx
-    beq breturn_from_b31
-    jmp b32
-  //SEG433 get_plane::@32
-  b32:
+    beq breturn_from_b5
+    jmp b6
+  //SEG433 get_plane::@6
+  b6:
   //SEG434 [242] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #5
     cmp idx
-    beq breturn_from_b32
-    jmp b33
-  //SEG435 get_plane::@33
-  b33:
+    beq breturn_from_b6
+    jmp b7
+  //SEG435 get_plane::@7
+  b7:
   //SEG436 [243] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #6
     cmp idx
-    beq breturn_from_b33
-    jmp b34
-  //SEG437 get_plane::@34
-  b34:
+    beq breturn_from_b7
+    jmp b8
+  //SEG437 get_plane::@8
+  b8:
   //SEG438 [244] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #7
     cmp idx
-    beq breturn_from_b34
-    jmp b35
-  //SEG439 get_plane::@35
-  b35:
+    beq breturn_from_b8
+    jmp b9
+  //SEG439 get_plane::@9
+  b9:
   //SEG440 [245] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #8
     cmp idx
-    beq breturn_from_b35
-    jmp b36
-  //SEG441 get_plane::@36
-  b36:
+    beq breturn_from_b9
+    jmp b10
+  //SEG441 get_plane::@10
+  b10:
   //SEG442 [246] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #9
     cmp idx
-    beq breturn_from_b36
-    jmp b37
-  //SEG443 get_plane::@37
-  b37:
+    beq breturn_from_b10
+    jmp b11
+  //SEG443 get_plane::@11
+  b11:
   //SEG444 [247] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #$a
     cmp idx
-    beq breturn_from_b37
-    jmp b38
-  //SEG445 get_plane::@38
-  b38:
+    beq breturn_from_b11
+    jmp b12
+  //SEG445 get_plane::@12
+  b12:
   //SEG446 [248] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $b) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #$b
     cmp idx
-    beq breturn_from_b38
-    jmp b39
-  //SEG447 get_plane::@39
-  b39:
+    beq breturn_from_b12
+    jmp b13
+  //SEG447 get_plane::@13
+  b13:
   //SEG448 [249] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $c) goto get_plane::@return -- vbuz1_eq_vbuc1_then_la1 
     lda #$c
     cmp idx
-    beq breturn_from_b39
-    jmp b40
-  //SEG449 get_plane::@40
-  b40:
-  //SEG450 [250] if((byte) get_plane::idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $d) goto get_plane::@27 -- vbuz1_neq_vbuc1_then_la1 
+    beq breturn_from_b13
+    jmp b14
+  //SEG449 get_plane::@14
+  b14:
+  //SEG450 [250] if((byte) get_plane::idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $d) goto get_plane::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$d
     cmp idx
-    bne b27_from_b40
-  //SEG451 [251] phi from get_plane::@40 to get_plane::@return [phi:get_plane::@40->get_plane::@return]
-  breturn_from_b40:
-  //SEG452 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_FULL#0 [phi:get_plane::@40->get_plane::@return#0] -- vduz1=vduc1 
+    bne b1_from_b14
+  //SEG451 [251] phi from get_plane::@14 to get_plane::@return [phi:get_plane::@14->get_plane::@return]
+  breturn_from_b14:
+  //SEG452 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_FULL#0 [phi:get_plane::@14->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_FULL
     sta return
     lda #>PLANE_FULL
@@ -15313,10 +15474,10 @@ get_plane: {
     lda #>PLANE_FULL>>$10
     sta return+3
     jmp breturn
-  //SEG453 [251] phi from get_plane get_plane::@27 to get_plane::@return [phi:get_plane/get_plane::@27->get_plane::@return]
+  //SEG453 [251] phi from get_plane get_plane::@1 to get_plane::@return [phi:get_plane/get_plane::@1->get_plane::@return]
   breturn_from_get_plane:
-  breturn_from_b27:
-  //SEG454 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN0#0 [phi:get_plane/get_plane::@27->get_plane::@return#0] -- vduz1=vduc1 
+  breturn_from_b1:
+  //SEG454 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN0#0 [phi:get_plane/get_plane::@1->get_plane::@return#0] -- vduz1=vduc1 
     lda #<$ffffffff&VIC_SCREEN0
     sta return
     lda #>$ffffffff&VIC_SCREEN0
@@ -15326,105 +15487,9 @@ get_plane: {
     lda #>$ffffffff&VIC_SCREEN0>>$10
     sta return+3
     jmp breturn
-  //SEG455 [251] phi from get_plane::@28 to get_plane::@return [phi:get_plane::@28->get_plane::@return]
-  breturn_from_b28:
-  //SEG456 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN1#0 [phi:get_plane::@28->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_SCREEN1
-    sta return
-    lda #>$ffffffff&VIC_SCREEN1
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN1>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN1>>$10
-    sta return+3
-    jmp breturn
-  //SEG457 [251] phi from get_plane::@29 to get_plane::@return [phi:get_plane::@29->get_plane::@return]
-  breturn_from_b29:
-  //SEG458 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN2#0 [phi:get_plane::@29->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_SCREEN2
-    sta return
-    lda #>$ffffffff&VIC_SCREEN2
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN2>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN2>>$10
-    sta return+3
-    jmp breturn
-  //SEG459 [251] phi from get_plane::@30 to get_plane::@return [phi:get_plane::@30->get_plane::@return]
-  breturn_from_b30:
-  //SEG460 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN3#0 [phi:get_plane::@30->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_SCREEN3
-    sta return
-    lda #>$ffffffff&VIC_SCREEN3
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN3>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN3>>$10
-    sta return+3
-    jmp breturn
-  //SEG461 [251] phi from get_plane::@31 to get_plane::@return [phi:get_plane::@31->get_plane::@return]
-  breturn_from_b31:
-  //SEG462 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_BITMAP#0 [phi:get_plane::@31->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_BITMAP
-    sta return
-    lda #>$ffffffff&VIC_BITMAP
-    sta return+1
-    lda #<$ffffffff&VIC_BITMAP>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_BITMAP>>$10
-    sta return+3
-    jmp breturn
-  //SEG463 [251] phi from get_plane::@32 to get_plane::@return [phi:get_plane::@32->get_plane::@return]
-  breturn_from_b32:
-  //SEG464 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_CHARSET_ROM#0 [phi:get_plane::@32->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_CHARSET_ROM
-    sta return
-    lda #>$ffffffff&VIC_CHARSET_ROM
-    sta return+1
-    lda #<$ffffffff&VIC_CHARSET_ROM>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_CHARSET_ROM>>$10
-    sta return+3
-    jmp breturn
-  //SEG465 [251] phi from get_plane::@33 to get_plane::@return [phi:get_plane::@33->get_plane::@return]
-  breturn_from_b33:
-  //SEG466 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_8BPP_CHUNKY#0 [phi:get_plane::@33->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<PLANE_8BPP_CHUNKY
-    sta return
-    lda #>PLANE_8BPP_CHUNKY
-    sta return+1
-    lda #<PLANE_8BPP_CHUNKY>>$10
-    sta return+2
-    lda #>PLANE_8BPP_CHUNKY>>$10
-    sta return+3
-    jmp breturn
-  //SEG467 [251] phi from get_plane::@34 to get_plane::@return [phi:get_plane::@34->get_plane::@return]
-  breturn_from_b34:
-  //SEG468 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL#0 [phi:get_plane::@34->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<PLANE_HORISONTAL
-    sta return
-    lda #>PLANE_HORISONTAL
-    sta return+1
-    lda #<PLANE_HORISONTAL>>$10
-    sta return+2
-    lda #>PLANE_HORISONTAL>>$10
-    sta return+3
-    jmp breturn
-  //SEG469 [251] phi from get_plane::@35 to get_plane::@return [phi:get_plane::@35->get_plane::@return]
-  breturn_from_b35:
-  //SEG470 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL#0 [phi:get_plane::@35->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<PLANE_VERTICAL
-    sta return
-    lda #>PLANE_VERTICAL
-    sta return+1
-    lda #<PLANE_VERTICAL>>$10
-    sta return+2
-    lda #>PLANE_VERTICAL>>$10
-    sta return+3
-    jmp breturn
-  //SEG471 [251] phi from get_plane::@36 to get_plane::@return [phi:get_plane::@36->get_plane::@return]
-  breturn_from_b36:
-  //SEG472 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL2#0 [phi:get_plane::@36->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG455 [251] phi from get_plane::@10 to get_plane::@return [phi:get_plane::@10->get_plane::@return]
+  breturn_from_b10:
+  //SEG456 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL2#0 [phi:get_plane::@10->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_HORISONTAL2
     sta return
     lda #>PLANE_HORISONTAL2
@@ -15434,9 +15499,9 @@ get_plane: {
     lda #>PLANE_HORISONTAL2>>$10
     sta return+3
     jmp breturn
-  //SEG473 [251] phi from get_plane::@37 to get_plane::@return [phi:get_plane::@37->get_plane::@return]
-  breturn_from_b37:
-  //SEG474 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL2#0 [phi:get_plane::@37->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG457 [251] phi from get_plane::@11 to get_plane::@return [phi:get_plane::@11->get_plane::@return]
+  breturn_from_b11:
+  //SEG458 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL2#0 [phi:get_plane::@11->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_VERTICAL2
     sta return
     lda #>PLANE_VERTICAL2
@@ -15446,9 +15511,9 @@ get_plane: {
     lda #>PLANE_VERTICAL2>>$10
     sta return+3
     jmp breturn
-  //SEG475 [251] phi from get_plane::@38 to get_plane::@return [phi:get_plane::@38->get_plane::@return]
-  breturn_from_b38:
-  //SEG476 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_CHARSET8#0 [phi:get_plane::@38->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG459 [251] phi from get_plane::@12 to get_plane::@return [phi:get_plane::@12->get_plane::@return]
+  breturn_from_b12:
+  //SEG460 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_CHARSET8#0 [phi:get_plane::@12->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_CHARSET8
     sta return
     lda #>PLANE_CHARSET8
@@ -15458,9 +15523,9 @@ get_plane: {
     lda #>PLANE_CHARSET8>>$10
     sta return+3
     jmp breturn
-  //SEG477 [251] phi from get_plane::@39 to get_plane::@return [phi:get_plane::@39->get_plane::@return]
-  breturn_from_b39:
-  //SEG478 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_BLANK#0 [phi:get_plane::@39->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG461 [251] phi from get_plane::@13 to get_plane::@return [phi:get_plane::@13->get_plane::@return]
+  breturn_from_b13:
+  //SEG462 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_BLANK#0 [phi:get_plane::@13->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_BLANK
     sta return
     lda #>PLANE_BLANK
@@ -15470,16 +15535,112 @@ get_plane: {
     lda #>PLANE_BLANK>>$10
     sta return+3
     jmp breturn
+  //SEG463 [251] phi from get_plane::@2 to get_plane::@return [phi:get_plane::@2->get_plane::@return]
+  breturn_from_b2:
+  //SEG464 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN1#0 [phi:get_plane::@2->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_SCREEN1
+    sta return
+    lda #>$ffffffff&VIC_SCREEN1
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN1>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN1>>$10
+    sta return+3
+    jmp breturn
+  //SEG465 [251] phi from get_plane::@3 to get_plane::@return [phi:get_plane::@3->get_plane::@return]
+  breturn_from_b3:
+  //SEG466 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN2#0 [phi:get_plane::@3->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_SCREEN2
+    sta return
+    lda #>$ffffffff&VIC_SCREEN2
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN2>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN2>>$10
+    sta return+3
+    jmp breturn
+  //SEG467 [251] phi from get_plane::@4 to get_plane::@return [phi:get_plane::@4->get_plane::@return]
+  breturn_from_b4:
+  //SEG468 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN3#0 [phi:get_plane::@4->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_SCREEN3
+    sta return
+    lda #>$ffffffff&VIC_SCREEN3
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN3>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN3>>$10
+    sta return+3
+    jmp breturn
+  //SEG469 [251] phi from get_plane::@5 to get_plane::@return [phi:get_plane::@5->get_plane::@return]
+  breturn_from_b5:
+  //SEG470 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_BITMAP#0 [phi:get_plane::@5->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_BITMAP
+    sta return
+    lda #>$ffffffff&VIC_BITMAP
+    sta return+1
+    lda #<$ffffffff&VIC_BITMAP>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_BITMAP>>$10
+    sta return+3
+    jmp breturn
+  //SEG471 [251] phi from get_plane::@6 to get_plane::@return [phi:get_plane::@6->get_plane::@return]
+  breturn_from_b6:
+  //SEG472 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_CHARSET_ROM#0 [phi:get_plane::@6->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_CHARSET_ROM
+    sta return
+    lda #>$ffffffff&VIC_CHARSET_ROM
+    sta return+1
+    lda #<$ffffffff&VIC_CHARSET_ROM>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_CHARSET_ROM>>$10
+    sta return+3
+    jmp breturn
+  //SEG473 [251] phi from get_plane::@7 to get_plane::@return [phi:get_plane::@7->get_plane::@return]
+  breturn_from_b7:
+  //SEG474 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_8BPP_CHUNKY#0 [phi:get_plane::@7->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<PLANE_8BPP_CHUNKY
+    sta return
+    lda #>PLANE_8BPP_CHUNKY
+    sta return+1
+    lda #<PLANE_8BPP_CHUNKY>>$10
+    sta return+2
+    lda #>PLANE_8BPP_CHUNKY>>$10
+    sta return+3
+    jmp breturn
+  //SEG475 [251] phi from get_plane::@8 to get_plane::@return [phi:get_plane::@8->get_plane::@return]
+  breturn_from_b8:
+  //SEG476 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL#0 [phi:get_plane::@8->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<PLANE_HORISONTAL
+    sta return
+    lda #>PLANE_HORISONTAL
+    sta return+1
+    lda #<PLANE_HORISONTAL>>$10
+    sta return+2
+    lda #>PLANE_HORISONTAL>>$10
+    sta return+3
+    jmp breturn
+  //SEG477 [251] phi from get_plane::@9 to get_plane::@return [phi:get_plane::@9->get_plane::@return]
+  breturn_from_b9:
+  //SEG478 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL#0 [phi:get_plane::@9->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<PLANE_VERTICAL
+    sta return
+    lda #>PLANE_VERTICAL
+    sta return+1
+    lda #<PLANE_VERTICAL>>$10
+    sta return+2
+    lda #>PLANE_VERTICAL>>$10
+    sta return+3
+    jmp breturn
   //SEG479 get_plane::@return
   breturn:
   //SEG480 [252] return 
     rts
-  //SEG481 [253] phi from get_plane::@40 to get_plane::@27 [phi:get_plane::@40->get_plane::@27]
-  b27_from_b40:
-    jmp b27
-  //SEG482 get_plane::@27
-  b27:
-    jmp breturn_from_b27
+  //SEG481 [253] phi from get_plane::@14 to get_plane::@1 [phi:get_plane::@14->get_plane::@1]
+  b1_from_b14:
+    jmp b1
+  //SEG482 get_plane::@1
+  b1:
+    jmp breturn_from_b1
 }
 //SEG483 form_mode
 // Show the form - and let the user change values
@@ -15496,94 +15657,94 @@ form_mode: {
     lda #>COLS
     sta print_set_screen.screen+1
     jsr print_set_screen
-  //SEG487 [256] phi from form_mode to form_mode::@21 [phi:form_mode->form_mode::@21]
-  b21_from_form_mode:
-    jmp b21
-  //SEG488 form_mode::@21
-  b21:
+  //SEG487 [256] phi from form_mode to form_mode::@8 [phi:form_mode->form_mode::@8]
+  b8_from_form_mode:
+    jmp b8
+  //SEG488 form_mode::@8
+  b8:
   //SEG489 [257] call print_cls 
     jsr print_cls
-  //SEG490 [258] phi from form_mode::@21 to form_mode::@22 [phi:form_mode::@21->form_mode::@22]
-  b22_from_b21:
-    jmp b22
-  //SEG491 form_mode::@22
-  b22:
+  //SEG490 [258] phi from form_mode::@8 to form_mode::@9 [phi:form_mode::@8->form_mode::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG491 form_mode::@9
+  b9:
   //SEG492 [259] call print_str_lines 
-  //SEG493 [419] phi from form_mode::@22 to print_str_lines [phi:form_mode::@22->print_str_lines]
-  print_str_lines_from_b22:
-  //SEG494 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_COLS#0 [phi:form_mode::@22->print_str_lines#0] -- pbuz1=pbuc1 
+  //SEG493 [419] phi from form_mode::@9 to print_str_lines [phi:form_mode::@9->print_str_lines]
+  print_str_lines_from_b9:
+  //SEG494 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_COLS#0 [phi:form_mode::@9->print_str_lines#0] -- pbuz1=pbuc1 
     lda #<FORM_COLS
     sta print_str_lines.str
     lda #>FORM_COLS
     sta print_str_lines.str+1
     jsr print_str_lines
-  //SEG495 [260] phi from form_mode::@22 to form_mode::@23 [phi:form_mode::@22->form_mode::@23]
-  b23_from_b22:
-    jmp b23
-  //SEG496 form_mode::@23
-  b23:
+  //SEG495 [260] phi from form_mode::@9 to form_mode::@10 [phi:form_mode::@9->form_mode::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG496 form_mode::@10
+  b10:
   //SEG497 [261] call print_set_screen 
-  //SEG498 [447] phi from form_mode::@23 to print_set_screen [phi:form_mode::@23->print_set_screen]
-  print_set_screen_from_b23:
-  //SEG499 [447] phi (byte*) print_set_screen::screen#2 = (const byte*) FORM_SCREEN#0 [phi:form_mode::@23->print_set_screen#0] -- pbuz1=pbuc1 
+  //SEG498 [447] phi from form_mode::@10 to print_set_screen [phi:form_mode::@10->print_set_screen]
+  print_set_screen_from_b10:
+  //SEG499 [447] phi (byte*) print_set_screen::screen#2 = (const byte*) FORM_SCREEN#0 [phi:form_mode::@10->print_set_screen#0] -- pbuz1=pbuc1 
     lda #<FORM_SCREEN
     sta print_set_screen.screen
     lda #>FORM_SCREEN
     sta print_set_screen.screen+1
     jsr print_set_screen
-  //SEG500 [262] phi from form_mode::@23 to form_mode::@24 [phi:form_mode::@23->form_mode::@24]
-  b24_from_b23:
-    jmp b24
-  //SEG501 form_mode::@24
-  b24:
+  //SEG500 [262] phi from form_mode::@10 to form_mode::@11 [phi:form_mode::@10->form_mode::@11]
+  b11_from_b10:
+    jmp b11
+  //SEG501 form_mode::@11
+  b11:
   //SEG502 [263] call print_cls 
     jsr print_cls
-  //SEG503 [264] phi from form_mode::@24 to form_mode::@25 [phi:form_mode::@24->form_mode::@25]
-  b25_from_b24:
-    jmp b25
-  //SEG504 form_mode::@25
-  b25:
+  //SEG503 [264] phi from form_mode::@11 to form_mode::@12 [phi:form_mode::@11->form_mode::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG504 form_mode::@12
+  b12:
   //SEG505 [265] call print_str_lines 
-  //SEG506 [419] phi from form_mode::@25 to print_str_lines [phi:form_mode::@25->print_str_lines]
-  print_str_lines_from_b25:
-  //SEG507 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_TEXT#0 [phi:form_mode::@25->print_str_lines#0] -- pbuz1=pbuc1 
+  //SEG506 [419] phi from form_mode::@12 to print_str_lines [phi:form_mode::@12->print_str_lines]
+  print_str_lines_from_b12:
+  //SEG507 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_TEXT#0 [phi:form_mode::@12->print_str_lines#0] -- pbuz1=pbuc1 
     lda #<FORM_TEXT
     sta print_str_lines.str
     lda #>FORM_TEXT
     sta print_str_lines.str+1
     jsr print_str_lines
-  //SEG508 [266] phi from form_mode::@25 to form_mode::@26 [phi:form_mode::@25->form_mode::@26]
-  b26_from_b25:
-    jmp b26
-  //SEG509 form_mode::@26
-  b26:
+  //SEG508 [266] phi from form_mode::@12 to form_mode::@13 [phi:form_mode::@12->form_mode::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG509 form_mode::@13
+  b13:
   //SEG510 [267] call form_set_screen 
-  //SEG511 [409] phi from form_mode::@26 to form_set_screen [phi:form_mode::@26->form_set_screen]
-  form_set_screen_from_b26:
+  //SEG511 [409] phi from form_mode::@13 to form_set_screen [phi:form_mode::@13->form_set_screen]
+  form_set_screen_from_b13:
     jsr form_set_screen
-  //SEG512 [268] phi from form_mode::@26 to form_mode::@27 [phi:form_mode::@26->form_mode::@27]
-  b27_from_b26:
-    jmp b27
-  //SEG513 form_mode::@27
-  b27:
+  //SEG512 [268] phi from form_mode::@13 to form_mode::@14 [phi:form_mode::@13->form_mode::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG513 form_mode::@14
+  b14:
   //SEG514 [269] call form_render_values 
-  //SEG515 [330] phi from form_mode::@27 to form_render_values [phi:form_mode::@27->form_render_values]
-  form_render_values_from_b27:
+  //SEG515 [330] phi from form_mode::@14 to form_render_values [phi:form_mode::@14->form_render_values]
+  form_render_values_from_b14:
     jsr form_render_values
-    jmp b28
-  //SEG516 form_mode::@28
-  b28:
+    jmp b15
+  //SEG516 form_mode::@15
+  b15:
   //SEG517 [270] (byte) render_preset_name::idx#0 ← *((const byte[]) form_fields_val#0) -- vbuz1=_deref_pbuc1 
     lda form_fields_val
     sta render_preset_name.idx
   //SEG518 [271] call render_preset_name 
-  //SEG519 [306] phi from form_mode::@28 to render_preset_name [phi:form_mode::@28->render_preset_name]
-  render_preset_name_from_b28:
-  //SEG520 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#0 [phi:form_mode::@28->render_preset_name#0] -- register_copy 
+  //SEG519 [306] phi from form_mode::@15 to render_preset_name [phi:form_mode::@15->render_preset_name]
+  render_preset_name_from_b15:
+  //SEG520 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#0 [phi:form_mode::@15->render_preset_name#0] -- register_copy 
     jsr render_preset_name
-    jmp b29
-  //SEG521 form_mode::@29
-  b29:
+    jmp b16
+  //SEG521 form_mode::@16
+  b16:
   //SEG522 [272] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) FORM_CHARSET#0/(dword/signed dword) $10000 -- _deref_pbuc1=vbuc2 
     // DTV Graphics Bank
     lda #($ffffffff&FORM_CHARSET)/$10000
@@ -15629,32 +15790,32 @@ form_mode: {
   //SEG533 [283] *((const byte*) DTV_PLANEA_START_HI#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta DTV_PLANEA_START_HI
-  //SEG534 [284] phi from form_mode::@29 to form_mode::@7 [phi:form_mode::@29->form_mode::@7]
-  b7_from_b29:
-  //SEG535 [284] phi (byte) form_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_mode::@29->form_mode::@7#0] -- vbuz1=vbuc1 
+  //SEG534 [284] phi from form_mode::@16 to form_mode::@2 [phi:form_mode::@16->form_mode::@2]
+  b2_from_b16:
+  //SEG535 [284] phi (byte) form_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_mode::@16->form_mode::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b7
+    jmp b2
   // DTV Palette - default
-  //SEG536 [284] phi from form_mode::@7 to form_mode::@7 [phi:form_mode::@7->form_mode::@7]
-  b7_from_b7:
-  //SEG537 [284] phi (byte) form_mode::i#2 = (byte) form_mode::i#1 [phi:form_mode::@7->form_mode::@7#0] -- register_copy 
-    jmp b7
-  //SEG538 form_mode::@7
-  b7:
+  //SEG536 [284] phi from form_mode::@2 to form_mode::@2 [phi:form_mode::@2->form_mode::@2]
+  b2_from_b2:
+  //SEG537 [284] phi (byte) form_mode::i#2 = (byte) form_mode::i#1 [phi:form_mode::@2->form_mode::@2#0] -- register_copy 
+    jmp b2
+  //SEG538 form_mode::@2
+  b2:
   //SEG539 [285] *((const byte*) DTV_PALETTE#0 + (byte) form_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) form_mode::i#2) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz1 
     ldy i
     lda DTV_PALETTE_DEFAULT,y
     sta DTV_PALETTE,y
   //SEG540 [286] (byte) form_mode::i#1 ← ++ (byte) form_mode::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG541 [287] if((byte) form_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto form_mode::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG541 [287] if((byte) form_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto form_mode::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$10
     cmp i
-    bne b7_from_b7
-    jmp b8
-  //SEG542 form_mode::@8
-  b8:
+    bne b2_from_b2
+    jmp b3
+  //SEG542 form_mode::@3
+  b3:
   //SEG543 [288] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Screen colors
     lda #0
@@ -15665,91 +15826,91 @@ form_mode: {
   //SEG545 [290] (byte) form_mode::preset_current#0 ← *((const byte[]) form_fields_val#0) -- vbuz1=_deref_pbuc1 
     lda form_fields_val
     sta preset_current
-  //SEG546 [291] phi from form_mode::@32 form_mode::@8 to form_mode::@1 [phi:form_mode::@32/form_mode::@8->form_mode::@1]
-  b1_from_b32:
-  b1_from_b8:
-  //SEG547 [291] phi (byte) form_mode::preset_current#7 = (byte) form_mode::preset_current#1 [phi:form_mode::@32/form_mode::@8->form_mode::@1#0] -- register_copy 
-  //SEG548 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@32/form_mode::@8->form_mode::@1#1] -- register_copy 
-  //SEG549 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@32/form_mode::@8->form_mode::@1#2] -- register_copy 
-  //SEG550 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@32/form_mode::@8->form_mode::@1#3] -- register_copy 
+  //SEG546 [291] phi from form_mode::@19 form_mode::@3 to form_mode::@1 [phi:form_mode::@19/form_mode::@3->form_mode::@1]
+  b1_from_b19:
+  b1_from_b3:
+  //SEG547 [291] phi (byte) form_mode::preset_current#7 = (byte) form_mode::preset_current#1 [phi:form_mode::@19/form_mode::@3->form_mode::@1#0] -- register_copy 
+  //SEG548 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@19/form_mode::@3->form_mode::@1#1] -- register_copy 
+  //SEG549 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@19/form_mode::@3->form_mode::@1#2] -- register_copy 
+  //SEG550 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@19/form_mode::@3->form_mode::@1#3] -- register_copy 
     jmp b1
   // Let the user change values in the form
-  //SEG551 [291] phi from form_mode::@12 to form_mode::@1 [phi:form_mode::@12->form_mode::@1]
-  b1_from_b12:
-  //SEG552 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@12->form_mode::@1#0] -- register_copy 
-  //SEG553 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@12->form_mode::@1#1] -- register_copy 
-  //SEG554 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@12->form_mode::@1#2] -- register_copy 
+  //SEG551 [291] phi from form_mode::@6 to form_mode::@1 [phi:form_mode::@6->form_mode::@1]
+  b1_from_b6:
+  //SEG552 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@6->form_mode::@1#0] -- register_copy 
+  //SEG553 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@6->form_mode::@1#1] -- register_copy 
+  //SEG554 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@6->form_mode::@1#2] -- register_copy 
     jmp b1
   //SEG555 form_mode::@1
   b1:
-    jmp b9
-  //SEG556 form_mode::@9
-  b9:
-  //SEG557 [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@9 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b4
+  //SEG556 form_mode::@4
+  b4:
+  //SEG557 [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b9
-  //SEG558 [293] phi from form_mode::@9 to form_mode::@11 [phi:form_mode::@9->form_mode::@11]
-  b11_from_b9:
-    jmp b11
-  //SEG559 form_mode::@11
-  b11:
+    bne b4
+  //SEG558 [293] phi from form_mode::@4 to form_mode::@5 [phi:form_mode::@4->form_mode::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG559 form_mode::@5
+  b5:
   //SEG560 [294] call form_control 
     jsr form_control
   //SEG561 [295] (byte) form_control::return#0 ← (byte) form_control::return#2 -- vbuz1=vbuz2 
     lda form_control.return_2
     sta form_control.return
-    jmp b30
-  //SEG562 form_mode::@30
-  b30:
+    jmp b17
+  //SEG562 form_mode::@17
+  b17:
   //SEG563 [296] (byte~) form_mode::$36 ← (byte) form_control::return#0 -- vbuz1=vbuz2 
     lda form_control.return
     sta _36
-  //SEG564 [297] if((byte~) form_mode::$36==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_mode::@12 -- vbuz1_eq_0_then_la1 
+  //SEG564 [297] if((byte~) form_mode::$36==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_mode::@6 -- vbuz1_eq_0_then_la1 
     lda _36
     cmp #0
-    beq b12
+    beq b6
     jmp breturn
   //SEG565 form_mode::@return
   breturn:
   //SEG566 [298] return 
     rts
-  //SEG567 form_mode::@12
-  b12:
+  //SEG567 form_mode::@6
+  b6:
   //SEG568 [299] if((byte) form_mode::preset_current#7==*((const byte[]) form_fields_val#0)) goto form_mode::@1 -- vbuz1_eq__deref_pbuc1_then_la1 
     lda form_fields_val
     cmp preset_current
-    beq b1_from_b12
-    jmp b19
-  //SEG569 form_mode::@19
-  b19:
+    beq b1_from_b6
+    jmp b7
+  //SEG569 form_mode::@7
+  b7:
   //SEG570 [300] (byte) apply_preset::idx#0 ← *((const byte[]) form_fields_val#0) -- vbuz1=_deref_pbuc1 
     lda form_fields_val
     sta apply_preset.idx
   //SEG571 [301] call apply_preset 
     jsr apply_preset
-    jmp b31
-  //SEG572 form_mode::@31
-  b31:
+    jmp b18
+  //SEG572 form_mode::@18
+  b18:
   //SEG573 [302] (byte) form_mode::preset_current#1 ← *((const byte[]) form_fields_val#0) -- vbuz1=_deref_pbuc1 
     lda form_fields_val
     sta preset_current
   //SEG574 [303] call form_render_values 
-  //SEG575 [330] phi from form_mode::@31 to form_render_values [phi:form_mode::@31->form_render_values]
-  form_render_values_from_b31:
+  //SEG575 [330] phi from form_mode::@18 to form_render_values [phi:form_mode::@18->form_render_values]
+  form_render_values_from_b18:
     jsr form_render_values
-    jmp b32
-  //SEG576 form_mode::@32
-  b32:
+    jmp b19
+  //SEG576 form_mode::@19
+  b19:
   //SEG577 [304] (byte) render_preset_name::idx#1 ← *((const byte[]) form_fields_val#0) -- vbuz1=_deref_pbuc1 
     lda form_fields_val
     sta render_preset_name.idx
   //SEG578 [305] call render_preset_name 
-  //SEG579 [306] phi from form_mode::@32 to render_preset_name [phi:form_mode::@32->render_preset_name]
-  render_preset_name_from_b32:
-  //SEG580 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#1 [phi:form_mode::@32->render_preset_name#0] -- register_copy 
+  //SEG579 [306] phi from form_mode::@19 to render_preset_name [phi:form_mode::@19->render_preset_name]
+  render_preset_name_from_b19:
+  //SEG580 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#1 [phi:form_mode::@19->render_preset_name#0] -- register_copy 
     jsr render_preset_name
-    jmp b1_from_b32
+    jmp b1_from_b19
 }
 //SEG581 render_preset_name
 // Render form preset name in the form
@@ -15758,184 +15919,184 @@ form_mode: {
 render_preset_name: {
     .label idx = $22
     .label name = $23
-  //SEG582 [307] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_preset_name::@22 -- vbuz1_eq_0_then_la1 
+  //SEG582 [307] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_preset_name::@1 -- vbuz1_eq_0_then_la1 
     lda idx
     cmp #0
-    beq b22_from_render_preset_name
-    jmp b23
-  //SEG583 render_preset_name::@23
-  b23:
-  //SEG584 [308] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto render_preset_name::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_render_preset_name
+    jmp b2
+  //SEG583 render_preset_name::@2
+  b2:
+  //SEG584 [308] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto render_preset_name::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #1
     cmp idx
-    beq b22_from_b23
-    jmp b24
-  //SEG585 render_preset_name::@24
-  b24:
-  //SEG586 [309] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_preset_name::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b2
+    jmp b3
+  //SEG585 render_preset_name::@3
+  b3:
+  //SEG586 [309] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_preset_name::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #2
     cmp idx
-    beq b22_from_b24
-    jmp b25
-  //SEG587 render_preset_name::@25
-  b25:
-  //SEG588 [310] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto render_preset_name::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b3
+    jmp b4
+  //SEG587 render_preset_name::@4
+  b4:
+  //SEG588 [310] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto render_preset_name::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #3
     cmp idx
-    beq b22_from_b25
-    jmp b26
-  //SEG589 render_preset_name::@26
-  b26:
-  //SEG590 [311] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_preset_name::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b4
+    jmp b5
+  //SEG589 render_preset_name::@5
+  b5:
+  //SEG590 [311] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_preset_name::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #4
     cmp idx
-    beq b22_from_b26
-    jmp b27
-  //SEG591 render_preset_name::@27
-  b27:
-  //SEG592 [312] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto render_preset_name::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b5
+    jmp b6
+  //SEG591 render_preset_name::@6
+  b6:
+  //SEG592 [312] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto render_preset_name::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #5
     cmp idx
-    beq b22_from_b27
-    jmp b28
-  //SEG593 render_preset_name::@28
-  b28:
-  //SEG594 [313] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto render_preset_name::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b6
+    jmp b7
+  //SEG593 render_preset_name::@7
+  b7:
+  //SEG594 [313] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto render_preset_name::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #6
     cmp idx
-    beq b22_from_b28
-    jmp b29
-  //SEG595 render_preset_name::@29
-  b29:
-  //SEG596 [314] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto render_preset_name::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b7
+    jmp b8
+  //SEG595 render_preset_name::@8
+  b8:
+  //SEG596 [314] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto render_preset_name::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #7
     cmp idx
-    beq b22_from_b29
-    jmp b30
-  //SEG597 render_preset_name::@30
-  b30:
-  //SEG598 [315] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto render_preset_name::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b8
+    jmp b9
+  //SEG597 render_preset_name::@9
+  b9:
+  //SEG598 [315] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto render_preset_name::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #8
     cmp idx
-    beq b22_from_b30
-    jmp b31
-  //SEG599 render_preset_name::@31
-  b31:
-  //SEG600 [316] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto render_preset_name::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b9
+    jmp b10
+  //SEG599 render_preset_name::@10
+  b10:
+  //SEG600 [316] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto render_preset_name::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #9
     cmp idx
-    beq b22_from_b31
-    jmp b32
-  //SEG601 render_preset_name::@32
-  b32:
-  //SEG602 [317] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto render_preset_name::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b10
+    jmp b11
+  //SEG601 render_preset_name::@11
+  b11:
+  //SEG602 [317] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto render_preset_name::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #$a
     cmp idx
-    beq b22_from_b32
-  //SEG603 [318] phi from render_preset_name::@32 to render_preset_name::@33 [phi:render_preset_name::@32->render_preset_name::@33]
-  b33_from_b32:
-    jmp b33
-  //SEG604 render_preset_name::@33
-  b33:
-  //SEG605 [319] phi from render_preset_name render_preset_name::@33 to render_preset_name::@22 [phi:render_preset_name/render_preset_name::@33->render_preset_name::@22]
-  b22_from_render_preset_name:
-  b22_from_b33:
-  //SEG606 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#1 [phi:render_preset_name/render_preset_name::@33->render_preset_name::@22#0] -- pbuz1=pbuc1 
+    beq b1_from_b11
+  //SEG603 [318] phi from render_preset_name::@11 to render_preset_name::@12 [phi:render_preset_name::@11->render_preset_name::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG604 render_preset_name::@12
+  b12:
+  //SEG605 [319] phi from render_preset_name render_preset_name::@12 to render_preset_name::@1 [phi:render_preset_name/render_preset_name::@12->render_preset_name::@1]
+  b1_from_render_preset_name:
+  b1_from_b12:
+  //SEG606 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#1 [phi:render_preset_name/render_preset_name::@12->render_preset_name::@1#0] -- pbuz1=pbuc1 
     lda #<name_1
     sta name
     lda #>name_1
     sta name+1
-    jmp b22
-  //SEG607 [319] phi from render_preset_name::@23 to render_preset_name::@22 [phi:render_preset_name::@23->render_preset_name::@22]
-  b22_from_b23:
-  //SEG608 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#2 [phi:render_preset_name::@23->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_2
-    sta name
-    lda #>name_2
-    sta name+1
-    jmp b22
-  //SEG609 [319] phi from render_preset_name::@24 to render_preset_name::@22 [phi:render_preset_name::@24->render_preset_name::@22]
-  b22_from_b24:
-  //SEG610 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#3 [phi:render_preset_name::@24->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_3
-    sta name
-    lda #>name_3
-    sta name+1
-    jmp b22
-  //SEG611 [319] phi from render_preset_name::@25 to render_preset_name::@22 [phi:render_preset_name::@25->render_preset_name::@22]
-  b22_from_b25:
-  //SEG612 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#4 [phi:render_preset_name::@25->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_4
-    sta name
-    lda #>name_4
-    sta name+1
-    jmp b22
-  //SEG613 [319] phi from render_preset_name::@26 to render_preset_name::@22 [phi:render_preset_name::@26->render_preset_name::@22]
-  b22_from_b26:
-  //SEG614 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#5 [phi:render_preset_name::@26->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_5
-    sta name
-    lda #>name_5
-    sta name+1
-    jmp b22
-  //SEG615 [319] phi from render_preset_name::@27 to render_preset_name::@22 [phi:render_preset_name::@27->render_preset_name::@22]
-  b22_from_b27:
-  //SEG616 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#6 [phi:render_preset_name::@27->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_6
-    sta name
-    lda #>name_6
-    sta name+1
-    jmp b22
-  //SEG617 [319] phi from render_preset_name::@28 to render_preset_name::@22 [phi:render_preset_name::@28->render_preset_name::@22]
-  b22_from_b28:
-  //SEG618 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#7 [phi:render_preset_name::@28->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_7
-    sta name
-    lda #>name_7
-    sta name+1
-    jmp b22
-  //SEG619 [319] phi from render_preset_name::@29 to render_preset_name::@22 [phi:render_preset_name::@29->render_preset_name::@22]
-  b22_from_b29:
-  //SEG620 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#8 [phi:render_preset_name::@29->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_8
-    sta name
-    lda #>name_8
-    sta name+1
-    jmp b22
-  //SEG621 [319] phi from render_preset_name::@30 to render_preset_name::@22 [phi:render_preset_name::@30->render_preset_name::@22]
-  b22_from_b30:
-  //SEG622 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#9 [phi:render_preset_name::@30->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_9
-    sta name
-    lda #>name_9
-    sta name+1
-    jmp b22
-  //SEG623 [319] phi from render_preset_name::@31 to render_preset_name::@22 [phi:render_preset_name::@31->render_preset_name::@22]
-  b22_from_b31:
-  //SEG624 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#10 [phi:render_preset_name::@31->render_preset_name::@22#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG607 [319] phi from render_preset_name::@10 to render_preset_name::@1 [phi:render_preset_name::@10->render_preset_name::@1]
+  b1_from_b10:
+  //SEG608 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#10 [phi:render_preset_name::@10->render_preset_name::@1#0] -- pbuz1=pbuc1 
     lda #<name_10
     sta name
     lda #>name_10
     sta name+1
-    jmp b22
-  //SEG625 [319] phi from render_preset_name::@32 to render_preset_name::@22 [phi:render_preset_name::@32->render_preset_name::@22]
-  b22_from_b32:
-  //SEG626 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#11 [phi:render_preset_name::@32->render_preset_name::@22#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG609 [319] phi from render_preset_name::@11 to render_preset_name::@1 [phi:render_preset_name::@11->render_preset_name::@1]
+  b1_from_b11:
+  //SEG610 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#11 [phi:render_preset_name::@11->render_preset_name::@1#0] -- pbuz1=pbuc1 
     lda #<name_11
     sta name
     lda #>name_11
     sta name+1
-    jmp b22
-  //SEG627 render_preset_name::@22
-  b22:
+    jmp b1
+  //SEG611 [319] phi from render_preset_name::@2 to render_preset_name::@1 [phi:render_preset_name::@2->render_preset_name::@1]
+  b1_from_b2:
+  //SEG612 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#2 [phi:render_preset_name::@2->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_2
+    sta name
+    lda #>name_2
+    sta name+1
+    jmp b1
+  //SEG613 [319] phi from render_preset_name::@3 to render_preset_name::@1 [phi:render_preset_name::@3->render_preset_name::@1]
+  b1_from_b3:
+  //SEG614 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#3 [phi:render_preset_name::@3->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_3
+    sta name
+    lda #>name_3
+    sta name+1
+    jmp b1
+  //SEG615 [319] phi from render_preset_name::@4 to render_preset_name::@1 [phi:render_preset_name::@4->render_preset_name::@1]
+  b1_from_b4:
+  //SEG616 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#4 [phi:render_preset_name::@4->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_4
+    sta name
+    lda #>name_4
+    sta name+1
+    jmp b1
+  //SEG617 [319] phi from render_preset_name::@5 to render_preset_name::@1 [phi:render_preset_name::@5->render_preset_name::@1]
+  b1_from_b5:
+  //SEG618 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#5 [phi:render_preset_name::@5->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_5
+    sta name
+    lda #>name_5
+    sta name+1
+    jmp b1
+  //SEG619 [319] phi from render_preset_name::@6 to render_preset_name::@1 [phi:render_preset_name::@6->render_preset_name::@1]
+  b1_from_b6:
+  //SEG620 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#6 [phi:render_preset_name::@6->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_6
+    sta name
+    lda #>name_6
+    sta name+1
+    jmp b1
+  //SEG621 [319] phi from render_preset_name::@7 to render_preset_name::@1 [phi:render_preset_name::@7->render_preset_name::@1]
+  b1_from_b7:
+  //SEG622 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#7 [phi:render_preset_name::@7->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_7
+    sta name
+    lda #>name_7
+    sta name+1
+    jmp b1
+  //SEG623 [319] phi from render_preset_name::@8 to render_preset_name::@1 [phi:render_preset_name::@8->render_preset_name::@1]
+  b1_from_b8:
+  //SEG624 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#8 [phi:render_preset_name::@8->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_8
+    sta name
+    lda #>name_8
+    sta name+1
+    jmp b1
+  //SEG625 [319] phi from render_preset_name::@9 to render_preset_name::@1 [phi:render_preset_name::@9->render_preset_name::@1]
+  b1_from_b9:
+  //SEG626 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#9 [phi:render_preset_name::@9->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_9
+    sta name
+    lda #>name_9
+    sta name+1
+    jmp b1
+  //SEG627 render_preset_name::@1
+  b1:
   //SEG628 [320] (byte*) print_str_at::str#1 ← (byte*) render_preset_name::name#13 -- pbuz1=pbuz2 
     lda name
     sta print_str_at.str
     lda name+1
     sta print_str_at.str+1
   //SEG629 [321] call print_str_at 
-  //SEG630 [323] phi from render_preset_name::@22 to print_str_at [phi:render_preset_name::@22->print_str_at]
-  print_str_at_from_b22:
+  //SEG630 [323] phi from render_preset_name::@1 to print_str_at [phi:render_preset_name::@1->print_str_at]
+  print_str_at_from_b1:
     jsr print_str_at
     jmp breturn
   //SEG631 render_preset_name::@return
@@ -16015,9 +16176,9 @@ form_render_values: {
     lda #0
     sta idx
     jmp b1
-  //SEG651 [331] phi from form_render_values::@3 to form_render_values::@1 [phi:form_render_values::@3->form_render_values::@1]
-  b1_from_b3:
-  //SEG652 [331] phi (byte) form_render_values::idx#2 = (byte) form_render_values::idx#1 [phi:form_render_values::@3->form_render_values::@1#0] -- register_copy 
+  //SEG651 [331] phi from form_render_values::@2 to form_render_values::@1 [phi:form_render_values::@2->form_render_values::@1]
+  b1_from_b2:
+  //SEG652 [331] phi (byte) form_render_values::idx#2 = (byte) form_render_values::idx#1 [phi:form_render_values::@2->form_render_values::@1#0] -- register_copy 
     jmp b1
   //SEG653 form_render_values::@1
   b1:
@@ -16034,9 +16195,9 @@ form_render_values: {
     sta form_field_ptr.return_2
     lda form_field_ptr.return+1
     sta form_field_ptr.return_2+1
-    jmp b3
-  //SEG659 form_render_values::@3
-  b3:
+    jmp b2
+  //SEG659 form_render_values::@2
+  b2:
   //SEG660 [335] (byte*) form_render_values::field#0 ← (byte*) form_field_ptr::return#2 -- pbuz1=pbuz2 
     lda form_field_ptr.return_2
     sta field
@@ -16053,7 +16214,7 @@ form_render_values: {
   //SEG663 [338] if((byte) form_render_values::idx#1<(const byte) form_fields_cnt#0) goto form_render_values::@1 -- vbuz1_lt_vbuc1_then_la1 
     lda idx
     cmp #form_fields_cnt
-    bcc b1_from_b3
+    bcc b1_from_b2
     jmp breturn
   //SEG664 form_render_values::@return
   breturn:
@@ -16108,199 +16269,199 @@ apply_preset: {
     .label i = $2d
     .label idx = $109
     .label preset = $2b
-  //SEG674 [346] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto apply_preset::@22 -- vbuz1_eq_0_then_la1 
+  //SEG674 [346] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto apply_preset::@1 -- vbuz1_eq_0_then_la1 
     lda idx
     cmp #0
-    beq b22_from_apply_preset
-    jmp b23
-  //SEG675 apply_preset::@23
-  b23:
-  //SEG676 [347] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto apply_preset::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_apply_preset
+    jmp b2
+  //SEG675 apply_preset::@2
+  b2:
+  //SEG676 [347] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto apply_preset::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #1
     cmp idx
-    beq b22_from_b23
-    jmp b24
-  //SEG677 apply_preset::@24
-  b24:
-  //SEG678 [348] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto apply_preset::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b2
+    jmp b3
+  //SEG677 apply_preset::@3
+  b3:
+  //SEG678 [348] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto apply_preset::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #2
     cmp idx
-    beq b22_from_b24
-    jmp b25
-  //SEG679 apply_preset::@25
-  b25:
-  //SEG680 [349] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto apply_preset::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b3
+    jmp b4
+  //SEG679 apply_preset::@4
+  b4:
+  //SEG680 [349] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto apply_preset::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #3
     cmp idx
-    beq b22_from_b25
-    jmp b26
-  //SEG681 apply_preset::@26
-  b26:
-  //SEG682 [350] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto apply_preset::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b4
+    jmp b5
+  //SEG681 apply_preset::@5
+  b5:
+  //SEG682 [350] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto apply_preset::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #4
     cmp idx
-    beq b22_from_b26
-    jmp b27
-  //SEG683 apply_preset::@27
-  b27:
-  //SEG684 [351] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 5) goto apply_preset::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b5
+    jmp b6
+  //SEG683 apply_preset::@6
+  b6:
+  //SEG684 [351] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 5) goto apply_preset::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #5
     cmp idx
-    beq b22_from_b27
-    jmp b28
-  //SEG685 apply_preset::@28
-  b28:
-  //SEG686 [352] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 6) goto apply_preset::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b6
+    jmp b7
+  //SEG685 apply_preset::@7
+  b7:
+  //SEG686 [352] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 6) goto apply_preset::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #6
     cmp idx
-    beq b22_from_b28
-    jmp b29
-  //SEG687 apply_preset::@29
-  b29:
-  //SEG688 [353] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 7) goto apply_preset::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b7
+    jmp b8
+  //SEG687 apply_preset::@8
+  b8:
+  //SEG688 [353] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 7) goto apply_preset::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #7
     cmp idx
-    beq b22_from_b29
-    jmp b30
-  //SEG689 apply_preset::@30
-  b30:
-  //SEG690 [354] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 8) goto apply_preset::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b8
+    jmp b9
+  //SEG689 apply_preset::@9
+  b9:
+  //SEG690 [354] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 8) goto apply_preset::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #8
     cmp idx
-    beq b22_from_b30
-    jmp b31
-  //SEG691 apply_preset::@31
-  b31:
-  //SEG692 [355] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 9) goto apply_preset::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b9
+    jmp b10
+  //SEG691 apply_preset::@10
+  b10:
+  //SEG692 [355] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 9) goto apply_preset::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #9
     cmp idx
-    beq b22_from_b31
-    jmp b32
-  //SEG693 apply_preset::@32
-  b32:
-  //SEG694 [356] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) $a) goto apply_preset::@22 -- vbuz1_eq_vbuc1_then_la1 
+    beq b1_from_b10
+    jmp b11
+  //SEG693 apply_preset::@11
+  b11:
+  //SEG694 [356] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) $a) goto apply_preset::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #$a
     cmp idx
-    beq b22_from_b32
-  //SEG695 [357] phi from apply_preset::@32 to apply_preset::@33 [phi:apply_preset::@32->apply_preset::@33]
-  b33_from_b32:
-    jmp b33
-  //SEG696 apply_preset::@33
-  b33:
-  //SEG697 [358] phi from apply_preset apply_preset::@33 to apply_preset::@22 [phi:apply_preset/apply_preset::@33->apply_preset::@22]
-  b22_from_apply_preset:
-  b22_from_b33:
-  //SEG698 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdchar#0 [phi:apply_preset/apply_preset::@33->apply_preset::@22#0] -- pbuz1=pbuc1 
+    beq b1_from_b11
+  //SEG695 [357] phi from apply_preset::@11 to apply_preset::@12 [phi:apply_preset::@11->apply_preset::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG696 apply_preset::@12
+  b12:
+  //SEG697 [358] phi from apply_preset apply_preset::@12 to apply_preset::@1 [phi:apply_preset/apply_preset::@12->apply_preset::@1]
+  b1_from_apply_preset:
+  b1_from_b12:
+  //SEG698 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdchar#0 [phi:apply_preset/apply_preset::@12->apply_preset::@1#0] -- pbuz1=pbuc1 
     lda #<preset_stdchar
     sta preset
     lda #>preset_stdchar
     sta preset+1
-    jmp b22
-  //SEG699 [358] phi from apply_preset::@23 to apply_preset::@22 [phi:apply_preset::@23->apply_preset::@22]
-  b22_from_b23:
-  //SEG700 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_ecmchar#0 [phi:apply_preset::@23->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_ecmchar
-    sta preset
-    lda #>preset_ecmchar
-    sta preset+1
-    jmp b22
-  //SEG701 [358] phi from apply_preset::@24 to apply_preset::@22 [phi:apply_preset::@24->apply_preset::@22]
-  b22_from_b24:
-  //SEG702 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdbm#0 [phi:apply_preset::@24->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_stdbm
-    sta preset
-    lda #>preset_stdbm
-    sta preset+1
-    jmp b22
-  //SEG703 [358] phi from apply_preset::@25 to apply_preset::@22 [phi:apply_preset::@25->apply_preset::@22]
-  b22_from_b25:
-  //SEG704 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_mcbm#0 [phi:apply_preset::@25->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_mcbm
-    sta preset
-    lda #>preset_mcbm
-    sta preset+1
-    jmp b22
-  //SEG705 [358] phi from apply_preset::@26 to apply_preset::@22 [phi:apply_preset::@26->apply_preset::@22]
-  b22_from_b26:
-  //SEG706 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_stdchar#0 [phi:apply_preset::@26->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_hi_stdchar
-    sta preset
-    lda #>preset_hi_stdchar
-    sta preset+1
-    jmp b22
-  //SEG707 [358] phi from apply_preset::@27 to apply_preset::@22 [phi:apply_preset::@27->apply_preset::@22]
-  b22_from_b27:
-  //SEG708 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_ecmchar#0 [phi:apply_preset::@27->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_hi_ecmchar
-    sta preset
-    lda #>preset_hi_ecmchar
-    sta preset+1
-    jmp b22
-  //SEG709 [358] phi from apply_preset::@28 to apply_preset::@22 [phi:apply_preset::@28->apply_preset::@22]
-  b22_from_b28:
-  //SEG710 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_twoplane#0 [phi:apply_preset::@28->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_twoplane
-    sta preset
-    lda #>preset_twoplane
-    sta preset+1
-    jmp b22
-  //SEG711 [358] phi from apply_preset::@29 to apply_preset::@22 [phi:apply_preset::@29->apply_preset::@22]
-  b22_from_b29:
-  //SEG712 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_chunky#0 [phi:apply_preset::@29->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_chunky
-    sta preset
-    lda #>preset_chunky
-    sta preset+1
-    jmp b22
-  //SEG713 [358] phi from apply_preset::@30 to apply_preset::@22 [phi:apply_preset::@30->apply_preset::@22]
-  b22_from_b30:
-  //SEG714 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred#0 [phi:apply_preset::@30->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_sixsfred
-    sta preset
-    lda #>preset_sixsfred
-    sta preset+1
-    jmp b22
-  //SEG715 [358] phi from apply_preset::@31 to apply_preset::@22 [phi:apply_preset::@31->apply_preset::@22]
-  b22_from_b31:
-  //SEG716 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred2#0 [phi:apply_preset::@31->apply_preset::@22#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG699 [358] phi from apply_preset::@10 to apply_preset::@1 [phi:apply_preset::@10->apply_preset::@1]
+  b1_from_b10:
+  //SEG700 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred2#0 [phi:apply_preset::@10->apply_preset::@1#0] -- pbuz1=pbuc1 
     lda #<preset_sixsfred2
     sta preset
     lda #>preset_sixsfred2
     sta preset+1
-    jmp b22
-  //SEG717 [358] phi from apply_preset::@32 to apply_preset::@22 [phi:apply_preset::@32->apply_preset::@22]
-  b22_from_b32:
-  //SEG718 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_8bpppixelcell#0 [phi:apply_preset::@32->apply_preset::@22#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG701 [358] phi from apply_preset::@11 to apply_preset::@1 [phi:apply_preset::@11->apply_preset::@1]
+  b1_from_b11:
+  //SEG702 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_8bpppixelcell#0 [phi:apply_preset::@11->apply_preset::@1#0] -- pbuz1=pbuc1 
     lda #<preset_8bpppixelcell
     sta preset
     lda #>preset_8bpppixelcell
     sta preset+1
-    jmp b22
-  //SEG719 apply_preset::@22
-  b22:
-  //SEG720 [359] phi from apply_preset::@22 to apply_preset::@45 [phi:apply_preset::@22->apply_preset::@45]
-  b45_from_b22:
-  //SEG721 [359] phi (byte) apply_preset::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:apply_preset::@22->apply_preset::@45#0] -- vbuz1=vbuc1 
+    jmp b1
+  //SEG703 [358] phi from apply_preset::@2 to apply_preset::@1 [phi:apply_preset::@2->apply_preset::@1]
+  b1_from_b2:
+  //SEG704 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_ecmchar#0 [phi:apply_preset::@2->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_ecmchar
+    sta preset
+    lda #>preset_ecmchar
+    sta preset+1
+    jmp b1
+  //SEG705 [358] phi from apply_preset::@3 to apply_preset::@1 [phi:apply_preset::@3->apply_preset::@1]
+  b1_from_b3:
+  //SEG706 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdbm#0 [phi:apply_preset::@3->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_stdbm
+    sta preset
+    lda #>preset_stdbm
+    sta preset+1
+    jmp b1
+  //SEG707 [358] phi from apply_preset::@4 to apply_preset::@1 [phi:apply_preset::@4->apply_preset::@1]
+  b1_from_b4:
+  //SEG708 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_mcbm#0 [phi:apply_preset::@4->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_mcbm
+    sta preset
+    lda #>preset_mcbm
+    sta preset+1
+    jmp b1
+  //SEG709 [358] phi from apply_preset::@5 to apply_preset::@1 [phi:apply_preset::@5->apply_preset::@1]
+  b1_from_b5:
+  //SEG710 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_stdchar#0 [phi:apply_preset::@5->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_hi_stdchar
+    sta preset
+    lda #>preset_hi_stdchar
+    sta preset+1
+    jmp b1
+  //SEG711 [358] phi from apply_preset::@6 to apply_preset::@1 [phi:apply_preset::@6->apply_preset::@1]
+  b1_from_b6:
+  //SEG712 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_ecmchar#0 [phi:apply_preset::@6->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_hi_ecmchar
+    sta preset
+    lda #>preset_hi_ecmchar
+    sta preset+1
+    jmp b1
+  //SEG713 [358] phi from apply_preset::@7 to apply_preset::@1 [phi:apply_preset::@7->apply_preset::@1]
+  b1_from_b7:
+  //SEG714 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_twoplane#0 [phi:apply_preset::@7->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_twoplane
+    sta preset
+    lda #>preset_twoplane
+    sta preset+1
+    jmp b1
+  //SEG715 [358] phi from apply_preset::@8 to apply_preset::@1 [phi:apply_preset::@8->apply_preset::@1]
+  b1_from_b8:
+  //SEG716 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_chunky#0 [phi:apply_preset::@8->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_chunky
+    sta preset
+    lda #>preset_chunky
+    sta preset+1
+    jmp b1
+  //SEG717 [358] phi from apply_preset::@9 to apply_preset::@1 [phi:apply_preset::@9->apply_preset::@1]
+  b1_from_b9:
+  //SEG718 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred#0 [phi:apply_preset::@9->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_sixsfred
+    sta preset
+    lda #>preset_sixsfred
+    sta preset+1
+    jmp b1
+  //SEG719 apply_preset::@1
+  b1:
+  //SEG720 [359] phi from apply_preset::@1 to apply_preset::@13 [phi:apply_preset::@1->apply_preset::@13]
+  b13_from_b1:
+  //SEG721 [359] phi (byte) apply_preset::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:apply_preset::@1->apply_preset::@13#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b45
+    jmp b13
   // Copy preset values into the fields
-  //SEG722 [359] phi from apply_preset::@45 to apply_preset::@45 [phi:apply_preset::@45->apply_preset::@45]
-  b45_from_b45:
-  //SEG723 [359] phi (byte) apply_preset::i#2 = (byte) apply_preset::i#1 [phi:apply_preset::@45->apply_preset::@45#0] -- register_copy 
-    jmp b45
-  //SEG724 apply_preset::@45
-  b45:
+  //SEG722 [359] phi from apply_preset::@13 to apply_preset::@13 [phi:apply_preset::@13->apply_preset::@13]
+  b13_from_b13:
+  //SEG723 [359] phi (byte) apply_preset::i#2 = (byte) apply_preset::i#1 [phi:apply_preset::@13->apply_preset::@13#0] -- register_copy 
+    jmp b13
+  //SEG724 apply_preset::@13
+  b13:
   //SEG725 [360] *((const byte[]) form_fields_val#0 + (byte) apply_preset::i#2) ← *((byte*) apply_preset::preset#14 + (byte) apply_preset::i#2) -- pbuc1_derefidx_vbuz1=pbuz2_derefidx_vbuz1 
     ldy i
     lda (preset),y
     sta form_fields_val,y
   //SEG726 [361] (byte) apply_preset::i#1 ← ++ (byte) apply_preset::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG727 [362] if((byte) apply_preset::i#1!=(const byte) form_fields_cnt#0) goto apply_preset::@45 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG727 [362] if((byte) apply_preset::i#1!=(const byte) form_fields_cnt#0) goto apply_preset::@13 -- vbuz1_neq_vbuc1_then_la1 
     lda #form_fields_cnt
     cmp i
-    bne b45_from_b45
+    bne b13_from_b13
     jmp breturn
   //SEG728 apply_preset::@return
   breturn:
@@ -16333,9 +16494,9 @@ form_control: {
     sta form_field_ptr.return_3
     lda form_field_ptr.return+1
     sta form_field_ptr.return_3+1
-    jmp b33
-  //SEG736 form_control::@33
-  b33:
+    jmp b17
+  //SEG736 form_control::@17
+  b17:
   //SEG737 [367] (byte*) form_control::field#0 ← (byte*) form_field_ptr::return#3 -- pbuz1=pbuz2 
     lda form_field_ptr.return_3
     sta field
@@ -16343,13 +16504,13 @@ form_control: {
     sta field+1
   //SEG738 [368] (signed byte) form_cursor_count#5 ← -- (signed byte) form_cursor_count#21 -- vbsz1=_dec_vbsz1 
     dec form_cursor_count
-  //SEG739 [369] if((signed byte) form_cursor_count#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@36 -- vbsz1_ge_0_then_la1 
+  //SEG739 [369] if((signed byte) form_cursor_count#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@20 -- vbsz1_ge_0_then_la1 
     lda form_cursor_count
     cmp #0
-    bpl b36_from_b33
-  //SEG740 [370] phi from form_control::@33 to form_control::@1 [phi:form_control::@33->form_control::@1]
-  b1_from_b33:
-  //SEG741 [370] phi (signed byte) form_cursor_count#15 = (const signed byte) FORM_CURSOR_BLINK#0 [phi:form_control::@33->form_control::@1#0] -- vbsz1=vbsc1 
+    bpl b20_from_b17
+  //SEG740 [370] phi from form_control::@17 to form_control::@1 [phi:form_control::@17->form_control::@1]
+  b1_from_b17:
+  //SEG741 [370] phi (signed byte) form_cursor_count#15 = (const signed byte) FORM_CURSOR_BLINK#0 [phi:form_control::@17->form_control::@1#0] -- vbsz1=vbsc1 
     lda #FORM_CURSOR_BLINK
     sta form_cursor_count
     jmp b1
@@ -16363,9 +16524,9 @@ form_control: {
     eor #$80
   !:
     bmi b2
-    jmp b8
-  //SEG744 form_control::@8
-  b8:
+    jmp b6
+  //SEG744 form_control::@6
+  b6:
   //SEG745 [372] (byte~) form_control::$13 ← *((byte*) form_control::field#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f -- vbuz1=_deref_pbuz2_band_vbuc1 
     lda #$7f
     ldy #0
@@ -16375,9 +16536,9 @@ form_control: {
     lda _13
     ldy #0
     sta (field),y
-  //SEG747 [374] phi from form_control::@2 form_control::@8 to form_control::@3 [phi:form_control::@2/form_control::@8->form_control::@3]
+  //SEG747 [374] phi from form_control::@2 form_control::@6 to form_control::@3 [phi:form_control::@2/form_control::@6->form_control::@3]
   b3_from_b2:
-  b3_from_b8:
+  b3_from_b6:
     jmp b3
   //SEG748 form_control::@3
   b3:
@@ -16386,19 +16547,19 @@ form_control: {
   keyboard_event_scan_from_b3:
   //SEG751 [159] phi (byte) keyboard_events_size#110 = (byte) keyboard_events_size#47 [phi:form_control::@3->keyboard_event_scan#0] -- register_copy 
     jsr keyboard_event_scan
-  //SEG752 [376] phi from form_control::@3 to form_control::@34 [phi:form_control::@3->form_control::@34]
-  b34_from_b3:
-    jmp b34
-  //SEG753 form_control::@34
-  b34:
+  //SEG752 [376] phi from form_control::@3 to form_control::@18 [phi:form_control::@3->form_control::@18]
+  b18_from_b3:
+    jmp b18
+  //SEG753 form_control::@18
+  b18:
   //SEG754 [377] call keyboard_event_get 
     jsr keyboard_event_get
   //SEG755 [378] (byte) keyboard_event_get::return#4 ← (byte) keyboard_event_get::return#2 -- vbuz1=vbuz2 
     lda keyboard_event_get.return
     sta keyboard_event_get.return_4
-    jmp b35
-  //SEG756 form_control::@35
-  b35:
+    jmp b19
+  //SEG756 form_control::@19
+  b19:
   //SEG757 [379] (byte) form_control::key_event#0 ← (byte) keyboard_event_get::return#4 -- vbuz1=vbuz2 
     lda keyboard_event_get.return_4
     sta key_event
@@ -16406,9 +16567,9 @@ form_control: {
     lda #KEY_CRSR_DOWN
     cmp key_event
     bne b4
-    jmp b10
-  //SEG759 form_control::@10
-  b10:
+    jmp b7
+  //SEG759 form_control::@7
+  b7:
   //SEG760 [381] (byte~) form_control::$15 ← *((byte*) form_control::field#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f -- vbuz1=_deref_pbuz2_band_vbuc1 
     lda #$7f
     ldy #0
@@ -16423,34 +16584,34 @@ form_control: {
     lda #KEY_MODIFIER_SHIFT
     and keyboard_modifiers
     sta _16
-  //SEG763 [384] if((byte~) form_control::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@19 -- vbuz1_eq_0_then_la1 
+  //SEG763 [384] if((byte~) form_control::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@12 -- vbuz1_eq_0_then_la1 
     lda _16
     cmp #0
-    beq b19
-    jmp b11
-  //SEG764 form_control::@11
-  b11:
+    beq b12
+    jmp b8
+  //SEG764 form_control::@8
+  b8:
   //SEG765 [385] (byte) form_field_idx#44 ← -- (byte) form_field_idx#28 -- vbuz1=_dec_vbuz1 
     dec form_field_idx
-  //SEG766 [386] if((byte) form_field_idx#44!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@37 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG766 [386] if((byte) form_field_idx#44!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@21 -- vbuz1_neq_vbuc1_then_la1 
     lda #$ff
     cmp form_field_idx
-    bne b37_from_b11
-  //SEG767 [387] phi from form_control::@11 to form_control::@22 [phi:form_control::@11->form_control::@22]
-  b22_from_b11:
-  //SEG768 [387] phi (byte) form_field_idx#31 = (const byte) form_fields_cnt#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:form_control::@11->form_control::@22#0] -- vbuz1=vbuc1 
+    bne b21_from_b8
+  //SEG767 [387] phi from form_control::@8 to form_control::@13 [phi:form_control::@8->form_control::@13]
+  b13_from_b8:
+  //SEG768 [387] phi (byte) form_field_idx#31 = (const byte) form_fields_cnt#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:form_control::@8->form_control::@13#0] -- vbuz1=vbuc1 
     lda #form_fields_cnt-1
     sta form_field_idx
-    jmp b22
-  //SEG769 form_control::@22
-  b22:
-  //SEG770 [388] phi from form_control::@22 to form_control::@return [phi:form_control::@22->form_control::@return]
-  breturn_from_b22:
-  //SEG771 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#31 [phi:form_control::@22->form_control::@return#0] -- register_copy 
-  //SEG772 [388] phi (signed byte) form_cursor_count#16 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:form_control::@22->form_control::@return#1] -- vbsz1=vbuc1 
+    jmp b13
+  //SEG769 form_control::@13
+  b13:
+  //SEG770 [388] phi from form_control::@13 to form_control::@return [phi:form_control::@13->form_control::@return]
+  breturn_from_b13:
+  //SEG771 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#31 [phi:form_control::@13->form_control::@return#0] -- register_copy 
+  //SEG772 [388] phi (signed byte) form_cursor_count#16 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:form_control::@13->form_control::@return#1] -- vbsz1=vbuc1 
     lda #FORM_CURSOR_BLINK/2
     sta form_cursor_count
-  //SEG773 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@22->form_control::@return#2] -- vbuz1=vbuc1 
+  //SEG773 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@13->form_control::@return#2] -- vbuz1=vbuc1 
     lda #0
     sta return_2
     jmp breturn
@@ -16458,74 +16619,74 @@ form_control: {
   breturn:
   //SEG775 [389] return 
     rts
-  //SEG776 [390] phi from form_control::@11 to form_control::@37 [phi:form_control::@11->form_control::@37]
-  b37_from_b11:
-    jmp b37
-  //SEG777 form_control::@37
-  b37:
-  //SEG778 [387] phi from form_control::@37 form_control::@38 to form_control::@22 [phi:form_control::@37/form_control::@38->form_control::@22]
-  b22_from_b37:
-  b22_from_b38:
-  //SEG779 [387] phi (byte) form_field_idx#31 = (byte) form_field_idx#44 [phi:form_control::@37/form_control::@38->form_control::@22#0] -- register_copy 
-    jmp b22
-  //SEG780 form_control::@19
-  b19:
+  //SEG776 [390] phi from form_control::@8 to form_control::@21 [phi:form_control::@8->form_control::@21]
+  b21_from_b8:
+    jmp b21
+  //SEG777 form_control::@21
+  b21:
+  //SEG778 [387] phi from form_control::@21 form_control::@22 to form_control::@13 [phi:form_control::@21/form_control::@22->form_control::@13]
+  b13_from_b21:
+  b13_from_b22:
+  //SEG779 [387] phi (byte) form_field_idx#31 = (byte) form_field_idx#44 [phi:form_control::@21/form_control::@22->form_control::@13#0] -- register_copy 
+    jmp b13
+  //SEG780 form_control::@12
+  b12:
   //SEG781 [391] (byte) form_field_idx#45 ← ++ (byte) form_field_idx#28 -- vbuz1=_inc_vbuz1 
     inc form_field_idx
-  //SEG782 [392] if((byte) form_field_idx#45!=(const byte) form_fields_cnt#0) goto form_control::@38 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG782 [392] if((byte) form_field_idx#45!=(const byte) form_fields_cnt#0) goto form_control::@22 -- vbuz1_neq_vbuc1_then_la1 
     lda #form_fields_cnt
     cmp form_field_idx
-    bne b38_from_b19
-  //SEG783 [387] phi from form_control::@19 to form_control::@22 [phi:form_control::@19->form_control::@22]
-  b22_from_b19:
-  //SEG784 [387] phi (byte) form_field_idx#31 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@19->form_control::@22#0] -- vbuz1=vbuc1 
+    bne b22_from_b12
+  //SEG783 [387] phi from form_control::@12 to form_control::@13 [phi:form_control::@12->form_control::@13]
+  b13_from_b12:
+  //SEG784 [387] phi (byte) form_field_idx#31 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@12->form_control::@13#0] -- vbuz1=vbuc1 
     lda #0
     sta form_field_idx
+    jmp b13
+  //SEG785 [393] phi from form_control::@12 to form_control::@22 [phi:form_control::@12->form_control::@22]
+  b22_from_b12:
     jmp b22
-  //SEG785 [393] phi from form_control::@19 to form_control::@38 [phi:form_control::@19->form_control::@38]
-  b38_from_b19:
-    jmp b38
-  //SEG786 form_control::@38
-  b38:
-    jmp b22_from_b38
+  //SEG786 form_control::@22
+  b22:
+    jmp b13_from_b22
   //SEG787 form_control::@4
   b4:
   //SEG788 [394] if((byte) form_control::key_event#0!=(const byte) KEY_CRSR_RIGHT#0) goto form_control::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #KEY_CRSR_RIGHT
     cmp key_event
     bne b5
-    jmp b13
-  //SEG789 form_control::@13
-  b13:
+    jmp b9
+  //SEG789 form_control::@9
+  b9:
   //SEG790 [395] (byte~) form_control::$24 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0 -- vbuz1=vbuz2_band_vbuc1 
     lda #KEY_MODIFIER_SHIFT
     and keyboard_modifiers
     sta _24
-  //SEG791 [396] if((byte~) form_control::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@26 -- vbuz1_eq_0_then_la1 
+  //SEG791 [396] if((byte~) form_control::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@14 -- vbuz1_eq_0_then_la1 
     lda _24
     cmp #0
-    beq b26
-    jmp b14
-  //SEG792 form_control::@14
-  b14:
+    beq b14
+    jmp b10
+  //SEG792 form_control::@10
+  b10:
   //SEG793 [397] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← -- *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) -- pbuc1_derefidx_vbuz1=_dec_pbuc1_derefidx_vbuz1 
     ldx form_field_idx
     dec form_fields_val,x
-  //SEG794 [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@29 -- pbuc1_derefidx_vbuz1_neq_vbuc2_then_la1 
+  //SEG794 [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@15 -- pbuc1_derefidx_vbuz1_neq_vbuc2_then_la1 
     lda #$ff
     ldy form_field_idx
     cmp form_fields_val,y
-    bne b29
-    jmp b15
-  //SEG795 form_control::@15
-  b15:
+    bne b15
+    jmp b11
+  //SEG795 form_control::@11
+  b11:
   //SEG796 [399] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← *((const byte[]) form_fields_max#0 + (byte) form_field_idx#28) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz1 
     ldy form_field_idx
     lda form_fields_max,y
     sta form_fields_val,y
-    jmp b29
-  //SEG797 form_control::@29
-  b29:
+    jmp b15
+  //SEG797 form_control::@15
+  b15:
   //SEG798 [400] *((byte*) form_control::field#0) ← *((const byte[]) print_hextab#0 + *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)) -- _deref_pbuz1=pbuc1_derefidx_pbuc2_derefidx_vbuz2 
     // Render field value
     ldx form_field_idx
@@ -16533,40 +16694,40 @@ form_control: {
     lda print_hextab,y
     ldy #0
     sta (field),y
-  //SEG799 [388] phi from form_control::@29 form_control::@39 to form_control::@return [phi:form_control::@29/form_control::@39->form_control::@return]
-  breturn_from_b29:
-  breturn_from_b39:
-  //SEG800 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#28 [phi:form_control::@29/form_control::@39->form_control::@return#0] -- register_copy 
-  //SEG801 [388] phi (signed byte) form_cursor_count#16 = (signed byte) form_cursor_count#15 [phi:form_control::@29/form_control::@39->form_control::@return#1] -- register_copy 
-  //SEG802 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@29/form_control::@39->form_control::@return#2] -- vbuz1=vbuc1 
+  //SEG799 [388] phi from form_control::@15 form_control::@23 to form_control::@return [phi:form_control::@15/form_control::@23->form_control::@return]
+  breturn_from_b15:
+  breturn_from_b23:
+  //SEG800 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#28 [phi:form_control::@15/form_control::@23->form_control::@return#0] -- register_copy 
+  //SEG801 [388] phi (signed byte) form_cursor_count#16 = (signed byte) form_cursor_count#15 [phi:form_control::@15/form_control::@23->form_control::@return#1] -- register_copy 
+  //SEG802 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@15/form_control::@23->form_control::@return#2] -- vbuz1=vbuc1 
     lda #0
     sta return_2
     jmp breturn
-  //SEG803 form_control::@26
-  b26:
+  //SEG803 form_control::@14
+  b14:
   //SEG804 [401] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← ++ *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) -- pbuc1_derefidx_vbuz1=_inc_pbuc1_derefidx_vbuz1 
     ldx form_field_idx
     inc form_fields_val,x
-  //SEG805 [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@29 -- pbuc1_derefidx_vbuz1_le_pbuc2_derefidx_vbuz1_then_la1 
+  //SEG805 [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@15 -- pbuc1_derefidx_vbuz1_le_pbuc2_derefidx_vbuz1_then_la1 
     ldy form_field_idx
     lda form_fields_val,y
     cmp form_fields_max,y
-    bcc b29
-    beq b29
-    jmp b31
-  //SEG806 form_control::@31
-  b31:
+    bcc b15
+    beq b15
+    jmp b16
+  //SEG806 form_control::@16
+  b16:
   //SEG807 [403] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuz1=vbuc2 
     lda #0
     ldy form_field_idx
     sta form_fields_val,y
-    jmp b29
+    jmp b15
   //SEG808 form_control::@5
   b5:
-  //SEG809 [404] if((byte) form_control::key_event#0!=(const byte) KEY_SPACE#0) goto form_control::@39 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG809 [404] if((byte) form_control::key_event#0!=(const byte) KEY_SPACE#0) goto form_control::@23 -- vbuz1_neq_vbuc1_then_la1 
     lda #KEY_SPACE
     cmp key_event
-    bne b39_from_b5
+    bne b23_from_b5
   //SEG810 [388] phi from form_control::@5 to form_control::@return [phi:form_control::@5->form_control::@return]
   breturn_from_b5:
   //SEG811 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#28 [phi:form_control::@5->form_control::@return#0] -- register_copy 
@@ -16575,12 +16736,12 @@ form_control: {
     lda #$ff
     sta return_2
     jmp breturn
-  //SEG814 [405] phi from form_control::@5 to form_control::@39 [phi:form_control::@5->form_control::@39]
-  b39_from_b5:
-    jmp b39
-  //SEG815 form_control::@39
-  b39:
-    jmp breturn_from_b39
+  //SEG814 [405] phi from form_control::@5 to form_control::@23 [phi:form_control::@5->form_control::@23]
+  b23_from_b5:
+    jmp b23
+  //SEG815 form_control::@23
+  b23:
+    jmp breturn_from_b23
   //SEG816 form_control::@2
   b2:
   //SEG817 [406] (byte/word/dword~) form_control::$14 ← *((byte*) form_control::field#0) | (byte/word/signed word/dword/signed dword) $80 -- vbuz1=_deref_pbuz2_bor_vbuc1 
@@ -16593,14 +16754,14 @@ form_control: {
     ldy #0
     sta (field),y
     jmp b3_from_b2
-  //SEG819 [408] phi from form_control::@33 to form_control::@36 [phi:form_control::@33->form_control::@36]
-  b36_from_b33:
-    jmp b36
-  //SEG820 form_control::@36
-  b36:
-  //SEG821 [370] phi from form_control::@36 to form_control::@1 [phi:form_control::@36->form_control::@1]
-  b1_from_b36:
-  //SEG822 [370] phi (signed byte) form_cursor_count#15 = (signed byte) form_cursor_count#5 [phi:form_control::@36->form_control::@1#0] -- register_copy 
+  //SEG819 [408] phi from form_control::@17 to form_control::@20 [phi:form_control::@17->form_control::@20]
+  b20_from_b17:
+    jmp b20
+  //SEG820 form_control::@20
+  b20:
+  //SEG821 [370] phi from form_control::@20 to form_control::@1 [phi:form_control::@20->form_control::@1]
+  b1_from_b20:
+  //SEG822 [370] phi (signed byte) form_cursor_count#15 = (signed byte) form_cursor_count#5 [phi:form_control::@20->form_control::@1#0] -- register_copy 
     jmp b1
 }
 //SEG823 form_set_screen
@@ -16675,33 +16836,33 @@ print_str_lines: {
     sta print_char_cursor
     lda print_set_screen.screen+1
     sta print_char_cursor+1
-  //SEG842 [421] phi from print_str_lines print_str_lines::@9 to print_str_lines::@1 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1]
+  //SEG842 [421] phi from print_str_lines print_str_lines::@5 to print_str_lines::@1 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1]
   b1_from_print_str_lines:
-  b1_from_b9:
-  //SEG843 [421] phi (byte*) print_line_cursor#2 = (byte*) print_set_screen::screen#2 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1#0] -- register_copy 
-  //SEG844 [421] phi (byte*) print_char_cursor#22 = (byte*~) print_char_cursor#77 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1#1] -- register_copy 
-  //SEG845 [421] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#5 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1#2] -- register_copy 
+  b1_from_b5:
+  //SEG843 [421] phi (byte*) print_line_cursor#2 = (byte*) print_set_screen::screen#2 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1#0] -- register_copy 
+  //SEG844 [421] phi (byte*) print_char_cursor#22 = (byte*~) print_char_cursor#77 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1#1] -- register_copy 
+  //SEG845 [421] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#5 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1#2] -- register_copy 
     jmp b1
   //SEG846 print_str_lines::@1
   b1:
-  //SEG847 [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@6 -- _deref_pbuz1_neq_vbuc1_then_la1 
+  //SEG847 [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@2 -- _deref_pbuz1_neq_vbuc1_then_la1 
     ldy #0
     lda (str),y
     cmp #'@'
-    bne b6_from_b1
+    bne b2_from_b1
     jmp breturn
   //SEG848 print_str_lines::@return
   breturn:
   //SEG849 [423] return 
     rts
-  //SEG850 [424] phi from print_str_lines::@1 print_str_lines::@7 to print_str_lines::@6 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6]
-  b6_from_b1:
-  b6_from_b7:
-  //SEG851 [424] phi (byte*) print_char_cursor#20 = (byte*) print_char_cursor#22 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#0] -- register_copy 
-  //SEG852 [424] phi (byte*) print_str_lines::str#4 = (byte*) print_str_lines::str#3 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#1] -- register_copy 
-    jmp b6
-  //SEG853 print_str_lines::@6
-  b6:
+  //SEG850 [424] phi from print_str_lines::@1 print_str_lines::@3 to print_str_lines::@2 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2]
+  b2_from_b1:
+  b2_from_b3:
+  //SEG851 [424] phi (byte*) print_char_cursor#20 = (byte*) print_char_cursor#22 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#0] -- register_copy 
+  //SEG852 [424] phi (byte*) print_str_lines::str#4 = (byte*) print_str_lines::str#3 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#1] -- register_copy 
+    jmp b2
+  //SEG853 print_str_lines::@2
+  b2:
   //SEG854 [425] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#4) -- vbuz1=_deref_pbuz2 
     ldy #0
     lda (str),y
@@ -16711,13 +16872,13 @@ print_str_lines: {
     bne !+
     inc str+1
   !:
-  //SEG856 [427] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@7 -- vbuz1_eq_vbuc1_then_la1 
+  //SEG856 [427] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@3 -- vbuz1_eq_vbuc1_then_la1 
     lda #'@'
     cmp ch
-    beq b7_from_b6
-    jmp b8
-  //SEG857 print_str_lines::@8
-  b8:
+    beq b3_from_b2
+    jmp b4
+  //SEG857 print_str_lines::@4
+  b4:
   //SEG858 [428] *((byte*) print_char_cursor#20) ← (byte) print_str_lines::ch#0 -- _deref_pbuz1=vbuz2 
     lda ch
     ldy #0
@@ -16727,32 +16888,32 @@ print_str_lines: {
     bne !+
     inc print_char_cursor+1
   !:
-  //SEG860 [430] phi from print_str_lines::@6 print_str_lines::@8 to print_str_lines::@7 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7]
-  b7_from_b6:
-  b7_from_b8:
-  //SEG861 [430] phi (byte*) print_char_cursor#38 = (byte*) print_char_cursor#20 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7#0] -- register_copy 
-    jmp b7
-  //SEG862 print_str_lines::@7
-  b7:
-  //SEG863 [431] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG860 [430] phi from print_str_lines::@2 print_str_lines::@4 to print_str_lines::@3 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3]
+  b3_from_b2:
+  b3_from_b4:
+  //SEG861 [430] phi (byte*) print_char_cursor#38 = (byte*) print_char_cursor#20 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3#0] -- register_copy 
+    jmp b3
+  //SEG862 print_str_lines::@3
+  b3:
+  //SEG863 [431] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #'@'
     cmp ch
-    bne b6_from_b7
-  //SEG864 [432] phi from print_str_lines::@7 to print_str_lines::@9 [phi:print_str_lines::@7->print_str_lines::@9]
-  b9_from_b7:
-    jmp b9
-  //SEG865 print_str_lines::@9
-  b9:
+    bne b2_from_b3
+  //SEG864 [432] phi from print_str_lines::@3 to print_str_lines::@5 [phi:print_str_lines::@3->print_str_lines::@5]
+  b5_from_b3:
+    jmp b5
+  //SEG865 print_str_lines::@5
+  b5:
   //SEG866 [433] call print_ln 
-  //SEG867 [435] phi from print_str_lines::@9 to print_ln [phi:print_str_lines::@9->print_ln]
-  print_ln_from_b9:
+  //SEG867 [435] phi from print_str_lines::@5 to print_ln [phi:print_str_lines::@5->print_ln]
+  print_ln_from_b5:
     jsr print_ln
   //SEG868 [434] (byte*~) print_char_cursor#78 ← (byte*) print_line_cursor#22 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-    jmp b1_from_b9
+    jmp b1_from_b5
 }
 //SEG869 print_ln
 // Print a newline
@@ -17444,10 +17605,10 @@ gfx_init_plane_horisontal: {
     lda #0
     sta ay
     jmp b1
-  //SEG1092 [545] phi from gfx_init_plane_horisontal::@7 to gfx_init_plane_horisontal::@1 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@1]
-  b1_from_b7:
-  //SEG1093 [545] phi (byte*) gfx_init_plane_horisontal::gfxa#6 = (byte*) gfx_init_plane_horisontal::gfxa#7 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@1#0] -- register_copy 
-  //SEG1094 [545] phi (byte) gfx_init_plane_horisontal::ay#4 = (byte) gfx_init_plane_horisontal::ay#1 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@1#1] -- register_copy 
+  //SEG1092 [545] phi from gfx_init_plane_horisontal::@6 to gfx_init_plane_horisontal::@1 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@1]
+  b1_from_b6:
+  //SEG1093 [545] phi (byte*) gfx_init_plane_horisontal::gfxa#6 = (byte*) gfx_init_plane_horisontal::gfxa#7 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@1#0] -- register_copy 
+  //SEG1094 [545] phi (byte) gfx_init_plane_horisontal::ay#4 = (byte) gfx_init_plane_horisontal::ay#1 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@1#1] -- register_copy 
     jmp b1
   //SEG1095 gfx_init_plane_horisontal::@1
   b1:
@@ -17498,24 +17659,24 @@ gfx_init_plane_horisontal: {
     lda #$28
     cmp ax
     bne b2_from_b4
-    jmp b7
-  //SEG1113 gfx_init_plane_horisontal::@7
-  b7:
+    jmp b6
+  //SEG1113 gfx_init_plane_horisontal::@6
+  b6:
   //SEG1114 [554] (byte) gfx_init_plane_horisontal::ay#1 ← ++ (byte) gfx_init_plane_horisontal::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
   //SEG1115 [555] if((byte) gfx_init_plane_horisontal::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto gfx_init_plane_horisontal::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
-    bne b1_from_b7
-  //SEG1116 [556] phi from gfx_init_plane_horisontal::@7 to gfx_init_plane_horisontal::@8 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG1117 gfx_init_plane_horisontal::@8
-  b8:
+    bne b1_from_b6
+  //SEG1116 [556] phi from gfx_init_plane_horisontal::@6 to gfx_init_plane_horisontal::@7 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG1117 gfx_init_plane_horisontal::@7
+  b7:
   //SEG1118 [557] call dtvSetCpuBankSegment1 
-  //SEG1119 [505] phi from gfx_init_plane_horisontal::@8 to dtvSetCpuBankSegment1 [phi:gfx_init_plane_horisontal::@8->dtvSetCpuBankSegment1]
-  dtvSetCpuBankSegment1_from_b8:
-  //SEG1120 [505] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 = ((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_horisontal::@8->dtvSetCpuBankSegment1#0] -- vbuz1=vbuc1 
+  //SEG1119 [505] phi from gfx_init_plane_horisontal::@7 to dtvSetCpuBankSegment1 [phi:gfx_init_plane_horisontal::@7->dtvSetCpuBankSegment1]
+  dtvSetCpuBankSegment1_from_b7:
+  //SEG1120 [505] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 = ((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_horisontal::@7->dtvSetCpuBankSegment1#0] -- vbuz1=vbuc1 
     lda #$4000/$4000
     sta dtvSetCpuBankSegment1.cpuBankIdx
     jsr dtvSetCpuBankSegment1
@@ -17792,15 +17953,15 @@ gfx_init_plane_8bppchunky: {
   dtvSetCpuBankSegment1_from_b4:
   //SEG1222 [505] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 = (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:gfx_init_plane_8bppchunky::@4->dtvSetCpuBankSegment1#0] -- register_copy 
     jsr dtvSetCpuBankSegment1
-    jmp b8
-  //SEG1223 gfx_init_plane_8bppchunky::@8
-  b8:
+    jmp b7
+  //SEG1223 gfx_init_plane_8bppchunky::@7
+  b7:
   //SEG1224 [593] (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 ← ++ (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#4 -- vbuz1=_inc_vbuz1 
     inc gfxbCpuBank
-  //SEG1225 [594] phi from gfx_init_plane_8bppchunky::@8 to gfx_init_plane_8bppchunky::@3 [phi:gfx_init_plane_8bppchunky::@8->gfx_init_plane_8bppchunky::@3]
-  b3_from_b8:
-  //SEG1226 [594] phi (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#8 = (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 [phi:gfx_init_plane_8bppchunky::@8->gfx_init_plane_8bppchunky::@3#0] -- register_copy 
-  //SEG1227 [594] phi (byte*) gfx_init_plane_8bppchunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_8bppchunky::@8->gfx_init_plane_8bppchunky::@3#1] -- pbuz1=pbuc1 
+  //SEG1225 [594] phi from gfx_init_plane_8bppchunky::@7 to gfx_init_plane_8bppchunky::@3 [phi:gfx_init_plane_8bppchunky::@7->gfx_init_plane_8bppchunky::@3]
+  b3_from_b7:
+  //SEG1226 [594] phi (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#8 = (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 [phi:gfx_init_plane_8bppchunky::@7->gfx_init_plane_8bppchunky::@3#0] -- register_copy 
+  //SEG1227 [594] phi (byte*) gfx_init_plane_8bppchunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_8bppchunky::@7->gfx_init_plane_8bppchunky::@3#1] -- pbuz1=pbuc1 
     lda #<$4000
     sta gfxb
     lda #>$4000
@@ -17881,22 +18042,22 @@ gfx_init_vic_bitmap: {
   //SEG1250 [759] phi from gfx_init_vic_bitmap to bitmap_init [phi:gfx_init_vic_bitmap->bitmap_init]
   bitmap_init_from_gfx_init_vic_bitmap:
     jsr bitmap_init
-  //SEG1251 [608] phi from gfx_init_vic_bitmap to gfx_init_vic_bitmap::@3 [phi:gfx_init_vic_bitmap->gfx_init_vic_bitmap::@3]
-  b3_from_gfx_init_vic_bitmap:
-    jmp b3
-  //SEG1252 gfx_init_vic_bitmap::@3
-  b3:
+  //SEG1251 [608] phi from gfx_init_vic_bitmap to gfx_init_vic_bitmap::@2 [phi:gfx_init_vic_bitmap->gfx_init_vic_bitmap::@2]
+  b2_from_gfx_init_vic_bitmap:
+    jmp b2
+  //SEG1252 gfx_init_vic_bitmap::@2
+  b2:
   //SEG1253 [609] call bitmap_clear 
     jsr bitmap_clear
-  //SEG1254 [610] phi from gfx_init_vic_bitmap::@3 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1]
-  b1_from_b3:
-  //SEG1255 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1#0] -- vbuz1=vbuc1 
+  //SEG1254 [610] phi from gfx_init_vic_bitmap::@2 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@2->gfx_init_vic_bitmap::@1]
+  b1_from_b2:
+  //SEG1255 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_init_vic_bitmap::@2->gfx_init_vic_bitmap::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta l
     jmp b1
-  //SEG1256 [610] phi from gfx_init_vic_bitmap::@5 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@5->gfx_init_vic_bitmap::@1]
-  b1_from_b5:
-  //SEG1257 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte) gfx_init_vic_bitmap::l#1 [phi:gfx_init_vic_bitmap::@5->gfx_init_vic_bitmap::@1#0] -- register_copy 
+  //SEG1256 [610] phi from gfx_init_vic_bitmap::@3 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1]
+  b1_from_b3:
+  //SEG1257 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte) gfx_init_vic_bitmap::l#1 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1#0] -- register_copy 
     jmp b1
   //SEG1258 gfx_init_vic_bitmap::@1
   b1:
@@ -17918,15 +18079,15 @@ gfx_init_vic_bitmap: {
     sta bitmap_line.y1
   //SEG1263 [615] call bitmap_line 
     jsr bitmap_line
-    jmp b5
-  //SEG1264 gfx_init_vic_bitmap::@5
-  b5:
+    jmp b3
+  //SEG1264 gfx_init_vic_bitmap::@3
+  b3:
   //SEG1265 [616] (byte) gfx_init_vic_bitmap::l#1 ← ++ (byte) gfx_init_vic_bitmap::l#2 -- vbuz1=_inc_vbuz1 
     inc l
   //SEG1266 [617] if((byte) gfx_init_vic_bitmap::l#1<(const byte) gfx_init_vic_bitmap::lines_cnt#0) goto gfx_init_vic_bitmap::@1 -- vbuz1_lt_vbuc1_then_la1 
     lda l
     cmp #lines_cnt
-    bcc b1_from_b5
+    bcc b1_from_b3
     jmp breturn
   //SEG1267 gfx_init_vic_bitmap::@return
   breturn:
@@ -17953,33 +18114,33 @@ bitmap_line: {
     lda x0
     cmp x1
     bcc b1
-    jmp b3
-  //SEG1271 bitmap_line::@3
-  b3:
+    jmp b2
+  //SEG1271 bitmap_line::@2
+  b2:
   //SEG1272 [620] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda x0
     sec
     sbc x1
     sta xd_2
-  //SEG1273 [621] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1273 [621] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b10
-    jmp b4
-  //SEG1274 bitmap_line::@4
-  b4:
+    bcc b7
+    jmp b3
+  //SEG1274 bitmap_line::@3
+  b3:
   //SEG1275 [622] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y0
     sec
     sbc y1
     sta yd_2
-  //SEG1276 [623] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1276 [623] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8 -- vbuz1_lt_vbuz2_then_la1 
     lda yd_2
     cmp xd_2
-    bcc b11
-    jmp b5
-  //SEG1277 bitmap_line::@5
-  b5:
+    bcc b8
+    jmp b4
+  //SEG1277 bitmap_line::@4
+  b4:
   //SEG1278 [624] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxi.y
@@ -17996,21 +18157,21 @@ bitmap_line: {
     lda xd_2
     sta bitmap_line_ydxi.xd
   //SEG1283 [629] call bitmap_line_ydxi 
-  //SEG1284 [703] phi from bitmap_line::@5 to bitmap_line_ydxi [phi:bitmap_line::@5->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b5:
-  //SEG1285 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@5->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1286 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1287 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@5->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1288 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@5->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1289 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1284 [703] phi from bitmap_line::@4 to bitmap_line_ydxi [phi:bitmap_line::@4->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b4:
+  //SEG1285 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@4->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1286 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1287 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@4->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1288 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@4->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1289 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
   //SEG1290 bitmap_line::@return
   breturn:
   //SEG1291 [630] return 
     rts
-  //SEG1292 bitmap_line::@11
-  b11:
+  //SEG1292 bitmap_line::@8
+  b8:
   //SEG1293 [631] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuz2 
     lda x1
     sta bitmap_line_xdyi.x
@@ -18027,29 +18188,29 @@ bitmap_line: {
     lda yd_2
     sta bitmap_line_xdyi.yd
   //SEG1298 [636] call bitmap_line_xdyi 
-  //SEG1299 [681] phi from bitmap_line::@11 to bitmap_line_xdyi [phi:bitmap_line::@11->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b11:
-  //SEG1300 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@11->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1301 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1302 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@11->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1303 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@11->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1304 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1299 [681] phi from bitmap_line::@8 to bitmap_line_xdyi [phi:bitmap_line::@8->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b8:
+  //SEG1300 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@8->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1301 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1302 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@8->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1303 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@8->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1304 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
-  //SEG1305 bitmap_line::@10
-  b10:
+  //SEG1305 bitmap_line::@7
+  b7:
   //SEG1306 [637] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y1
     sec
     sbc y0
     sta yd
-  //SEG1307 [638] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1307 [638] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9 -- vbuz1_lt_vbuz2_then_la1 
     lda yd
     cmp xd_2
-    bcc b15
-    jmp b17
-  //SEG1308 bitmap_line::@17
-  b17:
+    bcc b9
+    jmp b10
+  //SEG1308 bitmap_line::@10
+  b10:
   //SEG1309 [639] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxd.y
@@ -18066,17 +18227,17 @@ bitmap_line: {
     lda xd_2
     sta bitmap_line_ydxd.xd
   //SEG1314 [644] call bitmap_line_ydxd 
-  //SEG1315 [733] phi from bitmap_line::@17 to bitmap_line_ydxd [phi:bitmap_line::@17->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b17:
-  //SEG1316 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@17->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1317 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1318 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@17->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1319 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@17->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1320 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1315 [733] phi from bitmap_line::@10 to bitmap_line_ydxd [phi:bitmap_line::@10->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b10:
+  //SEG1316 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@10->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1317 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1318 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@10->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1319 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@10->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1320 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1321 bitmap_line::@15
-  b15:
+  //SEG1321 bitmap_line::@9
+  b9:
   //SEG1322 [645] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuz2 
     lda x1
     sta bitmap_line_xdyd.x
@@ -18093,13 +18254,13 @@ bitmap_line: {
     lda yd
     sta bitmap_line_xdyd.yd
   //SEG1327 [650] call bitmap_line_xdyd 
-  //SEG1328 [718] phi from bitmap_line::@15 to bitmap_line_xdyd [phi:bitmap_line::@15->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b15:
-  //SEG1329 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@15->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1330 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1331 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@15->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1332 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@15->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1333 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1328 [718] phi from bitmap_line::@9 to bitmap_line_xdyd [phi:bitmap_line::@9->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b9:
+  //SEG1329 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@9->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1330 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1331 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@9->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1332 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@9->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1333 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
   //SEG1334 bitmap_line::@1
@@ -18109,25 +18270,25 @@ bitmap_line: {
     sec
     sbc x0
     sta xd
-  //SEG1336 [652] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1336 [652] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b20
-    jmp b7
-  //SEG1337 bitmap_line::@7
-  b7:
+    bcc b11
+    jmp b5
+  //SEG1337 bitmap_line::@5
+  b5:
   //SEG1338 [653] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y0
     sec
     sbc y1
     sta yd_10
-  //SEG1339 [654] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1339 [654] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12 -- vbuz1_lt_vbuz2_then_la1 
     lda yd_10
     cmp xd
-    bcc b21
-    jmp b8
-  //SEG1340 bitmap_line::@8
-  b8:
+    bcc b12
+    jmp b6
+  //SEG1340 bitmap_line::@6
+  b6:
   //SEG1341 [655] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxd.y
@@ -18144,17 +18305,17 @@ bitmap_line: {
     lda xd
     sta bitmap_line_ydxd.xd
   //SEG1346 [660] call bitmap_line_ydxd 
-  //SEG1347 [733] phi from bitmap_line::@8 to bitmap_line_ydxd [phi:bitmap_line::@8->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b8:
-  //SEG1348 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@8->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1349 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1350 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@8->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1351 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@8->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1352 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1347 [733] phi from bitmap_line::@6 to bitmap_line_ydxd [phi:bitmap_line::@6->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b6:
+  //SEG1348 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@6->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1349 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1350 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@6->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1351 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@6->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1352 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1353 bitmap_line::@21
-  b21:
+  //SEG1353 bitmap_line::@12
+  b12:
   //SEG1354 [661] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyd.x
@@ -18171,29 +18332,29 @@ bitmap_line: {
     lda yd_10
     sta bitmap_line_xdyd.yd
   //SEG1359 [666] call bitmap_line_xdyd 
-  //SEG1360 [718] phi from bitmap_line::@21 to bitmap_line_xdyd [phi:bitmap_line::@21->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b21:
-  //SEG1361 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@21->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1362 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1363 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@21->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1364 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@21->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1365 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1360 [718] phi from bitmap_line::@12 to bitmap_line_xdyd [phi:bitmap_line::@12->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b12:
+  //SEG1361 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@12->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1362 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1363 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@12->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1364 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@12->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1365 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
-  //SEG1366 bitmap_line::@20
-  b20:
+  //SEG1366 bitmap_line::@11
+  b11:
   //SEG1367 [667] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y1
     sec
     sbc y0
     sta yd_11
-  //SEG1368 [668] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1368 [668] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13 -- vbuz1_lt_vbuz2_then_la1 
     lda yd_11
     cmp xd
-    bcc b25
-    jmp b27
-  //SEG1369 bitmap_line::@27
-  b27:
+    bcc b13
+    jmp b14
+  //SEG1369 bitmap_line::@14
+  b14:
   //SEG1370 [669] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxi.y
@@ -18210,17 +18371,17 @@ bitmap_line: {
     lda xd
     sta bitmap_line_ydxi.xd
   //SEG1375 [674] call bitmap_line_ydxi 
-  //SEG1376 [703] phi from bitmap_line::@27 to bitmap_line_ydxi [phi:bitmap_line::@27->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b27:
-  //SEG1377 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@27->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1378 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1379 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@27->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1380 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@27->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1381 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1376 [703] phi from bitmap_line::@14 to bitmap_line_ydxi [phi:bitmap_line::@14->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b14:
+  //SEG1377 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@14->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1378 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1379 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@14->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1380 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@14->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1381 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
-  //SEG1382 bitmap_line::@25
-  b25:
+  //SEG1382 bitmap_line::@13
+  b13:
   //SEG1383 [675] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyi.x
@@ -18237,13 +18398,13 @@ bitmap_line: {
     lda yd_11
     sta bitmap_line_xdyi.yd
   //SEG1388 [680] call bitmap_line_xdyi 
-  //SEG1389 [681] phi from bitmap_line::@25 to bitmap_line_xdyi [phi:bitmap_line::@25->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b25:
-  //SEG1390 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@25->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1391 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1392 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@25->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1393 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@25->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1394 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1389 [681] phi from bitmap_line::@13 to bitmap_line_xdyi [phi:bitmap_line::@13->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b13:
+  //SEG1390 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@13->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1391 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1392 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@13->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1393 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@13->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1394 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
 }
@@ -18282,9 +18443,9 @@ bitmap_line_xdyi: {
   //SEG1406 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#0] -- register_copy 
   //SEG1407 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1408 bitmap_line_xdyi::@5
-  b5:
+    jmp b4
+  //SEG1408 bitmap_line_xdyi::@4
+  b4:
   //SEG1409 [687] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1410 [688] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -18295,7 +18456,7 @@ bitmap_line_xdyi: {
   //SEG1411 [689] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1412 bitmap_line_xdyi::@3
   b3:
@@ -18306,11 +18467,11 @@ bitmap_line_xdyi: {
     sec
     sbc xd
     sta e
-  //SEG1415 [692] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2]
+  //SEG1415 [692] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1416 [692] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#0] -- register_copy 
-  //SEG1417 [692] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1416 [692] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#0] -- register_copy 
+  //SEG1417 [692] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#1] -- register_copy 
     jmp b2
   //SEG1418 bitmap_line_xdyi::@2
   b2:
@@ -18408,9 +18569,9 @@ bitmap_line_ydxi: {
   //SEG1442 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#0] -- register_copy 
   //SEG1443 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1444 bitmap_line_ydxi::@5
-  b5:
+    jmp b4
+  //SEG1444 bitmap_line_ydxi::@4
+  b4:
   //SEG1445 [709] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1446 [710] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -18421,7 +18582,7 @@ bitmap_line_ydxi: {
   //SEG1447 [711] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1448 bitmap_line_ydxi::@3
   b3:
@@ -18432,11 +18593,11 @@ bitmap_line_ydxi: {
     sec
     sbc yd
     sta e
-  //SEG1451 [714] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2]
+  //SEG1451 [714] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1452 [714] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#0] -- register_copy 
-  //SEG1453 [714] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1452 [714] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#0] -- register_copy 
+  //SEG1453 [714] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#1] -- register_copy 
     jmp b2
   //SEG1454 bitmap_line_ydxi::@2
   b2:
@@ -18489,9 +18650,9 @@ bitmap_line_xdyd: {
   //SEG1470 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#0] -- register_copy 
   //SEG1471 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1472 bitmap_line_xdyd::@5
-  b5:
+    jmp b4
+  //SEG1472 bitmap_line_xdyd::@4
+  b4:
   //SEG1473 [724] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1474 [725] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -18502,7 +18663,7 @@ bitmap_line_xdyd: {
   //SEG1475 [726] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1476 bitmap_line_xdyd::@3
   b3:
@@ -18513,11 +18674,11 @@ bitmap_line_xdyd: {
     sec
     sbc xd
     sta e
-  //SEG1479 [729] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2]
+  //SEG1479 [729] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1480 [729] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#0] -- register_copy 
-  //SEG1481 [729] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1480 [729] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#0] -- register_copy 
+  //SEG1481 [729] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#1] -- register_copy 
     jmp b2
   //SEG1482 bitmap_line_xdyd::@2
   b2:
@@ -18570,9 +18731,9 @@ bitmap_line_ydxd: {
   //SEG1498 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#0] -- register_copy 
   //SEG1499 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1500 bitmap_line_ydxd::@5
-  b5:
+    jmp b4
+  //SEG1500 bitmap_line_ydxd::@4
+  b4:
   //SEG1501 [739] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1502 [740] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -18583,7 +18744,7 @@ bitmap_line_ydxd: {
   //SEG1503 [741] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1504 bitmap_line_ydxd::@3
   b3:
@@ -18594,11 +18755,11 @@ bitmap_line_ydxd: {
     sec
     sbc yd
     sta e
-  //SEG1507 [744] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2]
+  //SEG1507 [744] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1508 [744] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#0] -- register_copy 
-  //SEG1509 [744] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1508 [744] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#0] -- register_copy 
+  //SEG1509 [744] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#1] -- register_copy 
     jmp b2
   //SEG1510 bitmap_line_ydxd::@2
   b2:
@@ -18738,10 +18899,10 @@ bitmap_init: {
     sta bitmap_plot_bit,y
   //SEG1553 [765] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr bits
-  //SEG1554 [766] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuz1_neq_0_then_la1 
+  //SEG1554 [766] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuz1_neq_0_then_la1 
     lda bits
     cmp #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG1555 [767] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
   b2_from_b1:
   //SEG1556 [767] phi (byte) bitmap_init::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:bitmap_init::@1->bitmap_init::@2#0] -- vbuz1=vbuc1 
@@ -18756,24 +18917,24 @@ bitmap_init: {
     lda x
     cmp #0
     bne b1_from_b2
-  //SEG1560 [770] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  b5_from_b2:
-  //SEG1561 [770] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG1560 [770] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  b3_from_b2:
+  //SEG1561 [770] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     lda #>0
     sta yoffs+1
-  //SEG1562 [770] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuz1=vbuc1 
+  //SEG1562 [770] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuz1=vbuc1 
     lda #0
     sta y
-    jmp b5
-  //SEG1563 [770] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  b5_from_b6:
-  //SEG1564 [770] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG1565 [770] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-    jmp b5
-  //SEG1566 bitmap_init::@5
-  b5:
+    jmp b3
+  //SEG1563 [770] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  b3_from_b4:
+  //SEG1564 [770] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG1565 [770] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+    jmp b3
+  //SEG1566 bitmap_init::@3
+  b3:
   //SEG1567 [771] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuz2_band_vbuc1 
     lda #7
     and y
@@ -18800,13 +18961,13 @@ bitmap_init: {
     lda #7
     and y
     sta _10
-  //SEG1574 [778] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG1574 [778] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp _10
-    bne b6_from_b5
-    jmp b7
-  //SEG1575 bitmap_init::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG1575 bitmap_init::@5
+  b5:
   //SEG1576 [779] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -18815,32 +18976,32 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG1577 [780] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG1578 [780] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-    jmp b6
-  //SEG1579 bitmap_init::@6
-  b6:
+  //SEG1577 [780] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG1578 [780] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+    jmp b4
+  //SEG1579 bitmap_init::@4
+  b4:
   //SEG1580 [781] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG1581 [782] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuz1_neq_0_then_la1 
+  //SEG1581 [782] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuz1_neq_0_then_la1 
     lda y
     cmp #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG1582 bitmap_init::@return
   breturn:
   //SEG1583 [783] return 
     rts
-  //SEG1584 [784] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG1585 bitmap_init::@10
-  b10:
-  //SEG1586 [767] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  b2_from_b10:
-  //SEG1587 [767] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG1584 [784] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG1585 bitmap_init::@6
+  b6:
+  //SEG1586 [767] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  b2_from_b6:
+  //SEG1587 [767] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
     jmp b2
 }
 //SEG1588 gfx_init_charset
@@ -19522,8 +19683,8 @@ Statement [130] (byte~) gfx_mode::$68 ← *((const byte*) form_vic_bg2_hi#0) <<
 Statement [131] (byte~) gfx_mode::$69 ← (byte~) gfx_mode::$68 | *((const byte*) form_vic_bg2_lo#0) [ keyboard_events_size#24 gfx_mode::$69 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 gfx_mode::$69 ] ) always clobbers reg byte a 
 Statement [133] (byte~) gfx_mode::$70 ← *((const byte*) form_vic_bg3_hi#0) << (byte/signed byte/word/signed word/dword/signed dword) 4 [ keyboard_events_size#24 gfx_mode::$70 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 gfx_mode::$70 ] ) always clobbers reg byte a 
 Statement [134] (byte~) gfx_mode::$71 ← (byte~) gfx_mode::$70 | *((const byte*) form_vic_bg3_lo#0) [ keyboard_events_size#24 gfx_mode::$71 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 gfx_mode::$71 ] ) always clobbers reg byte a 
-Statement [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@34 [ keyboard_events_size#24 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 ] ) always clobbers reg byte a 
-Statement [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@36 [ keyboard_events_size#24 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 ] ) always clobbers reg byte a 
+Statement [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@24 [ keyboard_events_size#24 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 ] ) always clobbers reg byte a 
+Statement [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@25 [ keyboard_events_size#24 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 ] ) always clobbers reg byte a 
 Statement [151] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) gfx_mode::i#2) [ keyboard_events_size#24 gfx_mode::i#2 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 gfx_mode::i#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:12 [ gfx_mode::i#2 gfx_mode::i#1 ]
 Statement [166] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 [ keyboard_event_scan::row#2 keyboard_events_size#119 keyboard_event_scan::keycode#1 ] ( main:2::gfx_mode:15::keyboard_event_scan:143 [ form_cursor_count#16 form_field_idx#18 keyboard_event_scan::row#2 keyboard_events_size#119 keyboard_event_scan::keycode#1 ] main:2::form_mode:13::form_control:294::keyboard_event_scan:375 [ form_mode::preset_current#7 form_field_idx#28 form_control::field#0 form_cursor_count#15 keyboard_event_scan::row#2 keyboard_events_size#119 keyboard_event_scan::keycode#1 ] ) always clobbers reg byte a 
@@ -19564,7 +19725,7 @@ Statement [285] *((const byte*) DTV_PALETTE#0 + (byte) form_mode::i#2) ← *((co
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:30 [ form_mode::i#2 form_mode::i#1 ]
 Statement [288] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 ] ( main:2::form_mode:13 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 ] ) always clobbers reg byte a 
 Statement [289] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 ] ( main:2::form_mode:13 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 ] ) always clobbers reg byte a 
-Statement [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@9 [ keyboard_events_size#47 form_cursor_count#21 form_field_idx#28 form_mode::preset_current#7 ] ( main:2::form_mode:13 [ keyboard_events_size#47 form_cursor_count#21 form_field_idx#28 form_mode::preset_current#7 ] ) always clobbers reg byte a 
+Statement [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@4 [ keyboard_events_size#47 form_cursor_count#21 form_field_idx#28 form_mode::preset_current#7 ] ( main:2::form_mode:13 [ keyboard_events_size#47 form_cursor_count#21 form_field_idx#28 form_mode::preset_current#7 ] ) always clobbers reg byte a 
 Statement [320] (byte*) print_str_at::str#1 ← (byte*) render_preset_name::name#13 [ print_str_at::str#1 ] ( main:2::form_mode:13::render_preset_name:271 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_at::str#1 ] main:2::form_mode:13::render_preset_name:305 [ form_cursor_count#16 keyboard_events_size#24 form_field_idx#18 form_mode::preset_current#1 print_str_at::str#1 ] ) always clobbers reg byte a 
 Statement [325] if(*((byte*) print_str_at::str#2)!=(byte) '@') goto print_str_at::@2 [ print_str_at::str#2 print_str_at::at#2 ] ( main:2::form_mode:13::render_preset_name:271::print_str_at:321 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_at::str#2 print_str_at::at#2 ] main:2::form_mode:13::render_preset_name:305::print_str_at:321 [ form_cursor_count#16 keyboard_events_size#24 form_field_idx#18 form_mode::preset_current#1 print_str_at::str#2 print_str_at::at#2 ] ) always clobbers reg byte a reg byte y 
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:33 [ form_mode::preset_current#7 form_mode::preset_current#1 form_mode::preset_current#0 ]
@@ -19589,17 +19750,17 @@ Removing always clobbered register reg byte y as potential for zp ZP_BYTE:15 [ k
 Statement [382] *((byte*) form_control::field#0) ← (byte~) form_control::$15 [ keyboard_events_size#24 keyboard_modifiers#21 form_field_idx#28 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 keyboard_modifiers#21 form_field_idx#28 ] ) always clobbers reg byte y 
 Statement [383] (byte~) form_control::$16 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0 [ keyboard_events_size#24 form_field_idx#28 form_control::$16 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::$16 ] ) always clobbers reg byte a 
 Statement [395] (byte~) form_control::$24 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 form_control::$24 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 form_control::$24 ] ) always clobbers reg byte a 
-Statement [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@29 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a 
+Statement [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@15 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a 
 Statement [399] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← *((const byte[]) form_fields_max#0 + (byte) form_field_idx#28) [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a 
 Statement [400] *((byte*) form_control::field#0) ← *((const byte[]) print_hextab#0 + *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)) [ keyboard_events_size#24 form_field_idx#28 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_cursor_count#15 ] ) always clobbers reg byte a reg byte y 
-Statement [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@29 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a reg byte y 
+Statement [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@15 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a reg byte y 
 Statement [403] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a 
 Statement [406] (byte/word/dword~) form_control::$14 ← *((byte*) form_control::field#0) | (byte/word/signed word/dword/signed dword) $80 [ keyboard_events_size#47 form_field_idx#28 form_control::field#0 form_cursor_count#15 form_control::$14 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#47 form_field_idx#28 form_control::field#0 form_cursor_count#15 form_control::$14 ] ) always clobbers reg byte a reg byte y 
 Statement [407] *((byte*) form_control::field#0) ← (byte/word/dword~) form_control::$14 [ keyboard_events_size#47 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#47 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte y 
 Statement [415] (byte*) form_set_screen::line#1 ← (byte*) form_set_screen::line#2 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ form_set_screen::y#2 form_set_screen::line#1 ] ( main:2::form_mode:13::form_set_screen:267 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 form_set_screen::y#2 form_set_screen::line#1 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:49 [ form_set_screen::y#2 form_set_screen::y#1 ]
 Statement [420] (byte*~) print_char_cursor#77 ← (byte*) print_set_screen::screen#2 [ print_str_lines::str#5 print_char_cursor#77 print_set_screen::screen#2 ] ( main:2::form_mode:13::print_str_lines:259 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#5 print_char_cursor#77 print_set_screen::screen#2 ] main:2::form_mode:13::print_str_lines:265 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#5 print_char_cursor#77 print_set_screen::screen#2 ] ) always clobbers reg byte a 
-Statement [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@6 [ print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] ( main:2::form_mode:13::print_str_lines:259 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] main:2::form_mode:13::print_str_lines:265 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] ) always clobbers reg byte a reg byte y 
+Statement [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@2 [ print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] ( main:2::form_mode:13::print_str_lines:259 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] main:2::form_mode:13::print_str_lines:265 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] ) always clobbers reg byte a reg byte y 
 Statement [425] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#4) [ print_line_cursor#2 print_str_lines::str#4 print_char_cursor#20 print_str_lines::ch#0 ] ( main:2::form_mode:13::print_str_lines:259 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_line_cursor#2 print_str_lines::str#4 print_char_cursor#20 print_str_lines::ch#0 ] main:2::form_mode:13::print_str_lines:265 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_line_cursor#2 print_str_lines::str#4 print_char_cursor#20 print_str_lines::ch#0 ] ) always clobbers reg byte a reg byte y 
 Statement [428] *((byte*) print_char_cursor#20) ← (byte) print_str_lines::ch#0 [ print_line_cursor#2 print_str_lines::str#0 print_char_cursor#20 print_str_lines::ch#0 ] ( main:2::form_mode:13::print_str_lines:259 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_line_cursor#2 print_str_lines::str#0 print_char_cursor#20 print_str_lines::ch#0 ] main:2::form_mode:13::print_str_lines:265 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_line_cursor#2 print_str_lines::str#0 print_char_cursor#20 print_str_lines::ch#0 ] ) always clobbers reg byte y 
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:289 [ print_str_lines::ch#0 ]
@@ -19878,10 +20039,10 @@ Statement [130] (byte~) gfx_mode::$68 ← *((const byte*) form_vic_bg2_hi#0) <<
 Statement [131] (byte~) gfx_mode::$69 ← (byte~) gfx_mode::$68 | *((const byte*) form_vic_bg2_lo#0) [ keyboard_events_size#24 gfx_mode::$69 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 gfx_mode::$69 ] ) always clobbers reg byte a 
 Statement [133] (byte~) gfx_mode::$70 ← *((const byte*) form_vic_bg3_hi#0) << (byte/signed byte/word/signed word/dword/signed dword) 4 [ keyboard_events_size#24 gfx_mode::$70 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 gfx_mode::$70 ] ) always clobbers reg byte a 
 Statement [134] (byte~) gfx_mode::$71 ← (byte~) gfx_mode::$70 | *((const byte*) form_vic_bg3_lo#0) [ keyboard_events_size#24 gfx_mode::$71 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 gfx_mode::$71 ] ) always clobbers reg byte a 
-Statement [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@34 [ keyboard_events_size#24 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 ] ) always clobbers reg byte a 
-Statement [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@36 [ keyboard_events_size#24 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 ] ) always clobbers reg byte a 
+Statement [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@24 [ keyboard_events_size#24 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 ] ) always clobbers reg byte a 
+Statement [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@25 [ keyboard_events_size#24 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 ] ) always clobbers reg byte a 
 Statement [151] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) gfx_mode::i#2) [ keyboard_events_size#24 gfx_mode::i#2 ] ( main:2::gfx_mode:15 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#24 gfx_mode::i#2 ] ) always clobbers reg byte a 
-Statement [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11 [ keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#119 keyboard_event_scan::row_scan#0 ] ( main:2::gfx_mode:15::keyboard_event_scan:143 [ form_cursor_count#16 form_field_idx#18 keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#119 keyboard_event_scan::row_scan#0 ] main:2::form_mode:13::form_control:294::keyboard_event_scan:375 [ form_mode::preset_current#7 form_field_idx#28 form_control::field#0 form_cursor_count#15 keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#119 keyboard_event_scan::row_scan#0 ] ) always clobbers reg byte a 
+Statement [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9 [ keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#119 keyboard_event_scan::row_scan#0 ] ( main:2::gfx_mode:15::keyboard_event_scan:143 [ form_cursor_count#16 form_field_idx#18 keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#119 keyboard_event_scan::row_scan#0 ] main:2::form_mode:13::form_control:294::keyboard_event_scan:375 [ form_mode::preset_current#7 form_field_idx#28 form_control::field#0 form_cursor_count#15 keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#119 keyboard_event_scan::row_scan#0 ] ) always clobbers reg byte a 
 Statement [166] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 [ keyboard_event_scan::row#2 keyboard_events_size#119 keyboard_event_scan::keycode#1 ] ( main:2::gfx_mode:15::keyboard_event_scan:143 [ form_cursor_count#16 form_field_idx#18 keyboard_event_scan::row#2 keyboard_events_size#119 keyboard_event_scan::keycode#1 ] main:2::form_mode:13::form_control:294::keyboard_event_scan:375 [ form_mode::preset_current#7 form_field_idx#28 form_control::field#0 form_cursor_count#15 keyboard_event_scan::row#2 keyboard_events_size#119 keyboard_event_scan::keycode#1 ] ) always clobbers reg byte a 
 Statement [181] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#18 | (const byte) KEY_MODIFIER_RSHIFT#0 [ keyboard_events_size#100 keyboard_modifiers#3 ] ( main:2::gfx_mode:15::keyboard_event_scan:143 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#100 keyboard_modifiers#3 ] main:2::form_mode:13::form_control:294::keyboard_event_scan:375 [ form_mode::preset_current#7 form_field_idx#28 form_control::field#0 form_cursor_count#15 keyboard_events_size#100 keyboard_modifiers#3 ] ) always clobbers reg byte a 
 Statement [187] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#19 | (const byte) KEY_MODIFIER_CTRL#0 [ keyboard_events_size#100 keyboard_modifiers#4 ] ( main:2::gfx_mode:15::keyboard_event_scan:143 [ form_cursor_count#16 form_field_idx#18 keyboard_events_size#100 keyboard_modifiers#4 ] main:2::form_mode:13::form_control:294::keyboard_event_scan:375 [ form_mode::preset_current#7 form_field_idx#28 form_control::field#0 form_cursor_count#15 keyboard_events_size#100 keyboard_modifiers#4 ] ) always clobbers reg byte a 
@@ -19911,7 +20072,7 @@ Statement [283] *((const byte*) DTV_PLANEA_START_HI#0) ← (byte/signed byte/wor
 Statement [285] *((const byte*) DTV_PALETTE#0 + (byte) form_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) form_mode::i#2) [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 form_mode::i#2 ] ( main:2::form_mode:13 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 form_mode::i#2 ] ) always clobbers reg byte a 
 Statement [288] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 ] ( main:2::form_mode:13 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 ] ) always clobbers reg byte a 
 Statement [289] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 ] ( main:2::form_mode:13 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 ] ) always clobbers reg byte a 
-Statement [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@9 [ keyboard_events_size#47 form_cursor_count#21 form_field_idx#28 form_mode::preset_current#7 ] ( main:2::form_mode:13 [ keyboard_events_size#47 form_cursor_count#21 form_field_idx#28 form_mode::preset_current#7 ] ) always clobbers reg byte a 
+Statement [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@4 [ keyboard_events_size#47 form_cursor_count#21 form_field_idx#28 form_mode::preset_current#7 ] ( main:2::form_mode:13 [ keyboard_events_size#47 form_cursor_count#21 form_field_idx#28 form_mode::preset_current#7 ] ) always clobbers reg byte a 
 Statement [320] (byte*) print_str_at::str#1 ← (byte*) render_preset_name::name#13 [ print_str_at::str#1 ] ( main:2::form_mode:13::render_preset_name:271 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_at::str#1 ] main:2::form_mode:13::render_preset_name:305 [ form_cursor_count#16 keyboard_events_size#24 form_field_idx#18 form_mode::preset_current#1 print_str_at::str#1 ] ) always clobbers reg byte a 
 Statement [325] if(*((byte*) print_str_at::str#2)!=(byte) '@') goto print_str_at::@2 [ print_str_at::str#2 print_str_at::at#2 ] ( main:2::form_mode:13::render_preset_name:271::print_str_at:321 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_at::str#2 print_str_at::at#2 ] main:2::form_mode:13::render_preset_name:305::print_str_at:321 [ form_cursor_count#16 keyboard_events_size#24 form_field_idx#18 form_mode::preset_current#1 print_str_at::str#2 print_str_at::at#2 ] ) always clobbers reg byte a reg byte y 
 Statement [327] *((byte*) print_str_at::at#2) ← *((byte*) print_str_at::str#2) [ print_str_at::str#2 print_str_at::at#2 ] ( main:2::form_mode:13::render_preset_name:271::print_str_at:321 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_at::str#2 print_str_at::at#2 ] main:2::form_mode:13::render_preset_name:305::print_str_at:321 [ form_cursor_count#16 keyboard_events_size#24 form_field_idx#18 form_mode::preset_current#1 print_str_at::str#2 print_str_at::at#2 ] ) always clobbers reg byte a reg byte y 
@@ -19930,16 +20091,16 @@ Statement [381] (byte~) form_control::$15 ← *((byte*) form_control::field#0) &
 Statement [382] *((byte*) form_control::field#0) ← (byte~) form_control::$15 [ keyboard_events_size#24 keyboard_modifiers#21 form_field_idx#28 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 keyboard_modifiers#21 form_field_idx#28 ] ) always clobbers reg byte y 
 Statement [383] (byte~) form_control::$16 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0 [ keyboard_events_size#24 form_field_idx#28 form_control::$16 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::$16 ] ) always clobbers reg byte a 
 Statement [395] (byte~) form_control::$24 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 form_control::$24 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 form_control::$24 ] ) always clobbers reg byte a 
-Statement [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@29 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a 
+Statement [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@15 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a 
 Statement [399] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← *((const byte[]) form_fields_max#0 + (byte) form_field_idx#28) [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a 
 Statement [400] *((byte*) form_control::field#0) ← *((const byte[]) print_hextab#0 + *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)) [ keyboard_events_size#24 form_field_idx#28 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_cursor_count#15 ] ) always clobbers reg byte a reg byte y 
-Statement [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@29 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a reg byte y 
+Statement [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@15 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a reg byte y 
 Statement [403] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#24 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte a 
 Statement [406] (byte/word/dword~) form_control::$14 ← *((byte*) form_control::field#0) | (byte/word/signed word/dword/signed dword) $80 [ keyboard_events_size#47 form_field_idx#28 form_control::field#0 form_cursor_count#15 form_control::$14 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#47 form_field_idx#28 form_control::field#0 form_cursor_count#15 form_control::$14 ] ) always clobbers reg byte a reg byte y 
 Statement [407] *((byte*) form_control::field#0) ← (byte/word/dword~) form_control::$14 [ keyboard_events_size#47 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ( main:2::form_mode:13::form_control:294 [ form_mode::preset_current#7 keyboard_events_size#47 form_field_idx#28 form_control::field#0 form_cursor_count#15 ] ) always clobbers reg byte y 
 Statement [415] (byte*) form_set_screen::line#1 ← (byte*) form_set_screen::line#2 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ form_set_screen::y#2 form_set_screen::line#1 ] ( main:2::form_mode:13::form_set_screen:267 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 form_set_screen::y#2 form_set_screen::line#1 ] ) always clobbers reg byte a 
 Statement [420] (byte*~) print_char_cursor#77 ← (byte*) print_set_screen::screen#2 [ print_str_lines::str#5 print_char_cursor#77 print_set_screen::screen#2 ] ( main:2::form_mode:13::print_str_lines:259 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#5 print_char_cursor#77 print_set_screen::screen#2 ] main:2::form_mode:13::print_str_lines:265 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#5 print_char_cursor#77 print_set_screen::screen#2 ] ) always clobbers reg byte a 
-Statement [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@6 [ print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] ( main:2::form_mode:13::print_str_lines:259 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] main:2::form_mode:13::print_str_lines:265 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] ) always clobbers reg byte a reg byte y 
+Statement [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@2 [ print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] ( main:2::form_mode:13::print_str_lines:259 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] main:2::form_mode:13::print_str_lines:265 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#3 print_char_cursor#22 print_line_cursor#2 ] ) always clobbers reg byte a reg byte y 
 Statement [425] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#4) [ print_line_cursor#2 print_str_lines::str#4 print_char_cursor#20 print_str_lines::ch#0 ] ( main:2::form_mode:13::print_str_lines:259 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_line_cursor#2 print_str_lines::str#4 print_char_cursor#20 print_str_lines::ch#0 ] main:2::form_mode:13::print_str_lines:265 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_line_cursor#2 print_str_lines::str#4 print_char_cursor#20 print_str_lines::ch#0 ] ) always clobbers reg byte a reg byte y 
 Statement [428] *((byte*) print_char_cursor#20) ← (byte) print_str_lines::ch#0 [ print_line_cursor#2 print_str_lines::str#0 print_char_cursor#20 print_str_lines::ch#0 ] ( main:2::form_mode:13::print_str_lines:259 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_line_cursor#2 print_str_lines::str#0 print_char_cursor#20 print_str_lines::ch#0 ] main:2::form_mode:13::print_str_lines:265 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_line_cursor#2 print_str_lines::str#0 print_char_cursor#20 print_str_lines::ch#0 ] ) always clobbers reg byte y 
 Statement [434] (byte*~) print_char_cursor#78 ← (byte*) print_line_cursor#22 [ print_str_lines::str#0 print_char_cursor#78 print_line_cursor#22 ] ( main:2::form_mode:13::print_str_lines:259 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#0 print_char_cursor#78 print_line_cursor#22 ] main:2::form_mode:13::print_str_lines:265 [ form_cursor_count#1 keyboard_events_size#27 form_field_idx#1 print_str_lines::str#0 print_char_cursor#78 print_line_cursor#22 ] ) always clobbers reg byte a 
@@ -21010,15 +21171,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label form_field_idx = $e
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @68 [phi:@begin->@68]
-b68_from_bbegin:
-  jmp b68
-//SEG5 @68
-b68:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @68 to @end [phi:@68->@end]
-bend_from_b68:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -21040,24 +21201,24 @@ main: {
     sta DTV_FEATURE
   //SEG14 [8] call keyboard_init 
     jsr keyboard_init
-  //SEG15 [9] phi from main to main::@7 [phi:main->main::@7]
-  b7_from_main:
-    jmp b7
-  //SEG16 main::@7
-  b7:
+  //SEG15 [9] phi from main to main::@3 [phi:main->main::@3]
+  b3_from_main:
+    jmp b3
+  //SEG16 main::@3
+  b3:
   //SEG17 [10] call gfx_init 
-  //SEG18 [449] phi from main::@7 to gfx_init [phi:main::@7->gfx_init]
-  gfx_init_from_b7:
+  //SEG18 [449] phi from main::@3 to gfx_init [phi:main::@3->gfx_init]
+  gfx_init_from_b3:
     jsr gfx_init
-  //SEG19 [11] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG20 [11] phi (byte) form_field_idx#1 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@1#0] -- vbuz1=vbuc1 
+  //SEG19 [11] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG20 [11] phi (byte) form_field_idx#1 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta form_field_idx
-  //SEG21 [11] phi (byte) keyboard_events_size#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@1#1] -- vbuz1=vbuc1 
+  //SEG21 [11] phi (byte) keyboard_events_size#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta keyboard_events_size
-  //SEG22 [11] phi (signed byte) form_cursor_count#1 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@7->main::@1#2] -- vbsz1=vbuc1 
+  //SEG22 [11] phi (signed byte) form_cursor_count#1 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@3->main::@1#2] -- vbsz1=vbuc1 
     lda #FORM_CURSOR_BLINK/2
     sta form_cursor_count
     jmp b1
@@ -21072,18 +21233,18 @@ main: {
   //SEG27 [254] phi from main::@2 to form_mode [phi:main::@2->form_mode]
   form_mode_from_b2:
     jsr form_mode
-  //SEG28 [14] phi from main::@2 to main::@9 [phi:main::@2->main::@9]
-  b9_from_b2:
-    jmp b9
-  //SEG29 main::@9
-  b9:
+  //SEG28 [14] phi from main::@2 to main::@4 [phi:main::@2->main::@4]
+  b4_from_b2:
+    jmp b4
+  //SEG29 main::@4
+  b4:
   //SEG30 [15] call gfx_mode 
     jsr gfx_mode
-  //SEG31 [11] phi from main::@9 to main::@1 [phi:main::@9->main::@1]
-  b1_from_b9:
-  //SEG32 [11] phi (byte) form_field_idx#1 = (byte) form_field_idx#18 [phi:main::@9->main::@1#0] -- register_copy 
-  //SEG33 [11] phi (byte) keyboard_events_size#27 = (byte) keyboard_events_size#24 [phi:main::@9->main::@1#1] -- register_copy 
-  //SEG34 [11] phi (signed byte) form_cursor_count#1 = (signed byte) form_cursor_count#16 [phi:main::@9->main::@1#2] -- register_copy 
+  //SEG31 [11] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG32 [11] phi (byte) form_field_idx#1 = (byte) form_field_idx#18 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG33 [11] phi (byte) keyboard_events_size#27 = (byte) keyboard_events_size#24 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG34 [11] phi (signed byte) form_cursor_count#1 = (signed byte) form_cursor_count#16 [phi:main::@4->main::@1#2] -- register_copy 
     jmp b1
 }
 //SEG35 gfx_mode
@@ -21112,14 +21273,14 @@ gfx_mode: {
     lda form_ctrl_line
     cmp #0
     beq b1_from_gfx_mode
-  //SEG37 [17] phi from gfx_mode to gfx_mode::@15 [phi:gfx_mode->gfx_mode::@15]
-  b15_from_gfx_mode:
-    jmp b15
-  //SEG38 gfx_mode::@15
-  b15:
-  //SEG39 [18] phi from gfx_mode::@15 to gfx_mode::@1 [phi:gfx_mode::@15->gfx_mode::@1]
-  b1_from_b15:
-  //SEG40 [18] phi (byte) gfx_mode::dtv_control#14 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) DTV_LINEAR#0 [phi:gfx_mode::@15->gfx_mode::@1#0] -- vbuxx=vbuc1 
+  //SEG37 [17] phi from gfx_mode to gfx_mode::@10 [phi:gfx_mode->gfx_mode::@10]
+  b10_from_gfx_mode:
+    jmp b10
+  //SEG38 gfx_mode::@10
+  b10:
+  //SEG39 [18] phi from gfx_mode::@10 to gfx_mode::@1 [phi:gfx_mode::@10->gfx_mode::@1]
+  b1_from_b10:
+  //SEG40 [18] phi (byte) gfx_mode::dtv_control#14 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) DTV_LINEAR#0 [phi:gfx_mode::@10->gfx_mode::@1#0] -- vbuxx=vbuc1 
     ldx #0|DTV_LINEAR
     jmp b1
   //SEG41 [18] phi from gfx_mode to gfx_mode::@1 [phi:gfx_mode->gfx_mode::@1]
@@ -21133,17 +21294,17 @@ gfx_mode: {
     lda form_ctrl_borof
     cmp #0
     beq b2_from_b1
-    jmp b16
-  //SEG45 gfx_mode::@16
-  b16:
+    jmp b11
+  //SEG45 gfx_mode::@11
+  b11:
   //SEG46 [20] (byte) gfx_mode::dtv_control#2 ← (byte) gfx_mode::dtv_control#14 | (const byte) DTV_BORDER_OFF#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_BORDER_OFF
     tax
-  //SEG47 [21] phi from gfx_mode::@1 gfx_mode::@16 to gfx_mode::@2 [phi:gfx_mode::@1/gfx_mode::@16->gfx_mode::@2]
+  //SEG47 [21] phi from gfx_mode::@1 gfx_mode::@11 to gfx_mode::@2 [phi:gfx_mode::@1/gfx_mode::@11->gfx_mode::@2]
   b2_from_b1:
-  b2_from_b16:
-  //SEG48 [21] phi (byte) gfx_mode::dtv_control#15 = (byte) gfx_mode::dtv_control#14 [phi:gfx_mode::@1/gfx_mode::@16->gfx_mode::@2#0] -- register_copy 
+  b2_from_b11:
+  //SEG48 [21] phi (byte) gfx_mode::dtv_control#15 = (byte) gfx_mode::dtv_control#14 [phi:gfx_mode::@1/gfx_mode::@11->gfx_mode::@2#0] -- register_copy 
     jmp b2
   //SEG49 gfx_mode::@2
   b2:
@@ -21151,17 +21312,17 @@ gfx_mode: {
     lda form_ctrl_hicol
     cmp #0
     beq b3_from_b2
-    jmp b17
-  //SEG51 gfx_mode::@17
-  b17:
+    jmp b12
+  //SEG51 gfx_mode::@12
+  b12:
   //SEG52 [23] (byte) gfx_mode::dtv_control#3 ← (byte) gfx_mode::dtv_control#15 | (const byte) DTV_HIGHCOLOR#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_HIGHCOLOR
     tax
-  //SEG53 [24] phi from gfx_mode::@17 gfx_mode::@2 to gfx_mode::@3 [phi:gfx_mode::@17/gfx_mode::@2->gfx_mode::@3]
-  b3_from_b17:
+  //SEG53 [24] phi from gfx_mode::@12 gfx_mode::@2 to gfx_mode::@3 [phi:gfx_mode::@12/gfx_mode::@2->gfx_mode::@3]
+  b3_from_b12:
   b3_from_b2:
-  //SEG54 [24] phi (byte) gfx_mode::dtv_control#10 = (byte) gfx_mode::dtv_control#3 [phi:gfx_mode::@17/gfx_mode::@2->gfx_mode::@3#0] -- register_copy 
+  //SEG54 [24] phi (byte) gfx_mode::dtv_control#10 = (byte) gfx_mode::dtv_control#3 [phi:gfx_mode::@12/gfx_mode::@2->gfx_mode::@3#0] -- register_copy 
     jmp b3
   //SEG55 gfx_mode::@3
   b3:
@@ -21169,17 +21330,17 @@ gfx_mode: {
     lda form_ctrl_overs
     cmp #0
     beq b4_from_b3
-    jmp b18
-  //SEG57 gfx_mode::@18
-  b18:
+    jmp b13
+  //SEG57 gfx_mode::@13
+  b13:
   //SEG58 [26] (byte) gfx_mode::dtv_control#4 ← (byte) gfx_mode::dtv_control#10 | (const byte) DTV_OVERSCAN#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_OVERSCAN
     tax
-  //SEG59 [27] phi from gfx_mode::@18 gfx_mode::@3 to gfx_mode::@4 [phi:gfx_mode::@18/gfx_mode::@3->gfx_mode::@4]
-  b4_from_b18:
+  //SEG59 [27] phi from gfx_mode::@13 gfx_mode::@3 to gfx_mode::@4 [phi:gfx_mode::@13/gfx_mode::@3->gfx_mode::@4]
+  b4_from_b13:
   b4_from_b3:
-  //SEG60 [27] phi (byte) gfx_mode::dtv_control#11 = (byte) gfx_mode::dtv_control#4 [phi:gfx_mode::@18/gfx_mode::@3->gfx_mode::@4#0] -- register_copy 
+  //SEG60 [27] phi (byte) gfx_mode::dtv_control#11 = (byte) gfx_mode::dtv_control#4 [phi:gfx_mode::@13/gfx_mode::@3->gfx_mode::@4#0] -- register_copy 
     jmp b4
   //SEG61 gfx_mode::@4
   b4:
@@ -21187,17 +21348,17 @@ gfx_mode: {
     lda form_ctrl_colof
     cmp #0
     beq b5_from_b4
-    jmp b19
-  //SEG63 gfx_mode::@19
-  b19:
+    jmp b14
+  //SEG63 gfx_mode::@14
+  b14:
   //SEG64 [29] (byte) gfx_mode::dtv_control#5 ← (byte) gfx_mode::dtv_control#11 | (const byte) DTV_COLORRAM_OFF#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_COLORRAM_OFF
     tax
-  //SEG65 [30] phi from gfx_mode::@19 gfx_mode::@4 to gfx_mode::@5 [phi:gfx_mode::@19/gfx_mode::@4->gfx_mode::@5]
-  b5_from_b19:
+  //SEG65 [30] phi from gfx_mode::@14 gfx_mode::@4 to gfx_mode::@5 [phi:gfx_mode::@14/gfx_mode::@4->gfx_mode::@5]
+  b5_from_b14:
   b5_from_b4:
-  //SEG66 [30] phi (byte) gfx_mode::dtv_control#13 = (byte) gfx_mode::dtv_control#5 [phi:gfx_mode::@19/gfx_mode::@4->gfx_mode::@5#0] -- register_copy 
+  //SEG66 [30] phi (byte) gfx_mode::dtv_control#13 = (byte) gfx_mode::dtv_control#5 [phi:gfx_mode::@14/gfx_mode::@4->gfx_mode::@5#0] -- register_copy 
     jmp b5
   //SEG67 gfx_mode::@5
   b5:
@@ -21205,17 +21366,17 @@ gfx_mode: {
     lda form_ctrl_chunk
     cmp #0
     beq b6_from_b5
-    jmp b20
-  //SEG69 gfx_mode::@20
-  b20:
+    jmp b15
+  //SEG69 gfx_mode::@15
+  b15:
   //SEG70 [32] (byte) gfx_mode::dtv_control#6 ← (byte) gfx_mode::dtv_control#13 | (const byte) DTV_CHUNKY#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_CHUNKY
     tax
-  //SEG71 [33] phi from gfx_mode::@20 gfx_mode::@5 to gfx_mode::@6 [phi:gfx_mode::@20/gfx_mode::@5->gfx_mode::@6]
-  b6_from_b20:
+  //SEG71 [33] phi from gfx_mode::@15 gfx_mode::@5 to gfx_mode::@6 [phi:gfx_mode::@15/gfx_mode::@5->gfx_mode::@6]
+  b6_from_b15:
   b6_from_b5:
-  //SEG72 [33] phi (byte) gfx_mode::dtv_control#12 = (byte) gfx_mode::dtv_control#6 [phi:gfx_mode::@20/gfx_mode::@5->gfx_mode::@6#0] -- register_copy 
+  //SEG72 [33] phi (byte) gfx_mode::dtv_control#12 = (byte) gfx_mode::dtv_control#6 [phi:gfx_mode::@15/gfx_mode::@5->gfx_mode::@6#0] -- register_copy 
     jmp b6
   //SEG73 gfx_mode::@6
   b6:
@@ -21225,14 +21386,14 @@ gfx_mode: {
     lda form_ctrl_ecm
     cmp #0
     beq b7_from_b6
-  //SEG76 [36] phi from gfx_mode::@6 to gfx_mode::@21 [phi:gfx_mode::@6->gfx_mode::@21]
-  b21_from_b6:
-    jmp b21
-  //SEG77 gfx_mode::@21
-  b21:
-  //SEG78 [37] phi from gfx_mode::@21 to gfx_mode::@7 [phi:gfx_mode::@21->gfx_mode::@7]
-  b7_from_b21:
-  //SEG79 [37] phi (byte) gfx_mode::vic_control#5 = (const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3|(const byte) VIC_ECM#0 [phi:gfx_mode::@21->gfx_mode::@7#0] -- vbuxx=vbuc1 
+  //SEG76 [36] phi from gfx_mode::@6 to gfx_mode::@16 [phi:gfx_mode::@6->gfx_mode::@16]
+  b16_from_b6:
+    jmp b16
+  //SEG77 gfx_mode::@16
+  b16:
+  //SEG78 [37] phi from gfx_mode::@16 to gfx_mode::@7 [phi:gfx_mode::@16->gfx_mode::@7]
+  b7_from_b16:
+  //SEG79 [37] phi (byte) gfx_mode::vic_control#5 = (const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3|(const byte) VIC_ECM#0 [phi:gfx_mode::@16->gfx_mode::@7#0] -- vbuxx=vbuc1 
     ldx #VIC_DEN|VIC_RSEL|3|VIC_ECM
     jmp b7
   //SEG80 [37] phi from gfx_mode::@6 to gfx_mode::@7 [phi:gfx_mode::@6->gfx_mode::@7]
@@ -21246,17 +21407,17 @@ gfx_mode: {
     lda form_ctrl_bmm
     cmp #0
     beq b8_from_b7
-    jmp b22
-  //SEG84 gfx_mode::@22
-  b22:
+    jmp b17
+  //SEG84 gfx_mode::@17
+  b17:
   //SEG85 [39] (byte) gfx_mode::vic_control#2 ← (byte) gfx_mode::vic_control#5 | (const byte) VIC_BMM#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #VIC_BMM
     tax
-  //SEG86 [40] phi from gfx_mode::@22 gfx_mode::@7 to gfx_mode::@8 [phi:gfx_mode::@22/gfx_mode::@7->gfx_mode::@8]
-  b8_from_b22:
+  //SEG86 [40] phi from gfx_mode::@17 gfx_mode::@7 to gfx_mode::@8 [phi:gfx_mode::@17/gfx_mode::@7->gfx_mode::@8]
+  b8_from_b17:
   b8_from_b7:
-  //SEG87 [40] phi (byte) gfx_mode::vic_control#4 = (byte) gfx_mode::vic_control#2 [phi:gfx_mode::@22/gfx_mode::@7->gfx_mode::@8#0] -- register_copy 
+  //SEG87 [40] phi (byte) gfx_mode::vic_control#4 = (byte) gfx_mode::vic_control#2 [phi:gfx_mode::@17/gfx_mode::@7->gfx_mode::@8#0] -- register_copy 
     jmp b8
   //SEG88 gfx_mode::@8
   b8:
@@ -21266,14 +21427,14 @@ gfx_mode: {
     lda form_ctrl_mcm
     cmp #0
     beq b9_from_b8
-  //SEG91 [43] phi from gfx_mode::@8 to gfx_mode::@23 [phi:gfx_mode::@8->gfx_mode::@23]
-  b23_from_b8:
-    jmp b23
-  //SEG92 gfx_mode::@23
-  b23:
-  //SEG93 [44] phi from gfx_mode::@23 to gfx_mode::@9 [phi:gfx_mode::@23->gfx_mode::@9]
-  b9_from_b23:
-  //SEG94 [44] phi (byte) gfx_mode::vic_control2#2 = (const byte) VIC_CSEL#0|(const byte) VIC_MCM#0 [phi:gfx_mode::@23->gfx_mode::@9#0] -- vbuaa=vbuc1 
+  //SEG91 [43] phi from gfx_mode::@8 to gfx_mode::@18 [phi:gfx_mode::@8->gfx_mode::@18]
+  b18_from_b8:
+    jmp b18
+  //SEG92 gfx_mode::@18
+  b18:
+  //SEG93 [44] phi from gfx_mode::@18 to gfx_mode::@9 [phi:gfx_mode::@18->gfx_mode::@9]
+  b9_from_b18:
+  //SEG94 [44] phi (byte) gfx_mode::vic_control2#2 = (const byte) VIC_CSEL#0|(const byte) VIC_MCM#0 [phi:gfx_mode::@18->gfx_mode::@9#0] -- vbuaa=vbuc1 
     lda #VIC_CSEL|VIC_MCM
     jmp b9
   //SEG95 [44] phi from gfx_mode::@8 to gfx_mode::@9 [phi:gfx_mode::@8->gfx_mode::@9]
@@ -21302,9 +21463,9 @@ gfx_mode: {
   //SEG104 [236] phi (byte) get_plane::idx#10 = (byte) get_plane::idx#0 [phi:gfx_mode::@9->get_plane#0] -- register_copy 
     jsr get_plane
   //SEG105 [50] (dword) get_plane::return#16 ← (dword) get_plane::return#14
-    jmp b46
-  //SEG106 gfx_mode::@46
-  b46:
+    jmp b27
+  //SEG106 gfx_mode::@27
+  b27:
   //SEG107 [51] (dword~) gfx_mode::$22 ← (dword) get_plane::return#16
   //SEG108 [52] (dword) gfx_mode::plane_a#0 ← (dword~) gfx_mode::$22 + (byte) gfx_mode::plane_a_offs#0 -- vduz1=vduz1_plus_vbuxx 
     txa
@@ -21382,14 +21543,14 @@ gfx_mode: {
   //SEG127 [71] (byte) get_plane::idx#1 ← *((const byte*) form_b_pattern#0) -- vbuaa=_deref_pbuc1 
     lda form_b_pattern
   //SEG128 [72] call get_plane 
-  //SEG129 [236] phi from gfx_mode::@46 to get_plane [phi:gfx_mode::@46->get_plane]
-  get_plane_from_b46:
-  //SEG130 [236] phi (byte) get_plane::idx#10 = (byte) get_plane::idx#1 [phi:gfx_mode::@46->get_plane#0] -- register_copy 
+  //SEG129 [236] phi from gfx_mode::@27 to get_plane [phi:gfx_mode::@27->get_plane]
+  get_plane_from_b27:
+  //SEG130 [236] phi (byte) get_plane::idx#10 = (byte) get_plane::idx#1 [phi:gfx_mode::@27->get_plane#0] -- register_copy 
     jsr get_plane
   //SEG131 [73] (dword) get_plane::return#17 ← (dword) get_plane::return#14
-    jmp b47
-  //SEG132 gfx_mode::@47
-  b47:
+    jmp b28
+  //SEG132 gfx_mode::@28
+  b28:
   //SEG133 [74] (dword~) gfx_mode::$36 ← (dword) get_plane::return#17
   //SEG134 [75] (dword) gfx_mode::plane_b#0 ← (dword~) gfx_mode::$36 + (byte) gfx_mode::plane_b_offs#0 -- vduz1=vduz1_plus_vbuxx 
     txa
@@ -21466,14 +21627,14 @@ gfx_mode: {
   //SEG153 [94] (byte) get_vic_screen::idx#0 ← *((const byte*) form_vic_screen#0) -- vbuaa=_deref_pbuc1 
     lda form_vic_screen
   //SEG154 [95] call get_vic_screen 
-  //SEG155 [222] phi from gfx_mode::@47 to get_vic_screen [phi:gfx_mode::@47->get_vic_screen]
-  get_vic_screen_from_b47:
-  //SEG156 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#0 [phi:gfx_mode::@47->get_vic_screen#0] -- register_copy 
+  //SEG155 [222] phi from gfx_mode::@28 to get_vic_screen [phi:gfx_mode::@28->get_vic_screen]
+  get_vic_screen_from_b28:
+  //SEG156 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#0 [phi:gfx_mode::@28->get_vic_screen#0] -- register_copy 
     jsr get_vic_screen
   //SEG157 [96] (byte*) get_vic_screen::return#10 ← (byte*) get_vic_screen::return#5
-    jmp b48
-  //SEG158 gfx_mode::@48
-  b48:
+    jmp b29
+  //SEG158 gfx_mode::@29
+  b29:
   //SEG159 [97] (byte*~) gfx_mode::$52 ← (byte*) get_vic_screen::return#10
   //SEG160 [98] (word~) gfx_mode::$54 ← (word)(byte*~) gfx_mode::$52 & (word/signed word/dword/signed dword) $3fff -- vwuz1=vwuz1_band_vwuc1 
     lda _54
@@ -21497,9 +21658,9 @@ gfx_mode: {
   //SEG164 [102] call get_vic_charset 
     jsr get_vic_charset
   //SEG165 [103] (byte*) get_vic_charset::return#4 ← (byte*) get_vic_charset::return#2
-    jmp b49
-  //SEG166 gfx_mode::@49
-  b49:
+    jmp b30
+  //SEG166 gfx_mode::@30
+  b30:
   //SEG167 [104] (byte*~) gfx_mode::$57 ← (byte*) get_vic_charset::return#4
   //SEG168 [105] (word~) gfx_mode::$59 ← (word)(byte*~) gfx_mode::$57 & (word/signed word/dword/signed dword) $3fff -- vwuz1=vwuz1_band_vwuc1 
     lda _59
@@ -21522,50 +21683,50 @@ gfx_mode: {
   //SEG173 [110] (byte) get_vic_screen::idx#1 ← *((const byte*) form_vic_cols#0) -- vbuaa=_deref_pbuc1 
     lda form_vic_cols
   //SEG174 [111] call get_vic_screen 
-  //SEG175 [222] phi from gfx_mode::@49 to get_vic_screen [phi:gfx_mode::@49->get_vic_screen]
-  get_vic_screen_from_b49:
-  //SEG176 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#1 [phi:gfx_mode::@49->get_vic_screen#0] -- register_copy 
+  //SEG175 [222] phi from gfx_mode::@30 to get_vic_screen [phi:gfx_mode::@30->get_vic_screen]
+  get_vic_screen_from_b30:
+  //SEG176 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#1 [phi:gfx_mode::@30->get_vic_screen#0] -- register_copy 
     jsr get_vic_screen
   //SEG177 [112] (byte*) get_vic_screen::return#11 ← (byte*) get_vic_screen::return#5
-    jmp b50
-  //SEG178 gfx_mode::@50
-  b50:
+    jmp b31
+  //SEG178 gfx_mode::@31
+  b31:
   //SEG179 [113] (byte*) gfx_mode::vic_colors#0 ← (byte*) get_vic_screen::return#11
-  //SEG180 [114] phi from gfx_mode::@50 to gfx_mode::@26 [phi:gfx_mode::@50->gfx_mode::@26]
-  b26_from_b50:
-  //SEG181 [114] phi (byte) gfx_mode::cy#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@50->gfx_mode::@26#0] -- vbuz1=vbuc1 
+  //SEG180 [114] phi from gfx_mode::@31 to gfx_mode::@19 [phi:gfx_mode::@31->gfx_mode::@19]
+  b19_from_b31:
+  //SEG181 [114] phi (byte) gfx_mode::cy#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@31->gfx_mode::@19#0] -- vbuz1=vbuc1 
     lda #0
     sta cy
-  //SEG182 [114] phi (byte*) gfx_mode::col#3 = (const byte*) COLS#0 [phi:gfx_mode::@50->gfx_mode::@26#1] -- pbuz1=pbuc1 
+  //SEG182 [114] phi (byte*) gfx_mode::col#3 = (const byte*) COLS#0 [phi:gfx_mode::@31->gfx_mode::@19#1] -- pbuz1=pbuc1 
     lda #<COLS
     sta col
     lda #>COLS
     sta col+1
-  //SEG183 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#0 [phi:gfx_mode::@50->gfx_mode::@26#2] -- register_copy 
-    jmp b26
-  //SEG184 [114] phi from gfx_mode::@28 to gfx_mode::@26 [phi:gfx_mode::@28->gfx_mode::@26]
-  b26_from_b28:
-  //SEG185 [114] phi (byte) gfx_mode::cy#4 = (byte) gfx_mode::cy#1 [phi:gfx_mode::@28->gfx_mode::@26#0] -- register_copy 
-  //SEG186 [114] phi (byte*) gfx_mode::col#3 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@28->gfx_mode::@26#1] -- register_copy 
-  //SEG187 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@28->gfx_mode::@26#2] -- register_copy 
-    jmp b26
-  //SEG188 gfx_mode::@26
-  b26:
-  //SEG189 [115] phi from gfx_mode::@26 to gfx_mode::@27 [phi:gfx_mode::@26->gfx_mode::@27]
-  b27_from_b26:
-  //SEG190 [115] phi (byte) gfx_mode::cx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@26->gfx_mode::@27#0] -- vbuxx=vbuc1 
+  //SEG183 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#0 [phi:gfx_mode::@31->gfx_mode::@19#2] -- register_copy 
+    jmp b19
+  //SEG184 [114] phi from gfx_mode::@21 to gfx_mode::@19 [phi:gfx_mode::@21->gfx_mode::@19]
+  b19_from_b21:
+  //SEG185 [114] phi (byte) gfx_mode::cy#4 = (byte) gfx_mode::cy#1 [phi:gfx_mode::@21->gfx_mode::@19#0] -- register_copy 
+  //SEG186 [114] phi (byte*) gfx_mode::col#3 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@21->gfx_mode::@19#1] -- register_copy 
+  //SEG187 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@21->gfx_mode::@19#2] -- register_copy 
+    jmp b19
+  //SEG188 gfx_mode::@19
+  b19:
+  //SEG189 [115] phi from gfx_mode::@19 to gfx_mode::@20 [phi:gfx_mode::@19->gfx_mode::@20]
+  b20_from_b19:
+  //SEG190 [115] phi (byte) gfx_mode::cx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@19->gfx_mode::@20#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG191 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#3 [phi:gfx_mode::@26->gfx_mode::@27#1] -- register_copy 
-  //SEG192 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#3 [phi:gfx_mode::@26->gfx_mode::@27#2] -- register_copy 
-    jmp b27
-  //SEG193 [115] phi from gfx_mode::@27 to gfx_mode::@27 [phi:gfx_mode::@27->gfx_mode::@27]
-  b27_from_b27:
-  //SEG194 [115] phi (byte) gfx_mode::cx#2 = (byte) gfx_mode::cx#1 [phi:gfx_mode::@27->gfx_mode::@27#0] -- register_copy 
-  //SEG195 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@27->gfx_mode::@27#1] -- register_copy 
-  //SEG196 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@27->gfx_mode::@27#2] -- register_copy 
-    jmp b27
-  //SEG197 gfx_mode::@27
-  b27:
+  //SEG191 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#3 [phi:gfx_mode::@19->gfx_mode::@20#1] -- register_copy 
+  //SEG192 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#3 [phi:gfx_mode::@19->gfx_mode::@20#2] -- register_copy 
+    jmp b20
+  //SEG193 [115] phi from gfx_mode::@20 to gfx_mode::@20 [phi:gfx_mode::@20->gfx_mode::@20]
+  b20_from_b20:
+  //SEG194 [115] phi (byte) gfx_mode::cx#2 = (byte) gfx_mode::cx#1 [phi:gfx_mode::@20->gfx_mode::@20#0] -- register_copy 
+  //SEG195 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@20->gfx_mode::@20#1] -- register_copy 
+  //SEG196 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@20->gfx_mode::@20#2] -- register_copy 
+    jmp b20
+  //SEG197 gfx_mode::@20
+  b20:
   //SEG198 [116] *((byte*) gfx_mode::col#2) ← *((byte*) gfx_mode::vic_colors#2) -- _deref_pbuz1=_deref_pbuz2 
     ldy #0
     lda (vic_colors),y
@@ -21583,21 +21744,21 @@ gfx_mode: {
   !:
   //SEG201 [119] (byte) gfx_mode::cx#1 ← ++ (byte) gfx_mode::cx#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG202 [120] if((byte) gfx_mode::cx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_mode::@27 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG202 [120] if((byte) gfx_mode::cx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_mode::@20 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b27_from_b27
-    jmp b28
-  //SEG203 gfx_mode::@28
-  b28:
+    bne b20_from_b20
+    jmp b21
+  //SEG203 gfx_mode::@21
+  b21:
   //SEG204 [121] (byte) gfx_mode::cy#1 ← ++ (byte) gfx_mode::cy#4 -- vbuz1=_inc_vbuz1 
     inc cy
-  //SEG205 [122] if((byte) gfx_mode::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto gfx_mode::@26 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG205 [122] if((byte) gfx_mode::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto gfx_mode::@19 -- vbuz1_neq_vbuc1_then_la1 
     lda #$19
     cmp cy
-    bne b26_from_b28
-    jmp b29
-  //SEG206 gfx_mode::@29
-  b29:
+    bne b19_from_b21
+    jmp b22
+  //SEG206 gfx_mode::@22
+  b22:
   //SEG207 [123] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Background colors
     lda #0
@@ -21642,89 +21803,89 @@ gfx_mode: {
     ora form_vic_bg3_lo
   //SEG219 [135] *((const byte*) BGCOL4#0) ← (byte~) gfx_mode::$71 -- _deref_pbuc1=vbuaa 
     sta BGCOL4
-  //SEG220 [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@34 -- _deref_pbuc1_eq_0_then_la1 
+  //SEG220 [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@24 -- _deref_pbuc1_eq_0_then_la1 
     // DTV Palette
     lda form_dtv_palet
     cmp #0
-    beq b34_from_b29
-  //SEG221 [137] phi from gfx_mode::@29 to gfx_mode::@31 [phi:gfx_mode::@29->gfx_mode::@31]
-  b31_from_b29:
-  //SEG222 [137] phi (byte) gfx_mode::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@29->gfx_mode::@31#0] -- vbuxx=vbuc1 
+    beq b24_from_b22
+  //SEG221 [137] phi from gfx_mode::@22 to gfx_mode::@23 [phi:gfx_mode::@22->gfx_mode::@23]
+  b23_from_b22:
+  //SEG222 [137] phi (byte) gfx_mode::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@22->gfx_mode::@23#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b31
+    jmp b23
   // DTV Palette - Grey Tones
-  //SEG223 [137] phi from gfx_mode::@31 to gfx_mode::@31 [phi:gfx_mode::@31->gfx_mode::@31]
-  b31_from_b31:
-  //SEG224 [137] phi (byte) gfx_mode::j#2 = (byte) gfx_mode::j#1 [phi:gfx_mode::@31->gfx_mode::@31#0] -- register_copy 
-    jmp b31
-  //SEG225 gfx_mode::@31
-  b31:
+  //SEG223 [137] phi from gfx_mode::@23 to gfx_mode::@23 [phi:gfx_mode::@23->gfx_mode::@23]
+  b23_from_b23:
+  //SEG224 [137] phi (byte) gfx_mode::j#2 = (byte) gfx_mode::j#1 [phi:gfx_mode::@23->gfx_mode::@23#0] -- register_copy 
+    jmp b23
+  //SEG225 gfx_mode::@23
+  b23:
   //SEG226 [138] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::j#2) ← (byte) gfx_mode::j#2 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta DTV_PALETTE,x
   //SEG227 [139] (byte) gfx_mode::j#1 ← ++ (byte) gfx_mode::j#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG228 [140] if((byte) gfx_mode::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@31 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG228 [140] if((byte) gfx_mode::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@23 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b31_from_b31
-    jmp b36
-  //SEG229 gfx_mode::@36
-  b36:
-  //SEG230 [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@36 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b23_from_b23
+    jmp b25
+  //SEG229 gfx_mode::@25
+  b25:
+  //SEG230 [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@25 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b36
-  //SEG231 [142] phi from gfx_mode::@36 to gfx_mode::@38 [phi:gfx_mode::@36->gfx_mode::@38]
-  b38_from_b36:
-    jmp b38
-  //SEG232 gfx_mode::@38
-  b38:
+    bne b25
+  //SEG231 [142] phi from gfx_mode::@25 to gfx_mode::@26 [phi:gfx_mode::@25->gfx_mode::@26]
+  b26_from_b25:
+    jmp b26
+  //SEG232 gfx_mode::@26
+  b26:
   //SEG233 [143] call keyboard_event_scan 
-  //SEG234 [159] phi from gfx_mode::@38 to keyboard_event_scan [phi:gfx_mode::@38->keyboard_event_scan]
-  keyboard_event_scan_from_b38:
-  //SEG235 [159] phi (byte) keyboard_events_size#110 = (byte) keyboard_events_size#24 [phi:gfx_mode::@38->keyboard_event_scan#0] -- register_copy 
+  //SEG234 [159] phi from gfx_mode::@26 to keyboard_event_scan [phi:gfx_mode::@26->keyboard_event_scan]
+  keyboard_event_scan_from_b26:
+  //SEG235 [159] phi (byte) keyboard_events_size#110 = (byte) keyboard_events_size#24 [phi:gfx_mode::@26->keyboard_event_scan#0] -- register_copy 
     jsr keyboard_event_scan
-  //SEG236 [144] phi from gfx_mode::@38 to gfx_mode::@51 [phi:gfx_mode::@38->gfx_mode::@51]
-  b51_from_b38:
-    jmp b51
-  //SEG237 gfx_mode::@51
-  b51:
+  //SEG236 [144] phi from gfx_mode::@26 to gfx_mode::@32 [phi:gfx_mode::@26->gfx_mode::@32]
+  b32_from_b26:
+    jmp b32
+  //SEG237 gfx_mode::@32
+  b32:
   //SEG238 [145] call keyboard_event_get 
     jsr keyboard_event_get
   //SEG239 [146] (byte) keyboard_event_get::return#3 ← (byte) keyboard_event_get::return#2
-    jmp b52
-  //SEG240 gfx_mode::@52
-  b52:
+    jmp b33
+  //SEG240 gfx_mode::@33
+  b33:
   //SEG241 [147] (byte) gfx_mode::keyboard_event#0 ← (byte) keyboard_event_get::return#3
-  //SEG242 [148] if((byte) gfx_mode::keyboard_event#0!=(const byte) KEY_SPACE#0) goto gfx_mode::@36 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG242 [148] if((byte) gfx_mode::keyboard_event#0!=(const byte) KEY_SPACE#0) goto gfx_mode::@25 -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_SPACE
-    bne b36
+    bne b25
     jmp breturn
   //SEG243 gfx_mode::@return
   breturn:
   //SEG244 [149] return 
     rts
   // DTV Palette - default
-  //SEG245 [150] phi from gfx_mode::@29 to gfx_mode::@34 [phi:gfx_mode::@29->gfx_mode::@34]
-  b34_from_b29:
-  //SEG246 [150] phi (byte) gfx_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@29->gfx_mode::@34#0] -- vbuxx=vbuc1 
+  //SEG245 [150] phi from gfx_mode::@22 to gfx_mode::@24 [phi:gfx_mode::@22->gfx_mode::@24]
+  b24_from_b22:
+  //SEG246 [150] phi (byte) gfx_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@22->gfx_mode::@24#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b34
-  //SEG247 [150] phi from gfx_mode::@34 to gfx_mode::@34 [phi:gfx_mode::@34->gfx_mode::@34]
-  b34_from_b34:
-  //SEG248 [150] phi (byte) gfx_mode::i#2 = (byte) gfx_mode::i#1 [phi:gfx_mode::@34->gfx_mode::@34#0] -- register_copy 
-    jmp b34
-  //SEG249 gfx_mode::@34
-  b34:
+    jmp b24
+  //SEG247 [150] phi from gfx_mode::@24 to gfx_mode::@24 [phi:gfx_mode::@24->gfx_mode::@24]
+  b24_from_b24:
+  //SEG248 [150] phi (byte) gfx_mode::i#2 = (byte) gfx_mode::i#1 [phi:gfx_mode::@24->gfx_mode::@24#0] -- register_copy 
+    jmp b24
+  //SEG249 gfx_mode::@24
+  b24:
   //SEG250 [151] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) gfx_mode::i#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda DTV_PALETTE_DEFAULT,x
     sta DTV_PALETTE,x
   //SEG251 [152] (byte) gfx_mode::i#1 ← ++ (byte) gfx_mode::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG252 [153] if((byte) gfx_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@34 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG252 [153] if((byte) gfx_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@24 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b34_from_b34
-    jmp b36
+    bne b24_from_b24
+    jmp b25
 }
 //SEG253 keyboard_event_get
 // Get the next event from the keyboard event buffer.
@@ -21735,18 +21896,18 @@ keyboard_event_get: {
     lda keyboard_events_size
     cmp #0
     beq breturn_from_keyboard_event_get
-    jmp b3
-  //SEG255 keyboard_event_get::@3
-  b3:
+    jmp b1
+  //SEG255 keyboard_event_get::@1
+  b1:
   //SEG256 [155] (byte) keyboard_events_size#4 ← -- (byte) keyboard_events_size#100 -- vbuz1=_dec_vbuz1 
     dec keyboard_events_size
   //SEG257 [156] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4) -- vbuaa=pbuc1_derefidx_vbuz1 
     ldy keyboard_events_size
     lda keyboard_events,y
-  //SEG258 [157] phi from keyboard_event_get::@3 to keyboard_event_get::@return [phi:keyboard_event_get::@3->keyboard_event_get::@return]
-  breturn_from_b3:
-  //SEG259 [157] phi (byte) keyboard_events_size#24 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@3->keyboard_event_get::@return#0] -- register_copy 
-  //SEG260 [157] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@3->keyboard_event_get::@return#1] -- register_copy 
+  //SEG258 [157] phi from keyboard_event_get::@1 to keyboard_event_get::@return [phi:keyboard_event_get::@1->keyboard_event_get::@return]
+  breturn_from_b1:
+  //SEG259 [157] phi (byte) keyboard_events_size#24 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@1->keyboard_event_get::@return#0] -- register_copy 
+  //SEG260 [157] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@1->keyboard_event_get::@return#1] -- register_copy 
     jmp breturn
   //SEG261 [157] phi from keyboard_event_get to keyboard_event_get::@return [phi:keyboard_event_get->keyboard_event_get::@return]
   breturn_from_keyboard_event_get:
@@ -21768,93 +21929,93 @@ keyboard_event_scan: {
     .label row_scan = $12
     .label keycode = 7
     .label row = 2
-  //SEG267 [160] phi from keyboard_event_scan to keyboard_event_scan::@8 [phi:keyboard_event_scan->keyboard_event_scan::@8]
-  b8_from_keyboard_event_scan:
-  //SEG268 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#110 [phi:keyboard_event_scan->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG269 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#1] -- vbuz1=vbuc1 
+  //SEG267 [160] phi from keyboard_event_scan to keyboard_event_scan::@7 [phi:keyboard_event_scan->keyboard_event_scan::@7]
+  b7_from_keyboard_event_scan:
+  //SEG268 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#110 [phi:keyboard_event_scan->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG269 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#1] -- vbuz1=vbuc1 
     lda #0
     sta keycode
-  //SEG270 [160] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#2] -- vbuz1=vbuc1 
+  //SEG270 [160] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#2] -- vbuz1=vbuc1 
     lda #0
     sta row
-    jmp b8
-  //SEG271 [160] phi from keyboard_event_scan::@10 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8]
-  b8_from_b10:
-  //SEG272 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#100 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG273 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#1] -- register_copy 
-  //SEG274 [160] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#2] -- register_copy 
-    jmp b8
-  //SEG275 keyboard_event_scan::@8
-  b8:
+    jmp b7
+  //SEG271 [160] phi from keyboard_event_scan::@8 to keyboard_event_scan::@7 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7]
+  b7_from_b8:
+  //SEG272 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#100 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG273 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#1] -- register_copy 
+  //SEG274 [160] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#2] -- register_copy 
+    jmp b7
+  //SEG275 keyboard_event_scan::@7
+  b7:
   //SEG276 [161] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_event_scan::row#2 -- vbuxx=vbuz1 
     ldx row
   //SEG277 [162] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG278 [163] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-    jmp b25
-  //SEG279 keyboard_event_scan::@25
-  b25:
+    jmp b19
+  //SEG279 keyboard_event_scan::@19
+  b19:
   //SEG280 [164] (byte) keyboard_event_scan::row_scan#0 ← (byte) keyboard_matrix_read::return#2 -- vbuz1=vbuaa 
     sta row_scan
-  //SEG281 [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
+  //SEG281 [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
     lda row_scan
     ldy row
     cmp keyboard_scan_values,y
-    bne b11_from_b25
-    jmp b21
-  //SEG282 keyboard_event_scan::@21
-  b21:
+    bne b9_from_b19
+    jmp b16
+  //SEG282 keyboard_event_scan::@16
+  b16:
   //SEG283 [166] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
     axs #-[8]
     stx keycode
-  //SEG284 [167] phi from keyboard_event_scan::@20 keyboard_event_scan::@21 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10]
-  b10_from_b20:
-  b10_from_b21:
-  //SEG285 [167] phi (byte) keyboard_events_size#100 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#0] -- register_copy 
-  //SEG286 [167] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#1] -- register_copy 
-    jmp b10
-  //SEG287 keyboard_event_scan::@10
-  b10:
+  //SEG284 [167] phi from keyboard_event_scan::@15 keyboard_event_scan::@16 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8]
+  b8_from_b15:
+  b8_from_b16:
+  //SEG285 [167] phi (byte) keyboard_events_size#100 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#0] -- register_copy 
+  //SEG286 [167] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#1] -- register_copy 
+    jmp b8
+  //SEG287 keyboard_event_scan::@8
+  b8:
   //SEG288 [168] (byte) keyboard_event_scan::row#1 ← ++ (byte) keyboard_event_scan::row#2 -- vbuz1=_inc_vbuz1 
     inc row
-  //SEG289 [169] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG289 [169] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp row
-    bne b8_from_b10
-  //SEG290 [170] phi from keyboard_event_scan::@10 to keyboard_event_scan::@23 [phi:keyboard_event_scan::@10->keyboard_event_scan::@23]
-  b23_from_b10:
-    jmp b23
-  //SEG291 keyboard_event_scan::@23
-  b23:
+    bne b7_from_b8
+  //SEG290 [170] phi from keyboard_event_scan::@8 to keyboard_event_scan::@17 [phi:keyboard_event_scan::@8->keyboard_event_scan::@17]
+  b17_from_b8:
+    jmp b17
+  //SEG291 keyboard_event_scan::@17
+  b17:
   //SEG292 [171] call keyboard_event_pressed 
-  //SEG293 [213] phi from keyboard_event_scan::@23 to keyboard_event_pressed [phi:keyboard_event_scan::@23->keyboard_event_pressed]
-  keyboard_event_pressed_from_b23:
-  //SEG294 [213] phi (byte) keyboard_event_pressed::keycode#4 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@23->keyboard_event_pressed#0] -- vbuz1=vbuc1 
+  //SEG293 [213] phi from keyboard_event_scan::@17 to keyboard_event_pressed [phi:keyboard_event_scan::@17->keyboard_event_pressed]
+  keyboard_event_pressed_from_b17:
+  //SEG294 [213] phi (byte) keyboard_event_pressed::keycode#4 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@17->keyboard_event_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_LSHIFT
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG295 [172] (byte) keyboard_event_pressed::return#0 ← (byte) keyboard_event_pressed::return#10
-    jmp b26
-  //SEG296 keyboard_event_scan::@26
-  b26:
+    jmp b20
+  //SEG296 keyboard_event_scan::@20
+  b20:
   //SEG297 [173] (byte~) keyboard_event_scan::$0 ← (byte) keyboard_event_pressed::return#0
   //SEG298 [174] if((byte~) keyboard_event_scan::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b1_from_b26
-  //SEG299 [175] phi from keyboard_event_scan::@26 to keyboard_event_scan::@24 [phi:keyboard_event_scan::@26->keyboard_event_scan::@24]
-  b24_from_b26:
-    jmp b24
-  //SEG300 keyboard_event_scan::@24
-  b24:
-  //SEG301 [176] phi from keyboard_event_scan::@24 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1]
-  b1_from_b24:
-  //SEG302 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
+    beq b1_from_b20
+  //SEG299 [175] phi from keyboard_event_scan::@20 to keyboard_event_scan::@18 [phi:keyboard_event_scan::@20->keyboard_event_scan::@18]
+  b18_from_b20:
+    jmp b18
+  //SEG300 keyboard_event_scan::@18
+  b18:
+  //SEG301 [176] phi from keyboard_event_scan::@18 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1]
+  b1_from_b18:
+  //SEG302 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
     ldx #0|KEY_MODIFIER_LSHIFT
     jmp b1
-  //SEG303 [176] phi from keyboard_event_scan::@26 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1]
-  b1_from_b26:
-  //SEG304 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
+  //SEG303 [176] phi from keyboard_event_scan::@20 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1]
+  b1_from_b20:
+  //SEG304 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
   //SEG305 keyboard_event_scan::@1
@@ -21867,24 +22028,24 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG309 [178] (byte) keyboard_event_pressed::return#1 ← (byte) keyboard_event_pressed::return#10
-    jmp b27
-  //SEG310 keyboard_event_scan::@27
-  b27:
+    jmp b21
+  //SEG310 keyboard_event_scan::@21
+  b21:
   //SEG311 [179] (byte~) keyboard_event_scan::$3 ← (byte) keyboard_event_pressed::return#1
   //SEG312 [180] if((byte~) keyboard_event_scan::$3==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b2_from_b27
-    jmp b5
-  //SEG313 keyboard_event_scan::@5
-  b5:
+    beq b2_from_b21
+    jmp b4
+  //SEG313 keyboard_event_scan::@4
+  b4:
   //SEG314 [181] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#18 | (const byte) KEY_MODIFIER_RSHIFT#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_RSHIFT
     tax
-  //SEG315 [182] phi from keyboard_event_scan::@27 keyboard_event_scan::@5 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2]
-  b2_from_b27:
-  b2_from_b5:
-  //SEG316 [182] phi (byte) keyboard_modifiers#19 = (byte) keyboard_modifiers#18 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2#0] -- register_copy 
+  //SEG315 [182] phi from keyboard_event_scan::@21 keyboard_event_scan::@4 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2]
+  b2_from_b21:
+  b2_from_b4:
+  //SEG316 [182] phi (byte) keyboard_modifiers#19 = (byte) keyboard_modifiers#18 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2#0] -- register_copy 
     jmp b2
   //SEG317 keyboard_event_scan::@2
   b2:
@@ -21896,24 +22057,24 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG321 [184] (byte) keyboard_event_pressed::return#2 ← (byte) keyboard_event_pressed::return#10
-    jmp b28
-  //SEG322 keyboard_event_scan::@28
-  b28:
+    jmp b22
+  //SEG322 keyboard_event_scan::@22
+  b22:
   //SEG323 [185] (byte~) keyboard_event_scan::$6 ← (byte) keyboard_event_pressed::return#2
   //SEG324 [186] if((byte~) keyboard_event_scan::$6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@3 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b3_from_b28
-    jmp b6
-  //SEG325 keyboard_event_scan::@6
-  b6:
+    beq b3_from_b22
+    jmp b5
+  //SEG325 keyboard_event_scan::@5
+  b5:
   //SEG326 [187] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#19 | (const byte) KEY_MODIFIER_CTRL#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_CTRL
     tax
-  //SEG327 [188] phi from keyboard_event_scan::@28 keyboard_event_scan::@6 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3]
-  b3_from_b28:
-  b3_from_b6:
-  //SEG328 [188] phi (byte) keyboard_modifiers#20 = (byte) keyboard_modifiers#19 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3#0] -- register_copy 
+  //SEG327 [188] phi from keyboard_event_scan::@22 keyboard_event_scan::@5 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3]
+  b3_from_b22:
+  b3_from_b5:
+  //SEG328 [188] phi (byte) keyboard_modifiers#20 = (byte) keyboard_modifiers#19 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3#0] -- register_copy 
     jmp b3
   //SEG329 keyboard_event_scan::@3
   b3:
@@ -21925,73 +22086,73 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG333 [190] (byte) keyboard_event_pressed::return#3 ← (byte) keyboard_event_pressed::return#10
-    jmp b29
-  //SEG334 keyboard_event_scan::@29
-  b29:
+    jmp b23
+  //SEG334 keyboard_event_scan::@23
+  b23:
   //SEG335 [191] (byte~) keyboard_event_scan::$9 ← (byte) keyboard_event_pressed::return#3
   //SEG336 [192] if((byte~) keyboard_event_scan::$9==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@return -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq breturn_from_b29
-    jmp b7
-  //SEG337 keyboard_event_scan::@7
-  b7:
+    beq breturn_from_b23
+    jmp b6
+  //SEG337 keyboard_event_scan::@6
+  b6:
   //SEG338 [193] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#20 | (const byte) KEY_MODIFIER_COMMODORE#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_COMMODORE
     tax
-  //SEG339 [194] phi from keyboard_event_scan::@29 keyboard_event_scan::@7 to keyboard_event_scan::@return [phi:keyboard_event_scan::@29/keyboard_event_scan::@7->keyboard_event_scan::@return]
-  breturn_from_b29:
-  breturn_from_b7:
-  //SEG340 [194] phi (byte) keyboard_modifiers#21 = (byte) keyboard_modifiers#20 [phi:keyboard_event_scan::@29/keyboard_event_scan::@7->keyboard_event_scan::@return#0] -- register_copy 
+  //SEG339 [194] phi from keyboard_event_scan::@23 keyboard_event_scan::@6 to keyboard_event_scan::@return [phi:keyboard_event_scan::@23/keyboard_event_scan::@6->keyboard_event_scan::@return]
+  breturn_from_b23:
+  breturn_from_b6:
+  //SEG340 [194] phi (byte) keyboard_modifiers#21 = (byte) keyboard_modifiers#20 [phi:keyboard_event_scan::@23/keyboard_event_scan::@6->keyboard_event_scan::@return#0] -- register_copy 
     jmp breturn
   //SEG341 keyboard_event_scan::@return
   breturn:
   //SEG342 [195] return 
     rts
   // Something has changed on the keyboard row - check each column
-  //SEG343 [196] phi from keyboard_event_scan::@12 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11]
-  b11_from_b12:
-  //SEG344 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG345 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG346 [196] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#2] -- register_copy 
-    jmp b11
-  //SEG347 [196] phi from keyboard_event_scan::@25 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11]
-  b11_from_b25:
-  //SEG348 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#119 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG349 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG350 [196] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#2] -- vbuxx=vbuc1 
+  //SEG343 [196] phi from keyboard_event_scan::@10 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9]
+  b9_from_b10:
+  //SEG344 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG345 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG346 [196] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#2] -- register_copy 
+    jmp b9
+  //SEG347 [196] phi from keyboard_event_scan::@19 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9]
+  b9_from_b19:
+  //SEG348 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#119 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG349 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG350 [196] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#2] -- vbuxx=vbuc1 
     ldx #0
-    jmp b11
-  //SEG351 keyboard_event_scan::@11
-  b11:
+    jmp b9
+  //SEG351 keyboard_event_scan::@9
+  b9:
   //SEG352 [197] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) -- vbuaa=vbuz1_bxor_pbuc1_derefidx_vbuz2 
     lda row_scan
     ldy row
     eor keyboard_scan_values,y
   //SEG353 [198] (byte~) keyboard_event_scan::$16 ← (byte~) keyboard_event_scan::$15 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuxx 
     and keyboard_matrix_col_bitmask,x
-  //SEG354 [199] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@12 -- vbuaa_eq_0_then_la1 
+  //SEG354 [199] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@10 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b12_from_b11
-    jmp b16
-  //SEG355 keyboard_event_scan::@16
-  b16:
-  //SEG356 [200] if((byte) keyboard_events_size#18==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12 -- vbuz1_eq_vbuc1_then_la1 
+    beq b10_from_b9
+    jmp b12
+  //SEG355 keyboard_event_scan::@12
+  b12:
+  //SEG356 [200] if((byte) keyboard_events_size#18==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10 -- vbuz1_eq_vbuc1_then_la1 
     lda #8
     cmp keyboard_events_size
-    beq b12_from_b16
-    jmp b17
-  //SEG357 keyboard_event_scan::@17
-  b17:
+    beq b10_from_b12
+    jmp b13
+  //SEG357 keyboard_event_scan::@13
+  b13:
   //SEG358 [201] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) -- vbuaa=vbuz1_band_pbuc1_derefidx_vbuxx 
     lda keyboard_matrix_col_bitmask,x
     and row_scan
-  //SEG359 [202] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@14 -- vbuaa_eq_0_then_la1 
+  //SEG359 [202] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@11 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b14
-    jmp b18
-  //SEG360 keyboard_event_scan::@18
-  b18:
+    beq b11
+    jmp b14
+  //SEG360 keyboard_event_scan::@14
+  b14:
   //SEG361 [203] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#18) ← (byte) keyboard_event_scan::keycode#10 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Key pressed
     lda keycode
@@ -21999,33 +22160,33 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG362 [204] (byte) keyboard_events_size#2 ← ++ (byte) keyboard_events_size#18 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-  //SEG363 [205] phi from keyboard_event_scan::@11 keyboard_event_scan::@14 keyboard_event_scan::@16 keyboard_event_scan::@18 to keyboard_event_scan::@12 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12]
-  b12_from_b11:
-  b12_from_b14:
-  b12_from_b16:
-  b12_from_b18:
-  //SEG364 [205] phi (byte) keyboard_events_size#118 = (byte) keyboard_events_size#18 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12#0] -- register_copy 
-    jmp b12
-  //SEG365 keyboard_event_scan::@12
-  b12:
+  //SEG363 [205] phi from keyboard_event_scan::@11 keyboard_event_scan::@12 keyboard_event_scan::@14 keyboard_event_scan::@9 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10]
+  b10_from_b11:
+  b10_from_b12:
+  b10_from_b14:
+  b10_from_b9:
+  //SEG364 [205] phi (byte) keyboard_events_size#118 = (byte) keyboard_events_size#1 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10#0] -- register_copy 
+    jmp b10
+  //SEG365 keyboard_event_scan::@10
+  b10:
   //SEG366 [206] (byte) keyboard_event_scan::keycode#15 ← ++ (byte) keyboard_event_scan::keycode#10 -- vbuz1=_inc_vbuz1 
     inc keycode
   //SEG367 [207] (byte) keyboard_event_scan::col#1 ← ++ (byte) keyboard_event_scan::col#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG368 [208] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG368 [208] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@9 -- vbuxx_neq_vbuc1_then_la1 
     cpx #8
-    bne b11_from_b12
-    jmp b20
-  //SEG369 keyboard_event_scan::@20
-  b20:
+    bne b9_from_b10
+    jmp b15
+  //SEG369 keyboard_event_scan::@15
+  b15:
   //SEG370 [209] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Store the current keyboard status for the row to debounce
     lda row_scan
     ldy row
     sta keyboard_scan_values,y
-    jmp b10_from_b20
-  //SEG371 keyboard_event_scan::@14
-  b14:
+    jmp b8_from_b15
+  //SEG371 keyboard_event_scan::@11
+  b11:
   //SEG372 [210] (byte/word/dword~) keyboard_event_scan::$23 ← (byte) keyboard_event_scan::keycode#10 | (byte/signed byte/word/signed word/dword/signed dword) $40 -- vbuaa=vbuz1_bor_vbuc1 
     lda #$40
     ora keycode
@@ -22035,7 +22196,7 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG374 [212] (byte) keyboard_events_size#1 ← ++ (byte) keyboard_events_size#18 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-    jmp b12_from_b14
+    jmp b10_from_b11
 }
 //SEG375 keyboard_event_pressed
 // Determine if a specific key is currently pressed based on the last keyboard_event_scan()
@@ -22094,66 +22255,66 @@ get_vic_screen: {
   //SEG388 [223] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_vic_screen::@return -- vbuaa_eq_0_then_la1 
     cmp #0
     beq breturn_from_get_vic_screen
-    jmp b10
-  //SEG389 get_vic_screen::@10
-  b10:
+    jmp b2
+  //SEG389 get_vic_screen::@2
+  b2:
   //SEG390 [224] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_screen::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #1
-    beq breturn_from_b10
-    jmp b11
-  //SEG391 get_vic_screen::@11
-  b11:
+    beq breturn_from_b2
+    jmp b3
+  //SEG391 get_vic_screen::@3
+  b3:
   //SEG392 [225] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 2) goto get_vic_screen::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #2
-    beq breturn_from_b11
-    jmp b12
-  //SEG393 get_vic_screen::@12
-  b12:
+    beq breturn_from_b3
+    jmp b4
+  //SEG393 get_vic_screen::@4
+  b4:
   //SEG394 [226] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 3) goto get_vic_screen::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #3
-    beq breturn_from_b12
-    jmp b13
-  //SEG395 get_vic_screen::@13
-  b13:
-  //SEG396 [227] if((byte) get_vic_screen::idx#2!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_vic_screen::@9 -- vbuaa_neq_vbuc1_then_la1 
+    beq breturn_from_b4
+    jmp b5
+  //SEG395 get_vic_screen::@5
+  b5:
+  //SEG396 [227] if((byte) get_vic_screen::idx#2!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_vic_screen::@1 -- vbuaa_neq_vbuc1_then_la1 
     cmp #4
-    bne b9_from_b13
-  //SEG397 [228] phi from get_vic_screen::@13 to get_vic_screen::@return [phi:get_vic_screen::@13->get_vic_screen::@return]
-  breturn_from_b13:
-  //SEG398 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN4#0 [phi:get_vic_screen::@13->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+    bne b1_from_b5
+  //SEG397 [228] phi from get_vic_screen::@5 to get_vic_screen::@return [phi:get_vic_screen::@5->get_vic_screen::@return]
+  breturn_from_b5:
+  //SEG398 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN4#0 [phi:get_vic_screen::@5->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN4
     sta return
     lda #>VIC_SCREEN4
     sta return+1
     jmp breturn
-  //SEG399 [228] phi from get_vic_screen get_vic_screen::@9 to get_vic_screen::@return [phi:get_vic_screen/get_vic_screen::@9->get_vic_screen::@return]
+  //SEG399 [228] phi from get_vic_screen get_vic_screen::@1 to get_vic_screen::@return [phi:get_vic_screen/get_vic_screen::@1->get_vic_screen::@return]
   breturn_from_get_vic_screen:
-  breturn_from_b9:
-  //SEG400 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN0#0 [phi:get_vic_screen/get_vic_screen::@9->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  breturn_from_b1:
+  //SEG400 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN0#0 [phi:get_vic_screen/get_vic_screen::@1->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN0
     sta return
     lda #>VIC_SCREEN0
     sta return+1
     jmp breturn
-  //SEG401 [228] phi from get_vic_screen::@10 to get_vic_screen::@return [phi:get_vic_screen::@10->get_vic_screen::@return]
-  breturn_from_b10:
-  //SEG402 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN1#0 [phi:get_vic_screen::@10->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  //SEG401 [228] phi from get_vic_screen::@2 to get_vic_screen::@return [phi:get_vic_screen::@2->get_vic_screen::@return]
+  breturn_from_b2:
+  //SEG402 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN1#0 [phi:get_vic_screen::@2->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN1
     sta return
     lda #>VIC_SCREEN1
     sta return+1
     jmp breturn
-  //SEG403 [228] phi from get_vic_screen::@11 to get_vic_screen::@return [phi:get_vic_screen::@11->get_vic_screen::@return]
-  breturn_from_b11:
-  //SEG404 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN2#0 [phi:get_vic_screen::@11->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  //SEG403 [228] phi from get_vic_screen::@3 to get_vic_screen::@return [phi:get_vic_screen::@3->get_vic_screen::@return]
+  breturn_from_b3:
+  //SEG404 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN2#0 [phi:get_vic_screen::@3->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN2
     sta return
     lda #>VIC_SCREEN2
     sta return+1
     jmp breturn
-  //SEG405 [228] phi from get_vic_screen::@12 to get_vic_screen::@return [phi:get_vic_screen::@12->get_vic_screen::@return]
-  breturn_from_b12:
-  //SEG406 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN3#0 [phi:get_vic_screen::@12->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  //SEG405 [228] phi from get_vic_screen::@4 to get_vic_screen::@return [phi:get_vic_screen::@4->get_vic_screen::@return]
+  breturn_from_b4:
+  //SEG406 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN3#0 [phi:get_vic_screen::@4->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN3
     sta return
     lda #>VIC_SCREEN3
@@ -22163,12 +22324,12 @@ get_vic_screen: {
   breturn:
   //SEG408 [229] return 
     rts
-  //SEG409 [230] phi from get_vic_screen::@13 to get_vic_screen::@9 [phi:get_vic_screen::@13->get_vic_screen::@9]
-  b9_from_b13:
-    jmp b9
-  //SEG410 get_vic_screen::@9
-  b9:
-    jmp breturn_from_b9
+  //SEG409 [230] phi from get_vic_screen::@5 to get_vic_screen::@1 [phi:get_vic_screen::@5->get_vic_screen::@1]
+  b1_from_b5:
+    jmp b1
+  //SEG410 get_vic_screen::@1
+  b1:
+    jmp breturn_from_b1
 }
 //SEG411 get_vic_charset
 // Get the VIC charset/bitmap address from the index
@@ -22178,24 +22339,24 @@ get_vic_charset: {
   //SEG412 [231] if((byte) get_vic_charset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_vic_charset::@return -- vbuaa_eq_0_then_la1 
     cmp #0
     beq breturn_from_get_vic_charset
-    jmp b4
-  //SEG413 get_vic_charset::@4
-  b4:
-  //SEG414 [232] if((byte) get_vic_charset::idx#0!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_charset::@3 -- vbuaa_neq_vbuc1_then_la1 
+    jmp b2
+  //SEG413 get_vic_charset::@2
+  b2:
+  //SEG414 [232] if((byte) get_vic_charset::idx#0!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_charset::@1 -- vbuaa_neq_vbuc1_then_la1 
     cmp #1
-    bne b3_from_b4
-  //SEG415 [233] phi from get_vic_charset::@4 to get_vic_charset::@return [phi:get_vic_charset::@4->get_vic_charset::@return]
-  breturn_from_b4:
-  //SEG416 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_BITMAP#0 [phi:get_vic_charset::@4->get_vic_charset::@return#0] -- pbuz1=pbuc1 
+    bne b1_from_b2
+  //SEG415 [233] phi from get_vic_charset::@2 to get_vic_charset::@return [phi:get_vic_charset::@2->get_vic_charset::@return]
+  breturn_from_b2:
+  //SEG416 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_BITMAP#0 [phi:get_vic_charset::@2->get_vic_charset::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_BITMAP
     sta return
     lda #>VIC_BITMAP
     sta return+1
     jmp breturn
-  //SEG417 [233] phi from get_vic_charset get_vic_charset::@3 to get_vic_charset::@return [phi:get_vic_charset/get_vic_charset::@3->get_vic_charset::@return]
+  //SEG417 [233] phi from get_vic_charset get_vic_charset::@1 to get_vic_charset::@return [phi:get_vic_charset/get_vic_charset::@1->get_vic_charset::@return]
   breturn_from_get_vic_charset:
-  breturn_from_b3:
-  //SEG418 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_CHARSET_ROM#0 [phi:get_vic_charset/get_vic_charset::@3->get_vic_charset::@return#0] -- pbuz1=pbuc1 
+  breturn_from_b1:
+  //SEG418 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_CHARSET_ROM#0 [phi:get_vic_charset/get_vic_charset::@1->get_vic_charset::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_CHARSET_ROM
     sta return
     lda #>VIC_CHARSET_ROM
@@ -22205,12 +22366,12 @@ get_vic_charset: {
   breturn:
   //SEG420 [234] return 
     rts
-  //SEG421 [235] phi from get_vic_charset::@4 to get_vic_charset::@3 [phi:get_vic_charset::@4->get_vic_charset::@3]
-  b3_from_b4:
-    jmp b3
-  //SEG422 get_vic_charset::@3
-  b3:
-    jmp breturn_from_b3
+  //SEG421 [235] phi from get_vic_charset::@2 to get_vic_charset::@1 [phi:get_vic_charset::@2->get_vic_charset::@1]
+  b1_from_b2:
+    jmp b1
+  //SEG422 get_vic_charset::@1
+  b1:
+    jmp breturn_from_b1
 }
 //SEG423 get_plane
 // Get plane address from a plane index (from the form)
@@ -22220,87 +22381,87 @@ get_plane: {
   //SEG424 [237] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_plane::@return -- vbuaa_eq_0_then_la1 
     cmp #0
     beq breturn_from_get_plane
-    jmp b28
-  //SEG425 get_plane::@28
-  b28:
+    jmp b2
+  //SEG425 get_plane::@2
+  b2:
   //SEG426 [238] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #1
-    beq breturn_from_b28
-    jmp b29
-  //SEG427 get_plane::@29
-  b29:
+    beq breturn_from_b2
+    jmp b3
+  //SEG427 get_plane::@3
+  b3:
   //SEG428 [239] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #2
-    beq breturn_from_b29
-    jmp b30
-  //SEG429 get_plane::@30
-  b30:
+    beq breturn_from_b3
+    jmp b4
+  //SEG429 get_plane::@4
+  b4:
   //SEG430 [240] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #3
-    beq breturn_from_b30
-    jmp b31
-  //SEG431 get_plane::@31
-  b31:
+    beq breturn_from_b4
+    jmp b5
+  //SEG431 get_plane::@5
+  b5:
   //SEG432 [241] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #4
-    beq breturn_from_b31
-    jmp b32
-  //SEG433 get_plane::@32
-  b32:
+    beq breturn_from_b5
+    jmp b6
+  //SEG433 get_plane::@6
+  b6:
   //SEG434 [242] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #5
-    beq breturn_from_b32
-    jmp b33
-  //SEG435 get_plane::@33
-  b33:
+    beq breturn_from_b6
+    jmp b7
+  //SEG435 get_plane::@7
+  b7:
   //SEG436 [243] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #6
-    beq breturn_from_b33
-    jmp b34
-  //SEG437 get_plane::@34
-  b34:
+    beq breturn_from_b7
+    jmp b8
+  //SEG437 get_plane::@8
+  b8:
   //SEG438 [244] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #7
-    beq breturn_from_b34
-    jmp b35
-  //SEG439 get_plane::@35
-  b35:
+    beq breturn_from_b8
+    jmp b9
+  //SEG439 get_plane::@9
+  b9:
   //SEG440 [245] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #8
-    beq breturn_from_b35
-    jmp b36
-  //SEG441 get_plane::@36
-  b36:
+    beq breturn_from_b9
+    jmp b10
+  //SEG441 get_plane::@10
+  b10:
   //SEG442 [246] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #9
-    beq breturn_from_b36
-    jmp b37
-  //SEG443 get_plane::@37
-  b37:
+    beq breturn_from_b10
+    jmp b11
+  //SEG443 get_plane::@11
+  b11:
   //SEG444 [247] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #$a
-    beq breturn_from_b37
-    jmp b38
-  //SEG445 get_plane::@38
-  b38:
+    beq breturn_from_b11
+    jmp b12
+  //SEG445 get_plane::@12
+  b12:
   //SEG446 [248] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $b) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #$b
-    beq breturn_from_b38
-    jmp b39
-  //SEG447 get_plane::@39
-  b39:
+    beq breturn_from_b12
+    jmp b13
+  //SEG447 get_plane::@13
+  b13:
   //SEG448 [249] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $c) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #$c
-    beq breturn_from_b39
-    jmp b40
-  //SEG449 get_plane::@40
-  b40:
-  //SEG450 [250] if((byte) get_plane::idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $d) goto get_plane::@27 -- vbuaa_neq_vbuc1_then_la1 
+    beq breturn_from_b13
+    jmp b14
+  //SEG449 get_plane::@14
+  b14:
+  //SEG450 [250] if((byte) get_plane::idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $d) goto get_plane::@1 -- vbuaa_neq_vbuc1_then_la1 
     cmp #$d
-    bne b27_from_b40
-  //SEG451 [251] phi from get_plane::@40 to get_plane::@return [phi:get_plane::@40->get_plane::@return]
-  breturn_from_b40:
-  //SEG452 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_FULL#0 [phi:get_plane::@40->get_plane::@return#0] -- vduz1=vduc1 
+    bne b1_from_b14
+  //SEG451 [251] phi from get_plane::@14 to get_plane::@return [phi:get_plane::@14->get_plane::@return]
+  breturn_from_b14:
+  //SEG452 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_FULL#0 [phi:get_plane::@14->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_FULL
     sta return
     lda #>PLANE_FULL
@@ -22310,10 +22471,10 @@ get_plane: {
     lda #>PLANE_FULL>>$10
     sta return+3
     jmp breturn
-  //SEG453 [251] phi from get_plane get_plane::@27 to get_plane::@return [phi:get_plane/get_plane::@27->get_plane::@return]
+  //SEG453 [251] phi from get_plane get_plane::@1 to get_plane::@return [phi:get_plane/get_plane::@1->get_plane::@return]
   breturn_from_get_plane:
-  breturn_from_b27:
-  //SEG454 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN0#0 [phi:get_plane/get_plane::@27->get_plane::@return#0] -- vduz1=vduc1 
+  breturn_from_b1:
+  //SEG454 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN0#0 [phi:get_plane/get_plane::@1->get_plane::@return#0] -- vduz1=vduc1 
     lda #<$ffffffff&VIC_SCREEN0
     sta return
     lda #>$ffffffff&VIC_SCREEN0
@@ -22323,105 +22484,9 @@ get_plane: {
     lda #>$ffffffff&VIC_SCREEN0>>$10
     sta return+3
     jmp breturn
-  //SEG455 [251] phi from get_plane::@28 to get_plane::@return [phi:get_plane::@28->get_plane::@return]
-  breturn_from_b28:
-  //SEG456 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN1#0 [phi:get_plane::@28->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_SCREEN1
-    sta return
-    lda #>$ffffffff&VIC_SCREEN1
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN1>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN1>>$10
-    sta return+3
-    jmp breturn
-  //SEG457 [251] phi from get_plane::@29 to get_plane::@return [phi:get_plane::@29->get_plane::@return]
-  breturn_from_b29:
-  //SEG458 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN2#0 [phi:get_plane::@29->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_SCREEN2
-    sta return
-    lda #>$ffffffff&VIC_SCREEN2
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN2>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN2>>$10
-    sta return+3
-    jmp breturn
-  //SEG459 [251] phi from get_plane::@30 to get_plane::@return [phi:get_plane::@30->get_plane::@return]
-  breturn_from_b30:
-  //SEG460 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN3#0 [phi:get_plane::@30->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_SCREEN3
-    sta return
-    lda #>$ffffffff&VIC_SCREEN3
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN3>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN3>>$10
-    sta return+3
-    jmp breturn
-  //SEG461 [251] phi from get_plane::@31 to get_plane::@return [phi:get_plane::@31->get_plane::@return]
-  breturn_from_b31:
-  //SEG462 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_BITMAP#0 [phi:get_plane::@31->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_BITMAP
-    sta return
-    lda #>$ffffffff&VIC_BITMAP
-    sta return+1
-    lda #<$ffffffff&VIC_BITMAP>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_BITMAP>>$10
-    sta return+3
-    jmp breturn
-  //SEG463 [251] phi from get_plane::@32 to get_plane::@return [phi:get_plane::@32->get_plane::@return]
-  breturn_from_b32:
-  //SEG464 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_CHARSET_ROM#0 [phi:get_plane::@32->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_CHARSET_ROM
-    sta return
-    lda #>$ffffffff&VIC_CHARSET_ROM
-    sta return+1
-    lda #<$ffffffff&VIC_CHARSET_ROM>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_CHARSET_ROM>>$10
-    sta return+3
-    jmp breturn
-  //SEG465 [251] phi from get_plane::@33 to get_plane::@return [phi:get_plane::@33->get_plane::@return]
-  breturn_from_b33:
-  //SEG466 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_8BPP_CHUNKY#0 [phi:get_plane::@33->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<PLANE_8BPP_CHUNKY
-    sta return
-    lda #>PLANE_8BPP_CHUNKY
-    sta return+1
-    lda #<PLANE_8BPP_CHUNKY>>$10
-    sta return+2
-    lda #>PLANE_8BPP_CHUNKY>>$10
-    sta return+3
-    jmp breturn
-  //SEG467 [251] phi from get_plane::@34 to get_plane::@return [phi:get_plane::@34->get_plane::@return]
-  breturn_from_b34:
-  //SEG468 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL#0 [phi:get_plane::@34->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<PLANE_HORISONTAL
-    sta return
-    lda #>PLANE_HORISONTAL
-    sta return+1
-    lda #<PLANE_HORISONTAL>>$10
-    sta return+2
-    lda #>PLANE_HORISONTAL>>$10
-    sta return+3
-    jmp breturn
-  //SEG469 [251] phi from get_plane::@35 to get_plane::@return [phi:get_plane::@35->get_plane::@return]
-  breturn_from_b35:
-  //SEG470 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL#0 [phi:get_plane::@35->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<PLANE_VERTICAL
-    sta return
-    lda #>PLANE_VERTICAL
-    sta return+1
-    lda #<PLANE_VERTICAL>>$10
-    sta return+2
-    lda #>PLANE_VERTICAL>>$10
-    sta return+3
-    jmp breturn
-  //SEG471 [251] phi from get_plane::@36 to get_plane::@return [phi:get_plane::@36->get_plane::@return]
-  breturn_from_b36:
-  //SEG472 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL2#0 [phi:get_plane::@36->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG455 [251] phi from get_plane::@10 to get_plane::@return [phi:get_plane::@10->get_plane::@return]
+  breturn_from_b10:
+  //SEG456 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL2#0 [phi:get_plane::@10->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_HORISONTAL2
     sta return
     lda #>PLANE_HORISONTAL2
@@ -22431,9 +22496,9 @@ get_plane: {
     lda #>PLANE_HORISONTAL2>>$10
     sta return+3
     jmp breturn
-  //SEG473 [251] phi from get_plane::@37 to get_plane::@return [phi:get_plane::@37->get_plane::@return]
-  breturn_from_b37:
-  //SEG474 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL2#0 [phi:get_plane::@37->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG457 [251] phi from get_plane::@11 to get_plane::@return [phi:get_plane::@11->get_plane::@return]
+  breturn_from_b11:
+  //SEG458 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL2#0 [phi:get_plane::@11->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_VERTICAL2
     sta return
     lda #>PLANE_VERTICAL2
@@ -22443,9 +22508,9 @@ get_plane: {
     lda #>PLANE_VERTICAL2>>$10
     sta return+3
     jmp breturn
-  //SEG475 [251] phi from get_plane::@38 to get_plane::@return [phi:get_plane::@38->get_plane::@return]
-  breturn_from_b38:
-  //SEG476 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_CHARSET8#0 [phi:get_plane::@38->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG459 [251] phi from get_plane::@12 to get_plane::@return [phi:get_plane::@12->get_plane::@return]
+  breturn_from_b12:
+  //SEG460 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_CHARSET8#0 [phi:get_plane::@12->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_CHARSET8
     sta return
     lda #>PLANE_CHARSET8
@@ -22455,9 +22520,9 @@ get_plane: {
     lda #>PLANE_CHARSET8>>$10
     sta return+3
     jmp breturn
-  //SEG477 [251] phi from get_plane::@39 to get_plane::@return [phi:get_plane::@39->get_plane::@return]
-  breturn_from_b39:
-  //SEG478 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_BLANK#0 [phi:get_plane::@39->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG461 [251] phi from get_plane::@13 to get_plane::@return [phi:get_plane::@13->get_plane::@return]
+  breturn_from_b13:
+  //SEG462 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_BLANK#0 [phi:get_plane::@13->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_BLANK
     sta return
     lda #>PLANE_BLANK
@@ -22467,16 +22532,112 @@ get_plane: {
     lda #>PLANE_BLANK>>$10
     sta return+3
     jmp breturn
+  //SEG463 [251] phi from get_plane::@2 to get_plane::@return [phi:get_plane::@2->get_plane::@return]
+  breturn_from_b2:
+  //SEG464 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN1#0 [phi:get_plane::@2->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_SCREEN1
+    sta return
+    lda #>$ffffffff&VIC_SCREEN1
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN1>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN1>>$10
+    sta return+3
+    jmp breturn
+  //SEG465 [251] phi from get_plane::@3 to get_plane::@return [phi:get_plane::@3->get_plane::@return]
+  breturn_from_b3:
+  //SEG466 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN2#0 [phi:get_plane::@3->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_SCREEN2
+    sta return
+    lda #>$ffffffff&VIC_SCREEN2
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN2>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN2>>$10
+    sta return+3
+    jmp breturn
+  //SEG467 [251] phi from get_plane::@4 to get_plane::@return [phi:get_plane::@4->get_plane::@return]
+  breturn_from_b4:
+  //SEG468 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN3#0 [phi:get_plane::@4->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_SCREEN3
+    sta return
+    lda #>$ffffffff&VIC_SCREEN3
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN3>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN3>>$10
+    sta return+3
+    jmp breturn
+  //SEG469 [251] phi from get_plane::@5 to get_plane::@return [phi:get_plane::@5->get_plane::@return]
+  breturn_from_b5:
+  //SEG470 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_BITMAP#0 [phi:get_plane::@5->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_BITMAP
+    sta return
+    lda #>$ffffffff&VIC_BITMAP
+    sta return+1
+    lda #<$ffffffff&VIC_BITMAP>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_BITMAP>>$10
+    sta return+3
+    jmp breturn
+  //SEG471 [251] phi from get_plane::@6 to get_plane::@return [phi:get_plane::@6->get_plane::@return]
+  breturn_from_b6:
+  //SEG472 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_CHARSET_ROM#0 [phi:get_plane::@6->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_CHARSET_ROM
+    sta return
+    lda #>$ffffffff&VIC_CHARSET_ROM
+    sta return+1
+    lda #<$ffffffff&VIC_CHARSET_ROM>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_CHARSET_ROM>>$10
+    sta return+3
+    jmp breturn
+  //SEG473 [251] phi from get_plane::@7 to get_plane::@return [phi:get_plane::@7->get_plane::@return]
+  breturn_from_b7:
+  //SEG474 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_8BPP_CHUNKY#0 [phi:get_plane::@7->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<PLANE_8BPP_CHUNKY
+    sta return
+    lda #>PLANE_8BPP_CHUNKY
+    sta return+1
+    lda #<PLANE_8BPP_CHUNKY>>$10
+    sta return+2
+    lda #>PLANE_8BPP_CHUNKY>>$10
+    sta return+3
+    jmp breturn
+  //SEG475 [251] phi from get_plane::@8 to get_plane::@return [phi:get_plane::@8->get_plane::@return]
+  breturn_from_b8:
+  //SEG476 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL#0 [phi:get_plane::@8->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<PLANE_HORISONTAL
+    sta return
+    lda #>PLANE_HORISONTAL
+    sta return+1
+    lda #<PLANE_HORISONTAL>>$10
+    sta return+2
+    lda #>PLANE_HORISONTAL>>$10
+    sta return+3
+    jmp breturn
+  //SEG477 [251] phi from get_plane::@9 to get_plane::@return [phi:get_plane::@9->get_plane::@return]
+  breturn_from_b9:
+  //SEG478 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL#0 [phi:get_plane::@9->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<PLANE_VERTICAL
+    sta return
+    lda #>PLANE_VERTICAL
+    sta return+1
+    lda #<PLANE_VERTICAL>>$10
+    sta return+2
+    lda #>PLANE_VERTICAL>>$10
+    sta return+3
+    jmp breturn
   //SEG479 get_plane::@return
   breturn:
   //SEG480 [252] return 
     rts
-  //SEG481 [253] phi from get_plane::@40 to get_plane::@27 [phi:get_plane::@40->get_plane::@27]
-  b27_from_b40:
-    jmp b27
-  //SEG482 get_plane::@27
-  b27:
-    jmp breturn_from_b27
+  //SEG481 [253] phi from get_plane::@14 to get_plane::@1 [phi:get_plane::@14->get_plane::@1]
+  b1_from_b14:
+    jmp b1
+  //SEG482 get_plane::@1
+  b1:
+    jmp breturn_from_b1
 }
 //SEG483 form_mode
 // Show the form - and let the user change values
@@ -22491,93 +22652,93 @@ form_mode: {
     lda #>COLS
     sta print_set_screen.screen+1
     jsr print_set_screen
-  //SEG487 [256] phi from form_mode to form_mode::@21 [phi:form_mode->form_mode::@21]
-  b21_from_form_mode:
-    jmp b21
-  //SEG488 form_mode::@21
-  b21:
+  //SEG487 [256] phi from form_mode to form_mode::@8 [phi:form_mode->form_mode::@8]
+  b8_from_form_mode:
+    jmp b8
+  //SEG488 form_mode::@8
+  b8:
   //SEG489 [257] call print_cls 
     jsr print_cls
-  //SEG490 [258] phi from form_mode::@21 to form_mode::@22 [phi:form_mode::@21->form_mode::@22]
-  b22_from_b21:
-    jmp b22
-  //SEG491 form_mode::@22
-  b22:
+  //SEG490 [258] phi from form_mode::@8 to form_mode::@9 [phi:form_mode::@8->form_mode::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG491 form_mode::@9
+  b9:
   //SEG492 [259] call print_str_lines 
-  //SEG493 [419] phi from form_mode::@22 to print_str_lines [phi:form_mode::@22->print_str_lines]
-  print_str_lines_from_b22:
-  //SEG494 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_COLS#0 [phi:form_mode::@22->print_str_lines#0] -- pbuz1=pbuc1 
+  //SEG493 [419] phi from form_mode::@9 to print_str_lines [phi:form_mode::@9->print_str_lines]
+  print_str_lines_from_b9:
+  //SEG494 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_COLS#0 [phi:form_mode::@9->print_str_lines#0] -- pbuz1=pbuc1 
     lda #<FORM_COLS
     sta print_str_lines.str
     lda #>FORM_COLS
     sta print_str_lines.str+1
     jsr print_str_lines
-  //SEG495 [260] phi from form_mode::@22 to form_mode::@23 [phi:form_mode::@22->form_mode::@23]
-  b23_from_b22:
-    jmp b23
-  //SEG496 form_mode::@23
-  b23:
+  //SEG495 [260] phi from form_mode::@9 to form_mode::@10 [phi:form_mode::@9->form_mode::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG496 form_mode::@10
+  b10:
   //SEG497 [261] call print_set_screen 
-  //SEG498 [447] phi from form_mode::@23 to print_set_screen [phi:form_mode::@23->print_set_screen]
-  print_set_screen_from_b23:
-  //SEG499 [447] phi (byte*) print_set_screen::screen#2 = (const byte*) FORM_SCREEN#0 [phi:form_mode::@23->print_set_screen#0] -- pbuz1=pbuc1 
+  //SEG498 [447] phi from form_mode::@10 to print_set_screen [phi:form_mode::@10->print_set_screen]
+  print_set_screen_from_b10:
+  //SEG499 [447] phi (byte*) print_set_screen::screen#2 = (const byte*) FORM_SCREEN#0 [phi:form_mode::@10->print_set_screen#0] -- pbuz1=pbuc1 
     lda #<FORM_SCREEN
     sta print_set_screen.screen
     lda #>FORM_SCREEN
     sta print_set_screen.screen+1
     jsr print_set_screen
-  //SEG500 [262] phi from form_mode::@23 to form_mode::@24 [phi:form_mode::@23->form_mode::@24]
-  b24_from_b23:
-    jmp b24
-  //SEG501 form_mode::@24
-  b24:
+  //SEG500 [262] phi from form_mode::@10 to form_mode::@11 [phi:form_mode::@10->form_mode::@11]
+  b11_from_b10:
+    jmp b11
+  //SEG501 form_mode::@11
+  b11:
   //SEG502 [263] call print_cls 
     jsr print_cls
-  //SEG503 [264] phi from form_mode::@24 to form_mode::@25 [phi:form_mode::@24->form_mode::@25]
-  b25_from_b24:
-    jmp b25
-  //SEG504 form_mode::@25
-  b25:
+  //SEG503 [264] phi from form_mode::@11 to form_mode::@12 [phi:form_mode::@11->form_mode::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG504 form_mode::@12
+  b12:
   //SEG505 [265] call print_str_lines 
-  //SEG506 [419] phi from form_mode::@25 to print_str_lines [phi:form_mode::@25->print_str_lines]
-  print_str_lines_from_b25:
-  //SEG507 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_TEXT#0 [phi:form_mode::@25->print_str_lines#0] -- pbuz1=pbuc1 
+  //SEG506 [419] phi from form_mode::@12 to print_str_lines [phi:form_mode::@12->print_str_lines]
+  print_str_lines_from_b12:
+  //SEG507 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_TEXT#0 [phi:form_mode::@12->print_str_lines#0] -- pbuz1=pbuc1 
     lda #<FORM_TEXT
     sta print_str_lines.str
     lda #>FORM_TEXT
     sta print_str_lines.str+1
     jsr print_str_lines
-  //SEG508 [266] phi from form_mode::@25 to form_mode::@26 [phi:form_mode::@25->form_mode::@26]
-  b26_from_b25:
-    jmp b26
-  //SEG509 form_mode::@26
-  b26:
+  //SEG508 [266] phi from form_mode::@12 to form_mode::@13 [phi:form_mode::@12->form_mode::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG509 form_mode::@13
+  b13:
   //SEG510 [267] call form_set_screen 
-  //SEG511 [409] phi from form_mode::@26 to form_set_screen [phi:form_mode::@26->form_set_screen]
-  form_set_screen_from_b26:
+  //SEG511 [409] phi from form_mode::@13 to form_set_screen [phi:form_mode::@13->form_set_screen]
+  form_set_screen_from_b13:
     jsr form_set_screen
-  //SEG512 [268] phi from form_mode::@26 to form_mode::@27 [phi:form_mode::@26->form_mode::@27]
-  b27_from_b26:
-    jmp b27
-  //SEG513 form_mode::@27
-  b27:
+  //SEG512 [268] phi from form_mode::@13 to form_mode::@14 [phi:form_mode::@13->form_mode::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG513 form_mode::@14
+  b14:
   //SEG514 [269] call form_render_values 
-  //SEG515 [330] phi from form_mode::@27 to form_render_values [phi:form_mode::@27->form_render_values]
-  form_render_values_from_b27:
+  //SEG515 [330] phi from form_mode::@14 to form_render_values [phi:form_mode::@14->form_render_values]
+  form_render_values_from_b14:
     jsr form_render_values
-    jmp b28
-  //SEG516 form_mode::@28
-  b28:
+    jmp b15
+  //SEG516 form_mode::@15
+  b15:
   //SEG517 [270] (byte) render_preset_name::idx#0 ← *((const byte[]) form_fields_val#0) -- vbuaa=_deref_pbuc1 
     lda form_fields_val
   //SEG518 [271] call render_preset_name 
-  //SEG519 [306] phi from form_mode::@28 to render_preset_name [phi:form_mode::@28->render_preset_name]
-  render_preset_name_from_b28:
-  //SEG520 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#0 [phi:form_mode::@28->render_preset_name#0] -- register_copy 
+  //SEG519 [306] phi from form_mode::@15 to render_preset_name [phi:form_mode::@15->render_preset_name]
+  render_preset_name_from_b15:
+  //SEG520 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#0 [phi:form_mode::@15->render_preset_name#0] -- register_copy 
     jsr render_preset_name
-    jmp b29
-  //SEG521 form_mode::@29
-  b29:
+    jmp b16
+  //SEG521 form_mode::@16
+  b16:
   //SEG522 [272] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) FORM_CHARSET#0/(dword/signed dword) $10000 -- _deref_pbuc1=vbuc2 
     // DTV Graphics Bank
     lda #($ffffffff&FORM_CHARSET)/$10000
@@ -22623,29 +22784,29 @@ form_mode: {
   //SEG533 [283] *((const byte*) DTV_PLANEA_START_HI#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta DTV_PLANEA_START_HI
-  //SEG534 [284] phi from form_mode::@29 to form_mode::@7 [phi:form_mode::@29->form_mode::@7]
-  b7_from_b29:
-  //SEG535 [284] phi (byte) form_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_mode::@29->form_mode::@7#0] -- vbuxx=vbuc1 
+  //SEG534 [284] phi from form_mode::@16 to form_mode::@2 [phi:form_mode::@16->form_mode::@2]
+  b2_from_b16:
+  //SEG535 [284] phi (byte) form_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_mode::@16->form_mode::@2#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b7
+    jmp b2
   // DTV Palette - default
-  //SEG536 [284] phi from form_mode::@7 to form_mode::@7 [phi:form_mode::@7->form_mode::@7]
-  b7_from_b7:
-  //SEG537 [284] phi (byte) form_mode::i#2 = (byte) form_mode::i#1 [phi:form_mode::@7->form_mode::@7#0] -- register_copy 
-    jmp b7
-  //SEG538 form_mode::@7
-  b7:
+  //SEG536 [284] phi from form_mode::@2 to form_mode::@2 [phi:form_mode::@2->form_mode::@2]
+  b2_from_b2:
+  //SEG537 [284] phi (byte) form_mode::i#2 = (byte) form_mode::i#1 [phi:form_mode::@2->form_mode::@2#0] -- register_copy 
+    jmp b2
+  //SEG538 form_mode::@2
+  b2:
   //SEG539 [285] *((const byte*) DTV_PALETTE#0 + (byte) form_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) form_mode::i#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda DTV_PALETTE_DEFAULT,x
     sta DTV_PALETTE,x
   //SEG540 [286] (byte) form_mode::i#1 ← ++ (byte) form_mode::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG541 [287] if((byte) form_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto form_mode::@7 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG541 [287] if((byte) form_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto form_mode::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b7_from_b7
-    jmp b8
-  //SEG542 form_mode::@8
-  b8:
+    bne b2_from_b2
+    jmp b3
+  //SEG542 form_mode::@3
+  b3:
   //SEG543 [288] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Screen colors
     lda #0
@@ -22656,85 +22817,85 @@ form_mode: {
   //SEG545 [290] (byte) form_mode::preset_current#0 ← *((const byte[]) form_fields_val#0) -- vbuz1=_deref_pbuc1 
     lda form_fields_val
     sta preset_current
-  //SEG546 [291] phi from form_mode::@32 form_mode::@8 to form_mode::@1 [phi:form_mode::@32/form_mode::@8->form_mode::@1]
-  b1_from_b32:
-  b1_from_b8:
-  //SEG547 [291] phi (byte) form_mode::preset_current#7 = (byte) form_mode::preset_current#1 [phi:form_mode::@32/form_mode::@8->form_mode::@1#0] -- register_copy 
-  //SEG548 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@32/form_mode::@8->form_mode::@1#1] -- register_copy 
-  //SEG549 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@32/form_mode::@8->form_mode::@1#2] -- register_copy 
-  //SEG550 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@32/form_mode::@8->form_mode::@1#3] -- register_copy 
+  //SEG546 [291] phi from form_mode::@19 form_mode::@3 to form_mode::@1 [phi:form_mode::@19/form_mode::@3->form_mode::@1]
+  b1_from_b19:
+  b1_from_b3:
+  //SEG547 [291] phi (byte) form_mode::preset_current#7 = (byte) form_mode::preset_current#1 [phi:form_mode::@19/form_mode::@3->form_mode::@1#0] -- register_copy 
+  //SEG548 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@19/form_mode::@3->form_mode::@1#1] -- register_copy 
+  //SEG549 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@19/form_mode::@3->form_mode::@1#2] -- register_copy 
+  //SEG550 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@19/form_mode::@3->form_mode::@1#3] -- register_copy 
     jmp b1
   // Let the user change values in the form
-  //SEG551 [291] phi from form_mode::@12 to form_mode::@1 [phi:form_mode::@12->form_mode::@1]
-  b1_from_b12:
-  //SEG552 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@12->form_mode::@1#0] -- register_copy 
-  //SEG553 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@12->form_mode::@1#1] -- register_copy 
-  //SEG554 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@12->form_mode::@1#2] -- register_copy 
+  //SEG551 [291] phi from form_mode::@6 to form_mode::@1 [phi:form_mode::@6->form_mode::@1]
+  b1_from_b6:
+  //SEG552 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@6->form_mode::@1#0] -- register_copy 
+  //SEG553 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@6->form_mode::@1#1] -- register_copy 
+  //SEG554 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@6->form_mode::@1#2] -- register_copy 
     jmp b1
   //SEG555 form_mode::@1
   b1:
-    jmp b9
-  //SEG556 form_mode::@9
-  b9:
-  //SEG557 [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@9 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b4
+  //SEG556 form_mode::@4
+  b4:
+  //SEG557 [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b9
-  //SEG558 [293] phi from form_mode::@9 to form_mode::@11 [phi:form_mode::@9->form_mode::@11]
-  b11_from_b9:
-    jmp b11
-  //SEG559 form_mode::@11
-  b11:
+    bne b4
+  //SEG558 [293] phi from form_mode::@4 to form_mode::@5 [phi:form_mode::@4->form_mode::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG559 form_mode::@5
+  b5:
   //SEG560 [294] call form_control 
     jsr form_control
   //SEG561 [295] (byte) form_control::return#0 ← (byte) form_control::return#2 -- vbuaa=vbuxx 
     txa
-    jmp b30
-  //SEG562 form_mode::@30
-  b30:
+    jmp b17
+  //SEG562 form_mode::@17
+  b17:
   //SEG563 [296] (byte~) form_mode::$36 ← (byte) form_control::return#0
-  //SEG564 [297] if((byte~) form_mode::$36==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_mode::@12 -- vbuaa_eq_0_then_la1 
+  //SEG564 [297] if((byte~) form_mode::$36==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_mode::@6 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b12
+    beq b6
     jmp breturn
   //SEG565 form_mode::@return
   breturn:
   //SEG566 [298] return 
     rts
-  //SEG567 form_mode::@12
-  b12:
+  //SEG567 form_mode::@6
+  b6:
   //SEG568 [299] if((byte) form_mode::preset_current#7==*((const byte[]) form_fields_val#0)) goto form_mode::@1 -- vbuz1_eq__deref_pbuc1_then_la1 
     lda form_fields_val
     cmp preset_current
-    beq b1_from_b12
-    jmp b19
-  //SEG569 form_mode::@19
-  b19:
+    beq b1_from_b6
+    jmp b7
+  //SEG569 form_mode::@7
+  b7:
   //SEG570 [300] (byte) apply_preset::idx#0 ← *((const byte[]) form_fields_val#0) -- vbuaa=_deref_pbuc1 
     lda form_fields_val
   //SEG571 [301] call apply_preset 
     jsr apply_preset
-    jmp b31
-  //SEG572 form_mode::@31
-  b31:
+    jmp b18
+  //SEG572 form_mode::@18
+  b18:
   //SEG573 [302] (byte) form_mode::preset_current#1 ← *((const byte[]) form_fields_val#0) -- vbuz1=_deref_pbuc1 
     lda form_fields_val
     sta preset_current
   //SEG574 [303] call form_render_values 
-  //SEG575 [330] phi from form_mode::@31 to form_render_values [phi:form_mode::@31->form_render_values]
-  form_render_values_from_b31:
+  //SEG575 [330] phi from form_mode::@18 to form_render_values [phi:form_mode::@18->form_render_values]
+  form_render_values_from_b18:
     jsr form_render_values
-    jmp b32
-  //SEG576 form_mode::@32
-  b32:
+    jmp b19
+  //SEG576 form_mode::@19
+  b19:
   //SEG577 [304] (byte) render_preset_name::idx#1 ← *((const byte[]) form_fields_val#0) -- vbuaa=_deref_pbuc1 
     lda form_fields_val
   //SEG578 [305] call render_preset_name 
-  //SEG579 [306] phi from form_mode::@32 to render_preset_name [phi:form_mode::@32->render_preset_name]
-  render_preset_name_from_b32:
-  //SEG580 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#1 [phi:form_mode::@32->render_preset_name#0] -- register_copy 
+  //SEG579 [306] phi from form_mode::@19 to render_preset_name [phi:form_mode::@19->render_preset_name]
+  render_preset_name_from_b19:
+  //SEG580 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#1 [phi:form_mode::@19->render_preset_name#0] -- register_copy 
     jsr render_preset_name
-    jmp b1_from_b32
+    jmp b1_from_b19
 }
 //SEG581 render_preset_name
 // Render form preset name in the form
@@ -22742,169 +22903,169 @@ form_mode: {
 // render_preset_name(byte register(A) idx)
 render_preset_name: {
     .label name = 3
-  //SEG582 [307] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_preset_name::@22 -- vbuaa_eq_0_then_la1 
+  //SEG582 [307] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_preset_name::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b22_from_render_preset_name
-    jmp b23
-  //SEG583 render_preset_name::@23
-  b23:
-  //SEG584 [308] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_render_preset_name
+    jmp b2
+  //SEG583 render_preset_name::@2
+  b2:
+  //SEG584 [308] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #1
-    beq b22_from_b23
-    jmp b24
-  //SEG585 render_preset_name::@24
-  b24:
-  //SEG586 [309] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b2
+    jmp b3
+  //SEG585 render_preset_name::@3
+  b3:
+  //SEG586 [309] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #2
-    beq b22_from_b24
-    jmp b25
-  //SEG587 render_preset_name::@25
-  b25:
-  //SEG588 [310] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b3
+    jmp b4
+  //SEG587 render_preset_name::@4
+  b4:
+  //SEG588 [310] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #3
-    beq b22_from_b25
-    jmp b26
-  //SEG589 render_preset_name::@26
-  b26:
-  //SEG590 [311] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b4
+    jmp b5
+  //SEG589 render_preset_name::@5
+  b5:
+  //SEG590 [311] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #4
-    beq b22_from_b26
-    jmp b27
-  //SEG591 render_preset_name::@27
-  b27:
-  //SEG592 [312] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b5
+    jmp b6
+  //SEG591 render_preset_name::@6
+  b6:
+  //SEG592 [312] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #5
-    beq b22_from_b27
-    jmp b28
-  //SEG593 render_preset_name::@28
-  b28:
-  //SEG594 [313] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b6
+    jmp b7
+  //SEG593 render_preset_name::@7
+  b7:
+  //SEG594 [313] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #6
-    beq b22_from_b28
-    jmp b29
-  //SEG595 render_preset_name::@29
-  b29:
-  //SEG596 [314] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b7
+    jmp b8
+  //SEG595 render_preset_name::@8
+  b8:
+  //SEG596 [314] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #7
-    beq b22_from_b29
-    jmp b30
-  //SEG597 render_preset_name::@30
-  b30:
-  //SEG598 [315] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b8
+    jmp b9
+  //SEG597 render_preset_name::@9
+  b9:
+  //SEG598 [315] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #8
-    beq b22_from_b30
-    jmp b31
-  //SEG599 render_preset_name::@31
-  b31:
-  //SEG600 [316] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b9
+    jmp b10
+  //SEG599 render_preset_name::@10
+  b10:
+  //SEG600 [316] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #9
-    beq b22_from_b31
-    jmp b32
-  //SEG601 render_preset_name::@32
-  b32:
-  //SEG602 [317] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b10
+    jmp b11
+  //SEG601 render_preset_name::@11
+  b11:
+  //SEG602 [317] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #$a
-    beq b22_from_b32
-  //SEG603 [318] phi from render_preset_name::@32 to render_preset_name::@33 [phi:render_preset_name::@32->render_preset_name::@33]
-  b33_from_b32:
-    jmp b33
-  //SEG604 render_preset_name::@33
-  b33:
-  //SEG605 [319] phi from render_preset_name render_preset_name::@33 to render_preset_name::@22 [phi:render_preset_name/render_preset_name::@33->render_preset_name::@22]
-  b22_from_render_preset_name:
-  b22_from_b33:
-  //SEG606 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#1 [phi:render_preset_name/render_preset_name::@33->render_preset_name::@22#0] -- pbuz1=pbuc1 
+    beq b1_from_b11
+  //SEG603 [318] phi from render_preset_name::@11 to render_preset_name::@12 [phi:render_preset_name::@11->render_preset_name::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG604 render_preset_name::@12
+  b12:
+  //SEG605 [319] phi from render_preset_name render_preset_name::@12 to render_preset_name::@1 [phi:render_preset_name/render_preset_name::@12->render_preset_name::@1]
+  b1_from_render_preset_name:
+  b1_from_b12:
+  //SEG606 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#1 [phi:render_preset_name/render_preset_name::@12->render_preset_name::@1#0] -- pbuz1=pbuc1 
     lda #<name_1
     sta name
     lda #>name_1
     sta name+1
-    jmp b22
-  //SEG607 [319] phi from render_preset_name::@23 to render_preset_name::@22 [phi:render_preset_name::@23->render_preset_name::@22]
-  b22_from_b23:
-  //SEG608 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#2 [phi:render_preset_name::@23->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_2
-    sta name
-    lda #>name_2
-    sta name+1
-    jmp b22
-  //SEG609 [319] phi from render_preset_name::@24 to render_preset_name::@22 [phi:render_preset_name::@24->render_preset_name::@22]
-  b22_from_b24:
-  //SEG610 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#3 [phi:render_preset_name::@24->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_3
-    sta name
-    lda #>name_3
-    sta name+1
-    jmp b22
-  //SEG611 [319] phi from render_preset_name::@25 to render_preset_name::@22 [phi:render_preset_name::@25->render_preset_name::@22]
-  b22_from_b25:
-  //SEG612 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#4 [phi:render_preset_name::@25->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_4
-    sta name
-    lda #>name_4
-    sta name+1
-    jmp b22
-  //SEG613 [319] phi from render_preset_name::@26 to render_preset_name::@22 [phi:render_preset_name::@26->render_preset_name::@22]
-  b22_from_b26:
-  //SEG614 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#5 [phi:render_preset_name::@26->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_5
-    sta name
-    lda #>name_5
-    sta name+1
-    jmp b22
-  //SEG615 [319] phi from render_preset_name::@27 to render_preset_name::@22 [phi:render_preset_name::@27->render_preset_name::@22]
-  b22_from_b27:
-  //SEG616 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#6 [phi:render_preset_name::@27->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_6
-    sta name
-    lda #>name_6
-    sta name+1
-    jmp b22
-  //SEG617 [319] phi from render_preset_name::@28 to render_preset_name::@22 [phi:render_preset_name::@28->render_preset_name::@22]
-  b22_from_b28:
-  //SEG618 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#7 [phi:render_preset_name::@28->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_7
-    sta name
-    lda #>name_7
-    sta name+1
-    jmp b22
-  //SEG619 [319] phi from render_preset_name::@29 to render_preset_name::@22 [phi:render_preset_name::@29->render_preset_name::@22]
-  b22_from_b29:
-  //SEG620 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#8 [phi:render_preset_name::@29->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_8
-    sta name
-    lda #>name_8
-    sta name+1
-    jmp b22
-  //SEG621 [319] phi from render_preset_name::@30 to render_preset_name::@22 [phi:render_preset_name::@30->render_preset_name::@22]
-  b22_from_b30:
-  //SEG622 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#9 [phi:render_preset_name::@30->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_9
-    sta name
-    lda #>name_9
-    sta name+1
-    jmp b22
-  //SEG623 [319] phi from render_preset_name::@31 to render_preset_name::@22 [phi:render_preset_name::@31->render_preset_name::@22]
-  b22_from_b31:
-  //SEG624 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#10 [phi:render_preset_name::@31->render_preset_name::@22#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG607 [319] phi from render_preset_name::@10 to render_preset_name::@1 [phi:render_preset_name::@10->render_preset_name::@1]
+  b1_from_b10:
+  //SEG608 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#10 [phi:render_preset_name::@10->render_preset_name::@1#0] -- pbuz1=pbuc1 
     lda #<name_10
     sta name
     lda #>name_10
     sta name+1
-    jmp b22
-  //SEG625 [319] phi from render_preset_name::@32 to render_preset_name::@22 [phi:render_preset_name::@32->render_preset_name::@22]
-  b22_from_b32:
-  //SEG626 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#11 [phi:render_preset_name::@32->render_preset_name::@22#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG609 [319] phi from render_preset_name::@11 to render_preset_name::@1 [phi:render_preset_name::@11->render_preset_name::@1]
+  b1_from_b11:
+  //SEG610 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#11 [phi:render_preset_name::@11->render_preset_name::@1#0] -- pbuz1=pbuc1 
     lda #<name_11
     sta name
     lda #>name_11
     sta name+1
-    jmp b22
-  //SEG627 render_preset_name::@22
-  b22:
+    jmp b1
+  //SEG611 [319] phi from render_preset_name::@2 to render_preset_name::@1 [phi:render_preset_name::@2->render_preset_name::@1]
+  b1_from_b2:
+  //SEG612 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#2 [phi:render_preset_name::@2->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_2
+    sta name
+    lda #>name_2
+    sta name+1
+    jmp b1
+  //SEG613 [319] phi from render_preset_name::@3 to render_preset_name::@1 [phi:render_preset_name::@3->render_preset_name::@1]
+  b1_from_b3:
+  //SEG614 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#3 [phi:render_preset_name::@3->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_3
+    sta name
+    lda #>name_3
+    sta name+1
+    jmp b1
+  //SEG615 [319] phi from render_preset_name::@4 to render_preset_name::@1 [phi:render_preset_name::@4->render_preset_name::@1]
+  b1_from_b4:
+  //SEG616 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#4 [phi:render_preset_name::@4->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_4
+    sta name
+    lda #>name_4
+    sta name+1
+    jmp b1
+  //SEG617 [319] phi from render_preset_name::@5 to render_preset_name::@1 [phi:render_preset_name::@5->render_preset_name::@1]
+  b1_from_b5:
+  //SEG618 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#5 [phi:render_preset_name::@5->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_5
+    sta name
+    lda #>name_5
+    sta name+1
+    jmp b1
+  //SEG619 [319] phi from render_preset_name::@6 to render_preset_name::@1 [phi:render_preset_name::@6->render_preset_name::@1]
+  b1_from_b6:
+  //SEG620 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#6 [phi:render_preset_name::@6->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_6
+    sta name
+    lda #>name_6
+    sta name+1
+    jmp b1
+  //SEG621 [319] phi from render_preset_name::@7 to render_preset_name::@1 [phi:render_preset_name::@7->render_preset_name::@1]
+  b1_from_b7:
+  //SEG622 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#7 [phi:render_preset_name::@7->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_7
+    sta name
+    lda #>name_7
+    sta name+1
+    jmp b1
+  //SEG623 [319] phi from render_preset_name::@8 to render_preset_name::@1 [phi:render_preset_name::@8->render_preset_name::@1]
+  b1_from_b8:
+  //SEG624 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#8 [phi:render_preset_name::@8->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_8
+    sta name
+    lda #>name_8
+    sta name+1
+    jmp b1
+  //SEG625 [319] phi from render_preset_name::@9 to render_preset_name::@1 [phi:render_preset_name::@9->render_preset_name::@1]
+  b1_from_b9:
+  //SEG626 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#9 [phi:render_preset_name::@9->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_9
+    sta name
+    lda #>name_9
+    sta name+1
+    jmp b1
+  //SEG627 render_preset_name::@1
+  b1:
   //SEG628 [320] (byte*) print_str_at::str#1 ← (byte*) render_preset_name::name#13
   //SEG629 [321] call print_str_at 
-  //SEG630 [323] phi from render_preset_name::@22 to print_str_at [phi:render_preset_name::@22->print_str_at]
-  print_str_at_from_b22:
+  //SEG630 [323] phi from render_preset_name::@1 to print_str_at [phi:render_preset_name::@1->print_str_at]
+  print_str_at_from_b1:
     jsr print_str_at
     jmp breturn
   //SEG631 render_preset_name::@return
@@ -22984,9 +23145,9 @@ form_render_values: {
     lda #0
     sta idx
     jmp b1
-  //SEG651 [331] phi from form_render_values::@3 to form_render_values::@1 [phi:form_render_values::@3->form_render_values::@1]
-  b1_from_b3:
-  //SEG652 [331] phi (byte) form_render_values::idx#2 = (byte) form_render_values::idx#1 [phi:form_render_values::@3->form_render_values::@1#0] -- register_copy 
+  //SEG651 [331] phi from form_render_values::@2 to form_render_values::@1 [phi:form_render_values::@2->form_render_values::@1]
+  b1_from_b2:
+  //SEG652 [331] phi (byte) form_render_values::idx#2 = (byte) form_render_values::idx#1 [phi:form_render_values::@2->form_render_values::@1#0] -- register_copy 
     jmp b1
   //SEG653 form_render_values::@1
   b1:
@@ -22998,9 +23159,9 @@ form_render_values: {
   //SEG657 [340] phi (byte) form_field_ptr::field_idx#2 = (byte) form_field_ptr::field_idx#0 [phi:form_render_values::@1->form_field_ptr#0] -- register_copy 
     jsr form_field_ptr
   //SEG658 [334] (byte*) form_field_ptr::return#2 ← (byte*) form_field_ptr::return#0
-    jmp b3
-  //SEG659 form_render_values::@3
-  b3:
+    jmp b2
+  //SEG659 form_render_values::@2
+  b2:
   //SEG660 [335] (byte*) form_render_values::field#0 ← (byte*) form_field_ptr::return#2
   //SEG661 [336] *((byte*) form_render_values::field#0) ← *((const byte[]) print_hextab#0 + *((const byte[]) form_fields_val#0 + (byte) form_render_values::idx#2)) -- _deref_pbuz1=pbuc1_derefidx_pbuc2_derefidx_vbuz2 
     ldx idx
@@ -23013,7 +23174,7 @@ form_render_values: {
   //SEG663 [338] if((byte) form_render_values::idx#1<(const byte) form_fields_cnt#0) goto form_render_values::@1 -- vbuz1_lt_vbuc1_then_la1 
     lda idx
     cmp #form_fields_cnt
-    bcc b1_from_b3
+    bcc b1_from_b2
     jmp breturn
   //SEG664 form_render_values::@return
   breturn:
@@ -23055,185 +23216,185 @@ form_field_ptr: {
 // apply_preset(byte register(A) idx)
 apply_preset: {
     .label preset = 3
-  //SEG674 [346] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto apply_preset::@22 -- vbuaa_eq_0_then_la1 
+  //SEG674 [346] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto apply_preset::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b22_from_apply_preset
-    jmp b23
-  //SEG675 apply_preset::@23
-  b23:
-  //SEG676 [347] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_apply_preset
+    jmp b2
+  //SEG675 apply_preset::@2
+  b2:
+  //SEG676 [347] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #1
-    beq b22_from_b23
-    jmp b24
-  //SEG677 apply_preset::@24
-  b24:
-  //SEG678 [348] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b2
+    jmp b3
+  //SEG677 apply_preset::@3
+  b3:
+  //SEG678 [348] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #2
-    beq b22_from_b24
-    jmp b25
-  //SEG679 apply_preset::@25
-  b25:
-  //SEG680 [349] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b3
+    jmp b4
+  //SEG679 apply_preset::@4
+  b4:
+  //SEG680 [349] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #3
-    beq b22_from_b25
-    jmp b26
-  //SEG681 apply_preset::@26
-  b26:
-  //SEG682 [350] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b4
+    jmp b5
+  //SEG681 apply_preset::@5
+  b5:
+  //SEG682 [350] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #4
-    beq b22_from_b26
-    jmp b27
-  //SEG683 apply_preset::@27
-  b27:
-  //SEG684 [351] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 5) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b5
+    jmp b6
+  //SEG683 apply_preset::@6
+  b6:
+  //SEG684 [351] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 5) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #5
-    beq b22_from_b27
-    jmp b28
-  //SEG685 apply_preset::@28
-  b28:
-  //SEG686 [352] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 6) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b6
+    jmp b7
+  //SEG685 apply_preset::@7
+  b7:
+  //SEG686 [352] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 6) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #6
-    beq b22_from_b28
-    jmp b29
-  //SEG687 apply_preset::@29
-  b29:
-  //SEG688 [353] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 7) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b7
+    jmp b8
+  //SEG687 apply_preset::@8
+  b8:
+  //SEG688 [353] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 7) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #7
-    beq b22_from_b29
-    jmp b30
-  //SEG689 apply_preset::@30
-  b30:
-  //SEG690 [354] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 8) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b8
+    jmp b9
+  //SEG689 apply_preset::@9
+  b9:
+  //SEG690 [354] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 8) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #8
-    beq b22_from_b30
-    jmp b31
-  //SEG691 apply_preset::@31
-  b31:
-  //SEG692 [355] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 9) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b9
+    jmp b10
+  //SEG691 apply_preset::@10
+  b10:
+  //SEG692 [355] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 9) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #9
-    beq b22_from_b31
-    jmp b32
-  //SEG693 apply_preset::@32
-  b32:
-  //SEG694 [356] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) $a) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b1_from_b10
+    jmp b11
+  //SEG693 apply_preset::@11
+  b11:
+  //SEG694 [356] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) $a) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #$a
-    beq b22_from_b32
-  //SEG695 [357] phi from apply_preset::@32 to apply_preset::@33 [phi:apply_preset::@32->apply_preset::@33]
-  b33_from_b32:
-    jmp b33
-  //SEG696 apply_preset::@33
-  b33:
-  //SEG697 [358] phi from apply_preset apply_preset::@33 to apply_preset::@22 [phi:apply_preset/apply_preset::@33->apply_preset::@22]
-  b22_from_apply_preset:
-  b22_from_b33:
-  //SEG698 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdchar#0 [phi:apply_preset/apply_preset::@33->apply_preset::@22#0] -- pbuz1=pbuc1 
+    beq b1_from_b11
+  //SEG695 [357] phi from apply_preset::@11 to apply_preset::@12 [phi:apply_preset::@11->apply_preset::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG696 apply_preset::@12
+  b12:
+  //SEG697 [358] phi from apply_preset apply_preset::@12 to apply_preset::@1 [phi:apply_preset/apply_preset::@12->apply_preset::@1]
+  b1_from_apply_preset:
+  b1_from_b12:
+  //SEG698 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdchar#0 [phi:apply_preset/apply_preset::@12->apply_preset::@1#0] -- pbuz1=pbuc1 
     lda #<preset_stdchar
     sta preset
     lda #>preset_stdchar
     sta preset+1
-    jmp b22
-  //SEG699 [358] phi from apply_preset::@23 to apply_preset::@22 [phi:apply_preset::@23->apply_preset::@22]
-  b22_from_b23:
-  //SEG700 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_ecmchar#0 [phi:apply_preset::@23->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_ecmchar
-    sta preset
-    lda #>preset_ecmchar
-    sta preset+1
-    jmp b22
-  //SEG701 [358] phi from apply_preset::@24 to apply_preset::@22 [phi:apply_preset::@24->apply_preset::@22]
-  b22_from_b24:
-  //SEG702 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdbm#0 [phi:apply_preset::@24->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_stdbm
-    sta preset
-    lda #>preset_stdbm
-    sta preset+1
-    jmp b22
-  //SEG703 [358] phi from apply_preset::@25 to apply_preset::@22 [phi:apply_preset::@25->apply_preset::@22]
-  b22_from_b25:
-  //SEG704 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_mcbm#0 [phi:apply_preset::@25->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_mcbm
-    sta preset
-    lda #>preset_mcbm
-    sta preset+1
-    jmp b22
-  //SEG705 [358] phi from apply_preset::@26 to apply_preset::@22 [phi:apply_preset::@26->apply_preset::@22]
-  b22_from_b26:
-  //SEG706 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_stdchar#0 [phi:apply_preset::@26->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_hi_stdchar
-    sta preset
-    lda #>preset_hi_stdchar
-    sta preset+1
-    jmp b22
-  //SEG707 [358] phi from apply_preset::@27 to apply_preset::@22 [phi:apply_preset::@27->apply_preset::@22]
-  b22_from_b27:
-  //SEG708 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_ecmchar#0 [phi:apply_preset::@27->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_hi_ecmchar
-    sta preset
-    lda #>preset_hi_ecmchar
-    sta preset+1
-    jmp b22
-  //SEG709 [358] phi from apply_preset::@28 to apply_preset::@22 [phi:apply_preset::@28->apply_preset::@22]
-  b22_from_b28:
-  //SEG710 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_twoplane#0 [phi:apply_preset::@28->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_twoplane
-    sta preset
-    lda #>preset_twoplane
-    sta preset+1
-    jmp b22
-  //SEG711 [358] phi from apply_preset::@29 to apply_preset::@22 [phi:apply_preset::@29->apply_preset::@22]
-  b22_from_b29:
-  //SEG712 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_chunky#0 [phi:apply_preset::@29->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_chunky
-    sta preset
-    lda #>preset_chunky
-    sta preset+1
-    jmp b22
-  //SEG713 [358] phi from apply_preset::@30 to apply_preset::@22 [phi:apply_preset::@30->apply_preset::@22]
-  b22_from_b30:
-  //SEG714 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred#0 [phi:apply_preset::@30->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_sixsfred
-    sta preset
-    lda #>preset_sixsfred
-    sta preset+1
-    jmp b22
-  //SEG715 [358] phi from apply_preset::@31 to apply_preset::@22 [phi:apply_preset::@31->apply_preset::@22]
-  b22_from_b31:
-  //SEG716 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred2#0 [phi:apply_preset::@31->apply_preset::@22#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG699 [358] phi from apply_preset::@10 to apply_preset::@1 [phi:apply_preset::@10->apply_preset::@1]
+  b1_from_b10:
+  //SEG700 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred2#0 [phi:apply_preset::@10->apply_preset::@1#0] -- pbuz1=pbuc1 
     lda #<preset_sixsfred2
     sta preset
     lda #>preset_sixsfred2
     sta preset+1
-    jmp b22
-  //SEG717 [358] phi from apply_preset::@32 to apply_preset::@22 [phi:apply_preset::@32->apply_preset::@22]
-  b22_from_b32:
-  //SEG718 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_8bpppixelcell#0 [phi:apply_preset::@32->apply_preset::@22#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG701 [358] phi from apply_preset::@11 to apply_preset::@1 [phi:apply_preset::@11->apply_preset::@1]
+  b1_from_b11:
+  //SEG702 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_8bpppixelcell#0 [phi:apply_preset::@11->apply_preset::@1#0] -- pbuz1=pbuc1 
     lda #<preset_8bpppixelcell
     sta preset
     lda #>preset_8bpppixelcell
     sta preset+1
-    jmp b22
-  //SEG719 apply_preset::@22
-  b22:
-  //SEG720 [359] phi from apply_preset::@22 to apply_preset::@45 [phi:apply_preset::@22->apply_preset::@45]
-  b45_from_b22:
-  //SEG721 [359] phi (byte) apply_preset::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:apply_preset::@22->apply_preset::@45#0] -- vbuyy=vbuc1 
+    jmp b1
+  //SEG703 [358] phi from apply_preset::@2 to apply_preset::@1 [phi:apply_preset::@2->apply_preset::@1]
+  b1_from_b2:
+  //SEG704 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_ecmchar#0 [phi:apply_preset::@2->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_ecmchar
+    sta preset
+    lda #>preset_ecmchar
+    sta preset+1
+    jmp b1
+  //SEG705 [358] phi from apply_preset::@3 to apply_preset::@1 [phi:apply_preset::@3->apply_preset::@1]
+  b1_from_b3:
+  //SEG706 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdbm#0 [phi:apply_preset::@3->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_stdbm
+    sta preset
+    lda #>preset_stdbm
+    sta preset+1
+    jmp b1
+  //SEG707 [358] phi from apply_preset::@4 to apply_preset::@1 [phi:apply_preset::@4->apply_preset::@1]
+  b1_from_b4:
+  //SEG708 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_mcbm#0 [phi:apply_preset::@4->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_mcbm
+    sta preset
+    lda #>preset_mcbm
+    sta preset+1
+    jmp b1
+  //SEG709 [358] phi from apply_preset::@5 to apply_preset::@1 [phi:apply_preset::@5->apply_preset::@1]
+  b1_from_b5:
+  //SEG710 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_stdchar#0 [phi:apply_preset::@5->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_hi_stdchar
+    sta preset
+    lda #>preset_hi_stdchar
+    sta preset+1
+    jmp b1
+  //SEG711 [358] phi from apply_preset::@6 to apply_preset::@1 [phi:apply_preset::@6->apply_preset::@1]
+  b1_from_b6:
+  //SEG712 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_ecmchar#0 [phi:apply_preset::@6->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_hi_ecmchar
+    sta preset
+    lda #>preset_hi_ecmchar
+    sta preset+1
+    jmp b1
+  //SEG713 [358] phi from apply_preset::@7 to apply_preset::@1 [phi:apply_preset::@7->apply_preset::@1]
+  b1_from_b7:
+  //SEG714 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_twoplane#0 [phi:apply_preset::@7->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_twoplane
+    sta preset
+    lda #>preset_twoplane
+    sta preset+1
+    jmp b1
+  //SEG715 [358] phi from apply_preset::@8 to apply_preset::@1 [phi:apply_preset::@8->apply_preset::@1]
+  b1_from_b8:
+  //SEG716 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_chunky#0 [phi:apply_preset::@8->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_chunky
+    sta preset
+    lda #>preset_chunky
+    sta preset+1
+    jmp b1
+  //SEG717 [358] phi from apply_preset::@9 to apply_preset::@1 [phi:apply_preset::@9->apply_preset::@1]
+  b1_from_b9:
+  //SEG718 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred#0 [phi:apply_preset::@9->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_sixsfred
+    sta preset
+    lda #>preset_sixsfred
+    sta preset+1
+    jmp b1
+  //SEG719 apply_preset::@1
+  b1:
+  //SEG720 [359] phi from apply_preset::@1 to apply_preset::@13 [phi:apply_preset::@1->apply_preset::@13]
+  b13_from_b1:
+  //SEG721 [359] phi (byte) apply_preset::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:apply_preset::@1->apply_preset::@13#0] -- vbuyy=vbuc1 
     ldy #0
-    jmp b45
+    jmp b13
   // Copy preset values into the fields
-  //SEG722 [359] phi from apply_preset::@45 to apply_preset::@45 [phi:apply_preset::@45->apply_preset::@45]
-  b45_from_b45:
-  //SEG723 [359] phi (byte) apply_preset::i#2 = (byte) apply_preset::i#1 [phi:apply_preset::@45->apply_preset::@45#0] -- register_copy 
-    jmp b45
-  //SEG724 apply_preset::@45
-  b45:
+  //SEG722 [359] phi from apply_preset::@13 to apply_preset::@13 [phi:apply_preset::@13->apply_preset::@13]
+  b13_from_b13:
+  //SEG723 [359] phi (byte) apply_preset::i#2 = (byte) apply_preset::i#1 [phi:apply_preset::@13->apply_preset::@13#0] -- register_copy 
+    jmp b13
+  //SEG724 apply_preset::@13
+  b13:
   //SEG725 [360] *((const byte[]) form_fields_val#0 + (byte) apply_preset::i#2) ← *((byte*) apply_preset::preset#14 + (byte) apply_preset::i#2) -- pbuc1_derefidx_vbuyy=pbuz1_derefidx_vbuyy 
     lda (preset),y
     sta form_fields_val,y
   //SEG726 [361] (byte) apply_preset::i#1 ← ++ (byte) apply_preset::i#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG727 [362] if((byte) apply_preset::i#1!=(const byte) form_fields_cnt#0) goto apply_preset::@45 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG727 [362] if((byte) apply_preset::i#1!=(const byte) form_fields_cnt#0) goto apply_preset::@13 -- vbuyy_neq_vbuc1_then_la1 
     cpy #form_fields_cnt
-    bne b45_from_b45
+    bne b13_from_b13
     jmp breturn
   //SEG728 apply_preset::@return
   breturn:
@@ -23253,19 +23414,19 @@ form_control: {
   //SEG734 [340] phi (byte) form_field_ptr::field_idx#2 = (byte) form_field_ptr::field_idx#1 [phi:form_control->form_field_ptr#0] -- register_copy 
     jsr form_field_ptr
   //SEG735 [366] (byte*) form_field_ptr::return#3 ← (byte*) form_field_ptr::return#0
-    jmp b33
-  //SEG736 form_control::@33
-  b33:
+    jmp b17
+  //SEG736 form_control::@17
+  b17:
   //SEG737 [367] (byte*) form_control::field#0 ← (byte*) form_field_ptr::return#3
   //SEG738 [368] (signed byte) form_cursor_count#5 ← -- (signed byte) form_cursor_count#21 -- vbsz1=_dec_vbsz1 
     dec form_cursor_count
-  //SEG739 [369] if((signed byte) form_cursor_count#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@36 -- vbsz1_ge_0_then_la1 
+  //SEG739 [369] if((signed byte) form_cursor_count#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@20 -- vbsz1_ge_0_then_la1 
     lda form_cursor_count
     cmp #0
-    bpl b36_from_b33
-  //SEG740 [370] phi from form_control::@33 to form_control::@1 [phi:form_control::@33->form_control::@1]
-  b1_from_b33:
-  //SEG741 [370] phi (signed byte) form_cursor_count#15 = (const signed byte) FORM_CURSOR_BLINK#0 [phi:form_control::@33->form_control::@1#0] -- vbsz1=vbsc1 
+    bpl b20_from_b17
+  //SEG740 [370] phi from form_control::@17 to form_control::@1 [phi:form_control::@17->form_control::@1]
+  b1_from_b17:
+  //SEG741 [370] phi (signed byte) form_cursor_count#15 = (const signed byte) FORM_CURSOR_BLINK#0 [phi:form_control::@17->form_control::@1#0] -- vbsz1=vbsc1 
     lda #FORM_CURSOR_BLINK
     sta form_cursor_count
     jmp b1
@@ -23279,9 +23440,9 @@ form_control: {
     eor #$80
   !:
     bmi b2
-    jmp b8
-  //SEG744 form_control::@8
-  b8:
+    jmp b6
+  //SEG744 form_control::@6
+  b6:
   //SEG745 [372] (byte~) form_control::$13 ← *((byte*) form_control::field#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f -- vbuaa=_deref_pbuz1_band_vbuc1 
     lda #$7f
     ldy #0
@@ -23289,9 +23450,9 @@ form_control: {
   //SEG746 [373] *((byte*) form_control::field#0) ← (byte~) form_control::$13 -- _deref_pbuz1=vbuaa 
     ldy #0
     sta (field),y
-  //SEG747 [374] phi from form_control::@2 form_control::@8 to form_control::@3 [phi:form_control::@2/form_control::@8->form_control::@3]
+  //SEG747 [374] phi from form_control::@2 form_control::@6 to form_control::@3 [phi:form_control::@2/form_control::@6->form_control::@3]
   b3_from_b2:
-  b3_from_b8:
+  b3_from_b6:
     jmp b3
   //SEG748 form_control::@3
   b3:
@@ -23300,24 +23461,24 @@ form_control: {
   keyboard_event_scan_from_b3:
   //SEG751 [159] phi (byte) keyboard_events_size#110 = (byte) keyboard_events_size#47 [phi:form_control::@3->keyboard_event_scan#0] -- register_copy 
     jsr keyboard_event_scan
-  //SEG752 [376] phi from form_control::@3 to form_control::@34 [phi:form_control::@3->form_control::@34]
-  b34_from_b3:
-    jmp b34
-  //SEG753 form_control::@34
-  b34:
+  //SEG752 [376] phi from form_control::@3 to form_control::@18 [phi:form_control::@3->form_control::@18]
+  b18_from_b3:
+    jmp b18
+  //SEG753 form_control::@18
+  b18:
   //SEG754 [377] call keyboard_event_get 
     jsr keyboard_event_get
   //SEG755 [378] (byte) keyboard_event_get::return#4 ← (byte) keyboard_event_get::return#2
-    jmp b35
-  //SEG756 form_control::@35
-  b35:
+    jmp b19
+  //SEG756 form_control::@19
+  b19:
   //SEG757 [379] (byte) form_control::key_event#0 ← (byte) keyboard_event_get::return#4
   //SEG758 [380] if((byte) form_control::key_event#0!=(const byte) KEY_CRSR_DOWN#0) goto form_control::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_CRSR_DOWN
     bne b4
-    jmp b10
-  //SEG759 form_control::@10
-  b10:
+    jmp b7
+  //SEG759 form_control::@7
+  b7:
   //SEG760 [381] (byte~) form_control::$15 ← *((byte*) form_control::field#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f -- vbuaa=_deref_pbuz1_band_vbuc1 
     lda #$7f
     ldy #0
@@ -23329,104 +23490,104 @@ form_control: {
   //SEG762 [383] (byte~) form_control::$16 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #KEY_MODIFIER_SHIFT
-  //SEG763 [384] if((byte~) form_control::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@19 -- vbuaa_eq_0_then_la1 
+  //SEG763 [384] if((byte~) form_control::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@12 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b19
-    jmp b11
-  //SEG764 form_control::@11
-  b11:
+    beq b12
+    jmp b8
+  //SEG764 form_control::@8
+  b8:
   //SEG765 [385] (byte) form_field_idx#44 ← -- (byte) form_field_idx#28 -- vbuz1=_dec_vbuz1 
     dec form_field_idx
-  //SEG766 [386] if((byte) form_field_idx#44!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@37 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG766 [386] if((byte) form_field_idx#44!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@21 -- vbuz1_neq_vbuc1_then_la1 
     lda #$ff
     cmp form_field_idx
-    bne b37_from_b11
-  //SEG767 [387] phi from form_control::@11 to form_control::@22 [phi:form_control::@11->form_control::@22]
-  b22_from_b11:
-  //SEG768 [387] phi (byte) form_field_idx#31 = (const byte) form_fields_cnt#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:form_control::@11->form_control::@22#0] -- vbuz1=vbuc1 
+    bne b21_from_b8
+  //SEG767 [387] phi from form_control::@8 to form_control::@13 [phi:form_control::@8->form_control::@13]
+  b13_from_b8:
+  //SEG768 [387] phi (byte) form_field_idx#31 = (const byte) form_fields_cnt#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:form_control::@8->form_control::@13#0] -- vbuz1=vbuc1 
     lda #form_fields_cnt-1
     sta form_field_idx
-    jmp b22
-  //SEG769 form_control::@22
-  b22:
-  //SEG770 [388] phi from form_control::@22 to form_control::@return [phi:form_control::@22->form_control::@return]
-  breturn_from_b22:
-  //SEG771 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#31 [phi:form_control::@22->form_control::@return#0] -- register_copy 
-  //SEG772 [388] phi (signed byte) form_cursor_count#16 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:form_control::@22->form_control::@return#1] -- vbsz1=vbuc1 
+    jmp b13
+  //SEG769 form_control::@13
+  b13:
+  //SEG770 [388] phi from form_control::@13 to form_control::@return [phi:form_control::@13->form_control::@return]
+  breturn_from_b13:
+  //SEG771 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#31 [phi:form_control::@13->form_control::@return#0] -- register_copy 
+  //SEG772 [388] phi (signed byte) form_cursor_count#16 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:form_control::@13->form_control::@return#1] -- vbsz1=vbuc1 
     lda #FORM_CURSOR_BLINK/2
     sta form_cursor_count
-  //SEG773 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@22->form_control::@return#2] -- vbuxx=vbuc1 
+  //SEG773 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@13->form_control::@return#2] -- vbuxx=vbuc1 
     ldx #0
     jmp breturn
   //SEG774 form_control::@return
   breturn:
   //SEG775 [389] return 
     rts
-  //SEG776 [390] phi from form_control::@11 to form_control::@37 [phi:form_control::@11->form_control::@37]
-  b37_from_b11:
-    jmp b37
-  //SEG777 form_control::@37
-  b37:
-  //SEG778 [387] phi from form_control::@37 form_control::@38 to form_control::@22 [phi:form_control::@37/form_control::@38->form_control::@22]
-  b22_from_b37:
-  b22_from_b38:
-  //SEG779 [387] phi (byte) form_field_idx#31 = (byte) form_field_idx#44 [phi:form_control::@37/form_control::@38->form_control::@22#0] -- register_copy 
-    jmp b22
-  //SEG780 form_control::@19
-  b19:
+  //SEG776 [390] phi from form_control::@8 to form_control::@21 [phi:form_control::@8->form_control::@21]
+  b21_from_b8:
+    jmp b21
+  //SEG777 form_control::@21
+  b21:
+  //SEG778 [387] phi from form_control::@21 form_control::@22 to form_control::@13 [phi:form_control::@21/form_control::@22->form_control::@13]
+  b13_from_b21:
+  b13_from_b22:
+  //SEG779 [387] phi (byte) form_field_idx#31 = (byte) form_field_idx#44 [phi:form_control::@21/form_control::@22->form_control::@13#0] -- register_copy 
+    jmp b13
+  //SEG780 form_control::@12
+  b12:
   //SEG781 [391] (byte) form_field_idx#45 ← ++ (byte) form_field_idx#28 -- vbuz1=_inc_vbuz1 
     inc form_field_idx
-  //SEG782 [392] if((byte) form_field_idx#45!=(const byte) form_fields_cnt#0) goto form_control::@38 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG782 [392] if((byte) form_field_idx#45!=(const byte) form_fields_cnt#0) goto form_control::@22 -- vbuz1_neq_vbuc1_then_la1 
     lda #form_fields_cnt
     cmp form_field_idx
-    bne b38_from_b19
-  //SEG783 [387] phi from form_control::@19 to form_control::@22 [phi:form_control::@19->form_control::@22]
-  b22_from_b19:
-  //SEG784 [387] phi (byte) form_field_idx#31 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@19->form_control::@22#0] -- vbuz1=vbuc1 
+    bne b22_from_b12
+  //SEG783 [387] phi from form_control::@12 to form_control::@13 [phi:form_control::@12->form_control::@13]
+  b13_from_b12:
+  //SEG784 [387] phi (byte) form_field_idx#31 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@12->form_control::@13#0] -- vbuz1=vbuc1 
     lda #0
     sta form_field_idx
+    jmp b13
+  //SEG785 [393] phi from form_control::@12 to form_control::@22 [phi:form_control::@12->form_control::@22]
+  b22_from_b12:
     jmp b22
-  //SEG785 [393] phi from form_control::@19 to form_control::@38 [phi:form_control::@19->form_control::@38]
-  b38_from_b19:
-    jmp b38
-  //SEG786 form_control::@38
-  b38:
-    jmp b22_from_b38
+  //SEG786 form_control::@22
+  b22:
+    jmp b13_from_b22
   //SEG787 form_control::@4
   b4:
   //SEG788 [394] if((byte) form_control::key_event#0!=(const byte) KEY_CRSR_RIGHT#0) goto form_control::@5 -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_CRSR_RIGHT
     bne b5
-    jmp b13
-  //SEG789 form_control::@13
-  b13:
+    jmp b9
+  //SEG789 form_control::@9
+  b9:
   //SEG790 [395] (byte~) form_control::$24 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #KEY_MODIFIER_SHIFT
-  //SEG791 [396] if((byte~) form_control::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@26 -- vbuaa_eq_0_then_la1 
+  //SEG791 [396] if((byte~) form_control::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@14 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b26
-    jmp b14
-  //SEG792 form_control::@14
-  b14:
+    beq b14
+    jmp b10
+  //SEG792 form_control::@10
+  b10:
   //SEG793 [397] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← -- *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) -- pbuc1_derefidx_vbuz1=_dec_pbuc1_derefidx_vbuz1 
     ldx form_field_idx
     dec form_fields_val,x
-  //SEG794 [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@29 -- pbuc1_derefidx_vbuz1_neq_vbuc2_then_la1 
+  //SEG794 [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@15 -- pbuc1_derefidx_vbuz1_neq_vbuc2_then_la1 
     lda #$ff
     ldy form_field_idx
     cmp form_fields_val,y
-    bne b29
-    jmp b15
-  //SEG795 form_control::@15
-  b15:
+    bne b15
+    jmp b11
+  //SEG795 form_control::@11
+  b11:
   //SEG796 [399] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← *((const byte[]) form_fields_max#0 + (byte) form_field_idx#28) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz1 
     ldy form_field_idx
     lda form_fields_max,y
     sta form_fields_val,y
-    jmp b29
-  //SEG797 form_control::@29
-  b29:
+    jmp b15
+  //SEG797 form_control::@15
+  b15:
   //SEG798 [400] *((byte*) form_control::field#0) ← *((const byte[]) print_hextab#0 + *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)) -- _deref_pbuz1=pbuc1_derefidx_pbuc2_derefidx_vbuz2 
     // Render field value
     ldx form_field_idx
@@ -23434,38 +23595,38 @@ form_control: {
     lda print_hextab,y
     ldy #0
     sta (field),y
-  //SEG799 [388] phi from form_control::@29 form_control::@39 to form_control::@return [phi:form_control::@29/form_control::@39->form_control::@return]
-  breturn_from_b29:
-  breturn_from_b39:
-  //SEG800 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#28 [phi:form_control::@29/form_control::@39->form_control::@return#0] -- register_copy 
-  //SEG801 [388] phi (signed byte) form_cursor_count#16 = (signed byte) form_cursor_count#15 [phi:form_control::@29/form_control::@39->form_control::@return#1] -- register_copy 
-  //SEG802 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@29/form_control::@39->form_control::@return#2] -- vbuxx=vbuc1 
+  //SEG799 [388] phi from form_control::@15 form_control::@23 to form_control::@return [phi:form_control::@15/form_control::@23->form_control::@return]
+  breturn_from_b15:
+  breturn_from_b23:
+  //SEG800 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#28 [phi:form_control::@15/form_control::@23->form_control::@return#0] -- register_copy 
+  //SEG801 [388] phi (signed byte) form_cursor_count#16 = (signed byte) form_cursor_count#15 [phi:form_control::@15/form_control::@23->form_control::@return#1] -- register_copy 
+  //SEG802 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@15/form_control::@23->form_control::@return#2] -- vbuxx=vbuc1 
     ldx #0
     jmp breturn
-  //SEG803 form_control::@26
-  b26:
+  //SEG803 form_control::@14
+  b14:
   //SEG804 [401] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← ++ *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) -- pbuc1_derefidx_vbuz1=_inc_pbuc1_derefidx_vbuz1 
     ldx form_field_idx
     inc form_fields_val,x
-  //SEG805 [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@29 -- pbuc1_derefidx_vbuz1_le_pbuc2_derefidx_vbuz1_then_la1 
+  //SEG805 [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@15 -- pbuc1_derefidx_vbuz1_le_pbuc2_derefidx_vbuz1_then_la1 
     ldy form_field_idx
     lda form_fields_val,y
     cmp form_fields_max,y
-    bcc b29
-    beq b29
-    jmp b31
-  //SEG806 form_control::@31
-  b31:
+    bcc b15
+    beq b15
+    jmp b16
+  //SEG806 form_control::@16
+  b16:
   //SEG807 [403] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuz1=vbuc2 
     lda #0
     ldy form_field_idx
     sta form_fields_val,y
-    jmp b29
+    jmp b15
   //SEG808 form_control::@5
   b5:
-  //SEG809 [404] if((byte) form_control::key_event#0!=(const byte) KEY_SPACE#0) goto form_control::@39 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG809 [404] if((byte) form_control::key_event#0!=(const byte) KEY_SPACE#0) goto form_control::@23 -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_SPACE
-    bne b39_from_b5
+    bne b23_from_b5
   //SEG810 [388] phi from form_control::@5 to form_control::@return [phi:form_control::@5->form_control::@return]
   breturn_from_b5:
   //SEG811 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#28 [phi:form_control::@5->form_control::@return#0] -- register_copy 
@@ -23473,12 +23634,12 @@ form_control: {
   //SEG813 [388] phi (byte) form_control::return#2 = (byte/word/signed word/dword/signed dword) $ff [phi:form_control::@5->form_control::@return#2] -- vbuxx=vbuc1 
     ldx #$ff
     jmp breturn
-  //SEG814 [405] phi from form_control::@5 to form_control::@39 [phi:form_control::@5->form_control::@39]
-  b39_from_b5:
-    jmp b39
-  //SEG815 form_control::@39
-  b39:
-    jmp breturn_from_b39
+  //SEG814 [405] phi from form_control::@5 to form_control::@23 [phi:form_control::@5->form_control::@23]
+  b23_from_b5:
+    jmp b23
+  //SEG815 form_control::@23
+  b23:
+    jmp breturn_from_b23
   //SEG816 form_control::@2
   b2:
   //SEG817 [406] (byte/word/dword~) form_control::$14 ← *((byte*) form_control::field#0) | (byte/word/signed word/dword/signed dword) $80 -- vbuaa=_deref_pbuz1_bor_vbuc1 
@@ -23489,14 +23650,14 @@ form_control: {
     ldy #0
     sta (field),y
     jmp b3_from_b2
-  //SEG819 [408] phi from form_control::@33 to form_control::@36 [phi:form_control::@33->form_control::@36]
-  b36_from_b33:
-    jmp b36
-  //SEG820 form_control::@36
-  b36:
-  //SEG821 [370] phi from form_control::@36 to form_control::@1 [phi:form_control::@36->form_control::@1]
-  b1_from_b36:
-  //SEG822 [370] phi (signed byte) form_cursor_count#15 = (signed byte) form_cursor_count#5 [phi:form_control::@36->form_control::@1#0] -- register_copy 
+  //SEG819 [408] phi from form_control::@17 to form_control::@20 [phi:form_control::@17->form_control::@20]
+  b20_from_b17:
+    jmp b20
+  //SEG820 form_control::@20
+  b20:
+  //SEG821 [370] phi from form_control::@20 to form_control::@1 [phi:form_control::@20->form_control::@1]
+  b1_from_b20:
+  //SEG822 [370] phi (signed byte) form_cursor_count#15 = (signed byte) form_cursor_count#5 [phi:form_control::@20->form_control::@1#0] -- register_copy 
     jmp b1
 }
 //SEG823 form_set_screen
@@ -23559,33 +23720,33 @@ print_str_lines: {
     sta print_char_cursor
     lda print_set_screen.screen+1
     sta print_char_cursor+1
-  //SEG842 [421] phi from print_str_lines print_str_lines::@9 to print_str_lines::@1 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1]
+  //SEG842 [421] phi from print_str_lines print_str_lines::@5 to print_str_lines::@1 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1]
   b1_from_print_str_lines:
-  b1_from_b9:
-  //SEG843 [421] phi (byte*) print_line_cursor#2 = (byte*) print_set_screen::screen#2 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1#0] -- register_copy 
-  //SEG844 [421] phi (byte*) print_char_cursor#22 = (byte*~) print_char_cursor#77 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1#1] -- register_copy 
-  //SEG845 [421] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#5 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1#2] -- register_copy 
+  b1_from_b5:
+  //SEG843 [421] phi (byte*) print_line_cursor#2 = (byte*) print_set_screen::screen#2 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1#0] -- register_copy 
+  //SEG844 [421] phi (byte*) print_char_cursor#22 = (byte*~) print_char_cursor#77 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1#1] -- register_copy 
+  //SEG845 [421] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#5 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1#2] -- register_copy 
     jmp b1
   //SEG846 print_str_lines::@1
   b1:
-  //SEG847 [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@6 -- _deref_pbuz1_neq_vbuc1_then_la1 
+  //SEG847 [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@2 -- _deref_pbuz1_neq_vbuc1_then_la1 
     ldy #0
     lda (str),y
     cmp #'@'
-    bne b6_from_b1
+    bne b2_from_b1
     jmp breturn
   //SEG848 print_str_lines::@return
   breturn:
   //SEG849 [423] return 
     rts
-  //SEG850 [424] phi from print_str_lines::@1 print_str_lines::@7 to print_str_lines::@6 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6]
-  b6_from_b1:
-  b6_from_b7:
-  //SEG851 [424] phi (byte*) print_char_cursor#20 = (byte*) print_char_cursor#22 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#0] -- register_copy 
-  //SEG852 [424] phi (byte*) print_str_lines::str#4 = (byte*) print_str_lines::str#3 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#1] -- register_copy 
-    jmp b6
-  //SEG853 print_str_lines::@6
-  b6:
+  //SEG850 [424] phi from print_str_lines::@1 print_str_lines::@3 to print_str_lines::@2 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2]
+  b2_from_b1:
+  b2_from_b3:
+  //SEG851 [424] phi (byte*) print_char_cursor#20 = (byte*) print_char_cursor#22 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#0] -- register_copy 
+  //SEG852 [424] phi (byte*) print_str_lines::str#4 = (byte*) print_str_lines::str#3 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#1] -- register_copy 
+    jmp b2
+  //SEG853 print_str_lines::@2
+  b2:
   //SEG854 [425] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#4) -- vbuaa=_deref_pbuz1 
     ldy #0
     lda (str),y
@@ -23594,12 +23755,12 @@ print_str_lines: {
     bne !+
     inc str+1
   !:
-  //SEG856 [427] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@7 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG856 [427] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@3 -- vbuaa_eq_vbuc1_then_la1 
     cmp #'@'
-    beq b7_from_b6
-    jmp b8
-  //SEG857 print_str_lines::@8
-  b8:
+    beq b3_from_b2
+    jmp b4
+  //SEG857 print_str_lines::@4
+  b4:
   //SEG858 [428] *((byte*) print_char_cursor#20) ← (byte) print_str_lines::ch#0 -- _deref_pbuz1=vbuaa 
     ldy #0
     sta (print_char_cursor),y
@@ -23608,31 +23769,31 @@ print_str_lines: {
     bne !+
     inc print_char_cursor+1
   !:
-  //SEG860 [430] phi from print_str_lines::@6 print_str_lines::@8 to print_str_lines::@7 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7]
-  b7_from_b6:
-  b7_from_b8:
-  //SEG861 [430] phi (byte*) print_char_cursor#38 = (byte*) print_char_cursor#20 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7#0] -- register_copy 
-    jmp b7
-  //SEG862 print_str_lines::@7
-  b7:
-  //SEG863 [431] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG860 [430] phi from print_str_lines::@2 print_str_lines::@4 to print_str_lines::@3 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3]
+  b3_from_b2:
+  b3_from_b4:
+  //SEG861 [430] phi (byte*) print_char_cursor#38 = (byte*) print_char_cursor#20 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3#0] -- register_copy 
+    jmp b3
+  //SEG862 print_str_lines::@3
+  b3:
+  //SEG863 [431] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@2 -- vbuaa_neq_vbuc1_then_la1 
     cmp #'@'
-    bne b6_from_b7
-  //SEG864 [432] phi from print_str_lines::@7 to print_str_lines::@9 [phi:print_str_lines::@7->print_str_lines::@9]
-  b9_from_b7:
-    jmp b9
-  //SEG865 print_str_lines::@9
-  b9:
+    bne b2_from_b3
+  //SEG864 [432] phi from print_str_lines::@3 to print_str_lines::@5 [phi:print_str_lines::@3->print_str_lines::@5]
+  b5_from_b3:
+    jmp b5
+  //SEG865 print_str_lines::@5
+  b5:
   //SEG866 [433] call print_ln 
-  //SEG867 [435] phi from print_str_lines::@9 to print_ln [phi:print_str_lines::@9->print_ln]
-  print_ln_from_b9:
+  //SEG867 [435] phi from print_str_lines::@5 to print_ln [phi:print_str_lines::@5->print_ln]
+  print_ln_from_b5:
     jsr print_ln
   //SEG868 [434] (byte*~) print_char_cursor#78 ← (byte*) print_line_cursor#22 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-    jmp b1_from_b9
+    jmp b1_from_b5
 }
 //SEG869 print_ln
 // Print a newline
@@ -24291,10 +24452,10 @@ gfx_init_plane_horisontal: {
     lda #0
     sta ay
     jmp b1
-  //SEG1092 [545] phi from gfx_init_plane_horisontal::@7 to gfx_init_plane_horisontal::@1 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@1]
-  b1_from_b7:
-  //SEG1093 [545] phi (byte*) gfx_init_plane_horisontal::gfxa#6 = (byte*) gfx_init_plane_horisontal::gfxa#7 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@1#0] -- register_copy 
-  //SEG1094 [545] phi (byte) gfx_init_plane_horisontal::ay#4 = (byte) gfx_init_plane_horisontal::ay#1 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@1#1] -- register_copy 
+  //SEG1092 [545] phi from gfx_init_plane_horisontal::@6 to gfx_init_plane_horisontal::@1 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@1]
+  b1_from_b6:
+  //SEG1093 [545] phi (byte*) gfx_init_plane_horisontal::gfxa#6 = (byte*) gfx_init_plane_horisontal::gfxa#7 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@1#0] -- register_copy 
+  //SEG1094 [545] phi (byte) gfx_init_plane_horisontal::ay#4 = (byte) gfx_init_plane_horisontal::ay#1 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@1#1] -- register_copy 
     jmp b1
   //SEG1095 gfx_init_plane_horisontal::@1
   b1:
@@ -24341,24 +24502,24 @@ gfx_init_plane_horisontal: {
   //SEG1112 [553] if((byte) gfx_init_plane_horisontal::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_init_plane_horisontal::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
     bne b2_from_b4
-    jmp b7
-  //SEG1113 gfx_init_plane_horisontal::@7
-  b7:
+    jmp b6
+  //SEG1113 gfx_init_plane_horisontal::@6
+  b6:
   //SEG1114 [554] (byte) gfx_init_plane_horisontal::ay#1 ← ++ (byte) gfx_init_plane_horisontal::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
   //SEG1115 [555] if((byte) gfx_init_plane_horisontal::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto gfx_init_plane_horisontal::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
-    bne b1_from_b7
-  //SEG1116 [556] phi from gfx_init_plane_horisontal::@7 to gfx_init_plane_horisontal::@8 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG1117 gfx_init_plane_horisontal::@8
-  b8:
+    bne b1_from_b6
+  //SEG1116 [556] phi from gfx_init_plane_horisontal::@6 to gfx_init_plane_horisontal::@7 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG1117 gfx_init_plane_horisontal::@7
+  b7:
   //SEG1118 [557] call dtvSetCpuBankSegment1 
-  //SEG1119 [505] phi from gfx_init_plane_horisontal::@8 to dtvSetCpuBankSegment1 [phi:gfx_init_plane_horisontal::@8->dtvSetCpuBankSegment1]
-  dtvSetCpuBankSegment1_from_b8:
-  //SEG1120 [505] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 = ((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_horisontal::@8->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1 
+  //SEG1119 [505] phi from gfx_init_plane_horisontal::@7 to dtvSetCpuBankSegment1 [phi:gfx_init_plane_horisontal::@7->dtvSetCpuBankSegment1]
+  dtvSetCpuBankSegment1_from_b7:
+  //SEG1120 [505] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 = ((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_horisontal::@7->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1 
     lda #$4000/$4000
     jsr dtvSetCpuBankSegment1
     jmp breturn
@@ -24617,15 +24778,15 @@ gfx_init_plane_8bppchunky: {
   dtvSetCpuBankSegment1_from_b4:
   //SEG1222 [505] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 = (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:gfx_init_plane_8bppchunky::@4->dtvSetCpuBankSegment1#0] -- register_copy 
     jsr dtvSetCpuBankSegment1
-    jmp b8
-  //SEG1223 gfx_init_plane_8bppchunky::@8
-  b8:
+    jmp b7
+  //SEG1223 gfx_init_plane_8bppchunky::@7
+  b7:
   //SEG1224 [593] (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 ← ++ (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#4 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1225 [594] phi from gfx_init_plane_8bppchunky::@8 to gfx_init_plane_8bppchunky::@3 [phi:gfx_init_plane_8bppchunky::@8->gfx_init_plane_8bppchunky::@3]
-  b3_from_b8:
-  //SEG1226 [594] phi (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#8 = (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 [phi:gfx_init_plane_8bppchunky::@8->gfx_init_plane_8bppchunky::@3#0] -- register_copy 
-  //SEG1227 [594] phi (byte*) gfx_init_plane_8bppchunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_8bppchunky::@8->gfx_init_plane_8bppchunky::@3#1] -- pbuz1=pbuc1 
+  //SEG1225 [594] phi from gfx_init_plane_8bppchunky::@7 to gfx_init_plane_8bppchunky::@3 [phi:gfx_init_plane_8bppchunky::@7->gfx_init_plane_8bppchunky::@3]
+  b3_from_b7:
+  //SEG1226 [594] phi (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#8 = (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 [phi:gfx_init_plane_8bppchunky::@7->gfx_init_plane_8bppchunky::@3#0] -- register_copy 
+  //SEG1227 [594] phi (byte*) gfx_init_plane_8bppchunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_8bppchunky::@7->gfx_init_plane_8bppchunky::@3#1] -- pbuz1=pbuc1 
     lda #<$4000
     sta gfxb
     lda #>$4000
@@ -24703,22 +24864,22 @@ gfx_init_vic_bitmap: {
   //SEG1250 [759] phi from gfx_init_vic_bitmap to bitmap_init [phi:gfx_init_vic_bitmap->bitmap_init]
   bitmap_init_from_gfx_init_vic_bitmap:
     jsr bitmap_init
-  //SEG1251 [608] phi from gfx_init_vic_bitmap to gfx_init_vic_bitmap::@3 [phi:gfx_init_vic_bitmap->gfx_init_vic_bitmap::@3]
-  b3_from_gfx_init_vic_bitmap:
-    jmp b3
-  //SEG1252 gfx_init_vic_bitmap::@3
-  b3:
+  //SEG1251 [608] phi from gfx_init_vic_bitmap to gfx_init_vic_bitmap::@2 [phi:gfx_init_vic_bitmap->gfx_init_vic_bitmap::@2]
+  b2_from_gfx_init_vic_bitmap:
+    jmp b2
+  //SEG1252 gfx_init_vic_bitmap::@2
+  b2:
   //SEG1253 [609] call bitmap_clear 
     jsr bitmap_clear
-  //SEG1254 [610] phi from gfx_init_vic_bitmap::@3 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1]
-  b1_from_b3:
-  //SEG1255 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1#0] -- vbuz1=vbuc1 
+  //SEG1254 [610] phi from gfx_init_vic_bitmap::@2 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@2->gfx_init_vic_bitmap::@1]
+  b1_from_b2:
+  //SEG1255 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_init_vic_bitmap::@2->gfx_init_vic_bitmap::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta l
     jmp b1
-  //SEG1256 [610] phi from gfx_init_vic_bitmap::@5 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@5->gfx_init_vic_bitmap::@1]
-  b1_from_b5:
-  //SEG1257 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte) gfx_init_vic_bitmap::l#1 [phi:gfx_init_vic_bitmap::@5->gfx_init_vic_bitmap::@1#0] -- register_copy 
+  //SEG1256 [610] phi from gfx_init_vic_bitmap::@3 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1]
+  b1_from_b3:
+  //SEG1257 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte) gfx_init_vic_bitmap::l#1 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1#0] -- register_copy 
     jmp b1
   //SEG1258 gfx_init_vic_bitmap::@1
   b1:
@@ -24739,15 +24900,15 @@ gfx_init_vic_bitmap: {
     sta bitmap_line.y1
   //SEG1263 [615] call bitmap_line 
     jsr bitmap_line
-    jmp b5
-  //SEG1264 gfx_init_vic_bitmap::@5
-  b5:
+    jmp b3
+  //SEG1264 gfx_init_vic_bitmap::@3
+  b3:
   //SEG1265 [616] (byte) gfx_init_vic_bitmap::l#1 ← ++ (byte) gfx_init_vic_bitmap::l#2 -- vbuz1=_inc_vbuz1 
     inc l
   //SEG1266 [617] if((byte) gfx_init_vic_bitmap::l#1<(const byte) gfx_init_vic_bitmap::lines_cnt#0) goto gfx_init_vic_bitmap::@1 -- vbuz1_lt_vbuc1_then_la1 
     lda l
     cmp #lines_cnt
-    bcc b1_from_b5
+    bcc b1_from_b3
     jmp breturn
   //SEG1267 gfx_init_vic_bitmap::@return
   breturn:
@@ -24770,33 +24931,33 @@ bitmap_line: {
     beq !+
     bcs b1
   !:
-    jmp b3
-  //SEG1271 bitmap_line::@3
-  b3:
+    jmp b2
+  //SEG1271 bitmap_line::@2
+  b2:
   //SEG1272 [620] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0 -- vbuz1=vbuz2_minus_vbuxx 
     txa
     eor #$ff
     sec
     adc x0
     sta xd
-  //SEG1273 [621] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1273 [621] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b10
-    jmp b4
-  //SEG1274 bitmap_line::@4
-  b4:
+    bcc b7
+    jmp b3
+  //SEG1274 bitmap_line::@3
+  b3:
   //SEG1275 [622] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y0
     sec
     sbc y1
     tay
-  //SEG1276 [623] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1276 [623] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b11
-    jmp b5
-  //SEG1277 bitmap_line::@5
-  b5:
+    bcc b8
+    jmp b4
+  //SEG1277 bitmap_line::@4
+  b4:
   //SEG1278 [624] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxi.y
@@ -24808,21 +24969,21 @@ bitmap_line: {
     sty bitmap_line_ydxi.yd
   //SEG1282 [628] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   //SEG1283 [629] call bitmap_line_ydxi 
-  //SEG1284 [703] phi from bitmap_line::@5 to bitmap_line_ydxi [phi:bitmap_line::@5->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b5:
-  //SEG1285 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@5->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1286 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1287 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@5->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1288 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@5->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1289 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1284 [703] phi from bitmap_line::@4 to bitmap_line_ydxi [phi:bitmap_line::@4->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b4:
+  //SEG1285 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@4->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1286 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1287 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@4->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1288 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@4->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1289 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
   //SEG1290 bitmap_line::@return
   breturn:
   //SEG1291 [630] return 
     rts
-  //SEG1292 bitmap_line::@11
-  b11:
+  //SEG1292 bitmap_line::@8
+  b8:
   //SEG1293 [631] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuxx 
     stx bitmap_line_xdyi.x
   //SEG1294 [632] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
@@ -24833,28 +24994,28 @@ bitmap_line: {
   //SEG1297 [635] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2 -- vbuz1=vbuyy 
     sty bitmap_line_xdyi.yd
   //SEG1298 [636] call bitmap_line_xdyi 
-  //SEG1299 [681] phi from bitmap_line::@11 to bitmap_line_xdyi [phi:bitmap_line::@11->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b11:
-  //SEG1300 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@11->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1301 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1302 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@11->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1303 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@11->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1304 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1299 [681] phi from bitmap_line::@8 to bitmap_line_xdyi [phi:bitmap_line::@8->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b8:
+  //SEG1300 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@8->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1301 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1302 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@8->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1303 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@8->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1304 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
-  //SEG1305 bitmap_line::@10
-  b10:
+  //SEG1305 bitmap_line::@7
+  b7:
   //SEG1306 [637] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y1
     sec
     sbc y0
     tay
-  //SEG1307 [638] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1307 [638] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b15
-    jmp b17
-  //SEG1308 bitmap_line::@17
-  b17:
+    bcc b9
+    jmp b10
+  //SEG1308 bitmap_line::@10
+  b10:
   //SEG1309 [639] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxd.y
@@ -24867,17 +25028,17 @@ bitmap_line: {
     sty bitmap_line_ydxd.yd
   //SEG1313 [643] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   //SEG1314 [644] call bitmap_line_ydxd 
-  //SEG1315 [733] phi from bitmap_line::@17 to bitmap_line_ydxd [phi:bitmap_line::@17->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b17:
-  //SEG1316 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@17->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1317 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1318 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@17->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1319 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@17->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1320 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1315 [733] phi from bitmap_line::@10 to bitmap_line_ydxd [phi:bitmap_line::@10->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b10:
+  //SEG1316 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@10->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1317 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1318 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@10->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1319 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@10->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1320 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1321 bitmap_line::@15
-  b15:
+  //SEG1321 bitmap_line::@9
+  b9:
   //SEG1322 [645] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuxx 
     stx bitmap_line_xdyd.x
   //SEG1323 [646] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
@@ -24888,13 +25049,13 @@ bitmap_line: {
   //SEG1326 [649] (byte) bitmap_line_xdyd::yd#0 ← (byte) bitmap_line::yd#1 -- vbuz1=vbuyy 
     sty bitmap_line_xdyd.yd
   //SEG1327 [650] call bitmap_line_xdyd 
-  //SEG1328 [718] phi from bitmap_line::@15 to bitmap_line_xdyd [phi:bitmap_line::@15->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b15:
-  //SEG1329 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@15->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1330 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1331 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@15->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1332 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@15->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1333 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1328 [718] phi from bitmap_line::@9 to bitmap_line_xdyd [phi:bitmap_line::@9->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b9:
+  //SEG1329 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@9->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1330 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1331 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@9->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1332 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@9->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1333 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
   //SEG1334 bitmap_line::@1
@@ -24904,24 +25065,24 @@ bitmap_line: {
     sec
     sbc x0
     sta xd
-  //SEG1336 [652] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1336 [652] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b20
-    jmp b7
-  //SEG1337 bitmap_line::@7
-  b7:
+    bcc b11
+    jmp b5
+  //SEG1337 bitmap_line::@5
+  b5:
   //SEG1338 [653] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y0
     sec
     sbc y1
     tay
-  //SEG1339 [654] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1339 [654] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b21
-    jmp b8
-  //SEG1340 bitmap_line::@8
-  b8:
+    bcc b12
+    jmp b6
+  //SEG1340 bitmap_line::@6
+  b6:
   //SEG1341 [655] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxd.y
@@ -24931,17 +25092,17 @@ bitmap_line: {
     sty bitmap_line_ydxd.yd
   //SEG1345 [659] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   //SEG1346 [660] call bitmap_line_ydxd 
-  //SEG1347 [733] phi from bitmap_line::@8 to bitmap_line_ydxd [phi:bitmap_line::@8->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b8:
-  //SEG1348 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@8->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1349 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1350 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@8->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1351 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@8->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1352 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1347 [733] phi from bitmap_line::@6 to bitmap_line_ydxd [phi:bitmap_line::@6->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b6:
+  //SEG1348 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@6->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1349 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1350 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@6->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1351 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@6->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1352 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1353 bitmap_line::@21
-  b21:
+  //SEG1353 bitmap_line::@12
+  b12:
   //SEG1354 [661] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyd.x
@@ -24952,28 +25113,28 @@ bitmap_line: {
   //SEG1358 [665] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10 -- vbuz1=vbuyy 
     sty bitmap_line_xdyd.yd
   //SEG1359 [666] call bitmap_line_xdyd 
-  //SEG1360 [718] phi from bitmap_line::@21 to bitmap_line_xdyd [phi:bitmap_line::@21->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b21:
-  //SEG1361 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@21->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1362 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1363 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@21->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1364 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@21->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1365 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1360 [718] phi from bitmap_line::@12 to bitmap_line_xdyd [phi:bitmap_line::@12->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b12:
+  //SEG1361 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@12->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1362 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1363 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@12->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1364 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@12->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1365 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
-  //SEG1366 bitmap_line::@20
-  b20:
+  //SEG1366 bitmap_line::@11
+  b11:
   //SEG1367 [667] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y1
     sec
     sbc y0
     tay
-  //SEG1368 [668] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1368 [668] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b25
-    jmp b27
-  //SEG1369 bitmap_line::@27
-  b27:
+    bcc b13
+    jmp b14
+  //SEG1369 bitmap_line::@14
+  b14:
   //SEG1370 [669] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxi.y
@@ -24984,17 +25145,17 @@ bitmap_line: {
     sty bitmap_line_ydxi.yd
   //SEG1374 [673] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   //SEG1375 [674] call bitmap_line_ydxi 
-  //SEG1376 [703] phi from bitmap_line::@27 to bitmap_line_ydxi [phi:bitmap_line::@27->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b27:
-  //SEG1377 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@27->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1378 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1379 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@27->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1380 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@27->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1381 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1376 [703] phi from bitmap_line::@14 to bitmap_line_ydxi [phi:bitmap_line::@14->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b14:
+  //SEG1377 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@14->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1378 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1379 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@14->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1380 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@14->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1381 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
-  //SEG1382 bitmap_line::@25
-  b25:
+  //SEG1382 bitmap_line::@13
+  b13:
   //SEG1383 [675] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyi.x
@@ -25005,13 +25166,13 @@ bitmap_line: {
   //SEG1387 [679] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11 -- vbuz1=vbuyy 
     sty bitmap_line_xdyi.yd
   //SEG1388 [680] call bitmap_line_xdyi 
-  //SEG1389 [681] phi from bitmap_line::@25 to bitmap_line_xdyi [phi:bitmap_line::@25->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b25:
-  //SEG1390 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@25->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1391 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1392 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@25->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1393 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@25->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1394 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1389 [681] phi from bitmap_line::@13 to bitmap_line_xdyi [phi:bitmap_line::@13->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b13:
+  //SEG1390 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@13->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1391 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1392 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@13->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1393 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@13->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1394 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
 }
@@ -25047,9 +25208,9 @@ bitmap_line_xdyi: {
   //SEG1406 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#0] -- register_copy 
   //SEG1407 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1408 bitmap_line_xdyi::@5
-  b5:
+    jmp b4
+  //SEG1408 bitmap_line_xdyi::@4
+  b4:
   //SEG1409 [687] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1410 [688] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -25060,7 +25221,7 @@ bitmap_line_xdyi: {
   //SEG1411 [689] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1412 bitmap_line_xdyi::@3
   b3:
@@ -25071,11 +25232,11 @@ bitmap_line_xdyi: {
     sec
     sbc xd
     sta e
-  //SEG1415 [692] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2]
+  //SEG1415 [692] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1416 [692] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#0] -- register_copy 
-  //SEG1417 [692] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1416 [692] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#0] -- register_copy 
+  //SEG1417 [692] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#1] -- register_copy 
     jmp b2
   //SEG1418 bitmap_line_xdyi::@2
   b2:
@@ -25158,9 +25319,9 @@ bitmap_line_ydxi: {
   //SEG1442 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#0] -- register_copy 
   //SEG1443 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1444 bitmap_line_ydxi::@5
-  b5:
+    jmp b4
+  //SEG1444 bitmap_line_ydxi::@4
+  b4:
   //SEG1445 [709] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1446 [710] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -25171,7 +25332,7 @@ bitmap_line_ydxi: {
   //SEG1447 [711] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1448 bitmap_line_ydxi::@3
   b3:
@@ -25182,11 +25343,11 @@ bitmap_line_ydxi: {
     sec
     sbc yd
     sta e
-  //SEG1451 [714] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2]
+  //SEG1451 [714] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1452 [714] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#0] -- register_copy 
-  //SEG1453 [714] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1452 [714] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#0] -- register_copy 
+  //SEG1453 [714] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#1] -- register_copy 
     jmp b2
   //SEG1454 bitmap_line_ydxi::@2
   b2:
@@ -25235,9 +25396,9 @@ bitmap_line_xdyd: {
   //SEG1470 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#0] -- register_copy 
   //SEG1471 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1472 bitmap_line_xdyd::@5
-  b5:
+    jmp b4
+  //SEG1472 bitmap_line_xdyd::@4
+  b4:
   //SEG1473 [724] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1474 [725] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -25248,7 +25409,7 @@ bitmap_line_xdyd: {
   //SEG1475 [726] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1476 bitmap_line_xdyd::@3
   b3:
@@ -25259,11 +25420,11 @@ bitmap_line_xdyd: {
     sec
     sbc xd
     sta e
-  //SEG1479 [729] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2]
+  //SEG1479 [729] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1480 [729] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#0] -- register_copy 
-  //SEG1481 [729] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1480 [729] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#0] -- register_copy 
+  //SEG1481 [729] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#1] -- register_copy 
     jmp b2
   //SEG1482 bitmap_line_xdyd::@2
   b2:
@@ -25309,9 +25470,9 @@ bitmap_line_ydxd: {
   //SEG1498 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#0] -- register_copy 
   //SEG1499 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1500 bitmap_line_ydxd::@5
-  b5:
+    jmp b4
+  //SEG1500 bitmap_line_ydxd::@4
+  b4:
   //SEG1501 [739] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1502 [740] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -25322,7 +25483,7 @@ bitmap_line_ydxd: {
   //SEG1503 [741] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1504 bitmap_line_ydxd::@3
   b3:
@@ -25333,11 +25494,11 @@ bitmap_line_ydxd: {
     sec
     sbc yd
     sta e
-  //SEG1507 [744] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2]
+  //SEG1507 [744] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1508 [744] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#0] -- register_copy 
-  //SEG1509 [744] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1508 [744] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#0] -- register_copy 
+  //SEG1509 [744] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#1] -- register_copy 
     jmp b2
   //SEG1510 bitmap_line_ydxd::@2
   b2:
@@ -25456,9 +25617,9 @@ bitmap_init: {
     tya
     lsr
     tay
-  //SEG1554 [766] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuyy_neq_0_then_la1 
+  //SEG1554 [766] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuyy_neq_0_then_la1 
     cpy #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG1555 [767] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
   b2_from_b1:
   //SEG1556 [767] phi (byte) bitmap_init::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:bitmap_init::@1->bitmap_init::@2#0] -- vbuyy=vbuc1 
@@ -25471,23 +25632,23 @@ bitmap_init: {
   //SEG1559 [769] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1_from_b2
-  //SEG1560 [770] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  b5_from_b2:
-  //SEG1561 [770] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG1560 [770] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  b3_from_b2:
+  //SEG1561 [770] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     lda #>0
     sta yoffs+1
-  //SEG1562 [770] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuxx=vbuc1 
+  //SEG1562 [770] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuxx=vbuc1 
     ldx #0
-    jmp b5
-  //SEG1563 [770] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  b5_from_b6:
-  //SEG1564 [770] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG1565 [770] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-    jmp b5
-  //SEG1566 bitmap_init::@5
-  b5:
+    jmp b3
+  //SEG1563 [770] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  b3_from_b4:
+  //SEG1564 [770] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG1565 [770] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+    jmp b3
+  //SEG1566 bitmap_init::@3
+  b3:
   //SEG1567 [771] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _6
@@ -25504,12 +25665,12 @@ bitmap_init: {
   //SEG1573 [777] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG1574 [778] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG1574 [778] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6_from_b5
-    jmp b7
-  //SEG1575 bitmap_init::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG1575 bitmap_init::@5
+  b5:
   //SEG1576 [779] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -25518,31 +25679,31 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG1577 [780] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG1578 [780] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-    jmp b6
-  //SEG1579 bitmap_init::@6
-  b6:
+  //SEG1577 [780] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG1578 [780] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+    jmp b4
+  //SEG1579 bitmap_init::@4
+  b4:
   //SEG1580 [781] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1581 [782] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuxx_neq_0_then_la1 
+  //SEG1581 [782] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG1582 bitmap_init::@return
   breturn:
   //SEG1583 [783] return 
     rts
-  //SEG1584 [784] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG1585 bitmap_init::@10
-  b10:
-  //SEG1586 [767] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  b2_from_b10:
-  //SEG1587 [767] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG1584 [784] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG1585 bitmap_init::@6
+  b6:
+  //SEG1586 [767] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  b2_from_b6:
+  //SEG1587 [767] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
     jmp b2
 }
 //SEG1588 gfx_init_charset
@@ -26083,176 +26244,176 @@ keyboard_init: {
   FORM_COLS: .text "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@"+"                                        @"+"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@"+"                                        @"+" nnnnnnnnnnnn   mmmmmmmmmm   ooooooooo  @"+" nnnnnnnnnnnn   mmmmmmmmmm   ooooooooo  @"+" nnnnnnnnnnnn   mmmmmmmmmm   ooooooooo  @"+" nnnnnnnnnnnn   mmmmmmmmmm   ooooooooo  @"+" nnnnnnnnnnnn   mmmmmmmmmm              @"+" nnnnnnnnnnnn                jjjjjjjjj  @"+" nnnnnnnnnnnn   mmmmmmmmmm   jjjjjjjjj  @"+" nnnnnnnnnnnn   mmmmmmmmmm   jjjjjjjjj  @"+" nnnnnnnnnnnn   mmmmmmmmmm   jjjjjjjjj  @"+" nnnnnnnnnnnn   mmmmmmmmmm   jjjjjjjjj  @"+" nnnnnnnnnnnn   mmmmmmmmmm   jjjjjjjjj  @"+" nnnnnnnnnnnn   mmmmmmmmmm   jjjjjjjjj  @"+"@"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b68
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b7
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b9
-Removing instruction jmp b15
-Removing instruction jmp b1
-Removing instruction jmp b16
-Removing instruction jmp b2
-Removing instruction jmp b17
 Removing instruction jmp b3
-Removing instruction jmp b18
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b4
-Removing instruction jmp b19
+Removing instruction jmp b10
+Removing instruction jmp b1
+Removing instruction jmp b11
+Removing instruction jmp b2
+Removing instruction jmp b12
+Removing instruction jmp b3
+Removing instruction jmp b13
+Removing instruction jmp b4
+Removing instruction jmp b14
 Removing instruction jmp b5
-Removing instruction jmp b20
+Removing instruction jmp b15
 Removing instruction jmp b6
-Removing instruction jmp b21
+Removing instruction jmp b16
 Removing instruction jmp b7
-Removing instruction jmp b22
+Removing instruction jmp b17
 Removing instruction jmp b8
-Removing instruction jmp b23
+Removing instruction jmp b18
 Removing instruction jmp b9
-Removing instruction jmp b46
-Removing instruction jmp b47
-Removing instruction jmp b48
-Removing instruction jmp b49
-Removing instruction jmp b50
-Removing instruction jmp b26
 Removing instruction jmp b27
 Removing instruction jmp b28
 Removing instruction jmp b29
+Removing instruction jmp b30
 Removing instruction jmp b31
-Removing instruction jmp b36
-Removing instruction jmp b38
-Removing instruction jmp b51
-Removing instruction jmp b52
-Removing instruction jmp breturn
-Removing instruction jmp b34
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b8
-Removing instruction jmp b25
+Removing instruction jmp b19
+Removing instruction jmp b20
 Removing instruction jmp b21
-Removing instruction jmp b10
+Removing instruction jmp b22
 Removing instruction jmp b23
+Removing instruction jmp b25
 Removing instruction jmp b26
+Removing instruction jmp b32
+Removing instruction jmp b33
+Removing instruction jmp breturn
 Removing instruction jmp b24
 Removing instruction jmp b1
-Removing instruction jmp b27
-Removing instruction jmp b5
-Removing instruction jmp b2
-Removing instruction jmp b28
-Removing instruction jmp b6
-Removing instruction jmp b3
-Removing instruction jmp b29
+Removing instruction jmp breturn
 Removing instruction jmp b7
-Removing instruction jmp breturn
-Removing instruction jmp b11
+Removing instruction jmp b19
 Removing instruction jmp b16
+Removing instruction jmp b8
 Removing instruction jmp b17
-Removing instruction jmp b18
-Removing instruction jmp b12
 Removing instruction jmp b20
+Removing instruction jmp b18
+Removing instruction jmp b1
+Removing instruction jmp b21
+Removing instruction jmp b4
+Removing instruction jmp b2
+Removing instruction jmp b22
+Removing instruction jmp b5
+Removing instruction jmp b3
+Removing instruction jmp b23
+Removing instruction jmp b6
+Removing instruction jmp breturn
+Removing instruction jmp b9
+Removing instruction jmp b12
+Removing instruction jmp b13
+Removing instruction jmp b14
+Removing instruction jmp b10
+Removing instruction jmp b15
 Removing instruction jmp breturn
 Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
 Removing instruction jmp b12
 Removing instruction jmp b13
+Removing instruction jmp b14
 Removing instruction jmp breturn
-Removing instruction jmp b9
-Removing instruction jmp b4
-Removing instruction jmp breturn
-Removing instruction jmp b3
-Removing instruction jmp b28
-Removing instruction jmp b29
-Removing instruction jmp b30
-Removing instruction jmp b31
-Removing instruction jmp b32
-Removing instruction jmp b33
-Removing instruction jmp b34
-Removing instruction jmp b35
-Removing instruction jmp b36
-Removing instruction jmp b37
-Removing instruction jmp b38
-Removing instruction jmp b39
-Removing instruction jmp b40
-Removing instruction jmp breturn
-Removing instruction jmp b27
-Removing instruction jmp b21
-Removing instruction jmp b22
-Removing instruction jmp b23
-Removing instruction jmp b24
-Removing instruction jmp b25
-Removing instruction jmp b26
-Removing instruction jmp b27
-Removing instruction jmp b28
-Removing instruction jmp b29
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b1
-Removing instruction jmp b9
-Removing instruction jmp b11
-Removing instruction jmp b30
-Removing instruction jmp breturn
-Removing instruction jmp b19
-Removing instruction jmp b31
-Removing instruction jmp b32
-Removing instruction jmp b23
-Removing instruction jmp b24
-Removing instruction jmp b25
-Removing instruction jmp b26
-Removing instruction jmp b27
-Removing instruction jmp b28
-Removing instruction jmp b29
-Removing instruction jmp b30
-Removing instruction jmp b31
-Removing instruction jmp b32
-Removing instruction jmp b33
-Removing instruction jmp b22
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp b23
-Removing instruction jmp b24
-Removing instruction jmp b25
-Removing instruction jmp b26
-Removing instruction jmp b27
-Removing instruction jmp b28
-Removing instruction jmp b29
-Removing instruction jmp b30
-Removing instruction jmp b31
-Removing instruction jmp b32
-Removing instruction jmp b33
-Removing instruction jmp b22
-Removing instruction jmp b45
-Removing instruction jmp breturn
-Removing instruction jmp b33
 Removing instruction jmp b1
 Removing instruction jmp b8
-Removing instruction jmp b3
-Removing instruction jmp b34
-Removing instruction jmp b35
+Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
-Removing instruction jmp b22
-Removing instruction jmp breturn
-Removing instruction jmp b37
-Removing instruction jmp b38
+Removing instruction jmp b12
 Removing instruction jmp b13
 Removing instruction jmp b14
 Removing instruction jmp b15
-Removing instruction jmp b29
-Removing instruction jmp b31
-Removing instruction jmp b39
-Removing instruction jmp b36
+Removing instruction jmp b16
+Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b17
 Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
 Removing instruction jmp b7
+Removing instruction jmp b18
+Removing instruction jmp b19
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b8
 Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp b11
+Removing instruction jmp b12
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp b11
+Removing instruction jmp b12
+Removing instruction jmp b1
+Removing instruction jmp b13
+Removing instruction jmp breturn
+Removing instruction jmp b17
+Removing instruction jmp b1
+Removing instruction jmp b6
+Removing instruction jmp b3
+Removing instruction jmp b18
+Removing instruction jmp b19
+Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b13
+Removing instruction jmp breturn
+Removing instruction jmp b21
+Removing instruction jmp b22
+Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp b11
+Removing instruction jmp b15
+Removing instruction jmp b16
+Removing instruction jmp b23
+Removing instruction jmp b20
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b5
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -26297,8 +26458,8 @@ Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b5
 Removing instruction jmp b4
+Removing instruction jmp b6
 Removing instruction jmp b7
-Removing instruction jmp b8
 Removing instruction jmp breturn
 Removing instruction jmp b9
 Removing instruction jmp b1
@@ -26313,55 +26474,55 @@ Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b4
-Removing instruction jmp b8
+Removing instruction jmp b7
 Removing instruction jmp b3
 Removing instruction jmp b5
 Removing instruction jmp b6
 Removing instruction jmp breturn
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b3
 Removing instruction jmp breturn
+Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp breturn
-Removing instruction jmp b17
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b27
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b5
-Removing instruction jmp b7
-Removing instruction jmp b6
 Removing instruction jmp breturn
 Removing instruction jmp b10
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b14
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b5
+Removing instruction jmp b4
+Removing instruction jmp breturn
+Removing instruction jmp b6
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
@@ -26421,43 +26582,43 @@ Replacing label b4_from_b3 with b4
 Replacing label b5_from_b4 with b5
 Replacing label b6_from_b5 with b6
 Replacing label b8_from_b7 with b8
-Replacing label b27_from_b27 with b27
-Replacing label b26_from_b28 with b26
-Replacing label b31_from_b31 with b31
-Replacing label b34_from_b34 with b34
-Replacing label b8_from_b10 with b8
-Replacing label b2_from_b27 with b2
-Replacing label b3_from_b28 with b3
-Replacing label breturn_from_b29 with breturn
-Replacing label b12_from_b11 with b12
-Replacing label b12_from_b16 with b12
-Replacing label b10_from_b20 with b10
-Replacing label b12_from_b14 with b12
-Replacing label breturn_from_get_vic_screen with breturn_from_b9
-Replacing label b9_from_b13 with b9
-Replacing label breturn_from_get_vic_charset with breturn_from_b3
-Replacing label b3_from_b4 with b3
-Replacing label breturn_from_get_plane with breturn_from_b27
-Replacing label b27_from_b40 with b27
-Replacing label b7_from_b7 with b7
-Replacing label b1 with b9
-Replacing label b1_from_b12 with b9
-Replacing label b1_from_b32 with b1_from_b8
-Replacing label b22_from_render_preset_name with b33
-Replacing label b1_from_b3 with b1
-Replacing label b22_from_apply_preset with b33
-Replacing label b45_from_b45 with b45
-Replacing label b36_from_b33 with b36
-Replacing label b37_from_b11 with b37
-Replacing label b38_from_b19 with b38
-Replacing label b22_from_b38 with b37
-Replacing label b39_from_b5 with b39
+Replacing label b20_from_b20 with b20
+Replacing label b19_from_b21 with b19
+Replacing label b23_from_b23 with b23
+Replacing label b24_from_b24 with b24
+Replacing label b7_from_b8 with b7
+Replacing label b2_from_b21 with b2
+Replacing label b3_from_b22 with b3
+Replacing label breturn_from_b23 with breturn
+Replacing label b10_from_b9 with b10
+Replacing label b10_from_b12 with b10
+Replacing label b8_from_b15 with b8
+Replacing label b10_from_b11 with b10
+Replacing label breturn_from_get_vic_screen with breturn_from_b1
+Replacing label b1_from_b5 with b1
+Replacing label breturn_from_get_vic_charset with breturn_from_b1
+Replacing label b1_from_b2 with b1
+Replacing label breturn_from_get_plane with breturn_from_b1
+Replacing label b1_from_b14 with b1
+Replacing label b2_from_b2 with b2
+Replacing label b1 with b4
+Replacing label b1_from_b6 with b4
+Replacing label b1_from_b19 with b1_from_b3
+Replacing label b1_from_render_preset_name with b12
+Replacing label b1_from_b2 with b1
+Replacing label b1_from_apply_preset with b12
+Replacing label b13_from_b13 with b13
+Replacing label b20_from_b17 with b20
+Replacing label b21_from_b8 with b21
+Replacing label b22_from_b12 with b22
+Replacing label b13_from_b22 with b21
+Replacing label b23_from_b5 with b23
 Replacing label b3_from_b2 with b3
 Replacing label b1_from_b1 with b1
-Replacing label b6_from_b1 with b6
-Replacing label b7_from_b6 with b7
-Replacing label b6_from_b7 with b6
-Replacing label b1_from_b9 with b1
+Replacing label b2_from_b1 with b2
+Replacing label b3_from_b2 with b3
+Replacing label b2_from_b3 with b2
+Replacing label b1_from_b5 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
@@ -26469,7 +26630,7 @@ Replacing label b1_from_b3 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
 Replacing label b2_from_b4 with b2
-Replacing label b1_from_b7 with b1
+Replacing label b1_from_b6 with b1
 Replacing label b4_from_b3 with b4
 Replacing label b3_from_b4 with b3
 Replacing label b2_from_b6 with b2
@@ -26479,21 +26640,21 @@ Replacing label b3_from_b2 with b3
 Replacing label b2_from_b3 with b2
 Replacing label b2_from_b3 with b2
 Replacing label b1_from_b5 with b1
-Replacing label b1_from_b5 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b1_from_b3 with b1
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b2 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b2 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b2 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b2 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
-Replacing label b10_from_b1 with b10
+Replacing label b6_from_b1 with b6
 Replacing label b1_from_b2 with b1
-Replacing label b6_from_b5 with b6
-Replacing label b5_from_b6 with b5
+Replacing label b4_from_b3 with b4
+Replacing label b3_from_b4 with b3
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
 Replacing label b2_from_b2 with b2
@@ -26506,117 +26667,117 @@ Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
-Removing instruction b68_from_bbegin:
-Removing instruction b68:
-Removing instruction bend_from_b68:
-Removing instruction b7_from_main:
-Removing instruction gfx_init_from_b7:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction b3_from_main:
+Removing instruction gfx_init_from_b3:
 Removing instruction b1:
 Removing instruction b2_from_b1:
 Removing instruction form_mode_from_b2:
-Removing instruction b9_from_b2:
-Removing instruction b15_from_gfx_mode:
-Removing instruction b1_from_b15:
+Removing instruction b4_from_b2:
+Removing instruction b10_from_gfx_mode:
+Removing instruction b1_from_b10:
 Removing instruction b2_from_b1:
-Removing instruction b2_from_b16:
-Removing instruction b3_from_b17:
+Removing instruction b2_from_b11:
+Removing instruction b3_from_b12:
 Removing instruction b3_from_b2:
-Removing instruction b4_from_b18:
+Removing instruction b4_from_b13:
 Removing instruction b4_from_b3:
-Removing instruction b5_from_b19:
+Removing instruction b5_from_b14:
 Removing instruction b5_from_b4:
-Removing instruction b6_from_b20:
+Removing instruction b6_from_b15:
 Removing instruction b6_from_b5:
-Removing instruction b21_from_b6:
-Removing instruction b7_from_b21:
-Removing instruction b8_from_b22:
+Removing instruction b16_from_b6:
+Removing instruction b7_from_b16:
+Removing instruction b8_from_b17:
 Removing instruction b8_from_b7:
-Removing instruction b23_from_b8:
-Removing instruction b9_from_b23:
-Removing instruction b26_from_b50:
-Removing instruction b26_from_b28:
-Removing instruction b27_from_b26:
-Removing instruction b27_from_b27:
-Removing instruction b31_from_b31:
-Removing instruction b38_from_b36:
-Removing instruction keyboard_event_scan_from_b38:
-Removing instruction b51_from_b38:
-Removing instruction b34_from_b34:
-Removing instruction b8_from_b10:
-Removing instruction b10_from_b20:
-Removing instruction b10_from_b21:
-Removing instruction b23_from_b10:
-Removing instruction keyboard_event_pressed_from_b23:
-Removing instruction b24_from_b26:
-Removing instruction b1_from_b24:
-Removing instruction keyboard_event_pressed_from_b1:
-Removing instruction b2_from_b27:
-Removing instruction b2_from_b5:
-Removing instruction keyboard_event_pressed_from_b2:
-Removing instruction b3_from_b28:
-Removing instruction b3_from_b6:
-Removing instruction keyboard_event_pressed_from_b3:
-Removing instruction breturn_from_b29:
-Removing instruction breturn_from_b7:
-Removing instruction b12_from_b11:
-Removing instruction b12_from_b14:
-Removing instruction b12_from_b16:
-Removing instruction b12_from_b18:
-Removing instruction breturn_from_get_vic_screen:
-Removing instruction b9_from_b13:
-Removing instruction breturn_from_get_vic_charset:
-Removing instruction b3_from_b4:
-Removing instruction breturn_from_get_plane:
-Removing instruction b27_from_b40:
-Removing instruction b21_from_form_mode:
-Removing instruction b22_from_b21:
-Removing instruction print_str_lines_from_b22:
-Removing instruction b23_from_b22:
-Removing instruction print_set_screen_from_b23:
-Removing instruction b24_from_b23:
-Removing instruction b25_from_b24:
-Removing instruction print_str_lines_from_b25:
+Removing instruction b18_from_b8:
+Removing instruction b9_from_b18:
+Removing instruction b19_from_b31:
+Removing instruction b19_from_b21:
+Removing instruction b20_from_b19:
+Removing instruction b20_from_b20:
+Removing instruction b23_from_b23:
 Removing instruction b26_from_b25:
-Removing instruction form_set_screen_from_b26:
-Removing instruction b27_from_b26:
-Removing instruction form_render_values_from_b27:
-Removing instruction b7_from_b7:
-Removing instruction b1_from_b32:
-Removing instruction b1_from_b12:
+Removing instruction keyboard_event_scan_from_b26:
+Removing instruction b32_from_b26:
+Removing instruction b24_from_b24:
+Removing instruction b7_from_b8:
+Removing instruction b8_from_b15:
+Removing instruction b8_from_b16:
+Removing instruction b17_from_b8:
+Removing instruction keyboard_event_pressed_from_b17:
+Removing instruction b18_from_b20:
+Removing instruction b1_from_b18:
+Removing instruction keyboard_event_pressed_from_b1:
+Removing instruction b2_from_b21:
+Removing instruction b2_from_b4:
+Removing instruction keyboard_event_pressed_from_b2:
+Removing instruction b3_from_b22:
+Removing instruction b3_from_b5:
+Removing instruction keyboard_event_pressed_from_b3:
+Removing instruction breturn_from_b23:
+Removing instruction breturn_from_b6:
+Removing instruction b10_from_b11:
+Removing instruction b10_from_b12:
+Removing instruction b10_from_b14:
+Removing instruction b10_from_b9:
+Removing instruction breturn_from_get_vic_screen:
+Removing instruction b1_from_b5:
+Removing instruction breturn_from_get_vic_charset:
+Removing instruction b1_from_b2:
+Removing instruction breturn_from_get_plane:
+Removing instruction b1_from_b14:
+Removing instruction b8_from_form_mode:
+Removing instruction b9_from_b8:
+Removing instruction print_str_lines_from_b9:
+Removing instruction b10_from_b9:
+Removing instruction print_set_screen_from_b10:
+Removing instruction b11_from_b10:
+Removing instruction b12_from_b11:
+Removing instruction print_str_lines_from_b12:
+Removing instruction b13_from_b12:
+Removing instruction form_set_screen_from_b13:
+Removing instruction b14_from_b13:
+Removing instruction form_render_values_from_b14:
+Removing instruction b2_from_b2:
+Removing instruction b1_from_b19:
+Removing instruction b1_from_b6:
 Removing instruction b1:
-Removing instruction b11_from_b9:
-Removing instruction b33_from_b32:
-Removing instruction b22_from_render_preset_name:
-Removing instruction b22_from_b33:
-Removing instruction print_str_at_from_b22:
-Removing instruction b1_from_b3:
-Removing instruction b33_from_b32:
-Removing instruction b22_from_apply_preset:
-Removing instruction b22_from_b33:
-Removing instruction b45_from_b22:
-Removing instruction b45_from_b45:
+Removing instruction b5_from_b4:
+Removing instruction b12_from_b11:
+Removing instruction b1_from_render_preset_name:
+Removing instruction b1_from_b12:
+Removing instruction print_str_at_from_b1:
+Removing instruction b1_from_b2:
+Removing instruction b12_from_b11:
+Removing instruction b1_from_apply_preset:
+Removing instruction b1_from_b12:
+Removing instruction b13_from_b1:
+Removing instruction b13_from_b13:
 Removing instruction b3_from_b2:
-Removing instruction b3_from_b8:
+Removing instruction b3_from_b6:
 Removing instruction keyboard_event_scan_from_b3:
-Removing instruction b34_from_b3:
-Removing instruction breturn_from_b22:
-Removing instruction b37_from_b11:
-Removing instruction b22_from_b37:
-Removing instruction b22_from_b38:
-Removing instruction b38_from_b19:
-Removing instruction breturn_from_b29:
-Removing instruction b39_from_b5:
-Removing instruction b36_from_b33:
-Removing instruction b1_from_b36:
+Removing instruction b18_from_b3:
+Removing instruction breturn_from_b13:
+Removing instruction b21_from_b8:
+Removing instruction b13_from_b21:
+Removing instruction b13_from_b22:
+Removing instruction b22_from_b12:
+Removing instruction breturn_from_b15:
+Removing instruction b23_from_b5:
+Removing instruction b20_from_b17:
+Removing instruction b1_from_b20:
 Removing instruction b1_from_b1:
 Removing instruction b1_from_print_str_lines:
-Removing instruction b1_from_b9:
-Removing instruction b6_from_b1:
-Removing instruction b6_from_b7:
-Removing instruction b7_from_b6:
-Removing instruction b7_from_b8:
-Removing instruction b9_from_b7:
-Removing instruction print_ln_from_b9:
+Removing instruction b1_from_b5:
+Removing instruction b2_from_b1:
+Removing instruction b2_from_b3:
+Removing instruction b3_from_b2:
+Removing instruction b3_from_b4:
+Removing instruction b5_from_b3:
+Removing instruction print_ln_from_b5:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction b1_from_print_cls:
@@ -26663,13 +26824,13 @@ Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
 Removing instruction b4_from_b3:
 Removing instruction dtvSetCpuBankSegment1_from_b4:
-Removing instruction b1_from_b7:
+Removing instruction b1_from_b6:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
 Removing instruction b4_from_b3:
 Removing instruction b4_from_b5:
-Removing instruction b8_from_b7:
-Removing instruction dtvSetCpuBankSegment1_from_b8:
+Removing instruction b7_from_b6:
+Removing instruction dtvSetCpuBankSegment1_from_b7:
 Removing instruction b1_from_b7:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b6:
@@ -26680,33 +26841,33 @@ Removing instruction b2_from_b3:
 Removing instruction b3_from_b2:
 Removing instruction b6_from_b5:
 Removing instruction dtvSetCpuBankSegment1_from_b6:
-Removing instruction b3_from_gfx_init_vic_bitmap:
-Removing instruction b1_from_b5:
+Removing instruction b2_from_gfx_init_vic_bitmap:
+Removing instruction b1_from_b3:
 Removing instruction b1_from_bitmap_line_xdyi:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_bitmap_line_ydxi:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_bitmap_line_xdyd:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_bitmap_line_ydxd:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
 Removing instruction b1_from_b2:
-Removing instruction b5_from_b6:
-Removing instruction b6_from_b5:
-Removing instruction b6_from_b7:
-Removing instruction b10_from_b1:
-Removing instruction b2_from_b10:
+Removing instruction b3_from_b4:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b5:
+Removing instruction b6_from_b1:
+Removing instruction b2_from_b6:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
@@ -26727,147 +26888,147 @@ Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b7:
-Removing instruction b1_from_b7:
-Removing instruction b9:
-Removing instruction b1_from_b9:
-Removing instruction b15:
-Removing instruction b16:
-Removing instruction b17:
-Removing instruction b18:
-Removing instruction b19:
-Removing instruction b20:
-Removing instruction b21:
-Removing instruction b22:
-Removing instruction b23:
-Removing instruction get_plane_from_b9:
-Removing instruction b46:
-Removing instruction get_plane_from_b46:
-Removing instruction b47:
-Removing instruction get_vic_screen_from_b47:
-Removing instruction b48:
-Removing instruction b49:
-Removing instruction get_vic_screen_from_b49:
-Removing instruction b50:
-Removing instruction b28:
-Removing instruction b29:
-Removing instruction b31_from_b29:
-Removing instruction b38:
-Removing instruction b51:
-Removing instruction b52:
-Removing instruction breturn:
 Removing instruction b3:
-Removing instruction breturn_from_b3:
-Removing instruction b8_from_keyboard_event_scan:
-Removing instruction b25:
-Removing instruction b21:
-Removing instruction b23:
-Removing instruction b26:
-Removing instruction b24:
-Removing instruction b27:
-Removing instruction b5:
-Removing instruction b28:
-Removing instruction b6:
-Removing instruction b29:
-Removing instruction b7:
-Removing instruction b16:
-Removing instruction b17:
-Removing instruction b18:
-Removing instruction b20:
-Removing instruction breturn:
-Removing instruction breturn:
+Removing instruction b1_from_b3:
+Removing instruction b4:
+Removing instruction b1_from_b4:
 Removing instruction b10:
 Removing instruction b11:
 Removing instruction b12:
 Removing instruction b13:
-Removing instruction breturn_from_b13:
-Removing instruction b4:
-Removing instruction breturn_from_b4:
+Removing instruction b14:
+Removing instruction b15:
+Removing instruction b16:
+Removing instruction b17:
+Removing instruction b18:
+Removing instruction get_plane_from_b9:
+Removing instruction b27:
+Removing instruction get_plane_from_b27:
 Removing instruction b28:
+Removing instruction get_vic_screen_from_b28:
 Removing instruction b29:
 Removing instruction b30:
+Removing instruction get_vic_screen_from_b30:
 Removing instruction b31:
-Removing instruction b32:
-Removing instruction b33:
-Removing instruction b34:
-Removing instruction b35:
-Removing instruction b36:
-Removing instruction b37:
-Removing instruction b38:
-Removing instruction b39:
-Removing instruction b40:
-Removing instruction breturn_from_b40:
-Removing instruction print_set_screen_from_form_mode:
 Removing instruction b21:
 Removing instruction b22:
-Removing instruction b23:
-Removing instruction b24:
-Removing instruction b25:
+Removing instruction b23_from_b22:
 Removing instruction b26:
-Removing instruction b27:
-Removing instruction b28:
-Removing instruction render_preset_name_from_b28:
-Removing instruction b29:
-Removing instruction b7_from_b29:
-Removing instruction b8:
-Removing instruction b11:
-Removing instruction b30:
+Removing instruction b32:
+Removing instruction b33:
 Removing instruction breturn:
+Removing instruction b1:
+Removing instruction breturn_from_b1:
+Removing instruction b7_from_keyboard_event_scan:
 Removing instruction b19:
-Removing instruction b31:
-Removing instruction form_render_values_from_b31:
-Removing instruction b32:
-Removing instruction render_preset_name_from_b32:
+Removing instruction b16:
+Removing instruction b17:
+Removing instruction b20:
+Removing instruction b18:
+Removing instruction b21:
+Removing instruction b4:
+Removing instruction b22:
+Removing instruction b5:
 Removing instruction b23:
-Removing instruction b24:
-Removing instruction b25:
-Removing instruction b26:
-Removing instruction b27:
-Removing instruction b28:
-Removing instruction b29:
-Removing instruction b30:
-Removing instruction b31:
-Removing instruction b32:
+Removing instruction b6:
+Removing instruction b12:
+Removing instruction b13:
+Removing instruction b14:
+Removing instruction b15:
+Removing instruction breturn:
+Removing instruction breturn:
+Removing instruction b2:
+Removing instruction b3:
+Removing instruction b4:
+Removing instruction b5:
+Removing instruction breturn_from_b5:
+Removing instruction b2:
+Removing instruction breturn_from_b2:
+Removing instruction b2:
+Removing instruction b3:
+Removing instruction b4:
+Removing instruction b5:
+Removing instruction b6:
+Removing instruction b7:
+Removing instruction b8:
+Removing instruction b9:
+Removing instruction b10:
+Removing instruction b11:
+Removing instruction b12:
+Removing instruction b13:
+Removing instruction b14:
+Removing instruction breturn_from_b14:
+Removing instruction print_set_screen_from_form_mode:
+Removing instruction b8:
+Removing instruction b9:
+Removing instruction b10:
+Removing instruction b11:
+Removing instruction b12:
+Removing instruction b13:
+Removing instruction b14:
+Removing instruction b15:
+Removing instruction render_preset_name_from_b15:
+Removing instruction b16:
+Removing instruction b2_from_b16:
+Removing instruction b3:
+Removing instruction b5:
+Removing instruction b17:
+Removing instruction breturn:
+Removing instruction b7:
+Removing instruction b18:
+Removing instruction form_render_values_from_b18:
+Removing instruction b19:
+Removing instruction render_preset_name_from_b19:
+Removing instruction b2:
+Removing instruction b3:
+Removing instruction b4:
+Removing instruction b5:
+Removing instruction b6:
+Removing instruction b7:
+Removing instruction b8:
+Removing instruction b9:
+Removing instruction b10:
+Removing instruction b11:
 Removing instruction breturn:
 Removing instruction b1_from_print_str_at:
 Removing instruction breturn:
 Removing instruction b1_from_b2:
 Removing instruction b1_from_form_render_values:
 Removing instruction form_field_ptr_from_b1:
+Removing instruction b2:
+Removing instruction breturn:
+Removing instruction breturn:
+Removing instruction b2:
 Removing instruction b3:
-Removing instruction breturn:
-Removing instruction breturn:
-Removing instruction b23:
-Removing instruction b24:
-Removing instruction b25:
-Removing instruction b26:
-Removing instruction b27:
-Removing instruction b28:
-Removing instruction b29:
-Removing instruction b30:
-Removing instruction b31:
-Removing instruction b32:
-Removing instruction breturn:
-Removing instruction form_field_ptr_from_form_control:
-Removing instruction b33:
-Removing instruction b1_from_b33:
+Removing instruction b4:
+Removing instruction b5:
+Removing instruction b6:
+Removing instruction b7:
 Removing instruction b8:
-Removing instruction b34:
-Removing instruction b35:
+Removing instruction b9:
 Removing instruction b10:
 Removing instruction b11:
-Removing instruction b22_from_b11:
-Removing instruction b22_from_b19:
-Removing instruction b13:
-Removing instruction b14:
-Removing instruction b15:
-Removing instruction b31:
+Removing instruction breturn:
+Removing instruction form_field_ptr_from_form_control:
+Removing instruction b17:
+Removing instruction b1_from_b17:
+Removing instruction b6:
+Removing instruction b18:
+Removing instruction b19:
+Removing instruction b7:
+Removing instruction b8:
+Removing instruction b13_from_b8:
+Removing instruction b13_from_b12:
+Removing instruction b9:
+Removing instruction b10:
+Removing instruction b11:
+Removing instruction b16:
 Removing instruction breturn_from_b5:
 Removing instruction b1_from_form_set_screen:
 Removing instruction breturn:
 Removing instruction breturn:
-Removing instruction b8:
-Removing instruction b9:
+Removing instruction b4:
+Removing instruction b5:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction breturn:
@@ -26913,8 +27074,8 @@ Removing instruction breturn:
 Removing instruction dtvSetCpuBankSegment1_from_gfx_init_plane_horisontal:
 Removing instruction b1_from_gfx_init_plane_horisontal:
 Removing instruction b5:
+Removing instruction b6:
 Removing instruction b7:
-Removing instruction b8:
 Removing instruction breturn:
 Removing instruction dtvSetCpuBankSegment1_from_gfx_init_plane_charset8:
 Removing instruction b9:
@@ -26931,46 +27092,46 @@ Removing instruction dtvSetCpuBankSegment1_from_gfx_init_plane_8bppchunky:
 Removing instruction b1_from_gfx_init_plane_8bppchunky:
 Removing instruction b4:
 Removing instruction dtvSetCpuBankSegment1_from_b4:
-Removing instruction b8:
-Removing instruction b3_from_b8:
+Removing instruction b7:
+Removing instruction b3_from_b7:
 Removing instruction b5:
 Removing instruction b6:
 Removing instruction breturn:
 Removing instruction bitmap_init_from_gfx_init_vic_bitmap:
+Removing instruction b2:
+Removing instruction b1_from_b2:
 Removing instruction b3:
-Removing instruction b1_from_b3:
-Removing instruction b5:
 Removing instruction breturn:
+Removing instruction b2:
 Removing instruction b3:
 Removing instruction b4:
+Removing instruction bitmap_line_ydxi_from_b4:
+Removing instruction bitmap_line_xdyi_from_b8:
+Removing instruction b10:
+Removing instruction bitmap_line_ydxd_from_b10:
+Removing instruction bitmap_line_xdyd_from_b9:
 Removing instruction b5:
-Removing instruction bitmap_line_ydxi_from_b5:
-Removing instruction bitmap_line_xdyi_from_b11:
-Removing instruction b17:
-Removing instruction bitmap_line_ydxd_from_b17:
-Removing instruction bitmap_line_xdyd_from_b15:
-Removing instruction b7:
-Removing instruction b8:
-Removing instruction bitmap_line_ydxd_from_b8:
-Removing instruction bitmap_line_xdyd_from_b21:
-Removing instruction b27:
-Removing instruction bitmap_line_ydxi_from_b27:
-Removing instruction bitmap_line_xdyi_from_b25:
+Removing instruction b6:
+Removing instruction bitmap_line_ydxd_from_b6:
+Removing instruction bitmap_line_xdyd_from_b12:
+Removing instruction b14:
+Removing instruction bitmap_line_ydxi_from_b14:
+Removing instruction bitmap_line_xdyi_from_b13:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_bitmap_clear:
@@ -26978,8 +27139,8 @@ Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_bitmap_init:
 Removing instruction b2_from_b1:
-Removing instruction b5_from_b2:
-Removing instruction b7:
+Removing instruction b3_from_b2:
+Removing instruction b5:
 Removing instruction breturn:
 Removing instruction b1_from_gfx_init_charset:
 Removing instruction b3:
@@ -27005,77 +27166,77 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b11 in bne b11_from_b12
-Skipping double jump to breturn_from_b9 in bne b9
-Skipping double jump to breturn_from_b3 in bne b3
-Skipping double jump to breturn_from_b27 in bne b27
-Skipping double jump to b9 in jmp b1_from_b8
-Skipping double jump to b1 in bpl b36
-Skipping double jump to b22 in bne b37
-Skipping double jump to b37 in bne b38
-Skipping double jump to b22 in jmp b37
-Skipping double jump to breturn_from_b39 in bne b39
-Skipping double jump to b2 in bne b10
+Skipping double jump to b9 in bne b9_from_b10
+Skipping double jump to breturn_from_b1 in bne b1
+Skipping double jump to breturn_from_b1 in bne b1
+Skipping double jump to breturn_from_b1 in bne b1
+Skipping double jump to b4 in jmp b1_from_b3
+Skipping double jump to b1 in bpl b20
+Skipping double jump to b13 in bne b21
+Skipping double jump to b21 in bne b22
+Skipping double jump to b13 in jmp b21
+Skipping double jump to breturn_from_b23 in bne b23
+Skipping double jump to b2 in bne b6
 Succesful ASM optimization Pass5DoubleJumpElimination
 Relabelling long label b1_from_gfx_mode to b10
 Relabelling long label b7_from_b6 to b11
 Relabelling long label b9_from_b8 to b12
-Relabelling long label b34_from_b29 to b13
+Relabelling long label b24_from_b22 to b13
 Relabelling long label breturn_from_keyboard_event_get to b1
-Relabelling long label b1_from_b26 to b4
-Relabelling long label b11_from_b12 to b5
-Relabelling long label b11_from_b25 to b6
-Relabelling long label breturn_from_b9 to b1
-Relabelling long label breturn_from_b10 to b2
-Relabelling long label breturn_from_b11 to b3
-Relabelling long label breturn_from_b12 to b4
-Relabelling long label breturn_from_b3 to b1
-Relabelling long label breturn_from_b27 to b1
-Relabelling long label breturn_from_b28 to b2
-Relabelling long label breturn_from_b29 to b3
-Relabelling long label breturn_from_b30 to b4
-Relabelling long label breturn_from_b31 to b5
-Relabelling long label breturn_from_b32 to b6
-Relabelling long label breturn_from_b33 to b7
-Relabelling long label breturn_from_b34 to b8
-Relabelling long label breturn_from_b35 to b9
-Relabelling long label breturn_from_b36 to b10
-Relabelling long label breturn_from_b37 to b11
-Relabelling long label breturn_from_b38 to b12
-Relabelling long label breturn_from_b39 to b13
-Relabelling long label b1_from_b8 to b1
-Relabelling long label b22_from_b23 to b1
-Relabelling long label b22_from_b24 to b2
-Relabelling long label b22_from_b25 to b3
-Relabelling long label b22_from_b26 to b4
-Relabelling long label b22_from_b27 to b5
-Relabelling long label b22_from_b28 to b6
-Relabelling long label b22_from_b29 to b7
-Relabelling long label b22_from_b30 to b8
-Relabelling long label b22_from_b31 to b9
-Relabelling long label b22_from_b32 to b10
-Relabelling long label b22_from_b23 to b1
-Relabelling long label b22_from_b24 to b2
-Relabelling long label b22_from_b25 to b3
-Relabelling long label b22_from_b26 to b4
-Relabelling long label b22_from_b27 to b5
-Relabelling long label b22_from_b28 to b6
-Relabelling long label b22_from_b29 to b7
-Relabelling long label b22_from_b30 to b8
-Relabelling long label b22_from_b31 to b9
-Relabelling long label b22_from_b32 to b10
-Relabelling long label breturn_from_b39 to b6
+Relabelling long label b1_from_b20 to b4
+Relabelling long label b9_from_b10 to b5
+Relabelling long label b9_from_b19 to b6
+Relabelling long label breturn_from_b1 to b2
+Relabelling long label breturn_from_b2 to b3
+Relabelling long label breturn_from_b3 to b4
+Relabelling long label breturn_from_b4 to b5
+Relabelling long label breturn_from_b1 to b2
+Relabelling long label breturn_from_b1 to b2
+Relabelling long label breturn_from_b10 to b3
+Relabelling long label breturn_from_b11 to b4
+Relabelling long label breturn_from_b12 to b5
+Relabelling long label breturn_from_b13 to b6
+Relabelling long label breturn_from_b2 to b7
+Relabelling long label breturn_from_b3 to b8
+Relabelling long label breturn_from_b4 to b9
+Relabelling long label breturn_from_b5 to b10
+Relabelling long label breturn_from_b6 to b11
+Relabelling long label breturn_from_b7 to b12
+Relabelling long label breturn_from_b8 to b13
+Relabelling long label breturn_from_b9 to b14
+Relabelling long label b1_from_b3 to b1
+Relabelling long label b1_from_b10 to b2
+Relabelling long label b1_from_b11 to b3
+Relabelling long label b1_from_b2 to b4
+Relabelling long label b1_from_b3 to b5
+Relabelling long label b1_from_b4 to b6
+Relabelling long label b1_from_b5 to b7
+Relabelling long label b1_from_b6 to b8
+Relabelling long label b1_from_b7 to b9
+Relabelling long label b1_from_b8 to b10
+Relabelling long label b1_from_b9 to b11
+Relabelling long label b1_from_b10 to b2
+Relabelling long label b1_from_b11 to b3
+Relabelling long label b1_from_b2 to b4
+Relabelling long label b1_from_b3 to b5
+Relabelling long label b1_from_b4 to b6
+Relabelling long label b1_from_b5 to b7
+Relabelling long label b1_from_b6 to b8
+Relabelling long label b1_from_b7 to b9
+Relabelling long label b1_from_b8 to b10
+Relabelling long label b1_from_b9 to b11
+Relabelling long label breturn_from_b23 to b6
 Relabelling long label b4_from_b3 to b5
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b26
-Removing instruction jmp b27
-Removing instruction jmp b31
-Removing instruction jmp b34
-Removing instruction jmp b8
+Removing instruction jmp b19
+Removing instruction jmp b20
+Removing instruction jmp b23
+Removing instruction jmp b24
 Removing instruction jmp b7
-Removing instruction jmp b9
+Removing instruction jmp b2
+Removing instruction jmp b4
 Removing instruction jmp b1
-Removing instruction jmp b45
+Removing instruction jmp b13
 Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -27095,7 +27256,7 @@ Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b1
@@ -27118,45 +27279,42 @@ Removing instruction lda y0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
 Removing instruction b5:
-Removing instruction b9:
-Removing instruction b3:
-Removing instruction b27:
 Removing instruction b1:
-Removing instruction b38:
-Removing instruction b39:
-Removing instruction b36:
-Removing instruction b10:
+Removing instruction b1:
+Removing instruction b1:
+Removing instruction b1:
+Removing instruction b22:
+Removing instruction b23:
+Removing instruction b20:
+Removing instruction b6:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Skipping double jump to b22 in bne b37
+Skipping double jump to b13 in bne b21
 Succesful ASM optimization Pass5DoubleJumpElimination
-Removing unreachable instruction jmp b11
-Removing unreachable instruction jmp b1
-Removing unreachable instruction jmp b1
-Removing unreachable instruction jmp b1
-Removing unreachable instruction jmp b22
+Removing unreachable instruction jmp b9
+Removing unreachable instruction jmp b2
+Removing unreachable instruction jmp b2
+Removing unreachable instruction jmp b2
+Removing unreachable instruction jmp b13
 Removing unreachable instruction jmp b6
 Removing unreachable instruction jmp b1
 Removing unreachable instruction jmp b2
 Succesful ASM optimization Pass5UnreachableCodeElimination
-Removing instruction b37:
+Removing instruction b21:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing unreachable instruction jmp b22
+Removing unreachable instruction jmp b13
 Succesful ASM optimization Pass5UnreachableCodeElimination
-Fixing long branch [756] beq b5 to bne
-Fixing long branch [760] beq b6 to bne
-Fixing long branch [764] beq b7 to bne
-Fixing long branch [768] beq b8 to bne
-Fixing long branch [754] beq b4 to bne
-Fixing long branch [774] beq b9 to bne
-Fixing long branch [778] beq b10 to bne
-Fixing long branch [782] beq b11 to bne
-Fixing long branch [786] beq b12 to bne
-Fixing long branch [752] beq b3 to bne
-Fixing long branch [792] beq b13 to bne
-Fixing long branch [1334] bmi b2 to bpl
+Fixing long branch [750] beq b7 to bne
+Fixing long branch [754] beq b8 to bne
+Fixing long branch [758] beq b9 to bne
+Fixing long branch [762] beq b10 to bne
+Fixing long branch [766] beq b11 to bne
+Fixing long branch [770] beq b12 to bne
+Fixing long branch [774] beq b13 to bne
+Fixing long branch [778] beq b14 to bne
+Fixing long branch [1328] bmi b2 to bpl
 
 FINAL SYMBOL TABLE
-(label) @68
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -27511,19 +27669,19 @@ FINAL SYMBOL TABLE
 (byte) WHITE
 (byte) YELLOW
 (void()) apply_preset((byte) apply_preset::idx)
-(label) apply_preset::@22
-(label) apply_preset::@23
-(label) apply_preset::@24
-(label) apply_preset::@25
-(label) apply_preset::@26
-(label) apply_preset::@27
-(label) apply_preset::@28
-(label) apply_preset::@29
-(label) apply_preset::@30
-(label) apply_preset::@31
-(label) apply_preset::@32
-(label) apply_preset::@33
-(label) apply_preset::@45
+(label) apply_preset::@1
+(label) apply_preset::@10
+(label) apply_preset::@11
+(label) apply_preset::@12
+(label) apply_preset::@13
+(label) apply_preset::@2
+(label) apply_preset::@3
+(label) apply_preset::@4
+(label) apply_preset::@5
+(label) apply_preset::@6
+(label) apply_preset::@7
+(label) apply_preset::@8
+(label) apply_preset::@9
 (label) apply_preset::@return
 (byte) apply_preset::i
 (byte) apply_preset::i#1 reg byte y 1501.5
@@ -27557,11 +27715,11 @@ FINAL SYMBOL TABLE
 (byte~) bitmap_init::$8 reg byte a 22.0
 (byte~) bitmap_init::$9 reg byte a 22.0
 (label) bitmap_init::@1
-(label) bitmap_init::@10
 (label) bitmap_init::@2
+(label) bitmap_init::@3
+(label) bitmap_init::@4
 (label) bitmap_init::@5
 (label) bitmap_init::@6
-(label) bitmap_init::@7
 (label) bitmap_init::@return
 (byte*) bitmap_init::bitmap
 (byte) bitmap_init::bits
@@ -27582,17 +27740,17 @@ FINAL SYMBOL TABLE
 (label) bitmap_line::@1
 (label) bitmap_line::@10
 (label) bitmap_line::@11
-(label) bitmap_line::@15
-(label) bitmap_line::@17
-(label) bitmap_line::@20
-(label) bitmap_line::@21
-(label) bitmap_line::@25
-(label) bitmap_line::@27
+(label) bitmap_line::@12
+(label) bitmap_line::@13
+(label) bitmap_line::@14
+(label) bitmap_line::@2
 (label) bitmap_line::@3
 (label) bitmap_line::@4
 (label) bitmap_line::@5
+(label) bitmap_line::@6
 (label) bitmap_line::@7
 (label) bitmap_line::@8
+(label) bitmap_line::@9
 (label) bitmap_line::@return
 (byte) bitmap_line::x0
 (byte) bitmap_line::x0#0 x0 zp ZP_BYTE:13 1.260869565217391
@@ -27615,7 +27773,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_xdyd::@1
 (label) bitmap_line_xdyd::@2
 (label) bitmap_line_xdyd::@3
-(label) bitmap_line_xdyd::@5
+(label) bitmap_line_xdyd::@4
 (label) bitmap_line_xdyd::@return
 (byte) bitmap_line_xdyd::e
 (byte) bitmap_line_xdyd::e#0 e zp ZP_BYTE:18 4.0
@@ -27653,7 +27811,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_xdyi::@1
 (label) bitmap_line_xdyi::@2
 (label) bitmap_line_xdyi::@3
-(label) bitmap_line_xdyi::@5
+(label) bitmap_line_xdyi::@4
 (label) bitmap_line_xdyi::@return
 (byte) bitmap_line_xdyi::e
 (byte) bitmap_line_xdyi::e#0 e zp ZP_BYTE:18 4.0
@@ -27691,7 +27849,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_ydxd::@1
 (label) bitmap_line_ydxd::@2
 (label) bitmap_line_ydxd::@3
-(label) bitmap_line_ydxd::@5
+(label) bitmap_line_ydxd::@4
 (label) bitmap_line_ydxd::@return
 (byte) bitmap_line_ydxd::e
 (byte) bitmap_line_ydxd::e#0 e zp ZP_BYTE:13 4.0
@@ -27729,7 +27887,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_ydxi::@1
 (label) bitmap_line_ydxi::@2
 (label) bitmap_line_ydxi::@3
-(label) bitmap_line_ydxi::@5
+(label) bitmap_line_ydxi::@4
 (label) bitmap_line_ydxi::@return
 (byte) bitmap_line_ydxi::e
 (byte) bitmap_line_ydxi::e#0 e zp ZP_BYTE:13 4.0
@@ -27838,26 +27996,26 @@ FINAL SYMBOL TABLE
 (label) form_control::@1
 (label) form_control::@10
 (label) form_control::@11
+(label) form_control::@12
 (label) form_control::@13
 (label) form_control::@14
 (label) form_control::@15
+(label) form_control::@16
+(label) form_control::@17
+(label) form_control::@18
 (label) form_control::@19
 (label) form_control::@2
+(label) form_control::@20
+(label) form_control::@21
 (label) form_control::@22
-(label) form_control::@26
-(label) form_control::@29
+(label) form_control::@23
 (label) form_control::@3
-(label) form_control::@31
-(label) form_control::@33
-(label) form_control::@34
-(label) form_control::@35
-(label) form_control::@36
-(label) form_control::@37
-(label) form_control::@38
-(label) form_control::@39
 (label) form_control::@4
 (label) form_control::@5
+(label) form_control::@6
+(label) form_control::@7
 (label) form_control::@8
+(label) form_control::@9
 (label) form_control::@return
 (byte*) form_control::field
 (byte*) form_control::field#0 field zp ZP_WORD:3 0.5925925925925926
@@ -27933,21 +28091,21 @@ FINAL SYMBOL TABLE
 (void()) form_mode()
 (byte~) form_mode::$36 reg byte a 2002.0
 (label) form_mode::@1
+(label) form_mode::@10
 (label) form_mode::@11
 (label) form_mode::@12
+(label) form_mode::@13
+(label) form_mode::@14
+(label) form_mode::@15
+(label) form_mode::@16
+(label) form_mode::@17
+(label) form_mode::@18
 (label) form_mode::@19
-(label) form_mode::@21
-(label) form_mode::@22
-(label) form_mode::@23
-(label) form_mode::@24
-(label) form_mode::@25
-(label) form_mode::@26
-(label) form_mode::@27
-(label) form_mode::@28
-(label) form_mode::@29
-(label) form_mode::@30
-(label) form_mode::@31
-(label) form_mode::@32
+(label) form_mode::@2
+(label) form_mode::@3
+(label) form_mode::@4
+(label) form_mode::@5
+(label) form_mode::@6
 (label) form_mode::@7
 (label) form_mode::@8
 (label) form_mode::@9
@@ -27962,7 +28120,7 @@ FINAL SYMBOL TABLE
 (byte*) form_preset
 (void()) form_render_values()
 (label) form_render_values::@1
-(label) form_render_values::@3
+(label) form_render_values::@2
 (label) form_render_values::@return
 (byte*) form_render_values::field
 (byte*) form_render_values::field#0 field zp ZP_WORD:3 2002.0
@@ -28004,20 +28162,20 @@ FINAL SYMBOL TABLE
 (byte*) form_vic_screen
 (const byte*) form_vic_screen#0 form_vic_screen = (const byte[]) form_fields_val#0+(byte/signed byte/word/signed word/dword/signed dword) $18
 (dword()) get_plane((byte) get_plane::idx)
-(label) get_plane::@27
-(label) get_plane::@28
-(label) get_plane::@29
-(label) get_plane::@30
-(label) get_plane::@31
-(label) get_plane::@32
-(label) get_plane::@33
-(label) get_plane::@34
-(label) get_plane::@35
-(label) get_plane::@36
-(label) get_plane::@37
-(label) get_plane::@38
-(label) get_plane::@39
-(label) get_plane::@40
+(label) get_plane::@1
+(label) get_plane::@10
+(label) get_plane::@11
+(label) get_plane::@12
+(label) get_plane::@13
+(label) get_plane::@14
+(label) get_plane::@2
+(label) get_plane::@3
+(label) get_plane::@4
+(label) get_plane::@5
+(label) get_plane::@6
+(label) get_plane::@7
+(label) get_plane::@8
+(label) get_plane::@9
 (label) get_plane::@return
 (byte) get_plane::idx
 (byte) get_plane::idx#0 reg byte a 4.0
@@ -28028,8 +28186,8 @@ FINAL SYMBOL TABLE
 (dword) get_plane::return#16 return zp ZP_DWORD:9 4.0
 (dword) get_plane::return#17 return zp ZP_DWORD:9 4.0
 (byte*()) get_vic_charset((byte) get_vic_charset::idx)
-(label) get_vic_charset::@3
-(label) get_vic_charset::@4
+(label) get_vic_charset::@1
+(label) get_vic_charset::@2
 (label) get_vic_charset::@return
 (byte) get_vic_charset::idx
 (byte) get_vic_charset::idx#0 reg byte a 3.0
@@ -28037,11 +28195,11 @@ FINAL SYMBOL TABLE
 (byte*) get_vic_charset::return#2 return zp ZP_WORD:3 0.6666666666666666
 (byte*) get_vic_charset::return#4 return zp ZP_WORD:3 4.0
 (byte*()) get_vic_screen((byte) get_vic_screen::idx)
-(label) get_vic_screen::@10
-(label) get_vic_screen::@11
-(label) get_vic_screen::@12
-(label) get_vic_screen::@13
-(label) get_vic_screen::@9
+(label) get_vic_screen::@1
+(label) get_vic_screen::@2
+(label) get_vic_screen::@3
+(label) get_vic_screen::@4
+(label) get_vic_screen::@5
 (label) get_vic_screen::@return
 (byte) get_vic_screen::idx
 (byte) get_vic_screen::idx#0 reg byte a 4.0
@@ -28095,7 +28253,7 @@ FINAL SYMBOL TABLE
 (label) gfx_init_plane_8bppchunky::@4
 (label) gfx_init_plane_8bppchunky::@5
 (label) gfx_init_plane_8bppchunky::@6
-(label) gfx_init_plane_8bppchunky::@8
+(label) gfx_init_plane_8bppchunky::@7
 (label) gfx_init_plane_8bppchunky::@return
 (byte) gfx_init_plane_8bppchunky::c
 (byte) gfx_init_plane_8bppchunky::c#0 reg byte a 202.0
@@ -28200,8 +28358,8 @@ FINAL SYMBOL TABLE
 (label) gfx_init_plane_horisontal::@3
 (label) gfx_init_plane_horisontal::@4
 (label) gfx_init_plane_horisontal::@5
+(label) gfx_init_plane_horisontal::@6
 (label) gfx_init_plane_horisontal::@7
-(label) gfx_init_plane_horisontal::@8
 (label) gfx_init_plane_horisontal::@return
 (byte) gfx_init_plane_horisontal::ax
 (byte) gfx_init_plane_horisontal::ax#1 reg byte x 151.5
@@ -28354,8 +28512,8 @@ FINAL SYMBOL TABLE
 (byte) gfx_init_screen4::cy#4 cy zp ZP_BYTE:2 3.6666666666666665
 (void()) gfx_init_vic_bitmap()
 (label) gfx_init_vic_bitmap::@1
+(label) gfx_init_vic_bitmap::@2
 (label) gfx_init_vic_bitmap::@3
-(label) gfx_init_vic_bitmap::@5
 (label) gfx_init_vic_bitmap::@return
 (byte) gfx_init_vic_bitmap::l
 (byte) gfx_init_vic_bitmap::l#1 l zp ZP_BYTE:2 16.5
@@ -28409,6 +28567,11 @@ FINAL SYMBOL TABLE
 (byte~) gfx_mode::$70 reg byte a 4.0
 (byte~) gfx_mode::$71 reg byte a 4.0
 (label) gfx_mode::@1
+(label) gfx_mode::@10
+(label) gfx_mode::@11
+(label) gfx_mode::@12
+(label) gfx_mode::@13
+(label) gfx_mode::@14
 (label) gfx_mode::@15
 (label) gfx_mode::@16
 (label) gfx_mode::@17
@@ -28419,24 +28582,19 @@ FINAL SYMBOL TABLE
 (label) gfx_mode::@21
 (label) gfx_mode::@22
 (label) gfx_mode::@23
+(label) gfx_mode::@24
+(label) gfx_mode::@25
 (label) gfx_mode::@26
 (label) gfx_mode::@27
 (label) gfx_mode::@28
 (label) gfx_mode::@29
 (label) gfx_mode::@3
+(label) gfx_mode::@30
 (label) gfx_mode::@31
-(label) gfx_mode::@34
-(label) gfx_mode::@36
-(label) gfx_mode::@38
+(label) gfx_mode::@32
+(label) gfx_mode::@33
 (label) gfx_mode::@4
-(label) gfx_mode::@46
-(label) gfx_mode::@47
-(label) gfx_mode::@48
-(label) gfx_mode::@49
 (label) gfx_mode::@5
-(label) gfx_mode::@50
-(label) gfx_mode::@51
-(label) gfx_mode::@52
 (label) gfx_mode::@6
 (label) gfx_mode::@7
 (label) gfx_mode::@8
@@ -28493,7 +28651,7 @@ FINAL SYMBOL TABLE
 (byte) gfx_mode::vic_control2#2 reg byte a 2.0
 (byte[]) keyboard_char_keycodes
 (byte()) keyboard_event_get()
-(label) keyboard_event_get::@3
+(label) keyboard_event_get::@1
 (label) keyboard_event_get::@return
 (byte) keyboard_event_get::return
 (byte) keyboard_event_get::return#1 reg byte a 4.0
@@ -28526,25 +28684,25 @@ FINAL SYMBOL TABLE
 (label) keyboard_event_scan::@10
 (label) keyboard_event_scan::@11
 (label) keyboard_event_scan::@12
+(label) keyboard_event_scan::@13
 (label) keyboard_event_scan::@14
+(label) keyboard_event_scan::@15
 (label) keyboard_event_scan::@16
 (label) keyboard_event_scan::@17
 (label) keyboard_event_scan::@18
+(label) keyboard_event_scan::@19
 (label) keyboard_event_scan::@2
 (label) keyboard_event_scan::@20
 (label) keyboard_event_scan::@21
+(label) keyboard_event_scan::@22
 (label) keyboard_event_scan::@23
-(label) keyboard_event_scan::@24
-(label) keyboard_event_scan::@25
-(label) keyboard_event_scan::@26
-(label) keyboard_event_scan::@27
-(label) keyboard_event_scan::@28
-(label) keyboard_event_scan::@29
 (label) keyboard_event_scan::@3
+(label) keyboard_event_scan::@4
 (label) keyboard_event_scan::@5
 (label) keyboard_event_scan::@6
 (label) keyboard_event_scan::@7
 (label) keyboard_event_scan::@8
+(label) keyboard_event_scan::@9
 (label) keyboard_event_scan::@return
 (byte) keyboard_event_scan::col
 (byte) keyboard_event_scan::col#1 reg byte x 150001.5
@@ -28603,8 +28761,8 @@ FINAL SYMBOL TABLE
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@7
-(label) main::@9
+(label) main::@3
+(label) main::@4
 (byte[]) preset_8bpppixelcell
 (const byte[]) preset_8bpppixelcell#0 preset_8bpppixelcell = { (byte/signed byte/word/signed word/dword/signed dword) $a, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) $b, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0 }
 (byte[]) preset_chunky
@@ -28669,10 +28827,10 @@ FINAL SYMBOL TABLE
 (byte*) print_str_at::str#2 str zp ZP_WORD:3 1001.5
 (void()) print_str_lines((byte*) print_str_lines::str)
 (label) print_str_lines::@1
-(label) print_str_lines::@6
-(label) print_str_lines::@7
-(label) print_str_lines::@8
-(label) print_str_lines::@9
+(label) print_str_lines::@2
+(label) print_str_lines::@3
+(label) print_str_lines::@4
+(label) print_str_lines::@5
 (label) print_str_lines::@return
 (byte) print_str_lines::ch
 (byte) print_str_lines::ch#0 reg byte a 667.3333333333334
@@ -28682,18 +28840,18 @@ FINAL SYMBOL TABLE
 (byte*) print_str_lines::str#4 str zp ZP_WORD:3 1552.0
 (byte*) print_str_lines::str#5 str zp ZP_WORD:3 1.0
 (void()) render_preset_name((byte) render_preset_name::idx)
-(label) render_preset_name::@22
-(label) render_preset_name::@23
-(label) render_preset_name::@24
-(label) render_preset_name::@25
-(label) render_preset_name::@26
-(label) render_preset_name::@27
-(label) render_preset_name::@28
-(label) render_preset_name::@29
-(label) render_preset_name::@30
-(label) render_preset_name::@31
-(label) render_preset_name::@32
-(label) render_preset_name::@33
+(label) render_preset_name::@1
+(label) render_preset_name::@10
+(label) render_preset_name::@11
+(label) render_preset_name::@12
+(label) render_preset_name::@2
+(label) render_preset_name::@3
+(label) render_preset_name::@4
+(label) render_preset_name::@5
+(label) render_preset_name::@6
+(label) render_preset_name::@7
+(label) render_preset_name::@8
+(label) render_preset_name::@9
 (label) render_preset_name::@return
 (byte) render_preset_name::idx
 (byte) render_preset_name::idx#0 reg byte a 4.0
@@ -28866,7 +29024,7 @@ reg byte a [ gfx_init_screen0::$3 ]
 
 
 FINAL ASSEMBLER
-Score: 10142481
+Score: 10142472
 
 //SEG0 File Comments
 // Interactive Explorer for C64DTV Screen Modes
@@ -29044,10 +29202,10 @@ Score: 10142481
   .label form_cursor_count = $d
   .label form_field_idx = $e
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @68 [phi:@begin->@68]
-//SEG5 @68
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @68 to @end [phi:@68->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -29067,18 +29225,18 @@ main: {
     sta DTV_FEATURE
   //SEG14 [8] call keyboard_init 
     jsr keyboard_init
-  //SEG15 [9] phi from main to main::@7 [phi:main->main::@7]
-  //SEG16 main::@7
+  //SEG15 [9] phi from main to main::@3 [phi:main->main::@3]
+  //SEG16 main::@3
   //SEG17 [10] call gfx_init 
-  //SEG18 [449] phi from main::@7 to gfx_init [phi:main::@7->gfx_init]
+  //SEG18 [449] phi from main::@3 to gfx_init [phi:main::@3->gfx_init]
     jsr gfx_init
-  //SEG19 [11] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  //SEG20 [11] phi (byte) form_field_idx#1 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@1#0] -- vbuz1=vbuc1 
+  //SEG19 [11] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  //SEG20 [11] phi (byte) form_field_idx#1 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta form_field_idx
-  //SEG21 [11] phi (byte) keyboard_events_size#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@1#1] -- vbuz1=vbuc1 
+  //SEG21 [11] phi (byte) keyboard_events_size#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@1#1] -- vbuz1=vbuc1 
     sta keyboard_events_size
-  //SEG22 [11] phi (signed byte) form_cursor_count#1 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@7->main::@1#2] -- vbsz1=vbuc1 
+  //SEG22 [11] phi (signed byte) form_cursor_count#1 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@3->main::@1#2] -- vbsz1=vbuc1 
     lda #FORM_CURSOR_BLINK/2
     sta form_cursor_count
   //SEG23 main::@1
@@ -29088,14 +29246,14 @@ main: {
   //SEG26 [13] call form_mode 
   //SEG27 [254] phi from main::@2 to form_mode [phi:main::@2->form_mode]
     jsr form_mode
-  //SEG28 [14] phi from main::@2 to main::@9 [phi:main::@2->main::@9]
-  //SEG29 main::@9
+  //SEG28 [14] phi from main::@2 to main::@4 [phi:main::@2->main::@4]
+  //SEG29 main::@4
   //SEG30 [15] call gfx_mode 
     jsr gfx_mode
-  //SEG31 [11] phi from main::@9 to main::@1 [phi:main::@9->main::@1]
-  //SEG32 [11] phi (byte) form_field_idx#1 = (byte) form_field_idx#18 [phi:main::@9->main::@1#0] -- register_copy 
-  //SEG33 [11] phi (byte) keyboard_events_size#27 = (byte) keyboard_events_size#24 [phi:main::@9->main::@1#1] -- register_copy 
-  //SEG34 [11] phi (signed byte) form_cursor_count#1 = (signed byte) form_cursor_count#16 [phi:main::@9->main::@1#2] -- register_copy 
+  //SEG31 [11] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  //SEG32 [11] phi (byte) form_field_idx#1 = (byte) form_field_idx#18 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG33 [11] phi (byte) keyboard_events_size#27 = (byte) keyboard_events_size#24 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG34 [11] phi (signed byte) form_cursor_count#1 = (signed byte) form_cursor_count#16 [phi:main::@4->main::@1#2] -- register_copy 
     jmp b2
 }
 //SEG35 gfx_mode
@@ -29124,10 +29282,10 @@ gfx_mode: {
     lda form_ctrl_line
     cmp #0
     beq b10
-  //SEG37 [17] phi from gfx_mode to gfx_mode::@15 [phi:gfx_mode->gfx_mode::@15]
-  //SEG38 gfx_mode::@15
-  //SEG39 [18] phi from gfx_mode::@15 to gfx_mode::@1 [phi:gfx_mode::@15->gfx_mode::@1]
-  //SEG40 [18] phi (byte) gfx_mode::dtv_control#14 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) DTV_LINEAR#0 [phi:gfx_mode::@15->gfx_mode::@1#0] -- vbuxx=vbuc1 
+  //SEG37 [17] phi from gfx_mode to gfx_mode::@10 [phi:gfx_mode->gfx_mode::@10]
+  //SEG38 gfx_mode::@10
+  //SEG39 [18] phi from gfx_mode::@10 to gfx_mode::@1 [phi:gfx_mode::@10->gfx_mode::@1]
+  //SEG40 [18] phi (byte) gfx_mode::dtv_control#14 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) DTV_LINEAR#0 [phi:gfx_mode::@10->gfx_mode::@1#0] -- vbuxx=vbuc1 
     ldx #0|DTV_LINEAR
     jmp b1
   //SEG41 [18] phi from gfx_mode to gfx_mode::@1 [phi:gfx_mode->gfx_mode::@1]
@@ -29140,65 +29298,65 @@ gfx_mode: {
     lda form_ctrl_borof
     cmp #0
     beq b2
-  //SEG45 gfx_mode::@16
+  //SEG45 gfx_mode::@11
   //SEG46 [20] (byte) gfx_mode::dtv_control#2 ← (byte) gfx_mode::dtv_control#14 | (const byte) DTV_BORDER_OFF#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_BORDER_OFF
     tax
-  //SEG47 [21] phi from gfx_mode::@1 gfx_mode::@16 to gfx_mode::@2 [phi:gfx_mode::@1/gfx_mode::@16->gfx_mode::@2]
-  //SEG48 [21] phi (byte) gfx_mode::dtv_control#15 = (byte) gfx_mode::dtv_control#14 [phi:gfx_mode::@1/gfx_mode::@16->gfx_mode::@2#0] -- register_copy 
+  //SEG47 [21] phi from gfx_mode::@1 gfx_mode::@11 to gfx_mode::@2 [phi:gfx_mode::@1/gfx_mode::@11->gfx_mode::@2]
+  //SEG48 [21] phi (byte) gfx_mode::dtv_control#15 = (byte) gfx_mode::dtv_control#14 [phi:gfx_mode::@1/gfx_mode::@11->gfx_mode::@2#0] -- register_copy 
   //SEG49 gfx_mode::@2
   b2:
   //SEG50 [22] if(*((const byte*) form_ctrl_hicol#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@3 -- _deref_pbuc1_eq_0_then_la1 
     lda form_ctrl_hicol
     cmp #0
     beq b3
-  //SEG51 gfx_mode::@17
+  //SEG51 gfx_mode::@12
   //SEG52 [23] (byte) gfx_mode::dtv_control#3 ← (byte) gfx_mode::dtv_control#15 | (const byte) DTV_HIGHCOLOR#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_HIGHCOLOR
     tax
-  //SEG53 [24] phi from gfx_mode::@17 gfx_mode::@2 to gfx_mode::@3 [phi:gfx_mode::@17/gfx_mode::@2->gfx_mode::@3]
-  //SEG54 [24] phi (byte) gfx_mode::dtv_control#10 = (byte) gfx_mode::dtv_control#3 [phi:gfx_mode::@17/gfx_mode::@2->gfx_mode::@3#0] -- register_copy 
+  //SEG53 [24] phi from gfx_mode::@12 gfx_mode::@2 to gfx_mode::@3 [phi:gfx_mode::@12/gfx_mode::@2->gfx_mode::@3]
+  //SEG54 [24] phi (byte) gfx_mode::dtv_control#10 = (byte) gfx_mode::dtv_control#3 [phi:gfx_mode::@12/gfx_mode::@2->gfx_mode::@3#0] -- register_copy 
   //SEG55 gfx_mode::@3
   b3:
   //SEG56 [25] if(*((const byte*) form_ctrl_overs#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@4 -- _deref_pbuc1_eq_0_then_la1 
     lda form_ctrl_overs
     cmp #0
     beq b4
-  //SEG57 gfx_mode::@18
+  //SEG57 gfx_mode::@13
   //SEG58 [26] (byte) gfx_mode::dtv_control#4 ← (byte) gfx_mode::dtv_control#10 | (const byte) DTV_OVERSCAN#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_OVERSCAN
     tax
-  //SEG59 [27] phi from gfx_mode::@18 gfx_mode::@3 to gfx_mode::@4 [phi:gfx_mode::@18/gfx_mode::@3->gfx_mode::@4]
-  //SEG60 [27] phi (byte) gfx_mode::dtv_control#11 = (byte) gfx_mode::dtv_control#4 [phi:gfx_mode::@18/gfx_mode::@3->gfx_mode::@4#0] -- register_copy 
+  //SEG59 [27] phi from gfx_mode::@13 gfx_mode::@3 to gfx_mode::@4 [phi:gfx_mode::@13/gfx_mode::@3->gfx_mode::@4]
+  //SEG60 [27] phi (byte) gfx_mode::dtv_control#11 = (byte) gfx_mode::dtv_control#4 [phi:gfx_mode::@13/gfx_mode::@3->gfx_mode::@4#0] -- register_copy 
   //SEG61 gfx_mode::@4
   b4:
   //SEG62 [28] if(*((const byte*) form_ctrl_colof#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@5 -- _deref_pbuc1_eq_0_then_la1 
     lda form_ctrl_colof
     cmp #0
     beq b5
-  //SEG63 gfx_mode::@19
+  //SEG63 gfx_mode::@14
   //SEG64 [29] (byte) gfx_mode::dtv_control#5 ← (byte) gfx_mode::dtv_control#11 | (const byte) DTV_COLORRAM_OFF#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_COLORRAM_OFF
     tax
-  //SEG65 [30] phi from gfx_mode::@19 gfx_mode::@4 to gfx_mode::@5 [phi:gfx_mode::@19/gfx_mode::@4->gfx_mode::@5]
-  //SEG66 [30] phi (byte) gfx_mode::dtv_control#13 = (byte) gfx_mode::dtv_control#5 [phi:gfx_mode::@19/gfx_mode::@4->gfx_mode::@5#0] -- register_copy 
+  //SEG65 [30] phi from gfx_mode::@14 gfx_mode::@4 to gfx_mode::@5 [phi:gfx_mode::@14/gfx_mode::@4->gfx_mode::@5]
+  //SEG66 [30] phi (byte) gfx_mode::dtv_control#13 = (byte) gfx_mode::dtv_control#5 [phi:gfx_mode::@14/gfx_mode::@4->gfx_mode::@5#0] -- register_copy 
   //SEG67 gfx_mode::@5
   b5:
   //SEG68 [31] if(*((const byte*) form_ctrl_chunk#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@6 -- _deref_pbuc1_eq_0_then_la1 
     lda form_ctrl_chunk
     cmp #0
     beq b6
-  //SEG69 gfx_mode::@20
+  //SEG69 gfx_mode::@15
   //SEG70 [32] (byte) gfx_mode::dtv_control#6 ← (byte) gfx_mode::dtv_control#13 | (const byte) DTV_CHUNKY#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_CHUNKY
     tax
-  //SEG71 [33] phi from gfx_mode::@20 gfx_mode::@5 to gfx_mode::@6 [phi:gfx_mode::@20/gfx_mode::@5->gfx_mode::@6]
-  //SEG72 [33] phi (byte) gfx_mode::dtv_control#12 = (byte) gfx_mode::dtv_control#6 [phi:gfx_mode::@20/gfx_mode::@5->gfx_mode::@6#0] -- register_copy 
+  //SEG71 [33] phi from gfx_mode::@15 gfx_mode::@5 to gfx_mode::@6 [phi:gfx_mode::@15/gfx_mode::@5->gfx_mode::@6]
+  //SEG72 [33] phi (byte) gfx_mode::dtv_control#12 = (byte) gfx_mode::dtv_control#6 [phi:gfx_mode::@15/gfx_mode::@5->gfx_mode::@6#0] -- register_copy 
   //SEG73 gfx_mode::@6
   b6:
   //SEG74 [34] *((const byte*) DTV_CONTROL#0) ← (byte) gfx_mode::dtv_control#12 -- _deref_pbuc1=vbuxx 
@@ -29207,10 +29365,10 @@ gfx_mode: {
     lda form_ctrl_ecm
     cmp #0
     beq b11
-  //SEG76 [36] phi from gfx_mode::@6 to gfx_mode::@21 [phi:gfx_mode::@6->gfx_mode::@21]
-  //SEG77 gfx_mode::@21
-  //SEG78 [37] phi from gfx_mode::@21 to gfx_mode::@7 [phi:gfx_mode::@21->gfx_mode::@7]
-  //SEG79 [37] phi (byte) gfx_mode::vic_control#5 = (const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3|(const byte) VIC_ECM#0 [phi:gfx_mode::@21->gfx_mode::@7#0] -- vbuxx=vbuc1 
+  //SEG76 [36] phi from gfx_mode::@6 to gfx_mode::@16 [phi:gfx_mode::@6->gfx_mode::@16]
+  //SEG77 gfx_mode::@16
+  //SEG78 [37] phi from gfx_mode::@16 to gfx_mode::@7 [phi:gfx_mode::@16->gfx_mode::@7]
+  //SEG79 [37] phi (byte) gfx_mode::vic_control#5 = (const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3|(const byte) VIC_ECM#0 [phi:gfx_mode::@16->gfx_mode::@7#0] -- vbuxx=vbuc1 
     ldx #VIC_DEN|VIC_RSEL|3|VIC_ECM
     jmp b7
   //SEG80 [37] phi from gfx_mode::@6 to gfx_mode::@7 [phi:gfx_mode::@6->gfx_mode::@7]
@@ -29223,13 +29381,13 @@ gfx_mode: {
     lda form_ctrl_bmm
     cmp #0
     beq b8
-  //SEG84 gfx_mode::@22
+  //SEG84 gfx_mode::@17
   //SEG85 [39] (byte) gfx_mode::vic_control#2 ← (byte) gfx_mode::vic_control#5 | (const byte) VIC_BMM#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #VIC_BMM
     tax
-  //SEG86 [40] phi from gfx_mode::@22 gfx_mode::@7 to gfx_mode::@8 [phi:gfx_mode::@22/gfx_mode::@7->gfx_mode::@8]
-  //SEG87 [40] phi (byte) gfx_mode::vic_control#4 = (byte) gfx_mode::vic_control#2 [phi:gfx_mode::@22/gfx_mode::@7->gfx_mode::@8#0] -- register_copy 
+  //SEG86 [40] phi from gfx_mode::@17 gfx_mode::@7 to gfx_mode::@8 [phi:gfx_mode::@17/gfx_mode::@7->gfx_mode::@8]
+  //SEG87 [40] phi (byte) gfx_mode::vic_control#4 = (byte) gfx_mode::vic_control#2 [phi:gfx_mode::@17/gfx_mode::@7->gfx_mode::@8#0] -- register_copy 
   //SEG88 gfx_mode::@8
   b8:
   //SEG89 [41] *((const byte*) VIC_CONTROL#0) ← (byte) gfx_mode::vic_control#4 -- _deref_pbuc1=vbuxx 
@@ -29238,10 +29396,10 @@ gfx_mode: {
     lda form_ctrl_mcm
     cmp #0
     beq b12
-  //SEG91 [43] phi from gfx_mode::@8 to gfx_mode::@23 [phi:gfx_mode::@8->gfx_mode::@23]
-  //SEG92 gfx_mode::@23
-  //SEG93 [44] phi from gfx_mode::@23 to gfx_mode::@9 [phi:gfx_mode::@23->gfx_mode::@9]
-  //SEG94 [44] phi (byte) gfx_mode::vic_control2#2 = (const byte) VIC_CSEL#0|(const byte) VIC_MCM#0 [phi:gfx_mode::@23->gfx_mode::@9#0] -- vbuaa=vbuc1 
+  //SEG91 [43] phi from gfx_mode::@8 to gfx_mode::@18 [phi:gfx_mode::@8->gfx_mode::@18]
+  //SEG92 gfx_mode::@18
+  //SEG93 [44] phi from gfx_mode::@18 to gfx_mode::@9 [phi:gfx_mode::@18->gfx_mode::@9]
+  //SEG94 [44] phi (byte) gfx_mode::vic_control2#2 = (const byte) VIC_CSEL#0|(const byte) VIC_MCM#0 [phi:gfx_mode::@18->gfx_mode::@9#0] -- vbuaa=vbuc1 
     lda #VIC_CSEL|VIC_MCM
     jmp b9
   //SEG95 [44] phi from gfx_mode::@8 to gfx_mode::@9 [phi:gfx_mode::@8->gfx_mode::@9]
@@ -29268,7 +29426,7 @@ gfx_mode: {
   //SEG104 [236] phi (byte) get_plane::idx#10 = (byte) get_plane::idx#0 [phi:gfx_mode::@9->get_plane#0] -- register_copy 
     jsr get_plane
   //SEG105 [50] (dword) get_plane::return#16 ← (dword) get_plane::return#14
-  //SEG106 gfx_mode::@46
+  //SEG106 gfx_mode::@27
   //SEG107 [51] (dword~) gfx_mode::$22 ← (dword) get_plane::return#16
   //SEG108 [52] (dword) gfx_mode::plane_a#0 ← (dword~) gfx_mode::$22 + (byte) gfx_mode::plane_a_offs#0 -- vduz1=vduz1_plus_vbuxx 
     txa
@@ -29345,11 +29503,11 @@ gfx_mode: {
   //SEG127 [71] (byte) get_plane::idx#1 ← *((const byte*) form_b_pattern#0) -- vbuaa=_deref_pbuc1 
     lda form_b_pattern
   //SEG128 [72] call get_plane 
-  //SEG129 [236] phi from gfx_mode::@46 to get_plane [phi:gfx_mode::@46->get_plane]
-  //SEG130 [236] phi (byte) get_plane::idx#10 = (byte) get_plane::idx#1 [phi:gfx_mode::@46->get_plane#0] -- register_copy 
+  //SEG129 [236] phi from gfx_mode::@27 to get_plane [phi:gfx_mode::@27->get_plane]
+  //SEG130 [236] phi (byte) get_plane::idx#10 = (byte) get_plane::idx#1 [phi:gfx_mode::@27->get_plane#0] -- register_copy 
     jsr get_plane
   //SEG131 [73] (dword) get_plane::return#17 ← (dword) get_plane::return#14
-  //SEG132 gfx_mode::@47
+  //SEG132 gfx_mode::@28
   //SEG133 [74] (dword~) gfx_mode::$36 ← (dword) get_plane::return#17
   //SEG134 [75] (dword) gfx_mode::plane_b#0 ← (dword~) gfx_mode::$36 + (byte) gfx_mode::plane_b_offs#0 -- vduz1=vduz1_plus_vbuxx 
     txa
@@ -29425,11 +29583,11 @@ gfx_mode: {
   //SEG153 [94] (byte) get_vic_screen::idx#0 ← *((const byte*) form_vic_screen#0) -- vbuaa=_deref_pbuc1 
     lda form_vic_screen
   //SEG154 [95] call get_vic_screen 
-  //SEG155 [222] phi from gfx_mode::@47 to get_vic_screen [phi:gfx_mode::@47->get_vic_screen]
-  //SEG156 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#0 [phi:gfx_mode::@47->get_vic_screen#0] -- register_copy 
+  //SEG155 [222] phi from gfx_mode::@28 to get_vic_screen [phi:gfx_mode::@28->get_vic_screen]
+  //SEG156 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#0 [phi:gfx_mode::@28->get_vic_screen#0] -- register_copy 
     jsr get_vic_screen
   //SEG157 [96] (byte*) get_vic_screen::return#10 ← (byte*) get_vic_screen::return#5
-  //SEG158 gfx_mode::@48
+  //SEG158 gfx_mode::@29
   //SEG159 [97] (byte*~) gfx_mode::$52 ← (byte*) get_vic_screen::return#10
   //SEG160 [98] (word~) gfx_mode::$54 ← (word)(byte*~) gfx_mode::$52 & (word/signed word/dword/signed dword) $3fff -- vwuz1=vwuz1_band_vwuc1 
     lda _54
@@ -29453,7 +29611,7 @@ gfx_mode: {
   //SEG164 [102] call get_vic_charset 
     jsr get_vic_charset
   //SEG165 [103] (byte*) get_vic_charset::return#4 ← (byte*) get_vic_charset::return#2
-  //SEG166 gfx_mode::@49
+  //SEG166 gfx_mode::@30
   //SEG167 [104] (byte*~) gfx_mode::$57 ← (byte*) get_vic_charset::return#4
   //SEG168 [105] (word~) gfx_mode::$59 ← (word)(byte*~) gfx_mode::$57 & (word/signed word/dword/signed dword) $3fff -- vwuz1=vwuz1_band_vwuc1 
     lda _59
@@ -29475,39 +29633,39 @@ gfx_mode: {
   //SEG173 [110] (byte) get_vic_screen::idx#1 ← *((const byte*) form_vic_cols#0) -- vbuaa=_deref_pbuc1 
     lda form_vic_cols
   //SEG174 [111] call get_vic_screen 
-  //SEG175 [222] phi from gfx_mode::@49 to get_vic_screen [phi:gfx_mode::@49->get_vic_screen]
-  //SEG176 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#1 [phi:gfx_mode::@49->get_vic_screen#0] -- register_copy 
+  //SEG175 [222] phi from gfx_mode::@30 to get_vic_screen [phi:gfx_mode::@30->get_vic_screen]
+  //SEG176 [222] phi (byte) get_vic_screen::idx#2 = (byte) get_vic_screen::idx#1 [phi:gfx_mode::@30->get_vic_screen#0] -- register_copy 
     jsr get_vic_screen
   //SEG177 [112] (byte*) get_vic_screen::return#11 ← (byte*) get_vic_screen::return#5
-  //SEG178 gfx_mode::@50
+  //SEG178 gfx_mode::@31
   //SEG179 [113] (byte*) gfx_mode::vic_colors#0 ← (byte*) get_vic_screen::return#11
-  //SEG180 [114] phi from gfx_mode::@50 to gfx_mode::@26 [phi:gfx_mode::@50->gfx_mode::@26]
-  //SEG181 [114] phi (byte) gfx_mode::cy#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@50->gfx_mode::@26#0] -- vbuz1=vbuc1 
+  //SEG180 [114] phi from gfx_mode::@31 to gfx_mode::@19 [phi:gfx_mode::@31->gfx_mode::@19]
+  //SEG181 [114] phi (byte) gfx_mode::cy#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@31->gfx_mode::@19#0] -- vbuz1=vbuc1 
     lda #0
     sta cy
-  //SEG182 [114] phi (byte*) gfx_mode::col#3 = (const byte*) COLS#0 [phi:gfx_mode::@50->gfx_mode::@26#1] -- pbuz1=pbuc1 
+  //SEG182 [114] phi (byte*) gfx_mode::col#3 = (const byte*) COLS#0 [phi:gfx_mode::@31->gfx_mode::@19#1] -- pbuz1=pbuc1 
     lda #<COLS
     sta col
     lda #>COLS
     sta col+1
-  //SEG183 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#0 [phi:gfx_mode::@50->gfx_mode::@26#2] -- register_copy 
-  //SEG184 [114] phi from gfx_mode::@28 to gfx_mode::@26 [phi:gfx_mode::@28->gfx_mode::@26]
-  //SEG185 [114] phi (byte) gfx_mode::cy#4 = (byte) gfx_mode::cy#1 [phi:gfx_mode::@28->gfx_mode::@26#0] -- register_copy 
-  //SEG186 [114] phi (byte*) gfx_mode::col#3 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@28->gfx_mode::@26#1] -- register_copy 
-  //SEG187 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@28->gfx_mode::@26#2] -- register_copy 
-  //SEG188 gfx_mode::@26
-  b26:
-  //SEG189 [115] phi from gfx_mode::@26 to gfx_mode::@27 [phi:gfx_mode::@26->gfx_mode::@27]
-  //SEG190 [115] phi (byte) gfx_mode::cx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@26->gfx_mode::@27#0] -- vbuxx=vbuc1 
+  //SEG183 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#0 [phi:gfx_mode::@31->gfx_mode::@19#2] -- register_copy 
+  //SEG184 [114] phi from gfx_mode::@21 to gfx_mode::@19 [phi:gfx_mode::@21->gfx_mode::@19]
+  //SEG185 [114] phi (byte) gfx_mode::cy#4 = (byte) gfx_mode::cy#1 [phi:gfx_mode::@21->gfx_mode::@19#0] -- register_copy 
+  //SEG186 [114] phi (byte*) gfx_mode::col#3 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@21->gfx_mode::@19#1] -- register_copy 
+  //SEG187 [114] phi (byte*) gfx_mode::vic_colors#3 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@21->gfx_mode::@19#2] -- register_copy 
+  //SEG188 gfx_mode::@19
+  b19:
+  //SEG189 [115] phi from gfx_mode::@19 to gfx_mode::@20 [phi:gfx_mode::@19->gfx_mode::@20]
+  //SEG190 [115] phi (byte) gfx_mode::cx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@19->gfx_mode::@20#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG191 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#3 [phi:gfx_mode::@26->gfx_mode::@27#1] -- register_copy 
-  //SEG192 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#3 [phi:gfx_mode::@26->gfx_mode::@27#2] -- register_copy 
-  //SEG193 [115] phi from gfx_mode::@27 to gfx_mode::@27 [phi:gfx_mode::@27->gfx_mode::@27]
-  //SEG194 [115] phi (byte) gfx_mode::cx#2 = (byte) gfx_mode::cx#1 [phi:gfx_mode::@27->gfx_mode::@27#0] -- register_copy 
-  //SEG195 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@27->gfx_mode::@27#1] -- register_copy 
-  //SEG196 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@27->gfx_mode::@27#2] -- register_copy 
-  //SEG197 gfx_mode::@27
-  b27:
+  //SEG191 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#3 [phi:gfx_mode::@19->gfx_mode::@20#1] -- register_copy 
+  //SEG192 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#3 [phi:gfx_mode::@19->gfx_mode::@20#2] -- register_copy 
+  //SEG193 [115] phi from gfx_mode::@20 to gfx_mode::@20 [phi:gfx_mode::@20->gfx_mode::@20]
+  //SEG194 [115] phi (byte) gfx_mode::cx#2 = (byte) gfx_mode::cx#1 [phi:gfx_mode::@20->gfx_mode::@20#0] -- register_copy 
+  //SEG195 [115] phi (byte*) gfx_mode::col#2 = (byte*) gfx_mode::col#1 [phi:gfx_mode::@20->gfx_mode::@20#1] -- register_copy 
+  //SEG196 [115] phi (byte*) gfx_mode::vic_colors#2 = (byte*) gfx_mode::vic_colors#1 [phi:gfx_mode::@20->gfx_mode::@20#2] -- register_copy 
+  //SEG197 gfx_mode::@20
+  b20:
   //SEG198 [116] *((byte*) gfx_mode::col#2) ← *((byte*) gfx_mode::vic_colors#2) -- _deref_pbuz1=_deref_pbuz2 
     ldy #0
     lda (vic_colors),y
@@ -29524,17 +29682,17 @@ gfx_mode: {
   !:
   //SEG201 [119] (byte) gfx_mode::cx#1 ← ++ (byte) gfx_mode::cx#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG202 [120] if((byte) gfx_mode::cx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_mode::@27 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG202 [120] if((byte) gfx_mode::cx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_mode::@20 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b27
-  //SEG203 gfx_mode::@28
+    bne b20
+  //SEG203 gfx_mode::@21
   //SEG204 [121] (byte) gfx_mode::cy#1 ← ++ (byte) gfx_mode::cy#4 -- vbuz1=_inc_vbuz1 
     inc cy
-  //SEG205 [122] if((byte) gfx_mode::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto gfx_mode::@26 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG205 [122] if((byte) gfx_mode::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto gfx_mode::@19 -- vbuz1_neq_vbuc1_then_la1 
     lda #$19
     cmp cy
-    bne b26
-  //SEG206 gfx_mode::@29
+    bne b19
+  //SEG206 gfx_mode::@22
   //SEG207 [123] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Background colors
     lda #0
@@ -29579,70 +29737,70 @@ gfx_mode: {
     ora form_vic_bg3_lo
   //SEG219 [135] *((const byte*) BGCOL4#0) ← (byte~) gfx_mode::$71 -- _deref_pbuc1=vbuaa 
     sta BGCOL4
-  //SEG220 [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@34 -- _deref_pbuc1_eq_0_then_la1 
+  //SEG220 [136] if(*((const byte*) form_dtv_palet#0)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto gfx_mode::@24 -- _deref_pbuc1_eq_0_then_la1 
     // DTV Palette
     lda form_dtv_palet
     cmp #0
     beq b13
-  //SEG221 [137] phi from gfx_mode::@29 to gfx_mode::@31 [phi:gfx_mode::@29->gfx_mode::@31]
-  //SEG222 [137] phi (byte) gfx_mode::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@29->gfx_mode::@31#0] -- vbuxx=vbuc1 
+  //SEG221 [137] phi from gfx_mode::@22 to gfx_mode::@23 [phi:gfx_mode::@22->gfx_mode::@23]
+  //SEG222 [137] phi (byte) gfx_mode::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@22->gfx_mode::@23#0] -- vbuxx=vbuc1 
     ldx #0
   // DTV Palette - Grey Tones
-  //SEG223 [137] phi from gfx_mode::@31 to gfx_mode::@31 [phi:gfx_mode::@31->gfx_mode::@31]
-  //SEG224 [137] phi (byte) gfx_mode::j#2 = (byte) gfx_mode::j#1 [phi:gfx_mode::@31->gfx_mode::@31#0] -- register_copy 
-  //SEG225 gfx_mode::@31
-  b31:
+  //SEG223 [137] phi from gfx_mode::@23 to gfx_mode::@23 [phi:gfx_mode::@23->gfx_mode::@23]
+  //SEG224 [137] phi (byte) gfx_mode::j#2 = (byte) gfx_mode::j#1 [phi:gfx_mode::@23->gfx_mode::@23#0] -- register_copy 
+  //SEG225 gfx_mode::@23
+  b23:
   //SEG226 [138] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::j#2) ← (byte) gfx_mode::j#2 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta DTV_PALETTE,x
   //SEG227 [139] (byte) gfx_mode::j#1 ← ++ (byte) gfx_mode::j#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG228 [140] if((byte) gfx_mode::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@31 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG228 [140] if((byte) gfx_mode::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@23 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b31
-  //SEG229 gfx_mode::@36
-  b36:
-  //SEG230 [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@36 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b23
+  //SEG229 gfx_mode::@25
+  b25:
+  //SEG230 [141] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto gfx_mode::@25 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b36
-  //SEG231 [142] phi from gfx_mode::@36 to gfx_mode::@38 [phi:gfx_mode::@36->gfx_mode::@38]
-  //SEG232 gfx_mode::@38
+    bne b25
+  //SEG231 [142] phi from gfx_mode::@25 to gfx_mode::@26 [phi:gfx_mode::@25->gfx_mode::@26]
+  //SEG232 gfx_mode::@26
   //SEG233 [143] call keyboard_event_scan 
-  //SEG234 [159] phi from gfx_mode::@38 to keyboard_event_scan [phi:gfx_mode::@38->keyboard_event_scan]
-  //SEG235 [159] phi (byte) keyboard_events_size#110 = (byte) keyboard_events_size#24 [phi:gfx_mode::@38->keyboard_event_scan#0] -- register_copy 
+  //SEG234 [159] phi from gfx_mode::@26 to keyboard_event_scan [phi:gfx_mode::@26->keyboard_event_scan]
+  //SEG235 [159] phi (byte) keyboard_events_size#110 = (byte) keyboard_events_size#24 [phi:gfx_mode::@26->keyboard_event_scan#0] -- register_copy 
     jsr keyboard_event_scan
-  //SEG236 [144] phi from gfx_mode::@38 to gfx_mode::@51 [phi:gfx_mode::@38->gfx_mode::@51]
-  //SEG237 gfx_mode::@51
+  //SEG236 [144] phi from gfx_mode::@26 to gfx_mode::@32 [phi:gfx_mode::@26->gfx_mode::@32]
+  //SEG237 gfx_mode::@32
   //SEG238 [145] call keyboard_event_get 
     jsr keyboard_event_get
   //SEG239 [146] (byte) keyboard_event_get::return#3 ← (byte) keyboard_event_get::return#2
-  //SEG240 gfx_mode::@52
+  //SEG240 gfx_mode::@33
   //SEG241 [147] (byte) gfx_mode::keyboard_event#0 ← (byte) keyboard_event_get::return#3
-  //SEG242 [148] if((byte) gfx_mode::keyboard_event#0!=(const byte) KEY_SPACE#0) goto gfx_mode::@36 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG242 [148] if((byte) gfx_mode::keyboard_event#0!=(const byte) KEY_SPACE#0) goto gfx_mode::@25 -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_SPACE
-    bne b36
+    bne b25
   //SEG243 gfx_mode::@return
   //SEG244 [149] return 
     rts
   // DTV Palette - default
-  //SEG245 [150] phi from gfx_mode::@29 to gfx_mode::@34 [phi:gfx_mode::@29->gfx_mode::@34]
+  //SEG245 [150] phi from gfx_mode::@22 to gfx_mode::@24 [phi:gfx_mode::@22->gfx_mode::@24]
   b13:
-  //SEG246 [150] phi (byte) gfx_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@29->gfx_mode::@34#0] -- vbuxx=vbuc1 
+  //SEG246 [150] phi (byte) gfx_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_mode::@22->gfx_mode::@24#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG247 [150] phi from gfx_mode::@34 to gfx_mode::@34 [phi:gfx_mode::@34->gfx_mode::@34]
-  //SEG248 [150] phi (byte) gfx_mode::i#2 = (byte) gfx_mode::i#1 [phi:gfx_mode::@34->gfx_mode::@34#0] -- register_copy 
-  //SEG249 gfx_mode::@34
-  b34:
+  //SEG247 [150] phi from gfx_mode::@24 to gfx_mode::@24 [phi:gfx_mode::@24->gfx_mode::@24]
+  //SEG248 [150] phi (byte) gfx_mode::i#2 = (byte) gfx_mode::i#1 [phi:gfx_mode::@24->gfx_mode::@24#0] -- register_copy 
+  //SEG249 gfx_mode::@24
+  b24:
   //SEG250 [151] *((const byte*) DTV_PALETTE#0 + (byte) gfx_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) gfx_mode::i#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda DTV_PALETTE_DEFAULT,x
     sta DTV_PALETTE,x
   //SEG251 [152] (byte) gfx_mode::i#1 ← ++ (byte) gfx_mode::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG252 [153] if((byte) gfx_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@34 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG252 [153] if((byte) gfx_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto gfx_mode::@24 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b34
-    jmp b36
+    bne b24
+    jmp b25
 }
 //SEG253 keyboard_event_get
 // Get the next event from the keyboard event buffer.
@@ -29653,15 +29811,15 @@ keyboard_event_get: {
     lda keyboard_events_size
     cmp #0
     beq b1
-  //SEG255 keyboard_event_get::@3
+  //SEG255 keyboard_event_get::@1
   //SEG256 [155] (byte) keyboard_events_size#4 ← -- (byte) keyboard_events_size#100 -- vbuz1=_dec_vbuz1 
     dec keyboard_events_size
   //SEG257 [156] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4) -- vbuaa=pbuc1_derefidx_vbuz1 
     ldy keyboard_events_size
     lda keyboard_events,y
-  //SEG258 [157] phi from keyboard_event_get::@3 to keyboard_event_get::@return [phi:keyboard_event_get::@3->keyboard_event_get::@return]
-  //SEG259 [157] phi (byte) keyboard_events_size#24 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@3->keyboard_event_get::@return#0] -- register_copy 
-  //SEG260 [157] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@3->keyboard_event_get::@return#1] -- register_copy 
+  //SEG258 [157] phi from keyboard_event_get::@1 to keyboard_event_get::@return [phi:keyboard_event_get::@1->keyboard_event_get::@return]
+  //SEG259 [157] phi (byte) keyboard_events_size#24 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@1->keyboard_event_get::@return#0] -- register_copy 
+  //SEG260 [157] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@1->keyboard_event_get::@return#1] -- register_copy 
     jmp breturn
   //SEG261 [157] phi from keyboard_event_get to keyboard_event_get::@return [phi:keyboard_event_get->keyboard_event_get::@return]
   b1:
@@ -29682,70 +29840,70 @@ keyboard_event_scan: {
     .label row_scan = $12
     .label keycode = 7
     .label row = 2
-  //SEG267 [160] phi from keyboard_event_scan to keyboard_event_scan::@8 [phi:keyboard_event_scan->keyboard_event_scan::@8]
-  //SEG268 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#110 [phi:keyboard_event_scan->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG269 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#1] -- vbuz1=vbuc1 
+  //SEG267 [160] phi from keyboard_event_scan to keyboard_event_scan::@7 [phi:keyboard_event_scan->keyboard_event_scan::@7]
+  //SEG268 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#110 [phi:keyboard_event_scan->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG269 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#1] -- vbuz1=vbuc1 
     lda #0
     sta keycode
-  //SEG270 [160] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#2] -- vbuz1=vbuc1 
+  //SEG270 [160] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#2] -- vbuz1=vbuc1 
     sta row
-  //SEG271 [160] phi from keyboard_event_scan::@10 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8]
-  //SEG272 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#100 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG273 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#1] -- register_copy 
-  //SEG274 [160] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#2] -- register_copy 
-  //SEG275 keyboard_event_scan::@8
-  b8:
+  //SEG271 [160] phi from keyboard_event_scan::@8 to keyboard_event_scan::@7 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7]
+  //SEG272 [160] phi (byte) keyboard_events_size#119 = (byte) keyboard_events_size#100 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG273 [160] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#1] -- register_copy 
+  //SEG274 [160] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#2] -- register_copy 
+  //SEG275 keyboard_event_scan::@7
+  b7:
   //SEG276 [161] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_event_scan::row#2 -- vbuxx=vbuz1 
     ldx row
   //SEG277 [162] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG278 [163] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  //SEG279 keyboard_event_scan::@25
+  //SEG279 keyboard_event_scan::@19
   //SEG280 [164] (byte) keyboard_event_scan::row_scan#0 ← (byte) keyboard_matrix_read::return#2 -- vbuz1=vbuaa 
     sta row_scan
-  //SEG281 [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
+  //SEG281 [165] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
     ldy row
     cmp keyboard_scan_values,y
     bne b6
-  //SEG282 keyboard_event_scan::@21
+  //SEG282 keyboard_event_scan::@16
   //SEG283 [166] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
     axs #-[8]
     stx keycode
-  //SEG284 [167] phi from keyboard_event_scan::@20 keyboard_event_scan::@21 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10]
-  //SEG285 [167] phi (byte) keyboard_events_size#100 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#0] -- register_copy 
-  //SEG286 [167] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#1] -- register_copy 
-  //SEG287 keyboard_event_scan::@10
-  b10:
+  //SEG284 [167] phi from keyboard_event_scan::@15 keyboard_event_scan::@16 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8]
+  //SEG285 [167] phi (byte) keyboard_events_size#100 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#0] -- register_copy 
+  //SEG286 [167] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#1] -- register_copy 
+  //SEG287 keyboard_event_scan::@8
+  b8:
   //SEG288 [168] (byte) keyboard_event_scan::row#1 ← ++ (byte) keyboard_event_scan::row#2 -- vbuz1=_inc_vbuz1 
     inc row
-  //SEG289 [169] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG289 [169] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp row
-    bne b8
-  //SEG290 [170] phi from keyboard_event_scan::@10 to keyboard_event_scan::@23 [phi:keyboard_event_scan::@10->keyboard_event_scan::@23]
-  //SEG291 keyboard_event_scan::@23
+    bne b7
+  //SEG290 [170] phi from keyboard_event_scan::@8 to keyboard_event_scan::@17 [phi:keyboard_event_scan::@8->keyboard_event_scan::@17]
+  //SEG291 keyboard_event_scan::@17
   //SEG292 [171] call keyboard_event_pressed 
-  //SEG293 [213] phi from keyboard_event_scan::@23 to keyboard_event_pressed [phi:keyboard_event_scan::@23->keyboard_event_pressed]
-  //SEG294 [213] phi (byte) keyboard_event_pressed::keycode#4 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@23->keyboard_event_pressed#0] -- vbuz1=vbuc1 
+  //SEG293 [213] phi from keyboard_event_scan::@17 to keyboard_event_pressed [phi:keyboard_event_scan::@17->keyboard_event_pressed]
+  //SEG294 [213] phi (byte) keyboard_event_pressed::keycode#4 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@17->keyboard_event_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_LSHIFT
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG295 [172] (byte) keyboard_event_pressed::return#0 ← (byte) keyboard_event_pressed::return#10
-  //SEG296 keyboard_event_scan::@26
+  //SEG296 keyboard_event_scan::@20
   //SEG297 [173] (byte~) keyboard_event_scan::$0 ← (byte) keyboard_event_pressed::return#0
   //SEG298 [174] if((byte~) keyboard_event_scan::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b4
-  //SEG299 [175] phi from keyboard_event_scan::@26 to keyboard_event_scan::@24 [phi:keyboard_event_scan::@26->keyboard_event_scan::@24]
-  //SEG300 keyboard_event_scan::@24
-  //SEG301 [176] phi from keyboard_event_scan::@24 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1]
-  //SEG302 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
+  //SEG299 [175] phi from keyboard_event_scan::@20 to keyboard_event_scan::@18 [phi:keyboard_event_scan::@20->keyboard_event_scan::@18]
+  //SEG300 keyboard_event_scan::@18
+  //SEG301 [176] phi from keyboard_event_scan::@18 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1]
+  //SEG302 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
     ldx #0|KEY_MODIFIER_LSHIFT
     jmp b1
-  //SEG303 [176] phi from keyboard_event_scan::@26 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1]
+  //SEG303 [176] phi from keyboard_event_scan::@20 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1]
   b4:
-  //SEG304 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
+  //SEG304 [176] phi (byte) keyboard_modifiers#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
     ldx #0
   //SEG305 keyboard_event_scan::@1
   b1:
@@ -29756,18 +29914,18 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG309 [178] (byte) keyboard_event_pressed::return#1 ← (byte) keyboard_event_pressed::return#10
-  //SEG310 keyboard_event_scan::@27
+  //SEG310 keyboard_event_scan::@21
   //SEG311 [179] (byte~) keyboard_event_scan::$3 ← (byte) keyboard_event_pressed::return#1
   //SEG312 [180] if((byte~) keyboard_event_scan::$3==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b2
-  //SEG313 keyboard_event_scan::@5
+  //SEG313 keyboard_event_scan::@4
   //SEG314 [181] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#18 | (const byte) KEY_MODIFIER_RSHIFT#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_RSHIFT
     tax
-  //SEG315 [182] phi from keyboard_event_scan::@27 keyboard_event_scan::@5 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2]
-  //SEG316 [182] phi (byte) keyboard_modifiers#19 = (byte) keyboard_modifiers#18 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2#0] -- register_copy 
+  //SEG315 [182] phi from keyboard_event_scan::@21 keyboard_event_scan::@4 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2]
+  //SEG316 [182] phi (byte) keyboard_modifiers#19 = (byte) keyboard_modifiers#18 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2#0] -- register_copy 
   //SEG317 keyboard_event_scan::@2
   b2:
   //SEG318 [183] call keyboard_event_pressed 
@@ -29777,18 +29935,18 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG321 [184] (byte) keyboard_event_pressed::return#2 ← (byte) keyboard_event_pressed::return#10
-  //SEG322 keyboard_event_scan::@28
+  //SEG322 keyboard_event_scan::@22
   //SEG323 [185] (byte~) keyboard_event_scan::$6 ← (byte) keyboard_event_pressed::return#2
   //SEG324 [186] if((byte~) keyboard_event_scan::$6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@3 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b3
-  //SEG325 keyboard_event_scan::@6
+  //SEG325 keyboard_event_scan::@5
   //SEG326 [187] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#19 | (const byte) KEY_MODIFIER_CTRL#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_CTRL
     tax
-  //SEG327 [188] phi from keyboard_event_scan::@28 keyboard_event_scan::@6 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3]
-  //SEG328 [188] phi (byte) keyboard_modifiers#20 = (byte) keyboard_modifiers#19 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3#0] -- register_copy 
+  //SEG327 [188] phi from keyboard_event_scan::@22 keyboard_event_scan::@5 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3]
+  //SEG328 [188] phi (byte) keyboard_modifiers#20 = (byte) keyboard_modifiers#19 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3#0] -- register_copy 
   //SEG329 keyboard_event_scan::@3
   b3:
   //SEG330 [189] call keyboard_event_pressed 
@@ -29798,57 +29956,57 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG333 [190] (byte) keyboard_event_pressed::return#3 ← (byte) keyboard_event_pressed::return#10
-  //SEG334 keyboard_event_scan::@29
+  //SEG334 keyboard_event_scan::@23
   //SEG335 [191] (byte~) keyboard_event_scan::$9 ← (byte) keyboard_event_pressed::return#3
   //SEG336 [192] if((byte~) keyboard_event_scan::$9==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@return -- vbuaa_eq_0_then_la1 
     cmp #0
     beq breturn
-  //SEG337 keyboard_event_scan::@7
+  //SEG337 keyboard_event_scan::@6
   //SEG338 [193] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#20 | (const byte) KEY_MODIFIER_COMMODORE#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_COMMODORE
     tax
-  //SEG339 [194] phi from keyboard_event_scan::@29 keyboard_event_scan::@7 to keyboard_event_scan::@return [phi:keyboard_event_scan::@29/keyboard_event_scan::@7->keyboard_event_scan::@return]
-  //SEG340 [194] phi (byte) keyboard_modifiers#21 = (byte) keyboard_modifiers#20 [phi:keyboard_event_scan::@29/keyboard_event_scan::@7->keyboard_event_scan::@return#0] -- register_copy 
+  //SEG339 [194] phi from keyboard_event_scan::@23 keyboard_event_scan::@6 to keyboard_event_scan::@return [phi:keyboard_event_scan::@23/keyboard_event_scan::@6->keyboard_event_scan::@return]
+  //SEG340 [194] phi (byte) keyboard_modifiers#21 = (byte) keyboard_modifiers#20 [phi:keyboard_event_scan::@23/keyboard_event_scan::@6->keyboard_event_scan::@return#0] -- register_copy 
   //SEG341 keyboard_event_scan::@return
   breturn:
   //SEG342 [195] return 
     rts
   // Something has changed on the keyboard row - check each column
-  //SEG343 [196] phi from keyboard_event_scan::@12 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11]
-  //SEG344 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG345 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG346 [196] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#2] -- register_copy 
-  //SEG347 [196] phi from keyboard_event_scan::@25 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11]
+  //SEG343 [196] phi from keyboard_event_scan::@10 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9]
+  //SEG344 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG345 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG346 [196] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#2] -- register_copy 
+  //SEG347 [196] phi from keyboard_event_scan::@19 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9]
   b6:
-  //SEG348 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#119 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG349 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG350 [196] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#2] -- vbuxx=vbuc1 
+  //SEG348 [196] phi (byte) keyboard_events_size#18 = (byte) keyboard_events_size#119 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG349 [196] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG350 [196] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#2] -- vbuxx=vbuc1 
     ldx #0
-  //SEG351 keyboard_event_scan::@11
-  b11:
+  //SEG351 keyboard_event_scan::@9
+  b9:
   //SEG352 [197] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) -- vbuaa=vbuz1_bxor_pbuc1_derefidx_vbuz2 
     lda row_scan
     ldy row
     eor keyboard_scan_values,y
   //SEG353 [198] (byte~) keyboard_event_scan::$16 ← (byte~) keyboard_event_scan::$15 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuxx 
     and keyboard_matrix_col_bitmask,x
-  //SEG354 [199] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@12 -- vbuaa_eq_0_then_la1 
+  //SEG354 [199] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@10 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b12
-  //SEG355 keyboard_event_scan::@16
-  //SEG356 [200] if((byte) keyboard_events_size#18==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12 -- vbuz1_eq_vbuc1_then_la1 
+    beq b10
+  //SEG355 keyboard_event_scan::@12
+  //SEG356 [200] if((byte) keyboard_events_size#18==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10 -- vbuz1_eq_vbuc1_then_la1 
     lda #8
     cmp keyboard_events_size
-    beq b12
-  //SEG357 keyboard_event_scan::@17
+    beq b10
+  //SEG357 keyboard_event_scan::@13
   //SEG358 [201] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) -- vbuaa=vbuz1_band_pbuc1_derefidx_vbuxx 
     lda keyboard_matrix_col_bitmask,x
     and row_scan
-  //SEG359 [202] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@14 -- vbuaa_eq_0_then_la1 
+  //SEG359 [202] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@11 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b14
-  //SEG360 keyboard_event_scan::@18
+    beq b11
+  //SEG360 keyboard_event_scan::@14
   //SEG361 [203] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#18) ← (byte) keyboard_event_scan::keycode#10 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Key pressed
     lda keycode
@@ -29856,26 +30014,26 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG362 [204] (byte) keyboard_events_size#2 ← ++ (byte) keyboard_events_size#18 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-  //SEG363 [205] phi from keyboard_event_scan::@11 keyboard_event_scan::@14 keyboard_event_scan::@16 keyboard_event_scan::@18 to keyboard_event_scan::@12 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12]
-  //SEG364 [205] phi (byte) keyboard_events_size#118 = (byte) keyboard_events_size#18 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12#0] -- register_copy 
-  //SEG365 keyboard_event_scan::@12
-  b12:
+  //SEG363 [205] phi from keyboard_event_scan::@11 keyboard_event_scan::@12 keyboard_event_scan::@14 keyboard_event_scan::@9 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10]
+  //SEG364 [205] phi (byte) keyboard_events_size#118 = (byte) keyboard_events_size#1 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10#0] -- register_copy 
+  //SEG365 keyboard_event_scan::@10
+  b10:
   //SEG366 [206] (byte) keyboard_event_scan::keycode#15 ← ++ (byte) keyboard_event_scan::keycode#10 -- vbuz1=_inc_vbuz1 
     inc keycode
   //SEG367 [207] (byte) keyboard_event_scan::col#1 ← ++ (byte) keyboard_event_scan::col#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG368 [208] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG368 [208] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@9 -- vbuxx_neq_vbuc1_then_la1 
     cpx #8
-    bne b11
-  //SEG369 keyboard_event_scan::@20
+    bne b9
+  //SEG369 keyboard_event_scan::@15
   //SEG370 [209] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Store the current keyboard status for the row to debounce
     lda row_scan
     ldy row
     sta keyboard_scan_values,y
-    jmp b10
-  //SEG371 keyboard_event_scan::@14
-  b14:
+    jmp b8
+  //SEG371 keyboard_event_scan::@11
+  b11:
   //SEG372 [210] (byte/word/dword~) keyboard_event_scan::$23 ← (byte) keyboard_event_scan::keycode#10 | (byte/signed byte/word/signed word/dword/signed dword) $40 -- vbuaa=vbuz1_bor_vbuc1 
     lda #$40
     ora keycode
@@ -29885,7 +30043,7 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG374 [212] (byte) keyboard_events_size#1 ← ++ (byte) keyboard_events_size#18 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-    jmp b12
+    jmp b10
 }
 //SEG375 keyboard_event_pressed
 // Determine if a specific key is currently pressed based on the last keyboard_event_scan()
@@ -29939,57 +30097,57 @@ get_vic_screen: {
     .label return = 3
   //SEG388 [223] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_vic_screen::@return -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b1
-  //SEG389 get_vic_screen::@10
+    beq b2
+  //SEG389 get_vic_screen::@2
   //SEG390 [224] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_screen::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #1
-    beq b2
-  //SEG391 get_vic_screen::@11
+    beq b3
+  //SEG391 get_vic_screen::@3
   //SEG392 [225] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 2) goto get_vic_screen::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #2
-    beq b3
-  //SEG393 get_vic_screen::@12
+    beq b4
+  //SEG393 get_vic_screen::@4
   //SEG394 [226] if((byte) get_vic_screen::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 3) goto get_vic_screen::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #3
-    beq b4
-  //SEG395 get_vic_screen::@13
-  //SEG396 [227] if((byte) get_vic_screen::idx#2!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_vic_screen::@9 -- vbuaa_neq_vbuc1_then_la1 
+    beq b5
+  //SEG395 get_vic_screen::@5
+  //SEG396 [227] if((byte) get_vic_screen::idx#2!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_vic_screen::@1 -- vbuaa_neq_vbuc1_then_la1 
     cmp #4
-    bne b1
-  //SEG397 [228] phi from get_vic_screen::@13 to get_vic_screen::@return [phi:get_vic_screen::@13->get_vic_screen::@return]
-  //SEG398 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN4#0 [phi:get_vic_screen::@13->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+    bne b2
+  //SEG397 [228] phi from get_vic_screen::@5 to get_vic_screen::@return [phi:get_vic_screen::@5->get_vic_screen::@return]
+  //SEG398 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN4#0 [phi:get_vic_screen::@5->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN4
     sta return
     lda #>VIC_SCREEN4
     sta return+1
     jmp breturn
-  //SEG399 [228] phi from get_vic_screen get_vic_screen::@9 to get_vic_screen::@return [phi:get_vic_screen/get_vic_screen::@9->get_vic_screen::@return]
-  b1:
-  //SEG400 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN0#0 [phi:get_vic_screen/get_vic_screen::@9->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  //SEG399 [228] phi from get_vic_screen get_vic_screen::@1 to get_vic_screen::@return [phi:get_vic_screen/get_vic_screen::@1->get_vic_screen::@return]
+  b2:
+  //SEG400 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN0#0 [phi:get_vic_screen/get_vic_screen::@1->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN0
     sta return
     lda #>VIC_SCREEN0
     sta return+1
     jmp breturn
-  //SEG401 [228] phi from get_vic_screen::@10 to get_vic_screen::@return [phi:get_vic_screen::@10->get_vic_screen::@return]
-  b2:
-  //SEG402 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN1#0 [phi:get_vic_screen::@10->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  //SEG401 [228] phi from get_vic_screen::@2 to get_vic_screen::@return [phi:get_vic_screen::@2->get_vic_screen::@return]
+  b3:
+  //SEG402 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN1#0 [phi:get_vic_screen::@2->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN1
     sta return
     lda #>VIC_SCREEN1
     sta return+1
     jmp breturn
-  //SEG403 [228] phi from get_vic_screen::@11 to get_vic_screen::@return [phi:get_vic_screen::@11->get_vic_screen::@return]
-  b3:
-  //SEG404 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN2#0 [phi:get_vic_screen::@11->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  //SEG403 [228] phi from get_vic_screen::@3 to get_vic_screen::@return [phi:get_vic_screen::@3->get_vic_screen::@return]
+  b4:
+  //SEG404 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN2#0 [phi:get_vic_screen::@3->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN2
     sta return
     lda #>VIC_SCREEN2
     sta return+1
     jmp breturn
-  //SEG405 [228] phi from get_vic_screen::@12 to get_vic_screen::@return [phi:get_vic_screen::@12->get_vic_screen::@return]
-  b4:
-  //SEG406 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN3#0 [phi:get_vic_screen::@12->get_vic_screen::@return#0] -- pbuz1=pbuc1 
+  //SEG405 [228] phi from get_vic_screen::@4 to get_vic_screen::@return [phi:get_vic_screen::@4->get_vic_screen::@return]
+  b5:
+  //SEG406 [228] phi (byte*) get_vic_screen::return#5 = (const byte*) VIC_SCREEN3#0 [phi:get_vic_screen::@4->get_vic_screen::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_SCREEN3
     sta return
     lda #>VIC_SCREEN3
@@ -29998,8 +30156,8 @@ get_vic_screen: {
   breturn:
   //SEG408 [229] return 
     rts
-  //SEG409 [230] phi from get_vic_screen::@13 to get_vic_screen::@9 [phi:get_vic_screen::@13->get_vic_screen::@9]
-  //SEG410 get_vic_screen::@9
+  //SEG409 [230] phi from get_vic_screen::@5 to get_vic_screen::@1 [phi:get_vic_screen::@5->get_vic_screen::@1]
+  //SEG410 get_vic_screen::@1
 }
 //SEG411 get_vic_charset
 // Get the VIC charset/bitmap address from the index
@@ -30008,21 +30166,21 @@ get_vic_charset: {
     .label return = 3
   //SEG412 [231] if((byte) get_vic_charset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_vic_charset::@return -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b1
-  //SEG413 get_vic_charset::@4
-  //SEG414 [232] if((byte) get_vic_charset::idx#0!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_charset::@3 -- vbuaa_neq_vbuc1_then_la1 
+    beq b2
+  //SEG413 get_vic_charset::@2
+  //SEG414 [232] if((byte) get_vic_charset::idx#0!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_vic_charset::@1 -- vbuaa_neq_vbuc1_then_la1 
     cmp #1
-    bne b1
-  //SEG415 [233] phi from get_vic_charset::@4 to get_vic_charset::@return [phi:get_vic_charset::@4->get_vic_charset::@return]
-  //SEG416 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_BITMAP#0 [phi:get_vic_charset::@4->get_vic_charset::@return#0] -- pbuz1=pbuc1 
+    bne b2
+  //SEG415 [233] phi from get_vic_charset::@2 to get_vic_charset::@return [phi:get_vic_charset::@2->get_vic_charset::@return]
+  //SEG416 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_BITMAP#0 [phi:get_vic_charset::@2->get_vic_charset::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_BITMAP
     sta return
     lda #>VIC_BITMAP
     sta return+1
     jmp breturn
-  //SEG417 [233] phi from get_vic_charset get_vic_charset::@3 to get_vic_charset::@return [phi:get_vic_charset/get_vic_charset::@3->get_vic_charset::@return]
-  b1:
-  //SEG418 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_CHARSET_ROM#0 [phi:get_vic_charset/get_vic_charset::@3->get_vic_charset::@return#0] -- pbuz1=pbuc1 
+  //SEG417 [233] phi from get_vic_charset get_vic_charset::@1 to get_vic_charset::@return [phi:get_vic_charset/get_vic_charset::@1->get_vic_charset::@return]
+  b2:
+  //SEG418 [233] phi (byte*) get_vic_charset::return#2 = (const byte*) VIC_CHARSET_ROM#0 [phi:get_vic_charset/get_vic_charset::@1->get_vic_charset::@return#0] -- pbuz1=pbuc1 
     lda #<VIC_CHARSET_ROM
     sta return
     lda #>VIC_CHARSET_ROM
@@ -30031,8 +30189,8 @@ get_vic_charset: {
   breturn:
   //SEG420 [234] return 
     rts
-  //SEG421 [235] phi from get_vic_charset::@4 to get_vic_charset::@3 [phi:get_vic_charset::@4->get_vic_charset::@3]
-  //SEG422 get_vic_charset::@3
+  //SEG421 [235] phi from get_vic_charset::@2 to get_vic_charset::@1 [phi:get_vic_charset::@2->get_vic_charset::@1]
+  //SEG422 get_vic_charset::@1
 }
 //SEG423 get_plane
 // Get plane address from a plane index (from the form)
@@ -30041,83 +30199,77 @@ get_plane: {
     .label return = 9
   //SEG424 [237] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto get_plane::@return -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b1
-  //SEG425 get_plane::@28
+    beq b2
+  //SEG425 get_plane::@2
   //SEG426 [238] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
     cmp #1
-    beq b2
-  //SEG427 get_plane::@29
-  //SEG428 [239] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
-    cmp #2
-    bne !b3+
-    jmp b3
-  !b3:
-  //SEG429 get_plane::@30
-  //SEG430 [240] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
-    cmp #3
-    bne !b4+
-    jmp b4
-  !b4:
-  //SEG431 get_plane::@31
-  //SEG432 [241] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
-    cmp #4
-    bne !b5+
-    jmp b5
-  !b5:
-  //SEG433 get_plane::@32
-  //SEG434 [242] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
-    cmp #5
-    bne !b6+
-    jmp b6
-  !b6:
-  //SEG435 get_plane::@33
-  //SEG436 [243] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
-    cmp #6
     bne !b7+
     jmp b7
   !b7:
-  //SEG437 get_plane::@34
-  //SEG438 [244] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
-    cmp #7
+  //SEG427 get_plane::@3
+  //SEG428 [239] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
+    cmp #2
     bne !b8+
     jmp b8
   !b8:
-  //SEG439 get_plane::@35
-  //SEG440 [245] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
-    cmp #8
+  //SEG429 get_plane::@4
+  //SEG430 [240] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
+    cmp #3
     bne !b9+
     jmp b9
   !b9:
-  //SEG441 get_plane::@36
-  //SEG442 [246] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
-    cmp #9
+  //SEG431 get_plane::@5
+  //SEG432 [241] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
+    cmp #4
     bne !b10+
     jmp b10
   !b10:
-  //SEG443 get_plane::@37
-  //SEG444 [247] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
-    cmp #$a
+  //SEG433 get_plane::@6
+  //SEG434 [242] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
+    cmp #5
     bne !b11+
     jmp b11
   !b11:
-  //SEG445 get_plane::@38
-  //SEG446 [248] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $b) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
-    cmp #$b
+  //SEG435 get_plane::@7
+  //SEG436 [243] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
+    cmp #6
     bne !b12+
     jmp b12
   !b12:
-  //SEG447 get_plane::@39
-  //SEG448 [249] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $c) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
-    cmp #$c
+  //SEG437 get_plane::@8
+  //SEG438 [244] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
+    cmp #7
     bne !b13+
     jmp b13
   !b13:
-  //SEG449 get_plane::@40
-  //SEG450 [250] if((byte) get_plane::idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $d) goto get_plane::@27 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG439 get_plane::@9
+  //SEG440 [245] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
+    cmp #8
+    bne !b14+
+    jmp b14
+  !b14:
+  //SEG441 get_plane::@10
+  //SEG442 [246] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
+    cmp #9
+    beq b3
+  //SEG443 get_plane::@11
+  //SEG444 [247] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
+    cmp #$a
+    beq b4
+  //SEG445 get_plane::@12
+  //SEG446 [248] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $b) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
+    cmp #$b
+    beq b5
+  //SEG447 get_plane::@13
+  //SEG448 [249] if((byte) get_plane::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $c) goto get_plane::@return -- vbuaa_eq_vbuc1_then_la1 
+    cmp #$c
+    beq b6
+  //SEG449 get_plane::@14
+  //SEG450 [250] if((byte) get_plane::idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $d) goto get_plane::@1 -- vbuaa_neq_vbuc1_then_la1 
     cmp #$d
-    bne b1
-  //SEG451 [251] phi from get_plane::@40 to get_plane::@return [phi:get_plane::@40->get_plane::@return]
-  //SEG452 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_FULL#0 [phi:get_plane::@40->get_plane::@return#0] -- vduz1=vduc1 
+    bne b2
+  //SEG451 [251] phi from get_plane::@14 to get_plane::@return [phi:get_plane::@14->get_plane::@return]
+  //SEG452 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_FULL#0 [phi:get_plane::@14->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_FULL
     sta return
     lda #>PLANE_FULL
@@ -30127,9 +30279,9 @@ get_plane: {
     lda #>PLANE_FULL>>$10
     sta return+3
     jmp breturn
-  //SEG453 [251] phi from get_plane get_plane::@27 to get_plane::@return [phi:get_plane/get_plane::@27->get_plane::@return]
-  b1:
-  //SEG454 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN0#0 [phi:get_plane/get_plane::@27->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG453 [251] phi from get_plane get_plane::@1 to get_plane::@return [phi:get_plane/get_plane::@1->get_plane::@return]
+  b2:
+  //SEG454 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN0#0 [phi:get_plane/get_plane::@1->get_plane::@return#0] -- vduz1=vduc1 
     lda #<$ffffffff&VIC_SCREEN0
     sta return
     lda #>$ffffffff&VIC_SCREEN0
@@ -30139,105 +30291,9 @@ get_plane: {
     lda #>$ffffffff&VIC_SCREEN0>>$10
     sta return+3
     jmp breturn
-  //SEG455 [251] phi from get_plane::@28 to get_plane::@return [phi:get_plane::@28->get_plane::@return]
-  b2:
-  //SEG456 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN1#0 [phi:get_plane::@28->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_SCREEN1
-    sta return
-    lda #>$ffffffff&VIC_SCREEN1
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN1>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN1>>$10
-    sta return+3
-    jmp breturn
-  //SEG457 [251] phi from get_plane::@29 to get_plane::@return [phi:get_plane::@29->get_plane::@return]
+  //SEG455 [251] phi from get_plane::@10 to get_plane::@return [phi:get_plane::@10->get_plane::@return]
   b3:
-  //SEG458 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN2#0 [phi:get_plane::@29->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_SCREEN2
-    sta return
-    lda #>$ffffffff&VIC_SCREEN2
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN2>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN2>>$10
-    sta return+3
-    jmp breturn
-  //SEG459 [251] phi from get_plane::@30 to get_plane::@return [phi:get_plane::@30->get_plane::@return]
-  b4:
-  //SEG460 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN3#0 [phi:get_plane::@30->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_SCREEN3
-    sta return
-    lda #>$ffffffff&VIC_SCREEN3
-    sta return+1
-    lda #<$ffffffff&VIC_SCREEN3>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_SCREEN3>>$10
-    sta return+3
-    jmp breturn
-  //SEG461 [251] phi from get_plane::@31 to get_plane::@return [phi:get_plane::@31->get_plane::@return]
-  b5:
-  //SEG462 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_BITMAP#0 [phi:get_plane::@31->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_BITMAP
-    sta return
-    lda #>$ffffffff&VIC_BITMAP
-    sta return+1
-    lda #<$ffffffff&VIC_BITMAP>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_BITMAP>>$10
-    sta return+3
-    jmp breturn
-  //SEG463 [251] phi from get_plane::@32 to get_plane::@return [phi:get_plane::@32->get_plane::@return]
-  b6:
-  //SEG464 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_CHARSET_ROM#0 [phi:get_plane::@32->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<$ffffffff&VIC_CHARSET_ROM
-    sta return
-    lda #>$ffffffff&VIC_CHARSET_ROM
-    sta return+1
-    lda #<$ffffffff&VIC_CHARSET_ROM>>$10
-    sta return+2
-    lda #>$ffffffff&VIC_CHARSET_ROM>>$10
-    sta return+3
-    jmp breturn
-  //SEG465 [251] phi from get_plane::@33 to get_plane::@return [phi:get_plane::@33->get_plane::@return]
-  b7:
-  //SEG466 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_8BPP_CHUNKY#0 [phi:get_plane::@33->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<PLANE_8BPP_CHUNKY
-    sta return
-    lda #>PLANE_8BPP_CHUNKY
-    sta return+1
-    lda #<PLANE_8BPP_CHUNKY>>$10
-    sta return+2
-    lda #>PLANE_8BPP_CHUNKY>>$10
-    sta return+3
-    jmp breturn
-  //SEG467 [251] phi from get_plane::@34 to get_plane::@return [phi:get_plane::@34->get_plane::@return]
-  b8:
-  //SEG468 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL#0 [phi:get_plane::@34->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<PLANE_HORISONTAL
-    sta return
-    lda #>PLANE_HORISONTAL
-    sta return+1
-    lda #<PLANE_HORISONTAL>>$10
-    sta return+2
-    lda #>PLANE_HORISONTAL>>$10
-    sta return+3
-    jmp breturn
-  //SEG469 [251] phi from get_plane::@35 to get_plane::@return [phi:get_plane::@35->get_plane::@return]
-  b9:
-  //SEG470 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL#0 [phi:get_plane::@35->get_plane::@return#0] -- vduz1=vduc1 
-    lda #<PLANE_VERTICAL
-    sta return
-    lda #>PLANE_VERTICAL
-    sta return+1
-    lda #<PLANE_VERTICAL>>$10
-    sta return+2
-    lda #>PLANE_VERTICAL>>$10
-    sta return+3
-    jmp breturn
-  //SEG471 [251] phi from get_plane::@36 to get_plane::@return [phi:get_plane::@36->get_plane::@return]
-  b10:
-  //SEG472 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL2#0 [phi:get_plane::@36->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG456 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL2#0 [phi:get_plane::@10->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_HORISONTAL2
     sta return
     lda #>PLANE_HORISONTAL2
@@ -30247,9 +30303,9 @@ get_plane: {
     lda #>PLANE_HORISONTAL2>>$10
     sta return+3
     jmp breturn
-  //SEG473 [251] phi from get_plane::@37 to get_plane::@return [phi:get_plane::@37->get_plane::@return]
-  b11:
-  //SEG474 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL2#0 [phi:get_plane::@37->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG457 [251] phi from get_plane::@11 to get_plane::@return [phi:get_plane::@11->get_plane::@return]
+  b4:
+  //SEG458 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL2#0 [phi:get_plane::@11->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_VERTICAL2
     sta return
     lda #>PLANE_VERTICAL2
@@ -30259,9 +30315,9 @@ get_plane: {
     lda #>PLANE_VERTICAL2>>$10
     sta return+3
     jmp breturn
-  //SEG475 [251] phi from get_plane::@38 to get_plane::@return [phi:get_plane::@38->get_plane::@return]
-  b12:
-  //SEG476 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_CHARSET8#0 [phi:get_plane::@38->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG459 [251] phi from get_plane::@12 to get_plane::@return [phi:get_plane::@12->get_plane::@return]
+  b5:
+  //SEG460 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_CHARSET8#0 [phi:get_plane::@12->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_CHARSET8
     sta return
     lda #>PLANE_CHARSET8
@@ -30271,9 +30327,9 @@ get_plane: {
     lda #>PLANE_CHARSET8>>$10
     sta return+3
     jmp breturn
-  //SEG477 [251] phi from get_plane::@39 to get_plane::@return [phi:get_plane::@39->get_plane::@return]
-  b13:
-  //SEG478 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_BLANK#0 [phi:get_plane::@39->get_plane::@return#0] -- vduz1=vduc1 
+  //SEG461 [251] phi from get_plane::@13 to get_plane::@return [phi:get_plane::@13->get_plane::@return]
+  b6:
+  //SEG462 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_BLANK#0 [phi:get_plane::@13->get_plane::@return#0] -- vduz1=vduc1 
     lda #<PLANE_BLANK
     sta return
     lda #>PLANE_BLANK
@@ -30282,12 +30338,108 @@ get_plane: {
     sta return+2
     lda #>PLANE_BLANK>>$10
     sta return+3
+    jmp breturn
+  //SEG463 [251] phi from get_plane::@2 to get_plane::@return [phi:get_plane::@2->get_plane::@return]
+  b7:
+  //SEG464 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN1#0 [phi:get_plane::@2->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_SCREEN1
+    sta return
+    lda #>$ffffffff&VIC_SCREEN1
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN1>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN1>>$10
+    sta return+3
+    jmp breturn
+  //SEG465 [251] phi from get_plane::@3 to get_plane::@return [phi:get_plane::@3->get_plane::@return]
+  b8:
+  //SEG466 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN2#0 [phi:get_plane::@3->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_SCREEN2
+    sta return
+    lda #>$ffffffff&VIC_SCREEN2
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN2>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN2>>$10
+    sta return+3
+    jmp breturn
+  //SEG467 [251] phi from get_plane::@4 to get_plane::@return [phi:get_plane::@4->get_plane::@return]
+  b9:
+  //SEG468 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_SCREEN3#0 [phi:get_plane::@4->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_SCREEN3
+    sta return
+    lda #>$ffffffff&VIC_SCREEN3
+    sta return+1
+    lda #<$ffffffff&VIC_SCREEN3>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_SCREEN3>>$10
+    sta return+3
+    jmp breturn
+  //SEG469 [251] phi from get_plane::@5 to get_plane::@return [phi:get_plane::@5->get_plane::@return]
+  b10:
+  //SEG470 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_BITMAP#0 [phi:get_plane::@5->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_BITMAP
+    sta return
+    lda #>$ffffffff&VIC_BITMAP
+    sta return+1
+    lda #<$ffffffff&VIC_BITMAP>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_BITMAP>>$10
+    sta return+3
+    jmp breturn
+  //SEG471 [251] phi from get_plane::@6 to get_plane::@return [phi:get_plane::@6->get_plane::@return]
+  b11:
+  //SEG472 [251] phi (dword) get_plane::return#14 = ((dword))(const byte*) VIC_CHARSET_ROM#0 [phi:get_plane::@6->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<$ffffffff&VIC_CHARSET_ROM
+    sta return
+    lda #>$ffffffff&VIC_CHARSET_ROM
+    sta return+1
+    lda #<$ffffffff&VIC_CHARSET_ROM>>$10
+    sta return+2
+    lda #>$ffffffff&VIC_CHARSET_ROM>>$10
+    sta return+3
+    jmp breturn
+  //SEG473 [251] phi from get_plane::@7 to get_plane::@return [phi:get_plane::@7->get_plane::@return]
+  b12:
+  //SEG474 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_8BPP_CHUNKY#0 [phi:get_plane::@7->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<PLANE_8BPP_CHUNKY
+    sta return
+    lda #>PLANE_8BPP_CHUNKY
+    sta return+1
+    lda #<PLANE_8BPP_CHUNKY>>$10
+    sta return+2
+    lda #>PLANE_8BPP_CHUNKY>>$10
+    sta return+3
+    jmp breturn
+  //SEG475 [251] phi from get_plane::@8 to get_plane::@return [phi:get_plane::@8->get_plane::@return]
+  b13:
+  //SEG476 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_HORISONTAL#0 [phi:get_plane::@8->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<PLANE_HORISONTAL
+    sta return
+    lda #>PLANE_HORISONTAL
+    sta return+1
+    lda #<PLANE_HORISONTAL>>$10
+    sta return+2
+    lda #>PLANE_HORISONTAL>>$10
+    sta return+3
+    jmp breturn
+  //SEG477 [251] phi from get_plane::@9 to get_plane::@return [phi:get_plane::@9->get_plane::@return]
+  b14:
+  //SEG478 [251] phi (dword) get_plane::return#14 = ((dword))(const dword) PLANE_VERTICAL#0 [phi:get_plane::@9->get_plane::@return#0] -- vduz1=vduc1 
+    lda #<PLANE_VERTICAL
+    sta return
+    lda #>PLANE_VERTICAL
+    sta return+1
+    lda #<PLANE_VERTICAL>>$10
+    sta return+2
+    lda #>PLANE_VERTICAL>>$10
+    sta return+3
   //SEG479 get_plane::@return
   breturn:
   //SEG480 [252] return 
     rts
-  //SEG481 [253] phi from get_plane::@40 to get_plane::@27 [phi:get_plane::@40->get_plane::@27]
-  //SEG482 get_plane::@27
+  //SEG481 [253] phi from get_plane::@14 to get_plane::@1 [phi:get_plane::@14->get_plane::@1]
+  //SEG482 get_plane::@1
 }
 //SEG483 form_mode
 // Show the form - and let the user change values
@@ -30301,62 +30453,62 @@ form_mode: {
     lda #>COLS
     sta print_set_screen.screen+1
     jsr print_set_screen
-  //SEG487 [256] phi from form_mode to form_mode::@21 [phi:form_mode->form_mode::@21]
-  //SEG488 form_mode::@21
+  //SEG487 [256] phi from form_mode to form_mode::@8 [phi:form_mode->form_mode::@8]
+  //SEG488 form_mode::@8
   //SEG489 [257] call print_cls 
     jsr print_cls
-  //SEG490 [258] phi from form_mode::@21 to form_mode::@22 [phi:form_mode::@21->form_mode::@22]
-  //SEG491 form_mode::@22
+  //SEG490 [258] phi from form_mode::@8 to form_mode::@9 [phi:form_mode::@8->form_mode::@9]
+  //SEG491 form_mode::@9
   //SEG492 [259] call print_str_lines 
-  //SEG493 [419] phi from form_mode::@22 to print_str_lines [phi:form_mode::@22->print_str_lines]
-  //SEG494 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_COLS#0 [phi:form_mode::@22->print_str_lines#0] -- pbuz1=pbuc1 
+  //SEG493 [419] phi from form_mode::@9 to print_str_lines [phi:form_mode::@9->print_str_lines]
+  //SEG494 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_COLS#0 [phi:form_mode::@9->print_str_lines#0] -- pbuz1=pbuc1 
     lda #<FORM_COLS
     sta print_str_lines.str
     lda #>FORM_COLS
     sta print_str_lines.str+1
     jsr print_str_lines
-  //SEG495 [260] phi from form_mode::@22 to form_mode::@23 [phi:form_mode::@22->form_mode::@23]
-  //SEG496 form_mode::@23
+  //SEG495 [260] phi from form_mode::@9 to form_mode::@10 [phi:form_mode::@9->form_mode::@10]
+  //SEG496 form_mode::@10
   //SEG497 [261] call print_set_screen 
-  //SEG498 [447] phi from form_mode::@23 to print_set_screen [phi:form_mode::@23->print_set_screen]
-  //SEG499 [447] phi (byte*) print_set_screen::screen#2 = (const byte*) FORM_SCREEN#0 [phi:form_mode::@23->print_set_screen#0] -- pbuz1=pbuc1 
+  //SEG498 [447] phi from form_mode::@10 to print_set_screen [phi:form_mode::@10->print_set_screen]
+  //SEG499 [447] phi (byte*) print_set_screen::screen#2 = (const byte*) FORM_SCREEN#0 [phi:form_mode::@10->print_set_screen#0] -- pbuz1=pbuc1 
     lda #<FORM_SCREEN
     sta print_set_screen.screen
     lda #>FORM_SCREEN
     sta print_set_screen.screen+1
     jsr print_set_screen
-  //SEG500 [262] phi from form_mode::@23 to form_mode::@24 [phi:form_mode::@23->form_mode::@24]
-  //SEG501 form_mode::@24
+  //SEG500 [262] phi from form_mode::@10 to form_mode::@11 [phi:form_mode::@10->form_mode::@11]
+  //SEG501 form_mode::@11
   //SEG502 [263] call print_cls 
     jsr print_cls
-  //SEG503 [264] phi from form_mode::@24 to form_mode::@25 [phi:form_mode::@24->form_mode::@25]
-  //SEG504 form_mode::@25
+  //SEG503 [264] phi from form_mode::@11 to form_mode::@12 [phi:form_mode::@11->form_mode::@12]
+  //SEG504 form_mode::@12
   //SEG505 [265] call print_str_lines 
-  //SEG506 [419] phi from form_mode::@25 to print_str_lines [phi:form_mode::@25->print_str_lines]
-  //SEG507 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_TEXT#0 [phi:form_mode::@25->print_str_lines#0] -- pbuz1=pbuc1 
+  //SEG506 [419] phi from form_mode::@12 to print_str_lines [phi:form_mode::@12->print_str_lines]
+  //SEG507 [419] phi (byte*) print_str_lines::str#5 = (const byte[]) FORM_TEXT#0 [phi:form_mode::@12->print_str_lines#0] -- pbuz1=pbuc1 
     lda #<FORM_TEXT
     sta print_str_lines.str
     lda #>FORM_TEXT
     sta print_str_lines.str+1
     jsr print_str_lines
-  //SEG508 [266] phi from form_mode::@25 to form_mode::@26 [phi:form_mode::@25->form_mode::@26]
-  //SEG509 form_mode::@26
+  //SEG508 [266] phi from form_mode::@12 to form_mode::@13 [phi:form_mode::@12->form_mode::@13]
+  //SEG509 form_mode::@13
   //SEG510 [267] call form_set_screen 
-  //SEG511 [409] phi from form_mode::@26 to form_set_screen [phi:form_mode::@26->form_set_screen]
+  //SEG511 [409] phi from form_mode::@13 to form_set_screen [phi:form_mode::@13->form_set_screen]
     jsr form_set_screen
-  //SEG512 [268] phi from form_mode::@26 to form_mode::@27 [phi:form_mode::@26->form_mode::@27]
-  //SEG513 form_mode::@27
+  //SEG512 [268] phi from form_mode::@13 to form_mode::@14 [phi:form_mode::@13->form_mode::@14]
+  //SEG513 form_mode::@14
   //SEG514 [269] call form_render_values 
-  //SEG515 [330] phi from form_mode::@27 to form_render_values [phi:form_mode::@27->form_render_values]
+  //SEG515 [330] phi from form_mode::@14 to form_render_values [phi:form_mode::@14->form_render_values]
     jsr form_render_values
-  //SEG516 form_mode::@28
+  //SEG516 form_mode::@15
   //SEG517 [270] (byte) render_preset_name::idx#0 ← *((const byte[]) form_fields_val#0) -- vbuaa=_deref_pbuc1 
     lda form_fields_val
   //SEG518 [271] call render_preset_name 
-  //SEG519 [306] phi from form_mode::@28 to render_preset_name [phi:form_mode::@28->render_preset_name]
-  //SEG520 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#0 [phi:form_mode::@28->render_preset_name#0] -- register_copy 
+  //SEG519 [306] phi from form_mode::@15 to render_preset_name [phi:form_mode::@15->render_preset_name]
+  //SEG520 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#0 [phi:form_mode::@15->render_preset_name#0] -- register_copy 
     jsr render_preset_name
-  //SEG521 form_mode::@29
+  //SEG521 form_mode::@16
   //SEG522 [272] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) FORM_CHARSET#0/(dword/signed dword) $10000 -- _deref_pbuc1=vbuc2 
     // DTV Graphics Bank
     lda #($ffffffff&FORM_CHARSET)/$10000
@@ -30402,23 +30554,23 @@ form_mode: {
   //SEG533 [283] *((const byte*) DTV_PLANEA_START_HI#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta DTV_PLANEA_START_HI
-  //SEG534 [284] phi from form_mode::@29 to form_mode::@7 [phi:form_mode::@29->form_mode::@7]
-  //SEG535 [284] phi (byte) form_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_mode::@29->form_mode::@7#0] -- vbuxx=vbuc1 
+  //SEG534 [284] phi from form_mode::@16 to form_mode::@2 [phi:form_mode::@16->form_mode::@2]
+  //SEG535 [284] phi (byte) form_mode::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_mode::@16->form_mode::@2#0] -- vbuxx=vbuc1 
     tax
   // DTV Palette - default
-  //SEG536 [284] phi from form_mode::@7 to form_mode::@7 [phi:form_mode::@7->form_mode::@7]
-  //SEG537 [284] phi (byte) form_mode::i#2 = (byte) form_mode::i#1 [phi:form_mode::@7->form_mode::@7#0] -- register_copy 
-  //SEG538 form_mode::@7
-  b7:
+  //SEG536 [284] phi from form_mode::@2 to form_mode::@2 [phi:form_mode::@2->form_mode::@2]
+  //SEG537 [284] phi (byte) form_mode::i#2 = (byte) form_mode::i#1 [phi:form_mode::@2->form_mode::@2#0] -- register_copy 
+  //SEG538 form_mode::@2
+  b2:
   //SEG539 [285] *((const byte*) DTV_PALETTE#0 + (byte) form_mode::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) form_mode::i#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda DTV_PALETTE_DEFAULT,x
     sta DTV_PALETTE,x
   //SEG540 [286] (byte) form_mode::i#1 ← ++ (byte) form_mode::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG541 [287] if((byte) form_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto form_mode::@7 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG541 [287] if((byte) form_mode::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto form_mode::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b7
-  //SEG542 form_mode::@8
+    bne b2
+  //SEG542 form_mode::@3
   //SEG543 [288] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Screen colors
     lda #0
@@ -30428,62 +30580,62 @@ form_mode: {
   //SEG545 [290] (byte) form_mode::preset_current#0 ← *((const byte[]) form_fields_val#0) -- vbuz1=_deref_pbuc1 
     lda form_fields_val
     sta preset_current
-  //SEG546 [291] phi from form_mode::@32 form_mode::@8 to form_mode::@1 [phi:form_mode::@32/form_mode::@8->form_mode::@1]
-  //SEG547 [291] phi (byte) form_mode::preset_current#7 = (byte) form_mode::preset_current#1 [phi:form_mode::@32/form_mode::@8->form_mode::@1#0] -- register_copy 
-  //SEG548 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@32/form_mode::@8->form_mode::@1#1] -- register_copy 
-  //SEG549 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@32/form_mode::@8->form_mode::@1#2] -- register_copy 
-  //SEG550 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@32/form_mode::@8->form_mode::@1#3] -- register_copy 
+  //SEG546 [291] phi from form_mode::@19 form_mode::@3 to form_mode::@1 [phi:form_mode::@19/form_mode::@3->form_mode::@1]
+  //SEG547 [291] phi (byte) form_mode::preset_current#7 = (byte) form_mode::preset_current#1 [phi:form_mode::@19/form_mode::@3->form_mode::@1#0] -- register_copy 
+  //SEG548 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@19/form_mode::@3->form_mode::@1#1] -- register_copy 
+  //SEG549 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@19/form_mode::@3->form_mode::@1#2] -- register_copy 
+  //SEG550 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@19/form_mode::@3->form_mode::@1#3] -- register_copy 
   // Let the user change values in the form
-  //SEG551 [291] phi from form_mode::@12 to form_mode::@1 [phi:form_mode::@12->form_mode::@1]
-  //SEG552 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@12->form_mode::@1#0] -- register_copy 
-  //SEG553 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@12->form_mode::@1#1] -- register_copy 
-  //SEG554 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@12->form_mode::@1#2] -- register_copy 
+  //SEG551 [291] phi from form_mode::@6 to form_mode::@1 [phi:form_mode::@6->form_mode::@1]
+  //SEG552 [291] phi (byte) form_field_idx#28 = (byte) form_field_idx#18 [phi:form_mode::@6->form_mode::@1#0] -- register_copy 
+  //SEG553 [291] phi (byte) keyboard_events_size#47 = (byte) keyboard_events_size#24 [phi:form_mode::@6->form_mode::@1#1] -- register_copy 
+  //SEG554 [291] phi (signed byte) form_cursor_count#21 = (signed byte) form_cursor_count#16 [phi:form_mode::@6->form_mode::@1#2] -- register_copy 
   //SEG555 form_mode::@1
-  //SEG556 form_mode::@9
-  b9:
-  //SEG557 [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@9 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG556 form_mode::@4
+  b4:
+  //SEG557 [292] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto form_mode::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b9
-  //SEG558 [293] phi from form_mode::@9 to form_mode::@11 [phi:form_mode::@9->form_mode::@11]
-  //SEG559 form_mode::@11
+    bne b4
+  //SEG558 [293] phi from form_mode::@4 to form_mode::@5 [phi:form_mode::@4->form_mode::@5]
+  //SEG559 form_mode::@5
   //SEG560 [294] call form_control 
     jsr form_control
   //SEG561 [295] (byte) form_control::return#0 ← (byte) form_control::return#2 -- vbuaa=vbuxx 
     txa
-  //SEG562 form_mode::@30
+  //SEG562 form_mode::@17
   //SEG563 [296] (byte~) form_mode::$36 ← (byte) form_control::return#0
-  //SEG564 [297] if((byte~) form_mode::$36==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_mode::@12 -- vbuaa_eq_0_then_la1 
+  //SEG564 [297] if((byte~) form_mode::$36==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_mode::@6 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b12
+    beq b6
   //SEG565 form_mode::@return
   //SEG566 [298] return 
     rts
-  //SEG567 form_mode::@12
-  b12:
+  //SEG567 form_mode::@6
+  b6:
   //SEG568 [299] if((byte) form_mode::preset_current#7==*((const byte[]) form_fields_val#0)) goto form_mode::@1 -- vbuz1_eq__deref_pbuc1_then_la1 
     lda form_fields_val
     cmp preset_current
-    beq b9
-  //SEG569 form_mode::@19
+    beq b4
+  //SEG569 form_mode::@7
   //SEG570 [300] (byte) apply_preset::idx#0 ← *((const byte[]) form_fields_val#0) -- vbuaa=_deref_pbuc1 
   //SEG571 [301] call apply_preset 
     jsr apply_preset
-  //SEG572 form_mode::@31
+  //SEG572 form_mode::@18
   //SEG573 [302] (byte) form_mode::preset_current#1 ← *((const byte[]) form_fields_val#0) -- vbuz1=_deref_pbuc1 
     lda form_fields_val
     sta preset_current
   //SEG574 [303] call form_render_values 
-  //SEG575 [330] phi from form_mode::@31 to form_render_values [phi:form_mode::@31->form_render_values]
+  //SEG575 [330] phi from form_mode::@18 to form_render_values [phi:form_mode::@18->form_render_values]
     jsr form_render_values
-  //SEG576 form_mode::@32
+  //SEG576 form_mode::@19
   //SEG577 [304] (byte) render_preset_name::idx#1 ← *((const byte[]) form_fields_val#0) -- vbuaa=_deref_pbuc1 
     lda form_fields_val
   //SEG578 [305] call render_preset_name 
-  //SEG579 [306] phi from form_mode::@32 to render_preset_name [phi:form_mode::@32->render_preset_name]
-  //SEG580 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#1 [phi:form_mode::@32->render_preset_name#0] -- register_copy 
+  //SEG579 [306] phi from form_mode::@19 to render_preset_name [phi:form_mode::@19->render_preset_name]
+  //SEG580 [306] phi (byte) render_preset_name::idx#10 = (byte) render_preset_name::idx#1 [phi:form_mode::@19->render_preset_name#0] -- register_copy 
     jsr render_preset_name
-    jmp b9
+    jmp b4
 }
 //SEG581 render_preset_name
 // Render form preset name in the form
@@ -30491,143 +30643,143 @@ form_mode: {
 // render_preset_name(byte register(A) idx)
 render_preset_name: {
     .label name = 3
-  //SEG582 [307] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_preset_name::@22 -- vbuaa_eq_0_then_la1 
+  //SEG582 [307] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_preset_name::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b33
-  //SEG583 render_preset_name::@23
-  //SEG584 [308] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b12
+  //SEG583 render_preset_name::@2
+  //SEG584 [308] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 1) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #1
-    beq b1
-  //SEG585 render_preset_name::@24
-  //SEG586 [309] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #2
-    beq b2
-  //SEG587 render_preset_name::@25
-  //SEG588 [310] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #3
-    beq b3
-  //SEG589 render_preset_name::@26
-  //SEG590 [311] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #4
     beq b4
-  //SEG591 render_preset_name::@27
-  //SEG592 [312] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #5
+  //SEG585 render_preset_name::@3
+  //SEG586 [309] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #2
     beq b5
-  //SEG593 render_preset_name::@28
-  //SEG594 [313] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #6
+  //SEG587 render_preset_name::@4
+  //SEG588 [310] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 3) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #3
     beq b6
-  //SEG595 render_preset_name::@29
-  //SEG596 [314] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #7
+  //SEG589 render_preset_name::@5
+  //SEG590 [311] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #4
     beq b7
-  //SEG597 render_preset_name::@30
-  //SEG598 [315] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #8
+  //SEG591 render_preset_name::@6
+  //SEG592 [312] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 5) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #5
     beq b8
-  //SEG599 render_preset_name::@31
-  //SEG600 [316] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #9
+  //SEG593 render_preset_name::@7
+  //SEG594 [313] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 6) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #6
     beq b9
-  //SEG601 render_preset_name::@32
-  //SEG602 [317] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto render_preset_name::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #$a
+  //SEG595 render_preset_name::@8
+  //SEG596 [314] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 7) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #7
     beq b10
-  //SEG603 [318] phi from render_preset_name::@32 to render_preset_name::@33 [phi:render_preset_name::@32->render_preset_name::@33]
-  //SEG604 render_preset_name::@33
-  b33:
-  //SEG605 [319] phi from render_preset_name render_preset_name::@33 to render_preset_name::@22 [phi:render_preset_name/render_preset_name::@33->render_preset_name::@22]
-  //SEG606 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#1 [phi:render_preset_name/render_preset_name::@33->render_preset_name::@22#0] -- pbuz1=pbuc1 
+  //SEG597 render_preset_name::@9
+  //SEG598 [315] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #8
+    beq b11
+  //SEG599 render_preset_name::@10
+  //SEG600 [316] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) 9) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #9
+    beq b2
+  //SEG601 render_preset_name::@11
+  //SEG602 [317] if((byte) render_preset_name::idx#10==(byte/signed byte/word/signed word/dword/signed dword) $a) goto render_preset_name::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #$a
+    beq b3
+  //SEG603 [318] phi from render_preset_name::@11 to render_preset_name::@12 [phi:render_preset_name::@11->render_preset_name::@12]
+  //SEG604 render_preset_name::@12
+  b12:
+  //SEG605 [319] phi from render_preset_name render_preset_name::@12 to render_preset_name::@1 [phi:render_preset_name/render_preset_name::@12->render_preset_name::@1]
+  //SEG606 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#1 [phi:render_preset_name/render_preset_name::@12->render_preset_name::@1#0] -- pbuz1=pbuc1 
     lda #<name_1
     sta name
     lda #>name_1
     sta name+1
-    jmp b22
-  //SEG607 [319] phi from render_preset_name::@23 to render_preset_name::@22 [phi:render_preset_name::@23->render_preset_name::@22]
-  b1:
-  //SEG608 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#2 [phi:render_preset_name::@23->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_2
-    sta name
-    lda #>name_2
-    sta name+1
-    jmp b22
-  //SEG609 [319] phi from render_preset_name::@24 to render_preset_name::@22 [phi:render_preset_name::@24->render_preset_name::@22]
+    jmp b1
+  //SEG607 [319] phi from render_preset_name::@10 to render_preset_name::@1 [phi:render_preset_name::@10->render_preset_name::@1]
   b2:
-  //SEG610 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#3 [phi:render_preset_name::@24->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_3
-    sta name
-    lda #>name_3
-    sta name+1
-    jmp b22
-  //SEG611 [319] phi from render_preset_name::@25 to render_preset_name::@22 [phi:render_preset_name::@25->render_preset_name::@22]
-  b3:
-  //SEG612 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#4 [phi:render_preset_name::@25->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_4
-    sta name
-    lda #>name_4
-    sta name+1
-    jmp b22
-  //SEG613 [319] phi from render_preset_name::@26 to render_preset_name::@22 [phi:render_preset_name::@26->render_preset_name::@22]
-  b4:
-  //SEG614 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#5 [phi:render_preset_name::@26->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_5
-    sta name
-    lda #>name_5
-    sta name+1
-    jmp b22
-  //SEG615 [319] phi from render_preset_name::@27 to render_preset_name::@22 [phi:render_preset_name::@27->render_preset_name::@22]
-  b5:
-  //SEG616 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#6 [phi:render_preset_name::@27->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_6
-    sta name
-    lda #>name_6
-    sta name+1
-    jmp b22
-  //SEG617 [319] phi from render_preset_name::@28 to render_preset_name::@22 [phi:render_preset_name::@28->render_preset_name::@22]
-  b6:
-  //SEG618 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#7 [phi:render_preset_name::@28->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_7
-    sta name
-    lda #>name_7
-    sta name+1
-    jmp b22
-  //SEG619 [319] phi from render_preset_name::@29 to render_preset_name::@22 [phi:render_preset_name::@29->render_preset_name::@22]
-  b7:
-  //SEG620 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#8 [phi:render_preset_name::@29->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_8
-    sta name
-    lda #>name_8
-    sta name+1
-    jmp b22
-  //SEG621 [319] phi from render_preset_name::@30 to render_preset_name::@22 [phi:render_preset_name::@30->render_preset_name::@22]
-  b8:
-  //SEG622 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#9 [phi:render_preset_name::@30->render_preset_name::@22#0] -- pbuz1=pbuc1 
-    lda #<name_9
-    sta name
-    lda #>name_9
-    sta name+1
-    jmp b22
-  //SEG623 [319] phi from render_preset_name::@31 to render_preset_name::@22 [phi:render_preset_name::@31->render_preset_name::@22]
-  b9:
-  //SEG624 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#10 [phi:render_preset_name::@31->render_preset_name::@22#0] -- pbuz1=pbuc1 
+  //SEG608 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#10 [phi:render_preset_name::@10->render_preset_name::@1#0] -- pbuz1=pbuc1 
     lda #<name_10
     sta name
     lda #>name_10
     sta name+1
-    jmp b22
-  //SEG625 [319] phi from render_preset_name::@32 to render_preset_name::@22 [phi:render_preset_name::@32->render_preset_name::@22]
-  b10:
-  //SEG626 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#11 [phi:render_preset_name::@32->render_preset_name::@22#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG609 [319] phi from render_preset_name::@11 to render_preset_name::@1 [phi:render_preset_name::@11->render_preset_name::@1]
+  b3:
+  //SEG610 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#11 [phi:render_preset_name::@11->render_preset_name::@1#0] -- pbuz1=pbuc1 
     lda #<name_11
     sta name
     lda #>name_11
     sta name+1
-  //SEG627 render_preset_name::@22
-  b22:
+    jmp b1
+  //SEG611 [319] phi from render_preset_name::@2 to render_preset_name::@1 [phi:render_preset_name::@2->render_preset_name::@1]
+  b4:
+  //SEG612 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#2 [phi:render_preset_name::@2->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_2
+    sta name
+    lda #>name_2
+    sta name+1
+    jmp b1
+  //SEG613 [319] phi from render_preset_name::@3 to render_preset_name::@1 [phi:render_preset_name::@3->render_preset_name::@1]
+  b5:
+  //SEG614 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#3 [phi:render_preset_name::@3->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_3
+    sta name
+    lda #>name_3
+    sta name+1
+    jmp b1
+  //SEG615 [319] phi from render_preset_name::@4 to render_preset_name::@1 [phi:render_preset_name::@4->render_preset_name::@1]
+  b6:
+  //SEG616 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#4 [phi:render_preset_name::@4->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_4
+    sta name
+    lda #>name_4
+    sta name+1
+    jmp b1
+  //SEG617 [319] phi from render_preset_name::@5 to render_preset_name::@1 [phi:render_preset_name::@5->render_preset_name::@1]
+  b7:
+  //SEG618 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#5 [phi:render_preset_name::@5->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_5
+    sta name
+    lda #>name_5
+    sta name+1
+    jmp b1
+  //SEG619 [319] phi from render_preset_name::@6 to render_preset_name::@1 [phi:render_preset_name::@6->render_preset_name::@1]
+  b8:
+  //SEG620 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#6 [phi:render_preset_name::@6->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_6
+    sta name
+    lda #>name_6
+    sta name+1
+    jmp b1
+  //SEG621 [319] phi from render_preset_name::@7 to render_preset_name::@1 [phi:render_preset_name::@7->render_preset_name::@1]
+  b9:
+  //SEG622 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#7 [phi:render_preset_name::@7->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_7
+    sta name
+    lda #>name_7
+    sta name+1
+    jmp b1
+  //SEG623 [319] phi from render_preset_name::@8 to render_preset_name::@1 [phi:render_preset_name::@8->render_preset_name::@1]
+  b10:
+  //SEG624 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#8 [phi:render_preset_name::@8->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_8
+    sta name
+    lda #>name_8
+    sta name+1
+    jmp b1
+  //SEG625 [319] phi from render_preset_name::@9 to render_preset_name::@1 [phi:render_preset_name::@9->render_preset_name::@1]
+  b11:
+  //SEG626 [319] phi (byte*) render_preset_name::name#13 = (const byte*) render_preset_name::name#9 [phi:render_preset_name::@9->render_preset_name::@1#0] -- pbuz1=pbuc1 
+    lda #<name_9
+    sta name
+    lda #>name_9
+    sta name+1
+  //SEG627 render_preset_name::@1
+  b1:
   //SEG628 [320] (byte*) print_str_at::str#1 ← (byte*) render_preset_name::name#13
   //SEG629 [321] call print_str_at 
-  //SEG630 [323] phi from render_preset_name::@22 to print_str_at [phi:render_preset_name::@22->print_str_at]
+  //SEG630 [323] phi from render_preset_name::@1 to print_str_at [phi:render_preset_name::@1->print_str_at]
     jsr print_str_at
   //SEG631 render_preset_name::@return
   //SEG632 [322] return 
@@ -30697,8 +30849,8 @@ form_render_values: {
   //SEG650 [331] phi (byte) form_render_values::idx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_render_values->form_render_values::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta idx
-  //SEG651 [331] phi from form_render_values::@3 to form_render_values::@1 [phi:form_render_values::@3->form_render_values::@1]
-  //SEG652 [331] phi (byte) form_render_values::idx#2 = (byte) form_render_values::idx#1 [phi:form_render_values::@3->form_render_values::@1#0] -- register_copy 
+  //SEG651 [331] phi from form_render_values::@2 to form_render_values::@1 [phi:form_render_values::@2->form_render_values::@1]
+  //SEG652 [331] phi (byte) form_render_values::idx#2 = (byte) form_render_values::idx#1 [phi:form_render_values::@2->form_render_values::@1#0] -- register_copy 
   //SEG653 form_render_values::@1
   b1:
   //SEG654 [332] (byte) form_field_ptr::field_idx#0 ← (byte) form_render_values::idx#2 -- vbuyy=vbuz1 
@@ -30708,7 +30860,7 @@ form_render_values: {
   //SEG657 [340] phi (byte) form_field_ptr::field_idx#2 = (byte) form_field_ptr::field_idx#0 [phi:form_render_values::@1->form_field_ptr#0] -- register_copy 
     jsr form_field_ptr
   //SEG658 [334] (byte*) form_field_ptr::return#2 ← (byte*) form_field_ptr::return#0
-  //SEG659 form_render_values::@3
+  //SEG659 form_render_values::@2
   //SEG660 [335] (byte*) form_render_values::field#0 ← (byte*) form_field_ptr::return#2
   //SEG661 [336] *((byte*) form_render_values::field#0) ← *((const byte[]) print_hextab#0 + *((const byte[]) form_fields_val#0 + (byte) form_render_values::idx#2)) -- _deref_pbuz1=pbuc1_derefidx_pbuc2_derefidx_vbuz2 
     ldx idx
@@ -30759,156 +30911,156 @@ form_field_ptr: {
 // apply_preset(byte register(A) idx)
 apply_preset: {
     .label preset = 3
-  //SEG674 [346] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto apply_preset::@22 -- vbuaa_eq_0_then_la1 
+  //SEG674 [346] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto apply_preset::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b33
-  //SEG675 apply_preset::@23
-  //SEG676 [347] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
+    beq b12
+  //SEG675 apply_preset::@2
+  //SEG676 [347] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #1
-    beq b1
-  //SEG677 apply_preset::@24
-  //SEG678 [348] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #2
-    beq b2
-  //SEG679 apply_preset::@25
-  //SEG680 [349] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #3
-    beq b3
-  //SEG681 apply_preset::@26
-  //SEG682 [350] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #4
     beq b4
-  //SEG683 apply_preset::@27
-  //SEG684 [351] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 5) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #5
+  //SEG677 apply_preset::@3
+  //SEG678 [348] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #2
     beq b5
-  //SEG685 apply_preset::@28
-  //SEG686 [352] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 6) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #6
+  //SEG679 apply_preset::@4
+  //SEG680 [349] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #3
     beq b6
-  //SEG687 apply_preset::@29
-  //SEG688 [353] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 7) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #7
+  //SEG681 apply_preset::@5
+  //SEG682 [350] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #4
     beq b7
-  //SEG689 apply_preset::@30
-  //SEG690 [354] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 8) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #8
+  //SEG683 apply_preset::@6
+  //SEG684 [351] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 5) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #5
     beq b8
-  //SEG691 apply_preset::@31
-  //SEG692 [355] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 9) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #9
+  //SEG685 apply_preset::@7
+  //SEG686 [352] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 6) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #6
     beq b9
-  //SEG693 apply_preset::@32
-  //SEG694 [356] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) $a) goto apply_preset::@22 -- vbuaa_eq_vbuc1_then_la1 
-    cmp #$a
+  //SEG687 apply_preset::@8
+  //SEG688 [353] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 7) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #7
     beq b10
-  //SEG695 [357] phi from apply_preset::@32 to apply_preset::@33 [phi:apply_preset::@32->apply_preset::@33]
-  //SEG696 apply_preset::@33
-  b33:
-  //SEG697 [358] phi from apply_preset apply_preset::@33 to apply_preset::@22 [phi:apply_preset/apply_preset::@33->apply_preset::@22]
-  //SEG698 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdchar#0 [phi:apply_preset/apply_preset::@33->apply_preset::@22#0] -- pbuz1=pbuc1 
+  //SEG689 apply_preset::@9
+  //SEG690 [354] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 8) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #8
+    beq b11
+  //SEG691 apply_preset::@10
+  //SEG692 [355] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) 9) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #9
+    beq b2
+  //SEG693 apply_preset::@11
+  //SEG694 [356] if((byte) apply_preset::idx#0==(byte/signed byte/word/signed word/dword/signed dword) $a) goto apply_preset::@1 -- vbuaa_eq_vbuc1_then_la1 
+    cmp #$a
+    beq b3
+  //SEG695 [357] phi from apply_preset::@11 to apply_preset::@12 [phi:apply_preset::@11->apply_preset::@12]
+  //SEG696 apply_preset::@12
+  b12:
+  //SEG697 [358] phi from apply_preset apply_preset::@12 to apply_preset::@1 [phi:apply_preset/apply_preset::@12->apply_preset::@1]
+  //SEG698 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdchar#0 [phi:apply_preset/apply_preset::@12->apply_preset::@1#0] -- pbuz1=pbuc1 
     lda #<preset_stdchar
     sta preset
     lda #>preset_stdchar
     sta preset+1
-    jmp b22
-  //SEG699 [358] phi from apply_preset::@23 to apply_preset::@22 [phi:apply_preset::@23->apply_preset::@22]
-  b1:
-  //SEG700 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_ecmchar#0 [phi:apply_preset::@23->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_ecmchar
-    sta preset
-    lda #>preset_ecmchar
-    sta preset+1
-    jmp b22
-  //SEG701 [358] phi from apply_preset::@24 to apply_preset::@22 [phi:apply_preset::@24->apply_preset::@22]
+    jmp b1
+  //SEG699 [358] phi from apply_preset::@10 to apply_preset::@1 [phi:apply_preset::@10->apply_preset::@1]
   b2:
-  //SEG702 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdbm#0 [phi:apply_preset::@24->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_stdbm
-    sta preset
-    lda #>preset_stdbm
-    sta preset+1
-    jmp b22
-  //SEG703 [358] phi from apply_preset::@25 to apply_preset::@22 [phi:apply_preset::@25->apply_preset::@22]
-  b3:
-  //SEG704 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_mcbm#0 [phi:apply_preset::@25->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_mcbm
-    sta preset
-    lda #>preset_mcbm
-    sta preset+1
-    jmp b22
-  //SEG705 [358] phi from apply_preset::@26 to apply_preset::@22 [phi:apply_preset::@26->apply_preset::@22]
-  b4:
-  //SEG706 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_stdchar#0 [phi:apply_preset::@26->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_hi_stdchar
-    sta preset
-    lda #>preset_hi_stdchar
-    sta preset+1
-    jmp b22
-  //SEG707 [358] phi from apply_preset::@27 to apply_preset::@22 [phi:apply_preset::@27->apply_preset::@22]
-  b5:
-  //SEG708 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_ecmchar#0 [phi:apply_preset::@27->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_hi_ecmchar
-    sta preset
-    lda #>preset_hi_ecmchar
-    sta preset+1
-    jmp b22
-  //SEG709 [358] phi from apply_preset::@28 to apply_preset::@22 [phi:apply_preset::@28->apply_preset::@22]
-  b6:
-  //SEG710 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_twoplane#0 [phi:apply_preset::@28->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_twoplane
-    sta preset
-    lda #>preset_twoplane
-    sta preset+1
-    jmp b22
-  //SEG711 [358] phi from apply_preset::@29 to apply_preset::@22 [phi:apply_preset::@29->apply_preset::@22]
-  b7:
-  //SEG712 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_chunky#0 [phi:apply_preset::@29->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_chunky
-    sta preset
-    lda #>preset_chunky
-    sta preset+1
-    jmp b22
-  //SEG713 [358] phi from apply_preset::@30 to apply_preset::@22 [phi:apply_preset::@30->apply_preset::@22]
-  b8:
-  //SEG714 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred#0 [phi:apply_preset::@30->apply_preset::@22#0] -- pbuz1=pbuc1 
-    lda #<preset_sixsfred
-    sta preset
-    lda #>preset_sixsfred
-    sta preset+1
-    jmp b22
-  //SEG715 [358] phi from apply_preset::@31 to apply_preset::@22 [phi:apply_preset::@31->apply_preset::@22]
-  b9:
-  //SEG716 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred2#0 [phi:apply_preset::@31->apply_preset::@22#0] -- pbuz1=pbuc1 
+  //SEG700 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred2#0 [phi:apply_preset::@10->apply_preset::@1#0] -- pbuz1=pbuc1 
     lda #<preset_sixsfred2
     sta preset
     lda #>preset_sixsfred2
     sta preset+1
-    jmp b22
-  //SEG717 [358] phi from apply_preset::@32 to apply_preset::@22 [phi:apply_preset::@32->apply_preset::@22]
-  b10:
-  //SEG718 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_8bpppixelcell#0 [phi:apply_preset::@32->apply_preset::@22#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG701 [358] phi from apply_preset::@11 to apply_preset::@1 [phi:apply_preset::@11->apply_preset::@1]
+  b3:
+  //SEG702 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_8bpppixelcell#0 [phi:apply_preset::@11->apply_preset::@1#0] -- pbuz1=pbuc1 
     lda #<preset_8bpppixelcell
     sta preset
     lda #>preset_8bpppixelcell
     sta preset+1
-  //SEG719 apply_preset::@22
-  b22:
-  //SEG720 [359] phi from apply_preset::@22 to apply_preset::@45 [phi:apply_preset::@22->apply_preset::@45]
-  //SEG721 [359] phi (byte) apply_preset::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:apply_preset::@22->apply_preset::@45#0] -- vbuyy=vbuc1 
+    jmp b1
+  //SEG703 [358] phi from apply_preset::@2 to apply_preset::@1 [phi:apply_preset::@2->apply_preset::@1]
+  b4:
+  //SEG704 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_ecmchar#0 [phi:apply_preset::@2->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_ecmchar
+    sta preset
+    lda #>preset_ecmchar
+    sta preset+1
+    jmp b1
+  //SEG705 [358] phi from apply_preset::@3 to apply_preset::@1 [phi:apply_preset::@3->apply_preset::@1]
+  b5:
+  //SEG706 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_stdbm#0 [phi:apply_preset::@3->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_stdbm
+    sta preset
+    lda #>preset_stdbm
+    sta preset+1
+    jmp b1
+  //SEG707 [358] phi from apply_preset::@4 to apply_preset::@1 [phi:apply_preset::@4->apply_preset::@1]
+  b6:
+  //SEG708 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_mcbm#0 [phi:apply_preset::@4->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_mcbm
+    sta preset
+    lda #>preset_mcbm
+    sta preset+1
+    jmp b1
+  //SEG709 [358] phi from apply_preset::@5 to apply_preset::@1 [phi:apply_preset::@5->apply_preset::@1]
+  b7:
+  //SEG710 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_stdchar#0 [phi:apply_preset::@5->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_hi_stdchar
+    sta preset
+    lda #>preset_hi_stdchar
+    sta preset+1
+    jmp b1
+  //SEG711 [358] phi from apply_preset::@6 to apply_preset::@1 [phi:apply_preset::@6->apply_preset::@1]
+  b8:
+  //SEG712 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_hi_ecmchar#0 [phi:apply_preset::@6->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_hi_ecmchar
+    sta preset
+    lda #>preset_hi_ecmchar
+    sta preset+1
+    jmp b1
+  //SEG713 [358] phi from apply_preset::@7 to apply_preset::@1 [phi:apply_preset::@7->apply_preset::@1]
+  b9:
+  //SEG714 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_twoplane#0 [phi:apply_preset::@7->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_twoplane
+    sta preset
+    lda #>preset_twoplane
+    sta preset+1
+    jmp b1
+  //SEG715 [358] phi from apply_preset::@8 to apply_preset::@1 [phi:apply_preset::@8->apply_preset::@1]
+  b10:
+  //SEG716 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_chunky#0 [phi:apply_preset::@8->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_chunky
+    sta preset
+    lda #>preset_chunky
+    sta preset+1
+    jmp b1
+  //SEG717 [358] phi from apply_preset::@9 to apply_preset::@1 [phi:apply_preset::@9->apply_preset::@1]
+  b11:
+  //SEG718 [358] phi (byte*) apply_preset::preset#14 = (const byte[]) preset_sixsfred#0 [phi:apply_preset::@9->apply_preset::@1#0] -- pbuz1=pbuc1 
+    lda #<preset_sixsfred
+    sta preset
+    lda #>preset_sixsfred
+    sta preset+1
+  //SEG719 apply_preset::@1
+  b1:
+  //SEG720 [359] phi from apply_preset::@1 to apply_preset::@13 [phi:apply_preset::@1->apply_preset::@13]
+  //SEG721 [359] phi (byte) apply_preset::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:apply_preset::@1->apply_preset::@13#0] -- vbuyy=vbuc1 
     ldy #0
   // Copy preset values into the fields
-  //SEG722 [359] phi from apply_preset::@45 to apply_preset::@45 [phi:apply_preset::@45->apply_preset::@45]
-  //SEG723 [359] phi (byte) apply_preset::i#2 = (byte) apply_preset::i#1 [phi:apply_preset::@45->apply_preset::@45#0] -- register_copy 
-  //SEG724 apply_preset::@45
-  b45:
+  //SEG722 [359] phi from apply_preset::@13 to apply_preset::@13 [phi:apply_preset::@13->apply_preset::@13]
+  //SEG723 [359] phi (byte) apply_preset::i#2 = (byte) apply_preset::i#1 [phi:apply_preset::@13->apply_preset::@13#0] -- register_copy 
+  //SEG724 apply_preset::@13
+  b13:
   //SEG725 [360] *((const byte[]) form_fields_val#0 + (byte) apply_preset::i#2) ← *((byte*) apply_preset::preset#14 + (byte) apply_preset::i#2) -- pbuc1_derefidx_vbuyy=pbuz1_derefidx_vbuyy 
     lda (preset),y
     sta form_fields_val,y
   //SEG726 [361] (byte) apply_preset::i#1 ← ++ (byte) apply_preset::i#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG727 [362] if((byte) apply_preset::i#1!=(const byte) form_fields_cnt#0) goto apply_preset::@45 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG727 [362] if((byte) apply_preset::i#1!=(const byte) form_fields_cnt#0) goto apply_preset::@13 -- vbuyy_neq_vbuc1_then_la1 
     cpy #form_fields_cnt
-    bne b45
+    bne b13
   //SEG728 apply_preset::@return
   //SEG729 [363] return 
     rts
@@ -30925,16 +31077,16 @@ form_control: {
   //SEG734 [340] phi (byte) form_field_ptr::field_idx#2 = (byte) form_field_ptr::field_idx#1 [phi:form_control->form_field_ptr#0] -- register_copy 
     jsr form_field_ptr
   //SEG735 [366] (byte*) form_field_ptr::return#3 ← (byte*) form_field_ptr::return#0
-  //SEG736 form_control::@33
+  //SEG736 form_control::@17
   //SEG737 [367] (byte*) form_control::field#0 ← (byte*) form_field_ptr::return#3
   //SEG738 [368] (signed byte) form_cursor_count#5 ← -- (signed byte) form_cursor_count#21 -- vbsz1=_dec_vbsz1 
     dec form_cursor_count
-  //SEG739 [369] if((signed byte) form_cursor_count#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@36 -- vbsz1_ge_0_then_la1 
+  //SEG739 [369] if((signed byte) form_cursor_count#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@20 -- vbsz1_ge_0_then_la1 
     lda form_cursor_count
     cmp #0
     bpl b1
-  //SEG740 [370] phi from form_control::@33 to form_control::@1 [phi:form_control::@33->form_control::@1]
-  //SEG741 [370] phi (signed byte) form_cursor_count#15 = (const signed byte) FORM_CURSOR_BLINK#0 [phi:form_control::@33->form_control::@1#0] -- vbsz1=vbsc1 
+  //SEG740 [370] phi from form_control::@17 to form_control::@1 [phi:form_control::@17->form_control::@1]
+  //SEG741 [370] phi (signed byte) form_cursor_count#15 = (const signed byte) FORM_CURSOR_BLINK#0 [phi:form_control::@17->form_control::@1#0] -- vbsz1=vbsc1 
     lda #FORM_CURSOR_BLINK
     sta form_cursor_count
   //SEG742 form_control::@1
@@ -30949,31 +31101,31 @@ form_control: {
     bpl !b2+
     jmp b2
   !b2:
-  //SEG744 form_control::@8
+  //SEG744 form_control::@6
   //SEG745 [372] (byte~) form_control::$13 ← *((byte*) form_control::field#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f -- vbuaa=_deref_pbuz1_band_vbuc1 
     lda #$7f
     ldy #0
     and (field),y
   //SEG746 [373] *((byte*) form_control::field#0) ← (byte~) form_control::$13 -- _deref_pbuz1=vbuaa 
     sta (field),y
-  //SEG747 [374] phi from form_control::@2 form_control::@8 to form_control::@3 [phi:form_control::@2/form_control::@8->form_control::@3]
+  //SEG747 [374] phi from form_control::@2 form_control::@6 to form_control::@3 [phi:form_control::@2/form_control::@6->form_control::@3]
   //SEG748 form_control::@3
   b3:
   //SEG749 [375] call keyboard_event_scan 
   //SEG750 [159] phi from form_control::@3 to keyboard_event_scan [phi:form_control::@3->keyboard_event_scan]
   //SEG751 [159] phi (byte) keyboard_events_size#110 = (byte) keyboard_events_size#47 [phi:form_control::@3->keyboard_event_scan#0] -- register_copy 
     jsr keyboard_event_scan
-  //SEG752 [376] phi from form_control::@3 to form_control::@34 [phi:form_control::@3->form_control::@34]
-  //SEG753 form_control::@34
+  //SEG752 [376] phi from form_control::@3 to form_control::@18 [phi:form_control::@3->form_control::@18]
+  //SEG753 form_control::@18
   //SEG754 [377] call keyboard_event_get 
     jsr keyboard_event_get
   //SEG755 [378] (byte) keyboard_event_get::return#4 ← (byte) keyboard_event_get::return#2
-  //SEG756 form_control::@35
+  //SEG756 form_control::@19
   //SEG757 [379] (byte) form_control::key_event#0 ← (byte) keyboard_event_get::return#4
   //SEG758 [380] if((byte) form_control::key_event#0!=(const byte) KEY_CRSR_DOWN#0) goto form_control::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_CRSR_DOWN
     bne b4
-  //SEG759 form_control::@10
+  //SEG759 form_control::@7
   //SEG760 [381] (byte~) form_control::$15 ← *((byte*) form_control::field#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f -- vbuaa=_deref_pbuz1_band_vbuc1 
     lda #$7f
     ldy #0
@@ -30984,79 +31136,79 @@ form_control: {
   //SEG762 [383] (byte~) form_control::$16 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #KEY_MODIFIER_SHIFT
-  //SEG763 [384] if((byte~) form_control::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@19 -- vbuaa_eq_0_then_la1 
+  //SEG763 [384] if((byte~) form_control::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@12 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b19
-  //SEG764 form_control::@11
+    beq b12
+  //SEG764 form_control::@8
   //SEG765 [385] (byte) form_field_idx#44 ← -- (byte) form_field_idx#28 -- vbuz1=_dec_vbuz1 
     dec form_field_idx
-  //SEG766 [386] if((byte) form_field_idx#44!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@37 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG766 [386] if((byte) form_field_idx#44!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@21 -- vbuz1_neq_vbuc1_then_la1 
     lda #$ff
     cmp form_field_idx
-    bne b22
-  //SEG767 [387] phi from form_control::@11 to form_control::@22 [phi:form_control::@11->form_control::@22]
-  //SEG768 [387] phi (byte) form_field_idx#31 = (const byte) form_fields_cnt#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:form_control::@11->form_control::@22#0] -- vbuz1=vbuc1 
+    bne b13
+  //SEG767 [387] phi from form_control::@8 to form_control::@13 [phi:form_control::@8->form_control::@13]
+  //SEG768 [387] phi (byte) form_field_idx#31 = (const byte) form_fields_cnt#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:form_control::@8->form_control::@13#0] -- vbuz1=vbuc1 
     lda #form_fields_cnt-1
     sta form_field_idx
-  //SEG769 form_control::@22
-  b22:
-  //SEG770 [388] phi from form_control::@22 to form_control::@return [phi:form_control::@22->form_control::@return]
-  //SEG771 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#31 [phi:form_control::@22->form_control::@return#0] -- register_copy 
-  //SEG772 [388] phi (signed byte) form_cursor_count#16 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:form_control::@22->form_control::@return#1] -- vbsz1=vbuc1 
+  //SEG769 form_control::@13
+  b13:
+  //SEG770 [388] phi from form_control::@13 to form_control::@return [phi:form_control::@13->form_control::@return]
+  //SEG771 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#31 [phi:form_control::@13->form_control::@return#0] -- register_copy 
+  //SEG772 [388] phi (signed byte) form_cursor_count#16 = (const signed byte) FORM_CURSOR_BLINK#0/(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:form_control::@13->form_control::@return#1] -- vbsz1=vbuc1 
     lda #FORM_CURSOR_BLINK/2
     sta form_cursor_count
-  //SEG773 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@22->form_control::@return#2] -- vbuxx=vbuc1 
+  //SEG773 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@13->form_control::@return#2] -- vbuxx=vbuc1 
     ldx #0
   //SEG774 form_control::@return
   breturn:
   //SEG775 [389] return 
     rts
-  //SEG776 [390] phi from form_control::@11 to form_control::@37 [phi:form_control::@11->form_control::@37]
-  //SEG777 form_control::@37
-  //SEG778 [387] phi from form_control::@37 form_control::@38 to form_control::@22 [phi:form_control::@37/form_control::@38->form_control::@22]
-  //SEG779 [387] phi (byte) form_field_idx#31 = (byte) form_field_idx#44 [phi:form_control::@37/form_control::@38->form_control::@22#0] -- register_copy 
-  //SEG780 form_control::@19
-  b19:
+  //SEG776 [390] phi from form_control::@8 to form_control::@21 [phi:form_control::@8->form_control::@21]
+  //SEG777 form_control::@21
+  //SEG778 [387] phi from form_control::@21 form_control::@22 to form_control::@13 [phi:form_control::@21/form_control::@22->form_control::@13]
+  //SEG779 [387] phi (byte) form_field_idx#31 = (byte) form_field_idx#44 [phi:form_control::@21/form_control::@22->form_control::@13#0] -- register_copy 
+  //SEG780 form_control::@12
+  b12:
   //SEG781 [391] (byte) form_field_idx#45 ← ++ (byte) form_field_idx#28 -- vbuz1=_inc_vbuz1 
     inc form_field_idx
-  //SEG782 [392] if((byte) form_field_idx#45!=(const byte) form_fields_cnt#0) goto form_control::@38 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG782 [392] if((byte) form_field_idx#45!=(const byte) form_fields_cnt#0) goto form_control::@22 -- vbuz1_neq_vbuc1_then_la1 
     lda #form_fields_cnt
     cmp form_field_idx
-    bne b22
-  //SEG783 [387] phi from form_control::@19 to form_control::@22 [phi:form_control::@19->form_control::@22]
-  //SEG784 [387] phi (byte) form_field_idx#31 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@19->form_control::@22#0] -- vbuz1=vbuc1 
+    bne b13
+  //SEG783 [387] phi from form_control::@12 to form_control::@13 [phi:form_control::@12->form_control::@13]
+  //SEG784 [387] phi (byte) form_field_idx#31 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@12->form_control::@13#0] -- vbuz1=vbuc1 
     lda #0
     sta form_field_idx
-    jmp b22
-  //SEG785 [393] phi from form_control::@19 to form_control::@38 [phi:form_control::@19->form_control::@38]
-  //SEG786 form_control::@38
+    jmp b13
+  //SEG785 [393] phi from form_control::@12 to form_control::@22 [phi:form_control::@12->form_control::@22]
+  //SEG786 form_control::@22
   //SEG787 form_control::@4
   b4:
   //SEG788 [394] if((byte) form_control::key_event#0!=(const byte) KEY_CRSR_RIGHT#0) goto form_control::@5 -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_CRSR_RIGHT
     bne b5
-  //SEG789 form_control::@13
+  //SEG789 form_control::@9
   //SEG790 [395] (byte~) form_control::$24 ← (byte) keyboard_modifiers#21 & (const byte) KEY_MODIFIER_SHIFT#0 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #KEY_MODIFIER_SHIFT
-  //SEG791 [396] if((byte~) form_control::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@26 -- vbuaa_eq_0_then_la1 
+  //SEG791 [396] if((byte~) form_control::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto form_control::@14 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b26
-  //SEG792 form_control::@14
+    beq b14
+  //SEG792 form_control::@10
   //SEG793 [397] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← -- *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) -- pbuc1_derefidx_vbuz1=_dec_pbuc1_derefidx_vbuz1 
     ldx form_field_idx
     dec form_fields_val,x
-  //SEG794 [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@29 -- pbuc1_derefidx_vbuz1_neq_vbuc2_then_la1 
+  //SEG794 [398] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)!=(byte/word/signed word/dword/signed dword) $ff) goto form_control::@15 -- pbuc1_derefidx_vbuz1_neq_vbuc2_then_la1 
     lda #$ff
     ldy form_field_idx
     cmp form_fields_val,y
-    bne b29
-  //SEG795 form_control::@15
+    bne b15
+  //SEG795 form_control::@11
   //SEG796 [399] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← *((const byte[]) form_fields_max#0 + (byte) form_field_idx#28) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz1 
     lda form_fields_max,y
     sta form_fields_val,y
-  //SEG797 form_control::@29
-  b29:
+  //SEG797 form_control::@15
+  b15:
   //SEG798 [400] *((byte*) form_control::field#0) ← *((const byte[]) print_hextab#0 + *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)) -- _deref_pbuz1=pbuc1_derefidx_pbuc2_derefidx_vbuz2 
     // Render field value
     ldx form_field_idx
@@ -31064,32 +31216,32 @@ form_control: {
     lda print_hextab,y
     ldy #0
     sta (field),y
-  //SEG799 [388] phi from form_control::@29 form_control::@39 to form_control::@return [phi:form_control::@29/form_control::@39->form_control::@return]
+  //SEG799 [388] phi from form_control::@15 form_control::@23 to form_control::@return [phi:form_control::@15/form_control::@23->form_control::@return]
   b6:
-  //SEG800 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#28 [phi:form_control::@29/form_control::@39->form_control::@return#0] -- register_copy 
-  //SEG801 [388] phi (signed byte) form_cursor_count#16 = (signed byte) form_cursor_count#15 [phi:form_control::@29/form_control::@39->form_control::@return#1] -- register_copy 
-  //SEG802 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@29/form_control::@39->form_control::@return#2] -- vbuxx=vbuc1 
+  //SEG800 [388] phi (byte) form_field_idx#18 = (byte) form_field_idx#28 [phi:form_control::@15/form_control::@23->form_control::@return#0] -- register_copy 
+  //SEG801 [388] phi (signed byte) form_cursor_count#16 = (signed byte) form_cursor_count#15 [phi:form_control::@15/form_control::@23->form_control::@return#1] -- register_copy 
+  //SEG802 [388] phi (byte) form_control::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:form_control::@15/form_control::@23->form_control::@return#2] -- vbuxx=vbuc1 
     ldx #0
     jmp breturn
-  //SEG803 form_control::@26
-  b26:
+  //SEG803 form_control::@14
+  b14:
   //SEG804 [401] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← ++ *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) -- pbuc1_derefidx_vbuz1=_inc_pbuc1_derefidx_vbuz1 
     ldx form_field_idx
     inc form_fields_val,x
-  //SEG805 [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@29 -- pbuc1_derefidx_vbuz1_le_pbuc2_derefidx_vbuz1_then_la1 
+  //SEG805 [402] if(*((const byte[]) form_fields_val#0 + (byte) form_field_idx#28)<=*((const byte[]) form_fields_max#0 + (byte) form_field_idx#28)) goto form_control::@15 -- pbuc1_derefidx_vbuz1_le_pbuc2_derefidx_vbuz1_then_la1 
     ldy form_field_idx
     lda form_fields_val,y
     cmp form_fields_max,y
-    bcc b29
-    beq b29
-  //SEG806 form_control::@31
+    bcc b15
+    beq b15
+  //SEG806 form_control::@16
   //SEG807 [403] *((const byte[]) form_fields_val#0 + (byte) form_field_idx#28) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuz1=vbuc2 
     lda #0
     sta form_fields_val,y
-    jmp b29
+    jmp b15
   //SEG808 form_control::@5
   b5:
-  //SEG809 [404] if((byte) form_control::key_event#0!=(const byte) KEY_SPACE#0) goto form_control::@39 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG809 [404] if((byte) form_control::key_event#0!=(const byte) KEY_SPACE#0) goto form_control::@23 -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_SPACE
     bne b6
   //SEG810 [388] phi from form_control::@5 to form_control::@return [phi:form_control::@5->form_control::@return]
@@ -31098,8 +31250,8 @@ form_control: {
   //SEG813 [388] phi (byte) form_control::return#2 = (byte/word/signed word/dword/signed dword) $ff [phi:form_control::@5->form_control::@return#2] -- vbuxx=vbuc1 
     ldx #$ff
     jmp breturn
-  //SEG814 [405] phi from form_control::@5 to form_control::@39 [phi:form_control::@5->form_control::@39]
-  //SEG815 form_control::@39
+  //SEG814 [405] phi from form_control::@5 to form_control::@23 [phi:form_control::@5->form_control::@23]
+  //SEG815 form_control::@23
   //SEG816 form_control::@2
   b2:
   //SEG817 [406] (byte/word/dword~) form_control::$14 ← *((byte*) form_control::field#0) | (byte/word/signed word/dword/signed dword) $80 -- vbuaa=_deref_pbuz1_bor_vbuc1 
@@ -31109,10 +31261,10 @@ form_control: {
   //SEG818 [407] *((byte*) form_control::field#0) ← (byte/word/dword~) form_control::$14 -- _deref_pbuz1=vbuaa 
     sta (field),y
     jmp b3
-  //SEG819 [408] phi from form_control::@33 to form_control::@36 [phi:form_control::@33->form_control::@36]
-  //SEG820 form_control::@36
-  //SEG821 [370] phi from form_control::@36 to form_control::@1 [phi:form_control::@36->form_control::@1]
-  //SEG822 [370] phi (signed byte) form_cursor_count#15 = (signed byte) form_cursor_count#5 [phi:form_control::@36->form_control::@1#0] -- register_copy 
+  //SEG819 [408] phi from form_control::@17 to form_control::@20 [phi:form_control::@17->form_control::@20]
+  //SEG820 form_control::@20
+  //SEG821 [370] phi from form_control::@20 to form_control::@1 [phi:form_control::@20->form_control::@1]
+  //SEG822 [370] phi (signed byte) form_cursor_count#15 = (signed byte) form_cursor_count#5 [phi:form_control::@20->form_control::@1#0] -- register_copy 
 }
 //SEG823 form_set_screen
 // Set the screen to use for the form.
@@ -31168,25 +31320,25 @@ print_str_lines: {
     sta print_char_cursor
     lda print_set_screen.screen+1
     sta print_char_cursor+1
-  //SEG842 [421] phi from print_str_lines print_str_lines::@9 to print_str_lines::@1 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1]
-  //SEG843 [421] phi (byte*) print_line_cursor#2 = (byte*) print_set_screen::screen#2 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1#0] -- register_copy 
-  //SEG844 [421] phi (byte*) print_char_cursor#22 = (byte*~) print_char_cursor#77 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1#1] -- register_copy 
-  //SEG845 [421] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#5 [phi:print_str_lines/print_str_lines::@9->print_str_lines::@1#2] -- register_copy 
+  //SEG842 [421] phi from print_str_lines print_str_lines::@5 to print_str_lines::@1 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1]
+  //SEG843 [421] phi (byte*) print_line_cursor#2 = (byte*) print_set_screen::screen#2 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1#0] -- register_copy 
+  //SEG844 [421] phi (byte*) print_char_cursor#22 = (byte*~) print_char_cursor#77 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1#1] -- register_copy 
+  //SEG845 [421] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#5 [phi:print_str_lines/print_str_lines::@5->print_str_lines::@1#2] -- register_copy 
   //SEG846 print_str_lines::@1
   b1:
-  //SEG847 [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@6 -- _deref_pbuz1_neq_vbuc1_then_la1 
+  //SEG847 [422] if(*((byte*) print_str_lines::str#3)!=(byte) '@') goto print_str_lines::@2 -- _deref_pbuz1_neq_vbuc1_then_la1 
     ldy #0
     lda (str),y
     cmp #'@'
-    bne b6
+    bne b2
   //SEG848 print_str_lines::@return
   //SEG849 [423] return 
     rts
-  //SEG850 [424] phi from print_str_lines::@1 print_str_lines::@7 to print_str_lines::@6 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6]
-  //SEG851 [424] phi (byte*) print_char_cursor#20 = (byte*) print_char_cursor#22 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#0] -- register_copy 
-  //SEG852 [424] phi (byte*) print_str_lines::str#4 = (byte*) print_str_lines::str#3 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#1] -- register_copy 
-  //SEG853 print_str_lines::@6
-  b6:
+  //SEG850 [424] phi from print_str_lines::@1 print_str_lines::@3 to print_str_lines::@2 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2]
+  //SEG851 [424] phi (byte*) print_char_cursor#20 = (byte*) print_char_cursor#22 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#0] -- register_copy 
+  //SEG852 [424] phi (byte*) print_str_lines::str#4 = (byte*) print_str_lines::str#3 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#1] -- register_copy 
+  //SEG853 print_str_lines::@2
+  b2:
   //SEG854 [425] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#4) -- vbuaa=_deref_pbuz1 
     ldy #0
     lda (str),y
@@ -31195,10 +31347,10 @@ print_str_lines: {
     bne !+
     inc str+1
   !:
-  //SEG856 [427] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@7 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG856 [427] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@3 -- vbuaa_eq_vbuc1_then_la1 
     cmp #'@'
-    beq b7
-  //SEG857 print_str_lines::@8
+    beq b3
+  //SEG857 print_str_lines::@4
   //SEG858 [428] *((byte*) print_char_cursor#20) ← (byte) print_str_lines::ch#0 -- _deref_pbuz1=vbuaa 
     ldy #0
     sta (print_char_cursor),y
@@ -31207,17 +31359,17 @@ print_str_lines: {
     bne !+
     inc print_char_cursor+1
   !:
-  //SEG860 [430] phi from print_str_lines::@6 print_str_lines::@8 to print_str_lines::@7 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7]
-  //SEG861 [430] phi (byte*) print_char_cursor#38 = (byte*) print_char_cursor#20 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7#0] -- register_copy 
-  //SEG862 print_str_lines::@7
-  b7:
-  //SEG863 [431] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG860 [430] phi from print_str_lines::@2 print_str_lines::@4 to print_str_lines::@3 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3]
+  //SEG861 [430] phi (byte*) print_char_cursor#38 = (byte*) print_char_cursor#20 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3#0] -- register_copy 
+  //SEG862 print_str_lines::@3
+  b3:
+  //SEG863 [431] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@2 -- vbuaa_neq_vbuc1_then_la1 
     cmp #'@'
-    bne b6
-  //SEG864 [432] phi from print_str_lines::@7 to print_str_lines::@9 [phi:print_str_lines::@7->print_str_lines::@9]
-  //SEG865 print_str_lines::@9
+    bne b2
+  //SEG864 [432] phi from print_str_lines::@3 to print_str_lines::@5 [phi:print_str_lines::@3->print_str_lines::@5]
+  //SEG865 print_str_lines::@5
   //SEG866 [433] call print_ln 
-  //SEG867 [435] phi from print_str_lines::@9 to print_ln [phi:print_str_lines::@9->print_ln]
+  //SEG867 [435] phi from print_str_lines::@5 to print_ln [phi:print_str_lines::@5->print_ln]
     jsr print_ln
   //SEG868 [434] (byte*~) print_char_cursor#78 ← (byte*) print_line_cursor#22 -- pbuz1=pbuz2 
     lda print_line_cursor
@@ -31746,9 +31898,9 @@ gfx_init_plane_horisontal: {
   //SEG1091 [545] phi (byte) gfx_init_plane_horisontal::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_init_plane_horisontal->gfx_init_plane_horisontal::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-  //SEG1092 [545] phi from gfx_init_plane_horisontal::@7 to gfx_init_plane_horisontal::@1 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@1]
-  //SEG1093 [545] phi (byte*) gfx_init_plane_horisontal::gfxa#6 = (byte*) gfx_init_plane_horisontal::gfxa#7 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@1#0] -- register_copy 
-  //SEG1094 [545] phi (byte) gfx_init_plane_horisontal::ay#4 = (byte) gfx_init_plane_horisontal::ay#1 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@1#1] -- register_copy 
+  //SEG1092 [545] phi from gfx_init_plane_horisontal::@6 to gfx_init_plane_horisontal::@1 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@1]
+  //SEG1093 [545] phi (byte*) gfx_init_plane_horisontal::gfxa#6 = (byte*) gfx_init_plane_horisontal::gfxa#7 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@1#0] -- register_copy 
+  //SEG1094 [545] phi (byte) gfx_init_plane_horisontal::ay#4 = (byte) gfx_init_plane_horisontal::ay#1 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@1#1] -- register_copy 
   //SEG1095 gfx_init_plane_horisontal::@1
   b1:
   //SEG1096 [546] phi from gfx_init_plane_horisontal::@1 to gfx_init_plane_horisontal::@2 [phi:gfx_init_plane_horisontal::@1->gfx_init_plane_horisontal::@2]
@@ -31785,18 +31937,18 @@ gfx_init_plane_horisontal: {
   //SEG1112 [553] if((byte) gfx_init_plane_horisontal::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto gfx_init_plane_horisontal::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
     bne b2
-  //SEG1113 gfx_init_plane_horisontal::@7
+  //SEG1113 gfx_init_plane_horisontal::@6
   //SEG1114 [554] (byte) gfx_init_plane_horisontal::ay#1 ← ++ (byte) gfx_init_plane_horisontal::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
   //SEG1115 [555] if((byte) gfx_init_plane_horisontal::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto gfx_init_plane_horisontal::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
     bne b1
-  //SEG1116 [556] phi from gfx_init_plane_horisontal::@7 to gfx_init_plane_horisontal::@8 [phi:gfx_init_plane_horisontal::@7->gfx_init_plane_horisontal::@8]
-  //SEG1117 gfx_init_plane_horisontal::@8
+  //SEG1116 [556] phi from gfx_init_plane_horisontal::@6 to gfx_init_plane_horisontal::@7 [phi:gfx_init_plane_horisontal::@6->gfx_init_plane_horisontal::@7]
+  //SEG1117 gfx_init_plane_horisontal::@7
   //SEG1118 [557] call dtvSetCpuBankSegment1 
-  //SEG1119 [505] phi from gfx_init_plane_horisontal::@8 to dtvSetCpuBankSegment1 [phi:gfx_init_plane_horisontal::@8->dtvSetCpuBankSegment1]
-  //SEG1120 [505] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 = ((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_horisontal::@8->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1 
+  //SEG1119 [505] phi from gfx_init_plane_horisontal::@7 to dtvSetCpuBankSegment1 [phi:gfx_init_plane_horisontal::@7->dtvSetCpuBankSegment1]
+  //SEG1120 [505] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 = ((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_horisontal::@7->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1 
     lda #$4000/$4000
     jsr dtvSetCpuBankSegment1
   //SEG1121 gfx_init_plane_horisontal::@return
@@ -32011,12 +32163,12 @@ gfx_init_plane_8bppchunky: {
   //SEG1221 [505] phi from gfx_init_plane_8bppchunky::@4 to dtvSetCpuBankSegment1 [phi:gfx_init_plane_8bppchunky::@4->dtvSetCpuBankSegment1]
   //SEG1222 [505] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#13 = (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:gfx_init_plane_8bppchunky::@4->dtvSetCpuBankSegment1#0] -- register_copy 
     jsr dtvSetCpuBankSegment1
-  //SEG1223 gfx_init_plane_8bppchunky::@8
+  //SEG1223 gfx_init_plane_8bppchunky::@7
   //SEG1224 [593] (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 ← ++ (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#4 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1225 [594] phi from gfx_init_plane_8bppchunky::@8 to gfx_init_plane_8bppchunky::@3 [phi:gfx_init_plane_8bppchunky::@8->gfx_init_plane_8bppchunky::@3]
-  //SEG1226 [594] phi (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#8 = (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 [phi:gfx_init_plane_8bppchunky::@8->gfx_init_plane_8bppchunky::@3#0] -- register_copy 
-  //SEG1227 [594] phi (byte*) gfx_init_plane_8bppchunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_8bppchunky::@8->gfx_init_plane_8bppchunky::@3#1] -- pbuz1=pbuc1 
+  //SEG1225 [594] phi from gfx_init_plane_8bppchunky::@7 to gfx_init_plane_8bppchunky::@3 [phi:gfx_init_plane_8bppchunky::@7->gfx_init_plane_8bppchunky::@3]
+  //SEG1226 [594] phi (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#8 = (byte) gfx_init_plane_8bppchunky::gfxbCpuBank#2 [phi:gfx_init_plane_8bppchunky::@7->gfx_init_plane_8bppchunky::@3#0] -- register_copy 
+  //SEG1227 [594] phi (byte*) gfx_init_plane_8bppchunky::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:gfx_init_plane_8bppchunky::@7->gfx_init_plane_8bppchunky::@3#1] -- pbuz1=pbuc1 
     lda #<$4000
     sta gfxb
     lda #>$4000
@@ -32082,16 +32234,16 @@ gfx_init_vic_bitmap: {
   //SEG1249 [607] call bitmap_init 
   //SEG1250 [759] phi from gfx_init_vic_bitmap to bitmap_init [phi:gfx_init_vic_bitmap->bitmap_init]
     jsr bitmap_init
-  //SEG1251 [608] phi from gfx_init_vic_bitmap to gfx_init_vic_bitmap::@3 [phi:gfx_init_vic_bitmap->gfx_init_vic_bitmap::@3]
-  //SEG1252 gfx_init_vic_bitmap::@3
+  //SEG1251 [608] phi from gfx_init_vic_bitmap to gfx_init_vic_bitmap::@2 [phi:gfx_init_vic_bitmap->gfx_init_vic_bitmap::@2]
+  //SEG1252 gfx_init_vic_bitmap::@2
   //SEG1253 [609] call bitmap_clear 
     jsr bitmap_clear
-  //SEG1254 [610] phi from gfx_init_vic_bitmap::@3 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1]
-  //SEG1255 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1#0] -- vbuz1=vbuc1 
+  //SEG1254 [610] phi from gfx_init_vic_bitmap::@2 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@2->gfx_init_vic_bitmap::@1]
+  //SEG1255 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gfx_init_vic_bitmap::@2->gfx_init_vic_bitmap::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta l
-  //SEG1256 [610] phi from gfx_init_vic_bitmap::@5 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@5->gfx_init_vic_bitmap::@1]
-  //SEG1257 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte) gfx_init_vic_bitmap::l#1 [phi:gfx_init_vic_bitmap::@5->gfx_init_vic_bitmap::@1#0] -- register_copy 
+  //SEG1256 [610] phi from gfx_init_vic_bitmap::@3 to gfx_init_vic_bitmap::@1 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1]
+  //SEG1257 [610] phi (byte) gfx_init_vic_bitmap::l#2 = (byte) gfx_init_vic_bitmap::l#1 [phi:gfx_init_vic_bitmap::@3->gfx_init_vic_bitmap::@1#0] -- register_copy 
   //SEG1258 gfx_init_vic_bitmap::@1
   b1:
   //SEG1259 [611] (byte) bitmap_line::x0#0 ← *((const byte[]) gfx_init_vic_bitmap::lines_x#0 + (byte) gfx_init_vic_bitmap::l#2) -- vbuz1=pbuc1_derefidx_vbuz2 
@@ -32108,7 +32260,7 @@ gfx_init_vic_bitmap: {
     sta bitmap_line.y1
   //SEG1263 [615] call bitmap_line 
     jsr bitmap_line
-  //SEG1264 gfx_init_vic_bitmap::@5
+  //SEG1264 gfx_init_vic_bitmap::@3
   //SEG1265 [616] (byte) gfx_init_vic_bitmap::l#1 ← ++ (byte) gfx_init_vic_bitmap::l#2 -- vbuz1=_inc_vbuz1 
     inc l
   //SEG1266 [617] if((byte) gfx_init_vic_bitmap::l#1<(const byte) gfx_init_vic_bitmap::lines_cnt#0) goto gfx_init_vic_bitmap::@1 -- vbuz1_lt_vbuc1_then_la1 
@@ -32135,26 +32287,26 @@ bitmap_line: {
     beq !+
     bcs b1
   !:
-  //SEG1271 bitmap_line::@3
+  //SEG1271 bitmap_line::@2
   //SEG1272 [620] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0 -- vbuz1=vbuz2_minus_vbuxx 
     txa
     eor #$ff
     sec
     adc x0
     sta xd
-  //SEG1273 [621] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1273 [621] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b10
-  //SEG1274 bitmap_line::@4
+    bcc b7
+  //SEG1274 bitmap_line::@3
   //SEG1275 [622] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuyy=vbuz1_minus_vbuz2 
     sec
     sbc y1
     tay
-  //SEG1276 [623] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1276 [623] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b11
-  //SEG1277 bitmap_line::@5
+    bcc b8
+  //SEG1277 bitmap_line::@4
   //SEG1278 [624] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxi.y
@@ -32166,19 +32318,19 @@ bitmap_line: {
     sty bitmap_line_ydxi.yd
   //SEG1282 [628] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   //SEG1283 [629] call bitmap_line_ydxi 
-  //SEG1284 [703] phi from bitmap_line::@5 to bitmap_line_ydxi [phi:bitmap_line::@5->bitmap_line_ydxi]
-  //SEG1285 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@5->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1286 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1287 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@5->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1288 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@5->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1289 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1284 [703] phi from bitmap_line::@4 to bitmap_line_ydxi [phi:bitmap_line::@4->bitmap_line_ydxi]
+  //SEG1285 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@4->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1286 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1287 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@4->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1288 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@4->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1289 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
   //SEG1290 bitmap_line::@return
   breturn:
   //SEG1291 [630] return 
     rts
-  //SEG1292 bitmap_line::@11
-  b11:
+  //SEG1292 bitmap_line::@8
+  b8:
   //SEG1293 [631] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuxx 
     stx bitmap_line_xdyi.x
   //SEG1294 [632] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
@@ -32189,25 +32341,25 @@ bitmap_line: {
   //SEG1297 [635] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2 -- vbuz1=vbuyy 
     sty bitmap_line_xdyi.yd
   //SEG1298 [636] call bitmap_line_xdyi 
-  //SEG1299 [681] phi from bitmap_line::@11 to bitmap_line_xdyi [phi:bitmap_line::@11->bitmap_line_xdyi]
-  //SEG1300 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@11->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1301 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1302 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@11->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1303 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@11->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1304 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1299 [681] phi from bitmap_line::@8 to bitmap_line_xdyi [phi:bitmap_line::@8->bitmap_line_xdyi]
+  //SEG1300 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@8->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1301 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1302 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@8->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1303 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@8->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1304 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
-  //SEG1305 bitmap_line::@10
-  b10:
+  //SEG1305 bitmap_line::@7
+  b7:
   //SEG1306 [637] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y1
     sec
     sbc y0
     tay
-  //SEG1307 [638] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1307 [638] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b15
-  //SEG1308 bitmap_line::@17
+    bcc b9
+  //SEG1308 bitmap_line::@10
   //SEG1309 [639] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxd.y
@@ -32220,16 +32372,16 @@ bitmap_line: {
     sty bitmap_line_ydxd.yd
   //SEG1313 [643] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   //SEG1314 [644] call bitmap_line_ydxd 
-  //SEG1315 [733] phi from bitmap_line::@17 to bitmap_line_ydxd [phi:bitmap_line::@17->bitmap_line_ydxd]
-  //SEG1316 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@17->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1317 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1318 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@17->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1319 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@17->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1320 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1315 [733] phi from bitmap_line::@10 to bitmap_line_ydxd [phi:bitmap_line::@10->bitmap_line_ydxd]
+  //SEG1316 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@10->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1317 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1318 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@10->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1319 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@10->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1320 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1321 bitmap_line::@15
-  b15:
+  //SEG1321 bitmap_line::@9
+  b9:
   //SEG1322 [645] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuxx 
     stx bitmap_line_xdyd.x
   //SEG1323 [646] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
@@ -32240,12 +32392,12 @@ bitmap_line: {
   //SEG1326 [649] (byte) bitmap_line_xdyd::yd#0 ← (byte) bitmap_line::yd#1 -- vbuz1=vbuyy 
     sty bitmap_line_xdyd.yd
   //SEG1327 [650] call bitmap_line_xdyd 
-  //SEG1328 [718] phi from bitmap_line::@15 to bitmap_line_xdyd [phi:bitmap_line::@15->bitmap_line_xdyd]
-  //SEG1329 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@15->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1330 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1331 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@15->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1332 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@15->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1333 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1328 [718] phi from bitmap_line::@9 to bitmap_line_xdyd [phi:bitmap_line::@9->bitmap_line_xdyd]
+  //SEG1329 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@9->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1330 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1331 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@9->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1332 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@9->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1333 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
   //SEG1334 bitmap_line::@1
@@ -32255,19 +32407,19 @@ bitmap_line: {
     sec
     sbc x0
     sta xd
-  //SEG1336 [652] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1336 [652] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b20
-  //SEG1337 bitmap_line::@7
+    bcc b11
+  //SEG1337 bitmap_line::@5
   //SEG1338 [653] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuyy=vbuz1_minus_vbuz2 
     sec
     sbc y1
     tay
-  //SEG1339 [654] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1339 [654] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b21
-  //SEG1340 bitmap_line::@8
+    bcc b12
+  //SEG1340 bitmap_line::@6
   //SEG1341 [655] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxd.y
@@ -32277,16 +32429,16 @@ bitmap_line: {
     sty bitmap_line_ydxd.yd
   //SEG1345 [659] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   //SEG1346 [660] call bitmap_line_ydxd 
-  //SEG1347 [733] phi from bitmap_line::@8 to bitmap_line_ydxd [phi:bitmap_line::@8->bitmap_line_ydxd]
-  //SEG1348 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@8->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1349 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1350 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@8->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1351 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@8->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1352 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1347 [733] phi from bitmap_line::@6 to bitmap_line_ydxd [phi:bitmap_line::@6->bitmap_line_ydxd]
+  //SEG1348 [733] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@6->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1349 [733] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1350 [733] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@6->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1351 [733] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@6->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1352 [733] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1353 bitmap_line::@21
-  b21:
+  //SEG1353 bitmap_line::@12
+  b12:
   //SEG1354 [661] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyd.x
@@ -32297,25 +32449,25 @@ bitmap_line: {
   //SEG1358 [665] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10 -- vbuz1=vbuyy 
     sty bitmap_line_xdyd.yd
   //SEG1359 [666] call bitmap_line_xdyd 
-  //SEG1360 [718] phi from bitmap_line::@21 to bitmap_line_xdyd [phi:bitmap_line::@21->bitmap_line_xdyd]
-  //SEG1361 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@21->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1362 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1363 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@21->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1364 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@21->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1365 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1360 [718] phi from bitmap_line::@12 to bitmap_line_xdyd [phi:bitmap_line::@12->bitmap_line_xdyd]
+  //SEG1361 [718] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@12->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1362 [718] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1363 [718] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@12->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1364 [718] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@12->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1365 [718] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
-  //SEG1366 bitmap_line::@20
-  b20:
+  //SEG1366 bitmap_line::@11
+  b11:
   //SEG1367 [667] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y1
     sec
     sbc y0
     tay
-  //SEG1368 [668] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1368 [668] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b25
-  //SEG1369 bitmap_line::@27
+    bcc b13
+  //SEG1369 bitmap_line::@14
   //SEG1370 [669] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxi.y
@@ -32326,16 +32478,16 @@ bitmap_line: {
     sty bitmap_line_ydxi.yd
   //SEG1374 [673] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   //SEG1375 [674] call bitmap_line_ydxi 
-  //SEG1376 [703] phi from bitmap_line::@27 to bitmap_line_ydxi [phi:bitmap_line::@27->bitmap_line_ydxi]
-  //SEG1377 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@27->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1378 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1379 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@27->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1380 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@27->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1381 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1376 [703] phi from bitmap_line::@14 to bitmap_line_ydxi [phi:bitmap_line::@14->bitmap_line_ydxi]
+  //SEG1377 [703] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@14->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1378 [703] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1379 [703] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@14->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1380 [703] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@14->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1381 [703] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
-  //SEG1382 bitmap_line::@25
-  b25:
+  //SEG1382 bitmap_line::@13
+  b13:
   //SEG1383 [675] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyi.x
@@ -32346,12 +32498,12 @@ bitmap_line: {
   //SEG1387 [679] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11 -- vbuz1=vbuyy 
     sty bitmap_line_xdyi.yd
   //SEG1388 [680] call bitmap_line_xdyi 
-  //SEG1389 [681] phi from bitmap_line::@25 to bitmap_line_xdyi [phi:bitmap_line::@25->bitmap_line_xdyi]
-  //SEG1390 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@25->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1391 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1392 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@25->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1393 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@25->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1394 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1389 [681] phi from bitmap_line::@13 to bitmap_line_xdyi [phi:bitmap_line::@13->bitmap_line_xdyi]
+  //SEG1390 [681] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@13->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1391 [681] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1392 [681] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@13->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1393 [681] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@13->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1394 [681] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
 }
@@ -32383,7 +32535,7 @@ bitmap_line_xdyi: {
   //SEG1406 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#0] -- register_copy 
   //SEG1407 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG1408 bitmap_line_xdyi::@5
+  //SEG1408 bitmap_line_xdyi::@4
   //SEG1409 [687] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1410 [688] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -32403,9 +32555,9 @@ bitmap_line_xdyi: {
     sec
     sbc xd
     sta e
-  //SEG1415 [692] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2]
-  //SEG1416 [692] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#0] -- register_copy 
-  //SEG1417 [692] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#1] -- register_copy 
+  //SEG1415 [692] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2]
+  //SEG1416 [692] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#0] -- register_copy 
+  //SEG1417 [692] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#1] -- register_copy 
   //SEG1418 bitmap_line_xdyi::@2
   b2:
   //SEG1419 [693] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6 ← (byte) bitmap_line_xdyi::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuz1_plus_1 
@@ -32478,7 +32630,7 @@ bitmap_line_ydxi: {
   //SEG1442 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#0] -- register_copy 
   //SEG1443 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG1444 bitmap_line_ydxi::@5
+  //SEG1444 bitmap_line_ydxi::@4
   //SEG1445 [709] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1446 [710] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -32498,9 +32650,9 @@ bitmap_line_ydxi: {
     sec
     sbc yd
     sta e
-  //SEG1451 [714] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2]
-  //SEG1452 [714] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#0] -- register_copy 
-  //SEG1453 [714] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#1] -- register_copy 
+  //SEG1451 [714] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2]
+  //SEG1452 [714] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#0] -- register_copy 
+  //SEG1453 [714] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#1] -- register_copy 
   //SEG1454 bitmap_line_ydxi::@2
   b2:
   //SEG1455 [715] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6 ← (byte) bitmap_line_ydxi::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_plus_1 
@@ -32542,7 +32694,7 @@ bitmap_line_xdyd: {
   //SEG1470 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#0] -- register_copy 
   //SEG1471 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG1472 bitmap_line_xdyd::@5
+  //SEG1472 bitmap_line_xdyd::@4
   //SEG1473 [724] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1474 [725] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -32562,9 +32714,9 @@ bitmap_line_xdyd: {
     sec
     sbc xd
     sta e
-  //SEG1479 [729] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2]
-  //SEG1480 [729] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#0] -- register_copy 
-  //SEG1481 [729] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#1] -- register_copy 
+  //SEG1479 [729] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2]
+  //SEG1480 [729] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#0] -- register_copy 
+  //SEG1481 [729] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#1] -- register_copy 
   //SEG1482 bitmap_line_xdyd::@2
   b2:
   //SEG1483 [730] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6 ← (byte) bitmap_line_xdyd::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuz1_plus_1 
@@ -32603,7 +32755,7 @@ bitmap_line_ydxd: {
   //SEG1498 [696] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#0] -- register_copy 
   //SEG1499 [696] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG1500 bitmap_line_ydxd::@5
+  //SEG1500 bitmap_line_ydxd::@4
   //SEG1501 [739] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1502 [740] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -32623,9 +32775,9 @@ bitmap_line_ydxd: {
     sec
     sbc yd
     sta e
-  //SEG1507 [744] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2]
-  //SEG1508 [744] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#0] -- register_copy 
-  //SEG1509 [744] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#1] -- register_copy 
+  //SEG1507 [744] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2]
+  //SEG1508 [744] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#0] -- register_copy 
+  //SEG1509 [744] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#1] -- register_copy 
   //SEG1510 bitmap_line_ydxd::@2
   b2:
   //SEG1511 [745] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6 ← (byte) bitmap_line_ydxd::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_plus_1 
@@ -32725,7 +32877,7 @@ bitmap_init: {
     tya
     lsr
     tay
-  //SEG1554 [766] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuyy_neq_0_then_la1 
+  //SEG1554 [766] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuyy_neq_0_then_la1 
     cpy #0
     bne b2
   //SEG1555 [767] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
@@ -32738,18 +32890,18 @@ bitmap_init: {
   //SEG1559 [769] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1
-  //SEG1560 [770] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  //SEG1561 [770] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG1560 [770] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  //SEG1561 [770] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     sta yoffs+1
-  //SEG1562 [770] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuxx=vbuc1 
+  //SEG1562 [770] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuxx=vbuc1 
     tax
-  //SEG1563 [770] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  //SEG1564 [770] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG1565 [770] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-  //SEG1566 bitmap_init::@5
-  b5:
+  //SEG1563 [770] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  //SEG1564 [770] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG1565 [770] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+  //SEG1566 bitmap_init::@3
+  b3:
   //SEG1567 [771] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _6
@@ -32766,10 +32918,10 @@ bitmap_init: {
   //SEG1573 [777] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG1574 [778] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG1574 [778] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6
-  //SEG1575 bitmap_init::@7
+    bne b4
+  //SEG1575 bitmap_init::@5
   //SEG1576 [779] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -32778,22 +32930,22 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG1577 [780] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  //SEG1578 [780] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-  //SEG1579 bitmap_init::@6
-  b6:
+  //SEG1577 [780] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  //SEG1578 [780] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+  //SEG1579 bitmap_init::@4
+  b4:
   //SEG1580 [781] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1581 [782] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuxx_neq_0_then_la1 
+  //SEG1581 [782] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5
+    bne b3
   //SEG1582 bitmap_init::@return
   //SEG1583 [783] return 
     rts
-  //SEG1584 [784] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  //SEG1585 bitmap_init::@10
-  //SEG1586 [767] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  //SEG1587 [767] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG1584 [784] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  //SEG1585 bitmap_init::@6
+  //SEG1586 [767] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  //SEG1587 [767] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
 }
 //SEG1588 gfx_init_charset
 gfx_init_charset: {
diff --git a/src/test/ref/c64dtv-gfxexplorer.sym b/src/test/ref/c64dtv-gfxexplorer.sym
index da3c6f533..32053d93e 100644
--- a/src/test/ref/c64dtv-gfxexplorer.sym
+++ b/src/test/ref/c64dtv-gfxexplorer.sym
@@ -1,4 +1,4 @@
-(label) @68
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -353,19 +353,19 @@
 (byte) WHITE
 (byte) YELLOW
 (void()) apply_preset((byte) apply_preset::idx)
-(label) apply_preset::@22
-(label) apply_preset::@23
-(label) apply_preset::@24
-(label) apply_preset::@25
-(label) apply_preset::@26
-(label) apply_preset::@27
-(label) apply_preset::@28
-(label) apply_preset::@29
-(label) apply_preset::@30
-(label) apply_preset::@31
-(label) apply_preset::@32
-(label) apply_preset::@33
-(label) apply_preset::@45
+(label) apply_preset::@1
+(label) apply_preset::@10
+(label) apply_preset::@11
+(label) apply_preset::@12
+(label) apply_preset::@13
+(label) apply_preset::@2
+(label) apply_preset::@3
+(label) apply_preset::@4
+(label) apply_preset::@5
+(label) apply_preset::@6
+(label) apply_preset::@7
+(label) apply_preset::@8
+(label) apply_preset::@9
 (label) apply_preset::@return
 (byte) apply_preset::i
 (byte) apply_preset::i#1 reg byte y 1501.5
@@ -399,11 +399,11 @@
 (byte~) bitmap_init::$8 reg byte a 22.0
 (byte~) bitmap_init::$9 reg byte a 22.0
 (label) bitmap_init::@1
-(label) bitmap_init::@10
 (label) bitmap_init::@2
+(label) bitmap_init::@3
+(label) bitmap_init::@4
 (label) bitmap_init::@5
 (label) bitmap_init::@6
-(label) bitmap_init::@7
 (label) bitmap_init::@return
 (byte*) bitmap_init::bitmap
 (byte) bitmap_init::bits
@@ -424,17 +424,17 @@
 (label) bitmap_line::@1
 (label) bitmap_line::@10
 (label) bitmap_line::@11
-(label) bitmap_line::@15
-(label) bitmap_line::@17
-(label) bitmap_line::@20
-(label) bitmap_line::@21
-(label) bitmap_line::@25
-(label) bitmap_line::@27
+(label) bitmap_line::@12
+(label) bitmap_line::@13
+(label) bitmap_line::@14
+(label) bitmap_line::@2
 (label) bitmap_line::@3
 (label) bitmap_line::@4
 (label) bitmap_line::@5
+(label) bitmap_line::@6
 (label) bitmap_line::@7
 (label) bitmap_line::@8
+(label) bitmap_line::@9
 (label) bitmap_line::@return
 (byte) bitmap_line::x0
 (byte) bitmap_line::x0#0 x0 zp ZP_BYTE:13 1.260869565217391
@@ -457,7 +457,7 @@
 (label) bitmap_line_xdyd::@1
 (label) bitmap_line_xdyd::@2
 (label) bitmap_line_xdyd::@3
-(label) bitmap_line_xdyd::@5
+(label) bitmap_line_xdyd::@4
 (label) bitmap_line_xdyd::@return
 (byte) bitmap_line_xdyd::e
 (byte) bitmap_line_xdyd::e#0 e zp ZP_BYTE:18 4.0
@@ -495,7 +495,7 @@
 (label) bitmap_line_xdyi::@1
 (label) bitmap_line_xdyi::@2
 (label) bitmap_line_xdyi::@3
-(label) bitmap_line_xdyi::@5
+(label) bitmap_line_xdyi::@4
 (label) bitmap_line_xdyi::@return
 (byte) bitmap_line_xdyi::e
 (byte) bitmap_line_xdyi::e#0 e zp ZP_BYTE:18 4.0
@@ -533,7 +533,7 @@
 (label) bitmap_line_ydxd::@1
 (label) bitmap_line_ydxd::@2
 (label) bitmap_line_ydxd::@3
-(label) bitmap_line_ydxd::@5
+(label) bitmap_line_ydxd::@4
 (label) bitmap_line_ydxd::@return
 (byte) bitmap_line_ydxd::e
 (byte) bitmap_line_ydxd::e#0 e zp ZP_BYTE:13 4.0
@@ -571,7 +571,7 @@
 (label) bitmap_line_ydxi::@1
 (label) bitmap_line_ydxi::@2
 (label) bitmap_line_ydxi::@3
-(label) bitmap_line_ydxi::@5
+(label) bitmap_line_ydxi::@4
 (label) bitmap_line_ydxi::@return
 (byte) bitmap_line_ydxi::e
 (byte) bitmap_line_ydxi::e#0 e zp ZP_BYTE:13 4.0
@@ -680,26 +680,26 @@
 (label) form_control::@1
 (label) form_control::@10
 (label) form_control::@11
+(label) form_control::@12
 (label) form_control::@13
 (label) form_control::@14
 (label) form_control::@15
+(label) form_control::@16
+(label) form_control::@17
+(label) form_control::@18
 (label) form_control::@19
 (label) form_control::@2
+(label) form_control::@20
+(label) form_control::@21
 (label) form_control::@22
-(label) form_control::@26
-(label) form_control::@29
+(label) form_control::@23
 (label) form_control::@3
-(label) form_control::@31
-(label) form_control::@33
-(label) form_control::@34
-(label) form_control::@35
-(label) form_control::@36
-(label) form_control::@37
-(label) form_control::@38
-(label) form_control::@39
 (label) form_control::@4
 (label) form_control::@5
+(label) form_control::@6
+(label) form_control::@7
 (label) form_control::@8
+(label) form_control::@9
 (label) form_control::@return
 (byte*) form_control::field
 (byte*) form_control::field#0 field zp ZP_WORD:3 0.5925925925925926
@@ -775,21 +775,21 @@
 (void()) form_mode()
 (byte~) form_mode::$36 reg byte a 2002.0
 (label) form_mode::@1
+(label) form_mode::@10
 (label) form_mode::@11
 (label) form_mode::@12
+(label) form_mode::@13
+(label) form_mode::@14
+(label) form_mode::@15
+(label) form_mode::@16
+(label) form_mode::@17
+(label) form_mode::@18
 (label) form_mode::@19
-(label) form_mode::@21
-(label) form_mode::@22
-(label) form_mode::@23
-(label) form_mode::@24
-(label) form_mode::@25
-(label) form_mode::@26
-(label) form_mode::@27
-(label) form_mode::@28
-(label) form_mode::@29
-(label) form_mode::@30
-(label) form_mode::@31
-(label) form_mode::@32
+(label) form_mode::@2
+(label) form_mode::@3
+(label) form_mode::@4
+(label) form_mode::@5
+(label) form_mode::@6
 (label) form_mode::@7
 (label) form_mode::@8
 (label) form_mode::@9
@@ -804,7 +804,7 @@
 (byte*) form_preset
 (void()) form_render_values()
 (label) form_render_values::@1
-(label) form_render_values::@3
+(label) form_render_values::@2
 (label) form_render_values::@return
 (byte*) form_render_values::field
 (byte*) form_render_values::field#0 field zp ZP_WORD:3 2002.0
@@ -846,20 +846,20 @@
 (byte*) form_vic_screen
 (const byte*) form_vic_screen#0 form_vic_screen = (const byte[]) form_fields_val#0+(byte/signed byte/word/signed word/dword/signed dword) $18
 (dword()) get_plane((byte) get_plane::idx)
-(label) get_plane::@27
-(label) get_plane::@28
-(label) get_plane::@29
-(label) get_plane::@30
-(label) get_plane::@31
-(label) get_plane::@32
-(label) get_plane::@33
-(label) get_plane::@34
-(label) get_plane::@35
-(label) get_plane::@36
-(label) get_plane::@37
-(label) get_plane::@38
-(label) get_plane::@39
-(label) get_plane::@40
+(label) get_plane::@1
+(label) get_plane::@10
+(label) get_plane::@11
+(label) get_plane::@12
+(label) get_plane::@13
+(label) get_plane::@14
+(label) get_plane::@2
+(label) get_plane::@3
+(label) get_plane::@4
+(label) get_plane::@5
+(label) get_plane::@6
+(label) get_plane::@7
+(label) get_plane::@8
+(label) get_plane::@9
 (label) get_plane::@return
 (byte) get_plane::idx
 (byte) get_plane::idx#0 reg byte a 4.0
@@ -870,8 +870,8 @@
 (dword) get_plane::return#16 return zp ZP_DWORD:9 4.0
 (dword) get_plane::return#17 return zp ZP_DWORD:9 4.0
 (byte*()) get_vic_charset((byte) get_vic_charset::idx)
-(label) get_vic_charset::@3
-(label) get_vic_charset::@4
+(label) get_vic_charset::@1
+(label) get_vic_charset::@2
 (label) get_vic_charset::@return
 (byte) get_vic_charset::idx
 (byte) get_vic_charset::idx#0 reg byte a 3.0
@@ -879,11 +879,11 @@
 (byte*) get_vic_charset::return#2 return zp ZP_WORD:3 0.6666666666666666
 (byte*) get_vic_charset::return#4 return zp ZP_WORD:3 4.0
 (byte*()) get_vic_screen((byte) get_vic_screen::idx)
-(label) get_vic_screen::@10
-(label) get_vic_screen::@11
-(label) get_vic_screen::@12
-(label) get_vic_screen::@13
-(label) get_vic_screen::@9
+(label) get_vic_screen::@1
+(label) get_vic_screen::@2
+(label) get_vic_screen::@3
+(label) get_vic_screen::@4
+(label) get_vic_screen::@5
 (label) get_vic_screen::@return
 (byte) get_vic_screen::idx
 (byte) get_vic_screen::idx#0 reg byte a 4.0
@@ -937,7 +937,7 @@
 (label) gfx_init_plane_8bppchunky::@4
 (label) gfx_init_plane_8bppchunky::@5
 (label) gfx_init_plane_8bppchunky::@6
-(label) gfx_init_plane_8bppchunky::@8
+(label) gfx_init_plane_8bppchunky::@7
 (label) gfx_init_plane_8bppchunky::@return
 (byte) gfx_init_plane_8bppchunky::c
 (byte) gfx_init_plane_8bppchunky::c#0 reg byte a 202.0
@@ -1042,8 +1042,8 @@
 (label) gfx_init_plane_horisontal::@3
 (label) gfx_init_plane_horisontal::@4
 (label) gfx_init_plane_horisontal::@5
+(label) gfx_init_plane_horisontal::@6
 (label) gfx_init_plane_horisontal::@7
-(label) gfx_init_plane_horisontal::@8
 (label) gfx_init_plane_horisontal::@return
 (byte) gfx_init_plane_horisontal::ax
 (byte) gfx_init_plane_horisontal::ax#1 reg byte x 151.5
@@ -1196,8 +1196,8 @@
 (byte) gfx_init_screen4::cy#4 cy zp ZP_BYTE:2 3.6666666666666665
 (void()) gfx_init_vic_bitmap()
 (label) gfx_init_vic_bitmap::@1
+(label) gfx_init_vic_bitmap::@2
 (label) gfx_init_vic_bitmap::@3
-(label) gfx_init_vic_bitmap::@5
 (label) gfx_init_vic_bitmap::@return
 (byte) gfx_init_vic_bitmap::l
 (byte) gfx_init_vic_bitmap::l#1 l zp ZP_BYTE:2 16.5
@@ -1251,6 +1251,11 @@
 (byte~) gfx_mode::$70 reg byte a 4.0
 (byte~) gfx_mode::$71 reg byte a 4.0
 (label) gfx_mode::@1
+(label) gfx_mode::@10
+(label) gfx_mode::@11
+(label) gfx_mode::@12
+(label) gfx_mode::@13
+(label) gfx_mode::@14
 (label) gfx_mode::@15
 (label) gfx_mode::@16
 (label) gfx_mode::@17
@@ -1261,24 +1266,19 @@
 (label) gfx_mode::@21
 (label) gfx_mode::@22
 (label) gfx_mode::@23
+(label) gfx_mode::@24
+(label) gfx_mode::@25
 (label) gfx_mode::@26
 (label) gfx_mode::@27
 (label) gfx_mode::@28
 (label) gfx_mode::@29
 (label) gfx_mode::@3
+(label) gfx_mode::@30
 (label) gfx_mode::@31
-(label) gfx_mode::@34
-(label) gfx_mode::@36
-(label) gfx_mode::@38
+(label) gfx_mode::@32
+(label) gfx_mode::@33
 (label) gfx_mode::@4
-(label) gfx_mode::@46
-(label) gfx_mode::@47
-(label) gfx_mode::@48
-(label) gfx_mode::@49
 (label) gfx_mode::@5
-(label) gfx_mode::@50
-(label) gfx_mode::@51
-(label) gfx_mode::@52
 (label) gfx_mode::@6
 (label) gfx_mode::@7
 (label) gfx_mode::@8
@@ -1335,7 +1335,7 @@
 (byte) gfx_mode::vic_control2#2 reg byte a 2.0
 (byte[]) keyboard_char_keycodes
 (byte()) keyboard_event_get()
-(label) keyboard_event_get::@3
+(label) keyboard_event_get::@1
 (label) keyboard_event_get::@return
 (byte) keyboard_event_get::return
 (byte) keyboard_event_get::return#1 reg byte a 4.0
@@ -1368,25 +1368,25 @@
 (label) keyboard_event_scan::@10
 (label) keyboard_event_scan::@11
 (label) keyboard_event_scan::@12
+(label) keyboard_event_scan::@13
 (label) keyboard_event_scan::@14
+(label) keyboard_event_scan::@15
 (label) keyboard_event_scan::@16
 (label) keyboard_event_scan::@17
 (label) keyboard_event_scan::@18
+(label) keyboard_event_scan::@19
 (label) keyboard_event_scan::@2
 (label) keyboard_event_scan::@20
 (label) keyboard_event_scan::@21
+(label) keyboard_event_scan::@22
 (label) keyboard_event_scan::@23
-(label) keyboard_event_scan::@24
-(label) keyboard_event_scan::@25
-(label) keyboard_event_scan::@26
-(label) keyboard_event_scan::@27
-(label) keyboard_event_scan::@28
-(label) keyboard_event_scan::@29
 (label) keyboard_event_scan::@3
+(label) keyboard_event_scan::@4
 (label) keyboard_event_scan::@5
 (label) keyboard_event_scan::@6
 (label) keyboard_event_scan::@7
 (label) keyboard_event_scan::@8
+(label) keyboard_event_scan::@9
 (label) keyboard_event_scan::@return
 (byte) keyboard_event_scan::col
 (byte) keyboard_event_scan::col#1 reg byte x 150001.5
@@ -1445,8 +1445,8 @@
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@7
-(label) main::@9
+(label) main::@3
+(label) main::@4
 (byte[]) preset_8bpppixelcell
 (const byte[]) preset_8bpppixelcell#0 preset_8bpppixelcell = { (byte/signed byte/word/signed word/dword/signed dword) $a, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) $b, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 1, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0, (byte/signed byte/word/signed word/dword/signed dword) 0 }
 (byte[]) preset_chunky
@@ -1511,10 +1511,10 @@
 (byte*) print_str_at::str#2 str zp ZP_WORD:3 1001.5
 (void()) print_str_lines((byte*) print_str_lines::str)
 (label) print_str_lines::@1
-(label) print_str_lines::@6
-(label) print_str_lines::@7
-(label) print_str_lines::@8
-(label) print_str_lines::@9
+(label) print_str_lines::@2
+(label) print_str_lines::@3
+(label) print_str_lines::@4
+(label) print_str_lines::@5
 (label) print_str_lines::@return
 (byte) print_str_lines::ch
 (byte) print_str_lines::ch#0 reg byte a 667.3333333333334
@@ -1524,18 +1524,18 @@
 (byte*) print_str_lines::str#4 str zp ZP_WORD:3 1552.0
 (byte*) print_str_lines::str#5 str zp ZP_WORD:3 1.0
 (void()) render_preset_name((byte) render_preset_name::idx)
-(label) render_preset_name::@22
-(label) render_preset_name::@23
-(label) render_preset_name::@24
-(label) render_preset_name::@25
-(label) render_preset_name::@26
-(label) render_preset_name::@27
-(label) render_preset_name::@28
-(label) render_preset_name::@29
-(label) render_preset_name::@30
-(label) render_preset_name::@31
-(label) render_preset_name::@32
-(label) render_preset_name::@33
+(label) render_preset_name::@1
+(label) render_preset_name::@10
+(label) render_preset_name::@11
+(label) render_preset_name::@12
+(label) render_preset_name::@2
+(label) render_preset_name::@3
+(label) render_preset_name::@4
+(label) render_preset_name::@5
+(label) render_preset_name::@6
+(label) render_preset_name::@7
+(label) render_preset_name::@8
+(label) render_preset_name::@9
 (label) render_preset_name::@return
 (byte) render_preset_name::idx
 (byte) render_preset_name::idx#0 reg byte a 4.0
diff --git a/src/test/ref/c64dtv-gfxmodes.asm b/src/test/ref/c64dtv-gfxmodes.asm
index ccb1dfefa..5bacee070 100644
--- a/src/test/ref/c64dtv-gfxmodes.asm
+++ b/src/test/ref/c64dtv-gfxmodes.asm
@@ -110,9 +110,9 @@ main: {
     // Enable DTV extended modes
     lda #DTV_FEATURE_ENABLE
     sta DTV_FEATURE
-  b2:
+  b1:
     jsr menu
-    jmp b2
+    jmp b1
 }
 menu: {
     .label SCREEN = $8000
@@ -146,18 +146,18 @@ menu: {
     sta VIC_MEMORY
     ldx #0
   // DTV Palette - default
-  b8:
+  b3:
     lda DTV_PALETTE_DEFAULT,x
     sta DTV_PALETTE,x
     inx
     cpx #$10
-    bne b8
+    bne b3
     lda #<COLS
     sta c
     lda #>COLS
     sta c+1
   // Char Colors
-  b10:
+  b4:
     lda #LIGHT_GREEN
     ldy #0
     sta (c),y
@@ -167,10 +167,10 @@ menu: {
   !:
     lda c+1
     cmp #>COLS+$3e8
-    bne b10
+    bne b4
     lda c
     cmp #<COLS+$3e8
-    bne b10
+    bne b4
     // Screen colors
     lda #0
     sta BGCOL
@@ -178,91 +178,91 @@ menu: {
     jsr print_set_screen
     jsr print_cls
     jsr print_str_lines
-  b2:
+  b1:
     ldy #KEY_1
     jsr keyboard_key_pressed
     cmp #0
-    beq b12
+    beq b6
     jsr mode_stdchar
   breturn:
     rts
-  b12:
+  b6:
     ldy #KEY_2
     jsr keyboard_key_pressed
     cmp #0
-    beq b13
+    beq b7
     jsr mode_ecmchar
     jmp breturn
-  b13:
+  b7:
     ldy #KEY_3
     jsr keyboard_key_pressed
     cmp #0
-    beq b14
+    beq b8
     jsr mode_mcchar
     jmp breturn
-  b14:
+  b8:
     ldy #KEY_4
     jsr keyboard_key_pressed
     cmp #0
-    beq b15
+    beq b9
     jsr mode_stdbitmap
     jmp breturn
-  b15:
+  b9:
     ldy #KEY_6
     jsr keyboard_key_pressed
     cmp #0
-    beq b16
+    beq b10
     jsr mode_hicolstdchar
     jmp breturn
-  b16:
+  b10:
     ldy #KEY_7
     jsr keyboard_key_pressed
     cmp #0
-    beq b17
+    beq b11
     jsr mode_hicolecmchar
     jmp breturn
-  b17:
+  b11:
     ldy #KEY_8
     jsr keyboard_key_pressed
     cmp #0
-    beq b18
+    beq b12
     jsr mode_hicolmcchar
     jmp breturn
-  b18:
+  b12:
     ldy #KEY_A
     jsr keyboard_key_pressed
     cmp #0
-    beq b19
+    beq b13
     jsr mode_sixsfred2
     jmp breturn
-  b19:
+  b13:
     ldy #KEY_B
     jsr keyboard_key_pressed
     cmp #0
-    beq b20
+    beq b14
     jsr mode_twoplanebitmap
     jmp breturn
-  b20:
+  b14:
     ldy #KEY_C
     jsr keyboard_key_pressed
     cmp #0
-    beq b21
+    beq b15
     jsr mode_sixsfred
     jmp breturn
-  b21:
+  b15:
     ldy #KEY_D
     jsr keyboard_key_pressed
     cmp #0
-    beq b22
+    beq b16
     jsr mode_8bpppixelcell
     jmp breturn
-  b22:
+  b16:
     ldy #KEY_E
     jsr keyboard_key_pressed
     cmp #0
-    bne !b2+
-    jmp b2
-  !b2:
+    bne !b1+
+    jmp b1
+  !b1:
     jsr mode_8bppchunkybmm
     jmp breturn
 }
@@ -375,72 +375,72 @@ mode_8bppchunkybmm: {
 mode_ctrl: {
   b1:
   // Wait for the raster
-  b6:
+  b2:
     lda #$ff
     cmp RASTER
-    bne b6
+    bne b2
     ldy #KEY_SPACE
     jsr keyboard_key_pressed
     cmp #0
-    beq b9
+    beq b4
     rts
-  b9:
+  b4:
     // Read the current control byte
     ldx dtv_control
     ldy #KEY_L
     jsr keyboard_key_pressed
     cmp #0
-    beq b10
+    beq b5
     txa
     ora #DTV_LINEAR
     tax
-  b10:
+  b5:
     ldy #KEY_H
     jsr keyboard_key_pressed
     cmp #0
-    beq b11
+    beq b6
     txa
     ora #DTV_HIGHCOLOR
     tax
-  b11:
+  b6:
     ldy #KEY_O
     jsr keyboard_key_pressed
     cmp #0
-    beq b12
+    beq b7
     txa
     ora #DTV_OVERSCAN
     tax
-  b12:
+  b7:
     ldy #KEY_B
     jsr keyboard_key_pressed
     cmp #0
-    beq b13
+    beq b8
     txa
     ora #DTV_BORDER_OFF
     tax
-  b13:
+  b8:
     ldy #KEY_U
     jsr keyboard_key_pressed
     cmp #0
-    beq b14
+    beq b9
     txa
     ora #DTV_CHUNKY
     tax
-  b14:
+  b9:
     ldy #KEY_C
     jsr keyboard_key_pressed
     cmp #0
-    beq b15
+    beq b10
     txa
     ora #DTV_COLORRAM_OFF
     tax
-  b15:
+  b10:
     ldy #KEY_0
     jsr keyboard_key_pressed
     cmp #0
-    beq b16
+    beq b11
     ldx #0
-  b16:
+  b11:
     cpx dtv_control
     beq b1
     stx dtv_control
@@ -563,9 +563,9 @@ mode_8bpppixelcell: {
     sta gfxa+1
     lda #0
     sta ay
-  b3:
+  b2:
     ldx #0
-  b4:
+  b3:
     lda #$f
     and ay
     asl
@@ -584,11 +584,11 @@ mode_8bpppixelcell: {
   !:
     inx
     cpx #$28
-    bne b4
+    bne b3
     inc ay
     lda #$19
     cmp ay
-    bne b3
+    bne b2
     // 8bpp cells for Plane B (charset) - ROM charset with 256 colors
     lda #PROCPORT_RAM_CHARROM
     sta PROCPORT
@@ -603,10 +603,10 @@ mode_8bpppixelcell: {
     sta chargen
     lda #>CHARGEN
     sta chargen+1
-  b7:
+  b6:
     lda #0
     sta cr
-  b8:
+  b7:
     ldy #0
     lda (chargen),y
     sta bits
@@ -615,16 +615,16 @@ mode_8bpppixelcell: {
     inc chargen+1
   !:
     ldx #0
-  b9:
+  b8:
     lda #$80
     and bits
     cmp #0
-    beq b2
+    beq b4
     lda col
-    jmp b10
-  b2:
+    jmp b9
+  b4:
     lda #0
-  b10:
+  b9:
     ldy #0
     sta (gfxb),y
     inc gfxb
@@ -635,15 +635,15 @@ mode_8bpppixelcell: {
     inc col
     inx
     cpx #8
-    bne b9
+    bne b8
     inc cr
     lda #8
     cmp cr
-    bne b8
+    bne b7
     inc ch
     lda ch
     cmp #0
-    bne b7
+    bne b6
     lda #PROCPORT_RAM_IO
     sta PROCPORT
     lda #DTV_HIGHCOLOR|DTV_LINEAR|DTV_CHUNKY
@@ -746,9 +746,9 @@ mode_sixsfred: {
     sta gfxa+1
     lda #0
     sta ay
-  b7:
+  b6:
     ldx #0
-  b8:
+  b7:
     lda ay
     lsr
     and #3
@@ -762,20 +762,20 @@ mode_sixsfred: {
   !:
     inx
     cpx #$28
-    bne b8
+    bne b7
     inc ay
     lda #$c8
     cmp ay
-    bne b7
+    bne b6
     lda #0
     sta by
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-  b11:
+  b9:
     ldx #0
-  b12:
+  b10:
     lda #$1b
     ldy #0
     sta (gfxb),y
@@ -785,11 +785,11 @@ mode_sixsfred: {
   !:
     inx
     cpx #$28
-    bne b12
+    bne b10
     inc by
     lda #$c8
     cmp by
-    bne b11
+    bne b9
     lda #DTV_HIGHCOLOR|DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
@@ -906,13 +906,13 @@ mode_twoplanebitmap: {
     sta gfxa+1
     lda #0
     sta ay
-  b7:
+  b6:
     ldx #0
-  b8:
+  b7:
     lda #4
     and ay
     cmp #0
-    beq b9
+    beq b8
     lda #$ff
     ldy #0
     sta (gfxa),y
@@ -920,23 +920,23 @@ mode_twoplanebitmap: {
     bne !+
     inc gfxa+1
   !:
-  b10:
+  b9:
     inx
     cpx #$28
-    bne b8
+    bne b7
     inc ay
     lda #$c8
     cmp ay
-    bne b7
+    bne b6
     lda #0
     sta by
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-  b15:
+  b12:
     ldx #0
-  b16:
+  b13:
     lda #$f
     ldy #0
     sta (gfxb),y
@@ -946,16 +946,16 @@ mode_twoplanebitmap: {
   !:
     inx
     cpx #$28
-    bne b16
+    bne b13
     inc by
     lda #$c8
     cmp by
-    bne b15
+    bne b12
     lda #DTV_HIGHCOLOR|DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
     rts
-  b9:
+  b8:
     lda #0
     tay
     sta (gfxa),y
@@ -963,7 +963,7 @@ mode_twoplanebitmap: {
     bne !+
     inc gfxa+1
   !:
-    jmp b10
+    jmp b9
 }
 // Sixs Fred Mode 2 - 8bpp Packed Bitmap - Generated from the two DTV linear graphics plane counters
 // Two Plane MultiColor Bitmap - 8bpp Packed Bitmap (CHUNK/COLDIS/HICOL = 0, ECM/BMM/MCM/LINEAR = 1)
@@ -1067,9 +1067,9 @@ mode_sixsfred2: {
     sta gfxa+1
     lda #0
     sta ay
-  b7:
+  b6:
     ldx #0
-  b8:
+  b7:
     lda ay
     lsr
     and #3
@@ -1083,20 +1083,20 @@ mode_sixsfred2: {
   !:
     inx
     cpx #$28
-    bne b8
+    bne b7
     inc ay
     lda #$c8
     cmp ay
-    bne b7
+    bne b6
     lda #0
     sta by
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-  b11:
+  b9:
     ldx #0
-  b12:
+  b10:
     lda #$1b
     ldy #0
     sta (gfxb),y
@@ -1106,11 +1106,11 @@ mode_sixsfred2: {
   !:
     inx
     cpx #$28
-    bne b12
+    bne b10
     inc by
     lda #$c8
     cmp by
-    bne b11
+    bne b9
     lda #DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
@@ -1567,12 +1567,12 @@ bitmap_line: {
     sta xd
     lda y0
     cmp y1
-    bcc b10
+    bcc b7
     sec
     sbc y1
     tay
     cpy xd
-    bcc b11
+    bcc b8
     lda y1
     sta bitmap_line_ydxi.y
     lda y0
@@ -1581,20 +1581,20 @@ bitmap_line: {
     jsr bitmap_line_ydxi
   breturn:
     rts
-  b11:
+  b8:
     stx bitmap_line_xdyi.x
     lda y1
     sta bitmap_line_xdyi.y
     sty bitmap_line_xdyi.yd
     jsr bitmap_line_xdyi
     jmp breturn
-  b10:
+  b7:
     lda y1
     sec
     sbc y0
     tay
     cpy xd
-    bcc b15
+    bcc b9
     lda y0
     sta bitmap_line_ydxd.y
     ldx x0
@@ -1603,7 +1603,7 @@ bitmap_line: {
     sty bitmap_line_ydxd.yd
     jsr bitmap_line_ydxd
     jmp breturn
-  b15:
+  b9:
     stx bitmap_line_xdyd.x
     lda y1
     sta bitmap_line_xdyd.y
@@ -1617,38 +1617,38 @@ bitmap_line: {
     sta xd
     lda y0
     cmp y1
-    bcc b20
+    bcc b11
     sec
     sbc y1
     tay
     cpy xd
-    bcc b21
+    bcc b12
     lda y1
     sta bitmap_line_ydxd.y
     sty bitmap_line_ydxd.yd
     jsr bitmap_line_ydxd
     jmp breturn
-  b21:
+  b12:
     lda x0
     sta bitmap_line_xdyd.x
     stx bitmap_line_xdyd.x1
     sty bitmap_line_xdyd.yd
     jsr bitmap_line_xdyd
     jmp breturn
-  b20:
+  b11:
     lda y1
     sec
     sbc y0
     tay
     cpy xd
-    bcc b25
+    bcc b13
     lda y0
     sta bitmap_line_ydxi.y
     ldx x0
     sty bitmap_line_ydxi.yd
     jsr bitmap_line_ydxi
     jmp breturn
-  b25:
+  b13:
     lda x0
     sta bitmap_line_xdyi.x
     stx bitmap_line_xdyi.x1
@@ -1878,7 +1878,7 @@ bitmap_init: {
     sta yoffs
     sta yoffs+1
     tax
-  b5:
+  b3:
     lda #7
     sax _6
     lda yoffs
@@ -1889,7 +1889,7 @@ bitmap_init: {
     txa
     and #7
     cmp #7
-    bne b6
+    bne b4
     clc
     lda yoffs
     adc #<$28*8
@@ -1897,10 +1897,10 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  b6:
+  b4:
     inx
     cpx #0
-    bne b5
+    bne b3
     rts
 }
 // Multicolor Character Mode (LINEAR/HICOL/CHUNK/COLDIS/BMM/ECM = 0, MCM = 1)
@@ -2253,9 +2253,9 @@ print_str_lines: {
     ldy #0
     lda (str),y
     cmp #'@'
-    bne b6
+    bne b2
     rts
-  b6:
+  b2:
     ldy #0
     lda (str),y
     inc str
@@ -2263,16 +2263,16 @@ print_str_lines: {
     inc str+1
   !:
     cmp #'@'
-    beq b7
+    beq b3
     ldy #0
     sta (print_char_cursor),y
     inc print_char_cursor
     bne !+
     inc print_char_cursor+1
   !:
-  b7:
+  b3:
     cmp #'@'
-    bne b6
+    bne b2
     jsr print_ln
     lda print_line_cursor
     sta print_char_cursor
diff --git a/src/test/ref/c64dtv-gfxmodes.cfg b/src/test/ref/c64dtv-gfxmodes.cfg
index 0e2162679..20e996961 100644
--- a/src/test/ref/c64dtv-gfxmodes.cfg
+++ b/src/test/ref/c64dtv-gfxmodes.cfg
@@ -1,23 +1,23 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@54
-@54: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @54
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @54
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
   [7] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [8] phi()
   [9] call menu 
-  to:main::@2
-menu: scope:[menu]  from main::@2
+  to:main::@1
+menu: scope:[menu]  from main::@1
   [10] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) menu::CHARSET#0/(dword/signed dword) $10000
   [11] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
   [12] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
@@ -27,192 +27,192 @@ menu: scope:[menu]  from main::@2
   [16] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [17] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_CSEL#0
   [18] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) menu::SCREEN#0&(word/signed word/dword/signed dword) $3fff/(byte/signed byte/word/signed word/dword/signed dword) $40|((word))(const byte*) menu::CHARSET#0&(word/signed word/dword/signed dword) $3fff/(word/signed word/dword/signed dword) $400
-  to:menu::@8
-menu::@8: scope:[menu]  from menu menu::@8
-  [19] (byte) menu::i#2 ← phi( menu/(byte/signed byte/word/signed word/dword/signed dword) 0 menu::@8/(byte) menu::i#1 )
+  to:menu::@3
+menu::@3: scope:[menu]  from menu menu::@3
+  [19] (byte) menu::i#2 ← phi( menu/(byte/signed byte/word/signed word/dword/signed dword) 0 menu::@3/(byte) menu::i#1 )
   [20] *((const byte*) DTV_PALETTE#0 + (byte) menu::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) menu::i#2)
   [21] (byte) menu::i#1 ← ++ (byte) menu::i#2
-  [22] if((byte) menu::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto menu::@8
-  to:menu::@10
-menu::@10: scope:[menu]  from menu::@10 menu::@8
-  [23] (byte*) menu::c#2 ← phi( menu::@10/(byte*) menu::c#1 menu::@8/(const byte*) COLS#0 )
+  [22] if((byte) menu::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto menu::@3
+  to:menu::@4
+menu::@4: scope:[menu]  from menu::@3 menu::@4
+  [23] (byte*) menu::c#2 ← phi( menu::@4/(byte*) menu::c#1 menu::@3/(const byte*) COLS#0 )
   [24] *((byte*) menu::c#2) ← (const byte) LIGHT_GREEN#0
   [25] (byte*) menu::c#1 ← ++ (byte*) menu::c#2
-  [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@10
-  to:menu::@11
-menu::@11: scope:[menu]  from menu::@10
+  [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@4
+  to:menu::@5
+menu::@5: scope:[menu]  from menu::@4
   [27] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [28] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [29] call print_set_screen 
-  to:menu::@47
-menu::@47: scope:[menu]  from menu::@11
+  to:menu::@28
+menu::@28: scope:[menu]  from menu::@5
   [30] phi()
   [31] call print_cls 
-  to:menu::@48
-menu::@48: scope:[menu]  from menu::@47
+  to:menu::@29
+menu::@29: scope:[menu]  from menu::@28
   [32] phi()
   [33] call print_str_lines 
-  to:menu::@2
-menu::@2: scope:[menu]  from menu::@48 menu::@71
+  to:menu::@1
+menu::@1: scope:[menu]  from menu::@29 menu::@41
   [34] phi()
   [35] call keyboard_key_pressed 
   [36] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@50
-menu::@50: scope:[menu]  from menu::@2
+  to:menu::@30
+menu::@30: scope:[menu]  from menu::@1
   [37] (byte~) menu::$29 ← (byte) keyboard_key_pressed::return#2
-  [38] if((byte~) menu::$29==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@12
-  to:menu::@6
-menu::@6: scope:[menu]  from menu::@50
+  [38] if((byte~) menu::$29==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@6
+  to:menu::@2
+menu::@2: scope:[menu]  from menu::@30
   [39] phi()
   [40] call mode_stdchar 
   to:menu::@return
-menu::@return: scope:[menu]  from menu::@24 menu::@26 menu::@28 menu::@30 menu::@32 menu::@34 menu::@36 menu::@38 menu::@40 menu::@42 menu::@44 menu::@6
+menu::@return: scope:[menu]  from menu::@17 menu::@18 menu::@19 menu::@2 menu::@20 menu::@21 menu::@22 menu::@23 menu::@24 menu::@25 menu::@26 menu::@27
   [41] return 
   to:@return
-menu::@12: scope:[menu]  from menu::@50
+menu::@6: scope:[menu]  from menu::@30
   [42] phi()
   [43] call keyboard_key_pressed 
   [44] (byte) keyboard_key_pressed::return#24 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@51
-menu::@51: scope:[menu]  from menu::@12
+  to:menu::@31
+menu::@31: scope:[menu]  from menu::@6
   [45] (byte~) menu::$33 ← (byte) keyboard_key_pressed::return#24
-  [46] if((byte~) menu::$33==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@13
-  to:menu::@24
-menu::@24: scope:[menu]  from menu::@51
+  [46] if((byte~) menu::$33==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@7
+  to:menu::@17
+menu::@17: scope:[menu]  from menu::@31
   [47] phi()
   [48] call mode_ecmchar 
   to:menu::@return
-menu::@13: scope:[menu]  from menu::@51
+menu::@7: scope:[menu]  from menu::@31
   [49] phi()
   [50] call keyboard_key_pressed 
   [51] (byte) keyboard_key_pressed::return#25 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@53
-menu::@53: scope:[menu]  from menu::@13
+  to:menu::@32
+menu::@32: scope:[menu]  from menu::@7
   [52] (byte~) menu::$37 ← (byte) keyboard_key_pressed::return#25
-  [53] if((byte~) menu::$37==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@14
-  to:menu::@26
-menu::@26: scope:[menu]  from menu::@53
+  [53] if((byte~) menu::$37==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@8
+  to:menu::@18
+menu::@18: scope:[menu]  from menu::@32
   [54] phi()
   [55] call mode_mcchar 
   to:menu::@return
-menu::@14: scope:[menu]  from menu::@53
+menu::@8: scope:[menu]  from menu::@32
   [56] phi()
   [57] call keyboard_key_pressed 
   [58] (byte) keyboard_key_pressed::return#26 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@55
-menu::@55: scope:[menu]  from menu::@14
+  to:menu::@33
+menu::@33: scope:[menu]  from menu::@8
   [59] (byte~) menu::$41 ← (byte) keyboard_key_pressed::return#26
-  [60] if((byte~) menu::$41==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@15
-  to:menu::@28
-menu::@28: scope:[menu]  from menu::@55
+  [60] if((byte~) menu::$41==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@9
+  to:menu::@19
+menu::@19: scope:[menu]  from menu::@33
   [61] phi()
   [62] call mode_stdbitmap 
   to:menu::@return
-menu::@15: scope:[menu]  from menu::@55
+menu::@9: scope:[menu]  from menu::@33
   [63] phi()
   [64] call keyboard_key_pressed 
   [65] (byte) keyboard_key_pressed::return#27 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@57
-menu::@57: scope:[menu]  from menu::@15
+  to:menu::@34
+menu::@34: scope:[menu]  from menu::@9
   [66] (byte~) menu::$45 ← (byte) keyboard_key_pressed::return#27
-  [67] if((byte~) menu::$45==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@16
-  to:menu::@30
-menu::@30: scope:[menu]  from menu::@57
+  [67] if((byte~) menu::$45==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@10
+  to:menu::@20
+menu::@20: scope:[menu]  from menu::@34
   [68] phi()
   [69] call mode_hicolstdchar 
   to:menu::@return
-menu::@16: scope:[menu]  from menu::@57
+menu::@10: scope:[menu]  from menu::@34
   [70] phi()
   [71] call keyboard_key_pressed 
   [72] (byte) keyboard_key_pressed::return#28 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@59
-menu::@59: scope:[menu]  from menu::@16
+  to:menu::@35
+menu::@35: scope:[menu]  from menu::@10
   [73] (byte~) menu::$49 ← (byte) keyboard_key_pressed::return#28
-  [74] if((byte~) menu::$49==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@17
-  to:menu::@32
-menu::@32: scope:[menu]  from menu::@59
+  [74] if((byte~) menu::$49==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@11
+  to:menu::@21
+menu::@21: scope:[menu]  from menu::@35
   [75] phi()
   [76] call mode_hicolecmchar 
   to:menu::@return
-menu::@17: scope:[menu]  from menu::@59
+menu::@11: scope:[menu]  from menu::@35
   [77] phi()
   [78] call keyboard_key_pressed 
   [79] (byte) keyboard_key_pressed::return#29 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@61
-menu::@61: scope:[menu]  from menu::@17
+  to:menu::@36
+menu::@36: scope:[menu]  from menu::@11
   [80] (byte~) menu::$53 ← (byte) keyboard_key_pressed::return#29
-  [81] if((byte~) menu::$53==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@18
-  to:menu::@34
-menu::@34: scope:[menu]  from menu::@61
+  [81] if((byte~) menu::$53==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@12
+  to:menu::@22
+menu::@22: scope:[menu]  from menu::@36
   [82] phi()
   [83] call mode_hicolmcchar 
   to:menu::@return
-menu::@18: scope:[menu]  from menu::@61
+menu::@12: scope:[menu]  from menu::@36
   [84] phi()
   [85] call keyboard_key_pressed 
   [86] (byte) keyboard_key_pressed::return#30 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@63
-menu::@63: scope:[menu]  from menu::@18
+  to:menu::@37
+menu::@37: scope:[menu]  from menu::@12
   [87] (byte~) menu::$57 ← (byte) keyboard_key_pressed::return#30
-  [88] if((byte~) menu::$57==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@19
-  to:menu::@36
-menu::@36: scope:[menu]  from menu::@63
+  [88] if((byte~) menu::$57==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@13
+  to:menu::@23
+menu::@23: scope:[menu]  from menu::@37
   [89] phi()
   [90] call mode_sixsfred2 
   to:menu::@return
-menu::@19: scope:[menu]  from menu::@63
+menu::@13: scope:[menu]  from menu::@37
   [91] phi()
   [92] call keyboard_key_pressed 
   [93] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@65
-menu::@65: scope:[menu]  from menu::@19
-  [94] (byte~) menu::$61 ← (byte) keyboard_key_pressed::return#10
-  [95] if((byte~) menu::$61==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@20
   to:menu::@38
-menu::@38: scope:[menu]  from menu::@65
+menu::@38: scope:[menu]  from menu::@13
+  [94] (byte~) menu::$61 ← (byte) keyboard_key_pressed::return#10
+  [95] if((byte~) menu::$61==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@14
+  to:menu::@24
+menu::@24: scope:[menu]  from menu::@38
   [96] phi()
   [97] call mode_twoplanebitmap 
   to:menu::@return
-menu::@20: scope:[menu]  from menu::@65
+menu::@14: scope:[menu]  from menu::@38
   [98] phi()
   [99] call keyboard_key_pressed 
   [100] (byte) keyboard_key_pressed::return#11 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@67
-menu::@67: scope:[menu]  from menu::@20
+  to:menu::@39
+menu::@39: scope:[menu]  from menu::@14
   [101] (byte~) menu::$65 ← (byte) keyboard_key_pressed::return#11
-  [102] if((byte~) menu::$65==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@21
-  to:menu::@40
-menu::@40: scope:[menu]  from menu::@67
+  [102] if((byte~) menu::$65==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@15
+  to:menu::@25
+menu::@25: scope:[menu]  from menu::@39
   [103] phi()
   [104] call mode_sixsfred 
   to:menu::@return
-menu::@21: scope:[menu]  from menu::@67
+menu::@15: scope:[menu]  from menu::@39
   [105] phi()
   [106] call keyboard_key_pressed 
   [107] (byte) keyboard_key_pressed::return#12 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@69
-menu::@69: scope:[menu]  from menu::@21
+  to:menu::@40
+menu::@40: scope:[menu]  from menu::@15
   [108] (byte~) menu::$69 ← (byte) keyboard_key_pressed::return#12
-  [109] if((byte~) menu::$69==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@22
-  to:menu::@42
-menu::@42: scope:[menu]  from menu::@69
+  [109] if((byte~) menu::$69==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@16
+  to:menu::@26
+menu::@26: scope:[menu]  from menu::@40
   [110] phi()
   [111] call mode_8bpppixelcell 
   to:menu::@return
-menu::@22: scope:[menu]  from menu::@69
+menu::@16: scope:[menu]  from menu::@40
   [112] phi()
   [113] call keyboard_key_pressed 
   [114] (byte) keyboard_key_pressed::return#13 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@71
-menu::@71: scope:[menu]  from menu::@22
+  to:menu::@41
+menu::@41: scope:[menu]  from menu::@16
   [115] (byte~) menu::$73 ← (byte) keyboard_key_pressed::return#13
-  [116] if((byte~) menu::$73==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@2
-  to:menu::@44
-menu::@44: scope:[menu]  from menu::@71
+  [116] if((byte~) menu::$73==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@1
+  to:menu::@27
+menu::@27: scope:[menu]  from menu::@41
   [117] phi()
   [118] call mode_8bppchunkybmm 
   to:menu::@return
-mode_8bppchunkybmm: scope:[mode_8bppchunkybmm]  from menu::@44
+mode_8bppchunkybmm: scope:[mode_8bppchunkybmm]  from menu::@27
   [119] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0
   [120] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_ECM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [121] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_MCM#0|(const byte) VIC_CSEL#0
@@ -248,13 +248,13 @@ mode_8bppchunkybmm::@4: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@3
 mode_8bppchunkybmm::@6: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@4
   [138] (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 ← (byte) mode_8bppchunkybmm::gfxbCpuBank#4
   [139] call dtvSetCpuBankSegment1 
-  to:mode_8bppchunkybmm::@10
-mode_8bppchunkybmm::@10: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@6
+  to:mode_8bppchunkybmm::@9
+mode_8bppchunkybmm::@9: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@6
   [140] (byte) mode_8bppchunkybmm::gfxbCpuBank#2 ← ++ (byte) mode_8bppchunkybmm::gfxbCpuBank#4
   to:mode_8bppchunkybmm::@5
-mode_8bppchunkybmm::@5: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@10 mode_8bppchunkybmm::@4
-  [141] (byte) mode_8bppchunkybmm::gfxbCpuBank#8 ← phi( mode_8bppchunkybmm::@10/(byte) mode_8bppchunkybmm::gfxbCpuBank#2 mode_8bppchunkybmm::@4/(byte) mode_8bppchunkybmm::gfxbCpuBank#4 )
-  [141] (byte*) mode_8bppchunkybmm::gfxb#4 ← phi( mode_8bppchunkybmm::@10/((byte*))(word/signed word/dword/signed dword) $4000 mode_8bppchunkybmm::@4/(byte*) mode_8bppchunkybmm::gfxb#3 )
+mode_8bppchunkybmm::@5: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@4 mode_8bppchunkybmm::@9
+  [141] (byte) mode_8bppchunkybmm::gfxbCpuBank#8 ← phi( mode_8bppchunkybmm::@9/(byte) mode_8bppchunkybmm::gfxbCpuBank#2 mode_8bppchunkybmm::@4/(byte) mode_8bppchunkybmm::gfxbCpuBank#4 )
+  [141] (byte*) mode_8bppchunkybmm::gfxb#4 ← phi( mode_8bppchunkybmm::@9/((byte*))(word/signed word/dword/signed dword) $4000 mode_8bppchunkybmm::@4/(byte*) mode_8bppchunkybmm::gfxb#3 )
   [142] (word~) mode_8bppchunkybmm::$27 ← (word) mode_8bppchunkybmm::x#2 + (byte) mode_8bppchunkybmm::y#6
   [143] (byte) mode_8bppchunkybmm::c#0 ← ((byte)) (word~) mode_8bppchunkybmm::$27
   [144] *((byte*) mode_8bppchunkybmm::gfxb#4) ← (byte) mode_8bppchunkybmm::c#0
@@ -269,141 +269,141 @@ mode_8bppchunkybmm::@7: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@5
 mode_8bppchunkybmm::@8: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@7
   [150] phi()
   [151] call dtvSetCpuBankSegment1 
-  to:mode_8bppchunkybmm::@11
-mode_8bppchunkybmm::@11: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@8
+  to:mode_8bppchunkybmm::@10
+mode_8bppchunkybmm::@10: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@8
   [152] phi()
   [153] call mode_ctrl 
   to:mode_8bppchunkybmm::@return
-mode_8bppchunkybmm::@return: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@11
+mode_8bppchunkybmm::@return: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@10
   [154] return 
   to:@return
-mode_ctrl: scope:[mode_ctrl]  from mode_8bppchunkybmm::@11 mode_8bpppixelcell::@14 mode_ecmchar::@6 mode_hicolecmchar::@6 mode_hicolmcchar::@6 mode_hicolstdchar::@6 mode_mcchar::@6 mode_sixsfred2::@14 mode_sixsfred::@14 mode_stdbitmap::@8 mode_stdchar::@6 mode_twoplanebitmap::@18
-  [155] (byte) dtv_control#145 ← phi( mode_8bppchunkybmm::@11/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 mode_8bpppixelcell::@14/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0 mode_ecmchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_hicolecmchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_hicolmcchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_hicolstdchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_mcchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@14/(const byte) DTV_LINEAR#0 mode_sixsfred::@14/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 mode_stdbitmap::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_stdchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@18/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 )
+mode_ctrl: scope:[mode_ctrl]  from mode_8bppchunkybmm::@10 mode_8bpppixelcell::@13 mode_ecmchar::@6 mode_hicolecmchar::@6 mode_hicolmcchar::@6 mode_hicolstdchar::@6 mode_mcchar::@6 mode_sixsfred2::@12 mode_sixsfred::@12 mode_stdbitmap::@8 mode_stdchar::@6 mode_twoplanebitmap::@15
+  [155] (byte) dtv_control#145 ← phi( mode_8bppchunkybmm::@10/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 mode_8bpppixelcell::@13/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0 mode_ecmchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_hicolecmchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_hicolmcchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_hicolstdchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_mcchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@12/(const byte) DTV_LINEAR#0 mode_sixsfred::@12/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 mode_stdbitmap::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_stdchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@15/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 )
   to:mode_ctrl::@1
-mode_ctrl::@1: scope:[mode_ctrl]  from mode_ctrl mode_ctrl::@16 mode_ctrl::@30
-  [156] (byte) dtv_control#114 ← phi( mode_ctrl/(byte) dtv_control#145 mode_ctrl::@30/(byte) dtv_control#17 )
-  to:mode_ctrl::@6
-mode_ctrl::@6: scope:[mode_ctrl]  from mode_ctrl::@1 mode_ctrl::@6
-  [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@6
-  to:mode_ctrl::@8
-mode_ctrl::@8: scope:[mode_ctrl]  from mode_ctrl::@6
+mode_ctrl::@1: scope:[mode_ctrl]  from mode_ctrl mode_ctrl::@11 mode_ctrl::@18
+  [156] (byte) dtv_control#114 ← phi( mode_ctrl/(byte) dtv_control#145 mode_ctrl::@18/(byte) dtv_control#17 )
+  to:mode_ctrl::@2
+mode_ctrl::@2: scope:[mode_ctrl]  from mode_ctrl::@1 mode_ctrl::@2
+  [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@2
+  to:mode_ctrl::@3
+mode_ctrl::@3: scope:[mode_ctrl]  from mode_ctrl::@2
   [158] phi()
   [159] call keyboard_key_pressed 
   [160] (byte) keyboard_key_pressed::return#14 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@32
-mode_ctrl::@32: scope:[mode_ctrl]  from mode_ctrl::@8
+  to:mode_ctrl::@19
+mode_ctrl::@19: scope:[mode_ctrl]  from mode_ctrl::@3
   [161] (byte~) mode_ctrl::$1 ← (byte) keyboard_key_pressed::return#14
-  [162] if((byte~) mode_ctrl::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@9
+  [162] if((byte~) mode_ctrl::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@4
   to:mode_ctrl::@return
-mode_ctrl::@return: scope:[mode_ctrl]  from mode_ctrl::@32
+mode_ctrl::@return: scope:[mode_ctrl]  from mode_ctrl::@19
   [163] return 
   to:@return
-mode_ctrl::@9: scope:[mode_ctrl]  from mode_ctrl::@32
+mode_ctrl::@4: scope:[mode_ctrl]  from mode_ctrl::@19
   [164] (byte) mode_ctrl::ctrl#0 ← (byte) dtv_control#114
   [165] call keyboard_key_pressed 
   [166] (byte) keyboard_key_pressed::return#15 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@33
-mode_ctrl::@33: scope:[mode_ctrl]  from mode_ctrl::@9
+  to:mode_ctrl::@20
+mode_ctrl::@20: scope:[mode_ctrl]  from mode_ctrl::@4
   [167] (byte~) mode_ctrl::$4 ← (byte) keyboard_key_pressed::return#15
-  [168] if((byte~) mode_ctrl::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@10
-  to:mode_ctrl::@23
-mode_ctrl::@23: scope:[mode_ctrl]  from mode_ctrl::@33
+  [168] if((byte~) mode_ctrl::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@5
+  to:mode_ctrl::@12
+mode_ctrl::@12: scope:[mode_ctrl]  from mode_ctrl::@20
   [169] (byte) mode_ctrl::ctrl#1 ← (byte) mode_ctrl::ctrl#0 | (const byte) DTV_LINEAR#0
-  to:mode_ctrl::@10
-mode_ctrl::@10: scope:[mode_ctrl]  from mode_ctrl::@23 mode_ctrl::@33
-  [170] (byte) mode_ctrl::ctrl#17 ← phi( mode_ctrl::@23/(byte) mode_ctrl::ctrl#1 mode_ctrl::@33/(byte) mode_ctrl::ctrl#0 )
+  to:mode_ctrl::@5
+mode_ctrl::@5: scope:[mode_ctrl]  from mode_ctrl::@12 mode_ctrl::@20
+  [170] (byte) mode_ctrl::ctrl#17 ← phi( mode_ctrl::@12/(byte) mode_ctrl::ctrl#1 mode_ctrl::@20/(byte) mode_ctrl::ctrl#0 )
   [171] call keyboard_key_pressed 
   [172] (byte) keyboard_key_pressed::return#16 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@34
-mode_ctrl::@34: scope:[mode_ctrl]  from mode_ctrl::@10
+  to:mode_ctrl::@21
+mode_ctrl::@21: scope:[mode_ctrl]  from mode_ctrl::@5
   [173] (byte~) mode_ctrl::$8 ← (byte) keyboard_key_pressed::return#16
-  [174] if((byte~) mode_ctrl::$8==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@11
-  to:mode_ctrl::@24
-mode_ctrl::@24: scope:[mode_ctrl]  from mode_ctrl::@34
+  [174] if((byte~) mode_ctrl::$8==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@6
+  to:mode_ctrl::@13
+mode_ctrl::@13: scope:[mode_ctrl]  from mode_ctrl::@21
   [175] (byte) mode_ctrl::ctrl#2 ← (byte) mode_ctrl::ctrl#17 | (const byte) DTV_HIGHCOLOR#0
-  to:mode_ctrl::@11
-mode_ctrl::@11: scope:[mode_ctrl]  from mode_ctrl::@24 mode_ctrl::@34
-  [176] (byte) mode_ctrl::ctrl#10 ← phi( mode_ctrl::@24/(byte) mode_ctrl::ctrl#2 mode_ctrl::@34/(byte) mode_ctrl::ctrl#17 )
+  to:mode_ctrl::@6
+mode_ctrl::@6: scope:[mode_ctrl]  from mode_ctrl::@13 mode_ctrl::@21
+  [176] (byte) mode_ctrl::ctrl#10 ← phi( mode_ctrl::@13/(byte) mode_ctrl::ctrl#2 mode_ctrl::@21/(byte) mode_ctrl::ctrl#17 )
   [177] call keyboard_key_pressed 
   [178] (byte) keyboard_key_pressed::return#17 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@35
-mode_ctrl::@35: scope:[mode_ctrl]  from mode_ctrl::@11
+  to:mode_ctrl::@22
+mode_ctrl::@22: scope:[mode_ctrl]  from mode_ctrl::@6
   [179] (byte~) mode_ctrl::$12 ← (byte) keyboard_key_pressed::return#17
-  [180] if((byte~) mode_ctrl::$12==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@12
-  to:mode_ctrl::@25
-mode_ctrl::@25: scope:[mode_ctrl]  from mode_ctrl::@35
+  [180] if((byte~) mode_ctrl::$12==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@7
+  to:mode_ctrl::@14
+mode_ctrl::@14: scope:[mode_ctrl]  from mode_ctrl::@22
   [181] (byte) mode_ctrl::ctrl#3 ← (byte) mode_ctrl::ctrl#10 | (const byte) DTV_OVERSCAN#0
-  to:mode_ctrl::@12
-mode_ctrl::@12: scope:[mode_ctrl]  from mode_ctrl::@25 mode_ctrl::@35
-  [182] (byte) mode_ctrl::ctrl#11 ← phi( mode_ctrl::@25/(byte) mode_ctrl::ctrl#3 mode_ctrl::@35/(byte) mode_ctrl::ctrl#10 )
+  to:mode_ctrl::@7
+mode_ctrl::@7: scope:[mode_ctrl]  from mode_ctrl::@14 mode_ctrl::@22
+  [182] (byte) mode_ctrl::ctrl#11 ← phi( mode_ctrl::@14/(byte) mode_ctrl::ctrl#3 mode_ctrl::@22/(byte) mode_ctrl::ctrl#10 )
   [183] call keyboard_key_pressed 
   [184] (byte) keyboard_key_pressed::return#18 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@36
-mode_ctrl::@36: scope:[mode_ctrl]  from mode_ctrl::@12
+  to:mode_ctrl::@23
+mode_ctrl::@23: scope:[mode_ctrl]  from mode_ctrl::@7
   [185] (byte~) mode_ctrl::$16 ← (byte) keyboard_key_pressed::return#18
-  [186] if((byte~) mode_ctrl::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@13
-  to:mode_ctrl::@26
-mode_ctrl::@26: scope:[mode_ctrl]  from mode_ctrl::@36
+  [186] if((byte~) mode_ctrl::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@8
+  to:mode_ctrl::@15
+mode_ctrl::@15: scope:[mode_ctrl]  from mode_ctrl::@23
   [187] (byte) mode_ctrl::ctrl#4 ← (byte) mode_ctrl::ctrl#11 | (const byte) DTV_BORDER_OFF#0
-  to:mode_ctrl::@13
-mode_ctrl::@13: scope:[mode_ctrl]  from mode_ctrl::@26 mode_ctrl::@36
-  [188] (byte) mode_ctrl::ctrl#12 ← phi( mode_ctrl::@26/(byte) mode_ctrl::ctrl#4 mode_ctrl::@36/(byte) mode_ctrl::ctrl#11 )
+  to:mode_ctrl::@8
+mode_ctrl::@8: scope:[mode_ctrl]  from mode_ctrl::@15 mode_ctrl::@23
+  [188] (byte) mode_ctrl::ctrl#12 ← phi( mode_ctrl::@15/(byte) mode_ctrl::ctrl#4 mode_ctrl::@23/(byte) mode_ctrl::ctrl#11 )
   [189] call keyboard_key_pressed 
   [190] (byte) keyboard_key_pressed::return#19 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@37
-mode_ctrl::@37: scope:[mode_ctrl]  from mode_ctrl::@13
+  to:mode_ctrl::@24
+mode_ctrl::@24: scope:[mode_ctrl]  from mode_ctrl::@8
   [191] (byte~) mode_ctrl::$20 ← (byte) keyboard_key_pressed::return#19
-  [192] if((byte~) mode_ctrl::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@14
-  to:mode_ctrl::@27
-mode_ctrl::@27: scope:[mode_ctrl]  from mode_ctrl::@37
+  [192] if((byte~) mode_ctrl::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@9
+  to:mode_ctrl::@16
+mode_ctrl::@16: scope:[mode_ctrl]  from mode_ctrl::@24
   [193] (byte) mode_ctrl::ctrl#5 ← (byte) mode_ctrl::ctrl#12 | (const byte) DTV_CHUNKY#0
-  to:mode_ctrl::@14
-mode_ctrl::@14: scope:[mode_ctrl]  from mode_ctrl::@27 mode_ctrl::@37
-  [194] (byte) mode_ctrl::ctrl#13 ← phi( mode_ctrl::@27/(byte) mode_ctrl::ctrl#5 mode_ctrl::@37/(byte) mode_ctrl::ctrl#12 )
+  to:mode_ctrl::@9
+mode_ctrl::@9: scope:[mode_ctrl]  from mode_ctrl::@16 mode_ctrl::@24
+  [194] (byte) mode_ctrl::ctrl#13 ← phi( mode_ctrl::@16/(byte) mode_ctrl::ctrl#5 mode_ctrl::@24/(byte) mode_ctrl::ctrl#12 )
   [195] call keyboard_key_pressed 
   [196] (byte) keyboard_key_pressed::return#20 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@38
-mode_ctrl::@38: scope:[mode_ctrl]  from mode_ctrl::@14
+  to:mode_ctrl::@25
+mode_ctrl::@25: scope:[mode_ctrl]  from mode_ctrl::@9
   [197] (byte~) mode_ctrl::$24 ← (byte) keyboard_key_pressed::return#20
-  [198] if((byte~) mode_ctrl::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@15
-  to:mode_ctrl::@28
-mode_ctrl::@28: scope:[mode_ctrl]  from mode_ctrl::@38
+  [198] if((byte~) mode_ctrl::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@10
+  to:mode_ctrl::@17
+mode_ctrl::@17: scope:[mode_ctrl]  from mode_ctrl::@25
   [199] (byte) mode_ctrl::ctrl#6 ← (byte) mode_ctrl::ctrl#13 | (const byte) DTV_COLORRAM_OFF#0
-  to:mode_ctrl::@15
-mode_ctrl::@15: scope:[mode_ctrl]  from mode_ctrl::@28 mode_ctrl::@38
-  [200] (byte) mode_ctrl::ctrl#22 ← phi( mode_ctrl::@28/(byte) mode_ctrl::ctrl#6 mode_ctrl::@38/(byte) mode_ctrl::ctrl#13 )
+  to:mode_ctrl::@10
+mode_ctrl::@10: scope:[mode_ctrl]  from mode_ctrl::@17 mode_ctrl::@25
+  [200] (byte) mode_ctrl::ctrl#22 ← phi( mode_ctrl::@17/(byte) mode_ctrl::ctrl#6 mode_ctrl::@25/(byte) mode_ctrl::ctrl#13 )
   [201] call keyboard_key_pressed 
   [202] (byte) keyboard_key_pressed::return#21 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@39
-mode_ctrl::@39: scope:[mode_ctrl]  from mode_ctrl::@15
+  to:mode_ctrl::@26
+mode_ctrl::@26: scope:[mode_ctrl]  from mode_ctrl::@10
   [203] (byte~) mode_ctrl::$28 ← (byte) keyboard_key_pressed::return#21
-  [204] if((byte~) mode_ctrl::$28==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@46
-  to:mode_ctrl::@16
-mode_ctrl::@16: scope:[mode_ctrl]  from mode_ctrl::@39 mode_ctrl::@46
-  [205] (byte) mode_ctrl::ctrl#14 ← phi( mode_ctrl::@39/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_ctrl::@46/(byte) mode_ctrl::ctrl#22 )
+  [204] if((byte~) mode_ctrl::$28==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@27
+  to:mode_ctrl::@11
+mode_ctrl::@11: scope:[mode_ctrl]  from mode_ctrl::@26 mode_ctrl::@27
+  [205] (byte) mode_ctrl::ctrl#14 ← phi( mode_ctrl::@26/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_ctrl::@27/(byte) mode_ctrl::ctrl#22 )
   [206] if((byte) mode_ctrl::ctrl#14==(byte) dtv_control#114) goto mode_ctrl::@1
-  to:mode_ctrl::@30
-mode_ctrl::@30: scope:[mode_ctrl]  from mode_ctrl::@16
+  to:mode_ctrl::@18
+mode_ctrl::@18: scope:[mode_ctrl]  from mode_ctrl::@11
   [207] (byte) dtv_control#17 ← (byte) mode_ctrl::ctrl#14
   [208] *((const byte*) DTV_CONTROL#0) ← (byte) mode_ctrl::ctrl#14
   [209] *((const byte*) BORDERCOL#0) ← (byte) mode_ctrl::ctrl#14
   to:mode_ctrl::@1
-mode_ctrl::@46: scope:[mode_ctrl]  from mode_ctrl::@39
+mode_ctrl::@27: scope:[mode_ctrl]  from mode_ctrl::@26
   [210] phi()
-  to:mode_ctrl::@16
-keyboard_key_pressed: scope:[keyboard_key_pressed]  from menu::@12 menu::@13 menu::@14 menu::@15 menu::@16 menu::@17 menu::@18 menu::@19 menu::@2 menu::@20 menu::@21 menu::@22 mode_ctrl::@10 mode_ctrl::@11 mode_ctrl::@12 mode_ctrl::@13 mode_ctrl::@14 mode_ctrl::@15 mode_ctrl::@8 mode_ctrl::@9
-  [211] (byte) keyboard_key_pressed::key#20 ← phi( menu::@12/(const byte) KEY_2#0 menu::@13/(const byte) KEY_3#0 menu::@14/(const byte) KEY_4#0 menu::@15/(const byte) KEY_6#0 menu::@16/(const byte) KEY_7#0 menu::@17/(const byte) KEY_8#0 menu::@18/(const byte) KEY_A#0 menu::@19/(const byte) KEY_B#0 menu::@2/(const byte) KEY_1#0 menu::@20/(const byte) KEY_C#0 menu::@21/(const byte) KEY_D#0 menu::@22/(const byte) KEY_E#0 mode_ctrl::@10/(const byte) KEY_H#0 mode_ctrl::@11/(const byte) KEY_O#0 mode_ctrl::@12/(const byte) KEY_B#0 mode_ctrl::@13/(const byte) KEY_U#0 mode_ctrl::@14/(const byte) KEY_C#0 mode_ctrl::@15/(const byte) KEY_0#0 mode_ctrl::@8/(const byte) KEY_SPACE#0 mode_ctrl::@9/(const byte) KEY_L#0 )
+  to:mode_ctrl::@11
+keyboard_key_pressed: scope:[keyboard_key_pressed]  from menu::@1 menu::@10 menu::@11 menu::@12 menu::@13 menu::@14 menu::@15 menu::@16 menu::@6 menu::@7 menu::@8 menu::@9 mode_ctrl::@10 mode_ctrl::@3 mode_ctrl::@4 mode_ctrl::@5 mode_ctrl::@6 mode_ctrl::@7 mode_ctrl::@8 mode_ctrl::@9
+  [211] (byte) keyboard_key_pressed::key#20 ← phi( menu::@6/(const byte) KEY_2#0 menu::@7/(const byte) KEY_3#0 menu::@8/(const byte) KEY_4#0 menu::@9/(const byte) KEY_6#0 menu::@10/(const byte) KEY_7#0 menu::@11/(const byte) KEY_8#0 menu::@12/(const byte) KEY_A#0 menu::@13/(const byte) KEY_B#0 menu::@1/(const byte) KEY_1#0 menu::@14/(const byte) KEY_C#0 menu::@15/(const byte) KEY_D#0 menu::@16/(const byte) KEY_E#0 mode_ctrl::@5/(const byte) KEY_H#0 mode_ctrl::@6/(const byte) KEY_O#0 mode_ctrl::@7/(const byte) KEY_B#0 mode_ctrl::@8/(const byte) KEY_U#0 mode_ctrl::@9/(const byte) KEY_C#0 mode_ctrl::@10/(const byte) KEY_0#0 mode_ctrl::@3/(const byte) KEY_SPACE#0 mode_ctrl::@4/(const byte) KEY_L#0 )
   [212] (byte) keyboard_key_pressed::colidx#0 ← (byte) keyboard_key_pressed::key#20 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [213] (byte) keyboard_key_pressed::rowidx#0 ← (byte) keyboard_key_pressed::key#20 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [214] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_key_pressed::rowidx#0
   [215] call keyboard_matrix_read 
   [216] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_key_pressed::@2
-keyboard_key_pressed::@2: scope:[keyboard_key_pressed]  from keyboard_key_pressed
+  to:keyboard_key_pressed::@1
+keyboard_key_pressed::@1: scope:[keyboard_key_pressed]  from keyboard_key_pressed
   [217] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   [218] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0)
   to:keyboard_key_pressed::@return
-keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@2
+keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@1
   [219] return 
   to:@return
 keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
@@ -421,7 +421,7 @@ dtvSetCpuBankSegment1: scope:[dtvSetCpuBankSegment1]  from mode_8bppchunkybmm::@
 dtvSetCpuBankSegment1::@return: scope:[dtvSetCpuBankSegment1]  from dtvSetCpuBankSegment1
   [226] return 
   to:@return
-mode_8bpppixelcell: scope:[mode_8bpppixelcell]  from menu::@42
+mode_8bpppixelcell: scope:[mode_8bpppixelcell]  from menu::@26
   [227] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0
   [228] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_ECM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [229] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_MCM#0|(const byte) VIC_CSEL#0
@@ -444,14 +444,14 @@ mode_8bpppixelcell::@1: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell mode
   [244] *((const byte*) DTV_PALETTE#0 + (byte) mode_8bpppixelcell::i#2) ← (byte) mode_8bpppixelcell::i#2
   [245] (byte) mode_8bpppixelcell::i#1 ← ++ (byte) mode_8bpppixelcell::i#2
   [246] if((byte) mode_8bpppixelcell::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mode_8bpppixelcell::@1
+  to:mode_8bpppixelcell::@2
+mode_8bpppixelcell::@2: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@1 mode_8bpppixelcell::@4
+  [247] (byte*) mode_8bpppixelcell::gfxa#3 ← phi( mode_8bpppixelcell::@1/(const byte*) mode_8bpppixelcell::PLANEA#0 mode_8bpppixelcell::@4/(byte*) mode_8bpppixelcell::gfxa#1 )
+  [247] (byte) mode_8bpppixelcell::ay#4 ← phi( mode_8bpppixelcell::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_8bpppixelcell::@4/(byte) mode_8bpppixelcell::ay#1 )
   to:mode_8bpppixelcell::@3
-mode_8bpppixelcell::@3: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@1 mode_8bpppixelcell::@5
-  [247] (byte*) mode_8bpppixelcell::gfxa#3 ← phi( mode_8bpppixelcell::@1/(const byte*) mode_8bpppixelcell::PLANEA#0 mode_8bpppixelcell::@5/(byte*) mode_8bpppixelcell::gfxa#1 )
-  [247] (byte) mode_8bpppixelcell::ay#4 ← phi( mode_8bpppixelcell::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_8bpppixelcell::@5/(byte) mode_8bpppixelcell::ay#1 )
-  to:mode_8bpppixelcell::@4
-mode_8bpppixelcell::@4: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@3 mode_8bpppixelcell::@4
-  [248] (byte*) mode_8bpppixelcell::gfxa#2 ← phi( mode_8bpppixelcell::@3/(byte*) mode_8bpppixelcell::gfxa#3 mode_8bpppixelcell::@4/(byte*) mode_8bpppixelcell::gfxa#1 )
-  [248] (byte) mode_8bpppixelcell::ax#2 ← phi( mode_8bpppixelcell::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_8bpppixelcell::@4/(byte) mode_8bpppixelcell::ax#1 )
+mode_8bpppixelcell::@3: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@2 mode_8bpppixelcell::@3
+  [248] (byte*) mode_8bpppixelcell::gfxa#2 ← phi( mode_8bpppixelcell::@2/(byte*) mode_8bpppixelcell::gfxa#3 mode_8bpppixelcell::@3/(byte*) mode_8bpppixelcell::gfxa#1 )
+  [248] (byte) mode_8bpppixelcell::ax#2 ← phi( mode_8bpppixelcell::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_8bpppixelcell::@3/(byte) mode_8bpppixelcell::ax#1 )
   [249] (byte~) mode_8bpppixelcell::$14 ← (byte) mode_8bpppixelcell::ay#4 & (byte/signed byte/word/signed word/dword/signed dword) $f
   [250] (byte~) mode_8bpppixelcell::$15 ← (byte~) mode_8bpppixelcell::$14 << (byte/signed byte/word/signed word/dword/signed dword) 4
   [251] (byte~) mode_8bpppixelcell::$16 ← (byte) mode_8bpppixelcell::ax#2 & (byte/signed byte/word/signed word/dword/signed dword) $f
@@ -459,65 +459,65 @@ mode_8bpppixelcell::@4: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@3
   [253] *((byte*) mode_8bpppixelcell::gfxa#2) ← (byte~) mode_8bpppixelcell::$17
   [254] (byte*) mode_8bpppixelcell::gfxa#1 ← ++ (byte*) mode_8bpppixelcell::gfxa#2
   [255] (byte) mode_8bpppixelcell::ax#1 ← ++ (byte) mode_8bpppixelcell::ax#2
-  [256] if((byte) mode_8bpppixelcell::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_8bpppixelcell::@4
+  [256] if((byte) mode_8bpppixelcell::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_8bpppixelcell::@3
+  to:mode_8bpppixelcell::@4
+mode_8bpppixelcell::@4: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@3
+  [257] (byte) mode_8bpppixelcell::ay#1 ← ++ (byte) mode_8bpppixelcell::ay#4
+  [258] if((byte) mode_8bpppixelcell::ay#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_8bpppixelcell::@2
   to:mode_8bpppixelcell::@5
 mode_8bpppixelcell::@5: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@4
-  [257] (byte) mode_8bpppixelcell::ay#1 ← ++ (byte) mode_8bpppixelcell::ay#4
-  [258] if((byte) mode_8bpppixelcell::ay#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_8bpppixelcell::@3
-  to:mode_8bpppixelcell::@6
-mode_8bpppixelcell::@6: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@5
   [259] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_CHARROM#0
+  to:mode_8bpppixelcell::@6
+mode_8bpppixelcell::@6: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@12 mode_8bpppixelcell::@5
+  [260] (byte) mode_8bpppixelcell::ch#8 ← phi( mode_8bpppixelcell::@12/(byte) mode_8bpppixelcell::ch#1 mode_8bpppixelcell::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [260] (byte) mode_8bpppixelcell::col#7 ← phi( mode_8bpppixelcell::@12/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [260] (byte*) mode_8bpppixelcell::gfxb#7 ← phi( mode_8bpppixelcell::@12/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@5/(const byte*) mode_8bpppixelcell::PLANEB#0 )
+  [260] (byte*) mode_8bpppixelcell::chargen#4 ← phi( mode_8bpppixelcell::@12/(byte*) mode_8bpppixelcell::chargen#1 mode_8bpppixelcell::@5/(const byte*) mode_8bpppixelcell::CHARGEN#0 )
   to:mode_8bpppixelcell::@7
-mode_8bpppixelcell::@7: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@13 mode_8bpppixelcell::@6
-  [260] (byte) mode_8bpppixelcell::ch#8 ← phi( mode_8bpppixelcell::@13/(byte) mode_8bpppixelcell::ch#1 mode_8bpppixelcell::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [260] (byte) mode_8bpppixelcell::col#7 ← phi( mode_8bpppixelcell::@13/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [260] (byte*) mode_8bpppixelcell::gfxb#7 ← phi( mode_8bpppixelcell::@13/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@6/(const byte*) mode_8bpppixelcell::PLANEB#0 )
-  [260] (byte*) mode_8bpppixelcell::chargen#4 ← phi( mode_8bpppixelcell::@13/(byte*) mode_8bpppixelcell::chargen#1 mode_8bpppixelcell::@6/(const byte*) mode_8bpppixelcell::CHARGEN#0 )
-  to:mode_8bpppixelcell::@8
-mode_8bpppixelcell::@8: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@12 mode_8bpppixelcell::@7
-  [261] (byte) mode_8bpppixelcell::cr#6 ← phi( mode_8bpppixelcell::@12/(byte) mode_8bpppixelcell::cr#1 mode_8bpppixelcell::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [261] (byte) mode_8bpppixelcell::col#5 ← phi( mode_8bpppixelcell::@12/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@7/(byte) mode_8bpppixelcell::col#7 )
-  [261] (byte*) mode_8bpppixelcell::gfxb#5 ← phi( mode_8bpppixelcell::@12/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@7/(byte*) mode_8bpppixelcell::gfxb#7 )
-  [261] (byte*) mode_8bpppixelcell::chargen#2 ← phi( mode_8bpppixelcell::@12/(byte*) mode_8bpppixelcell::chargen#1 mode_8bpppixelcell::@7/(byte*) mode_8bpppixelcell::chargen#4 )
+mode_8bpppixelcell::@7: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@11 mode_8bpppixelcell::@6
+  [261] (byte) mode_8bpppixelcell::cr#6 ← phi( mode_8bpppixelcell::@11/(byte) mode_8bpppixelcell::cr#1 mode_8bpppixelcell::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [261] (byte) mode_8bpppixelcell::col#5 ← phi( mode_8bpppixelcell::@11/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@6/(byte) mode_8bpppixelcell::col#7 )
+  [261] (byte*) mode_8bpppixelcell::gfxb#5 ← phi( mode_8bpppixelcell::@11/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@6/(byte*) mode_8bpppixelcell::gfxb#7 )
+  [261] (byte*) mode_8bpppixelcell::chargen#2 ← phi( mode_8bpppixelcell::@11/(byte*) mode_8bpppixelcell::chargen#1 mode_8bpppixelcell::@6/(byte*) mode_8bpppixelcell::chargen#4 )
   [262] (byte) mode_8bpppixelcell::bits#0 ← *((byte*) mode_8bpppixelcell::chargen#2)
   [263] (byte*) mode_8bpppixelcell::chargen#1 ← ++ (byte*) mode_8bpppixelcell::chargen#2
+  to:mode_8bpppixelcell::@8
+mode_8bpppixelcell::@8: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@7 mode_8bpppixelcell::@9
+  [264] (byte) mode_8bpppixelcell::cp#2 ← phi( mode_8bpppixelcell::@9/(byte) mode_8bpppixelcell::cp#1 mode_8bpppixelcell::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [264] (byte) mode_8bpppixelcell::col#2 ← phi( mode_8bpppixelcell::@9/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@7/(byte) mode_8bpppixelcell::col#5 )
+  [264] (byte*) mode_8bpppixelcell::gfxb#2 ← phi( mode_8bpppixelcell::@9/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@7/(byte*) mode_8bpppixelcell::gfxb#5 )
+  [264] (byte) mode_8bpppixelcell::bits#2 ← phi( mode_8bpppixelcell::@9/(byte) mode_8bpppixelcell::bits#1 mode_8bpppixelcell::@7/(byte) mode_8bpppixelcell::bits#0 )
+  [265] (byte~) mode_8bpppixelcell::$20 ← (byte) mode_8bpppixelcell::bits#2 & (byte/word/signed word/dword/signed dword) $80
+  [266] if((byte~) mode_8bpppixelcell::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@9
+  to:mode_8bpppixelcell::@10
+mode_8bpppixelcell::@10: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@8
+  [267] (byte~) mode_8bpppixelcell::c#3 ← (byte) mode_8bpppixelcell::col#2
   to:mode_8bpppixelcell::@9
 mode_8bpppixelcell::@9: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@10 mode_8bpppixelcell::@8
-  [264] (byte) mode_8bpppixelcell::cp#2 ← phi( mode_8bpppixelcell::@10/(byte) mode_8bpppixelcell::cp#1 mode_8bpppixelcell::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [264] (byte) mode_8bpppixelcell::col#2 ← phi( mode_8bpppixelcell::@10/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@8/(byte) mode_8bpppixelcell::col#5 )
-  [264] (byte*) mode_8bpppixelcell::gfxb#2 ← phi( mode_8bpppixelcell::@10/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@8/(byte*) mode_8bpppixelcell::gfxb#5 )
-  [264] (byte) mode_8bpppixelcell::bits#2 ← phi( mode_8bpppixelcell::@10/(byte) mode_8bpppixelcell::bits#1 mode_8bpppixelcell::@8/(byte) mode_8bpppixelcell::bits#0 )
-  [265] (byte~) mode_8bpppixelcell::$20 ← (byte) mode_8bpppixelcell::bits#2 & (byte/word/signed word/dword/signed dword) $80
-  [266] if((byte~) mode_8bpppixelcell::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@10
-  to:mode_8bpppixelcell::@11
-mode_8bpppixelcell::@11: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@9
-  [267] (byte~) mode_8bpppixelcell::c#3 ← (byte) mode_8bpppixelcell::col#2
-  to:mode_8bpppixelcell::@10
-mode_8bpppixelcell::@10: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@11 mode_8bpppixelcell::@9
-  [268] (byte) mode_8bpppixelcell::c#2 ← phi( mode_8bpppixelcell::@11/(byte~) mode_8bpppixelcell::c#3 mode_8bpppixelcell::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [268] (byte) mode_8bpppixelcell::c#2 ← phi( mode_8bpppixelcell::@10/(byte~) mode_8bpppixelcell::c#3 mode_8bpppixelcell::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [269] *((byte*) mode_8bpppixelcell::gfxb#2) ← (byte) mode_8bpppixelcell::c#2
   [270] (byte*) mode_8bpppixelcell::gfxb#1 ← ++ (byte*) mode_8bpppixelcell::gfxb#2
   [271] (byte) mode_8bpppixelcell::bits#1 ← (byte) mode_8bpppixelcell::bits#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [272] (byte) mode_8bpppixelcell::col#1 ← ++ (byte) mode_8bpppixelcell::col#2
   [273] (byte) mode_8bpppixelcell::cp#1 ← ++ (byte) mode_8bpppixelcell::cp#2
-  [274] if((byte) mode_8bpppixelcell::cp#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@9
-  to:mode_8bpppixelcell::@12
-mode_8bpppixelcell::@12: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@10
+  [274] if((byte) mode_8bpppixelcell::cp#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@8
+  to:mode_8bpppixelcell::@11
+mode_8bpppixelcell::@11: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@9
   [275] (byte) mode_8bpppixelcell::cr#1 ← ++ (byte) mode_8bpppixelcell::cr#6
-  [276] if((byte) mode_8bpppixelcell::cr#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@8
+  [276] if((byte) mode_8bpppixelcell::cr#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@7
+  to:mode_8bpppixelcell::@12
+mode_8bpppixelcell::@12: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@11
+  [277] (byte) mode_8bpppixelcell::ch#1 ← ++ (byte) mode_8bpppixelcell::ch#8
+  [278] if((byte) mode_8bpppixelcell::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@6
   to:mode_8bpppixelcell::@13
 mode_8bpppixelcell::@13: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@12
-  [277] (byte) mode_8bpppixelcell::ch#1 ← ++ (byte) mode_8bpppixelcell::ch#8
-  [278] if((byte) mode_8bpppixelcell::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@7
-  to:mode_8bpppixelcell::@14
-mode_8bpppixelcell::@14: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@13
   [279] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
   [280] call mode_ctrl 
   to:mode_8bpppixelcell::@return
-mode_8bpppixelcell::@return: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@14
+mode_8bpppixelcell::@return: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@13
   [281] return 
   to:@return
-mode_sixsfred: scope:[mode_sixsfred]  from menu::@40
+mode_sixsfred: scope:[mode_sixsfred]  from menu::@25
   [282] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0
   [283] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_ECM#0|(const byte) VIC_BMM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [284] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_MCM#0|(const byte) VIC_CSEL#0
@@ -562,49 +562,49 @@ mode_sixsfred::@4: scope:[mode_sixsfred]  from mode_sixsfred::@3 mode_sixsfred::
 mode_sixsfred::@5: scope:[mode_sixsfred]  from mode_sixsfred::@4
   [312] (byte) mode_sixsfred::cy#1 ← ++ (byte) mode_sixsfred::cy#4
   [313] if((byte) mode_sixsfred::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_sixsfred::@3
+  to:mode_sixsfred::@6
+mode_sixsfred::@6: scope:[mode_sixsfred]  from mode_sixsfred::@5 mode_sixsfred::@8
+  [314] (byte*) mode_sixsfred::gfxa#3 ← phi( mode_sixsfred::@5/(const byte*) mode_sixsfred::PLANEA#0 mode_sixsfred::@8/(byte*) mode_sixsfred::gfxa#1 )
+  [314] (byte) mode_sixsfred::ay#4 ← phi( mode_sixsfred::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@8/(byte) mode_sixsfred::ay#1 )
   to:mode_sixsfred::@7
-mode_sixsfred::@7: scope:[mode_sixsfred]  from mode_sixsfred::@5 mode_sixsfred::@9
-  [314] (byte*) mode_sixsfred::gfxa#3 ← phi( mode_sixsfred::@5/(const byte*) mode_sixsfred::PLANEA#0 mode_sixsfred::@9/(byte*) mode_sixsfred::gfxa#1 )
-  [314] (byte) mode_sixsfred::ay#4 ← phi( mode_sixsfred::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@9/(byte) mode_sixsfred::ay#1 )
-  to:mode_sixsfred::@8
-mode_sixsfred::@8: scope:[mode_sixsfred]  from mode_sixsfred::@7 mode_sixsfred::@8
-  [315] (byte) mode_sixsfred::ax#2 ← phi( mode_sixsfred::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@8/(byte) mode_sixsfred::ax#1 )
-  [315] (byte*) mode_sixsfred::gfxa#2 ← phi( mode_sixsfred::@7/(byte*) mode_sixsfred::gfxa#3 mode_sixsfred::@8/(byte*) mode_sixsfred::gfxa#1 )
+mode_sixsfred::@7: scope:[mode_sixsfred]  from mode_sixsfred::@6 mode_sixsfred::@7
+  [315] (byte) mode_sixsfred::ax#2 ← phi( mode_sixsfred::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@7/(byte) mode_sixsfred::ax#1 )
+  [315] (byte*) mode_sixsfred::gfxa#2 ← phi( mode_sixsfred::@6/(byte*) mode_sixsfred::gfxa#3 mode_sixsfred::@7/(byte*) mode_sixsfred::gfxa#1 )
   [316] (byte~) mode_sixsfred::$21 ← (byte) mode_sixsfred::ay#4 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [317] (byte) mode_sixsfred::row#0 ← (byte~) mode_sixsfred::$21 & (byte/signed byte/word/signed word/dword/signed dword) 3
   [318] *((byte*) mode_sixsfred::gfxa#2) ← *((const byte[]) mode_sixsfred::row_bitmask#0 + (byte) mode_sixsfred::row#0)
   [319] (byte*) mode_sixsfred::gfxa#1 ← ++ (byte*) mode_sixsfred::gfxa#2
   [320] (byte) mode_sixsfred::ax#1 ← ++ (byte) mode_sixsfred::ax#2
-  [321] if((byte) mode_sixsfred::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@8
-  to:mode_sixsfred::@9
-mode_sixsfred::@9: scope:[mode_sixsfred]  from mode_sixsfred::@8
+  [321] if((byte) mode_sixsfred::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@7
+  to:mode_sixsfred::@8
+mode_sixsfred::@8: scope:[mode_sixsfred]  from mode_sixsfred::@7
   [322] (byte) mode_sixsfred::ay#1 ← ++ (byte) mode_sixsfred::ay#4
-  [323] if((byte) mode_sixsfred::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@7
-  to:mode_sixsfred::@11
-mode_sixsfred::@11: scope:[mode_sixsfred]  from mode_sixsfred::@13 mode_sixsfred::@9
-  [324] (byte) mode_sixsfred::by#4 ← phi( mode_sixsfred::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@13/(byte) mode_sixsfred::by#1 )
-  [324] (byte*) mode_sixsfred::gfxb#3 ← phi( mode_sixsfred::@9/(const byte*) mode_sixsfred::PLANEB#0 mode_sixsfred::@13/(byte*) mode_sixsfred::gfxb#1 )
-  to:mode_sixsfred::@12
-mode_sixsfred::@12: scope:[mode_sixsfred]  from mode_sixsfred::@11 mode_sixsfred::@12
-  [325] (byte) mode_sixsfred::bx#2 ← phi( mode_sixsfred::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@12/(byte) mode_sixsfred::bx#1 )
-  [325] (byte*) mode_sixsfred::gfxb#2 ← phi( mode_sixsfred::@11/(byte*) mode_sixsfred::gfxb#3 mode_sixsfred::@12/(byte*) mode_sixsfred::gfxb#1 )
+  [323] if((byte) mode_sixsfred::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@6
+  to:mode_sixsfred::@9
+mode_sixsfred::@9: scope:[mode_sixsfred]  from mode_sixsfred::@11 mode_sixsfred::@8
+  [324] (byte) mode_sixsfred::by#4 ← phi( mode_sixsfred::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@11/(byte) mode_sixsfred::by#1 )
+  [324] (byte*) mode_sixsfred::gfxb#3 ← phi( mode_sixsfred::@8/(const byte*) mode_sixsfred::PLANEB#0 mode_sixsfred::@11/(byte*) mode_sixsfred::gfxb#1 )
+  to:mode_sixsfred::@10
+mode_sixsfred::@10: scope:[mode_sixsfred]  from mode_sixsfred::@10 mode_sixsfred::@9
+  [325] (byte) mode_sixsfred::bx#2 ← phi( mode_sixsfred::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@10/(byte) mode_sixsfred::bx#1 )
+  [325] (byte*) mode_sixsfred::gfxb#2 ← phi( mode_sixsfred::@9/(byte*) mode_sixsfred::gfxb#3 mode_sixsfred::@10/(byte*) mode_sixsfred::gfxb#1 )
   [326] *((byte*) mode_sixsfred::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $1b
   [327] (byte*) mode_sixsfred::gfxb#1 ← ++ (byte*) mode_sixsfred::gfxb#2
   [328] (byte) mode_sixsfred::bx#1 ← ++ (byte) mode_sixsfred::bx#2
-  [329] if((byte) mode_sixsfred::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@12
-  to:mode_sixsfred::@13
-mode_sixsfred::@13: scope:[mode_sixsfred]  from mode_sixsfred::@12
+  [329] if((byte) mode_sixsfred::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@10
+  to:mode_sixsfred::@11
+mode_sixsfred::@11: scope:[mode_sixsfred]  from mode_sixsfred::@10
   [330] (byte) mode_sixsfred::by#1 ← ++ (byte) mode_sixsfred::by#4
-  [331] if((byte) mode_sixsfred::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@11
-  to:mode_sixsfred::@14
-mode_sixsfred::@14: scope:[mode_sixsfred]  from mode_sixsfred::@13
+  [331] if((byte) mode_sixsfred::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@9
+  to:mode_sixsfred::@12
+mode_sixsfred::@12: scope:[mode_sixsfred]  from mode_sixsfred::@11
   [332] phi()
   [333] call mode_ctrl 
   to:mode_sixsfred::@return
-mode_sixsfred::@return: scope:[mode_sixsfred]  from mode_sixsfred::@14
+mode_sixsfred::@return: scope:[mode_sixsfred]  from mode_sixsfred::@12
   [334] return 
   to:@return
-mode_twoplanebitmap: scope:[mode_twoplanebitmap]  from menu::@38
+mode_twoplanebitmap: scope:[mode_twoplanebitmap]  from menu::@24
   [335] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0
   [336] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_ECM#0|(const byte) VIC_BMM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [337] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_CSEL#0
@@ -653,58 +653,58 @@ mode_twoplanebitmap::@4: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::
 mode_twoplanebitmap::@5: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@4
   [369] (byte) mode_twoplanebitmap::cy#1 ← ++ (byte) mode_twoplanebitmap::cy#4
   [370] if((byte) mode_twoplanebitmap::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_twoplanebitmap::@3
+  to:mode_twoplanebitmap::@6
+mode_twoplanebitmap::@6: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@11 mode_twoplanebitmap::@5
+  [371] (byte*) mode_twoplanebitmap::gfxa#7 ← phi( mode_twoplanebitmap::@11/(byte*) mode_twoplanebitmap::gfxa#6 mode_twoplanebitmap::@5/(const byte*) mode_twoplanebitmap::PLANEA#0 )
+  [371] (byte) mode_twoplanebitmap::ay#5 ← phi( mode_twoplanebitmap::@11/(byte) mode_twoplanebitmap::ay#1 mode_twoplanebitmap::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   to:mode_twoplanebitmap::@7
-mode_twoplanebitmap::@7: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@13 mode_twoplanebitmap::@5
-  [371] (byte*) mode_twoplanebitmap::gfxa#7 ← phi( mode_twoplanebitmap::@13/(byte*) mode_twoplanebitmap::gfxa#6 mode_twoplanebitmap::@5/(const byte*) mode_twoplanebitmap::PLANEA#0 )
-  [371] (byte) mode_twoplanebitmap::ay#5 ← phi( mode_twoplanebitmap::@13/(byte) mode_twoplanebitmap::ay#1 mode_twoplanebitmap::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  to:mode_twoplanebitmap::@8
-mode_twoplanebitmap::@8: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@10 mode_twoplanebitmap::@7
-  [372] (byte) mode_twoplanebitmap::ax#2 ← phi( mode_twoplanebitmap::@10/(byte) mode_twoplanebitmap::ax#1 mode_twoplanebitmap::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [372] (byte*) mode_twoplanebitmap::gfxa#3 ← phi( mode_twoplanebitmap::@10/(byte*) mode_twoplanebitmap::gfxa#6 mode_twoplanebitmap::@7/(byte*) mode_twoplanebitmap::gfxa#7 )
+mode_twoplanebitmap::@7: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@6 mode_twoplanebitmap::@9
+  [372] (byte) mode_twoplanebitmap::ax#2 ← phi( mode_twoplanebitmap::@9/(byte) mode_twoplanebitmap::ax#1 mode_twoplanebitmap::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [372] (byte*) mode_twoplanebitmap::gfxa#3 ← phi( mode_twoplanebitmap::@9/(byte*) mode_twoplanebitmap::gfxa#6 mode_twoplanebitmap::@6/(byte*) mode_twoplanebitmap::gfxa#7 )
   [373] (byte~) mode_twoplanebitmap::$22 ← (byte) mode_twoplanebitmap::ay#5 & (byte/signed byte/word/signed word/dword/signed dword) 4
-  [374] if((byte~) mode_twoplanebitmap::$22==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_twoplanebitmap::@9
-  to:mode_twoplanebitmap::@11
-mode_twoplanebitmap::@11: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@8
+  [374] if((byte~) mode_twoplanebitmap::$22==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_twoplanebitmap::@8
+  to:mode_twoplanebitmap::@10
+mode_twoplanebitmap::@10: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@7
   [375] *((byte*) mode_twoplanebitmap::gfxa#3) ← (byte/word/signed word/dword/signed dword) $ff
   [376] (byte*) mode_twoplanebitmap::gfxa#2 ← ++ (byte*) mode_twoplanebitmap::gfxa#3
-  to:mode_twoplanebitmap::@10
-mode_twoplanebitmap::@10: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@11 mode_twoplanebitmap::@9
-  [377] (byte*) mode_twoplanebitmap::gfxa#6 ← phi( mode_twoplanebitmap::@11/(byte*) mode_twoplanebitmap::gfxa#2 mode_twoplanebitmap::@9/(byte*) mode_twoplanebitmap::gfxa#1 )
+  to:mode_twoplanebitmap::@9
+mode_twoplanebitmap::@9: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@10 mode_twoplanebitmap::@8
+  [377] (byte*) mode_twoplanebitmap::gfxa#6 ← phi( mode_twoplanebitmap::@10/(byte*) mode_twoplanebitmap::gfxa#2 mode_twoplanebitmap::@8/(byte*) mode_twoplanebitmap::gfxa#1 )
   [378] (byte) mode_twoplanebitmap::ax#1 ← ++ (byte) mode_twoplanebitmap::ax#2
-  [379] if((byte) mode_twoplanebitmap::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@8
-  to:mode_twoplanebitmap::@13
-mode_twoplanebitmap::@13: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@10
+  [379] if((byte) mode_twoplanebitmap::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@7
+  to:mode_twoplanebitmap::@11
+mode_twoplanebitmap::@11: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@9
   [380] (byte) mode_twoplanebitmap::ay#1 ← ++ (byte) mode_twoplanebitmap::ay#5
-  [381] if((byte) mode_twoplanebitmap::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@7
-  to:mode_twoplanebitmap::@15
-mode_twoplanebitmap::@15: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@13 mode_twoplanebitmap::@17
-  [382] (byte) mode_twoplanebitmap::by#4 ← phi( mode_twoplanebitmap::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@17/(byte) mode_twoplanebitmap::by#1 )
-  [382] (byte*) mode_twoplanebitmap::gfxb#3 ← phi( mode_twoplanebitmap::@13/(const byte*) mode_twoplanebitmap::PLANEB#0 mode_twoplanebitmap::@17/(byte*) mode_twoplanebitmap::gfxb#1 )
-  to:mode_twoplanebitmap::@16
-mode_twoplanebitmap::@16: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@15 mode_twoplanebitmap::@16
-  [383] (byte) mode_twoplanebitmap::bx#2 ← phi( mode_twoplanebitmap::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@16/(byte) mode_twoplanebitmap::bx#1 )
-  [383] (byte*) mode_twoplanebitmap::gfxb#2 ← phi( mode_twoplanebitmap::@15/(byte*) mode_twoplanebitmap::gfxb#3 mode_twoplanebitmap::@16/(byte*) mode_twoplanebitmap::gfxb#1 )
+  [381] if((byte) mode_twoplanebitmap::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@6
+  to:mode_twoplanebitmap::@12
+mode_twoplanebitmap::@12: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@11 mode_twoplanebitmap::@14
+  [382] (byte) mode_twoplanebitmap::by#4 ← phi( mode_twoplanebitmap::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@14/(byte) mode_twoplanebitmap::by#1 )
+  [382] (byte*) mode_twoplanebitmap::gfxb#3 ← phi( mode_twoplanebitmap::@11/(const byte*) mode_twoplanebitmap::PLANEB#0 mode_twoplanebitmap::@14/(byte*) mode_twoplanebitmap::gfxb#1 )
+  to:mode_twoplanebitmap::@13
+mode_twoplanebitmap::@13: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@12 mode_twoplanebitmap::@13
+  [383] (byte) mode_twoplanebitmap::bx#2 ← phi( mode_twoplanebitmap::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@13/(byte) mode_twoplanebitmap::bx#1 )
+  [383] (byte*) mode_twoplanebitmap::gfxb#2 ← phi( mode_twoplanebitmap::@12/(byte*) mode_twoplanebitmap::gfxb#3 mode_twoplanebitmap::@13/(byte*) mode_twoplanebitmap::gfxb#1 )
   [384] *((byte*) mode_twoplanebitmap::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $f
   [385] (byte*) mode_twoplanebitmap::gfxb#1 ← ++ (byte*) mode_twoplanebitmap::gfxb#2
   [386] (byte) mode_twoplanebitmap::bx#1 ← ++ (byte) mode_twoplanebitmap::bx#2
-  [387] if((byte) mode_twoplanebitmap::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@16
-  to:mode_twoplanebitmap::@17
-mode_twoplanebitmap::@17: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@16
+  [387] if((byte) mode_twoplanebitmap::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@13
+  to:mode_twoplanebitmap::@14
+mode_twoplanebitmap::@14: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@13
   [388] (byte) mode_twoplanebitmap::by#1 ← ++ (byte) mode_twoplanebitmap::by#4
-  [389] if((byte) mode_twoplanebitmap::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@15
-  to:mode_twoplanebitmap::@18
-mode_twoplanebitmap::@18: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@17
+  [389] if((byte) mode_twoplanebitmap::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@12
+  to:mode_twoplanebitmap::@15
+mode_twoplanebitmap::@15: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@14
   [390] phi()
   [391] call mode_ctrl 
   to:mode_twoplanebitmap::@return
-mode_twoplanebitmap::@return: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@18
+mode_twoplanebitmap::@return: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@15
   [392] return 
   to:@return
-mode_twoplanebitmap::@9: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@8
+mode_twoplanebitmap::@8: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@7
   [393] *((byte*) mode_twoplanebitmap::gfxa#3) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [394] (byte*) mode_twoplanebitmap::gfxa#1 ← ++ (byte*) mode_twoplanebitmap::gfxa#3
-  to:mode_twoplanebitmap::@10
-mode_sixsfred2: scope:[mode_sixsfred2]  from menu::@36
+  to:mode_twoplanebitmap::@9
+mode_sixsfred2: scope:[mode_sixsfred2]  from menu::@23
   [395] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_LINEAR#0
   [396] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_ECM#0|(const byte) VIC_BMM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [397] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_MCM#0|(const byte) VIC_CSEL#0
@@ -751,49 +751,49 @@ mode_sixsfred2::@4: scope:[mode_sixsfred2]  from mode_sixsfred2::@3 mode_sixsfre
 mode_sixsfred2::@5: scope:[mode_sixsfred2]  from mode_sixsfred2::@4
   [427] (byte) mode_sixsfred2::cy#1 ← ++ (byte) mode_sixsfred2::cy#4
   [428] if((byte) mode_sixsfred2::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_sixsfred2::@3
+  to:mode_sixsfred2::@6
+mode_sixsfred2::@6: scope:[mode_sixsfred2]  from mode_sixsfred2::@5 mode_sixsfred2::@8
+  [429] (byte*) mode_sixsfred2::gfxa#3 ← phi( mode_sixsfred2::@5/(const byte*) mode_sixsfred2::PLANEA#0 mode_sixsfred2::@8/(byte*) mode_sixsfred2::gfxa#1 )
+  [429] (byte) mode_sixsfred2::ay#4 ← phi( mode_sixsfred2::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@8/(byte) mode_sixsfred2::ay#1 )
   to:mode_sixsfred2::@7
-mode_sixsfred2::@7: scope:[mode_sixsfred2]  from mode_sixsfred2::@5 mode_sixsfred2::@9
-  [429] (byte*) mode_sixsfred2::gfxa#3 ← phi( mode_sixsfred2::@5/(const byte*) mode_sixsfred2::PLANEA#0 mode_sixsfred2::@9/(byte*) mode_sixsfred2::gfxa#1 )
-  [429] (byte) mode_sixsfred2::ay#4 ← phi( mode_sixsfred2::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@9/(byte) mode_sixsfred2::ay#1 )
-  to:mode_sixsfred2::@8
-mode_sixsfred2::@8: scope:[mode_sixsfred2]  from mode_sixsfred2::@7 mode_sixsfred2::@8
-  [430] (byte) mode_sixsfred2::ax#2 ← phi( mode_sixsfred2::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@8/(byte) mode_sixsfred2::ax#1 )
-  [430] (byte*) mode_sixsfred2::gfxa#2 ← phi( mode_sixsfred2::@7/(byte*) mode_sixsfred2::gfxa#3 mode_sixsfred2::@8/(byte*) mode_sixsfred2::gfxa#1 )
+mode_sixsfred2::@7: scope:[mode_sixsfred2]  from mode_sixsfred2::@6 mode_sixsfred2::@7
+  [430] (byte) mode_sixsfred2::ax#2 ← phi( mode_sixsfred2::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@7/(byte) mode_sixsfred2::ax#1 )
+  [430] (byte*) mode_sixsfred2::gfxa#2 ← phi( mode_sixsfred2::@6/(byte*) mode_sixsfred2::gfxa#3 mode_sixsfred2::@7/(byte*) mode_sixsfred2::gfxa#1 )
   [431] (byte~) mode_sixsfred2::$21 ← (byte) mode_sixsfred2::ay#4 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [432] (byte) mode_sixsfred2::row#0 ← (byte~) mode_sixsfred2::$21 & (byte/signed byte/word/signed word/dword/signed dword) 3
   [433] *((byte*) mode_sixsfred2::gfxa#2) ← *((const byte[]) mode_sixsfred2::row_bitmask#0 + (byte) mode_sixsfred2::row#0)
   [434] (byte*) mode_sixsfred2::gfxa#1 ← ++ (byte*) mode_sixsfred2::gfxa#2
   [435] (byte) mode_sixsfred2::ax#1 ← ++ (byte) mode_sixsfred2::ax#2
-  [436] if((byte) mode_sixsfred2::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@8
-  to:mode_sixsfred2::@9
-mode_sixsfred2::@9: scope:[mode_sixsfred2]  from mode_sixsfred2::@8
+  [436] if((byte) mode_sixsfred2::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@7
+  to:mode_sixsfred2::@8
+mode_sixsfred2::@8: scope:[mode_sixsfred2]  from mode_sixsfred2::@7
   [437] (byte) mode_sixsfred2::ay#1 ← ++ (byte) mode_sixsfred2::ay#4
-  [438] if((byte) mode_sixsfred2::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@7
-  to:mode_sixsfred2::@11
-mode_sixsfred2::@11: scope:[mode_sixsfred2]  from mode_sixsfred2::@13 mode_sixsfred2::@9
-  [439] (byte) mode_sixsfred2::by#4 ← phi( mode_sixsfred2::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@13/(byte) mode_sixsfred2::by#1 )
-  [439] (byte*) mode_sixsfred2::gfxb#3 ← phi( mode_sixsfred2::@9/(const byte*) mode_sixsfred2::PLANEB#0 mode_sixsfred2::@13/(byte*) mode_sixsfred2::gfxb#1 )
-  to:mode_sixsfred2::@12
-mode_sixsfred2::@12: scope:[mode_sixsfred2]  from mode_sixsfred2::@11 mode_sixsfred2::@12
-  [440] (byte) mode_sixsfred2::bx#2 ← phi( mode_sixsfred2::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@12/(byte) mode_sixsfred2::bx#1 )
-  [440] (byte*) mode_sixsfred2::gfxb#2 ← phi( mode_sixsfred2::@11/(byte*) mode_sixsfred2::gfxb#3 mode_sixsfred2::@12/(byte*) mode_sixsfred2::gfxb#1 )
+  [438] if((byte) mode_sixsfred2::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@6
+  to:mode_sixsfred2::@9
+mode_sixsfred2::@9: scope:[mode_sixsfred2]  from mode_sixsfred2::@11 mode_sixsfred2::@8
+  [439] (byte) mode_sixsfred2::by#4 ← phi( mode_sixsfred2::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@11/(byte) mode_sixsfred2::by#1 )
+  [439] (byte*) mode_sixsfred2::gfxb#3 ← phi( mode_sixsfred2::@8/(const byte*) mode_sixsfred2::PLANEB#0 mode_sixsfred2::@11/(byte*) mode_sixsfred2::gfxb#1 )
+  to:mode_sixsfred2::@10
+mode_sixsfred2::@10: scope:[mode_sixsfred2]  from mode_sixsfred2::@10 mode_sixsfred2::@9
+  [440] (byte) mode_sixsfred2::bx#2 ← phi( mode_sixsfred2::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@10/(byte) mode_sixsfred2::bx#1 )
+  [440] (byte*) mode_sixsfred2::gfxb#2 ← phi( mode_sixsfred2::@9/(byte*) mode_sixsfred2::gfxb#3 mode_sixsfred2::@10/(byte*) mode_sixsfred2::gfxb#1 )
   [441] *((byte*) mode_sixsfred2::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $1b
   [442] (byte*) mode_sixsfred2::gfxb#1 ← ++ (byte*) mode_sixsfred2::gfxb#2
   [443] (byte) mode_sixsfred2::bx#1 ← ++ (byte) mode_sixsfred2::bx#2
-  [444] if((byte) mode_sixsfred2::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@12
-  to:mode_sixsfred2::@13
-mode_sixsfred2::@13: scope:[mode_sixsfred2]  from mode_sixsfred2::@12
+  [444] if((byte) mode_sixsfred2::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@10
+  to:mode_sixsfred2::@11
+mode_sixsfred2::@11: scope:[mode_sixsfred2]  from mode_sixsfred2::@10
   [445] (byte) mode_sixsfred2::by#1 ← ++ (byte) mode_sixsfred2::by#4
-  [446] if((byte) mode_sixsfred2::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@11
-  to:mode_sixsfred2::@14
-mode_sixsfred2::@14: scope:[mode_sixsfred2]  from mode_sixsfred2::@13
+  [446] if((byte) mode_sixsfred2::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@9
+  to:mode_sixsfred2::@12
+mode_sixsfred2::@12: scope:[mode_sixsfred2]  from mode_sixsfred2::@11
   [447] phi()
   [448] call mode_ctrl 
   to:mode_sixsfred2::@return
-mode_sixsfred2::@return: scope:[mode_sixsfred2]  from mode_sixsfred2::@14
+mode_sixsfred2::@return: scope:[mode_sixsfred2]  from mode_sixsfred2::@12
   [449] return 
   to:@return
-mode_hicolmcchar: scope:[mode_hicolmcchar]  from menu::@34
+mode_hicolmcchar: scope:[mode_hicolmcchar]  from menu::@22
   [450] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_hicolmcchar::CHARSET#0/(dword/signed dword) $10000
   [451] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const byte*) mode_hicolmcchar::COLORS#0/(word/signed word/dword/signed dword) $400
   [452] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const byte*) mode_hicolmcchar::COLORS#0/(word/signed word/dword/signed dword) $400
@@ -847,7 +847,7 @@ mode_hicolmcchar::@6: scope:[mode_hicolmcchar]  from mode_hicolmcchar::@5
 mode_hicolmcchar::@return: scope:[mode_hicolmcchar]  from mode_hicolmcchar::@6
   [483] return 
   to:@return
-mode_hicolecmchar: scope:[mode_hicolecmchar]  from menu::@32
+mode_hicolecmchar: scope:[mode_hicolecmchar]  from menu::@21
   [484] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_hicolecmchar::CHARSET#0/(dword/signed dword) $10000
   [485] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const byte*) mode_hicolecmchar::COLORS#0/(word/signed word/dword/signed dword) $400
   [486] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const byte*) mode_hicolecmchar::COLORS#0/(word/signed word/dword/signed dword) $400
@@ -902,7 +902,7 @@ mode_hicolecmchar::@6: scope:[mode_hicolecmchar]  from mode_hicolecmchar::@5
 mode_hicolecmchar::@return: scope:[mode_hicolecmchar]  from mode_hicolecmchar::@6
   [518] return 
   to:@return
-mode_hicolstdchar: scope:[mode_hicolstdchar]  from menu::@30
+mode_hicolstdchar: scope:[mode_hicolstdchar]  from menu::@20
   [519] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_hicolstdchar::CHARSET#0/(dword/signed dword) $10000
   [520] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const byte*) mode_hicolstdchar::COLORS#0/(word/signed word/dword/signed dword) $400
   [521] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const byte*) mode_hicolstdchar::COLORS#0/(word/signed word/dword/signed dword) $400
@@ -954,7 +954,7 @@ mode_hicolstdchar::@6: scope:[mode_hicolstdchar]  from mode_hicolstdchar::@5
 mode_hicolstdchar::@return: scope:[mode_hicolstdchar]  from mode_hicolstdchar::@6
   [550] return 
   to:@return
-mode_stdbitmap: scope:[mode_stdbitmap]  from menu::@28
+mode_stdbitmap: scope:[mode_stdbitmap]  from menu::@19
   [551] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_stdbitmap::BITMAP#0/(dword/signed dword) $10000
   [552] *((const byte*) DTV_CONTROL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [553] *((const byte*) CIA2_PORT_A_DDR#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3
@@ -1002,19 +1002,19 @@ mode_stdbitmap::@9: scope:[mode_stdbitmap]  from mode_stdbitmap::@6
   [579] phi()
   [580] call bitmap_clear 
   to:mode_stdbitmap::@7
-mode_stdbitmap::@7: scope:[mode_stdbitmap]  from mode_stdbitmap::@11 mode_stdbitmap::@9
-  [581] (byte) mode_stdbitmap::l#2 ← phi( mode_stdbitmap::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_stdbitmap::@11/(byte) mode_stdbitmap::l#1 )
+mode_stdbitmap::@7: scope:[mode_stdbitmap]  from mode_stdbitmap::@10 mode_stdbitmap::@9
+  [581] (byte) mode_stdbitmap::l#2 ← phi( mode_stdbitmap::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_stdbitmap::@10/(byte) mode_stdbitmap::l#1 )
   [582] (byte) bitmap_line::x0#0 ← *((const byte[]) mode_stdbitmap::lines_x#0 + (byte) mode_stdbitmap::l#2)
   [583] (byte) bitmap_line::x1#0 ← *((const byte[]) mode_stdbitmap::lines_x#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) mode_stdbitmap::l#2)
   [584] (byte) bitmap_line::y0#0 ← *((const byte[]) mode_stdbitmap::lines_y#0 + (byte) mode_stdbitmap::l#2)
   [585] (byte) bitmap_line::y1#0 ← *((const byte[]) mode_stdbitmap::lines_y#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) mode_stdbitmap::l#2)
   [586] call bitmap_line 
-  to:mode_stdbitmap::@11
-mode_stdbitmap::@11: scope:[mode_stdbitmap]  from mode_stdbitmap::@7
+  to:mode_stdbitmap::@10
+mode_stdbitmap::@10: scope:[mode_stdbitmap]  from mode_stdbitmap::@7
   [587] (byte) mode_stdbitmap::l#1 ← ++ (byte) mode_stdbitmap::l#2
   [588] if((byte) mode_stdbitmap::l#1<(const byte) mode_stdbitmap::lines_cnt#0) goto mode_stdbitmap::@7
   to:mode_stdbitmap::@8
-mode_stdbitmap::@8: scope:[mode_stdbitmap]  from mode_stdbitmap::@11
+mode_stdbitmap::@8: scope:[mode_stdbitmap]  from mode_stdbitmap::@10
   [589] phi()
   [590] call mode_ctrl 
   to:mode_stdbitmap::@return
@@ -1023,16 +1023,16 @@ mode_stdbitmap::@return: scope:[mode_stdbitmap]  from mode_stdbitmap::@8
   to:@return
 bitmap_line: scope:[bitmap_line]  from mode_stdbitmap::@7
   [592] if((byte) bitmap_line::x0#0<(byte) bitmap_line::x1#0) goto bitmap_line::@1
-  to:bitmap_line::@3
-bitmap_line::@3: scope:[bitmap_line]  from bitmap_line
+  to:bitmap_line::@2
+bitmap_line::@2: scope:[bitmap_line]  from bitmap_line
   [593] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0
-  [594] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10
+  [594] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7
+  to:bitmap_line::@3
+bitmap_line::@3: scope:[bitmap_line]  from bitmap_line::@2
+  [595] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
+  [596] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8
   to:bitmap_line::@4
 bitmap_line::@4: scope:[bitmap_line]  from bitmap_line::@3
-  [595] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [596] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11
-  to:bitmap_line::@5
-bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [597] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0
   [598] (byte) bitmap_line_ydxi::x#0 ← (byte) bitmap_line::x1#0
   [599] (byte) bitmap_line_ydxi::y1#0 ← (byte) bitmap_line::y0#0
@@ -1040,10 +1040,10 @@ bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [601] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   [602] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@11 bitmap_line::@15 bitmap_line::@17 bitmap_line::@21 bitmap_line::@25 bitmap_line::@27 bitmap_line::@5 bitmap_line::@8
+bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@10 bitmap_line::@12 bitmap_line::@13 bitmap_line::@14 bitmap_line::@4 bitmap_line::@6 bitmap_line::@8 bitmap_line::@9
   [603] return 
   to:@return
-bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
+bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@3
   [604] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0
   [605] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0
   [606] (byte) bitmap_line_xdyi::x1#0 ← (byte) bitmap_line::x0#0
@@ -1051,11 +1051,11 @@ bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
   [608] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2
   [609] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@3
+bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@2
   [610] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [611] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15
-  to:bitmap_line::@17
-bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
+  [611] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9
+  to:bitmap_line::@10
+bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@7
   [612] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0
   [613] (byte) bitmap_line_ydxd::x#0 ← (byte) bitmap_line::x0#0
   [614] (byte) bitmap_line_ydxd::y1#0 ← (byte) bitmap_line::y1#0
@@ -1063,7 +1063,7 @@ bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
   [616] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   [617] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
+bitmap_line::@9: scope:[bitmap_line]  from bitmap_line::@7
   [618] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0
   [619] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0
   [620] (byte) bitmap_line_xdyd::x1#0 ← (byte) bitmap_line::x0#0
@@ -1073,13 +1073,13 @@ bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
   to:bitmap_line::@return
 bitmap_line::@1: scope:[bitmap_line]  from bitmap_line
   [624] (byte) bitmap_line::xd#1 ← (byte) bitmap_line::x1#0 - (byte) bitmap_line::x0#0
-  [625] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20
-  to:bitmap_line::@7
-bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@1
+  [625] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11
+  to:bitmap_line::@5
+bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@1
   [626] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [627] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21
-  to:bitmap_line::@8
-bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
+  [627] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12
+  to:bitmap_line::@6
+bitmap_line::@6: scope:[bitmap_line]  from bitmap_line::@5
   [628] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0
   [629] (byte) bitmap_line_ydxd::x#1 ← (byte) bitmap_line::x1#0
   [630] (byte) bitmap_line_ydxd::y1#1 ← (byte) bitmap_line::y0#0
@@ -1087,7 +1087,7 @@ bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
   [632] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   [633] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
+bitmap_line::@12: scope:[bitmap_line]  from bitmap_line::@5
   [634] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0
   [635] (byte) bitmap_line_xdyd::y#1 ← (byte) bitmap_line::y0#0
   [636] (byte) bitmap_line_xdyd::x1#1 ← (byte) bitmap_line::x1#0
@@ -1095,11 +1095,11 @@ bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
   [638] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10
   [639] call bitmap_line_xdyd 
   to:bitmap_line::@return
-bitmap_line::@20: scope:[bitmap_line]  from bitmap_line::@1
+bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@1
   [640] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [641] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25
-  to:bitmap_line::@27
-bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
+  [641] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13
+  to:bitmap_line::@14
+bitmap_line::@14: scope:[bitmap_line]  from bitmap_line::@11
   [642] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0
   [643] (byte) bitmap_line_ydxi::x#1 ← (byte) bitmap_line::x0#0
   [644] (byte) bitmap_line_ydxi::y1#1 ← (byte) bitmap_line::y1#0
@@ -1107,7 +1107,7 @@ bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
   [646] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   [647] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
+bitmap_line::@13: scope:[bitmap_line]  from bitmap_line::@11
   [648] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0
   [649] (byte) bitmap_line_xdyi::y#1 ← (byte) bitmap_line::y0#0
   [650] (byte) bitmap_line_xdyi::x1#1 ← (byte) bitmap_line::x1#0
@@ -1115,12 +1115,12 @@ bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
   [652] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11
   [653] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@11 bitmap_line::@25
-  [654] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x1#1 )
-  [654] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::xd#1 )
-  [654] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::y#0 bitmap_line::@25/(byte) bitmap_line_xdyi::y#1 )
-  [654] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x#1 )
-  [654] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::yd#1 )
+bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@13 bitmap_line::@8
+  [654] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x1#1 )
+  [654] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::xd#1 )
+  [654] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::y#0 bitmap_line::@13/(byte) bitmap_line_xdyi::y#1 )
+  [654] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x#1 )
+  [654] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::yd#1 )
   [655] (byte) bitmap_line_xdyi::e#0 ← (byte) bitmap_line_xdyi::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyi::@1
 bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_line_xdyi::@2
@@ -1130,19 +1130,19 @@ bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_lin
   [657] (byte) bitmap_plot::x#0 ← (byte) bitmap_line_xdyi::x#3
   [658] (byte) bitmap_plot::y#0 ← (byte) bitmap_line_xdyi::y#3
   [659] call bitmap_plot 
-  to:bitmap_line_xdyi::@5
-bitmap_line_xdyi::@5: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
+  to:bitmap_line_xdyi::@4
+bitmap_line_xdyi::@4: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
   [660] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3
   [661] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2
   [662] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2
   to:bitmap_line_xdyi::@3
-bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@5
+bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@4
   [663] (byte) bitmap_line_xdyi::y#2 ← ++ (byte) bitmap_line_xdyi::y#3
   [664] (byte) bitmap_line_xdyi::e#2 ← (byte) bitmap_line_xdyi::e#1 - (byte) bitmap_line_xdyi::xd#5
   to:bitmap_line_xdyi::@2
-bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5
-  [665] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::e#1 )
-  [665] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::y#3 )
+bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4
+  [665] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::e#1 )
+  [665] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::y#3 )
   [666] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6 ← (byte) bitmap_line_xdyi::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [667] if((byte) bitmap_line_xdyi::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6) goto bitmap_line_xdyi::@1
   to:bitmap_line_xdyi::@return
@@ -1161,12 +1161,12 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line_xdyd::@1 bitmap_line_xdyi::@1
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [675] return 
   to:@return
-bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@27 bitmap_line::@5
-  [676] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y1#0 )
-  [676] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::yd#0 )
-  [676] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y#0 )
-  [676] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::x#1 bitmap_line::@5/(byte) bitmap_line_ydxi::x#0 )
-  [676] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::xd#0 )
+bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@14 bitmap_line::@4
+  [676] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y1#0 )
+  [676] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::yd#0 )
+  [676] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y#0 )
+  [676] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::x#1 bitmap_line::@4/(byte) bitmap_line_ydxi::x#0 )
+  [676] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::xd#0 )
   [677] (byte) bitmap_line_ydxi::e#0 ← (byte) bitmap_line_ydxi::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxi::@1
 bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_line_ydxi::@2
@@ -1176,31 +1176,31 @@ bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_lin
   [679] (byte) bitmap_plot::x#2 ← (byte) bitmap_line_ydxi::x#3
   [680] (byte) bitmap_plot::y#2 ← (byte) bitmap_line_ydxi::y#3
   [681] call bitmap_plot 
-  to:bitmap_line_ydxi::@5
-bitmap_line_ydxi::@5: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
+  to:bitmap_line_ydxi::@4
+bitmap_line_ydxi::@4: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
   [682] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3
   [683] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2
   [684] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2
   to:bitmap_line_ydxi::@3
-bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@5
+bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@4
   [685] (byte) bitmap_line_ydxi::x#2 ← ++ (byte) bitmap_line_ydxi::x#3
   [686] (byte) bitmap_line_ydxi::e#2 ← (byte) bitmap_line_ydxi::e#1 - (byte) bitmap_line_ydxi::yd#5
   to:bitmap_line_ydxi::@2
-bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5
-  [687] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::e#1 )
-  [687] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::x#3 )
+bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4
+  [687] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::e#1 )
+  [687] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::x#3 )
   [688] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6 ← (byte) bitmap_line_ydxi::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [689] if((byte) bitmap_line_ydxi::y#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6) goto bitmap_line_ydxi::@1
   to:bitmap_line_ydxi::@return
 bitmap_line_ydxi::@return: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@2
   [690] return 
   to:@return
-bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@15 bitmap_line::@21
-  [691] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x1#1 )
-  [691] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::xd#1 )
-  [691] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::y#0 bitmap_line::@21/(byte) bitmap_line_xdyd::y#1 )
-  [691] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x#1 )
-  [691] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::yd#1 )
+bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@12 bitmap_line::@9
+  [691] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x1#1 )
+  [691] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::xd#1 )
+  [691] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::y#0 bitmap_line::@12/(byte) bitmap_line_xdyd::y#1 )
+  [691] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x#1 )
+  [691] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::yd#1 )
   [692] (byte) bitmap_line_xdyd::e#0 ← (byte) bitmap_line_xdyd::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyd::@1
 bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_line_xdyd::@2
@@ -1210,31 +1210,31 @@ bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_lin
   [694] (byte) bitmap_plot::x#1 ← (byte) bitmap_line_xdyd::x#3
   [695] (byte) bitmap_plot::y#1 ← (byte) bitmap_line_xdyd::y#3
   [696] call bitmap_plot 
-  to:bitmap_line_xdyd::@5
-bitmap_line_xdyd::@5: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
+  to:bitmap_line_xdyd::@4
+bitmap_line_xdyd::@4: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
   [697] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3
   [698] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2
   [699] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2
   to:bitmap_line_xdyd::@3
-bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@5
+bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@4
   [700] (byte) bitmap_line_xdyd::y#2 ← -- (byte) bitmap_line_xdyd::y#3
   [701] (byte) bitmap_line_xdyd::e#2 ← (byte) bitmap_line_xdyd::e#1 - (byte) bitmap_line_xdyd::xd#5
   to:bitmap_line_xdyd::@2
-bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5
-  [702] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::e#1 )
-  [702] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::y#3 )
+bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4
+  [702] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::e#1 )
+  [702] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::y#3 )
   [703] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6 ← (byte) bitmap_line_xdyd::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [704] if((byte) bitmap_line_xdyd::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6) goto bitmap_line_xdyd::@1
   to:bitmap_line_xdyd::@return
 bitmap_line_xdyd::@return: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@2
   [705] return 
   to:@return
-bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@17 bitmap_line::@8
-  [706] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y1#1 )
-  [706] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::yd#1 )
-  [706] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y#1 )
-  [706] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::x#0 bitmap_line::@8/(byte) bitmap_line_ydxd::x#1 )
-  [706] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::xd#1 )
+bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@10 bitmap_line::@6
+  [706] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y1#1 )
+  [706] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::yd#1 )
+  [706] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y#1 )
+  [706] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::x#0 bitmap_line::@6/(byte) bitmap_line_ydxd::x#1 )
+  [706] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::xd#1 )
   [707] (byte) bitmap_line_ydxd::e#0 ← (byte) bitmap_line_ydxd::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxd::@1
 bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_line_ydxd::@2
@@ -1244,19 +1244,19 @@ bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_lin
   [709] (byte) bitmap_plot::x#3 ← (byte) bitmap_line_ydxd::x#3
   [710] (byte) bitmap_plot::y#3 ← (byte) bitmap_line_ydxd::y#2
   [711] call bitmap_plot 
-  to:bitmap_line_ydxd::@5
-bitmap_line_ydxd::@5: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
+  to:bitmap_line_ydxd::@4
+bitmap_line_ydxd::@4: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
   [712] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2
   [713] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2
   [714] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2
   to:bitmap_line_ydxd::@3
-bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@5
+bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@4
   [715] (byte) bitmap_line_ydxd::x#2 ← -- (byte) bitmap_line_ydxd::x#3
   [716] (byte) bitmap_line_ydxd::e#2 ← (byte) bitmap_line_ydxd::e#1 - (byte) bitmap_line_ydxd::yd#5
   to:bitmap_line_ydxd::@2
-bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5
-  [717] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::e#1 )
-  [717] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::x#3 )
+bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4
+  [717] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::e#1 )
+  [717] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::x#3 )
   [718] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6 ← (byte) bitmap_line_ydxd::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [719] if((byte) bitmap_line_ydxd::y#3!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6) goto bitmap_line_ydxd::@1
   to:bitmap_line_ydxd::@return
@@ -1297,16 +1297,16 @@ bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
   [736] *((const byte[$100]) bitmap_plot_xhi#0 + (byte) bitmap_init::x#2) ← >(const byte*) mode_stdbitmap::BITMAP#0
   [737] *((const byte[$100]) bitmap_plot_bit#0 + (byte) bitmap_init::x#2) ← (byte) bitmap_init::bits#3
   [738] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [739] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10
+  [739] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6
   to:bitmap_init::@2
-bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@10
-  [740] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@10/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
+bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@6
+  [740] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@6/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
   [741] (byte) bitmap_init::x#1 ← ++ (byte) bitmap_init::x#2
   [742] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1
-  to:bitmap_init::@5
-bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
-  [743] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte*) bitmap_init::yoffs#4 )
-  [743] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte) bitmap_init::y#1 )
+  to:bitmap_init::@3
+bitmap_init::@3: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@4
+  [743] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte*) bitmap_init::yoffs#4 )
+  [743] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte) bitmap_init::y#1 )
   [744] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [745] (byte~) bitmap_init::$7 ← < (byte*) bitmap_init::yoffs#2
   [746] (byte~) bitmap_init::$8 ← (byte~) bitmap_init::$6 | (byte~) bitmap_init::$7
@@ -1314,23 +1314,23 @@ bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
   [748] (byte~) bitmap_init::$9 ← > (byte*) bitmap_init::yoffs#2
   [749] *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_init::y#2) ← (byte~) bitmap_init::$9
   [750] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [751] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6
-  to:bitmap_init::@7
-bitmap_init::@7: scope:[bitmap_init]  from bitmap_init::@5
+  [751] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4
+  to:bitmap_init::@5
+bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@3
   [752] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:bitmap_init::@6
-bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@5 bitmap_init::@7
-  [753] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@5/(byte*) bitmap_init::yoffs#2 bitmap_init::@7/(byte*) bitmap_init::yoffs#1 )
+  to:bitmap_init::@4
+bitmap_init::@4: scope:[bitmap_init]  from bitmap_init::@3 bitmap_init::@5
+  [753] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@3/(byte*) bitmap_init::yoffs#2 bitmap_init::@5/(byte*) bitmap_init::yoffs#1 )
   [754] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2
-  [755] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5
+  [755] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3
   to:bitmap_init::@return
-bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@6
+bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@4
   [756] return 
   to:@return
-bitmap_init::@10: scope:[bitmap_init]  from bitmap_init::@1
+bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@1
   [757] phi()
   to:bitmap_init::@2
-mode_mcchar: scope:[mode_mcchar]  from menu::@26
+mode_mcchar: scope:[mode_mcchar]  from menu::@18
   [758] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_mcchar::CHARSET#0/(dword/signed dword) $10000
   [759] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
   [760] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
@@ -1386,7 +1386,7 @@ mode_mcchar::@6: scope:[mode_mcchar]  from mode_mcchar::@5
 mode_mcchar::@return: scope:[mode_mcchar]  from mode_mcchar::@6
   [793] return 
   to:@return
-mode_ecmchar: scope:[mode_ecmchar]  from menu::@24
+mode_ecmchar: scope:[mode_ecmchar]  from menu::@17
   [794] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_ecmchar::CHARSET#0/(dword/signed dword) $10000
   [795] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
   [796] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
@@ -1443,7 +1443,7 @@ mode_ecmchar::@6: scope:[mode_ecmchar]  from mode_ecmchar::@5
 mode_ecmchar::@return: scope:[mode_ecmchar]  from mode_ecmchar::@6
   [830] return 
   to:@return
-mode_stdchar: scope:[mode_stdchar]  from menu::@6
+mode_stdchar: scope:[mode_stdchar]  from menu::@2
   [831] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_stdchar::CHARSET#0/(dword/signed dword) $10000
   [832] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
   [833] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
@@ -1497,39 +1497,39 @@ mode_stdchar::@6: scope:[mode_stdchar]  from mode_stdchar::@5
 mode_stdchar::@return: scope:[mode_stdchar]  from mode_stdchar::@6
   [864] return 
   to:@return
-print_str_lines: scope:[print_str_lines]  from menu::@48
+print_str_lines: scope:[print_str_lines]  from menu::@29
   [865] phi()
   to:print_str_lines::@1
-print_str_lines::@1: scope:[print_str_lines]  from print_str_lines print_str_lines::@9
-  [866] (byte*) print_line_cursor#17 ← phi( print_str_lines/(const byte*) menu::SCREEN#0 print_str_lines::@9/(byte*) print_line_cursor#19 )
-  [866] (byte*) print_char_cursor#19 ← phi( print_str_lines/(const byte*) menu::SCREEN#0 print_str_lines::@9/(byte*~) print_char_cursor#103 )
-  [866] (byte*) print_str_lines::str#2 ← phi( print_str_lines/(const byte[]) MENU_TEXT#0 print_str_lines::@9/(byte*) print_str_lines::str#0 )
-  [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@6
+print_str_lines::@1: scope:[print_str_lines]  from print_str_lines print_str_lines::@5
+  [866] (byte*) print_line_cursor#17 ← phi( print_str_lines/(const byte*) menu::SCREEN#0 print_str_lines::@5/(byte*) print_line_cursor#19 )
+  [866] (byte*) print_char_cursor#19 ← phi( print_str_lines/(const byte*) menu::SCREEN#0 print_str_lines::@5/(byte*~) print_char_cursor#103 )
+  [866] (byte*) print_str_lines::str#2 ← phi( print_str_lines/(const byte[]) MENU_TEXT#0 print_str_lines::@5/(byte*) print_str_lines::str#0 )
+  [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@2
   to:print_str_lines::@return
 print_str_lines::@return: scope:[print_str_lines]  from print_str_lines::@1
   [868] return 
   to:@return
-print_str_lines::@6: scope:[print_str_lines]  from print_str_lines::@1 print_str_lines::@7
-  [869] (byte*) print_char_cursor#17 ← phi( print_str_lines::@1/(byte*) print_char_cursor#19 print_str_lines::@7/(byte*) print_char_cursor#32 )
-  [869] (byte*) print_str_lines::str#3 ← phi( print_str_lines::@1/(byte*) print_str_lines::str#2 print_str_lines::@7/(byte*) print_str_lines::str#0 )
+print_str_lines::@2: scope:[print_str_lines]  from print_str_lines::@1 print_str_lines::@3
+  [869] (byte*) print_char_cursor#17 ← phi( print_str_lines::@1/(byte*) print_char_cursor#19 print_str_lines::@3/(byte*) print_char_cursor#32 )
+  [869] (byte*) print_str_lines::str#3 ← phi( print_str_lines::@1/(byte*) print_str_lines::str#2 print_str_lines::@3/(byte*) print_str_lines::str#0 )
   [870] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#3)
   [871] (byte*) print_str_lines::str#0 ← ++ (byte*) print_str_lines::str#3
-  [872] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@7
-  to:print_str_lines::@8
-print_str_lines::@8: scope:[print_str_lines]  from print_str_lines::@6
+  [872] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@3
+  to:print_str_lines::@4
+print_str_lines::@4: scope:[print_str_lines]  from print_str_lines::@2
   [873] *((byte*) print_char_cursor#17) ← (byte) print_str_lines::ch#0
   [874] (byte*) print_char_cursor#1 ← ++ (byte*) print_char_cursor#17
-  to:print_str_lines::@7
-print_str_lines::@7: scope:[print_str_lines]  from print_str_lines::@6 print_str_lines::@8
-  [875] (byte*) print_char_cursor#32 ← phi( print_str_lines::@6/(byte*) print_char_cursor#17 print_str_lines::@8/(byte*) print_char_cursor#1 )
-  [876] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@6
-  to:print_str_lines::@9
-print_str_lines::@9: scope:[print_str_lines]  from print_str_lines::@7
+  to:print_str_lines::@3
+print_str_lines::@3: scope:[print_str_lines]  from print_str_lines::@2 print_str_lines::@4
+  [875] (byte*) print_char_cursor#32 ← phi( print_str_lines::@2/(byte*) print_char_cursor#17 print_str_lines::@4/(byte*) print_char_cursor#1 )
+  [876] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@2
+  to:print_str_lines::@5
+print_str_lines::@5: scope:[print_str_lines]  from print_str_lines::@3
   [877] phi()
   [878] call print_ln 
   [879] (byte*~) print_char_cursor#103 ← (byte*) print_line_cursor#19
   to:print_str_lines::@1
-print_ln: scope:[print_ln]  from print_str_lines::@9
+print_ln: scope:[print_ln]  from print_str_lines::@5
   [880] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -1540,7 +1540,7 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [884] return 
   to:@return
-print_cls: scope:[print_cls]  from menu::@47
+print_cls: scope:[print_cls]  from menu::@28
   [885] phi()
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -1552,7 +1552,7 @@ print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
 print_cls::@return: scope:[print_cls]  from print_cls::@1
   [890] return 
   to:@return
-print_set_screen: scope:[print_set_screen]  from menu::@11
+print_set_screen: scope:[print_set_screen]  from menu::@5
   [891] phi()
   to:print_set_screen::@return
 print_set_screen::@return: scope:[print_set_screen]  from print_set_screen
diff --git a/src/test/ref/c64dtv-gfxmodes.log b/src/test/ref/c64dtv-gfxmodes.log
index 8e63fbe5c..abaf326b8 100644
--- a/src/test/ref/c64dtv-gfxmodes.log
+++ b/src/test/ref/c64dtv-gfxmodes.log
@@ -9184,44 +9184,178 @@ Culled Empty Block (label) print_str_lines::@13
 Culled Empty Block (label) print_str_lines::@14
 Culled Empty Block (label) print_ln::@3
 Culled Empty Block (label) print_cls::@3
+Renumbering block @54 to @1
+Renumbering block print_str_lines::@6 to print_str_lines::@2
+Renumbering block print_str_lines::@7 to print_str_lines::@3
+Renumbering block print_str_lines::@8 to print_str_lines::@4
+Renumbering block print_str_lines::@9 to print_str_lines::@5
+Renumbering block keyboard_key_pressed::@2 to keyboard_key_pressed::@1
+Renumbering block bitmap_init::@5 to bitmap_init::@3
+Renumbering block bitmap_init::@6 to bitmap_init::@4
+Renumbering block bitmap_init::@7 to bitmap_init::@5
+Renumbering block bitmap_init::@10 to bitmap_init::@6
+Renumbering block bitmap_line::@3 to bitmap_line::@2
+Renumbering block bitmap_line::@4 to bitmap_line::@3
+Renumbering block bitmap_line::@5 to bitmap_line::@4
+Renumbering block bitmap_line::@7 to bitmap_line::@5
+Renumbering block bitmap_line::@8 to bitmap_line::@6
+Renumbering block bitmap_line::@10 to bitmap_line::@7
+Renumbering block bitmap_line::@11 to bitmap_line::@8
+Renumbering block bitmap_line::@15 to bitmap_line::@9
+Renumbering block bitmap_line::@17 to bitmap_line::@10
+Renumbering block bitmap_line::@20 to bitmap_line::@11
+Renumbering block bitmap_line::@21 to bitmap_line::@12
+Renumbering block bitmap_line::@25 to bitmap_line::@13
+Renumbering block bitmap_line::@27 to bitmap_line::@14
+Renumbering block bitmap_line_xdyi::@5 to bitmap_line_xdyi::@4
+Renumbering block bitmap_line_xdyd::@5 to bitmap_line_xdyd::@4
+Renumbering block bitmap_line_ydxi::@5 to bitmap_line_ydxi::@4
+Renumbering block bitmap_line_ydxd::@5 to bitmap_line_ydxd::@4
+Renumbering block main::@2 to main::@1
+Renumbering block menu::@2 to menu::@1
+Renumbering block menu::@6 to menu::@2
+Renumbering block menu::@8 to menu::@3
+Renumbering block menu::@10 to menu::@4
+Renumbering block menu::@11 to menu::@5
+Renumbering block menu::@12 to menu::@6
+Renumbering block menu::@13 to menu::@7
+Renumbering block menu::@14 to menu::@8
+Renumbering block menu::@15 to menu::@9
+Renumbering block menu::@16 to menu::@10
+Renumbering block menu::@17 to menu::@11
+Renumbering block menu::@18 to menu::@12
+Renumbering block menu::@19 to menu::@13
+Renumbering block menu::@20 to menu::@14
+Renumbering block menu::@21 to menu::@15
+Renumbering block menu::@22 to menu::@16
+Renumbering block menu::@24 to menu::@17
+Renumbering block menu::@26 to menu::@18
+Renumbering block menu::@28 to menu::@19
+Renumbering block menu::@30 to menu::@20
+Renumbering block menu::@32 to menu::@21
+Renumbering block menu::@34 to menu::@22
+Renumbering block menu::@36 to menu::@23
+Renumbering block menu::@38 to menu::@24
+Renumbering block menu::@40 to menu::@25
+Renumbering block menu::@42 to menu::@26
+Renumbering block menu::@44 to menu::@27
+Renumbering block menu::@47 to menu::@28
+Renumbering block menu::@48 to menu::@29
+Renumbering block menu::@50 to menu::@30
+Renumbering block menu::@51 to menu::@31
+Renumbering block menu::@53 to menu::@32
+Renumbering block menu::@55 to menu::@33
+Renumbering block menu::@57 to menu::@34
+Renumbering block menu::@59 to menu::@35
+Renumbering block menu::@61 to menu::@36
+Renumbering block menu::@63 to menu::@37
+Renumbering block menu::@65 to menu::@38
+Renumbering block menu::@67 to menu::@39
+Renumbering block menu::@69 to menu::@40
+Renumbering block menu::@71 to menu::@41
+Renumbering block mode_ctrl::@6 to mode_ctrl::@2
+Renumbering block mode_ctrl::@8 to mode_ctrl::@3
+Renumbering block mode_ctrl::@9 to mode_ctrl::@4
+Renumbering block mode_ctrl::@10 to mode_ctrl::@5
+Renumbering block mode_ctrl::@11 to mode_ctrl::@6
+Renumbering block mode_ctrl::@12 to mode_ctrl::@7
+Renumbering block mode_ctrl::@13 to mode_ctrl::@8
+Renumbering block mode_ctrl::@14 to mode_ctrl::@9
+Renumbering block mode_ctrl::@15 to mode_ctrl::@10
+Renumbering block mode_ctrl::@16 to mode_ctrl::@11
+Renumbering block mode_ctrl::@23 to mode_ctrl::@12
+Renumbering block mode_ctrl::@24 to mode_ctrl::@13
+Renumbering block mode_ctrl::@25 to mode_ctrl::@14
+Renumbering block mode_ctrl::@26 to mode_ctrl::@15
+Renumbering block mode_ctrl::@27 to mode_ctrl::@16
+Renumbering block mode_ctrl::@28 to mode_ctrl::@17
+Renumbering block mode_ctrl::@30 to mode_ctrl::@18
+Renumbering block mode_ctrl::@32 to mode_ctrl::@19
+Renumbering block mode_ctrl::@33 to mode_ctrl::@20
+Renumbering block mode_ctrl::@34 to mode_ctrl::@21
+Renumbering block mode_ctrl::@35 to mode_ctrl::@22
+Renumbering block mode_ctrl::@36 to mode_ctrl::@23
+Renumbering block mode_ctrl::@37 to mode_ctrl::@24
+Renumbering block mode_ctrl::@38 to mode_ctrl::@25
+Renumbering block mode_ctrl::@39 to mode_ctrl::@26
+Renumbering block mode_ctrl::@46 to mode_ctrl::@27
+Renumbering block mode_stdbitmap::@11 to mode_stdbitmap::@10
+Renumbering block mode_twoplanebitmap::@7 to mode_twoplanebitmap::@6
+Renumbering block mode_twoplanebitmap::@8 to mode_twoplanebitmap::@7
+Renumbering block mode_twoplanebitmap::@9 to mode_twoplanebitmap::@8
+Renumbering block mode_twoplanebitmap::@10 to mode_twoplanebitmap::@9
+Renumbering block mode_twoplanebitmap::@11 to mode_twoplanebitmap::@10
+Renumbering block mode_twoplanebitmap::@13 to mode_twoplanebitmap::@11
+Renumbering block mode_twoplanebitmap::@15 to mode_twoplanebitmap::@12
+Renumbering block mode_twoplanebitmap::@16 to mode_twoplanebitmap::@13
+Renumbering block mode_twoplanebitmap::@17 to mode_twoplanebitmap::@14
+Renumbering block mode_twoplanebitmap::@18 to mode_twoplanebitmap::@15
+Renumbering block mode_sixsfred::@7 to mode_sixsfred::@6
+Renumbering block mode_sixsfred::@8 to mode_sixsfred::@7
+Renumbering block mode_sixsfred::@9 to mode_sixsfred::@8
+Renumbering block mode_sixsfred::@11 to mode_sixsfred::@9
+Renumbering block mode_sixsfred::@12 to mode_sixsfred::@10
+Renumbering block mode_sixsfred::@13 to mode_sixsfred::@11
+Renumbering block mode_sixsfred::@14 to mode_sixsfred::@12
+Renumbering block mode_sixsfred2::@7 to mode_sixsfred2::@6
+Renumbering block mode_sixsfred2::@8 to mode_sixsfred2::@7
+Renumbering block mode_sixsfred2::@9 to mode_sixsfred2::@8
+Renumbering block mode_sixsfred2::@11 to mode_sixsfred2::@9
+Renumbering block mode_sixsfred2::@12 to mode_sixsfred2::@10
+Renumbering block mode_sixsfred2::@13 to mode_sixsfred2::@11
+Renumbering block mode_sixsfred2::@14 to mode_sixsfred2::@12
+Renumbering block mode_8bpppixelcell::@3 to mode_8bpppixelcell::@2
+Renumbering block mode_8bpppixelcell::@4 to mode_8bpppixelcell::@3
+Renumbering block mode_8bpppixelcell::@5 to mode_8bpppixelcell::@4
+Renumbering block mode_8bpppixelcell::@6 to mode_8bpppixelcell::@5
+Renumbering block mode_8bpppixelcell::@7 to mode_8bpppixelcell::@6
+Renumbering block mode_8bpppixelcell::@8 to mode_8bpppixelcell::@7
+Renumbering block mode_8bpppixelcell::@9 to mode_8bpppixelcell::@8
+Renumbering block mode_8bpppixelcell::@10 to mode_8bpppixelcell::@9
+Renumbering block mode_8bpppixelcell::@11 to mode_8bpppixelcell::@10
+Renumbering block mode_8bpppixelcell::@12 to mode_8bpppixelcell::@11
+Renumbering block mode_8bpppixelcell::@13 to mode_8bpppixelcell::@12
+Renumbering block mode_8bpppixelcell::@14 to mode_8bpppixelcell::@13
+Renumbering block mode_8bppchunkybmm::@10 to mode_8bppchunkybmm::@9
+Renumbering block mode_8bppchunkybmm::@11 to mode_8bppchunkybmm::@10
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @54
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
-Adding NOP phi() at start of main::@2
-Adding NOP phi() at start of menu::@47
-Adding NOP phi() at start of menu::@48
+Adding NOP phi() at start of main::@1
+Adding NOP phi() at start of menu::@28
+Adding NOP phi() at start of menu::@29
+Adding NOP phi() at start of menu::@1
 Adding NOP phi() at start of menu::@2
 Adding NOP phi() at start of menu::@6
-Adding NOP phi() at start of menu::@12
-Adding NOP phi() at start of menu::@24
-Adding NOP phi() at start of menu::@13
-Adding NOP phi() at start of menu::@26
-Adding NOP phi() at start of menu::@14
-Adding NOP phi() at start of menu::@28
-Adding NOP phi() at start of menu::@15
-Adding NOP phi() at start of menu::@30
-Adding NOP phi() at start of menu::@16
-Adding NOP phi() at start of menu::@32
 Adding NOP phi() at start of menu::@17
-Adding NOP phi() at start of menu::@34
+Adding NOP phi() at start of menu::@7
 Adding NOP phi() at start of menu::@18
-Adding NOP phi() at start of menu::@36
+Adding NOP phi() at start of menu::@8
 Adding NOP phi() at start of menu::@19
-Adding NOP phi() at start of menu::@38
+Adding NOP phi() at start of menu::@9
 Adding NOP phi() at start of menu::@20
-Adding NOP phi() at start of menu::@40
+Adding NOP phi() at start of menu::@10
 Adding NOP phi() at start of menu::@21
-Adding NOP phi() at start of menu::@42
+Adding NOP phi() at start of menu::@11
 Adding NOP phi() at start of menu::@22
-Adding NOP phi() at start of menu::@44
+Adding NOP phi() at start of menu::@12
+Adding NOP phi() at start of menu::@23
+Adding NOP phi() at start of menu::@13
+Adding NOP phi() at start of menu::@24
+Adding NOP phi() at start of menu::@14
+Adding NOP phi() at start of menu::@25
+Adding NOP phi() at start of menu::@15
+Adding NOP phi() at start of menu::@26
+Adding NOP phi() at start of menu::@16
+Adding NOP phi() at start of menu::@27
 Adding NOP phi() at start of mode_8bppchunkybmm::@2
 Adding NOP phi() at start of mode_8bppchunkybmm::@8
-Adding NOP phi() at start of mode_8bppchunkybmm::@11
-Adding NOP phi() at start of mode_ctrl::@8
-Adding NOP phi() at start of mode_ctrl::@46
-Adding NOP phi() at start of mode_sixsfred::@14
-Adding NOP phi() at start of mode_twoplanebitmap::@18
-Adding NOP phi() at start of mode_sixsfred2::@14
+Adding NOP phi() at start of mode_8bppchunkybmm::@10
+Adding NOP phi() at start of mode_ctrl::@3
+Adding NOP phi() at start of mode_ctrl::@27
+Adding NOP phi() at start of mode_sixsfred::@12
+Adding NOP phi() at start of mode_twoplanebitmap::@15
+Adding NOP phi() at start of mode_sixsfred2::@12
 Adding NOP phi() at start of mode_hicolmcchar::@6
 Adding NOP phi() at start of mode_hicolecmchar::@6
 Adding NOP phi() at start of mode_hicolstdchar::@6
@@ -9229,12 +9363,12 @@ Adding NOP phi() at start of mode_stdbitmap::@6
 Adding NOP phi() at start of mode_stdbitmap::@9
 Adding NOP phi() at start of mode_stdbitmap::@8
 Adding NOP phi() at start of bitmap_init
-Adding NOP phi() at start of bitmap_init::@10
+Adding NOP phi() at start of bitmap_init::@6
 Adding NOP phi() at start of mode_mcchar::@6
 Adding NOP phi() at start of mode_ecmchar::@6
 Adding NOP phi() at start of mode_stdchar::@6
 Adding NOP phi() at start of print_str_lines
-Adding NOP phi() at start of print_str_lines::@9
+Adding NOP phi() at start of print_str_lines::@5
 Adding NOP phi() at start of print_ln
 Adding NOP phi() at start of print_cls
 Adding NOP phi() at start of print_set_screen
@@ -9242,24 +9376,24 @@ Adding NOP phi() at start of print_set_screen
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@54
-@54: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @54
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @54
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
   [7] *((const byte*) DTV_FEATURE#0) ← (const byte) DTV_FEATURE_ENABLE#0
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [8] phi()
   [9] call menu 
-  to:main::@2
-menu: scope:[menu]  from main::@2
+  to:main::@1
+menu: scope:[menu]  from main::@1
   [10] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) menu::CHARSET#0/(dword/signed dword) $10000
   [11] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
   [12] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
@@ -9269,192 +9403,192 @@ menu: scope:[menu]  from main::@2
   [16] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [17] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_CSEL#0
   [18] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) menu::SCREEN#0&(word/signed word/dword/signed dword) $3fff/(byte/signed byte/word/signed word/dword/signed dword) $40|((word))(const byte*) menu::CHARSET#0&(word/signed word/dword/signed dword) $3fff/(word/signed word/dword/signed dword) $400
-  to:menu::@8
-menu::@8: scope:[menu]  from menu menu::@8
-  [19] (byte) menu::i#2 ← phi( menu/(byte/signed byte/word/signed word/dword/signed dword) 0 menu::@8/(byte) menu::i#1 )
+  to:menu::@3
+menu::@3: scope:[menu]  from menu menu::@3
+  [19] (byte) menu::i#2 ← phi( menu/(byte/signed byte/word/signed word/dword/signed dword) 0 menu::@3/(byte) menu::i#1 )
   [20] *((const byte*) DTV_PALETTE#0 + (byte) menu::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) menu::i#2)
   [21] (byte) menu::i#1 ← ++ (byte) menu::i#2
-  [22] if((byte) menu::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto menu::@8
-  to:menu::@10
-menu::@10: scope:[menu]  from menu::@10 menu::@8
-  [23] (byte*) menu::c#2 ← phi( menu::@10/(byte*) menu::c#1 menu::@8/(const byte*) COLS#0 )
+  [22] if((byte) menu::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto menu::@3
+  to:menu::@4
+menu::@4: scope:[menu]  from menu::@3 menu::@4
+  [23] (byte*) menu::c#2 ← phi( menu::@4/(byte*) menu::c#1 menu::@3/(const byte*) COLS#0 )
   [24] *((byte*) menu::c#2) ← (const byte) LIGHT_GREEN#0
   [25] (byte*) menu::c#1 ← ++ (byte*) menu::c#2
-  [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@10
-  to:menu::@11
-menu::@11: scope:[menu]  from menu::@10
+  [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@4
+  to:menu::@5
+menu::@5: scope:[menu]  from menu::@4
   [27] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [28] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [29] call print_set_screen 
-  to:menu::@47
-menu::@47: scope:[menu]  from menu::@11
+  to:menu::@28
+menu::@28: scope:[menu]  from menu::@5
   [30] phi()
   [31] call print_cls 
-  to:menu::@48
-menu::@48: scope:[menu]  from menu::@47
+  to:menu::@29
+menu::@29: scope:[menu]  from menu::@28
   [32] phi()
   [33] call print_str_lines 
-  to:menu::@2
-menu::@2: scope:[menu]  from menu::@48 menu::@71
+  to:menu::@1
+menu::@1: scope:[menu]  from menu::@29 menu::@41
   [34] phi()
   [35] call keyboard_key_pressed 
   [36] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@50
-menu::@50: scope:[menu]  from menu::@2
+  to:menu::@30
+menu::@30: scope:[menu]  from menu::@1
   [37] (byte~) menu::$29 ← (byte) keyboard_key_pressed::return#2
-  [38] if((byte~) menu::$29==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@12
-  to:menu::@6
-menu::@6: scope:[menu]  from menu::@50
+  [38] if((byte~) menu::$29==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@6
+  to:menu::@2
+menu::@2: scope:[menu]  from menu::@30
   [39] phi()
   [40] call mode_stdchar 
   to:menu::@return
-menu::@return: scope:[menu]  from menu::@24 menu::@26 menu::@28 menu::@30 menu::@32 menu::@34 menu::@36 menu::@38 menu::@40 menu::@42 menu::@44 menu::@6
+menu::@return: scope:[menu]  from menu::@17 menu::@18 menu::@19 menu::@2 menu::@20 menu::@21 menu::@22 menu::@23 menu::@24 menu::@25 menu::@26 menu::@27
   [41] return 
   to:@return
-menu::@12: scope:[menu]  from menu::@50
+menu::@6: scope:[menu]  from menu::@30
   [42] phi()
   [43] call keyboard_key_pressed 
   [44] (byte) keyboard_key_pressed::return#24 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@51
-menu::@51: scope:[menu]  from menu::@12
+  to:menu::@31
+menu::@31: scope:[menu]  from menu::@6
   [45] (byte~) menu::$33 ← (byte) keyboard_key_pressed::return#24
-  [46] if((byte~) menu::$33==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@13
-  to:menu::@24
-menu::@24: scope:[menu]  from menu::@51
+  [46] if((byte~) menu::$33==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@7
+  to:menu::@17
+menu::@17: scope:[menu]  from menu::@31
   [47] phi()
   [48] call mode_ecmchar 
   to:menu::@return
-menu::@13: scope:[menu]  from menu::@51
+menu::@7: scope:[menu]  from menu::@31
   [49] phi()
   [50] call keyboard_key_pressed 
   [51] (byte) keyboard_key_pressed::return#25 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@53
-menu::@53: scope:[menu]  from menu::@13
+  to:menu::@32
+menu::@32: scope:[menu]  from menu::@7
   [52] (byte~) menu::$37 ← (byte) keyboard_key_pressed::return#25
-  [53] if((byte~) menu::$37==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@14
-  to:menu::@26
-menu::@26: scope:[menu]  from menu::@53
+  [53] if((byte~) menu::$37==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@8
+  to:menu::@18
+menu::@18: scope:[menu]  from menu::@32
   [54] phi()
   [55] call mode_mcchar 
   to:menu::@return
-menu::@14: scope:[menu]  from menu::@53
+menu::@8: scope:[menu]  from menu::@32
   [56] phi()
   [57] call keyboard_key_pressed 
   [58] (byte) keyboard_key_pressed::return#26 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@55
-menu::@55: scope:[menu]  from menu::@14
+  to:menu::@33
+menu::@33: scope:[menu]  from menu::@8
   [59] (byte~) menu::$41 ← (byte) keyboard_key_pressed::return#26
-  [60] if((byte~) menu::$41==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@15
-  to:menu::@28
-menu::@28: scope:[menu]  from menu::@55
+  [60] if((byte~) menu::$41==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@9
+  to:menu::@19
+menu::@19: scope:[menu]  from menu::@33
   [61] phi()
   [62] call mode_stdbitmap 
   to:menu::@return
-menu::@15: scope:[menu]  from menu::@55
+menu::@9: scope:[menu]  from menu::@33
   [63] phi()
   [64] call keyboard_key_pressed 
   [65] (byte) keyboard_key_pressed::return#27 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@57
-menu::@57: scope:[menu]  from menu::@15
+  to:menu::@34
+menu::@34: scope:[menu]  from menu::@9
   [66] (byte~) menu::$45 ← (byte) keyboard_key_pressed::return#27
-  [67] if((byte~) menu::$45==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@16
-  to:menu::@30
-menu::@30: scope:[menu]  from menu::@57
+  [67] if((byte~) menu::$45==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@10
+  to:menu::@20
+menu::@20: scope:[menu]  from menu::@34
   [68] phi()
   [69] call mode_hicolstdchar 
   to:menu::@return
-menu::@16: scope:[menu]  from menu::@57
+menu::@10: scope:[menu]  from menu::@34
   [70] phi()
   [71] call keyboard_key_pressed 
   [72] (byte) keyboard_key_pressed::return#28 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@59
-menu::@59: scope:[menu]  from menu::@16
+  to:menu::@35
+menu::@35: scope:[menu]  from menu::@10
   [73] (byte~) menu::$49 ← (byte) keyboard_key_pressed::return#28
-  [74] if((byte~) menu::$49==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@17
-  to:menu::@32
-menu::@32: scope:[menu]  from menu::@59
+  [74] if((byte~) menu::$49==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@11
+  to:menu::@21
+menu::@21: scope:[menu]  from menu::@35
   [75] phi()
   [76] call mode_hicolecmchar 
   to:menu::@return
-menu::@17: scope:[menu]  from menu::@59
+menu::@11: scope:[menu]  from menu::@35
   [77] phi()
   [78] call keyboard_key_pressed 
   [79] (byte) keyboard_key_pressed::return#29 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@61
-menu::@61: scope:[menu]  from menu::@17
+  to:menu::@36
+menu::@36: scope:[menu]  from menu::@11
   [80] (byte~) menu::$53 ← (byte) keyboard_key_pressed::return#29
-  [81] if((byte~) menu::$53==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@18
-  to:menu::@34
-menu::@34: scope:[menu]  from menu::@61
+  [81] if((byte~) menu::$53==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@12
+  to:menu::@22
+menu::@22: scope:[menu]  from menu::@36
   [82] phi()
   [83] call mode_hicolmcchar 
   to:menu::@return
-menu::@18: scope:[menu]  from menu::@61
+menu::@12: scope:[menu]  from menu::@36
   [84] phi()
   [85] call keyboard_key_pressed 
   [86] (byte) keyboard_key_pressed::return#30 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@63
-menu::@63: scope:[menu]  from menu::@18
+  to:menu::@37
+menu::@37: scope:[menu]  from menu::@12
   [87] (byte~) menu::$57 ← (byte) keyboard_key_pressed::return#30
-  [88] if((byte~) menu::$57==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@19
-  to:menu::@36
-menu::@36: scope:[menu]  from menu::@63
+  [88] if((byte~) menu::$57==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@13
+  to:menu::@23
+menu::@23: scope:[menu]  from menu::@37
   [89] phi()
   [90] call mode_sixsfred2 
   to:menu::@return
-menu::@19: scope:[menu]  from menu::@63
+menu::@13: scope:[menu]  from menu::@37
   [91] phi()
   [92] call keyboard_key_pressed 
   [93] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@65
-menu::@65: scope:[menu]  from menu::@19
-  [94] (byte~) menu::$61 ← (byte) keyboard_key_pressed::return#10
-  [95] if((byte~) menu::$61==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@20
   to:menu::@38
-menu::@38: scope:[menu]  from menu::@65
+menu::@38: scope:[menu]  from menu::@13
+  [94] (byte~) menu::$61 ← (byte) keyboard_key_pressed::return#10
+  [95] if((byte~) menu::$61==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@14
+  to:menu::@24
+menu::@24: scope:[menu]  from menu::@38
   [96] phi()
   [97] call mode_twoplanebitmap 
   to:menu::@return
-menu::@20: scope:[menu]  from menu::@65
+menu::@14: scope:[menu]  from menu::@38
   [98] phi()
   [99] call keyboard_key_pressed 
   [100] (byte) keyboard_key_pressed::return#11 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@67
-menu::@67: scope:[menu]  from menu::@20
+  to:menu::@39
+menu::@39: scope:[menu]  from menu::@14
   [101] (byte~) menu::$65 ← (byte) keyboard_key_pressed::return#11
-  [102] if((byte~) menu::$65==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@21
-  to:menu::@40
-menu::@40: scope:[menu]  from menu::@67
+  [102] if((byte~) menu::$65==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@15
+  to:menu::@25
+menu::@25: scope:[menu]  from menu::@39
   [103] phi()
   [104] call mode_sixsfred 
   to:menu::@return
-menu::@21: scope:[menu]  from menu::@67
+menu::@15: scope:[menu]  from menu::@39
   [105] phi()
   [106] call keyboard_key_pressed 
   [107] (byte) keyboard_key_pressed::return#12 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@69
-menu::@69: scope:[menu]  from menu::@21
+  to:menu::@40
+menu::@40: scope:[menu]  from menu::@15
   [108] (byte~) menu::$69 ← (byte) keyboard_key_pressed::return#12
-  [109] if((byte~) menu::$69==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@22
-  to:menu::@42
-menu::@42: scope:[menu]  from menu::@69
+  [109] if((byte~) menu::$69==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@16
+  to:menu::@26
+menu::@26: scope:[menu]  from menu::@40
   [110] phi()
   [111] call mode_8bpppixelcell 
   to:menu::@return
-menu::@22: scope:[menu]  from menu::@69
+menu::@16: scope:[menu]  from menu::@40
   [112] phi()
   [113] call keyboard_key_pressed 
   [114] (byte) keyboard_key_pressed::return#13 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@71
-menu::@71: scope:[menu]  from menu::@22
+  to:menu::@41
+menu::@41: scope:[menu]  from menu::@16
   [115] (byte~) menu::$73 ← (byte) keyboard_key_pressed::return#13
-  [116] if((byte~) menu::$73==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@2
-  to:menu::@44
-menu::@44: scope:[menu]  from menu::@71
+  [116] if((byte~) menu::$73==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@1
+  to:menu::@27
+menu::@27: scope:[menu]  from menu::@41
   [117] phi()
   [118] call mode_8bppchunkybmm 
   to:menu::@return
-mode_8bppchunkybmm: scope:[mode_8bppchunkybmm]  from menu::@44
+mode_8bppchunkybmm: scope:[mode_8bppchunkybmm]  from menu::@27
   [119] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0
   [120] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_ECM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [121] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_MCM#0|(const byte) VIC_CSEL#0
@@ -9490,13 +9624,13 @@ mode_8bppchunkybmm::@4: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@3
 mode_8bppchunkybmm::@6: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@4
   [138] (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 ← (byte) mode_8bppchunkybmm::gfxbCpuBank#4
   [139] call dtvSetCpuBankSegment1 
-  to:mode_8bppchunkybmm::@10
-mode_8bppchunkybmm::@10: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@6
+  to:mode_8bppchunkybmm::@9
+mode_8bppchunkybmm::@9: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@6
   [140] (byte) mode_8bppchunkybmm::gfxbCpuBank#2 ← ++ (byte) mode_8bppchunkybmm::gfxbCpuBank#4
   to:mode_8bppchunkybmm::@5
-mode_8bppchunkybmm::@5: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@10 mode_8bppchunkybmm::@4
-  [141] (byte) mode_8bppchunkybmm::gfxbCpuBank#8 ← phi( mode_8bppchunkybmm::@10/(byte) mode_8bppchunkybmm::gfxbCpuBank#2 mode_8bppchunkybmm::@4/(byte) mode_8bppchunkybmm::gfxbCpuBank#4 )
-  [141] (byte*) mode_8bppchunkybmm::gfxb#4 ← phi( mode_8bppchunkybmm::@10/((byte*))(word/signed word/dword/signed dword) $4000 mode_8bppchunkybmm::@4/(byte*) mode_8bppchunkybmm::gfxb#3 )
+mode_8bppchunkybmm::@5: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@4 mode_8bppchunkybmm::@9
+  [141] (byte) mode_8bppchunkybmm::gfxbCpuBank#8 ← phi( mode_8bppchunkybmm::@9/(byte) mode_8bppchunkybmm::gfxbCpuBank#2 mode_8bppchunkybmm::@4/(byte) mode_8bppchunkybmm::gfxbCpuBank#4 )
+  [141] (byte*) mode_8bppchunkybmm::gfxb#4 ← phi( mode_8bppchunkybmm::@9/((byte*))(word/signed word/dword/signed dword) $4000 mode_8bppchunkybmm::@4/(byte*) mode_8bppchunkybmm::gfxb#3 )
   [142] (word~) mode_8bppchunkybmm::$27 ← (word) mode_8bppchunkybmm::x#2 + (byte) mode_8bppchunkybmm::y#6
   [143] (byte) mode_8bppchunkybmm::c#0 ← ((byte)) (word~) mode_8bppchunkybmm::$27
   [144] *((byte*) mode_8bppchunkybmm::gfxb#4) ← (byte) mode_8bppchunkybmm::c#0
@@ -9511,141 +9645,141 @@ mode_8bppchunkybmm::@7: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@5
 mode_8bppchunkybmm::@8: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@7
   [150] phi()
   [151] call dtvSetCpuBankSegment1 
-  to:mode_8bppchunkybmm::@11
-mode_8bppchunkybmm::@11: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@8
+  to:mode_8bppchunkybmm::@10
+mode_8bppchunkybmm::@10: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@8
   [152] phi()
   [153] call mode_ctrl 
   to:mode_8bppchunkybmm::@return
-mode_8bppchunkybmm::@return: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@11
+mode_8bppchunkybmm::@return: scope:[mode_8bppchunkybmm]  from mode_8bppchunkybmm::@10
   [154] return 
   to:@return
-mode_ctrl: scope:[mode_ctrl]  from mode_8bppchunkybmm::@11 mode_8bpppixelcell::@14 mode_ecmchar::@6 mode_hicolecmchar::@6 mode_hicolmcchar::@6 mode_hicolstdchar::@6 mode_mcchar::@6 mode_sixsfred2::@14 mode_sixsfred::@14 mode_stdbitmap::@8 mode_stdchar::@6 mode_twoplanebitmap::@18
-  [155] (byte) dtv_control#145 ← phi( mode_8bppchunkybmm::@11/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 mode_8bpppixelcell::@14/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0 mode_ecmchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_hicolecmchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_hicolmcchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_hicolstdchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_mcchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@14/(const byte) DTV_LINEAR#0 mode_sixsfred::@14/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 mode_stdbitmap::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_stdchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@18/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 )
+mode_ctrl: scope:[mode_ctrl]  from mode_8bppchunkybmm::@10 mode_8bpppixelcell::@13 mode_ecmchar::@6 mode_hicolecmchar::@6 mode_hicolmcchar::@6 mode_hicolstdchar::@6 mode_mcchar::@6 mode_sixsfred2::@12 mode_sixsfred::@12 mode_stdbitmap::@8 mode_stdchar::@6 mode_twoplanebitmap::@15
+  [155] (byte) dtv_control#145 ← phi( mode_8bppchunkybmm::@10/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 mode_8bpppixelcell::@13/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0 mode_ecmchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_hicolecmchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_hicolmcchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_hicolstdchar::@6/(const byte) DTV_HIGHCOLOR#0 mode_mcchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@12/(const byte) DTV_LINEAR#0 mode_sixsfred::@12/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 mode_stdbitmap::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_stdchar::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@15/(const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 )
   to:mode_ctrl::@1
-mode_ctrl::@1: scope:[mode_ctrl]  from mode_ctrl mode_ctrl::@16 mode_ctrl::@30
-  [156] (byte) dtv_control#114 ← phi( mode_ctrl/(byte) dtv_control#145 mode_ctrl::@30/(byte) dtv_control#17 )
-  to:mode_ctrl::@6
-mode_ctrl::@6: scope:[mode_ctrl]  from mode_ctrl::@1 mode_ctrl::@6
-  [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@6
-  to:mode_ctrl::@8
-mode_ctrl::@8: scope:[mode_ctrl]  from mode_ctrl::@6
+mode_ctrl::@1: scope:[mode_ctrl]  from mode_ctrl mode_ctrl::@11 mode_ctrl::@18
+  [156] (byte) dtv_control#114 ← phi( mode_ctrl/(byte) dtv_control#145 mode_ctrl::@18/(byte) dtv_control#17 )
+  to:mode_ctrl::@2
+mode_ctrl::@2: scope:[mode_ctrl]  from mode_ctrl::@1 mode_ctrl::@2
+  [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@2
+  to:mode_ctrl::@3
+mode_ctrl::@3: scope:[mode_ctrl]  from mode_ctrl::@2
   [158] phi()
   [159] call keyboard_key_pressed 
   [160] (byte) keyboard_key_pressed::return#14 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@32
-mode_ctrl::@32: scope:[mode_ctrl]  from mode_ctrl::@8
+  to:mode_ctrl::@19
+mode_ctrl::@19: scope:[mode_ctrl]  from mode_ctrl::@3
   [161] (byte~) mode_ctrl::$1 ← (byte) keyboard_key_pressed::return#14
-  [162] if((byte~) mode_ctrl::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@9
+  [162] if((byte~) mode_ctrl::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@4
   to:mode_ctrl::@return
-mode_ctrl::@return: scope:[mode_ctrl]  from mode_ctrl::@32
+mode_ctrl::@return: scope:[mode_ctrl]  from mode_ctrl::@19
   [163] return 
   to:@return
-mode_ctrl::@9: scope:[mode_ctrl]  from mode_ctrl::@32
+mode_ctrl::@4: scope:[mode_ctrl]  from mode_ctrl::@19
   [164] (byte) mode_ctrl::ctrl#0 ← (byte) dtv_control#114
   [165] call keyboard_key_pressed 
   [166] (byte) keyboard_key_pressed::return#15 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@33
-mode_ctrl::@33: scope:[mode_ctrl]  from mode_ctrl::@9
+  to:mode_ctrl::@20
+mode_ctrl::@20: scope:[mode_ctrl]  from mode_ctrl::@4
   [167] (byte~) mode_ctrl::$4 ← (byte) keyboard_key_pressed::return#15
-  [168] if((byte~) mode_ctrl::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@10
-  to:mode_ctrl::@23
-mode_ctrl::@23: scope:[mode_ctrl]  from mode_ctrl::@33
+  [168] if((byte~) mode_ctrl::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@5
+  to:mode_ctrl::@12
+mode_ctrl::@12: scope:[mode_ctrl]  from mode_ctrl::@20
   [169] (byte) mode_ctrl::ctrl#1 ← (byte) mode_ctrl::ctrl#0 | (const byte) DTV_LINEAR#0
-  to:mode_ctrl::@10
-mode_ctrl::@10: scope:[mode_ctrl]  from mode_ctrl::@23 mode_ctrl::@33
-  [170] (byte) mode_ctrl::ctrl#17 ← phi( mode_ctrl::@23/(byte) mode_ctrl::ctrl#1 mode_ctrl::@33/(byte) mode_ctrl::ctrl#0 )
+  to:mode_ctrl::@5
+mode_ctrl::@5: scope:[mode_ctrl]  from mode_ctrl::@12 mode_ctrl::@20
+  [170] (byte) mode_ctrl::ctrl#17 ← phi( mode_ctrl::@12/(byte) mode_ctrl::ctrl#1 mode_ctrl::@20/(byte) mode_ctrl::ctrl#0 )
   [171] call keyboard_key_pressed 
   [172] (byte) keyboard_key_pressed::return#16 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@34
-mode_ctrl::@34: scope:[mode_ctrl]  from mode_ctrl::@10
+  to:mode_ctrl::@21
+mode_ctrl::@21: scope:[mode_ctrl]  from mode_ctrl::@5
   [173] (byte~) mode_ctrl::$8 ← (byte) keyboard_key_pressed::return#16
-  [174] if((byte~) mode_ctrl::$8==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@11
-  to:mode_ctrl::@24
-mode_ctrl::@24: scope:[mode_ctrl]  from mode_ctrl::@34
+  [174] if((byte~) mode_ctrl::$8==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@6
+  to:mode_ctrl::@13
+mode_ctrl::@13: scope:[mode_ctrl]  from mode_ctrl::@21
   [175] (byte) mode_ctrl::ctrl#2 ← (byte) mode_ctrl::ctrl#17 | (const byte) DTV_HIGHCOLOR#0
-  to:mode_ctrl::@11
-mode_ctrl::@11: scope:[mode_ctrl]  from mode_ctrl::@24 mode_ctrl::@34
-  [176] (byte) mode_ctrl::ctrl#10 ← phi( mode_ctrl::@24/(byte) mode_ctrl::ctrl#2 mode_ctrl::@34/(byte) mode_ctrl::ctrl#17 )
+  to:mode_ctrl::@6
+mode_ctrl::@6: scope:[mode_ctrl]  from mode_ctrl::@13 mode_ctrl::@21
+  [176] (byte) mode_ctrl::ctrl#10 ← phi( mode_ctrl::@13/(byte) mode_ctrl::ctrl#2 mode_ctrl::@21/(byte) mode_ctrl::ctrl#17 )
   [177] call keyboard_key_pressed 
   [178] (byte) keyboard_key_pressed::return#17 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@35
-mode_ctrl::@35: scope:[mode_ctrl]  from mode_ctrl::@11
+  to:mode_ctrl::@22
+mode_ctrl::@22: scope:[mode_ctrl]  from mode_ctrl::@6
   [179] (byte~) mode_ctrl::$12 ← (byte) keyboard_key_pressed::return#17
-  [180] if((byte~) mode_ctrl::$12==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@12
-  to:mode_ctrl::@25
-mode_ctrl::@25: scope:[mode_ctrl]  from mode_ctrl::@35
+  [180] if((byte~) mode_ctrl::$12==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@7
+  to:mode_ctrl::@14
+mode_ctrl::@14: scope:[mode_ctrl]  from mode_ctrl::@22
   [181] (byte) mode_ctrl::ctrl#3 ← (byte) mode_ctrl::ctrl#10 | (const byte) DTV_OVERSCAN#0
-  to:mode_ctrl::@12
-mode_ctrl::@12: scope:[mode_ctrl]  from mode_ctrl::@25 mode_ctrl::@35
-  [182] (byte) mode_ctrl::ctrl#11 ← phi( mode_ctrl::@25/(byte) mode_ctrl::ctrl#3 mode_ctrl::@35/(byte) mode_ctrl::ctrl#10 )
+  to:mode_ctrl::@7
+mode_ctrl::@7: scope:[mode_ctrl]  from mode_ctrl::@14 mode_ctrl::@22
+  [182] (byte) mode_ctrl::ctrl#11 ← phi( mode_ctrl::@14/(byte) mode_ctrl::ctrl#3 mode_ctrl::@22/(byte) mode_ctrl::ctrl#10 )
   [183] call keyboard_key_pressed 
   [184] (byte) keyboard_key_pressed::return#18 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@36
-mode_ctrl::@36: scope:[mode_ctrl]  from mode_ctrl::@12
+  to:mode_ctrl::@23
+mode_ctrl::@23: scope:[mode_ctrl]  from mode_ctrl::@7
   [185] (byte~) mode_ctrl::$16 ← (byte) keyboard_key_pressed::return#18
-  [186] if((byte~) mode_ctrl::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@13
-  to:mode_ctrl::@26
-mode_ctrl::@26: scope:[mode_ctrl]  from mode_ctrl::@36
+  [186] if((byte~) mode_ctrl::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@8
+  to:mode_ctrl::@15
+mode_ctrl::@15: scope:[mode_ctrl]  from mode_ctrl::@23
   [187] (byte) mode_ctrl::ctrl#4 ← (byte) mode_ctrl::ctrl#11 | (const byte) DTV_BORDER_OFF#0
-  to:mode_ctrl::@13
-mode_ctrl::@13: scope:[mode_ctrl]  from mode_ctrl::@26 mode_ctrl::@36
-  [188] (byte) mode_ctrl::ctrl#12 ← phi( mode_ctrl::@26/(byte) mode_ctrl::ctrl#4 mode_ctrl::@36/(byte) mode_ctrl::ctrl#11 )
+  to:mode_ctrl::@8
+mode_ctrl::@8: scope:[mode_ctrl]  from mode_ctrl::@15 mode_ctrl::@23
+  [188] (byte) mode_ctrl::ctrl#12 ← phi( mode_ctrl::@15/(byte) mode_ctrl::ctrl#4 mode_ctrl::@23/(byte) mode_ctrl::ctrl#11 )
   [189] call keyboard_key_pressed 
   [190] (byte) keyboard_key_pressed::return#19 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@37
-mode_ctrl::@37: scope:[mode_ctrl]  from mode_ctrl::@13
+  to:mode_ctrl::@24
+mode_ctrl::@24: scope:[mode_ctrl]  from mode_ctrl::@8
   [191] (byte~) mode_ctrl::$20 ← (byte) keyboard_key_pressed::return#19
-  [192] if((byte~) mode_ctrl::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@14
-  to:mode_ctrl::@27
-mode_ctrl::@27: scope:[mode_ctrl]  from mode_ctrl::@37
+  [192] if((byte~) mode_ctrl::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@9
+  to:mode_ctrl::@16
+mode_ctrl::@16: scope:[mode_ctrl]  from mode_ctrl::@24
   [193] (byte) mode_ctrl::ctrl#5 ← (byte) mode_ctrl::ctrl#12 | (const byte) DTV_CHUNKY#0
-  to:mode_ctrl::@14
-mode_ctrl::@14: scope:[mode_ctrl]  from mode_ctrl::@27 mode_ctrl::@37
-  [194] (byte) mode_ctrl::ctrl#13 ← phi( mode_ctrl::@27/(byte) mode_ctrl::ctrl#5 mode_ctrl::@37/(byte) mode_ctrl::ctrl#12 )
+  to:mode_ctrl::@9
+mode_ctrl::@9: scope:[mode_ctrl]  from mode_ctrl::@16 mode_ctrl::@24
+  [194] (byte) mode_ctrl::ctrl#13 ← phi( mode_ctrl::@16/(byte) mode_ctrl::ctrl#5 mode_ctrl::@24/(byte) mode_ctrl::ctrl#12 )
   [195] call keyboard_key_pressed 
   [196] (byte) keyboard_key_pressed::return#20 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@38
-mode_ctrl::@38: scope:[mode_ctrl]  from mode_ctrl::@14
+  to:mode_ctrl::@25
+mode_ctrl::@25: scope:[mode_ctrl]  from mode_ctrl::@9
   [197] (byte~) mode_ctrl::$24 ← (byte) keyboard_key_pressed::return#20
-  [198] if((byte~) mode_ctrl::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@15
-  to:mode_ctrl::@28
-mode_ctrl::@28: scope:[mode_ctrl]  from mode_ctrl::@38
+  [198] if((byte~) mode_ctrl::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@10
+  to:mode_ctrl::@17
+mode_ctrl::@17: scope:[mode_ctrl]  from mode_ctrl::@25
   [199] (byte) mode_ctrl::ctrl#6 ← (byte) mode_ctrl::ctrl#13 | (const byte) DTV_COLORRAM_OFF#0
-  to:mode_ctrl::@15
-mode_ctrl::@15: scope:[mode_ctrl]  from mode_ctrl::@28 mode_ctrl::@38
-  [200] (byte) mode_ctrl::ctrl#22 ← phi( mode_ctrl::@28/(byte) mode_ctrl::ctrl#6 mode_ctrl::@38/(byte) mode_ctrl::ctrl#13 )
+  to:mode_ctrl::@10
+mode_ctrl::@10: scope:[mode_ctrl]  from mode_ctrl::@17 mode_ctrl::@25
+  [200] (byte) mode_ctrl::ctrl#22 ← phi( mode_ctrl::@17/(byte) mode_ctrl::ctrl#6 mode_ctrl::@25/(byte) mode_ctrl::ctrl#13 )
   [201] call keyboard_key_pressed 
   [202] (byte) keyboard_key_pressed::return#21 ← (byte) keyboard_key_pressed::return#0
-  to:mode_ctrl::@39
-mode_ctrl::@39: scope:[mode_ctrl]  from mode_ctrl::@15
+  to:mode_ctrl::@26
+mode_ctrl::@26: scope:[mode_ctrl]  from mode_ctrl::@10
   [203] (byte~) mode_ctrl::$28 ← (byte) keyboard_key_pressed::return#21
-  [204] if((byte~) mode_ctrl::$28==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@46
-  to:mode_ctrl::@16
-mode_ctrl::@16: scope:[mode_ctrl]  from mode_ctrl::@39 mode_ctrl::@46
-  [205] (byte) mode_ctrl::ctrl#14 ← phi( mode_ctrl::@39/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_ctrl::@46/(byte) mode_ctrl::ctrl#22 )
+  [204] if((byte~) mode_ctrl::$28==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@27
+  to:mode_ctrl::@11
+mode_ctrl::@11: scope:[mode_ctrl]  from mode_ctrl::@26 mode_ctrl::@27
+  [205] (byte) mode_ctrl::ctrl#14 ← phi( mode_ctrl::@26/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_ctrl::@27/(byte) mode_ctrl::ctrl#22 )
   [206] if((byte) mode_ctrl::ctrl#14==(byte) dtv_control#114) goto mode_ctrl::@1
-  to:mode_ctrl::@30
-mode_ctrl::@30: scope:[mode_ctrl]  from mode_ctrl::@16
+  to:mode_ctrl::@18
+mode_ctrl::@18: scope:[mode_ctrl]  from mode_ctrl::@11
   [207] (byte) dtv_control#17 ← (byte) mode_ctrl::ctrl#14
   [208] *((const byte*) DTV_CONTROL#0) ← (byte) mode_ctrl::ctrl#14
   [209] *((const byte*) BORDERCOL#0) ← (byte) mode_ctrl::ctrl#14
   to:mode_ctrl::@1
-mode_ctrl::@46: scope:[mode_ctrl]  from mode_ctrl::@39
+mode_ctrl::@27: scope:[mode_ctrl]  from mode_ctrl::@26
   [210] phi()
-  to:mode_ctrl::@16
-keyboard_key_pressed: scope:[keyboard_key_pressed]  from menu::@12 menu::@13 menu::@14 menu::@15 menu::@16 menu::@17 menu::@18 menu::@19 menu::@2 menu::@20 menu::@21 menu::@22 mode_ctrl::@10 mode_ctrl::@11 mode_ctrl::@12 mode_ctrl::@13 mode_ctrl::@14 mode_ctrl::@15 mode_ctrl::@8 mode_ctrl::@9
-  [211] (byte) keyboard_key_pressed::key#20 ← phi( menu::@12/(const byte) KEY_2#0 menu::@13/(const byte) KEY_3#0 menu::@14/(const byte) KEY_4#0 menu::@15/(const byte) KEY_6#0 menu::@16/(const byte) KEY_7#0 menu::@17/(const byte) KEY_8#0 menu::@18/(const byte) KEY_A#0 menu::@19/(const byte) KEY_B#0 menu::@2/(const byte) KEY_1#0 menu::@20/(const byte) KEY_C#0 menu::@21/(const byte) KEY_D#0 menu::@22/(const byte) KEY_E#0 mode_ctrl::@10/(const byte) KEY_H#0 mode_ctrl::@11/(const byte) KEY_O#0 mode_ctrl::@12/(const byte) KEY_B#0 mode_ctrl::@13/(const byte) KEY_U#0 mode_ctrl::@14/(const byte) KEY_C#0 mode_ctrl::@15/(const byte) KEY_0#0 mode_ctrl::@8/(const byte) KEY_SPACE#0 mode_ctrl::@9/(const byte) KEY_L#0 )
+  to:mode_ctrl::@11
+keyboard_key_pressed: scope:[keyboard_key_pressed]  from menu::@1 menu::@10 menu::@11 menu::@12 menu::@13 menu::@14 menu::@15 menu::@16 menu::@6 menu::@7 menu::@8 menu::@9 mode_ctrl::@10 mode_ctrl::@3 mode_ctrl::@4 mode_ctrl::@5 mode_ctrl::@6 mode_ctrl::@7 mode_ctrl::@8 mode_ctrl::@9
+  [211] (byte) keyboard_key_pressed::key#20 ← phi( menu::@6/(const byte) KEY_2#0 menu::@7/(const byte) KEY_3#0 menu::@8/(const byte) KEY_4#0 menu::@9/(const byte) KEY_6#0 menu::@10/(const byte) KEY_7#0 menu::@11/(const byte) KEY_8#0 menu::@12/(const byte) KEY_A#0 menu::@13/(const byte) KEY_B#0 menu::@1/(const byte) KEY_1#0 menu::@14/(const byte) KEY_C#0 menu::@15/(const byte) KEY_D#0 menu::@16/(const byte) KEY_E#0 mode_ctrl::@5/(const byte) KEY_H#0 mode_ctrl::@6/(const byte) KEY_O#0 mode_ctrl::@7/(const byte) KEY_B#0 mode_ctrl::@8/(const byte) KEY_U#0 mode_ctrl::@9/(const byte) KEY_C#0 mode_ctrl::@10/(const byte) KEY_0#0 mode_ctrl::@3/(const byte) KEY_SPACE#0 mode_ctrl::@4/(const byte) KEY_L#0 )
   [212] (byte) keyboard_key_pressed::colidx#0 ← (byte) keyboard_key_pressed::key#20 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [213] (byte) keyboard_key_pressed::rowidx#0 ← (byte) keyboard_key_pressed::key#20 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [214] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_key_pressed::rowidx#0
   [215] call keyboard_matrix_read 
   [216] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_key_pressed::@2
-keyboard_key_pressed::@2: scope:[keyboard_key_pressed]  from keyboard_key_pressed
+  to:keyboard_key_pressed::@1
+keyboard_key_pressed::@1: scope:[keyboard_key_pressed]  from keyboard_key_pressed
   [217] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   [218] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0)
   to:keyboard_key_pressed::@return
-keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@2
+keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@1
   [219] return 
   to:@return
 keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
@@ -9663,7 +9797,7 @@ dtvSetCpuBankSegment1: scope:[dtvSetCpuBankSegment1]  from mode_8bppchunkybmm::@
 dtvSetCpuBankSegment1::@return: scope:[dtvSetCpuBankSegment1]  from dtvSetCpuBankSegment1
   [226] return 
   to:@return
-mode_8bpppixelcell: scope:[mode_8bpppixelcell]  from menu::@42
+mode_8bpppixelcell: scope:[mode_8bpppixelcell]  from menu::@26
   [227] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0
   [228] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_ECM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [229] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_MCM#0|(const byte) VIC_CSEL#0
@@ -9686,14 +9820,14 @@ mode_8bpppixelcell::@1: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell mode
   [244] *((const byte*) DTV_PALETTE#0 + (byte) mode_8bpppixelcell::i#2) ← (byte) mode_8bpppixelcell::i#2
   [245] (byte) mode_8bpppixelcell::i#1 ← ++ (byte) mode_8bpppixelcell::i#2
   [246] if((byte) mode_8bpppixelcell::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mode_8bpppixelcell::@1
+  to:mode_8bpppixelcell::@2
+mode_8bpppixelcell::@2: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@1 mode_8bpppixelcell::@4
+  [247] (byte*) mode_8bpppixelcell::gfxa#3 ← phi( mode_8bpppixelcell::@1/(const byte*) mode_8bpppixelcell::PLANEA#0 mode_8bpppixelcell::@4/(byte*) mode_8bpppixelcell::gfxa#1 )
+  [247] (byte) mode_8bpppixelcell::ay#4 ← phi( mode_8bpppixelcell::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_8bpppixelcell::@4/(byte) mode_8bpppixelcell::ay#1 )
   to:mode_8bpppixelcell::@3
-mode_8bpppixelcell::@3: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@1 mode_8bpppixelcell::@5
-  [247] (byte*) mode_8bpppixelcell::gfxa#3 ← phi( mode_8bpppixelcell::@1/(const byte*) mode_8bpppixelcell::PLANEA#0 mode_8bpppixelcell::@5/(byte*) mode_8bpppixelcell::gfxa#1 )
-  [247] (byte) mode_8bpppixelcell::ay#4 ← phi( mode_8bpppixelcell::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_8bpppixelcell::@5/(byte) mode_8bpppixelcell::ay#1 )
-  to:mode_8bpppixelcell::@4
-mode_8bpppixelcell::@4: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@3 mode_8bpppixelcell::@4
-  [248] (byte*) mode_8bpppixelcell::gfxa#2 ← phi( mode_8bpppixelcell::@3/(byte*) mode_8bpppixelcell::gfxa#3 mode_8bpppixelcell::@4/(byte*) mode_8bpppixelcell::gfxa#1 )
-  [248] (byte) mode_8bpppixelcell::ax#2 ← phi( mode_8bpppixelcell::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_8bpppixelcell::@4/(byte) mode_8bpppixelcell::ax#1 )
+mode_8bpppixelcell::@3: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@2 mode_8bpppixelcell::@3
+  [248] (byte*) mode_8bpppixelcell::gfxa#2 ← phi( mode_8bpppixelcell::@2/(byte*) mode_8bpppixelcell::gfxa#3 mode_8bpppixelcell::@3/(byte*) mode_8bpppixelcell::gfxa#1 )
+  [248] (byte) mode_8bpppixelcell::ax#2 ← phi( mode_8bpppixelcell::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_8bpppixelcell::@3/(byte) mode_8bpppixelcell::ax#1 )
   [249] (byte~) mode_8bpppixelcell::$14 ← (byte) mode_8bpppixelcell::ay#4 & (byte/signed byte/word/signed word/dword/signed dword) $f
   [250] (byte~) mode_8bpppixelcell::$15 ← (byte~) mode_8bpppixelcell::$14 << (byte/signed byte/word/signed word/dword/signed dword) 4
   [251] (byte~) mode_8bpppixelcell::$16 ← (byte) mode_8bpppixelcell::ax#2 & (byte/signed byte/word/signed word/dword/signed dword) $f
@@ -9701,65 +9835,65 @@ mode_8bpppixelcell::@4: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@3
   [253] *((byte*) mode_8bpppixelcell::gfxa#2) ← (byte~) mode_8bpppixelcell::$17
   [254] (byte*) mode_8bpppixelcell::gfxa#1 ← ++ (byte*) mode_8bpppixelcell::gfxa#2
   [255] (byte) mode_8bpppixelcell::ax#1 ← ++ (byte) mode_8bpppixelcell::ax#2
-  [256] if((byte) mode_8bpppixelcell::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_8bpppixelcell::@4
+  [256] if((byte) mode_8bpppixelcell::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_8bpppixelcell::@3
+  to:mode_8bpppixelcell::@4
+mode_8bpppixelcell::@4: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@3
+  [257] (byte) mode_8bpppixelcell::ay#1 ← ++ (byte) mode_8bpppixelcell::ay#4
+  [258] if((byte) mode_8bpppixelcell::ay#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_8bpppixelcell::@2
   to:mode_8bpppixelcell::@5
 mode_8bpppixelcell::@5: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@4
-  [257] (byte) mode_8bpppixelcell::ay#1 ← ++ (byte) mode_8bpppixelcell::ay#4
-  [258] if((byte) mode_8bpppixelcell::ay#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_8bpppixelcell::@3
-  to:mode_8bpppixelcell::@6
-mode_8bpppixelcell::@6: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@5
   [259] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_CHARROM#0
+  to:mode_8bpppixelcell::@6
+mode_8bpppixelcell::@6: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@12 mode_8bpppixelcell::@5
+  [260] (byte) mode_8bpppixelcell::ch#8 ← phi( mode_8bpppixelcell::@12/(byte) mode_8bpppixelcell::ch#1 mode_8bpppixelcell::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [260] (byte) mode_8bpppixelcell::col#7 ← phi( mode_8bpppixelcell::@12/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [260] (byte*) mode_8bpppixelcell::gfxb#7 ← phi( mode_8bpppixelcell::@12/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@5/(const byte*) mode_8bpppixelcell::PLANEB#0 )
+  [260] (byte*) mode_8bpppixelcell::chargen#4 ← phi( mode_8bpppixelcell::@12/(byte*) mode_8bpppixelcell::chargen#1 mode_8bpppixelcell::@5/(const byte*) mode_8bpppixelcell::CHARGEN#0 )
   to:mode_8bpppixelcell::@7
-mode_8bpppixelcell::@7: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@13 mode_8bpppixelcell::@6
-  [260] (byte) mode_8bpppixelcell::ch#8 ← phi( mode_8bpppixelcell::@13/(byte) mode_8bpppixelcell::ch#1 mode_8bpppixelcell::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [260] (byte) mode_8bpppixelcell::col#7 ← phi( mode_8bpppixelcell::@13/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [260] (byte*) mode_8bpppixelcell::gfxb#7 ← phi( mode_8bpppixelcell::@13/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@6/(const byte*) mode_8bpppixelcell::PLANEB#0 )
-  [260] (byte*) mode_8bpppixelcell::chargen#4 ← phi( mode_8bpppixelcell::@13/(byte*) mode_8bpppixelcell::chargen#1 mode_8bpppixelcell::@6/(const byte*) mode_8bpppixelcell::CHARGEN#0 )
-  to:mode_8bpppixelcell::@8
-mode_8bpppixelcell::@8: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@12 mode_8bpppixelcell::@7
-  [261] (byte) mode_8bpppixelcell::cr#6 ← phi( mode_8bpppixelcell::@12/(byte) mode_8bpppixelcell::cr#1 mode_8bpppixelcell::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [261] (byte) mode_8bpppixelcell::col#5 ← phi( mode_8bpppixelcell::@12/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@7/(byte) mode_8bpppixelcell::col#7 )
-  [261] (byte*) mode_8bpppixelcell::gfxb#5 ← phi( mode_8bpppixelcell::@12/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@7/(byte*) mode_8bpppixelcell::gfxb#7 )
-  [261] (byte*) mode_8bpppixelcell::chargen#2 ← phi( mode_8bpppixelcell::@12/(byte*) mode_8bpppixelcell::chargen#1 mode_8bpppixelcell::@7/(byte*) mode_8bpppixelcell::chargen#4 )
+mode_8bpppixelcell::@7: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@11 mode_8bpppixelcell::@6
+  [261] (byte) mode_8bpppixelcell::cr#6 ← phi( mode_8bpppixelcell::@11/(byte) mode_8bpppixelcell::cr#1 mode_8bpppixelcell::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [261] (byte) mode_8bpppixelcell::col#5 ← phi( mode_8bpppixelcell::@11/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@6/(byte) mode_8bpppixelcell::col#7 )
+  [261] (byte*) mode_8bpppixelcell::gfxb#5 ← phi( mode_8bpppixelcell::@11/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@6/(byte*) mode_8bpppixelcell::gfxb#7 )
+  [261] (byte*) mode_8bpppixelcell::chargen#2 ← phi( mode_8bpppixelcell::@11/(byte*) mode_8bpppixelcell::chargen#1 mode_8bpppixelcell::@6/(byte*) mode_8bpppixelcell::chargen#4 )
   [262] (byte) mode_8bpppixelcell::bits#0 ← *((byte*) mode_8bpppixelcell::chargen#2)
   [263] (byte*) mode_8bpppixelcell::chargen#1 ← ++ (byte*) mode_8bpppixelcell::chargen#2
+  to:mode_8bpppixelcell::@8
+mode_8bpppixelcell::@8: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@7 mode_8bpppixelcell::@9
+  [264] (byte) mode_8bpppixelcell::cp#2 ← phi( mode_8bpppixelcell::@9/(byte) mode_8bpppixelcell::cp#1 mode_8bpppixelcell::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [264] (byte) mode_8bpppixelcell::col#2 ← phi( mode_8bpppixelcell::@9/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@7/(byte) mode_8bpppixelcell::col#5 )
+  [264] (byte*) mode_8bpppixelcell::gfxb#2 ← phi( mode_8bpppixelcell::@9/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@7/(byte*) mode_8bpppixelcell::gfxb#5 )
+  [264] (byte) mode_8bpppixelcell::bits#2 ← phi( mode_8bpppixelcell::@9/(byte) mode_8bpppixelcell::bits#1 mode_8bpppixelcell::@7/(byte) mode_8bpppixelcell::bits#0 )
+  [265] (byte~) mode_8bpppixelcell::$20 ← (byte) mode_8bpppixelcell::bits#2 & (byte/word/signed word/dword/signed dword) $80
+  [266] if((byte~) mode_8bpppixelcell::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@9
+  to:mode_8bpppixelcell::@10
+mode_8bpppixelcell::@10: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@8
+  [267] (byte~) mode_8bpppixelcell::c#3 ← (byte) mode_8bpppixelcell::col#2
   to:mode_8bpppixelcell::@9
 mode_8bpppixelcell::@9: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@10 mode_8bpppixelcell::@8
-  [264] (byte) mode_8bpppixelcell::cp#2 ← phi( mode_8bpppixelcell::@10/(byte) mode_8bpppixelcell::cp#1 mode_8bpppixelcell::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [264] (byte) mode_8bpppixelcell::col#2 ← phi( mode_8bpppixelcell::@10/(byte) mode_8bpppixelcell::col#1 mode_8bpppixelcell::@8/(byte) mode_8bpppixelcell::col#5 )
-  [264] (byte*) mode_8bpppixelcell::gfxb#2 ← phi( mode_8bpppixelcell::@10/(byte*) mode_8bpppixelcell::gfxb#1 mode_8bpppixelcell::@8/(byte*) mode_8bpppixelcell::gfxb#5 )
-  [264] (byte) mode_8bpppixelcell::bits#2 ← phi( mode_8bpppixelcell::@10/(byte) mode_8bpppixelcell::bits#1 mode_8bpppixelcell::@8/(byte) mode_8bpppixelcell::bits#0 )
-  [265] (byte~) mode_8bpppixelcell::$20 ← (byte) mode_8bpppixelcell::bits#2 & (byte/word/signed word/dword/signed dword) $80
-  [266] if((byte~) mode_8bpppixelcell::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@10
-  to:mode_8bpppixelcell::@11
-mode_8bpppixelcell::@11: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@9
-  [267] (byte~) mode_8bpppixelcell::c#3 ← (byte) mode_8bpppixelcell::col#2
-  to:mode_8bpppixelcell::@10
-mode_8bpppixelcell::@10: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@11 mode_8bpppixelcell::@9
-  [268] (byte) mode_8bpppixelcell::c#2 ← phi( mode_8bpppixelcell::@11/(byte~) mode_8bpppixelcell::c#3 mode_8bpppixelcell::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [268] (byte) mode_8bpppixelcell::c#2 ← phi( mode_8bpppixelcell::@10/(byte~) mode_8bpppixelcell::c#3 mode_8bpppixelcell::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [269] *((byte*) mode_8bpppixelcell::gfxb#2) ← (byte) mode_8bpppixelcell::c#2
   [270] (byte*) mode_8bpppixelcell::gfxb#1 ← ++ (byte*) mode_8bpppixelcell::gfxb#2
   [271] (byte) mode_8bpppixelcell::bits#1 ← (byte) mode_8bpppixelcell::bits#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [272] (byte) mode_8bpppixelcell::col#1 ← ++ (byte) mode_8bpppixelcell::col#2
   [273] (byte) mode_8bpppixelcell::cp#1 ← ++ (byte) mode_8bpppixelcell::cp#2
-  [274] if((byte) mode_8bpppixelcell::cp#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@9
-  to:mode_8bpppixelcell::@12
-mode_8bpppixelcell::@12: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@10
+  [274] if((byte) mode_8bpppixelcell::cp#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@8
+  to:mode_8bpppixelcell::@11
+mode_8bpppixelcell::@11: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@9
   [275] (byte) mode_8bpppixelcell::cr#1 ← ++ (byte) mode_8bpppixelcell::cr#6
-  [276] if((byte) mode_8bpppixelcell::cr#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@8
+  [276] if((byte) mode_8bpppixelcell::cr#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@7
+  to:mode_8bpppixelcell::@12
+mode_8bpppixelcell::@12: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@11
+  [277] (byte) mode_8bpppixelcell::ch#1 ← ++ (byte) mode_8bpppixelcell::ch#8
+  [278] if((byte) mode_8bpppixelcell::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@6
   to:mode_8bpppixelcell::@13
 mode_8bpppixelcell::@13: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@12
-  [277] (byte) mode_8bpppixelcell::ch#1 ← ++ (byte) mode_8bpppixelcell::ch#8
-  [278] if((byte) mode_8bpppixelcell::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@7
-  to:mode_8bpppixelcell::@14
-mode_8bpppixelcell::@14: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@13
   [279] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
   [280] call mode_ctrl 
   to:mode_8bpppixelcell::@return
-mode_8bpppixelcell::@return: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@14
+mode_8bpppixelcell::@return: scope:[mode_8bpppixelcell]  from mode_8bpppixelcell::@13
   [281] return 
   to:@return
-mode_sixsfred: scope:[mode_sixsfred]  from menu::@40
+mode_sixsfred: scope:[mode_sixsfred]  from menu::@25
   [282] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0
   [283] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_ECM#0|(const byte) VIC_BMM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [284] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_MCM#0|(const byte) VIC_CSEL#0
@@ -9804,49 +9938,49 @@ mode_sixsfred::@4: scope:[mode_sixsfred]  from mode_sixsfred::@3 mode_sixsfred::
 mode_sixsfred::@5: scope:[mode_sixsfred]  from mode_sixsfred::@4
   [312] (byte) mode_sixsfred::cy#1 ← ++ (byte) mode_sixsfred::cy#4
   [313] if((byte) mode_sixsfred::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_sixsfred::@3
+  to:mode_sixsfred::@6
+mode_sixsfred::@6: scope:[mode_sixsfred]  from mode_sixsfred::@5 mode_sixsfred::@8
+  [314] (byte*) mode_sixsfred::gfxa#3 ← phi( mode_sixsfred::@5/(const byte*) mode_sixsfred::PLANEA#0 mode_sixsfred::@8/(byte*) mode_sixsfred::gfxa#1 )
+  [314] (byte) mode_sixsfred::ay#4 ← phi( mode_sixsfred::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@8/(byte) mode_sixsfred::ay#1 )
   to:mode_sixsfred::@7
-mode_sixsfred::@7: scope:[mode_sixsfred]  from mode_sixsfred::@5 mode_sixsfred::@9
-  [314] (byte*) mode_sixsfred::gfxa#3 ← phi( mode_sixsfred::@5/(const byte*) mode_sixsfred::PLANEA#0 mode_sixsfred::@9/(byte*) mode_sixsfred::gfxa#1 )
-  [314] (byte) mode_sixsfred::ay#4 ← phi( mode_sixsfred::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@9/(byte) mode_sixsfred::ay#1 )
-  to:mode_sixsfred::@8
-mode_sixsfred::@8: scope:[mode_sixsfred]  from mode_sixsfred::@7 mode_sixsfred::@8
-  [315] (byte) mode_sixsfred::ax#2 ← phi( mode_sixsfred::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@8/(byte) mode_sixsfred::ax#1 )
-  [315] (byte*) mode_sixsfred::gfxa#2 ← phi( mode_sixsfred::@7/(byte*) mode_sixsfred::gfxa#3 mode_sixsfred::@8/(byte*) mode_sixsfred::gfxa#1 )
+mode_sixsfred::@7: scope:[mode_sixsfred]  from mode_sixsfred::@6 mode_sixsfred::@7
+  [315] (byte) mode_sixsfred::ax#2 ← phi( mode_sixsfred::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@7/(byte) mode_sixsfred::ax#1 )
+  [315] (byte*) mode_sixsfred::gfxa#2 ← phi( mode_sixsfred::@6/(byte*) mode_sixsfred::gfxa#3 mode_sixsfred::@7/(byte*) mode_sixsfred::gfxa#1 )
   [316] (byte~) mode_sixsfred::$21 ← (byte) mode_sixsfred::ay#4 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [317] (byte) mode_sixsfred::row#0 ← (byte~) mode_sixsfred::$21 & (byte/signed byte/word/signed word/dword/signed dword) 3
   [318] *((byte*) mode_sixsfred::gfxa#2) ← *((const byte[]) mode_sixsfred::row_bitmask#0 + (byte) mode_sixsfred::row#0)
   [319] (byte*) mode_sixsfred::gfxa#1 ← ++ (byte*) mode_sixsfred::gfxa#2
   [320] (byte) mode_sixsfred::ax#1 ← ++ (byte) mode_sixsfred::ax#2
-  [321] if((byte) mode_sixsfred::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@8
-  to:mode_sixsfred::@9
-mode_sixsfred::@9: scope:[mode_sixsfred]  from mode_sixsfred::@8
+  [321] if((byte) mode_sixsfred::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@7
+  to:mode_sixsfred::@8
+mode_sixsfred::@8: scope:[mode_sixsfred]  from mode_sixsfred::@7
   [322] (byte) mode_sixsfred::ay#1 ← ++ (byte) mode_sixsfred::ay#4
-  [323] if((byte) mode_sixsfred::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@7
-  to:mode_sixsfred::@11
-mode_sixsfred::@11: scope:[mode_sixsfred]  from mode_sixsfred::@13 mode_sixsfred::@9
-  [324] (byte) mode_sixsfred::by#4 ← phi( mode_sixsfred::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@13/(byte) mode_sixsfred::by#1 )
-  [324] (byte*) mode_sixsfred::gfxb#3 ← phi( mode_sixsfred::@9/(const byte*) mode_sixsfred::PLANEB#0 mode_sixsfred::@13/(byte*) mode_sixsfred::gfxb#1 )
-  to:mode_sixsfred::@12
-mode_sixsfred::@12: scope:[mode_sixsfred]  from mode_sixsfred::@11 mode_sixsfred::@12
-  [325] (byte) mode_sixsfred::bx#2 ← phi( mode_sixsfred::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@12/(byte) mode_sixsfred::bx#1 )
-  [325] (byte*) mode_sixsfred::gfxb#2 ← phi( mode_sixsfred::@11/(byte*) mode_sixsfred::gfxb#3 mode_sixsfred::@12/(byte*) mode_sixsfred::gfxb#1 )
+  [323] if((byte) mode_sixsfred::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@6
+  to:mode_sixsfred::@9
+mode_sixsfred::@9: scope:[mode_sixsfred]  from mode_sixsfred::@11 mode_sixsfred::@8
+  [324] (byte) mode_sixsfred::by#4 ← phi( mode_sixsfred::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@11/(byte) mode_sixsfred::by#1 )
+  [324] (byte*) mode_sixsfred::gfxb#3 ← phi( mode_sixsfred::@8/(const byte*) mode_sixsfred::PLANEB#0 mode_sixsfred::@11/(byte*) mode_sixsfred::gfxb#1 )
+  to:mode_sixsfred::@10
+mode_sixsfred::@10: scope:[mode_sixsfred]  from mode_sixsfred::@10 mode_sixsfred::@9
+  [325] (byte) mode_sixsfred::bx#2 ← phi( mode_sixsfred::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred::@10/(byte) mode_sixsfred::bx#1 )
+  [325] (byte*) mode_sixsfred::gfxb#2 ← phi( mode_sixsfred::@9/(byte*) mode_sixsfred::gfxb#3 mode_sixsfred::@10/(byte*) mode_sixsfred::gfxb#1 )
   [326] *((byte*) mode_sixsfred::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $1b
   [327] (byte*) mode_sixsfred::gfxb#1 ← ++ (byte*) mode_sixsfred::gfxb#2
   [328] (byte) mode_sixsfred::bx#1 ← ++ (byte) mode_sixsfred::bx#2
-  [329] if((byte) mode_sixsfred::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@12
-  to:mode_sixsfred::@13
-mode_sixsfred::@13: scope:[mode_sixsfred]  from mode_sixsfred::@12
+  [329] if((byte) mode_sixsfred::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@10
+  to:mode_sixsfred::@11
+mode_sixsfred::@11: scope:[mode_sixsfred]  from mode_sixsfred::@10
   [330] (byte) mode_sixsfred::by#1 ← ++ (byte) mode_sixsfred::by#4
-  [331] if((byte) mode_sixsfred::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@11
-  to:mode_sixsfred::@14
-mode_sixsfred::@14: scope:[mode_sixsfred]  from mode_sixsfred::@13
+  [331] if((byte) mode_sixsfred::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@9
+  to:mode_sixsfred::@12
+mode_sixsfred::@12: scope:[mode_sixsfred]  from mode_sixsfred::@11
   [332] phi()
   [333] call mode_ctrl 
   to:mode_sixsfred::@return
-mode_sixsfred::@return: scope:[mode_sixsfred]  from mode_sixsfred::@14
+mode_sixsfred::@return: scope:[mode_sixsfred]  from mode_sixsfred::@12
   [334] return 
   to:@return
-mode_twoplanebitmap: scope:[mode_twoplanebitmap]  from menu::@38
+mode_twoplanebitmap: scope:[mode_twoplanebitmap]  from menu::@24
   [335] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0
   [336] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_ECM#0|(const byte) VIC_BMM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [337] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_CSEL#0
@@ -9895,58 +10029,58 @@ mode_twoplanebitmap::@4: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::
 mode_twoplanebitmap::@5: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@4
   [369] (byte) mode_twoplanebitmap::cy#1 ← ++ (byte) mode_twoplanebitmap::cy#4
   [370] if((byte) mode_twoplanebitmap::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_twoplanebitmap::@3
+  to:mode_twoplanebitmap::@6
+mode_twoplanebitmap::@6: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@11 mode_twoplanebitmap::@5
+  [371] (byte*) mode_twoplanebitmap::gfxa#7 ← phi( mode_twoplanebitmap::@11/(byte*) mode_twoplanebitmap::gfxa#6 mode_twoplanebitmap::@5/(const byte*) mode_twoplanebitmap::PLANEA#0 )
+  [371] (byte) mode_twoplanebitmap::ay#5 ← phi( mode_twoplanebitmap::@11/(byte) mode_twoplanebitmap::ay#1 mode_twoplanebitmap::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   to:mode_twoplanebitmap::@7
-mode_twoplanebitmap::@7: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@13 mode_twoplanebitmap::@5
-  [371] (byte*) mode_twoplanebitmap::gfxa#7 ← phi( mode_twoplanebitmap::@13/(byte*) mode_twoplanebitmap::gfxa#6 mode_twoplanebitmap::@5/(const byte*) mode_twoplanebitmap::PLANEA#0 )
-  [371] (byte) mode_twoplanebitmap::ay#5 ← phi( mode_twoplanebitmap::@13/(byte) mode_twoplanebitmap::ay#1 mode_twoplanebitmap::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  to:mode_twoplanebitmap::@8
-mode_twoplanebitmap::@8: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@10 mode_twoplanebitmap::@7
-  [372] (byte) mode_twoplanebitmap::ax#2 ← phi( mode_twoplanebitmap::@10/(byte) mode_twoplanebitmap::ax#1 mode_twoplanebitmap::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [372] (byte*) mode_twoplanebitmap::gfxa#3 ← phi( mode_twoplanebitmap::@10/(byte*) mode_twoplanebitmap::gfxa#6 mode_twoplanebitmap::@7/(byte*) mode_twoplanebitmap::gfxa#7 )
+mode_twoplanebitmap::@7: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@6 mode_twoplanebitmap::@9
+  [372] (byte) mode_twoplanebitmap::ax#2 ← phi( mode_twoplanebitmap::@9/(byte) mode_twoplanebitmap::ax#1 mode_twoplanebitmap::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [372] (byte*) mode_twoplanebitmap::gfxa#3 ← phi( mode_twoplanebitmap::@9/(byte*) mode_twoplanebitmap::gfxa#6 mode_twoplanebitmap::@6/(byte*) mode_twoplanebitmap::gfxa#7 )
   [373] (byte~) mode_twoplanebitmap::$22 ← (byte) mode_twoplanebitmap::ay#5 & (byte/signed byte/word/signed word/dword/signed dword) 4
-  [374] if((byte~) mode_twoplanebitmap::$22==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_twoplanebitmap::@9
-  to:mode_twoplanebitmap::@11
-mode_twoplanebitmap::@11: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@8
+  [374] if((byte~) mode_twoplanebitmap::$22==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_twoplanebitmap::@8
+  to:mode_twoplanebitmap::@10
+mode_twoplanebitmap::@10: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@7
   [375] *((byte*) mode_twoplanebitmap::gfxa#3) ← (byte/word/signed word/dword/signed dword) $ff
   [376] (byte*) mode_twoplanebitmap::gfxa#2 ← ++ (byte*) mode_twoplanebitmap::gfxa#3
-  to:mode_twoplanebitmap::@10
-mode_twoplanebitmap::@10: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@11 mode_twoplanebitmap::@9
-  [377] (byte*) mode_twoplanebitmap::gfxa#6 ← phi( mode_twoplanebitmap::@11/(byte*) mode_twoplanebitmap::gfxa#2 mode_twoplanebitmap::@9/(byte*) mode_twoplanebitmap::gfxa#1 )
+  to:mode_twoplanebitmap::@9
+mode_twoplanebitmap::@9: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@10 mode_twoplanebitmap::@8
+  [377] (byte*) mode_twoplanebitmap::gfxa#6 ← phi( mode_twoplanebitmap::@10/(byte*) mode_twoplanebitmap::gfxa#2 mode_twoplanebitmap::@8/(byte*) mode_twoplanebitmap::gfxa#1 )
   [378] (byte) mode_twoplanebitmap::ax#1 ← ++ (byte) mode_twoplanebitmap::ax#2
-  [379] if((byte) mode_twoplanebitmap::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@8
-  to:mode_twoplanebitmap::@13
-mode_twoplanebitmap::@13: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@10
+  [379] if((byte) mode_twoplanebitmap::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@7
+  to:mode_twoplanebitmap::@11
+mode_twoplanebitmap::@11: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@9
   [380] (byte) mode_twoplanebitmap::ay#1 ← ++ (byte) mode_twoplanebitmap::ay#5
-  [381] if((byte) mode_twoplanebitmap::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@7
-  to:mode_twoplanebitmap::@15
-mode_twoplanebitmap::@15: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@13 mode_twoplanebitmap::@17
-  [382] (byte) mode_twoplanebitmap::by#4 ← phi( mode_twoplanebitmap::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@17/(byte) mode_twoplanebitmap::by#1 )
-  [382] (byte*) mode_twoplanebitmap::gfxb#3 ← phi( mode_twoplanebitmap::@13/(const byte*) mode_twoplanebitmap::PLANEB#0 mode_twoplanebitmap::@17/(byte*) mode_twoplanebitmap::gfxb#1 )
-  to:mode_twoplanebitmap::@16
-mode_twoplanebitmap::@16: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@15 mode_twoplanebitmap::@16
-  [383] (byte) mode_twoplanebitmap::bx#2 ← phi( mode_twoplanebitmap::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@16/(byte) mode_twoplanebitmap::bx#1 )
-  [383] (byte*) mode_twoplanebitmap::gfxb#2 ← phi( mode_twoplanebitmap::@15/(byte*) mode_twoplanebitmap::gfxb#3 mode_twoplanebitmap::@16/(byte*) mode_twoplanebitmap::gfxb#1 )
+  [381] if((byte) mode_twoplanebitmap::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@6
+  to:mode_twoplanebitmap::@12
+mode_twoplanebitmap::@12: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@11 mode_twoplanebitmap::@14
+  [382] (byte) mode_twoplanebitmap::by#4 ← phi( mode_twoplanebitmap::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@14/(byte) mode_twoplanebitmap::by#1 )
+  [382] (byte*) mode_twoplanebitmap::gfxb#3 ← phi( mode_twoplanebitmap::@11/(const byte*) mode_twoplanebitmap::PLANEB#0 mode_twoplanebitmap::@14/(byte*) mode_twoplanebitmap::gfxb#1 )
+  to:mode_twoplanebitmap::@13
+mode_twoplanebitmap::@13: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@12 mode_twoplanebitmap::@13
+  [383] (byte) mode_twoplanebitmap::bx#2 ← phi( mode_twoplanebitmap::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_twoplanebitmap::@13/(byte) mode_twoplanebitmap::bx#1 )
+  [383] (byte*) mode_twoplanebitmap::gfxb#2 ← phi( mode_twoplanebitmap::@12/(byte*) mode_twoplanebitmap::gfxb#3 mode_twoplanebitmap::@13/(byte*) mode_twoplanebitmap::gfxb#1 )
   [384] *((byte*) mode_twoplanebitmap::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $f
   [385] (byte*) mode_twoplanebitmap::gfxb#1 ← ++ (byte*) mode_twoplanebitmap::gfxb#2
   [386] (byte) mode_twoplanebitmap::bx#1 ← ++ (byte) mode_twoplanebitmap::bx#2
-  [387] if((byte) mode_twoplanebitmap::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@16
-  to:mode_twoplanebitmap::@17
-mode_twoplanebitmap::@17: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@16
+  [387] if((byte) mode_twoplanebitmap::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@13
+  to:mode_twoplanebitmap::@14
+mode_twoplanebitmap::@14: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@13
   [388] (byte) mode_twoplanebitmap::by#1 ← ++ (byte) mode_twoplanebitmap::by#4
-  [389] if((byte) mode_twoplanebitmap::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@15
-  to:mode_twoplanebitmap::@18
-mode_twoplanebitmap::@18: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@17
+  [389] if((byte) mode_twoplanebitmap::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@12
+  to:mode_twoplanebitmap::@15
+mode_twoplanebitmap::@15: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@14
   [390] phi()
   [391] call mode_ctrl 
   to:mode_twoplanebitmap::@return
-mode_twoplanebitmap::@return: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@18
+mode_twoplanebitmap::@return: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@15
   [392] return 
   to:@return
-mode_twoplanebitmap::@9: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@8
+mode_twoplanebitmap::@8: scope:[mode_twoplanebitmap]  from mode_twoplanebitmap::@7
   [393] *((byte*) mode_twoplanebitmap::gfxa#3) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [394] (byte*) mode_twoplanebitmap::gfxa#1 ← ++ (byte*) mode_twoplanebitmap::gfxa#3
-  to:mode_twoplanebitmap::@10
-mode_sixsfred2: scope:[mode_sixsfred2]  from menu::@36
+  to:mode_twoplanebitmap::@9
+mode_sixsfred2: scope:[mode_sixsfred2]  from menu::@23
   [395] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_LINEAR#0
   [396] *((const byte*) VIC_CONTROL#0) ← (const byte) VIC_ECM#0|(const byte) VIC_BMM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [397] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_MCM#0|(const byte) VIC_CSEL#0
@@ -9993,49 +10127,49 @@ mode_sixsfred2::@4: scope:[mode_sixsfred2]  from mode_sixsfred2::@3 mode_sixsfre
 mode_sixsfred2::@5: scope:[mode_sixsfred2]  from mode_sixsfred2::@4
   [427] (byte) mode_sixsfred2::cy#1 ← ++ (byte) mode_sixsfred2::cy#4
   [428] if((byte) mode_sixsfred2::cy#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_sixsfred2::@3
+  to:mode_sixsfred2::@6
+mode_sixsfred2::@6: scope:[mode_sixsfred2]  from mode_sixsfred2::@5 mode_sixsfred2::@8
+  [429] (byte*) mode_sixsfred2::gfxa#3 ← phi( mode_sixsfred2::@5/(const byte*) mode_sixsfred2::PLANEA#0 mode_sixsfred2::@8/(byte*) mode_sixsfred2::gfxa#1 )
+  [429] (byte) mode_sixsfred2::ay#4 ← phi( mode_sixsfred2::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@8/(byte) mode_sixsfred2::ay#1 )
   to:mode_sixsfred2::@7
-mode_sixsfred2::@7: scope:[mode_sixsfred2]  from mode_sixsfred2::@5 mode_sixsfred2::@9
-  [429] (byte*) mode_sixsfred2::gfxa#3 ← phi( mode_sixsfred2::@5/(const byte*) mode_sixsfred2::PLANEA#0 mode_sixsfred2::@9/(byte*) mode_sixsfred2::gfxa#1 )
-  [429] (byte) mode_sixsfred2::ay#4 ← phi( mode_sixsfred2::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@9/(byte) mode_sixsfred2::ay#1 )
-  to:mode_sixsfred2::@8
-mode_sixsfred2::@8: scope:[mode_sixsfred2]  from mode_sixsfred2::@7 mode_sixsfred2::@8
-  [430] (byte) mode_sixsfred2::ax#2 ← phi( mode_sixsfred2::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@8/(byte) mode_sixsfred2::ax#1 )
-  [430] (byte*) mode_sixsfred2::gfxa#2 ← phi( mode_sixsfred2::@7/(byte*) mode_sixsfred2::gfxa#3 mode_sixsfred2::@8/(byte*) mode_sixsfred2::gfxa#1 )
+mode_sixsfred2::@7: scope:[mode_sixsfred2]  from mode_sixsfred2::@6 mode_sixsfred2::@7
+  [430] (byte) mode_sixsfred2::ax#2 ← phi( mode_sixsfred2::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@7/(byte) mode_sixsfred2::ax#1 )
+  [430] (byte*) mode_sixsfred2::gfxa#2 ← phi( mode_sixsfred2::@6/(byte*) mode_sixsfred2::gfxa#3 mode_sixsfred2::@7/(byte*) mode_sixsfred2::gfxa#1 )
   [431] (byte~) mode_sixsfred2::$21 ← (byte) mode_sixsfred2::ay#4 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [432] (byte) mode_sixsfred2::row#0 ← (byte~) mode_sixsfred2::$21 & (byte/signed byte/word/signed word/dword/signed dword) 3
   [433] *((byte*) mode_sixsfred2::gfxa#2) ← *((const byte[]) mode_sixsfred2::row_bitmask#0 + (byte) mode_sixsfred2::row#0)
   [434] (byte*) mode_sixsfred2::gfxa#1 ← ++ (byte*) mode_sixsfred2::gfxa#2
   [435] (byte) mode_sixsfred2::ax#1 ← ++ (byte) mode_sixsfred2::ax#2
-  [436] if((byte) mode_sixsfred2::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@8
-  to:mode_sixsfred2::@9
-mode_sixsfred2::@9: scope:[mode_sixsfred2]  from mode_sixsfred2::@8
+  [436] if((byte) mode_sixsfred2::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@7
+  to:mode_sixsfred2::@8
+mode_sixsfred2::@8: scope:[mode_sixsfred2]  from mode_sixsfred2::@7
   [437] (byte) mode_sixsfred2::ay#1 ← ++ (byte) mode_sixsfred2::ay#4
-  [438] if((byte) mode_sixsfred2::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@7
-  to:mode_sixsfred2::@11
-mode_sixsfred2::@11: scope:[mode_sixsfred2]  from mode_sixsfred2::@13 mode_sixsfred2::@9
-  [439] (byte) mode_sixsfred2::by#4 ← phi( mode_sixsfred2::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@13/(byte) mode_sixsfred2::by#1 )
-  [439] (byte*) mode_sixsfred2::gfxb#3 ← phi( mode_sixsfred2::@9/(const byte*) mode_sixsfred2::PLANEB#0 mode_sixsfred2::@13/(byte*) mode_sixsfred2::gfxb#1 )
-  to:mode_sixsfred2::@12
-mode_sixsfred2::@12: scope:[mode_sixsfred2]  from mode_sixsfred2::@11 mode_sixsfred2::@12
-  [440] (byte) mode_sixsfred2::bx#2 ← phi( mode_sixsfred2::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@12/(byte) mode_sixsfred2::bx#1 )
-  [440] (byte*) mode_sixsfred2::gfxb#2 ← phi( mode_sixsfred2::@11/(byte*) mode_sixsfred2::gfxb#3 mode_sixsfred2::@12/(byte*) mode_sixsfred2::gfxb#1 )
+  [438] if((byte) mode_sixsfred2::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@6
+  to:mode_sixsfred2::@9
+mode_sixsfred2::@9: scope:[mode_sixsfred2]  from mode_sixsfred2::@11 mode_sixsfred2::@8
+  [439] (byte) mode_sixsfred2::by#4 ← phi( mode_sixsfred2::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@11/(byte) mode_sixsfred2::by#1 )
+  [439] (byte*) mode_sixsfred2::gfxb#3 ← phi( mode_sixsfred2::@8/(const byte*) mode_sixsfred2::PLANEB#0 mode_sixsfred2::@11/(byte*) mode_sixsfred2::gfxb#1 )
+  to:mode_sixsfred2::@10
+mode_sixsfred2::@10: scope:[mode_sixsfred2]  from mode_sixsfred2::@10 mode_sixsfred2::@9
+  [440] (byte) mode_sixsfred2::bx#2 ← phi( mode_sixsfred2::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_sixsfred2::@10/(byte) mode_sixsfred2::bx#1 )
+  [440] (byte*) mode_sixsfred2::gfxb#2 ← phi( mode_sixsfred2::@9/(byte*) mode_sixsfred2::gfxb#3 mode_sixsfred2::@10/(byte*) mode_sixsfred2::gfxb#1 )
   [441] *((byte*) mode_sixsfred2::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $1b
   [442] (byte*) mode_sixsfred2::gfxb#1 ← ++ (byte*) mode_sixsfred2::gfxb#2
   [443] (byte) mode_sixsfred2::bx#1 ← ++ (byte) mode_sixsfred2::bx#2
-  [444] if((byte) mode_sixsfred2::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@12
-  to:mode_sixsfred2::@13
-mode_sixsfred2::@13: scope:[mode_sixsfred2]  from mode_sixsfred2::@12
+  [444] if((byte) mode_sixsfred2::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@10
+  to:mode_sixsfred2::@11
+mode_sixsfred2::@11: scope:[mode_sixsfred2]  from mode_sixsfred2::@10
   [445] (byte) mode_sixsfred2::by#1 ← ++ (byte) mode_sixsfred2::by#4
-  [446] if((byte) mode_sixsfred2::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@11
-  to:mode_sixsfred2::@14
-mode_sixsfred2::@14: scope:[mode_sixsfred2]  from mode_sixsfred2::@13
+  [446] if((byte) mode_sixsfred2::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@9
+  to:mode_sixsfred2::@12
+mode_sixsfred2::@12: scope:[mode_sixsfred2]  from mode_sixsfred2::@11
   [447] phi()
   [448] call mode_ctrl 
   to:mode_sixsfred2::@return
-mode_sixsfred2::@return: scope:[mode_sixsfred2]  from mode_sixsfred2::@14
+mode_sixsfred2::@return: scope:[mode_sixsfred2]  from mode_sixsfred2::@12
   [449] return 
   to:@return
-mode_hicolmcchar: scope:[mode_hicolmcchar]  from menu::@34
+mode_hicolmcchar: scope:[mode_hicolmcchar]  from menu::@22
   [450] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_hicolmcchar::CHARSET#0/(dword/signed dword) $10000
   [451] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const byte*) mode_hicolmcchar::COLORS#0/(word/signed word/dword/signed dword) $400
   [452] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const byte*) mode_hicolmcchar::COLORS#0/(word/signed word/dword/signed dword) $400
@@ -10089,7 +10223,7 @@ mode_hicolmcchar::@6: scope:[mode_hicolmcchar]  from mode_hicolmcchar::@5
 mode_hicolmcchar::@return: scope:[mode_hicolmcchar]  from mode_hicolmcchar::@6
   [483] return 
   to:@return
-mode_hicolecmchar: scope:[mode_hicolecmchar]  from menu::@32
+mode_hicolecmchar: scope:[mode_hicolecmchar]  from menu::@21
   [484] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_hicolecmchar::CHARSET#0/(dword/signed dword) $10000
   [485] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const byte*) mode_hicolecmchar::COLORS#0/(word/signed word/dword/signed dword) $400
   [486] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const byte*) mode_hicolecmchar::COLORS#0/(word/signed word/dword/signed dword) $400
@@ -10144,7 +10278,7 @@ mode_hicolecmchar::@6: scope:[mode_hicolecmchar]  from mode_hicolecmchar::@5
 mode_hicolecmchar::@return: scope:[mode_hicolecmchar]  from mode_hicolecmchar::@6
   [518] return 
   to:@return
-mode_hicolstdchar: scope:[mode_hicolstdchar]  from menu::@30
+mode_hicolstdchar: scope:[mode_hicolstdchar]  from menu::@20
   [519] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_hicolstdchar::CHARSET#0/(dword/signed dword) $10000
   [520] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const byte*) mode_hicolstdchar::COLORS#0/(word/signed word/dword/signed dword) $400
   [521] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const byte*) mode_hicolstdchar::COLORS#0/(word/signed word/dword/signed dword) $400
@@ -10196,7 +10330,7 @@ mode_hicolstdchar::@6: scope:[mode_hicolstdchar]  from mode_hicolstdchar::@5
 mode_hicolstdchar::@return: scope:[mode_hicolstdchar]  from mode_hicolstdchar::@6
   [550] return 
   to:@return
-mode_stdbitmap: scope:[mode_stdbitmap]  from menu::@28
+mode_stdbitmap: scope:[mode_stdbitmap]  from menu::@19
   [551] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_stdbitmap::BITMAP#0/(dword/signed dword) $10000
   [552] *((const byte*) DTV_CONTROL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [553] *((const byte*) CIA2_PORT_A_DDR#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3
@@ -10244,19 +10378,19 @@ mode_stdbitmap::@9: scope:[mode_stdbitmap]  from mode_stdbitmap::@6
   [579] phi()
   [580] call bitmap_clear 
   to:mode_stdbitmap::@7
-mode_stdbitmap::@7: scope:[mode_stdbitmap]  from mode_stdbitmap::@11 mode_stdbitmap::@9
-  [581] (byte) mode_stdbitmap::l#2 ← phi( mode_stdbitmap::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_stdbitmap::@11/(byte) mode_stdbitmap::l#1 )
+mode_stdbitmap::@7: scope:[mode_stdbitmap]  from mode_stdbitmap::@10 mode_stdbitmap::@9
+  [581] (byte) mode_stdbitmap::l#2 ← phi( mode_stdbitmap::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 mode_stdbitmap::@10/(byte) mode_stdbitmap::l#1 )
   [582] (byte) bitmap_line::x0#0 ← *((const byte[]) mode_stdbitmap::lines_x#0 + (byte) mode_stdbitmap::l#2)
   [583] (byte) bitmap_line::x1#0 ← *((const byte[]) mode_stdbitmap::lines_x#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) mode_stdbitmap::l#2)
   [584] (byte) bitmap_line::y0#0 ← *((const byte[]) mode_stdbitmap::lines_y#0 + (byte) mode_stdbitmap::l#2)
   [585] (byte) bitmap_line::y1#0 ← *((const byte[]) mode_stdbitmap::lines_y#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) mode_stdbitmap::l#2)
   [586] call bitmap_line 
-  to:mode_stdbitmap::@11
-mode_stdbitmap::@11: scope:[mode_stdbitmap]  from mode_stdbitmap::@7
+  to:mode_stdbitmap::@10
+mode_stdbitmap::@10: scope:[mode_stdbitmap]  from mode_stdbitmap::@7
   [587] (byte) mode_stdbitmap::l#1 ← ++ (byte) mode_stdbitmap::l#2
   [588] if((byte) mode_stdbitmap::l#1<(const byte) mode_stdbitmap::lines_cnt#0) goto mode_stdbitmap::@7
   to:mode_stdbitmap::@8
-mode_stdbitmap::@8: scope:[mode_stdbitmap]  from mode_stdbitmap::@11
+mode_stdbitmap::@8: scope:[mode_stdbitmap]  from mode_stdbitmap::@10
   [589] phi()
   [590] call mode_ctrl 
   to:mode_stdbitmap::@return
@@ -10265,16 +10399,16 @@ mode_stdbitmap::@return: scope:[mode_stdbitmap]  from mode_stdbitmap::@8
   to:@return
 bitmap_line: scope:[bitmap_line]  from mode_stdbitmap::@7
   [592] if((byte) bitmap_line::x0#0<(byte) bitmap_line::x1#0) goto bitmap_line::@1
-  to:bitmap_line::@3
-bitmap_line::@3: scope:[bitmap_line]  from bitmap_line
+  to:bitmap_line::@2
+bitmap_line::@2: scope:[bitmap_line]  from bitmap_line
   [593] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0
-  [594] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10
+  [594] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7
+  to:bitmap_line::@3
+bitmap_line::@3: scope:[bitmap_line]  from bitmap_line::@2
+  [595] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
+  [596] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8
   to:bitmap_line::@4
 bitmap_line::@4: scope:[bitmap_line]  from bitmap_line::@3
-  [595] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [596] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11
-  to:bitmap_line::@5
-bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [597] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0
   [598] (byte) bitmap_line_ydxi::x#0 ← (byte) bitmap_line::x1#0
   [599] (byte) bitmap_line_ydxi::y1#0 ← (byte) bitmap_line::y0#0
@@ -10282,10 +10416,10 @@ bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [601] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   [602] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@11 bitmap_line::@15 bitmap_line::@17 bitmap_line::@21 bitmap_line::@25 bitmap_line::@27 bitmap_line::@5 bitmap_line::@8
+bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@10 bitmap_line::@12 bitmap_line::@13 bitmap_line::@14 bitmap_line::@4 bitmap_line::@6 bitmap_line::@8 bitmap_line::@9
   [603] return 
   to:@return
-bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
+bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@3
   [604] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0
   [605] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0
   [606] (byte) bitmap_line_xdyi::x1#0 ← (byte) bitmap_line::x0#0
@@ -10293,11 +10427,11 @@ bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
   [608] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2
   [609] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@3
+bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@2
   [610] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [611] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15
-  to:bitmap_line::@17
-bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
+  [611] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9
+  to:bitmap_line::@10
+bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@7
   [612] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0
   [613] (byte) bitmap_line_ydxd::x#0 ← (byte) bitmap_line::x0#0
   [614] (byte) bitmap_line_ydxd::y1#0 ← (byte) bitmap_line::y1#0
@@ -10305,7 +10439,7 @@ bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
   [616] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   [617] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
+bitmap_line::@9: scope:[bitmap_line]  from bitmap_line::@7
   [618] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0
   [619] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0
   [620] (byte) bitmap_line_xdyd::x1#0 ← (byte) bitmap_line::x0#0
@@ -10315,13 +10449,13 @@ bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
   to:bitmap_line::@return
 bitmap_line::@1: scope:[bitmap_line]  from bitmap_line
   [624] (byte) bitmap_line::xd#1 ← (byte) bitmap_line::x1#0 - (byte) bitmap_line::x0#0
-  [625] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20
-  to:bitmap_line::@7
-bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@1
+  [625] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11
+  to:bitmap_line::@5
+bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@1
   [626] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [627] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21
-  to:bitmap_line::@8
-bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
+  [627] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12
+  to:bitmap_line::@6
+bitmap_line::@6: scope:[bitmap_line]  from bitmap_line::@5
   [628] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0
   [629] (byte) bitmap_line_ydxd::x#1 ← (byte) bitmap_line::x1#0
   [630] (byte) bitmap_line_ydxd::y1#1 ← (byte) bitmap_line::y0#0
@@ -10329,7 +10463,7 @@ bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
   [632] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   [633] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
+bitmap_line::@12: scope:[bitmap_line]  from bitmap_line::@5
   [634] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0
   [635] (byte) bitmap_line_xdyd::y#1 ← (byte) bitmap_line::y0#0
   [636] (byte) bitmap_line_xdyd::x1#1 ← (byte) bitmap_line::x1#0
@@ -10337,11 +10471,11 @@ bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
   [638] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10
   [639] call bitmap_line_xdyd 
   to:bitmap_line::@return
-bitmap_line::@20: scope:[bitmap_line]  from bitmap_line::@1
+bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@1
   [640] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [641] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25
-  to:bitmap_line::@27
-bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
+  [641] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13
+  to:bitmap_line::@14
+bitmap_line::@14: scope:[bitmap_line]  from bitmap_line::@11
   [642] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0
   [643] (byte) bitmap_line_ydxi::x#1 ← (byte) bitmap_line::x0#0
   [644] (byte) bitmap_line_ydxi::y1#1 ← (byte) bitmap_line::y1#0
@@ -10349,7 +10483,7 @@ bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
   [646] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   [647] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
+bitmap_line::@13: scope:[bitmap_line]  from bitmap_line::@11
   [648] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0
   [649] (byte) bitmap_line_xdyi::y#1 ← (byte) bitmap_line::y0#0
   [650] (byte) bitmap_line_xdyi::x1#1 ← (byte) bitmap_line::x1#0
@@ -10357,12 +10491,12 @@ bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
   [652] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11
   [653] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@11 bitmap_line::@25
-  [654] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x1#1 )
-  [654] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::xd#1 )
-  [654] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::y#0 bitmap_line::@25/(byte) bitmap_line_xdyi::y#1 )
-  [654] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x#1 )
-  [654] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::yd#1 )
+bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@13 bitmap_line::@8
+  [654] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x1#1 )
+  [654] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::xd#1 )
+  [654] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::y#0 bitmap_line::@13/(byte) bitmap_line_xdyi::y#1 )
+  [654] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x#1 )
+  [654] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::yd#1 )
   [655] (byte) bitmap_line_xdyi::e#0 ← (byte) bitmap_line_xdyi::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyi::@1
 bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_line_xdyi::@2
@@ -10372,19 +10506,19 @@ bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_lin
   [657] (byte) bitmap_plot::x#0 ← (byte) bitmap_line_xdyi::x#3
   [658] (byte) bitmap_plot::y#0 ← (byte) bitmap_line_xdyi::y#3
   [659] call bitmap_plot 
-  to:bitmap_line_xdyi::@5
-bitmap_line_xdyi::@5: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
+  to:bitmap_line_xdyi::@4
+bitmap_line_xdyi::@4: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
   [660] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3
   [661] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2
   [662] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2
   to:bitmap_line_xdyi::@3
-bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@5
+bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@4
   [663] (byte) bitmap_line_xdyi::y#2 ← ++ (byte) bitmap_line_xdyi::y#3
   [664] (byte) bitmap_line_xdyi::e#2 ← (byte) bitmap_line_xdyi::e#1 - (byte) bitmap_line_xdyi::xd#5
   to:bitmap_line_xdyi::@2
-bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5
-  [665] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::e#1 )
-  [665] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::y#3 )
+bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4
+  [665] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::e#1 )
+  [665] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::y#3 )
   [666] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6 ← (byte) bitmap_line_xdyi::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [667] if((byte) bitmap_line_xdyi::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6) goto bitmap_line_xdyi::@1
   to:bitmap_line_xdyi::@return
@@ -10403,12 +10537,12 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line_xdyd::@1 bitmap_line_xdyi::@1
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [675] return 
   to:@return
-bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@27 bitmap_line::@5
-  [676] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y1#0 )
-  [676] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::yd#0 )
-  [676] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y#0 )
-  [676] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::x#1 bitmap_line::@5/(byte) bitmap_line_ydxi::x#0 )
-  [676] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::xd#0 )
+bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@14 bitmap_line::@4
+  [676] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y1#0 )
+  [676] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::yd#0 )
+  [676] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y#0 )
+  [676] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::x#1 bitmap_line::@4/(byte) bitmap_line_ydxi::x#0 )
+  [676] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::xd#0 )
   [677] (byte) bitmap_line_ydxi::e#0 ← (byte) bitmap_line_ydxi::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxi::@1
 bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_line_ydxi::@2
@@ -10418,31 +10552,31 @@ bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_lin
   [679] (byte) bitmap_plot::x#2 ← (byte) bitmap_line_ydxi::x#3
   [680] (byte) bitmap_plot::y#2 ← (byte) bitmap_line_ydxi::y#3
   [681] call bitmap_plot 
-  to:bitmap_line_ydxi::@5
-bitmap_line_ydxi::@5: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
+  to:bitmap_line_ydxi::@4
+bitmap_line_ydxi::@4: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
   [682] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3
   [683] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2
   [684] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2
   to:bitmap_line_ydxi::@3
-bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@5
+bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@4
   [685] (byte) bitmap_line_ydxi::x#2 ← ++ (byte) bitmap_line_ydxi::x#3
   [686] (byte) bitmap_line_ydxi::e#2 ← (byte) bitmap_line_ydxi::e#1 - (byte) bitmap_line_ydxi::yd#5
   to:bitmap_line_ydxi::@2
-bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5
-  [687] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::e#1 )
-  [687] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::x#3 )
+bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4
+  [687] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::e#1 )
+  [687] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::x#3 )
   [688] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6 ← (byte) bitmap_line_ydxi::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [689] if((byte) bitmap_line_ydxi::y#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6) goto bitmap_line_ydxi::@1
   to:bitmap_line_ydxi::@return
 bitmap_line_ydxi::@return: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@2
   [690] return 
   to:@return
-bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@15 bitmap_line::@21
-  [691] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x1#1 )
-  [691] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::xd#1 )
-  [691] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::y#0 bitmap_line::@21/(byte) bitmap_line_xdyd::y#1 )
-  [691] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x#1 )
-  [691] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::yd#1 )
+bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@12 bitmap_line::@9
+  [691] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x1#1 )
+  [691] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::xd#1 )
+  [691] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::y#0 bitmap_line::@12/(byte) bitmap_line_xdyd::y#1 )
+  [691] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x#1 )
+  [691] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::yd#1 )
   [692] (byte) bitmap_line_xdyd::e#0 ← (byte) bitmap_line_xdyd::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyd::@1
 bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_line_xdyd::@2
@@ -10452,31 +10586,31 @@ bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_lin
   [694] (byte) bitmap_plot::x#1 ← (byte) bitmap_line_xdyd::x#3
   [695] (byte) bitmap_plot::y#1 ← (byte) bitmap_line_xdyd::y#3
   [696] call bitmap_plot 
-  to:bitmap_line_xdyd::@5
-bitmap_line_xdyd::@5: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
+  to:bitmap_line_xdyd::@4
+bitmap_line_xdyd::@4: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
   [697] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3
   [698] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2
   [699] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2
   to:bitmap_line_xdyd::@3
-bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@5
+bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@4
   [700] (byte) bitmap_line_xdyd::y#2 ← -- (byte) bitmap_line_xdyd::y#3
   [701] (byte) bitmap_line_xdyd::e#2 ← (byte) bitmap_line_xdyd::e#1 - (byte) bitmap_line_xdyd::xd#5
   to:bitmap_line_xdyd::@2
-bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5
-  [702] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::e#1 )
-  [702] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::y#3 )
+bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4
+  [702] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::e#1 )
+  [702] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::y#3 )
   [703] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6 ← (byte) bitmap_line_xdyd::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [704] if((byte) bitmap_line_xdyd::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6) goto bitmap_line_xdyd::@1
   to:bitmap_line_xdyd::@return
 bitmap_line_xdyd::@return: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@2
   [705] return 
   to:@return
-bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@17 bitmap_line::@8
-  [706] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y1#1 )
-  [706] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::yd#1 )
-  [706] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y#1 )
-  [706] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::x#0 bitmap_line::@8/(byte) bitmap_line_ydxd::x#1 )
-  [706] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::xd#1 )
+bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@10 bitmap_line::@6
+  [706] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y1#1 )
+  [706] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::yd#1 )
+  [706] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y#1 )
+  [706] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::x#0 bitmap_line::@6/(byte) bitmap_line_ydxd::x#1 )
+  [706] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::xd#1 )
   [707] (byte) bitmap_line_ydxd::e#0 ← (byte) bitmap_line_ydxd::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxd::@1
 bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_line_ydxd::@2
@@ -10486,19 +10620,19 @@ bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_lin
   [709] (byte) bitmap_plot::x#3 ← (byte) bitmap_line_ydxd::x#3
   [710] (byte) bitmap_plot::y#3 ← (byte) bitmap_line_ydxd::y#2
   [711] call bitmap_plot 
-  to:bitmap_line_ydxd::@5
-bitmap_line_ydxd::@5: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
+  to:bitmap_line_ydxd::@4
+bitmap_line_ydxd::@4: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
   [712] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2
   [713] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2
   [714] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2
   to:bitmap_line_ydxd::@3
-bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@5
+bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@4
   [715] (byte) bitmap_line_ydxd::x#2 ← -- (byte) bitmap_line_ydxd::x#3
   [716] (byte) bitmap_line_ydxd::e#2 ← (byte) bitmap_line_ydxd::e#1 - (byte) bitmap_line_ydxd::yd#5
   to:bitmap_line_ydxd::@2
-bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5
-  [717] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::e#1 )
-  [717] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::x#3 )
+bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4
+  [717] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::e#1 )
+  [717] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::x#3 )
   [718] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6 ← (byte) bitmap_line_ydxd::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [719] if((byte) bitmap_line_ydxd::y#3!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6) goto bitmap_line_ydxd::@1
   to:bitmap_line_ydxd::@return
@@ -10539,16 +10673,16 @@ bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
   [736] *((const byte[$100]) bitmap_plot_xhi#0 + (byte) bitmap_init::x#2) ← >(const byte*) mode_stdbitmap::BITMAP#0
   [737] *((const byte[$100]) bitmap_plot_bit#0 + (byte) bitmap_init::x#2) ← (byte) bitmap_init::bits#3
   [738] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [739] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10
+  [739] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6
   to:bitmap_init::@2
-bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@10
-  [740] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@10/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
+bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@6
+  [740] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@6/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
   [741] (byte) bitmap_init::x#1 ← ++ (byte) bitmap_init::x#2
   [742] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1
-  to:bitmap_init::@5
-bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
-  [743] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte*) bitmap_init::yoffs#4 )
-  [743] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte) bitmap_init::y#1 )
+  to:bitmap_init::@3
+bitmap_init::@3: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@4
+  [743] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte*) bitmap_init::yoffs#4 )
+  [743] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte) bitmap_init::y#1 )
   [744] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [745] (byte~) bitmap_init::$7 ← < (byte*) bitmap_init::yoffs#2
   [746] (byte~) bitmap_init::$8 ← (byte~) bitmap_init::$6 | (byte~) bitmap_init::$7
@@ -10556,23 +10690,23 @@ bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
   [748] (byte~) bitmap_init::$9 ← > (byte*) bitmap_init::yoffs#2
   [749] *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_init::y#2) ← (byte~) bitmap_init::$9
   [750] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [751] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6
-  to:bitmap_init::@7
-bitmap_init::@7: scope:[bitmap_init]  from bitmap_init::@5
+  [751] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4
+  to:bitmap_init::@5
+bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@3
   [752] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:bitmap_init::@6
-bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@5 bitmap_init::@7
-  [753] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@5/(byte*) bitmap_init::yoffs#2 bitmap_init::@7/(byte*) bitmap_init::yoffs#1 )
+  to:bitmap_init::@4
+bitmap_init::@4: scope:[bitmap_init]  from bitmap_init::@3 bitmap_init::@5
+  [753] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@3/(byte*) bitmap_init::yoffs#2 bitmap_init::@5/(byte*) bitmap_init::yoffs#1 )
   [754] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2
-  [755] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5
+  [755] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3
   to:bitmap_init::@return
-bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@6
+bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@4
   [756] return 
   to:@return
-bitmap_init::@10: scope:[bitmap_init]  from bitmap_init::@1
+bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@1
   [757] phi()
   to:bitmap_init::@2
-mode_mcchar: scope:[mode_mcchar]  from menu::@26
+mode_mcchar: scope:[mode_mcchar]  from menu::@18
   [758] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_mcchar::CHARSET#0/(dword/signed dword) $10000
   [759] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
   [760] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
@@ -10628,7 +10762,7 @@ mode_mcchar::@6: scope:[mode_mcchar]  from mode_mcchar::@5
 mode_mcchar::@return: scope:[mode_mcchar]  from mode_mcchar::@6
   [793] return 
   to:@return
-mode_ecmchar: scope:[mode_ecmchar]  from menu::@24
+mode_ecmchar: scope:[mode_ecmchar]  from menu::@17
   [794] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_ecmchar::CHARSET#0/(dword/signed dword) $10000
   [795] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
   [796] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
@@ -10685,7 +10819,7 @@ mode_ecmchar::@6: scope:[mode_ecmchar]  from mode_ecmchar::@5
 mode_ecmchar::@return: scope:[mode_ecmchar]  from mode_ecmchar::@6
   [830] return 
   to:@return
-mode_stdchar: scope:[mode_stdchar]  from menu::@6
+mode_stdchar: scope:[mode_stdchar]  from menu::@2
   [831] *((const byte*) DTV_GRAPHICS_VIC_BANK#0) ← ((byte))((dword))(const byte*) mode_stdchar::CHARSET#0/(dword/signed dword) $10000
   [832] *((const byte*) DTV_COLOR_BANK_LO#0) ← <((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
   [833] *((const byte*) DTV_COLOR_BANK_HI#0) ← >((word))(const dword) DTV_COLOR_BANK_DEFAULT#0/(word/signed word/dword/signed dword) $400
@@ -10739,39 +10873,39 @@ mode_stdchar::@6: scope:[mode_stdchar]  from mode_stdchar::@5
 mode_stdchar::@return: scope:[mode_stdchar]  from mode_stdchar::@6
   [864] return 
   to:@return
-print_str_lines: scope:[print_str_lines]  from menu::@48
+print_str_lines: scope:[print_str_lines]  from menu::@29
   [865] phi()
   to:print_str_lines::@1
-print_str_lines::@1: scope:[print_str_lines]  from print_str_lines print_str_lines::@9
-  [866] (byte*) print_line_cursor#17 ← phi( print_str_lines/(const byte*) menu::SCREEN#0 print_str_lines::@9/(byte*) print_line_cursor#19 )
-  [866] (byte*) print_char_cursor#19 ← phi( print_str_lines/(const byte*) menu::SCREEN#0 print_str_lines::@9/(byte*~) print_char_cursor#103 )
-  [866] (byte*) print_str_lines::str#2 ← phi( print_str_lines/(const byte[]) MENU_TEXT#0 print_str_lines::@9/(byte*) print_str_lines::str#0 )
-  [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@6
+print_str_lines::@1: scope:[print_str_lines]  from print_str_lines print_str_lines::@5
+  [866] (byte*) print_line_cursor#17 ← phi( print_str_lines/(const byte*) menu::SCREEN#0 print_str_lines::@5/(byte*) print_line_cursor#19 )
+  [866] (byte*) print_char_cursor#19 ← phi( print_str_lines/(const byte*) menu::SCREEN#0 print_str_lines::@5/(byte*~) print_char_cursor#103 )
+  [866] (byte*) print_str_lines::str#2 ← phi( print_str_lines/(const byte[]) MENU_TEXT#0 print_str_lines::@5/(byte*) print_str_lines::str#0 )
+  [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@2
   to:print_str_lines::@return
 print_str_lines::@return: scope:[print_str_lines]  from print_str_lines::@1
   [868] return 
   to:@return
-print_str_lines::@6: scope:[print_str_lines]  from print_str_lines::@1 print_str_lines::@7
-  [869] (byte*) print_char_cursor#17 ← phi( print_str_lines::@1/(byte*) print_char_cursor#19 print_str_lines::@7/(byte*) print_char_cursor#32 )
-  [869] (byte*) print_str_lines::str#3 ← phi( print_str_lines::@1/(byte*) print_str_lines::str#2 print_str_lines::@7/(byte*) print_str_lines::str#0 )
+print_str_lines::@2: scope:[print_str_lines]  from print_str_lines::@1 print_str_lines::@3
+  [869] (byte*) print_char_cursor#17 ← phi( print_str_lines::@1/(byte*) print_char_cursor#19 print_str_lines::@3/(byte*) print_char_cursor#32 )
+  [869] (byte*) print_str_lines::str#3 ← phi( print_str_lines::@1/(byte*) print_str_lines::str#2 print_str_lines::@3/(byte*) print_str_lines::str#0 )
   [870] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#3)
   [871] (byte*) print_str_lines::str#0 ← ++ (byte*) print_str_lines::str#3
-  [872] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@7
-  to:print_str_lines::@8
-print_str_lines::@8: scope:[print_str_lines]  from print_str_lines::@6
+  [872] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@3
+  to:print_str_lines::@4
+print_str_lines::@4: scope:[print_str_lines]  from print_str_lines::@2
   [873] *((byte*) print_char_cursor#17) ← (byte) print_str_lines::ch#0
   [874] (byte*) print_char_cursor#1 ← ++ (byte*) print_char_cursor#17
-  to:print_str_lines::@7
-print_str_lines::@7: scope:[print_str_lines]  from print_str_lines::@6 print_str_lines::@8
-  [875] (byte*) print_char_cursor#32 ← phi( print_str_lines::@6/(byte*) print_char_cursor#17 print_str_lines::@8/(byte*) print_char_cursor#1 )
-  [876] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@6
-  to:print_str_lines::@9
-print_str_lines::@9: scope:[print_str_lines]  from print_str_lines::@7
+  to:print_str_lines::@3
+print_str_lines::@3: scope:[print_str_lines]  from print_str_lines::@2 print_str_lines::@4
+  [875] (byte*) print_char_cursor#32 ← phi( print_str_lines::@2/(byte*) print_char_cursor#17 print_str_lines::@4/(byte*) print_char_cursor#1 )
+  [876] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@2
+  to:print_str_lines::@5
+print_str_lines::@5: scope:[print_str_lines]  from print_str_lines::@3
   [877] phi()
   [878] call print_ln 
   [879] (byte*~) print_char_cursor#103 ← (byte*) print_line_cursor#19
   to:print_str_lines::@1
-print_ln: scope:[print_ln]  from print_str_lines::@9
+print_ln: scope:[print_ln]  from print_str_lines::@5
   [880] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -10782,7 +10916,7 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [884] return 
   to:@return
-print_cls: scope:[print_cls]  from menu::@47
+print_cls: scope:[print_cls]  from menu::@28
   [885] phi()
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -10794,45 +10928,45 @@ print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
 print_cls::@return: scope:[print_cls]  from print_cls::@1
   [890] return 
   to:@return
-print_set_screen: scope:[print_set_screen]  from menu::@11
+print_set_screen: scope:[print_set_screen]  from menu::@5
   [891] phi()
   to:print_set_screen::@return
 print_set_screen::@return: scope:[print_set_screen]  from print_set_screen
   [892] return 
   to:@return
 
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@16 blocks: mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
-null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@30 blocks: mode_ctrl::@30 mode_ctrl::@16 mode_ctrl::@39 mode_ctrl::@46 mode_ctrl::@15 mode_ctrl::@28 mode_ctrl::@38 mode_ctrl::@14 mode_ctrl::@27 mode_ctrl::@37 mode_ctrl::@13 mode_ctrl::@26 mode_ctrl::@36 mode_ctrl::@12 mode_ctrl::@25 mode_ctrl::@35 mode_ctrl::@11 mode_ctrl::@24 mode_ctrl::@34 mode_ctrl::@10 mode_ctrl::@23 mode_ctrl::@33 mode_ctrl::@9 mode_ctrl::@32 mode_ctrl::@8 mode_ctrl::@6 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@11 blocks: mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
+null depth in calling loop Loop head: mode_ctrl::@1 tails: mode_ctrl::@18 blocks: mode_ctrl::@18 mode_ctrl::@11 mode_ctrl::@26 mode_ctrl::@27 mode_ctrl::@10 mode_ctrl::@17 mode_ctrl::@25 mode_ctrl::@9 mode_ctrl::@16 mode_ctrl::@24 mode_ctrl::@8 mode_ctrl::@15 mode_ctrl::@23 mode_ctrl::@7 mode_ctrl::@14 mode_ctrl::@22 mode_ctrl::@6 mode_ctrl::@13 mode_ctrl::@21 mode_ctrl::@5 mode_ctrl::@12 mode_ctrl::@20 mode_ctrl::@4 mode_ctrl::@19 mode_ctrl::@3 mode_ctrl::@2 mode_ctrl::@1  in scope keyboard_key_pressed
 
 VARIABLE REGISTER WEIGHTS
 (byte*) BGCOL
@@ -12685,15 +12819,15 @@ INITIAL ASM
   .label print_line_cursor = $9d
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @54 [phi:@begin->@54]
-b54_from_bbegin:
-  jmp b54
-//SEG5 @54
-b54:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @54 to @end [phi:@54->@end]
-bend_from_b54:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -12713,15 +12847,15 @@ main: {
     // Enable DTV extended modes
     lda #DTV_FEATURE_ENABLE
     sta DTV_FEATURE
-  //SEG14 [8] phi from main main::@2 to main::@2 [phi:main/main::@2->main::@2]
-  b2_from_main:
-  b2_from_b2:
-    jmp b2
-  //SEG15 main::@2
-  b2:
+  //SEG14 [8] phi from main main::@1 to main::@1 [phi:main/main::@1->main::@1]
+  b1_from_main:
+  b1_from_b1:
+    jmp b1
+  //SEG15 main::@1
+  b1:
   //SEG16 [9] call menu 
     jsr menu
-    jmp b2_from_b2
+    jmp b1_from_b1
 }
 //SEG17 menu
 menu: {
@@ -12777,44 +12911,44 @@ menu: {
     // VIC Memory Pointers
     lda #(SCREEN&$3fff)/$40|(CHARSET&$3fff)/$400
     sta VIC_MEMORY
-  //SEG27 [19] phi from menu to menu::@8 [phi:menu->menu::@8]
-  b8_from_menu:
-  //SEG28 [19] phi (byte) menu::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:menu->menu::@8#0] -- vbuz1=vbuc1 
+  //SEG27 [19] phi from menu to menu::@3 [phi:menu->menu::@3]
+  b3_from_menu:
+  //SEG28 [19] phi (byte) menu::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:menu->menu::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b8
+    jmp b3
   // DTV Palette - default
-  //SEG29 [19] phi from menu::@8 to menu::@8 [phi:menu::@8->menu::@8]
-  b8_from_b8:
-  //SEG30 [19] phi (byte) menu::i#2 = (byte) menu::i#1 [phi:menu::@8->menu::@8#0] -- register_copy 
-    jmp b8
-  //SEG31 menu::@8
-  b8:
+  //SEG29 [19] phi from menu::@3 to menu::@3 [phi:menu::@3->menu::@3]
+  b3_from_b3:
+  //SEG30 [19] phi (byte) menu::i#2 = (byte) menu::i#1 [phi:menu::@3->menu::@3#0] -- register_copy 
+    jmp b3
+  //SEG31 menu::@3
+  b3:
   //SEG32 [20] *((const byte*) DTV_PALETTE#0 + (byte) menu::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) menu::i#2) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz1 
     ldy i
     lda DTV_PALETTE_DEFAULT,y
     sta DTV_PALETTE,y
   //SEG33 [21] (byte) menu::i#1 ← ++ (byte) menu::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG34 [22] if((byte) menu::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto menu::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG34 [22] if((byte) menu::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto menu::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #$10
     cmp i
-    bne b8_from_b8
-  //SEG35 [23] phi from menu::@8 to menu::@10 [phi:menu::@8->menu::@10]
-  b10_from_b8:
-  //SEG36 [23] phi (byte*) menu::c#2 = (const byte*) COLS#0 [phi:menu::@8->menu::@10#0] -- pbuz1=pbuc1 
+    bne b3_from_b3
+  //SEG35 [23] phi from menu::@3 to menu::@4 [phi:menu::@3->menu::@4]
+  b4_from_b3:
+  //SEG36 [23] phi (byte*) menu::c#2 = (const byte*) COLS#0 [phi:menu::@3->menu::@4#0] -- pbuz1=pbuc1 
     lda #<COLS
     sta c
     lda #>COLS
     sta c+1
-    jmp b10
+    jmp b4
   // Char Colors
-  //SEG37 [23] phi from menu::@10 to menu::@10 [phi:menu::@10->menu::@10]
-  b10_from_b10:
-  //SEG38 [23] phi (byte*) menu::c#2 = (byte*) menu::c#1 [phi:menu::@10->menu::@10#0] -- register_copy 
-    jmp b10
-  //SEG39 menu::@10
-  b10:
+  //SEG37 [23] phi from menu::@4 to menu::@4 [phi:menu::@4->menu::@4]
+  b4_from_b4:
+  //SEG38 [23] phi (byte*) menu::c#2 = (byte*) menu::c#1 [phi:menu::@4->menu::@4#0] -- register_copy 
+    jmp b4
+  //SEG39 menu::@4
+  b4:
   //SEG40 [24] *((byte*) menu::c#2) ← (const byte) LIGHT_GREEN#0 -- _deref_pbuz1=vbuc1 
     lda #LIGHT_GREEN
     ldy #0
@@ -12824,16 +12958,16 @@ menu: {
     bne !+
     inc c+1
   !:
-  //SEG42 [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@10 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG42 [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda c+1
     cmp #>COLS+$3e8
-    bne b10_from_b10
+    bne b4_from_b4
     lda c
     cmp #<COLS+$3e8
-    bne b10_from_b10
-    jmp b11
-  //SEG43 menu::@11
-  b11:
+    bne b4_from_b4
+    jmp b5
+  //SEG43 menu::@5
+  b5:
   //SEG44 [27] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Screen colors
     lda #0
@@ -12842,58 +12976,58 @@ menu: {
     lda #0
     sta BORDERCOL
   //SEG46 [29] call print_set_screen 
-  //SEG47 [891] phi from menu::@11 to print_set_screen [phi:menu::@11->print_set_screen]
-  print_set_screen_from_b11:
+  //SEG47 [891] phi from menu::@5 to print_set_screen [phi:menu::@5->print_set_screen]
+  print_set_screen_from_b5:
     jsr print_set_screen
-  //SEG48 [30] phi from menu::@11 to menu::@47 [phi:menu::@11->menu::@47]
-  b47_from_b11:
-    jmp b47
-  //SEG49 menu::@47
-  b47:
+  //SEG48 [30] phi from menu::@5 to menu::@28 [phi:menu::@5->menu::@28]
+  b28_from_b5:
+    jmp b28
+  //SEG49 menu::@28
+  b28:
   //SEG50 [31] call print_cls 
-  //SEG51 [885] phi from menu::@47 to print_cls [phi:menu::@47->print_cls]
-  print_cls_from_b47:
+  //SEG51 [885] phi from menu::@28 to print_cls [phi:menu::@28->print_cls]
+  print_cls_from_b28:
     jsr print_cls
-  //SEG52 [32] phi from menu::@47 to menu::@48 [phi:menu::@47->menu::@48]
-  b48_from_b47:
-    jmp b48
-  //SEG53 menu::@48
-  b48:
+  //SEG52 [32] phi from menu::@28 to menu::@29 [phi:menu::@28->menu::@29]
+  b29_from_b28:
+    jmp b29
+  //SEG53 menu::@29
+  b29:
   //SEG54 [33] call print_str_lines 
-  //SEG55 [865] phi from menu::@48 to print_str_lines [phi:menu::@48->print_str_lines]
-  print_str_lines_from_b48:
+  //SEG55 [865] phi from menu::@29 to print_str_lines [phi:menu::@29->print_str_lines]
+  print_str_lines_from_b29:
     jsr print_str_lines
-  //SEG56 [34] phi from menu::@48 menu::@71 to menu::@2 [phi:menu::@48/menu::@71->menu::@2]
-  b2_from_b48:
-  b2_from_b71:
-    jmp b2
-  //SEG57 menu::@2
-  b2:
+  //SEG56 [34] phi from menu::@29 menu::@41 to menu::@1 [phi:menu::@29/menu::@41->menu::@1]
+  b1_from_b29:
+  b1_from_b41:
+    jmp b1
+  //SEG57 menu::@1
+  b1:
   //SEG58 [35] call keyboard_key_pressed 
-  //SEG59 [211] phi from menu::@2 to keyboard_key_pressed [phi:menu::@2->keyboard_key_pressed]
-  keyboard_key_pressed_from_b2:
-  //SEG60 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_1#0 [phi:menu::@2->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG59 [211] phi from menu::@1 to keyboard_key_pressed [phi:menu::@1->keyboard_key_pressed]
+  keyboard_key_pressed_from_b1:
+  //SEG60 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_1#0 [phi:menu::@1->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_1
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG61 [36] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_2
-    jmp b50
-  //SEG62 menu::@50
-  b50:
+    jmp b30
+  //SEG62 menu::@30
+  b30:
   //SEG63 [37] (byte~) menu::$29 ← (byte) keyboard_key_pressed::return#2 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_2
     sta _29
-  //SEG64 [38] if((byte~) menu::$29==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@12 -- vbuz1_eq_0_then_la1 
+  //SEG64 [38] if((byte~) menu::$29==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@6 -- vbuz1_eq_0_then_la1 
     lda _29
     cmp #0
-    beq b12_from_b50
-  //SEG65 [39] phi from menu::@50 to menu::@6 [phi:menu::@50->menu::@6]
-  b6_from_b50:
-    jmp b6
-  //SEG66 menu::@6
-  b6:
+    beq b6_from_b30
+  //SEG65 [39] phi from menu::@30 to menu::@2 [phi:menu::@30->menu::@2]
+  b2_from_b30:
+    jmp b2
+  //SEG66 menu::@2
+  b2:
   //SEG67 [40] call mode_stdchar 
     jsr mode_stdchar
     jmp breturn
@@ -12901,366 +13035,366 @@ menu: {
   breturn:
   //SEG69 [41] return 
     rts
-  //SEG70 [42] phi from menu::@50 to menu::@12 [phi:menu::@50->menu::@12]
-  b12_from_b50:
-    jmp b12
-  //SEG71 menu::@12
-  b12:
+  //SEG70 [42] phi from menu::@30 to menu::@6 [phi:menu::@30->menu::@6]
+  b6_from_b30:
+    jmp b6
+  //SEG71 menu::@6
+  b6:
   //SEG72 [43] call keyboard_key_pressed 
-  //SEG73 [211] phi from menu::@12 to keyboard_key_pressed [phi:menu::@12->keyboard_key_pressed]
-  keyboard_key_pressed_from_b12:
-  //SEG74 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_2#0 [phi:menu::@12->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG73 [211] phi from menu::@6 to keyboard_key_pressed [phi:menu::@6->keyboard_key_pressed]
+  keyboard_key_pressed_from_b6:
+  //SEG74 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_2#0 [phi:menu::@6->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_2
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG75 [44] (byte) keyboard_key_pressed::return#24 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_24
-    jmp b51
-  //SEG76 menu::@51
-  b51:
+    jmp b31
+  //SEG76 menu::@31
+  b31:
   //SEG77 [45] (byte~) menu::$33 ← (byte) keyboard_key_pressed::return#24 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_24
     sta _33
-  //SEG78 [46] if((byte~) menu::$33==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@13 -- vbuz1_eq_0_then_la1 
+  //SEG78 [46] if((byte~) menu::$33==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@7 -- vbuz1_eq_0_then_la1 
     lda _33
     cmp #0
-    beq b13_from_b51
-  //SEG79 [47] phi from menu::@51 to menu::@24 [phi:menu::@51->menu::@24]
-  b24_from_b51:
-    jmp b24
-  //SEG80 menu::@24
-  b24:
+    beq b7_from_b31
+  //SEG79 [47] phi from menu::@31 to menu::@17 [phi:menu::@31->menu::@17]
+  b17_from_b31:
+    jmp b17
+  //SEG80 menu::@17
+  b17:
   //SEG81 [48] call mode_ecmchar 
     jsr mode_ecmchar
     jmp breturn
-  //SEG82 [49] phi from menu::@51 to menu::@13 [phi:menu::@51->menu::@13]
-  b13_from_b51:
-    jmp b13
-  //SEG83 menu::@13
-  b13:
+  //SEG82 [49] phi from menu::@31 to menu::@7 [phi:menu::@31->menu::@7]
+  b7_from_b31:
+    jmp b7
+  //SEG83 menu::@7
+  b7:
   //SEG84 [50] call keyboard_key_pressed 
-  //SEG85 [211] phi from menu::@13 to keyboard_key_pressed [phi:menu::@13->keyboard_key_pressed]
-  keyboard_key_pressed_from_b13:
-  //SEG86 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_3#0 [phi:menu::@13->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG85 [211] phi from menu::@7 to keyboard_key_pressed [phi:menu::@7->keyboard_key_pressed]
+  keyboard_key_pressed_from_b7:
+  //SEG86 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_3#0 [phi:menu::@7->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_3
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG87 [51] (byte) keyboard_key_pressed::return#25 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_25
-    jmp b53
-  //SEG88 menu::@53
-  b53:
+    jmp b32
+  //SEG88 menu::@32
+  b32:
   //SEG89 [52] (byte~) menu::$37 ← (byte) keyboard_key_pressed::return#25 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_25
     sta _37
-  //SEG90 [53] if((byte~) menu::$37==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@14 -- vbuz1_eq_0_then_la1 
+  //SEG90 [53] if((byte~) menu::$37==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@8 -- vbuz1_eq_0_then_la1 
     lda _37
     cmp #0
-    beq b14_from_b53
-  //SEG91 [54] phi from menu::@53 to menu::@26 [phi:menu::@53->menu::@26]
-  b26_from_b53:
-    jmp b26
-  //SEG92 menu::@26
-  b26:
+    beq b8_from_b32
+  //SEG91 [54] phi from menu::@32 to menu::@18 [phi:menu::@32->menu::@18]
+  b18_from_b32:
+    jmp b18
+  //SEG92 menu::@18
+  b18:
   //SEG93 [55] call mode_mcchar 
     jsr mode_mcchar
     jmp breturn
-  //SEG94 [56] phi from menu::@53 to menu::@14 [phi:menu::@53->menu::@14]
-  b14_from_b53:
-    jmp b14
-  //SEG95 menu::@14
-  b14:
+  //SEG94 [56] phi from menu::@32 to menu::@8 [phi:menu::@32->menu::@8]
+  b8_from_b32:
+    jmp b8
+  //SEG95 menu::@8
+  b8:
   //SEG96 [57] call keyboard_key_pressed 
-  //SEG97 [211] phi from menu::@14 to keyboard_key_pressed [phi:menu::@14->keyboard_key_pressed]
-  keyboard_key_pressed_from_b14:
-  //SEG98 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_4#0 [phi:menu::@14->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG97 [211] phi from menu::@8 to keyboard_key_pressed [phi:menu::@8->keyboard_key_pressed]
+  keyboard_key_pressed_from_b8:
+  //SEG98 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_4#0 [phi:menu::@8->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_4
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG99 [58] (byte) keyboard_key_pressed::return#26 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_26
-    jmp b55
-  //SEG100 menu::@55
-  b55:
+    jmp b33
+  //SEG100 menu::@33
+  b33:
   //SEG101 [59] (byte~) menu::$41 ← (byte) keyboard_key_pressed::return#26 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_26
     sta _41
-  //SEG102 [60] if((byte~) menu::$41==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@15 -- vbuz1_eq_0_then_la1 
+  //SEG102 [60] if((byte~) menu::$41==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@9 -- vbuz1_eq_0_then_la1 
     lda _41
     cmp #0
-    beq b15_from_b55
-  //SEG103 [61] phi from menu::@55 to menu::@28 [phi:menu::@55->menu::@28]
-  b28_from_b55:
-    jmp b28
-  //SEG104 menu::@28
-  b28:
+    beq b9_from_b33
+  //SEG103 [61] phi from menu::@33 to menu::@19 [phi:menu::@33->menu::@19]
+  b19_from_b33:
+    jmp b19
+  //SEG104 menu::@19
+  b19:
   //SEG105 [62] call mode_stdbitmap 
     jsr mode_stdbitmap
     jmp breturn
-  //SEG106 [63] phi from menu::@55 to menu::@15 [phi:menu::@55->menu::@15]
-  b15_from_b55:
-    jmp b15
-  //SEG107 menu::@15
-  b15:
+  //SEG106 [63] phi from menu::@33 to menu::@9 [phi:menu::@33->menu::@9]
+  b9_from_b33:
+    jmp b9
+  //SEG107 menu::@9
+  b9:
   //SEG108 [64] call keyboard_key_pressed 
-  //SEG109 [211] phi from menu::@15 to keyboard_key_pressed [phi:menu::@15->keyboard_key_pressed]
-  keyboard_key_pressed_from_b15:
-  //SEG110 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_6#0 [phi:menu::@15->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG109 [211] phi from menu::@9 to keyboard_key_pressed [phi:menu::@9->keyboard_key_pressed]
+  keyboard_key_pressed_from_b9:
+  //SEG110 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_6#0 [phi:menu::@9->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_6
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG111 [65] (byte) keyboard_key_pressed::return#27 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_27
-    jmp b57
-  //SEG112 menu::@57
-  b57:
+    jmp b34
+  //SEG112 menu::@34
+  b34:
   //SEG113 [66] (byte~) menu::$45 ← (byte) keyboard_key_pressed::return#27 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_27
     sta _45
-  //SEG114 [67] if((byte~) menu::$45==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@16 -- vbuz1_eq_0_then_la1 
+  //SEG114 [67] if((byte~) menu::$45==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@10 -- vbuz1_eq_0_then_la1 
     lda _45
     cmp #0
-    beq b16_from_b57
-  //SEG115 [68] phi from menu::@57 to menu::@30 [phi:menu::@57->menu::@30]
-  b30_from_b57:
-    jmp b30
-  //SEG116 menu::@30
-  b30:
+    beq b10_from_b34
+  //SEG115 [68] phi from menu::@34 to menu::@20 [phi:menu::@34->menu::@20]
+  b20_from_b34:
+    jmp b20
+  //SEG116 menu::@20
+  b20:
   //SEG117 [69] call mode_hicolstdchar 
     jsr mode_hicolstdchar
     jmp breturn
-  //SEG118 [70] phi from menu::@57 to menu::@16 [phi:menu::@57->menu::@16]
-  b16_from_b57:
-    jmp b16
-  //SEG119 menu::@16
-  b16:
+  //SEG118 [70] phi from menu::@34 to menu::@10 [phi:menu::@34->menu::@10]
+  b10_from_b34:
+    jmp b10
+  //SEG119 menu::@10
+  b10:
   //SEG120 [71] call keyboard_key_pressed 
-  //SEG121 [211] phi from menu::@16 to keyboard_key_pressed [phi:menu::@16->keyboard_key_pressed]
-  keyboard_key_pressed_from_b16:
-  //SEG122 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_7#0 [phi:menu::@16->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG121 [211] phi from menu::@10 to keyboard_key_pressed [phi:menu::@10->keyboard_key_pressed]
+  keyboard_key_pressed_from_b10:
+  //SEG122 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_7#0 [phi:menu::@10->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_7
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG123 [72] (byte) keyboard_key_pressed::return#28 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_28
-    jmp b59
-  //SEG124 menu::@59
-  b59:
+    jmp b35
+  //SEG124 menu::@35
+  b35:
   //SEG125 [73] (byte~) menu::$49 ← (byte) keyboard_key_pressed::return#28 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_28
     sta _49
-  //SEG126 [74] if((byte~) menu::$49==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@17 -- vbuz1_eq_0_then_la1 
+  //SEG126 [74] if((byte~) menu::$49==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@11 -- vbuz1_eq_0_then_la1 
     lda _49
     cmp #0
-    beq b17_from_b59
-  //SEG127 [75] phi from menu::@59 to menu::@32 [phi:menu::@59->menu::@32]
-  b32_from_b59:
-    jmp b32
-  //SEG128 menu::@32
-  b32:
+    beq b11_from_b35
+  //SEG127 [75] phi from menu::@35 to menu::@21 [phi:menu::@35->menu::@21]
+  b21_from_b35:
+    jmp b21
+  //SEG128 menu::@21
+  b21:
   //SEG129 [76] call mode_hicolecmchar 
     jsr mode_hicolecmchar
     jmp breturn
-  //SEG130 [77] phi from menu::@59 to menu::@17 [phi:menu::@59->menu::@17]
-  b17_from_b59:
-    jmp b17
-  //SEG131 menu::@17
-  b17:
+  //SEG130 [77] phi from menu::@35 to menu::@11 [phi:menu::@35->menu::@11]
+  b11_from_b35:
+    jmp b11
+  //SEG131 menu::@11
+  b11:
   //SEG132 [78] call keyboard_key_pressed 
-  //SEG133 [211] phi from menu::@17 to keyboard_key_pressed [phi:menu::@17->keyboard_key_pressed]
-  keyboard_key_pressed_from_b17:
-  //SEG134 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_8#0 [phi:menu::@17->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG133 [211] phi from menu::@11 to keyboard_key_pressed [phi:menu::@11->keyboard_key_pressed]
+  keyboard_key_pressed_from_b11:
+  //SEG134 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_8#0 [phi:menu::@11->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_8
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG135 [79] (byte) keyboard_key_pressed::return#29 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_29
-    jmp b61
-  //SEG136 menu::@61
-  b61:
+    jmp b36
+  //SEG136 menu::@36
+  b36:
   //SEG137 [80] (byte~) menu::$53 ← (byte) keyboard_key_pressed::return#29 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_29
     sta _53
-  //SEG138 [81] if((byte~) menu::$53==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@18 -- vbuz1_eq_0_then_la1 
+  //SEG138 [81] if((byte~) menu::$53==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@12 -- vbuz1_eq_0_then_la1 
     lda _53
     cmp #0
-    beq b18_from_b61
-  //SEG139 [82] phi from menu::@61 to menu::@34 [phi:menu::@61->menu::@34]
-  b34_from_b61:
-    jmp b34
-  //SEG140 menu::@34
-  b34:
+    beq b12_from_b36
+  //SEG139 [82] phi from menu::@36 to menu::@22 [phi:menu::@36->menu::@22]
+  b22_from_b36:
+    jmp b22
+  //SEG140 menu::@22
+  b22:
   //SEG141 [83] call mode_hicolmcchar 
     jsr mode_hicolmcchar
     jmp breturn
-  //SEG142 [84] phi from menu::@61 to menu::@18 [phi:menu::@61->menu::@18]
-  b18_from_b61:
-    jmp b18
-  //SEG143 menu::@18
-  b18:
+  //SEG142 [84] phi from menu::@36 to menu::@12 [phi:menu::@36->menu::@12]
+  b12_from_b36:
+    jmp b12
+  //SEG143 menu::@12
+  b12:
   //SEG144 [85] call keyboard_key_pressed 
-  //SEG145 [211] phi from menu::@18 to keyboard_key_pressed [phi:menu::@18->keyboard_key_pressed]
-  keyboard_key_pressed_from_b18:
-  //SEG146 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_A#0 [phi:menu::@18->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG145 [211] phi from menu::@12 to keyboard_key_pressed [phi:menu::@12->keyboard_key_pressed]
+  keyboard_key_pressed_from_b12:
+  //SEG146 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_A#0 [phi:menu::@12->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_A
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG147 [86] (byte) keyboard_key_pressed::return#30 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_30
-    jmp b63
-  //SEG148 menu::@63
-  b63:
+    jmp b37
+  //SEG148 menu::@37
+  b37:
   //SEG149 [87] (byte~) menu::$57 ← (byte) keyboard_key_pressed::return#30 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_30
     sta _57
-  //SEG150 [88] if((byte~) menu::$57==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@19 -- vbuz1_eq_0_then_la1 
+  //SEG150 [88] if((byte~) menu::$57==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@13 -- vbuz1_eq_0_then_la1 
     lda _57
     cmp #0
-    beq b19_from_b63
-  //SEG151 [89] phi from menu::@63 to menu::@36 [phi:menu::@63->menu::@36]
-  b36_from_b63:
-    jmp b36
-  //SEG152 menu::@36
-  b36:
+    beq b13_from_b37
+  //SEG151 [89] phi from menu::@37 to menu::@23 [phi:menu::@37->menu::@23]
+  b23_from_b37:
+    jmp b23
+  //SEG152 menu::@23
+  b23:
   //SEG153 [90] call mode_sixsfred2 
     jsr mode_sixsfred2
     jmp breturn
-  //SEG154 [91] phi from menu::@63 to menu::@19 [phi:menu::@63->menu::@19]
-  b19_from_b63:
-    jmp b19
-  //SEG155 menu::@19
-  b19:
+  //SEG154 [91] phi from menu::@37 to menu::@13 [phi:menu::@37->menu::@13]
+  b13_from_b37:
+    jmp b13
+  //SEG155 menu::@13
+  b13:
   //SEG156 [92] call keyboard_key_pressed 
-  //SEG157 [211] phi from menu::@19 to keyboard_key_pressed [phi:menu::@19->keyboard_key_pressed]
-  keyboard_key_pressed_from_b19:
-  //SEG158 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:menu::@19->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG157 [211] phi from menu::@13 to keyboard_key_pressed [phi:menu::@13->keyboard_key_pressed]
+  keyboard_key_pressed_from_b13:
+  //SEG158 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:menu::@13->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_B
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG159 [93] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_10
-    jmp b65
-  //SEG160 menu::@65
-  b65:
+    jmp b38
+  //SEG160 menu::@38
+  b38:
   //SEG161 [94] (byte~) menu::$61 ← (byte) keyboard_key_pressed::return#10 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_10
     sta _61
-  //SEG162 [95] if((byte~) menu::$61==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@20 -- vbuz1_eq_0_then_la1 
+  //SEG162 [95] if((byte~) menu::$61==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@14 -- vbuz1_eq_0_then_la1 
     lda _61
     cmp #0
-    beq b20_from_b65
-  //SEG163 [96] phi from menu::@65 to menu::@38 [phi:menu::@65->menu::@38]
-  b38_from_b65:
-    jmp b38
-  //SEG164 menu::@38
-  b38:
+    beq b14_from_b38
+  //SEG163 [96] phi from menu::@38 to menu::@24 [phi:menu::@38->menu::@24]
+  b24_from_b38:
+    jmp b24
+  //SEG164 menu::@24
+  b24:
   //SEG165 [97] call mode_twoplanebitmap 
     jsr mode_twoplanebitmap
     jmp breturn
-  //SEG166 [98] phi from menu::@65 to menu::@20 [phi:menu::@65->menu::@20]
-  b20_from_b65:
-    jmp b20
-  //SEG167 menu::@20
-  b20:
+  //SEG166 [98] phi from menu::@38 to menu::@14 [phi:menu::@38->menu::@14]
+  b14_from_b38:
+    jmp b14
+  //SEG167 menu::@14
+  b14:
   //SEG168 [99] call keyboard_key_pressed 
-  //SEG169 [211] phi from menu::@20 to keyboard_key_pressed [phi:menu::@20->keyboard_key_pressed]
-  keyboard_key_pressed_from_b20:
-  //SEG170 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:menu::@20->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG169 [211] phi from menu::@14 to keyboard_key_pressed [phi:menu::@14->keyboard_key_pressed]
+  keyboard_key_pressed_from_b14:
+  //SEG170 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:menu::@14->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_C
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG171 [100] (byte) keyboard_key_pressed::return#11 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_11
-    jmp b67
-  //SEG172 menu::@67
-  b67:
+    jmp b39
+  //SEG172 menu::@39
+  b39:
   //SEG173 [101] (byte~) menu::$65 ← (byte) keyboard_key_pressed::return#11 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_11
     sta _65
-  //SEG174 [102] if((byte~) menu::$65==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@21 -- vbuz1_eq_0_then_la1 
+  //SEG174 [102] if((byte~) menu::$65==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@15 -- vbuz1_eq_0_then_la1 
     lda _65
     cmp #0
-    beq b21_from_b67
-  //SEG175 [103] phi from menu::@67 to menu::@40 [phi:menu::@67->menu::@40]
-  b40_from_b67:
-    jmp b40
-  //SEG176 menu::@40
-  b40:
+    beq b15_from_b39
+  //SEG175 [103] phi from menu::@39 to menu::@25 [phi:menu::@39->menu::@25]
+  b25_from_b39:
+    jmp b25
+  //SEG176 menu::@25
+  b25:
   //SEG177 [104] call mode_sixsfred 
     jsr mode_sixsfred
     jmp breturn
-  //SEG178 [105] phi from menu::@67 to menu::@21 [phi:menu::@67->menu::@21]
-  b21_from_b67:
-    jmp b21
-  //SEG179 menu::@21
-  b21:
+  //SEG178 [105] phi from menu::@39 to menu::@15 [phi:menu::@39->menu::@15]
+  b15_from_b39:
+    jmp b15
+  //SEG179 menu::@15
+  b15:
   //SEG180 [106] call keyboard_key_pressed 
-  //SEG181 [211] phi from menu::@21 to keyboard_key_pressed [phi:menu::@21->keyboard_key_pressed]
-  keyboard_key_pressed_from_b21:
-  //SEG182 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_D#0 [phi:menu::@21->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG181 [211] phi from menu::@15 to keyboard_key_pressed [phi:menu::@15->keyboard_key_pressed]
+  keyboard_key_pressed_from_b15:
+  //SEG182 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_D#0 [phi:menu::@15->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_D
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG183 [107] (byte) keyboard_key_pressed::return#12 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_12
-    jmp b69
-  //SEG184 menu::@69
-  b69:
+    jmp b40
+  //SEG184 menu::@40
+  b40:
   //SEG185 [108] (byte~) menu::$69 ← (byte) keyboard_key_pressed::return#12 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_12
     sta _69
-  //SEG186 [109] if((byte~) menu::$69==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@22 -- vbuz1_eq_0_then_la1 
+  //SEG186 [109] if((byte~) menu::$69==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@16 -- vbuz1_eq_0_then_la1 
     lda _69
     cmp #0
-    beq b22_from_b69
-  //SEG187 [110] phi from menu::@69 to menu::@42 [phi:menu::@69->menu::@42]
-  b42_from_b69:
-    jmp b42
-  //SEG188 menu::@42
-  b42:
+    beq b16_from_b40
+  //SEG187 [110] phi from menu::@40 to menu::@26 [phi:menu::@40->menu::@26]
+  b26_from_b40:
+    jmp b26
+  //SEG188 menu::@26
+  b26:
   //SEG189 [111] call mode_8bpppixelcell 
     jsr mode_8bpppixelcell
     jmp breturn
-  //SEG190 [112] phi from menu::@69 to menu::@22 [phi:menu::@69->menu::@22]
-  b22_from_b69:
-    jmp b22
-  //SEG191 menu::@22
-  b22:
+  //SEG190 [112] phi from menu::@40 to menu::@16 [phi:menu::@40->menu::@16]
+  b16_from_b40:
+    jmp b16
+  //SEG191 menu::@16
+  b16:
   //SEG192 [113] call keyboard_key_pressed 
-  //SEG193 [211] phi from menu::@22 to keyboard_key_pressed [phi:menu::@22->keyboard_key_pressed]
-  keyboard_key_pressed_from_b22:
-  //SEG194 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_E#0 [phi:menu::@22->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG193 [211] phi from menu::@16 to keyboard_key_pressed [phi:menu::@16->keyboard_key_pressed]
+  keyboard_key_pressed_from_b16:
+  //SEG194 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_E#0 [phi:menu::@16->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_E
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG195 [114] (byte) keyboard_key_pressed::return#13 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_13
-    jmp b71
-  //SEG196 menu::@71
-  b71:
+    jmp b41
+  //SEG196 menu::@41
+  b41:
   //SEG197 [115] (byte~) menu::$73 ← (byte) keyboard_key_pressed::return#13 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_13
     sta _73
-  //SEG198 [116] if((byte~) menu::$73==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@2 -- vbuz1_eq_0_then_la1 
+  //SEG198 [116] if((byte~) menu::$73==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@1 -- vbuz1_eq_0_then_la1 
     lda _73
     cmp #0
-    beq b2_from_b71
-  //SEG199 [117] phi from menu::@71 to menu::@44 [phi:menu::@71->menu::@44]
-  b44_from_b71:
-    jmp b44
-  //SEG200 menu::@44
-  b44:
+    beq b1_from_b41
+  //SEG199 [117] phi from menu::@41 to menu::@27 [phi:menu::@41->menu::@27]
+  b27_from_b41:
+    jmp b27
+  //SEG200 menu::@27
+  b27:
   //SEG201 [118] call mode_8bppchunkybmm 
     jsr mode_8bppchunkybmm
     jmp breturn
@@ -13408,15 +13542,15 @@ mode_8bppchunkybmm: {
   dtvSetCpuBankSegment1_from_b6:
   //SEG249 [223] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#3 = (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:mode_8bppchunkybmm::@6->dtvSetCpuBankSegment1#0] -- register_copy 
     jsr dtvSetCpuBankSegment1
-    jmp b10
-  //SEG250 mode_8bppchunkybmm::@10
-  b10:
+    jmp b9
+  //SEG250 mode_8bppchunkybmm::@9
+  b9:
   //SEG251 [140] (byte) mode_8bppchunkybmm::gfxbCpuBank#2 ← ++ (byte) mode_8bppchunkybmm::gfxbCpuBank#4 -- vbuz1=_inc_vbuz1 
     inc gfxbCpuBank
-  //SEG252 [141] phi from mode_8bppchunkybmm::@10 to mode_8bppchunkybmm::@5 [phi:mode_8bppchunkybmm::@10->mode_8bppchunkybmm::@5]
-  b5_from_b10:
-  //SEG253 [141] phi (byte) mode_8bppchunkybmm::gfxbCpuBank#8 = (byte) mode_8bppchunkybmm::gfxbCpuBank#2 [phi:mode_8bppchunkybmm::@10->mode_8bppchunkybmm::@5#0] -- register_copy 
-  //SEG254 [141] phi (byte*) mode_8bppchunkybmm::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:mode_8bppchunkybmm::@10->mode_8bppchunkybmm::@5#1] -- pbuz1=pbuc1 
+  //SEG252 [141] phi from mode_8bppchunkybmm::@9 to mode_8bppchunkybmm::@5 [phi:mode_8bppchunkybmm::@9->mode_8bppchunkybmm::@5]
+  b5_from_b9:
+  //SEG253 [141] phi (byte) mode_8bppchunkybmm::gfxbCpuBank#8 = (byte) mode_8bppchunkybmm::gfxbCpuBank#2 [phi:mode_8bppchunkybmm::@9->mode_8bppchunkybmm::@5#0] -- register_copy 
+  //SEG254 [141] phi (byte*) mode_8bppchunkybmm::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:mode_8bppchunkybmm::@9->mode_8bppchunkybmm::@5#1] -- pbuz1=pbuc1 
     lda #<$4000
     sta gfxb
     lda #>$4000
@@ -13482,15 +13616,15 @@ mode_8bppchunkybmm: {
     lda #$4000/$4000
     sta dtvSetCpuBankSegment1.cpuBankIdx
     jsr dtvSetCpuBankSegment1
-  //SEG273 [152] phi from mode_8bppchunkybmm::@8 to mode_8bppchunkybmm::@11 [phi:mode_8bppchunkybmm::@8->mode_8bppchunkybmm::@11]
-  b11_from_b8:
-    jmp b11
-  //SEG274 mode_8bppchunkybmm::@11
-  b11:
+  //SEG273 [152] phi from mode_8bppchunkybmm::@8 to mode_8bppchunkybmm::@10 [phi:mode_8bppchunkybmm::@8->mode_8bppchunkybmm::@10]
+  b10_from_b8:
+    jmp b10
+  //SEG274 mode_8bppchunkybmm::@10
+  b10:
   //SEG275 [153] call mode_ctrl 
-  //SEG276 [155] phi from mode_8bppchunkybmm::@11 to mode_ctrl [phi:mode_8bppchunkybmm::@11->mode_ctrl]
-  mode_ctrl_from_b11:
-  //SEG277 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 [phi:mode_8bppchunkybmm::@11->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG276 [155] phi from mode_8bppchunkybmm::@10 to mode_ctrl [phi:mode_8bppchunkybmm::@10->mode_ctrl]
+  mode_ctrl_from_b10:
+  //SEG277 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 [phi:mode_8bppchunkybmm::@10->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR|DTV_CHUNKY|DTV_COLORRAM_OFF
     sta dtv_control
     jsr mode_ctrl
@@ -13512,299 +13646,299 @@ mode_ctrl: {
     .label _24 = $c9
     .label _28 = $cb
     .label ctrl = $d
-  //SEG281 [156] phi from mode_ctrl mode_ctrl::@30 to mode_ctrl::@1 [phi:mode_ctrl/mode_ctrl::@30->mode_ctrl::@1]
+  //SEG281 [156] phi from mode_ctrl mode_ctrl::@18 to mode_ctrl::@1 [phi:mode_ctrl/mode_ctrl::@18->mode_ctrl::@1]
   b1_from_mode_ctrl:
-  b1_from_b30:
-  //SEG282 [156] phi (byte) dtv_control#114 = (byte) dtv_control#145 [phi:mode_ctrl/mode_ctrl::@30->mode_ctrl::@1#0] -- register_copy 
+  b1_from_b18:
+  //SEG282 [156] phi (byte) dtv_control#114 = (byte) dtv_control#145 [phi:mode_ctrl/mode_ctrl::@18->mode_ctrl::@1#0] -- register_copy 
     jmp b1
-  //SEG283 [156] phi from mode_ctrl::@16 to mode_ctrl::@1 [phi:mode_ctrl::@16->mode_ctrl::@1]
-  b1_from_b16:
+  //SEG283 [156] phi from mode_ctrl::@11 to mode_ctrl::@1 [phi:mode_ctrl::@11->mode_ctrl::@1]
+  b1_from_b11:
     jmp b1
   //SEG284 mode_ctrl::@1
   b1:
-    jmp b6
+    jmp b2
   // Wait for the raster
-  //SEG285 mode_ctrl::@6
-  b6:
-  //SEG286 [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG285 mode_ctrl::@2
+  b2:
+  //SEG286 [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG287 [158] phi from mode_ctrl::@6 to mode_ctrl::@8 [phi:mode_ctrl::@6->mode_ctrl::@8]
-  b8_from_b6:
-    jmp b8
-  //SEG288 mode_ctrl::@8
-  b8:
+    bne b2
+  //SEG287 [158] phi from mode_ctrl::@2 to mode_ctrl::@3 [phi:mode_ctrl::@2->mode_ctrl::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG288 mode_ctrl::@3
+  b3:
   //SEG289 [159] call keyboard_key_pressed 
-  //SEG290 [211] phi from mode_ctrl::@8 to keyboard_key_pressed [phi:mode_ctrl::@8->keyboard_key_pressed]
-  keyboard_key_pressed_from_b8:
-  //SEG291 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_SPACE#0 [phi:mode_ctrl::@8->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG290 [211] phi from mode_ctrl::@3 to keyboard_key_pressed [phi:mode_ctrl::@3->keyboard_key_pressed]
+  keyboard_key_pressed_from_b3:
+  //SEG291 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_SPACE#0 [phi:mode_ctrl::@3->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_SPACE
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG292 [160] (byte) keyboard_key_pressed::return#14 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_14
-    jmp b32
-  //SEG293 mode_ctrl::@32
-  b32:
+    jmp b19
+  //SEG293 mode_ctrl::@19
+  b19:
   //SEG294 [161] (byte~) mode_ctrl::$1 ← (byte) keyboard_key_pressed::return#14 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_14
     sta _1
-  //SEG295 [162] if((byte~) mode_ctrl::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@9 -- vbuz1_eq_0_then_la1 
+  //SEG295 [162] if((byte~) mode_ctrl::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b9
+    beq b4
     jmp breturn
   //SEG296 mode_ctrl::@return
   breturn:
   //SEG297 [163] return 
     rts
-  //SEG298 mode_ctrl::@9
-  b9:
+  //SEG298 mode_ctrl::@4
+  b4:
   //SEG299 [164] (byte) mode_ctrl::ctrl#0 ← (byte) dtv_control#114 -- vbuz1=vbuz2 
     // Read the current control byte
     lda dtv_control
     sta ctrl
   //SEG300 [165] call keyboard_key_pressed 
-  //SEG301 [211] phi from mode_ctrl::@9 to keyboard_key_pressed [phi:mode_ctrl::@9->keyboard_key_pressed]
-  keyboard_key_pressed_from_b9:
-  //SEG302 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_L#0 [phi:mode_ctrl::@9->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG301 [211] phi from mode_ctrl::@4 to keyboard_key_pressed [phi:mode_ctrl::@4->keyboard_key_pressed]
+  keyboard_key_pressed_from_b4:
+  //SEG302 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_L#0 [phi:mode_ctrl::@4->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_L
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG303 [166] (byte) keyboard_key_pressed::return#15 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_15
-    jmp b33
-  //SEG304 mode_ctrl::@33
-  b33:
+    jmp b20
+  //SEG304 mode_ctrl::@20
+  b20:
   //SEG305 [167] (byte~) mode_ctrl::$4 ← (byte) keyboard_key_pressed::return#15 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_15
     sta _4
-  //SEG306 [168] if((byte~) mode_ctrl::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@10 -- vbuz1_eq_0_then_la1 
+  //SEG306 [168] if((byte~) mode_ctrl::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@5 -- vbuz1_eq_0_then_la1 
     lda _4
     cmp #0
-    beq b10_from_b33
-    jmp b23
-  //SEG307 mode_ctrl::@23
-  b23:
+    beq b5_from_b20
+    jmp b12
+  //SEG307 mode_ctrl::@12
+  b12:
   //SEG308 [169] (byte) mode_ctrl::ctrl#1 ← (byte) mode_ctrl::ctrl#0 | (const byte) DTV_LINEAR#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #DTV_LINEAR
     ora ctrl
     sta ctrl
-  //SEG309 [170] phi from mode_ctrl::@23 mode_ctrl::@33 to mode_ctrl::@10 [phi:mode_ctrl::@23/mode_ctrl::@33->mode_ctrl::@10]
-  b10_from_b23:
-  b10_from_b33:
-  //SEG310 [170] phi (byte) mode_ctrl::ctrl#17 = (byte) mode_ctrl::ctrl#1 [phi:mode_ctrl::@23/mode_ctrl::@33->mode_ctrl::@10#0] -- register_copy 
-    jmp b10
-  //SEG311 mode_ctrl::@10
-  b10:
+  //SEG309 [170] phi from mode_ctrl::@12 mode_ctrl::@20 to mode_ctrl::@5 [phi:mode_ctrl::@12/mode_ctrl::@20->mode_ctrl::@5]
+  b5_from_b12:
+  b5_from_b20:
+  //SEG310 [170] phi (byte) mode_ctrl::ctrl#17 = (byte) mode_ctrl::ctrl#1 [phi:mode_ctrl::@12/mode_ctrl::@20->mode_ctrl::@5#0] -- register_copy 
+    jmp b5
+  //SEG311 mode_ctrl::@5
+  b5:
   //SEG312 [171] call keyboard_key_pressed 
-  //SEG313 [211] phi from mode_ctrl::@10 to keyboard_key_pressed [phi:mode_ctrl::@10->keyboard_key_pressed]
-  keyboard_key_pressed_from_b10:
-  //SEG314 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_H#0 [phi:mode_ctrl::@10->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG313 [211] phi from mode_ctrl::@5 to keyboard_key_pressed [phi:mode_ctrl::@5->keyboard_key_pressed]
+  keyboard_key_pressed_from_b5:
+  //SEG314 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_H#0 [phi:mode_ctrl::@5->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_H
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG315 [172] (byte) keyboard_key_pressed::return#16 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_16
-    jmp b34
-  //SEG316 mode_ctrl::@34
-  b34:
+    jmp b21
+  //SEG316 mode_ctrl::@21
+  b21:
   //SEG317 [173] (byte~) mode_ctrl::$8 ← (byte) keyboard_key_pressed::return#16 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_16
     sta _8
-  //SEG318 [174] if((byte~) mode_ctrl::$8==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@11 -- vbuz1_eq_0_then_la1 
+  //SEG318 [174] if((byte~) mode_ctrl::$8==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@6 -- vbuz1_eq_0_then_la1 
     lda _8
     cmp #0
-    beq b11_from_b34
-    jmp b24
-  //SEG319 mode_ctrl::@24
-  b24:
+    beq b6_from_b21
+    jmp b13
+  //SEG319 mode_ctrl::@13
+  b13:
   //SEG320 [175] (byte) mode_ctrl::ctrl#2 ← (byte) mode_ctrl::ctrl#17 | (const byte) DTV_HIGHCOLOR#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #DTV_HIGHCOLOR
     ora ctrl
     sta ctrl
-  //SEG321 [176] phi from mode_ctrl::@24 mode_ctrl::@34 to mode_ctrl::@11 [phi:mode_ctrl::@24/mode_ctrl::@34->mode_ctrl::@11]
-  b11_from_b24:
-  b11_from_b34:
-  //SEG322 [176] phi (byte) mode_ctrl::ctrl#10 = (byte) mode_ctrl::ctrl#2 [phi:mode_ctrl::@24/mode_ctrl::@34->mode_ctrl::@11#0] -- register_copy 
-    jmp b11
-  //SEG323 mode_ctrl::@11
-  b11:
+  //SEG321 [176] phi from mode_ctrl::@13 mode_ctrl::@21 to mode_ctrl::@6 [phi:mode_ctrl::@13/mode_ctrl::@21->mode_ctrl::@6]
+  b6_from_b13:
+  b6_from_b21:
+  //SEG322 [176] phi (byte) mode_ctrl::ctrl#10 = (byte) mode_ctrl::ctrl#2 [phi:mode_ctrl::@13/mode_ctrl::@21->mode_ctrl::@6#0] -- register_copy 
+    jmp b6
+  //SEG323 mode_ctrl::@6
+  b6:
   //SEG324 [177] call keyboard_key_pressed 
-  //SEG325 [211] phi from mode_ctrl::@11 to keyboard_key_pressed [phi:mode_ctrl::@11->keyboard_key_pressed]
-  keyboard_key_pressed_from_b11:
-  //SEG326 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_O#0 [phi:mode_ctrl::@11->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG325 [211] phi from mode_ctrl::@6 to keyboard_key_pressed [phi:mode_ctrl::@6->keyboard_key_pressed]
+  keyboard_key_pressed_from_b6:
+  //SEG326 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_O#0 [phi:mode_ctrl::@6->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_O
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG327 [178] (byte) keyboard_key_pressed::return#17 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_17
-    jmp b35
-  //SEG328 mode_ctrl::@35
-  b35:
+    jmp b22
+  //SEG328 mode_ctrl::@22
+  b22:
   //SEG329 [179] (byte~) mode_ctrl::$12 ← (byte) keyboard_key_pressed::return#17 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_17
     sta _12
-  //SEG330 [180] if((byte~) mode_ctrl::$12==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@12 -- vbuz1_eq_0_then_la1 
+  //SEG330 [180] if((byte~) mode_ctrl::$12==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@7 -- vbuz1_eq_0_then_la1 
     lda _12
     cmp #0
-    beq b12_from_b35
-    jmp b25
-  //SEG331 mode_ctrl::@25
-  b25:
+    beq b7_from_b22
+    jmp b14
+  //SEG331 mode_ctrl::@14
+  b14:
   //SEG332 [181] (byte) mode_ctrl::ctrl#3 ← (byte) mode_ctrl::ctrl#10 | (const byte) DTV_OVERSCAN#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #DTV_OVERSCAN
     ora ctrl
     sta ctrl
-  //SEG333 [182] phi from mode_ctrl::@25 mode_ctrl::@35 to mode_ctrl::@12 [phi:mode_ctrl::@25/mode_ctrl::@35->mode_ctrl::@12]
-  b12_from_b25:
-  b12_from_b35:
-  //SEG334 [182] phi (byte) mode_ctrl::ctrl#11 = (byte) mode_ctrl::ctrl#3 [phi:mode_ctrl::@25/mode_ctrl::@35->mode_ctrl::@12#0] -- register_copy 
-    jmp b12
-  //SEG335 mode_ctrl::@12
-  b12:
+  //SEG333 [182] phi from mode_ctrl::@14 mode_ctrl::@22 to mode_ctrl::@7 [phi:mode_ctrl::@14/mode_ctrl::@22->mode_ctrl::@7]
+  b7_from_b14:
+  b7_from_b22:
+  //SEG334 [182] phi (byte) mode_ctrl::ctrl#11 = (byte) mode_ctrl::ctrl#3 [phi:mode_ctrl::@14/mode_ctrl::@22->mode_ctrl::@7#0] -- register_copy 
+    jmp b7
+  //SEG335 mode_ctrl::@7
+  b7:
   //SEG336 [183] call keyboard_key_pressed 
-  //SEG337 [211] phi from mode_ctrl::@12 to keyboard_key_pressed [phi:mode_ctrl::@12->keyboard_key_pressed]
-  keyboard_key_pressed_from_b12:
-  //SEG338 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:mode_ctrl::@12->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG337 [211] phi from mode_ctrl::@7 to keyboard_key_pressed [phi:mode_ctrl::@7->keyboard_key_pressed]
+  keyboard_key_pressed_from_b7:
+  //SEG338 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:mode_ctrl::@7->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_B
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG339 [184] (byte) keyboard_key_pressed::return#18 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_18
-    jmp b36
-  //SEG340 mode_ctrl::@36
-  b36:
+    jmp b23
+  //SEG340 mode_ctrl::@23
+  b23:
   //SEG341 [185] (byte~) mode_ctrl::$16 ← (byte) keyboard_key_pressed::return#18 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_18
     sta _16
-  //SEG342 [186] if((byte~) mode_ctrl::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@13 -- vbuz1_eq_0_then_la1 
+  //SEG342 [186] if((byte~) mode_ctrl::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@8 -- vbuz1_eq_0_then_la1 
     lda _16
     cmp #0
-    beq b13_from_b36
-    jmp b26
-  //SEG343 mode_ctrl::@26
-  b26:
+    beq b8_from_b23
+    jmp b15
+  //SEG343 mode_ctrl::@15
+  b15:
   //SEG344 [187] (byte) mode_ctrl::ctrl#4 ← (byte) mode_ctrl::ctrl#11 | (const byte) DTV_BORDER_OFF#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #DTV_BORDER_OFF
     ora ctrl
     sta ctrl
-  //SEG345 [188] phi from mode_ctrl::@26 mode_ctrl::@36 to mode_ctrl::@13 [phi:mode_ctrl::@26/mode_ctrl::@36->mode_ctrl::@13]
-  b13_from_b26:
-  b13_from_b36:
-  //SEG346 [188] phi (byte) mode_ctrl::ctrl#12 = (byte) mode_ctrl::ctrl#4 [phi:mode_ctrl::@26/mode_ctrl::@36->mode_ctrl::@13#0] -- register_copy 
-    jmp b13
-  //SEG347 mode_ctrl::@13
-  b13:
+  //SEG345 [188] phi from mode_ctrl::@15 mode_ctrl::@23 to mode_ctrl::@8 [phi:mode_ctrl::@15/mode_ctrl::@23->mode_ctrl::@8]
+  b8_from_b15:
+  b8_from_b23:
+  //SEG346 [188] phi (byte) mode_ctrl::ctrl#12 = (byte) mode_ctrl::ctrl#4 [phi:mode_ctrl::@15/mode_ctrl::@23->mode_ctrl::@8#0] -- register_copy 
+    jmp b8
+  //SEG347 mode_ctrl::@8
+  b8:
   //SEG348 [189] call keyboard_key_pressed 
-  //SEG349 [211] phi from mode_ctrl::@13 to keyboard_key_pressed [phi:mode_ctrl::@13->keyboard_key_pressed]
-  keyboard_key_pressed_from_b13:
-  //SEG350 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_U#0 [phi:mode_ctrl::@13->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG349 [211] phi from mode_ctrl::@8 to keyboard_key_pressed [phi:mode_ctrl::@8->keyboard_key_pressed]
+  keyboard_key_pressed_from_b8:
+  //SEG350 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_U#0 [phi:mode_ctrl::@8->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_U
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG351 [190] (byte) keyboard_key_pressed::return#19 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_19
-    jmp b37
-  //SEG352 mode_ctrl::@37
-  b37:
+    jmp b24
+  //SEG352 mode_ctrl::@24
+  b24:
   //SEG353 [191] (byte~) mode_ctrl::$20 ← (byte) keyboard_key_pressed::return#19 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_19
     sta _20
-  //SEG354 [192] if((byte~) mode_ctrl::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@14 -- vbuz1_eq_0_then_la1 
+  //SEG354 [192] if((byte~) mode_ctrl::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@9 -- vbuz1_eq_0_then_la1 
     lda _20
     cmp #0
-    beq b14_from_b37
-    jmp b27
-  //SEG355 mode_ctrl::@27
-  b27:
+    beq b9_from_b24
+    jmp b16
+  //SEG355 mode_ctrl::@16
+  b16:
   //SEG356 [193] (byte) mode_ctrl::ctrl#5 ← (byte) mode_ctrl::ctrl#12 | (const byte) DTV_CHUNKY#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #DTV_CHUNKY
     ora ctrl
     sta ctrl
-  //SEG357 [194] phi from mode_ctrl::@27 mode_ctrl::@37 to mode_ctrl::@14 [phi:mode_ctrl::@27/mode_ctrl::@37->mode_ctrl::@14]
-  b14_from_b27:
-  b14_from_b37:
-  //SEG358 [194] phi (byte) mode_ctrl::ctrl#13 = (byte) mode_ctrl::ctrl#5 [phi:mode_ctrl::@27/mode_ctrl::@37->mode_ctrl::@14#0] -- register_copy 
-    jmp b14
-  //SEG359 mode_ctrl::@14
-  b14:
+  //SEG357 [194] phi from mode_ctrl::@16 mode_ctrl::@24 to mode_ctrl::@9 [phi:mode_ctrl::@16/mode_ctrl::@24->mode_ctrl::@9]
+  b9_from_b16:
+  b9_from_b24:
+  //SEG358 [194] phi (byte) mode_ctrl::ctrl#13 = (byte) mode_ctrl::ctrl#5 [phi:mode_ctrl::@16/mode_ctrl::@24->mode_ctrl::@9#0] -- register_copy 
+    jmp b9
+  //SEG359 mode_ctrl::@9
+  b9:
   //SEG360 [195] call keyboard_key_pressed 
-  //SEG361 [211] phi from mode_ctrl::@14 to keyboard_key_pressed [phi:mode_ctrl::@14->keyboard_key_pressed]
-  keyboard_key_pressed_from_b14:
-  //SEG362 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:mode_ctrl::@14->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG361 [211] phi from mode_ctrl::@9 to keyboard_key_pressed [phi:mode_ctrl::@9->keyboard_key_pressed]
+  keyboard_key_pressed_from_b9:
+  //SEG362 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:mode_ctrl::@9->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_C
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG363 [196] (byte) keyboard_key_pressed::return#20 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_20
-    jmp b38
-  //SEG364 mode_ctrl::@38
-  b38:
+    jmp b25
+  //SEG364 mode_ctrl::@25
+  b25:
   //SEG365 [197] (byte~) mode_ctrl::$24 ← (byte) keyboard_key_pressed::return#20 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_20
     sta _24
-  //SEG366 [198] if((byte~) mode_ctrl::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@15 -- vbuz1_eq_0_then_la1 
+  //SEG366 [198] if((byte~) mode_ctrl::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@10 -- vbuz1_eq_0_then_la1 
     lda _24
     cmp #0
-    beq b15_from_b38
-    jmp b28
-  //SEG367 mode_ctrl::@28
-  b28:
+    beq b10_from_b25
+    jmp b17
+  //SEG367 mode_ctrl::@17
+  b17:
   //SEG368 [199] (byte) mode_ctrl::ctrl#6 ← (byte) mode_ctrl::ctrl#13 | (const byte) DTV_COLORRAM_OFF#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #DTV_COLORRAM_OFF
     ora ctrl
     sta ctrl
-  //SEG369 [200] phi from mode_ctrl::@28 mode_ctrl::@38 to mode_ctrl::@15 [phi:mode_ctrl::@28/mode_ctrl::@38->mode_ctrl::@15]
-  b15_from_b28:
-  b15_from_b38:
-  //SEG370 [200] phi (byte) mode_ctrl::ctrl#22 = (byte) mode_ctrl::ctrl#6 [phi:mode_ctrl::@28/mode_ctrl::@38->mode_ctrl::@15#0] -- register_copy 
-    jmp b15
-  //SEG371 mode_ctrl::@15
-  b15:
+  //SEG369 [200] phi from mode_ctrl::@17 mode_ctrl::@25 to mode_ctrl::@10 [phi:mode_ctrl::@17/mode_ctrl::@25->mode_ctrl::@10]
+  b10_from_b17:
+  b10_from_b25:
+  //SEG370 [200] phi (byte) mode_ctrl::ctrl#22 = (byte) mode_ctrl::ctrl#6 [phi:mode_ctrl::@17/mode_ctrl::@25->mode_ctrl::@10#0] -- register_copy 
+    jmp b10
+  //SEG371 mode_ctrl::@10
+  b10:
   //SEG372 [201] call keyboard_key_pressed 
-  //SEG373 [211] phi from mode_ctrl::@15 to keyboard_key_pressed [phi:mode_ctrl::@15->keyboard_key_pressed]
-  keyboard_key_pressed_from_b15:
-  //SEG374 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_0#0 [phi:mode_ctrl::@15->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG373 [211] phi from mode_ctrl::@10 to keyboard_key_pressed [phi:mode_ctrl::@10->keyboard_key_pressed]
+  keyboard_key_pressed_from_b10:
+  //SEG374 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_0#0 [phi:mode_ctrl::@10->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_0
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG375 [202] (byte) keyboard_key_pressed::return#21 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_21
-    jmp b39
-  //SEG376 mode_ctrl::@39
-  b39:
+    jmp b26
+  //SEG376 mode_ctrl::@26
+  b26:
   //SEG377 [203] (byte~) mode_ctrl::$28 ← (byte) keyboard_key_pressed::return#21 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_21
     sta _28
-  //SEG378 [204] if((byte~) mode_ctrl::$28==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@46 -- vbuz1_eq_0_then_la1 
+  //SEG378 [204] if((byte~) mode_ctrl::$28==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@27 -- vbuz1_eq_0_then_la1 
     lda _28
     cmp #0
-    beq b46_from_b39
-  //SEG379 [205] phi from mode_ctrl::@39 to mode_ctrl::@16 [phi:mode_ctrl::@39->mode_ctrl::@16]
-  b16_from_b39:
-  //SEG380 [205] phi (byte) mode_ctrl::ctrl#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_ctrl::@39->mode_ctrl::@16#0] -- vbuz1=vbuc1 
+    beq b27_from_b26
+  //SEG379 [205] phi from mode_ctrl::@26 to mode_ctrl::@11 [phi:mode_ctrl::@26->mode_ctrl::@11]
+  b11_from_b26:
+  //SEG380 [205] phi (byte) mode_ctrl::ctrl#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_ctrl::@26->mode_ctrl::@11#0] -- vbuz1=vbuc1 
     lda #0
     sta ctrl
-    jmp b16
-  //SEG381 mode_ctrl::@16
-  b16:
+    jmp b11
+  //SEG381 mode_ctrl::@11
+  b11:
   //SEG382 [206] if((byte) mode_ctrl::ctrl#14==(byte) dtv_control#114) goto mode_ctrl::@1 -- vbuz1_eq_vbuz2_then_la1 
     lda ctrl
     cmp dtv_control
-    beq b1_from_b16
-    jmp b30
-  //SEG383 mode_ctrl::@30
-  b30:
+    beq b1_from_b11
+    jmp b18
+  //SEG383 mode_ctrl::@18
+  b18:
   //SEG384 [207] (byte) dtv_control#17 ← (byte) mode_ctrl::ctrl#14 -- vbuz1=vbuz2 
     lda ctrl
     sta dtv_control
@@ -13814,16 +13948,16 @@ mode_ctrl: {
   //SEG386 [209] *((const byte*) BORDERCOL#0) ← (byte) mode_ctrl::ctrl#14 -- _deref_pbuc1=vbuz1 
     lda ctrl
     sta BORDERCOL
-    jmp b1_from_b30
-  //SEG387 [210] phi from mode_ctrl::@39 to mode_ctrl::@46 [phi:mode_ctrl::@39->mode_ctrl::@46]
-  b46_from_b39:
-    jmp b46
-  //SEG388 mode_ctrl::@46
-  b46:
-  //SEG389 [205] phi from mode_ctrl::@46 to mode_ctrl::@16 [phi:mode_ctrl::@46->mode_ctrl::@16]
-  b16_from_b46:
-  //SEG390 [205] phi (byte) mode_ctrl::ctrl#14 = (byte) mode_ctrl::ctrl#22 [phi:mode_ctrl::@46->mode_ctrl::@16#0] -- register_copy 
-    jmp b16
+    jmp b1_from_b18
+  //SEG387 [210] phi from mode_ctrl::@26 to mode_ctrl::@27 [phi:mode_ctrl::@26->mode_ctrl::@27]
+  b27_from_b26:
+    jmp b27
+  //SEG388 mode_ctrl::@27
+  b27:
+  //SEG389 [205] phi from mode_ctrl::@27 to mode_ctrl::@11 [phi:mode_ctrl::@27->mode_ctrl::@11]
+  b11_from_b27:
+  //SEG390 [205] phi (byte) mode_ctrl::ctrl#14 = (byte) mode_ctrl::ctrl#22 [phi:mode_ctrl::@27->mode_ctrl::@11#0] -- register_copy 
+    jmp b11
 }
 //SEG391 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -13875,9 +14009,9 @@ keyboard_key_pressed: {
   //SEG396 [216] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return
     sta keyboard_matrix_read.return_2
-    jmp b2
-  //SEG397 keyboard_key_pressed::@2
-  b2:
+    jmp b1
+  //SEG397 keyboard_key_pressed::@1
+  b1:
   //SEG398 [217] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return_2
     sta _2
@@ -14047,38 +14181,38 @@ mode_8bpppixelcell: {
     lda #$10
     cmp i
     bne b1_from_b1
-  //SEG437 [247] phi from mode_8bpppixelcell::@1 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@3]
-  b3_from_b1:
-  //SEG438 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (const byte*) mode_8bpppixelcell::PLANEA#0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@3#0] -- pbuz1=pbuc1 
+  //SEG437 [247] phi from mode_8bpppixelcell::@1 to mode_8bpppixelcell::@2 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@2]
+  b2_from_b1:
+  //SEG438 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (const byte*) mode_8bpppixelcell::PLANEA#0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@2#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG439 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@3#1] -- vbuz1=vbuc1 
+  //SEG439 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-    jmp b3
-  //SEG440 [247] phi from mode_8bpppixelcell::@5 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@3]
-  b3_from_b5:
-  //SEG441 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@3#0] -- register_copy 
-  //SEG442 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte) mode_8bpppixelcell::ay#1 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@3#1] -- register_copy 
-    jmp b3
-  //SEG443 mode_8bpppixelcell::@3
-  b3:
-  //SEG444 [248] phi from mode_8bpppixelcell::@3 to mode_8bpppixelcell::@4 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@4]
-  b4_from_b3:
-  //SEG445 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#3 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@4#0] -- register_copy 
-  //SEG446 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@4#1] -- vbuz1=vbuc1 
+    jmp b2
+  //SEG440 [247] phi from mode_8bpppixelcell::@4 to mode_8bpppixelcell::@2 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@2]
+  b2_from_b4:
+  //SEG441 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@2#0] -- register_copy 
+  //SEG442 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte) mode_8bpppixelcell::ay#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@2#1] -- register_copy 
+    jmp b2
+  //SEG443 mode_8bpppixelcell::@2
+  b2:
+  //SEG444 [248] phi from mode_8bpppixelcell::@2 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@2->mode_8bpppixelcell::@3]
+  b3_from_b2:
+  //SEG445 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#3 [phi:mode_8bpppixelcell::@2->mode_8bpppixelcell::@3#0] -- register_copy 
+  //SEG446 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@2->mode_8bpppixelcell::@3#1] -- vbuz1=vbuc1 
     lda #0
     sta ax
-    jmp b4
-  //SEG447 [248] phi from mode_8bpppixelcell::@4 to mode_8bpppixelcell::@4 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@4]
-  b4_from_b4:
-  //SEG448 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@4#0] -- register_copy 
-  //SEG449 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte) mode_8bpppixelcell::ax#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@4#1] -- register_copy 
-    jmp b4
-  //SEG450 mode_8bpppixelcell::@4
-  b4:
+    jmp b3
+  //SEG447 [248] phi from mode_8bpppixelcell::@3 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@3]
+  b3_from_b3:
+  //SEG448 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@3#0] -- register_copy 
+  //SEG449 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte) mode_8bpppixelcell::ax#1 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@3#1] -- register_copy 
+    jmp b3
+  //SEG450 mode_8bpppixelcell::@3
+  b3:
   //SEG451 [249] (byte~) mode_8bpppixelcell::$14 ← (byte) mode_8bpppixelcell::ay#4 & (byte/signed byte/word/signed word/dword/signed dword) $f -- vbuz1=vbuz2_band_vbuc1 
     lda #$f
     and ay
@@ -14109,72 +14243,72 @@ mode_8bpppixelcell: {
   !:
   //SEG457 [255] (byte) mode_8bpppixelcell::ax#1 ← ++ (byte) mode_8bpppixelcell::ax#2 -- vbuz1=_inc_vbuz1 
     inc ax
-  //SEG458 [256] if((byte) mode_8bpppixelcell::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_8bpppixelcell::@4 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG458 [256] if((byte) mode_8bpppixelcell::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_8bpppixelcell::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp ax
-    bne b4_from_b4
-    jmp b5
-  //SEG459 mode_8bpppixelcell::@5
-  b5:
+    bne b3_from_b3
+    jmp b4
+  //SEG459 mode_8bpppixelcell::@4
+  b4:
   //SEG460 [257] (byte) mode_8bpppixelcell::ay#1 ← ++ (byte) mode_8bpppixelcell::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG461 [258] if((byte) mode_8bpppixelcell::ay#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_8bpppixelcell::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG461 [258] if((byte) mode_8bpppixelcell::ay#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_8bpppixelcell::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$19
     cmp ay
-    bne b3_from_b5
-    jmp b6
-  //SEG462 mode_8bpppixelcell::@6
-  b6:
+    bne b2_from_b4
+    jmp b5
+  //SEG462 mode_8bpppixelcell::@5
+  b5:
   //SEG463 [259] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_CHARROM#0 -- _deref_pbuc1=vbuc2 
     // 8bpp cells for Plane B (charset) - ROM charset with 256 colors
     lda #PROCPORT_RAM_CHARROM
     sta PROCPORT
-  //SEG464 [260] phi from mode_8bpppixelcell::@6 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7]
-  b7_from_b6:
-  //SEG465 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#0] -- vbuz1=vbuc1 
+  //SEG464 [260] phi from mode_8bpppixelcell::@5 to mode_8bpppixelcell::@6 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6]
+  b6_from_b5:
+  //SEG465 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#0] -- vbuz1=vbuc1 
     lda #0
     sta ch
-  //SEG466 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#1] -- vbuz1=vbuc1 
+  //SEG466 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#1] -- vbuz1=vbuc1 
     lda #0
     sta col
-  //SEG467 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (const byte*) mode_8bpppixelcell::PLANEB#0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#2] -- pbuz1=pbuc1 
+  //SEG467 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (const byte*) mode_8bpppixelcell::PLANEB#0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#2] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-  //SEG468 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (const byte*) mode_8bpppixelcell::CHARGEN#0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#3] -- pbuz1=pbuc1 
+  //SEG468 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (const byte*) mode_8bpppixelcell::CHARGEN#0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#3] -- pbuz1=pbuc1 
     lda #<CHARGEN
     sta chargen
     lda #>CHARGEN
     sta chargen+1
-    jmp b7
-  //SEG469 [260] phi from mode_8bpppixelcell::@13 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7]
-  b7_from_b13:
-  //SEG470 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte) mode_8bpppixelcell::ch#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#0] -- register_copy 
-  //SEG471 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#1] -- register_copy 
-  //SEG472 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#2] -- register_copy 
-  //SEG473 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#3] -- register_copy 
-    jmp b7
-  //SEG474 mode_8bpppixelcell::@7
-  b7:
-  //SEG475 [261] phi from mode_8bpppixelcell::@7 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8]
-  b8_from_b7:
-  //SEG476 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#0] -- vbuz1=vbuc1 
+    jmp b6
+  //SEG469 [260] phi from mode_8bpppixelcell::@12 to mode_8bpppixelcell::@6 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6]
+  b6_from_b12:
+  //SEG470 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte) mode_8bpppixelcell::ch#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#0] -- register_copy 
+  //SEG471 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#1] -- register_copy 
+  //SEG472 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#2] -- register_copy 
+  //SEG473 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#3] -- register_copy 
+    jmp b6
+  //SEG474 mode_8bpppixelcell::@6
+  b6:
+  //SEG475 [261] phi from mode_8bpppixelcell::@6 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7]
+  b7_from_b6:
+  //SEG476 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#0] -- vbuz1=vbuc1 
     lda #0
     sta cr
-  //SEG477 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#7 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#1] -- register_copy 
-  //SEG478 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#7 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#2] -- register_copy 
-  //SEG479 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#4 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#3] -- register_copy 
-    jmp b8
-  //SEG480 [261] phi from mode_8bpppixelcell::@12 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8]
-  b8_from_b12:
-  //SEG481 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte) mode_8bpppixelcell::cr#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#0] -- register_copy 
-  //SEG482 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#1] -- register_copy 
-  //SEG483 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#2] -- register_copy 
-  //SEG484 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#3] -- register_copy 
-    jmp b8
-  //SEG485 mode_8bpppixelcell::@8
-  b8:
+  //SEG477 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#1] -- register_copy 
+  //SEG478 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#2] -- register_copy 
+  //SEG479 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#4 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#3] -- register_copy 
+    jmp b7
+  //SEG480 [261] phi from mode_8bpppixelcell::@11 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7]
+  b7_from_b11:
+  //SEG481 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte) mode_8bpppixelcell::cr#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#0] -- register_copy 
+  //SEG482 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#1] -- register_copy 
+  //SEG483 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#2] -- register_copy 
+  //SEG484 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#3] -- register_copy 
+    jmp b7
+  //SEG485 mode_8bpppixelcell::@7
+  b7:
   //SEG486 [262] (byte) mode_8bpppixelcell::bits#0 ← *((byte*) mode_8bpppixelcell::chargen#2) -- vbuz1=_deref_pbuz2 
     ldy #0
     lda (chargen),y
@@ -14184,50 +14318,50 @@ mode_8bpppixelcell: {
     bne !+
     inc chargen+1
   !:
-  //SEG488 [264] phi from mode_8bpppixelcell::@8 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9]
-  b9_from_b8:
-  //SEG489 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#0] -- vbuz1=vbuc1 
+  //SEG488 [264] phi from mode_8bpppixelcell::@7 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8]
+  b8_from_b7:
+  //SEG489 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#0] -- vbuz1=vbuc1 
     lda #0
     sta cp
-  //SEG490 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#5 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#1] -- register_copy 
-  //SEG491 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#5 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#2] -- register_copy 
-  //SEG492 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#0 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#3] -- register_copy 
-    jmp b9
-  //SEG493 [264] phi from mode_8bpppixelcell::@10 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9]
-  b9_from_b10:
-  //SEG494 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte) mode_8bpppixelcell::cp#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#0] -- register_copy 
-  //SEG495 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#1] -- register_copy 
-  //SEG496 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#2] -- register_copy 
-  //SEG497 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#3] -- register_copy 
-    jmp b9
-  //SEG498 mode_8bpppixelcell::@9
-  b9:
+  //SEG490 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#5 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#1] -- register_copy 
+  //SEG491 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#5 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#2] -- register_copy 
+  //SEG492 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#0 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#3] -- register_copy 
+    jmp b8
+  //SEG493 [264] phi from mode_8bpppixelcell::@9 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8]
+  b8_from_b9:
+  //SEG494 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte) mode_8bpppixelcell::cp#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#0] -- register_copy 
+  //SEG495 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#1] -- register_copy 
+  //SEG496 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#2] -- register_copy 
+  //SEG497 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#3] -- register_copy 
+    jmp b8
+  //SEG498 mode_8bpppixelcell::@8
+  b8:
   //SEG499 [265] (byte~) mode_8bpppixelcell::$20 ← (byte) mode_8bpppixelcell::bits#2 & (byte/word/signed word/dword/signed dword) $80 -- vbuz1=vbuz2_band_vbuc1 
     lda #$80
     and bits
     sta _20
-  //SEG500 [266] if((byte~) mode_8bpppixelcell::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@10 -- vbuz1_eq_0_then_la1 
+  //SEG500 [266] if((byte~) mode_8bpppixelcell::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@9 -- vbuz1_eq_0_then_la1 
     lda _20
     cmp #0
-    beq b10_from_b9
-    jmp b11
-  //SEG501 mode_8bpppixelcell::@11
-  b11:
+    beq b9_from_b8
+    jmp b10
+  //SEG501 mode_8bpppixelcell::@10
+  b10:
   //SEG502 [267] (byte~) mode_8bpppixelcell::c#3 ← (byte) mode_8bpppixelcell::col#2 -- vbuz1=vbuz2 
     lda col
     sta c
-  //SEG503 [268] phi from mode_8bpppixelcell::@11 to mode_8bpppixelcell::@10 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@10]
-  b10_from_b11:
-  //SEG504 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte~) mode_8bpppixelcell::c#3 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@10#0] -- register_copy 
-    jmp b10
-  //SEG505 [268] phi from mode_8bpppixelcell::@9 to mode_8bpppixelcell::@10 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@10]
-  b10_from_b9:
-  //SEG506 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@10#0] -- vbuz1=vbuc1 
+  //SEG503 [268] phi from mode_8bpppixelcell::@10 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9]
+  b9_from_b10:
+  //SEG504 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte~) mode_8bpppixelcell::c#3 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#0] -- register_copy 
+    jmp b9
+  //SEG505 [268] phi from mode_8bpppixelcell::@8 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9]
+  b9_from_b8:
+  //SEG506 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#0] -- vbuz1=vbuc1 
     lda #0
     sta c
-    jmp b10
-  //SEG507 mode_8bpppixelcell::@10
-  b10:
+    jmp b9
+  //SEG507 mode_8bpppixelcell::@9
+  b9:
   //SEG508 [269] *((byte*) mode_8bpppixelcell::gfxb#2) ← (byte) mode_8bpppixelcell::c#2 -- _deref_pbuz1=vbuz2 
     lda c
     ldy #0
@@ -14243,38 +14377,38 @@ mode_8bpppixelcell: {
     inc col
   //SEG512 [273] (byte) mode_8bpppixelcell::cp#1 ← ++ (byte) mode_8bpppixelcell::cp#2 -- vbuz1=_inc_vbuz1 
     inc cp
-  //SEG513 [274] if((byte) mode_8bpppixelcell::cp#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@9 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG513 [274] if((byte) mode_8bpppixelcell::cp#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@8 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp cp
-    bne b9_from_b10
-    jmp b12
-  //SEG514 mode_8bpppixelcell::@12
-  b12:
+    bne b8_from_b9
+    jmp b11
+  //SEG514 mode_8bpppixelcell::@11
+  b11:
   //SEG515 [275] (byte) mode_8bpppixelcell::cr#1 ← ++ (byte) mode_8bpppixelcell::cr#6 -- vbuz1=_inc_vbuz1 
     inc cr
-  //SEG516 [276] if((byte) mode_8bpppixelcell::cr#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG516 [276] if((byte) mode_8bpppixelcell::cr#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp cr
-    bne b8_from_b12
-    jmp b13
-  //SEG517 mode_8bpppixelcell::@13
-  b13:
+    bne b7_from_b11
+    jmp b12
+  //SEG517 mode_8bpppixelcell::@12
+  b12:
   //SEG518 [277] (byte) mode_8bpppixelcell::ch#1 ← ++ (byte) mode_8bpppixelcell::ch#8 -- vbuz1=_inc_vbuz1 
     inc ch
-  //SEG519 [278] if((byte) mode_8bpppixelcell::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@7 -- vbuz1_neq_0_then_la1 
+  //SEG519 [278] if((byte) mode_8bpppixelcell::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@6 -- vbuz1_neq_0_then_la1 
     lda ch
     cmp #0
-    bne b7_from_b13
-    jmp b14
-  //SEG520 mode_8bpppixelcell::@14
-  b14:
+    bne b6_from_b12
+    jmp b13
+  //SEG520 mode_8bpppixelcell::@13
+  b13:
   //SEG521 [279] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0 -- _deref_pbuc1=vbuc2 
     lda #PROCPORT_RAM_IO
     sta PROCPORT
   //SEG522 [280] call mode_ctrl 
-  //SEG523 [155] phi from mode_8bpppixelcell::@14 to mode_ctrl [phi:mode_8bpppixelcell::@14->mode_ctrl]
-  mode_ctrl_from_b14:
-  //SEG524 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0 [phi:mode_8bpppixelcell::@14->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG523 [155] phi from mode_8bpppixelcell::@13 to mode_ctrl [phi:mode_8bpppixelcell::@13->mode_ctrl]
+  mode_ctrl_from_b13:
+  //SEG524 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0 [phi:mode_8bpppixelcell::@13->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR|DTV_CHUNKY
     sta dtv_control
     jsr mode_ctrl
@@ -14459,38 +14593,38 @@ mode_sixsfred: {
     lda #$19
     cmp cy
     bne b3_from_b5
-  //SEG578 [314] phi from mode_sixsfred::@5 to mode_sixsfred::@7 [phi:mode_sixsfred::@5->mode_sixsfred::@7]
-  b7_from_b5:
-  //SEG579 [314] phi (byte*) mode_sixsfred::gfxa#3 = (const byte*) mode_sixsfred::PLANEA#0 [phi:mode_sixsfred::@5->mode_sixsfred::@7#0] -- pbuz1=pbuc1 
+  //SEG578 [314] phi from mode_sixsfred::@5 to mode_sixsfred::@6 [phi:mode_sixsfred::@5->mode_sixsfred::@6]
+  b6_from_b5:
+  //SEG579 [314] phi (byte*) mode_sixsfred::gfxa#3 = (const byte*) mode_sixsfred::PLANEA#0 [phi:mode_sixsfred::@5->mode_sixsfred::@6#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG580 [314] phi (byte) mode_sixsfred::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@5->mode_sixsfred::@7#1] -- vbuz1=vbuc1 
+  //SEG580 [314] phi (byte) mode_sixsfred::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@5->mode_sixsfred::@6#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-    jmp b7
-  //SEG581 [314] phi from mode_sixsfred::@9 to mode_sixsfred::@7 [phi:mode_sixsfred::@9->mode_sixsfred::@7]
-  b7_from_b9:
-  //SEG582 [314] phi (byte*) mode_sixsfred::gfxa#3 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@9->mode_sixsfred::@7#0] -- register_copy 
-  //SEG583 [314] phi (byte) mode_sixsfred::ay#4 = (byte) mode_sixsfred::ay#1 [phi:mode_sixsfred::@9->mode_sixsfred::@7#1] -- register_copy 
-    jmp b7
-  //SEG584 mode_sixsfred::@7
-  b7:
-  //SEG585 [315] phi from mode_sixsfred::@7 to mode_sixsfred::@8 [phi:mode_sixsfred::@7->mode_sixsfred::@8]
-  b8_from_b7:
-  //SEG586 [315] phi (byte) mode_sixsfred::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@7->mode_sixsfred::@8#0] -- vbuz1=vbuc1 
+    jmp b6
+  //SEG581 [314] phi from mode_sixsfred::@8 to mode_sixsfred::@6 [phi:mode_sixsfred::@8->mode_sixsfred::@6]
+  b6_from_b8:
+  //SEG582 [314] phi (byte*) mode_sixsfred::gfxa#3 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@8->mode_sixsfred::@6#0] -- register_copy 
+  //SEG583 [314] phi (byte) mode_sixsfred::ay#4 = (byte) mode_sixsfred::ay#1 [phi:mode_sixsfred::@8->mode_sixsfred::@6#1] -- register_copy 
+    jmp b6
+  //SEG584 mode_sixsfred::@6
+  b6:
+  //SEG585 [315] phi from mode_sixsfred::@6 to mode_sixsfred::@7 [phi:mode_sixsfred::@6->mode_sixsfred::@7]
+  b7_from_b6:
+  //SEG586 [315] phi (byte) mode_sixsfred::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@6->mode_sixsfred::@7#0] -- vbuz1=vbuc1 
     lda #0
     sta ax
-  //SEG587 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#3 [phi:mode_sixsfred::@7->mode_sixsfred::@8#1] -- register_copy 
-    jmp b8
-  //SEG588 [315] phi from mode_sixsfred::@8 to mode_sixsfred::@8 [phi:mode_sixsfred::@8->mode_sixsfred::@8]
-  b8_from_b8:
-  //SEG589 [315] phi (byte) mode_sixsfred::ax#2 = (byte) mode_sixsfred::ax#1 [phi:mode_sixsfred::@8->mode_sixsfred::@8#0] -- register_copy 
-  //SEG590 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@8->mode_sixsfred::@8#1] -- register_copy 
-    jmp b8
-  //SEG591 mode_sixsfred::@8
-  b8:
+  //SEG587 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#3 [phi:mode_sixsfred::@6->mode_sixsfred::@7#1] -- register_copy 
+    jmp b7
+  //SEG588 [315] phi from mode_sixsfred::@7 to mode_sixsfred::@7 [phi:mode_sixsfred::@7->mode_sixsfred::@7]
+  b7_from_b7:
+  //SEG589 [315] phi (byte) mode_sixsfred::ax#2 = (byte) mode_sixsfred::ax#1 [phi:mode_sixsfred::@7->mode_sixsfred::@7#0] -- register_copy 
+  //SEG590 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@7->mode_sixsfred::@7#1] -- register_copy 
+    jmp b7
+  //SEG591 mode_sixsfred::@7
+  b7:
   //SEG592 [316] (byte~) mode_sixsfred::$21 ← (byte) mode_sixsfred::ay#4 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_ror_1 
     lda ay
     lsr
@@ -14511,51 +14645,51 @@ mode_sixsfred: {
   !:
   //SEG596 [320] (byte) mode_sixsfred::ax#1 ← ++ (byte) mode_sixsfred::ax#2 -- vbuz1=_inc_vbuz1 
     inc ax
-  //SEG597 [321] if((byte) mode_sixsfred::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG597 [321] if((byte) mode_sixsfred::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp ax
-    bne b8_from_b8
-    jmp b9
-  //SEG598 mode_sixsfred::@9
-  b9:
+    bne b7_from_b7
+    jmp b8
+  //SEG598 mode_sixsfred::@8
+  b8:
   //SEG599 [322] (byte) mode_sixsfred::ay#1 ← ++ (byte) mode_sixsfred::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG600 [323] if((byte) mode_sixsfred::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG600 [323] if((byte) mode_sixsfred::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
-    bne b7_from_b9
-  //SEG601 [324] phi from mode_sixsfred::@9 to mode_sixsfred::@11 [phi:mode_sixsfred::@9->mode_sixsfred::@11]
-  b11_from_b9:
-  //SEG602 [324] phi (byte) mode_sixsfred::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@9->mode_sixsfred::@11#0] -- vbuz1=vbuc1 
+    bne b6_from_b8
+  //SEG601 [324] phi from mode_sixsfred::@8 to mode_sixsfred::@9 [phi:mode_sixsfred::@8->mode_sixsfred::@9]
+  b9_from_b8:
+  //SEG602 [324] phi (byte) mode_sixsfred::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@8->mode_sixsfred::@9#0] -- vbuz1=vbuc1 
     lda #0
     sta by
-  //SEG603 [324] phi (byte*) mode_sixsfred::gfxb#3 = (const byte*) mode_sixsfred::PLANEB#0 [phi:mode_sixsfred::@9->mode_sixsfred::@11#1] -- pbuz1=pbuc1 
+  //SEG603 [324] phi (byte*) mode_sixsfred::gfxb#3 = (const byte*) mode_sixsfred::PLANEB#0 [phi:mode_sixsfred::@8->mode_sixsfred::@9#1] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-    jmp b11
-  //SEG604 [324] phi from mode_sixsfred::@13 to mode_sixsfred::@11 [phi:mode_sixsfred::@13->mode_sixsfred::@11]
-  b11_from_b13:
-  //SEG605 [324] phi (byte) mode_sixsfred::by#4 = (byte) mode_sixsfred::by#1 [phi:mode_sixsfred::@13->mode_sixsfred::@11#0] -- register_copy 
-  //SEG606 [324] phi (byte*) mode_sixsfred::gfxb#3 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@13->mode_sixsfred::@11#1] -- register_copy 
-    jmp b11
-  //SEG607 mode_sixsfred::@11
-  b11:
-  //SEG608 [325] phi from mode_sixsfred::@11 to mode_sixsfred::@12 [phi:mode_sixsfred::@11->mode_sixsfred::@12]
-  b12_from_b11:
-  //SEG609 [325] phi (byte) mode_sixsfred::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@11->mode_sixsfred::@12#0] -- vbuz1=vbuc1 
+    jmp b9
+  //SEG604 [324] phi from mode_sixsfred::@11 to mode_sixsfred::@9 [phi:mode_sixsfred::@11->mode_sixsfred::@9]
+  b9_from_b11:
+  //SEG605 [324] phi (byte) mode_sixsfred::by#4 = (byte) mode_sixsfred::by#1 [phi:mode_sixsfred::@11->mode_sixsfred::@9#0] -- register_copy 
+  //SEG606 [324] phi (byte*) mode_sixsfred::gfxb#3 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@11->mode_sixsfred::@9#1] -- register_copy 
+    jmp b9
+  //SEG607 mode_sixsfred::@9
+  b9:
+  //SEG608 [325] phi from mode_sixsfred::@9 to mode_sixsfred::@10 [phi:mode_sixsfred::@9->mode_sixsfred::@10]
+  b10_from_b9:
+  //SEG609 [325] phi (byte) mode_sixsfred::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@9->mode_sixsfred::@10#0] -- vbuz1=vbuc1 
     lda #0
     sta bx
-  //SEG610 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#3 [phi:mode_sixsfred::@11->mode_sixsfred::@12#1] -- register_copy 
-    jmp b12
-  //SEG611 [325] phi from mode_sixsfred::@12 to mode_sixsfred::@12 [phi:mode_sixsfred::@12->mode_sixsfred::@12]
-  b12_from_b12:
-  //SEG612 [325] phi (byte) mode_sixsfred::bx#2 = (byte) mode_sixsfred::bx#1 [phi:mode_sixsfred::@12->mode_sixsfred::@12#0] -- register_copy 
-  //SEG613 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@12->mode_sixsfred::@12#1] -- register_copy 
-    jmp b12
-  //SEG614 mode_sixsfred::@12
-  b12:
+  //SEG610 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#3 [phi:mode_sixsfred::@9->mode_sixsfred::@10#1] -- register_copy 
+    jmp b10
+  //SEG611 [325] phi from mode_sixsfred::@10 to mode_sixsfred::@10 [phi:mode_sixsfred::@10->mode_sixsfred::@10]
+  b10_from_b10:
+  //SEG612 [325] phi (byte) mode_sixsfred::bx#2 = (byte) mode_sixsfred::bx#1 [phi:mode_sixsfred::@10->mode_sixsfred::@10#0] -- register_copy 
+  //SEG613 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@10->mode_sixsfred::@10#1] -- register_copy 
+    jmp b10
+  //SEG614 mode_sixsfred::@10
+  b10:
   //SEG615 [326] *((byte*) mode_sixsfred::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $1b -- _deref_pbuz1=vbuc1 
     lda #$1b
     ldy #0
@@ -14567,28 +14701,28 @@ mode_sixsfred: {
   !:
   //SEG617 [328] (byte) mode_sixsfred::bx#1 ← ++ (byte) mode_sixsfred::bx#2 -- vbuz1=_inc_vbuz1 
     inc bx
-  //SEG618 [329] if((byte) mode_sixsfred::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@12 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG618 [329] if((byte) mode_sixsfred::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@10 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp bx
-    bne b12_from_b12
-    jmp b13
-  //SEG619 mode_sixsfred::@13
-  b13:
+    bne b10_from_b10
+    jmp b11
+  //SEG619 mode_sixsfred::@11
+  b11:
   //SEG620 [330] (byte) mode_sixsfred::by#1 ← ++ (byte) mode_sixsfred::by#4 -- vbuz1=_inc_vbuz1 
     inc by
-  //SEG621 [331] if((byte) mode_sixsfred::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG621 [331] if((byte) mode_sixsfred::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp by
-    bne b11_from_b13
-  //SEG622 [332] phi from mode_sixsfred::@13 to mode_sixsfred::@14 [phi:mode_sixsfred::@13->mode_sixsfred::@14]
-  b14_from_b13:
-    jmp b14
-  //SEG623 mode_sixsfred::@14
-  b14:
+    bne b9_from_b11
+  //SEG622 [332] phi from mode_sixsfred::@11 to mode_sixsfred::@12 [phi:mode_sixsfred::@11->mode_sixsfred::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG623 mode_sixsfred::@12
+  b12:
   //SEG624 [333] call mode_ctrl 
-  //SEG625 [155] phi from mode_sixsfred::@14 to mode_ctrl [phi:mode_sixsfred::@14->mode_ctrl]
-  mode_ctrl_from_b14:
-  //SEG626 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_sixsfred::@14->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG625 [155] phi from mode_sixsfred::@12 to mode_ctrl [phi:mode_sixsfred::@12->mode_ctrl]
+  mode_ctrl_from_b12:
+  //SEG626 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_sixsfred::@12->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
@@ -14795,49 +14929,49 @@ mode_twoplanebitmap: {
     lda #$19
     cmp cy
     bne b3_from_b5
-  //SEG684 [371] phi from mode_twoplanebitmap::@5 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@7]
-  b7_from_b5:
-  //SEG685 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (const byte*) mode_twoplanebitmap::PLANEA#0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@7#0] -- pbuz1=pbuc1 
+  //SEG684 [371] phi from mode_twoplanebitmap::@5 to mode_twoplanebitmap::@6 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@6]
+  b6_from_b5:
+  //SEG685 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (const byte*) mode_twoplanebitmap::PLANEA#0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@6#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG686 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@7#1] -- vbuz1=vbuc1 
+  //SEG686 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@6#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-    jmp b7
-  //SEG687 [371] phi from mode_twoplanebitmap::@13 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@7]
-  b7_from_b13:
-  //SEG688 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@7#0] -- register_copy 
-  //SEG689 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte) mode_twoplanebitmap::ay#1 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@7#1] -- register_copy 
-    jmp b7
-  //SEG690 mode_twoplanebitmap::@7
-  b7:
-  //SEG691 [372] phi from mode_twoplanebitmap::@7 to mode_twoplanebitmap::@8 [phi:mode_twoplanebitmap::@7->mode_twoplanebitmap::@8]
-  b8_from_b7:
-  //SEG692 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@7->mode_twoplanebitmap::@8#0] -- vbuz1=vbuc1 
+    jmp b6
+  //SEG687 [371] phi from mode_twoplanebitmap::@11 to mode_twoplanebitmap::@6 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@6]
+  b6_from_b11:
+  //SEG688 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@6#0] -- register_copy 
+  //SEG689 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte) mode_twoplanebitmap::ay#1 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@6#1] -- register_copy 
+    jmp b6
+  //SEG690 mode_twoplanebitmap::@6
+  b6:
+  //SEG691 [372] phi from mode_twoplanebitmap::@6 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@6->mode_twoplanebitmap::@7]
+  b7_from_b6:
+  //SEG692 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@6->mode_twoplanebitmap::@7#0] -- vbuz1=vbuc1 
     lda #0
     sta ax
-  //SEG693 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#7 [phi:mode_twoplanebitmap::@7->mode_twoplanebitmap::@8#1] -- register_copy 
-    jmp b8
-  //SEG694 [372] phi from mode_twoplanebitmap::@10 to mode_twoplanebitmap::@8 [phi:mode_twoplanebitmap::@10->mode_twoplanebitmap::@8]
-  b8_from_b10:
-  //SEG695 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte) mode_twoplanebitmap::ax#1 [phi:mode_twoplanebitmap::@10->mode_twoplanebitmap::@8#0] -- register_copy 
-  //SEG696 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@10->mode_twoplanebitmap::@8#1] -- register_copy 
-    jmp b8
-  //SEG697 mode_twoplanebitmap::@8
-  b8:
+  //SEG693 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#7 [phi:mode_twoplanebitmap::@6->mode_twoplanebitmap::@7#1] -- register_copy 
+    jmp b7
+  //SEG694 [372] phi from mode_twoplanebitmap::@9 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@9->mode_twoplanebitmap::@7]
+  b7_from_b9:
+  //SEG695 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte) mode_twoplanebitmap::ax#1 [phi:mode_twoplanebitmap::@9->mode_twoplanebitmap::@7#0] -- register_copy 
+  //SEG696 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@9->mode_twoplanebitmap::@7#1] -- register_copy 
+    jmp b7
+  //SEG697 mode_twoplanebitmap::@7
+  b7:
   //SEG698 [373] (byte~) mode_twoplanebitmap::$22 ← (byte) mode_twoplanebitmap::ay#5 & (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz2_band_vbuc1 
     lda #4
     and ay
     sta _22
-  //SEG699 [374] if((byte~) mode_twoplanebitmap::$22==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_twoplanebitmap::@9 -- vbuz1_eq_0_then_la1 
+  //SEG699 [374] if((byte~) mode_twoplanebitmap::$22==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_twoplanebitmap::@8 -- vbuz1_eq_0_then_la1 
     lda _22
     cmp #0
-    beq b9
-    jmp b11
-  //SEG700 mode_twoplanebitmap::@11
-  b11:
+    beq b8
+    jmp b10
+  //SEG700 mode_twoplanebitmap::@10
+  b10:
   //SEG701 [375] *((byte*) mode_twoplanebitmap::gfxa#3) ← (byte/word/signed word/dword/signed dword) $ff -- _deref_pbuz1=vbuc1 
     lda #$ff
     ldy #0
@@ -14847,60 +14981,60 @@ mode_twoplanebitmap: {
     bne !+
     inc gfxa+1
   !:
-  //SEG703 [377] phi from mode_twoplanebitmap::@11 mode_twoplanebitmap::@9 to mode_twoplanebitmap::@10 [phi:mode_twoplanebitmap::@11/mode_twoplanebitmap::@9->mode_twoplanebitmap::@10]
-  b10_from_b11:
-  b10_from_b9:
-  //SEG704 [377] phi (byte*) mode_twoplanebitmap::gfxa#6 = (byte*) mode_twoplanebitmap::gfxa#2 [phi:mode_twoplanebitmap::@11/mode_twoplanebitmap::@9->mode_twoplanebitmap::@10#0] -- register_copy 
-    jmp b10
-  //SEG705 mode_twoplanebitmap::@10
-  b10:
+  //SEG703 [377] phi from mode_twoplanebitmap::@10 mode_twoplanebitmap::@8 to mode_twoplanebitmap::@9 [phi:mode_twoplanebitmap::@10/mode_twoplanebitmap::@8->mode_twoplanebitmap::@9]
+  b9_from_b10:
+  b9_from_b8:
+  //SEG704 [377] phi (byte*) mode_twoplanebitmap::gfxa#6 = (byte*) mode_twoplanebitmap::gfxa#2 [phi:mode_twoplanebitmap::@10/mode_twoplanebitmap::@8->mode_twoplanebitmap::@9#0] -- register_copy 
+    jmp b9
+  //SEG705 mode_twoplanebitmap::@9
+  b9:
   //SEG706 [378] (byte) mode_twoplanebitmap::ax#1 ← ++ (byte) mode_twoplanebitmap::ax#2 -- vbuz1=_inc_vbuz1 
     inc ax
-  //SEG707 [379] if((byte) mode_twoplanebitmap::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG707 [379] if((byte) mode_twoplanebitmap::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp ax
-    bne b8_from_b10
-    jmp b13
-  //SEG708 mode_twoplanebitmap::@13
-  b13:
+    bne b7_from_b9
+    jmp b11
+  //SEG708 mode_twoplanebitmap::@11
+  b11:
   //SEG709 [380] (byte) mode_twoplanebitmap::ay#1 ← ++ (byte) mode_twoplanebitmap::ay#5 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG710 [381] if((byte) mode_twoplanebitmap::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG710 [381] if((byte) mode_twoplanebitmap::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
-    bne b7_from_b13
-  //SEG711 [382] phi from mode_twoplanebitmap::@13 to mode_twoplanebitmap::@15 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@15]
-  b15_from_b13:
-  //SEG712 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@15#0] -- vbuz1=vbuc1 
+    bne b6_from_b11
+  //SEG711 [382] phi from mode_twoplanebitmap::@11 to mode_twoplanebitmap::@12 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@12]
+  b12_from_b11:
+  //SEG712 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@12#0] -- vbuz1=vbuc1 
     lda #0
     sta by
-  //SEG713 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (const byte*) mode_twoplanebitmap::PLANEB#0 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@15#1] -- pbuz1=pbuc1 
+  //SEG713 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (const byte*) mode_twoplanebitmap::PLANEB#0 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@12#1] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-    jmp b15
-  //SEG714 [382] phi from mode_twoplanebitmap::@17 to mode_twoplanebitmap::@15 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@15]
-  b15_from_b17:
-  //SEG715 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte) mode_twoplanebitmap::by#1 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@15#0] -- register_copy 
-  //SEG716 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@15#1] -- register_copy 
-    jmp b15
-  //SEG717 mode_twoplanebitmap::@15
-  b15:
-  //SEG718 [383] phi from mode_twoplanebitmap::@15 to mode_twoplanebitmap::@16 [phi:mode_twoplanebitmap::@15->mode_twoplanebitmap::@16]
-  b16_from_b15:
-  //SEG719 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@15->mode_twoplanebitmap::@16#0] -- vbuz1=vbuc1 
+    jmp b12
+  //SEG714 [382] phi from mode_twoplanebitmap::@14 to mode_twoplanebitmap::@12 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@12]
+  b12_from_b14:
+  //SEG715 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte) mode_twoplanebitmap::by#1 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@12#0] -- register_copy 
+  //SEG716 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@12#1] -- register_copy 
+    jmp b12
+  //SEG717 mode_twoplanebitmap::@12
+  b12:
+  //SEG718 [383] phi from mode_twoplanebitmap::@12 to mode_twoplanebitmap::@13 [phi:mode_twoplanebitmap::@12->mode_twoplanebitmap::@13]
+  b13_from_b12:
+  //SEG719 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@12->mode_twoplanebitmap::@13#0] -- vbuz1=vbuc1 
     lda #0
     sta bx
-  //SEG720 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#3 [phi:mode_twoplanebitmap::@15->mode_twoplanebitmap::@16#1] -- register_copy 
-    jmp b16
-  //SEG721 [383] phi from mode_twoplanebitmap::@16 to mode_twoplanebitmap::@16 [phi:mode_twoplanebitmap::@16->mode_twoplanebitmap::@16]
-  b16_from_b16:
-  //SEG722 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte) mode_twoplanebitmap::bx#1 [phi:mode_twoplanebitmap::@16->mode_twoplanebitmap::@16#0] -- register_copy 
-  //SEG723 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@16->mode_twoplanebitmap::@16#1] -- register_copy 
-    jmp b16
-  //SEG724 mode_twoplanebitmap::@16
-  b16:
+  //SEG720 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#3 [phi:mode_twoplanebitmap::@12->mode_twoplanebitmap::@13#1] -- register_copy 
+    jmp b13
+  //SEG721 [383] phi from mode_twoplanebitmap::@13 to mode_twoplanebitmap::@13 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@13]
+  b13_from_b13:
+  //SEG722 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte) mode_twoplanebitmap::bx#1 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@13#0] -- register_copy 
+  //SEG723 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@13#1] -- register_copy 
+    jmp b13
+  //SEG724 mode_twoplanebitmap::@13
+  b13:
   //SEG725 [384] *((byte*) mode_twoplanebitmap::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $f -- _deref_pbuz1=vbuc1 
     lda #$f
     ldy #0
@@ -14912,28 +15046,28 @@ mode_twoplanebitmap: {
   !:
   //SEG727 [386] (byte) mode_twoplanebitmap::bx#1 ← ++ (byte) mode_twoplanebitmap::bx#2 -- vbuz1=_inc_vbuz1 
     inc bx
-  //SEG728 [387] if((byte) mode_twoplanebitmap::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@16 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG728 [387] if((byte) mode_twoplanebitmap::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@13 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp bx
-    bne b16_from_b16
-    jmp b17
-  //SEG729 mode_twoplanebitmap::@17
-  b17:
+    bne b13_from_b13
+    jmp b14
+  //SEG729 mode_twoplanebitmap::@14
+  b14:
   //SEG730 [388] (byte) mode_twoplanebitmap::by#1 ← ++ (byte) mode_twoplanebitmap::by#4 -- vbuz1=_inc_vbuz1 
     inc by
-  //SEG731 [389] if((byte) mode_twoplanebitmap::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@15 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG731 [389] if((byte) mode_twoplanebitmap::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@12 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp by
-    bne b15_from_b17
-  //SEG732 [390] phi from mode_twoplanebitmap::@17 to mode_twoplanebitmap::@18 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG733 mode_twoplanebitmap::@18
-  b18:
+    bne b12_from_b14
+  //SEG732 [390] phi from mode_twoplanebitmap::@14 to mode_twoplanebitmap::@15 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@15]
+  b15_from_b14:
+    jmp b15
+  //SEG733 mode_twoplanebitmap::@15
+  b15:
   //SEG734 [391] call mode_ctrl 
-  //SEG735 [155] phi from mode_twoplanebitmap::@18 to mode_ctrl [phi:mode_twoplanebitmap::@18->mode_ctrl]
-  mode_ctrl_from_b18:
-  //SEG736 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_twoplanebitmap::@18->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG735 [155] phi from mode_twoplanebitmap::@15 to mode_ctrl [phi:mode_twoplanebitmap::@15->mode_ctrl]
+  mode_ctrl_from_b15:
+  //SEG736 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_twoplanebitmap::@15->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
@@ -14942,8 +15076,8 @@ mode_twoplanebitmap: {
   breturn:
   //SEG738 [392] return 
     rts
-  //SEG739 mode_twoplanebitmap::@9
-  b9:
+  //SEG739 mode_twoplanebitmap::@8
+  b8:
   //SEG740 [393] *((byte*) mode_twoplanebitmap::gfxa#3) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuz1=vbuc1 
     lda #0
     ldy #0
@@ -14953,7 +15087,7 @@ mode_twoplanebitmap: {
     bne !+
     inc gfxa+1
   !:
-    jmp b10_from_b9
+    jmp b9_from_b8
 }
 //SEG742 mode_sixsfred2
 // Sixs Fred Mode 2 - 8bpp Packed Bitmap - Generated from the two DTV linear graphics plane counters
@@ -15142,38 +15276,38 @@ mode_sixsfred2: {
     lda #$19
     cmp cy
     bne b3_from_b5
-  //SEG795 [429] phi from mode_sixsfred2::@5 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@5->mode_sixsfred2::@7]
-  b7_from_b5:
-  //SEG796 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (const byte*) mode_sixsfred2::PLANEA#0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@7#0] -- pbuz1=pbuc1 
+  //SEG795 [429] phi from mode_sixsfred2::@5 to mode_sixsfred2::@6 [phi:mode_sixsfred2::@5->mode_sixsfred2::@6]
+  b6_from_b5:
+  //SEG796 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (const byte*) mode_sixsfred2::PLANEA#0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@6#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG797 [429] phi (byte) mode_sixsfred2::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@7#1] -- vbuz1=vbuc1 
+  //SEG797 [429] phi (byte) mode_sixsfred2::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@6#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-    jmp b7
-  //SEG798 [429] phi from mode_sixsfred2::@9 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@9->mode_sixsfred2::@7]
-  b7_from_b9:
-  //SEG799 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@9->mode_sixsfred2::@7#0] -- register_copy 
-  //SEG800 [429] phi (byte) mode_sixsfred2::ay#4 = (byte) mode_sixsfred2::ay#1 [phi:mode_sixsfred2::@9->mode_sixsfred2::@7#1] -- register_copy 
-    jmp b7
-  //SEG801 mode_sixsfred2::@7
-  b7:
-  //SEG802 [430] phi from mode_sixsfred2::@7 to mode_sixsfred2::@8 [phi:mode_sixsfred2::@7->mode_sixsfred2::@8]
-  b8_from_b7:
-  //SEG803 [430] phi (byte) mode_sixsfred2::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@7->mode_sixsfred2::@8#0] -- vbuz1=vbuc1 
+    jmp b6
+  //SEG798 [429] phi from mode_sixsfred2::@8 to mode_sixsfred2::@6 [phi:mode_sixsfred2::@8->mode_sixsfred2::@6]
+  b6_from_b8:
+  //SEG799 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@6#0] -- register_copy 
+  //SEG800 [429] phi (byte) mode_sixsfred2::ay#4 = (byte) mode_sixsfred2::ay#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@6#1] -- register_copy 
+    jmp b6
+  //SEG801 mode_sixsfred2::@6
+  b6:
+  //SEG802 [430] phi from mode_sixsfred2::@6 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@6->mode_sixsfred2::@7]
+  b7_from_b6:
+  //SEG803 [430] phi (byte) mode_sixsfred2::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@6->mode_sixsfred2::@7#0] -- vbuz1=vbuc1 
     lda #0
     sta ax
-  //SEG804 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#3 [phi:mode_sixsfred2::@7->mode_sixsfred2::@8#1] -- register_copy 
-    jmp b8
-  //SEG805 [430] phi from mode_sixsfred2::@8 to mode_sixsfred2::@8 [phi:mode_sixsfred2::@8->mode_sixsfred2::@8]
-  b8_from_b8:
-  //SEG806 [430] phi (byte) mode_sixsfred2::ax#2 = (byte) mode_sixsfred2::ax#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@8#0] -- register_copy 
-  //SEG807 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@8#1] -- register_copy 
-    jmp b8
-  //SEG808 mode_sixsfred2::@8
-  b8:
+  //SEG804 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#3 [phi:mode_sixsfred2::@6->mode_sixsfred2::@7#1] -- register_copy 
+    jmp b7
+  //SEG805 [430] phi from mode_sixsfred2::@7 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@7->mode_sixsfred2::@7]
+  b7_from_b7:
+  //SEG806 [430] phi (byte) mode_sixsfred2::ax#2 = (byte) mode_sixsfred2::ax#1 [phi:mode_sixsfred2::@7->mode_sixsfred2::@7#0] -- register_copy 
+  //SEG807 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@7->mode_sixsfred2::@7#1] -- register_copy 
+    jmp b7
+  //SEG808 mode_sixsfred2::@7
+  b7:
   //SEG809 [431] (byte~) mode_sixsfred2::$21 ← (byte) mode_sixsfred2::ay#4 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_ror_1 
     lda ay
     lsr
@@ -15194,51 +15328,51 @@ mode_sixsfred2: {
   !:
   //SEG813 [435] (byte) mode_sixsfred2::ax#1 ← ++ (byte) mode_sixsfred2::ax#2 -- vbuz1=_inc_vbuz1 
     inc ax
-  //SEG814 [436] if((byte) mode_sixsfred2::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG814 [436] if((byte) mode_sixsfred2::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp ax
-    bne b8_from_b8
-    jmp b9
-  //SEG815 mode_sixsfred2::@9
-  b9:
+    bne b7_from_b7
+    jmp b8
+  //SEG815 mode_sixsfred2::@8
+  b8:
   //SEG816 [437] (byte) mode_sixsfred2::ay#1 ← ++ (byte) mode_sixsfred2::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG817 [438] if((byte) mode_sixsfred2::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG817 [438] if((byte) mode_sixsfred2::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
-    bne b7_from_b9
-  //SEG818 [439] phi from mode_sixsfred2::@9 to mode_sixsfred2::@11 [phi:mode_sixsfred2::@9->mode_sixsfred2::@11]
-  b11_from_b9:
-  //SEG819 [439] phi (byte) mode_sixsfred2::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@9->mode_sixsfred2::@11#0] -- vbuz1=vbuc1 
+    bne b6_from_b8
+  //SEG818 [439] phi from mode_sixsfred2::@8 to mode_sixsfred2::@9 [phi:mode_sixsfred2::@8->mode_sixsfred2::@9]
+  b9_from_b8:
+  //SEG819 [439] phi (byte) mode_sixsfred2::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@8->mode_sixsfred2::@9#0] -- vbuz1=vbuc1 
     lda #0
     sta by
-  //SEG820 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (const byte*) mode_sixsfred2::PLANEB#0 [phi:mode_sixsfred2::@9->mode_sixsfred2::@11#1] -- pbuz1=pbuc1 
+  //SEG820 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (const byte*) mode_sixsfred2::PLANEB#0 [phi:mode_sixsfred2::@8->mode_sixsfred2::@9#1] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-    jmp b11
-  //SEG821 [439] phi from mode_sixsfred2::@13 to mode_sixsfred2::@11 [phi:mode_sixsfred2::@13->mode_sixsfred2::@11]
-  b11_from_b13:
-  //SEG822 [439] phi (byte) mode_sixsfred2::by#4 = (byte) mode_sixsfred2::by#1 [phi:mode_sixsfred2::@13->mode_sixsfred2::@11#0] -- register_copy 
-  //SEG823 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@13->mode_sixsfred2::@11#1] -- register_copy 
-    jmp b11
-  //SEG824 mode_sixsfred2::@11
-  b11:
-  //SEG825 [440] phi from mode_sixsfred2::@11 to mode_sixsfred2::@12 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12]
-  b12_from_b11:
-  //SEG826 [440] phi (byte) mode_sixsfred2::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12#0] -- vbuz1=vbuc1 
+    jmp b9
+  //SEG821 [439] phi from mode_sixsfred2::@11 to mode_sixsfred2::@9 [phi:mode_sixsfred2::@11->mode_sixsfred2::@9]
+  b9_from_b11:
+  //SEG822 [439] phi (byte) mode_sixsfred2::by#4 = (byte) mode_sixsfred2::by#1 [phi:mode_sixsfred2::@11->mode_sixsfred2::@9#0] -- register_copy 
+  //SEG823 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@11->mode_sixsfred2::@9#1] -- register_copy 
+    jmp b9
+  //SEG824 mode_sixsfred2::@9
+  b9:
+  //SEG825 [440] phi from mode_sixsfred2::@9 to mode_sixsfred2::@10 [phi:mode_sixsfred2::@9->mode_sixsfred2::@10]
+  b10_from_b9:
+  //SEG826 [440] phi (byte) mode_sixsfred2::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@9->mode_sixsfred2::@10#0] -- vbuz1=vbuc1 
     lda #0
     sta bx
-  //SEG827 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#3 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12#1] -- register_copy 
-    jmp b12
-  //SEG828 [440] phi from mode_sixsfred2::@12 to mode_sixsfred2::@12 [phi:mode_sixsfred2::@12->mode_sixsfred2::@12]
-  b12_from_b12:
-  //SEG829 [440] phi (byte) mode_sixsfred2::bx#2 = (byte) mode_sixsfred2::bx#1 [phi:mode_sixsfred2::@12->mode_sixsfred2::@12#0] -- register_copy 
-  //SEG830 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@12->mode_sixsfred2::@12#1] -- register_copy 
-    jmp b12
-  //SEG831 mode_sixsfred2::@12
-  b12:
+  //SEG827 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#3 [phi:mode_sixsfred2::@9->mode_sixsfred2::@10#1] -- register_copy 
+    jmp b10
+  //SEG828 [440] phi from mode_sixsfred2::@10 to mode_sixsfred2::@10 [phi:mode_sixsfred2::@10->mode_sixsfred2::@10]
+  b10_from_b10:
+  //SEG829 [440] phi (byte) mode_sixsfred2::bx#2 = (byte) mode_sixsfred2::bx#1 [phi:mode_sixsfred2::@10->mode_sixsfred2::@10#0] -- register_copy 
+  //SEG830 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@10->mode_sixsfred2::@10#1] -- register_copy 
+    jmp b10
+  //SEG831 mode_sixsfred2::@10
+  b10:
   //SEG832 [441] *((byte*) mode_sixsfred2::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $1b -- _deref_pbuz1=vbuc1 
     lda #$1b
     ldy #0
@@ -15250,28 +15384,28 @@ mode_sixsfred2: {
   !:
   //SEG834 [443] (byte) mode_sixsfred2::bx#1 ← ++ (byte) mode_sixsfred2::bx#2 -- vbuz1=_inc_vbuz1 
     inc bx
-  //SEG835 [444] if((byte) mode_sixsfred2::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@12 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG835 [444] if((byte) mode_sixsfred2::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@10 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp bx
-    bne b12_from_b12
-    jmp b13
-  //SEG836 mode_sixsfred2::@13
-  b13:
+    bne b10_from_b10
+    jmp b11
+  //SEG836 mode_sixsfred2::@11
+  b11:
   //SEG837 [445] (byte) mode_sixsfred2::by#1 ← ++ (byte) mode_sixsfred2::by#4 -- vbuz1=_inc_vbuz1 
     inc by
-  //SEG838 [446] if((byte) mode_sixsfred2::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG838 [446] if((byte) mode_sixsfred2::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp by
-    bne b11_from_b13
-  //SEG839 [447] phi from mode_sixsfred2::@13 to mode_sixsfred2::@14 [phi:mode_sixsfred2::@13->mode_sixsfred2::@14]
-  b14_from_b13:
-    jmp b14
-  //SEG840 mode_sixsfred2::@14
-  b14:
+    bne b9_from_b11
+  //SEG839 [447] phi from mode_sixsfred2::@11 to mode_sixsfred2::@12 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG840 mode_sixsfred2::@12
+  b12:
   //SEG841 [448] call mode_ctrl 
-  //SEG842 [155] phi from mode_sixsfred2::@14 to mode_ctrl [phi:mode_sixsfred2::@14->mode_ctrl]
-  mode_ctrl_from_b14:
-  //SEG843 [155] phi (byte) dtv_control#145 = (const byte) DTV_LINEAR#0 [phi:mode_sixsfred2::@14->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG842 [155] phi from mode_sixsfred2::@12 to mode_ctrl [phi:mode_sixsfred2::@12->mode_ctrl]
+  mode_ctrl_from_b12:
+  //SEG843 [155] phi (byte) dtv_control#145 = (const byte) DTV_LINEAR#0 [phi:mode_sixsfred2::@12->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
@@ -16088,9 +16222,9 @@ mode_stdbitmap: {
     lda #0
     sta l
     jmp b7
-  //SEG1082 [581] phi from mode_stdbitmap::@11 to mode_stdbitmap::@7 [phi:mode_stdbitmap::@11->mode_stdbitmap::@7]
-  b7_from_b11:
-  //SEG1083 [581] phi (byte) mode_stdbitmap::l#2 = (byte) mode_stdbitmap::l#1 [phi:mode_stdbitmap::@11->mode_stdbitmap::@7#0] -- register_copy 
+  //SEG1082 [581] phi from mode_stdbitmap::@10 to mode_stdbitmap::@7 [phi:mode_stdbitmap::@10->mode_stdbitmap::@7]
+  b7_from_b10:
+  //SEG1083 [581] phi (byte) mode_stdbitmap::l#2 = (byte) mode_stdbitmap::l#1 [phi:mode_stdbitmap::@10->mode_stdbitmap::@7#0] -- register_copy 
     jmp b7
   //SEG1084 mode_stdbitmap::@7
   b7:
@@ -16112,17 +16246,17 @@ mode_stdbitmap: {
     sta bitmap_line.y1
   //SEG1089 [586] call bitmap_line 
     jsr bitmap_line
-    jmp b11
-  //SEG1090 mode_stdbitmap::@11
-  b11:
+    jmp b10
+  //SEG1090 mode_stdbitmap::@10
+  b10:
   //SEG1091 [587] (byte) mode_stdbitmap::l#1 ← ++ (byte) mode_stdbitmap::l#2 -- vbuz1=_inc_vbuz1 
     inc l
   //SEG1092 [588] if((byte) mode_stdbitmap::l#1<(const byte) mode_stdbitmap::lines_cnt#0) goto mode_stdbitmap::@7 -- vbuz1_lt_vbuc1_then_la1 
     lda l
     cmp #lines_cnt
-    bcc b7_from_b11
-  //SEG1093 [589] phi from mode_stdbitmap::@11 to mode_stdbitmap::@8 [phi:mode_stdbitmap::@11->mode_stdbitmap::@8]
-  b8_from_b11:
+    bcc b7_from_b10
+  //SEG1093 [589] phi from mode_stdbitmap::@10 to mode_stdbitmap::@8 [phi:mode_stdbitmap::@10->mode_stdbitmap::@8]
+  b8_from_b10:
     jmp b8
   //SEG1094 mode_stdbitmap::@8
   b8:
@@ -16159,33 +16293,33 @@ bitmap_line: {
     lda x0
     cmp x1
     bcc b1
-    jmp b3
-  //SEG1102 bitmap_line::@3
-  b3:
+    jmp b2
+  //SEG1102 bitmap_line::@2
+  b2:
   //SEG1103 [593] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda x0
     sec
     sbc x1
     sta xd_2
-  //SEG1104 [594] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1104 [594] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b10
-    jmp b4
-  //SEG1105 bitmap_line::@4
-  b4:
+    bcc b7
+    jmp b3
+  //SEG1105 bitmap_line::@3
+  b3:
   //SEG1106 [595] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y0
     sec
     sbc y1
     sta yd_2
-  //SEG1107 [596] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1107 [596] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8 -- vbuz1_lt_vbuz2_then_la1 
     lda yd_2
     cmp xd_2
-    bcc b11
-    jmp b5
-  //SEG1108 bitmap_line::@5
-  b5:
+    bcc b8
+    jmp b4
+  //SEG1108 bitmap_line::@4
+  b4:
   //SEG1109 [597] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxi.y
@@ -16202,21 +16336,21 @@ bitmap_line: {
     lda xd_2
     sta bitmap_line_ydxi.xd
   //SEG1114 [602] call bitmap_line_ydxi 
-  //SEG1115 [676] phi from bitmap_line::@5 to bitmap_line_ydxi [phi:bitmap_line::@5->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b5:
-  //SEG1116 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@5->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1117 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1118 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@5->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1119 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@5->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1120 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1115 [676] phi from bitmap_line::@4 to bitmap_line_ydxi [phi:bitmap_line::@4->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b4:
+  //SEG1116 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@4->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1117 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1118 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@4->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1119 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@4->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1120 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
   //SEG1121 bitmap_line::@return
   breturn:
   //SEG1122 [603] return 
     rts
-  //SEG1123 bitmap_line::@11
-  b11:
+  //SEG1123 bitmap_line::@8
+  b8:
   //SEG1124 [604] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuz2 
     lda x1
     sta bitmap_line_xdyi.x
@@ -16233,29 +16367,29 @@ bitmap_line: {
     lda yd_2
     sta bitmap_line_xdyi.yd
   //SEG1129 [609] call bitmap_line_xdyi 
-  //SEG1130 [654] phi from bitmap_line::@11 to bitmap_line_xdyi [phi:bitmap_line::@11->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b11:
-  //SEG1131 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@11->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1132 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1133 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@11->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1134 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@11->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1135 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1130 [654] phi from bitmap_line::@8 to bitmap_line_xdyi [phi:bitmap_line::@8->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b8:
+  //SEG1131 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@8->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1132 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1133 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@8->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1134 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@8->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1135 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
-  //SEG1136 bitmap_line::@10
-  b10:
+  //SEG1136 bitmap_line::@7
+  b7:
   //SEG1137 [610] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y1
     sec
     sbc y0
     sta yd
-  //SEG1138 [611] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1138 [611] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9 -- vbuz1_lt_vbuz2_then_la1 
     lda yd
     cmp xd_2
-    bcc b15
-    jmp b17
-  //SEG1139 bitmap_line::@17
-  b17:
+    bcc b9
+    jmp b10
+  //SEG1139 bitmap_line::@10
+  b10:
   //SEG1140 [612] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxd.y
@@ -16272,17 +16406,17 @@ bitmap_line: {
     lda xd_2
     sta bitmap_line_ydxd.xd
   //SEG1145 [617] call bitmap_line_ydxd 
-  //SEG1146 [706] phi from bitmap_line::@17 to bitmap_line_ydxd [phi:bitmap_line::@17->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b17:
-  //SEG1147 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@17->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1148 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1149 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@17->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1150 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@17->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1151 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1146 [706] phi from bitmap_line::@10 to bitmap_line_ydxd [phi:bitmap_line::@10->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b10:
+  //SEG1147 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@10->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1148 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1149 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@10->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1150 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@10->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1151 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1152 bitmap_line::@15
-  b15:
+  //SEG1152 bitmap_line::@9
+  b9:
   //SEG1153 [618] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuz2 
     lda x1
     sta bitmap_line_xdyd.x
@@ -16299,13 +16433,13 @@ bitmap_line: {
     lda yd
     sta bitmap_line_xdyd.yd
   //SEG1158 [623] call bitmap_line_xdyd 
-  //SEG1159 [691] phi from bitmap_line::@15 to bitmap_line_xdyd [phi:bitmap_line::@15->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b15:
-  //SEG1160 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@15->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1161 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1162 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@15->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1163 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@15->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1164 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1159 [691] phi from bitmap_line::@9 to bitmap_line_xdyd [phi:bitmap_line::@9->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b9:
+  //SEG1160 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@9->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1161 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1162 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@9->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1163 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@9->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1164 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
   //SEG1165 bitmap_line::@1
@@ -16315,25 +16449,25 @@ bitmap_line: {
     sec
     sbc x0
     sta xd
-  //SEG1167 [625] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1167 [625] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b20
-    jmp b7
-  //SEG1168 bitmap_line::@7
-  b7:
+    bcc b11
+    jmp b5
+  //SEG1168 bitmap_line::@5
+  b5:
   //SEG1169 [626] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y0
     sec
     sbc y1
     sta yd_10
-  //SEG1170 [627] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1170 [627] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12 -- vbuz1_lt_vbuz2_then_la1 
     lda yd_10
     cmp xd
-    bcc b21
-    jmp b8
-  //SEG1171 bitmap_line::@8
-  b8:
+    bcc b12
+    jmp b6
+  //SEG1171 bitmap_line::@6
+  b6:
   //SEG1172 [628] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxd.y
@@ -16350,17 +16484,17 @@ bitmap_line: {
     lda xd
     sta bitmap_line_ydxd.xd
   //SEG1177 [633] call bitmap_line_ydxd 
-  //SEG1178 [706] phi from bitmap_line::@8 to bitmap_line_ydxd [phi:bitmap_line::@8->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b8:
-  //SEG1179 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@8->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1180 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1181 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@8->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1182 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@8->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1183 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1178 [706] phi from bitmap_line::@6 to bitmap_line_ydxd [phi:bitmap_line::@6->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b6:
+  //SEG1179 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@6->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1180 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1181 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@6->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1182 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@6->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1183 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1184 bitmap_line::@21
-  b21:
+  //SEG1184 bitmap_line::@12
+  b12:
   //SEG1185 [634] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyd.x
@@ -16377,29 +16511,29 @@ bitmap_line: {
     lda yd_10
     sta bitmap_line_xdyd.yd
   //SEG1190 [639] call bitmap_line_xdyd 
-  //SEG1191 [691] phi from bitmap_line::@21 to bitmap_line_xdyd [phi:bitmap_line::@21->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b21:
-  //SEG1192 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@21->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1193 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1194 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@21->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1195 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@21->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1196 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1191 [691] phi from bitmap_line::@12 to bitmap_line_xdyd [phi:bitmap_line::@12->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b12:
+  //SEG1192 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@12->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1193 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1194 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@12->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1195 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@12->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1196 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
-  //SEG1197 bitmap_line::@20
-  b20:
+  //SEG1197 bitmap_line::@11
+  b11:
   //SEG1198 [640] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y1
     sec
     sbc y0
     sta yd_11
-  //SEG1199 [641] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1199 [641] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13 -- vbuz1_lt_vbuz2_then_la1 
     lda yd_11
     cmp xd
-    bcc b25
-    jmp b27
-  //SEG1200 bitmap_line::@27
-  b27:
+    bcc b13
+    jmp b14
+  //SEG1200 bitmap_line::@14
+  b14:
   //SEG1201 [642] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxi.y
@@ -16416,17 +16550,17 @@ bitmap_line: {
     lda xd
     sta bitmap_line_ydxi.xd
   //SEG1206 [647] call bitmap_line_ydxi 
-  //SEG1207 [676] phi from bitmap_line::@27 to bitmap_line_ydxi [phi:bitmap_line::@27->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b27:
-  //SEG1208 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@27->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1209 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1210 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@27->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1211 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@27->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1212 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1207 [676] phi from bitmap_line::@14 to bitmap_line_ydxi [phi:bitmap_line::@14->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b14:
+  //SEG1208 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@14->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1209 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1210 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@14->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1211 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@14->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1212 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
-  //SEG1213 bitmap_line::@25
-  b25:
+  //SEG1213 bitmap_line::@13
+  b13:
   //SEG1214 [648] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyi.x
@@ -16443,13 +16577,13 @@ bitmap_line: {
     lda yd_11
     sta bitmap_line_xdyi.yd
   //SEG1219 [653] call bitmap_line_xdyi 
-  //SEG1220 [654] phi from bitmap_line::@25 to bitmap_line_xdyi [phi:bitmap_line::@25->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b25:
-  //SEG1221 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@25->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1222 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1223 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@25->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1224 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@25->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1225 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1220 [654] phi from bitmap_line::@13 to bitmap_line_xdyi [phi:bitmap_line::@13->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b13:
+  //SEG1221 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@13->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1222 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1223 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@13->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1224 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@13->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1225 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
 }
@@ -16488,9 +16622,9 @@ bitmap_line_xdyi: {
   //SEG1237 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#0] -- register_copy 
   //SEG1238 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1239 bitmap_line_xdyi::@5
-  b5:
+    jmp b4
+  //SEG1239 bitmap_line_xdyi::@4
+  b4:
   //SEG1240 [660] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1241 [661] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -16501,7 +16635,7 @@ bitmap_line_xdyi: {
   //SEG1242 [662] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1243 bitmap_line_xdyi::@3
   b3:
@@ -16512,11 +16646,11 @@ bitmap_line_xdyi: {
     sec
     sbc xd
     sta e
-  //SEG1246 [665] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2]
+  //SEG1246 [665] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1247 [665] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#0] -- register_copy 
-  //SEG1248 [665] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1247 [665] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#0] -- register_copy 
+  //SEG1248 [665] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#1] -- register_copy 
     jmp b2
   //SEG1249 bitmap_line_xdyi::@2
   b2:
@@ -16614,9 +16748,9 @@ bitmap_line_ydxi: {
   //SEG1273 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#0] -- register_copy 
   //SEG1274 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1275 bitmap_line_ydxi::@5
-  b5:
+    jmp b4
+  //SEG1275 bitmap_line_ydxi::@4
+  b4:
   //SEG1276 [682] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1277 [683] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -16627,7 +16761,7 @@ bitmap_line_ydxi: {
   //SEG1278 [684] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1279 bitmap_line_ydxi::@3
   b3:
@@ -16638,11 +16772,11 @@ bitmap_line_ydxi: {
     sec
     sbc yd
     sta e
-  //SEG1282 [687] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2]
+  //SEG1282 [687] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1283 [687] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#0] -- register_copy 
-  //SEG1284 [687] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1283 [687] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#0] -- register_copy 
+  //SEG1284 [687] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#1] -- register_copy 
     jmp b2
   //SEG1285 bitmap_line_ydxi::@2
   b2:
@@ -16695,9 +16829,9 @@ bitmap_line_xdyd: {
   //SEG1301 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#0] -- register_copy 
   //SEG1302 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1303 bitmap_line_xdyd::@5
-  b5:
+    jmp b4
+  //SEG1303 bitmap_line_xdyd::@4
+  b4:
   //SEG1304 [697] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1305 [698] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -16708,7 +16842,7 @@ bitmap_line_xdyd: {
   //SEG1306 [699] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1307 bitmap_line_xdyd::@3
   b3:
@@ -16719,11 +16853,11 @@ bitmap_line_xdyd: {
     sec
     sbc xd
     sta e
-  //SEG1310 [702] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2]
+  //SEG1310 [702] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1311 [702] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#0] -- register_copy 
-  //SEG1312 [702] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1311 [702] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#0] -- register_copy 
+  //SEG1312 [702] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#1] -- register_copy 
     jmp b2
   //SEG1313 bitmap_line_xdyd::@2
   b2:
@@ -16776,9 +16910,9 @@ bitmap_line_ydxd: {
   //SEG1329 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#0] -- register_copy 
   //SEG1330 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1331 bitmap_line_ydxd::@5
-  b5:
+    jmp b4
+  //SEG1331 bitmap_line_ydxd::@4
+  b4:
   //SEG1332 [712] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1333 [713] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -16789,7 +16923,7 @@ bitmap_line_ydxd: {
   //SEG1334 [714] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1335 bitmap_line_ydxd::@3
   b3:
@@ -16800,11 +16934,11 @@ bitmap_line_ydxd: {
     sec
     sbc yd
     sta e
-  //SEG1338 [717] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2]
+  //SEG1338 [717] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1339 [717] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#0] -- register_copy 
-  //SEG1340 [717] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1339 [717] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#0] -- register_copy 
+  //SEG1340 [717] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#1] -- register_copy 
     jmp b2
   //SEG1341 bitmap_line_ydxd::@2
   b2:
@@ -16944,10 +17078,10 @@ bitmap_init: {
     sta bitmap_plot_bit,y
   //SEG1384 [738] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr bits
-  //SEG1385 [739] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuz1_neq_0_then_la1 
+  //SEG1385 [739] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuz1_neq_0_then_la1 
     lda bits
     cmp #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG1386 [740] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
   b2_from_b1:
   //SEG1387 [740] phi (byte) bitmap_init::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:bitmap_init::@1->bitmap_init::@2#0] -- vbuz1=vbuc1 
@@ -16962,24 +17096,24 @@ bitmap_init: {
     lda x
     cmp #0
     bne b1_from_b2
-  //SEG1391 [743] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  b5_from_b2:
-  //SEG1392 [743] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG1391 [743] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  b3_from_b2:
+  //SEG1392 [743] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     lda #>0
     sta yoffs+1
-  //SEG1393 [743] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuz1=vbuc1 
+  //SEG1393 [743] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuz1=vbuc1 
     lda #0
     sta y
-    jmp b5
-  //SEG1394 [743] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  b5_from_b6:
-  //SEG1395 [743] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG1396 [743] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-    jmp b5
-  //SEG1397 bitmap_init::@5
-  b5:
+    jmp b3
+  //SEG1394 [743] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  b3_from_b4:
+  //SEG1395 [743] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG1396 [743] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+    jmp b3
+  //SEG1397 bitmap_init::@3
+  b3:
   //SEG1398 [744] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuz2_band_vbuc1 
     lda #7
     and y
@@ -17006,13 +17140,13 @@ bitmap_init: {
     lda #7
     and y
     sta _10
-  //SEG1405 [751] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG1405 [751] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp _10
-    bne b6_from_b5
-    jmp b7
-  //SEG1406 bitmap_init::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG1406 bitmap_init::@5
+  b5:
   //SEG1407 [752] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -17021,32 +17155,32 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG1408 [753] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG1409 [753] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-    jmp b6
-  //SEG1410 bitmap_init::@6
-  b6:
+  //SEG1408 [753] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG1409 [753] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+    jmp b4
+  //SEG1410 bitmap_init::@4
+  b4:
   //SEG1411 [754] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG1412 [755] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuz1_neq_0_then_la1 
+  //SEG1412 [755] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuz1_neq_0_then_la1 
     lda y
     cmp #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG1413 bitmap_init::@return
   breturn:
   //SEG1414 [756] return 
     rts
-  //SEG1415 [757] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG1416 bitmap_init::@10
-  b10:
-  //SEG1417 [740] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  b2_from_b10:
-  //SEG1418 [740] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG1415 [757] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG1416 bitmap_init::@6
+  b6:
+  //SEG1417 [740] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  b2_from_b6:
+  //SEG1418 [740] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
     jmp b2
 }
 //SEG1419 mode_mcchar
@@ -17730,24 +17864,24 @@ print_str_lines: {
     jmp b1
   //SEG1612 print_str_lines::@1
   b1:
-  //SEG1613 [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@6 -- _deref_pbuz1_neq_vbuc1_then_la1 
+  //SEG1613 [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@2 -- _deref_pbuz1_neq_vbuc1_then_la1 
     ldy #0
     lda (str),y
     cmp #'@'
-    bne b6_from_b1
+    bne b2_from_b1
     jmp breturn
   //SEG1614 print_str_lines::@return
   breturn:
   //SEG1615 [868] return 
     rts
-  //SEG1616 [869] phi from print_str_lines::@1 print_str_lines::@7 to print_str_lines::@6 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6]
-  b6_from_b1:
-  b6_from_b7:
-  //SEG1617 [869] phi (byte*) print_char_cursor#17 = (byte*) print_char_cursor#19 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#0] -- register_copy 
-  //SEG1618 [869] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#2 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#1] -- register_copy 
-    jmp b6
-  //SEG1619 print_str_lines::@6
-  b6:
+  //SEG1616 [869] phi from print_str_lines::@1 print_str_lines::@3 to print_str_lines::@2 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2]
+  b2_from_b1:
+  b2_from_b3:
+  //SEG1617 [869] phi (byte*) print_char_cursor#17 = (byte*) print_char_cursor#19 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#0] -- register_copy 
+  //SEG1618 [869] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#2 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#1] -- register_copy 
+    jmp b2
+  //SEG1619 print_str_lines::@2
+  b2:
   //SEG1620 [870] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#3) -- vbuz1=_deref_pbuz2 
     ldy #0
     lda (str),y
@@ -17757,13 +17891,13 @@ print_str_lines: {
     bne !+
     inc str+1
   !:
-  //SEG1622 [872] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@7 -- vbuz1_eq_vbuc1_then_la1 
+  //SEG1622 [872] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@3 -- vbuz1_eq_vbuc1_then_la1 
     lda #'@'
     cmp ch
-    beq b7_from_b6
-    jmp b8
-  //SEG1623 print_str_lines::@8
-  b8:
+    beq b3_from_b2
+    jmp b4
+  //SEG1623 print_str_lines::@4
+  b4:
   //SEG1624 [873] *((byte*) print_char_cursor#17) ← (byte) print_str_lines::ch#0 -- _deref_pbuz1=vbuz2 
     lda ch
     ldy #0
@@ -17773,36 +17907,36 @@ print_str_lines: {
     bne !+
     inc print_char_cursor+1
   !:
-  //SEG1626 [875] phi from print_str_lines::@6 print_str_lines::@8 to print_str_lines::@7 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7]
-  b7_from_b6:
-  b7_from_b8:
-  //SEG1627 [875] phi (byte*) print_char_cursor#32 = (byte*) print_char_cursor#17 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7#0] -- register_copy 
-    jmp b7
-  //SEG1628 print_str_lines::@7
-  b7:
-  //SEG1629 [876] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG1626 [875] phi from print_str_lines::@2 print_str_lines::@4 to print_str_lines::@3 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3]
+  b3_from_b2:
+  b3_from_b4:
+  //SEG1627 [875] phi (byte*) print_char_cursor#32 = (byte*) print_char_cursor#17 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3#0] -- register_copy 
+    jmp b3
+  //SEG1628 print_str_lines::@3
+  b3:
+  //SEG1629 [876] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #'@'
     cmp ch
-    bne b6_from_b7
-  //SEG1630 [877] phi from print_str_lines::@7 to print_str_lines::@9 [phi:print_str_lines::@7->print_str_lines::@9]
-  b9_from_b7:
-    jmp b9
-  //SEG1631 print_str_lines::@9
-  b9:
+    bne b2_from_b3
+  //SEG1630 [877] phi from print_str_lines::@3 to print_str_lines::@5 [phi:print_str_lines::@3->print_str_lines::@5]
+  b5_from_b3:
+    jmp b5
+  //SEG1631 print_str_lines::@5
+  b5:
   //SEG1632 [878] call print_ln 
-  //SEG1633 [880] phi from print_str_lines::@9 to print_ln [phi:print_str_lines::@9->print_ln]
-  print_ln_from_b9:
+  //SEG1633 [880] phi from print_str_lines::@5 to print_ln [phi:print_str_lines::@5->print_ln]
+  print_ln_from_b5:
     jsr print_ln
   //SEG1634 [879] (byte*~) print_char_cursor#103 ← (byte*) print_line_cursor#19 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG1635 [866] phi from print_str_lines::@9 to print_str_lines::@1 [phi:print_str_lines::@9->print_str_lines::@1]
-  b1_from_b9:
-  //SEG1636 [866] phi (byte*) print_line_cursor#17 = (byte*) print_line_cursor#19 [phi:print_str_lines::@9->print_str_lines::@1#0] -- register_copy 
-  //SEG1637 [866] phi (byte*) print_char_cursor#19 = (byte*~) print_char_cursor#103 [phi:print_str_lines::@9->print_str_lines::@1#1] -- register_copy 
-  //SEG1638 [866] phi (byte*) print_str_lines::str#2 = (byte*) print_str_lines::str#0 [phi:print_str_lines::@9->print_str_lines::@1#2] -- register_copy 
+  //SEG1635 [866] phi from print_str_lines::@5 to print_str_lines::@1 [phi:print_str_lines::@5->print_str_lines::@1]
+  b1_from_b5:
+  //SEG1636 [866] phi (byte*) print_line_cursor#17 = (byte*) print_line_cursor#19 [phi:print_str_lines::@5->print_str_lines::@1#0] -- register_copy 
+  //SEG1637 [866] phi (byte*) print_char_cursor#19 = (byte*~) print_char_cursor#103 [phi:print_str_lines::@5->print_str_lines::@1#1] -- register_copy 
+  //SEG1638 [866] phi (byte*) print_str_lines::str#2 = (byte*) print_str_lines::str#0 [phi:print_str_lines::@5->print_str_lines::@1#2] -- register_copy 
     jmp b1
 }
 //SEG1639 print_ln
@@ -17918,7 +18052,7 @@ Statement [18] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) m
 Statement [20] *((const byte*) DTV_PALETTE#0 + (byte) menu::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) menu::i#2) [ menu::i#2 ] ( main:2::menu:9 [ menu::i#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ menu::i#2 menu::i#1 ]
 Statement [24] *((byte*) menu::c#2) ← (const byte) LIGHT_GREEN#0 [ menu::c#2 ] ( main:2::menu:9 [ menu::c#2 ] ) always clobbers reg byte a reg byte y 
-Statement [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@10 [ menu::c#1 ] ( main:2::menu:9 [ menu::c#1 ] ) always clobbers reg byte a 
+Statement [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@4 [ menu::c#1 ] ( main:2::menu:9 [ menu::c#1 ] ) always clobbers reg byte a 
 Statement [27] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2::menu:9 [ ] ) always clobbers reg byte a 
 Statement [28] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2::menu:9 [ ] ) always clobbers reg byte a 
 Statement [119] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 [ ] ( main:2::menu:9::mode_8bppchunkybmm:118 [ ] ) always clobbers reg byte a 
@@ -17940,7 +18074,7 @@ Statement [144] *((byte*) mode_8bppchunkybmm::gfxb#4) ← (byte) mode_8bppchunky
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:6 [ mode_8bppchunkybmm::y#6 mode_8bppchunkybmm::y#1 ]
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:9 [ mode_8bppchunkybmm::gfxbCpuBank#4 mode_8bppchunkybmm::gfxbCpuBank#7 mode_8bppchunkybmm::gfxbCpuBank#8 mode_8bppchunkybmm::gfxbCpuBank#2 ]
 Statement [147] if((word) mode_8bppchunkybmm::x#1!=(word/signed word/dword/signed dword) $140) goto mode_8bppchunkybmm::@4 [ mode_8bppchunkybmm::y#6 mode_8bppchunkybmm::gfxb#1 mode_8bppchunkybmm::gfxbCpuBank#8 mode_8bppchunkybmm::x#1 ] ( main:2::menu:9::mode_8bppchunkybmm:118 [ mode_8bppchunkybmm::y#6 mode_8bppchunkybmm::gfxb#1 mode_8bppchunkybmm::gfxbCpuBank#8 mode_8bppchunkybmm::x#1 ] ) always clobbers reg byte a 
-Statement [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@6 [ dtv_control#114 ] ( main:2::menu:9::mode_8bppchunkybmm:118::mode_ctrl:153 [ dtv_control#114 ] main:2::menu:9::mode_8bpppixelcell:111::mode_ctrl:280 [ dtv_control#114 ] main:2::menu:9::mode_sixsfred:104::mode_ctrl:333 [ dtv_control#114 ] main:2::menu:9::mode_twoplanebitmap:97::mode_ctrl:391 [ dtv_control#114 ] main:2::menu:9::mode_sixsfred2:90::mode_ctrl:448 [ dtv_control#114 ] main:2::menu:9::mode_hicolmcchar:83::mode_ctrl:482 [ dtv_control#114 ] main:2::menu:9::mode_hicolecmchar:76::mode_ctrl:517 [ dtv_control#114 ] main:2::menu:9::mode_hicolstdchar:69::mode_ctrl:549 [ dtv_control#114 ] main:2::menu:9::mode_stdbitmap:62::mode_ctrl:590 [ dtv_control#114 ] main:2::menu:9::mode_mcchar:55::mode_ctrl:792 [ dtv_control#114 ] main:2::menu:9::mode_ecmchar:48::mode_ctrl:829 [ dtv_control#114 ] main:2::menu:9::mode_stdchar:40::mode_ctrl:863 [ dtv_control#114 ] ) always clobbers reg byte a 
+Statement [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@2 [ dtv_control#114 ] ( main:2::menu:9::mode_8bppchunkybmm:118::mode_ctrl:153 [ dtv_control#114 ] main:2::menu:9::mode_8bpppixelcell:111::mode_ctrl:280 [ dtv_control#114 ] main:2::menu:9::mode_sixsfred:104::mode_ctrl:333 [ dtv_control#114 ] main:2::menu:9::mode_twoplanebitmap:97::mode_ctrl:391 [ dtv_control#114 ] main:2::menu:9::mode_sixsfred2:90::mode_ctrl:448 [ dtv_control#114 ] main:2::menu:9::mode_hicolmcchar:83::mode_ctrl:482 [ dtv_control#114 ] main:2::menu:9::mode_hicolecmchar:76::mode_ctrl:517 [ dtv_control#114 ] main:2::menu:9::mode_hicolstdchar:69::mode_ctrl:549 [ dtv_control#114 ] main:2::menu:9::mode_stdbitmap:62::mode_ctrl:590 [ dtv_control#114 ] main:2::menu:9::mode_mcchar:55::mode_ctrl:792 [ dtv_control#114 ] main:2::menu:9::mode_ecmchar:48::mode_ctrl:829 [ dtv_control#114 ] main:2::menu:9::mode_stdchar:40::mode_ctrl:863 [ dtv_control#114 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:12 [ dtv_control#114 dtv_control#145 dtv_control#17 ]
 Statement [169] (byte) mode_ctrl::ctrl#1 ← (byte) mode_ctrl::ctrl#0 | (const byte) DTV_LINEAR#0 [ dtv_control#114 mode_ctrl::ctrl#1 ] ( main:2::menu:9::mode_8bppchunkybmm:118::mode_ctrl:153 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_8bpppixelcell:111::mode_ctrl:280 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_sixsfred:104::mode_ctrl:333 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_twoplanebitmap:97::mode_ctrl:391 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_sixsfred2:90::mode_ctrl:448 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_hicolmcchar:83::mode_ctrl:482 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_hicolecmchar:76::mode_ctrl:517 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_hicolstdchar:69::mode_ctrl:549 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_stdbitmap:62::mode_ctrl:590 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_mcchar:55::mode_ctrl:792 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_ecmchar:48::mode_ctrl:829 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_stdchar:40::mode_ctrl:863 [ dtv_control#114 mode_ctrl::ctrl#1 ] ) always clobbers reg byte a 
 Statement [175] (byte) mode_ctrl::ctrl#2 ← (byte) mode_ctrl::ctrl#17 | (const byte) DTV_HIGHCOLOR#0 [ dtv_control#114 mode_ctrl::ctrl#2 ] ( main:2::menu:9::mode_8bppchunkybmm:118::mode_ctrl:153 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_8bpppixelcell:111::mode_ctrl:280 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_sixsfred:104::mode_ctrl:333 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_twoplanebitmap:97::mode_ctrl:391 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_sixsfred2:90::mode_ctrl:448 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_hicolmcchar:83::mode_ctrl:482 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_hicolecmchar:76::mode_ctrl:517 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_hicolstdchar:69::mode_ctrl:549 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_stdbitmap:62::mode_ctrl:590 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_mcchar:55::mode_ctrl:792 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_ecmchar:48::mode_ctrl:829 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_stdchar:40::mode_ctrl:863 [ dtv_control#114 mode_ctrl::ctrl#2 ] ) always clobbers reg byte a 
@@ -18361,7 +18495,7 @@ Statement [853] (byte~) mode_stdchar::$28 ← (byte~) mode_stdchar::$27 << (byte
 Statement [854] (byte~) mode_stdchar::$29 ← (byte) mode_stdchar::cx#2 & (byte/signed byte/word/signed word/dword/signed dword) $f [ mode_stdchar::cy#4 mode_stdchar::col#1 mode_stdchar::cx#2 mode_stdchar::ch#2 mode_stdchar::$28 mode_stdchar::$29 ] ( main:2::menu:9::mode_stdchar:40 [ mode_stdchar::cy#4 mode_stdchar::col#1 mode_stdchar::cx#2 mode_stdchar::ch#2 mode_stdchar::$28 mode_stdchar::$29 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:292 [ mode_stdchar::$28 ]
 Statement [856] *((byte*) mode_stdchar::ch#2) ← (byte~) mode_stdchar::$30 [ mode_stdchar::cy#4 mode_stdchar::col#1 mode_stdchar::cx#2 mode_stdchar::ch#2 ] ( main:2::menu:9::mode_stdchar:40 [ mode_stdchar::cy#4 mode_stdchar::col#1 mode_stdchar::cx#2 mode_stdchar::ch#2 ] ) always clobbers reg byte y 
-Statement [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@6 [ print_str_lines::str#2 print_char_cursor#19 print_line_cursor#17 ] ( main:2::menu:9::print_str_lines:33 [ print_str_lines::str#2 print_char_cursor#19 print_line_cursor#17 ] ) always clobbers reg byte a reg byte y 
+Statement [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@2 [ print_str_lines::str#2 print_char_cursor#19 print_line_cursor#17 ] ( main:2::menu:9::print_str_lines:33 [ print_str_lines::str#2 print_char_cursor#19 print_line_cursor#17 ] ) always clobbers reg byte a reg byte y 
 Statement [870] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#3) [ print_line_cursor#17 print_str_lines::str#3 print_char_cursor#17 print_str_lines::ch#0 ] ( main:2::menu:9::print_str_lines:33 [ print_line_cursor#17 print_str_lines::str#3 print_char_cursor#17 print_str_lines::ch#0 ] ) always clobbers reg byte a reg byte y 
 Statement [873] *((byte*) print_char_cursor#17) ← (byte) print_str_lines::ch#0 [ print_line_cursor#17 print_str_lines::str#0 print_char_cursor#17 print_str_lines::ch#0 ] ( main:2::menu:9::print_str_lines:33 [ print_line_cursor#17 print_str_lines::str#0 print_char_cursor#17 print_str_lines::ch#0 ] ) always clobbers reg byte y 
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:295 [ print_str_lines::ch#0 ]
@@ -18384,7 +18518,7 @@ Statement [17] *((const byte*) VIC_CONTROL2#0) ← (const byte) VIC_CSEL#0 [ ] (
 Statement [18] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) menu::SCREEN#0&(word/signed word/dword/signed dword) $3fff/(byte/signed byte/word/signed word/dword/signed dword) $40|((word))(const byte*) menu::CHARSET#0&(word/signed word/dword/signed dword) $3fff/(word/signed word/dword/signed dword) $400 [ ] ( main:2::menu:9 [ ] ) always clobbers reg byte a 
 Statement [20] *((const byte*) DTV_PALETTE#0 + (byte) menu::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) menu::i#2) [ menu::i#2 ] ( main:2::menu:9 [ menu::i#2 ] ) always clobbers reg byte a 
 Statement [24] *((byte*) menu::c#2) ← (const byte) LIGHT_GREEN#0 [ menu::c#2 ] ( main:2::menu:9 [ menu::c#2 ] ) always clobbers reg byte a reg byte y 
-Statement [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@10 [ menu::c#1 ] ( main:2::menu:9 [ menu::c#1 ] ) always clobbers reg byte a 
+Statement [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@4 [ menu::c#1 ] ( main:2::menu:9 [ menu::c#1 ] ) always clobbers reg byte a 
 Statement [27] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2::menu:9 [ ] ) always clobbers reg byte a 
 Statement [28] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2::menu:9 [ ] ) always clobbers reg byte a 
 Statement [119] *((const byte*) DTV_CONTROL#0) ← (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 [ ] ( main:2::menu:9::mode_8bppchunkybmm:118 [ ] ) always clobbers reg byte a 
@@ -18402,7 +18536,7 @@ Statement [142] (word~) mode_8bppchunkybmm::$27 ← (word) mode_8bppchunkybmm::x
 Statement [143] (byte) mode_8bppchunkybmm::c#0 ← ((byte)) (word~) mode_8bppchunkybmm::$27 [ mode_8bppchunkybmm::y#6 mode_8bppchunkybmm::gfxbCpuBank#8 mode_8bppchunkybmm::x#2 mode_8bppchunkybmm::gfxb#4 mode_8bppchunkybmm::c#0 ] ( main:2::menu:9::mode_8bppchunkybmm:118 [ mode_8bppchunkybmm::y#6 mode_8bppchunkybmm::gfxbCpuBank#8 mode_8bppchunkybmm::x#2 mode_8bppchunkybmm::gfxb#4 mode_8bppchunkybmm::c#0 ] ) always clobbers reg byte a 
 Statement [144] *((byte*) mode_8bppchunkybmm::gfxb#4) ← (byte) mode_8bppchunkybmm::c#0 [ mode_8bppchunkybmm::y#6 mode_8bppchunkybmm::gfxbCpuBank#8 mode_8bppchunkybmm::x#2 mode_8bppchunkybmm::gfxb#4 ] ( main:2::menu:9::mode_8bppchunkybmm:118 [ mode_8bppchunkybmm::y#6 mode_8bppchunkybmm::gfxbCpuBank#8 mode_8bppchunkybmm::x#2 mode_8bppchunkybmm::gfxb#4 ] ) always clobbers reg byte y 
 Statement [147] if((word) mode_8bppchunkybmm::x#1!=(word/signed word/dword/signed dword) $140) goto mode_8bppchunkybmm::@4 [ mode_8bppchunkybmm::y#6 mode_8bppchunkybmm::gfxb#1 mode_8bppchunkybmm::gfxbCpuBank#8 mode_8bppchunkybmm::x#1 ] ( main:2::menu:9::mode_8bppchunkybmm:118 [ mode_8bppchunkybmm::y#6 mode_8bppchunkybmm::gfxb#1 mode_8bppchunkybmm::gfxbCpuBank#8 mode_8bppchunkybmm::x#1 ] ) always clobbers reg byte a 
-Statement [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@6 [ dtv_control#114 ] ( main:2::menu:9::mode_8bppchunkybmm:118::mode_ctrl:153 [ dtv_control#114 ] main:2::menu:9::mode_8bpppixelcell:111::mode_ctrl:280 [ dtv_control#114 ] main:2::menu:9::mode_sixsfred:104::mode_ctrl:333 [ dtv_control#114 ] main:2::menu:9::mode_twoplanebitmap:97::mode_ctrl:391 [ dtv_control#114 ] main:2::menu:9::mode_sixsfred2:90::mode_ctrl:448 [ dtv_control#114 ] main:2::menu:9::mode_hicolmcchar:83::mode_ctrl:482 [ dtv_control#114 ] main:2::menu:9::mode_hicolecmchar:76::mode_ctrl:517 [ dtv_control#114 ] main:2::menu:9::mode_hicolstdchar:69::mode_ctrl:549 [ dtv_control#114 ] main:2::menu:9::mode_stdbitmap:62::mode_ctrl:590 [ dtv_control#114 ] main:2::menu:9::mode_mcchar:55::mode_ctrl:792 [ dtv_control#114 ] main:2::menu:9::mode_ecmchar:48::mode_ctrl:829 [ dtv_control#114 ] main:2::menu:9::mode_stdchar:40::mode_ctrl:863 [ dtv_control#114 ] ) always clobbers reg byte a 
+Statement [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@2 [ dtv_control#114 ] ( main:2::menu:9::mode_8bppchunkybmm:118::mode_ctrl:153 [ dtv_control#114 ] main:2::menu:9::mode_8bpppixelcell:111::mode_ctrl:280 [ dtv_control#114 ] main:2::menu:9::mode_sixsfred:104::mode_ctrl:333 [ dtv_control#114 ] main:2::menu:9::mode_twoplanebitmap:97::mode_ctrl:391 [ dtv_control#114 ] main:2::menu:9::mode_sixsfred2:90::mode_ctrl:448 [ dtv_control#114 ] main:2::menu:9::mode_hicolmcchar:83::mode_ctrl:482 [ dtv_control#114 ] main:2::menu:9::mode_hicolecmchar:76::mode_ctrl:517 [ dtv_control#114 ] main:2::menu:9::mode_hicolstdchar:69::mode_ctrl:549 [ dtv_control#114 ] main:2::menu:9::mode_stdbitmap:62::mode_ctrl:590 [ dtv_control#114 ] main:2::menu:9::mode_mcchar:55::mode_ctrl:792 [ dtv_control#114 ] main:2::menu:9::mode_ecmchar:48::mode_ctrl:829 [ dtv_control#114 ] main:2::menu:9::mode_stdchar:40::mode_ctrl:863 [ dtv_control#114 ] ) always clobbers reg byte a 
 Statement [169] (byte) mode_ctrl::ctrl#1 ← (byte) mode_ctrl::ctrl#0 | (const byte) DTV_LINEAR#0 [ dtv_control#114 mode_ctrl::ctrl#1 ] ( main:2::menu:9::mode_8bppchunkybmm:118::mode_ctrl:153 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_8bpppixelcell:111::mode_ctrl:280 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_sixsfred:104::mode_ctrl:333 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_twoplanebitmap:97::mode_ctrl:391 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_sixsfred2:90::mode_ctrl:448 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_hicolmcchar:83::mode_ctrl:482 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_hicolecmchar:76::mode_ctrl:517 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_hicolstdchar:69::mode_ctrl:549 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_stdbitmap:62::mode_ctrl:590 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_mcchar:55::mode_ctrl:792 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_ecmchar:48::mode_ctrl:829 [ dtv_control#114 mode_ctrl::ctrl#1 ] main:2::menu:9::mode_stdchar:40::mode_ctrl:863 [ dtv_control#114 mode_ctrl::ctrl#1 ] ) always clobbers reg byte a 
 Statement [175] (byte) mode_ctrl::ctrl#2 ← (byte) mode_ctrl::ctrl#17 | (const byte) DTV_HIGHCOLOR#0 [ dtv_control#114 mode_ctrl::ctrl#2 ] ( main:2::menu:9::mode_8bppchunkybmm:118::mode_ctrl:153 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_8bpppixelcell:111::mode_ctrl:280 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_sixsfred:104::mode_ctrl:333 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_twoplanebitmap:97::mode_ctrl:391 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_sixsfred2:90::mode_ctrl:448 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_hicolmcchar:83::mode_ctrl:482 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_hicolecmchar:76::mode_ctrl:517 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_hicolstdchar:69::mode_ctrl:549 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_stdbitmap:62::mode_ctrl:590 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_mcchar:55::mode_ctrl:792 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_ecmchar:48::mode_ctrl:829 [ dtv_control#114 mode_ctrl::ctrl#2 ] main:2::menu:9::mode_stdchar:40::mode_ctrl:863 [ dtv_control#114 mode_ctrl::ctrl#2 ] ) always clobbers reg byte a 
 Statement [181] (byte) mode_ctrl::ctrl#3 ← (byte) mode_ctrl::ctrl#10 | (const byte) DTV_OVERSCAN#0 [ dtv_control#114 mode_ctrl::ctrl#3 ] ( main:2::menu:9::mode_8bppchunkybmm:118::mode_ctrl:153 [ dtv_control#114 mode_ctrl::ctrl#3 ] main:2::menu:9::mode_8bpppixelcell:111::mode_ctrl:280 [ dtv_control#114 mode_ctrl::ctrl#3 ] main:2::menu:9::mode_sixsfred:104::mode_ctrl:333 [ dtv_control#114 mode_ctrl::ctrl#3 ] main:2::menu:9::mode_twoplanebitmap:97::mode_ctrl:391 [ dtv_control#114 mode_ctrl::ctrl#3 ] main:2::menu:9::mode_sixsfred2:90::mode_ctrl:448 [ dtv_control#114 mode_ctrl::ctrl#3 ] main:2::menu:9::mode_hicolmcchar:83::mode_ctrl:482 [ dtv_control#114 mode_ctrl::ctrl#3 ] main:2::menu:9::mode_hicolecmchar:76::mode_ctrl:517 [ dtv_control#114 mode_ctrl::ctrl#3 ] main:2::menu:9::mode_hicolstdchar:69::mode_ctrl:549 [ dtv_control#114 mode_ctrl::ctrl#3 ] main:2::menu:9::mode_stdbitmap:62::mode_ctrl:590 [ dtv_control#114 mode_ctrl::ctrl#3 ] main:2::menu:9::mode_mcchar:55::mode_ctrl:792 [ dtv_control#114 mode_ctrl::ctrl#3 ] main:2::menu:9::mode_ecmchar:48::mode_ctrl:829 [ dtv_control#114 mode_ctrl::ctrl#3 ] main:2::menu:9::mode_stdchar:40::mode_ctrl:863 [ dtv_control#114 mode_ctrl::ctrl#3 ] ) always clobbers reg byte a 
@@ -18671,7 +18805,7 @@ Statement [852] (byte~) mode_stdchar::$27 ← (byte) mode_stdchar::cy#4 & (byte/
 Statement [853] (byte~) mode_stdchar::$28 ← (byte~) mode_stdchar::$27 << (byte/signed byte/word/signed word/dword/signed dword) 4 [ mode_stdchar::cy#4 mode_stdchar::col#1 mode_stdchar::cx#2 mode_stdchar::ch#2 mode_stdchar::$28 ] ( main:2::menu:9::mode_stdchar:40 [ mode_stdchar::cy#4 mode_stdchar::col#1 mode_stdchar::cx#2 mode_stdchar::ch#2 mode_stdchar::$28 ] ) always clobbers reg byte a 
 Statement [854] (byte~) mode_stdchar::$29 ← (byte) mode_stdchar::cx#2 & (byte/signed byte/word/signed word/dword/signed dword) $f [ mode_stdchar::cy#4 mode_stdchar::col#1 mode_stdchar::cx#2 mode_stdchar::ch#2 mode_stdchar::$28 mode_stdchar::$29 ] ( main:2::menu:9::mode_stdchar:40 [ mode_stdchar::cy#4 mode_stdchar::col#1 mode_stdchar::cx#2 mode_stdchar::ch#2 mode_stdchar::$28 mode_stdchar::$29 ] ) always clobbers reg byte a 
 Statement [856] *((byte*) mode_stdchar::ch#2) ← (byte~) mode_stdchar::$30 [ mode_stdchar::cy#4 mode_stdchar::col#1 mode_stdchar::cx#2 mode_stdchar::ch#2 ] ( main:2::menu:9::mode_stdchar:40 [ mode_stdchar::cy#4 mode_stdchar::col#1 mode_stdchar::cx#2 mode_stdchar::ch#2 ] ) always clobbers reg byte y 
-Statement [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@6 [ print_str_lines::str#2 print_char_cursor#19 print_line_cursor#17 ] ( main:2::menu:9::print_str_lines:33 [ print_str_lines::str#2 print_char_cursor#19 print_line_cursor#17 ] ) always clobbers reg byte a reg byte y 
+Statement [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@2 [ print_str_lines::str#2 print_char_cursor#19 print_line_cursor#17 ] ( main:2::menu:9::print_str_lines:33 [ print_str_lines::str#2 print_char_cursor#19 print_line_cursor#17 ] ) always clobbers reg byte a reg byte y 
 Statement [870] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#3) [ print_line_cursor#17 print_str_lines::str#3 print_char_cursor#17 print_str_lines::ch#0 ] ( main:2::menu:9::print_str_lines:33 [ print_line_cursor#17 print_str_lines::str#3 print_char_cursor#17 print_str_lines::ch#0 ] ) always clobbers reg byte a reg byte y 
 Statement [873] *((byte*) print_char_cursor#17) ← (byte) print_str_lines::ch#0 [ print_line_cursor#17 print_str_lines::str#0 print_char_cursor#17 print_str_lines::ch#0 ] ( main:2::menu:9::print_str_lines:33 [ print_line_cursor#17 print_str_lines::str#0 print_char_cursor#17 print_str_lines::ch#0 ] ) always clobbers reg byte y 
 Statement [879] (byte*~) print_char_cursor#103 ← (byte*) print_line_cursor#19 [ print_str_lines::str#0 print_char_cursor#103 print_line_cursor#19 ] ( main:2::menu:9::print_str_lines:33 [ print_str_lines::str#0 print_char_cursor#103 print_line_cursor#19 ] ) always clobbers reg byte a 
@@ -19573,15 +19707,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = $d
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @54 [phi:@begin->@54]
-b54_from_bbegin:
-  jmp b54
-//SEG5 @54
-b54:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @54 to @end [phi:@54->@end]
-bend_from_b54:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -19601,15 +19735,15 @@ main: {
     // Enable DTV extended modes
     lda #DTV_FEATURE_ENABLE
     sta DTV_FEATURE
-  //SEG14 [8] phi from main main::@2 to main::@2 [phi:main/main::@2->main::@2]
-  b2_from_main:
-  b2_from_b2:
-    jmp b2
-  //SEG15 main::@2
-  b2:
+  //SEG14 [8] phi from main main::@1 to main::@1 [phi:main/main::@1->main::@1]
+  b1_from_main:
+  b1_from_b1:
+    jmp b1
+  //SEG15 main::@1
+  b1:
   //SEG16 [9] call menu 
     jsr menu
-    jmp b2_from_b2
+    jmp b1_from_b1
 }
 //SEG17 menu
 menu: {
@@ -19652,41 +19786,41 @@ menu: {
     // VIC Memory Pointers
     lda #(SCREEN&$3fff)/$40|(CHARSET&$3fff)/$400
     sta VIC_MEMORY
-  //SEG27 [19] phi from menu to menu::@8 [phi:menu->menu::@8]
-  b8_from_menu:
-  //SEG28 [19] phi (byte) menu::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:menu->menu::@8#0] -- vbuxx=vbuc1 
+  //SEG27 [19] phi from menu to menu::@3 [phi:menu->menu::@3]
+  b3_from_menu:
+  //SEG28 [19] phi (byte) menu::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:menu->menu::@3#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b8
+    jmp b3
   // DTV Palette - default
-  //SEG29 [19] phi from menu::@8 to menu::@8 [phi:menu::@8->menu::@8]
-  b8_from_b8:
-  //SEG30 [19] phi (byte) menu::i#2 = (byte) menu::i#1 [phi:menu::@8->menu::@8#0] -- register_copy 
-    jmp b8
-  //SEG31 menu::@8
-  b8:
+  //SEG29 [19] phi from menu::@3 to menu::@3 [phi:menu::@3->menu::@3]
+  b3_from_b3:
+  //SEG30 [19] phi (byte) menu::i#2 = (byte) menu::i#1 [phi:menu::@3->menu::@3#0] -- register_copy 
+    jmp b3
+  //SEG31 menu::@3
+  b3:
   //SEG32 [20] *((const byte*) DTV_PALETTE#0 + (byte) menu::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) menu::i#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda DTV_PALETTE_DEFAULT,x
     sta DTV_PALETTE,x
   //SEG33 [21] (byte) menu::i#1 ← ++ (byte) menu::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG34 [22] if((byte) menu::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto menu::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG34 [22] if((byte) menu::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto menu::@3 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b8_from_b8
-  //SEG35 [23] phi from menu::@8 to menu::@10 [phi:menu::@8->menu::@10]
-  b10_from_b8:
-  //SEG36 [23] phi (byte*) menu::c#2 = (const byte*) COLS#0 [phi:menu::@8->menu::@10#0] -- pbuz1=pbuc1 
+    bne b3_from_b3
+  //SEG35 [23] phi from menu::@3 to menu::@4 [phi:menu::@3->menu::@4]
+  b4_from_b3:
+  //SEG36 [23] phi (byte*) menu::c#2 = (const byte*) COLS#0 [phi:menu::@3->menu::@4#0] -- pbuz1=pbuc1 
     lda #<COLS
     sta c
     lda #>COLS
     sta c+1
-    jmp b10
+    jmp b4
   // Char Colors
-  //SEG37 [23] phi from menu::@10 to menu::@10 [phi:menu::@10->menu::@10]
-  b10_from_b10:
-  //SEG38 [23] phi (byte*) menu::c#2 = (byte*) menu::c#1 [phi:menu::@10->menu::@10#0] -- register_copy 
-    jmp b10
-  //SEG39 menu::@10
-  b10:
+  //SEG37 [23] phi from menu::@4 to menu::@4 [phi:menu::@4->menu::@4]
+  b4_from_b4:
+  //SEG38 [23] phi (byte*) menu::c#2 = (byte*) menu::c#1 [phi:menu::@4->menu::@4#0] -- register_copy 
+    jmp b4
+  //SEG39 menu::@4
+  b4:
   //SEG40 [24] *((byte*) menu::c#2) ← (const byte) LIGHT_GREEN#0 -- _deref_pbuz1=vbuc1 
     lda #LIGHT_GREEN
     ldy #0
@@ -19696,16 +19830,16 @@ menu: {
     bne !+
     inc c+1
   !:
-  //SEG42 [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@10 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG42 [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda c+1
     cmp #>COLS+$3e8
-    bne b10_from_b10
+    bne b4_from_b4
     lda c
     cmp #<COLS+$3e8
-    bne b10_from_b10
-    jmp b11
-  //SEG43 menu::@11
-  b11:
+    bne b4_from_b4
+    jmp b5
+  //SEG43 menu::@5
+  b5:
   //SEG44 [27] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Screen colors
     lda #0
@@ -19714,52 +19848,52 @@ menu: {
     lda #0
     sta BORDERCOL
   //SEG46 [29] call print_set_screen 
-  //SEG47 [891] phi from menu::@11 to print_set_screen [phi:menu::@11->print_set_screen]
-  print_set_screen_from_b11:
+  //SEG47 [891] phi from menu::@5 to print_set_screen [phi:menu::@5->print_set_screen]
+  print_set_screen_from_b5:
     jsr print_set_screen
-  //SEG48 [30] phi from menu::@11 to menu::@47 [phi:menu::@11->menu::@47]
-  b47_from_b11:
-    jmp b47
-  //SEG49 menu::@47
-  b47:
+  //SEG48 [30] phi from menu::@5 to menu::@28 [phi:menu::@5->menu::@28]
+  b28_from_b5:
+    jmp b28
+  //SEG49 menu::@28
+  b28:
   //SEG50 [31] call print_cls 
-  //SEG51 [885] phi from menu::@47 to print_cls [phi:menu::@47->print_cls]
-  print_cls_from_b47:
+  //SEG51 [885] phi from menu::@28 to print_cls [phi:menu::@28->print_cls]
+  print_cls_from_b28:
     jsr print_cls
-  //SEG52 [32] phi from menu::@47 to menu::@48 [phi:menu::@47->menu::@48]
-  b48_from_b47:
-    jmp b48
-  //SEG53 menu::@48
-  b48:
+  //SEG52 [32] phi from menu::@28 to menu::@29 [phi:menu::@28->menu::@29]
+  b29_from_b28:
+    jmp b29
+  //SEG53 menu::@29
+  b29:
   //SEG54 [33] call print_str_lines 
-  //SEG55 [865] phi from menu::@48 to print_str_lines [phi:menu::@48->print_str_lines]
-  print_str_lines_from_b48:
+  //SEG55 [865] phi from menu::@29 to print_str_lines [phi:menu::@29->print_str_lines]
+  print_str_lines_from_b29:
     jsr print_str_lines
-  //SEG56 [34] phi from menu::@48 menu::@71 to menu::@2 [phi:menu::@48/menu::@71->menu::@2]
-  b2_from_b48:
-  b2_from_b71:
-    jmp b2
-  //SEG57 menu::@2
-  b2:
+  //SEG56 [34] phi from menu::@29 menu::@41 to menu::@1 [phi:menu::@29/menu::@41->menu::@1]
+  b1_from_b29:
+  b1_from_b41:
+    jmp b1
+  //SEG57 menu::@1
+  b1:
   //SEG58 [35] call keyboard_key_pressed 
-  //SEG59 [211] phi from menu::@2 to keyboard_key_pressed [phi:menu::@2->keyboard_key_pressed]
-  keyboard_key_pressed_from_b2:
-  //SEG60 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_1#0 [phi:menu::@2->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG59 [211] phi from menu::@1 to keyboard_key_pressed [phi:menu::@1->keyboard_key_pressed]
+  keyboard_key_pressed_from_b1:
+  //SEG60 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_1#0 [phi:menu::@1->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_1
     jsr keyboard_key_pressed
   //SEG61 [36] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-    jmp b50
-  //SEG62 menu::@50
-  b50:
+    jmp b30
+  //SEG62 menu::@30
+  b30:
   //SEG63 [37] (byte~) menu::$29 ← (byte) keyboard_key_pressed::return#2
-  //SEG64 [38] if((byte~) menu::$29==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@12 -- vbuaa_eq_0_then_la1 
+  //SEG64 [38] if((byte~) menu::$29==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@6 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b12_from_b50
-  //SEG65 [39] phi from menu::@50 to menu::@6 [phi:menu::@50->menu::@6]
-  b6_from_b50:
-    jmp b6
-  //SEG66 menu::@6
-  b6:
+    beq b6_from_b30
+  //SEG65 [39] phi from menu::@30 to menu::@2 [phi:menu::@30->menu::@2]
+  b2_from_b30:
+    jmp b2
+  //SEG66 menu::@2
+  b2:
   //SEG67 [40] call mode_stdchar 
     jsr mode_stdchar
     jmp breturn
@@ -19767,300 +19901,300 @@ menu: {
   breturn:
   //SEG69 [41] return 
     rts
-  //SEG70 [42] phi from menu::@50 to menu::@12 [phi:menu::@50->menu::@12]
-  b12_from_b50:
-    jmp b12
-  //SEG71 menu::@12
-  b12:
+  //SEG70 [42] phi from menu::@30 to menu::@6 [phi:menu::@30->menu::@6]
+  b6_from_b30:
+    jmp b6
+  //SEG71 menu::@6
+  b6:
   //SEG72 [43] call keyboard_key_pressed 
-  //SEG73 [211] phi from menu::@12 to keyboard_key_pressed [phi:menu::@12->keyboard_key_pressed]
-  keyboard_key_pressed_from_b12:
-  //SEG74 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_2#0 [phi:menu::@12->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG73 [211] phi from menu::@6 to keyboard_key_pressed [phi:menu::@6->keyboard_key_pressed]
+  keyboard_key_pressed_from_b6:
+  //SEG74 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_2#0 [phi:menu::@6->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_2
     jsr keyboard_key_pressed
   //SEG75 [44] (byte) keyboard_key_pressed::return#24 ← (byte) keyboard_key_pressed::return#0
-    jmp b51
-  //SEG76 menu::@51
-  b51:
+    jmp b31
+  //SEG76 menu::@31
+  b31:
   //SEG77 [45] (byte~) menu::$33 ← (byte) keyboard_key_pressed::return#24
-  //SEG78 [46] if((byte~) menu::$33==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@13 -- vbuaa_eq_0_then_la1 
+  //SEG78 [46] if((byte~) menu::$33==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@7 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b13_from_b51
-  //SEG79 [47] phi from menu::@51 to menu::@24 [phi:menu::@51->menu::@24]
-  b24_from_b51:
-    jmp b24
-  //SEG80 menu::@24
-  b24:
+    beq b7_from_b31
+  //SEG79 [47] phi from menu::@31 to menu::@17 [phi:menu::@31->menu::@17]
+  b17_from_b31:
+    jmp b17
+  //SEG80 menu::@17
+  b17:
   //SEG81 [48] call mode_ecmchar 
     jsr mode_ecmchar
     jmp breturn
-  //SEG82 [49] phi from menu::@51 to menu::@13 [phi:menu::@51->menu::@13]
-  b13_from_b51:
-    jmp b13
-  //SEG83 menu::@13
-  b13:
+  //SEG82 [49] phi from menu::@31 to menu::@7 [phi:menu::@31->menu::@7]
+  b7_from_b31:
+    jmp b7
+  //SEG83 menu::@7
+  b7:
   //SEG84 [50] call keyboard_key_pressed 
-  //SEG85 [211] phi from menu::@13 to keyboard_key_pressed [phi:menu::@13->keyboard_key_pressed]
-  keyboard_key_pressed_from_b13:
-  //SEG86 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_3#0 [phi:menu::@13->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG85 [211] phi from menu::@7 to keyboard_key_pressed [phi:menu::@7->keyboard_key_pressed]
+  keyboard_key_pressed_from_b7:
+  //SEG86 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_3#0 [phi:menu::@7->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_3
     jsr keyboard_key_pressed
   //SEG87 [51] (byte) keyboard_key_pressed::return#25 ← (byte) keyboard_key_pressed::return#0
-    jmp b53
-  //SEG88 menu::@53
-  b53:
+    jmp b32
+  //SEG88 menu::@32
+  b32:
   //SEG89 [52] (byte~) menu::$37 ← (byte) keyboard_key_pressed::return#25
-  //SEG90 [53] if((byte~) menu::$37==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@14 -- vbuaa_eq_0_then_la1 
+  //SEG90 [53] if((byte~) menu::$37==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@8 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b14_from_b53
-  //SEG91 [54] phi from menu::@53 to menu::@26 [phi:menu::@53->menu::@26]
-  b26_from_b53:
-    jmp b26
-  //SEG92 menu::@26
-  b26:
+    beq b8_from_b32
+  //SEG91 [54] phi from menu::@32 to menu::@18 [phi:menu::@32->menu::@18]
+  b18_from_b32:
+    jmp b18
+  //SEG92 menu::@18
+  b18:
   //SEG93 [55] call mode_mcchar 
     jsr mode_mcchar
     jmp breturn
-  //SEG94 [56] phi from menu::@53 to menu::@14 [phi:menu::@53->menu::@14]
-  b14_from_b53:
-    jmp b14
-  //SEG95 menu::@14
-  b14:
+  //SEG94 [56] phi from menu::@32 to menu::@8 [phi:menu::@32->menu::@8]
+  b8_from_b32:
+    jmp b8
+  //SEG95 menu::@8
+  b8:
   //SEG96 [57] call keyboard_key_pressed 
-  //SEG97 [211] phi from menu::@14 to keyboard_key_pressed [phi:menu::@14->keyboard_key_pressed]
-  keyboard_key_pressed_from_b14:
-  //SEG98 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_4#0 [phi:menu::@14->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG97 [211] phi from menu::@8 to keyboard_key_pressed [phi:menu::@8->keyboard_key_pressed]
+  keyboard_key_pressed_from_b8:
+  //SEG98 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_4#0 [phi:menu::@8->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_4
     jsr keyboard_key_pressed
   //SEG99 [58] (byte) keyboard_key_pressed::return#26 ← (byte) keyboard_key_pressed::return#0
-    jmp b55
-  //SEG100 menu::@55
-  b55:
+    jmp b33
+  //SEG100 menu::@33
+  b33:
   //SEG101 [59] (byte~) menu::$41 ← (byte) keyboard_key_pressed::return#26
-  //SEG102 [60] if((byte~) menu::$41==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@15 -- vbuaa_eq_0_then_la1 
+  //SEG102 [60] if((byte~) menu::$41==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@9 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b15_from_b55
-  //SEG103 [61] phi from menu::@55 to menu::@28 [phi:menu::@55->menu::@28]
-  b28_from_b55:
-    jmp b28
-  //SEG104 menu::@28
-  b28:
+    beq b9_from_b33
+  //SEG103 [61] phi from menu::@33 to menu::@19 [phi:menu::@33->menu::@19]
+  b19_from_b33:
+    jmp b19
+  //SEG104 menu::@19
+  b19:
   //SEG105 [62] call mode_stdbitmap 
     jsr mode_stdbitmap
     jmp breturn
-  //SEG106 [63] phi from menu::@55 to menu::@15 [phi:menu::@55->menu::@15]
-  b15_from_b55:
-    jmp b15
-  //SEG107 menu::@15
-  b15:
+  //SEG106 [63] phi from menu::@33 to menu::@9 [phi:menu::@33->menu::@9]
+  b9_from_b33:
+    jmp b9
+  //SEG107 menu::@9
+  b9:
   //SEG108 [64] call keyboard_key_pressed 
-  //SEG109 [211] phi from menu::@15 to keyboard_key_pressed [phi:menu::@15->keyboard_key_pressed]
-  keyboard_key_pressed_from_b15:
-  //SEG110 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_6#0 [phi:menu::@15->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG109 [211] phi from menu::@9 to keyboard_key_pressed [phi:menu::@9->keyboard_key_pressed]
+  keyboard_key_pressed_from_b9:
+  //SEG110 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_6#0 [phi:menu::@9->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_6
     jsr keyboard_key_pressed
   //SEG111 [65] (byte) keyboard_key_pressed::return#27 ← (byte) keyboard_key_pressed::return#0
-    jmp b57
-  //SEG112 menu::@57
-  b57:
+    jmp b34
+  //SEG112 menu::@34
+  b34:
   //SEG113 [66] (byte~) menu::$45 ← (byte) keyboard_key_pressed::return#27
-  //SEG114 [67] if((byte~) menu::$45==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@16 -- vbuaa_eq_0_then_la1 
+  //SEG114 [67] if((byte~) menu::$45==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@10 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b16_from_b57
-  //SEG115 [68] phi from menu::@57 to menu::@30 [phi:menu::@57->menu::@30]
-  b30_from_b57:
-    jmp b30
-  //SEG116 menu::@30
-  b30:
+    beq b10_from_b34
+  //SEG115 [68] phi from menu::@34 to menu::@20 [phi:menu::@34->menu::@20]
+  b20_from_b34:
+    jmp b20
+  //SEG116 menu::@20
+  b20:
   //SEG117 [69] call mode_hicolstdchar 
     jsr mode_hicolstdchar
     jmp breturn
-  //SEG118 [70] phi from menu::@57 to menu::@16 [phi:menu::@57->menu::@16]
-  b16_from_b57:
-    jmp b16
-  //SEG119 menu::@16
-  b16:
+  //SEG118 [70] phi from menu::@34 to menu::@10 [phi:menu::@34->menu::@10]
+  b10_from_b34:
+    jmp b10
+  //SEG119 menu::@10
+  b10:
   //SEG120 [71] call keyboard_key_pressed 
-  //SEG121 [211] phi from menu::@16 to keyboard_key_pressed [phi:menu::@16->keyboard_key_pressed]
-  keyboard_key_pressed_from_b16:
-  //SEG122 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_7#0 [phi:menu::@16->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG121 [211] phi from menu::@10 to keyboard_key_pressed [phi:menu::@10->keyboard_key_pressed]
+  keyboard_key_pressed_from_b10:
+  //SEG122 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_7#0 [phi:menu::@10->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_7
     jsr keyboard_key_pressed
   //SEG123 [72] (byte) keyboard_key_pressed::return#28 ← (byte) keyboard_key_pressed::return#0
-    jmp b59
-  //SEG124 menu::@59
-  b59:
+    jmp b35
+  //SEG124 menu::@35
+  b35:
   //SEG125 [73] (byte~) menu::$49 ← (byte) keyboard_key_pressed::return#28
-  //SEG126 [74] if((byte~) menu::$49==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@17 -- vbuaa_eq_0_then_la1 
+  //SEG126 [74] if((byte~) menu::$49==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@11 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b17_from_b59
-  //SEG127 [75] phi from menu::@59 to menu::@32 [phi:menu::@59->menu::@32]
-  b32_from_b59:
-    jmp b32
-  //SEG128 menu::@32
-  b32:
+    beq b11_from_b35
+  //SEG127 [75] phi from menu::@35 to menu::@21 [phi:menu::@35->menu::@21]
+  b21_from_b35:
+    jmp b21
+  //SEG128 menu::@21
+  b21:
   //SEG129 [76] call mode_hicolecmchar 
     jsr mode_hicolecmchar
     jmp breturn
-  //SEG130 [77] phi from menu::@59 to menu::@17 [phi:menu::@59->menu::@17]
-  b17_from_b59:
-    jmp b17
-  //SEG131 menu::@17
-  b17:
+  //SEG130 [77] phi from menu::@35 to menu::@11 [phi:menu::@35->menu::@11]
+  b11_from_b35:
+    jmp b11
+  //SEG131 menu::@11
+  b11:
   //SEG132 [78] call keyboard_key_pressed 
-  //SEG133 [211] phi from menu::@17 to keyboard_key_pressed [phi:menu::@17->keyboard_key_pressed]
-  keyboard_key_pressed_from_b17:
-  //SEG134 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_8#0 [phi:menu::@17->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG133 [211] phi from menu::@11 to keyboard_key_pressed [phi:menu::@11->keyboard_key_pressed]
+  keyboard_key_pressed_from_b11:
+  //SEG134 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_8#0 [phi:menu::@11->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_8
     jsr keyboard_key_pressed
   //SEG135 [79] (byte) keyboard_key_pressed::return#29 ← (byte) keyboard_key_pressed::return#0
-    jmp b61
-  //SEG136 menu::@61
-  b61:
+    jmp b36
+  //SEG136 menu::@36
+  b36:
   //SEG137 [80] (byte~) menu::$53 ← (byte) keyboard_key_pressed::return#29
-  //SEG138 [81] if((byte~) menu::$53==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@18 -- vbuaa_eq_0_then_la1 
+  //SEG138 [81] if((byte~) menu::$53==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@12 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b18_from_b61
-  //SEG139 [82] phi from menu::@61 to menu::@34 [phi:menu::@61->menu::@34]
-  b34_from_b61:
-    jmp b34
-  //SEG140 menu::@34
-  b34:
+    beq b12_from_b36
+  //SEG139 [82] phi from menu::@36 to menu::@22 [phi:menu::@36->menu::@22]
+  b22_from_b36:
+    jmp b22
+  //SEG140 menu::@22
+  b22:
   //SEG141 [83] call mode_hicolmcchar 
     jsr mode_hicolmcchar
     jmp breturn
-  //SEG142 [84] phi from menu::@61 to menu::@18 [phi:menu::@61->menu::@18]
-  b18_from_b61:
-    jmp b18
-  //SEG143 menu::@18
-  b18:
+  //SEG142 [84] phi from menu::@36 to menu::@12 [phi:menu::@36->menu::@12]
+  b12_from_b36:
+    jmp b12
+  //SEG143 menu::@12
+  b12:
   //SEG144 [85] call keyboard_key_pressed 
-  //SEG145 [211] phi from menu::@18 to keyboard_key_pressed [phi:menu::@18->keyboard_key_pressed]
-  keyboard_key_pressed_from_b18:
-  //SEG146 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_A#0 [phi:menu::@18->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG145 [211] phi from menu::@12 to keyboard_key_pressed [phi:menu::@12->keyboard_key_pressed]
+  keyboard_key_pressed_from_b12:
+  //SEG146 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_A#0 [phi:menu::@12->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_A
     jsr keyboard_key_pressed
   //SEG147 [86] (byte) keyboard_key_pressed::return#30 ← (byte) keyboard_key_pressed::return#0
-    jmp b63
-  //SEG148 menu::@63
-  b63:
+    jmp b37
+  //SEG148 menu::@37
+  b37:
   //SEG149 [87] (byte~) menu::$57 ← (byte) keyboard_key_pressed::return#30
-  //SEG150 [88] if((byte~) menu::$57==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@19 -- vbuaa_eq_0_then_la1 
+  //SEG150 [88] if((byte~) menu::$57==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@13 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b19_from_b63
-  //SEG151 [89] phi from menu::@63 to menu::@36 [phi:menu::@63->menu::@36]
-  b36_from_b63:
-    jmp b36
-  //SEG152 menu::@36
-  b36:
+    beq b13_from_b37
+  //SEG151 [89] phi from menu::@37 to menu::@23 [phi:menu::@37->menu::@23]
+  b23_from_b37:
+    jmp b23
+  //SEG152 menu::@23
+  b23:
   //SEG153 [90] call mode_sixsfred2 
     jsr mode_sixsfred2
     jmp breturn
-  //SEG154 [91] phi from menu::@63 to menu::@19 [phi:menu::@63->menu::@19]
-  b19_from_b63:
-    jmp b19
-  //SEG155 menu::@19
-  b19:
+  //SEG154 [91] phi from menu::@37 to menu::@13 [phi:menu::@37->menu::@13]
+  b13_from_b37:
+    jmp b13
+  //SEG155 menu::@13
+  b13:
   //SEG156 [92] call keyboard_key_pressed 
-  //SEG157 [211] phi from menu::@19 to keyboard_key_pressed [phi:menu::@19->keyboard_key_pressed]
-  keyboard_key_pressed_from_b19:
-  //SEG158 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:menu::@19->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG157 [211] phi from menu::@13 to keyboard_key_pressed [phi:menu::@13->keyboard_key_pressed]
+  keyboard_key_pressed_from_b13:
+  //SEG158 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:menu::@13->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_B
     jsr keyboard_key_pressed
   //SEG159 [93] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-    jmp b65
-  //SEG160 menu::@65
-  b65:
-  //SEG161 [94] (byte~) menu::$61 ← (byte) keyboard_key_pressed::return#10
-  //SEG162 [95] if((byte~) menu::$61==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@20 -- vbuaa_eq_0_then_la1 
-    cmp #0
-    beq b20_from_b65
-  //SEG163 [96] phi from menu::@65 to menu::@38 [phi:menu::@65->menu::@38]
-  b38_from_b65:
     jmp b38
-  //SEG164 menu::@38
+  //SEG160 menu::@38
   b38:
+  //SEG161 [94] (byte~) menu::$61 ← (byte) keyboard_key_pressed::return#10
+  //SEG162 [95] if((byte~) menu::$61==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@14 -- vbuaa_eq_0_then_la1 
+    cmp #0
+    beq b14_from_b38
+  //SEG163 [96] phi from menu::@38 to menu::@24 [phi:menu::@38->menu::@24]
+  b24_from_b38:
+    jmp b24
+  //SEG164 menu::@24
+  b24:
   //SEG165 [97] call mode_twoplanebitmap 
     jsr mode_twoplanebitmap
     jmp breturn
-  //SEG166 [98] phi from menu::@65 to menu::@20 [phi:menu::@65->menu::@20]
-  b20_from_b65:
-    jmp b20
-  //SEG167 menu::@20
-  b20:
+  //SEG166 [98] phi from menu::@38 to menu::@14 [phi:menu::@38->menu::@14]
+  b14_from_b38:
+    jmp b14
+  //SEG167 menu::@14
+  b14:
   //SEG168 [99] call keyboard_key_pressed 
-  //SEG169 [211] phi from menu::@20 to keyboard_key_pressed [phi:menu::@20->keyboard_key_pressed]
-  keyboard_key_pressed_from_b20:
-  //SEG170 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:menu::@20->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG169 [211] phi from menu::@14 to keyboard_key_pressed [phi:menu::@14->keyboard_key_pressed]
+  keyboard_key_pressed_from_b14:
+  //SEG170 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:menu::@14->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_C
     jsr keyboard_key_pressed
   //SEG171 [100] (byte) keyboard_key_pressed::return#11 ← (byte) keyboard_key_pressed::return#0
-    jmp b67
-  //SEG172 menu::@67
-  b67:
+    jmp b39
+  //SEG172 menu::@39
+  b39:
   //SEG173 [101] (byte~) menu::$65 ← (byte) keyboard_key_pressed::return#11
-  //SEG174 [102] if((byte~) menu::$65==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@21 -- vbuaa_eq_0_then_la1 
+  //SEG174 [102] if((byte~) menu::$65==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@15 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b21_from_b67
-  //SEG175 [103] phi from menu::@67 to menu::@40 [phi:menu::@67->menu::@40]
-  b40_from_b67:
-    jmp b40
-  //SEG176 menu::@40
-  b40:
+    beq b15_from_b39
+  //SEG175 [103] phi from menu::@39 to menu::@25 [phi:menu::@39->menu::@25]
+  b25_from_b39:
+    jmp b25
+  //SEG176 menu::@25
+  b25:
   //SEG177 [104] call mode_sixsfred 
     jsr mode_sixsfred
     jmp breturn
-  //SEG178 [105] phi from menu::@67 to menu::@21 [phi:menu::@67->menu::@21]
-  b21_from_b67:
-    jmp b21
-  //SEG179 menu::@21
-  b21:
+  //SEG178 [105] phi from menu::@39 to menu::@15 [phi:menu::@39->menu::@15]
+  b15_from_b39:
+    jmp b15
+  //SEG179 menu::@15
+  b15:
   //SEG180 [106] call keyboard_key_pressed 
-  //SEG181 [211] phi from menu::@21 to keyboard_key_pressed [phi:menu::@21->keyboard_key_pressed]
-  keyboard_key_pressed_from_b21:
-  //SEG182 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_D#0 [phi:menu::@21->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG181 [211] phi from menu::@15 to keyboard_key_pressed [phi:menu::@15->keyboard_key_pressed]
+  keyboard_key_pressed_from_b15:
+  //SEG182 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_D#0 [phi:menu::@15->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_D
     jsr keyboard_key_pressed
   //SEG183 [107] (byte) keyboard_key_pressed::return#12 ← (byte) keyboard_key_pressed::return#0
-    jmp b69
-  //SEG184 menu::@69
-  b69:
+    jmp b40
+  //SEG184 menu::@40
+  b40:
   //SEG185 [108] (byte~) menu::$69 ← (byte) keyboard_key_pressed::return#12
-  //SEG186 [109] if((byte~) menu::$69==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@22 -- vbuaa_eq_0_then_la1 
+  //SEG186 [109] if((byte~) menu::$69==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@16 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b22_from_b69
-  //SEG187 [110] phi from menu::@69 to menu::@42 [phi:menu::@69->menu::@42]
-  b42_from_b69:
-    jmp b42
-  //SEG188 menu::@42
-  b42:
+    beq b16_from_b40
+  //SEG187 [110] phi from menu::@40 to menu::@26 [phi:menu::@40->menu::@26]
+  b26_from_b40:
+    jmp b26
+  //SEG188 menu::@26
+  b26:
   //SEG189 [111] call mode_8bpppixelcell 
     jsr mode_8bpppixelcell
     jmp breturn
-  //SEG190 [112] phi from menu::@69 to menu::@22 [phi:menu::@69->menu::@22]
-  b22_from_b69:
-    jmp b22
-  //SEG191 menu::@22
-  b22:
+  //SEG190 [112] phi from menu::@40 to menu::@16 [phi:menu::@40->menu::@16]
+  b16_from_b40:
+    jmp b16
+  //SEG191 menu::@16
+  b16:
   //SEG192 [113] call keyboard_key_pressed 
-  //SEG193 [211] phi from menu::@22 to keyboard_key_pressed [phi:menu::@22->keyboard_key_pressed]
-  keyboard_key_pressed_from_b22:
-  //SEG194 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_E#0 [phi:menu::@22->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG193 [211] phi from menu::@16 to keyboard_key_pressed [phi:menu::@16->keyboard_key_pressed]
+  keyboard_key_pressed_from_b16:
+  //SEG194 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_E#0 [phi:menu::@16->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_E
     jsr keyboard_key_pressed
   //SEG195 [114] (byte) keyboard_key_pressed::return#13 ← (byte) keyboard_key_pressed::return#0
-    jmp b71
-  //SEG196 menu::@71
-  b71:
+    jmp b41
+  //SEG196 menu::@41
+  b41:
   //SEG197 [115] (byte~) menu::$73 ← (byte) keyboard_key_pressed::return#13
-  //SEG198 [116] if((byte~) menu::$73==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@2 -- vbuaa_eq_0_then_la1 
+  //SEG198 [116] if((byte~) menu::$73==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b2_from_b71
-  //SEG199 [117] phi from menu::@71 to menu::@44 [phi:menu::@71->menu::@44]
-  b44_from_b71:
-    jmp b44
-  //SEG200 menu::@44
-  b44:
+    beq b1_from_b41
+  //SEG199 [117] phi from menu::@41 to menu::@27 [phi:menu::@41->menu::@27]
+  b27_from_b41:
+    jmp b27
+  //SEG200 menu::@27
+  b27:
   //SEG201 [118] call mode_8bppchunkybmm 
     jsr mode_8bppchunkybmm
     jmp breturn
@@ -20199,15 +20333,15 @@ mode_8bppchunkybmm: {
   dtvSetCpuBankSegment1_from_b6:
   //SEG249 [223] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#3 = (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:mode_8bppchunkybmm::@6->dtvSetCpuBankSegment1#0] -- register_copy 
     jsr dtvSetCpuBankSegment1
-    jmp b10
-  //SEG250 mode_8bppchunkybmm::@10
-  b10:
+    jmp b9
+  //SEG250 mode_8bppchunkybmm::@9
+  b9:
   //SEG251 [140] (byte) mode_8bppchunkybmm::gfxbCpuBank#2 ← ++ (byte) mode_8bppchunkybmm::gfxbCpuBank#4 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG252 [141] phi from mode_8bppchunkybmm::@10 to mode_8bppchunkybmm::@5 [phi:mode_8bppchunkybmm::@10->mode_8bppchunkybmm::@5]
-  b5_from_b10:
-  //SEG253 [141] phi (byte) mode_8bppchunkybmm::gfxbCpuBank#8 = (byte) mode_8bppchunkybmm::gfxbCpuBank#2 [phi:mode_8bppchunkybmm::@10->mode_8bppchunkybmm::@5#0] -- register_copy 
-  //SEG254 [141] phi (byte*) mode_8bppchunkybmm::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:mode_8bppchunkybmm::@10->mode_8bppchunkybmm::@5#1] -- pbuz1=pbuc1 
+  //SEG252 [141] phi from mode_8bppchunkybmm::@9 to mode_8bppchunkybmm::@5 [phi:mode_8bppchunkybmm::@9->mode_8bppchunkybmm::@5]
+  b5_from_b9:
+  //SEG253 [141] phi (byte) mode_8bppchunkybmm::gfxbCpuBank#8 = (byte) mode_8bppchunkybmm::gfxbCpuBank#2 [phi:mode_8bppchunkybmm::@9->mode_8bppchunkybmm::@5#0] -- register_copy 
+  //SEG254 [141] phi (byte*) mode_8bppchunkybmm::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:mode_8bppchunkybmm::@9->mode_8bppchunkybmm::@5#1] -- pbuz1=pbuc1 
     lda #<$4000
     sta gfxb
     lda #>$4000
@@ -20270,15 +20404,15 @@ mode_8bppchunkybmm: {
   //SEG272 [223] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#3 = ((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 [phi:mode_8bppchunkybmm::@8->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1 
     lda #$4000/$4000
     jsr dtvSetCpuBankSegment1
-  //SEG273 [152] phi from mode_8bppchunkybmm::@8 to mode_8bppchunkybmm::@11 [phi:mode_8bppchunkybmm::@8->mode_8bppchunkybmm::@11]
-  b11_from_b8:
-    jmp b11
-  //SEG274 mode_8bppchunkybmm::@11
-  b11:
+  //SEG273 [152] phi from mode_8bppchunkybmm::@8 to mode_8bppchunkybmm::@10 [phi:mode_8bppchunkybmm::@8->mode_8bppchunkybmm::@10]
+  b10_from_b8:
+    jmp b10
+  //SEG274 mode_8bppchunkybmm::@10
+  b10:
   //SEG275 [153] call mode_ctrl 
-  //SEG276 [155] phi from mode_8bppchunkybmm::@11 to mode_ctrl [phi:mode_8bppchunkybmm::@11->mode_ctrl]
-  mode_ctrl_from_b11:
-  //SEG277 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 [phi:mode_8bppchunkybmm::@11->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG276 [155] phi from mode_8bppchunkybmm::@10 to mode_ctrl [phi:mode_8bppchunkybmm::@10->mode_ctrl]
+  mode_ctrl_from_b10:
+  //SEG277 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 [phi:mode_8bppchunkybmm::@10->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR|DTV_CHUNKY|DTV_COLORRAM_OFF
     sta dtv_control
     jsr mode_ctrl
@@ -20291,264 +20425,264 @@ mode_8bppchunkybmm: {
 //SEG280 mode_ctrl
 // Allow the user to control the DTV graphics using different keys
 mode_ctrl: {
-  //SEG281 [156] phi from mode_ctrl mode_ctrl::@30 to mode_ctrl::@1 [phi:mode_ctrl/mode_ctrl::@30->mode_ctrl::@1]
+  //SEG281 [156] phi from mode_ctrl mode_ctrl::@18 to mode_ctrl::@1 [phi:mode_ctrl/mode_ctrl::@18->mode_ctrl::@1]
   b1_from_mode_ctrl:
-  b1_from_b30:
-  //SEG282 [156] phi (byte) dtv_control#114 = (byte) dtv_control#145 [phi:mode_ctrl/mode_ctrl::@30->mode_ctrl::@1#0] -- register_copy 
+  b1_from_b18:
+  //SEG282 [156] phi (byte) dtv_control#114 = (byte) dtv_control#145 [phi:mode_ctrl/mode_ctrl::@18->mode_ctrl::@1#0] -- register_copy 
     jmp b1
-  //SEG283 [156] phi from mode_ctrl::@16 to mode_ctrl::@1 [phi:mode_ctrl::@16->mode_ctrl::@1]
-  b1_from_b16:
+  //SEG283 [156] phi from mode_ctrl::@11 to mode_ctrl::@1 [phi:mode_ctrl::@11->mode_ctrl::@1]
+  b1_from_b11:
     jmp b1
   //SEG284 mode_ctrl::@1
   b1:
-    jmp b6
+    jmp b2
   // Wait for the raster
-  //SEG285 mode_ctrl::@6
-  b6:
-  //SEG286 [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG285 mode_ctrl::@2
+  b2:
+  //SEG286 [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG287 [158] phi from mode_ctrl::@6 to mode_ctrl::@8 [phi:mode_ctrl::@6->mode_ctrl::@8]
-  b8_from_b6:
-    jmp b8
-  //SEG288 mode_ctrl::@8
-  b8:
+    bne b2
+  //SEG287 [158] phi from mode_ctrl::@2 to mode_ctrl::@3 [phi:mode_ctrl::@2->mode_ctrl::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG288 mode_ctrl::@3
+  b3:
   //SEG289 [159] call keyboard_key_pressed 
-  //SEG290 [211] phi from mode_ctrl::@8 to keyboard_key_pressed [phi:mode_ctrl::@8->keyboard_key_pressed]
-  keyboard_key_pressed_from_b8:
-  //SEG291 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_SPACE#0 [phi:mode_ctrl::@8->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG290 [211] phi from mode_ctrl::@3 to keyboard_key_pressed [phi:mode_ctrl::@3->keyboard_key_pressed]
+  keyboard_key_pressed_from_b3:
+  //SEG291 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_SPACE#0 [phi:mode_ctrl::@3->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_SPACE
     jsr keyboard_key_pressed
   //SEG292 [160] (byte) keyboard_key_pressed::return#14 ← (byte) keyboard_key_pressed::return#0
-    jmp b32
-  //SEG293 mode_ctrl::@32
-  b32:
+    jmp b19
+  //SEG293 mode_ctrl::@19
+  b19:
   //SEG294 [161] (byte~) mode_ctrl::$1 ← (byte) keyboard_key_pressed::return#14
-  //SEG295 [162] if((byte~) mode_ctrl::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@9 -- vbuaa_eq_0_then_la1 
+  //SEG295 [162] if((byte~) mode_ctrl::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b9
+    beq b4
     jmp breturn
   //SEG296 mode_ctrl::@return
   breturn:
   //SEG297 [163] return 
     rts
-  //SEG298 mode_ctrl::@9
-  b9:
+  //SEG298 mode_ctrl::@4
+  b4:
   //SEG299 [164] (byte) mode_ctrl::ctrl#0 ← (byte) dtv_control#114 -- vbuxx=vbuz1 
     // Read the current control byte
     ldx dtv_control
   //SEG300 [165] call keyboard_key_pressed 
-  //SEG301 [211] phi from mode_ctrl::@9 to keyboard_key_pressed [phi:mode_ctrl::@9->keyboard_key_pressed]
-  keyboard_key_pressed_from_b9:
-  //SEG302 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_L#0 [phi:mode_ctrl::@9->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG301 [211] phi from mode_ctrl::@4 to keyboard_key_pressed [phi:mode_ctrl::@4->keyboard_key_pressed]
+  keyboard_key_pressed_from_b4:
+  //SEG302 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_L#0 [phi:mode_ctrl::@4->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_L
     jsr keyboard_key_pressed
   //SEG303 [166] (byte) keyboard_key_pressed::return#15 ← (byte) keyboard_key_pressed::return#0
-    jmp b33
-  //SEG304 mode_ctrl::@33
-  b33:
+    jmp b20
+  //SEG304 mode_ctrl::@20
+  b20:
   //SEG305 [167] (byte~) mode_ctrl::$4 ← (byte) keyboard_key_pressed::return#15
-  //SEG306 [168] if((byte~) mode_ctrl::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@10 -- vbuaa_eq_0_then_la1 
+  //SEG306 [168] if((byte~) mode_ctrl::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@5 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b10_from_b33
-    jmp b23
-  //SEG307 mode_ctrl::@23
-  b23:
+    beq b5_from_b20
+    jmp b12
+  //SEG307 mode_ctrl::@12
+  b12:
   //SEG308 [169] (byte) mode_ctrl::ctrl#1 ← (byte) mode_ctrl::ctrl#0 | (const byte) DTV_LINEAR#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_LINEAR
     tax
-  //SEG309 [170] phi from mode_ctrl::@23 mode_ctrl::@33 to mode_ctrl::@10 [phi:mode_ctrl::@23/mode_ctrl::@33->mode_ctrl::@10]
-  b10_from_b23:
-  b10_from_b33:
-  //SEG310 [170] phi (byte) mode_ctrl::ctrl#17 = (byte) mode_ctrl::ctrl#1 [phi:mode_ctrl::@23/mode_ctrl::@33->mode_ctrl::@10#0] -- register_copy 
-    jmp b10
-  //SEG311 mode_ctrl::@10
-  b10:
+  //SEG309 [170] phi from mode_ctrl::@12 mode_ctrl::@20 to mode_ctrl::@5 [phi:mode_ctrl::@12/mode_ctrl::@20->mode_ctrl::@5]
+  b5_from_b12:
+  b5_from_b20:
+  //SEG310 [170] phi (byte) mode_ctrl::ctrl#17 = (byte) mode_ctrl::ctrl#1 [phi:mode_ctrl::@12/mode_ctrl::@20->mode_ctrl::@5#0] -- register_copy 
+    jmp b5
+  //SEG311 mode_ctrl::@5
+  b5:
   //SEG312 [171] call keyboard_key_pressed 
-  //SEG313 [211] phi from mode_ctrl::@10 to keyboard_key_pressed [phi:mode_ctrl::@10->keyboard_key_pressed]
-  keyboard_key_pressed_from_b10:
-  //SEG314 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_H#0 [phi:mode_ctrl::@10->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG313 [211] phi from mode_ctrl::@5 to keyboard_key_pressed [phi:mode_ctrl::@5->keyboard_key_pressed]
+  keyboard_key_pressed_from_b5:
+  //SEG314 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_H#0 [phi:mode_ctrl::@5->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_H
     jsr keyboard_key_pressed
   //SEG315 [172] (byte) keyboard_key_pressed::return#16 ← (byte) keyboard_key_pressed::return#0
-    jmp b34
-  //SEG316 mode_ctrl::@34
-  b34:
+    jmp b21
+  //SEG316 mode_ctrl::@21
+  b21:
   //SEG317 [173] (byte~) mode_ctrl::$8 ← (byte) keyboard_key_pressed::return#16
-  //SEG318 [174] if((byte~) mode_ctrl::$8==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@11 -- vbuaa_eq_0_then_la1 
+  //SEG318 [174] if((byte~) mode_ctrl::$8==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@6 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b11_from_b34
-    jmp b24
-  //SEG319 mode_ctrl::@24
-  b24:
+    beq b6_from_b21
+    jmp b13
+  //SEG319 mode_ctrl::@13
+  b13:
   //SEG320 [175] (byte) mode_ctrl::ctrl#2 ← (byte) mode_ctrl::ctrl#17 | (const byte) DTV_HIGHCOLOR#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_HIGHCOLOR
     tax
-  //SEG321 [176] phi from mode_ctrl::@24 mode_ctrl::@34 to mode_ctrl::@11 [phi:mode_ctrl::@24/mode_ctrl::@34->mode_ctrl::@11]
-  b11_from_b24:
-  b11_from_b34:
-  //SEG322 [176] phi (byte) mode_ctrl::ctrl#10 = (byte) mode_ctrl::ctrl#2 [phi:mode_ctrl::@24/mode_ctrl::@34->mode_ctrl::@11#0] -- register_copy 
-    jmp b11
-  //SEG323 mode_ctrl::@11
-  b11:
+  //SEG321 [176] phi from mode_ctrl::@13 mode_ctrl::@21 to mode_ctrl::@6 [phi:mode_ctrl::@13/mode_ctrl::@21->mode_ctrl::@6]
+  b6_from_b13:
+  b6_from_b21:
+  //SEG322 [176] phi (byte) mode_ctrl::ctrl#10 = (byte) mode_ctrl::ctrl#2 [phi:mode_ctrl::@13/mode_ctrl::@21->mode_ctrl::@6#0] -- register_copy 
+    jmp b6
+  //SEG323 mode_ctrl::@6
+  b6:
   //SEG324 [177] call keyboard_key_pressed 
-  //SEG325 [211] phi from mode_ctrl::@11 to keyboard_key_pressed [phi:mode_ctrl::@11->keyboard_key_pressed]
-  keyboard_key_pressed_from_b11:
-  //SEG326 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_O#0 [phi:mode_ctrl::@11->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG325 [211] phi from mode_ctrl::@6 to keyboard_key_pressed [phi:mode_ctrl::@6->keyboard_key_pressed]
+  keyboard_key_pressed_from_b6:
+  //SEG326 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_O#0 [phi:mode_ctrl::@6->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_O
     jsr keyboard_key_pressed
   //SEG327 [178] (byte) keyboard_key_pressed::return#17 ← (byte) keyboard_key_pressed::return#0
-    jmp b35
-  //SEG328 mode_ctrl::@35
-  b35:
+    jmp b22
+  //SEG328 mode_ctrl::@22
+  b22:
   //SEG329 [179] (byte~) mode_ctrl::$12 ← (byte) keyboard_key_pressed::return#17
-  //SEG330 [180] if((byte~) mode_ctrl::$12==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@12 -- vbuaa_eq_0_then_la1 
+  //SEG330 [180] if((byte~) mode_ctrl::$12==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@7 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b12_from_b35
-    jmp b25
-  //SEG331 mode_ctrl::@25
-  b25:
+    beq b7_from_b22
+    jmp b14
+  //SEG331 mode_ctrl::@14
+  b14:
   //SEG332 [181] (byte) mode_ctrl::ctrl#3 ← (byte) mode_ctrl::ctrl#10 | (const byte) DTV_OVERSCAN#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_OVERSCAN
     tax
-  //SEG333 [182] phi from mode_ctrl::@25 mode_ctrl::@35 to mode_ctrl::@12 [phi:mode_ctrl::@25/mode_ctrl::@35->mode_ctrl::@12]
-  b12_from_b25:
-  b12_from_b35:
-  //SEG334 [182] phi (byte) mode_ctrl::ctrl#11 = (byte) mode_ctrl::ctrl#3 [phi:mode_ctrl::@25/mode_ctrl::@35->mode_ctrl::@12#0] -- register_copy 
-    jmp b12
-  //SEG335 mode_ctrl::@12
-  b12:
+  //SEG333 [182] phi from mode_ctrl::@14 mode_ctrl::@22 to mode_ctrl::@7 [phi:mode_ctrl::@14/mode_ctrl::@22->mode_ctrl::@7]
+  b7_from_b14:
+  b7_from_b22:
+  //SEG334 [182] phi (byte) mode_ctrl::ctrl#11 = (byte) mode_ctrl::ctrl#3 [phi:mode_ctrl::@14/mode_ctrl::@22->mode_ctrl::@7#0] -- register_copy 
+    jmp b7
+  //SEG335 mode_ctrl::@7
+  b7:
   //SEG336 [183] call keyboard_key_pressed 
-  //SEG337 [211] phi from mode_ctrl::@12 to keyboard_key_pressed [phi:mode_ctrl::@12->keyboard_key_pressed]
-  keyboard_key_pressed_from_b12:
-  //SEG338 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:mode_ctrl::@12->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG337 [211] phi from mode_ctrl::@7 to keyboard_key_pressed [phi:mode_ctrl::@7->keyboard_key_pressed]
+  keyboard_key_pressed_from_b7:
+  //SEG338 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:mode_ctrl::@7->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_B
     jsr keyboard_key_pressed
   //SEG339 [184] (byte) keyboard_key_pressed::return#18 ← (byte) keyboard_key_pressed::return#0
-    jmp b36
-  //SEG340 mode_ctrl::@36
-  b36:
+    jmp b23
+  //SEG340 mode_ctrl::@23
+  b23:
   //SEG341 [185] (byte~) mode_ctrl::$16 ← (byte) keyboard_key_pressed::return#18
-  //SEG342 [186] if((byte~) mode_ctrl::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@13 -- vbuaa_eq_0_then_la1 
+  //SEG342 [186] if((byte~) mode_ctrl::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@8 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b13_from_b36
-    jmp b26
-  //SEG343 mode_ctrl::@26
-  b26:
+    beq b8_from_b23
+    jmp b15
+  //SEG343 mode_ctrl::@15
+  b15:
   //SEG344 [187] (byte) mode_ctrl::ctrl#4 ← (byte) mode_ctrl::ctrl#11 | (const byte) DTV_BORDER_OFF#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_BORDER_OFF
     tax
-  //SEG345 [188] phi from mode_ctrl::@26 mode_ctrl::@36 to mode_ctrl::@13 [phi:mode_ctrl::@26/mode_ctrl::@36->mode_ctrl::@13]
-  b13_from_b26:
-  b13_from_b36:
-  //SEG346 [188] phi (byte) mode_ctrl::ctrl#12 = (byte) mode_ctrl::ctrl#4 [phi:mode_ctrl::@26/mode_ctrl::@36->mode_ctrl::@13#0] -- register_copy 
-    jmp b13
-  //SEG347 mode_ctrl::@13
-  b13:
+  //SEG345 [188] phi from mode_ctrl::@15 mode_ctrl::@23 to mode_ctrl::@8 [phi:mode_ctrl::@15/mode_ctrl::@23->mode_ctrl::@8]
+  b8_from_b15:
+  b8_from_b23:
+  //SEG346 [188] phi (byte) mode_ctrl::ctrl#12 = (byte) mode_ctrl::ctrl#4 [phi:mode_ctrl::@15/mode_ctrl::@23->mode_ctrl::@8#0] -- register_copy 
+    jmp b8
+  //SEG347 mode_ctrl::@8
+  b8:
   //SEG348 [189] call keyboard_key_pressed 
-  //SEG349 [211] phi from mode_ctrl::@13 to keyboard_key_pressed [phi:mode_ctrl::@13->keyboard_key_pressed]
-  keyboard_key_pressed_from_b13:
-  //SEG350 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_U#0 [phi:mode_ctrl::@13->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG349 [211] phi from mode_ctrl::@8 to keyboard_key_pressed [phi:mode_ctrl::@8->keyboard_key_pressed]
+  keyboard_key_pressed_from_b8:
+  //SEG350 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_U#0 [phi:mode_ctrl::@8->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_U
     jsr keyboard_key_pressed
   //SEG351 [190] (byte) keyboard_key_pressed::return#19 ← (byte) keyboard_key_pressed::return#0
-    jmp b37
-  //SEG352 mode_ctrl::@37
-  b37:
+    jmp b24
+  //SEG352 mode_ctrl::@24
+  b24:
   //SEG353 [191] (byte~) mode_ctrl::$20 ← (byte) keyboard_key_pressed::return#19
-  //SEG354 [192] if((byte~) mode_ctrl::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@14 -- vbuaa_eq_0_then_la1 
+  //SEG354 [192] if((byte~) mode_ctrl::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@9 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b14_from_b37
-    jmp b27
-  //SEG355 mode_ctrl::@27
-  b27:
+    beq b9_from_b24
+    jmp b16
+  //SEG355 mode_ctrl::@16
+  b16:
   //SEG356 [193] (byte) mode_ctrl::ctrl#5 ← (byte) mode_ctrl::ctrl#12 | (const byte) DTV_CHUNKY#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_CHUNKY
     tax
-  //SEG357 [194] phi from mode_ctrl::@27 mode_ctrl::@37 to mode_ctrl::@14 [phi:mode_ctrl::@27/mode_ctrl::@37->mode_ctrl::@14]
-  b14_from_b27:
-  b14_from_b37:
-  //SEG358 [194] phi (byte) mode_ctrl::ctrl#13 = (byte) mode_ctrl::ctrl#5 [phi:mode_ctrl::@27/mode_ctrl::@37->mode_ctrl::@14#0] -- register_copy 
-    jmp b14
-  //SEG359 mode_ctrl::@14
-  b14:
+  //SEG357 [194] phi from mode_ctrl::@16 mode_ctrl::@24 to mode_ctrl::@9 [phi:mode_ctrl::@16/mode_ctrl::@24->mode_ctrl::@9]
+  b9_from_b16:
+  b9_from_b24:
+  //SEG358 [194] phi (byte) mode_ctrl::ctrl#13 = (byte) mode_ctrl::ctrl#5 [phi:mode_ctrl::@16/mode_ctrl::@24->mode_ctrl::@9#0] -- register_copy 
+    jmp b9
+  //SEG359 mode_ctrl::@9
+  b9:
   //SEG360 [195] call keyboard_key_pressed 
-  //SEG361 [211] phi from mode_ctrl::@14 to keyboard_key_pressed [phi:mode_ctrl::@14->keyboard_key_pressed]
-  keyboard_key_pressed_from_b14:
-  //SEG362 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:mode_ctrl::@14->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG361 [211] phi from mode_ctrl::@9 to keyboard_key_pressed [phi:mode_ctrl::@9->keyboard_key_pressed]
+  keyboard_key_pressed_from_b9:
+  //SEG362 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:mode_ctrl::@9->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_C
     jsr keyboard_key_pressed
   //SEG363 [196] (byte) keyboard_key_pressed::return#20 ← (byte) keyboard_key_pressed::return#0
-    jmp b38
-  //SEG364 mode_ctrl::@38
-  b38:
+    jmp b25
+  //SEG364 mode_ctrl::@25
+  b25:
   //SEG365 [197] (byte~) mode_ctrl::$24 ← (byte) keyboard_key_pressed::return#20
-  //SEG366 [198] if((byte~) mode_ctrl::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@15 -- vbuaa_eq_0_then_la1 
+  //SEG366 [198] if((byte~) mode_ctrl::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@10 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b15_from_b38
-    jmp b28
-  //SEG367 mode_ctrl::@28
-  b28:
+    beq b10_from_b25
+    jmp b17
+  //SEG367 mode_ctrl::@17
+  b17:
   //SEG368 [199] (byte) mode_ctrl::ctrl#6 ← (byte) mode_ctrl::ctrl#13 | (const byte) DTV_COLORRAM_OFF#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_COLORRAM_OFF
     tax
-  //SEG369 [200] phi from mode_ctrl::@28 mode_ctrl::@38 to mode_ctrl::@15 [phi:mode_ctrl::@28/mode_ctrl::@38->mode_ctrl::@15]
-  b15_from_b28:
-  b15_from_b38:
-  //SEG370 [200] phi (byte) mode_ctrl::ctrl#22 = (byte) mode_ctrl::ctrl#6 [phi:mode_ctrl::@28/mode_ctrl::@38->mode_ctrl::@15#0] -- register_copy 
-    jmp b15
-  //SEG371 mode_ctrl::@15
-  b15:
+  //SEG369 [200] phi from mode_ctrl::@17 mode_ctrl::@25 to mode_ctrl::@10 [phi:mode_ctrl::@17/mode_ctrl::@25->mode_ctrl::@10]
+  b10_from_b17:
+  b10_from_b25:
+  //SEG370 [200] phi (byte) mode_ctrl::ctrl#22 = (byte) mode_ctrl::ctrl#6 [phi:mode_ctrl::@17/mode_ctrl::@25->mode_ctrl::@10#0] -- register_copy 
+    jmp b10
+  //SEG371 mode_ctrl::@10
+  b10:
   //SEG372 [201] call keyboard_key_pressed 
-  //SEG373 [211] phi from mode_ctrl::@15 to keyboard_key_pressed [phi:mode_ctrl::@15->keyboard_key_pressed]
-  keyboard_key_pressed_from_b15:
-  //SEG374 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_0#0 [phi:mode_ctrl::@15->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG373 [211] phi from mode_ctrl::@10 to keyboard_key_pressed [phi:mode_ctrl::@10->keyboard_key_pressed]
+  keyboard_key_pressed_from_b10:
+  //SEG374 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_0#0 [phi:mode_ctrl::@10->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_0
     jsr keyboard_key_pressed
   //SEG375 [202] (byte) keyboard_key_pressed::return#21 ← (byte) keyboard_key_pressed::return#0
-    jmp b39
-  //SEG376 mode_ctrl::@39
-  b39:
+    jmp b26
+  //SEG376 mode_ctrl::@26
+  b26:
   //SEG377 [203] (byte~) mode_ctrl::$28 ← (byte) keyboard_key_pressed::return#21
-  //SEG378 [204] if((byte~) mode_ctrl::$28==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@46 -- vbuaa_eq_0_then_la1 
+  //SEG378 [204] if((byte~) mode_ctrl::$28==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@27 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b46_from_b39
-  //SEG379 [205] phi from mode_ctrl::@39 to mode_ctrl::@16 [phi:mode_ctrl::@39->mode_ctrl::@16]
-  b16_from_b39:
-  //SEG380 [205] phi (byte) mode_ctrl::ctrl#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_ctrl::@39->mode_ctrl::@16#0] -- vbuxx=vbuc1 
+    beq b27_from_b26
+  //SEG379 [205] phi from mode_ctrl::@26 to mode_ctrl::@11 [phi:mode_ctrl::@26->mode_ctrl::@11]
+  b11_from_b26:
+  //SEG380 [205] phi (byte) mode_ctrl::ctrl#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_ctrl::@26->mode_ctrl::@11#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b16
-  //SEG381 mode_ctrl::@16
-  b16:
+    jmp b11
+  //SEG381 mode_ctrl::@11
+  b11:
   //SEG382 [206] if((byte) mode_ctrl::ctrl#14==(byte) dtv_control#114) goto mode_ctrl::@1 -- vbuxx_eq_vbuz1_then_la1 
     cpx dtv_control
-    beq b1_from_b16
-    jmp b30
-  //SEG383 mode_ctrl::@30
-  b30:
+    beq b1_from_b11
+    jmp b18
+  //SEG383 mode_ctrl::@18
+  b18:
   //SEG384 [207] (byte) dtv_control#17 ← (byte) mode_ctrl::ctrl#14 -- vbuz1=vbuxx 
     stx dtv_control
   //SEG385 [208] *((const byte*) DTV_CONTROL#0) ← (byte) mode_ctrl::ctrl#14 -- _deref_pbuc1=vbuxx 
     stx DTV_CONTROL
   //SEG386 [209] *((const byte*) BORDERCOL#0) ← (byte) mode_ctrl::ctrl#14 -- _deref_pbuc1=vbuxx 
     stx BORDERCOL
-    jmp b1_from_b30
-  //SEG387 [210] phi from mode_ctrl::@39 to mode_ctrl::@46 [phi:mode_ctrl::@39->mode_ctrl::@46]
-  b46_from_b39:
-    jmp b46
-  //SEG388 mode_ctrl::@46
-  b46:
-  //SEG389 [205] phi from mode_ctrl::@46 to mode_ctrl::@16 [phi:mode_ctrl::@46->mode_ctrl::@16]
-  b16_from_b46:
-  //SEG390 [205] phi (byte) mode_ctrl::ctrl#14 = (byte) mode_ctrl::ctrl#22 [phi:mode_ctrl::@46->mode_ctrl::@16#0] -- register_copy 
-    jmp b16
+    jmp b1_from_b18
+  //SEG387 [210] phi from mode_ctrl::@26 to mode_ctrl::@27 [phi:mode_ctrl::@26->mode_ctrl::@27]
+  b27_from_b26:
+    jmp b27
+  //SEG388 mode_ctrl::@27
+  b27:
+  //SEG389 [205] phi from mode_ctrl::@27 to mode_ctrl::@11 [phi:mode_ctrl::@27->mode_ctrl::@11]
+  b11_from_b27:
+  //SEG390 [205] phi (byte) mode_ctrl::ctrl#14 = (byte) mode_ctrl::ctrl#22 [phi:mode_ctrl::@27->mode_ctrl::@11#0] -- register_copy 
+    jmp b11
 }
 //SEG391 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -20572,9 +20706,9 @@ keyboard_key_pressed: {
   //SEG395 [215] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG396 [216] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-    jmp b2
-  //SEG397 keyboard_key_pressed::@2
-  b2:
+    jmp b1
+  //SEG397 keyboard_key_pressed::@1
+  b1:
   //SEG398 [217] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   //SEG399 [218] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuz1 
     ldy colidx
@@ -20722,37 +20856,37 @@ mode_8bpppixelcell: {
   //SEG436 [246] if((byte) mode_8bpppixelcell::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mode_8bpppixelcell::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
     bne b1_from_b1
-  //SEG437 [247] phi from mode_8bpppixelcell::@1 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@3]
-  b3_from_b1:
-  //SEG438 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (const byte*) mode_8bpppixelcell::PLANEA#0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@3#0] -- pbuz1=pbuc1 
+  //SEG437 [247] phi from mode_8bpppixelcell::@1 to mode_8bpppixelcell::@2 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@2]
+  b2_from_b1:
+  //SEG438 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (const byte*) mode_8bpppixelcell::PLANEA#0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@2#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG439 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@3#1] -- vbuz1=vbuc1 
+  //SEG439 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-    jmp b3
-  //SEG440 [247] phi from mode_8bpppixelcell::@5 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@3]
-  b3_from_b5:
-  //SEG441 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@3#0] -- register_copy 
-  //SEG442 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte) mode_8bpppixelcell::ay#1 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@3#1] -- register_copy 
-    jmp b3
-  //SEG443 mode_8bpppixelcell::@3
-  b3:
-  //SEG444 [248] phi from mode_8bpppixelcell::@3 to mode_8bpppixelcell::@4 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@4]
-  b4_from_b3:
-  //SEG445 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#3 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@4#0] -- register_copy 
-  //SEG446 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@4#1] -- vbuxx=vbuc1 
+    jmp b2
+  //SEG440 [247] phi from mode_8bpppixelcell::@4 to mode_8bpppixelcell::@2 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@2]
+  b2_from_b4:
+  //SEG441 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@2#0] -- register_copy 
+  //SEG442 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte) mode_8bpppixelcell::ay#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@2#1] -- register_copy 
+    jmp b2
+  //SEG443 mode_8bpppixelcell::@2
+  b2:
+  //SEG444 [248] phi from mode_8bpppixelcell::@2 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@2->mode_8bpppixelcell::@3]
+  b3_from_b2:
+  //SEG445 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#3 [phi:mode_8bpppixelcell::@2->mode_8bpppixelcell::@3#0] -- register_copy 
+  //SEG446 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@2->mode_8bpppixelcell::@3#1] -- vbuxx=vbuc1 
     ldx #0
-    jmp b4
-  //SEG447 [248] phi from mode_8bpppixelcell::@4 to mode_8bpppixelcell::@4 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@4]
-  b4_from_b4:
-  //SEG448 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@4#0] -- register_copy 
-  //SEG449 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte) mode_8bpppixelcell::ax#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@4#1] -- register_copy 
-    jmp b4
-  //SEG450 mode_8bpppixelcell::@4
-  b4:
+    jmp b3
+  //SEG447 [248] phi from mode_8bpppixelcell::@3 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@3]
+  b3_from_b3:
+  //SEG448 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@3#0] -- register_copy 
+  //SEG449 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte) mode_8bpppixelcell::ax#1 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@3#1] -- register_copy 
+    jmp b3
+  //SEG450 mode_8bpppixelcell::@3
+  b3:
   //SEG451 [249] (byte~) mode_8bpppixelcell::$14 ← (byte) mode_8bpppixelcell::ay#4 & (byte/signed byte/word/signed word/dword/signed dword) $f -- vbuaa=vbuz1_band_vbuc1 
     lda #$f
     and ay
@@ -20777,71 +20911,71 @@ mode_8bpppixelcell: {
   !:
   //SEG457 [255] (byte) mode_8bpppixelcell::ax#1 ← ++ (byte) mode_8bpppixelcell::ax#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG458 [256] if((byte) mode_8bpppixelcell::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_8bpppixelcell::@4 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG458 [256] if((byte) mode_8bpppixelcell::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_8bpppixelcell::@3 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b4_from_b4
-    jmp b5
-  //SEG459 mode_8bpppixelcell::@5
-  b5:
+    bne b3_from_b3
+    jmp b4
+  //SEG459 mode_8bpppixelcell::@4
+  b4:
   //SEG460 [257] (byte) mode_8bpppixelcell::ay#1 ← ++ (byte) mode_8bpppixelcell::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG461 [258] if((byte) mode_8bpppixelcell::ay#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_8bpppixelcell::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG461 [258] if((byte) mode_8bpppixelcell::ay#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_8bpppixelcell::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$19
     cmp ay
-    bne b3_from_b5
-    jmp b6
-  //SEG462 mode_8bpppixelcell::@6
-  b6:
+    bne b2_from_b4
+    jmp b5
+  //SEG462 mode_8bpppixelcell::@5
+  b5:
   //SEG463 [259] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_CHARROM#0 -- _deref_pbuc1=vbuc2 
     // 8bpp cells for Plane B (charset) - ROM charset with 256 colors
     lda #PROCPORT_RAM_CHARROM
     sta PROCPORT
-  //SEG464 [260] phi from mode_8bpppixelcell::@6 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7]
-  b7_from_b6:
-  //SEG465 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#0] -- vbuz1=vbuc1 
+  //SEG464 [260] phi from mode_8bpppixelcell::@5 to mode_8bpppixelcell::@6 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6]
+  b6_from_b5:
+  //SEG465 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#0] -- vbuz1=vbuc1 
     lda #0
     sta ch
-  //SEG466 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#1] -- vbuz1=vbuc1 
+  //SEG466 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#1] -- vbuz1=vbuc1 
     lda #0
     sta col
-  //SEG467 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (const byte*) mode_8bpppixelcell::PLANEB#0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#2] -- pbuz1=pbuc1 
+  //SEG467 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (const byte*) mode_8bpppixelcell::PLANEB#0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#2] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-  //SEG468 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (const byte*) mode_8bpppixelcell::CHARGEN#0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#3] -- pbuz1=pbuc1 
+  //SEG468 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (const byte*) mode_8bpppixelcell::CHARGEN#0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#3] -- pbuz1=pbuc1 
     lda #<CHARGEN
     sta chargen
     lda #>CHARGEN
     sta chargen+1
-    jmp b7
-  //SEG469 [260] phi from mode_8bpppixelcell::@13 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7]
-  b7_from_b13:
-  //SEG470 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte) mode_8bpppixelcell::ch#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#0] -- register_copy 
-  //SEG471 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#1] -- register_copy 
-  //SEG472 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#2] -- register_copy 
-  //SEG473 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#3] -- register_copy 
-    jmp b7
-  //SEG474 mode_8bpppixelcell::@7
-  b7:
-  //SEG475 [261] phi from mode_8bpppixelcell::@7 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8]
-  b8_from_b7:
-  //SEG476 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#0] -- vbuz1=vbuc1 
+    jmp b6
+  //SEG469 [260] phi from mode_8bpppixelcell::@12 to mode_8bpppixelcell::@6 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6]
+  b6_from_b12:
+  //SEG470 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte) mode_8bpppixelcell::ch#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#0] -- register_copy 
+  //SEG471 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#1] -- register_copy 
+  //SEG472 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#2] -- register_copy 
+  //SEG473 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#3] -- register_copy 
+    jmp b6
+  //SEG474 mode_8bpppixelcell::@6
+  b6:
+  //SEG475 [261] phi from mode_8bpppixelcell::@6 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7]
+  b7_from_b6:
+  //SEG476 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#0] -- vbuz1=vbuc1 
     lda #0
     sta cr
-  //SEG477 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#7 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#1] -- register_copy 
-  //SEG478 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#7 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#2] -- register_copy 
-  //SEG479 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#4 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#3] -- register_copy 
-    jmp b8
-  //SEG480 [261] phi from mode_8bpppixelcell::@12 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8]
-  b8_from_b12:
-  //SEG481 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte) mode_8bpppixelcell::cr#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#0] -- register_copy 
-  //SEG482 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#1] -- register_copy 
-  //SEG483 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#2] -- register_copy 
-  //SEG484 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#3] -- register_copy 
-    jmp b8
-  //SEG485 mode_8bpppixelcell::@8
-  b8:
+  //SEG477 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#1] -- register_copy 
+  //SEG478 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#2] -- register_copy 
+  //SEG479 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#4 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#3] -- register_copy 
+    jmp b7
+  //SEG480 [261] phi from mode_8bpppixelcell::@11 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7]
+  b7_from_b11:
+  //SEG481 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte) mode_8bpppixelcell::cr#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#0] -- register_copy 
+  //SEG482 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#1] -- register_copy 
+  //SEG483 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#2] -- register_copy 
+  //SEG484 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#3] -- register_copy 
+    jmp b7
+  //SEG485 mode_8bpppixelcell::@7
+  b7:
   //SEG486 [262] (byte) mode_8bpppixelcell::bits#0 ← *((byte*) mode_8bpppixelcell::chargen#2) -- vbuz1=_deref_pbuz2 
     ldy #0
     lda (chargen),y
@@ -20851,45 +20985,45 @@ mode_8bpppixelcell: {
     bne !+
     inc chargen+1
   !:
-  //SEG488 [264] phi from mode_8bpppixelcell::@8 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9]
-  b9_from_b8:
-  //SEG489 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#0] -- vbuxx=vbuc1 
+  //SEG488 [264] phi from mode_8bpppixelcell::@7 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8]
+  b8_from_b7:
+  //SEG489 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG490 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#5 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#1] -- register_copy 
-  //SEG491 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#5 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#2] -- register_copy 
-  //SEG492 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#0 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#3] -- register_copy 
-    jmp b9
-  //SEG493 [264] phi from mode_8bpppixelcell::@10 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9]
-  b9_from_b10:
-  //SEG494 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte) mode_8bpppixelcell::cp#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#0] -- register_copy 
-  //SEG495 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#1] -- register_copy 
-  //SEG496 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#2] -- register_copy 
-  //SEG497 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#3] -- register_copy 
-    jmp b9
-  //SEG498 mode_8bpppixelcell::@9
-  b9:
+  //SEG490 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#5 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#1] -- register_copy 
+  //SEG491 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#5 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#2] -- register_copy 
+  //SEG492 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#0 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#3] -- register_copy 
+    jmp b8
+  //SEG493 [264] phi from mode_8bpppixelcell::@9 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8]
+  b8_from_b9:
+  //SEG494 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte) mode_8bpppixelcell::cp#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#0] -- register_copy 
+  //SEG495 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#1] -- register_copy 
+  //SEG496 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#2] -- register_copy 
+  //SEG497 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#3] -- register_copy 
+    jmp b8
+  //SEG498 mode_8bpppixelcell::@8
+  b8:
   //SEG499 [265] (byte~) mode_8bpppixelcell::$20 ← (byte) mode_8bpppixelcell::bits#2 & (byte/word/signed word/dword/signed dword) $80 -- vbuaa=vbuz1_band_vbuc1 
     lda #$80
     and bits
-  //SEG500 [266] if((byte~) mode_8bpppixelcell::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@10 -- vbuaa_eq_0_then_la1 
+  //SEG500 [266] if((byte~) mode_8bpppixelcell::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@9 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b10_from_b9
-    jmp b11
-  //SEG501 mode_8bpppixelcell::@11
-  b11:
+    beq b9_from_b8
+    jmp b10
+  //SEG501 mode_8bpppixelcell::@10
+  b10:
   //SEG502 [267] (byte~) mode_8bpppixelcell::c#3 ← (byte) mode_8bpppixelcell::col#2 -- vbuaa=vbuz1 
     lda col
-  //SEG503 [268] phi from mode_8bpppixelcell::@11 to mode_8bpppixelcell::@10 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@10]
-  b10_from_b11:
-  //SEG504 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte~) mode_8bpppixelcell::c#3 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@10#0] -- register_copy 
-    jmp b10
-  //SEG505 [268] phi from mode_8bpppixelcell::@9 to mode_8bpppixelcell::@10 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@10]
-  b10_from_b9:
-  //SEG506 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@10#0] -- vbuaa=vbuc1 
+  //SEG503 [268] phi from mode_8bpppixelcell::@10 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9]
+  b9_from_b10:
+  //SEG504 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte~) mode_8bpppixelcell::c#3 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#0] -- register_copy 
+    jmp b9
+  //SEG505 [268] phi from mode_8bpppixelcell::@8 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9]
+  b9_from_b8:
+  //SEG506 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#0] -- vbuaa=vbuc1 
     lda #0
-    jmp b10
-  //SEG507 mode_8bpppixelcell::@10
-  b10:
+    jmp b9
+  //SEG507 mode_8bpppixelcell::@9
+  b9:
   //SEG508 [269] *((byte*) mode_8bpppixelcell::gfxb#2) ← (byte) mode_8bpppixelcell::c#2 -- _deref_pbuz1=vbuaa 
     ldy #0
     sta (gfxb),y
@@ -20904,37 +21038,37 @@ mode_8bpppixelcell: {
     inc col
   //SEG512 [273] (byte) mode_8bpppixelcell::cp#1 ← ++ (byte) mode_8bpppixelcell::cp#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG513 [274] if((byte) mode_8bpppixelcell::cp#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@9 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG513 [274] if((byte) mode_8bpppixelcell::cp#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@8 -- vbuxx_neq_vbuc1_then_la1 
     cpx #8
-    bne b9_from_b10
-    jmp b12
-  //SEG514 mode_8bpppixelcell::@12
-  b12:
+    bne b8_from_b9
+    jmp b11
+  //SEG514 mode_8bpppixelcell::@11
+  b11:
   //SEG515 [275] (byte) mode_8bpppixelcell::cr#1 ← ++ (byte) mode_8bpppixelcell::cr#6 -- vbuz1=_inc_vbuz1 
     inc cr
-  //SEG516 [276] if((byte) mode_8bpppixelcell::cr#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG516 [276] if((byte) mode_8bpppixelcell::cr#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp cr
-    bne b8_from_b12
-    jmp b13
-  //SEG517 mode_8bpppixelcell::@13
-  b13:
+    bne b7_from_b11
+    jmp b12
+  //SEG517 mode_8bpppixelcell::@12
+  b12:
   //SEG518 [277] (byte) mode_8bpppixelcell::ch#1 ← ++ (byte) mode_8bpppixelcell::ch#8 -- vbuz1=_inc_vbuz1 
     inc ch
-  //SEG519 [278] if((byte) mode_8bpppixelcell::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@7 -- vbuz1_neq_0_then_la1 
+  //SEG519 [278] if((byte) mode_8bpppixelcell::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@6 -- vbuz1_neq_0_then_la1 
     lda ch
     cmp #0
-    bne b7_from_b13
-    jmp b14
-  //SEG520 mode_8bpppixelcell::@14
-  b14:
+    bne b6_from_b12
+    jmp b13
+  //SEG520 mode_8bpppixelcell::@13
+  b13:
   //SEG521 [279] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0 -- _deref_pbuc1=vbuc2 
     lda #PROCPORT_RAM_IO
     sta PROCPORT
   //SEG522 [280] call mode_ctrl 
-  //SEG523 [155] phi from mode_8bpppixelcell::@14 to mode_ctrl [phi:mode_8bpppixelcell::@14->mode_ctrl]
-  mode_ctrl_from_b14:
-  //SEG524 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0 [phi:mode_8bpppixelcell::@14->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG523 [155] phi from mode_8bpppixelcell::@13 to mode_ctrl [phi:mode_8bpppixelcell::@13->mode_ctrl]
+  mode_ctrl_from_b13:
+  //SEG524 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0 [phi:mode_8bpppixelcell::@13->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR|DTV_CHUNKY
     sta dtv_control
     jsr mode_ctrl
@@ -21102,37 +21236,37 @@ mode_sixsfred: {
     lda #$19
     cmp cy
     bne b3_from_b5
-  //SEG578 [314] phi from mode_sixsfred::@5 to mode_sixsfred::@7 [phi:mode_sixsfred::@5->mode_sixsfred::@7]
-  b7_from_b5:
-  //SEG579 [314] phi (byte*) mode_sixsfred::gfxa#3 = (const byte*) mode_sixsfred::PLANEA#0 [phi:mode_sixsfred::@5->mode_sixsfred::@7#0] -- pbuz1=pbuc1 
+  //SEG578 [314] phi from mode_sixsfred::@5 to mode_sixsfred::@6 [phi:mode_sixsfred::@5->mode_sixsfred::@6]
+  b6_from_b5:
+  //SEG579 [314] phi (byte*) mode_sixsfred::gfxa#3 = (const byte*) mode_sixsfred::PLANEA#0 [phi:mode_sixsfred::@5->mode_sixsfred::@6#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG580 [314] phi (byte) mode_sixsfred::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@5->mode_sixsfred::@7#1] -- vbuz1=vbuc1 
+  //SEG580 [314] phi (byte) mode_sixsfred::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@5->mode_sixsfred::@6#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-    jmp b7
-  //SEG581 [314] phi from mode_sixsfred::@9 to mode_sixsfred::@7 [phi:mode_sixsfred::@9->mode_sixsfred::@7]
-  b7_from_b9:
-  //SEG582 [314] phi (byte*) mode_sixsfred::gfxa#3 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@9->mode_sixsfred::@7#0] -- register_copy 
-  //SEG583 [314] phi (byte) mode_sixsfred::ay#4 = (byte) mode_sixsfred::ay#1 [phi:mode_sixsfred::@9->mode_sixsfred::@7#1] -- register_copy 
-    jmp b7
-  //SEG584 mode_sixsfred::@7
-  b7:
-  //SEG585 [315] phi from mode_sixsfred::@7 to mode_sixsfred::@8 [phi:mode_sixsfred::@7->mode_sixsfred::@8]
-  b8_from_b7:
-  //SEG586 [315] phi (byte) mode_sixsfred::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@7->mode_sixsfred::@8#0] -- vbuxx=vbuc1 
+    jmp b6
+  //SEG581 [314] phi from mode_sixsfred::@8 to mode_sixsfred::@6 [phi:mode_sixsfred::@8->mode_sixsfred::@6]
+  b6_from_b8:
+  //SEG582 [314] phi (byte*) mode_sixsfred::gfxa#3 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@8->mode_sixsfred::@6#0] -- register_copy 
+  //SEG583 [314] phi (byte) mode_sixsfred::ay#4 = (byte) mode_sixsfred::ay#1 [phi:mode_sixsfred::@8->mode_sixsfred::@6#1] -- register_copy 
+    jmp b6
+  //SEG584 mode_sixsfred::@6
+  b6:
+  //SEG585 [315] phi from mode_sixsfred::@6 to mode_sixsfred::@7 [phi:mode_sixsfred::@6->mode_sixsfred::@7]
+  b7_from_b6:
+  //SEG586 [315] phi (byte) mode_sixsfred::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@6->mode_sixsfred::@7#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG587 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#3 [phi:mode_sixsfred::@7->mode_sixsfred::@8#1] -- register_copy 
-    jmp b8
-  //SEG588 [315] phi from mode_sixsfred::@8 to mode_sixsfred::@8 [phi:mode_sixsfred::@8->mode_sixsfred::@8]
-  b8_from_b8:
-  //SEG589 [315] phi (byte) mode_sixsfred::ax#2 = (byte) mode_sixsfred::ax#1 [phi:mode_sixsfred::@8->mode_sixsfred::@8#0] -- register_copy 
-  //SEG590 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@8->mode_sixsfred::@8#1] -- register_copy 
-    jmp b8
-  //SEG591 mode_sixsfred::@8
-  b8:
+  //SEG587 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#3 [phi:mode_sixsfred::@6->mode_sixsfred::@7#1] -- register_copy 
+    jmp b7
+  //SEG588 [315] phi from mode_sixsfred::@7 to mode_sixsfred::@7 [phi:mode_sixsfred::@7->mode_sixsfred::@7]
+  b7_from_b7:
+  //SEG589 [315] phi (byte) mode_sixsfred::ax#2 = (byte) mode_sixsfred::ax#1 [phi:mode_sixsfred::@7->mode_sixsfred::@7#0] -- register_copy 
+  //SEG590 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@7->mode_sixsfred::@7#1] -- register_copy 
+    jmp b7
+  //SEG591 mode_sixsfred::@7
+  b7:
   //SEG592 [316] (byte~) mode_sixsfred::$21 ← (byte) mode_sixsfred::ay#4 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_ror_1 
     lda ay
     lsr
@@ -21150,49 +21284,49 @@ mode_sixsfred: {
   !:
   //SEG596 [320] (byte) mode_sixsfred::ax#1 ← ++ (byte) mode_sixsfred::ax#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG597 [321] if((byte) mode_sixsfred::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG597 [321] if((byte) mode_sixsfred::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@7 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b8_from_b8
-    jmp b9
-  //SEG598 mode_sixsfred::@9
-  b9:
+    bne b7_from_b7
+    jmp b8
+  //SEG598 mode_sixsfred::@8
+  b8:
   //SEG599 [322] (byte) mode_sixsfred::ay#1 ← ++ (byte) mode_sixsfred::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG600 [323] if((byte) mode_sixsfred::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG600 [323] if((byte) mode_sixsfred::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
-    bne b7_from_b9
-  //SEG601 [324] phi from mode_sixsfred::@9 to mode_sixsfred::@11 [phi:mode_sixsfred::@9->mode_sixsfred::@11]
-  b11_from_b9:
-  //SEG602 [324] phi (byte) mode_sixsfred::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@9->mode_sixsfred::@11#0] -- vbuz1=vbuc1 
+    bne b6_from_b8
+  //SEG601 [324] phi from mode_sixsfred::@8 to mode_sixsfred::@9 [phi:mode_sixsfred::@8->mode_sixsfred::@9]
+  b9_from_b8:
+  //SEG602 [324] phi (byte) mode_sixsfred::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@8->mode_sixsfred::@9#0] -- vbuz1=vbuc1 
     lda #0
     sta by
-  //SEG603 [324] phi (byte*) mode_sixsfred::gfxb#3 = (const byte*) mode_sixsfred::PLANEB#0 [phi:mode_sixsfred::@9->mode_sixsfred::@11#1] -- pbuz1=pbuc1 
+  //SEG603 [324] phi (byte*) mode_sixsfred::gfxb#3 = (const byte*) mode_sixsfred::PLANEB#0 [phi:mode_sixsfred::@8->mode_sixsfred::@9#1] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-    jmp b11
-  //SEG604 [324] phi from mode_sixsfred::@13 to mode_sixsfred::@11 [phi:mode_sixsfred::@13->mode_sixsfred::@11]
-  b11_from_b13:
-  //SEG605 [324] phi (byte) mode_sixsfred::by#4 = (byte) mode_sixsfred::by#1 [phi:mode_sixsfred::@13->mode_sixsfred::@11#0] -- register_copy 
-  //SEG606 [324] phi (byte*) mode_sixsfred::gfxb#3 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@13->mode_sixsfred::@11#1] -- register_copy 
-    jmp b11
-  //SEG607 mode_sixsfred::@11
-  b11:
-  //SEG608 [325] phi from mode_sixsfred::@11 to mode_sixsfred::@12 [phi:mode_sixsfred::@11->mode_sixsfred::@12]
-  b12_from_b11:
-  //SEG609 [325] phi (byte) mode_sixsfred::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@11->mode_sixsfred::@12#0] -- vbuxx=vbuc1 
+    jmp b9
+  //SEG604 [324] phi from mode_sixsfred::@11 to mode_sixsfred::@9 [phi:mode_sixsfred::@11->mode_sixsfred::@9]
+  b9_from_b11:
+  //SEG605 [324] phi (byte) mode_sixsfred::by#4 = (byte) mode_sixsfred::by#1 [phi:mode_sixsfred::@11->mode_sixsfred::@9#0] -- register_copy 
+  //SEG606 [324] phi (byte*) mode_sixsfred::gfxb#3 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@11->mode_sixsfred::@9#1] -- register_copy 
+    jmp b9
+  //SEG607 mode_sixsfred::@9
+  b9:
+  //SEG608 [325] phi from mode_sixsfred::@9 to mode_sixsfred::@10 [phi:mode_sixsfred::@9->mode_sixsfred::@10]
+  b10_from_b9:
+  //SEG609 [325] phi (byte) mode_sixsfred::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@9->mode_sixsfred::@10#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG610 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#3 [phi:mode_sixsfred::@11->mode_sixsfred::@12#1] -- register_copy 
-    jmp b12
-  //SEG611 [325] phi from mode_sixsfred::@12 to mode_sixsfred::@12 [phi:mode_sixsfred::@12->mode_sixsfred::@12]
-  b12_from_b12:
-  //SEG612 [325] phi (byte) mode_sixsfred::bx#2 = (byte) mode_sixsfred::bx#1 [phi:mode_sixsfred::@12->mode_sixsfred::@12#0] -- register_copy 
-  //SEG613 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@12->mode_sixsfred::@12#1] -- register_copy 
-    jmp b12
-  //SEG614 mode_sixsfred::@12
-  b12:
+  //SEG610 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#3 [phi:mode_sixsfred::@9->mode_sixsfred::@10#1] -- register_copy 
+    jmp b10
+  //SEG611 [325] phi from mode_sixsfred::@10 to mode_sixsfred::@10 [phi:mode_sixsfred::@10->mode_sixsfred::@10]
+  b10_from_b10:
+  //SEG612 [325] phi (byte) mode_sixsfred::bx#2 = (byte) mode_sixsfred::bx#1 [phi:mode_sixsfred::@10->mode_sixsfred::@10#0] -- register_copy 
+  //SEG613 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@10->mode_sixsfred::@10#1] -- register_copy 
+    jmp b10
+  //SEG614 mode_sixsfred::@10
+  b10:
   //SEG615 [326] *((byte*) mode_sixsfred::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $1b -- _deref_pbuz1=vbuc1 
     lda #$1b
     ldy #0
@@ -21204,27 +21338,27 @@ mode_sixsfred: {
   !:
   //SEG617 [328] (byte) mode_sixsfred::bx#1 ← ++ (byte) mode_sixsfred::bx#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG618 [329] if((byte) mode_sixsfred::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@12 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG618 [329] if((byte) mode_sixsfred::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@10 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b12_from_b12
-    jmp b13
-  //SEG619 mode_sixsfred::@13
-  b13:
+    bne b10_from_b10
+    jmp b11
+  //SEG619 mode_sixsfred::@11
+  b11:
   //SEG620 [330] (byte) mode_sixsfred::by#1 ← ++ (byte) mode_sixsfred::by#4 -- vbuz1=_inc_vbuz1 
     inc by
-  //SEG621 [331] if((byte) mode_sixsfred::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG621 [331] if((byte) mode_sixsfred::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp by
-    bne b11_from_b13
-  //SEG622 [332] phi from mode_sixsfred::@13 to mode_sixsfred::@14 [phi:mode_sixsfred::@13->mode_sixsfred::@14]
-  b14_from_b13:
-    jmp b14
-  //SEG623 mode_sixsfred::@14
-  b14:
+    bne b9_from_b11
+  //SEG622 [332] phi from mode_sixsfred::@11 to mode_sixsfred::@12 [phi:mode_sixsfred::@11->mode_sixsfred::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG623 mode_sixsfred::@12
+  b12:
   //SEG624 [333] call mode_ctrl 
-  //SEG625 [155] phi from mode_sixsfred::@14 to mode_ctrl [phi:mode_sixsfred::@14->mode_ctrl]
-  mode_ctrl_from_b14:
-  //SEG626 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_sixsfred::@14->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG625 [155] phi from mode_sixsfred::@12 to mode_ctrl [phi:mode_sixsfred::@12->mode_ctrl]
+  mode_ctrl_from_b12:
+  //SEG626 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_sixsfred::@12->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
@@ -21412,46 +21546,46 @@ mode_twoplanebitmap: {
     lda #$19
     cmp cy
     bne b3_from_b5
-  //SEG684 [371] phi from mode_twoplanebitmap::@5 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@7]
-  b7_from_b5:
-  //SEG685 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (const byte*) mode_twoplanebitmap::PLANEA#0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@7#0] -- pbuz1=pbuc1 
+  //SEG684 [371] phi from mode_twoplanebitmap::@5 to mode_twoplanebitmap::@6 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@6]
+  b6_from_b5:
+  //SEG685 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (const byte*) mode_twoplanebitmap::PLANEA#0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@6#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG686 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@7#1] -- vbuz1=vbuc1 
+  //SEG686 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@6#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-    jmp b7
-  //SEG687 [371] phi from mode_twoplanebitmap::@13 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@7]
-  b7_from_b13:
-  //SEG688 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@7#0] -- register_copy 
-  //SEG689 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte) mode_twoplanebitmap::ay#1 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@7#1] -- register_copy 
-    jmp b7
-  //SEG690 mode_twoplanebitmap::@7
-  b7:
-  //SEG691 [372] phi from mode_twoplanebitmap::@7 to mode_twoplanebitmap::@8 [phi:mode_twoplanebitmap::@7->mode_twoplanebitmap::@8]
-  b8_from_b7:
-  //SEG692 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@7->mode_twoplanebitmap::@8#0] -- vbuxx=vbuc1 
+    jmp b6
+  //SEG687 [371] phi from mode_twoplanebitmap::@11 to mode_twoplanebitmap::@6 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@6]
+  b6_from_b11:
+  //SEG688 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@6#0] -- register_copy 
+  //SEG689 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte) mode_twoplanebitmap::ay#1 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@6#1] -- register_copy 
+    jmp b6
+  //SEG690 mode_twoplanebitmap::@6
+  b6:
+  //SEG691 [372] phi from mode_twoplanebitmap::@6 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@6->mode_twoplanebitmap::@7]
+  b7_from_b6:
+  //SEG692 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@6->mode_twoplanebitmap::@7#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG693 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#7 [phi:mode_twoplanebitmap::@7->mode_twoplanebitmap::@8#1] -- register_copy 
-    jmp b8
-  //SEG694 [372] phi from mode_twoplanebitmap::@10 to mode_twoplanebitmap::@8 [phi:mode_twoplanebitmap::@10->mode_twoplanebitmap::@8]
-  b8_from_b10:
-  //SEG695 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte) mode_twoplanebitmap::ax#1 [phi:mode_twoplanebitmap::@10->mode_twoplanebitmap::@8#0] -- register_copy 
-  //SEG696 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@10->mode_twoplanebitmap::@8#1] -- register_copy 
-    jmp b8
-  //SEG697 mode_twoplanebitmap::@8
-  b8:
+  //SEG693 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#7 [phi:mode_twoplanebitmap::@6->mode_twoplanebitmap::@7#1] -- register_copy 
+    jmp b7
+  //SEG694 [372] phi from mode_twoplanebitmap::@9 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@9->mode_twoplanebitmap::@7]
+  b7_from_b9:
+  //SEG695 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte) mode_twoplanebitmap::ax#1 [phi:mode_twoplanebitmap::@9->mode_twoplanebitmap::@7#0] -- register_copy 
+  //SEG696 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@9->mode_twoplanebitmap::@7#1] -- register_copy 
+    jmp b7
+  //SEG697 mode_twoplanebitmap::@7
+  b7:
   //SEG698 [373] (byte~) mode_twoplanebitmap::$22 ← (byte) mode_twoplanebitmap::ay#5 & (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuaa=vbuz1_band_vbuc1 
     lda #4
     and ay
-  //SEG699 [374] if((byte~) mode_twoplanebitmap::$22==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_twoplanebitmap::@9 -- vbuaa_eq_0_then_la1 
+  //SEG699 [374] if((byte~) mode_twoplanebitmap::$22==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_twoplanebitmap::@8 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b9
-    jmp b11
-  //SEG700 mode_twoplanebitmap::@11
-  b11:
+    beq b8
+    jmp b10
+  //SEG700 mode_twoplanebitmap::@10
+  b10:
   //SEG701 [375] *((byte*) mode_twoplanebitmap::gfxa#3) ← (byte/word/signed word/dword/signed dword) $ff -- _deref_pbuz1=vbuc1 
     lda #$ff
     ldy #0
@@ -21461,58 +21595,58 @@ mode_twoplanebitmap: {
     bne !+
     inc gfxa+1
   !:
-  //SEG703 [377] phi from mode_twoplanebitmap::@11 mode_twoplanebitmap::@9 to mode_twoplanebitmap::@10 [phi:mode_twoplanebitmap::@11/mode_twoplanebitmap::@9->mode_twoplanebitmap::@10]
-  b10_from_b11:
-  b10_from_b9:
-  //SEG704 [377] phi (byte*) mode_twoplanebitmap::gfxa#6 = (byte*) mode_twoplanebitmap::gfxa#2 [phi:mode_twoplanebitmap::@11/mode_twoplanebitmap::@9->mode_twoplanebitmap::@10#0] -- register_copy 
-    jmp b10
-  //SEG705 mode_twoplanebitmap::@10
-  b10:
+  //SEG703 [377] phi from mode_twoplanebitmap::@10 mode_twoplanebitmap::@8 to mode_twoplanebitmap::@9 [phi:mode_twoplanebitmap::@10/mode_twoplanebitmap::@8->mode_twoplanebitmap::@9]
+  b9_from_b10:
+  b9_from_b8:
+  //SEG704 [377] phi (byte*) mode_twoplanebitmap::gfxa#6 = (byte*) mode_twoplanebitmap::gfxa#2 [phi:mode_twoplanebitmap::@10/mode_twoplanebitmap::@8->mode_twoplanebitmap::@9#0] -- register_copy 
+    jmp b9
+  //SEG705 mode_twoplanebitmap::@9
+  b9:
   //SEG706 [378] (byte) mode_twoplanebitmap::ax#1 ← ++ (byte) mode_twoplanebitmap::ax#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG707 [379] if((byte) mode_twoplanebitmap::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG707 [379] if((byte) mode_twoplanebitmap::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@7 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b8_from_b10
-    jmp b13
-  //SEG708 mode_twoplanebitmap::@13
-  b13:
+    bne b7_from_b9
+    jmp b11
+  //SEG708 mode_twoplanebitmap::@11
+  b11:
   //SEG709 [380] (byte) mode_twoplanebitmap::ay#1 ← ++ (byte) mode_twoplanebitmap::ay#5 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG710 [381] if((byte) mode_twoplanebitmap::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG710 [381] if((byte) mode_twoplanebitmap::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
-    bne b7_from_b13
-  //SEG711 [382] phi from mode_twoplanebitmap::@13 to mode_twoplanebitmap::@15 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@15]
-  b15_from_b13:
-  //SEG712 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@15#0] -- vbuz1=vbuc1 
+    bne b6_from_b11
+  //SEG711 [382] phi from mode_twoplanebitmap::@11 to mode_twoplanebitmap::@12 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@12]
+  b12_from_b11:
+  //SEG712 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@12#0] -- vbuz1=vbuc1 
     lda #0
     sta by
-  //SEG713 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (const byte*) mode_twoplanebitmap::PLANEB#0 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@15#1] -- pbuz1=pbuc1 
+  //SEG713 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (const byte*) mode_twoplanebitmap::PLANEB#0 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@12#1] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-    jmp b15
-  //SEG714 [382] phi from mode_twoplanebitmap::@17 to mode_twoplanebitmap::@15 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@15]
-  b15_from_b17:
-  //SEG715 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte) mode_twoplanebitmap::by#1 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@15#0] -- register_copy 
-  //SEG716 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@15#1] -- register_copy 
-    jmp b15
-  //SEG717 mode_twoplanebitmap::@15
-  b15:
-  //SEG718 [383] phi from mode_twoplanebitmap::@15 to mode_twoplanebitmap::@16 [phi:mode_twoplanebitmap::@15->mode_twoplanebitmap::@16]
-  b16_from_b15:
-  //SEG719 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@15->mode_twoplanebitmap::@16#0] -- vbuxx=vbuc1 
+    jmp b12
+  //SEG714 [382] phi from mode_twoplanebitmap::@14 to mode_twoplanebitmap::@12 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@12]
+  b12_from_b14:
+  //SEG715 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte) mode_twoplanebitmap::by#1 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@12#0] -- register_copy 
+  //SEG716 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@12#1] -- register_copy 
+    jmp b12
+  //SEG717 mode_twoplanebitmap::@12
+  b12:
+  //SEG718 [383] phi from mode_twoplanebitmap::@12 to mode_twoplanebitmap::@13 [phi:mode_twoplanebitmap::@12->mode_twoplanebitmap::@13]
+  b13_from_b12:
+  //SEG719 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@12->mode_twoplanebitmap::@13#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG720 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#3 [phi:mode_twoplanebitmap::@15->mode_twoplanebitmap::@16#1] -- register_copy 
-    jmp b16
-  //SEG721 [383] phi from mode_twoplanebitmap::@16 to mode_twoplanebitmap::@16 [phi:mode_twoplanebitmap::@16->mode_twoplanebitmap::@16]
-  b16_from_b16:
-  //SEG722 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte) mode_twoplanebitmap::bx#1 [phi:mode_twoplanebitmap::@16->mode_twoplanebitmap::@16#0] -- register_copy 
-  //SEG723 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@16->mode_twoplanebitmap::@16#1] -- register_copy 
-    jmp b16
-  //SEG724 mode_twoplanebitmap::@16
-  b16:
+  //SEG720 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#3 [phi:mode_twoplanebitmap::@12->mode_twoplanebitmap::@13#1] -- register_copy 
+    jmp b13
+  //SEG721 [383] phi from mode_twoplanebitmap::@13 to mode_twoplanebitmap::@13 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@13]
+  b13_from_b13:
+  //SEG722 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte) mode_twoplanebitmap::bx#1 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@13#0] -- register_copy 
+  //SEG723 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@13#1] -- register_copy 
+    jmp b13
+  //SEG724 mode_twoplanebitmap::@13
+  b13:
   //SEG725 [384] *((byte*) mode_twoplanebitmap::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $f -- _deref_pbuz1=vbuc1 
     lda #$f
     ldy #0
@@ -21524,27 +21658,27 @@ mode_twoplanebitmap: {
   !:
   //SEG727 [386] (byte) mode_twoplanebitmap::bx#1 ← ++ (byte) mode_twoplanebitmap::bx#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG728 [387] if((byte) mode_twoplanebitmap::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@16 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG728 [387] if((byte) mode_twoplanebitmap::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@13 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b16_from_b16
-    jmp b17
-  //SEG729 mode_twoplanebitmap::@17
-  b17:
+    bne b13_from_b13
+    jmp b14
+  //SEG729 mode_twoplanebitmap::@14
+  b14:
   //SEG730 [388] (byte) mode_twoplanebitmap::by#1 ← ++ (byte) mode_twoplanebitmap::by#4 -- vbuz1=_inc_vbuz1 
     inc by
-  //SEG731 [389] if((byte) mode_twoplanebitmap::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@15 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG731 [389] if((byte) mode_twoplanebitmap::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@12 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp by
-    bne b15_from_b17
-  //SEG732 [390] phi from mode_twoplanebitmap::@17 to mode_twoplanebitmap::@18 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG733 mode_twoplanebitmap::@18
-  b18:
+    bne b12_from_b14
+  //SEG732 [390] phi from mode_twoplanebitmap::@14 to mode_twoplanebitmap::@15 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@15]
+  b15_from_b14:
+    jmp b15
+  //SEG733 mode_twoplanebitmap::@15
+  b15:
   //SEG734 [391] call mode_ctrl 
-  //SEG735 [155] phi from mode_twoplanebitmap::@18 to mode_ctrl [phi:mode_twoplanebitmap::@18->mode_ctrl]
-  mode_ctrl_from_b18:
-  //SEG736 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_twoplanebitmap::@18->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG735 [155] phi from mode_twoplanebitmap::@15 to mode_ctrl [phi:mode_twoplanebitmap::@15->mode_ctrl]
+  mode_ctrl_from_b15:
+  //SEG736 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_twoplanebitmap::@15->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
@@ -21553,8 +21687,8 @@ mode_twoplanebitmap: {
   breturn:
   //SEG738 [392] return 
     rts
-  //SEG739 mode_twoplanebitmap::@9
-  b9:
+  //SEG739 mode_twoplanebitmap::@8
+  b8:
   //SEG740 [393] *((byte*) mode_twoplanebitmap::gfxa#3) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuz1=vbuc1 
     lda #0
     ldy #0
@@ -21564,7 +21698,7 @@ mode_twoplanebitmap: {
     bne !+
     inc gfxa+1
   !:
-    jmp b10_from_b9
+    jmp b9_from_b8
 }
 //SEG742 mode_sixsfred2
 // Sixs Fred Mode 2 - 8bpp Packed Bitmap - Generated from the two DTV linear graphics plane counters
@@ -21733,37 +21867,37 @@ mode_sixsfred2: {
     lda #$19
     cmp cy
     bne b3_from_b5
-  //SEG795 [429] phi from mode_sixsfred2::@5 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@5->mode_sixsfred2::@7]
-  b7_from_b5:
-  //SEG796 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (const byte*) mode_sixsfred2::PLANEA#0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@7#0] -- pbuz1=pbuc1 
+  //SEG795 [429] phi from mode_sixsfred2::@5 to mode_sixsfred2::@6 [phi:mode_sixsfred2::@5->mode_sixsfred2::@6]
+  b6_from_b5:
+  //SEG796 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (const byte*) mode_sixsfred2::PLANEA#0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@6#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG797 [429] phi (byte) mode_sixsfred2::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@7#1] -- vbuz1=vbuc1 
+  //SEG797 [429] phi (byte) mode_sixsfred2::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@6#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-    jmp b7
-  //SEG798 [429] phi from mode_sixsfred2::@9 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@9->mode_sixsfred2::@7]
-  b7_from_b9:
-  //SEG799 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@9->mode_sixsfred2::@7#0] -- register_copy 
-  //SEG800 [429] phi (byte) mode_sixsfred2::ay#4 = (byte) mode_sixsfred2::ay#1 [phi:mode_sixsfred2::@9->mode_sixsfred2::@7#1] -- register_copy 
-    jmp b7
-  //SEG801 mode_sixsfred2::@7
-  b7:
-  //SEG802 [430] phi from mode_sixsfred2::@7 to mode_sixsfred2::@8 [phi:mode_sixsfred2::@7->mode_sixsfred2::@8]
-  b8_from_b7:
-  //SEG803 [430] phi (byte) mode_sixsfred2::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@7->mode_sixsfred2::@8#0] -- vbuxx=vbuc1 
+    jmp b6
+  //SEG798 [429] phi from mode_sixsfred2::@8 to mode_sixsfred2::@6 [phi:mode_sixsfred2::@8->mode_sixsfred2::@6]
+  b6_from_b8:
+  //SEG799 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@6#0] -- register_copy 
+  //SEG800 [429] phi (byte) mode_sixsfred2::ay#4 = (byte) mode_sixsfred2::ay#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@6#1] -- register_copy 
+    jmp b6
+  //SEG801 mode_sixsfred2::@6
+  b6:
+  //SEG802 [430] phi from mode_sixsfred2::@6 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@6->mode_sixsfred2::@7]
+  b7_from_b6:
+  //SEG803 [430] phi (byte) mode_sixsfred2::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@6->mode_sixsfred2::@7#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG804 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#3 [phi:mode_sixsfred2::@7->mode_sixsfred2::@8#1] -- register_copy 
-    jmp b8
-  //SEG805 [430] phi from mode_sixsfred2::@8 to mode_sixsfred2::@8 [phi:mode_sixsfred2::@8->mode_sixsfred2::@8]
-  b8_from_b8:
-  //SEG806 [430] phi (byte) mode_sixsfred2::ax#2 = (byte) mode_sixsfred2::ax#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@8#0] -- register_copy 
-  //SEG807 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@8#1] -- register_copy 
-    jmp b8
-  //SEG808 mode_sixsfred2::@8
-  b8:
+  //SEG804 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#3 [phi:mode_sixsfred2::@6->mode_sixsfred2::@7#1] -- register_copy 
+    jmp b7
+  //SEG805 [430] phi from mode_sixsfred2::@7 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@7->mode_sixsfred2::@7]
+  b7_from_b7:
+  //SEG806 [430] phi (byte) mode_sixsfred2::ax#2 = (byte) mode_sixsfred2::ax#1 [phi:mode_sixsfred2::@7->mode_sixsfred2::@7#0] -- register_copy 
+  //SEG807 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@7->mode_sixsfred2::@7#1] -- register_copy 
+    jmp b7
+  //SEG808 mode_sixsfred2::@7
+  b7:
   //SEG809 [431] (byte~) mode_sixsfred2::$21 ← (byte) mode_sixsfred2::ay#4 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_ror_1 
     lda ay
     lsr
@@ -21781,49 +21915,49 @@ mode_sixsfred2: {
   !:
   //SEG813 [435] (byte) mode_sixsfred2::ax#1 ← ++ (byte) mode_sixsfred2::ax#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG814 [436] if((byte) mode_sixsfred2::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG814 [436] if((byte) mode_sixsfred2::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@7 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b8_from_b8
-    jmp b9
-  //SEG815 mode_sixsfred2::@9
-  b9:
+    bne b7_from_b7
+    jmp b8
+  //SEG815 mode_sixsfred2::@8
+  b8:
   //SEG816 [437] (byte) mode_sixsfred2::ay#1 ← ++ (byte) mode_sixsfred2::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG817 [438] if((byte) mode_sixsfred2::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG817 [438] if((byte) mode_sixsfred2::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
-    bne b7_from_b9
-  //SEG818 [439] phi from mode_sixsfred2::@9 to mode_sixsfred2::@11 [phi:mode_sixsfred2::@9->mode_sixsfred2::@11]
-  b11_from_b9:
-  //SEG819 [439] phi (byte) mode_sixsfred2::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@9->mode_sixsfred2::@11#0] -- vbuz1=vbuc1 
+    bne b6_from_b8
+  //SEG818 [439] phi from mode_sixsfred2::@8 to mode_sixsfred2::@9 [phi:mode_sixsfred2::@8->mode_sixsfred2::@9]
+  b9_from_b8:
+  //SEG819 [439] phi (byte) mode_sixsfred2::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@8->mode_sixsfred2::@9#0] -- vbuz1=vbuc1 
     lda #0
     sta by
-  //SEG820 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (const byte*) mode_sixsfred2::PLANEB#0 [phi:mode_sixsfred2::@9->mode_sixsfred2::@11#1] -- pbuz1=pbuc1 
+  //SEG820 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (const byte*) mode_sixsfred2::PLANEB#0 [phi:mode_sixsfred2::@8->mode_sixsfred2::@9#1] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-    jmp b11
-  //SEG821 [439] phi from mode_sixsfred2::@13 to mode_sixsfred2::@11 [phi:mode_sixsfred2::@13->mode_sixsfred2::@11]
-  b11_from_b13:
-  //SEG822 [439] phi (byte) mode_sixsfred2::by#4 = (byte) mode_sixsfred2::by#1 [phi:mode_sixsfred2::@13->mode_sixsfred2::@11#0] -- register_copy 
-  //SEG823 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@13->mode_sixsfred2::@11#1] -- register_copy 
-    jmp b11
-  //SEG824 mode_sixsfred2::@11
-  b11:
-  //SEG825 [440] phi from mode_sixsfred2::@11 to mode_sixsfred2::@12 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12]
-  b12_from_b11:
-  //SEG826 [440] phi (byte) mode_sixsfred2::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12#0] -- vbuxx=vbuc1 
+    jmp b9
+  //SEG821 [439] phi from mode_sixsfred2::@11 to mode_sixsfred2::@9 [phi:mode_sixsfred2::@11->mode_sixsfred2::@9]
+  b9_from_b11:
+  //SEG822 [439] phi (byte) mode_sixsfred2::by#4 = (byte) mode_sixsfred2::by#1 [phi:mode_sixsfred2::@11->mode_sixsfred2::@9#0] -- register_copy 
+  //SEG823 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@11->mode_sixsfred2::@9#1] -- register_copy 
+    jmp b9
+  //SEG824 mode_sixsfred2::@9
+  b9:
+  //SEG825 [440] phi from mode_sixsfred2::@9 to mode_sixsfred2::@10 [phi:mode_sixsfred2::@9->mode_sixsfred2::@10]
+  b10_from_b9:
+  //SEG826 [440] phi (byte) mode_sixsfred2::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@9->mode_sixsfred2::@10#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG827 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#3 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12#1] -- register_copy 
-    jmp b12
-  //SEG828 [440] phi from mode_sixsfred2::@12 to mode_sixsfred2::@12 [phi:mode_sixsfred2::@12->mode_sixsfred2::@12]
-  b12_from_b12:
-  //SEG829 [440] phi (byte) mode_sixsfred2::bx#2 = (byte) mode_sixsfred2::bx#1 [phi:mode_sixsfred2::@12->mode_sixsfred2::@12#0] -- register_copy 
-  //SEG830 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@12->mode_sixsfred2::@12#1] -- register_copy 
-    jmp b12
-  //SEG831 mode_sixsfred2::@12
-  b12:
+  //SEG827 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#3 [phi:mode_sixsfred2::@9->mode_sixsfred2::@10#1] -- register_copy 
+    jmp b10
+  //SEG828 [440] phi from mode_sixsfred2::@10 to mode_sixsfred2::@10 [phi:mode_sixsfred2::@10->mode_sixsfred2::@10]
+  b10_from_b10:
+  //SEG829 [440] phi (byte) mode_sixsfred2::bx#2 = (byte) mode_sixsfred2::bx#1 [phi:mode_sixsfred2::@10->mode_sixsfred2::@10#0] -- register_copy 
+  //SEG830 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@10->mode_sixsfred2::@10#1] -- register_copy 
+    jmp b10
+  //SEG831 mode_sixsfred2::@10
+  b10:
   //SEG832 [441] *((byte*) mode_sixsfred2::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $1b -- _deref_pbuz1=vbuc1 
     lda #$1b
     ldy #0
@@ -21835,27 +21969,27 @@ mode_sixsfred2: {
   !:
   //SEG834 [443] (byte) mode_sixsfred2::bx#1 ← ++ (byte) mode_sixsfred2::bx#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG835 [444] if((byte) mode_sixsfred2::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@12 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG835 [444] if((byte) mode_sixsfred2::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@10 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b12_from_b12
-    jmp b13
-  //SEG836 mode_sixsfred2::@13
-  b13:
+    bne b10_from_b10
+    jmp b11
+  //SEG836 mode_sixsfred2::@11
+  b11:
   //SEG837 [445] (byte) mode_sixsfred2::by#1 ← ++ (byte) mode_sixsfred2::by#4 -- vbuz1=_inc_vbuz1 
     inc by
-  //SEG838 [446] if((byte) mode_sixsfred2::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG838 [446] if((byte) mode_sixsfred2::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp by
-    bne b11_from_b13
-  //SEG839 [447] phi from mode_sixsfred2::@13 to mode_sixsfred2::@14 [phi:mode_sixsfred2::@13->mode_sixsfred2::@14]
-  b14_from_b13:
-    jmp b14
-  //SEG840 mode_sixsfred2::@14
-  b14:
+    bne b9_from_b11
+  //SEG839 [447] phi from mode_sixsfred2::@11 to mode_sixsfred2::@12 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG840 mode_sixsfred2::@12
+  b12:
   //SEG841 [448] call mode_ctrl 
-  //SEG842 [155] phi from mode_sixsfred2::@14 to mode_ctrl [phi:mode_sixsfred2::@14->mode_ctrl]
-  mode_ctrl_from_b14:
-  //SEG843 [155] phi (byte) dtv_control#145 = (const byte) DTV_LINEAR#0 [phi:mode_sixsfred2::@14->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG842 [155] phi from mode_sixsfred2::@12 to mode_ctrl [phi:mode_sixsfred2::@12->mode_ctrl]
+  mode_ctrl_from_b12:
+  //SEG843 [155] phi (byte) dtv_control#145 = (const byte) DTV_LINEAR#0 [phi:mode_sixsfred2::@12->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
@@ -22605,9 +22739,9 @@ mode_stdbitmap: {
     lda #0
     sta l
     jmp b7
-  //SEG1082 [581] phi from mode_stdbitmap::@11 to mode_stdbitmap::@7 [phi:mode_stdbitmap::@11->mode_stdbitmap::@7]
-  b7_from_b11:
-  //SEG1083 [581] phi (byte) mode_stdbitmap::l#2 = (byte) mode_stdbitmap::l#1 [phi:mode_stdbitmap::@11->mode_stdbitmap::@7#0] -- register_copy 
+  //SEG1082 [581] phi from mode_stdbitmap::@10 to mode_stdbitmap::@7 [phi:mode_stdbitmap::@10->mode_stdbitmap::@7]
+  b7_from_b10:
+  //SEG1083 [581] phi (byte) mode_stdbitmap::l#2 = (byte) mode_stdbitmap::l#1 [phi:mode_stdbitmap::@10->mode_stdbitmap::@7#0] -- register_copy 
     jmp b7
   //SEG1084 mode_stdbitmap::@7
   b7:
@@ -22628,17 +22762,17 @@ mode_stdbitmap: {
     sta bitmap_line.y1
   //SEG1089 [586] call bitmap_line 
     jsr bitmap_line
-    jmp b11
-  //SEG1090 mode_stdbitmap::@11
-  b11:
+    jmp b10
+  //SEG1090 mode_stdbitmap::@10
+  b10:
   //SEG1091 [587] (byte) mode_stdbitmap::l#1 ← ++ (byte) mode_stdbitmap::l#2 -- vbuz1=_inc_vbuz1 
     inc l
   //SEG1092 [588] if((byte) mode_stdbitmap::l#1<(const byte) mode_stdbitmap::lines_cnt#0) goto mode_stdbitmap::@7 -- vbuz1_lt_vbuc1_then_la1 
     lda l
     cmp #lines_cnt
-    bcc b7_from_b11
-  //SEG1093 [589] phi from mode_stdbitmap::@11 to mode_stdbitmap::@8 [phi:mode_stdbitmap::@11->mode_stdbitmap::@8]
-  b8_from_b11:
+    bcc b7_from_b10
+  //SEG1093 [589] phi from mode_stdbitmap::@10 to mode_stdbitmap::@8 [phi:mode_stdbitmap::@10->mode_stdbitmap::@8]
+  b8_from_b10:
     jmp b8
   //SEG1094 mode_stdbitmap::@8
   b8:
@@ -22671,33 +22805,33 @@ bitmap_line: {
     beq !+
     bcs b1
   !:
-    jmp b3
-  //SEG1102 bitmap_line::@3
-  b3:
+    jmp b2
+  //SEG1102 bitmap_line::@2
+  b2:
   //SEG1103 [593] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0 -- vbuz1=vbuz2_minus_vbuxx 
     txa
     eor #$ff
     sec
     adc x0
     sta xd
-  //SEG1104 [594] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1104 [594] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b10
-    jmp b4
-  //SEG1105 bitmap_line::@4
-  b4:
+    bcc b7
+    jmp b3
+  //SEG1105 bitmap_line::@3
+  b3:
   //SEG1106 [595] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y0
     sec
     sbc y1
     tay
-  //SEG1107 [596] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1107 [596] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b11
-    jmp b5
-  //SEG1108 bitmap_line::@5
-  b5:
+    bcc b8
+    jmp b4
+  //SEG1108 bitmap_line::@4
+  b4:
   //SEG1109 [597] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxi.y
@@ -22709,21 +22843,21 @@ bitmap_line: {
     sty bitmap_line_ydxi.yd
   //SEG1113 [601] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   //SEG1114 [602] call bitmap_line_ydxi 
-  //SEG1115 [676] phi from bitmap_line::@5 to bitmap_line_ydxi [phi:bitmap_line::@5->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b5:
-  //SEG1116 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@5->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1117 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1118 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@5->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1119 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@5->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1120 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1115 [676] phi from bitmap_line::@4 to bitmap_line_ydxi [phi:bitmap_line::@4->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b4:
+  //SEG1116 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@4->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1117 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1118 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@4->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1119 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@4->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1120 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
   //SEG1121 bitmap_line::@return
   breturn:
   //SEG1122 [603] return 
     rts
-  //SEG1123 bitmap_line::@11
-  b11:
+  //SEG1123 bitmap_line::@8
+  b8:
   //SEG1124 [604] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuxx 
     stx bitmap_line_xdyi.x
   //SEG1125 [605] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
@@ -22734,28 +22868,28 @@ bitmap_line: {
   //SEG1128 [608] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2 -- vbuz1=vbuyy 
     sty bitmap_line_xdyi.yd
   //SEG1129 [609] call bitmap_line_xdyi 
-  //SEG1130 [654] phi from bitmap_line::@11 to bitmap_line_xdyi [phi:bitmap_line::@11->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b11:
-  //SEG1131 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@11->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1132 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1133 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@11->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1134 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@11->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1135 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1130 [654] phi from bitmap_line::@8 to bitmap_line_xdyi [phi:bitmap_line::@8->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b8:
+  //SEG1131 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@8->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1132 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1133 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@8->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1134 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@8->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1135 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
-  //SEG1136 bitmap_line::@10
-  b10:
+  //SEG1136 bitmap_line::@7
+  b7:
   //SEG1137 [610] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y1
     sec
     sbc y0
     tay
-  //SEG1138 [611] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1138 [611] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b15
-    jmp b17
-  //SEG1139 bitmap_line::@17
-  b17:
+    bcc b9
+    jmp b10
+  //SEG1139 bitmap_line::@10
+  b10:
   //SEG1140 [612] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxd.y
@@ -22768,17 +22902,17 @@ bitmap_line: {
     sty bitmap_line_ydxd.yd
   //SEG1144 [616] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   //SEG1145 [617] call bitmap_line_ydxd 
-  //SEG1146 [706] phi from bitmap_line::@17 to bitmap_line_ydxd [phi:bitmap_line::@17->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b17:
-  //SEG1147 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@17->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1148 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1149 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@17->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1150 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@17->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1151 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1146 [706] phi from bitmap_line::@10 to bitmap_line_ydxd [phi:bitmap_line::@10->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b10:
+  //SEG1147 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@10->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1148 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1149 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@10->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1150 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@10->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1151 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1152 bitmap_line::@15
-  b15:
+  //SEG1152 bitmap_line::@9
+  b9:
   //SEG1153 [618] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuxx 
     stx bitmap_line_xdyd.x
   //SEG1154 [619] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
@@ -22789,13 +22923,13 @@ bitmap_line: {
   //SEG1157 [622] (byte) bitmap_line_xdyd::yd#0 ← (byte) bitmap_line::yd#1 -- vbuz1=vbuyy 
     sty bitmap_line_xdyd.yd
   //SEG1158 [623] call bitmap_line_xdyd 
-  //SEG1159 [691] phi from bitmap_line::@15 to bitmap_line_xdyd [phi:bitmap_line::@15->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b15:
-  //SEG1160 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@15->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1161 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1162 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@15->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1163 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@15->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1164 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1159 [691] phi from bitmap_line::@9 to bitmap_line_xdyd [phi:bitmap_line::@9->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b9:
+  //SEG1160 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@9->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1161 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1162 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@9->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1163 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@9->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1164 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
   //SEG1165 bitmap_line::@1
@@ -22805,24 +22939,24 @@ bitmap_line: {
     sec
     sbc x0
     sta xd
-  //SEG1167 [625] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1167 [625] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b20
-    jmp b7
-  //SEG1168 bitmap_line::@7
-  b7:
+    bcc b11
+    jmp b5
+  //SEG1168 bitmap_line::@5
+  b5:
   //SEG1169 [626] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y0
     sec
     sbc y1
     tay
-  //SEG1170 [627] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1170 [627] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b21
-    jmp b8
-  //SEG1171 bitmap_line::@8
-  b8:
+    bcc b12
+    jmp b6
+  //SEG1171 bitmap_line::@6
+  b6:
   //SEG1172 [628] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxd.y
@@ -22832,17 +22966,17 @@ bitmap_line: {
     sty bitmap_line_ydxd.yd
   //SEG1176 [632] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   //SEG1177 [633] call bitmap_line_ydxd 
-  //SEG1178 [706] phi from bitmap_line::@8 to bitmap_line_ydxd [phi:bitmap_line::@8->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b8:
-  //SEG1179 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@8->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1180 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1181 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@8->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1182 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@8->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1183 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1178 [706] phi from bitmap_line::@6 to bitmap_line_ydxd [phi:bitmap_line::@6->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b6:
+  //SEG1179 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@6->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1180 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1181 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@6->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1182 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@6->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1183 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1184 bitmap_line::@21
-  b21:
+  //SEG1184 bitmap_line::@12
+  b12:
   //SEG1185 [634] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyd.x
@@ -22853,28 +22987,28 @@ bitmap_line: {
   //SEG1189 [638] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10 -- vbuz1=vbuyy 
     sty bitmap_line_xdyd.yd
   //SEG1190 [639] call bitmap_line_xdyd 
-  //SEG1191 [691] phi from bitmap_line::@21 to bitmap_line_xdyd [phi:bitmap_line::@21->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b21:
-  //SEG1192 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@21->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1193 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1194 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@21->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1195 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@21->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1196 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1191 [691] phi from bitmap_line::@12 to bitmap_line_xdyd [phi:bitmap_line::@12->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b12:
+  //SEG1192 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@12->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1193 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1194 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@12->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1195 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@12->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1196 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
-  //SEG1197 bitmap_line::@20
-  b20:
+  //SEG1197 bitmap_line::@11
+  b11:
   //SEG1198 [640] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y1
     sec
     sbc y0
     tay
-  //SEG1199 [641] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1199 [641] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b25
-    jmp b27
-  //SEG1200 bitmap_line::@27
-  b27:
+    bcc b13
+    jmp b14
+  //SEG1200 bitmap_line::@14
+  b14:
   //SEG1201 [642] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxi.y
@@ -22885,17 +23019,17 @@ bitmap_line: {
     sty bitmap_line_ydxi.yd
   //SEG1205 [646] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   //SEG1206 [647] call bitmap_line_ydxi 
-  //SEG1207 [676] phi from bitmap_line::@27 to bitmap_line_ydxi [phi:bitmap_line::@27->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b27:
-  //SEG1208 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@27->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1209 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1210 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@27->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1211 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@27->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1212 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1207 [676] phi from bitmap_line::@14 to bitmap_line_ydxi [phi:bitmap_line::@14->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b14:
+  //SEG1208 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@14->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1209 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1210 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@14->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1211 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@14->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1212 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
-  //SEG1213 bitmap_line::@25
-  b25:
+  //SEG1213 bitmap_line::@13
+  b13:
   //SEG1214 [648] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyi.x
@@ -22906,13 +23040,13 @@ bitmap_line: {
   //SEG1218 [652] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11 -- vbuz1=vbuyy 
     sty bitmap_line_xdyi.yd
   //SEG1219 [653] call bitmap_line_xdyi 
-  //SEG1220 [654] phi from bitmap_line::@25 to bitmap_line_xdyi [phi:bitmap_line::@25->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b25:
-  //SEG1221 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@25->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1222 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1223 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@25->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1224 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@25->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1225 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1220 [654] phi from bitmap_line::@13 to bitmap_line_xdyi [phi:bitmap_line::@13->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b13:
+  //SEG1221 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@13->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1222 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1223 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@13->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1224 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@13->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1225 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
 }
@@ -22948,9 +23082,9 @@ bitmap_line_xdyi: {
   //SEG1237 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#0] -- register_copy 
   //SEG1238 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1239 bitmap_line_xdyi::@5
-  b5:
+    jmp b4
+  //SEG1239 bitmap_line_xdyi::@4
+  b4:
   //SEG1240 [660] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1241 [661] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -22961,7 +23095,7 @@ bitmap_line_xdyi: {
   //SEG1242 [662] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1243 bitmap_line_xdyi::@3
   b3:
@@ -22972,11 +23106,11 @@ bitmap_line_xdyi: {
     sec
     sbc xd
     sta e
-  //SEG1246 [665] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2]
+  //SEG1246 [665] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1247 [665] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#0] -- register_copy 
-  //SEG1248 [665] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1247 [665] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#0] -- register_copy 
+  //SEG1248 [665] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#1] -- register_copy 
     jmp b2
   //SEG1249 bitmap_line_xdyi::@2
   b2:
@@ -23059,9 +23193,9 @@ bitmap_line_ydxi: {
   //SEG1273 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#0] -- register_copy 
   //SEG1274 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1275 bitmap_line_ydxi::@5
-  b5:
+    jmp b4
+  //SEG1275 bitmap_line_ydxi::@4
+  b4:
   //SEG1276 [682] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1277 [683] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -23072,7 +23206,7 @@ bitmap_line_ydxi: {
   //SEG1278 [684] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1279 bitmap_line_ydxi::@3
   b3:
@@ -23083,11 +23217,11 @@ bitmap_line_ydxi: {
     sec
     sbc yd
     sta e
-  //SEG1282 [687] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2]
+  //SEG1282 [687] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1283 [687] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#0] -- register_copy 
-  //SEG1284 [687] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1283 [687] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#0] -- register_copy 
+  //SEG1284 [687] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#1] -- register_copy 
     jmp b2
   //SEG1285 bitmap_line_ydxi::@2
   b2:
@@ -23136,9 +23270,9 @@ bitmap_line_xdyd: {
   //SEG1301 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#0] -- register_copy 
   //SEG1302 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1303 bitmap_line_xdyd::@5
-  b5:
+    jmp b4
+  //SEG1303 bitmap_line_xdyd::@4
+  b4:
   //SEG1304 [697] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1305 [698] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -23149,7 +23283,7 @@ bitmap_line_xdyd: {
   //SEG1306 [699] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1307 bitmap_line_xdyd::@3
   b3:
@@ -23160,11 +23294,11 @@ bitmap_line_xdyd: {
     sec
     sbc xd
     sta e
-  //SEG1310 [702] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2]
+  //SEG1310 [702] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1311 [702] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#0] -- register_copy 
-  //SEG1312 [702] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1311 [702] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#0] -- register_copy 
+  //SEG1312 [702] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#1] -- register_copy 
     jmp b2
   //SEG1313 bitmap_line_xdyd::@2
   b2:
@@ -23210,9 +23344,9 @@ bitmap_line_ydxd: {
   //SEG1329 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#0] -- register_copy 
   //SEG1330 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG1331 bitmap_line_ydxd::@5
-  b5:
+    jmp b4
+  //SEG1331 bitmap_line_ydxd::@4
+  b4:
   //SEG1332 [712] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1333 [713] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -23223,7 +23357,7 @@ bitmap_line_ydxd: {
   //SEG1334 [714] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG1335 bitmap_line_ydxd::@3
   b3:
@@ -23234,11 +23368,11 @@ bitmap_line_ydxd: {
     sec
     sbc yd
     sta e
-  //SEG1338 [717] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2]
+  //SEG1338 [717] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG1339 [717] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#0] -- register_copy 
-  //SEG1340 [717] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG1339 [717] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#0] -- register_copy 
+  //SEG1340 [717] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#1] -- register_copy 
     jmp b2
   //SEG1341 bitmap_line_ydxd::@2
   b2:
@@ -23357,9 +23491,9 @@ bitmap_init: {
     tya
     lsr
     tay
-  //SEG1385 [739] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuyy_neq_0_then_la1 
+  //SEG1385 [739] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuyy_neq_0_then_la1 
     cpy #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG1386 [740] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
   b2_from_b1:
   //SEG1387 [740] phi (byte) bitmap_init::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:bitmap_init::@1->bitmap_init::@2#0] -- vbuyy=vbuc1 
@@ -23372,23 +23506,23 @@ bitmap_init: {
   //SEG1390 [742] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1_from_b2
-  //SEG1391 [743] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  b5_from_b2:
-  //SEG1392 [743] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG1391 [743] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  b3_from_b2:
+  //SEG1392 [743] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     lda #>0
     sta yoffs+1
-  //SEG1393 [743] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuxx=vbuc1 
+  //SEG1393 [743] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuxx=vbuc1 
     ldx #0
-    jmp b5
-  //SEG1394 [743] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  b5_from_b6:
-  //SEG1395 [743] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG1396 [743] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-    jmp b5
-  //SEG1397 bitmap_init::@5
-  b5:
+    jmp b3
+  //SEG1394 [743] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  b3_from_b4:
+  //SEG1395 [743] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG1396 [743] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+    jmp b3
+  //SEG1397 bitmap_init::@3
+  b3:
   //SEG1398 [744] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _6
@@ -23405,12 +23539,12 @@ bitmap_init: {
   //SEG1404 [750] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG1405 [751] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG1405 [751] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6_from_b5
-    jmp b7
-  //SEG1406 bitmap_init::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG1406 bitmap_init::@5
+  b5:
   //SEG1407 [752] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -23419,31 +23553,31 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG1408 [753] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG1409 [753] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-    jmp b6
-  //SEG1410 bitmap_init::@6
-  b6:
+  //SEG1408 [753] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG1409 [753] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+    jmp b4
+  //SEG1410 bitmap_init::@4
+  b4:
   //SEG1411 [754] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1412 [755] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuxx_neq_0_then_la1 
+  //SEG1412 [755] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG1413 bitmap_init::@return
   breturn:
   //SEG1414 [756] return 
     rts
-  //SEG1415 [757] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG1416 bitmap_init::@10
-  b10:
-  //SEG1417 [740] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  b2_from_b10:
-  //SEG1418 [740] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG1415 [757] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG1416 bitmap_init::@6
+  b6:
+  //SEG1417 [740] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  b2_from_b6:
+  //SEG1418 [740] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
     jmp b2
 }
 //SEG1419 mode_mcchar
@@ -24060,24 +24194,24 @@ print_str_lines: {
     jmp b1
   //SEG1612 print_str_lines::@1
   b1:
-  //SEG1613 [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@6 -- _deref_pbuz1_neq_vbuc1_then_la1 
+  //SEG1613 [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@2 -- _deref_pbuz1_neq_vbuc1_then_la1 
     ldy #0
     lda (str),y
     cmp #'@'
-    bne b6_from_b1
+    bne b2_from_b1
     jmp breturn
   //SEG1614 print_str_lines::@return
   breturn:
   //SEG1615 [868] return 
     rts
-  //SEG1616 [869] phi from print_str_lines::@1 print_str_lines::@7 to print_str_lines::@6 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6]
-  b6_from_b1:
-  b6_from_b7:
-  //SEG1617 [869] phi (byte*) print_char_cursor#17 = (byte*) print_char_cursor#19 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#0] -- register_copy 
-  //SEG1618 [869] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#2 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#1] -- register_copy 
-    jmp b6
-  //SEG1619 print_str_lines::@6
-  b6:
+  //SEG1616 [869] phi from print_str_lines::@1 print_str_lines::@3 to print_str_lines::@2 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2]
+  b2_from_b1:
+  b2_from_b3:
+  //SEG1617 [869] phi (byte*) print_char_cursor#17 = (byte*) print_char_cursor#19 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#0] -- register_copy 
+  //SEG1618 [869] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#2 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#1] -- register_copy 
+    jmp b2
+  //SEG1619 print_str_lines::@2
+  b2:
   //SEG1620 [870] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#3) -- vbuaa=_deref_pbuz1 
     ldy #0
     lda (str),y
@@ -24086,12 +24220,12 @@ print_str_lines: {
     bne !+
     inc str+1
   !:
-  //SEG1622 [872] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@7 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG1622 [872] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@3 -- vbuaa_eq_vbuc1_then_la1 
     cmp #'@'
-    beq b7_from_b6
-    jmp b8
-  //SEG1623 print_str_lines::@8
-  b8:
+    beq b3_from_b2
+    jmp b4
+  //SEG1623 print_str_lines::@4
+  b4:
   //SEG1624 [873] *((byte*) print_char_cursor#17) ← (byte) print_str_lines::ch#0 -- _deref_pbuz1=vbuaa 
     ldy #0
     sta (print_char_cursor),y
@@ -24100,35 +24234,35 @@ print_str_lines: {
     bne !+
     inc print_char_cursor+1
   !:
-  //SEG1626 [875] phi from print_str_lines::@6 print_str_lines::@8 to print_str_lines::@7 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7]
-  b7_from_b6:
-  b7_from_b8:
-  //SEG1627 [875] phi (byte*) print_char_cursor#32 = (byte*) print_char_cursor#17 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7#0] -- register_copy 
-    jmp b7
-  //SEG1628 print_str_lines::@7
-  b7:
-  //SEG1629 [876] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG1626 [875] phi from print_str_lines::@2 print_str_lines::@4 to print_str_lines::@3 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3]
+  b3_from_b2:
+  b3_from_b4:
+  //SEG1627 [875] phi (byte*) print_char_cursor#32 = (byte*) print_char_cursor#17 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3#0] -- register_copy 
+    jmp b3
+  //SEG1628 print_str_lines::@3
+  b3:
+  //SEG1629 [876] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@2 -- vbuaa_neq_vbuc1_then_la1 
     cmp #'@'
-    bne b6_from_b7
-  //SEG1630 [877] phi from print_str_lines::@7 to print_str_lines::@9 [phi:print_str_lines::@7->print_str_lines::@9]
-  b9_from_b7:
-    jmp b9
-  //SEG1631 print_str_lines::@9
-  b9:
+    bne b2_from_b3
+  //SEG1630 [877] phi from print_str_lines::@3 to print_str_lines::@5 [phi:print_str_lines::@3->print_str_lines::@5]
+  b5_from_b3:
+    jmp b5
+  //SEG1631 print_str_lines::@5
+  b5:
   //SEG1632 [878] call print_ln 
-  //SEG1633 [880] phi from print_str_lines::@9 to print_ln [phi:print_str_lines::@9->print_ln]
-  print_ln_from_b9:
+  //SEG1633 [880] phi from print_str_lines::@5 to print_ln [phi:print_str_lines::@5->print_ln]
+  print_ln_from_b5:
     jsr print_ln
   //SEG1634 [879] (byte*~) print_char_cursor#103 ← (byte*) print_line_cursor#19 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG1635 [866] phi from print_str_lines::@9 to print_str_lines::@1 [phi:print_str_lines::@9->print_str_lines::@1]
-  b1_from_b9:
-  //SEG1636 [866] phi (byte*) print_line_cursor#17 = (byte*) print_line_cursor#19 [phi:print_str_lines::@9->print_str_lines::@1#0] -- register_copy 
-  //SEG1637 [866] phi (byte*) print_char_cursor#19 = (byte*~) print_char_cursor#103 [phi:print_str_lines::@9->print_str_lines::@1#1] -- register_copy 
-  //SEG1638 [866] phi (byte*) print_str_lines::str#2 = (byte*) print_str_lines::str#0 [phi:print_str_lines::@9->print_str_lines::@1#2] -- register_copy 
+  //SEG1635 [866] phi from print_str_lines::@5 to print_str_lines::@1 [phi:print_str_lines::@5->print_str_lines::@1]
+  b1_from_b5:
+  //SEG1636 [866] phi (byte*) print_line_cursor#17 = (byte*) print_line_cursor#19 [phi:print_str_lines::@5->print_str_lines::@1#0] -- register_copy 
+  //SEG1637 [866] phi (byte*) print_char_cursor#19 = (byte*~) print_char_cursor#103 [phi:print_str_lines::@5->print_str_lines::@1#1] -- register_copy 
+  //SEG1638 [866] phi (byte*) print_str_lines::str#2 = (byte*) print_str_lines::str#0 [phi:print_str_lines::@5->print_str_lines::@1#2] -- register_copy 
     jmp b1
 }
 //SEG1639 print_ln
@@ -24228,220 +24362,220 @@ print_set_screen: {
   MENU_TEXT: .text "C64DTV Graphics Modes            CCLHBME@"+"                                 OHIIMCC@"+"                                 LUNCMMM@"+"----------------------------------------@"+"1. Standard Char             (V) 0000000@"+"2. Extended Color Char       (V) 0000001@"+"3. Multicolor Char           (V) 0000010@"+"4. Standard Bitmap           (V) 0000100@"+"5. Multicolor Bitmap         (V) 0000110@"+"6. High Color Standard Char  (H) 0001000@"+"7. High Extended Color Char  (H) 0001001@"+"8. High Multicolor Char      (H) 0001010@"+"9. High Multicolor Bitmap    (H) 0001110@"+"a. Sixs Fred 2               (D) 0010111@"+"b. Two Plane Bitmap          (D) 0011101@"+"c. Sixs Fred (2 Plane MC BM) (D) 0011111@"+"d. 8bpp Pixel Cell           (D) 0111011@"+"e. Chunky 8bpp Bitmap        (D) 1111011@"+"----------------------------------------@"+"    (V) vicII (H) vicII+hicol (D) c64dtv@"+"@"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b54
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b2
-Removing instruction jmp b8
-Removing instruction jmp b10
-Removing instruction jmp b11
-Removing instruction jmp b47
-Removing instruction jmp b48
-Removing instruction jmp b2
-Removing instruction jmp b50
-Removing instruction jmp b6
-Removing instruction jmp breturn
-Removing instruction jmp b12
-Removing instruction jmp b51
-Removing instruction jmp b24
-Removing instruction jmp b13
-Removing instruction jmp b53
-Removing instruction jmp b26
-Removing instruction jmp b14
-Removing instruction jmp b55
-Removing instruction jmp b28
-Removing instruction jmp b15
-Removing instruction jmp b57
-Removing instruction jmp b30
-Removing instruction jmp b16
-Removing instruction jmp b59
-Removing instruction jmp b32
-Removing instruction jmp b17
-Removing instruction jmp b61
-Removing instruction jmp b34
-Removing instruction jmp b18
-Removing instruction jmp b63
-Removing instruction jmp b36
-Removing instruction jmp b19
-Removing instruction jmp b65
-Removing instruction jmp b38
-Removing instruction jmp b20
-Removing instruction jmp b67
-Removing instruction jmp b40
-Removing instruction jmp b21
-Removing instruction jmp b69
-Removing instruction jmp b42
-Removing instruction jmp b22
-Removing instruction jmp b71
-Removing instruction jmp b44
 Removing instruction jmp b1
-Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
-Removing instruction jmp b6
-Removing instruction jmp b10
 Removing instruction jmp b5
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b11
-Removing instruction jmp breturn
+Removing instruction jmp b28
+Removing instruction jmp b29
 Removing instruction jmp b1
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b32
+Removing instruction jmp b30
+Removing instruction jmp b2
 Removing instruction jmp breturn
+Removing instruction jmp b6
+Removing instruction jmp b31
+Removing instruction jmp b17
+Removing instruction jmp b7
+Removing instruction jmp b32
+Removing instruction jmp b18
+Removing instruction jmp b8
 Removing instruction jmp b33
-Removing instruction jmp b23
-Removing instruction jmp b10
+Removing instruction jmp b19
+Removing instruction jmp b9
 Removing instruction jmp b34
-Removing instruction jmp b24
-Removing instruction jmp b11
+Removing instruction jmp b20
+Removing instruction jmp b10
 Removing instruction jmp b35
-Removing instruction jmp b25
-Removing instruction jmp b12
+Removing instruction jmp b21
+Removing instruction jmp b11
 Removing instruction jmp b36
-Removing instruction jmp b26
-Removing instruction jmp b13
+Removing instruction jmp b22
+Removing instruction jmp b12
 Removing instruction jmp b37
-Removing instruction jmp b27
-Removing instruction jmp b14
+Removing instruction jmp b23
+Removing instruction jmp b13
 Removing instruction jmp b38
-Removing instruction jmp b28
-Removing instruction jmp b15
+Removing instruction jmp b24
+Removing instruction jmp b14
 Removing instruction jmp b39
-Removing instruction jmp b16
-Removing instruction jmp b30
-Removing instruction jmp b46
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b11
-Removing instruction jmp b10
-Removing instruction jmp b12
-Removing instruction jmp b13
-Removing instruction jmp b14
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b11
-Removing instruction jmp b12
-Removing instruction jmp b13
-Removing instruction jmp b14
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b11
-Removing instruction jmp b10
-Removing instruction jmp b13
+Removing instruction jmp b25
 Removing instruction jmp b15
+Removing instruction jmp b40
+Removing instruction jmp b26
 Removing instruction jmp b16
-Removing instruction jmp b17
-Removing instruction jmp b18
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b11
-Removing instruction jmp b12
-Removing instruction jmp b13
-Removing instruction jmp b14
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp b9
-Removing instruction jmp b7
-Removing instruction jmp b11
-Removing instruction jmp b8
-Removing instruction jmp breturn
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp breturn
-Removing instruction jmp b17
-Removing instruction jmp b7
-Removing instruction jmp b8
+Removing instruction jmp b41
 Removing instruction jmp b27
 Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
+Removing instruction jmp b4
+Removing instruction jmp b6
+Removing instruction jmp b9
 Removing instruction jmp b5
 Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b10
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b19
+Removing instruction jmp breturn
+Removing instruction jmp b20
+Removing instruction jmp b12
+Removing instruction jmp b5
+Removing instruction jmp b21
+Removing instruction jmp b13
 Removing instruction jmp b6
+Removing instruction jmp b22
+Removing instruction jmp b14
+Removing instruction jmp b7
+Removing instruction jmp b23
+Removing instruction jmp b15
+Removing instruction jmp b8
+Removing instruction jmp b24
+Removing instruction jmp b16
+Removing instruction jmp b9
+Removing instruction jmp b25
+Removing instruction jmp b17
+Removing instruction jmp b10
+Removing instruction jmp b26
+Removing instruction jmp b11
+Removing instruction jmp b18
+Removing instruction jmp b27
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b10
+Removing instruction jmp b9
+Removing instruction jmp b11
+Removing instruction jmp b12
+Removing instruction jmp b13
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp b11
+Removing instruction jmp b12
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b10
+Removing instruction jmp b9
+Removing instruction jmp b11
+Removing instruction jmp b12
+Removing instruction jmp b13
+Removing instruction jmp b14
+Removing instruction jmp b15
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp b11
+Removing instruction jmp b12
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b9
+Removing instruction jmp b7
+Removing instruction jmp b10
+Removing instruction jmp b8
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp breturn
 Removing instruction jmp b10
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b14
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b5
+Removing instruction jmp b4
+Removing instruction jmp breturn
+Removing instruction jmp b6
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
@@ -24465,10 +24599,10 @@ Removing instruction jmp b6
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b7
-Removing instruction jmp b9
+Removing instruction jmp b2
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b5
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -24508,155 +24642,155 @@ Removing instruction lda #0
 Removing instruction lda #0
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b2_from_b2 with b2
-Replacing label b8_from_b8 with b8
-Replacing label b10_from_b10 with b10
-Replacing label b10_from_b10 with b10
-Replacing label b12_from_b50 with b12
-Replacing label b13_from_b51 with b13
-Replacing label b14_from_b53 with b14
-Replacing label b15_from_b55 with b15
-Replacing label b16_from_b57 with b16
-Replacing label b17_from_b59 with b17
-Replacing label b18_from_b61 with b18
-Replacing label b19_from_b63 with b19
-Replacing label b20_from_b65 with b20
-Replacing label b21_from_b67 with b21
-Replacing label b22_from_b69 with b22
-Replacing label b2_from_b71 with b2
+Replacing label b1_from_b1 with b1
+Replacing label b3_from_b3 with b3
+Replacing label b4_from_b4 with b4
+Replacing label b4_from_b4 with b4
+Replacing label b6_from_b30 with b6
+Replacing label b7_from_b31 with b7
+Replacing label b8_from_b32 with b8
+Replacing label b9_from_b33 with b9
+Replacing label b10_from_b34 with b10
+Replacing label b11_from_b35 with b11
+Replacing label b12_from_b36 with b12
+Replacing label b13_from_b37 with b13
+Replacing label b14_from_b38 with b14
+Replacing label b15_from_b39 with b15
+Replacing label b16_from_b40 with b16
+Replacing label b1_from_b41 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b5_from_b4 with b5
 Replacing label b5_from_b4 with b5
 Replacing label b4_from_b5 with b4
 Replacing label b4_from_b5 with b4
 Replacing label b3_from_b7 with b3
-Replacing label b10_from_b33 with b10
-Replacing label b11_from_b34 with b11
-Replacing label b12_from_b35 with b12
-Replacing label b13_from_b36 with b13
-Replacing label b14_from_b37 with b14
-Replacing label b15_from_b38 with b15
-Replacing label b46_from_b39 with b46
-Replacing label b1_from_b16 with b1
+Replacing label b5_from_b20 with b5
+Replacing label b6_from_b21 with b6
+Replacing label b7_from_b22 with b7
+Replacing label b8_from_b23 with b8
+Replacing label b9_from_b24 with b9
+Replacing label b10_from_b25 with b10
+Replacing label b27_from_b26 with b27
+Replacing label b1_from_b11 with b1
 Replacing label b1_from_b1 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b3_from_b5 with b3
-Replacing label b9_from_b10 with b9
-Replacing label b8_from_b12 with b8
-Replacing label b7_from_b13 with b7
-Replacing label b1_from_b1 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b3_from_b5 with b3
-Replacing label b8_from_b8 with b8
-Replacing label b7_from_b9 with b7
-Replacing label b12_from_b12 with b12
-Replacing label b11_from_b13 with b11
-Replacing label b1_from_b1 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b3_from_b5 with b3
-Replacing label b8_from_b10 with b8
-Replacing label b7_from_b13 with b7
-Replacing label b16_from_b16 with b16
-Replacing label b15_from_b17 with b15
-Replacing label b10_from_b9 with b10
-Replacing label b1_from_b1 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b3_from_b5 with b3
-Replacing label b8_from_b8 with b8
-Replacing label b7_from_b9 with b7
-Replacing label b12_from_b12 with b12
-Replacing label b11_from_b13 with b11
-Replacing label b1_from_b1 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b3_from_b5 with b3
-Replacing label b1_from_b1 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b3_from_b5 with b3
-Replacing label b1_from_b1 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b3_from_b5 with b3
-Replacing label b1_from_b1 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b3_from_b5 with b3
+Replacing label b3_from_b3 with b3
+Replacing label b2_from_b4 with b2
+Replacing label b8_from_b9 with b8
 Replacing label b7_from_b11 with b7
-Replacing label b2_from_b5 with b2
+Replacing label b6_from_b12 with b6
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b4 with b4
+Replacing label b3_from_b5 with b3
+Replacing label b7_from_b7 with b7
+Replacing label b6_from_b8 with b6
+Replacing label b10_from_b10 with b10
+Replacing label b9_from_b11 with b9
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b4 with b4
+Replacing label b3_from_b5 with b3
+Replacing label b7_from_b9 with b7
+Replacing label b6_from_b11 with b6
+Replacing label b13_from_b13 with b13
+Replacing label b12_from_b14 with b12
+Replacing label b9_from_b8 with b9
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b4 with b4
+Replacing label b3_from_b5 with b3
+Replacing label b7_from_b7 with b7
+Replacing label b6_from_b8 with b6
+Replacing label b10_from_b10 with b10
+Replacing label b9_from_b11 with b9
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b4 with b4
+Replacing label b3_from_b5 with b3
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b4 with b4
+Replacing label b3_from_b5 with b3
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b4 with b4
+Replacing label b3_from_b5 with b3
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b4 with b4
+Replacing label b3_from_b5 with b3
+Replacing label b7_from_b10 with b7
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b2 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b2 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b2 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b2 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
-Replacing label b10_from_b1 with b10
-Replacing label b1_from_b2 with b1
-Replacing label b6_from_b5 with b6
-Replacing label b5_from_b6 with b5
-Replacing label b1_from_b1 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b3_from_b5 with b3
-Replacing label b1_from_b1 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b3_from_b5 with b3
-Replacing label b1_from_b1 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b3_from_b5 with b3
 Replacing label b6_from_b1 with b6
-Replacing label b7_from_b6 with b7
-Replacing label b6_from_b7 with b6
+Replacing label b1_from_b2 with b1
+Replacing label b4_from_b3 with b4
+Replacing label b3_from_b4 with b3
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b4 with b4
+Replacing label b3_from_b5 with b3
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b4 with b4
+Replacing label b3_from_b5 with b3
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b4 with b4
+Replacing label b3_from_b5 with b3
+Replacing label b2_from_b1 with b2
+Replacing label b3_from_b2 with b3
+Replacing label b2_from_b3 with b2
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b54_from_bbegin:
-Removing instruction b54:
-Removing instruction bend_from_b54:
-Removing instruction b2_from_main:
-Removing instruction b2_from_b2:
-Removing instruction b8_from_b8:
-Removing instruction b10_from_b10:
-Removing instruction b47_from_b11:
-Removing instruction print_cls_from_b47:
-Removing instruction b48_from_b47:
-Removing instruction print_str_lines_from_b48:
-Removing instruction b2_from_b48:
-Removing instruction b2_from_b71:
-Removing instruction keyboard_key_pressed_from_b2:
-Removing instruction b6_from_b50:
-Removing instruction b12_from_b50:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_main:
+Removing instruction b1_from_b1:
+Removing instruction b3_from_b3:
+Removing instruction b4_from_b4:
+Removing instruction b28_from_b5:
+Removing instruction print_cls_from_b28:
+Removing instruction b29_from_b28:
+Removing instruction print_str_lines_from_b29:
+Removing instruction b1_from_b29:
+Removing instruction b1_from_b41:
+Removing instruction keyboard_key_pressed_from_b1:
+Removing instruction b2_from_b30:
+Removing instruction b6_from_b30:
+Removing instruction keyboard_key_pressed_from_b6:
+Removing instruction b17_from_b31:
+Removing instruction b7_from_b31:
+Removing instruction keyboard_key_pressed_from_b7:
+Removing instruction b18_from_b32:
+Removing instruction b8_from_b32:
+Removing instruction keyboard_key_pressed_from_b8:
+Removing instruction b19_from_b33:
+Removing instruction b9_from_b33:
+Removing instruction keyboard_key_pressed_from_b9:
+Removing instruction b20_from_b34:
+Removing instruction b10_from_b34:
+Removing instruction keyboard_key_pressed_from_b10:
+Removing instruction b21_from_b35:
+Removing instruction b11_from_b35:
+Removing instruction keyboard_key_pressed_from_b11:
+Removing instruction b22_from_b36:
+Removing instruction b12_from_b36:
 Removing instruction keyboard_key_pressed_from_b12:
-Removing instruction b24_from_b51:
-Removing instruction b13_from_b51:
+Removing instruction b23_from_b37:
+Removing instruction b13_from_b37:
 Removing instruction keyboard_key_pressed_from_b13:
-Removing instruction b26_from_b53:
-Removing instruction b14_from_b53:
+Removing instruction b24_from_b38:
+Removing instruction b14_from_b38:
 Removing instruction keyboard_key_pressed_from_b14:
-Removing instruction b28_from_b55:
-Removing instruction b15_from_b55:
+Removing instruction b25_from_b39:
+Removing instruction b15_from_b39:
 Removing instruction keyboard_key_pressed_from_b15:
-Removing instruction b30_from_b57:
-Removing instruction b16_from_b57:
+Removing instruction b26_from_b40:
+Removing instruction b16_from_b40:
 Removing instruction keyboard_key_pressed_from_b16:
-Removing instruction b32_from_b59:
-Removing instruction b17_from_b59:
-Removing instruction keyboard_key_pressed_from_b17:
-Removing instruction b34_from_b61:
-Removing instruction b18_from_b61:
-Removing instruction keyboard_key_pressed_from_b18:
-Removing instruction b36_from_b63:
-Removing instruction b19_from_b63:
-Removing instruction keyboard_key_pressed_from_b19:
-Removing instruction b38_from_b65:
-Removing instruction b20_from_b65:
-Removing instruction keyboard_key_pressed_from_b20:
-Removing instruction b40_from_b67:
-Removing instruction b21_from_b67:
-Removing instruction keyboard_key_pressed_from_b21:
-Removing instruction b42_from_b69:
-Removing instruction b22_from_b69:
-Removing instruction keyboard_key_pressed_from_b22:
-Removing instruction b44_from_b71:
+Removing instruction b27_from_b41:
 Removing instruction b1_from_b1:
 Removing instruction b2_from_b1:
 Removing instruction dtvSetCpuBankSegment1_from_b2:
@@ -24666,78 +24800,78 @@ Removing instruction b4_from_b5:
 Removing instruction b5_from_b4:
 Removing instruction b8_from_b7:
 Removing instruction dtvSetCpuBankSegment1_from_b8:
-Removing instruction b11_from_b8:
-Removing instruction mode_ctrl_from_b11:
+Removing instruction b10_from_b8:
+Removing instruction mode_ctrl_from_b10:
 Removing instruction b1_from_mode_ctrl:
-Removing instruction b1_from_b16:
-Removing instruction b8_from_b6:
+Removing instruction b1_from_b11:
+Removing instruction b3_from_b2:
+Removing instruction keyboard_key_pressed_from_b3:
+Removing instruction b5_from_b12:
+Removing instruction b5_from_b20:
+Removing instruction keyboard_key_pressed_from_b5:
+Removing instruction b6_from_b13:
+Removing instruction b6_from_b21:
+Removing instruction keyboard_key_pressed_from_b6:
+Removing instruction b7_from_b14:
+Removing instruction b7_from_b22:
+Removing instruction keyboard_key_pressed_from_b7:
+Removing instruction b8_from_b15:
+Removing instruction b8_from_b23:
 Removing instruction keyboard_key_pressed_from_b8:
-Removing instruction b10_from_b23:
-Removing instruction b10_from_b33:
+Removing instruction b9_from_b16:
+Removing instruction b9_from_b24:
+Removing instruction keyboard_key_pressed_from_b9:
+Removing instruction b10_from_b17:
+Removing instruction b10_from_b25:
 Removing instruction keyboard_key_pressed_from_b10:
-Removing instruction b11_from_b24:
-Removing instruction b11_from_b34:
-Removing instruction keyboard_key_pressed_from_b11:
-Removing instruction b12_from_b25:
-Removing instruction b12_from_b35:
-Removing instruction keyboard_key_pressed_from_b12:
-Removing instruction b13_from_b26:
-Removing instruction b13_from_b36:
-Removing instruction keyboard_key_pressed_from_b13:
-Removing instruction b14_from_b27:
-Removing instruction b14_from_b37:
-Removing instruction keyboard_key_pressed_from_b14:
-Removing instruction b15_from_b28:
-Removing instruction b15_from_b38:
-Removing instruction keyboard_key_pressed_from_b15:
-Removing instruction b46_from_b39:
-Removing instruction b16_from_b46:
+Removing instruction b27_from_b26:
+Removing instruction b11_from_b27:
+Removing instruction b1_from_b1:
+Removing instruction b2_from_b4:
+Removing instruction b3_from_b2:
+Removing instruction b3_from_b3:
+Removing instruction b6_from_b12:
+Removing instruction b7_from_b6:
+Removing instruction b7_from_b11:
+Removing instruction b8_from_b9:
 Removing instruction b1_from_b1:
 Removing instruction b3_from_b5:
 Removing instruction b4_from_b3:
 Removing instruction b4_from_b4:
-Removing instruction b7_from_b13:
-Removing instruction b8_from_b7:
-Removing instruction b8_from_b12:
-Removing instruction b9_from_b10:
-Removing instruction b1_from_b1:
-Removing instruction b3_from_b5:
-Removing instruction b4_from_b3:
-Removing instruction b4_from_b4:
-Removing instruction b7_from_b9:
-Removing instruction b8_from_b7:
-Removing instruction b8_from_b8:
-Removing instruction b11_from_b13:
-Removing instruction b12_from_b11:
-Removing instruction b12_from_b12:
-Removing instruction b14_from_b13:
-Removing instruction mode_ctrl_from_b14:
-Removing instruction b1_from_b1:
-Removing instruction b3_from_b5:
-Removing instruction b4_from_b3:
-Removing instruction b4_from_b4:
-Removing instruction b7_from_b13:
-Removing instruction b8_from_b7:
-Removing instruction b8_from_b10:
-Removing instruction b10_from_b11:
+Removing instruction b6_from_b8:
+Removing instruction b7_from_b6:
+Removing instruction b7_from_b7:
+Removing instruction b9_from_b11:
 Removing instruction b10_from_b9:
-Removing instruction b15_from_b17:
-Removing instruction b16_from_b15:
-Removing instruction b16_from_b16:
-Removing instruction b18_from_b17:
-Removing instruction mode_ctrl_from_b18:
+Removing instruction b10_from_b10:
+Removing instruction b12_from_b11:
+Removing instruction mode_ctrl_from_b12:
 Removing instruction b1_from_b1:
 Removing instruction b3_from_b5:
 Removing instruction b4_from_b3:
 Removing instruction b4_from_b4:
+Removing instruction b6_from_b11:
+Removing instruction b7_from_b6:
 Removing instruction b7_from_b9:
-Removing instruction b8_from_b7:
-Removing instruction b8_from_b8:
-Removing instruction b11_from_b13:
+Removing instruction b9_from_b10:
+Removing instruction b9_from_b8:
+Removing instruction b12_from_b14:
+Removing instruction b13_from_b12:
+Removing instruction b13_from_b13:
+Removing instruction b15_from_b14:
+Removing instruction mode_ctrl_from_b15:
+Removing instruction b1_from_b1:
+Removing instruction b3_from_b5:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b4:
+Removing instruction b6_from_b8:
+Removing instruction b7_from_b6:
+Removing instruction b7_from_b7:
+Removing instruction b9_from_b11:
+Removing instruction b10_from_b9:
+Removing instruction b10_from_b10:
 Removing instruction b12_from_b11:
-Removing instruction b12_from_b12:
-Removing instruction b14_from_b13:
-Removing instruction mode_ctrl_from_b14:
+Removing instruction mode_ctrl_from_b12:
 Removing instruction b1_from_b1:
 Removing instruction b3_from_b5:
 Removing instruction b4_from_b3:
@@ -24763,170 +24897,170 @@ Removing instruction b4_from_b4:
 Removing instruction b6_from_b5:
 Removing instruction bitmap_init_from_b6:
 Removing instruction b9_from_b6:
-Removing instruction b7_from_b11:
-Removing instruction b8_from_b11:
+Removing instruction b7_from_b10:
+Removing instruction b8_from_b10:
 Removing instruction mode_ctrl_from_b8:
 Removing instruction b1_from_bitmap_line_xdyi:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_bitmap_line_ydxi:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_bitmap_line_xdyd:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_bitmap_line_ydxd:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
 Removing instruction b1_from_b2:
-Removing instruction b5_from_b6:
-Removing instruction b6_from_b5:
-Removing instruction b6_from_b7:
-Removing instruction b10_from_b1:
-Removing instruction b2_from_b10:
-Removing instruction b1_from_b1:
-Removing instruction b3_from_b5:
+Removing instruction b3_from_b4:
 Removing instruction b4_from_b3:
-Removing instruction b4_from_b4:
-Removing instruction b6_from_b5:
-Removing instruction mode_ctrl_from_b6:
-Removing instruction b1_from_b1:
-Removing instruction b3_from_b5:
-Removing instruction b4_from_b3:
-Removing instruction b4_from_b4:
-Removing instruction b6_from_b5:
-Removing instruction mode_ctrl_from_b6:
-Removing instruction b1_from_b1:
-Removing instruction b3_from_b5:
-Removing instruction b4_from_b3:
-Removing instruction b4_from_b4:
-Removing instruction b6_from_b5:
-Removing instruction mode_ctrl_from_b6:
+Removing instruction b4_from_b5:
 Removing instruction b6_from_b1:
-Removing instruction b6_from_b7:
-Removing instruction b7_from_b6:
-Removing instruction b7_from_b8:
-Removing instruction b9_from_b7:
-Removing instruction print_ln_from_b9:
+Removing instruction b2_from_b6:
+Removing instruction b1_from_b1:
+Removing instruction b3_from_b5:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b4:
+Removing instruction b6_from_b5:
+Removing instruction mode_ctrl_from_b6:
+Removing instruction b1_from_b1:
+Removing instruction b3_from_b5:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b4:
+Removing instruction b6_from_b5:
+Removing instruction mode_ctrl_from_b6:
+Removing instruction b1_from_b1:
+Removing instruction b3_from_b5:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b4:
+Removing instruction b6_from_b5:
+Removing instruction mode_ctrl_from_b6:
+Removing instruction b2_from_b1:
+Removing instruction b2_from_b3:
+Removing instruction b3_from_b2:
+Removing instruction b3_from_b4:
+Removing instruction b5_from_b3:
+Removing instruction print_ln_from_b5:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b8_from_menu:
-Removing instruction b10_from_b8:
-Removing instruction b11:
-Removing instruction print_set_screen_from_b11:
-Removing instruction b47:
-Removing instruction b48:
-Removing instruction b50:
-Removing instruction b6:
-Removing instruction b51:
-Removing instruction b24:
-Removing instruction b53:
-Removing instruction b26:
-Removing instruction b55:
+Removing instruction b3_from_menu:
+Removing instruction b4_from_b3:
+Removing instruction b5:
+Removing instruction print_set_screen_from_b5:
 Removing instruction b28:
-Removing instruction b57:
+Removing instruction b29:
 Removing instruction b30:
-Removing instruction b59:
+Removing instruction b2:
+Removing instruction b31:
+Removing instruction b17:
 Removing instruction b32:
-Removing instruction b61:
+Removing instruction b18:
+Removing instruction b33:
+Removing instruction b19:
 Removing instruction b34:
-Removing instruction b63:
+Removing instruction b20:
+Removing instruction b35:
+Removing instruction b21:
 Removing instruction b36:
-Removing instruction b65:
+Removing instruction b22:
+Removing instruction b37:
+Removing instruction b23:
 Removing instruction b38:
-Removing instruction b67:
+Removing instruction b24:
+Removing instruction b39:
+Removing instruction b25:
 Removing instruction b40:
-Removing instruction b69:
-Removing instruction b42:
-Removing instruction b71:
-Removing instruction b44:
+Removing instruction b26:
+Removing instruction b41:
+Removing instruction b27:
 Removing instruction b1_from_mode_8bppchunkybmm:
 Removing instruction b2:
 Removing instruction b3_from_b2:
 Removing instruction b6:
 Removing instruction dtvSetCpuBankSegment1_from_b6:
-Removing instruction b10:
-Removing instruction b5_from_b10:
+Removing instruction b9:
+Removing instruction b5_from_b9:
 Removing instruction b7:
 Removing instruction b8:
-Removing instruction b11:
+Removing instruction b10:
 Removing instruction breturn:
-Removing instruction b8:
-Removing instruction b32:
+Removing instruction b3:
+Removing instruction b19:
 Removing instruction breturn:
-Removing instruction keyboard_key_pressed_from_b9:
-Removing instruction b33:
+Removing instruction keyboard_key_pressed_from_b4:
+Removing instruction b20:
+Removing instruction b12:
+Removing instruction b21:
+Removing instruction b13:
+Removing instruction b22:
+Removing instruction b14:
 Removing instruction b23:
-Removing instruction b34:
+Removing instruction b15:
 Removing instruction b24:
-Removing instruction b35:
+Removing instruction b16:
 Removing instruction b25:
-Removing instruction b36:
+Removing instruction b17:
 Removing instruction b26:
-Removing instruction b37:
-Removing instruction b27:
-Removing instruction b38:
-Removing instruction b28:
-Removing instruction b39:
-Removing instruction b16_from_b39:
-Removing instruction b30:
-Removing instruction b2:
+Removing instruction b11_from_b26:
+Removing instruction b18:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b1_from_mode_8bpppixelcell:
-Removing instruction b3_from_b1:
+Removing instruction b2_from_b1:
+Removing instruction b4:
 Removing instruction b5:
-Removing instruction b6:
-Removing instruction b7_from_b6:
-Removing instruction b9_from_b8:
+Removing instruction b6_from_b5:
+Removing instruction b8_from_b7:
+Removing instruction b10:
+Removing instruction b9_from_b10:
 Removing instruction b11:
-Removing instruction b10_from_b11:
 Removing instruction b12:
 Removing instruction b13:
-Removing instruction b14:
-Removing instruction mode_ctrl_from_b14:
+Removing instruction mode_ctrl_from_b13:
 Removing instruction breturn:
 Removing instruction b1_from_mode_sixsfred:
 Removing instruction b2:
 Removing instruction b3_from_b2:
 Removing instruction b5:
-Removing instruction b7_from_b5:
-Removing instruction b9:
-Removing instruction b11_from_b9:
-Removing instruction b13:
-Removing instruction b14:
+Removing instruction b6_from_b5:
+Removing instruction b8:
+Removing instruction b9_from_b8:
+Removing instruction b11:
+Removing instruction b12:
 Removing instruction breturn:
 Removing instruction b1_from_mode_twoplanebitmap:
 Removing instruction b2:
 Removing instruction b3_from_b2:
 Removing instruction b5:
-Removing instruction b7_from_b5:
+Removing instruction b6_from_b5:
+Removing instruction b10:
 Removing instruction b11:
-Removing instruction b13:
-Removing instruction b15_from_b13:
-Removing instruction b17:
-Removing instruction b18:
+Removing instruction b12_from_b11:
+Removing instruction b14:
+Removing instruction b15:
 Removing instruction breturn:
 Removing instruction b1_from_mode_sixsfred2:
 Removing instruction b2:
 Removing instruction b3_from_b2:
 Removing instruction b5:
-Removing instruction b7_from_b5:
-Removing instruction b9:
-Removing instruction b11_from_b9:
-Removing instruction b13:
-Removing instruction b14:
+Removing instruction b6_from_b5:
+Removing instruction b8:
+Removing instruction b9_from_b8:
+Removing instruction b11:
+Removing instruction b12:
 Removing instruction breturn:
 Removing instruction b1_from_mode_hicolmcchar:
 Removing instruction b2:
@@ -24953,39 +25087,39 @@ Removing instruction b5:
 Removing instruction b6:
 Removing instruction b9:
 Removing instruction b7_from_b9:
-Removing instruction b11:
+Removing instruction b10:
 Removing instruction b8:
 Removing instruction breturn:
+Removing instruction b2:
 Removing instruction b3:
 Removing instruction b4:
+Removing instruction bitmap_line_ydxi_from_b4:
+Removing instruction bitmap_line_xdyi_from_b8:
+Removing instruction b10:
+Removing instruction bitmap_line_ydxd_from_b10:
+Removing instruction bitmap_line_xdyd_from_b9:
 Removing instruction b5:
-Removing instruction bitmap_line_ydxi_from_b5:
-Removing instruction bitmap_line_xdyi_from_b11:
-Removing instruction b17:
-Removing instruction bitmap_line_ydxd_from_b17:
-Removing instruction bitmap_line_xdyd_from_b15:
-Removing instruction b7:
-Removing instruction b8:
-Removing instruction bitmap_line_ydxd_from_b8:
-Removing instruction bitmap_line_xdyd_from_b21:
-Removing instruction b27:
-Removing instruction bitmap_line_ydxi_from_b27:
-Removing instruction bitmap_line_xdyi_from_b25:
+Removing instruction b6:
+Removing instruction bitmap_line_ydxd_from_b6:
+Removing instruction bitmap_line_xdyd_from_b12:
+Removing instruction b14:
+Removing instruction bitmap_line_ydxi_from_b14:
+Removing instruction bitmap_line_xdyi_from_b13:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_bitmap_clear:
@@ -24993,8 +25127,8 @@ Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_bitmap_init:
 Removing instruction b2_from_b1:
-Removing instruction b5_from_b2:
-Removing instruction b7:
+Removing instruction b3_from_b2:
+Removing instruction b5:
 Removing instruction breturn:
 Removing instruction b1_from_mode_mcchar:
 Removing instruction b2:
@@ -25016,9 +25150,9 @@ Removing instruction b6:
 Removing instruction breturn:
 Removing instruction b1_from_print_str_lines:
 Removing instruction breturn:
-Removing instruction b8:
-Removing instruction b9:
-Removing instruction b1_from_b9:
+Removing instruction b4:
+Removing instruction b5:
+Removing instruction b1_from_b5:
 Removing instruction breturn:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
@@ -25027,47 +25161,47 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b16 in beq b46
-Skipping double jump to b1 in jmp b1_from_b30
-Skipping double jump to b2 in bne b10
+Skipping double jump to b11 in beq b27
+Skipping double jump to b1 in jmp b1_from_b18
+Skipping double jump to b2 in bne b6
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b1_from_b30 to b2
-Relabelling long label b10_from_b9 to b2
+Relabelling long label b1_from_b18 to b3
+Relabelling long label b9_from_b8 to b4
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b8
-Removing instruction jmp b10
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp b1
 Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp b4
+Removing instruction jmp b6
 Removing instruction jmp b7
 Removing instruction jmp b8
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b6
+Removing instruction jmp b7
 Removing instruction jmp b9
+Removing instruction jmp b10
 Removing instruction jmp b1
 Removing instruction jmp b3
 Removing instruction jmp b4
+Removing instruction jmp b6
 Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b11
 Removing instruction jmp b12
+Removing instruction jmp b13
 Removing instruction jmp b1
 Removing instruction jmp b3
 Removing instruction jmp b4
+Removing instruction jmp b6
 Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b15
-Removing instruction jmp b16
-Removing instruction jmp b1
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b11
-Removing instruction jmp b12
+Removing instruction jmp b9
+Removing instruction jmp b10
 Removing instruction jmp b1
 Removing instruction jmp b3
 Removing instruction jmp b4
@@ -25084,7 +25218,7 @@ Removing instruction jmp b7
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp b3
 Removing instruction jmp b4
@@ -25101,19 +25235,19 @@ Replacing instruction ldx #0 with TAX
 Removing instruction lda y0
 Removing instruction lda y0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Removing instruction b2:
+Removing instruction b3:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bbegin:
-Removing instruction b46:
-Removing instruction b10:
+Removing instruction b27:
+Removing instruction b6:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing unreachable instruction jmp b16
+Removing unreachable instruction jmp b11
 Removing unreachable instruction jmp b2
 Succesful ASM optimization Pass5UnreachableCodeElimination
-Fixing long branch [262] beq b2 to bne
+Fixing long branch [262] beq b1 to bne
 
 FINAL SYMBOL TABLE
-(label) @54
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -25461,11 +25595,11 @@ FINAL SYMBOL TABLE
 (byte~) bitmap_init::$8 reg byte a 202.0
 (byte~) bitmap_init::$9 reg byte a 202.0
 (label) bitmap_init::@1
-(label) bitmap_init::@10
 (label) bitmap_init::@2
+(label) bitmap_init::@3
+(label) bitmap_init::@4
 (label) bitmap_init::@5
 (label) bitmap_init::@6
-(label) bitmap_init::@7
 (label) bitmap_init::@return
 (byte*) bitmap_init::bitmap
 (byte) bitmap_init::bits
@@ -25486,17 +25620,17 @@ FINAL SYMBOL TABLE
 (label) bitmap_line::@1
 (label) bitmap_line::@10
 (label) bitmap_line::@11
-(label) bitmap_line::@15
-(label) bitmap_line::@17
-(label) bitmap_line::@20
-(label) bitmap_line::@21
-(label) bitmap_line::@25
-(label) bitmap_line::@27
+(label) bitmap_line::@12
+(label) bitmap_line::@13
+(label) bitmap_line::@14
+(label) bitmap_line::@2
 (label) bitmap_line::@3
 (label) bitmap_line::@4
 (label) bitmap_line::@5
+(label) bitmap_line::@6
 (label) bitmap_line::@7
 (label) bitmap_line::@8
+(label) bitmap_line::@9
 (label) bitmap_line::@return
 (byte) bitmap_line::x0
 (byte) bitmap_line::x0#0 x0 zp ZP_BYTE:9 5.173913043478264
@@ -25519,7 +25653,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_xdyd::@1
 (label) bitmap_line_xdyd::@2
 (label) bitmap_line_xdyd::@3
-(label) bitmap_line_xdyd::@5
+(label) bitmap_line_xdyd::@4
 (label) bitmap_line_xdyd::@return
 (byte) bitmap_line_xdyd::e
 (byte) bitmap_line_xdyd::e#0 e zp ZP_BYTE:12 4.0
@@ -25557,7 +25691,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_xdyi::@1
 (label) bitmap_line_xdyi::@2
 (label) bitmap_line_xdyi::@3
-(label) bitmap_line_xdyi::@5
+(label) bitmap_line_xdyi::@4
 (label) bitmap_line_xdyi::@return
 (byte) bitmap_line_xdyi::e
 (byte) bitmap_line_xdyi::e#0 e zp ZP_BYTE:12 4.0
@@ -25595,7 +25729,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_ydxd::@1
 (label) bitmap_line_ydxd::@2
 (label) bitmap_line_ydxd::@3
-(label) bitmap_line_ydxd::@5
+(label) bitmap_line_ydxd::@4
 (label) bitmap_line_ydxd::@return
 (byte) bitmap_line_ydxd::e
 (byte) bitmap_line_ydxd::e#0 e zp ZP_BYTE:9 4.0
@@ -25633,7 +25767,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_ydxi::@1
 (label) bitmap_line_ydxi::@2
 (label) bitmap_line_ydxi::@3
-(label) bitmap_line_ydxi::@5
+(label) bitmap_line_ydxi::@4
 (label) bitmap_line_ydxi::@return
 (byte) bitmap_line_ydxi::e
 (byte) bitmap_line_ydxi::e#0 e zp ZP_BYTE:9 4.0
@@ -25713,7 +25847,7 @@ FINAL SYMBOL TABLE
 (byte) keyboard_events_size
 (byte()) keyboard_key_pressed((byte) keyboard_key_pressed::key)
 (byte~) keyboard_key_pressed::$2 reg byte a 4.0
-(label) keyboard_key_pressed::@2
+(label) keyboard_key_pressed::@1
 (label) keyboard_key_pressed::@return
 (byte) keyboard_key_pressed::colidx
 (byte) keyboard_key_pressed::colidx#0 colidx zp ZP_BYTE:7 0.6666666666666666
@@ -25758,7 +25892,7 @@ FINAL SYMBOL TABLE
 (byte) keyboard_modifiers
 (byte[8]) keyboard_scan_values
 (void()) main()
-(label) main::@2
+(label) main::@1
 (void()) menu()
 (byte~) menu::$29 reg byte a 202.0
 (byte~) menu::$33 reg byte a 202.0
@@ -25772,6 +25906,7 @@ FINAL SYMBOL TABLE
 (byte~) menu::$65 reg byte a 202.0
 (byte~) menu::$69 reg byte a 202.0
 (byte~) menu::$73 reg byte a 202.0
+(label) menu::@1
 (label) menu::@10
 (label) menu::@11
 (label) menu::@12
@@ -25786,33 +25921,32 @@ FINAL SYMBOL TABLE
 (label) menu::@20
 (label) menu::@21
 (label) menu::@22
+(label) menu::@23
 (label) menu::@24
+(label) menu::@25
 (label) menu::@26
+(label) menu::@27
 (label) menu::@28
+(label) menu::@29
+(label) menu::@3
 (label) menu::@30
+(label) menu::@31
 (label) menu::@32
+(label) menu::@33
 (label) menu::@34
+(label) menu::@35
 (label) menu::@36
+(label) menu::@37
 (label) menu::@38
+(label) menu::@39
+(label) menu::@4
 (label) menu::@40
-(label) menu::@42
-(label) menu::@44
-(label) menu::@47
-(label) menu::@48
-(label) menu::@50
-(label) menu::@51
-(label) menu::@53
-(label) menu::@55
-(label) menu::@57
-(label) menu::@59
+(label) menu::@41
+(label) menu::@5
 (label) menu::@6
-(label) menu::@61
-(label) menu::@63
-(label) menu::@65
-(label) menu::@67
-(label) menu::@69
-(label) menu::@71
+(label) menu::@7
 (label) menu::@8
+(label) menu::@9
 (label) menu::@return
 (byte*) menu::CHARSET
 (const byte*) menu::CHARSET#0 CHARSET = ((byte*))(word/dword/signed dword) $9800
@@ -25828,7 +25962,6 @@ FINAL SYMBOL TABLE
 (word~) mode_8bppchunkybmm::$27 $27 zp ZP_WORD:13 2002.0
 (label) mode_8bppchunkybmm::@1
 (label) mode_8bppchunkybmm::@10
-(label) mode_8bppchunkybmm::@11
 (label) mode_8bppchunkybmm::@2
 (label) mode_8bppchunkybmm::@3
 (label) mode_8bppchunkybmm::@4
@@ -25836,6 +25969,7 @@ FINAL SYMBOL TABLE
 (label) mode_8bppchunkybmm::@6
 (label) mode_8bppchunkybmm::@7
 (label) mode_8bppchunkybmm::@8
+(label) mode_8bppchunkybmm::@9
 (label) mode_8bppchunkybmm::@return
 (dword) mode_8bppchunkybmm::PLANEB
 (const dword) mode_8bppchunkybmm::PLANEB#0 PLANEB = (dword/signed dword) $20000
@@ -25871,7 +26005,7 @@ FINAL SYMBOL TABLE
 (label) mode_8bpppixelcell::@11
 (label) mode_8bpppixelcell::@12
 (label) mode_8bpppixelcell::@13
-(label) mode_8bpppixelcell::@14
+(label) mode_8bpppixelcell::@2
 (label) mode_8bpppixelcell::@3
 (label) mode_8bpppixelcell::@4
 (label) mode_8bpppixelcell::@5
@@ -25946,23 +26080,23 @@ FINAL SYMBOL TABLE
 (label) mode_ctrl::@14
 (label) mode_ctrl::@15
 (label) mode_ctrl::@16
+(label) mode_ctrl::@17
+(label) mode_ctrl::@18
+(label) mode_ctrl::@19
+(label) mode_ctrl::@2
+(label) mode_ctrl::@20
+(label) mode_ctrl::@21
+(label) mode_ctrl::@22
 (label) mode_ctrl::@23
 (label) mode_ctrl::@24
 (label) mode_ctrl::@25
 (label) mode_ctrl::@26
 (label) mode_ctrl::@27
-(label) mode_ctrl::@28
-(label) mode_ctrl::@30
-(label) mode_ctrl::@32
-(label) mode_ctrl::@33
-(label) mode_ctrl::@34
-(label) mode_ctrl::@35
-(label) mode_ctrl::@36
-(label) mode_ctrl::@37
-(label) mode_ctrl::@38
-(label) mode_ctrl::@39
-(label) mode_ctrl::@46
+(label) mode_ctrl::@3
+(label) mode_ctrl::@4
+(label) mode_ctrl::@5
 (label) mode_ctrl::@6
+(label) mode_ctrl::@7
 (label) mode_ctrl::@8
 (label) mode_ctrl::@9
 (label) mode_ctrl::@return
@@ -26168,14 +26302,14 @@ FINAL SYMBOL TABLE
 (byte~) mode_sixsfred::$18 reg byte a 2002.0
 (byte~) mode_sixsfred::$21 reg byte a 2002.0
 (label) mode_sixsfred::@1
+(label) mode_sixsfred::@10
 (label) mode_sixsfred::@11
 (label) mode_sixsfred::@12
-(label) mode_sixsfred::@13
-(label) mode_sixsfred::@14
 (label) mode_sixsfred::@2
 (label) mode_sixsfred::@3
 (label) mode_sixsfred::@4
 (label) mode_sixsfred::@5
+(label) mode_sixsfred::@6
 (label) mode_sixsfred::@7
 (label) mode_sixsfred::@8
 (label) mode_sixsfred::@9
@@ -26230,14 +26364,14 @@ FINAL SYMBOL TABLE
 (byte~) mode_sixsfred2::$18 reg byte a 2002.0
 (byte~) mode_sixsfred2::$21 reg byte a 2002.0
 (label) mode_sixsfred2::@1
+(label) mode_sixsfred2::@10
 (label) mode_sixsfred2::@11
 (label) mode_sixsfred2::@12
-(label) mode_sixsfred2::@13
-(label) mode_sixsfred2::@14
 (label) mode_sixsfred2::@2
 (label) mode_sixsfred2::@3
 (label) mode_sixsfred2::@4
 (label) mode_sixsfred2::@5
+(label) mode_sixsfred2::@6
 (label) mode_sixsfred2::@7
 (label) mode_sixsfred2::@8
 (label) mode_sixsfred2::@9
@@ -26290,7 +26424,7 @@ FINAL SYMBOL TABLE
 (byte~) mode_stdbitmap::$25 reg byte a 2002.0
 (byte~) mode_stdbitmap::$26 reg byte a 2002.0
 (label) mode_stdbitmap::@1
-(label) mode_stdbitmap::@11
+(label) mode_stdbitmap::@10
 (label) mode_stdbitmap::@2
 (label) mode_stdbitmap::@3
 (label) mode_stdbitmap::@4
@@ -26376,15 +26510,15 @@ FINAL SYMBOL TABLE
 (label) mode_twoplanebitmap::@1
 (label) mode_twoplanebitmap::@10
 (label) mode_twoplanebitmap::@11
+(label) mode_twoplanebitmap::@12
 (label) mode_twoplanebitmap::@13
+(label) mode_twoplanebitmap::@14
 (label) mode_twoplanebitmap::@15
-(label) mode_twoplanebitmap::@16
-(label) mode_twoplanebitmap::@17
-(label) mode_twoplanebitmap::@18
 (label) mode_twoplanebitmap::@2
 (label) mode_twoplanebitmap::@3
 (label) mode_twoplanebitmap::@4
 (label) mode_twoplanebitmap::@5
+(label) mode_twoplanebitmap::@6
 (label) mode_twoplanebitmap::@7
 (label) mode_twoplanebitmap::@8
 (label) mode_twoplanebitmap::@9
@@ -26456,10 +26590,10 @@ FINAL SYMBOL TABLE
 (byte*) print_set_screen::screen
 (void()) print_str_lines((byte*) print_str_lines::str)
 (label) print_str_lines::@1
-(label) print_str_lines::@6
-(label) print_str_lines::@7
-(label) print_str_lines::@8
-(label) print_str_lines::@9
+(label) print_str_lines::@2
+(label) print_str_lines::@3
+(label) print_str_lines::@4
+(label) print_str_lines::@5
 (label) print_str_lines::@return
 (byte) print_str_lines::ch
 (byte) print_str_lines::ch#0 reg byte a 667.3333333333334
@@ -26740,10 +26874,10 @@ Score: 2305587
   .label dtv_control = 4
   .label print_line_cursor = $d
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @54 [phi:@begin->@54]
-//SEG5 @54
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @54 to @end [phi:@54->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -26761,12 +26895,12 @@ main: {
     // Enable DTV extended modes
     lda #DTV_FEATURE_ENABLE
     sta DTV_FEATURE
-  //SEG14 [8] phi from main main::@2 to main::@2 [phi:main/main::@2->main::@2]
-  //SEG15 main::@2
-  b2:
+  //SEG14 [8] phi from main main::@1 to main::@1 [phi:main/main::@1->main::@1]
+  //SEG15 main::@1
+  b1:
   //SEG16 [9] call menu 
     jsr menu
-    jmp b2
+    jmp b1
 }
 //SEG17 menu
 menu: {
@@ -26808,33 +26942,33 @@ menu: {
     // VIC Memory Pointers
     lda #(SCREEN&$3fff)/$40|(CHARSET&$3fff)/$400
     sta VIC_MEMORY
-  //SEG27 [19] phi from menu to menu::@8 [phi:menu->menu::@8]
-  //SEG28 [19] phi (byte) menu::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:menu->menu::@8#0] -- vbuxx=vbuc1 
+  //SEG27 [19] phi from menu to menu::@3 [phi:menu->menu::@3]
+  //SEG28 [19] phi (byte) menu::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:menu->menu::@3#0] -- vbuxx=vbuc1 
     ldx #0
   // DTV Palette - default
-  //SEG29 [19] phi from menu::@8 to menu::@8 [phi:menu::@8->menu::@8]
-  //SEG30 [19] phi (byte) menu::i#2 = (byte) menu::i#1 [phi:menu::@8->menu::@8#0] -- register_copy 
-  //SEG31 menu::@8
-  b8:
+  //SEG29 [19] phi from menu::@3 to menu::@3 [phi:menu::@3->menu::@3]
+  //SEG30 [19] phi (byte) menu::i#2 = (byte) menu::i#1 [phi:menu::@3->menu::@3#0] -- register_copy 
+  //SEG31 menu::@3
+  b3:
   //SEG32 [20] *((const byte*) DTV_PALETTE#0 + (byte) menu::i#2) ← *((const byte[$10]) DTV_PALETTE_DEFAULT#0 + (byte) menu::i#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda DTV_PALETTE_DEFAULT,x
     sta DTV_PALETTE,x
   //SEG33 [21] (byte) menu::i#1 ← ++ (byte) menu::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG34 [22] if((byte) menu::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto menu::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG34 [22] if((byte) menu::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto menu::@3 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
-    bne b8
-  //SEG35 [23] phi from menu::@8 to menu::@10 [phi:menu::@8->menu::@10]
-  //SEG36 [23] phi (byte*) menu::c#2 = (const byte*) COLS#0 [phi:menu::@8->menu::@10#0] -- pbuz1=pbuc1 
+    bne b3
+  //SEG35 [23] phi from menu::@3 to menu::@4 [phi:menu::@3->menu::@4]
+  //SEG36 [23] phi (byte*) menu::c#2 = (const byte*) COLS#0 [phi:menu::@3->menu::@4#0] -- pbuz1=pbuc1 
     lda #<COLS
     sta c
     lda #>COLS
     sta c+1
   // Char Colors
-  //SEG37 [23] phi from menu::@10 to menu::@10 [phi:menu::@10->menu::@10]
-  //SEG38 [23] phi (byte*) menu::c#2 = (byte*) menu::c#1 [phi:menu::@10->menu::@10#0] -- register_copy 
-  //SEG39 menu::@10
-  b10:
+  //SEG37 [23] phi from menu::@4 to menu::@4 [phi:menu::@4->menu::@4]
+  //SEG38 [23] phi (byte*) menu::c#2 = (byte*) menu::c#1 [phi:menu::@4->menu::@4#0] -- register_copy 
+  //SEG39 menu::@4
+  b4:
   //SEG40 [24] *((byte*) menu::c#2) ← (const byte) LIGHT_GREEN#0 -- _deref_pbuz1=vbuc1 
     lda #LIGHT_GREEN
     ldy #0
@@ -26844,14 +26978,14 @@ menu: {
     bne !+
     inc c+1
   !:
-  //SEG42 [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@10 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG42 [26] if((byte*) menu::c#1!=(const byte*) COLS#0+(word/signed word/dword/signed dword) $3e8) goto menu::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda c+1
     cmp #>COLS+$3e8
-    bne b10
+    bne b4
     lda c
     cmp #<COLS+$3e8
-    bne b10
-  //SEG43 menu::@11
+    bne b4
+  //SEG43 menu::@5
   //SEG44 [27] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     // Screen colors
     lda #0
@@ -26859,248 +26993,248 @@ menu: {
   //SEG45 [28] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     sta BORDERCOL
   //SEG46 [29] call print_set_screen 
-  //SEG47 [891] phi from menu::@11 to print_set_screen [phi:menu::@11->print_set_screen]
+  //SEG47 [891] phi from menu::@5 to print_set_screen [phi:menu::@5->print_set_screen]
     jsr print_set_screen
-  //SEG48 [30] phi from menu::@11 to menu::@47 [phi:menu::@11->menu::@47]
-  //SEG49 menu::@47
+  //SEG48 [30] phi from menu::@5 to menu::@28 [phi:menu::@5->menu::@28]
+  //SEG49 menu::@28
   //SEG50 [31] call print_cls 
-  //SEG51 [885] phi from menu::@47 to print_cls [phi:menu::@47->print_cls]
+  //SEG51 [885] phi from menu::@28 to print_cls [phi:menu::@28->print_cls]
     jsr print_cls
-  //SEG52 [32] phi from menu::@47 to menu::@48 [phi:menu::@47->menu::@48]
-  //SEG53 menu::@48
+  //SEG52 [32] phi from menu::@28 to menu::@29 [phi:menu::@28->menu::@29]
+  //SEG53 menu::@29
   //SEG54 [33] call print_str_lines 
-  //SEG55 [865] phi from menu::@48 to print_str_lines [phi:menu::@48->print_str_lines]
+  //SEG55 [865] phi from menu::@29 to print_str_lines [phi:menu::@29->print_str_lines]
     jsr print_str_lines
-  //SEG56 [34] phi from menu::@48 menu::@71 to menu::@2 [phi:menu::@48/menu::@71->menu::@2]
-  //SEG57 menu::@2
-  b2:
+  //SEG56 [34] phi from menu::@29 menu::@41 to menu::@1 [phi:menu::@29/menu::@41->menu::@1]
+  //SEG57 menu::@1
+  b1:
   //SEG58 [35] call keyboard_key_pressed 
-  //SEG59 [211] phi from menu::@2 to keyboard_key_pressed [phi:menu::@2->keyboard_key_pressed]
-  //SEG60 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_1#0 [phi:menu::@2->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG59 [211] phi from menu::@1 to keyboard_key_pressed [phi:menu::@1->keyboard_key_pressed]
+  //SEG60 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_1#0 [phi:menu::@1->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_1
     jsr keyboard_key_pressed
   //SEG61 [36] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  //SEG62 menu::@50
+  //SEG62 menu::@30
   //SEG63 [37] (byte~) menu::$29 ← (byte) keyboard_key_pressed::return#2
-  //SEG64 [38] if((byte~) menu::$29==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@12 -- vbuaa_eq_0_then_la1 
+  //SEG64 [38] if((byte~) menu::$29==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@6 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b12
-  //SEG65 [39] phi from menu::@50 to menu::@6 [phi:menu::@50->menu::@6]
-  //SEG66 menu::@6
+    beq b6
+  //SEG65 [39] phi from menu::@30 to menu::@2 [phi:menu::@30->menu::@2]
+  //SEG66 menu::@2
   //SEG67 [40] call mode_stdchar 
     jsr mode_stdchar
   //SEG68 menu::@return
   breturn:
   //SEG69 [41] return 
     rts
-  //SEG70 [42] phi from menu::@50 to menu::@12 [phi:menu::@50->menu::@12]
-  //SEG71 menu::@12
-  b12:
+  //SEG70 [42] phi from menu::@30 to menu::@6 [phi:menu::@30->menu::@6]
+  //SEG71 menu::@6
+  b6:
   //SEG72 [43] call keyboard_key_pressed 
-  //SEG73 [211] phi from menu::@12 to keyboard_key_pressed [phi:menu::@12->keyboard_key_pressed]
-  //SEG74 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_2#0 [phi:menu::@12->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG73 [211] phi from menu::@6 to keyboard_key_pressed [phi:menu::@6->keyboard_key_pressed]
+  //SEG74 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_2#0 [phi:menu::@6->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_2
     jsr keyboard_key_pressed
   //SEG75 [44] (byte) keyboard_key_pressed::return#24 ← (byte) keyboard_key_pressed::return#0
-  //SEG76 menu::@51
+  //SEG76 menu::@31
   //SEG77 [45] (byte~) menu::$33 ← (byte) keyboard_key_pressed::return#24
-  //SEG78 [46] if((byte~) menu::$33==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@13 -- vbuaa_eq_0_then_la1 
+  //SEG78 [46] if((byte~) menu::$33==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@7 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b13
-  //SEG79 [47] phi from menu::@51 to menu::@24 [phi:menu::@51->menu::@24]
-  //SEG80 menu::@24
+    beq b7
+  //SEG79 [47] phi from menu::@31 to menu::@17 [phi:menu::@31->menu::@17]
+  //SEG80 menu::@17
   //SEG81 [48] call mode_ecmchar 
     jsr mode_ecmchar
     jmp breturn
-  //SEG82 [49] phi from menu::@51 to menu::@13 [phi:menu::@51->menu::@13]
-  //SEG83 menu::@13
-  b13:
+  //SEG82 [49] phi from menu::@31 to menu::@7 [phi:menu::@31->menu::@7]
+  //SEG83 menu::@7
+  b7:
   //SEG84 [50] call keyboard_key_pressed 
-  //SEG85 [211] phi from menu::@13 to keyboard_key_pressed [phi:menu::@13->keyboard_key_pressed]
-  //SEG86 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_3#0 [phi:menu::@13->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG85 [211] phi from menu::@7 to keyboard_key_pressed [phi:menu::@7->keyboard_key_pressed]
+  //SEG86 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_3#0 [phi:menu::@7->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_3
     jsr keyboard_key_pressed
   //SEG87 [51] (byte) keyboard_key_pressed::return#25 ← (byte) keyboard_key_pressed::return#0
-  //SEG88 menu::@53
+  //SEG88 menu::@32
   //SEG89 [52] (byte~) menu::$37 ← (byte) keyboard_key_pressed::return#25
-  //SEG90 [53] if((byte~) menu::$37==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@14 -- vbuaa_eq_0_then_la1 
+  //SEG90 [53] if((byte~) menu::$37==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@8 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b14
-  //SEG91 [54] phi from menu::@53 to menu::@26 [phi:menu::@53->menu::@26]
-  //SEG92 menu::@26
+    beq b8
+  //SEG91 [54] phi from menu::@32 to menu::@18 [phi:menu::@32->menu::@18]
+  //SEG92 menu::@18
   //SEG93 [55] call mode_mcchar 
     jsr mode_mcchar
     jmp breturn
-  //SEG94 [56] phi from menu::@53 to menu::@14 [phi:menu::@53->menu::@14]
-  //SEG95 menu::@14
-  b14:
+  //SEG94 [56] phi from menu::@32 to menu::@8 [phi:menu::@32->menu::@8]
+  //SEG95 menu::@8
+  b8:
   //SEG96 [57] call keyboard_key_pressed 
-  //SEG97 [211] phi from menu::@14 to keyboard_key_pressed [phi:menu::@14->keyboard_key_pressed]
-  //SEG98 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_4#0 [phi:menu::@14->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG97 [211] phi from menu::@8 to keyboard_key_pressed [phi:menu::@8->keyboard_key_pressed]
+  //SEG98 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_4#0 [phi:menu::@8->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_4
     jsr keyboard_key_pressed
   //SEG99 [58] (byte) keyboard_key_pressed::return#26 ← (byte) keyboard_key_pressed::return#0
-  //SEG100 menu::@55
+  //SEG100 menu::@33
   //SEG101 [59] (byte~) menu::$41 ← (byte) keyboard_key_pressed::return#26
-  //SEG102 [60] if((byte~) menu::$41==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@15 -- vbuaa_eq_0_then_la1 
+  //SEG102 [60] if((byte~) menu::$41==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@9 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b15
-  //SEG103 [61] phi from menu::@55 to menu::@28 [phi:menu::@55->menu::@28]
-  //SEG104 menu::@28
+    beq b9
+  //SEG103 [61] phi from menu::@33 to menu::@19 [phi:menu::@33->menu::@19]
+  //SEG104 menu::@19
   //SEG105 [62] call mode_stdbitmap 
     jsr mode_stdbitmap
     jmp breturn
-  //SEG106 [63] phi from menu::@55 to menu::@15 [phi:menu::@55->menu::@15]
-  //SEG107 menu::@15
-  b15:
+  //SEG106 [63] phi from menu::@33 to menu::@9 [phi:menu::@33->menu::@9]
+  //SEG107 menu::@9
+  b9:
   //SEG108 [64] call keyboard_key_pressed 
-  //SEG109 [211] phi from menu::@15 to keyboard_key_pressed [phi:menu::@15->keyboard_key_pressed]
-  //SEG110 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_6#0 [phi:menu::@15->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG109 [211] phi from menu::@9 to keyboard_key_pressed [phi:menu::@9->keyboard_key_pressed]
+  //SEG110 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_6#0 [phi:menu::@9->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_6
     jsr keyboard_key_pressed
   //SEG111 [65] (byte) keyboard_key_pressed::return#27 ← (byte) keyboard_key_pressed::return#0
-  //SEG112 menu::@57
+  //SEG112 menu::@34
   //SEG113 [66] (byte~) menu::$45 ← (byte) keyboard_key_pressed::return#27
-  //SEG114 [67] if((byte~) menu::$45==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@16 -- vbuaa_eq_0_then_la1 
+  //SEG114 [67] if((byte~) menu::$45==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@10 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b16
-  //SEG115 [68] phi from menu::@57 to menu::@30 [phi:menu::@57->menu::@30]
-  //SEG116 menu::@30
+    beq b10
+  //SEG115 [68] phi from menu::@34 to menu::@20 [phi:menu::@34->menu::@20]
+  //SEG116 menu::@20
   //SEG117 [69] call mode_hicolstdchar 
     jsr mode_hicolstdchar
     jmp breturn
-  //SEG118 [70] phi from menu::@57 to menu::@16 [phi:menu::@57->menu::@16]
-  //SEG119 menu::@16
-  b16:
+  //SEG118 [70] phi from menu::@34 to menu::@10 [phi:menu::@34->menu::@10]
+  //SEG119 menu::@10
+  b10:
   //SEG120 [71] call keyboard_key_pressed 
-  //SEG121 [211] phi from menu::@16 to keyboard_key_pressed [phi:menu::@16->keyboard_key_pressed]
-  //SEG122 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_7#0 [phi:menu::@16->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG121 [211] phi from menu::@10 to keyboard_key_pressed [phi:menu::@10->keyboard_key_pressed]
+  //SEG122 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_7#0 [phi:menu::@10->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_7
     jsr keyboard_key_pressed
   //SEG123 [72] (byte) keyboard_key_pressed::return#28 ← (byte) keyboard_key_pressed::return#0
-  //SEG124 menu::@59
+  //SEG124 menu::@35
   //SEG125 [73] (byte~) menu::$49 ← (byte) keyboard_key_pressed::return#28
-  //SEG126 [74] if((byte~) menu::$49==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@17 -- vbuaa_eq_0_then_la1 
+  //SEG126 [74] if((byte~) menu::$49==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@11 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b17
-  //SEG127 [75] phi from menu::@59 to menu::@32 [phi:menu::@59->menu::@32]
-  //SEG128 menu::@32
+    beq b11
+  //SEG127 [75] phi from menu::@35 to menu::@21 [phi:menu::@35->menu::@21]
+  //SEG128 menu::@21
   //SEG129 [76] call mode_hicolecmchar 
     jsr mode_hicolecmchar
     jmp breturn
-  //SEG130 [77] phi from menu::@59 to menu::@17 [phi:menu::@59->menu::@17]
-  //SEG131 menu::@17
-  b17:
+  //SEG130 [77] phi from menu::@35 to menu::@11 [phi:menu::@35->menu::@11]
+  //SEG131 menu::@11
+  b11:
   //SEG132 [78] call keyboard_key_pressed 
-  //SEG133 [211] phi from menu::@17 to keyboard_key_pressed [phi:menu::@17->keyboard_key_pressed]
-  //SEG134 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_8#0 [phi:menu::@17->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG133 [211] phi from menu::@11 to keyboard_key_pressed [phi:menu::@11->keyboard_key_pressed]
+  //SEG134 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_8#0 [phi:menu::@11->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_8
     jsr keyboard_key_pressed
   //SEG135 [79] (byte) keyboard_key_pressed::return#29 ← (byte) keyboard_key_pressed::return#0
-  //SEG136 menu::@61
+  //SEG136 menu::@36
   //SEG137 [80] (byte~) menu::$53 ← (byte) keyboard_key_pressed::return#29
-  //SEG138 [81] if((byte~) menu::$53==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@18 -- vbuaa_eq_0_then_la1 
+  //SEG138 [81] if((byte~) menu::$53==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@12 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b18
-  //SEG139 [82] phi from menu::@61 to menu::@34 [phi:menu::@61->menu::@34]
-  //SEG140 menu::@34
+    beq b12
+  //SEG139 [82] phi from menu::@36 to menu::@22 [phi:menu::@36->menu::@22]
+  //SEG140 menu::@22
   //SEG141 [83] call mode_hicolmcchar 
     jsr mode_hicolmcchar
     jmp breturn
-  //SEG142 [84] phi from menu::@61 to menu::@18 [phi:menu::@61->menu::@18]
-  //SEG143 menu::@18
-  b18:
+  //SEG142 [84] phi from menu::@36 to menu::@12 [phi:menu::@36->menu::@12]
+  //SEG143 menu::@12
+  b12:
   //SEG144 [85] call keyboard_key_pressed 
-  //SEG145 [211] phi from menu::@18 to keyboard_key_pressed [phi:menu::@18->keyboard_key_pressed]
-  //SEG146 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_A#0 [phi:menu::@18->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG145 [211] phi from menu::@12 to keyboard_key_pressed [phi:menu::@12->keyboard_key_pressed]
+  //SEG146 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_A#0 [phi:menu::@12->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_A
     jsr keyboard_key_pressed
   //SEG147 [86] (byte) keyboard_key_pressed::return#30 ← (byte) keyboard_key_pressed::return#0
-  //SEG148 menu::@63
+  //SEG148 menu::@37
   //SEG149 [87] (byte~) menu::$57 ← (byte) keyboard_key_pressed::return#30
-  //SEG150 [88] if((byte~) menu::$57==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@19 -- vbuaa_eq_0_then_la1 
+  //SEG150 [88] if((byte~) menu::$57==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@13 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b19
-  //SEG151 [89] phi from menu::@63 to menu::@36 [phi:menu::@63->menu::@36]
-  //SEG152 menu::@36
+    beq b13
+  //SEG151 [89] phi from menu::@37 to menu::@23 [phi:menu::@37->menu::@23]
+  //SEG152 menu::@23
   //SEG153 [90] call mode_sixsfred2 
     jsr mode_sixsfred2
     jmp breturn
-  //SEG154 [91] phi from menu::@63 to menu::@19 [phi:menu::@63->menu::@19]
-  //SEG155 menu::@19
-  b19:
+  //SEG154 [91] phi from menu::@37 to menu::@13 [phi:menu::@37->menu::@13]
+  //SEG155 menu::@13
+  b13:
   //SEG156 [92] call keyboard_key_pressed 
-  //SEG157 [211] phi from menu::@19 to keyboard_key_pressed [phi:menu::@19->keyboard_key_pressed]
-  //SEG158 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:menu::@19->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG157 [211] phi from menu::@13 to keyboard_key_pressed [phi:menu::@13->keyboard_key_pressed]
+  //SEG158 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:menu::@13->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_B
     jsr keyboard_key_pressed
   //SEG159 [93] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-  //SEG160 menu::@65
+  //SEG160 menu::@38
   //SEG161 [94] (byte~) menu::$61 ← (byte) keyboard_key_pressed::return#10
-  //SEG162 [95] if((byte~) menu::$61==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@20 -- vbuaa_eq_0_then_la1 
+  //SEG162 [95] if((byte~) menu::$61==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@14 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b20
-  //SEG163 [96] phi from menu::@65 to menu::@38 [phi:menu::@65->menu::@38]
-  //SEG164 menu::@38
+    beq b14
+  //SEG163 [96] phi from menu::@38 to menu::@24 [phi:menu::@38->menu::@24]
+  //SEG164 menu::@24
   //SEG165 [97] call mode_twoplanebitmap 
     jsr mode_twoplanebitmap
     jmp breturn
-  //SEG166 [98] phi from menu::@65 to menu::@20 [phi:menu::@65->menu::@20]
-  //SEG167 menu::@20
-  b20:
+  //SEG166 [98] phi from menu::@38 to menu::@14 [phi:menu::@38->menu::@14]
+  //SEG167 menu::@14
+  b14:
   //SEG168 [99] call keyboard_key_pressed 
-  //SEG169 [211] phi from menu::@20 to keyboard_key_pressed [phi:menu::@20->keyboard_key_pressed]
-  //SEG170 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:menu::@20->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG169 [211] phi from menu::@14 to keyboard_key_pressed [phi:menu::@14->keyboard_key_pressed]
+  //SEG170 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:menu::@14->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_C
     jsr keyboard_key_pressed
   //SEG171 [100] (byte) keyboard_key_pressed::return#11 ← (byte) keyboard_key_pressed::return#0
-  //SEG172 menu::@67
+  //SEG172 menu::@39
   //SEG173 [101] (byte~) menu::$65 ← (byte) keyboard_key_pressed::return#11
-  //SEG174 [102] if((byte~) menu::$65==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@21 -- vbuaa_eq_0_then_la1 
+  //SEG174 [102] if((byte~) menu::$65==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@15 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b21
-  //SEG175 [103] phi from menu::@67 to menu::@40 [phi:menu::@67->menu::@40]
-  //SEG176 menu::@40
+    beq b15
+  //SEG175 [103] phi from menu::@39 to menu::@25 [phi:menu::@39->menu::@25]
+  //SEG176 menu::@25
   //SEG177 [104] call mode_sixsfred 
     jsr mode_sixsfred
     jmp breturn
-  //SEG178 [105] phi from menu::@67 to menu::@21 [phi:menu::@67->menu::@21]
-  //SEG179 menu::@21
-  b21:
+  //SEG178 [105] phi from menu::@39 to menu::@15 [phi:menu::@39->menu::@15]
+  //SEG179 menu::@15
+  b15:
   //SEG180 [106] call keyboard_key_pressed 
-  //SEG181 [211] phi from menu::@21 to keyboard_key_pressed [phi:menu::@21->keyboard_key_pressed]
-  //SEG182 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_D#0 [phi:menu::@21->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG181 [211] phi from menu::@15 to keyboard_key_pressed [phi:menu::@15->keyboard_key_pressed]
+  //SEG182 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_D#0 [phi:menu::@15->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_D
     jsr keyboard_key_pressed
   //SEG183 [107] (byte) keyboard_key_pressed::return#12 ← (byte) keyboard_key_pressed::return#0
-  //SEG184 menu::@69
+  //SEG184 menu::@40
   //SEG185 [108] (byte~) menu::$69 ← (byte) keyboard_key_pressed::return#12
-  //SEG186 [109] if((byte~) menu::$69==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@22 -- vbuaa_eq_0_then_la1 
+  //SEG186 [109] if((byte~) menu::$69==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@16 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b22
-  //SEG187 [110] phi from menu::@69 to menu::@42 [phi:menu::@69->menu::@42]
-  //SEG188 menu::@42
+    beq b16
+  //SEG187 [110] phi from menu::@40 to menu::@26 [phi:menu::@40->menu::@26]
+  //SEG188 menu::@26
   //SEG189 [111] call mode_8bpppixelcell 
     jsr mode_8bpppixelcell
     jmp breturn
-  //SEG190 [112] phi from menu::@69 to menu::@22 [phi:menu::@69->menu::@22]
-  //SEG191 menu::@22
-  b22:
+  //SEG190 [112] phi from menu::@40 to menu::@16 [phi:menu::@40->menu::@16]
+  //SEG191 menu::@16
+  b16:
   //SEG192 [113] call keyboard_key_pressed 
-  //SEG193 [211] phi from menu::@22 to keyboard_key_pressed [phi:menu::@22->keyboard_key_pressed]
-  //SEG194 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_E#0 [phi:menu::@22->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG193 [211] phi from menu::@16 to keyboard_key_pressed [phi:menu::@16->keyboard_key_pressed]
+  //SEG194 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_E#0 [phi:menu::@16->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_E
     jsr keyboard_key_pressed
   //SEG195 [114] (byte) keyboard_key_pressed::return#13 ← (byte) keyboard_key_pressed::return#0
-  //SEG196 menu::@71
+  //SEG196 menu::@41
   //SEG197 [115] (byte~) menu::$73 ← (byte) keyboard_key_pressed::return#13
-  //SEG198 [116] if((byte~) menu::$73==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@2 -- vbuaa_eq_0_then_la1 
+  //SEG198 [116] if((byte~) menu::$73==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    bne !b2+
-    jmp b2
-  !b2:
-  //SEG199 [117] phi from menu::@71 to menu::@44 [phi:menu::@71->menu::@44]
-  //SEG200 menu::@44
+    bne !b1+
+    jmp b1
+  !b1:
+  //SEG199 [117] phi from menu::@41 to menu::@27 [phi:menu::@41->menu::@27]
+  //SEG200 menu::@27
   //SEG201 [118] call mode_8bppchunkybmm 
     jsr mode_8bppchunkybmm
     jmp breturn
@@ -27217,12 +27351,12 @@ mode_8bppchunkybmm: {
   //SEG248 [223] phi from mode_8bppchunkybmm::@6 to dtvSetCpuBankSegment1 [phi:mode_8bppchunkybmm::@6->dtvSetCpuBankSegment1]
   //SEG249 [223] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#3 = (byte) dtvSetCpuBankSegment1::cpuBankIdx#1 [phi:mode_8bppchunkybmm::@6->dtvSetCpuBankSegment1#0] -- register_copy 
     jsr dtvSetCpuBankSegment1
-  //SEG250 mode_8bppchunkybmm::@10
+  //SEG250 mode_8bppchunkybmm::@9
   //SEG251 [140] (byte) mode_8bppchunkybmm::gfxbCpuBank#2 ← ++ (byte) mode_8bppchunkybmm::gfxbCpuBank#4 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG252 [141] phi from mode_8bppchunkybmm::@10 to mode_8bppchunkybmm::@5 [phi:mode_8bppchunkybmm::@10->mode_8bppchunkybmm::@5]
-  //SEG253 [141] phi (byte) mode_8bppchunkybmm::gfxbCpuBank#8 = (byte) mode_8bppchunkybmm::gfxbCpuBank#2 [phi:mode_8bppchunkybmm::@10->mode_8bppchunkybmm::@5#0] -- register_copy 
-  //SEG254 [141] phi (byte*) mode_8bppchunkybmm::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:mode_8bppchunkybmm::@10->mode_8bppchunkybmm::@5#1] -- pbuz1=pbuc1 
+  //SEG252 [141] phi from mode_8bppchunkybmm::@9 to mode_8bppchunkybmm::@5 [phi:mode_8bppchunkybmm::@9->mode_8bppchunkybmm::@5]
+  //SEG253 [141] phi (byte) mode_8bppchunkybmm::gfxbCpuBank#8 = (byte) mode_8bppchunkybmm::gfxbCpuBank#2 [phi:mode_8bppchunkybmm::@9->mode_8bppchunkybmm::@5#0] -- register_copy 
+  //SEG254 [141] phi (byte*) mode_8bppchunkybmm::gfxb#4 = ((byte*))(word/signed word/dword/signed dword) $4000 [phi:mode_8bppchunkybmm::@9->mode_8bppchunkybmm::@5#1] -- pbuz1=pbuc1 
     lda #<$4000
     sta gfxb
     lda #>$4000
@@ -27276,11 +27410,11 @@ mode_8bppchunkybmm: {
   //SEG272 [223] phi (byte) dtvSetCpuBankSegment1::cpuBankIdx#3 = ((byte))(word/signed word/dword/signed dword) $4000/(word/signed word/dword/signed dword) $4000 [phi:mode_8bppchunkybmm::@8->dtvSetCpuBankSegment1#0] -- vbuaa=vbuc1 
     lda #$4000/$4000
     jsr dtvSetCpuBankSegment1
-  //SEG273 [152] phi from mode_8bppchunkybmm::@8 to mode_8bppchunkybmm::@11 [phi:mode_8bppchunkybmm::@8->mode_8bppchunkybmm::@11]
-  //SEG274 mode_8bppchunkybmm::@11
+  //SEG273 [152] phi from mode_8bppchunkybmm::@8 to mode_8bppchunkybmm::@10 [phi:mode_8bppchunkybmm::@8->mode_8bppchunkybmm::@10]
+  //SEG274 mode_8bppchunkybmm::@10
   //SEG275 [153] call mode_ctrl 
-  //SEG276 [155] phi from mode_8bppchunkybmm::@11 to mode_ctrl [phi:mode_8bppchunkybmm::@11->mode_ctrl]
-  //SEG277 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 [phi:mode_8bppchunkybmm::@11->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG276 [155] phi from mode_8bppchunkybmm::@10 to mode_ctrl [phi:mode_8bppchunkybmm::@10->mode_ctrl]
+  //SEG277 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0|(const byte) DTV_COLORRAM_OFF#0 [phi:mode_8bppchunkybmm::@10->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR|DTV_CHUNKY|DTV_COLORRAM_OFF
     sta dtv_control
     jsr mode_ctrl
@@ -27291,179 +27425,179 @@ mode_8bppchunkybmm: {
 //SEG280 mode_ctrl
 // Allow the user to control the DTV graphics using different keys
 mode_ctrl: {
-  //SEG281 [156] phi from mode_ctrl mode_ctrl::@30 to mode_ctrl::@1 [phi:mode_ctrl/mode_ctrl::@30->mode_ctrl::@1]
-  //SEG282 [156] phi (byte) dtv_control#114 = (byte) dtv_control#145 [phi:mode_ctrl/mode_ctrl::@30->mode_ctrl::@1#0] -- register_copy 
-  //SEG283 [156] phi from mode_ctrl::@16 to mode_ctrl::@1 [phi:mode_ctrl::@16->mode_ctrl::@1]
+  //SEG281 [156] phi from mode_ctrl mode_ctrl::@18 to mode_ctrl::@1 [phi:mode_ctrl/mode_ctrl::@18->mode_ctrl::@1]
+  //SEG282 [156] phi (byte) dtv_control#114 = (byte) dtv_control#145 [phi:mode_ctrl/mode_ctrl::@18->mode_ctrl::@1#0] -- register_copy 
+  //SEG283 [156] phi from mode_ctrl::@11 to mode_ctrl::@1 [phi:mode_ctrl::@11->mode_ctrl::@1]
   //SEG284 mode_ctrl::@1
   b1:
   // Wait for the raster
-  //SEG285 mode_ctrl::@6
-  b6:
-  //SEG286 [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG285 mode_ctrl::@2
+  b2:
+  //SEG286 [157] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG287 [158] phi from mode_ctrl::@6 to mode_ctrl::@8 [phi:mode_ctrl::@6->mode_ctrl::@8]
-  //SEG288 mode_ctrl::@8
+    bne b2
+  //SEG287 [158] phi from mode_ctrl::@2 to mode_ctrl::@3 [phi:mode_ctrl::@2->mode_ctrl::@3]
+  //SEG288 mode_ctrl::@3
   //SEG289 [159] call keyboard_key_pressed 
-  //SEG290 [211] phi from mode_ctrl::@8 to keyboard_key_pressed [phi:mode_ctrl::@8->keyboard_key_pressed]
-  //SEG291 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_SPACE#0 [phi:mode_ctrl::@8->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG290 [211] phi from mode_ctrl::@3 to keyboard_key_pressed [phi:mode_ctrl::@3->keyboard_key_pressed]
+  //SEG291 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_SPACE#0 [phi:mode_ctrl::@3->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_SPACE
     jsr keyboard_key_pressed
   //SEG292 [160] (byte) keyboard_key_pressed::return#14 ← (byte) keyboard_key_pressed::return#0
-  //SEG293 mode_ctrl::@32
+  //SEG293 mode_ctrl::@19
   //SEG294 [161] (byte~) mode_ctrl::$1 ← (byte) keyboard_key_pressed::return#14
-  //SEG295 [162] if((byte~) mode_ctrl::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@9 -- vbuaa_eq_0_then_la1 
+  //SEG295 [162] if((byte~) mode_ctrl::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b9
+    beq b4
   //SEG296 mode_ctrl::@return
   //SEG297 [163] return 
     rts
-  //SEG298 mode_ctrl::@9
-  b9:
+  //SEG298 mode_ctrl::@4
+  b4:
   //SEG299 [164] (byte) mode_ctrl::ctrl#0 ← (byte) dtv_control#114 -- vbuxx=vbuz1 
     // Read the current control byte
     ldx dtv_control
   //SEG300 [165] call keyboard_key_pressed 
-  //SEG301 [211] phi from mode_ctrl::@9 to keyboard_key_pressed [phi:mode_ctrl::@9->keyboard_key_pressed]
-  //SEG302 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_L#0 [phi:mode_ctrl::@9->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG301 [211] phi from mode_ctrl::@4 to keyboard_key_pressed [phi:mode_ctrl::@4->keyboard_key_pressed]
+  //SEG302 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_L#0 [phi:mode_ctrl::@4->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_L
     jsr keyboard_key_pressed
   //SEG303 [166] (byte) keyboard_key_pressed::return#15 ← (byte) keyboard_key_pressed::return#0
-  //SEG304 mode_ctrl::@33
+  //SEG304 mode_ctrl::@20
   //SEG305 [167] (byte~) mode_ctrl::$4 ← (byte) keyboard_key_pressed::return#15
-  //SEG306 [168] if((byte~) mode_ctrl::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@10 -- vbuaa_eq_0_then_la1 
+  //SEG306 [168] if((byte~) mode_ctrl::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@5 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b10
-  //SEG307 mode_ctrl::@23
+    beq b5
+  //SEG307 mode_ctrl::@12
   //SEG308 [169] (byte) mode_ctrl::ctrl#1 ← (byte) mode_ctrl::ctrl#0 | (const byte) DTV_LINEAR#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_LINEAR
     tax
-  //SEG309 [170] phi from mode_ctrl::@23 mode_ctrl::@33 to mode_ctrl::@10 [phi:mode_ctrl::@23/mode_ctrl::@33->mode_ctrl::@10]
-  //SEG310 [170] phi (byte) mode_ctrl::ctrl#17 = (byte) mode_ctrl::ctrl#1 [phi:mode_ctrl::@23/mode_ctrl::@33->mode_ctrl::@10#0] -- register_copy 
-  //SEG311 mode_ctrl::@10
-  b10:
+  //SEG309 [170] phi from mode_ctrl::@12 mode_ctrl::@20 to mode_ctrl::@5 [phi:mode_ctrl::@12/mode_ctrl::@20->mode_ctrl::@5]
+  //SEG310 [170] phi (byte) mode_ctrl::ctrl#17 = (byte) mode_ctrl::ctrl#1 [phi:mode_ctrl::@12/mode_ctrl::@20->mode_ctrl::@5#0] -- register_copy 
+  //SEG311 mode_ctrl::@5
+  b5:
   //SEG312 [171] call keyboard_key_pressed 
-  //SEG313 [211] phi from mode_ctrl::@10 to keyboard_key_pressed [phi:mode_ctrl::@10->keyboard_key_pressed]
-  //SEG314 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_H#0 [phi:mode_ctrl::@10->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG313 [211] phi from mode_ctrl::@5 to keyboard_key_pressed [phi:mode_ctrl::@5->keyboard_key_pressed]
+  //SEG314 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_H#0 [phi:mode_ctrl::@5->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_H
     jsr keyboard_key_pressed
   //SEG315 [172] (byte) keyboard_key_pressed::return#16 ← (byte) keyboard_key_pressed::return#0
-  //SEG316 mode_ctrl::@34
+  //SEG316 mode_ctrl::@21
   //SEG317 [173] (byte~) mode_ctrl::$8 ← (byte) keyboard_key_pressed::return#16
-  //SEG318 [174] if((byte~) mode_ctrl::$8==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@11 -- vbuaa_eq_0_then_la1 
+  //SEG318 [174] if((byte~) mode_ctrl::$8==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@6 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b11
-  //SEG319 mode_ctrl::@24
+    beq b6
+  //SEG319 mode_ctrl::@13
   //SEG320 [175] (byte) mode_ctrl::ctrl#2 ← (byte) mode_ctrl::ctrl#17 | (const byte) DTV_HIGHCOLOR#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_HIGHCOLOR
     tax
-  //SEG321 [176] phi from mode_ctrl::@24 mode_ctrl::@34 to mode_ctrl::@11 [phi:mode_ctrl::@24/mode_ctrl::@34->mode_ctrl::@11]
-  //SEG322 [176] phi (byte) mode_ctrl::ctrl#10 = (byte) mode_ctrl::ctrl#2 [phi:mode_ctrl::@24/mode_ctrl::@34->mode_ctrl::@11#0] -- register_copy 
-  //SEG323 mode_ctrl::@11
-  b11:
+  //SEG321 [176] phi from mode_ctrl::@13 mode_ctrl::@21 to mode_ctrl::@6 [phi:mode_ctrl::@13/mode_ctrl::@21->mode_ctrl::@6]
+  //SEG322 [176] phi (byte) mode_ctrl::ctrl#10 = (byte) mode_ctrl::ctrl#2 [phi:mode_ctrl::@13/mode_ctrl::@21->mode_ctrl::@6#0] -- register_copy 
+  //SEG323 mode_ctrl::@6
+  b6:
   //SEG324 [177] call keyboard_key_pressed 
-  //SEG325 [211] phi from mode_ctrl::@11 to keyboard_key_pressed [phi:mode_ctrl::@11->keyboard_key_pressed]
-  //SEG326 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_O#0 [phi:mode_ctrl::@11->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG325 [211] phi from mode_ctrl::@6 to keyboard_key_pressed [phi:mode_ctrl::@6->keyboard_key_pressed]
+  //SEG326 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_O#0 [phi:mode_ctrl::@6->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_O
     jsr keyboard_key_pressed
   //SEG327 [178] (byte) keyboard_key_pressed::return#17 ← (byte) keyboard_key_pressed::return#0
-  //SEG328 mode_ctrl::@35
+  //SEG328 mode_ctrl::@22
   //SEG329 [179] (byte~) mode_ctrl::$12 ← (byte) keyboard_key_pressed::return#17
-  //SEG330 [180] if((byte~) mode_ctrl::$12==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@12 -- vbuaa_eq_0_then_la1 
+  //SEG330 [180] if((byte~) mode_ctrl::$12==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@7 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b12
-  //SEG331 mode_ctrl::@25
+    beq b7
+  //SEG331 mode_ctrl::@14
   //SEG332 [181] (byte) mode_ctrl::ctrl#3 ← (byte) mode_ctrl::ctrl#10 | (const byte) DTV_OVERSCAN#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_OVERSCAN
     tax
-  //SEG333 [182] phi from mode_ctrl::@25 mode_ctrl::@35 to mode_ctrl::@12 [phi:mode_ctrl::@25/mode_ctrl::@35->mode_ctrl::@12]
-  //SEG334 [182] phi (byte) mode_ctrl::ctrl#11 = (byte) mode_ctrl::ctrl#3 [phi:mode_ctrl::@25/mode_ctrl::@35->mode_ctrl::@12#0] -- register_copy 
-  //SEG335 mode_ctrl::@12
-  b12:
+  //SEG333 [182] phi from mode_ctrl::@14 mode_ctrl::@22 to mode_ctrl::@7 [phi:mode_ctrl::@14/mode_ctrl::@22->mode_ctrl::@7]
+  //SEG334 [182] phi (byte) mode_ctrl::ctrl#11 = (byte) mode_ctrl::ctrl#3 [phi:mode_ctrl::@14/mode_ctrl::@22->mode_ctrl::@7#0] -- register_copy 
+  //SEG335 mode_ctrl::@7
+  b7:
   //SEG336 [183] call keyboard_key_pressed 
-  //SEG337 [211] phi from mode_ctrl::@12 to keyboard_key_pressed [phi:mode_ctrl::@12->keyboard_key_pressed]
-  //SEG338 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:mode_ctrl::@12->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG337 [211] phi from mode_ctrl::@7 to keyboard_key_pressed [phi:mode_ctrl::@7->keyboard_key_pressed]
+  //SEG338 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_B#0 [phi:mode_ctrl::@7->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_B
     jsr keyboard_key_pressed
   //SEG339 [184] (byte) keyboard_key_pressed::return#18 ← (byte) keyboard_key_pressed::return#0
-  //SEG340 mode_ctrl::@36
+  //SEG340 mode_ctrl::@23
   //SEG341 [185] (byte~) mode_ctrl::$16 ← (byte) keyboard_key_pressed::return#18
-  //SEG342 [186] if((byte~) mode_ctrl::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@13 -- vbuaa_eq_0_then_la1 
+  //SEG342 [186] if((byte~) mode_ctrl::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@8 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b13
-  //SEG343 mode_ctrl::@26
+    beq b8
+  //SEG343 mode_ctrl::@15
   //SEG344 [187] (byte) mode_ctrl::ctrl#4 ← (byte) mode_ctrl::ctrl#11 | (const byte) DTV_BORDER_OFF#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_BORDER_OFF
     tax
-  //SEG345 [188] phi from mode_ctrl::@26 mode_ctrl::@36 to mode_ctrl::@13 [phi:mode_ctrl::@26/mode_ctrl::@36->mode_ctrl::@13]
-  //SEG346 [188] phi (byte) mode_ctrl::ctrl#12 = (byte) mode_ctrl::ctrl#4 [phi:mode_ctrl::@26/mode_ctrl::@36->mode_ctrl::@13#0] -- register_copy 
-  //SEG347 mode_ctrl::@13
-  b13:
+  //SEG345 [188] phi from mode_ctrl::@15 mode_ctrl::@23 to mode_ctrl::@8 [phi:mode_ctrl::@15/mode_ctrl::@23->mode_ctrl::@8]
+  //SEG346 [188] phi (byte) mode_ctrl::ctrl#12 = (byte) mode_ctrl::ctrl#4 [phi:mode_ctrl::@15/mode_ctrl::@23->mode_ctrl::@8#0] -- register_copy 
+  //SEG347 mode_ctrl::@8
+  b8:
   //SEG348 [189] call keyboard_key_pressed 
-  //SEG349 [211] phi from mode_ctrl::@13 to keyboard_key_pressed [phi:mode_ctrl::@13->keyboard_key_pressed]
-  //SEG350 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_U#0 [phi:mode_ctrl::@13->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG349 [211] phi from mode_ctrl::@8 to keyboard_key_pressed [phi:mode_ctrl::@8->keyboard_key_pressed]
+  //SEG350 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_U#0 [phi:mode_ctrl::@8->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_U
     jsr keyboard_key_pressed
   //SEG351 [190] (byte) keyboard_key_pressed::return#19 ← (byte) keyboard_key_pressed::return#0
-  //SEG352 mode_ctrl::@37
+  //SEG352 mode_ctrl::@24
   //SEG353 [191] (byte~) mode_ctrl::$20 ← (byte) keyboard_key_pressed::return#19
-  //SEG354 [192] if((byte~) mode_ctrl::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@14 -- vbuaa_eq_0_then_la1 
+  //SEG354 [192] if((byte~) mode_ctrl::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@9 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b14
-  //SEG355 mode_ctrl::@27
+    beq b9
+  //SEG355 mode_ctrl::@16
   //SEG356 [193] (byte) mode_ctrl::ctrl#5 ← (byte) mode_ctrl::ctrl#12 | (const byte) DTV_CHUNKY#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_CHUNKY
     tax
-  //SEG357 [194] phi from mode_ctrl::@27 mode_ctrl::@37 to mode_ctrl::@14 [phi:mode_ctrl::@27/mode_ctrl::@37->mode_ctrl::@14]
-  //SEG358 [194] phi (byte) mode_ctrl::ctrl#13 = (byte) mode_ctrl::ctrl#5 [phi:mode_ctrl::@27/mode_ctrl::@37->mode_ctrl::@14#0] -- register_copy 
-  //SEG359 mode_ctrl::@14
-  b14:
+  //SEG357 [194] phi from mode_ctrl::@16 mode_ctrl::@24 to mode_ctrl::@9 [phi:mode_ctrl::@16/mode_ctrl::@24->mode_ctrl::@9]
+  //SEG358 [194] phi (byte) mode_ctrl::ctrl#13 = (byte) mode_ctrl::ctrl#5 [phi:mode_ctrl::@16/mode_ctrl::@24->mode_ctrl::@9#0] -- register_copy 
+  //SEG359 mode_ctrl::@9
+  b9:
   //SEG360 [195] call keyboard_key_pressed 
-  //SEG361 [211] phi from mode_ctrl::@14 to keyboard_key_pressed [phi:mode_ctrl::@14->keyboard_key_pressed]
-  //SEG362 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:mode_ctrl::@14->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG361 [211] phi from mode_ctrl::@9 to keyboard_key_pressed [phi:mode_ctrl::@9->keyboard_key_pressed]
+  //SEG362 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_C#0 [phi:mode_ctrl::@9->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_C
     jsr keyboard_key_pressed
   //SEG363 [196] (byte) keyboard_key_pressed::return#20 ← (byte) keyboard_key_pressed::return#0
-  //SEG364 mode_ctrl::@38
+  //SEG364 mode_ctrl::@25
   //SEG365 [197] (byte~) mode_ctrl::$24 ← (byte) keyboard_key_pressed::return#20
-  //SEG366 [198] if((byte~) mode_ctrl::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@15 -- vbuaa_eq_0_then_la1 
+  //SEG366 [198] if((byte~) mode_ctrl::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@10 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b15
-  //SEG367 mode_ctrl::@28
+    beq b10
+  //SEG367 mode_ctrl::@17
   //SEG368 [199] (byte) mode_ctrl::ctrl#6 ← (byte) mode_ctrl::ctrl#13 | (const byte) DTV_COLORRAM_OFF#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #DTV_COLORRAM_OFF
     tax
-  //SEG369 [200] phi from mode_ctrl::@28 mode_ctrl::@38 to mode_ctrl::@15 [phi:mode_ctrl::@28/mode_ctrl::@38->mode_ctrl::@15]
-  //SEG370 [200] phi (byte) mode_ctrl::ctrl#22 = (byte) mode_ctrl::ctrl#6 [phi:mode_ctrl::@28/mode_ctrl::@38->mode_ctrl::@15#0] -- register_copy 
-  //SEG371 mode_ctrl::@15
-  b15:
+  //SEG369 [200] phi from mode_ctrl::@17 mode_ctrl::@25 to mode_ctrl::@10 [phi:mode_ctrl::@17/mode_ctrl::@25->mode_ctrl::@10]
+  //SEG370 [200] phi (byte) mode_ctrl::ctrl#22 = (byte) mode_ctrl::ctrl#6 [phi:mode_ctrl::@17/mode_ctrl::@25->mode_ctrl::@10#0] -- register_copy 
+  //SEG371 mode_ctrl::@10
+  b10:
   //SEG372 [201] call keyboard_key_pressed 
-  //SEG373 [211] phi from mode_ctrl::@15 to keyboard_key_pressed [phi:mode_ctrl::@15->keyboard_key_pressed]
-  //SEG374 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_0#0 [phi:mode_ctrl::@15->keyboard_key_pressed#0] -- vbuyy=vbuc1 
+  //SEG373 [211] phi from mode_ctrl::@10 to keyboard_key_pressed [phi:mode_ctrl::@10->keyboard_key_pressed]
+  //SEG374 [211] phi (byte) keyboard_key_pressed::key#20 = (const byte) KEY_0#0 [phi:mode_ctrl::@10->keyboard_key_pressed#0] -- vbuyy=vbuc1 
     ldy #KEY_0
     jsr keyboard_key_pressed
   //SEG375 [202] (byte) keyboard_key_pressed::return#21 ← (byte) keyboard_key_pressed::return#0
-  //SEG376 mode_ctrl::@39
+  //SEG376 mode_ctrl::@26
   //SEG377 [203] (byte~) mode_ctrl::$28 ← (byte) keyboard_key_pressed::return#21
-  //SEG378 [204] if((byte~) mode_ctrl::$28==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@46 -- vbuaa_eq_0_then_la1 
+  //SEG378 [204] if((byte~) mode_ctrl::$28==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_ctrl::@27 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b16
-  //SEG379 [205] phi from mode_ctrl::@39 to mode_ctrl::@16 [phi:mode_ctrl::@39->mode_ctrl::@16]
-  //SEG380 [205] phi (byte) mode_ctrl::ctrl#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_ctrl::@39->mode_ctrl::@16#0] -- vbuxx=vbuc1 
+    beq b11
+  //SEG379 [205] phi from mode_ctrl::@26 to mode_ctrl::@11 [phi:mode_ctrl::@26->mode_ctrl::@11]
+  //SEG380 [205] phi (byte) mode_ctrl::ctrl#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_ctrl::@26->mode_ctrl::@11#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG381 mode_ctrl::@16
-  b16:
+  //SEG381 mode_ctrl::@11
+  b11:
   //SEG382 [206] if((byte) mode_ctrl::ctrl#14==(byte) dtv_control#114) goto mode_ctrl::@1 -- vbuxx_eq_vbuz1_then_la1 
     cpx dtv_control
     beq b1
-  //SEG383 mode_ctrl::@30
+  //SEG383 mode_ctrl::@18
   //SEG384 [207] (byte) dtv_control#17 ← (byte) mode_ctrl::ctrl#14 -- vbuz1=vbuxx 
     stx dtv_control
   //SEG385 [208] *((const byte*) DTV_CONTROL#0) ← (byte) mode_ctrl::ctrl#14 -- _deref_pbuc1=vbuxx 
@@ -27471,10 +27605,10 @@ mode_ctrl: {
   //SEG386 [209] *((const byte*) BORDERCOL#0) ← (byte) mode_ctrl::ctrl#14 -- _deref_pbuc1=vbuxx 
     stx BORDERCOL
     jmp b1
-  //SEG387 [210] phi from mode_ctrl::@39 to mode_ctrl::@46 [phi:mode_ctrl::@39->mode_ctrl::@46]
-  //SEG388 mode_ctrl::@46
-  //SEG389 [205] phi from mode_ctrl::@46 to mode_ctrl::@16 [phi:mode_ctrl::@46->mode_ctrl::@16]
-  //SEG390 [205] phi (byte) mode_ctrl::ctrl#14 = (byte) mode_ctrl::ctrl#22 [phi:mode_ctrl::@46->mode_ctrl::@16#0] -- register_copy 
+  //SEG387 [210] phi from mode_ctrl::@26 to mode_ctrl::@27 [phi:mode_ctrl::@26->mode_ctrl::@27]
+  //SEG388 mode_ctrl::@27
+  //SEG389 [205] phi from mode_ctrl::@27 to mode_ctrl::@11 [phi:mode_ctrl::@27->mode_ctrl::@11]
+  //SEG390 [205] phi (byte) mode_ctrl::ctrl#14 = (byte) mode_ctrl::ctrl#22 [phi:mode_ctrl::@27->mode_ctrl::@11#0] -- register_copy 
 }
 //SEG391 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -27498,7 +27632,7 @@ keyboard_key_pressed: {
   //SEG395 [215] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG396 [216] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  //SEG397 keyboard_key_pressed::@2
+  //SEG397 keyboard_key_pressed::@1
   //SEG398 [217] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   //SEG399 [218] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuz1 
     ldy colidx
@@ -27631,29 +27765,29 @@ mode_8bpppixelcell: {
   //SEG436 [246] if((byte) mode_8bpppixelcell::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mode_8bpppixelcell::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$10
     bne b1
-  //SEG437 [247] phi from mode_8bpppixelcell::@1 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@3]
-  //SEG438 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (const byte*) mode_8bpppixelcell::PLANEA#0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@3#0] -- pbuz1=pbuc1 
+  //SEG437 [247] phi from mode_8bpppixelcell::@1 to mode_8bpppixelcell::@2 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@2]
+  //SEG438 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (const byte*) mode_8bpppixelcell::PLANEA#0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@2#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG439 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@3#1] -- vbuz1=vbuc1 
+  //SEG439 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@1->mode_8bpppixelcell::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-  //SEG440 [247] phi from mode_8bpppixelcell::@5 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@3]
-  //SEG441 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@3#0] -- register_copy 
-  //SEG442 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte) mode_8bpppixelcell::ay#1 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@3#1] -- register_copy 
-  //SEG443 mode_8bpppixelcell::@3
-  b3:
-  //SEG444 [248] phi from mode_8bpppixelcell::@3 to mode_8bpppixelcell::@4 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@4]
-  //SEG445 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#3 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@4#0] -- register_copy 
-  //SEG446 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@4#1] -- vbuxx=vbuc1 
+  //SEG440 [247] phi from mode_8bpppixelcell::@4 to mode_8bpppixelcell::@2 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@2]
+  //SEG441 [247] phi (byte*) mode_8bpppixelcell::gfxa#3 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@2#0] -- register_copy 
+  //SEG442 [247] phi (byte) mode_8bpppixelcell::ay#4 = (byte) mode_8bpppixelcell::ay#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@2#1] -- register_copy 
+  //SEG443 mode_8bpppixelcell::@2
+  b2:
+  //SEG444 [248] phi from mode_8bpppixelcell::@2 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@2->mode_8bpppixelcell::@3]
+  //SEG445 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#3 [phi:mode_8bpppixelcell::@2->mode_8bpppixelcell::@3#0] -- register_copy 
+  //SEG446 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@2->mode_8bpppixelcell::@3#1] -- vbuxx=vbuc1 
     ldx #0
-  //SEG447 [248] phi from mode_8bpppixelcell::@4 to mode_8bpppixelcell::@4 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@4]
-  //SEG448 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@4#0] -- register_copy 
-  //SEG449 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte) mode_8bpppixelcell::ax#1 [phi:mode_8bpppixelcell::@4->mode_8bpppixelcell::@4#1] -- register_copy 
-  //SEG450 mode_8bpppixelcell::@4
-  b4:
+  //SEG447 [248] phi from mode_8bpppixelcell::@3 to mode_8bpppixelcell::@3 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@3]
+  //SEG448 [248] phi (byte*) mode_8bpppixelcell::gfxa#2 = (byte*) mode_8bpppixelcell::gfxa#1 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@3#0] -- register_copy 
+  //SEG449 [248] phi (byte) mode_8bpppixelcell::ax#2 = (byte) mode_8bpppixelcell::ax#1 [phi:mode_8bpppixelcell::@3->mode_8bpppixelcell::@3#1] -- register_copy 
+  //SEG450 mode_8bpppixelcell::@3
+  b3:
   //SEG451 [249] (byte~) mode_8bpppixelcell::$14 ← (byte) mode_8bpppixelcell::ay#4 & (byte/signed byte/word/signed word/dword/signed dword) $f -- vbuaa=vbuz1_band_vbuc1 
     lda #$f
     and ay
@@ -27678,58 +27812,58 @@ mode_8bpppixelcell: {
   !:
   //SEG457 [255] (byte) mode_8bpppixelcell::ax#1 ← ++ (byte) mode_8bpppixelcell::ax#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG458 [256] if((byte) mode_8bpppixelcell::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_8bpppixelcell::@4 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG458 [256] if((byte) mode_8bpppixelcell::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_8bpppixelcell::@3 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b4
-  //SEG459 mode_8bpppixelcell::@5
+    bne b3
+  //SEG459 mode_8bpppixelcell::@4
   //SEG460 [257] (byte) mode_8bpppixelcell::ay#1 ← ++ (byte) mode_8bpppixelcell::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG461 [258] if((byte) mode_8bpppixelcell::ay#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_8bpppixelcell::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG461 [258] if((byte) mode_8bpppixelcell::ay#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto mode_8bpppixelcell::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$19
     cmp ay
-    bne b3
-  //SEG462 mode_8bpppixelcell::@6
+    bne b2
+  //SEG462 mode_8bpppixelcell::@5
   //SEG463 [259] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_CHARROM#0 -- _deref_pbuc1=vbuc2 
     // 8bpp cells for Plane B (charset) - ROM charset with 256 colors
     lda #PROCPORT_RAM_CHARROM
     sta PROCPORT
-  //SEG464 [260] phi from mode_8bpppixelcell::@6 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7]
-  //SEG465 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#0] -- vbuz1=vbuc1 
+  //SEG464 [260] phi from mode_8bpppixelcell::@5 to mode_8bpppixelcell::@6 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6]
+  //SEG465 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#0] -- vbuz1=vbuc1 
     lda #0
     sta ch
-  //SEG466 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#1] -- vbuz1=vbuc1 
+  //SEG466 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#1] -- vbuz1=vbuc1 
     sta col
-  //SEG467 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (const byte*) mode_8bpppixelcell::PLANEB#0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#2] -- pbuz1=pbuc1 
+  //SEG467 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (const byte*) mode_8bpppixelcell::PLANEB#0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#2] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-  //SEG468 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (const byte*) mode_8bpppixelcell::CHARGEN#0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#3] -- pbuz1=pbuc1 
+  //SEG468 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (const byte*) mode_8bpppixelcell::CHARGEN#0 [phi:mode_8bpppixelcell::@5->mode_8bpppixelcell::@6#3] -- pbuz1=pbuc1 
     lda #<CHARGEN
     sta chargen
     lda #>CHARGEN
     sta chargen+1
-  //SEG469 [260] phi from mode_8bpppixelcell::@13 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7]
-  //SEG470 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte) mode_8bpppixelcell::ch#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#0] -- register_copy 
-  //SEG471 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#1] -- register_copy 
-  //SEG472 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#2] -- register_copy 
-  //SEG473 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@13->mode_8bpppixelcell::@7#3] -- register_copy 
-  //SEG474 mode_8bpppixelcell::@7
-  b7:
-  //SEG475 [261] phi from mode_8bpppixelcell::@7 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8]
-  //SEG476 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#0] -- vbuz1=vbuc1 
+  //SEG469 [260] phi from mode_8bpppixelcell::@12 to mode_8bpppixelcell::@6 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6]
+  //SEG470 [260] phi (byte) mode_8bpppixelcell::ch#8 = (byte) mode_8bpppixelcell::ch#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#0] -- register_copy 
+  //SEG471 [260] phi (byte) mode_8bpppixelcell::col#7 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#1] -- register_copy 
+  //SEG472 [260] phi (byte*) mode_8bpppixelcell::gfxb#7 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#2] -- register_copy 
+  //SEG473 [260] phi (byte*) mode_8bpppixelcell::chargen#4 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@6#3] -- register_copy 
+  //SEG474 mode_8bpppixelcell::@6
+  b6:
+  //SEG475 [261] phi from mode_8bpppixelcell::@6 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7]
+  //SEG476 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#0] -- vbuz1=vbuc1 
     lda #0
     sta cr
-  //SEG477 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#7 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#1] -- register_copy 
-  //SEG478 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#7 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#2] -- register_copy 
-  //SEG479 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#4 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#3] -- register_copy 
-  //SEG480 [261] phi from mode_8bpppixelcell::@12 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8]
-  //SEG481 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte) mode_8bpppixelcell::cr#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#0] -- register_copy 
-  //SEG482 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#1] -- register_copy 
-  //SEG483 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#2] -- register_copy 
-  //SEG484 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@12->mode_8bpppixelcell::@8#3] -- register_copy 
-  //SEG485 mode_8bpppixelcell::@8
-  b8:
+  //SEG477 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#1] -- register_copy 
+  //SEG478 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#7 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#2] -- register_copy 
+  //SEG479 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#4 [phi:mode_8bpppixelcell::@6->mode_8bpppixelcell::@7#3] -- register_copy 
+  //SEG480 [261] phi from mode_8bpppixelcell::@11 to mode_8bpppixelcell::@7 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7]
+  //SEG481 [261] phi (byte) mode_8bpppixelcell::cr#6 = (byte) mode_8bpppixelcell::cr#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#0] -- register_copy 
+  //SEG482 [261] phi (byte) mode_8bpppixelcell::col#5 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#1] -- register_copy 
+  //SEG483 [261] phi (byte*) mode_8bpppixelcell::gfxb#5 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#2] -- register_copy 
+  //SEG484 [261] phi (byte*) mode_8bpppixelcell::chargen#2 = (byte*) mode_8bpppixelcell::chargen#1 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@7#3] -- register_copy 
+  //SEG485 mode_8bpppixelcell::@7
+  b7:
   //SEG486 [262] (byte) mode_8bpppixelcell::bits#0 ← *((byte*) mode_8bpppixelcell::chargen#2) -- vbuz1=_deref_pbuz2 
     ldy #0
     lda (chargen),y
@@ -27739,37 +27873,37 @@ mode_8bpppixelcell: {
     bne !+
     inc chargen+1
   !:
-  //SEG488 [264] phi from mode_8bpppixelcell::@8 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9]
-  //SEG489 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#0] -- vbuxx=vbuc1 
+  //SEG488 [264] phi from mode_8bpppixelcell::@7 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8]
+  //SEG489 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG490 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#5 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#1] -- register_copy 
-  //SEG491 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#5 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#2] -- register_copy 
-  //SEG492 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#0 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#3] -- register_copy 
-  //SEG493 [264] phi from mode_8bpppixelcell::@10 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9]
-  //SEG494 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte) mode_8bpppixelcell::cp#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#0] -- register_copy 
-  //SEG495 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#1] -- register_copy 
-  //SEG496 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#2] -- register_copy 
-  //SEG497 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#1 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#3] -- register_copy 
-  //SEG498 mode_8bpppixelcell::@9
-  b9:
+  //SEG490 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#5 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#1] -- register_copy 
+  //SEG491 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#5 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#2] -- register_copy 
+  //SEG492 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#0 [phi:mode_8bpppixelcell::@7->mode_8bpppixelcell::@8#3] -- register_copy 
+  //SEG493 [264] phi from mode_8bpppixelcell::@9 to mode_8bpppixelcell::@8 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8]
+  //SEG494 [264] phi (byte) mode_8bpppixelcell::cp#2 = (byte) mode_8bpppixelcell::cp#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#0] -- register_copy 
+  //SEG495 [264] phi (byte) mode_8bpppixelcell::col#2 = (byte) mode_8bpppixelcell::col#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#1] -- register_copy 
+  //SEG496 [264] phi (byte*) mode_8bpppixelcell::gfxb#2 = (byte*) mode_8bpppixelcell::gfxb#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#2] -- register_copy 
+  //SEG497 [264] phi (byte) mode_8bpppixelcell::bits#2 = (byte) mode_8bpppixelcell::bits#1 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@8#3] -- register_copy 
+  //SEG498 mode_8bpppixelcell::@8
+  b8:
   //SEG499 [265] (byte~) mode_8bpppixelcell::$20 ← (byte) mode_8bpppixelcell::bits#2 & (byte/word/signed word/dword/signed dword) $80 -- vbuaa=vbuz1_band_vbuc1 
     lda #$80
     and bits
-  //SEG500 [266] if((byte~) mode_8bpppixelcell::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@10 -- vbuaa_eq_0_then_la1 
+  //SEG500 [266] if((byte~) mode_8bpppixelcell::$20==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@9 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b2
-  //SEG501 mode_8bpppixelcell::@11
+    beq b4
+  //SEG501 mode_8bpppixelcell::@10
   //SEG502 [267] (byte~) mode_8bpppixelcell::c#3 ← (byte) mode_8bpppixelcell::col#2 -- vbuaa=vbuz1 
     lda col
-  //SEG503 [268] phi from mode_8bpppixelcell::@11 to mode_8bpppixelcell::@10 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@10]
-  //SEG504 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte~) mode_8bpppixelcell::c#3 [phi:mode_8bpppixelcell::@11->mode_8bpppixelcell::@10#0] -- register_copy 
-    jmp b10
-  //SEG505 [268] phi from mode_8bpppixelcell::@9 to mode_8bpppixelcell::@10 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@10]
-  b2:
-  //SEG506 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@9->mode_8bpppixelcell::@10#0] -- vbuaa=vbuc1 
+  //SEG503 [268] phi from mode_8bpppixelcell::@10 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9]
+  //SEG504 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte~) mode_8bpppixelcell::c#3 [phi:mode_8bpppixelcell::@10->mode_8bpppixelcell::@9#0] -- register_copy 
+    jmp b9
+  //SEG505 [268] phi from mode_8bpppixelcell::@8 to mode_8bpppixelcell::@9 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9]
+  b4:
+  //SEG506 [268] phi (byte) mode_8bpppixelcell::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_8bpppixelcell::@8->mode_8bpppixelcell::@9#0] -- vbuaa=vbuc1 
     lda #0
-  //SEG507 mode_8bpppixelcell::@10
-  b10:
+  //SEG507 mode_8bpppixelcell::@9
+  b9:
   //SEG508 [269] *((byte*) mode_8bpppixelcell::gfxb#2) ← (byte) mode_8bpppixelcell::c#2 -- _deref_pbuz1=vbuaa 
     ldy #0
     sta (gfxb),y
@@ -27784,30 +27918,30 @@ mode_8bpppixelcell: {
     inc col
   //SEG512 [273] (byte) mode_8bpppixelcell::cp#1 ← ++ (byte) mode_8bpppixelcell::cp#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG513 [274] if((byte) mode_8bpppixelcell::cp#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@9 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG513 [274] if((byte) mode_8bpppixelcell::cp#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@8 -- vbuxx_neq_vbuc1_then_la1 
     cpx #8
-    bne b9
-  //SEG514 mode_8bpppixelcell::@12
+    bne b8
+  //SEG514 mode_8bpppixelcell::@11
   //SEG515 [275] (byte) mode_8bpppixelcell::cr#1 ← ++ (byte) mode_8bpppixelcell::cr#6 -- vbuz1=_inc_vbuz1 
     inc cr
-  //SEG516 [276] if((byte) mode_8bpppixelcell::cr#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG516 [276] if((byte) mode_8bpppixelcell::cr#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto mode_8bpppixelcell::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp cr
-    bne b8
-  //SEG517 mode_8bpppixelcell::@13
+    bne b7
+  //SEG517 mode_8bpppixelcell::@12
   //SEG518 [277] (byte) mode_8bpppixelcell::ch#1 ← ++ (byte) mode_8bpppixelcell::ch#8 -- vbuz1=_inc_vbuz1 
     inc ch
-  //SEG519 [278] if((byte) mode_8bpppixelcell::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@7 -- vbuz1_neq_0_then_la1 
+  //SEG519 [278] if((byte) mode_8bpppixelcell::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_8bpppixelcell::@6 -- vbuz1_neq_0_then_la1 
     lda ch
     cmp #0
-    bne b7
-  //SEG520 mode_8bpppixelcell::@14
+    bne b6
+  //SEG520 mode_8bpppixelcell::@13
   //SEG521 [279] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0 -- _deref_pbuc1=vbuc2 
     lda #PROCPORT_RAM_IO
     sta PROCPORT
   //SEG522 [280] call mode_ctrl 
-  //SEG523 [155] phi from mode_8bpppixelcell::@14 to mode_ctrl [phi:mode_8bpppixelcell::@14->mode_ctrl]
-  //SEG524 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0 [phi:mode_8bpppixelcell::@14->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG523 [155] phi from mode_8bpppixelcell::@13 to mode_ctrl [phi:mode_8bpppixelcell::@13->mode_ctrl]
+  //SEG524 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0|(const byte) DTV_CHUNKY#0 [phi:mode_8bpppixelcell::@13->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR|DTV_CHUNKY
     sta dtv_control
     jsr mode_ctrl
@@ -27955,29 +28089,29 @@ mode_sixsfred: {
     lda #$19
     cmp cy
     bne b3
-  //SEG578 [314] phi from mode_sixsfred::@5 to mode_sixsfred::@7 [phi:mode_sixsfred::@5->mode_sixsfred::@7]
-  //SEG579 [314] phi (byte*) mode_sixsfred::gfxa#3 = (const byte*) mode_sixsfred::PLANEA#0 [phi:mode_sixsfred::@5->mode_sixsfred::@7#0] -- pbuz1=pbuc1 
+  //SEG578 [314] phi from mode_sixsfred::@5 to mode_sixsfred::@6 [phi:mode_sixsfred::@5->mode_sixsfred::@6]
+  //SEG579 [314] phi (byte*) mode_sixsfred::gfxa#3 = (const byte*) mode_sixsfred::PLANEA#0 [phi:mode_sixsfred::@5->mode_sixsfred::@6#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG580 [314] phi (byte) mode_sixsfred::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@5->mode_sixsfred::@7#1] -- vbuz1=vbuc1 
+  //SEG580 [314] phi (byte) mode_sixsfred::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@5->mode_sixsfred::@6#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-  //SEG581 [314] phi from mode_sixsfred::@9 to mode_sixsfred::@7 [phi:mode_sixsfred::@9->mode_sixsfred::@7]
-  //SEG582 [314] phi (byte*) mode_sixsfred::gfxa#3 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@9->mode_sixsfred::@7#0] -- register_copy 
-  //SEG583 [314] phi (byte) mode_sixsfred::ay#4 = (byte) mode_sixsfred::ay#1 [phi:mode_sixsfred::@9->mode_sixsfred::@7#1] -- register_copy 
-  //SEG584 mode_sixsfred::@7
-  b7:
-  //SEG585 [315] phi from mode_sixsfred::@7 to mode_sixsfred::@8 [phi:mode_sixsfred::@7->mode_sixsfred::@8]
-  //SEG586 [315] phi (byte) mode_sixsfred::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@7->mode_sixsfred::@8#0] -- vbuxx=vbuc1 
+  //SEG581 [314] phi from mode_sixsfred::@8 to mode_sixsfred::@6 [phi:mode_sixsfred::@8->mode_sixsfred::@6]
+  //SEG582 [314] phi (byte*) mode_sixsfred::gfxa#3 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@8->mode_sixsfred::@6#0] -- register_copy 
+  //SEG583 [314] phi (byte) mode_sixsfred::ay#4 = (byte) mode_sixsfred::ay#1 [phi:mode_sixsfred::@8->mode_sixsfred::@6#1] -- register_copy 
+  //SEG584 mode_sixsfred::@6
+  b6:
+  //SEG585 [315] phi from mode_sixsfred::@6 to mode_sixsfred::@7 [phi:mode_sixsfred::@6->mode_sixsfred::@7]
+  //SEG586 [315] phi (byte) mode_sixsfred::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@6->mode_sixsfred::@7#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG587 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#3 [phi:mode_sixsfred::@7->mode_sixsfred::@8#1] -- register_copy 
-  //SEG588 [315] phi from mode_sixsfred::@8 to mode_sixsfred::@8 [phi:mode_sixsfred::@8->mode_sixsfred::@8]
-  //SEG589 [315] phi (byte) mode_sixsfred::ax#2 = (byte) mode_sixsfred::ax#1 [phi:mode_sixsfred::@8->mode_sixsfred::@8#0] -- register_copy 
-  //SEG590 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@8->mode_sixsfred::@8#1] -- register_copy 
-  //SEG591 mode_sixsfred::@8
-  b8:
+  //SEG587 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#3 [phi:mode_sixsfred::@6->mode_sixsfred::@7#1] -- register_copy 
+  //SEG588 [315] phi from mode_sixsfred::@7 to mode_sixsfred::@7 [phi:mode_sixsfred::@7->mode_sixsfred::@7]
+  //SEG589 [315] phi (byte) mode_sixsfred::ax#2 = (byte) mode_sixsfred::ax#1 [phi:mode_sixsfred::@7->mode_sixsfred::@7#0] -- register_copy 
+  //SEG590 [315] phi (byte*) mode_sixsfred::gfxa#2 = (byte*) mode_sixsfred::gfxa#1 [phi:mode_sixsfred::@7->mode_sixsfred::@7#1] -- register_copy 
+  //SEG591 mode_sixsfred::@7
+  b7:
   //SEG592 [316] (byte~) mode_sixsfred::$21 ← (byte) mode_sixsfred::ay#4 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_ror_1 
     lda ay
     lsr
@@ -27995,39 +28129,39 @@ mode_sixsfred: {
   !:
   //SEG596 [320] (byte) mode_sixsfred::ax#1 ← ++ (byte) mode_sixsfred::ax#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG597 [321] if((byte) mode_sixsfred::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG597 [321] if((byte) mode_sixsfred::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@7 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b8
-  //SEG598 mode_sixsfred::@9
+    bne b7
+  //SEG598 mode_sixsfred::@8
   //SEG599 [322] (byte) mode_sixsfred::ay#1 ← ++ (byte) mode_sixsfred::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG600 [323] if((byte) mode_sixsfred::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG600 [323] if((byte) mode_sixsfred::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
-    bne b7
-  //SEG601 [324] phi from mode_sixsfred::@9 to mode_sixsfred::@11 [phi:mode_sixsfred::@9->mode_sixsfred::@11]
-  //SEG602 [324] phi (byte) mode_sixsfred::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@9->mode_sixsfred::@11#0] -- vbuz1=vbuc1 
+    bne b6
+  //SEG601 [324] phi from mode_sixsfred::@8 to mode_sixsfred::@9 [phi:mode_sixsfred::@8->mode_sixsfred::@9]
+  //SEG602 [324] phi (byte) mode_sixsfred::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@8->mode_sixsfred::@9#0] -- vbuz1=vbuc1 
     lda #0
     sta by
-  //SEG603 [324] phi (byte*) mode_sixsfred::gfxb#3 = (const byte*) mode_sixsfred::PLANEB#0 [phi:mode_sixsfred::@9->mode_sixsfred::@11#1] -- pbuz1=pbuc1 
+  //SEG603 [324] phi (byte*) mode_sixsfred::gfxb#3 = (const byte*) mode_sixsfred::PLANEB#0 [phi:mode_sixsfred::@8->mode_sixsfred::@9#1] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-  //SEG604 [324] phi from mode_sixsfred::@13 to mode_sixsfred::@11 [phi:mode_sixsfred::@13->mode_sixsfred::@11]
-  //SEG605 [324] phi (byte) mode_sixsfred::by#4 = (byte) mode_sixsfred::by#1 [phi:mode_sixsfred::@13->mode_sixsfred::@11#0] -- register_copy 
-  //SEG606 [324] phi (byte*) mode_sixsfred::gfxb#3 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@13->mode_sixsfred::@11#1] -- register_copy 
-  //SEG607 mode_sixsfred::@11
-  b11:
-  //SEG608 [325] phi from mode_sixsfred::@11 to mode_sixsfred::@12 [phi:mode_sixsfred::@11->mode_sixsfred::@12]
-  //SEG609 [325] phi (byte) mode_sixsfred::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@11->mode_sixsfred::@12#0] -- vbuxx=vbuc1 
+  //SEG604 [324] phi from mode_sixsfred::@11 to mode_sixsfred::@9 [phi:mode_sixsfred::@11->mode_sixsfred::@9]
+  //SEG605 [324] phi (byte) mode_sixsfred::by#4 = (byte) mode_sixsfred::by#1 [phi:mode_sixsfred::@11->mode_sixsfred::@9#0] -- register_copy 
+  //SEG606 [324] phi (byte*) mode_sixsfred::gfxb#3 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@11->mode_sixsfred::@9#1] -- register_copy 
+  //SEG607 mode_sixsfred::@9
+  b9:
+  //SEG608 [325] phi from mode_sixsfred::@9 to mode_sixsfred::@10 [phi:mode_sixsfred::@9->mode_sixsfred::@10]
+  //SEG609 [325] phi (byte) mode_sixsfred::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred::@9->mode_sixsfred::@10#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG610 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#3 [phi:mode_sixsfred::@11->mode_sixsfred::@12#1] -- register_copy 
-  //SEG611 [325] phi from mode_sixsfred::@12 to mode_sixsfred::@12 [phi:mode_sixsfred::@12->mode_sixsfred::@12]
-  //SEG612 [325] phi (byte) mode_sixsfred::bx#2 = (byte) mode_sixsfred::bx#1 [phi:mode_sixsfred::@12->mode_sixsfred::@12#0] -- register_copy 
-  //SEG613 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@12->mode_sixsfred::@12#1] -- register_copy 
-  //SEG614 mode_sixsfred::@12
-  b12:
+  //SEG610 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#3 [phi:mode_sixsfred::@9->mode_sixsfred::@10#1] -- register_copy 
+  //SEG611 [325] phi from mode_sixsfred::@10 to mode_sixsfred::@10 [phi:mode_sixsfred::@10->mode_sixsfred::@10]
+  //SEG612 [325] phi (byte) mode_sixsfred::bx#2 = (byte) mode_sixsfred::bx#1 [phi:mode_sixsfred::@10->mode_sixsfred::@10#0] -- register_copy 
+  //SEG613 [325] phi (byte*) mode_sixsfred::gfxb#2 = (byte*) mode_sixsfred::gfxb#1 [phi:mode_sixsfred::@10->mode_sixsfred::@10#1] -- register_copy 
+  //SEG614 mode_sixsfred::@10
+  b10:
   //SEG615 [326] *((byte*) mode_sixsfred::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $1b -- _deref_pbuz1=vbuc1 
     lda #$1b
     ldy #0
@@ -28039,21 +28173,21 @@ mode_sixsfred: {
   !:
   //SEG617 [328] (byte) mode_sixsfred::bx#1 ← ++ (byte) mode_sixsfred::bx#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG618 [329] if((byte) mode_sixsfred::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@12 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG618 [329] if((byte) mode_sixsfred::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred::@10 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b12
-  //SEG619 mode_sixsfred::@13
+    bne b10
+  //SEG619 mode_sixsfred::@11
   //SEG620 [330] (byte) mode_sixsfred::by#1 ← ++ (byte) mode_sixsfred::by#4 -- vbuz1=_inc_vbuz1 
     inc by
-  //SEG621 [331] if((byte) mode_sixsfred::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG621 [331] if((byte) mode_sixsfred::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp by
-    bne b11
-  //SEG622 [332] phi from mode_sixsfred::@13 to mode_sixsfred::@14 [phi:mode_sixsfred::@13->mode_sixsfred::@14]
-  //SEG623 mode_sixsfred::@14
+    bne b9
+  //SEG622 [332] phi from mode_sixsfred::@11 to mode_sixsfred::@12 [phi:mode_sixsfred::@11->mode_sixsfred::@12]
+  //SEG623 mode_sixsfred::@12
   //SEG624 [333] call mode_ctrl 
-  //SEG625 [155] phi from mode_sixsfred::@14 to mode_ctrl [phi:mode_sixsfred::@14->mode_ctrl]
-  //SEG626 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_sixsfred::@14->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG625 [155] phi from mode_sixsfred::@12 to mode_ctrl [phi:mode_sixsfred::@12->mode_ctrl]
+  //SEG626 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_sixsfred::@12->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
@@ -28221,36 +28355,36 @@ mode_twoplanebitmap: {
     lda #$19
     cmp cy
     bne b3
-  //SEG684 [371] phi from mode_twoplanebitmap::@5 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@7]
-  //SEG685 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (const byte*) mode_twoplanebitmap::PLANEA#0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@7#0] -- pbuz1=pbuc1 
+  //SEG684 [371] phi from mode_twoplanebitmap::@5 to mode_twoplanebitmap::@6 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@6]
+  //SEG685 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (const byte*) mode_twoplanebitmap::PLANEA#0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@6#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG686 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@7#1] -- vbuz1=vbuc1 
+  //SEG686 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@5->mode_twoplanebitmap::@6#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-  //SEG687 [371] phi from mode_twoplanebitmap::@13 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@7]
-  //SEG688 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@7#0] -- register_copy 
-  //SEG689 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte) mode_twoplanebitmap::ay#1 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@7#1] -- register_copy 
-  //SEG690 mode_twoplanebitmap::@7
-  b7:
-  //SEG691 [372] phi from mode_twoplanebitmap::@7 to mode_twoplanebitmap::@8 [phi:mode_twoplanebitmap::@7->mode_twoplanebitmap::@8]
-  //SEG692 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@7->mode_twoplanebitmap::@8#0] -- vbuxx=vbuc1 
+  //SEG687 [371] phi from mode_twoplanebitmap::@11 to mode_twoplanebitmap::@6 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@6]
+  //SEG688 [371] phi (byte*) mode_twoplanebitmap::gfxa#7 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@6#0] -- register_copy 
+  //SEG689 [371] phi (byte) mode_twoplanebitmap::ay#5 = (byte) mode_twoplanebitmap::ay#1 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@6#1] -- register_copy 
+  //SEG690 mode_twoplanebitmap::@6
+  b6:
+  //SEG691 [372] phi from mode_twoplanebitmap::@6 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@6->mode_twoplanebitmap::@7]
+  //SEG692 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@6->mode_twoplanebitmap::@7#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG693 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#7 [phi:mode_twoplanebitmap::@7->mode_twoplanebitmap::@8#1] -- register_copy 
-  //SEG694 [372] phi from mode_twoplanebitmap::@10 to mode_twoplanebitmap::@8 [phi:mode_twoplanebitmap::@10->mode_twoplanebitmap::@8]
-  //SEG695 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte) mode_twoplanebitmap::ax#1 [phi:mode_twoplanebitmap::@10->mode_twoplanebitmap::@8#0] -- register_copy 
-  //SEG696 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@10->mode_twoplanebitmap::@8#1] -- register_copy 
-  //SEG697 mode_twoplanebitmap::@8
-  b8:
+  //SEG693 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#7 [phi:mode_twoplanebitmap::@6->mode_twoplanebitmap::@7#1] -- register_copy 
+  //SEG694 [372] phi from mode_twoplanebitmap::@9 to mode_twoplanebitmap::@7 [phi:mode_twoplanebitmap::@9->mode_twoplanebitmap::@7]
+  //SEG695 [372] phi (byte) mode_twoplanebitmap::ax#2 = (byte) mode_twoplanebitmap::ax#1 [phi:mode_twoplanebitmap::@9->mode_twoplanebitmap::@7#0] -- register_copy 
+  //SEG696 [372] phi (byte*) mode_twoplanebitmap::gfxa#3 = (byte*) mode_twoplanebitmap::gfxa#6 [phi:mode_twoplanebitmap::@9->mode_twoplanebitmap::@7#1] -- register_copy 
+  //SEG697 mode_twoplanebitmap::@7
+  b7:
   //SEG698 [373] (byte~) mode_twoplanebitmap::$22 ← (byte) mode_twoplanebitmap::ay#5 & (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuaa=vbuz1_band_vbuc1 
     lda #4
     and ay
-  //SEG699 [374] if((byte~) mode_twoplanebitmap::$22==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_twoplanebitmap::@9 -- vbuaa_eq_0_then_la1 
+  //SEG699 [374] if((byte~) mode_twoplanebitmap::$22==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode_twoplanebitmap::@8 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b9
-  //SEG700 mode_twoplanebitmap::@11
+    beq b8
+  //SEG700 mode_twoplanebitmap::@10
   //SEG701 [375] *((byte*) mode_twoplanebitmap::gfxa#3) ← (byte/word/signed word/dword/signed dword) $ff -- _deref_pbuz1=vbuc1 
     lda #$ff
     ldy #0
@@ -28260,45 +28394,45 @@ mode_twoplanebitmap: {
     bne !+
     inc gfxa+1
   !:
-  //SEG703 [377] phi from mode_twoplanebitmap::@11 mode_twoplanebitmap::@9 to mode_twoplanebitmap::@10 [phi:mode_twoplanebitmap::@11/mode_twoplanebitmap::@9->mode_twoplanebitmap::@10]
-  //SEG704 [377] phi (byte*) mode_twoplanebitmap::gfxa#6 = (byte*) mode_twoplanebitmap::gfxa#2 [phi:mode_twoplanebitmap::@11/mode_twoplanebitmap::@9->mode_twoplanebitmap::@10#0] -- register_copy 
-  //SEG705 mode_twoplanebitmap::@10
-  b10:
+  //SEG703 [377] phi from mode_twoplanebitmap::@10 mode_twoplanebitmap::@8 to mode_twoplanebitmap::@9 [phi:mode_twoplanebitmap::@10/mode_twoplanebitmap::@8->mode_twoplanebitmap::@9]
+  //SEG704 [377] phi (byte*) mode_twoplanebitmap::gfxa#6 = (byte*) mode_twoplanebitmap::gfxa#2 [phi:mode_twoplanebitmap::@10/mode_twoplanebitmap::@8->mode_twoplanebitmap::@9#0] -- register_copy 
+  //SEG705 mode_twoplanebitmap::@9
+  b9:
   //SEG706 [378] (byte) mode_twoplanebitmap::ax#1 ← ++ (byte) mode_twoplanebitmap::ax#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG707 [379] if((byte) mode_twoplanebitmap::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG707 [379] if((byte) mode_twoplanebitmap::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@7 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b8
-  //SEG708 mode_twoplanebitmap::@13
+    bne b7
+  //SEG708 mode_twoplanebitmap::@11
   //SEG709 [380] (byte) mode_twoplanebitmap::ay#1 ← ++ (byte) mode_twoplanebitmap::ay#5 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG710 [381] if((byte) mode_twoplanebitmap::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG710 [381] if((byte) mode_twoplanebitmap::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
-    bne b7
-  //SEG711 [382] phi from mode_twoplanebitmap::@13 to mode_twoplanebitmap::@15 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@15]
-  //SEG712 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@15#0] -- vbuz1=vbuc1 
+    bne b6
+  //SEG711 [382] phi from mode_twoplanebitmap::@11 to mode_twoplanebitmap::@12 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@12]
+  //SEG712 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@12#0] -- vbuz1=vbuc1 
     lda #0
     sta by
-  //SEG713 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (const byte*) mode_twoplanebitmap::PLANEB#0 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@15#1] -- pbuz1=pbuc1 
+  //SEG713 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (const byte*) mode_twoplanebitmap::PLANEB#0 [phi:mode_twoplanebitmap::@11->mode_twoplanebitmap::@12#1] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-  //SEG714 [382] phi from mode_twoplanebitmap::@17 to mode_twoplanebitmap::@15 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@15]
-  //SEG715 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte) mode_twoplanebitmap::by#1 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@15#0] -- register_copy 
-  //SEG716 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@15#1] -- register_copy 
-  //SEG717 mode_twoplanebitmap::@15
-  b15:
-  //SEG718 [383] phi from mode_twoplanebitmap::@15 to mode_twoplanebitmap::@16 [phi:mode_twoplanebitmap::@15->mode_twoplanebitmap::@16]
-  //SEG719 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@15->mode_twoplanebitmap::@16#0] -- vbuxx=vbuc1 
+  //SEG714 [382] phi from mode_twoplanebitmap::@14 to mode_twoplanebitmap::@12 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@12]
+  //SEG715 [382] phi (byte) mode_twoplanebitmap::by#4 = (byte) mode_twoplanebitmap::by#1 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@12#0] -- register_copy 
+  //SEG716 [382] phi (byte*) mode_twoplanebitmap::gfxb#3 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@12#1] -- register_copy 
+  //SEG717 mode_twoplanebitmap::@12
+  b12:
+  //SEG718 [383] phi from mode_twoplanebitmap::@12 to mode_twoplanebitmap::@13 [phi:mode_twoplanebitmap::@12->mode_twoplanebitmap::@13]
+  //SEG719 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_twoplanebitmap::@12->mode_twoplanebitmap::@13#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG720 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#3 [phi:mode_twoplanebitmap::@15->mode_twoplanebitmap::@16#1] -- register_copy 
-  //SEG721 [383] phi from mode_twoplanebitmap::@16 to mode_twoplanebitmap::@16 [phi:mode_twoplanebitmap::@16->mode_twoplanebitmap::@16]
-  //SEG722 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte) mode_twoplanebitmap::bx#1 [phi:mode_twoplanebitmap::@16->mode_twoplanebitmap::@16#0] -- register_copy 
-  //SEG723 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@16->mode_twoplanebitmap::@16#1] -- register_copy 
-  //SEG724 mode_twoplanebitmap::@16
-  b16:
+  //SEG720 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#3 [phi:mode_twoplanebitmap::@12->mode_twoplanebitmap::@13#1] -- register_copy 
+  //SEG721 [383] phi from mode_twoplanebitmap::@13 to mode_twoplanebitmap::@13 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@13]
+  //SEG722 [383] phi (byte) mode_twoplanebitmap::bx#2 = (byte) mode_twoplanebitmap::bx#1 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@13#0] -- register_copy 
+  //SEG723 [383] phi (byte*) mode_twoplanebitmap::gfxb#2 = (byte*) mode_twoplanebitmap::gfxb#1 [phi:mode_twoplanebitmap::@13->mode_twoplanebitmap::@13#1] -- register_copy 
+  //SEG724 mode_twoplanebitmap::@13
+  b13:
   //SEG725 [384] *((byte*) mode_twoplanebitmap::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $f -- _deref_pbuz1=vbuc1 
     lda #$f
     ldy #0
@@ -28310,29 +28444,29 @@ mode_twoplanebitmap: {
   !:
   //SEG727 [386] (byte) mode_twoplanebitmap::bx#1 ← ++ (byte) mode_twoplanebitmap::bx#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG728 [387] if((byte) mode_twoplanebitmap::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@16 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG728 [387] if((byte) mode_twoplanebitmap::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_twoplanebitmap::@13 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b16
-  //SEG729 mode_twoplanebitmap::@17
+    bne b13
+  //SEG729 mode_twoplanebitmap::@14
   //SEG730 [388] (byte) mode_twoplanebitmap::by#1 ← ++ (byte) mode_twoplanebitmap::by#4 -- vbuz1=_inc_vbuz1 
     inc by
-  //SEG731 [389] if((byte) mode_twoplanebitmap::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@15 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG731 [389] if((byte) mode_twoplanebitmap::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_twoplanebitmap::@12 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp by
-    bne b15
-  //SEG732 [390] phi from mode_twoplanebitmap::@17 to mode_twoplanebitmap::@18 [phi:mode_twoplanebitmap::@17->mode_twoplanebitmap::@18]
-  //SEG733 mode_twoplanebitmap::@18
+    bne b12
+  //SEG732 [390] phi from mode_twoplanebitmap::@14 to mode_twoplanebitmap::@15 [phi:mode_twoplanebitmap::@14->mode_twoplanebitmap::@15]
+  //SEG733 mode_twoplanebitmap::@15
   //SEG734 [391] call mode_ctrl 
-  //SEG735 [155] phi from mode_twoplanebitmap::@18 to mode_ctrl [phi:mode_twoplanebitmap::@18->mode_ctrl]
-  //SEG736 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_twoplanebitmap::@18->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG735 [155] phi from mode_twoplanebitmap::@15 to mode_ctrl [phi:mode_twoplanebitmap::@15->mode_ctrl]
+  //SEG736 [155] phi (byte) dtv_control#145 = (const byte) DTV_HIGHCOLOR#0|(const byte) DTV_LINEAR#0 [phi:mode_twoplanebitmap::@15->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_HIGHCOLOR|DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
   //SEG737 mode_twoplanebitmap::@return
   //SEG738 [392] return 
     rts
-  //SEG739 mode_twoplanebitmap::@9
-  b9:
+  //SEG739 mode_twoplanebitmap::@8
+  b8:
   //SEG740 [393] *((byte*) mode_twoplanebitmap::gfxa#3) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuz1=vbuc1 
     lda #0
     tay
@@ -28342,7 +28476,7 @@ mode_twoplanebitmap: {
     bne !+
     inc gfxa+1
   !:
-    jmp b10
+    jmp b9
 }
 //SEG742 mode_sixsfred2
 // Sixs Fred Mode 2 - 8bpp Packed Bitmap - Generated from the two DTV linear graphics plane counters
@@ -28493,29 +28627,29 @@ mode_sixsfred2: {
     lda #$19
     cmp cy
     bne b3
-  //SEG795 [429] phi from mode_sixsfred2::@5 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@5->mode_sixsfred2::@7]
-  //SEG796 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (const byte*) mode_sixsfred2::PLANEA#0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@7#0] -- pbuz1=pbuc1 
+  //SEG795 [429] phi from mode_sixsfred2::@5 to mode_sixsfred2::@6 [phi:mode_sixsfred2::@5->mode_sixsfred2::@6]
+  //SEG796 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (const byte*) mode_sixsfred2::PLANEA#0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@6#0] -- pbuz1=pbuc1 
     lda #<PLANEA
     sta gfxa
     lda #>PLANEA
     sta gfxa+1
-  //SEG797 [429] phi (byte) mode_sixsfred2::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@7#1] -- vbuz1=vbuc1 
+  //SEG797 [429] phi (byte) mode_sixsfred2::ay#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@5->mode_sixsfred2::@6#1] -- vbuz1=vbuc1 
     lda #0
     sta ay
-  //SEG798 [429] phi from mode_sixsfred2::@9 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@9->mode_sixsfred2::@7]
-  //SEG799 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@9->mode_sixsfred2::@7#0] -- register_copy 
-  //SEG800 [429] phi (byte) mode_sixsfred2::ay#4 = (byte) mode_sixsfred2::ay#1 [phi:mode_sixsfred2::@9->mode_sixsfred2::@7#1] -- register_copy 
-  //SEG801 mode_sixsfred2::@7
-  b7:
-  //SEG802 [430] phi from mode_sixsfred2::@7 to mode_sixsfred2::@8 [phi:mode_sixsfred2::@7->mode_sixsfred2::@8]
-  //SEG803 [430] phi (byte) mode_sixsfred2::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@7->mode_sixsfred2::@8#0] -- vbuxx=vbuc1 
+  //SEG798 [429] phi from mode_sixsfred2::@8 to mode_sixsfred2::@6 [phi:mode_sixsfred2::@8->mode_sixsfred2::@6]
+  //SEG799 [429] phi (byte*) mode_sixsfred2::gfxa#3 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@6#0] -- register_copy 
+  //SEG800 [429] phi (byte) mode_sixsfred2::ay#4 = (byte) mode_sixsfred2::ay#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@6#1] -- register_copy 
+  //SEG801 mode_sixsfred2::@6
+  b6:
+  //SEG802 [430] phi from mode_sixsfred2::@6 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@6->mode_sixsfred2::@7]
+  //SEG803 [430] phi (byte) mode_sixsfred2::ax#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@6->mode_sixsfred2::@7#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG804 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#3 [phi:mode_sixsfred2::@7->mode_sixsfred2::@8#1] -- register_copy 
-  //SEG805 [430] phi from mode_sixsfred2::@8 to mode_sixsfred2::@8 [phi:mode_sixsfred2::@8->mode_sixsfred2::@8]
-  //SEG806 [430] phi (byte) mode_sixsfred2::ax#2 = (byte) mode_sixsfred2::ax#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@8#0] -- register_copy 
-  //SEG807 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@8->mode_sixsfred2::@8#1] -- register_copy 
-  //SEG808 mode_sixsfred2::@8
-  b8:
+  //SEG804 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#3 [phi:mode_sixsfred2::@6->mode_sixsfred2::@7#1] -- register_copy 
+  //SEG805 [430] phi from mode_sixsfred2::@7 to mode_sixsfred2::@7 [phi:mode_sixsfred2::@7->mode_sixsfred2::@7]
+  //SEG806 [430] phi (byte) mode_sixsfred2::ax#2 = (byte) mode_sixsfred2::ax#1 [phi:mode_sixsfred2::@7->mode_sixsfred2::@7#0] -- register_copy 
+  //SEG807 [430] phi (byte*) mode_sixsfred2::gfxa#2 = (byte*) mode_sixsfred2::gfxa#1 [phi:mode_sixsfred2::@7->mode_sixsfred2::@7#1] -- register_copy 
+  //SEG808 mode_sixsfred2::@7
+  b7:
   //SEG809 [431] (byte~) mode_sixsfred2::$21 ← (byte) mode_sixsfred2::ay#4 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_ror_1 
     lda ay
     lsr
@@ -28533,39 +28667,39 @@ mode_sixsfred2: {
   !:
   //SEG813 [435] (byte) mode_sixsfred2::ax#1 ← ++ (byte) mode_sixsfred2::ax#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG814 [436] if((byte) mode_sixsfred2::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG814 [436] if((byte) mode_sixsfred2::ax#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@7 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b8
-  //SEG815 mode_sixsfred2::@9
+    bne b7
+  //SEG815 mode_sixsfred2::@8
   //SEG816 [437] (byte) mode_sixsfred2::ay#1 ← ++ (byte) mode_sixsfred2::ay#4 -- vbuz1=_inc_vbuz1 
     inc ay
-  //SEG817 [438] if((byte) mode_sixsfred2::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG817 [438] if((byte) mode_sixsfred2::ay#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp ay
-    bne b7
-  //SEG818 [439] phi from mode_sixsfred2::@9 to mode_sixsfred2::@11 [phi:mode_sixsfred2::@9->mode_sixsfred2::@11]
-  //SEG819 [439] phi (byte) mode_sixsfred2::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@9->mode_sixsfred2::@11#0] -- vbuz1=vbuc1 
+    bne b6
+  //SEG818 [439] phi from mode_sixsfred2::@8 to mode_sixsfred2::@9 [phi:mode_sixsfred2::@8->mode_sixsfred2::@9]
+  //SEG819 [439] phi (byte) mode_sixsfred2::by#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@8->mode_sixsfred2::@9#0] -- vbuz1=vbuc1 
     lda #0
     sta by
-  //SEG820 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (const byte*) mode_sixsfred2::PLANEB#0 [phi:mode_sixsfred2::@9->mode_sixsfred2::@11#1] -- pbuz1=pbuc1 
+  //SEG820 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (const byte*) mode_sixsfred2::PLANEB#0 [phi:mode_sixsfred2::@8->mode_sixsfred2::@9#1] -- pbuz1=pbuc1 
     lda #<PLANEB
     sta gfxb
     lda #>PLANEB
     sta gfxb+1
-  //SEG821 [439] phi from mode_sixsfred2::@13 to mode_sixsfred2::@11 [phi:mode_sixsfred2::@13->mode_sixsfred2::@11]
-  //SEG822 [439] phi (byte) mode_sixsfred2::by#4 = (byte) mode_sixsfred2::by#1 [phi:mode_sixsfred2::@13->mode_sixsfred2::@11#0] -- register_copy 
-  //SEG823 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@13->mode_sixsfred2::@11#1] -- register_copy 
-  //SEG824 mode_sixsfred2::@11
-  b11:
-  //SEG825 [440] phi from mode_sixsfred2::@11 to mode_sixsfred2::@12 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12]
-  //SEG826 [440] phi (byte) mode_sixsfred2::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12#0] -- vbuxx=vbuc1 
+  //SEG821 [439] phi from mode_sixsfred2::@11 to mode_sixsfred2::@9 [phi:mode_sixsfred2::@11->mode_sixsfred2::@9]
+  //SEG822 [439] phi (byte) mode_sixsfred2::by#4 = (byte) mode_sixsfred2::by#1 [phi:mode_sixsfred2::@11->mode_sixsfred2::@9#0] -- register_copy 
+  //SEG823 [439] phi (byte*) mode_sixsfred2::gfxb#3 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@11->mode_sixsfred2::@9#1] -- register_copy 
+  //SEG824 mode_sixsfred2::@9
+  b9:
+  //SEG825 [440] phi from mode_sixsfred2::@9 to mode_sixsfred2::@10 [phi:mode_sixsfred2::@9->mode_sixsfred2::@10]
+  //SEG826 [440] phi (byte) mode_sixsfred2::bx#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_sixsfred2::@9->mode_sixsfred2::@10#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG827 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#3 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12#1] -- register_copy 
-  //SEG828 [440] phi from mode_sixsfred2::@12 to mode_sixsfred2::@12 [phi:mode_sixsfred2::@12->mode_sixsfred2::@12]
-  //SEG829 [440] phi (byte) mode_sixsfred2::bx#2 = (byte) mode_sixsfred2::bx#1 [phi:mode_sixsfred2::@12->mode_sixsfred2::@12#0] -- register_copy 
-  //SEG830 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@12->mode_sixsfred2::@12#1] -- register_copy 
-  //SEG831 mode_sixsfred2::@12
-  b12:
+  //SEG827 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#3 [phi:mode_sixsfred2::@9->mode_sixsfred2::@10#1] -- register_copy 
+  //SEG828 [440] phi from mode_sixsfred2::@10 to mode_sixsfred2::@10 [phi:mode_sixsfred2::@10->mode_sixsfred2::@10]
+  //SEG829 [440] phi (byte) mode_sixsfred2::bx#2 = (byte) mode_sixsfred2::bx#1 [phi:mode_sixsfred2::@10->mode_sixsfred2::@10#0] -- register_copy 
+  //SEG830 [440] phi (byte*) mode_sixsfred2::gfxb#2 = (byte*) mode_sixsfred2::gfxb#1 [phi:mode_sixsfred2::@10->mode_sixsfred2::@10#1] -- register_copy 
+  //SEG831 mode_sixsfred2::@10
+  b10:
   //SEG832 [441] *((byte*) mode_sixsfred2::gfxb#2) ← (byte/signed byte/word/signed word/dword/signed dword) $1b -- _deref_pbuz1=vbuc1 
     lda #$1b
     ldy #0
@@ -28577,21 +28711,21 @@ mode_sixsfred2: {
   !:
   //SEG834 [443] (byte) mode_sixsfred2::bx#1 ← ++ (byte) mode_sixsfred2::bx#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG835 [444] if((byte) mode_sixsfred2::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@12 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG835 [444] if((byte) mode_sixsfred2::bx#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto mode_sixsfred2::@10 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b12
-  //SEG836 mode_sixsfred2::@13
+    bne b10
+  //SEG836 mode_sixsfred2::@11
   //SEG837 [445] (byte) mode_sixsfred2::by#1 ← ++ (byte) mode_sixsfred2::by#4 -- vbuz1=_inc_vbuz1 
     inc by
-  //SEG838 [446] if((byte) mode_sixsfred2::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG838 [446] if((byte) mode_sixsfred2::by#1!=(byte/word/signed word/dword/signed dword) $c8) goto mode_sixsfred2::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c8
     cmp by
-    bne b11
-  //SEG839 [447] phi from mode_sixsfred2::@13 to mode_sixsfred2::@14 [phi:mode_sixsfred2::@13->mode_sixsfred2::@14]
-  //SEG840 mode_sixsfred2::@14
+    bne b9
+  //SEG839 [447] phi from mode_sixsfred2::@11 to mode_sixsfred2::@12 [phi:mode_sixsfred2::@11->mode_sixsfred2::@12]
+  //SEG840 mode_sixsfred2::@12
   //SEG841 [448] call mode_ctrl 
-  //SEG842 [155] phi from mode_sixsfred2::@14 to mode_ctrl [phi:mode_sixsfred2::@14->mode_ctrl]
-  //SEG843 [155] phi (byte) dtv_control#145 = (const byte) DTV_LINEAR#0 [phi:mode_sixsfred2::@14->mode_ctrl#0] -- vbuz1=vbuc1 
+  //SEG842 [155] phi from mode_sixsfred2::@12 to mode_ctrl [phi:mode_sixsfred2::@12->mode_ctrl]
+  //SEG843 [155] phi (byte) dtv_control#145 = (const byte) DTV_LINEAR#0 [phi:mode_sixsfred2::@12->mode_ctrl#0] -- vbuz1=vbuc1 
     lda #DTV_LINEAR
     sta dtv_control
     jsr mode_ctrl
@@ -29246,8 +29380,8 @@ mode_stdbitmap: {
   //SEG1081 [581] phi (byte) mode_stdbitmap::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mode_stdbitmap::@9->mode_stdbitmap::@7#0] -- vbuz1=vbuc1 
     lda #0
     sta l
-  //SEG1082 [581] phi from mode_stdbitmap::@11 to mode_stdbitmap::@7 [phi:mode_stdbitmap::@11->mode_stdbitmap::@7]
-  //SEG1083 [581] phi (byte) mode_stdbitmap::l#2 = (byte) mode_stdbitmap::l#1 [phi:mode_stdbitmap::@11->mode_stdbitmap::@7#0] -- register_copy 
+  //SEG1082 [581] phi from mode_stdbitmap::@10 to mode_stdbitmap::@7 [phi:mode_stdbitmap::@10->mode_stdbitmap::@7]
+  //SEG1083 [581] phi (byte) mode_stdbitmap::l#2 = (byte) mode_stdbitmap::l#1 [phi:mode_stdbitmap::@10->mode_stdbitmap::@7#0] -- register_copy 
   //SEG1084 mode_stdbitmap::@7
   b7:
   //SEG1085 [582] (byte) bitmap_line::x0#0 ← *((const byte[]) mode_stdbitmap::lines_x#0 + (byte) mode_stdbitmap::l#2) -- vbuz1=pbuc1_derefidx_vbuz2 
@@ -29264,14 +29398,14 @@ mode_stdbitmap: {
     sta bitmap_line.y1
   //SEG1089 [586] call bitmap_line 
     jsr bitmap_line
-  //SEG1090 mode_stdbitmap::@11
+  //SEG1090 mode_stdbitmap::@10
   //SEG1091 [587] (byte) mode_stdbitmap::l#1 ← ++ (byte) mode_stdbitmap::l#2 -- vbuz1=_inc_vbuz1 
     inc l
   //SEG1092 [588] if((byte) mode_stdbitmap::l#1<(const byte) mode_stdbitmap::lines_cnt#0) goto mode_stdbitmap::@7 -- vbuz1_lt_vbuc1_then_la1 
     lda l
     cmp #lines_cnt
     bcc b7
-  //SEG1093 [589] phi from mode_stdbitmap::@11 to mode_stdbitmap::@8 [phi:mode_stdbitmap::@11->mode_stdbitmap::@8]
+  //SEG1093 [589] phi from mode_stdbitmap::@10 to mode_stdbitmap::@8 [phi:mode_stdbitmap::@10->mode_stdbitmap::@8]
   //SEG1094 mode_stdbitmap::@8
   //SEG1095 [590] call mode_ctrl 
   //SEG1096 [155] phi from mode_stdbitmap::@8 to mode_ctrl [phi:mode_stdbitmap::@8->mode_ctrl]
@@ -29299,26 +29433,26 @@ bitmap_line: {
     beq !+
     bcs b1
   !:
-  //SEG1102 bitmap_line::@3
+  //SEG1102 bitmap_line::@2
   //SEG1103 [593] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0 -- vbuz1=vbuz2_minus_vbuxx 
     txa
     eor #$ff
     sec
     adc x0
     sta xd
-  //SEG1104 [594] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1104 [594] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b10
-  //SEG1105 bitmap_line::@4
+    bcc b7
+  //SEG1105 bitmap_line::@3
   //SEG1106 [595] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuyy=vbuz1_minus_vbuz2 
     sec
     sbc y1
     tay
-  //SEG1107 [596] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1107 [596] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b11
-  //SEG1108 bitmap_line::@5
+    bcc b8
+  //SEG1108 bitmap_line::@4
   //SEG1109 [597] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxi.y
@@ -29330,19 +29464,19 @@ bitmap_line: {
     sty bitmap_line_ydxi.yd
   //SEG1113 [601] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   //SEG1114 [602] call bitmap_line_ydxi 
-  //SEG1115 [676] phi from bitmap_line::@5 to bitmap_line_ydxi [phi:bitmap_line::@5->bitmap_line_ydxi]
-  //SEG1116 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@5->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1117 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1118 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@5->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1119 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@5->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1120 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1115 [676] phi from bitmap_line::@4 to bitmap_line_ydxi [phi:bitmap_line::@4->bitmap_line_ydxi]
+  //SEG1116 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@4->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1117 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1118 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@4->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1119 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@4->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1120 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
   //SEG1121 bitmap_line::@return
   breturn:
   //SEG1122 [603] return 
     rts
-  //SEG1123 bitmap_line::@11
-  b11:
+  //SEG1123 bitmap_line::@8
+  b8:
   //SEG1124 [604] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuxx 
     stx bitmap_line_xdyi.x
   //SEG1125 [605] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
@@ -29353,25 +29487,25 @@ bitmap_line: {
   //SEG1128 [608] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2 -- vbuz1=vbuyy 
     sty bitmap_line_xdyi.yd
   //SEG1129 [609] call bitmap_line_xdyi 
-  //SEG1130 [654] phi from bitmap_line::@11 to bitmap_line_xdyi [phi:bitmap_line::@11->bitmap_line_xdyi]
-  //SEG1131 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@11->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1132 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1133 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@11->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1134 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@11->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1135 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1130 [654] phi from bitmap_line::@8 to bitmap_line_xdyi [phi:bitmap_line::@8->bitmap_line_xdyi]
+  //SEG1131 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@8->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1132 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1133 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@8->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1134 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@8->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1135 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
-  //SEG1136 bitmap_line::@10
-  b10:
+  //SEG1136 bitmap_line::@7
+  b7:
   //SEG1137 [610] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y1
     sec
     sbc y0
     tay
-  //SEG1138 [611] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1138 [611] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b15
-  //SEG1139 bitmap_line::@17
+    bcc b9
+  //SEG1139 bitmap_line::@10
   //SEG1140 [612] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxd.y
@@ -29384,16 +29518,16 @@ bitmap_line: {
     sty bitmap_line_ydxd.yd
   //SEG1144 [616] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   //SEG1145 [617] call bitmap_line_ydxd 
-  //SEG1146 [706] phi from bitmap_line::@17 to bitmap_line_ydxd [phi:bitmap_line::@17->bitmap_line_ydxd]
-  //SEG1147 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@17->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1148 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1149 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@17->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1150 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@17->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1151 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1146 [706] phi from bitmap_line::@10 to bitmap_line_ydxd [phi:bitmap_line::@10->bitmap_line_ydxd]
+  //SEG1147 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@10->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1148 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1149 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@10->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1150 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@10->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1151 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1152 bitmap_line::@15
-  b15:
+  //SEG1152 bitmap_line::@9
+  b9:
   //SEG1153 [618] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuxx 
     stx bitmap_line_xdyd.x
   //SEG1154 [619] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
@@ -29404,12 +29538,12 @@ bitmap_line: {
   //SEG1157 [622] (byte) bitmap_line_xdyd::yd#0 ← (byte) bitmap_line::yd#1 -- vbuz1=vbuyy 
     sty bitmap_line_xdyd.yd
   //SEG1158 [623] call bitmap_line_xdyd 
-  //SEG1159 [691] phi from bitmap_line::@15 to bitmap_line_xdyd [phi:bitmap_line::@15->bitmap_line_xdyd]
-  //SEG1160 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@15->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1161 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1162 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@15->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1163 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@15->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1164 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1159 [691] phi from bitmap_line::@9 to bitmap_line_xdyd [phi:bitmap_line::@9->bitmap_line_xdyd]
+  //SEG1160 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@9->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1161 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1162 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@9->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1163 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@9->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1164 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
   //SEG1165 bitmap_line::@1
@@ -29419,19 +29553,19 @@ bitmap_line: {
     sec
     sbc x0
     sta xd
-  //SEG1167 [625] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG1167 [625] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b20
-  //SEG1168 bitmap_line::@7
+    bcc b11
+  //SEG1168 bitmap_line::@5
   //SEG1169 [626] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuyy=vbuz1_minus_vbuz2 
     sec
     sbc y1
     tay
-  //SEG1170 [627] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1170 [627] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b21
-  //SEG1171 bitmap_line::@8
+    bcc b12
+  //SEG1171 bitmap_line::@6
   //SEG1172 [628] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxd.y
@@ -29441,16 +29575,16 @@ bitmap_line: {
     sty bitmap_line_ydxd.yd
   //SEG1176 [632] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   //SEG1177 [633] call bitmap_line_ydxd 
-  //SEG1178 [706] phi from bitmap_line::@8 to bitmap_line_ydxd [phi:bitmap_line::@8->bitmap_line_ydxd]
-  //SEG1179 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@8->bitmap_line_ydxd#0] -- register_copy 
-  //SEG1180 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#1] -- register_copy 
-  //SEG1181 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@8->bitmap_line_ydxd#2] -- register_copy 
-  //SEG1182 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@8->bitmap_line_ydxd#3] -- register_copy 
-  //SEG1183 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#4] -- register_copy 
+  //SEG1178 [706] phi from bitmap_line::@6 to bitmap_line_ydxd [phi:bitmap_line::@6->bitmap_line_ydxd]
+  //SEG1179 [706] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@6->bitmap_line_ydxd#0] -- register_copy 
+  //SEG1180 [706] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#1] -- register_copy 
+  //SEG1181 [706] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@6->bitmap_line_ydxd#2] -- register_copy 
+  //SEG1182 [706] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@6->bitmap_line_ydxd#3] -- register_copy 
+  //SEG1183 [706] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG1184 bitmap_line::@21
-  b21:
+  //SEG1184 bitmap_line::@12
+  b12:
   //SEG1185 [634] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyd.x
@@ -29461,25 +29595,25 @@ bitmap_line: {
   //SEG1189 [638] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10 -- vbuz1=vbuyy 
     sty bitmap_line_xdyd.yd
   //SEG1190 [639] call bitmap_line_xdyd 
-  //SEG1191 [691] phi from bitmap_line::@21 to bitmap_line_xdyd [phi:bitmap_line::@21->bitmap_line_xdyd]
-  //SEG1192 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@21->bitmap_line_xdyd#0] -- register_copy 
-  //SEG1193 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#1] -- register_copy 
-  //SEG1194 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@21->bitmap_line_xdyd#2] -- register_copy 
-  //SEG1195 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@21->bitmap_line_xdyd#3] -- register_copy 
-  //SEG1196 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#4] -- register_copy 
+  //SEG1191 [691] phi from bitmap_line::@12 to bitmap_line_xdyd [phi:bitmap_line::@12->bitmap_line_xdyd]
+  //SEG1192 [691] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@12->bitmap_line_xdyd#0] -- register_copy 
+  //SEG1193 [691] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#1] -- register_copy 
+  //SEG1194 [691] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@12->bitmap_line_xdyd#2] -- register_copy 
+  //SEG1195 [691] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@12->bitmap_line_xdyd#3] -- register_copy 
+  //SEG1196 [691] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
-  //SEG1197 bitmap_line::@20
-  b20:
+  //SEG1197 bitmap_line::@11
+  b11:
   //SEG1198 [640] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuyy=vbuz1_minus_vbuz2 
     lda y1
     sec
     sbc y0
     tay
-  //SEG1199 [641] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25 -- vbuyy_lt_vbuz1_then_la1 
+  //SEG1199 [641] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13 -- vbuyy_lt_vbuz1_then_la1 
     cpy xd
-    bcc b25
-  //SEG1200 bitmap_line::@27
+    bcc b13
+  //SEG1200 bitmap_line::@14
   //SEG1201 [642] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxi.y
@@ -29490,16 +29624,16 @@ bitmap_line: {
     sty bitmap_line_ydxi.yd
   //SEG1205 [646] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   //SEG1206 [647] call bitmap_line_ydxi 
-  //SEG1207 [676] phi from bitmap_line::@27 to bitmap_line_ydxi [phi:bitmap_line::@27->bitmap_line_ydxi]
-  //SEG1208 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@27->bitmap_line_ydxi#0] -- register_copy 
-  //SEG1209 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#1] -- register_copy 
-  //SEG1210 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@27->bitmap_line_ydxi#2] -- register_copy 
-  //SEG1211 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@27->bitmap_line_ydxi#3] -- register_copy 
-  //SEG1212 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#4] -- register_copy 
+  //SEG1207 [676] phi from bitmap_line::@14 to bitmap_line_ydxi [phi:bitmap_line::@14->bitmap_line_ydxi]
+  //SEG1208 [676] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@14->bitmap_line_ydxi#0] -- register_copy 
+  //SEG1209 [676] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#1] -- register_copy 
+  //SEG1210 [676] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@14->bitmap_line_ydxi#2] -- register_copy 
+  //SEG1211 [676] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@14->bitmap_line_ydxi#3] -- register_copy 
+  //SEG1212 [676] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
-  //SEG1213 bitmap_line::@25
-  b25:
+  //SEG1213 bitmap_line::@13
+  b13:
   //SEG1214 [648] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyi.x
@@ -29510,12 +29644,12 @@ bitmap_line: {
   //SEG1218 [652] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11 -- vbuz1=vbuyy 
     sty bitmap_line_xdyi.yd
   //SEG1219 [653] call bitmap_line_xdyi 
-  //SEG1220 [654] phi from bitmap_line::@25 to bitmap_line_xdyi [phi:bitmap_line::@25->bitmap_line_xdyi]
-  //SEG1221 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@25->bitmap_line_xdyi#0] -- register_copy 
-  //SEG1222 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#1] -- register_copy 
-  //SEG1223 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@25->bitmap_line_xdyi#2] -- register_copy 
-  //SEG1224 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@25->bitmap_line_xdyi#3] -- register_copy 
-  //SEG1225 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#4] -- register_copy 
+  //SEG1220 [654] phi from bitmap_line::@13 to bitmap_line_xdyi [phi:bitmap_line::@13->bitmap_line_xdyi]
+  //SEG1221 [654] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@13->bitmap_line_xdyi#0] -- register_copy 
+  //SEG1222 [654] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#1] -- register_copy 
+  //SEG1223 [654] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@13->bitmap_line_xdyi#2] -- register_copy 
+  //SEG1224 [654] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@13->bitmap_line_xdyi#3] -- register_copy 
+  //SEG1225 [654] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
 }
@@ -29547,7 +29681,7 @@ bitmap_line_xdyi: {
   //SEG1237 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#0] -- register_copy 
   //SEG1238 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG1239 bitmap_line_xdyi::@5
+  //SEG1239 bitmap_line_xdyi::@4
   //SEG1240 [660] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1241 [661] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -29567,9 +29701,9 @@ bitmap_line_xdyi: {
     sec
     sbc xd
     sta e
-  //SEG1246 [665] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2]
-  //SEG1247 [665] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#0] -- register_copy 
-  //SEG1248 [665] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#1] -- register_copy 
+  //SEG1246 [665] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2]
+  //SEG1247 [665] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#0] -- register_copy 
+  //SEG1248 [665] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#1] -- register_copy 
   //SEG1249 bitmap_line_xdyi::@2
   b2:
   //SEG1250 [666] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6 ← (byte) bitmap_line_xdyi::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuz1_plus_1 
@@ -29642,7 +29776,7 @@ bitmap_line_ydxi: {
   //SEG1273 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#0] -- register_copy 
   //SEG1274 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG1275 bitmap_line_ydxi::@5
+  //SEG1275 bitmap_line_ydxi::@4
   //SEG1276 [682] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1277 [683] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -29662,9 +29796,9 @@ bitmap_line_ydxi: {
     sec
     sbc yd
     sta e
-  //SEG1282 [687] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2]
-  //SEG1283 [687] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#0] -- register_copy 
-  //SEG1284 [687] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#1] -- register_copy 
+  //SEG1282 [687] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2]
+  //SEG1283 [687] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#0] -- register_copy 
+  //SEG1284 [687] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#1] -- register_copy 
   //SEG1285 bitmap_line_ydxi::@2
   b2:
   //SEG1286 [688] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6 ← (byte) bitmap_line_ydxi::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_plus_1 
@@ -29706,7 +29840,7 @@ bitmap_line_xdyd: {
   //SEG1301 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#0] -- register_copy 
   //SEG1302 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG1303 bitmap_line_xdyd::@5
+  //SEG1303 bitmap_line_xdyd::@4
   //SEG1304 [697] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG1305 [698] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -29726,9 +29860,9 @@ bitmap_line_xdyd: {
     sec
     sbc xd
     sta e
-  //SEG1310 [702] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2]
-  //SEG1311 [702] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#0] -- register_copy 
-  //SEG1312 [702] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#1] -- register_copy 
+  //SEG1310 [702] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2]
+  //SEG1311 [702] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#0] -- register_copy 
+  //SEG1312 [702] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#1] -- register_copy 
   //SEG1313 bitmap_line_xdyd::@2
   b2:
   //SEG1314 [703] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6 ← (byte) bitmap_line_xdyd::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuz1_plus_1 
@@ -29767,7 +29901,7 @@ bitmap_line_ydxd: {
   //SEG1329 [669] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#0] -- register_copy 
   //SEG1330 [669] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG1331 bitmap_line_ydxd::@5
+  //SEG1331 bitmap_line_ydxd::@4
   //SEG1332 [712] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1333 [713] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -29787,9 +29921,9 @@ bitmap_line_ydxd: {
     sec
     sbc yd
     sta e
-  //SEG1338 [717] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2]
-  //SEG1339 [717] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#0] -- register_copy 
-  //SEG1340 [717] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#1] -- register_copy 
+  //SEG1338 [717] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2]
+  //SEG1339 [717] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#0] -- register_copy 
+  //SEG1340 [717] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#1] -- register_copy 
   //SEG1341 bitmap_line_ydxd::@2
   b2:
   //SEG1342 [718] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6 ← (byte) bitmap_line_ydxd::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_plus_1 
@@ -29889,7 +30023,7 @@ bitmap_init: {
     tya
     lsr
     tay
-  //SEG1385 [739] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuyy_neq_0_then_la1 
+  //SEG1385 [739] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuyy_neq_0_then_la1 
     cpy #0
     bne b2
   //SEG1386 [740] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
@@ -29902,18 +30036,18 @@ bitmap_init: {
   //SEG1390 [742] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1
-  //SEG1391 [743] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  //SEG1392 [743] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG1391 [743] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  //SEG1392 [743] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     sta yoffs+1
-  //SEG1393 [743] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuxx=vbuc1 
+  //SEG1393 [743] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuxx=vbuc1 
     tax
-  //SEG1394 [743] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  //SEG1395 [743] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG1396 [743] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-  //SEG1397 bitmap_init::@5
-  b5:
+  //SEG1394 [743] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  //SEG1395 [743] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG1396 [743] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+  //SEG1397 bitmap_init::@3
+  b3:
   //SEG1398 [744] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _6
@@ -29930,10 +30064,10 @@ bitmap_init: {
   //SEG1404 [750] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG1405 [751] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG1405 [751] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6
-  //SEG1406 bitmap_init::@7
+    bne b4
+  //SEG1406 bitmap_init::@5
   //SEG1407 [752] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -29942,22 +30076,22 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG1408 [753] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  //SEG1409 [753] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-  //SEG1410 bitmap_init::@6
-  b6:
+  //SEG1408 [753] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  //SEG1409 [753] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+  //SEG1410 bitmap_init::@4
+  b4:
   //SEG1411 [754] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1412 [755] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuxx_neq_0_then_la1 
+  //SEG1412 [755] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5
+    bne b3
   //SEG1413 bitmap_init::@return
   //SEG1414 [756] return 
     rts
-  //SEG1415 [757] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  //SEG1416 bitmap_init::@10
-  //SEG1417 [740] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  //SEG1418 [740] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG1415 [757] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  //SEG1416 bitmap_init::@6
+  //SEG1417 [740] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  //SEG1418 [740] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
 }
 //SEG1419 mode_mcchar
 // Multicolor Character Mode (LINEAR/HICOL/CHUNK/COLDIS/BMM/ECM = 0, MCM = 1)
@@ -30500,19 +30634,19 @@ print_str_lines: {
     sta str+1
   //SEG1612 print_str_lines::@1
   b1:
-  //SEG1613 [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@6 -- _deref_pbuz1_neq_vbuc1_then_la1 
+  //SEG1613 [867] if(*((byte*) print_str_lines::str#2)!=(byte) '@') goto print_str_lines::@2 -- _deref_pbuz1_neq_vbuc1_then_la1 
     ldy #0
     lda (str),y
     cmp #'@'
-    bne b6
+    bne b2
   //SEG1614 print_str_lines::@return
   //SEG1615 [868] return 
     rts
-  //SEG1616 [869] phi from print_str_lines::@1 print_str_lines::@7 to print_str_lines::@6 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6]
-  //SEG1617 [869] phi (byte*) print_char_cursor#17 = (byte*) print_char_cursor#19 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#0] -- register_copy 
-  //SEG1618 [869] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#2 [phi:print_str_lines::@1/print_str_lines::@7->print_str_lines::@6#1] -- register_copy 
-  //SEG1619 print_str_lines::@6
-  b6:
+  //SEG1616 [869] phi from print_str_lines::@1 print_str_lines::@3 to print_str_lines::@2 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2]
+  //SEG1617 [869] phi (byte*) print_char_cursor#17 = (byte*) print_char_cursor#19 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#0] -- register_copy 
+  //SEG1618 [869] phi (byte*) print_str_lines::str#3 = (byte*) print_str_lines::str#2 [phi:print_str_lines::@1/print_str_lines::@3->print_str_lines::@2#1] -- register_copy 
+  //SEG1619 print_str_lines::@2
+  b2:
   //SEG1620 [870] (byte) print_str_lines::ch#0 ← *((byte*) print_str_lines::str#3) -- vbuaa=_deref_pbuz1 
     ldy #0
     lda (str),y
@@ -30521,10 +30655,10 @@ print_str_lines: {
     bne !+
     inc str+1
   !:
-  //SEG1622 [872] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@7 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG1622 [872] if((byte) print_str_lines::ch#0==(byte) '@') goto print_str_lines::@3 -- vbuaa_eq_vbuc1_then_la1 
     cmp #'@'
-    beq b7
-  //SEG1623 print_str_lines::@8
+    beq b3
+  //SEG1623 print_str_lines::@4
   //SEG1624 [873] *((byte*) print_char_cursor#17) ← (byte) print_str_lines::ch#0 -- _deref_pbuz1=vbuaa 
     ldy #0
     sta (print_char_cursor),y
@@ -30533,27 +30667,27 @@ print_str_lines: {
     bne !+
     inc print_char_cursor+1
   !:
-  //SEG1626 [875] phi from print_str_lines::@6 print_str_lines::@8 to print_str_lines::@7 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7]
-  //SEG1627 [875] phi (byte*) print_char_cursor#32 = (byte*) print_char_cursor#17 [phi:print_str_lines::@6/print_str_lines::@8->print_str_lines::@7#0] -- register_copy 
-  //SEG1628 print_str_lines::@7
-  b7:
-  //SEG1629 [876] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG1626 [875] phi from print_str_lines::@2 print_str_lines::@4 to print_str_lines::@3 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3]
+  //SEG1627 [875] phi (byte*) print_char_cursor#32 = (byte*) print_char_cursor#17 [phi:print_str_lines::@2/print_str_lines::@4->print_str_lines::@3#0] -- register_copy 
+  //SEG1628 print_str_lines::@3
+  b3:
+  //SEG1629 [876] if((byte) print_str_lines::ch#0!=(byte) '@') goto print_str_lines::@2 -- vbuaa_neq_vbuc1_then_la1 
     cmp #'@'
-    bne b6
-  //SEG1630 [877] phi from print_str_lines::@7 to print_str_lines::@9 [phi:print_str_lines::@7->print_str_lines::@9]
-  //SEG1631 print_str_lines::@9
+    bne b2
+  //SEG1630 [877] phi from print_str_lines::@3 to print_str_lines::@5 [phi:print_str_lines::@3->print_str_lines::@5]
+  //SEG1631 print_str_lines::@5
   //SEG1632 [878] call print_ln 
-  //SEG1633 [880] phi from print_str_lines::@9 to print_ln [phi:print_str_lines::@9->print_ln]
+  //SEG1633 [880] phi from print_str_lines::@5 to print_ln [phi:print_str_lines::@5->print_ln]
     jsr print_ln
   //SEG1634 [879] (byte*~) print_char_cursor#103 ← (byte*) print_line_cursor#19 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG1635 [866] phi from print_str_lines::@9 to print_str_lines::@1 [phi:print_str_lines::@9->print_str_lines::@1]
-  //SEG1636 [866] phi (byte*) print_line_cursor#17 = (byte*) print_line_cursor#19 [phi:print_str_lines::@9->print_str_lines::@1#0] -- register_copy 
-  //SEG1637 [866] phi (byte*) print_char_cursor#19 = (byte*~) print_char_cursor#103 [phi:print_str_lines::@9->print_str_lines::@1#1] -- register_copy 
-  //SEG1638 [866] phi (byte*) print_str_lines::str#2 = (byte*) print_str_lines::str#0 [phi:print_str_lines::@9->print_str_lines::@1#2] -- register_copy 
+  //SEG1635 [866] phi from print_str_lines::@5 to print_str_lines::@1 [phi:print_str_lines::@5->print_str_lines::@1]
+  //SEG1636 [866] phi (byte*) print_line_cursor#17 = (byte*) print_line_cursor#19 [phi:print_str_lines::@5->print_str_lines::@1#0] -- register_copy 
+  //SEG1637 [866] phi (byte*) print_char_cursor#19 = (byte*~) print_char_cursor#103 [phi:print_str_lines::@5->print_str_lines::@1#1] -- register_copy 
+  //SEG1638 [866] phi (byte*) print_str_lines::str#2 = (byte*) print_str_lines::str#0 [phi:print_str_lines::@5->print_str_lines::@1#2] -- register_copy 
     jmp b1
 }
 //SEG1639 print_ln
diff --git a/src/test/ref/c64dtv-gfxmodes.sym b/src/test/ref/c64dtv-gfxmodes.sym
index 795f0ea1f..981039b82 100644
--- a/src/test/ref/c64dtv-gfxmodes.sym
+++ b/src/test/ref/c64dtv-gfxmodes.sym
@@ -1,4 +1,4 @@
-(label) @54
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -346,11 +346,11 @@
 (byte~) bitmap_init::$8 reg byte a 202.0
 (byte~) bitmap_init::$9 reg byte a 202.0
 (label) bitmap_init::@1
-(label) bitmap_init::@10
 (label) bitmap_init::@2
+(label) bitmap_init::@3
+(label) bitmap_init::@4
 (label) bitmap_init::@5
 (label) bitmap_init::@6
-(label) bitmap_init::@7
 (label) bitmap_init::@return
 (byte*) bitmap_init::bitmap
 (byte) bitmap_init::bits
@@ -371,17 +371,17 @@
 (label) bitmap_line::@1
 (label) bitmap_line::@10
 (label) bitmap_line::@11
-(label) bitmap_line::@15
-(label) bitmap_line::@17
-(label) bitmap_line::@20
-(label) bitmap_line::@21
-(label) bitmap_line::@25
-(label) bitmap_line::@27
+(label) bitmap_line::@12
+(label) bitmap_line::@13
+(label) bitmap_line::@14
+(label) bitmap_line::@2
 (label) bitmap_line::@3
 (label) bitmap_line::@4
 (label) bitmap_line::@5
+(label) bitmap_line::@6
 (label) bitmap_line::@7
 (label) bitmap_line::@8
+(label) bitmap_line::@9
 (label) bitmap_line::@return
 (byte) bitmap_line::x0
 (byte) bitmap_line::x0#0 x0 zp ZP_BYTE:9 5.173913043478264
@@ -404,7 +404,7 @@
 (label) bitmap_line_xdyd::@1
 (label) bitmap_line_xdyd::@2
 (label) bitmap_line_xdyd::@3
-(label) bitmap_line_xdyd::@5
+(label) bitmap_line_xdyd::@4
 (label) bitmap_line_xdyd::@return
 (byte) bitmap_line_xdyd::e
 (byte) bitmap_line_xdyd::e#0 e zp ZP_BYTE:12 4.0
@@ -442,7 +442,7 @@
 (label) bitmap_line_xdyi::@1
 (label) bitmap_line_xdyi::@2
 (label) bitmap_line_xdyi::@3
-(label) bitmap_line_xdyi::@5
+(label) bitmap_line_xdyi::@4
 (label) bitmap_line_xdyi::@return
 (byte) bitmap_line_xdyi::e
 (byte) bitmap_line_xdyi::e#0 e zp ZP_BYTE:12 4.0
@@ -480,7 +480,7 @@
 (label) bitmap_line_ydxd::@1
 (label) bitmap_line_ydxd::@2
 (label) bitmap_line_ydxd::@3
-(label) bitmap_line_ydxd::@5
+(label) bitmap_line_ydxd::@4
 (label) bitmap_line_ydxd::@return
 (byte) bitmap_line_ydxd::e
 (byte) bitmap_line_ydxd::e#0 e zp ZP_BYTE:9 4.0
@@ -518,7 +518,7 @@
 (label) bitmap_line_ydxi::@1
 (label) bitmap_line_ydxi::@2
 (label) bitmap_line_ydxi::@3
-(label) bitmap_line_ydxi::@5
+(label) bitmap_line_ydxi::@4
 (label) bitmap_line_ydxi::@return
 (byte) bitmap_line_ydxi::e
 (byte) bitmap_line_ydxi::e#0 e zp ZP_BYTE:9 4.0
@@ -598,7 +598,7 @@
 (byte) keyboard_events_size
 (byte()) keyboard_key_pressed((byte) keyboard_key_pressed::key)
 (byte~) keyboard_key_pressed::$2 reg byte a 4.0
-(label) keyboard_key_pressed::@2
+(label) keyboard_key_pressed::@1
 (label) keyboard_key_pressed::@return
 (byte) keyboard_key_pressed::colidx
 (byte) keyboard_key_pressed::colidx#0 colidx zp ZP_BYTE:7 0.6666666666666666
@@ -643,7 +643,7 @@
 (byte) keyboard_modifiers
 (byte[8]) keyboard_scan_values
 (void()) main()
-(label) main::@2
+(label) main::@1
 (void()) menu()
 (byte~) menu::$29 reg byte a 202.0
 (byte~) menu::$33 reg byte a 202.0
@@ -657,6 +657,7 @@
 (byte~) menu::$65 reg byte a 202.0
 (byte~) menu::$69 reg byte a 202.0
 (byte~) menu::$73 reg byte a 202.0
+(label) menu::@1
 (label) menu::@10
 (label) menu::@11
 (label) menu::@12
@@ -671,33 +672,32 @@
 (label) menu::@20
 (label) menu::@21
 (label) menu::@22
+(label) menu::@23
 (label) menu::@24
+(label) menu::@25
 (label) menu::@26
+(label) menu::@27
 (label) menu::@28
+(label) menu::@29
+(label) menu::@3
 (label) menu::@30
+(label) menu::@31
 (label) menu::@32
+(label) menu::@33
 (label) menu::@34
+(label) menu::@35
 (label) menu::@36
+(label) menu::@37
 (label) menu::@38
+(label) menu::@39
+(label) menu::@4
 (label) menu::@40
-(label) menu::@42
-(label) menu::@44
-(label) menu::@47
-(label) menu::@48
-(label) menu::@50
-(label) menu::@51
-(label) menu::@53
-(label) menu::@55
-(label) menu::@57
-(label) menu::@59
+(label) menu::@41
+(label) menu::@5
 (label) menu::@6
-(label) menu::@61
-(label) menu::@63
-(label) menu::@65
-(label) menu::@67
-(label) menu::@69
-(label) menu::@71
+(label) menu::@7
 (label) menu::@8
+(label) menu::@9
 (label) menu::@return
 (byte*) menu::CHARSET
 (const byte*) menu::CHARSET#0 CHARSET = ((byte*))(word/dword/signed dword) $9800
@@ -713,7 +713,6 @@
 (word~) mode_8bppchunkybmm::$27 $27 zp ZP_WORD:13 2002.0
 (label) mode_8bppchunkybmm::@1
 (label) mode_8bppchunkybmm::@10
-(label) mode_8bppchunkybmm::@11
 (label) mode_8bppchunkybmm::@2
 (label) mode_8bppchunkybmm::@3
 (label) mode_8bppchunkybmm::@4
@@ -721,6 +720,7 @@
 (label) mode_8bppchunkybmm::@6
 (label) mode_8bppchunkybmm::@7
 (label) mode_8bppchunkybmm::@8
+(label) mode_8bppchunkybmm::@9
 (label) mode_8bppchunkybmm::@return
 (dword) mode_8bppchunkybmm::PLANEB
 (const dword) mode_8bppchunkybmm::PLANEB#0 PLANEB = (dword/signed dword) $20000
@@ -756,7 +756,7 @@
 (label) mode_8bpppixelcell::@11
 (label) mode_8bpppixelcell::@12
 (label) mode_8bpppixelcell::@13
-(label) mode_8bpppixelcell::@14
+(label) mode_8bpppixelcell::@2
 (label) mode_8bpppixelcell::@3
 (label) mode_8bpppixelcell::@4
 (label) mode_8bpppixelcell::@5
@@ -831,23 +831,23 @@
 (label) mode_ctrl::@14
 (label) mode_ctrl::@15
 (label) mode_ctrl::@16
+(label) mode_ctrl::@17
+(label) mode_ctrl::@18
+(label) mode_ctrl::@19
+(label) mode_ctrl::@2
+(label) mode_ctrl::@20
+(label) mode_ctrl::@21
+(label) mode_ctrl::@22
 (label) mode_ctrl::@23
 (label) mode_ctrl::@24
 (label) mode_ctrl::@25
 (label) mode_ctrl::@26
 (label) mode_ctrl::@27
-(label) mode_ctrl::@28
-(label) mode_ctrl::@30
-(label) mode_ctrl::@32
-(label) mode_ctrl::@33
-(label) mode_ctrl::@34
-(label) mode_ctrl::@35
-(label) mode_ctrl::@36
-(label) mode_ctrl::@37
-(label) mode_ctrl::@38
-(label) mode_ctrl::@39
-(label) mode_ctrl::@46
+(label) mode_ctrl::@3
+(label) mode_ctrl::@4
+(label) mode_ctrl::@5
 (label) mode_ctrl::@6
+(label) mode_ctrl::@7
 (label) mode_ctrl::@8
 (label) mode_ctrl::@9
 (label) mode_ctrl::@return
@@ -1053,14 +1053,14 @@
 (byte~) mode_sixsfred::$18 reg byte a 2002.0
 (byte~) mode_sixsfred::$21 reg byte a 2002.0
 (label) mode_sixsfred::@1
+(label) mode_sixsfred::@10
 (label) mode_sixsfred::@11
 (label) mode_sixsfred::@12
-(label) mode_sixsfred::@13
-(label) mode_sixsfred::@14
 (label) mode_sixsfred::@2
 (label) mode_sixsfred::@3
 (label) mode_sixsfred::@4
 (label) mode_sixsfred::@5
+(label) mode_sixsfred::@6
 (label) mode_sixsfred::@7
 (label) mode_sixsfred::@8
 (label) mode_sixsfred::@9
@@ -1115,14 +1115,14 @@
 (byte~) mode_sixsfred2::$18 reg byte a 2002.0
 (byte~) mode_sixsfred2::$21 reg byte a 2002.0
 (label) mode_sixsfred2::@1
+(label) mode_sixsfred2::@10
 (label) mode_sixsfred2::@11
 (label) mode_sixsfred2::@12
-(label) mode_sixsfred2::@13
-(label) mode_sixsfred2::@14
 (label) mode_sixsfred2::@2
 (label) mode_sixsfred2::@3
 (label) mode_sixsfred2::@4
 (label) mode_sixsfred2::@5
+(label) mode_sixsfred2::@6
 (label) mode_sixsfred2::@7
 (label) mode_sixsfred2::@8
 (label) mode_sixsfred2::@9
@@ -1175,7 +1175,7 @@
 (byte~) mode_stdbitmap::$25 reg byte a 2002.0
 (byte~) mode_stdbitmap::$26 reg byte a 2002.0
 (label) mode_stdbitmap::@1
-(label) mode_stdbitmap::@11
+(label) mode_stdbitmap::@10
 (label) mode_stdbitmap::@2
 (label) mode_stdbitmap::@3
 (label) mode_stdbitmap::@4
@@ -1261,15 +1261,15 @@
 (label) mode_twoplanebitmap::@1
 (label) mode_twoplanebitmap::@10
 (label) mode_twoplanebitmap::@11
+(label) mode_twoplanebitmap::@12
 (label) mode_twoplanebitmap::@13
+(label) mode_twoplanebitmap::@14
 (label) mode_twoplanebitmap::@15
-(label) mode_twoplanebitmap::@16
-(label) mode_twoplanebitmap::@17
-(label) mode_twoplanebitmap::@18
 (label) mode_twoplanebitmap::@2
 (label) mode_twoplanebitmap::@3
 (label) mode_twoplanebitmap::@4
 (label) mode_twoplanebitmap::@5
+(label) mode_twoplanebitmap::@6
 (label) mode_twoplanebitmap::@7
 (label) mode_twoplanebitmap::@8
 (label) mode_twoplanebitmap::@9
@@ -1341,10 +1341,10 @@
 (byte*) print_set_screen::screen
 (void()) print_str_lines((byte*) print_str_lines::str)
 (label) print_str_lines::@1
-(label) print_str_lines::@6
-(label) print_str_lines::@7
-(label) print_str_lines::@8
-(label) print_str_lines::@9
+(label) print_str_lines::@2
+(label) print_str_lines::@3
+(label) print_str_lines::@4
+(label) print_str_lines::@5
 (label) print_str_lines::@return
 (byte) print_str_lines::ch
 (byte) print_str_lines::ch#0 reg byte a 667.3333333333334
diff --git a/src/test/ref/callconstparam.cfg b/src/test/ref/callconstparam.cfg
index 606f64281..d0b26dcf9 100644
--- a/src/test/ref/callconstparam.cfg
+++ b/src/test/ref/callconstparam.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call line 
   to:main::@1
diff --git a/src/test/ref/callconstparam.log b/src/test/ref/callconstparam.log
index fc9ce03be..ef4d1962a 100644
--- a/src/test/ref/callconstparam.log
+++ b/src/test/ref/callconstparam.log
@@ -154,8 +154,9 @@ Coalesced [18] line::x#4 ← line::x#1
 Coalesced (already) [19] screen#18 ← screen#11
 Coalesced down to 3 phi equivalence classes
 Culled Empty Block (label) line::@3
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -163,14 +164,14 @@ Adding NOP phi() at start of main::@1
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call line 
   to:main::@1
@@ -239,17 +240,17 @@ INITIAL ASM
   .label screen = 4
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -361,17 +362,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = 3
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -446,7 +447,7 @@ line: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -454,10 +455,10 @@ Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction line_from_b1:
 Removing instruction b1_from_line:
@@ -476,7 +477,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) line((byte) line::x0 , (byte) line::x1)
@@ -516,11 +517,11 @@ Score: 348
 //SEG2 Global Constants & labels
   .label screen = 3
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/callconstparam.sym b/src/test/ref/callconstparam.sym
index 3bff28cd3..00e91669e 100644
--- a/src/test/ref/callconstparam.sym
+++ b/src/test/ref/callconstparam.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) line((byte) line::x0 , (byte) line::x1)
diff --git a/src/test/ref/cast-precedence-problem.cfg b/src/test/ref/cast-precedence-problem.cfg
index 1f52393cf..fff61dce6 100644
--- a/src/test/ref/cast-precedence-problem.cfg
+++ b/src/test/ref/cast-precedence-problem.cfg
@@ -11,11 +11,11 @@ main: scope:[main]  from @1
   [4] *((const byte*) main::SCREEN#0) ← (const byte) main::midw#0
   [5] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (const byte) main::midb#0
   [6] if(*((const byte*) main::SCREEN#0)==*((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1)) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main
+  to:main::@2
+main::@2: scope:[main]  from main
   [7] *((const byte*) main::BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   to:main::@return
-main::@return: scope:[main]  from main::@1 main::@3
+main::@return: scope:[main]  from main::@1 main::@2
   [8] return 
   to:@return
 main::@1: scope:[main]  from main
diff --git a/src/test/ref/cast-precedence-problem.log b/src/test/ref/cast-precedence-problem.log
index 4e410ffc6..401a337bb 100644
--- a/src/test/ref/cast-precedence-problem.log
+++ b/src/test/ref/cast-precedence-problem.log
@@ -123,6 +123,7 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -141,11 +142,11 @@ main: scope:[main]  from @1
   [4] *((const byte*) main::SCREEN#0) ← (const byte) main::midw#0
   [5] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (const byte) main::midb#0
   [6] if(*((const byte*) main::SCREEN#0)==*((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1)) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main
+  to:main::@2
+main::@2: scope:[main]  from main
   [7] *((const byte*) main::BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   to:main::@return
-main::@return: scope:[main]  from main::@1 main::@3
+main::@return: scope:[main]  from main::@1 main::@2
   [8] return 
   to:@return
 main::@1: scope:[main]  from main
@@ -209,9 +210,9 @@ main: {
     lda SCREEN
     cmp SCREEN+1
     beq b1
-    jmp b3
-  //SEG13 main::@3
-  b3:
+    jmp b2
+  //SEG13 main::@2
+  b2:
   //SEG14 [7] *((const byte*) main::BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -284,9 +285,9 @@ main: {
     lda SCREEN
     cmp SCREEN+1
     beq b1
-    jmp b3
-  //SEG13 main::@3
-  b3:
+    jmp b2
+  //SEG13 main::@2
+  b2:
   //SEG14 [7] *((const byte*) main::BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -306,7 +307,7 @@ main: {
 ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction b1_from_bbegin:
@@ -314,7 +315,7 @@ Removing instruction b1:
 Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b3:
+Removing instruction b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
@@ -328,7 +329,7 @@ FINAL SYMBOL TABLE
 (label) @end
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte*) main::BGCOL
 (const byte*) main::BGCOL#0 BGCOL = ((byte*))(word/dword/signed dword) $d021
@@ -385,7 +386,7 @@ main: {
     lda SCREEN
     cmp SCREEN+1
     beq b1
-  //SEG13 main::@3
+  //SEG13 main::@2
   //SEG14 [7] *((const byte*) main::BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
diff --git a/src/test/ref/cast-precedence-problem.sym b/src/test/ref/cast-precedence-problem.sym
index 5dc665889..82ea97328 100644
--- a/src/test/ref/cast-precedence-problem.sym
+++ b/src/test/ref/cast-precedence-problem.sym
@@ -3,7 +3,7 @@
 (label) @end
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte*) main::BGCOL
 (const byte*) main::BGCOL#0 BGCOL = ((byte*))(word/dword/signed dword) $d021
diff --git a/src/test/ref/casting.cfg b/src/test/ref/casting.cfg
index b05792e64..914ff137c 100644
--- a/src/test/ref/casting.cfg
+++ b/src/test/ref/casting.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@1
diff --git a/src/test/ref/casting.log b/src/test/ref/casting.log
index b842311d5..781681967 100644
--- a/src/test/ref/casting.log
+++ b/src/test/ref/casting.log
@@ -242,8 +242,9 @@ Coalesced [24] w::i#3 ← w::i#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@4
 Culled Empty Block (label) w::@3
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@2
@@ -252,14 +253,14 @@ Adding NOP phi() at start of w
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@1
@@ -348,17 +349,17 @@ INITIAL ASM
   .label SCREEN4 = SCREEN+$28*9
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -504,17 +505,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN4 = SCREEN+$28*9
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -604,7 +605,7 @@ w: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -614,10 +615,10 @@ Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b1:
 Removing instruction b2_from_b1:
 Removing instruction w_from_b2:
@@ -640,7 +641,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -698,11 +699,11 @@ Score: 648
   .label SCREEN3 = SCREEN+$28*6
   .label SCREEN4 = SCREEN+$28*9
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/casting.sym b/src/test/ref/casting.sym
index 583940321..b006fccef 100644
--- a/src/test/ref/casting.sym
+++ b/src/test/ref/casting.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
diff --git a/src/test/ref/complex-conditional-problem.asm b/src/test/ref/complex-conditional-problem.asm
index fa8046258..ccac71363 100644
--- a/src/test/ref/complex-conditional-problem.asm
+++ b/src/test/ref/complex-conditional-problem.asm
@@ -5,18 +5,18 @@
   .label RASTER = $d012
   .label SCREEN = $400
 main: {
-  b2:
+  b1:
     lda RASTER
     cmp #$20
     beq !+
-    bcs b6
+    bcs b2
   !:
     cmp #$40
-    bcc b6
-  b7:
+    bcc b2
+  b3:
     sta SCREEN
-    jmp b2
-  b6:
+    jmp b1
+  b2:
     lda #0
-    jmp b7
+    jmp b3
 }
diff --git a/src/test/ref/complex-conditional-problem.cfg b/src/test/ref/complex-conditional-problem.cfg
index f8847c24e..8cd7165d7 100644
--- a/src/test/ref/complex-conditional-problem.cfg
+++ b/src/test/ref/complex-conditional-problem.cfg
@@ -9,18 +9,18 @@
   [3] phi()
 main: scope:[main]  from @1
   [4] phi()
-  to:main::@2
-main::@2: scope:[main]  from main main::@7
+  to:main::@1
+main::@1: scope:[main]  from main main::@3
   [5] (byte) main::key#0 ← *((const byte*) RASTER#0)
-  [6] if((byte) main::key#0>(byte/signed byte/word/signed word/dword/signed dword) $20) goto main::@6
-  to:main::@9
-main::@9: scope:[main]  from main::@2
-  [7] if((byte) main::key#0<(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6
-  to:main::@7
-main::@7: scope:[main]  from main::@6 main::@9
-  [8] (byte) main::key#2 ← phi( main::@9/(byte) main::key#0 main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] if((byte) main::key#0>(byte/signed byte/word/signed word/dword/signed dword) $20) goto main::@2
+  to:main::@4
+main::@4: scope:[main]  from main::@1
+  [7] if((byte) main::key#0<(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@4
+  [8] (byte) main::key#2 ← phi( main::@4/(byte) main::key#0 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [9] *((const byte*) SCREEN#0) ← (byte) main::key#2
-  to:main::@2
-main::@6: scope:[main]  from main::@2 main::@9
+  to:main::@1
+main::@2: scope:[main]  from main::@1 main::@4
   [10] phi()
-  to:main::@7
+  to:main::@3
diff --git a/src/test/ref/complex-conditional-problem.log b/src/test/ref/complex-conditional-problem.log
index ab852d983..e8438c7f7 100644
--- a/src/test/ref/complex-conditional-problem.log
+++ b/src/test/ref/complex-conditional-problem.log
@@ -93,11 +93,15 @@ Created 1 initial phi equivalence classes
 Coalesced [8] main::key#3 ← main::key#0
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) main::@10
+Renumbering block main::@2 to main::@1
+Renumbering block main::@6 to main::@2
+Renumbering block main::@7 to main::@3
+Renumbering block main::@9 to main::@4
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@6
+Adding NOP phi() at start of main::@2
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
@@ -111,21 +115,21 @@ FINAL CONTROL FLOW GRAPH
   [3] phi()
 main: scope:[main]  from @1
   [4] phi()
-  to:main::@2
-main::@2: scope:[main]  from main main::@7
+  to:main::@1
+main::@1: scope:[main]  from main main::@3
   [5] (byte) main::key#0 ← *((const byte*) RASTER#0)
-  [6] if((byte) main::key#0>(byte/signed byte/word/signed word/dword/signed dword) $20) goto main::@6
-  to:main::@9
-main::@9: scope:[main]  from main::@2
-  [7] if((byte) main::key#0<(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6
-  to:main::@7
-main::@7: scope:[main]  from main::@6 main::@9
-  [8] (byte) main::key#2 ← phi( main::@9/(byte) main::key#0 main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] if((byte) main::key#0>(byte/signed byte/word/signed word/dword/signed dword) $20) goto main::@2
+  to:main::@4
+main::@4: scope:[main]  from main::@1
+  [7] if((byte) main::key#0<(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@4
+  [8] (byte) main::key#2 ← phi( main::@4/(byte) main::key#0 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [9] *((const byte*) SCREEN#0) ← (byte) main::key#2
-  to:main::@2
-main::@6: scope:[main]  from main::@2 main::@9
+  to:main::@1
+main::@2: scope:[main]  from main::@1 main::@4
   [10] phi()
-  to:main::@7
+  to:main::@3
 
 
 VARIABLE REGISTER WEIGHTS
@@ -171,45 +175,45 @@ bend:
 //SEG10 main
 main: {
     .label key = 2
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] (byte) main::key#0 ← *((const byte*) RASTER#0) -- vbuz1=_deref_pbuc1 
     lda RASTER
     sta key
-  //SEG13 [6] if((byte) main::key#0>(byte/signed byte/word/signed word/dword/signed dword) $20) goto main::@6 -- vbuz1_gt_vbuc1_then_la1 
+  //SEG13 [6] if((byte) main::key#0>(byte/signed byte/word/signed word/dword/signed dword) $20) goto main::@2 -- vbuz1_gt_vbuc1_then_la1 
     lda #$20
     cmp key
-    bcc b6_from_b2
-    jmp b9
-  //SEG14 main::@9
-  b9:
-  //SEG15 [7] if((byte) main::key#0<(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6 -- vbuz1_lt_vbuc1_then_la1 
+    bcc b2_from_b1
+    jmp b4
+  //SEG14 main::@4
+  b4:
+  //SEG15 [7] if((byte) main::key#0<(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@2 -- vbuz1_lt_vbuc1_then_la1 
     lda key
     cmp #$40
-    bcc b6_from_b9
-  //SEG16 [8] phi from main::@9 to main::@7 [phi:main::@9->main::@7]
-  b7_from_b9:
-  //SEG17 [8] phi (byte) main::key#2 = (byte) main::key#0 [phi:main::@9->main::@7#0] -- register_copy 
-    jmp b7
-  //SEG18 main::@7
-  b7:
+    bcc b2_from_b4
+  //SEG16 [8] phi from main::@4 to main::@3 [phi:main::@4->main::@3]
+  b3_from_b4:
+  //SEG17 [8] phi (byte) main::key#2 = (byte) main::key#0 [phi:main::@4->main::@3#0] -- register_copy 
+    jmp b3
+  //SEG18 main::@3
+  b3:
   //SEG19 [9] *((const byte*) SCREEN#0) ← (byte) main::key#2 -- _deref_pbuc1=vbuz1 
     lda key
     sta SCREEN
+    jmp b1
+  //SEG20 [10] phi from main::@1 main::@4 to main::@2 [phi:main::@1/main::@4->main::@2]
+  b2_from_b1:
+  b2_from_b4:
     jmp b2
-  //SEG20 [10] phi from main::@2 main::@9 to main::@6 [phi:main::@2/main::@9->main::@6]
-  b6_from_b2:
-  b6_from_b9:
-    jmp b6
-  //SEG21 main::@6
-  b6:
-  //SEG22 [8] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-  //SEG23 [8] phi (byte) main::key#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@7#0] -- vbuz1=vbuc1 
+  //SEG21 main::@2
+  b2:
+  //SEG22 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG23 [8] phi (byte) main::key#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta key
-    jmp b7
+    jmp b3
 }
 
 REGISTER UPLIFT POTENTIAL REGISTERS
@@ -250,65 +254,65 @@ bend_from_b1:
 bend:
 //SEG10 main
 main: {
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] (byte) main::key#0 ← *((const byte*) RASTER#0) -- vbuaa=_deref_pbuc1 
     lda RASTER
-  //SEG13 [6] if((byte) main::key#0>(byte/signed byte/word/signed word/dword/signed dword) $20) goto main::@6 -- vbuaa_gt_vbuc1_then_la1 
+  //SEG13 [6] if((byte) main::key#0>(byte/signed byte/word/signed word/dword/signed dword) $20) goto main::@2 -- vbuaa_gt_vbuc1_then_la1 
     cmp #$20
     beq !+
-    bcs b6_from_b2
+    bcs b2_from_b1
   !:
-    jmp b9
-  //SEG14 main::@9
-  b9:
-  //SEG15 [7] if((byte) main::key#0<(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6 -- vbuaa_lt_vbuc1_then_la1 
+    jmp b4
+  //SEG14 main::@4
+  b4:
+  //SEG15 [7] if((byte) main::key#0<(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@2 -- vbuaa_lt_vbuc1_then_la1 
     cmp #$40
-    bcc b6_from_b9
-  //SEG16 [8] phi from main::@9 to main::@7 [phi:main::@9->main::@7]
-  b7_from_b9:
-  //SEG17 [8] phi (byte) main::key#2 = (byte) main::key#0 [phi:main::@9->main::@7#0] -- register_copy 
-    jmp b7
-  //SEG18 main::@7
-  b7:
+    bcc b2_from_b4
+  //SEG16 [8] phi from main::@4 to main::@3 [phi:main::@4->main::@3]
+  b3_from_b4:
+  //SEG17 [8] phi (byte) main::key#2 = (byte) main::key#0 [phi:main::@4->main::@3#0] -- register_copy 
+    jmp b3
+  //SEG18 main::@3
+  b3:
   //SEG19 [9] *((const byte*) SCREEN#0) ← (byte) main::key#2 -- _deref_pbuc1=vbuaa 
     sta SCREEN
+    jmp b1
+  //SEG20 [10] phi from main::@1 main::@4 to main::@2 [phi:main::@1/main::@4->main::@2]
+  b2_from_b1:
+  b2_from_b4:
     jmp b2
-  //SEG20 [10] phi from main::@2 main::@9 to main::@6 [phi:main::@2/main::@9->main::@6]
-  b6_from_b2:
-  b6_from_b9:
-    jmp b6
-  //SEG21 main::@6
-  b6:
-  //SEG22 [8] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-  //SEG23 [8] phi (byte) main::key#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@7#0] -- vbuaa=vbuc1 
+  //SEG21 main::@2
+  b2:
+  //SEG22 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG23 [8] phi (byte) main::key#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuaa=vbuc1 
     lda #0
-    jmp b7
+    jmp b3
 }
 
 ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp b2
-Removing instruction jmp b9
-Removing instruction jmp b7
-Removing instruction jmp b6
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b6_from_b2 with b6
-Replacing label b6_from_b9 with b6
+Replacing label b2_from_b1 with b2
+Replacing label b2_from_b4 with b2
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
-Removing instruction b7_from_b9:
-Removing instruction b6_from_b2:
-Removing instruction b6_from_b9:
-Removing instruction b7_from_b6:
+Removing instruction b3_from_b4:
+Removing instruction b2_from_b1:
+Removing instruction b2_from_b4:
+Removing instruction b3_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b9:
+Removing instruction b4:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
@@ -325,10 +329,10 @@ FINAL SYMBOL TABLE
 (byte*) SCREEN
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@6
-(label) main::@7
-(label) main::@9
+(label) main::@3
+(label) main::@4
 (byte) main::key
 (byte) main::key#0 reg byte a 14.666666666666666
 (byte) main::key#2 reg byte a 22.0
@@ -357,32 +361,32 @@ Score: 275
 //SEG9 @end
 //SEG10 main
 main: {
-  //SEG11 main::@2
-  b2:
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] (byte) main::key#0 ← *((const byte*) RASTER#0) -- vbuaa=_deref_pbuc1 
     lda RASTER
-  //SEG13 [6] if((byte) main::key#0>(byte/signed byte/word/signed word/dword/signed dword) $20) goto main::@6 -- vbuaa_gt_vbuc1_then_la1 
+  //SEG13 [6] if((byte) main::key#0>(byte/signed byte/word/signed word/dword/signed dword) $20) goto main::@2 -- vbuaa_gt_vbuc1_then_la1 
     cmp #$20
     beq !+
-    bcs b6
+    bcs b2
   !:
-  //SEG14 main::@9
-  //SEG15 [7] if((byte) main::key#0<(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@6 -- vbuaa_lt_vbuc1_then_la1 
+  //SEG14 main::@4
+  //SEG15 [7] if((byte) main::key#0<(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@2 -- vbuaa_lt_vbuc1_then_la1 
     cmp #$40
-    bcc b6
-  //SEG16 [8] phi from main::@9 to main::@7 [phi:main::@9->main::@7]
-  //SEG17 [8] phi (byte) main::key#2 = (byte) main::key#0 [phi:main::@9->main::@7#0] -- register_copy 
-  //SEG18 main::@7
-  b7:
+    bcc b2
+  //SEG16 [8] phi from main::@4 to main::@3 [phi:main::@4->main::@3]
+  //SEG17 [8] phi (byte) main::key#2 = (byte) main::key#0 [phi:main::@4->main::@3#0] -- register_copy 
+  //SEG18 main::@3
+  b3:
   //SEG19 [9] *((const byte*) SCREEN#0) ← (byte) main::key#2 -- _deref_pbuc1=vbuaa 
     sta SCREEN
-    jmp b2
-  //SEG20 [10] phi from main::@2 main::@9 to main::@6 [phi:main::@2/main::@9->main::@6]
-  //SEG21 main::@6
-  b6:
-  //SEG22 [8] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  //SEG23 [8] phi (byte) main::key#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@7#0] -- vbuaa=vbuc1 
+    jmp b1
+  //SEG20 [10] phi from main::@1 main::@4 to main::@2 [phi:main::@1/main::@4->main::@2]
+  //SEG21 main::@2
+  b2:
+  //SEG22 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  //SEG23 [8] phi (byte) main::key#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuaa=vbuc1 
     lda #0
-    jmp b7
+    jmp b3
 }
 
diff --git a/src/test/ref/complex-conditional-problem.sym b/src/test/ref/complex-conditional-problem.sym
index ddb3704f8..ce37fd449 100644
--- a/src/test/ref/complex-conditional-problem.sym
+++ b/src/test/ref/complex-conditional-problem.sym
@@ -6,10 +6,10 @@
 (byte*) SCREEN
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@6
-(label) main::@7
-(label) main::@9
+(label) main::@3
+(label) main::@4
 (byte) main::key
 (byte) main::key#0 reg byte a 14.666666666666666
 (byte) main::key#2 reg byte a 22.0
diff --git a/src/test/ref/complex/tetris/test-sprites.asm b/src/test/ref/complex/tetris/test-sprites.asm
index 22de5120f..ab1608749 100644
--- a/src/test/ref/complex/tetris/test-sprites.asm
+++ b/src/test/ref/complex/tetris/test-sprites.asm
@@ -135,14 +135,14 @@ loop: {
     .label s = 3
     lda #0
     sta sin_idx
-  b6:
+  b2:
     lda #$ff
     cmp RASTER
-    bne b6
+    bne b2
     ldx sin_idx
     lda #4
     sta s
-  b8:
+  b4:
     lda s
     asl
     tay
@@ -153,9 +153,9 @@ loop: {
     inc s
     lda #8
     cmp s
-    bne b8
+    bne b4
     inc sin_idx
-    jmp b6
+    jmp b2
 }
 // Setup the IRQ
 sprites_irq_init: {
@@ -238,10 +238,10 @@ sprites_irq: {
     inx
     // Wait for the y-position before changing sprite pointers
     stx raster_sprite_gfx_modify
-  b11:
+  b8:
     lda RASTER
     cmp raster_sprite_gfx_modify
-    bcc b11
+    bcc b8
     ldx irq_sprite_ptr
     lda render_screen_showing
     cmp #0
@@ -271,7 +271,7 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-  b6:
+  b5:
     // Setup next interrupt
     lda irq_raster_next
     sta RASTER
@@ -294,7 +294,7 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-    jmp b6
+    jmp b5
   b3:
     lax irq_raster_next
     axs #-[$15]
@@ -303,7 +303,7 @@ sprites_irq: {
     sta irq_sprite_ypos
     lda #toSpritePtr2_return
     sta irq_sprite_ptr
-    jmp b6
+    jmp b5
   b1:
     stx PLAYFIELD_SPRITE_PTRS_1
     inx
diff --git a/src/test/ref/complex/tetris/test-sprites.cfg b/src/test/ref/complex/tetris/test-sprites.cfg
index 891226083..182e56b1d 100644
--- a/src/test/ref/complex/tetris/test-sprites.cfg
+++ b/src/test/ref/complex/tetris/test-sprites.cfg
@@ -1,7 +1,7 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] (byte) render_screen_showing#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   kickasm(location (const byte*) PLAYFIELD_SPRITES#0) {{ .var sprites = LoadPicture("playfield-sprites.png", List().add($010101, $000000))
 	// Put the sprites into memory 
@@ -18,19 +18,19 @@
 	  	}
 	}
  }}
-  to:@5
-@5: scope:[]  from @4
+  to:@2
+@2: scope:[]  from @1
   [3] (byte) irq_raster_next#0 ← (const byte) IRQ_RASTER_FIRST#0
   [4] (byte) irq_sprite_ypos#0 ← (const byte) SPRITES_FIRST_YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) $15
   to:toSpritePtr1
-toSpritePtr1: scope:[]  from @5
+toSpritePtr1: scope:[]  from @2
   [5] phi()
-  to:@10
-@10: scope:[]  from toSpritePtr1
+  to:@5
+@5: scope:[]  from toSpritePtr1
   [6] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(byte/signed byte/word/signed word/dword/signed dword) 3
   [7] (byte) irq_cnt#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@7
-@7: scope:[]  from @10
+  to:@3
+@3: scope:[]  from @5
   kickasm(location (const byte*) SIN#0) {{ .var AMPL = 200-21
     .for(var i=0; i<256; i++) {
   	  .byte 51+AMPL/2+sin(toRadians([i*360]/256))*AMPL/2
@@ -38,14 +38,14 @@ toSpritePtr1: scope:[]  from @5
  }}
   kickasm(location (const byte*) SIN_SPRITE#0) {{ .fill $40, $ff
  }}
-  to:@9
-@9: scope:[]  from @7
+  to:@4
+@4: scope:[]  from @3
   [10] phi()
   [11] call main 
   to:@end
-@end: scope:[]  from @9
+@end: scope:[]  from @4
   [12] phi()
-main: scope:[main]  from @9
+main: scope:[main]  from @4
   [13] phi()
   to:main::vicSelectGfxBank1
 main::vicSelectGfxBank1: scope:[main]  from main
@@ -59,18 +59,18 @@ main::vicSelectGfxBank1_@1: scope:[main]  from main::vicSelectGfxBank1_toDd001
   to:main::toD0181
 main::toD0181: scope:[main]  from main::vicSelectGfxBank1_@1
   [17] phi()
-  to:main::@4
-main::@4: scope:[main]  from main::toD0181
+  to:main::@3
+main::@3: scope:[main]  from main::toD0181
   [18] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0
   [19] call sprites_init 
-  to:main::@6
-main::@6: scope:[main]  from main::@4
+  to:main::@5
+main::@5: scope:[main]  from main::@3
   [20] *((const byte*) SPRITES_ENABLE#0) ← (byte/word/signed word/dword/signed dword) $ff
   to:main::@1
-main::@1: scope:[main]  from main::@5 main::@6
-  [21] (byte) main::ypos#2 ← phi( main::@5/(byte) main::ypos#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) $32 )
-  [21] (byte) main::xpos#2 ← phi( main::@5/(byte) main::xpos#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) $18 )
-  [21] (byte) main::s#2 ← phi( main::@5/(byte) main::s#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) 4 )
+main::@1: scope:[main]  from main::@4 main::@5
+  [21] (byte) main::ypos#2 ← phi( main::@4/(byte) main::ypos#1 main::@5/(byte/signed byte/word/signed word/dword/signed dword) $32 )
+  [21] (byte) main::xpos#2 ← phi( main::@4/(byte) main::xpos#1 main::@5/(byte/signed byte/word/signed word/dword/signed dword) $18 )
+  [21] (byte) main::s#2 ← phi( main::@4/(byte) main::s#1 main::@5/(byte/signed byte/word/signed word/dword/signed dword) 4 )
   [22] (byte) main::s2#0 ← (byte) main::s#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [23] *((const byte*) SPRITES_XPOS#0 + (byte) main::s2#0) ← (byte) main::xpos#2
   [24] *((const byte*) SPRITES_YPOS#0 + (byte) main::s2#0) ← (byte) main::ypos#2
@@ -79,47 +79,47 @@ main::@1: scope:[main]  from main::@5 main::@6
   to:main::toSpritePtr2
 main::toSpritePtr2: scope:[main]  from main::@1
   [27] phi()
-  to:main::@5
-main::@5: scope:[main]  from main::toSpritePtr2
+  to:main::@4
+main::@4: scope:[main]  from main::toSpritePtr2
   [28] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0 + (byte) main::s#2) ← (const byte) main::toSpritePtr2_return#0
   [29] (byte) main::xpos#1 ← (byte) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18
   [30] (byte) main::ypos#1 ← (byte) main::ypos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18
   [31] (byte) main::s#1 ← ++ (byte) main::s#2
   [32] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main::@5
+main::@2: scope:[main]  from main::@4
   [33] phi()
   [34] call sprites_irq_init 
-  to:main::@7
-main::@7: scope:[main]  from main::@2
+  to:main::@6
+main::@6: scope:[main]  from main::@2
   [35] phi()
   [36] call loop 
   to:main::@return
-main::@return: scope:[main]  from main::@7
+main::@return: scope:[main]  from main::@6
   [37] return 
   to:@return
-loop: scope:[loop]  from main::@7
+loop: scope:[loop]  from main::@6
   [38] phi()
   to:loop::@1
-loop::@1: scope:[loop]  from loop loop::@9
-  [39] (byte) sin_idx#10 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@9/(byte) sin_idx#3 )
-  to:loop::@6
-loop::@6: scope:[loop]  from loop::@1 loop::@6
-  [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6
-  to:loop::@7
-loop::@7: scope:[loop]  from loop::@6
+loop::@1: scope:[loop]  from loop loop::@5
+  [39] (byte) sin_idx#10 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@5/(byte) sin_idx#3 )
+  to:loop::@2
+loop::@2: scope:[loop]  from loop::@1 loop::@2
+  [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2
+  to:loop::@3
+loop::@3: scope:[loop]  from loop::@2
   [41] (byte) loop::idx#0 ← (byte) sin_idx#10
-  to:loop::@8
-loop::@8: scope:[loop]  from loop::@7 loop::@8
-  [42] (byte) loop::idx#2 ← phi( loop::@7/(byte) loop::idx#0 loop::@8/(byte) loop::idx#1 )
-  [42] (byte) loop::s#2 ← phi( loop::@7/(byte/signed byte/word/signed word/dword/signed dword) 4 loop::@8/(byte) loop::s#1 )
+  to:loop::@4
+loop::@4: scope:[loop]  from loop::@3 loop::@4
+  [42] (byte) loop::idx#2 ← phi( loop::@3/(byte) loop::idx#0 loop::@4/(byte) loop::idx#1 )
+  [42] (byte) loop::s#2 ← phi( loop::@3/(byte/signed byte/word/signed word/dword/signed dword) 4 loop::@4/(byte) loop::s#1 )
   [43] (byte~) loop::$1 ← (byte) loop::s#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [44] *((const byte*) SPRITES_YPOS#0 + (byte~) loop::$1) ← *((const byte*) SIN#0 + (byte) loop::idx#2)
   [45] (byte) loop::idx#1 ← (byte) loop::idx#2 + (byte/signed byte/word/signed word/dword/signed dword) $a
   [46] (byte) loop::s#1 ← ++ (byte) loop::s#2
-  [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@8
-  to:loop::@9
-loop::@9: scope:[loop]  from loop::@8
+  [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@4
+  to:loop::@5
+loop::@5: scope:[loop]  from loop::@4
   [48] (byte) sin_idx#3 ← ++ (byte) sin_idx#10
   to:loop::@1
 sprites_irq_init: scope:[sprites_irq_init]  from main::@2
@@ -138,7 +138,7 @@ sprites_irq_init: scope:[sprites_irq_init]  from main::@2
 sprites_irq_init::@return: scope:[sprites_irq_init]  from sprites_irq_init
   [60] return 
   to:@return
-sprites_init: scope:[sprites_init]  from main::@4
+sprites_init: scope:[sprites_init]  from main::@3
   [61] *((const byte*) SPRITES_ENABLE#0) ← (byte/signed byte/word/signed word/dword/signed dword) $f
   [62] *((const byte*) SPRITES_MC#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [63] *((const byte*) SPRITES_EXPAND_Y#0) ← *((const byte*) SPRITES_MC#0)
@@ -166,15 +166,15 @@ sprites_irq: scope:[sprites_irq]  from
   [78] *((const byte*) SPRITES_YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 6) ← (byte) sprites_irq::ypos#0
   [79] (byte/signed word/word/dword/signed dword~) sprites_irq::$0 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [80] (byte) sprites_irq::raster_sprite_gfx_modify#0 ← (byte/signed word/word/dword/signed dword~) sprites_irq::$0
-  to:sprites_irq::@11
-sprites_irq::@11: scope:[sprites_irq]  from sprites_irq sprites_irq::@11
-  [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11
-  to:sprites_irq::@12
-sprites_irq::@12: scope:[sprites_irq]  from sprites_irq::@11
+  to:sprites_irq::@8
+sprites_irq::@8: scope:[sprites_irq]  from sprites_irq sprites_irq::@8
+  [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8
+  to:sprites_irq::@9
+sprites_irq::@9: scope:[sprites_irq]  from sprites_irq::@8
   [82] (byte) sprites_irq::ptr#0 ← (byte) irq_sprite_ptr#0
   [83] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1
-  to:sprites_irq::@13
-sprites_irq::@13: scope:[sprites_irq]  from sprites_irq::@12
+  to:sprites_irq::@10
+sprites_irq::@10: scope:[sprites_irq]  from sprites_irq::@9
   [84] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0) ← (byte) sprites_irq::ptr#0
   [85] (byte) sprites_irq::ptr#3 ← ++ (byte) sprites_irq::ptr#0
   [86] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) sprites_irq::ptr#3
@@ -182,43 +182,43 @@ sprites_irq::@13: scope:[sprites_irq]  from sprites_irq::@12
   [88] (byte) sprites_irq::ptr#4 ← ++ (byte) sprites_irq::ptr#3
   [89] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte) sprites_irq::ptr#4
   to:sprites_irq::@2
-sprites_irq::@2: scope:[sprites_irq]  from sprites_irq::@1 sprites_irq::@13
+sprites_irq::@2: scope:[sprites_irq]  from sprites_irq::@1 sprites_irq::@10
   [90] (byte) irq_cnt#1 ← ++ (byte) irq_cnt#0
   [91] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) 9) goto sprites_irq::@3
-  to:sprites_irq::@7
-sprites_irq::@7: scope:[sprites_irq]  from sprites_irq::@2
+  to:sprites_irq::@6
+sprites_irq::@6: scope:[sprites_irq]  from sprites_irq::@2
   [92] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) $a) goto sprites_irq::@4
-  to:sprites_irq::@8
-sprites_irq::@8: scope:[sprites_irq]  from sprites_irq::@7
+  to:sprites_irq::@7
+sprites_irq::@7: scope:[sprites_irq]  from sprites_irq::@6
   [93] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14
   [94] (byte) irq_sprite_ypos#3 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [95] (byte) irq_sprite_ptr#3 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3
-  to:sprites_irq::@6
-sprites_irq::@6: scope:[sprites_irq]  from sprites_irq::@15 sprites_irq::@4 sprites_irq::@8
-  [96] (byte) irq_raster_next#4 ← phi( sprites_irq::@15/(byte) irq_raster_next#1 sprites_irq::@4/(byte) irq_raster_next#2 sprites_irq::@8/(byte) irq_raster_next#3 )
+  to:sprites_irq::@5
+sprites_irq::@5: scope:[sprites_irq]  from sprites_irq::@11 sprites_irq::@4 sprites_irq::@7
+  [96] (byte) irq_raster_next#4 ← phi( sprites_irq::@11/(byte) irq_raster_next#1 sprites_irq::@4/(byte) irq_raster_next#2 sprites_irq::@7/(byte) irq_raster_next#3 )
   [97] *((const byte*) RASTER#0) ← (byte) irq_raster_next#4
   [98] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
   to:sprites_irq::@return
-sprites_irq::@return: scope:[sprites_irq]  from sprites_irq::@6
+sprites_irq::@return: scope:[sprites_irq]  from sprites_irq::@5
   [99] return 
   to:@return
-sprites_irq::@4: scope:[sprites_irq]  from sprites_irq::@7
+sprites_irq::@4: scope:[sprites_irq]  from sprites_irq::@6
   [100] (byte) irq_cnt#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [101] (byte) irq_raster_next#2 ← (const byte) IRQ_RASTER_FIRST#0
   [102] (byte) irq_sprite_ypos#2 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [103] (byte) irq_sprite_ptr#2 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3
-  to:sprites_irq::@6
+  to:sprites_irq::@5
 sprites_irq::@3: scope:[sprites_irq]  from sprites_irq::@2
   [104] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [105] (byte) irq_sprite_ypos#1 ← (const byte) SPRITES_FIRST_YPOS#0
   to:sprites_irq::toSpritePtr2
 sprites_irq::toSpritePtr2: scope:[sprites_irq]  from sprites_irq::@3
   [106] phi()
-  to:sprites_irq::@15
-sprites_irq::@15: scope:[sprites_irq]  from sprites_irq::toSpritePtr2
+  to:sprites_irq::@11
+sprites_irq::@11: scope:[sprites_irq]  from sprites_irq::toSpritePtr2
   [107] (byte) irq_sprite_ptr#1 ← (const byte) sprites_irq::toSpritePtr2_return#0
-  to:sprites_irq::@6
-sprites_irq::@1: scope:[sprites_irq]  from sprites_irq::@12
+  to:sprites_irq::@5
+sprites_irq::@1: scope:[sprites_irq]  from sprites_irq::@9
   [108] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0) ← (byte) sprites_irq::ptr#0
   [109] (byte) sprites_irq::ptr#1 ← ++ (byte) sprites_irq::ptr#0
   [110] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) sprites_irq::ptr#1
diff --git a/src/test/ref/complex/tetris/test-sprites.log b/src/test/ref/complex/tetris/test-sprites.log
index 28e07bb0a..7b61f26e6 100644
--- a/src/test/ref/complex/tetris/test-sprites.log
+++ b/src/test/ref/complex/tetris/test-sprites.log
@@ -1547,24 +1547,44 @@ Coalesced down to 9 phi equivalence classes
 Culled Empty Block (label) main::@9
 Culled Empty Block (label) loop::@11
 Culled Empty Block (label) sprites_init::@3
+Renumbering block @4 to @1
+Renumbering block @5 to @2
+Renumbering block @7 to @3
+Renumbering block @9 to @4
+Renumbering block @10 to @5
+Renumbering block sprites_irq::@6 to sprites_irq::@5
+Renumbering block sprites_irq::@7 to sprites_irq::@6
+Renumbering block sprites_irq::@8 to sprites_irq::@7
+Renumbering block sprites_irq::@11 to sprites_irq::@8
+Renumbering block sprites_irq::@12 to sprites_irq::@9
+Renumbering block sprites_irq::@13 to sprites_irq::@10
+Renumbering block sprites_irq::@15 to sprites_irq::@11
+Renumbering block main::@4 to main::@3
+Renumbering block main::@5 to main::@4
+Renumbering block main::@6 to main::@5
+Renumbering block main::@7 to main::@6
+Renumbering block loop::@6 to loop::@2
+Renumbering block loop::@7 to loop::@3
+Renumbering block loop::@8 to loop::@4
+Renumbering block loop::@9 to loop::@5
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of toSpritePtr1
-Adding NOP phi() at start of @9
+Adding NOP phi() at start of @4
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::vicSelectGfxBank1_toDd001
 Adding NOP phi() at start of main::toD0181
 Adding NOP phi() at start of main::toSpritePtr2
 Adding NOP phi() at start of main::@2
-Adding NOP phi() at start of main::@7
+Adding NOP phi() at start of main::@6
 Adding NOP phi() at start of loop
 Adding NOP phi() at start of sprites_irq::toSpritePtr2
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] (byte) render_screen_showing#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   kickasm(location (const byte*) PLAYFIELD_SPRITES#0) {{ .var sprites = LoadPicture("playfield-sprites.png", List().add($010101, $000000))
 	// Put the sprites into memory 
@@ -1581,19 +1601,19 @@ FINAL CONTROL FLOW GRAPH
 	  	}
 	}
  }}
-  to:@5
-@5: scope:[]  from @4
+  to:@2
+@2: scope:[]  from @1
   [3] (byte) irq_raster_next#0 ← (const byte) IRQ_RASTER_FIRST#0
   [4] (byte) irq_sprite_ypos#0 ← (const byte) SPRITES_FIRST_YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) $15
   to:toSpritePtr1
-toSpritePtr1: scope:[]  from @5
+toSpritePtr1: scope:[]  from @2
   [5] phi()
-  to:@10
-@10: scope:[]  from toSpritePtr1
+  to:@5
+@5: scope:[]  from toSpritePtr1
   [6] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(byte/signed byte/word/signed word/dword/signed dword) 3
   [7] (byte) irq_cnt#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@7
-@7: scope:[]  from @10
+  to:@3
+@3: scope:[]  from @5
   kickasm(location (const byte*) SIN#0) {{ .var AMPL = 200-21
     .for(var i=0; i<256; i++) {
   	  .byte 51+AMPL/2+sin(toRadians([i*360]/256))*AMPL/2
@@ -1601,14 +1621,14 @@ toSpritePtr1: scope:[]  from @5
  }}
   kickasm(location (const byte*) SIN_SPRITE#0) {{ .fill $40, $ff
  }}
-  to:@9
-@9: scope:[]  from @7
+  to:@4
+@4: scope:[]  from @3
   [10] phi()
   [11] call main 
   to:@end
-@end: scope:[]  from @9
+@end: scope:[]  from @4
   [12] phi()
-main: scope:[main]  from @9
+main: scope:[main]  from @4
   [13] phi()
   to:main::vicSelectGfxBank1
 main::vicSelectGfxBank1: scope:[main]  from main
@@ -1622,18 +1642,18 @@ main::vicSelectGfxBank1_@1: scope:[main]  from main::vicSelectGfxBank1_toDd001
   to:main::toD0181
 main::toD0181: scope:[main]  from main::vicSelectGfxBank1_@1
   [17] phi()
-  to:main::@4
-main::@4: scope:[main]  from main::toD0181
+  to:main::@3
+main::@3: scope:[main]  from main::toD0181
   [18] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0
   [19] call sprites_init 
-  to:main::@6
-main::@6: scope:[main]  from main::@4
+  to:main::@5
+main::@5: scope:[main]  from main::@3
   [20] *((const byte*) SPRITES_ENABLE#0) ← (byte/word/signed word/dword/signed dword) $ff
   to:main::@1
-main::@1: scope:[main]  from main::@5 main::@6
-  [21] (byte) main::ypos#2 ← phi( main::@5/(byte) main::ypos#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) $32 )
-  [21] (byte) main::xpos#2 ← phi( main::@5/(byte) main::xpos#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) $18 )
-  [21] (byte) main::s#2 ← phi( main::@5/(byte) main::s#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) 4 )
+main::@1: scope:[main]  from main::@4 main::@5
+  [21] (byte) main::ypos#2 ← phi( main::@4/(byte) main::ypos#1 main::@5/(byte/signed byte/word/signed word/dword/signed dword) $32 )
+  [21] (byte) main::xpos#2 ← phi( main::@4/(byte) main::xpos#1 main::@5/(byte/signed byte/word/signed word/dword/signed dword) $18 )
+  [21] (byte) main::s#2 ← phi( main::@4/(byte) main::s#1 main::@5/(byte/signed byte/word/signed word/dword/signed dword) 4 )
   [22] (byte) main::s2#0 ← (byte) main::s#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [23] *((const byte*) SPRITES_XPOS#0 + (byte) main::s2#0) ← (byte) main::xpos#2
   [24] *((const byte*) SPRITES_YPOS#0 + (byte) main::s2#0) ← (byte) main::ypos#2
@@ -1642,47 +1662,47 @@ main::@1: scope:[main]  from main::@5 main::@6
   to:main::toSpritePtr2
 main::toSpritePtr2: scope:[main]  from main::@1
   [27] phi()
-  to:main::@5
-main::@5: scope:[main]  from main::toSpritePtr2
+  to:main::@4
+main::@4: scope:[main]  from main::toSpritePtr2
   [28] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0 + (byte) main::s#2) ← (const byte) main::toSpritePtr2_return#0
   [29] (byte) main::xpos#1 ← (byte) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18
   [30] (byte) main::ypos#1 ← (byte) main::ypos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18
   [31] (byte) main::s#1 ← ++ (byte) main::s#2
   [32] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main::@5
+main::@2: scope:[main]  from main::@4
   [33] phi()
   [34] call sprites_irq_init 
-  to:main::@7
-main::@7: scope:[main]  from main::@2
+  to:main::@6
+main::@6: scope:[main]  from main::@2
   [35] phi()
   [36] call loop 
   to:main::@return
-main::@return: scope:[main]  from main::@7
+main::@return: scope:[main]  from main::@6
   [37] return 
   to:@return
-loop: scope:[loop]  from main::@7
+loop: scope:[loop]  from main::@6
   [38] phi()
   to:loop::@1
-loop::@1: scope:[loop]  from loop loop::@9
-  [39] (byte) sin_idx#10 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@9/(byte) sin_idx#3 )
-  to:loop::@6
-loop::@6: scope:[loop]  from loop::@1 loop::@6
-  [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6
-  to:loop::@7
-loop::@7: scope:[loop]  from loop::@6
+loop::@1: scope:[loop]  from loop loop::@5
+  [39] (byte) sin_idx#10 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@5/(byte) sin_idx#3 )
+  to:loop::@2
+loop::@2: scope:[loop]  from loop::@1 loop::@2
+  [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2
+  to:loop::@3
+loop::@3: scope:[loop]  from loop::@2
   [41] (byte) loop::idx#0 ← (byte) sin_idx#10
-  to:loop::@8
-loop::@8: scope:[loop]  from loop::@7 loop::@8
-  [42] (byte) loop::idx#2 ← phi( loop::@7/(byte) loop::idx#0 loop::@8/(byte) loop::idx#1 )
-  [42] (byte) loop::s#2 ← phi( loop::@7/(byte/signed byte/word/signed word/dword/signed dword) 4 loop::@8/(byte) loop::s#1 )
+  to:loop::@4
+loop::@4: scope:[loop]  from loop::@3 loop::@4
+  [42] (byte) loop::idx#2 ← phi( loop::@3/(byte) loop::idx#0 loop::@4/(byte) loop::idx#1 )
+  [42] (byte) loop::s#2 ← phi( loop::@3/(byte/signed byte/word/signed word/dword/signed dword) 4 loop::@4/(byte) loop::s#1 )
   [43] (byte~) loop::$1 ← (byte) loop::s#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [44] *((const byte*) SPRITES_YPOS#0 + (byte~) loop::$1) ← *((const byte*) SIN#0 + (byte) loop::idx#2)
   [45] (byte) loop::idx#1 ← (byte) loop::idx#2 + (byte/signed byte/word/signed word/dword/signed dword) $a
   [46] (byte) loop::s#1 ← ++ (byte) loop::s#2
-  [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@8
-  to:loop::@9
-loop::@9: scope:[loop]  from loop::@8
+  [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@4
+  to:loop::@5
+loop::@5: scope:[loop]  from loop::@4
   [48] (byte) sin_idx#3 ← ++ (byte) sin_idx#10
   to:loop::@1
 sprites_irq_init: scope:[sprites_irq_init]  from main::@2
@@ -1701,7 +1721,7 @@ sprites_irq_init: scope:[sprites_irq_init]  from main::@2
 sprites_irq_init::@return: scope:[sprites_irq_init]  from sprites_irq_init
   [60] return 
   to:@return
-sprites_init: scope:[sprites_init]  from main::@4
+sprites_init: scope:[sprites_init]  from main::@3
   [61] *((const byte*) SPRITES_ENABLE#0) ← (byte/signed byte/word/signed word/dword/signed dword) $f
   [62] *((const byte*) SPRITES_MC#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [63] *((const byte*) SPRITES_EXPAND_Y#0) ← *((const byte*) SPRITES_MC#0)
@@ -1729,15 +1749,15 @@ sprites_irq: scope:[sprites_irq]  from
   [78] *((const byte*) SPRITES_YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 6) ← (byte) sprites_irq::ypos#0
   [79] (byte/signed word/word/dword/signed dword~) sprites_irq::$0 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [80] (byte) sprites_irq::raster_sprite_gfx_modify#0 ← (byte/signed word/word/dword/signed dword~) sprites_irq::$0
-  to:sprites_irq::@11
-sprites_irq::@11: scope:[sprites_irq]  from sprites_irq sprites_irq::@11
-  [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11
-  to:sprites_irq::@12
-sprites_irq::@12: scope:[sprites_irq]  from sprites_irq::@11
+  to:sprites_irq::@8
+sprites_irq::@8: scope:[sprites_irq]  from sprites_irq sprites_irq::@8
+  [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8
+  to:sprites_irq::@9
+sprites_irq::@9: scope:[sprites_irq]  from sprites_irq::@8
   [82] (byte) sprites_irq::ptr#0 ← (byte) irq_sprite_ptr#0
   [83] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1
-  to:sprites_irq::@13
-sprites_irq::@13: scope:[sprites_irq]  from sprites_irq::@12
+  to:sprites_irq::@10
+sprites_irq::@10: scope:[sprites_irq]  from sprites_irq::@9
   [84] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0) ← (byte) sprites_irq::ptr#0
   [85] (byte) sprites_irq::ptr#3 ← ++ (byte) sprites_irq::ptr#0
   [86] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) sprites_irq::ptr#3
@@ -1745,43 +1765,43 @@ sprites_irq::@13: scope:[sprites_irq]  from sprites_irq::@12
   [88] (byte) sprites_irq::ptr#4 ← ++ (byte) sprites_irq::ptr#3
   [89] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte) sprites_irq::ptr#4
   to:sprites_irq::@2
-sprites_irq::@2: scope:[sprites_irq]  from sprites_irq::@1 sprites_irq::@13
+sprites_irq::@2: scope:[sprites_irq]  from sprites_irq::@1 sprites_irq::@10
   [90] (byte) irq_cnt#1 ← ++ (byte) irq_cnt#0
   [91] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) 9) goto sprites_irq::@3
-  to:sprites_irq::@7
-sprites_irq::@7: scope:[sprites_irq]  from sprites_irq::@2
+  to:sprites_irq::@6
+sprites_irq::@6: scope:[sprites_irq]  from sprites_irq::@2
   [92] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) $a) goto sprites_irq::@4
-  to:sprites_irq::@8
-sprites_irq::@8: scope:[sprites_irq]  from sprites_irq::@7
+  to:sprites_irq::@7
+sprites_irq::@7: scope:[sprites_irq]  from sprites_irq::@6
   [93] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14
   [94] (byte) irq_sprite_ypos#3 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [95] (byte) irq_sprite_ptr#3 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3
-  to:sprites_irq::@6
-sprites_irq::@6: scope:[sprites_irq]  from sprites_irq::@15 sprites_irq::@4 sprites_irq::@8
-  [96] (byte) irq_raster_next#4 ← phi( sprites_irq::@15/(byte) irq_raster_next#1 sprites_irq::@4/(byte) irq_raster_next#2 sprites_irq::@8/(byte) irq_raster_next#3 )
+  to:sprites_irq::@5
+sprites_irq::@5: scope:[sprites_irq]  from sprites_irq::@11 sprites_irq::@4 sprites_irq::@7
+  [96] (byte) irq_raster_next#4 ← phi( sprites_irq::@11/(byte) irq_raster_next#1 sprites_irq::@4/(byte) irq_raster_next#2 sprites_irq::@7/(byte) irq_raster_next#3 )
   [97] *((const byte*) RASTER#0) ← (byte) irq_raster_next#4
   [98] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
   to:sprites_irq::@return
-sprites_irq::@return: scope:[sprites_irq]  from sprites_irq::@6
+sprites_irq::@return: scope:[sprites_irq]  from sprites_irq::@5
   [99] return 
   to:@return
-sprites_irq::@4: scope:[sprites_irq]  from sprites_irq::@7
+sprites_irq::@4: scope:[sprites_irq]  from sprites_irq::@6
   [100] (byte) irq_cnt#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [101] (byte) irq_raster_next#2 ← (const byte) IRQ_RASTER_FIRST#0
   [102] (byte) irq_sprite_ypos#2 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [103] (byte) irq_sprite_ptr#2 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3
-  to:sprites_irq::@6
+  to:sprites_irq::@5
 sprites_irq::@3: scope:[sprites_irq]  from sprites_irq::@2
   [104] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [105] (byte) irq_sprite_ypos#1 ← (const byte) SPRITES_FIRST_YPOS#0
   to:sprites_irq::toSpritePtr2
 sprites_irq::toSpritePtr2: scope:[sprites_irq]  from sprites_irq::@3
   [106] phi()
-  to:sprites_irq::@15
-sprites_irq::@15: scope:[sprites_irq]  from sprites_irq::toSpritePtr2
+  to:sprites_irq::@11
+sprites_irq::@11: scope:[sprites_irq]  from sprites_irq::toSpritePtr2
   [107] (byte) irq_sprite_ptr#1 ← (const byte) sprites_irq::toSpritePtr2_return#0
-  to:sprites_irq::@6
-sprites_irq::@1: scope:[sprites_irq]  from sprites_irq::@12
+  to:sprites_irq::@5
+sprites_irq::@1: scope:[sprites_irq]  from sprites_irq::@9
   [108] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0) ← (byte) sprites_irq::ptr#0
   [109] (byte) sprites_irq::ptr#1 ← ++ (byte) sprites_irq::ptr#0
   [110] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) sprites_irq::ptr#1
@@ -2194,17 +2214,17 @@ INITIAL ASM
   .label sin_idx = 5
 //SEG3 @begin
 bbegin:
-  jmp b4
-//SEG4 @4
-b4:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 [1] (byte) render_screen_showing#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The screen currently being showed to the user. $00 for screen 1 / $40 for screen 2.
   lda #0
   sta render_screen_showing
 //SEG6 kickasm(location (const byte*) PLAYFIELD_SPRITES#0) {{ .var sprites = LoadPicture("playfield-sprites.png", List().add($010101, $000000)) 	// Put the sprites into memory  	.for(var sy=0;sy<10;sy++) { 	    .var sprite_gfx_y = sy*20 		.for(var sx=0;sx<3;sx++) { 	    	.for (var y=0;y<21; y++) { 	    	    .var gfx_y =  sprite_gfx_y + mod(2100+y-sprite_gfx_y,21) 		    	.for (var c=0; c<3; c++) { 	            	.byte sprites.getSinglecolorByte(sx*3+c,gfx_y) 	            } 	        } 	    	.byte 0 	  	} 	}  }}
-  jmp b5
-//SEG7 @5
-b5:
+  jmp b2
+//SEG7 @2
+b2:
 //SEG8 [3] (byte) irq_raster_next#0 ← (const byte) IRQ_RASTER_FIRST#0 -- vbuz1=vbuc1 
   // The raster line of the next IRQ
   lda #IRQ_RASTER_FIRST
@@ -2213,14 +2233,14 @@ b5:
   // Y-pos of the sprites on the next IRQ
   lda #SPRITES_FIRST_YPOS+$15
   sta irq_sprite_ypos
-//SEG10 [5] phi from @5 to toSpritePtr1 [phi:@5->toSpritePtr1]
-toSpritePtr1_from_b5:
+//SEG10 [5] phi from @2 to toSpritePtr1 [phi:@2->toSpritePtr1]
+toSpritePtr1_from_b2:
   jmp toSpritePtr1
 //SEG11 toSpritePtr1
 toSpritePtr1:
-  jmp b10
-//SEG12 @10
-b10:
+  jmp b5
+//SEG12 @5
+b5:
 //SEG13 [6] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuc1 
   // Index of the sprites to show on the next IRQ
   lda #toSpritePtr1_return+3
@@ -2229,22 +2249,22 @@ b10:
   // Counting the 10 IRQs
   lda #0
   sta irq_cnt
-  jmp b7
-//SEG15 @7
-b7:
+  jmp b3
+//SEG15 @3
+b3:
 //SEG16 kickasm(location (const byte*) SIN#0) {{ .var AMPL = 200-21     .for(var i=0; i<256; i++) {   	  .byte 51+AMPL/2+sin(toRadians([i*360]/256))*AMPL/2     }  }}
 //SEG17 kickasm(location (const byte*) SIN_SPRITE#0) {{ .fill $40, $ff  }}
-//SEG18 [10] phi from @7 to @9 [phi:@7->@9]
-b9_from_b7:
-  jmp b9
-//SEG19 @9
-b9:
+//SEG18 [10] phi from @3 to @4 [phi:@3->@4]
+b4_from_b3:
+  jmp b4
+//SEG19 @4
+b4:
 //SEG20 [11] call main 
-//SEG21 [13] phi from @9 to main [phi:@9->main]
-main_from_b9:
+//SEG21 [13] phi from @4 to main [phi:@4->main]
+main_from_b4:
   jsr main
-//SEG22 [12] phi from @9 to @end [phi:@9->@end]
-bend_from_b9:
+//SEG22 [12] phi from @4 to @end [phi:@4->@end]
+bend_from_b4:
   jmp bend
 //SEG23 @end
 bend:
@@ -2280,37 +2300,37 @@ main: {
     jmp toD0181
   //SEG32 main::toD0181
   toD0181:
-    jmp b4
-  //SEG33 main::@4
-  b4:
+    jmp b3
+  //SEG33 main::@3
+  b3:
   //SEG34 [18] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG35 [19] call sprites_init 
     jsr sprites_init
-    jmp b6
-  //SEG36 main::@6
-  b6:
+    jmp b5
+  //SEG36 main::@5
+  b5:
   //SEG37 [20] *((const byte*) SPRITES_ENABLE#0) ← (byte/word/signed word/dword/signed dword) $ff -- _deref_pbuc1=vbuc2 
     lda #$ff
     sta SPRITES_ENABLE
-  //SEG38 [21] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  b1_from_b6:
-  //SEG39 [21] phi (byte) main::ypos#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:main::@6->main::@1#0] -- vbuz1=vbuc1 
+  //SEG38 [21] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG39 [21] phi (byte) main::ypos#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:main::@5->main::@1#0] -- vbuz1=vbuc1 
     lda #$32
     sta ypos
-  //SEG40 [21] phi (byte) main::xpos#2 = (byte/signed byte/word/signed word/dword/signed dword) $18 [phi:main::@6->main::@1#1] -- vbuz1=vbuc1 
+  //SEG40 [21] phi (byte) main::xpos#2 = (byte/signed byte/word/signed word/dword/signed dword) $18 [phi:main::@5->main::@1#1] -- vbuz1=vbuc1 
     lda #$18
     sta xpos
-  //SEG41 [21] phi (byte) main::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:main::@6->main::@1#2] -- vbuz1=vbuc1 
+  //SEG41 [21] phi (byte) main::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:main::@5->main::@1#2] -- vbuz1=vbuc1 
     lda #4
     sta s
     jmp b1
-  //SEG42 [21] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  b1_from_b5:
-  //SEG43 [21] phi (byte) main::ypos#2 = (byte) main::ypos#1 [phi:main::@5->main::@1#0] -- register_copy 
-  //SEG44 [21] phi (byte) main::xpos#2 = (byte) main::xpos#1 [phi:main::@5->main::@1#1] -- register_copy 
-  //SEG45 [21] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@5->main::@1#2] -- register_copy 
+  //SEG42 [21] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG43 [21] phi (byte) main::ypos#2 = (byte) main::ypos#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG44 [21] phi (byte) main::xpos#2 = (byte) main::xpos#1 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG45 [21] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@4->main::@1#2] -- register_copy 
     jmp b1
   //SEG46 main::@1
   b1:
@@ -2339,9 +2359,9 @@ main: {
     jmp toSpritePtr2
   //SEG53 main::toSpritePtr2
   toSpritePtr2:
-    jmp b5
-  //SEG54 main::@5
-  b5:
+    jmp b4
+  //SEG54 main::@4
+  b4:
   //SEG55 [28] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0 + (byte) main::s#2) ← (const byte) main::toSpritePtr2_return#0 -- pbuc1_derefidx_vbuz1=vbuc2 
     lda #toSpritePtr2_return
     ldy s
@@ -2359,22 +2379,22 @@ main: {
   //SEG59 [32] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp s
-    bne b1_from_b5
-  //SEG60 [33] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
-  b2_from_b5:
+    bne b1_from_b4
+  //SEG60 [33] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
     jmp b2
   //SEG61 main::@2
   b2:
   //SEG62 [34] call sprites_irq_init 
     jsr sprites_irq_init
-  //SEG63 [35] phi from main::@2 to main::@7 [phi:main::@2->main::@7]
-  b7_from_b2:
-    jmp b7
-  //SEG64 main::@7
-  b7:
+  //SEG63 [35] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
+  b6_from_b2:
+    jmp b6
+  //SEG64 main::@6
+  b6:
   //SEG65 [36] call loop 
-  //SEG66 [38] phi from main::@7 to loop [phi:main::@7->loop]
-  loop_from_b7:
+  //SEG66 [38] phi from main::@6 to loop [phi:main::@6->loop]
+  loop_from_b6:
     jsr loop
     jmp breturn
   //SEG67 main::@return
@@ -2395,33 +2415,33 @@ loop: {
     jmp b1
   //SEG72 loop::@1
   b1:
-    jmp b6
-  //SEG73 loop::@6
-  b6:
-  //SEG74 [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG73 loop::@2
+  b2:
+  //SEG74 [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b7
-  //SEG75 loop::@7
-  b7:
+    bne b2
+    jmp b3
+  //SEG75 loop::@3
+  b3:
   //SEG76 [41] (byte) loop::idx#0 ← (byte) sin_idx#10 -- vbuz1=vbuz2 
     lda sin_idx
     sta idx
-  //SEG77 [42] phi from loop::@7 to loop::@8 [phi:loop::@7->loop::@8]
-  b8_from_b7:
-  //SEG78 [42] phi (byte) loop::idx#2 = (byte) loop::idx#0 [phi:loop::@7->loop::@8#0] -- register_copy 
-  //SEG79 [42] phi (byte) loop::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:loop::@7->loop::@8#1] -- vbuz1=vbuc1 
+  //SEG77 [42] phi from loop::@3 to loop::@4 [phi:loop::@3->loop::@4]
+  b4_from_b3:
+  //SEG78 [42] phi (byte) loop::idx#2 = (byte) loop::idx#0 [phi:loop::@3->loop::@4#0] -- register_copy 
+  //SEG79 [42] phi (byte) loop::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:loop::@3->loop::@4#1] -- vbuz1=vbuc1 
     lda #4
     sta s
-    jmp b8
-  //SEG80 [42] phi from loop::@8 to loop::@8 [phi:loop::@8->loop::@8]
-  b8_from_b8:
-  //SEG81 [42] phi (byte) loop::idx#2 = (byte) loop::idx#1 [phi:loop::@8->loop::@8#0] -- register_copy 
-  //SEG82 [42] phi (byte) loop::s#2 = (byte) loop::s#1 [phi:loop::@8->loop::@8#1] -- register_copy 
-    jmp b8
-  //SEG83 loop::@8
-  b8:
+    jmp b4
+  //SEG80 [42] phi from loop::@4 to loop::@4 [phi:loop::@4->loop::@4]
+  b4_from_b4:
+  //SEG81 [42] phi (byte) loop::idx#2 = (byte) loop::idx#1 [phi:loop::@4->loop::@4#0] -- register_copy 
+  //SEG82 [42] phi (byte) loop::s#2 = (byte) loop::s#1 [phi:loop::@4->loop::@4#1] -- register_copy 
+    jmp b4
+  //SEG83 loop::@4
+  b4:
   //SEG84 [43] (byte~) loop::$1 ← (byte) loop::s#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_rol_1 
     lda s
     asl
@@ -2437,18 +2457,18 @@ loop: {
     stx idx
   //SEG87 [46] (byte) loop::s#1 ← ++ (byte) loop::s#2 -- vbuz1=_inc_vbuz1 
     inc s
-  //SEG88 [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG88 [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp s
-    bne b8_from_b8
-    jmp b9
-  //SEG89 loop::@9
-  b9:
+    bne b4_from_b4
+    jmp b5
+  //SEG89 loop::@5
+  b5:
   //SEG90 [48] (byte) sin_idx#3 ← ++ (byte) sin_idx#10 -- vbuz1=_inc_vbuz1 
     inc sin_idx
-  //SEG91 [39] phi from loop::@9 to loop::@1 [phi:loop::@9->loop::@1]
-  b1_from_b9:
-  //SEG92 [39] phi (byte) sin_idx#10 = (byte) sin_idx#3 [phi:loop::@9->loop::@1#0] -- register_copy 
+  //SEG91 [39] phi from loop::@5 to loop::@1 [phi:loop::@5->loop::@1]
+  b1_from_b5:
+  //SEG92 [39] phi (byte) sin_idx#10 = (byte) sin_idx#3 [phi:loop::@5->loop::@1#0] -- register_copy 
     jmp b1
 }
 //SEG93 sprites_irq_init
@@ -2607,16 +2627,16 @@ sprites_irq: {
     // Wait for the y-position before changing sprite pointers
     lda _0
     sta raster_sprite_gfx_modify
-    jmp b11
-  //SEG137 sprites_irq::@11
-  b11:
-  //SEG138 [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11 -- _deref_pbuc1_lt_vbuz1_then_la1 
+    jmp b8
+  //SEG137 sprites_irq::@8
+  b8:
+  //SEG138 [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8 -- _deref_pbuc1_lt_vbuz1_then_la1 
     lda RASTER
     cmp raster_sprite_gfx_modify
-    bcc b11
-    jmp b12
-  //SEG139 sprites_irq::@12
-  b12:
+    bcc b8
+    jmp b9
+  //SEG139 sprites_irq::@9
+  b9:
   //SEG140 [82] (byte) sprites_irq::ptr#0 ← (byte) irq_sprite_ptr#0 -- vbuz1=vbuz2 
     lda irq_sprite_ptr
     sta ptr
@@ -2624,9 +2644,9 @@ sprites_irq: {
     lda render_screen_showing
     cmp #0
     beq b1
-    jmp b13
-  //SEG142 sprites_irq::@13
-  b13:
+    jmp b10
+  //SEG142 sprites_irq::@10
+  b10:
   //SEG143 [84] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuz1 
     lda ptr
     sta PLAYFIELD_SPRITE_PTRS_2
@@ -2658,16 +2678,16 @@ sprites_irq: {
     lda #9
     cmp irq_cnt_1
     beq b3
-    jmp b7
-  //SEG152 sprites_irq::@7
-  b7:
+    jmp b6
+  //SEG152 sprites_irq::@6
+  b6:
   //SEG153 [92] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) $a) goto sprites_irq::@4 -- vbuz1_eq_vbuc1_then_la1 
     lda #$a
     cmp irq_cnt_1
     beq b4
-    jmp b8
-  //SEG154 sprites_irq::@8
-  b8:
+    jmp b7
+  //SEG154 sprites_irq::@7
+  b7:
   //SEG155 [93] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_raster_next
     axs #-[$14]
@@ -2680,14 +2700,14 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr_3
-  //SEG158 [96] phi from sprites_irq::@15 sprites_irq::@4 sprites_irq::@8 to sprites_irq::@6 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6]
-  b6_from_b15:
-  b6_from_b4:
-  b6_from_b8:
-  //SEG159 [96] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6#0] -- register_copy 
-    jmp b6
-  //SEG160 sprites_irq::@6
-  b6:
+  //SEG158 [96] phi from sprites_irq::@11 sprites_irq::@4 sprites_irq::@7 to sprites_irq::@5 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5]
+  b5_from_b11:
+  b5_from_b4:
+  b5_from_b7:
+  //SEG159 [96] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5#0] -- register_copy 
+    jmp b5
+  //SEG160 sprites_irq::@5
+  b5:
   //SEG161 [97] *((const byte*) RASTER#0) ← (byte) irq_raster_next#4 -- _deref_pbuc1=vbuz1 
     // Setup next interrupt
     lda irq_raster_next_4
@@ -2723,7 +2743,7 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr_2
-    jmp b6_from_b4
+    jmp b5_from_b4
   //SEG170 sprites_irq::@3
   b3:
   //SEG171 [104] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz2_plus_vbuc1 
@@ -2738,13 +2758,13 @@ sprites_irq: {
     jmp toSpritePtr2
   //SEG174 sprites_irq::toSpritePtr2
   toSpritePtr2:
-    jmp b15
-  //SEG175 sprites_irq::@15
-  b15:
+    jmp b11
+  //SEG175 sprites_irq::@11
+  b11:
   //SEG176 [107] (byte) irq_sprite_ptr#1 ← (const byte) sprites_irq::toSpritePtr2_return#0 -- vbuz1=vbuc1 
     lda #toSpritePtr2_return
     sta irq_sprite_ptr_1
-    jmp b6_from_b15
+    jmp b5_from_b11
   //SEG177 sprites_irq::@1
   b1:
   //SEG178 [108] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuz1 
@@ -2816,7 +2836,7 @@ Statement [25] (byte/signed word/word/dword/signed dword~) main::$6 ← (byte) m
 Statement [28] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0 + (byte) main::s#2) ← (const byte) main::toSpritePtr2_return#0 [ main::s#2 main::xpos#2 main::ypos#2 ] ( main:11 [ main::s#2 main::xpos#2 main::ypos#2 ] ) always clobbers reg byte a 
 Statement [29] (byte) main::xpos#1 ← (byte) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 [ main::s#2 main::ypos#2 main::xpos#1 ] ( main:11 [ main::s#2 main::ypos#2 main::xpos#1 ] ) always clobbers reg byte a 
 Statement [30] (byte) main::ypos#1 ← (byte) main::ypos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 [ main::s#2 main::xpos#1 main::ypos#1 ] ( main:11 [ main::s#2 main::xpos#1 main::ypos#1 ] ) always clobbers reg byte a 
-Statement [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 [ sin_idx#10 ] ( main:11::loop:36 [ sin_idx#10 ] ) always clobbers reg byte a 
+Statement [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 [ sin_idx#10 ] ( main:11::loop:36 [ sin_idx#10 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:5 [ sin_idx#10 sin_idx#3 ]
 Statement [43] (byte~) loop::$1 ← (byte) loop::s#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 [ sin_idx#10 loop::s#2 loop::idx#2 loop::$1 ] ( main:11::loop:36 [ sin_idx#10 loop::s#2 loop::idx#2 loop::$1 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:6 [ loop::s#2 loop::s#1 ]
@@ -2842,7 +2862,7 @@ Removing always clobbered register reg byte a as potential for zp ZP_BYTE:9 [ sp
 Statement [67] *((const byte*) SPRITES_XPOS#0 + (byte) sprites_init::s2#0) ← (byte) sprites_init::xpos#2 [ sprites_init::s#2 sprites_init::xpos#2 ] ( main:11::sprites_init:19 [ sprites_init::s#2 sprites_init::xpos#2 ] ) always clobbers reg byte a 
 Statement [68] *((const byte*) SPRITES_COLS#0 + (byte) sprites_init::s#2) ← (const byte) BLACK#0 [ sprites_init::s#2 sprites_init::xpos#2 ] ( main:11::sprites_init:19 [ sprites_init::s#2 sprites_init::xpos#2 ] ) always clobbers reg byte a 
 Statement [69] (byte) sprites_init::xpos#1 ← (byte) sprites_init::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 [ sprites_init::s#2 sprites_init::xpos#1 ] ( main:11::sprites_init:19 [ sprites_init::s#2 sprites_init::xpos#1 ] ) always clobbers reg byte a 
-Statement [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11 [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] (  [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] ) always clobbers reg byte a 
+Statement [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8 [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] (  [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] ) always clobbers reg byte a 
 Statement [83] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::ptr#0 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::ptr#0 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:23 [ sprites_irq::ptr#0 ]
 Statement [90] (byte) irq_cnt#1 ← ++ (byte) irq_cnt#0 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] ) always clobbers reg byte y 
@@ -2877,7 +2897,7 @@ Statement [25] (byte/signed word/word/dword/signed dword~) main::$6 ← (byte) m
 Statement [28] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0 + (byte) main::s#2) ← (const byte) main::toSpritePtr2_return#0 [ main::s#2 main::xpos#2 main::ypos#2 ] ( main:11 [ main::s#2 main::xpos#2 main::ypos#2 ] ) always clobbers reg byte a 
 Statement [29] (byte) main::xpos#1 ← (byte) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 [ main::s#2 main::ypos#2 main::xpos#1 ] ( main:11 [ main::s#2 main::ypos#2 main::xpos#1 ] ) always clobbers reg byte a 
 Statement [30] (byte) main::ypos#1 ← (byte) main::ypos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 [ main::s#2 main::xpos#1 main::ypos#1 ] ( main:11 [ main::s#2 main::xpos#1 main::ypos#1 ] ) always clobbers reg byte a 
-Statement [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 [ sin_idx#10 ] ( main:11::loop:36 [ sin_idx#10 ] ) always clobbers reg byte a 
+Statement [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 [ sin_idx#10 ] ( main:11::loop:36 [ sin_idx#10 ] ) always clobbers reg byte a 
 Statement [43] (byte~) loop::$1 ← (byte) loop::s#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 [ sin_idx#10 loop::s#2 loop::idx#2 loop::$1 ] ( main:11::loop:36 [ sin_idx#10 loop::s#2 loop::idx#2 loop::$1 ] ) always clobbers reg byte a 
 Statement [44] *((const byte*) SPRITES_YPOS#0 + (byte~) loop::$1) ← *((const byte*) SIN#0 + (byte) loop::idx#2) [ sin_idx#10 loop::s#2 loop::idx#2 ] ( main:11::loop:36 [ sin_idx#10 loop::s#2 loop::idx#2 ] ) always clobbers reg byte a 
 Statement [45] (byte) loop::idx#1 ← (byte) loop::idx#2 + (byte/signed byte/word/signed word/dword/signed dword) $a [ sin_idx#10 loop::s#2 loop::idx#1 ] ( main:11::loop:36 [ sin_idx#10 loop::s#2 loop::idx#1 ] ) always clobbers reg byte a 
@@ -2898,7 +2918,7 @@ Statement [66] (byte) sprites_init::s2#0 ← (byte) sprites_init::s#2 << (byte/s
 Statement [67] *((const byte*) SPRITES_XPOS#0 + (byte) sprites_init::s2#0) ← (byte) sprites_init::xpos#2 [ sprites_init::s#2 sprites_init::xpos#2 ] ( main:11::sprites_init:19 [ sprites_init::s#2 sprites_init::xpos#2 ] ) always clobbers reg byte a 
 Statement [68] *((const byte*) SPRITES_COLS#0 + (byte) sprites_init::s#2) ← (const byte) BLACK#0 [ sprites_init::s#2 sprites_init::xpos#2 ] ( main:11::sprites_init:19 [ sprites_init::s#2 sprites_init::xpos#2 ] ) always clobbers reg byte a 
 Statement [69] (byte) sprites_init::xpos#1 ← (byte) sprites_init::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 [ sprites_init::s#2 sprites_init::xpos#1 ] ( main:11::sprites_init:19 [ sprites_init::s#2 sprites_init::xpos#1 ] ) always clobbers reg byte a 
-Statement [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11 [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] (  [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] ) always clobbers reg byte a 
+Statement [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8 [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] (  [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] ) always clobbers reg byte a 
 Statement [83] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::ptr#0 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::ptr#0 ] ) always clobbers reg byte a 
 Statement [90] (byte) irq_cnt#1 ← ++ (byte) irq_cnt#0 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] ) always clobbers reg byte y 
 Statement [91] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) 9) goto sprites_irq::@3 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] ) always clobbers reg byte a 
@@ -3113,17 +3133,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label sin_idx = 2
 //SEG3 @begin
 bbegin:
-  jmp b4
-//SEG4 @4
-b4:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 [1] (byte) render_screen_showing#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The screen currently being showed to the user. $00 for screen 1 / $40 for screen 2.
   lda #0
   sta render_screen_showing
 //SEG6 kickasm(location (const byte*) PLAYFIELD_SPRITES#0) {{ .var sprites = LoadPicture("playfield-sprites.png", List().add($010101, $000000)) 	// Put the sprites into memory  	.for(var sy=0;sy<10;sy++) { 	    .var sprite_gfx_y = sy*20 		.for(var sx=0;sx<3;sx++) { 	    	.for (var y=0;y<21; y++) { 	    	    .var gfx_y =  sprite_gfx_y + mod(2100+y-sprite_gfx_y,21) 		    	.for (var c=0; c<3; c++) { 	            	.byte sprites.getSinglecolorByte(sx*3+c,gfx_y) 	            } 	        } 	    	.byte 0 	  	} 	}  }}
-  jmp b5
-//SEG7 @5
-b5:
+  jmp b2
+//SEG7 @2
+b2:
 //SEG8 [3] (byte) irq_raster_next#0 ← (const byte) IRQ_RASTER_FIRST#0 -- vbuz1=vbuc1 
   // The raster line of the next IRQ
   lda #IRQ_RASTER_FIRST
@@ -3132,14 +3152,14 @@ b5:
   // Y-pos of the sprites on the next IRQ
   lda #SPRITES_FIRST_YPOS+$15
   sta irq_sprite_ypos
-//SEG10 [5] phi from @5 to toSpritePtr1 [phi:@5->toSpritePtr1]
-toSpritePtr1_from_b5:
+//SEG10 [5] phi from @2 to toSpritePtr1 [phi:@2->toSpritePtr1]
+toSpritePtr1_from_b2:
   jmp toSpritePtr1
 //SEG11 toSpritePtr1
 toSpritePtr1:
-  jmp b10
-//SEG12 @10
-b10:
+  jmp b5
+//SEG12 @5
+b5:
 //SEG13 [6] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuc1 
   // Index of the sprites to show on the next IRQ
   lda #toSpritePtr1_return+3
@@ -3148,22 +3168,22 @@ b10:
   // Counting the 10 IRQs
   lda #0
   sta irq_cnt
-  jmp b7
-//SEG15 @7
-b7:
+  jmp b3
+//SEG15 @3
+b3:
 //SEG16 kickasm(location (const byte*) SIN#0) {{ .var AMPL = 200-21     .for(var i=0; i<256; i++) {   	  .byte 51+AMPL/2+sin(toRadians([i*360]/256))*AMPL/2     }  }}
 //SEG17 kickasm(location (const byte*) SIN_SPRITE#0) {{ .fill $40, $ff  }}
-//SEG18 [10] phi from @7 to @9 [phi:@7->@9]
-b9_from_b7:
-  jmp b9
-//SEG19 @9
-b9:
+//SEG18 [10] phi from @3 to @4 [phi:@3->@4]
+b4_from_b3:
+  jmp b4
+//SEG19 @4
+b4:
 //SEG20 [11] call main 
-//SEG21 [13] phi from @9 to main [phi:@9->main]
-main_from_b9:
+//SEG21 [13] phi from @4 to main [phi:@4->main]
+main_from_b4:
   jsr main
-//SEG22 [12] phi from @9 to @end [phi:@9->@end]
-bend_from_b9:
+//SEG22 [12] phi from @4 to @end [phi:@4->@end]
+bend_from_b4:
   jmp bend
 //SEG23 @end
 bend:
@@ -3196,36 +3216,36 @@ main: {
     jmp toD0181
   //SEG32 main::toD0181
   toD0181:
-    jmp b4
-  //SEG33 main::@4
-  b4:
+    jmp b3
+  //SEG33 main::@3
+  b3:
   //SEG34 [18] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG35 [19] call sprites_init 
     jsr sprites_init
-    jmp b6
-  //SEG36 main::@6
-  b6:
+    jmp b5
+  //SEG36 main::@5
+  b5:
   //SEG37 [20] *((const byte*) SPRITES_ENABLE#0) ← (byte/word/signed word/dword/signed dword) $ff -- _deref_pbuc1=vbuc2 
     lda #$ff
     sta SPRITES_ENABLE
-  //SEG38 [21] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  b1_from_b6:
-  //SEG39 [21] phi (byte) main::ypos#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:main::@6->main::@1#0] -- vbuz1=vbuc1 
+  //SEG38 [21] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG39 [21] phi (byte) main::ypos#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:main::@5->main::@1#0] -- vbuz1=vbuc1 
     lda #$32
     sta ypos
-  //SEG40 [21] phi (byte) main::xpos#2 = (byte/signed byte/word/signed word/dword/signed dword) $18 [phi:main::@6->main::@1#1] -- vbuz1=vbuc1 
+  //SEG40 [21] phi (byte) main::xpos#2 = (byte/signed byte/word/signed word/dword/signed dword) $18 [phi:main::@5->main::@1#1] -- vbuz1=vbuc1 
     lda #$18
     sta xpos
-  //SEG41 [21] phi (byte) main::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:main::@6->main::@1#2] -- vbuyy=vbuc1 
+  //SEG41 [21] phi (byte) main::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:main::@5->main::@1#2] -- vbuyy=vbuc1 
     ldy #4
     jmp b1
-  //SEG42 [21] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  b1_from_b5:
-  //SEG43 [21] phi (byte) main::ypos#2 = (byte) main::ypos#1 [phi:main::@5->main::@1#0] -- register_copy 
-  //SEG44 [21] phi (byte) main::xpos#2 = (byte) main::xpos#1 [phi:main::@5->main::@1#1] -- register_copy 
-  //SEG45 [21] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@5->main::@1#2] -- register_copy 
+  //SEG42 [21] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG43 [21] phi (byte) main::ypos#2 = (byte) main::ypos#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG44 [21] phi (byte) main::xpos#2 = (byte) main::xpos#1 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG45 [21] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@4->main::@1#2] -- register_copy 
     jmp b1
   //SEG46 main::@1
   b1:
@@ -3250,9 +3270,9 @@ main: {
     jmp toSpritePtr2
   //SEG53 main::toSpritePtr2
   toSpritePtr2:
-    jmp b5
-  //SEG54 main::@5
-  b5:
+    jmp b4
+  //SEG54 main::@4
+  b4:
   //SEG55 [28] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0 + (byte) main::s#2) ← (const byte) main::toSpritePtr2_return#0 -- pbuc1_derefidx_vbuyy=vbuc2 
     lda #toSpritePtr2_return
     sta PLAYFIELD_SPRITE_PTRS_1,y
@@ -3268,22 +3288,22 @@ main: {
     iny
   //SEG59 [32] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1 -- vbuyy_neq_vbuc1_then_la1 
     cpy #8
-    bne b1_from_b5
-  //SEG60 [33] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
-  b2_from_b5:
+    bne b1_from_b4
+  //SEG60 [33] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
     jmp b2
   //SEG61 main::@2
   b2:
   //SEG62 [34] call sprites_irq_init 
     jsr sprites_irq_init
-  //SEG63 [35] phi from main::@2 to main::@7 [phi:main::@2->main::@7]
-  b7_from_b2:
-    jmp b7
-  //SEG64 main::@7
-  b7:
+  //SEG63 [35] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
+  b6_from_b2:
+    jmp b6
+  //SEG64 main::@6
+  b6:
   //SEG65 [36] call loop 
-  //SEG66 [38] phi from main::@7 to loop [phi:main::@7->loop]
-  loop_from_b7:
+  //SEG66 [38] phi from main::@6 to loop [phi:main::@6->loop]
+  loop_from_b6:
     jsr loop
     jmp breturn
   //SEG67 main::@return
@@ -3302,32 +3322,32 @@ loop: {
     jmp b1
   //SEG72 loop::@1
   b1:
-    jmp b6
-  //SEG73 loop::@6
-  b6:
-  //SEG74 [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG73 loop::@2
+  b2:
+  //SEG74 [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b7
-  //SEG75 loop::@7
-  b7:
+    bne b2
+    jmp b3
+  //SEG75 loop::@3
+  b3:
   //SEG76 [41] (byte) loop::idx#0 ← (byte) sin_idx#10 -- vbuxx=vbuz1 
     ldx sin_idx
-  //SEG77 [42] phi from loop::@7 to loop::@8 [phi:loop::@7->loop::@8]
-  b8_from_b7:
-  //SEG78 [42] phi (byte) loop::idx#2 = (byte) loop::idx#0 [phi:loop::@7->loop::@8#0] -- register_copy 
-  //SEG79 [42] phi (byte) loop::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:loop::@7->loop::@8#1] -- vbuz1=vbuc1 
+  //SEG77 [42] phi from loop::@3 to loop::@4 [phi:loop::@3->loop::@4]
+  b4_from_b3:
+  //SEG78 [42] phi (byte) loop::idx#2 = (byte) loop::idx#0 [phi:loop::@3->loop::@4#0] -- register_copy 
+  //SEG79 [42] phi (byte) loop::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:loop::@3->loop::@4#1] -- vbuz1=vbuc1 
     lda #4
     sta s
-    jmp b8
-  //SEG80 [42] phi from loop::@8 to loop::@8 [phi:loop::@8->loop::@8]
-  b8_from_b8:
-  //SEG81 [42] phi (byte) loop::idx#2 = (byte) loop::idx#1 [phi:loop::@8->loop::@8#0] -- register_copy 
-  //SEG82 [42] phi (byte) loop::s#2 = (byte) loop::s#1 [phi:loop::@8->loop::@8#1] -- register_copy 
-    jmp b8
-  //SEG83 loop::@8
-  b8:
+    jmp b4
+  //SEG80 [42] phi from loop::@4 to loop::@4 [phi:loop::@4->loop::@4]
+  b4_from_b4:
+  //SEG81 [42] phi (byte) loop::idx#2 = (byte) loop::idx#1 [phi:loop::@4->loop::@4#0] -- register_copy 
+  //SEG82 [42] phi (byte) loop::s#2 = (byte) loop::s#1 [phi:loop::@4->loop::@4#1] -- register_copy 
+    jmp b4
+  //SEG83 loop::@4
+  b4:
   //SEG84 [43] (byte~) loop::$1 ← (byte) loop::s#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_rol_1 
     lda s
     asl
@@ -3340,18 +3360,18 @@ loop: {
     axs #-[$a]
   //SEG87 [46] (byte) loop::s#1 ← ++ (byte) loop::s#2 -- vbuz1=_inc_vbuz1 
     inc s
-  //SEG88 [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG88 [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp s
-    bne b8_from_b8
-    jmp b9
-  //SEG89 loop::@9
-  b9:
+    bne b4_from_b4
+    jmp b5
+  //SEG89 loop::@5
+  b5:
   //SEG90 [48] (byte) sin_idx#3 ← ++ (byte) sin_idx#10 -- vbuz1=_inc_vbuz1 
     inc sin_idx
-  //SEG91 [39] phi from loop::@9 to loop::@1 [phi:loop::@9->loop::@1]
-  b1_from_b9:
-  //SEG92 [39] phi (byte) sin_idx#10 = (byte) sin_idx#3 [phi:loop::@9->loop::@1#0] -- register_copy 
+  //SEG91 [39] phi from loop::@5 to loop::@1 [phi:loop::@5->loop::@1]
+  b1_from_b5:
+  //SEG92 [39] phi (byte) sin_idx#10 = (byte) sin_idx#3 [phi:loop::@5->loop::@1#0] -- register_copy 
     jmp b1
 }
 //SEG93 sprites_irq_init
@@ -3489,25 +3509,25 @@ sprites_irq: {
   //SEG136 [80] (byte) sprites_irq::raster_sprite_gfx_modify#0 ← (byte/signed word/word/dword/signed dword~) sprites_irq::$0 -- vbuz1=vbuxx 
     // Wait for the y-position before changing sprite pointers
     stx raster_sprite_gfx_modify
-    jmp b11
-  //SEG137 sprites_irq::@11
-  b11:
-  //SEG138 [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11 -- _deref_pbuc1_lt_vbuz1_then_la1 
+    jmp b8
+  //SEG137 sprites_irq::@8
+  b8:
+  //SEG138 [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8 -- _deref_pbuc1_lt_vbuz1_then_la1 
     lda RASTER
     cmp raster_sprite_gfx_modify
-    bcc b11
-    jmp b12
-  //SEG139 sprites_irq::@12
-  b12:
+    bcc b8
+    jmp b9
+  //SEG139 sprites_irq::@9
+  b9:
   //SEG140 [82] (byte) sprites_irq::ptr#0 ← (byte) irq_sprite_ptr#0 -- vbuxx=vbuz1 
     ldx irq_sprite_ptr
   //SEG141 [83] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1 -- vbuz1_eq_0_then_la1 
     lda render_screen_showing
     cmp #0
     beq b1
-    jmp b13
-  //SEG142 sprites_irq::@13
-  b13:
+    jmp b10
+  //SEG142 sprites_irq::@10
+  b10:
   //SEG143 [84] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuxx 
     stx PLAYFIELD_SPRITE_PTRS_2
   //SEG144 [85] (byte) sprites_irq::ptr#3 ← ++ (byte) sprites_irq::ptr#0 -- vbuaa=_inc_vbuxx 
@@ -3531,16 +3551,16 @@ sprites_irq: {
     lda #9
     cmp irq_cnt
     beq b3
-    jmp b7
-  //SEG152 sprites_irq::@7
-  b7:
+    jmp b6
+  //SEG152 sprites_irq::@6
+  b6:
   //SEG153 [92] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) $a) goto sprites_irq::@4 -- vbuz1_eq_vbuc1_then_la1 
     lda #$a
     cmp irq_cnt
     beq b4
-    jmp b8
-  //SEG154 sprites_irq::@8
-  b8:
+    jmp b7
+  //SEG154 sprites_irq::@7
+  b7:
   //SEG155 [93] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
     axs #-[$14]
@@ -3553,14 +3573,14 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-  //SEG158 [96] phi from sprites_irq::@15 sprites_irq::@4 sprites_irq::@8 to sprites_irq::@6 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6]
-  b6_from_b15:
-  b6_from_b4:
-  b6_from_b8:
-  //SEG159 [96] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6#0] -- register_copy 
-    jmp b6
-  //SEG160 sprites_irq::@6
-  b6:
+  //SEG158 [96] phi from sprites_irq::@11 sprites_irq::@4 sprites_irq::@7 to sprites_irq::@5 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5]
+  b5_from_b11:
+  b5_from_b4:
+  b5_from_b7:
+  //SEG159 [96] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5#0] -- register_copy 
+    jmp b5
+  //SEG160 sprites_irq::@5
+  b5:
   //SEG161 [97] *((const byte*) RASTER#0) ← (byte) irq_raster_next#4 -- _deref_pbuc1=vbuz1 
     // Setup next interrupt
     lda irq_raster_next
@@ -3594,7 +3614,7 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-    jmp b6_from_b4
+    jmp b5_from_b4
   //SEG170 sprites_irq::@3
   b3:
   //SEG171 [104] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
@@ -3609,13 +3629,13 @@ sprites_irq: {
     jmp toSpritePtr2
   //SEG174 sprites_irq::toSpritePtr2
   toSpritePtr2:
-    jmp b15
-  //SEG175 sprites_irq::@15
-  b15:
+    jmp b11
+  //SEG175 sprites_irq::@11
+  b11:
   //SEG176 [107] (byte) irq_sprite_ptr#1 ← (const byte) sprites_irq::toSpritePtr2_return#0 -- vbuz1=vbuc1 
     lda #toSpritePtr2_return
     sta irq_sprite_ptr
-    jmp b6_from_b15
+    jmp b5_from_b11
   //SEG177 sprites_irq::@1
   b1:
   //SEG178 [108] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuxx 
@@ -3660,118 +3680,118 @@ sprites_irq: {
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b4
-Removing instruction jmp b5
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp toSpritePtr1
-Removing instruction jmp b10
-Removing instruction jmp b7
-Removing instruction jmp b9
+Removing instruction jmp b5
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp bend
 Removing instruction jmp vicSelectGfxBank1
 Removing instruction jmp vicSelectGfxBank1_toDd001
 Removing instruction jmp vicSelectGfxBank1_b1
 Removing instruction jmp toD0181
-Removing instruction jmp b4
-Removing instruction jmp b6
+Removing instruction jmp b3
+Removing instruction jmp b5
 Removing instruction jmp b1
 Removing instruction jmp toSpritePtr2
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp b2
-Removing instruction jmp b7
+Removing instruction jmp b6
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b6
-Removing instruction jmp b7
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
 Removing instruction jmp b8
 Removing instruction jmp b9
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b11
-Removing instruction jmp b12
-Removing instruction jmp b13
+Removing instruction jmp b10
 Removing instruction jmp b2
-Removing instruction jmp b7
-Removing instruction jmp b8
 Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b5
 Removing instruction jmp breturn
 Removing instruction jmp toSpritePtr2
-Removing instruction jmp b15
+Removing instruction jmp b11
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda SPRITES_MC
 Removing instruction lda SPRITES_EXPAND_Y
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b1_from_b5 with b1
-Replacing label b8_from_b8 with b8
-Replacing label b1 with b6
+Replacing label b1_from_b4 with b1
+Replacing label b4_from_b4 with b4
+Replacing label b1 with b2
 Replacing label b1_from_b1 with b1
-Replacing label b6_from_b4 with b6
-Replacing label b6_from_b15 with b6
-Removing instruction b4:
-Removing instruction toSpritePtr1_from_b5:
+Replacing label b5_from_b4 with b5
+Replacing label b5_from_b11 with b5
+Removing instruction b1:
+Removing instruction toSpritePtr1_from_b2:
 Removing instruction toSpritePtr1:
-Removing instruction b7:
-Removing instruction b9_from_b7:
-Removing instruction main_from_b9:
-Removing instruction bend_from_b9:
+Removing instruction b3:
+Removing instruction b4_from_b3:
+Removing instruction main_from_b4:
+Removing instruction bend_from_b4:
 Removing instruction vicSelectGfxBank1_toDd001_from_vicSelectGfxBank1:
 Removing instruction vicSelectGfxBank1_toDd001:
 Removing instruction toD0181_from_vicSelectGfxBank1_b1:
 Removing instruction toD0181:
-Removing instruction b1_from_b5:
+Removing instruction b1_from_b4:
 Removing instruction toSpritePtr2_from_b1:
 Removing instruction toSpritePtr2:
-Removing instruction b2_from_b5:
-Removing instruction b7_from_b2:
-Removing instruction loop_from_b7:
+Removing instruction b2_from_b4:
+Removing instruction b6_from_b2:
+Removing instruction loop_from_b6:
 Removing instruction b1:
-Removing instruction b8_from_b8:
+Removing instruction b4_from_b4:
 Removing instruction b1_from_b1:
-Removing instruction b6_from_b15:
-Removing instruction b6_from_b4:
-Removing instruction b6_from_b8:
+Removing instruction b5_from_b11:
+Removing instruction b5_from_b4:
+Removing instruction b5_from_b7:
 Removing instruction breturn:
 Removing instruction toSpritePtr2_from_b3:
 Removing instruction toSpritePtr2:
 Succesful ASM optimization Pass5RedundantLabelElimination
+Removing instruction b2:
 Removing instruction b5:
-Removing instruction b10:
-Removing instruction b9:
+Removing instruction b4:
 Removing instruction bend:
 Removing instruction vicSelectGfxBank1:
 Removing instruction vicSelectGfxBank1_b1:
-Removing instruction b4:
-Removing instruction b6:
-Removing instruction b1_from_b6:
+Removing instruction b3:
 Removing instruction b5:
+Removing instruction b1_from_b5:
+Removing instruction b4:
 Removing instruction b2:
-Removing instruction b7:
+Removing instruction b6:
 Removing instruction breturn:
 Removing instruction b1_from_loop:
-Removing instruction b7:
-Removing instruction b8_from_b7:
-Removing instruction b9:
-Removing instruction b1_from_b9:
+Removing instruction b3:
+Removing instruction b4_from_b3:
+Removing instruction b5:
+Removing instruction b1_from_b5:
 Removing instruction breturn:
 Removing instruction b1_from_sprites_init:
 Removing instruction breturn:
-Removing instruction b12:
-Removing instruction b13:
+Removing instruction b9:
+Removing instruction b10:
+Removing instruction b6:
 Removing instruction b7:
-Removing instruction b8:
-Removing instruction b15:
+Removing instruction b11:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing instruction jmp b1
-Removing instruction jmp b8
+Removing instruction jmp b4
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 
 FINAL SYMBOL TABLE
-(label) @10
+(label) @1
+(label) @2
+(label) @3
 (label) @4
 (label) @5
-(label) @7
-(label) @9
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -3934,10 +3954,10 @@ FINAL SYMBOL TABLE
 (void()) loop()
 (byte~) loop::$1 reg byte a 202.0
 (label) loop::@1
-(label) loop::@6
-(label) loop::@7
-(label) loop::@8
-(label) loop::@9
+(label) loop::@2
+(label) loop::@3
+(label) loop::@4
+(label) loop::@5
 (byte) loop::idx
 (byte) loop::idx#0 reg byte x 22.0
 (byte) loop::idx#1 reg byte x 67.33333333333333
@@ -3949,10 +3969,10 @@ FINAL SYMBOL TABLE
 (byte/signed word/word/dword/signed dword~) main::$6 reg byte a 22.0
 (label) main::@1
 (label) main::@2
+(label) main::@3
 (label) main::@4
 (label) main::@5
 (label) main::@6
-(label) main::@7
 (label) main::@return
 (byte) main::s
 (byte) main::s#1 reg byte y 16.5
@@ -4021,16 +4041,16 @@ FINAL SYMBOL TABLE
 interrupt(HARDWARE_CLOBBER)(void()) sprites_irq()
 (byte/signed word/word/dword/signed dword~) sprites_irq::$0 reg byte x 4.0
 (label) sprites_irq::@1
+(label) sprites_irq::@10
 (label) sprites_irq::@11
-(label) sprites_irq::@12
-(label) sprites_irq::@13
-(label) sprites_irq::@15
 (label) sprites_irq::@2
 (label) sprites_irq::@3
 (label) sprites_irq::@4
+(label) sprites_irq::@5
 (label) sprites_irq::@6
 (label) sprites_irq::@7
 (label) sprites_irq::@8
+(label) sprites_irq::@9
 (label) sprites_irq::@return
 (byte) sprites_irq::ptr
 (byte) sprites_irq::ptr#0 reg byte x 2.5
@@ -4160,13 +4180,13 @@ Score: 7304
   .label sin_idx = 2
 //SEG3 @begin
 bbegin:
-//SEG4 @4
+//SEG4 @1
 //SEG5 [1] (byte) render_screen_showing#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The screen currently being showed to the user. $00 for screen 1 / $40 for screen 2.
   lda #0
   sta render_screen_showing
 //SEG6 kickasm(location (const byte*) PLAYFIELD_SPRITES#0) {{ .var sprites = LoadPicture("playfield-sprites.png", List().add($010101, $000000)) 	// Put the sprites into memory  	.for(var sy=0;sy<10;sy++) { 	    .var sprite_gfx_y = sy*20 		.for(var sx=0;sx<3;sx++) { 	    	.for (var y=0;y<21; y++) { 	    	    .var gfx_y =  sprite_gfx_y + mod(2100+y-sprite_gfx_y,21) 		    	.for (var c=0; c<3; c++) { 	            	.byte sprites.getSinglecolorByte(sx*3+c,gfx_y) 	            } 	        } 	    	.byte 0 	  	} 	}  }}
-//SEG7 @5
+//SEG7 @2
 //SEG8 [3] (byte) irq_raster_next#0 ← (const byte) IRQ_RASTER_FIRST#0 -- vbuz1=vbuc1 
   // The raster line of the next IRQ
   lda #IRQ_RASTER_FIRST
@@ -4175,9 +4195,9 @@ bbegin:
   // Y-pos of the sprites on the next IRQ
   lda #SPRITES_FIRST_YPOS+$15
   sta irq_sprite_ypos
-//SEG10 [5] phi from @5 to toSpritePtr1 [phi:@5->toSpritePtr1]
+//SEG10 [5] phi from @2 to toSpritePtr1 [phi:@2->toSpritePtr1]
 //SEG11 toSpritePtr1
-//SEG12 @10
+//SEG12 @5
 //SEG13 [6] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuc1 
   // Index of the sprites to show on the next IRQ
   lda #toSpritePtr1_return+3
@@ -4186,15 +4206,15 @@ bbegin:
   // Counting the 10 IRQs
   lda #0
   sta irq_cnt
-//SEG15 @7
+//SEG15 @3
 //SEG16 kickasm(location (const byte*) SIN#0) {{ .var AMPL = 200-21     .for(var i=0; i<256; i++) {   	  .byte 51+AMPL/2+sin(toRadians([i*360]/256))*AMPL/2     }  }}
 //SEG17 kickasm(location (const byte*) SIN_SPRITE#0) {{ .fill $40, $ff  }}
-//SEG18 [10] phi from @7 to @9 [phi:@7->@9]
-//SEG19 @9
+//SEG18 [10] phi from @3 to @4 [phi:@3->@4]
+//SEG19 @4
 //SEG20 [11] call main 
-//SEG21 [13] phi from @9 to main [phi:@9->main]
+//SEG21 [13] phi from @4 to main [phi:@4->main]
   jsr main
-//SEG22 [12] phi from @9 to @end [phi:@9->@end]
+//SEG22 [12] phi from @4 to @end [phi:@4->@end]
 //SEG23 @end
 //SEG24 main
 main: {
@@ -4215,29 +4235,29 @@ main: {
     sta CIA2_PORT_A
   //SEG31 [17] phi from main::vicSelectGfxBank1_@1 to main::toD0181 [phi:main::vicSelectGfxBank1_@1->main::toD0181]
   //SEG32 main::toD0181
-  //SEG33 main::@4
+  //SEG33 main::@3
   //SEG34 [18] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG35 [19] call sprites_init 
     jsr sprites_init
-  //SEG36 main::@6
+  //SEG36 main::@5
   //SEG37 [20] *((const byte*) SPRITES_ENABLE#0) ← (byte/word/signed word/dword/signed dword) $ff -- _deref_pbuc1=vbuc2 
     lda #$ff
     sta SPRITES_ENABLE
-  //SEG38 [21] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  //SEG39 [21] phi (byte) main::ypos#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:main::@6->main::@1#0] -- vbuz1=vbuc1 
+  //SEG38 [21] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  //SEG39 [21] phi (byte) main::ypos#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:main::@5->main::@1#0] -- vbuz1=vbuc1 
     lda #$32
     sta ypos
-  //SEG40 [21] phi (byte) main::xpos#2 = (byte/signed byte/word/signed word/dword/signed dword) $18 [phi:main::@6->main::@1#1] -- vbuz1=vbuc1 
+  //SEG40 [21] phi (byte) main::xpos#2 = (byte/signed byte/word/signed word/dword/signed dword) $18 [phi:main::@5->main::@1#1] -- vbuz1=vbuc1 
     lda #$18
     sta xpos
-  //SEG41 [21] phi (byte) main::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:main::@6->main::@1#2] -- vbuyy=vbuc1 
+  //SEG41 [21] phi (byte) main::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:main::@5->main::@1#2] -- vbuyy=vbuc1 
     ldy #4
-  //SEG42 [21] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  //SEG43 [21] phi (byte) main::ypos#2 = (byte) main::ypos#1 [phi:main::@5->main::@1#0] -- register_copy 
-  //SEG44 [21] phi (byte) main::xpos#2 = (byte) main::xpos#1 [phi:main::@5->main::@1#1] -- register_copy 
-  //SEG45 [21] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@5->main::@1#2] -- register_copy 
+  //SEG42 [21] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  //SEG43 [21] phi (byte) main::ypos#2 = (byte) main::ypos#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG44 [21] phi (byte) main::xpos#2 = (byte) main::xpos#1 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG45 [21] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@4->main::@1#2] -- register_copy 
   //SEG46 main::@1
   b1:
   //SEG47 [22] (byte) main::s2#0 ← (byte) main::s#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuyy_rol_1 
@@ -4258,7 +4278,7 @@ main: {
     sta SPRITES_COLS,y
   //SEG52 [27] phi from main::@1 to main::toSpritePtr2 [phi:main::@1->main::toSpritePtr2]
   //SEG53 main::toSpritePtr2
-  //SEG54 main::@5
+  //SEG54 main::@4
   //SEG55 [28] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0 + (byte) main::s#2) ← (const byte) main::toSpritePtr2_return#0 -- pbuc1_derefidx_vbuyy=vbuc2 
     lda #toSpritePtr2_return
     sta PLAYFIELD_SPRITE_PTRS_1,y
@@ -4275,14 +4295,14 @@ main: {
   //SEG59 [32] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1 -- vbuyy_neq_vbuc1_then_la1 
     cpy #8
     bne b1
-  //SEG60 [33] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
+  //SEG60 [33] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
   //SEG61 main::@2
   //SEG62 [34] call sprites_irq_init 
     jsr sprites_irq_init
-  //SEG63 [35] phi from main::@2 to main::@7 [phi:main::@2->main::@7]
-  //SEG64 main::@7
+  //SEG63 [35] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
+  //SEG64 main::@6
   //SEG65 [36] call loop 
-  //SEG66 [38] phi from main::@7 to loop [phi:main::@7->loop]
+  //SEG66 [38] phi from main::@6 to loop [phi:main::@6->loop]
     jsr loop
   //SEG67 main::@return
   //SEG68 [37] return 
@@ -4296,25 +4316,25 @@ loop: {
     lda #0
     sta sin_idx
   //SEG72 loop::@1
-  //SEG73 loop::@6
-  b6:
-  //SEG74 [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG73 loop::@2
+  b2:
+  //SEG74 [40] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG75 loop::@7
+    bne b2
+  //SEG75 loop::@3
   //SEG76 [41] (byte) loop::idx#0 ← (byte) sin_idx#10 -- vbuxx=vbuz1 
     ldx sin_idx
-  //SEG77 [42] phi from loop::@7 to loop::@8 [phi:loop::@7->loop::@8]
-  //SEG78 [42] phi (byte) loop::idx#2 = (byte) loop::idx#0 [phi:loop::@7->loop::@8#0] -- register_copy 
-  //SEG79 [42] phi (byte) loop::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:loop::@7->loop::@8#1] -- vbuz1=vbuc1 
+  //SEG77 [42] phi from loop::@3 to loop::@4 [phi:loop::@3->loop::@4]
+  //SEG78 [42] phi (byte) loop::idx#2 = (byte) loop::idx#0 [phi:loop::@3->loop::@4#0] -- register_copy 
+  //SEG79 [42] phi (byte) loop::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:loop::@3->loop::@4#1] -- vbuz1=vbuc1 
     lda #4
     sta s
-  //SEG80 [42] phi from loop::@8 to loop::@8 [phi:loop::@8->loop::@8]
-  //SEG81 [42] phi (byte) loop::idx#2 = (byte) loop::idx#1 [phi:loop::@8->loop::@8#0] -- register_copy 
-  //SEG82 [42] phi (byte) loop::s#2 = (byte) loop::s#1 [phi:loop::@8->loop::@8#1] -- register_copy 
-  //SEG83 loop::@8
-  b8:
+  //SEG80 [42] phi from loop::@4 to loop::@4 [phi:loop::@4->loop::@4]
+  //SEG81 [42] phi (byte) loop::idx#2 = (byte) loop::idx#1 [phi:loop::@4->loop::@4#0] -- register_copy 
+  //SEG82 [42] phi (byte) loop::s#2 = (byte) loop::s#1 [phi:loop::@4->loop::@4#1] -- register_copy 
+  //SEG83 loop::@4
+  b4:
   //SEG84 [43] (byte~) loop::$1 ← (byte) loop::s#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_rol_1 
     lda s
     asl
@@ -4327,16 +4347,16 @@ loop: {
     axs #-[$a]
   //SEG87 [46] (byte) loop::s#1 ← ++ (byte) loop::s#2 -- vbuz1=_inc_vbuz1 
     inc s
-  //SEG88 [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG88 [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp s
-    bne b8
-  //SEG89 loop::@9
+    bne b4
+  //SEG89 loop::@5
   //SEG90 [48] (byte) sin_idx#3 ← ++ (byte) sin_idx#10 -- vbuz1=_inc_vbuz1 
     inc sin_idx
-  //SEG91 [39] phi from loop::@9 to loop::@1 [phi:loop::@9->loop::@1]
-  //SEG92 [39] phi (byte) sin_idx#10 = (byte) sin_idx#3 [phi:loop::@9->loop::@1#0] -- register_copy 
-    jmp b6
+  //SEG91 [39] phi from loop::@5 to loop::@1 [phi:loop::@5->loop::@1]
+  //SEG92 [39] phi (byte) sin_idx#10 = (byte) sin_idx#3 [phi:loop::@5->loop::@1#0] -- register_copy 
+    jmp b2
 }
 //SEG93 sprites_irq_init
 // Setup the IRQ
@@ -4463,20 +4483,20 @@ sprites_irq: {
   //SEG136 [80] (byte) sprites_irq::raster_sprite_gfx_modify#0 ← (byte/signed word/word/dword/signed dword~) sprites_irq::$0 -- vbuz1=vbuxx 
     // Wait for the y-position before changing sprite pointers
     stx raster_sprite_gfx_modify
-  //SEG137 sprites_irq::@11
-  b11:
-  //SEG138 [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11 -- _deref_pbuc1_lt_vbuz1_then_la1 
+  //SEG137 sprites_irq::@8
+  b8:
+  //SEG138 [81] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8 -- _deref_pbuc1_lt_vbuz1_then_la1 
     lda RASTER
     cmp raster_sprite_gfx_modify
-    bcc b11
-  //SEG139 sprites_irq::@12
+    bcc b8
+  //SEG139 sprites_irq::@9
   //SEG140 [82] (byte) sprites_irq::ptr#0 ← (byte) irq_sprite_ptr#0 -- vbuxx=vbuz1 
     ldx irq_sprite_ptr
   //SEG141 [83] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1 -- vbuz1_eq_0_then_la1 
     lda render_screen_showing
     cmp #0
     beq b1
-  //SEG142 sprites_irq::@13
+  //SEG142 sprites_irq::@10
   //SEG143 [84] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuxx 
     stx PLAYFIELD_SPRITE_PTRS_2
   //SEG144 [85] (byte) sprites_irq::ptr#3 ← ++ (byte) sprites_irq::ptr#0 -- vbuaa=_inc_vbuxx 
@@ -4499,12 +4519,12 @@ sprites_irq: {
     lda #9
     cmp irq_cnt
     beq b3
-  //SEG152 sprites_irq::@7
+  //SEG152 sprites_irq::@6
   //SEG153 [92] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) $a) goto sprites_irq::@4 -- vbuz1_eq_vbuc1_then_la1 
     lda #$a
     cmp irq_cnt
     beq b4
-  //SEG154 sprites_irq::@8
+  //SEG154 sprites_irq::@7
   //SEG155 [93] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
     axs #-[$14]
@@ -4517,10 +4537,10 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-  //SEG158 [96] phi from sprites_irq::@15 sprites_irq::@4 sprites_irq::@8 to sprites_irq::@6 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6]
-  //SEG159 [96] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6#0] -- register_copy 
-  //SEG160 sprites_irq::@6
-  b6:
+  //SEG158 [96] phi from sprites_irq::@11 sprites_irq::@4 sprites_irq::@7 to sprites_irq::@5 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5]
+  //SEG159 [96] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5#0] -- register_copy 
+  //SEG160 sprites_irq::@5
+  b5:
   //SEG161 [97] *((const byte*) RASTER#0) ← (byte) irq_raster_next#4 -- _deref_pbuc1=vbuz1 
     // Setup next interrupt
     lda irq_raster_next
@@ -4552,7 +4572,7 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-    jmp b6
+    jmp b5
   //SEG170 sprites_irq::@3
   b3:
   //SEG171 [104] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
@@ -4564,11 +4584,11 @@ sprites_irq: {
     sta irq_sprite_ypos
   //SEG173 [106] phi from sprites_irq::@3 to sprites_irq::toSpritePtr2 [phi:sprites_irq::@3->sprites_irq::toSpritePtr2]
   //SEG174 sprites_irq::toSpritePtr2
-  //SEG175 sprites_irq::@15
+  //SEG175 sprites_irq::@11
   //SEG176 [107] (byte) irq_sprite_ptr#1 ← (const byte) sprites_irq::toSpritePtr2_return#0 -- vbuz1=vbuc1 
     lda #toSpritePtr2_return
     sta irq_sprite_ptr
-    jmp b6
+    jmp b5
   //SEG177 sprites_irq::@1
   b1:
   //SEG178 [108] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuxx 
diff --git a/src/test/ref/complex/tetris/test-sprites.sym b/src/test/ref/complex/tetris/test-sprites.sym
index 1c6826434..dbb0361eb 100644
--- a/src/test/ref/complex/tetris/test-sprites.sym
+++ b/src/test/ref/complex/tetris/test-sprites.sym
@@ -1,8 +1,8 @@
-(label) @10
+(label) @1
+(label) @2
+(label) @3
 (label) @4
 (label) @5
-(label) @7
-(label) @9
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -165,10 +165,10 @@
 (void()) loop()
 (byte~) loop::$1 reg byte a 202.0
 (label) loop::@1
-(label) loop::@6
-(label) loop::@7
-(label) loop::@8
-(label) loop::@9
+(label) loop::@2
+(label) loop::@3
+(label) loop::@4
+(label) loop::@5
 (byte) loop::idx
 (byte) loop::idx#0 reg byte x 22.0
 (byte) loop::idx#1 reg byte x 67.33333333333333
@@ -180,10 +180,10 @@
 (byte/signed word/word/dword/signed dword~) main::$6 reg byte a 22.0
 (label) main::@1
 (label) main::@2
+(label) main::@3
 (label) main::@4
 (label) main::@5
 (label) main::@6
-(label) main::@7
 (label) main::@return
 (byte) main::s
 (byte) main::s#1 reg byte y 16.5
@@ -252,16 +252,16 @@
 interrupt(HARDWARE_CLOBBER)(void()) sprites_irq()
 (byte/signed word/word/dword/signed dword~) sprites_irq::$0 reg byte x 4.0
 (label) sprites_irq::@1
+(label) sprites_irq::@10
 (label) sprites_irq::@11
-(label) sprites_irq::@12
-(label) sprites_irq::@13
-(label) sprites_irq::@15
 (label) sprites_irq::@2
 (label) sprites_irq::@3
 (label) sprites_irq::@4
+(label) sprites_irq::@5
 (label) sprites_irq::@6
 (label) sprites_irq::@7
 (label) sprites_irq::@8
+(label) sprites_irq::@9
 (label) sprites_irq::@return
 (byte) sprites_irq::ptr
 (byte) sprites_irq::ptr#0 reg byte x 2.5
diff --git a/src/test/ref/complex/tetris/tetris.asm b/src/test/ref/complex/tetris/tetris.asm
index 613004bf1..bfe057a56 100644
--- a/src/test/ref/complex/tetris/tetris.asm
+++ b/src/test/ref/complex/tetris/tetris.asm
@@ -235,20 +235,20 @@ main: {
     sta render_screen_show
   b1:
   // Wait for a frame to pass
-  b6:
+  b2:
     lda #$ff
     cmp RASTER
-    bne b6
+    bne b2
     jsr render_show
     jsr keyboard_event_scan
     jsr keyboard_event_get
     lda game_over
     cmp #0
-    beq b9
-  b11:
+    beq b4
+  b5:
     inc BORDERCOL
-    jmp b11
-  b9:
+    jmp b5
+  b4:
     stx play_movement.key_event
     jsr play_movement
     lda play_movement.return
@@ -294,18 +294,18 @@ render_score: {
     .label screen = 5
     lda render_screen_render
     cmp #0
-    beq b1
+    beq b2
     lda #<PLAYFIELD_SCREEN_2
     sta screen
     lda #>PLAYFIELD_SCREEN_2
     sta screen+1
-    jmp b2
-  b1:
+    jmp b1
+  b2:
     lda #<PLAYFIELD_SCREEN_1
     sta screen
     lda #>PLAYFIELD_SCREEN_1
     sta screen+1
-  b2:
+  b1:
     ldx score_bytes+2
     ldy #0
     lda #<score_offset
@@ -406,18 +406,18 @@ render_next: {
     .label screen_next_area = 7
     .label l = 9
     cmp #0
-    beq b1
+    beq b2
     lda #<PLAYFIELD_SCREEN_2+next_area_offset
     sta screen_next_area
     lda #>PLAYFIELD_SCREEN_2+next_area_offset
     sta screen_next_area+1
-    jmp b2
-  b1:
+    jmp b1
+  b2:
     lda #<PLAYFIELD_SCREEN_1+next_area_offset
     sta screen_next_area
     lda #>PLAYFIELD_SCREEN_1+next_area_offset
     sta screen_next_area+1
-  b2:
+  b1:
     txa
     asl
     tay
@@ -429,9 +429,9 @@ render_next: {
     sta next_piece_gfx+1
     lda #0
     sta l
-  b5:
+  b3:
     ldx #0
-  b6:
+  b4:
     ldy #0
     lda (next_piece_gfx),y
     inc next_piece_gfx
@@ -439,18 +439,18 @@ render_next: {
     inc next_piece_gfx+1
   !:
     cmp #0
-    bne b7
+    bne b5
     lda #0
     tay
     sta (screen_next_area),y
-  b8:
+  b6:
     inc screen_next_area
     bne !+
     inc screen_next_area+1
   !:
     inx
     cpx #4
-    bne b6
+    bne b4
     lda #$24
     clc
     adc screen_next_area
@@ -461,13 +461,13 @@ render_next: {
     inc l
     lda #4
     cmp l
-    bne b5
+    bne b3
     rts
-  b7:
+  b5:
     lda next_piece_char
     ldy #0
     sta (screen_next_area),y
-    jmp b8
+    jmp b6
 }
 // Render the current moving piece at position (current_xpos, current_ypos)
 // Ignores cases where parts of the tetromino is outside the playfield (sides/bottom) since the movement collision routine prevents this.
@@ -612,7 +612,7 @@ play_move_rotate: {
     beq b1
     cmp #KEY_X
     beq b2
-  b3:
+  b4:
     lda #0
   breturn:
     rts
@@ -621,7 +621,7 @@ play_move_rotate: {
     axs #-[$10]
     lda #$3f
     sax orientation
-  b4:
+  b3:
     lda current_xpos
     sta play_collision.xpos
     lda current_ypos
@@ -633,7 +633,7 @@ play_move_rotate: {
     sta current_piece_101+1
     jsr play_collision
     cmp #COLLISION_NONE
-    bne b3
+    bne b4
     lda orientation
     sta current_orientation
     clc
@@ -649,7 +649,7 @@ play_move_rotate: {
     axs #$10
     lda #$3f
     sax orientation
-    jmp b4
+    jmp b3
 }
 // Test if there is a collision between the current piece moved to (x, y) and anything on the playfield or the playfield boundaries
 // Returns information about the type of the collision detected
@@ -725,7 +725,7 @@ play_collision: {
     inc col
     inx
     cpx #4
-    bne b21
+    bne b10
     lda ypos2
     clc
     adc #2
@@ -733,14 +733,14 @@ play_collision: {
     inc l
     lda #4
     cmp l
-    bne b20
+    bne b9
     lda #COLLISION_NONE
     jmp breturn
-  b20:
+  b9:
     lda i
     sta i_11
     jmp b1
-  b21:
+  b10:
     lda i
     sta i_13
     jmp b2
@@ -833,7 +833,7 @@ play_move_down: {
     sta current_piece_98+1
     jsr play_collision
     cmp #COLLISION_NONE
-    beq b14
+    beq b10
     jsr play_lock_current
     jsr play_remove_lines
     lda play_remove_lines.removed
@@ -847,7 +847,7 @@ play_move_down: {
     sta current_piece+1
     lda #0
     sta current_orientation
-  b15:
+  b11:
     lda #0
     sta current_movedown_counter
     ldx #1
@@ -856,9 +856,9 @@ play_move_down: {
     ldx #0
   breturn:
     rts
-  b14:
+  b10:
     inc current_ypos
-    jmp b15
+    jmp b11
 }
 // Spawn a new piece
 // Moves the next piece into the current and spawns a new next piece
@@ -973,29 +973,29 @@ play_increase_level: {
     // Update speed of moving tetrominos down
     lda #$1d
     cmp level
-    bcc b1
+    bcc b3
     ldy level
     lda MOVEDOWN_SLOW_SPEEDS,y
     sta current_movedown_slow
-    jmp b2
-  b1:
+    jmp b1
+  b3:
     lda #1
     sta current_movedown_slow
-  b2:
+  b1:
     inc level_bcd
     lda #$f
     and level_bcd
     cmp #$a
-    bne b3
+    bne b2
     // If level low nybble hits $a change to $10
     lax level_bcd
     axs #-[6]
     stx level_bcd
-  b3:
+  b2:
     // Increase the score values gained
     sed
     ldx #0
-  b7:
+  b5:
     txa
     asl
     asl
@@ -1015,7 +1015,7 @@ play_increase_level: {
     sta score_add_bcd+3,y
     inx
     cpx #5
-    bne b7
+    bne b5
     cld
     rts
 }
@@ -1035,38 +1035,38 @@ play_remove_lines: {
     ldx #PLAYFIELD_LINES*PLAYFIELD_COLS-1
     ldy #PLAYFIELD_LINES*PLAYFIELD_COLS-1
   // Read all lines and rewrite them
-  b8:
+  b3:
     lda #1
     sta full
     lda #0
     sta x
-  b9:
+  b4:
     lda playfield,y
     sta c
     dey
     cmp #0
-    bne b10
+    bne b5
     lda #0
     sta full
-  b10:
+  b5:
     lda c
     sta playfield,x
     dex
     inc x
     lda #PLAYFIELD_COLS-1+1
     cmp x
-    bne b9
+    bne b4
     lda #1
     cmp full
-    bne b14
+    bne b8
     txa
     axs #-[PLAYFIELD_COLS]
     inc removed
-  b14:
+  b8:
     inc y
     lda #PLAYFIELD_LINES-1+1
     cmp y
-    bne b8
+    bne b3
   b1:
   // Write zeros in the rest of the lines
     cpx #$ff
@@ -1117,7 +1117,7 @@ play_lock_current: {
     inc col
     inx
     cpx #4
-    bne b8
+    bne b7
     lda ypos2
     clc
     adc #2
@@ -1125,13 +1125,13 @@ play_lock_current: {
     inc l
     lda #4
     cmp l
-    bne b7
+    bne b6
     rts
-  b7:
+  b6:
     lda i
     sta i_7
     jmp b1
-  b8:
+  b7:
     lda i
     sta i_9
     jmp b2
@@ -1183,7 +1183,7 @@ keyboard_event_scan: {
     lda #0
     sta keycode
     sta row
-  b8:
+  b7:
     ldx row
     jsr keyboard_matrix_read
     sta row_scan
@@ -1193,11 +1193,11 @@ keyboard_event_scan: {
     lax keycode
     axs #-[8]
     stx keycode
-  b10:
+  b8:
     inc row
     lda #8
     cmp row
-    bne b8
+    bne b7
     lda #KEY_LSHIFT
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
@@ -1238,43 +1238,43 @@ keyboard_event_scan: {
   // Something has changed on the keyboard row - check each column
   b6:
     ldx #0
-  b11:
+  b9:
     lda row_scan
     ldy row
     eor keyboard_scan_values,y
     and keyboard_matrix_col_bitmask,x
     cmp #0
-    beq b12
+    beq b10
     lda #8
     cmp keyboard_events_size
-    beq b12
+    beq b10
     lda keyboard_matrix_col_bitmask,x
     and row_scan
     cmp #0
-    beq b14
+    beq b11
     // Key pressed
     lda keycode
     ldy keyboard_events_size
     sta keyboard_events,y
     inc keyboard_events_size
-  b12:
+  b10:
     inc keycode
     inx
     cpx #8
-    bne b11
+    bne b9
     // Store the current keyboard status for the row to debounce
     lda row_scan
     ldy row
     sta keyboard_scan_values,y
-    jmp b10
-  b14:
+    jmp b8
+  b11:
     lda #$40
     ora keycode
     // Key released
     ldy keyboard_events_size
     sta keyboard_events,y
     inc keyboard_events_size
-    jmp b12
+    jmp b10
 }
 // Read a single row of the keyboard matrix
 // The row ID (0-7) of the keyboard matrix row to read. See the C64 key matrix for row IDs.
@@ -1297,7 +1297,7 @@ render_show: {
     cmp #0
     beq toD0181
     lda #toD0182_return
-  b2:
+  b1:
     sta D018
     ldy level
     lda PIECES_COLORS_1,y
@@ -1309,7 +1309,7 @@ render_show: {
     rts
   toD0181:
     lda #toD0181_return
-    jmp b2
+    jmp b1
 }
 // Initialize play data tables
 play_init: {
@@ -1548,7 +1548,7 @@ render_screen_original: {
     inx
     cpx #4
     bne b2
-  b4:
+  b3:
     ldy #0
     lda (oscr),y
     sta (screen),y
@@ -1573,8 +1573,8 @@ render_screen_original: {
   !:
     inx
     cpx #$24
-    bne b4
-  b6:
+    bne b3
+  b4:
     lda #SPACE
     ldy #0
     sta (screen),y
@@ -1591,7 +1591,7 @@ render_screen_original: {
   !:
     inx
     cpx #$28
-    bne b6
+    bne b4
     inc y
     lda #$19
     cmp y
@@ -1629,10 +1629,10 @@ sprites_irq: {
     inx
     // Wait for the y-position before changing sprite pointers
     stx raster_sprite_gfx_modify
-  b11:
+  b8:
     lda RASTER
     cmp raster_sprite_gfx_modify
-    bcc b11
+    bcc b8
     ldx irq_sprite_ptr
     lda render_screen_showing
     cmp #0
@@ -1662,7 +1662,7 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-  b6:
+  b5:
     // Setup next interrupt
     lda irq_raster_next
     sta RASTER
@@ -1685,7 +1685,7 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-    jmp b6
+    jmp b5
   b3:
     lax irq_raster_next
     axs #-[$15]
@@ -1694,7 +1694,7 @@ sprites_irq: {
     sta irq_sprite_ypos
     lda #toSpritePtr2_return
     sta irq_sprite_ptr
-    jmp b6
+    jmp b5
   b1:
     stx PLAYFIELD_SPRITE_PTRS_1
     inx
diff --git a/src/test/ref/complex/tetris/tetris.cfg b/src/test/ref/complex/tetris/tetris.cfg
index e7bf31ca1..c9ddd13d2 100644
--- a/src/test/ref/complex/tetris/tetris.cfg
+++ b/src/test/ref/complex/tetris/tetris.cfg
@@ -1,7 +1,7 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@14
-@14: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] (byte) render_screen_showing#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   kickasm(location (const byte*) PLAYFIELD_CHARSET#0) {{ .fill 8,$00 // Place a filled char at the start of the charset
     .import binary "playfield-screen.imap"
@@ -17,8 +17,8 @@
  }}
   kickasm(location (const byte*) PLAYFIELD_COLORS_ORIGINAL#0) {{ .import binary "playfield-screen.col"
  }}
-  to:@23
-@23: scope:[]  from @14
+  to:@2
+@2: scope:[]  from @1
   kickasm(location (const byte*) PLAYFIELD_SPRITES#0) {{ .var sprites = LoadPicture("playfield-sprites.png", List().add($010101, $000000))
 	// Put the sprites into memory 
 	.for(var sy=0;sy<10;sy++) {
@@ -34,198 +34,198 @@
 	  	}
 	}
  }}
-  to:@24
-@24: scope:[]  from @23
+  to:@3
+@3: scope:[]  from @2
   [6] (byte) irq_raster_next#0 ← (const byte) IRQ_RASTER_FIRST#0
   [7] (byte) irq_sprite_ypos#0 ← (const byte) SPRITES_FIRST_YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) $15
   to:toSpritePtr1
-toSpritePtr1: scope:[]  from @24
+toSpritePtr1: scope:[]  from @3
   [8] phi()
-  to:@39
-@39: scope:[]  from toSpritePtr1
+  to:@5
+@5: scope:[]  from toSpritePtr1
   [9] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(byte/signed byte/word/signed word/dword/signed dword) 3
   [10] (byte) irq_cnt#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@38
-@38: scope:[]  from @39
+  to:@4
+@4: scope:[]  from @5
   [11] phi()
   [12] call main 
   to:@end
-@end: scope:[]  from @38
+@end: scope:[]  from @4
   [13] phi()
-main: scope:[main]  from @38
+main: scope:[main]  from @4
   [14] phi()
   [15] call sid_rnd_init 
-  to:main::@25
-main::@25: scope:[main]  from main
+  to:main::@8
+main::@8: scope:[main]  from main
   asm { sei  }
   [17] call render_init 
-  to:main::@26
-main::@26: scope:[main]  from main::@25
+  to:main::@9
+main::@9: scope:[main]  from main::@8
   [18] phi()
   [19] call sprites_init 
-  to:main::@27
-main::@27: scope:[main]  from main::@26
+  to:main::@10
+main::@10: scope:[main]  from main::@9
   [20] phi()
   [21] call sprites_irq_init 
-  to:main::@28
-main::@28: scope:[main]  from main::@27
+  to:main::@11
+main::@11: scope:[main]  from main::@10
   [22] phi()
   [23] call play_init 
-  to:main::@29
-main::@29: scope:[main]  from main::@28
+  to:main::@12
+main::@12: scope:[main]  from main::@11
   [24] phi()
   [25] call play_spawn_current 
-  to:main::@30
-main::@30: scope:[main]  from main::@29
+  to:main::@13
+main::@13: scope:[main]  from main::@12
   [26] phi()
   [27] call play_spawn_current 
-  to:main::@31
-main::@31: scope:[main]  from main::@30
+  to:main::@14
+main::@14: scope:[main]  from main::@13
   [28] phi()
   [29] call render_playfield 
-  to:main::@32
-main::@32: scope:[main]  from main::@31
+  to:main::@15
+main::@15: scope:[main]  from main::@14
   [30] (byte~) current_ypos#104 ← (byte) current_ypos#6
   [31] (byte~) current_xpos#128 ← (byte) current_xpos#103
   [32] (byte*~) current_piece_gfx#118 ← (byte*) current_piece_gfx#74
   [33] (byte~) current_piece_char#106 ← (byte) current_piece_char#5
   [34] call render_moving 
-  to:main::@33
-main::@33: scope:[main]  from main::@32
+  to:main::@16
+main::@16: scope:[main]  from main::@15
   [35] (byte~) next_piece_idx#84 ← (byte) play_spawn_current::piece_idx#2
   [36] call render_next 
   [37] (byte*~) current_piece#96 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0)
   to:main::@1
-main::@1: scope:[main]  from main::@17 main::@33 main::@42
-  [38] (byte) level_bcd#11 ← phi( main::@17/(byte) level_bcd#17 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) level_bcd#17 )
-  [38] (byte) level#10 ← phi( main::@17/(byte) level#17 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) level#17 )
-  [38] (dword) score_bcd#18 ← phi( main::@17/(dword) score_bcd#14 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(dword) score_bcd#14 )
-  [38] (word) lines_bcd#19 ← phi( main::@17/(word) lines_bcd#15 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(word) lines_bcd#15 )
-  [38] (byte) current_movedown_counter#16 ← phi( main::@17/(byte) current_movedown_counter#14 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) current_movedown_counter#14 )
-  [38] (byte) keyboard_events_size#19 ← phi( main::@17/(byte) keyboard_events_size#16 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) keyboard_events_size#16 )
-  [38] (byte) next_piece_idx#10 ← phi( main::@17/(byte) next_piece_idx#16 main::@33/(byte) play_spawn_current::piece_idx#2 main::@42/(byte) next_piece_idx#16 )
-  [38] (byte) game_over#10 ← phi( main::@17/(byte) game_over#15 main::@33/(byte) game_over#52 main::@42/(byte) game_over#15 )
-  [38] (byte) current_ypos#11 ← phi( main::@17/(byte) current_ypos#19 main::@33/(byte) current_ypos#6 main::@42/(byte) current_ypos#19 )
-  [38] (byte) current_xpos#122 ← phi( main::@17/(byte) current_xpos#19 main::@33/(byte) current_xpos#103 main::@42/(byte) current_xpos#19 )
-  [38] (byte*) current_piece_gfx#112 ← phi( main::@17/(byte*) current_piece_gfx#18 main::@33/(byte*) current_piece_gfx#74 main::@42/(byte*) current_piece_gfx#18 )
-  [38] (byte) current_orientation#13 ← phi( main::@17/(byte) current_orientation#17 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) current_orientation#17 )
-  [38] (byte) current_piece_char#10 ← phi( main::@17/(byte) current_piece_char#16 main::@33/(byte) current_piece_char#5 main::@42/(byte) current_piece_char#16 )
-  [38] (byte*) current_piece#10 ← phi( main::@17/(byte*) current_piece#15 main::@33/(byte*~) current_piece#96 main::@42/(byte*) current_piece#15 )
-  [38] (byte) current_movedown_slow#14 ← phi( main::@17/(byte) current_movedown_slow#21 main::@33/(byte) current_movedown_slow#1 main::@42/(byte) current_movedown_slow#21 )
-  [38] (byte) render_screen_render#18 ← phi( main::@33/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@42/(byte) render_screen_render#11 )
-  [38] (byte) render_screen_show#16 ← phi( main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) render_screen_show#13 )
-  to:main::@6
-main::@6: scope:[main]  from main::@1 main::@6
-  [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6
-  to:main::@8
-main::@8: scope:[main]  from main::@6
+main::@1: scope:[main]  from main::@16 main::@24 main::@6
+  [38] (byte) level_bcd#11 ← phi( main::@6/(byte) level_bcd#17 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) level_bcd#17 )
+  [38] (byte) level#10 ← phi( main::@6/(byte) level#17 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) level#17 )
+  [38] (dword) score_bcd#18 ← phi( main::@6/(dword) score_bcd#14 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(dword) score_bcd#14 )
+  [38] (word) lines_bcd#19 ← phi( main::@6/(word) lines_bcd#15 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(word) lines_bcd#15 )
+  [38] (byte) current_movedown_counter#16 ← phi( main::@6/(byte) current_movedown_counter#14 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) current_movedown_counter#14 )
+  [38] (byte) keyboard_events_size#19 ← phi( main::@6/(byte) keyboard_events_size#16 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) keyboard_events_size#16 )
+  [38] (byte) next_piece_idx#10 ← phi( main::@6/(byte) next_piece_idx#16 main::@16/(byte) play_spawn_current::piece_idx#2 main::@24/(byte) next_piece_idx#16 )
+  [38] (byte) game_over#10 ← phi( main::@6/(byte) game_over#15 main::@16/(byte) game_over#52 main::@24/(byte) game_over#15 )
+  [38] (byte) current_ypos#11 ← phi( main::@6/(byte) current_ypos#19 main::@16/(byte) current_ypos#6 main::@24/(byte) current_ypos#19 )
+  [38] (byte) current_xpos#122 ← phi( main::@6/(byte) current_xpos#19 main::@16/(byte) current_xpos#103 main::@24/(byte) current_xpos#19 )
+  [38] (byte*) current_piece_gfx#112 ← phi( main::@6/(byte*) current_piece_gfx#18 main::@16/(byte*) current_piece_gfx#74 main::@24/(byte*) current_piece_gfx#18 )
+  [38] (byte) current_orientation#13 ← phi( main::@6/(byte) current_orientation#17 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) current_orientation#17 )
+  [38] (byte) current_piece_char#10 ← phi( main::@6/(byte) current_piece_char#16 main::@16/(byte) current_piece_char#5 main::@24/(byte) current_piece_char#16 )
+  [38] (byte*) current_piece#10 ← phi( main::@6/(byte*) current_piece#15 main::@16/(byte*~) current_piece#96 main::@24/(byte*) current_piece#15 )
+  [38] (byte) current_movedown_slow#14 ← phi( main::@6/(byte) current_movedown_slow#21 main::@16/(byte) current_movedown_slow#1 main::@24/(byte) current_movedown_slow#21 )
+  [38] (byte) render_screen_render#18 ← phi( main::@16/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@24/(byte) render_screen_render#11 )
+  [38] (byte) render_screen_show#16 ← phi( main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) render_screen_show#13 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [40] phi()
   [41] call render_show 
-  to:main::@35
-main::@35: scope:[main]  from main::@8
+  to:main::@17
+main::@17: scope:[main]  from main::@3
   [42] phi()
   [43] call keyboard_event_scan 
-  to:main::@36
-main::@36: scope:[main]  from main::@35
+  to:main::@18
+main::@18: scope:[main]  from main::@17
   [44] phi()
   [45] call keyboard_event_get 
   [46] (byte) keyboard_event_get::return#3 ← (byte) keyboard_event_get::return#2
-  to:main::@37
-main::@37: scope:[main]  from main::@36
+  to:main::@19
+main::@19: scope:[main]  from main::@18
   [47] (byte) main::key_event#0 ← (byte) keyboard_event_get::return#3
-  [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9
-  to:main::@11
-main::@11: scope:[main]  from main::@11 main::@37
+  [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4
+  to:main::@5
+main::@5: scope:[main]  from main::@19 main::@5
   [49] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
-  to:main::@11
-main::@9: scope:[main]  from main::@37
+  to:main::@5
+main::@4: scope:[main]  from main::@19
   [50] (byte) play_movement::key_event#0 ← (byte) main::key_event#0
   [51] call play_movement 
   [52] (byte) play_movement::return#3 ← (byte) play_movement::return#2
-  to:main::@38
-main::@38: scope:[main]  from main::@9
+  to:main::@20
+main::@20: scope:[main]  from main::@4
   [53] (byte) main::render#1 ← (byte) play_movement::return#3
-  to:main::@17
-main::@17: scope:[main]  from main::@38
+  to:main::@6
+main::@6: scope:[main]  from main::@20
   [54] if((byte) main::render#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
-  to:main::@23
-main::@23: scope:[main]  from main::@17
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [55] (byte~) render_screen_render#70 ← (byte) render_screen_render#18
   [56] call render_playfield 
-  to:main::@39
-main::@39: scope:[main]  from main::@23
+  to:main::@21
+main::@21: scope:[main]  from main::@7
   [57] (byte~) current_ypos#105 ← (byte) current_ypos#19
   [58] (byte~) render_screen_render#69 ← (byte) render_screen_render#18
   [59] (byte~) current_xpos#129 ← (byte) current_xpos#19
   [60] (byte*~) current_piece_gfx#119 ← (byte*) current_piece_gfx#18
   [61] (byte~) current_piece_char#107 ← (byte) current_piece_char#16
   [62] call render_moving 
-  to:main::@40
-main::@40: scope:[main]  from main::@39
+  to:main::@22
+main::@22: scope:[main]  from main::@21
   [63] (byte~) render_screen_render#68 ← (byte) render_screen_render#18
   [64] (byte~) next_piece_idx#85 ← (byte) next_piece_idx#16
   [65] call render_next 
-  to:main::@41
-main::@41: scope:[main]  from main::@40
+  to:main::@23
+main::@23: scope:[main]  from main::@22
   [66] phi()
   [67] call render_score 
-  to:main::@42
-main::@42: scope:[main]  from main::@41
+  to:main::@24
+main::@24: scope:[main]  from main::@23
   [68] phi()
   [69] call render_screen_swap 
   to:main::@1
-render_screen_swap: scope:[render_screen_swap]  from main::@42
+render_screen_swap: scope:[render_screen_swap]  from main::@24
   [70] (byte) render_screen_render#11 ← (byte) render_screen_render#18 ^ (byte/signed byte/word/signed word/dword/signed dword) $40
   [71] (byte) render_screen_show#13 ← (byte) render_screen_show#16 ^ (byte/signed byte/word/signed word/dword/signed dword) $40
   to:render_screen_swap::@return
 render_screen_swap::@return: scope:[render_screen_swap]  from render_screen_swap
   [72] return 
   to:@return
-render_score: scope:[render_score]  from main::@41
-  [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@2
-  to:render_score::@3
-render_score::@3: scope:[render_score]  from render_score
-  [74] phi()
+render_score: scope:[render_score]  from main::@23
+  [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@1
   to:render_score::@2
-render_score::@2: scope:[render_score]  from render_score render_score::@3
-  [75] (byte*) render_score::screen#3 ← phi( render_score/(const byte*) PLAYFIELD_SCREEN_1#0 render_score::@3/(const byte*) PLAYFIELD_SCREEN_2#0 )
+render_score::@2: scope:[render_score]  from render_score
+  [74] phi()
+  to:render_score::@1
+render_score::@1: scope:[render_score]  from render_score render_score::@2
+  [75] (byte*) render_score::screen#3 ← phi( render_score/(const byte*) PLAYFIELD_SCREEN_1#0 render_score::@2/(const byte*) PLAYFIELD_SCREEN_2#0 )
   [76] (byte*) render_bcd::screen#0 ← (byte*) render_score::screen#3
   [77] (byte) render_bcd::bcd#0 ← *((const byte*) render_score::score_bytes#0+(byte/signed byte/word/signed word/dword/signed dword) 2)
   [78] call render_bcd 
-  to:render_score::@5
-render_score::@5: scope:[render_score]  from render_score::@2
+  to:render_score::@3
+render_score::@3: scope:[render_score]  from render_score::@1
   [79] (byte*) render_bcd::screen#1 ← (byte*) render_score::screen#3
   [80] (byte) render_bcd::bcd#1 ← *((const byte*) render_score::score_bytes#0+(byte/signed byte/word/signed word/dword/signed dword) 1)
   [81] call render_bcd 
-  to:render_score::@6
-render_score::@6: scope:[render_score]  from render_score::@5
+  to:render_score::@4
+render_score::@4: scope:[render_score]  from render_score::@3
   [82] (byte*) render_bcd::screen#2 ← (byte*) render_score::screen#3
   [83] (byte) render_bcd::bcd#2 ← *((const byte*) render_score::score_bytes#0)
   [84] call render_bcd 
-  to:render_score::@7
-render_score::@7: scope:[render_score]  from render_score::@6
+  to:render_score::@5
+render_score::@5: scope:[render_score]  from render_score::@4
   [85] (byte) render_bcd::bcd#3 ← > (word) lines_bcd#15
   [86] (byte*) render_bcd::screen#3 ← (byte*) render_score::screen#3
   [87] call render_bcd 
-  to:render_score::@8
-render_score::@8: scope:[render_score]  from render_score::@7
+  to:render_score::@6
+render_score::@6: scope:[render_score]  from render_score::@5
   [88] (byte) render_bcd::bcd#4 ← < (word) lines_bcd#15
   [89] (byte*) render_bcd::screen#4 ← (byte*) render_score::screen#3
   [90] call render_bcd 
-  to:render_score::@9
-render_score::@9: scope:[render_score]  from render_score::@8
+  to:render_score::@7
+render_score::@7: scope:[render_score]  from render_score::@6
   [91] (byte*) render_bcd::screen#5 ← (byte*) render_score::screen#3
   [92] (byte) render_bcd::bcd#5 ← (byte) level_bcd#17
   [93] call render_bcd 
   to:render_score::@return
-render_score::@return: scope:[render_score]  from render_score::@9
+render_score::@return: scope:[render_score]  from render_score::@7
   [94] return 
   to:@return
-render_bcd: scope:[render_bcd]  from render_score::@2 render_score::@5 render_score::@6 render_score::@7 render_score::@8 render_score::@9
-  [95] (byte) render_bcd::bcd#6 ← phi( render_score::@2/(byte) render_bcd::bcd#0 render_score::@5/(byte) render_bcd::bcd#1 render_score::@6/(byte) render_bcd::bcd#2 render_score::@7/(byte) render_bcd::bcd#3 render_score::@8/(byte) render_bcd::bcd#4 render_score::@9/(byte) render_bcd::bcd#5 )
-  [95] (byte) render_bcd::only_low#6 ← phi( render_score::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 render_score::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [95] (word) render_bcd::offset#6 ← phi( render_score::@2/(const word) render_score::score_offset#0 render_score::@5/(const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 2 render_score::@6/(const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 4 render_score::@7/(const word) render_score::lines_offset#0 render_score::@8/(const word) render_score::lines_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 1 render_score::@9/(const word) render_score::level_offset#0 )
-  [95] (byte*) render_bcd::screen#6 ← phi( render_score::@2/(byte*) render_bcd::screen#0 render_score::@5/(byte*) render_bcd::screen#1 render_score::@6/(byte*) render_bcd::screen#2 render_score::@7/(byte*) render_bcd::screen#3 render_score::@8/(byte*) render_bcd::screen#4 render_score::@9/(byte*) render_bcd::screen#5 )
+render_bcd: scope:[render_bcd]  from render_score::@1 render_score::@3 render_score::@4 render_score::@5 render_score::@6 render_score::@7
+  [95] (byte) render_bcd::bcd#6 ← phi( render_score::@1/(byte) render_bcd::bcd#0 render_score::@3/(byte) render_bcd::bcd#1 render_score::@4/(byte) render_bcd::bcd#2 render_score::@5/(byte) render_bcd::bcd#3 render_score::@6/(byte) render_bcd::bcd#4 render_score::@7/(byte) render_bcd::bcd#5 )
+  [95] (byte) render_bcd::only_low#6 ← phi( render_score::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 render_score::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [95] (word) render_bcd::offset#6 ← phi( render_score::@1/(const word) render_score::score_offset#0 render_score::@3/(const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 2 render_score::@4/(const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 4 render_score::@5/(const word) render_score::lines_offset#0 render_score::@6/(const word) render_score::lines_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 1 render_score::@7/(const word) render_score::level_offset#0 )
+  [95] (byte*) render_bcd::screen#6 ← phi( render_score::@1/(byte*) render_bcd::screen#0 render_score::@3/(byte*) render_bcd::screen#1 render_score::@4/(byte*) render_bcd::screen#2 render_score::@5/(byte*) render_bcd::screen#3 render_score::@6/(byte*) render_bcd::screen#4 render_score::@7/(byte*) render_bcd::screen#5 )
   [96] (byte*) render_bcd::screen_pos#0 ← (byte*) render_bcd::screen#6 + (word) render_bcd::offset#6
   [97] if((byte) render_bcd::only_low#6!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_bcd::@1
   to:render_bcd::@2
@@ -245,58 +245,58 @@ render_bcd::@1: scope:[render_bcd]  from render_bcd render_bcd::@2
 render_bcd::@return: scope:[render_bcd]  from render_bcd::@1
   [107] return 
   to:@return
-render_next: scope:[render_next]  from main::@33 main::@40
-  [108] (byte) next_piece_idx#12 ← phi( main::@33/(byte~) next_piece_idx#84 main::@40/(byte~) next_piece_idx#85 )
-  [108] (byte) render_screen_render#15 ← phi( main::@33/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@40/(byte~) render_screen_render#68 )
-  [109] if((byte) render_screen_render#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@2
-  to:render_next::@3
-render_next::@3: scope:[render_next]  from render_next
-  [110] phi()
+render_next: scope:[render_next]  from main::@16 main::@22
+  [108] (byte) next_piece_idx#12 ← phi( main::@16/(byte~) next_piece_idx#84 main::@22/(byte~) next_piece_idx#85 )
+  [108] (byte) render_screen_render#15 ← phi( main::@16/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@22/(byte~) render_screen_render#68 )
+  [109] if((byte) render_screen_render#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@1
   to:render_next::@2
-render_next::@2: scope:[render_next]  from render_next render_next::@3
-  [111] (byte*) render_next::screen_next_area#11 ← phi( render_next/(const byte*) PLAYFIELD_SCREEN_1#0+(const word) render_next::next_area_offset#0 render_next::@3/(const byte*) PLAYFIELD_SCREEN_2#0+(const word) render_next::next_area_offset#0 )
+render_next::@2: scope:[render_next]  from render_next
+  [110] phi()
+  to:render_next::@1
+render_next::@1: scope:[render_next]  from render_next render_next::@2
+  [111] (byte*) render_next::screen_next_area#11 ← phi( render_next/(const byte*) PLAYFIELD_SCREEN_1#0+(const word) render_next::next_area_offset#0 render_next::@2/(const byte*) PLAYFIELD_SCREEN_2#0+(const word) render_next::next_area_offset#0 )
   [112] (byte~) render_next::$4 ← (byte) next_piece_idx#12 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [113] (byte) render_next::next_piece_char#0 ← *((const byte[]) PIECES_NEXT_CHARS#0 + (byte) next_piece_idx#12)
   [114] (byte*~) render_next::next_piece_gfx#9 ← (byte*)*((const word[]) PIECES#0 + (byte~) render_next::$4)
-  to:render_next::@5
-render_next::@5: scope:[render_next]  from render_next::@11 render_next::@2
-  [115] (byte) render_next::l#7 ← phi( render_next::@11/(byte) render_next::l#1 render_next::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [115] (byte*) render_next::screen_next_area#10 ← phi( render_next::@11/(byte*) render_next::screen_next_area#4 render_next::@2/(byte*) render_next::screen_next_area#11 )
-  [115] (byte*) render_next::next_piece_gfx#3 ← phi( render_next::@11/(byte*) render_next::next_piece_gfx#1 render_next::@2/(byte*~) render_next::next_piece_gfx#9 )
-  to:render_next::@6
-render_next::@6: scope:[render_next]  from render_next::@5 render_next::@8
-  [116] (byte) render_next::c#2 ← phi( render_next::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 render_next::@8/(byte) render_next::c#1 )
-  [116] (byte*) render_next::screen_next_area#5 ← phi( render_next::@5/(byte*) render_next::screen_next_area#10 render_next::@8/(byte*) render_next::screen_next_area#3 )
-  [116] (byte*) render_next::next_piece_gfx#2 ← phi( render_next::@5/(byte*) render_next::next_piece_gfx#3 render_next::@8/(byte*) render_next::next_piece_gfx#1 )
+  to:render_next::@3
+render_next::@3: scope:[render_next]  from render_next::@1 render_next::@8
+  [115] (byte) render_next::l#7 ← phi( render_next::@8/(byte) render_next::l#1 render_next::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [115] (byte*) render_next::screen_next_area#10 ← phi( render_next::@8/(byte*) render_next::screen_next_area#4 render_next::@1/(byte*) render_next::screen_next_area#11 )
+  [115] (byte*) render_next::next_piece_gfx#3 ← phi( render_next::@8/(byte*) render_next::next_piece_gfx#1 render_next::@1/(byte*~) render_next::next_piece_gfx#9 )
+  to:render_next::@4
+render_next::@4: scope:[render_next]  from render_next::@3 render_next::@6
+  [116] (byte) render_next::c#2 ← phi( render_next::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 render_next::@6/(byte) render_next::c#1 )
+  [116] (byte*) render_next::screen_next_area#5 ← phi( render_next::@3/(byte*) render_next::screen_next_area#10 render_next::@6/(byte*) render_next::screen_next_area#3 )
+  [116] (byte*) render_next::next_piece_gfx#2 ← phi( render_next::@3/(byte*) render_next::next_piece_gfx#3 render_next::@6/(byte*) render_next::next_piece_gfx#1 )
   [117] (byte) render_next::cell#0 ← *((byte*) render_next::next_piece_gfx#2)
   [118] (byte*) render_next::next_piece_gfx#1 ← ++ (byte*) render_next::next_piece_gfx#2
-  [119] if((byte) render_next::cell#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@7
-  to:render_next::@9
-render_next::@9: scope:[render_next]  from render_next::@6
+  [119] if((byte) render_next::cell#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@5
+  to:render_next::@7
+render_next::@7: scope:[render_next]  from render_next::@4
   [120] *((byte*) render_next::screen_next_area#5) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:render_next::@8
-render_next::@8: scope:[render_next]  from render_next::@7 render_next::@9
+  to:render_next::@6
+render_next::@6: scope:[render_next]  from render_next::@5 render_next::@7
   [121] (byte*) render_next::screen_next_area#3 ← ++ (byte*) render_next::screen_next_area#5
   [122] (byte) render_next::c#1 ← ++ (byte) render_next::c#2
-  [123] if((byte) render_next::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@6
-  to:render_next::@11
-render_next::@11: scope:[render_next]  from render_next::@8
+  [123] if((byte) render_next::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@4
+  to:render_next::@8
+render_next::@8: scope:[render_next]  from render_next::@6
   [124] (byte*) render_next::screen_next_area#4 ← (byte*) render_next::screen_next_area#3 + (byte/signed byte/word/signed word/dword/signed dword) $24
   [125] (byte) render_next::l#1 ← ++ (byte) render_next::l#7
-  [126] if((byte) render_next::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@5
+  [126] if((byte) render_next::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@3
   to:render_next::@return
-render_next::@return: scope:[render_next]  from render_next::@11
+render_next::@return: scope:[render_next]  from render_next::@8
   [127] return 
   to:@return
-render_next::@7: scope:[render_next]  from render_next::@6
+render_next::@5: scope:[render_next]  from render_next::@4
   [128] *((byte*) render_next::screen_next_area#5) ← (byte) render_next::next_piece_char#0
-  to:render_next::@8
-render_moving: scope:[render_moving]  from main::@32 main::@39
-  [129] (byte) current_piece_char#68 ← phi( main::@32/(byte~) current_piece_char#106 main::@39/(byte~) current_piece_char#107 )
-  [129] (byte*) current_piece_gfx#64 ← phi( main::@32/(byte*~) current_piece_gfx#118 main::@39/(byte*~) current_piece_gfx#119 )
-  [129] (byte) current_xpos#59 ← phi( main::@32/(byte~) current_xpos#128 main::@39/(byte~) current_xpos#129 )
-  [129] (byte) render_screen_render#33 ← phi( main::@32/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@39/(byte~) render_screen_render#69 )
-  [129] (byte) current_ypos#13 ← phi( main::@32/(byte~) current_ypos#104 main::@39/(byte~) current_ypos#105 )
+  to:render_next::@6
+render_moving: scope:[render_moving]  from main::@15 main::@21
+  [129] (byte) current_piece_char#68 ← phi( main::@15/(byte~) current_piece_char#106 main::@21/(byte~) current_piece_char#107 )
+  [129] (byte*) current_piece_gfx#64 ← phi( main::@15/(byte*~) current_piece_gfx#118 main::@21/(byte*~) current_piece_gfx#119 )
+  [129] (byte) current_xpos#59 ← phi( main::@15/(byte~) current_xpos#128 main::@21/(byte~) current_xpos#129 )
+  [129] (byte) render_screen_render#33 ← phi( main::@15/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@21/(byte~) render_screen_render#69 )
+  [129] (byte) current_ypos#13 ← phi( main::@15/(byte~) current_ypos#104 main::@21/(byte~) current_ypos#105 )
   [130] (byte) render_moving::ypos2#0 ← (byte) current_ypos#13 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:render_moving::@1
 render_moving::@1: scope:[render_moving]  from render_moving render_moving::@3
@@ -304,12 +304,12 @@ render_moving::@1: scope:[render_moving]  from render_moving render_moving::@3
   [131] (byte) render_moving::i#3 ← phi( render_moving/(byte/signed byte/word/signed word/dword/signed dword) 0 render_moving::@3/(byte) render_moving::i#8 )
   [131] (byte) render_moving::ypos2#2 ← phi( render_moving/(byte) render_moving::ypos2#0 render_moving::@3/(byte) render_moving::ypos2#1 )
   [132] if((byte) render_moving::ypos2#2>(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_moving::@2
-  to:render_moving::@8
-render_moving::@8: scope:[render_moving]  from render_moving::@1
+  to:render_moving::@7
+render_moving::@7: scope:[render_moving]  from render_moving::@1
   [133] (byte) render_moving::i#1 ← (byte) render_moving::i#3 + (byte/signed byte/word/signed word/dword/signed dword) 4
   to:render_moving::@3
-render_moving::@3: scope:[render_moving]  from render_moving::@5 render_moving::@8
-  [134] (byte) render_moving::i#8 ← phi( render_moving::@5/(byte) render_moving::i#2 render_moving::@8/(byte) render_moving::i#1 )
+render_moving::@3: scope:[render_moving]  from render_moving::@5 render_moving::@7
+  [134] (byte) render_moving::i#8 ← phi( render_moving::@5/(byte) render_moving::i#2 render_moving::@7/(byte) render_moving::i#1 )
   [135] (byte) render_moving::ypos2#1 ← (byte) render_moving::ypos2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [136] (byte) render_moving::l#1 ← ++ (byte) render_moving::l#4
   [137] if((byte) render_moving::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_moving::@1
@@ -338,8 +338,8 @@ render_moving::@5: scope:[render_moving]  from render_moving::@4 render_moving::
   [148] (byte) render_moving::c#1 ← ++ (byte) render_moving::c#2
   [149] if((byte) render_moving::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_moving::@4
   to:render_moving::@3
-render_playfield: scope:[render_playfield]  from main::@23 main::@31
-  [150] (byte) render_screen_render#22 ← phi( main::@23/(byte~) render_screen_render#70 main::@31/(byte/signed byte/word/signed word/dword/signed dword) $40 )
+render_playfield: scope:[render_playfield]  from main::@14 main::@7
+  [150] (byte) render_screen_render#22 ← phi( main::@7/(byte~) render_screen_render#70 main::@14/(byte/signed byte/word/signed word/dword/signed dword) $40 )
   to:render_playfield::@1
 render_playfield::@1: scope:[render_playfield]  from render_playfield render_playfield::@3
   [151] (byte) render_playfield::i#3 ← phi( render_playfield/(const byte) PLAYFIELD_COLS#0*(byte/signed byte/word/signed word/dword/signed dword) 2 render_playfield::@3/(byte) render_playfield::i#1 )
@@ -365,56 +365,56 @@ render_playfield::@3: scope:[render_playfield]  from render_playfield::@2
 render_playfield::@return: scope:[render_playfield]  from render_playfield::@3
   [163] return 
   to:@return
-play_movement: scope:[play_movement]  from main::@9
+play_movement: scope:[play_movement]  from main::@4
   [164] (byte) play_move_down::key_event#0 ← (byte) play_movement::key_event#0
   [165] call play_move_down 
   [166] (byte) play_move_down::return#0 ← (byte) play_move_down::return#3
-  to:play_movement::@5
-play_movement::@5: scope:[play_movement]  from play_movement
+  to:play_movement::@2
+play_movement::@2: scope:[play_movement]  from play_movement
   [167] (byte~) play_movement::$0 ← (byte) play_move_down::return#0
   [168] (byte) play_movement::render#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 + (byte~) play_movement::$0
   [169] if((byte) game_over#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_movement::@1
   to:play_movement::@return
-play_movement::@return: scope:[play_movement]  from play_movement::@5 play_movement::@7
-  [170] (byte) current_xpos#19 ← phi( play_movement::@5/(byte) current_xpos#22 play_movement::@7/(byte) current_xpos#26 )
-  [170] (byte*) current_piece_gfx#18 ← phi( play_movement::@5/(byte*) current_piece_gfx#20 play_movement::@7/(byte*) current_piece_gfx#21 )
-  [170] (byte) current_orientation#17 ← phi( play_movement::@5/(byte) current_orientation#20 play_movement::@7/(byte) current_orientation#25 )
-  [170] (byte) play_movement::return#2 ← phi( play_movement::@5/(byte) play_movement::render#1 play_movement::@7/(byte) play_movement::return#0 )
+play_movement::@return: scope:[play_movement]  from play_movement::@2 play_movement::@4
+  [170] (byte) current_xpos#19 ← phi( play_movement::@2/(byte) current_xpos#22 play_movement::@4/(byte) current_xpos#26 )
+  [170] (byte*) current_piece_gfx#18 ← phi( play_movement::@2/(byte*) current_piece_gfx#20 play_movement::@4/(byte*) current_piece_gfx#21 )
+  [170] (byte) current_orientation#17 ← phi( play_movement::@2/(byte) current_orientation#20 play_movement::@4/(byte) current_orientation#25 )
+  [170] (byte) play_movement::return#2 ← phi( play_movement::@2/(byte) play_movement::render#1 play_movement::@4/(byte) play_movement::return#0 )
   [171] return 
   to:@return
-play_movement::@1: scope:[play_movement]  from play_movement::@5
+play_movement::@1: scope:[play_movement]  from play_movement::@2
   [172] (byte) play_move_leftright::key_event#0 ← (byte) play_movement::key_event#0
   [173] call play_move_leftright 
   [174] (byte) play_move_leftright::return#0 ← (byte) play_move_leftright::return#2
-  to:play_movement::@6
-play_movement::@6: scope:[play_movement]  from play_movement::@1
+  to:play_movement::@3
+play_movement::@3: scope:[play_movement]  from play_movement::@1
   [175] (byte~) play_movement::$3 ← (byte) play_move_leftright::return#0
   [176] (byte) play_movement::render#2 ← (byte) play_movement::render#1 + (byte~) play_movement::$3
   [177] (byte) play_move_rotate::key_event#0 ← (byte) play_movement::key_event#0
   [178] call play_move_rotate 
   [179] (byte) play_move_rotate::return#0 ← (byte) play_move_rotate::return#2
-  to:play_movement::@7
-play_movement::@7: scope:[play_movement]  from play_movement::@6
+  to:play_movement::@4
+play_movement::@4: scope:[play_movement]  from play_movement::@3
   [180] (byte~) play_movement::$4 ← (byte) play_move_rotate::return#0
   [181] (byte) play_movement::return#0 ← (byte) play_movement::render#2 + (byte~) play_movement::$4
   to:play_movement::@return
-play_move_rotate: scope:[play_move_rotate]  from play_movement::@6
+play_move_rotate: scope:[play_move_rotate]  from play_movement::@3
   [182] if((byte) play_move_rotate::key_event#0==(const byte) KEY_Z#0) goto play_move_rotate::@1
-  to:play_move_rotate::@6
-play_move_rotate::@6: scope:[play_move_rotate]  from play_move_rotate
+  to:play_move_rotate::@4
+play_move_rotate::@4: scope:[play_move_rotate]  from play_move_rotate
   [183] if((byte) play_move_rotate::key_event#0==(const byte) KEY_X#0) goto play_move_rotate::@2
   to:play_move_rotate::@return
-play_move_rotate::@return: scope:[play_move_rotate]  from play_move_rotate::@11 play_move_rotate::@14 play_move_rotate::@6
-  [184] (byte*) current_piece_gfx#21 ← phi( play_move_rotate::@11/(byte*) current_piece_gfx#7 play_move_rotate::@14/(byte*) current_piece_gfx#20 play_move_rotate::@6/(byte*) current_piece_gfx#20 )
-  [184] (byte) current_orientation#25 ← phi( play_move_rotate::@11/(byte) current_orientation#7 play_move_rotate::@14/(byte) current_orientation#20 play_move_rotate::@6/(byte) current_orientation#20 )
-  [184] (byte) play_move_rotate::return#2 ← phi( play_move_rotate::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_rotate::@14/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_rotate::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+play_move_rotate::@return: scope:[play_move_rotate]  from play_move_rotate::@4 play_move_rotate::@5 play_move_rotate::@6
+  [184] (byte*) current_piece_gfx#21 ← phi( play_move_rotate::@5/(byte*) current_piece_gfx#7 play_move_rotate::@6/(byte*) current_piece_gfx#20 play_move_rotate::@4/(byte*) current_piece_gfx#20 )
+  [184] (byte) current_orientation#25 ← phi( play_move_rotate::@5/(byte) current_orientation#7 play_move_rotate::@6/(byte) current_orientation#20 play_move_rotate::@4/(byte) current_orientation#20 )
+  [184] (byte) play_move_rotate::return#2 ← phi( play_move_rotate::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_rotate::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_rotate::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [185] return 
   to:@return
-play_move_rotate::@2: scope:[play_move_rotate]  from play_move_rotate::@6
+play_move_rotate::@2: scope:[play_move_rotate]  from play_move_rotate::@4
   [186] (byte/signed word/word/dword/signed dword~) play_move_rotate::$5 ← (byte) current_orientation#20 + (byte/signed byte/word/signed word/dword/signed dword) $10
   [187] (byte) play_move_rotate::orientation#2 ← (byte/signed word/word/dword/signed dword~) play_move_rotate::$5 & (byte/signed byte/word/signed word/dword/signed dword) $3f
-  to:play_move_rotate::@4
-play_move_rotate::@4: scope:[play_move_rotate]  from play_move_rotate::@1 play_move_rotate::@2
+  to:play_move_rotate::@3
+play_move_rotate::@3: scope:[play_move_rotate]  from play_move_rotate::@1 play_move_rotate::@2
   [188] (byte) play_move_rotate::orientation#3 ← phi( play_move_rotate::@1/(byte) play_move_rotate::orientation#1 play_move_rotate::@2/(byte) play_move_rotate::orientation#2 )
   [189] (byte) play_collision::xpos#3 ← (byte) current_xpos#26
   [190] (byte) play_collision::ypos#3 ← (byte) current_ypos#19
@@ -422,49 +422,49 @@ play_move_rotate::@4: scope:[play_move_rotate]  from play_move_rotate::@1 play_m
   [192] (byte*~) current_piece#101 ← (byte*) current_piece#15
   [193] call play_collision 
   [194] (byte) play_collision::return#14 ← (byte) play_collision::return#15
-  to:play_move_rotate::@14
-play_move_rotate::@14: scope:[play_move_rotate]  from play_move_rotate::@4
+  to:play_move_rotate::@6
+play_move_rotate::@6: scope:[play_move_rotate]  from play_move_rotate::@3
   [195] (byte~) play_move_rotate::$2 ← (byte) play_collision::return#14
   [196] if((byte~) play_move_rotate::$2!=(const byte) COLLISION_NONE#0) goto play_move_rotate::@return
-  to:play_move_rotate::@11
-play_move_rotate::@11: scope:[play_move_rotate]  from play_move_rotate::@14
+  to:play_move_rotate::@5
+play_move_rotate::@5: scope:[play_move_rotate]  from play_move_rotate::@6
   [197] (byte) current_orientation#7 ← (byte) play_move_rotate::orientation#3
   [198] (byte*) current_piece_gfx#7 ← (byte*) current_piece#15 + (byte) current_orientation#7
   to:play_move_rotate::@return
 play_move_rotate::@1: scope:[play_move_rotate]  from play_move_rotate
   [199] (byte/signed word/word/dword/signed dword~) play_move_rotate::$7 ← (byte) current_orientation#20 - (byte/signed byte/word/signed word/dword/signed dword) $10
   [200] (byte) play_move_rotate::orientation#1 ← (byte/signed word/word/dword/signed dword~) play_move_rotate::$7 & (byte/signed byte/word/signed word/dword/signed dword) $3f
-  to:play_move_rotate::@4
-play_collision: scope:[play_collision]  from play_move_down::@9 play_move_leftright::@1 play_move_leftright::@5 play_move_rotate::@4 play_spawn_current
-  [201] (byte) play_collision::xpos#6 ← phi( play_move_down::@9/(byte) play_collision::xpos#0 play_move_leftright::@1/(byte) play_collision::xpos#1 play_move_leftright::@5/(byte) play_collision::xpos#2 play_move_rotate::@4/(byte) play_collision::xpos#3 play_spawn_current/(byte) play_collision::xpos#4 )
-  [201] (byte) play_collision::ypos#5 ← phi( play_move_down::@9/(byte) play_collision::ypos#0 play_move_leftright::@1/(byte) play_collision::ypos#1 play_move_leftright::@5/(byte) play_collision::ypos#2 play_move_rotate::@4/(byte) play_collision::ypos#3 play_spawn_current/(byte) play_collision::ypos#4 )
-  [201] (byte) play_collision::orientation#5 ← phi( play_move_down::@9/(byte) play_collision::orientation#0 play_move_leftright::@1/(byte) play_collision::orientation#1 play_move_leftright::@5/(byte) play_collision::orientation#2 play_move_rotate::@4/(byte) play_collision::orientation#3 play_spawn_current/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [201] (byte*) current_piece#17 ← phi( play_move_down::@9/(byte*~) current_piece#98 play_move_leftright::@1/(byte*~) current_piece#99 play_move_leftright::@5/(byte*~) current_piece#100 play_move_rotate::@4/(byte*~) current_piece#101 play_spawn_current/(byte*~) current_piece#102 )
+  to:play_move_rotate::@3
+play_collision: scope:[play_collision]  from play_move_down::@8 play_move_leftright::@1 play_move_leftright::@3 play_move_rotate::@3 play_spawn_current
+  [201] (byte) play_collision::xpos#6 ← phi( play_move_down::@8/(byte) play_collision::xpos#0 play_move_leftright::@1/(byte) play_collision::xpos#1 play_move_leftright::@3/(byte) play_collision::xpos#2 play_move_rotate::@3/(byte) play_collision::xpos#3 play_spawn_current/(byte) play_collision::xpos#4 )
+  [201] (byte) play_collision::ypos#5 ← phi( play_move_down::@8/(byte) play_collision::ypos#0 play_move_leftright::@1/(byte) play_collision::ypos#1 play_move_leftright::@3/(byte) play_collision::ypos#2 play_move_rotate::@3/(byte) play_collision::ypos#3 play_spawn_current/(byte) play_collision::ypos#4 )
+  [201] (byte) play_collision::orientation#5 ← phi( play_move_down::@8/(byte) play_collision::orientation#0 play_move_leftright::@1/(byte) play_collision::orientation#1 play_move_leftright::@3/(byte) play_collision::orientation#2 play_move_rotate::@3/(byte) play_collision::orientation#3 play_spawn_current/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [201] (byte*) current_piece#17 ← phi( play_move_down::@8/(byte*~) current_piece#98 play_move_leftright::@1/(byte*~) current_piece#99 play_move_leftright::@3/(byte*~) current_piece#100 play_move_rotate::@3/(byte*~) current_piece#101 play_spawn_current/(byte*~) current_piece#102 )
   [202] (byte*) play_collision::piece_gfx#0 ← (byte*) current_piece#17 + (byte) play_collision::orientation#5
   [203] (byte) play_collision::ypos2#0 ← (byte) play_collision::ypos#5 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:play_collision::@1
-play_collision::@1: scope:[play_collision]  from play_collision play_collision::@20
-  [204] (byte) play_collision::l#6 ← phi( play_collision/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@20/(byte) play_collision::l#1 )
-  [204] (byte) play_collision::i#3 ← phi( play_collision/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@20/(byte~) play_collision::i#11 )
-  [204] (byte) play_collision::ypos2#2 ← phi( play_collision/(byte) play_collision::ypos2#0 play_collision::@20/(byte) play_collision::ypos2#1 )
+play_collision::@1: scope:[play_collision]  from play_collision play_collision::@9
+  [204] (byte) play_collision::l#6 ← phi( play_collision/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@9/(byte) play_collision::l#1 )
+  [204] (byte) play_collision::i#3 ← phi( play_collision/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@9/(byte~) play_collision::i#11 )
+  [204] (byte) play_collision::ypos2#2 ← phi( play_collision/(byte) play_collision::ypos2#0 play_collision::@9/(byte) play_collision::ypos2#1 )
   [205] (byte*) play_collision::playfield_line#0 ← *((const byte*[PLAYFIELD_LINES#0]) playfield_lines#0 + (byte) play_collision::ypos2#2)
   [206] (byte~) play_collision::col#9 ← (byte) play_collision::xpos#6
   to:play_collision::@2
-play_collision::@2: scope:[play_collision]  from play_collision::@1 play_collision::@21
-  [207] (byte) play_collision::c#2 ← phi( play_collision::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@21/(byte) play_collision::c#1 )
-  [207] (byte) play_collision::col#2 ← phi( play_collision::@1/(byte~) play_collision::col#9 play_collision::@21/(byte) play_collision::col#1 )
-  [207] (byte) play_collision::i#2 ← phi( play_collision::@1/(byte) play_collision::i#3 play_collision::@21/(byte~) play_collision::i#13 )
+play_collision::@2: scope:[play_collision]  from play_collision::@1 play_collision::@10
+  [207] (byte) play_collision::c#2 ← phi( play_collision::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@10/(byte) play_collision::c#1 )
+  [207] (byte) play_collision::col#2 ← phi( play_collision::@1/(byte~) play_collision::col#9 play_collision::@10/(byte) play_collision::col#1 )
+  [207] (byte) play_collision::i#2 ← phi( play_collision::@1/(byte) play_collision::i#3 play_collision::@10/(byte~) play_collision::i#13 )
   [208] (byte) play_collision::i#1 ← ++ (byte) play_collision::i#2
   [209] if(*((byte*) play_collision::piece_gfx#0 + (byte) play_collision::i#2)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_collision::@3
-  to:play_collision::@14
-play_collision::@14: scope:[play_collision]  from play_collision::@2
+  to:play_collision::@7
+play_collision::@7: scope:[play_collision]  from play_collision::@2
   [210] if((byte) play_collision::ypos2#2<(byte/signed byte/word/signed word/dword/signed dword) 2*(const byte) PLAYFIELD_LINES#0) goto play_collision::@4
   to:play_collision::@return
-play_collision::@return: scope:[play_collision]  from play_collision::@14 play_collision::@17 play_collision::@4 play_collision::@5 play_collision::@6
-  [211] (byte) play_collision::return#15 ← phi( play_collision::@5/(const byte) COLLISION_RIGHT#0 play_collision::@6/(const byte) COLLISION_PLAYFIELD#0 play_collision::@14/(const byte) COLLISION_BOTTOM#0 play_collision::@17/(const byte) COLLISION_NONE#0 play_collision::@4/(const byte) COLLISION_LEFT#0 )
+play_collision::@return: scope:[play_collision]  from play_collision::@4 play_collision::@5 play_collision::@6 play_collision::@7 play_collision::@8
+  [211] (byte) play_collision::return#15 ← phi( play_collision::@5/(const byte) COLLISION_RIGHT#0 play_collision::@6/(const byte) COLLISION_PLAYFIELD#0 play_collision::@7/(const byte) COLLISION_BOTTOM#0 play_collision::@8/(const byte) COLLISION_NONE#0 play_collision::@4/(const byte) COLLISION_LEFT#0 )
   [212] return 
   to:@return
-play_collision::@4: scope:[play_collision]  from play_collision::@14
+play_collision::@4: scope:[play_collision]  from play_collision::@7
   [213] (byte~) play_collision::$7 ← (byte) play_collision::col#2 & (byte/word/signed word/dword/signed dword) $80
   [214] if((byte~) play_collision::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_collision::@5
   to:play_collision::@return
@@ -477,43 +477,43 @@ play_collision::@6: scope:[play_collision]  from play_collision::@5
 play_collision::@3: scope:[play_collision]  from play_collision::@2 play_collision::@6
   [217] (byte) play_collision::col#1 ← ++ (byte) play_collision::col#2
   [218] (byte) play_collision::c#1 ← ++ (byte) play_collision::c#2
-  [219] if((byte) play_collision::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@21
-  to:play_collision::@17
-play_collision::@17: scope:[play_collision]  from play_collision::@3
+  [219] if((byte) play_collision::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@10
+  to:play_collision::@8
+play_collision::@8: scope:[play_collision]  from play_collision::@3
   [220] (byte) play_collision::ypos2#1 ← (byte) play_collision::ypos2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [221] (byte) play_collision::l#1 ← ++ (byte) play_collision::l#6
-  [222] if((byte) play_collision::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@20
+  [222] if((byte) play_collision::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@9
   to:play_collision::@return
-play_collision::@20: scope:[play_collision]  from play_collision::@17
+play_collision::@9: scope:[play_collision]  from play_collision::@8
   [223] (byte~) play_collision::i#11 ← (byte) play_collision::i#1
   to:play_collision::@1
-play_collision::@21: scope:[play_collision]  from play_collision::@3
+play_collision::@10: scope:[play_collision]  from play_collision::@3
   [224] (byte~) play_collision::i#13 ← (byte) play_collision::i#1
   to:play_collision::@2
 play_move_leftright: scope:[play_move_leftright]  from play_movement::@1
   [225] if((byte) play_move_leftright::key_event#0==(const byte) KEY_COMMA#0) goto play_move_leftright::@1
-  to:play_move_leftright::@4
-play_move_leftright::@4: scope:[play_move_leftright]  from play_move_leftright
+  to:play_move_leftright::@2
+play_move_leftright::@2: scope:[play_move_leftright]  from play_move_leftright
   [226] if((byte) play_move_leftright::key_event#0!=(const byte) KEY_DOT#0) goto play_move_leftright::@return
-  to:play_move_leftright::@5
-play_move_leftright::@5: scope:[play_move_leftright]  from play_move_leftright::@4
+  to:play_move_leftright::@3
+play_move_leftright::@3: scope:[play_move_leftright]  from play_move_leftright::@2
   [227] (byte) play_collision::xpos#2 ← (byte) current_xpos#22 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [228] (byte) play_collision::ypos#2 ← (byte) current_ypos#19
   [229] (byte) play_collision::orientation#2 ← (byte) current_orientation#20
   [230] (byte*~) current_piece#100 ← (byte*) current_piece#15
   [231] call play_collision 
   [232] (byte) play_collision::return#13 ← (byte) play_collision::return#15
-  to:play_move_leftright::@15
-play_move_leftright::@15: scope:[play_move_leftright]  from play_move_leftright::@5
+  to:play_move_leftright::@7
+play_move_leftright::@7: scope:[play_move_leftright]  from play_move_leftright::@3
   [233] (byte~) play_move_leftright::$4 ← (byte) play_collision::return#13
   [234] if((byte~) play_move_leftright::$4!=(const byte) COLLISION_NONE#0) goto play_move_leftright::@return
-  to:play_move_leftright::@6
-play_move_leftright::@6: scope:[play_move_leftright]  from play_move_leftright::@15
+  to:play_move_leftright::@4
+play_move_leftright::@4: scope:[play_move_leftright]  from play_move_leftright::@7
   [235] (byte) current_xpos#6 ← ++ (byte) current_xpos#22
   to:play_move_leftright::@return
-play_move_leftright::@return: scope:[play_move_leftright]  from play_move_leftright::@14 play_move_leftright::@15 play_move_leftright::@4 play_move_leftright::@6 play_move_leftright::@9
-  [236] (byte) current_xpos#26 ← phi( play_move_leftright::@14/(byte) current_xpos#22 play_move_leftright::@6/(byte) current_xpos#6 play_move_leftright::@9/(byte) current_xpos#8 play_move_leftright::@15/(byte) current_xpos#22 play_move_leftright::@4/(byte) current_xpos#22 )
-  [236] (byte) play_move_leftright::return#2 ← phi( play_move_leftright::@14/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_leftright::@6/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_leftright::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_leftright::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_leftright::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+play_move_leftright::@return: scope:[play_move_leftright]  from play_move_leftright::@2 play_move_leftright::@4 play_move_leftright::@5 play_move_leftright::@6 play_move_leftright::@7
+  [236] (byte) current_xpos#26 ← phi( play_move_leftright::@6/(byte) current_xpos#22 play_move_leftright::@4/(byte) current_xpos#6 play_move_leftright::@5/(byte) current_xpos#8 play_move_leftright::@7/(byte) current_xpos#22 play_move_leftright::@2/(byte) current_xpos#22 )
+  [236] (byte) play_move_leftright::return#2 ← phi( play_move_leftright::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_leftright::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_leftright::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_leftright::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_leftright::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [237] return 
   to:@return
 play_move_leftright::@1: scope:[play_move_leftright]  from play_move_leftright
@@ -523,117 +523,117 @@ play_move_leftright::@1: scope:[play_move_leftright]  from play_move_leftright
   [241] (byte*~) current_piece#99 ← (byte*) current_piece#15
   [242] call play_collision 
   [243] (byte) play_collision::return#1 ← (byte) play_collision::return#15
-  to:play_move_leftright::@14
-play_move_leftright::@14: scope:[play_move_leftright]  from play_move_leftright::@1
+  to:play_move_leftright::@6
+play_move_leftright::@6: scope:[play_move_leftright]  from play_move_leftright::@1
   [244] (byte~) play_move_leftright::$8 ← (byte) play_collision::return#1
   [245] if((byte~) play_move_leftright::$8!=(const byte) COLLISION_NONE#0) goto play_move_leftright::@return
-  to:play_move_leftright::@9
-play_move_leftright::@9: scope:[play_move_leftright]  from play_move_leftright::@14
+  to:play_move_leftright::@5
+play_move_leftright::@5: scope:[play_move_leftright]  from play_move_leftright::@6
   [246] (byte) current_xpos#8 ← -- (byte) current_xpos#22
   to:play_move_leftright::@return
 play_move_down: scope:[play_move_down]  from play_movement
   [247] (byte) current_movedown_counter#12 ← ++ (byte) current_movedown_counter#16
   [248] if((byte) play_move_down::key_event#0!=(const byte) KEY_SPACE#0) goto play_move_down::@1
-  to:play_move_down::@5
-play_move_down::@5: scope:[play_move_down]  from play_move_down
+  to:play_move_down::@4
+play_move_down::@4: scope:[play_move_down]  from play_move_down
   [249] phi()
   to:play_move_down::@1
-play_move_down::@1: scope:[play_move_down]  from play_move_down play_move_down::@5
-  [250] (byte) play_move_down::movedown#10 ← phi( play_move_down/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_down::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+play_move_down::@1: scope:[play_move_down]  from play_move_down play_move_down::@4
+  [250] (byte) play_move_down::movedown#10 ← phi( play_move_down/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_down::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [251] call keyboard_event_pressed 
   [252] (byte) keyboard_event_pressed::return#12 ← (byte) keyboard_event_pressed::return#11
-  to:play_move_down::@17
-play_move_down::@17: scope:[play_move_down]  from play_move_down::@1
+  to:play_move_down::@12
+play_move_down::@12: scope:[play_move_down]  from play_move_down::@1
   [253] (byte~) play_move_down::$2 ← (byte) keyboard_event_pressed::return#12
   [254] if((byte~) play_move_down::$2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_move_down::@2
-  to:play_move_down::@6
-play_move_down::@6: scope:[play_move_down]  from play_move_down::@17
+  to:play_move_down::@5
+play_move_down::@5: scope:[play_move_down]  from play_move_down::@12
   [255] if((byte) current_movedown_counter#12<(const byte) current_movedown_fast#0) goto play_move_down::@2
-  to:play_move_down::@7
-play_move_down::@7: scope:[play_move_down]  from play_move_down::@6
+  to:play_move_down::@6
+play_move_down::@6: scope:[play_move_down]  from play_move_down::@5
   [256] (byte) play_move_down::movedown#2 ← ++ (byte) play_move_down::movedown#10
   to:play_move_down::@2
-play_move_down::@2: scope:[play_move_down]  from play_move_down::@17 play_move_down::@6 play_move_down::@7
-  [257] (byte) play_move_down::movedown#7 ← phi( play_move_down::@6/(byte) play_move_down::movedown#10 play_move_down::@17/(byte) play_move_down::movedown#10 play_move_down::@7/(byte) play_move_down::movedown#2 )
+play_move_down::@2: scope:[play_move_down]  from play_move_down::@12 play_move_down::@5 play_move_down::@6
+  [257] (byte) play_move_down::movedown#7 ← phi( play_move_down::@5/(byte) play_move_down::movedown#10 play_move_down::@12/(byte) play_move_down::movedown#10 play_move_down::@6/(byte) play_move_down::movedown#2 )
   [258] if((byte) current_movedown_counter#12<(byte) current_movedown_slow#14) goto play_move_down::@3
-  to:play_move_down::@8
-play_move_down::@8: scope:[play_move_down]  from play_move_down::@2
+  to:play_move_down::@7
+play_move_down::@7: scope:[play_move_down]  from play_move_down::@2
   [259] (byte) play_move_down::movedown#3 ← ++ (byte) play_move_down::movedown#7
   to:play_move_down::@3
-play_move_down::@3: scope:[play_move_down]  from play_move_down::@2 play_move_down::@8
-  [260] (byte) play_move_down::movedown#6 ← phi( play_move_down::@2/(byte) play_move_down::movedown#7 play_move_down::@8/(byte) play_move_down::movedown#3 )
+play_move_down::@3: scope:[play_move_down]  from play_move_down::@2 play_move_down::@7
+  [260] (byte) play_move_down::movedown#6 ← phi( play_move_down::@2/(byte) play_move_down::movedown#7 play_move_down::@7/(byte) play_move_down::movedown#3 )
   [261] if((byte) play_move_down::movedown#6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_move_down::@return
-  to:play_move_down::@9
-play_move_down::@9: scope:[play_move_down]  from play_move_down::@3
+  to:play_move_down::@8
+play_move_down::@8: scope:[play_move_down]  from play_move_down::@3
   [262] (byte) play_collision::ypos#0 ← (byte) current_ypos#11 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [263] (byte) play_collision::xpos#0 ← (byte) current_xpos#122
   [264] (byte) play_collision::orientation#0 ← (byte) current_orientation#13
   [265] (byte*~) current_piece#98 ← (byte*) current_piece#10
   [266] call play_collision 
   [267] (byte) play_collision::return#0 ← (byte) play_collision::return#15
-  to:play_move_down::@18
-play_move_down::@18: scope:[play_move_down]  from play_move_down::@9
+  to:play_move_down::@13
+play_move_down::@13: scope:[play_move_down]  from play_move_down::@8
   [268] (byte~) play_move_down::$12 ← (byte) play_collision::return#0
-  [269] if((byte~) play_move_down::$12==(const byte) COLLISION_NONE#0) goto play_move_down::@14
-  to:play_move_down::@10
-play_move_down::@10: scope:[play_move_down]  from play_move_down::@18
+  [269] if((byte~) play_move_down::$12==(const byte) COLLISION_NONE#0) goto play_move_down::@10
+  to:play_move_down::@9
+play_move_down::@9: scope:[play_move_down]  from play_move_down::@13
   [270] phi()
   [271] call play_lock_current 
-  to:play_move_down::@19
-play_move_down::@19: scope:[play_move_down]  from play_move_down::@10
+  to:play_move_down::@14
+play_move_down::@14: scope:[play_move_down]  from play_move_down::@9
   [272] phi()
   [273] call play_remove_lines 
   [274] (byte) play_remove_lines::return#0 ← (byte) play_remove_lines::removed#7
-  to:play_move_down::@20
-play_move_down::@20: scope:[play_move_down]  from play_move_down::@19
+  to:play_move_down::@15
+play_move_down::@15: scope:[play_move_down]  from play_move_down::@14
   [275] (byte) play_move_down::removed#0 ← (byte) play_remove_lines::return#0
   [276] (byte) play_update_score::removed#0 ← (byte) play_move_down::removed#0
   [277] call play_update_score 
-  to:play_move_down::@21
-play_move_down::@21: scope:[play_move_down]  from play_move_down::@20
+  to:play_move_down::@16
+play_move_down::@16: scope:[play_move_down]  from play_move_down::@15
   [278] phi()
   [279] call play_spawn_current 
   [280] (byte*~) current_piece#104 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0)
-  to:play_move_down::@15
-play_move_down::@15: scope:[play_move_down]  from play_move_down::@14 play_move_down::@21
-  [281] (byte) next_piece_idx#30 ← phi( play_move_down::@14/(byte) next_piece_idx#10 play_move_down::@21/(byte) play_spawn_current::piece_idx#2 )
-  [281] (byte) game_over#27 ← phi( play_move_down::@14/(byte) game_over#10 play_move_down::@21/(byte) game_over#52 )
-  [281] (byte) current_xpos#43 ← phi( play_move_down::@14/(byte) current_xpos#122 play_move_down::@21/(byte) current_xpos#103 )
-  [281] (byte*) current_piece_gfx#35 ← phi( play_move_down::@14/(byte*) current_piece_gfx#112 play_move_down::@21/(byte*) current_piece_gfx#74 )
-  [281] (byte) current_orientation#37 ← phi( play_move_down::@14/(byte) current_orientation#13 play_move_down::@21/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [281] (byte) current_piece_char#29 ← phi( play_move_down::@14/(byte) current_piece_char#10 play_move_down::@21/(byte) current_piece_char#5 )
-  [281] (byte*) current_piece#28 ← phi( play_move_down::@14/(byte*) current_piece#10 play_move_down::@21/(byte*~) current_piece#104 )
-  [281] (byte) level_bcd#31 ← phi( play_move_down::@14/(byte) level_bcd#11 play_move_down::@21/(byte) level_bcd#19 )
-  [281] (byte) current_movedown_slow#37 ← phi( play_move_down::@14/(byte) current_movedown_slow#14 play_move_down::@21/(byte) current_movedown_slow#23 )
-  [281] (byte) level#33 ← phi( play_move_down::@14/(byte) level#10 play_move_down::@21/(byte) level#19 )
-  [281] (dword) score_bcd#26 ← phi( play_move_down::@14/(dword) score_bcd#18 play_move_down::@21/(dword) score_bcd#16 )
-  [281] (word) lines_bcd#26 ← phi( play_move_down::@14/(word) lines_bcd#19 play_move_down::@21/(word) lines_bcd#17 )
-  [281] (byte) current_ypos#38 ← phi( play_move_down::@14/(byte) current_ypos#3 play_move_down::@21/(byte) current_ypos#6 )
+  to:play_move_down::@11
+play_move_down::@11: scope:[play_move_down]  from play_move_down::@10 play_move_down::@16
+  [281] (byte) next_piece_idx#30 ← phi( play_move_down::@10/(byte) next_piece_idx#10 play_move_down::@16/(byte) play_spawn_current::piece_idx#2 )
+  [281] (byte) game_over#27 ← phi( play_move_down::@10/(byte) game_over#10 play_move_down::@16/(byte) game_over#52 )
+  [281] (byte) current_xpos#43 ← phi( play_move_down::@10/(byte) current_xpos#122 play_move_down::@16/(byte) current_xpos#103 )
+  [281] (byte*) current_piece_gfx#35 ← phi( play_move_down::@10/(byte*) current_piece_gfx#112 play_move_down::@16/(byte*) current_piece_gfx#74 )
+  [281] (byte) current_orientation#37 ← phi( play_move_down::@10/(byte) current_orientation#13 play_move_down::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [281] (byte) current_piece_char#29 ← phi( play_move_down::@10/(byte) current_piece_char#10 play_move_down::@16/(byte) current_piece_char#5 )
+  [281] (byte*) current_piece#28 ← phi( play_move_down::@10/(byte*) current_piece#10 play_move_down::@16/(byte*~) current_piece#104 )
+  [281] (byte) level_bcd#31 ← phi( play_move_down::@10/(byte) level_bcd#11 play_move_down::@16/(byte) level_bcd#19 )
+  [281] (byte) current_movedown_slow#37 ← phi( play_move_down::@10/(byte) current_movedown_slow#14 play_move_down::@16/(byte) current_movedown_slow#23 )
+  [281] (byte) level#33 ← phi( play_move_down::@10/(byte) level#10 play_move_down::@16/(byte) level#19 )
+  [281] (dword) score_bcd#26 ← phi( play_move_down::@10/(dword) score_bcd#18 play_move_down::@16/(dword) score_bcd#16 )
+  [281] (word) lines_bcd#26 ← phi( play_move_down::@10/(word) lines_bcd#19 play_move_down::@16/(word) lines_bcd#17 )
+  [281] (byte) current_ypos#38 ← phi( play_move_down::@10/(byte) current_ypos#3 play_move_down::@16/(byte) current_ypos#6 )
   to:play_move_down::@return
-play_move_down::@return: scope:[play_move_down]  from play_move_down::@15 play_move_down::@3
-  [282] (byte) next_piece_idx#16 ← phi( play_move_down::@15/(byte) next_piece_idx#30 play_move_down::@3/(byte) next_piece_idx#10 )
-  [282] (byte) game_over#15 ← phi( play_move_down::@15/(byte) game_over#27 play_move_down::@3/(byte) game_over#10 )
-  [282] (byte) current_xpos#22 ← phi( play_move_down::@15/(byte) current_xpos#43 play_move_down::@3/(byte) current_xpos#122 )
-  [282] (byte*) current_piece_gfx#20 ← phi( play_move_down::@15/(byte*) current_piece_gfx#35 play_move_down::@3/(byte*) current_piece_gfx#112 )
-  [282] (byte) current_orientation#20 ← phi( play_move_down::@15/(byte) current_orientation#37 play_move_down::@3/(byte) current_orientation#13 )
-  [282] (byte) current_piece_char#16 ← phi( play_move_down::@15/(byte) current_piece_char#29 play_move_down::@3/(byte) current_piece_char#10 )
-  [282] (byte*) current_piece#15 ← phi( play_move_down::@15/(byte*) current_piece#28 play_move_down::@3/(byte*) current_piece#10 )
-  [282] (byte) level_bcd#17 ← phi( play_move_down::@15/(byte) level_bcd#31 play_move_down::@3/(byte) level_bcd#11 )
-  [282] (byte) current_movedown_slow#21 ← phi( play_move_down::@15/(byte) current_movedown_slow#37 play_move_down::@3/(byte) current_movedown_slow#14 )
-  [282] (byte) level#17 ← phi( play_move_down::@15/(byte) level#33 play_move_down::@3/(byte) level#10 )
-  [282] (dword) score_bcd#14 ← phi( play_move_down::@15/(dword) score_bcd#26 play_move_down::@3/(dword) score_bcd#18 )
-  [282] (word) lines_bcd#15 ← phi( play_move_down::@15/(word) lines_bcd#26 play_move_down::@3/(word) lines_bcd#19 )
-  [282] (byte) current_ypos#19 ← phi( play_move_down::@15/(byte) current_ypos#38 play_move_down::@3/(byte) current_ypos#11 )
-  [282] (byte) current_movedown_counter#14 ← phi( play_move_down::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_down::@3/(byte) current_movedown_counter#12 )
-  [282] (byte) play_move_down::return#3 ← phi( play_move_down::@15/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_down::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+play_move_down::@return: scope:[play_move_down]  from play_move_down::@11 play_move_down::@3
+  [282] (byte) next_piece_idx#16 ← phi( play_move_down::@11/(byte) next_piece_idx#30 play_move_down::@3/(byte) next_piece_idx#10 )
+  [282] (byte) game_over#15 ← phi( play_move_down::@11/(byte) game_over#27 play_move_down::@3/(byte) game_over#10 )
+  [282] (byte) current_xpos#22 ← phi( play_move_down::@11/(byte) current_xpos#43 play_move_down::@3/(byte) current_xpos#122 )
+  [282] (byte*) current_piece_gfx#20 ← phi( play_move_down::@11/(byte*) current_piece_gfx#35 play_move_down::@3/(byte*) current_piece_gfx#112 )
+  [282] (byte) current_orientation#20 ← phi( play_move_down::@11/(byte) current_orientation#37 play_move_down::@3/(byte) current_orientation#13 )
+  [282] (byte) current_piece_char#16 ← phi( play_move_down::@11/(byte) current_piece_char#29 play_move_down::@3/(byte) current_piece_char#10 )
+  [282] (byte*) current_piece#15 ← phi( play_move_down::@11/(byte*) current_piece#28 play_move_down::@3/(byte*) current_piece#10 )
+  [282] (byte) level_bcd#17 ← phi( play_move_down::@11/(byte) level_bcd#31 play_move_down::@3/(byte) level_bcd#11 )
+  [282] (byte) current_movedown_slow#21 ← phi( play_move_down::@11/(byte) current_movedown_slow#37 play_move_down::@3/(byte) current_movedown_slow#14 )
+  [282] (byte) level#17 ← phi( play_move_down::@11/(byte) level#33 play_move_down::@3/(byte) level#10 )
+  [282] (dword) score_bcd#14 ← phi( play_move_down::@11/(dword) score_bcd#26 play_move_down::@3/(dword) score_bcd#18 )
+  [282] (word) lines_bcd#15 ← phi( play_move_down::@11/(word) lines_bcd#26 play_move_down::@3/(word) lines_bcd#19 )
+  [282] (byte) current_ypos#19 ← phi( play_move_down::@11/(byte) current_ypos#38 play_move_down::@3/(byte) current_ypos#11 )
+  [282] (byte) current_movedown_counter#14 ← phi( play_move_down::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_down::@3/(byte) current_movedown_counter#12 )
+  [282] (byte) play_move_down::return#3 ← phi( play_move_down::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_down::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [283] return 
   to:@return
-play_move_down::@14: scope:[play_move_down]  from play_move_down::@18
+play_move_down::@10: scope:[play_move_down]  from play_move_down::@13
   [284] (byte) current_ypos#3 ← ++ (byte) current_ypos#11
-  to:play_move_down::@15
-play_spawn_current: scope:[play_spawn_current]  from main::@29 main::@30 play_move_down::@21
-  [285] (byte) game_over#65 ← phi( main::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@30/(byte) game_over#52 play_move_down::@21/(byte) game_over#10 )
-  [285] (byte) next_piece_idx#17 ← phi( main::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@30/(byte) play_spawn_current::piece_idx#2 play_move_down::@21/(byte) next_piece_idx#10 )
+  to:play_move_down::@11
+play_spawn_current: scope:[play_spawn_current]  from main::@12 main::@13 play_move_down::@16
+  [285] (byte) game_over#65 ← phi( main::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@13/(byte) game_over#52 play_move_down::@16/(byte) game_over#10 )
+  [285] (byte) next_piece_idx#17 ← phi( main::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@13/(byte) play_spawn_current::piece_idx#2 play_move_down::@16/(byte) next_piece_idx#10 )
   [286] (byte) play_spawn_current::current_piece_idx#0 ← (byte) next_piece_idx#17
   [287] (byte~) play_spawn_current::$0 ← (byte) play_spawn_current::current_piece_idx#0 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [288] (byte) current_piece_char#5 ← *((const byte[]) PIECES_CHARS#0 + (byte) play_spawn_current::current_piece_idx#0)
@@ -645,16 +645,16 @@ play_spawn_current: scope:[play_spawn_current]  from main::@29 main::@30 play_mo
   [294] (byte*~) current_piece#102 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0)
   [295] call play_collision 
   [296] (byte) play_collision::return#10 ← (byte) play_collision::return#15
-  to:play_spawn_current::@9
-play_spawn_current::@9: scope:[play_spawn_current]  from play_spawn_current
+  to:play_spawn_current::@4
+play_spawn_current::@4: scope:[play_spawn_current]  from play_spawn_current
   [297] (byte~) play_spawn_current::$2 ← (byte) play_collision::return#10
-  [298] if((byte~) play_spawn_current::$2!=(const byte) COLLISION_PLAYFIELD#0) goto play_spawn_current::@11
+  [298] if((byte~) play_spawn_current::$2!=(const byte) COLLISION_PLAYFIELD#0) goto play_spawn_current::@6
   to:play_spawn_current::@1
-play_spawn_current::@1: scope:[play_spawn_current]  from play_spawn_current::@11 play_spawn_current::@9
-  [299] (byte) game_over#52 ← phi( play_spawn_current::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 play_spawn_current::@11/(byte) game_over#65 )
+play_spawn_current::@1: scope:[play_spawn_current]  from play_spawn_current::@4 play_spawn_current::@6
+  [299] (byte) game_over#52 ← phi( play_spawn_current::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 play_spawn_current::@6/(byte) game_over#65 )
   to:play_spawn_current::@2
-play_spawn_current::@2: scope:[play_spawn_current]  from play_spawn_current::@1 play_spawn_current::@10
-  [300] (byte) play_spawn_current::piece_idx#2 ← phi( play_spawn_current::@1/(byte/signed byte/word/signed word/dword/signed dword) 7 play_spawn_current::@10/(byte) play_spawn_current::piece_idx#1 )
+play_spawn_current::@2: scope:[play_spawn_current]  from play_spawn_current::@1 play_spawn_current::@5
+  [300] (byte) play_spawn_current::piece_idx#2 ← phi( play_spawn_current::@1/(byte/signed byte/word/signed word/dword/signed dword) 7 play_spawn_current::@5/(byte) play_spawn_current::piece_idx#1 )
   [301] if((byte) play_spawn_current::piece_idx#2==(byte/signed byte/word/signed word/dword/signed dword) 7) goto play_spawn_current::@3
   to:play_spawn_current::@return
 play_spawn_current::@return: scope:[play_spawn_current]  from play_spawn_current::@2
@@ -664,12 +664,12 @@ play_spawn_current::@3: scope:[play_spawn_current]  from play_spawn_current::@2
   [303] phi()
   [304] call sid_rnd 
   [305] (byte) sid_rnd::return#2 ← (byte) sid_rnd::return#0
-  to:play_spawn_current::@10
-play_spawn_current::@10: scope:[play_spawn_current]  from play_spawn_current::@3
+  to:play_spawn_current::@5
+play_spawn_current::@5: scope:[play_spawn_current]  from play_spawn_current::@3
   [306] (byte~) play_spawn_current::$6 ← (byte) sid_rnd::return#2
   [307] (byte) play_spawn_current::piece_idx#1 ← (byte~) play_spawn_current::$6 & (byte/signed byte/word/signed word/dword/signed dword) 7
   to:play_spawn_current::@2
-play_spawn_current::@11: scope:[play_spawn_current]  from play_spawn_current::@9
+play_spawn_current::@6: scope:[play_spawn_current]  from play_spawn_current::@4
   [308] phi()
   to:play_spawn_current::@1
 sid_rnd: scope:[sid_rnd]  from play_spawn_current::@3
@@ -678,10 +678,10 @@ sid_rnd: scope:[sid_rnd]  from play_spawn_current::@3
 sid_rnd::@return: scope:[sid_rnd]  from sid_rnd
   [310] return 
   to:@return
-play_update_score: scope:[play_update_score]  from play_move_down::@20
+play_update_score: scope:[play_update_score]  from play_move_down::@15
   [311] if((byte) play_update_score::removed#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_update_score::@return
-  to:play_update_score::@2
-play_update_score::@2: scope:[play_update_score]  from play_update_score
+  to:play_update_score::@1
+play_update_score::@1: scope:[play_update_score]  from play_update_score
   [312] (byte~) play_update_score::$2 ← < (word) lines_bcd#19
   [313] (byte) play_update_score::lines_before#0 ← (byte~) play_update_score::$2 & (byte/word/signed word/dword/signed dword) $f0
   [314] (byte~) play_update_score::$4 ← (byte) play_update_score::removed#0 << (byte/signed byte/word/signed word/dword/signed dword) 2
@@ -693,92 +693,92 @@ play_update_score::@2: scope:[play_update_score]  from play_update_score
   [320] (byte~) play_update_score::$5 ← < (word) lines_bcd#30
   [321] (byte) play_update_score::lines_after#0 ← (byte~) play_update_score::$5 & (byte/word/signed word/dword/signed dword) $f0
   [322] if((byte) play_update_score::lines_before#0==(byte) play_update_score::lines_after#0) goto play_update_score::@return
-  to:play_update_score::@3
-play_update_score::@3: scope:[play_update_score]  from play_update_score::@2
+  to:play_update_score::@2
+play_update_score::@2: scope:[play_update_score]  from play_update_score::@1
   [323] phi()
   [324] call play_increase_level 
   to:play_update_score::@return
-play_update_score::@return: scope:[play_update_score]  from play_update_score play_update_score::@2 play_update_score::@3
-  [325] (byte) level_bcd#19 ← phi( play_update_score/(byte) level_bcd#11 play_update_score::@2/(byte) level_bcd#11 play_update_score::@3/(byte) level_bcd#64 )
-  [325] (byte) current_movedown_slow#23 ← phi( play_update_score/(byte) current_movedown_slow#14 play_update_score::@2/(byte) current_movedown_slow#14 play_update_score::@3/(byte) current_movedown_slow#69 )
-  [325] (byte) level#19 ← phi( play_update_score/(byte) level#10 play_update_score::@2/(byte) level#10 play_update_score::@3/(byte) level#21 )
-  [325] (dword) score_bcd#16 ← phi( play_update_score/(dword) score_bcd#18 play_update_score::@2/(dword) score_bcd#30 play_update_score::@3/(dword) score_bcd#30 )
-  [325] (word) lines_bcd#17 ← phi( play_update_score/(word) lines_bcd#19 play_update_score::@2/(word) lines_bcd#30 play_update_score::@3/(word) lines_bcd#30 )
+play_update_score::@return: scope:[play_update_score]  from play_update_score play_update_score::@1 play_update_score::@2
+  [325] (byte) level_bcd#19 ← phi( play_update_score/(byte) level_bcd#11 play_update_score::@1/(byte) level_bcd#11 play_update_score::@2/(byte) level_bcd#64 )
+  [325] (byte) current_movedown_slow#23 ← phi( play_update_score/(byte) current_movedown_slow#14 play_update_score::@1/(byte) current_movedown_slow#14 play_update_score::@2/(byte) current_movedown_slow#69 )
+  [325] (byte) level#19 ← phi( play_update_score/(byte) level#10 play_update_score::@1/(byte) level#10 play_update_score::@2/(byte) level#21 )
+  [325] (dword) score_bcd#16 ← phi( play_update_score/(dword) score_bcd#18 play_update_score::@1/(dword) score_bcd#30 play_update_score::@2/(dword) score_bcd#30 )
+  [325] (word) lines_bcd#17 ← phi( play_update_score/(word) lines_bcd#19 play_update_score::@1/(word) lines_bcd#30 play_update_score::@2/(word) lines_bcd#30 )
   [326] return 
   to:@return
-play_increase_level: scope:[play_increase_level]  from play_update_score::@3
+play_increase_level: scope:[play_increase_level]  from play_update_score::@2
   [327] (byte) level#21 ← ++ (byte) level#10
-  [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@2
-  to:play_increase_level::@4
-play_increase_level::@4: scope:[play_increase_level]  from play_increase_level
+  [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@1
+  to:play_increase_level::@3
+play_increase_level::@3: scope:[play_increase_level]  from play_increase_level
   [329] (byte) current_movedown_slow#10 ← *((const byte[]) MOVEDOWN_SLOW_SPEEDS#0 + (byte) level#21)
-  to:play_increase_level::@2
-play_increase_level::@2: scope:[play_increase_level]  from play_increase_level play_increase_level::@4
-  [330] (byte) current_movedown_slow#69 ← phi( play_increase_level/(byte/signed byte/word/signed word/dword/signed dword) 1 play_increase_level::@4/(byte) current_movedown_slow#10 )
+  to:play_increase_level::@1
+play_increase_level::@1: scope:[play_increase_level]  from play_increase_level play_increase_level::@3
+  [330] (byte) current_movedown_slow#69 ← phi( play_increase_level/(byte/signed byte/word/signed word/dword/signed dword) 1 play_increase_level::@3/(byte) current_movedown_slow#10 )
   [331] (byte) level_bcd#21 ← ++ (byte) level_bcd#11
   [332] (byte~) play_increase_level::$1 ← (byte) level_bcd#21 & (byte/signed byte/word/signed word/dword/signed dword) $f
-  [333] if((byte~) play_increase_level::$1!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto play_increase_level::@3
-  to:play_increase_level::@6
-play_increase_level::@6: scope:[play_increase_level]  from play_increase_level::@2
+  [333] if((byte~) play_increase_level::$1!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto play_increase_level::@2
+  to:play_increase_level::@4
+play_increase_level::@4: scope:[play_increase_level]  from play_increase_level::@1
   [334] (byte) level_bcd#8 ← (byte) level_bcd#21 + (byte/signed byte/word/signed word/dword/signed dword) 6
-  to:play_increase_level::@3
-play_increase_level::@3: scope:[play_increase_level]  from play_increase_level::@2 play_increase_level::@6
-  [335] (byte) level_bcd#64 ← phi( play_increase_level::@2/(byte) level_bcd#21 play_increase_level::@6/(byte) level_bcd#8 )
+  to:play_increase_level::@2
+play_increase_level::@2: scope:[play_increase_level]  from play_increase_level::@1 play_increase_level::@4
+  [335] (byte) level_bcd#64 ← phi( play_increase_level::@1/(byte) level_bcd#21 play_increase_level::@4/(byte) level_bcd#8 )
   asm { sed  }
-  to:play_increase_level::@7
-play_increase_level::@7: scope:[play_increase_level]  from play_increase_level::@3 play_increase_level::@7
-  [337] (byte) play_increase_level::b#2 ← phi( play_increase_level::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 play_increase_level::@7/(byte) play_increase_level::b#1 )
+  to:play_increase_level::@5
+play_increase_level::@5: scope:[play_increase_level]  from play_increase_level::@2 play_increase_level::@5
+  [337] (byte) play_increase_level::b#2 ← phi( play_increase_level::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 play_increase_level::@5/(byte) play_increase_level::b#1 )
   [338] (byte) play_increase_level::b4#0 ← (byte) play_increase_level::b#2 << (byte/signed byte/word/signed word/dword/signed dword) 2
   [339] *((const dword[5]) score_add_bcd#0 + (byte) play_increase_level::b4#0) ← *((const dword[5]) score_add_bcd#0 + (byte) play_increase_level::b4#0) + *((const dword[]) SCORE_BASE_BCD#0 + (byte) play_increase_level::b4#0)
   [340] (byte) play_increase_level::b#1 ← ++ (byte) play_increase_level::b#2
-  [341] if((byte) play_increase_level::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto play_increase_level::@7
-  to:play_increase_level::@8
-play_increase_level::@8: scope:[play_increase_level]  from play_increase_level::@7
+  [341] if((byte) play_increase_level::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto play_increase_level::@5
+  to:play_increase_level::@6
+play_increase_level::@6: scope:[play_increase_level]  from play_increase_level::@5
   asm { cld  }
   to:play_increase_level::@return
-play_increase_level::@return: scope:[play_increase_level]  from play_increase_level::@8
+play_increase_level::@return: scope:[play_increase_level]  from play_increase_level::@6
   [343] return 
   to:@return
-play_remove_lines: scope:[play_remove_lines]  from play_move_down::@19
+play_remove_lines: scope:[play_remove_lines]  from play_move_down::@14
   [344] phi()
-  to:play_remove_lines::@8
-play_remove_lines::@8: scope:[play_remove_lines]  from play_remove_lines play_remove_lines::@14
-  [345] (byte) play_remove_lines::removed#11 ← phi( play_remove_lines/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@14/(byte) play_remove_lines::removed#7 )
-  [345] (byte) play_remove_lines::y#8 ← phi( play_remove_lines/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@14/(byte) play_remove_lines::y#1 )
-  [345] (byte) play_remove_lines::w#12 ← phi( play_remove_lines/(const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 play_remove_lines::@14/(byte) play_remove_lines::w#11 )
-  [345] (byte) play_remove_lines::r#4 ← phi( play_remove_lines/(const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 play_remove_lines::@14/(byte) play_remove_lines::r#1 )
-  to:play_remove_lines::@9
-play_remove_lines::@9: scope:[play_remove_lines]  from play_remove_lines::@10 play_remove_lines::@8
-  [346] (byte) play_remove_lines::full#4 ← phi( play_remove_lines::@10/(byte) play_remove_lines::full#2 play_remove_lines::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [346] (byte) play_remove_lines::x#2 ← phi( play_remove_lines::@10/(byte) play_remove_lines::x#1 play_remove_lines::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [346] (byte) play_remove_lines::w#4 ← phi( play_remove_lines::@10/(byte) play_remove_lines::w#1 play_remove_lines::@8/(byte) play_remove_lines::w#12 )
-  [346] (byte) play_remove_lines::r#2 ← phi( play_remove_lines::@10/(byte) play_remove_lines::r#1 play_remove_lines::@8/(byte) play_remove_lines::r#4 )
+  to:play_remove_lines::@3
+play_remove_lines::@3: scope:[play_remove_lines]  from play_remove_lines play_remove_lines::@8
+  [345] (byte) play_remove_lines::removed#11 ← phi( play_remove_lines/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@8/(byte) play_remove_lines::removed#7 )
+  [345] (byte) play_remove_lines::y#8 ← phi( play_remove_lines/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@8/(byte) play_remove_lines::y#1 )
+  [345] (byte) play_remove_lines::w#12 ← phi( play_remove_lines/(const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 play_remove_lines::@8/(byte) play_remove_lines::w#11 )
+  [345] (byte) play_remove_lines::r#4 ← phi( play_remove_lines/(const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 play_remove_lines::@8/(byte) play_remove_lines::r#1 )
+  to:play_remove_lines::@4
+play_remove_lines::@4: scope:[play_remove_lines]  from play_remove_lines::@3 play_remove_lines::@5
+  [346] (byte) play_remove_lines::full#4 ← phi( play_remove_lines::@5/(byte) play_remove_lines::full#2 play_remove_lines::@3/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [346] (byte) play_remove_lines::x#2 ← phi( play_remove_lines::@5/(byte) play_remove_lines::x#1 play_remove_lines::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [346] (byte) play_remove_lines::w#4 ← phi( play_remove_lines::@5/(byte) play_remove_lines::w#1 play_remove_lines::@3/(byte) play_remove_lines::w#12 )
+  [346] (byte) play_remove_lines::r#2 ← phi( play_remove_lines::@5/(byte) play_remove_lines::r#1 play_remove_lines::@3/(byte) play_remove_lines::r#4 )
   [347] (byte) play_remove_lines::c#0 ← *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::r#2)
   [348] (byte) play_remove_lines::r#1 ← -- (byte) play_remove_lines::r#2
-  [349] if((byte) play_remove_lines::c#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_remove_lines::@18
-  to:play_remove_lines::@10
-play_remove_lines::@10: scope:[play_remove_lines]  from play_remove_lines::@18 play_remove_lines::@9
-  [350] (byte) play_remove_lines::full#2 ← phi( play_remove_lines::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@18/(byte) play_remove_lines::full#4 )
+  [349] if((byte) play_remove_lines::c#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_remove_lines::@9
+  to:play_remove_lines::@5
+play_remove_lines::@5: scope:[play_remove_lines]  from play_remove_lines::@4 play_remove_lines::@9
+  [350] (byte) play_remove_lines::full#2 ← phi( play_remove_lines::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@9/(byte) play_remove_lines::full#4 )
   [351] *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::w#4) ← (byte) play_remove_lines::c#0
   [352] (byte) play_remove_lines::w#1 ← -- (byte) play_remove_lines::w#4
   [353] (byte) play_remove_lines::x#1 ← ++ (byte) play_remove_lines::x#2
-  [354] if((byte) play_remove_lines::x#1!=(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@9
-  to:play_remove_lines::@12
-play_remove_lines::@12: scope:[play_remove_lines]  from play_remove_lines::@10
-  [355] if((byte) play_remove_lines::full#2!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@14
-  to:play_remove_lines::@13
-play_remove_lines::@13: scope:[play_remove_lines]  from play_remove_lines::@12
+  [354] if((byte) play_remove_lines::x#1!=(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@4
+  to:play_remove_lines::@6
+play_remove_lines::@6: scope:[play_remove_lines]  from play_remove_lines::@5
+  [355] if((byte) play_remove_lines::full#2!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@8
+  to:play_remove_lines::@7
+play_remove_lines::@7: scope:[play_remove_lines]  from play_remove_lines::@6
   [356] (byte) play_remove_lines::w#2 ← (byte) play_remove_lines::w#1 + (const byte) PLAYFIELD_COLS#0
   [357] (byte) play_remove_lines::removed#1 ← ++ (byte) play_remove_lines::removed#11
-  to:play_remove_lines::@14
-play_remove_lines::@14: scope:[play_remove_lines]  from play_remove_lines::@12 play_remove_lines::@13
-  [358] (byte) play_remove_lines::removed#7 ← phi( play_remove_lines::@12/(byte) play_remove_lines::removed#11 play_remove_lines::@13/(byte) play_remove_lines::removed#1 )
-  [358] (byte) play_remove_lines::w#11 ← phi( play_remove_lines::@12/(byte) play_remove_lines::w#1 play_remove_lines::@13/(byte) play_remove_lines::w#2 )
+  to:play_remove_lines::@8
+play_remove_lines::@8: scope:[play_remove_lines]  from play_remove_lines::@6 play_remove_lines::@7
+  [358] (byte) play_remove_lines::removed#7 ← phi( play_remove_lines::@6/(byte) play_remove_lines::removed#11 play_remove_lines::@7/(byte) play_remove_lines::removed#1 )
+  [358] (byte) play_remove_lines::w#11 ← phi( play_remove_lines::@6/(byte) play_remove_lines::w#1 play_remove_lines::@7/(byte) play_remove_lines::w#2 )
   [359] (byte) play_remove_lines::y#1 ← ++ (byte) play_remove_lines::y#8
-  [360] if((byte) play_remove_lines::y#1!=(const byte) PLAYFIELD_LINES#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@8
+  [360] if((byte) play_remove_lines::y#1!=(const byte) PLAYFIELD_LINES#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@3
   to:play_remove_lines::@1
-play_remove_lines::@1: scope:[play_remove_lines]  from play_remove_lines::@14 play_remove_lines::@2
-  [361] (byte) play_remove_lines::w#6 ← phi( play_remove_lines::@14/(byte) play_remove_lines::w#11 play_remove_lines::@2/(byte) play_remove_lines::w#3 )
+play_remove_lines::@1: scope:[play_remove_lines]  from play_remove_lines::@2 play_remove_lines::@8
+  [361] (byte) play_remove_lines::w#6 ← phi( play_remove_lines::@8/(byte) play_remove_lines::w#11 play_remove_lines::@2/(byte) play_remove_lines::w#3 )
   [362] if((byte) play_remove_lines::w#6!=(byte/word/signed word/dword/signed dword) $ff) goto play_remove_lines::@2
   to:play_remove_lines::@return
 play_remove_lines::@return: scope:[play_remove_lines]  from play_remove_lines::@1
@@ -788,23 +788,23 @@ play_remove_lines::@2: scope:[play_remove_lines]  from play_remove_lines::@1
   [364] *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::w#6) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [365] (byte) play_remove_lines::w#3 ← -- (byte) play_remove_lines::w#6
   to:play_remove_lines::@1
-play_remove_lines::@18: scope:[play_remove_lines]  from play_remove_lines::@9
+play_remove_lines::@9: scope:[play_remove_lines]  from play_remove_lines::@4
   [366] phi()
-  to:play_remove_lines::@10
-play_lock_current: scope:[play_lock_current]  from play_move_down::@10
+  to:play_remove_lines::@5
+play_lock_current: scope:[play_lock_current]  from play_move_down::@9
   [367] (byte) play_lock_current::ypos2#0 ← (byte) current_ypos#11 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:play_lock_current::@1
-play_lock_current::@1: scope:[play_lock_current]  from play_lock_current play_lock_current::@7
-  [368] (byte) play_lock_current::l#6 ← phi( play_lock_current/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@7/(byte) play_lock_current::l#1 )
-  [368] (byte) play_lock_current::i#3 ← phi( play_lock_current/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@7/(byte~) play_lock_current::i#7 )
-  [368] (byte) play_lock_current::ypos2#2 ← phi( play_lock_current/(byte) play_lock_current::ypos2#0 play_lock_current::@7/(byte) play_lock_current::ypos2#1 )
+play_lock_current::@1: scope:[play_lock_current]  from play_lock_current play_lock_current::@6
+  [368] (byte) play_lock_current::l#6 ← phi( play_lock_current/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@6/(byte) play_lock_current::l#1 )
+  [368] (byte) play_lock_current::i#3 ← phi( play_lock_current/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@6/(byte~) play_lock_current::i#7 )
+  [368] (byte) play_lock_current::ypos2#2 ← phi( play_lock_current/(byte) play_lock_current::ypos2#0 play_lock_current::@6/(byte) play_lock_current::ypos2#1 )
   [369] (byte*) play_lock_current::playfield_line#0 ← *((const byte*[PLAYFIELD_LINES#0]) playfield_lines#0 + (byte) play_lock_current::ypos2#2)
   [370] (byte) play_lock_current::col#0 ← (byte) current_xpos#122
   to:play_lock_current::@2
-play_lock_current::@2: scope:[play_lock_current]  from play_lock_current::@1 play_lock_current::@8
-  [371] (byte) play_lock_current::c#2 ← phi( play_lock_current::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@8/(byte) play_lock_current::c#1 )
-  [371] (byte) play_lock_current::col#2 ← phi( play_lock_current::@1/(byte) play_lock_current::col#0 play_lock_current::@8/(byte) play_lock_current::col#1 )
-  [371] (byte) play_lock_current::i#2 ← phi( play_lock_current::@1/(byte) play_lock_current::i#3 play_lock_current::@8/(byte~) play_lock_current::i#9 )
+play_lock_current::@2: scope:[play_lock_current]  from play_lock_current::@1 play_lock_current::@7
+  [371] (byte) play_lock_current::c#2 ← phi( play_lock_current::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@7/(byte) play_lock_current::c#1 )
+  [371] (byte) play_lock_current::col#2 ← phi( play_lock_current::@1/(byte) play_lock_current::col#0 play_lock_current::@7/(byte) play_lock_current::col#1 )
+  [371] (byte) play_lock_current::i#2 ← phi( play_lock_current::@1/(byte) play_lock_current::i#3 play_lock_current::@7/(byte~) play_lock_current::i#9 )
   [372] (byte) play_lock_current::i#1 ← ++ (byte) play_lock_current::i#2
   [373] if(*((byte*) current_piece_gfx#112 + (byte) play_lock_current::i#2)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_lock_current::@3
   to:play_lock_current::@4
@@ -814,24 +814,24 @@ play_lock_current::@4: scope:[play_lock_current]  from play_lock_current::@2
 play_lock_current::@3: scope:[play_lock_current]  from play_lock_current::@2 play_lock_current::@4
   [375] (byte) play_lock_current::col#1 ← ++ (byte) play_lock_current::col#2
   [376] (byte) play_lock_current::c#1 ← ++ (byte) play_lock_current::c#2
-  [377] if((byte) play_lock_current::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@8
+  [377] if((byte) play_lock_current::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@7
   to:play_lock_current::@5
 play_lock_current::@5: scope:[play_lock_current]  from play_lock_current::@3
   [378] (byte) play_lock_current::ypos2#1 ← (byte) play_lock_current::ypos2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [379] (byte) play_lock_current::l#1 ← ++ (byte) play_lock_current::l#6
-  [380] if((byte) play_lock_current::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@7
+  [380] if((byte) play_lock_current::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@6
   to:play_lock_current::@return
 play_lock_current::@return: scope:[play_lock_current]  from play_lock_current::@5
   [381] return 
   to:@return
-play_lock_current::@7: scope:[play_lock_current]  from play_lock_current::@5
+play_lock_current::@6: scope:[play_lock_current]  from play_lock_current::@5
   [382] (byte~) play_lock_current::i#7 ← (byte) play_lock_current::i#1
   to:play_lock_current::@1
-play_lock_current::@8: scope:[play_lock_current]  from play_lock_current::@3
+play_lock_current::@7: scope:[play_lock_current]  from play_lock_current::@3
   [383] (byte~) play_lock_current::i#9 ← (byte) play_lock_current::i#1
   to:play_lock_current::@2
-keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan::@1 keyboard_event_scan::@2 keyboard_event_scan::@23 keyboard_event_scan::@3 play_move_down::@1
-  [384] (byte) keyboard_event_pressed::keycode#5 ← phi( keyboard_event_scan::@1/(const byte) KEY_RSHIFT#0 keyboard_event_scan::@2/(const byte) KEY_CTRL#0 keyboard_event_scan::@23/(const byte) KEY_LSHIFT#0 keyboard_event_scan::@3/(const byte) KEY_COMMODORE#0 play_move_down::@1/(const byte) KEY_SPACE#0 )
+keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan::@1 keyboard_event_scan::@17 keyboard_event_scan::@2 keyboard_event_scan::@3 play_move_down::@1
+  [384] (byte) keyboard_event_pressed::keycode#5 ← phi( keyboard_event_scan::@1/(const byte) KEY_RSHIFT#0 keyboard_event_scan::@2/(const byte) KEY_CTRL#0 keyboard_event_scan::@17/(const byte) KEY_LSHIFT#0 keyboard_event_scan::@3/(const byte) KEY_COMMODORE#0 play_move_down::@1/(const byte) KEY_SPACE#0 )
   [385] (byte~) keyboard_event_pressed::$0 ← (byte) keyboard_event_pressed::keycode#5 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [386] (byte) keyboard_event_pressed::row_bits#0 ← *((const byte[8]) keyboard_scan_values#0 + (byte~) keyboard_event_pressed::$0)
   [387] (byte~) keyboard_event_pressed::$1 ← (byte) keyboard_event_pressed::keycode#5 & (byte/signed byte/word/signed word/dword/signed dword) 7
@@ -840,153 +840,153 @@ keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan
 keyboard_event_pressed::@return: scope:[keyboard_event_pressed]  from keyboard_event_pressed
   [389] return 
   to:@return
-keyboard_event_get: scope:[keyboard_event_get]  from main::@36
+keyboard_event_get: scope:[keyboard_event_get]  from main::@18
   [390] if((byte) keyboard_events_size#13==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_get::@return
-  to:keyboard_event_get::@3
-keyboard_event_get::@3: scope:[keyboard_event_get]  from keyboard_event_get
+  to:keyboard_event_get::@1
+keyboard_event_get::@1: scope:[keyboard_event_get]  from keyboard_event_get
   [391] (byte) keyboard_events_size#4 ← -- (byte) keyboard_events_size#13
   [392] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4)
   to:keyboard_event_get::@return
-keyboard_event_get::@return: scope:[keyboard_event_get]  from keyboard_event_get keyboard_event_get::@3
-  [393] (byte) keyboard_events_size#16 ← phi( keyboard_event_get/(byte) keyboard_events_size#13 keyboard_event_get::@3/(byte) keyboard_events_size#4 )
-  [393] (byte) keyboard_event_get::return#2 ← phi( keyboard_event_get/(byte/word/signed word/dword/signed dword) $ff keyboard_event_get::@3/(byte) keyboard_event_get::return#1 )
+keyboard_event_get::@return: scope:[keyboard_event_get]  from keyboard_event_get keyboard_event_get::@1
+  [393] (byte) keyboard_events_size#16 ← phi( keyboard_event_get/(byte) keyboard_events_size#13 keyboard_event_get::@1/(byte) keyboard_events_size#4 )
+  [393] (byte) keyboard_event_get::return#2 ← phi( keyboard_event_get/(byte/word/signed word/dword/signed dword) $ff keyboard_event_get::@1/(byte) keyboard_event_get::return#1 )
   [394] return 
   to:@return
-keyboard_event_scan: scope:[keyboard_event_scan]  from main::@35
+keyboard_event_scan: scope:[keyboard_event_scan]  from main::@17
   [395] phi()
-  to:keyboard_event_scan::@8
-keyboard_event_scan::@8: scope:[keyboard_event_scan]  from keyboard_event_scan keyboard_event_scan::@10
-  [396] (byte) keyboard_events_size#30 ← phi( keyboard_event_scan/(byte) keyboard_events_size#19 keyboard_event_scan::@10/(byte) keyboard_events_size#13 )
-  [396] (byte) keyboard_event_scan::keycode#11 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@10/(byte) keyboard_event_scan::keycode#14 )
-  [396] (byte) keyboard_event_scan::row#2 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@10/(byte) keyboard_event_scan::row#1 )
+  to:keyboard_event_scan::@7
+keyboard_event_scan::@7: scope:[keyboard_event_scan]  from keyboard_event_scan keyboard_event_scan::@8
+  [396] (byte) keyboard_events_size#30 ← phi( keyboard_event_scan/(byte) keyboard_events_size#19 keyboard_event_scan::@8/(byte) keyboard_events_size#13 )
+  [396] (byte) keyboard_event_scan::keycode#11 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@8/(byte) keyboard_event_scan::keycode#14 )
+  [396] (byte) keyboard_event_scan::row#2 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@8/(byte) keyboard_event_scan::row#1 )
   [397] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_event_scan::row#2
   [398] call keyboard_matrix_read 
   [399] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_event_scan::@25
-keyboard_event_scan::@25: scope:[keyboard_event_scan]  from keyboard_event_scan::@8
+  to:keyboard_event_scan::@19
+keyboard_event_scan::@19: scope:[keyboard_event_scan]  from keyboard_event_scan::@7
   [400] (byte) keyboard_event_scan::row_scan#0 ← (byte) keyboard_matrix_read::return#2
-  [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11
-  to:keyboard_event_scan::@21
-keyboard_event_scan::@21: scope:[keyboard_event_scan]  from keyboard_event_scan::@25
+  [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9
+  to:keyboard_event_scan::@16
+keyboard_event_scan::@16: scope:[keyboard_event_scan]  from keyboard_event_scan::@19
   [402] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8
-  to:keyboard_event_scan::@10
-keyboard_event_scan::@10: scope:[keyboard_event_scan]  from keyboard_event_scan::@20 keyboard_event_scan::@21
-  [403] (byte) keyboard_events_size#13 ← phi( keyboard_event_scan::@20/(byte) keyboard_events_size#29 keyboard_event_scan::@21/(byte) keyboard_events_size#30 )
-  [403] (byte) keyboard_event_scan::keycode#14 ← phi( keyboard_event_scan::@20/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@21/(byte) keyboard_event_scan::keycode#1 )
+  to:keyboard_event_scan::@8
+keyboard_event_scan::@8: scope:[keyboard_event_scan]  from keyboard_event_scan::@15 keyboard_event_scan::@16
+  [403] (byte) keyboard_events_size#13 ← phi( keyboard_event_scan::@15/(byte) keyboard_events_size#29 keyboard_event_scan::@16/(byte) keyboard_events_size#30 )
+  [403] (byte) keyboard_event_scan::keycode#14 ← phi( keyboard_event_scan::@15/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@16/(byte) keyboard_event_scan::keycode#1 )
   [404] (byte) keyboard_event_scan::row#1 ← ++ (byte) keyboard_event_scan::row#2
-  [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8
-  to:keyboard_event_scan::@23
-keyboard_event_scan::@23: scope:[keyboard_event_scan]  from keyboard_event_scan::@10
+  [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7
+  to:keyboard_event_scan::@17
+keyboard_event_scan::@17: scope:[keyboard_event_scan]  from keyboard_event_scan::@8
   [406] phi()
   [407] call keyboard_event_pressed 
   [408] (byte) keyboard_event_pressed::return#0 ← (byte) keyboard_event_pressed::return#11
-  to:keyboard_event_scan::@26
-keyboard_event_scan::@26: scope:[keyboard_event_scan]  from keyboard_event_scan::@23
+  to:keyboard_event_scan::@20
+keyboard_event_scan::@20: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
   [409] (byte~) keyboard_event_scan::$0 ← (byte) keyboard_event_pressed::return#0
   [410] if((byte~) keyboard_event_scan::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@1
-  to:keyboard_event_scan::@24
-keyboard_event_scan::@24: scope:[keyboard_event_scan]  from keyboard_event_scan::@26
+  to:keyboard_event_scan::@18
+keyboard_event_scan::@18: scope:[keyboard_event_scan]  from keyboard_event_scan::@20
   [411] phi()
   to:keyboard_event_scan::@1
-keyboard_event_scan::@1: scope:[keyboard_event_scan]  from keyboard_event_scan::@24 keyboard_event_scan::@26
-  [412] (byte) keyboard_modifiers#11 ← phi( keyboard_event_scan::@24/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 keyboard_event_scan::@26/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+keyboard_event_scan::@1: scope:[keyboard_event_scan]  from keyboard_event_scan::@18 keyboard_event_scan::@20
+  [412] (byte) keyboard_modifiers#11 ← phi( keyboard_event_scan::@18/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 keyboard_event_scan::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [413] call keyboard_event_pressed 
   [414] (byte) keyboard_event_pressed::return#1 ← (byte) keyboard_event_pressed::return#11
-  to:keyboard_event_scan::@27
-keyboard_event_scan::@27: scope:[keyboard_event_scan]  from keyboard_event_scan::@1
+  to:keyboard_event_scan::@21
+keyboard_event_scan::@21: scope:[keyboard_event_scan]  from keyboard_event_scan::@1
   [415] (byte~) keyboard_event_scan::$3 ← (byte) keyboard_event_pressed::return#1
   [416] if((byte~) keyboard_event_scan::$3==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@2
-  to:keyboard_event_scan::@5
-keyboard_event_scan::@5: scope:[keyboard_event_scan]  from keyboard_event_scan::@27
+  to:keyboard_event_scan::@4
+keyboard_event_scan::@4: scope:[keyboard_event_scan]  from keyboard_event_scan::@21
   [417] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#11 | (const byte) KEY_MODIFIER_RSHIFT#0
   to:keyboard_event_scan::@2
-keyboard_event_scan::@2: scope:[keyboard_event_scan]  from keyboard_event_scan::@27 keyboard_event_scan::@5
-  [418] (byte) keyboard_modifiers#12 ← phi( keyboard_event_scan::@27/(byte) keyboard_modifiers#11 keyboard_event_scan::@5/(byte) keyboard_modifiers#3 )
+keyboard_event_scan::@2: scope:[keyboard_event_scan]  from keyboard_event_scan::@21 keyboard_event_scan::@4
+  [418] (byte) keyboard_modifiers#12 ← phi( keyboard_event_scan::@21/(byte) keyboard_modifiers#11 keyboard_event_scan::@4/(byte) keyboard_modifiers#3 )
   [419] call keyboard_event_pressed 
   [420] (byte) keyboard_event_pressed::return#2 ← (byte) keyboard_event_pressed::return#11
-  to:keyboard_event_scan::@28
-keyboard_event_scan::@28: scope:[keyboard_event_scan]  from keyboard_event_scan::@2
+  to:keyboard_event_scan::@22
+keyboard_event_scan::@22: scope:[keyboard_event_scan]  from keyboard_event_scan::@2
   [421] (byte~) keyboard_event_scan::$6 ← (byte) keyboard_event_pressed::return#2
   [422] if((byte~) keyboard_event_scan::$6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@3
-  to:keyboard_event_scan::@6
-keyboard_event_scan::@6: scope:[keyboard_event_scan]  from keyboard_event_scan::@28
+  to:keyboard_event_scan::@5
+keyboard_event_scan::@5: scope:[keyboard_event_scan]  from keyboard_event_scan::@22
   [423] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#12 | (const byte) KEY_MODIFIER_CTRL#0
   to:keyboard_event_scan::@3
-keyboard_event_scan::@3: scope:[keyboard_event_scan]  from keyboard_event_scan::@28 keyboard_event_scan::@6
-  [424] (byte) keyboard_modifiers#13 ← phi( keyboard_event_scan::@28/(byte) keyboard_modifiers#12 keyboard_event_scan::@6/(byte) keyboard_modifiers#4 )
+keyboard_event_scan::@3: scope:[keyboard_event_scan]  from keyboard_event_scan::@22 keyboard_event_scan::@5
+  [424] (byte) keyboard_modifiers#13 ← phi( keyboard_event_scan::@22/(byte) keyboard_modifiers#12 keyboard_event_scan::@5/(byte) keyboard_modifiers#4 )
   [425] call keyboard_event_pressed 
   [426] (byte) keyboard_event_pressed::return#10 ← (byte) keyboard_event_pressed::return#11
-  to:keyboard_event_scan::@29
-keyboard_event_scan::@29: scope:[keyboard_event_scan]  from keyboard_event_scan::@3
+  to:keyboard_event_scan::@23
+keyboard_event_scan::@23: scope:[keyboard_event_scan]  from keyboard_event_scan::@3
   [427] (byte~) keyboard_event_scan::$9 ← (byte) keyboard_event_pressed::return#10
   [428] if((byte~) keyboard_event_scan::$9==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@return
-  to:keyboard_event_scan::@7
-keyboard_event_scan::@7: scope:[keyboard_event_scan]  from keyboard_event_scan::@29
+  to:keyboard_event_scan::@6
+keyboard_event_scan::@6: scope:[keyboard_event_scan]  from keyboard_event_scan::@23
   [429] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#13 | (const byte) KEY_MODIFIER_COMMODORE#0
   to:keyboard_event_scan::@return
-keyboard_event_scan::@return: scope:[keyboard_event_scan]  from keyboard_event_scan::@29 keyboard_event_scan::@7
+keyboard_event_scan::@return: scope:[keyboard_event_scan]  from keyboard_event_scan::@23 keyboard_event_scan::@6
   [430] return 
   to:@return
-keyboard_event_scan::@11: scope:[keyboard_event_scan]  from keyboard_event_scan::@12 keyboard_event_scan::@25
-  [431] (byte) keyboard_events_size#10 ← phi( keyboard_event_scan::@12/(byte) keyboard_events_size#29 keyboard_event_scan::@25/(byte) keyboard_events_size#30 )
-  [431] (byte) keyboard_event_scan::keycode#10 ← phi( keyboard_event_scan::@12/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@25/(byte) keyboard_event_scan::keycode#11 )
-  [431] (byte) keyboard_event_scan::col#2 ← phi( keyboard_event_scan::@12/(byte) keyboard_event_scan::col#1 keyboard_event_scan::@25/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+keyboard_event_scan::@9: scope:[keyboard_event_scan]  from keyboard_event_scan::@10 keyboard_event_scan::@19
+  [431] (byte) keyboard_events_size#10 ← phi( keyboard_event_scan::@10/(byte) keyboard_events_size#29 keyboard_event_scan::@19/(byte) keyboard_events_size#30 )
+  [431] (byte) keyboard_event_scan::keycode#10 ← phi( keyboard_event_scan::@10/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@19/(byte) keyboard_event_scan::keycode#11 )
+  [431] (byte) keyboard_event_scan::col#2 ← phi( keyboard_event_scan::@10/(byte) keyboard_event_scan::col#1 keyboard_event_scan::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [432] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)
   [433] (byte~) keyboard_event_scan::$16 ← (byte~) keyboard_event_scan::$15 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2)
-  [434] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@12
-  to:keyboard_event_scan::@16
-keyboard_event_scan::@16: scope:[keyboard_event_scan]  from keyboard_event_scan::@11
-  [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12
-  to:keyboard_event_scan::@17
-keyboard_event_scan::@17: scope:[keyboard_event_scan]  from keyboard_event_scan::@16
+  [434] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@10
+  to:keyboard_event_scan::@12
+keyboard_event_scan::@12: scope:[keyboard_event_scan]  from keyboard_event_scan::@9
+  [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10
+  to:keyboard_event_scan::@13
+keyboard_event_scan::@13: scope:[keyboard_event_scan]  from keyboard_event_scan::@12
   [436] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2)
-  [437] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@14
-  to:keyboard_event_scan::@18
-keyboard_event_scan::@18: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
+  [437] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@11
+  to:keyboard_event_scan::@14
+keyboard_event_scan::@14: scope:[keyboard_event_scan]  from keyboard_event_scan::@13
   [438] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#10) ← (byte) keyboard_event_scan::keycode#10
   [439] (byte) keyboard_events_size#2 ← ++ (byte) keyboard_events_size#10
-  to:keyboard_event_scan::@12
-keyboard_event_scan::@12: scope:[keyboard_event_scan]  from keyboard_event_scan::@11 keyboard_event_scan::@14 keyboard_event_scan::@16 keyboard_event_scan::@18
-  [440] (byte) keyboard_events_size#29 ← phi( keyboard_event_scan::@11/(byte) keyboard_events_size#10 keyboard_event_scan::@16/(byte) keyboard_events_size#10 keyboard_event_scan::@14/(byte) keyboard_events_size#1 keyboard_event_scan::@18/(byte) keyboard_events_size#2 )
+  to:keyboard_event_scan::@10
+keyboard_event_scan::@10: scope:[keyboard_event_scan]  from keyboard_event_scan::@11 keyboard_event_scan::@12 keyboard_event_scan::@14 keyboard_event_scan::@9
+  [440] (byte) keyboard_events_size#29 ← phi( keyboard_event_scan::@9/(byte) keyboard_events_size#10 keyboard_event_scan::@12/(byte) keyboard_events_size#10 keyboard_event_scan::@11/(byte) keyboard_events_size#1 keyboard_event_scan::@14/(byte) keyboard_events_size#2 )
   [441] (byte) keyboard_event_scan::keycode#15 ← ++ (byte) keyboard_event_scan::keycode#10
   [442] (byte) keyboard_event_scan::col#1 ← ++ (byte) keyboard_event_scan::col#2
-  [443] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@11
-  to:keyboard_event_scan::@20
-keyboard_event_scan::@20: scope:[keyboard_event_scan]  from keyboard_event_scan::@12
+  [443] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@9
+  to:keyboard_event_scan::@15
+keyboard_event_scan::@15: scope:[keyboard_event_scan]  from keyboard_event_scan::@10
   [444] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0
-  to:keyboard_event_scan::@10
-keyboard_event_scan::@14: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
+  to:keyboard_event_scan::@8
+keyboard_event_scan::@11: scope:[keyboard_event_scan]  from keyboard_event_scan::@13
   [445] (byte/word/dword~) keyboard_event_scan::$23 ← (byte) keyboard_event_scan::keycode#10 | (byte/signed byte/word/signed word/dword/signed dword) $40
   [446] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#10) ← (byte/word/dword~) keyboard_event_scan::$23
   [447] (byte) keyboard_events_size#1 ← ++ (byte) keyboard_events_size#10
-  to:keyboard_event_scan::@12
-keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_event_scan::@8
+  to:keyboard_event_scan::@10
+keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_event_scan::@7
   [448] *((const byte*) CIA1_PORT_A#0) ← *((const byte[8]) keyboard_matrix_row_bitmask#0 + (byte) keyboard_matrix_read::rowid#0)
   [449] (byte) keyboard_matrix_read::return#0 ← ~ *((const byte*) CIA1_PORT_B#0)
   to:keyboard_matrix_read::@return
 keyboard_matrix_read::@return: scope:[keyboard_matrix_read]  from keyboard_matrix_read
   [450] return 
   to:@return
-render_show: scope:[render_show]  from main::@8
+render_show: scope:[render_show]  from main::@3
   [451] if((byte) render_screen_show#16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_show::toD0181
   to:render_show::toD0182
 render_show::toD0182: scope:[render_show]  from render_show
   [452] phi()
-  to:render_show::@2
-render_show::@2: scope:[render_show]  from render_show::toD0181 render_show::toD0182
+  to:render_show::@1
+render_show::@1: scope:[render_show]  from render_show::toD0181 render_show::toD0182
   [453] (byte) render_show::d018val#3 ← phi( render_show::toD0181/(const byte) render_show::toD0181_return#0 render_show::toD0182/(const byte) render_show::toD0182_return#0 )
   [454] *((const byte*) D018#0) ← (byte) render_show::d018val#3
   [455] *((const byte*) BGCOL2#0) ← *((const byte[]) PIECES_COLORS_1#0 + (byte) level#10)
   [456] *((const byte*) BGCOL3#0) ← *((const byte[]) PIECES_COLORS_2#0 + (byte) level#10)
   [457] (byte) render_screen_showing#1 ← (byte) render_screen_show#16
   to:render_show::@return
-render_show::@return: scope:[render_show]  from render_show::@2
+render_show::@return: scope:[render_show]  from render_show::@1
   [458] return 
   to:@return
 render_show::toD0181: scope:[render_show]  from render_show
   [459] phi()
-  to:render_show::@2
-play_init: scope:[play_init]  from main::@28
+  to:render_show::@1
+play_init: scope:[play_init]  from main::@11
   [460] phi()
   to:play_init::@1
 play_init::@1: scope:[play_init]  from play_init play_init::@1
@@ -1015,7 +1015,7 @@ play_init::@3: scope:[play_init]  from play_init::@2 play_init::@3
 play_init::@return: scope:[play_init]  from play_init::@3
   [476] return 
   to:@return
-sprites_irq_init: scope:[sprites_irq_init]  from main::@27
+sprites_irq_init: scope:[sprites_irq_init]  from main::@10
   asm { sei  }
   [478] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
   asm { ldaCIA1_INTERRUPT  }
@@ -1031,7 +1031,7 @@ sprites_irq_init: scope:[sprites_irq_init]  from main::@27
 sprites_irq_init::@return: scope:[sprites_irq_init]  from sprites_irq_init
   [488] return 
   to:@return
-sprites_init: scope:[sprites_init]  from main::@26
+sprites_init: scope:[sprites_init]  from main::@9
   [489] *((const byte*) SPRITES_ENABLE#0) ← (byte/signed byte/word/signed word/dword/signed dword) $f
   [490] *((const byte*) SPRITES_MC#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [491] *((const byte*) SPRITES_EXPAND_Y#0) ← *((const byte*) SPRITES_MC#0)
@@ -1050,7 +1050,7 @@ sprites_init::@1: scope:[sprites_init]  from sprites_init sprites_init::@1
 sprites_init::@return: scope:[sprites_init]  from sprites_init::@1
   [500] return 
   to:@return
-render_init: scope:[render_init]  from main::@25
+render_init: scope:[render_init]  from main::@8
   [501] phi()
   to:render_init::vicSelectGfxBank1
 render_init::vicSelectGfxBank1: scope:[render_init]  from render_init
@@ -1061,8 +1061,8 @@ render_init::vicSelectGfxBank1_toDd001: scope:[render_init]  from render_init::v
   to:render_init::vicSelectGfxBank1_@1
 render_init::vicSelectGfxBank1_@1: scope:[render_init]  from render_init::vicSelectGfxBank1_toDd001
   [504] *((const byte*) CIA2_PORT_A#0) ← (const byte) render_init::vicSelectGfxBank1_toDd001_return#0
-  to:render_init::@3
-render_init::@3: scope:[render_init]  from render_init::vicSelectGfxBank1_@1
+  to:render_init::@2
+render_init::@2: scope:[render_init]  from render_init::vicSelectGfxBank1_@1
   [505] *((const byte*) D011#0) ← (const byte) VIC_ECM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [506] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0
   [507] *((const byte*) BGCOL1#0) ← (const byte) BLACK#0
@@ -1070,15 +1070,15 @@ render_init::@3: scope:[render_init]  from render_init::vicSelectGfxBank1_@1
   [509] *((const byte*) BGCOL3#0) ← *((const byte[]) PIECES_COLORS_2#0)
   [510] *((const byte*) BGCOL4#0) ← (const byte) GREY#0
   [511] call render_screen_original 
-  to:render_init::@4
-render_init::@4: scope:[render_init]  from render_init::@3
+  to:render_init::@3
+render_init::@3: scope:[render_init]  from render_init::@2
   [512] phi()
   [513] call render_screen_original 
   to:render_init::@1
-render_init::@1: scope:[render_init]  from render_init::@1 render_init::@4
-  [514] (byte*) render_init::li_2#2 ← phi( render_init::@1/(byte*) render_init::li_2#1 render_init::@4/(const byte*) PLAYFIELD_SCREEN_2#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 )
-  [514] (byte*) render_init::li_1#2 ← phi( render_init::@1/(byte*) render_init::li_1#1 render_init::@4/(const byte*) PLAYFIELD_SCREEN_1#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 )
-  [514] (byte) render_init::i#2 ← phi( render_init::@1/(byte) render_init::i#1 render_init::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+render_init::@1: scope:[render_init]  from render_init::@1 render_init::@3
+  [514] (byte*) render_init::li_2#2 ← phi( render_init::@1/(byte*) render_init::li_2#1 render_init::@3/(const byte*) PLAYFIELD_SCREEN_2#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 )
+  [514] (byte*) render_init::li_1#2 ← phi( render_init::@1/(byte*) render_init::li_1#1 render_init::@3/(const byte*) PLAYFIELD_SCREEN_1#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 )
+  [514] (byte) render_init::i#2 ← phi( render_init::@1/(byte) render_init::i#1 render_init::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [515] (byte~) render_init::$13 ← (byte) render_init::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [516] *((const byte*[PLAYFIELD_LINES#0]) screen_lines_1#0 + (byte~) render_init::$13) ← (byte*) render_init::li_1#2
   [517] (byte~) render_init::$14 ← (byte) render_init::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
@@ -1091,15 +1091,15 @@ render_init::@1: scope:[render_init]  from render_init::@1 render_init::@4
 render_init::@return: scope:[render_init]  from render_init::@1
   [523] return 
   to:@return
-render_screen_original: scope:[render_screen_original]  from render_init::@3 render_init::@4
-  [524] (byte*) render_screen_original::screen#9 ← phi( render_init::@3/(const byte*) PLAYFIELD_SCREEN_1#0 render_init::@4/(const byte*) PLAYFIELD_SCREEN_2#0 )
+render_screen_original: scope:[render_screen_original]  from render_init::@2 render_init::@3
+  [524] (byte*) render_screen_original::screen#9 ← phi( render_init::@2/(const byte*) PLAYFIELD_SCREEN_1#0 render_init::@3/(const byte*) PLAYFIELD_SCREEN_2#0 )
   to:render_screen_original::@1
-render_screen_original::@1: scope:[render_screen_original]  from render_screen_original render_screen_original::@7
-  [525] (byte) render_screen_original::y#6 ← phi( render_screen_original/(byte/signed byte/word/signed word/dword/signed dword) 0 render_screen_original::@7/(byte) render_screen_original::y#1 )
-  [525] (byte*) render_screen_original::ocols#4 ← phi( render_screen_original/(const byte*) PLAYFIELD_COLORS_ORIGINAL#0+(byte/signed byte/word/signed word/dword/signed dword) $20*(byte/signed byte/word/signed word/dword/signed dword) 2 render_screen_original::@7/(byte*) render_screen_original::ocols#1 )
-  [525] (byte*) render_screen_original::oscr#4 ← phi( render_screen_original/(const byte*) PLAYFIELD_SCREEN_ORIGINAL#0+(byte/signed byte/word/signed word/dword/signed dword) $20*(byte/signed byte/word/signed word/dword/signed dword) 2 render_screen_original::@7/(byte*) render_screen_original::oscr#1 )
-  [525] (byte*) render_screen_original::cols#7 ← phi( render_screen_original/(const byte*) COLS#0 render_screen_original::@7/(byte*) render_screen_original::cols#3 )
-  [525] (byte*) render_screen_original::screen#8 ← phi( render_screen_original/(byte*) render_screen_original::screen#9 render_screen_original::@7/(byte*) render_screen_original::screen#10 )
+render_screen_original::@1: scope:[render_screen_original]  from render_screen_original render_screen_original::@5
+  [525] (byte) render_screen_original::y#6 ← phi( render_screen_original/(byte/signed byte/word/signed word/dword/signed dword) 0 render_screen_original::@5/(byte) render_screen_original::y#1 )
+  [525] (byte*) render_screen_original::ocols#4 ← phi( render_screen_original/(const byte*) PLAYFIELD_COLORS_ORIGINAL#0+(byte/signed byte/word/signed word/dword/signed dword) $20*(byte/signed byte/word/signed word/dword/signed dword) 2 render_screen_original::@5/(byte*) render_screen_original::ocols#1 )
+  [525] (byte*) render_screen_original::oscr#4 ← phi( render_screen_original/(const byte*) PLAYFIELD_SCREEN_ORIGINAL#0+(byte/signed byte/word/signed word/dword/signed dword) $20*(byte/signed byte/word/signed word/dword/signed dword) 2 render_screen_original::@5/(byte*) render_screen_original::oscr#1 )
+  [525] (byte*) render_screen_original::cols#7 ← phi( render_screen_original/(const byte*) COLS#0 render_screen_original::@5/(byte*) render_screen_original::cols#3 )
+  [525] (byte*) render_screen_original::screen#8 ← phi( render_screen_original/(byte*) render_screen_original::screen#9 render_screen_original::@5/(byte*) render_screen_original::screen#10 )
   to:render_screen_original::@2
 render_screen_original::@2: scope:[render_screen_original]  from render_screen_original::@1 render_screen_original::@2
   [526] (byte) render_screen_original::x#4 ← phi( render_screen_original::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render_screen_original::@2/(byte) render_screen_original::x#1 )
@@ -1111,13 +1111,13 @@ render_screen_original::@2: scope:[render_screen_original]  from render_screen_o
   [530] (byte*) render_screen_original::cols#1 ← ++ (byte*) render_screen_original::cols#4
   [531] (byte) render_screen_original::x#1 ← ++ (byte) render_screen_original::x#4
   [532] if((byte) render_screen_original::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_screen_original::@2
-  to:render_screen_original::@4
-render_screen_original::@4: scope:[render_screen_original]  from render_screen_original::@2 render_screen_original::@4
-  [533] (byte) render_screen_original::x#5 ← phi( render_screen_original::@2/(byte) render_screen_original::x#1 render_screen_original::@4/(byte) render_screen_original::x#2 )
-  [533] (byte*) render_screen_original::cols#5 ← phi( render_screen_original::@2/(byte*) render_screen_original::cols#1 render_screen_original::@4/(byte*) render_screen_original::cols#2 )
-  [533] (byte*) render_screen_original::ocols#2 ← phi( render_screen_original::@2/(byte*) render_screen_original::ocols#4 render_screen_original::@4/(byte*) render_screen_original::ocols#1 )
-  [533] (byte*) render_screen_original::screen#6 ← phi( render_screen_original::@2/(byte*) render_screen_original::screen#2 render_screen_original::@4/(byte*) render_screen_original::screen#3 )
-  [533] (byte*) render_screen_original::oscr#2 ← phi( render_screen_original::@2/(byte*) render_screen_original::oscr#4 render_screen_original::@4/(byte*) render_screen_original::oscr#1 )
+  to:render_screen_original::@3
+render_screen_original::@3: scope:[render_screen_original]  from render_screen_original::@2 render_screen_original::@3
+  [533] (byte) render_screen_original::x#5 ← phi( render_screen_original::@2/(byte) render_screen_original::x#1 render_screen_original::@3/(byte) render_screen_original::x#2 )
+  [533] (byte*) render_screen_original::cols#5 ← phi( render_screen_original::@2/(byte*) render_screen_original::cols#1 render_screen_original::@3/(byte*) render_screen_original::cols#2 )
+  [533] (byte*) render_screen_original::ocols#2 ← phi( render_screen_original::@2/(byte*) render_screen_original::ocols#4 render_screen_original::@3/(byte*) render_screen_original::ocols#1 )
+  [533] (byte*) render_screen_original::screen#6 ← phi( render_screen_original::@2/(byte*) render_screen_original::screen#2 render_screen_original::@3/(byte*) render_screen_original::screen#3 )
+  [533] (byte*) render_screen_original::oscr#2 ← phi( render_screen_original::@2/(byte*) render_screen_original::oscr#4 render_screen_original::@3/(byte*) render_screen_original::oscr#1 )
   [534] *((byte*) render_screen_original::screen#6) ← *((byte*) render_screen_original::oscr#2)
   [535] (byte*) render_screen_original::screen#3 ← ++ (byte*) render_screen_original::screen#6
   [536] (byte*) render_screen_original::oscr#1 ← ++ (byte*) render_screen_original::oscr#2
@@ -1125,24 +1125,24 @@ render_screen_original::@4: scope:[render_screen_original]  from render_screen_o
   [538] (byte*) render_screen_original::cols#2 ← ++ (byte*) render_screen_original::cols#5
   [539] (byte*) render_screen_original::ocols#1 ← ++ (byte*) render_screen_original::ocols#2
   [540] (byte) render_screen_original::x#2 ← ++ (byte) render_screen_original::x#5
-  [541] if((byte) render_screen_original::x#2!=(byte/signed byte/word/signed word/dword/signed dword) $24) goto render_screen_original::@4
-  to:render_screen_original::@6
-render_screen_original::@6: scope:[render_screen_original]  from render_screen_original::@4 render_screen_original::@6
-  [542] (byte) render_screen_original::x#6 ← phi( render_screen_original::@4/(byte) render_screen_original::x#2 render_screen_original::@6/(byte) render_screen_original::x#3 )
-  [542] (byte*) render_screen_original::cols#6 ← phi( render_screen_original::@4/(byte*) render_screen_original::cols#2 render_screen_original::@6/(byte*) render_screen_original::cols#3 )
-  [542] (byte*) render_screen_original::screen#7 ← phi( render_screen_original::@4/(byte*) render_screen_original::screen#3 render_screen_original::@6/(byte*) render_screen_original::screen#10 )
+  [541] if((byte) render_screen_original::x#2!=(byte/signed byte/word/signed word/dword/signed dword) $24) goto render_screen_original::@3
+  to:render_screen_original::@4
+render_screen_original::@4: scope:[render_screen_original]  from render_screen_original::@3 render_screen_original::@4
+  [542] (byte) render_screen_original::x#6 ← phi( render_screen_original::@3/(byte) render_screen_original::x#2 render_screen_original::@4/(byte) render_screen_original::x#3 )
+  [542] (byte*) render_screen_original::cols#6 ← phi( render_screen_original::@3/(byte*) render_screen_original::cols#2 render_screen_original::@4/(byte*) render_screen_original::cols#3 )
+  [542] (byte*) render_screen_original::screen#7 ← phi( render_screen_original::@3/(byte*) render_screen_original::screen#3 render_screen_original::@4/(byte*) render_screen_original::screen#10 )
   [543] *((byte*) render_screen_original::screen#7) ← (const byte) render_screen_original::SPACE#0
   [544] (byte*) render_screen_original::screen#10 ← ++ (byte*) render_screen_original::screen#7
   [545] *((byte*) render_screen_original::cols#6) ← (const byte) BLACK#0
   [546] (byte*) render_screen_original::cols#3 ← ++ (byte*) render_screen_original::cols#6
   [547] (byte) render_screen_original::x#3 ← ++ (byte) render_screen_original::x#6
-  [548] if((byte) render_screen_original::x#3!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_screen_original::@6
-  to:render_screen_original::@7
-render_screen_original::@7: scope:[render_screen_original]  from render_screen_original::@6
+  [548] if((byte) render_screen_original::x#3!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_screen_original::@4
+  to:render_screen_original::@5
+render_screen_original::@5: scope:[render_screen_original]  from render_screen_original::@4
   [549] (byte) render_screen_original::y#1 ← ++ (byte) render_screen_original::y#6
   [550] if((byte) render_screen_original::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto render_screen_original::@1
   to:render_screen_original::@return
-render_screen_original::@return: scope:[render_screen_original]  from render_screen_original::@7
+render_screen_original::@return: scope:[render_screen_original]  from render_screen_original::@5
   [551] return 
   to:@return
 sid_rnd_init: scope:[sid_rnd_init]  from main
@@ -1161,15 +1161,15 @@ sprites_irq: scope:[sprites_irq]  from
   [560] *((const byte*) SPRITES_YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 6) ← (byte) sprites_irq::ypos#0
   [561] (byte/signed word/word/dword/signed dword~) sprites_irq::$0 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [562] (byte) sprites_irq::raster_sprite_gfx_modify#0 ← (byte/signed word/word/dword/signed dword~) sprites_irq::$0
-  to:sprites_irq::@11
-sprites_irq::@11: scope:[sprites_irq]  from sprites_irq sprites_irq::@11
-  [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11
-  to:sprites_irq::@12
-sprites_irq::@12: scope:[sprites_irq]  from sprites_irq::@11
+  to:sprites_irq::@8
+sprites_irq::@8: scope:[sprites_irq]  from sprites_irq sprites_irq::@8
+  [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8
+  to:sprites_irq::@9
+sprites_irq::@9: scope:[sprites_irq]  from sprites_irq::@8
   [564] (byte) sprites_irq::ptr#0 ← (byte) irq_sprite_ptr#0
   [565] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1
-  to:sprites_irq::@13
-sprites_irq::@13: scope:[sprites_irq]  from sprites_irq::@12
+  to:sprites_irq::@10
+sprites_irq::@10: scope:[sprites_irq]  from sprites_irq::@9
   [566] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0) ← (byte) sprites_irq::ptr#0
   [567] (byte) sprites_irq::ptr#3 ← ++ (byte) sprites_irq::ptr#0
   [568] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) sprites_irq::ptr#3
@@ -1177,43 +1177,43 @@ sprites_irq::@13: scope:[sprites_irq]  from sprites_irq::@12
   [570] (byte) sprites_irq::ptr#4 ← ++ (byte) sprites_irq::ptr#3
   [571] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte) sprites_irq::ptr#4
   to:sprites_irq::@2
-sprites_irq::@2: scope:[sprites_irq]  from sprites_irq::@1 sprites_irq::@13
+sprites_irq::@2: scope:[sprites_irq]  from sprites_irq::@1 sprites_irq::@10
   [572] (byte) irq_cnt#1 ← ++ (byte) irq_cnt#0
   [573] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) 9) goto sprites_irq::@3
-  to:sprites_irq::@7
-sprites_irq::@7: scope:[sprites_irq]  from sprites_irq::@2
+  to:sprites_irq::@6
+sprites_irq::@6: scope:[sprites_irq]  from sprites_irq::@2
   [574] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) $a) goto sprites_irq::@4
-  to:sprites_irq::@8
-sprites_irq::@8: scope:[sprites_irq]  from sprites_irq::@7
+  to:sprites_irq::@7
+sprites_irq::@7: scope:[sprites_irq]  from sprites_irq::@6
   [575] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14
   [576] (byte) irq_sprite_ypos#3 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [577] (byte) irq_sprite_ptr#3 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3
-  to:sprites_irq::@6
-sprites_irq::@6: scope:[sprites_irq]  from sprites_irq::@15 sprites_irq::@4 sprites_irq::@8
-  [578] (byte) irq_raster_next#4 ← phi( sprites_irq::@15/(byte) irq_raster_next#1 sprites_irq::@4/(byte) irq_raster_next#2 sprites_irq::@8/(byte) irq_raster_next#3 )
+  to:sprites_irq::@5
+sprites_irq::@5: scope:[sprites_irq]  from sprites_irq::@11 sprites_irq::@4 sprites_irq::@7
+  [578] (byte) irq_raster_next#4 ← phi( sprites_irq::@11/(byte) irq_raster_next#1 sprites_irq::@4/(byte) irq_raster_next#2 sprites_irq::@7/(byte) irq_raster_next#3 )
   [579] *((const byte*) RASTER#0) ← (byte) irq_raster_next#4
   [580] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
   to:sprites_irq::@return
-sprites_irq::@return: scope:[sprites_irq]  from sprites_irq::@6
+sprites_irq::@return: scope:[sprites_irq]  from sprites_irq::@5
   [581] return 
   to:@return
-sprites_irq::@4: scope:[sprites_irq]  from sprites_irq::@7
+sprites_irq::@4: scope:[sprites_irq]  from sprites_irq::@6
   [582] (byte) irq_cnt#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [583] (byte) irq_raster_next#2 ← (const byte) IRQ_RASTER_FIRST#0
   [584] (byte) irq_sprite_ypos#2 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [585] (byte) irq_sprite_ptr#2 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3
-  to:sprites_irq::@6
+  to:sprites_irq::@5
 sprites_irq::@3: scope:[sprites_irq]  from sprites_irq::@2
   [586] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [587] (byte) irq_sprite_ypos#1 ← (const byte) SPRITES_FIRST_YPOS#0
   to:sprites_irq::toSpritePtr2
 sprites_irq::toSpritePtr2: scope:[sprites_irq]  from sprites_irq::@3
   [588] phi()
-  to:sprites_irq::@15
-sprites_irq::@15: scope:[sprites_irq]  from sprites_irq::toSpritePtr2
+  to:sprites_irq::@11
+sprites_irq::@11: scope:[sprites_irq]  from sprites_irq::toSpritePtr2
   [589] (byte) irq_sprite_ptr#1 ← (const byte) sprites_irq::toSpritePtr2_return#0
-  to:sprites_irq::@6
-sprites_irq::@1: scope:[sprites_irq]  from sprites_irq::@12
+  to:sprites_irq::@5
+sprites_irq::@1: scope:[sprites_irq]  from sprites_irq::@9
   [590] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0) ← (byte) sprites_irq::ptr#0
   [591] (byte) sprites_irq::ptr#1 ← ++ (byte) sprites_irq::ptr#0
   [592] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) sprites_irq::ptr#1
diff --git a/src/test/ref/complex/tetris/tetris.log b/src/test/ref/complex/tetris/tetris.log
index 13f916b92..e08da38f8 100644
--- a/src/test/ref/complex/tetris/tetris.log
+++ b/src/test/ref/complex/tetris/tetris.log
@@ -10015,49 +10015,177 @@ Culled Empty Block (label) render_screen_original::@9
 Culled Empty Block (label) render_screen_original::@14
 Culled Empty Block (label) render_screen_original::@12
 Culled Empty Block (label) render_screen_original::@10
+Renumbering block @14 to @1
+Renumbering block @23 to @2
+Renumbering block @24 to @3
+Renumbering block @38 to @4
+Renumbering block @39 to @5
+Renumbering block keyboard_event_scan::@5 to keyboard_event_scan::@4
+Renumbering block keyboard_event_scan::@6 to keyboard_event_scan::@5
+Renumbering block keyboard_event_scan::@7 to keyboard_event_scan::@6
+Renumbering block keyboard_event_scan::@8 to keyboard_event_scan::@7
+Renumbering block keyboard_event_scan::@10 to keyboard_event_scan::@8
+Renumbering block keyboard_event_scan::@11 to keyboard_event_scan::@9
+Renumbering block keyboard_event_scan::@12 to keyboard_event_scan::@10
+Renumbering block keyboard_event_scan::@14 to keyboard_event_scan::@11
+Renumbering block keyboard_event_scan::@16 to keyboard_event_scan::@12
+Renumbering block keyboard_event_scan::@17 to keyboard_event_scan::@13
+Renumbering block keyboard_event_scan::@18 to keyboard_event_scan::@14
+Renumbering block keyboard_event_scan::@20 to keyboard_event_scan::@15
+Renumbering block keyboard_event_scan::@21 to keyboard_event_scan::@16
+Renumbering block keyboard_event_scan::@23 to keyboard_event_scan::@17
+Renumbering block keyboard_event_scan::@24 to keyboard_event_scan::@18
+Renumbering block keyboard_event_scan::@25 to keyboard_event_scan::@19
+Renumbering block keyboard_event_scan::@26 to keyboard_event_scan::@20
+Renumbering block keyboard_event_scan::@27 to keyboard_event_scan::@21
+Renumbering block keyboard_event_scan::@28 to keyboard_event_scan::@22
+Renumbering block keyboard_event_scan::@29 to keyboard_event_scan::@23
+Renumbering block keyboard_event_get::@3 to keyboard_event_get::@1
+Renumbering block render_init::@3 to render_init::@2
+Renumbering block render_init::@4 to render_init::@3
+Renumbering block render_show::@2 to render_show::@1
+Renumbering block render_score::@2 to render_score::@1
+Renumbering block render_score::@3 to render_score::@2
+Renumbering block render_score::@5 to render_score::@3
+Renumbering block render_score::@6 to render_score::@4
+Renumbering block render_score::@7 to render_score::@5
+Renumbering block render_score::@8 to render_score::@6
+Renumbering block render_score::@9 to render_score::@7
+Renumbering block render_screen_original::@4 to render_screen_original::@3
+Renumbering block render_screen_original::@6 to render_screen_original::@4
+Renumbering block render_screen_original::@7 to render_screen_original::@5
+Renumbering block render_moving::@8 to render_moving::@7
+Renumbering block render_next::@2 to render_next::@1
+Renumbering block render_next::@3 to render_next::@2
+Renumbering block render_next::@5 to render_next::@3
+Renumbering block render_next::@6 to render_next::@4
+Renumbering block render_next::@7 to render_next::@5
+Renumbering block render_next::@8 to render_next::@6
+Renumbering block render_next::@9 to render_next::@7
+Renumbering block render_next::@11 to render_next::@8
+Renumbering block sprites_irq::@6 to sprites_irq::@5
+Renumbering block sprites_irq::@7 to sprites_irq::@6
+Renumbering block sprites_irq::@8 to sprites_irq::@7
+Renumbering block sprites_irq::@11 to sprites_irq::@8
+Renumbering block sprites_irq::@12 to sprites_irq::@9
+Renumbering block sprites_irq::@13 to sprites_irq::@10
+Renumbering block sprites_irq::@15 to sprites_irq::@11
+Renumbering block play_movement::@5 to play_movement::@2
+Renumbering block play_movement::@6 to play_movement::@3
+Renumbering block play_movement::@7 to play_movement::@4
+Renumbering block play_move_down::@5 to play_move_down::@4
+Renumbering block play_move_down::@6 to play_move_down::@5
+Renumbering block play_move_down::@7 to play_move_down::@6
+Renumbering block play_move_down::@8 to play_move_down::@7
+Renumbering block play_move_down::@9 to play_move_down::@8
+Renumbering block play_move_down::@10 to play_move_down::@9
+Renumbering block play_move_down::@14 to play_move_down::@10
+Renumbering block play_move_down::@15 to play_move_down::@11
+Renumbering block play_move_down::@17 to play_move_down::@12
+Renumbering block play_move_down::@18 to play_move_down::@13
+Renumbering block play_move_down::@19 to play_move_down::@14
+Renumbering block play_move_down::@20 to play_move_down::@15
+Renumbering block play_move_down::@21 to play_move_down::@16
+Renumbering block play_move_leftright::@4 to play_move_leftright::@2
+Renumbering block play_move_leftright::@5 to play_move_leftright::@3
+Renumbering block play_move_leftright::@6 to play_move_leftright::@4
+Renumbering block play_move_leftright::@9 to play_move_leftright::@5
+Renumbering block play_move_leftright::@14 to play_move_leftright::@6
+Renumbering block play_move_leftright::@15 to play_move_leftright::@7
+Renumbering block play_move_rotate::@4 to play_move_rotate::@3
+Renumbering block play_move_rotate::@6 to play_move_rotate::@4
+Renumbering block play_move_rotate::@11 to play_move_rotate::@5
+Renumbering block play_move_rotate::@14 to play_move_rotate::@6
+Renumbering block play_collision::@14 to play_collision::@7
+Renumbering block play_collision::@17 to play_collision::@8
+Renumbering block play_collision::@20 to play_collision::@9
+Renumbering block play_collision::@21 to play_collision::@10
+Renumbering block play_lock_current::@7 to play_lock_current::@6
+Renumbering block play_lock_current::@8 to play_lock_current::@7
+Renumbering block play_spawn_current::@9 to play_spawn_current::@4
+Renumbering block play_spawn_current::@10 to play_spawn_current::@5
+Renumbering block play_spawn_current::@11 to play_spawn_current::@6
+Renumbering block play_remove_lines::@8 to play_remove_lines::@3
+Renumbering block play_remove_lines::@9 to play_remove_lines::@4
+Renumbering block play_remove_lines::@10 to play_remove_lines::@5
+Renumbering block play_remove_lines::@12 to play_remove_lines::@6
+Renumbering block play_remove_lines::@13 to play_remove_lines::@7
+Renumbering block play_remove_lines::@14 to play_remove_lines::@8
+Renumbering block play_remove_lines::@18 to play_remove_lines::@9
+Renumbering block play_update_score::@2 to play_update_score::@1
+Renumbering block play_update_score::@3 to play_update_score::@2
+Renumbering block play_increase_level::@2 to play_increase_level::@1
+Renumbering block play_increase_level::@3 to play_increase_level::@2
+Renumbering block play_increase_level::@4 to play_increase_level::@3
+Renumbering block play_increase_level::@6 to play_increase_level::@4
+Renumbering block play_increase_level::@7 to play_increase_level::@5
+Renumbering block play_increase_level::@8 to play_increase_level::@6
+Renumbering block main::@6 to main::@2
+Renumbering block main::@8 to main::@3
+Renumbering block main::@9 to main::@4
+Renumbering block main::@11 to main::@5
+Renumbering block main::@17 to main::@6
+Renumbering block main::@23 to main::@7
+Renumbering block main::@25 to main::@8
+Renumbering block main::@26 to main::@9
+Renumbering block main::@27 to main::@10
+Renumbering block main::@28 to main::@11
+Renumbering block main::@29 to main::@12
+Renumbering block main::@30 to main::@13
+Renumbering block main::@31 to main::@14
+Renumbering block main::@32 to main::@15
+Renumbering block main::@33 to main::@16
+Renumbering block main::@35 to main::@17
+Renumbering block main::@36 to main::@18
+Renumbering block main::@37 to main::@19
+Renumbering block main::@38 to main::@20
+Renumbering block main::@39 to main::@21
+Renumbering block main::@40 to main::@22
+Renumbering block main::@41 to main::@23
+Renumbering block main::@42 to main::@24
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of toSpritePtr1
-Adding NOP phi() at start of @38
+Adding NOP phi() at start of @4
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@26
-Adding NOP phi() at start of main::@27
-Adding NOP phi() at start of main::@28
-Adding NOP phi() at start of main::@29
-Adding NOP phi() at start of main::@30
-Adding NOP phi() at start of main::@31
-Adding NOP phi() at start of main::@8
-Adding NOP phi() at start of main::@35
-Adding NOP phi() at start of main::@36
-Adding NOP phi() at start of main::@41
-Adding NOP phi() at start of main::@42
-Adding NOP phi() at start of render_score::@3
-Adding NOP phi() at start of render_next::@3
-Adding NOP phi() at start of play_move_down::@5
-Adding NOP phi() at start of play_move_down::@10
-Adding NOP phi() at start of play_move_down::@19
-Adding NOP phi() at start of play_move_down::@21
+Adding NOP phi() at start of main::@9
+Adding NOP phi() at start of main::@10
+Adding NOP phi() at start of main::@11
+Adding NOP phi() at start of main::@12
+Adding NOP phi() at start of main::@13
+Adding NOP phi() at start of main::@14
+Adding NOP phi() at start of main::@3
+Adding NOP phi() at start of main::@17
+Adding NOP phi() at start of main::@18
+Adding NOP phi() at start of main::@23
+Adding NOP phi() at start of main::@24
+Adding NOP phi() at start of render_score::@2
+Adding NOP phi() at start of render_next::@2
+Adding NOP phi() at start of play_move_down::@4
+Adding NOP phi() at start of play_move_down::@9
+Adding NOP phi() at start of play_move_down::@14
+Adding NOP phi() at start of play_move_down::@16
 Adding NOP phi() at start of play_spawn_current::@3
-Adding NOP phi() at start of play_spawn_current::@11
-Adding NOP phi() at start of play_update_score::@3
+Adding NOP phi() at start of play_spawn_current::@6
+Adding NOP phi() at start of play_update_score::@2
 Adding NOP phi() at start of play_remove_lines
-Adding NOP phi() at start of play_remove_lines::@18
+Adding NOP phi() at start of play_remove_lines::@9
 Adding NOP phi() at start of keyboard_event_scan
-Adding NOP phi() at start of keyboard_event_scan::@23
-Adding NOP phi() at start of keyboard_event_scan::@24
+Adding NOP phi() at start of keyboard_event_scan::@17
+Adding NOP phi() at start of keyboard_event_scan::@18
 Adding NOP phi() at start of render_show::toD0182
 Adding NOP phi() at start of render_show::toD0181
 Adding NOP phi() at start of play_init
 Adding NOP phi() at start of render_init
 Adding NOP phi() at start of render_init::vicSelectGfxBank1_toDd001
-Adding NOP phi() at start of render_init::@4
+Adding NOP phi() at start of render_init::@3
 Adding NOP phi() at start of sprites_irq::toSpritePtr2
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@14
-@14: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] (byte) render_screen_showing#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   kickasm(location (const byte*) PLAYFIELD_CHARSET#0) {{ .fill 8,$00 // Place a filled char at the start of the charset
     .import binary "playfield-screen.imap"
@@ -10073,8 +10201,8 @@ FINAL CONTROL FLOW GRAPH
  }}
   kickasm(location (const byte*) PLAYFIELD_COLORS_ORIGINAL#0) {{ .import binary "playfield-screen.col"
  }}
-  to:@23
-@23: scope:[]  from @14
+  to:@2
+@2: scope:[]  from @1
   kickasm(location (const byte*) PLAYFIELD_SPRITES#0) {{ .var sprites = LoadPicture("playfield-sprites.png", List().add($010101, $000000))
 	// Put the sprites into memory 
 	.for(var sy=0;sy<10;sy++) {
@@ -10090,198 +10218,198 @@ FINAL CONTROL FLOW GRAPH
 	  	}
 	}
  }}
-  to:@24
-@24: scope:[]  from @23
+  to:@3
+@3: scope:[]  from @2
   [6] (byte) irq_raster_next#0 ← (const byte) IRQ_RASTER_FIRST#0
   [7] (byte) irq_sprite_ypos#0 ← (const byte) SPRITES_FIRST_YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) $15
   to:toSpritePtr1
-toSpritePtr1: scope:[]  from @24
+toSpritePtr1: scope:[]  from @3
   [8] phi()
-  to:@39
-@39: scope:[]  from toSpritePtr1
+  to:@5
+@5: scope:[]  from toSpritePtr1
   [9] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(byte/signed byte/word/signed word/dword/signed dword) 3
   [10] (byte) irq_cnt#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@38
-@38: scope:[]  from @39
+  to:@4
+@4: scope:[]  from @5
   [11] phi()
   [12] call main 
   to:@end
-@end: scope:[]  from @38
+@end: scope:[]  from @4
   [13] phi()
-main: scope:[main]  from @38
+main: scope:[main]  from @4
   [14] phi()
   [15] call sid_rnd_init 
-  to:main::@25
-main::@25: scope:[main]  from main
+  to:main::@8
+main::@8: scope:[main]  from main
   asm { sei  }
   [17] call render_init 
-  to:main::@26
-main::@26: scope:[main]  from main::@25
+  to:main::@9
+main::@9: scope:[main]  from main::@8
   [18] phi()
   [19] call sprites_init 
-  to:main::@27
-main::@27: scope:[main]  from main::@26
+  to:main::@10
+main::@10: scope:[main]  from main::@9
   [20] phi()
   [21] call sprites_irq_init 
-  to:main::@28
-main::@28: scope:[main]  from main::@27
+  to:main::@11
+main::@11: scope:[main]  from main::@10
   [22] phi()
   [23] call play_init 
-  to:main::@29
-main::@29: scope:[main]  from main::@28
+  to:main::@12
+main::@12: scope:[main]  from main::@11
   [24] phi()
   [25] call play_spawn_current 
-  to:main::@30
-main::@30: scope:[main]  from main::@29
+  to:main::@13
+main::@13: scope:[main]  from main::@12
   [26] phi()
   [27] call play_spawn_current 
-  to:main::@31
-main::@31: scope:[main]  from main::@30
+  to:main::@14
+main::@14: scope:[main]  from main::@13
   [28] phi()
   [29] call render_playfield 
-  to:main::@32
-main::@32: scope:[main]  from main::@31
+  to:main::@15
+main::@15: scope:[main]  from main::@14
   [30] (byte~) current_ypos#104 ← (byte) current_ypos#6
   [31] (byte~) current_xpos#128 ← (byte) current_xpos#103
   [32] (byte*~) current_piece_gfx#118 ← (byte*) current_piece_gfx#74
   [33] (byte~) current_piece_char#106 ← (byte) current_piece_char#5
   [34] call render_moving 
-  to:main::@33
-main::@33: scope:[main]  from main::@32
+  to:main::@16
+main::@16: scope:[main]  from main::@15
   [35] (byte~) next_piece_idx#84 ← (byte) play_spawn_current::piece_idx#2
   [36] call render_next 
   [37] (byte*~) current_piece#96 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0)
   to:main::@1
-main::@1: scope:[main]  from main::@17 main::@33 main::@42
-  [38] (byte) level_bcd#11 ← phi( main::@17/(byte) level_bcd#17 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) level_bcd#17 )
-  [38] (byte) level#10 ← phi( main::@17/(byte) level#17 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) level#17 )
-  [38] (dword) score_bcd#18 ← phi( main::@17/(dword) score_bcd#14 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(dword) score_bcd#14 )
-  [38] (word) lines_bcd#19 ← phi( main::@17/(word) lines_bcd#15 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(word) lines_bcd#15 )
-  [38] (byte) current_movedown_counter#16 ← phi( main::@17/(byte) current_movedown_counter#14 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) current_movedown_counter#14 )
-  [38] (byte) keyboard_events_size#19 ← phi( main::@17/(byte) keyboard_events_size#16 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) keyboard_events_size#16 )
-  [38] (byte) next_piece_idx#10 ← phi( main::@17/(byte) next_piece_idx#16 main::@33/(byte) play_spawn_current::piece_idx#2 main::@42/(byte) next_piece_idx#16 )
-  [38] (byte) game_over#10 ← phi( main::@17/(byte) game_over#15 main::@33/(byte) game_over#52 main::@42/(byte) game_over#15 )
-  [38] (byte) current_ypos#11 ← phi( main::@17/(byte) current_ypos#19 main::@33/(byte) current_ypos#6 main::@42/(byte) current_ypos#19 )
-  [38] (byte) current_xpos#122 ← phi( main::@17/(byte) current_xpos#19 main::@33/(byte) current_xpos#103 main::@42/(byte) current_xpos#19 )
-  [38] (byte*) current_piece_gfx#112 ← phi( main::@17/(byte*) current_piece_gfx#18 main::@33/(byte*) current_piece_gfx#74 main::@42/(byte*) current_piece_gfx#18 )
-  [38] (byte) current_orientation#13 ← phi( main::@17/(byte) current_orientation#17 main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) current_orientation#17 )
-  [38] (byte) current_piece_char#10 ← phi( main::@17/(byte) current_piece_char#16 main::@33/(byte) current_piece_char#5 main::@42/(byte) current_piece_char#16 )
-  [38] (byte*) current_piece#10 ← phi( main::@17/(byte*) current_piece#15 main::@33/(byte*~) current_piece#96 main::@42/(byte*) current_piece#15 )
-  [38] (byte) current_movedown_slow#14 ← phi( main::@17/(byte) current_movedown_slow#21 main::@33/(byte) current_movedown_slow#1 main::@42/(byte) current_movedown_slow#21 )
-  [38] (byte) render_screen_render#18 ← phi( main::@33/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@42/(byte) render_screen_render#11 )
-  [38] (byte) render_screen_show#16 ← phi( main::@33/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@42/(byte) render_screen_show#13 )
-  to:main::@6
-main::@6: scope:[main]  from main::@1 main::@6
-  [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6
-  to:main::@8
-main::@8: scope:[main]  from main::@6
+main::@1: scope:[main]  from main::@16 main::@24 main::@6
+  [38] (byte) level_bcd#11 ← phi( main::@6/(byte) level_bcd#17 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) level_bcd#17 )
+  [38] (byte) level#10 ← phi( main::@6/(byte) level#17 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) level#17 )
+  [38] (dword) score_bcd#18 ← phi( main::@6/(dword) score_bcd#14 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(dword) score_bcd#14 )
+  [38] (word) lines_bcd#19 ← phi( main::@6/(word) lines_bcd#15 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(word) lines_bcd#15 )
+  [38] (byte) current_movedown_counter#16 ← phi( main::@6/(byte) current_movedown_counter#14 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) current_movedown_counter#14 )
+  [38] (byte) keyboard_events_size#19 ← phi( main::@6/(byte) keyboard_events_size#16 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) keyboard_events_size#16 )
+  [38] (byte) next_piece_idx#10 ← phi( main::@6/(byte) next_piece_idx#16 main::@16/(byte) play_spawn_current::piece_idx#2 main::@24/(byte) next_piece_idx#16 )
+  [38] (byte) game_over#10 ← phi( main::@6/(byte) game_over#15 main::@16/(byte) game_over#52 main::@24/(byte) game_over#15 )
+  [38] (byte) current_ypos#11 ← phi( main::@6/(byte) current_ypos#19 main::@16/(byte) current_ypos#6 main::@24/(byte) current_ypos#19 )
+  [38] (byte) current_xpos#122 ← phi( main::@6/(byte) current_xpos#19 main::@16/(byte) current_xpos#103 main::@24/(byte) current_xpos#19 )
+  [38] (byte*) current_piece_gfx#112 ← phi( main::@6/(byte*) current_piece_gfx#18 main::@16/(byte*) current_piece_gfx#74 main::@24/(byte*) current_piece_gfx#18 )
+  [38] (byte) current_orientation#13 ← phi( main::@6/(byte) current_orientation#17 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) current_orientation#17 )
+  [38] (byte) current_piece_char#10 ← phi( main::@6/(byte) current_piece_char#16 main::@16/(byte) current_piece_char#5 main::@24/(byte) current_piece_char#16 )
+  [38] (byte*) current_piece#10 ← phi( main::@6/(byte*) current_piece#15 main::@16/(byte*~) current_piece#96 main::@24/(byte*) current_piece#15 )
+  [38] (byte) current_movedown_slow#14 ← phi( main::@6/(byte) current_movedown_slow#21 main::@16/(byte) current_movedown_slow#1 main::@24/(byte) current_movedown_slow#21 )
+  [38] (byte) render_screen_render#18 ← phi( main::@16/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@24/(byte) render_screen_render#11 )
+  [38] (byte) render_screen_show#16 ← phi( main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@24/(byte) render_screen_show#13 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [40] phi()
   [41] call render_show 
-  to:main::@35
-main::@35: scope:[main]  from main::@8
+  to:main::@17
+main::@17: scope:[main]  from main::@3
   [42] phi()
   [43] call keyboard_event_scan 
-  to:main::@36
-main::@36: scope:[main]  from main::@35
+  to:main::@18
+main::@18: scope:[main]  from main::@17
   [44] phi()
   [45] call keyboard_event_get 
   [46] (byte) keyboard_event_get::return#3 ← (byte) keyboard_event_get::return#2
-  to:main::@37
-main::@37: scope:[main]  from main::@36
+  to:main::@19
+main::@19: scope:[main]  from main::@18
   [47] (byte) main::key_event#0 ← (byte) keyboard_event_get::return#3
-  [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9
-  to:main::@11
-main::@11: scope:[main]  from main::@11 main::@37
+  [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4
+  to:main::@5
+main::@5: scope:[main]  from main::@19 main::@5
   [49] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
-  to:main::@11
-main::@9: scope:[main]  from main::@37
+  to:main::@5
+main::@4: scope:[main]  from main::@19
   [50] (byte) play_movement::key_event#0 ← (byte) main::key_event#0
   [51] call play_movement 
   [52] (byte) play_movement::return#3 ← (byte) play_movement::return#2
-  to:main::@38
-main::@38: scope:[main]  from main::@9
+  to:main::@20
+main::@20: scope:[main]  from main::@4
   [53] (byte) main::render#1 ← (byte) play_movement::return#3
-  to:main::@17
-main::@17: scope:[main]  from main::@38
+  to:main::@6
+main::@6: scope:[main]  from main::@20
   [54] if((byte) main::render#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
-  to:main::@23
-main::@23: scope:[main]  from main::@17
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [55] (byte~) render_screen_render#70 ← (byte) render_screen_render#18
   [56] call render_playfield 
-  to:main::@39
-main::@39: scope:[main]  from main::@23
+  to:main::@21
+main::@21: scope:[main]  from main::@7
   [57] (byte~) current_ypos#105 ← (byte) current_ypos#19
   [58] (byte~) render_screen_render#69 ← (byte) render_screen_render#18
   [59] (byte~) current_xpos#129 ← (byte) current_xpos#19
   [60] (byte*~) current_piece_gfx#119 ← (byte*) current_piece_gfx#18
   [61] (byte~) current_piece_char#107 ← (byte) current_piece_char#16
   [62] call render_moving 
-  to:main::@40
-main::@40: scope:[main]  from main::@39
+  to:main::@22
+main::@22: scope:[main]  from main::@21
   [63] (byte~) render_screen_render#68 ← (byte) render_screen_render#18
   [64] (byte~) next_piece_idx#85 ← (byte) next_piece_idx#16
   [65] call render_next 
-  to:main::@41
-main::@41: scope:[main]  from main::@40
+  to:main::@23
+main::@23: scope:[main]  from main::@22
   [66] phi()
   [67] call render_score 
-  to:main::@42
-main::@42: scope:[main]  from main::@41
+  to:main::@24
+main::@24: scope:[main]  from main::@23
   [68] phi()
   [69] call render_screen_swap 
   to:main::@1
-render_screen_swap: scope:[render_screen_swap]  from main::@42
+render_screen_swap: scope:[render_screen_swap]  from main::@24
   [70] (byte) render_screen_render#11 ← (byte) render_screen_render#18 ^ (byte/signed byte/word/signed word/dword/signed dword) $40
   [71] (byte) render_screen_show#13 ← (byte) render_screen_show#16 ^ (byte/signed byte/word/signed word/dword/signed dword) $40
   to:render_screen_swap::@return
 render_screen_swap::@return: scope:[render_screen_swap]  from render_screen_swap
   [72] return 
   to:@return
-render_score: scope:[render_score]  from main::@41
-  [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@2
-  to:render_score::@3
-render_score::@3: scope:[render_score]  from render_score
-  [74] phi()
+render_score: scope:[render_score]  from main::@23
+  [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@1
   to:render_score::@2
-render_score::@2: scope:[render_score]  from render_score render_score::@3
-  [75] (byte*) render_score::screen#3 ← phi( render_score/(const byte*) PLAYFIELD_SCREEN_1#0 render_score::@3/(const byte*) PLAYFIELD_SCREEN_2#0 )
+render_score::@2: scope:[render_score]  from render_score
+  [74] phi()
+  to:render_score::@1
+render_score::@1: scope:[render_score]  from render_score render_score::@2
+  [75] (byte*) render_score::screen#3 ← phi( render_score/(const byte*) PLAYFIELD_SCREEN_1#0 render_score::@2/(const byte*) PLAYFIELD_SCREEN_2#0 )
   [76] (byte*) render_bcd::screen#0 ← (byte*) render_score::screen#3
   [77] (byte) render_bcd::bcd#0 ← *((const byte*) render_score::score_bytes#0+(byte/signed byte/word/signed word/dword/signed dword) 2)
   [78] call render_bcd 
-  to:render_score::@5
-render_score::@5: scope:[render_score]  from render_score::@2
+  to:render_score::@3
+render_score::@3: scope:[render_score]  from render_score::@1
   [79] (byte*) render_bcd::screen#1 ← (byte*) render_score::screen#3
   [80] (byte) render_bcd::bcd#1 ← *((const byte*) render_score::score_bytes#0+(byte/signed byte/word/signed word/dword/signed dword) 1)
   [81] call render_bcd 
-  to:render_score::@6
-render_score::@6: scope:[render_score]  from render_score::@5
+  to:render_score::@4
+render_score::@4: scope:[render_score]  from render_score::@3
   [82] (byte*) render_bcd::screen#2 ← (byte*) render_score::screen#3
   [83] (byte) render_bcd::bcd#2 ← *((const byte*) render_score::score_bytes#0)
   [84] call render_bcd 
-  to:render_score::@7
-render_score::@7: scope:[render_score]  from render_score::@6
+  to:render_score::@5
+render_score::@5: scope:[render_score]  from render_score::@4
   [85] (byte) render_bcd::bcd#3 ← > (word) lines_bcd#15
   [86] (byte*) render_bcd::screen#3 ← (byte*) render_score::screen#3
   [87] call render_bcd 
-  to:render_score::@8
-render_score::@8: scope:[render_score]  from render_score::@7
+  to:render_score::@6
+render_score::@6: scope:[render_score]  from render_score::@5
   [88] (byte) render_bcd::bcd#4 ← < (word) lines_bcd#15
   [89] (byte*) render_bcd::screen#4 ← (byte*) render_score::screen#3
   [90] call render_bcd 
-  to:render_score::@9
-render_score::@9: scope:[render_score]  from render_score::@8
+  to:render_score::@7
+render_score::@7: scope:[render_score]  from render_score::@6
   [91] (byte*) render_bcd::screen#5 ← (byte*) render_score::screen#3
   [92] (byte) render_bcd::bcd#5 ← (byte) level_bcd#17
   [93] call render_bcd 
   to:render_score::@return
-render_score::@return: scope:[render_score]  from render_score::@9
+render_score::@return: scope:[render_score]  from render_score::@7
   [94] return 
   to:@return
-render_bcd: scope:[render_bcd]  from render_score::@2 render_score::@5 render_score::@6 render_score::@7 render_score::@8 render_score::@9
-  [95] (byte) render_bcd::bcd#6 ← phi( render_score::@2/(byte) render_bcd::bcd#0 render_score::@5/(byte) render_bcd::bcd#1 render_score::@6/(byte) render_bcd::bcd#2 render_score::@7/(byte) render_bcd::bcd#3 render_score::@8/(byte) render_bcd::bcd#4 render_score::@9/(byte) render_bcd::bcd#5 )
-  [95] (byte) render_bcd::only_low#6 ← phi( render_score::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 render_score::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [95] (word) render_bcd::offset#6 ← phi( render_score::@2/(const word) render_score::score_offset#0 render_score::@5/(const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 2 render_score::@6/(const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 4 render_score::@7/(const word) render_score::lines_offset#0 render_score::@8/(const word) render_score::lines_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 1 render_score::@9/(const word) render_score::level_offset#0 )
-  [95] (byte*) render_bcd::screen#6 ← phi( render_score::@2/(byte*) render_bcd::screen#0 render_score::@5/(byte*) render_bcd::screen#1 render_score::@6/(byte*) render_bcd::screen#2 render_score::@7/(byte*) render_bcd::screen#3 render_score::@8/(byte*) render_bcd::screen#4 render_score::@9/(byte*) render_bcd::screen#5 )
+render_bcd: scope:[render_bcd]  from render_score::@1 render_score::@3 render_score::@4 render_score::@5 render_score::@6 render_score::@7
+  [95] (byte) render_bcd::bcd#6 ← phi( render_score::@1/(byte) render_bcd::bcd#0 render_score::@3/(byte) render_bcd::bcd#1 render_score::@4/(byte) render_bcd::bcd#2 render_score::@5/(byte) render_bcd::bcd#3 render_score::@6/(byte) render_bcd::bcd#4 render_score::@7/(byte) render_bcd::bcd#5 )
+  [95] (byte) render_bcd::only_low#6 ← phi( render_score::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 render_score::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 render_score::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [95] (word) render_bcd::offset#6 ← phi( render_score::@1/(const word) render_score::score_offset#0 render_score::@3/(const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 2 render_score::@4/(const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 4 render_score::@5/(const word) render_score::lines_offset#0 render_score::@6/(const word) render_score::lines_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 1 render_score::@7/(const word) render_score::level_offset#0 )
+  [95] (byte*) render_bcd::screen#6 ← phi( render_score::@1/(byte*) render_bcd::screen#0 render_score::@3/(byte*) render_bcd::screen#1 render_score::@4/(byte*) render_bcd::screen#2 render_score::@5/(byte*) render_bcd::screen#3 render_score::@6/(byte*) render_bcd::screen#4 render_score::@7/(byte*) render_bcd::screen#5 )
   [96] (byte*) render_bcd::screen_pos#0 ← (byte*) render_bcd::screen#6 + (word) render_bcd::offset#6
   [97] if((byte) render_bcd::only_low#6!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_bcd::@1
   to:render_bcd::@2
@@ -10301,58 +10429,58 @@ render_bcd::@1: scope:[render_bcd]  from render_bcd render_bcd::@2
 render_bcd::@return: scope:[render_bcd]  from render_bcd::@1
   [107] return 
   to:@return
-render_next: scope:[render_next]  from main::@33 main::@40
-  [108] (byte) next_piece_idx#12 ← phi( main::@33/(byte~) next_piece_idx#84 main::@40/(byte~) next_piece_idx#85 )
-  [108] (byte) render_screen_render#15 ← phi( main::@33/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@40/(byte~) render_screen_render#68 )
-  [109] if((byte) render_screen_render#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@2
-  to:render_next::@3
-render_next::@3: scope:[render_next]  from render_next
-  [110] phi()
+render_next: scope:[render_next]  from main::@16 main::@22
+  [108] (byte) next_piece_idx#12 ← phi( main::@16/(byte~) next_piece_idx#84 main::@22/(byte~) next_piece_idx#85 )
+  [108] (byte) render_screen_render#15 ← phi( main::@16/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@22/(byte~) render_screen_render#68 )
+  [109] if((byte) render_screen_render#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@1
   to:render_next::@2
-render_next::@2: scope:[render_next]  from render_next render_next::@3
-  [111] (byte*) render_next::screen_next_area#11 ← phi( render_next/(const byte*) PLAYFIELD_SCREEN_1#0+(const word) render_next::next_area_offset#0 render_next::@3/(const byte*) PLAYFIELD_SCREEN_2#0+(const word) render_next::next_area_offset#0 )
+render_next::@2: scope:[render_next]  from render_next
+  [110] phi()
+  to:render_next::@1
+render_next::@1: scope:[render_next]  from render_next render_next::@2
+  [111] (byte*) render_next::screen_next_area#11 ← phi( render_next/(const byte*) PLAYFIELD_SCREEN_1#0+(const word) render_next::next_area_offset#0 render_next::@2/(const byte*) PLAYFIELD_SCREEN_2#0+(const word) render_next::next_area_offset#0 )
   [112] (byte~) render_next::$4 ← (byte) next_piece_idx#12 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [113] (byte) render_next::next_piece_char#0 ← *((const byte[]) PIECES_NEXT_CHARS#0 + (byte) next_piece_idx#12)
   [114] (byte*~) render_next::next_piece_gfx#9 ← (byte*)*((const word[]) PIECES#0 + (byte~) render_next::$4)
-  to:render_next::@5
-render_next::@5: scope:[render_next]  from render_next::@11 render_next::@2
-  [115] (byte) render_next::l#7 ← phi( render_next::@11/(byte) render_next::l#1 render_next::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [115] (byte*) render_next::screen_next_area#10 ← phi( render_next::@11/(byte*) render_next::screen_next_area#4 render_next::@2/(byte*) render_next::screen_next_area#11 )
-  [115] (byte*) render_next::next_piece_gfx#3 ← phi( render_next::@11/(byte*) render_next::next_piece_gfx#1 render_next::@2/(byte*~) render_next::next_piece_gfx#9 )
-  to:render_next::@6
-render_next::@6: scope:[render_next]  from render_next::@5 render_next::@8
-  [116] (byte) render_next::c#2 ← phi( render_next::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 render_next::@8/(byte) render_next::c#1 )
-  [116] (byte*) render_next::screen_next_area#5 ← phi( render_next::@5/(byte*) render_next::screen_next_area#10 render_next::@8/(byte*) render_next::screen_next_area#3 )
-  [116] (byte*) render_next::next_piece_gfx#2 ← phi( render_next::@5/(byte*) render_next::next_piece_gfx#3 render_next::@8/(byte*) render_next::next_piece_gfx#1 )
+  to:render_next::@3
+render_next::@3: scope:[render_next]  from render_next::@1 render_next::@8
+  [115] (byte) render_next::l#7 ← phi( render_next::@8/(byte) render_next::l#1 render_next::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [115] (byte*) render_next::screen_next_area#10 ← phi( render_next::@8/(byte*) render_next::screen_next_area#4 render_next::@1/(byte*) render_next::screen_next_area#11 )
+  [115] (byte*) render_next::next_piece_gfx#3 ← phi( render_next::@8/(byte*) render_next::next_piece_gfx#1 render_next::@1/(byte*~) render_next::next_piece_gfx#9 )
+  to:render_next::@4
+render_next::@4: scope:[render_next]  from render_next::@3 render_next::@6
+  [116] (byte) render_next::c#2 ← phi( render_next::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 render_next::@6/(byte) render_next::c#1 )
+  [116] (byte*) render_next::screen_next_area#5 ← phi( render_next::@3/(byte*) render_next::screen_next_area#10 render_next::@6/(byte*) render_next::screen_next_area#3 )
+  [116] (byte*) render_next::next_piece_gfx#2 ← phi( render_next::@3/(byte*) render_next::next_piece_gfx#3 render_next::@6/(byte*) render_next::next_piece_gfx#1 )
   [117] (byte) render_next::cell#0 ← *((byte*) render_next::next_piece_gfx#2)
   [118] (byte*) render_next::next_piece_gfx#1 ← ++ (byte*) render_next::next_piece_gfx#2
-  [119] if((byte) render_next::cell#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@7
-  to:render_next::@9
-render_next::@9: scope:[render_next]  from render_next::@6
+  [119] if((byte) render_next::cell#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@5
+  to:render_next::@7
+render_next::@7: scope:[render_next]  from render_next::@4
   [120] *((byte*) render_next::screen_next_area#5) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:render_next::@8
-render_next::@8: scope:[render_next]  from render_next::@7 render_next::@9
+  to:render_next::@6
+render_next::@6: scope:[render_next]  from render_next::@5 render_next::@7
   [121] (byte*) render_next::screen_next_area#3 ← ++ (byte*) render_next::screen_next_area#5
   [122] (byte) render_next::c#1 ← ++ (byte) render_next::c#2
-  [123] if((byte) render_next::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@6
-  to:render_next::@11
-render_next::@11: scope:[render_next]  from render_next::@8
+  [123] if((byte) render_next::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@4
+  to:render_next::@8
+render_next::@8: scope:[render_next]  from render_next::@6
   [124] (byte*) render_next::screen_next_area#4 ← (byte*) render_next::screen_next_area#3 + (byte/signed byte/word/signed word/dword/signed dword) $24
   [125] (byte) render_next::l#1 ← ++ (byte) render_next::l#7
-  [126] if((byte) render_next::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@5
+  [126] if((byte) render_next::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@3
   to:render_next::@return
-render_next::@return: scope:[render_next]  from render_next::@11
+render_next::@return: scope:[render_next]  from render_next::@8
   [127] return 
   to:@return
-render_next::@7: scope:[render_next]  from render_next::@6
+render_next::@5: scope:[render_next]  from render_next::@4
   [128] *((byte*) render_next::screen_next_area#5) ← (byte) render_next::next_piece_char#0
-  to:render_next::@8
-render_moving: scope:[render_moving]  from main::@32 main::@39
-  [129] (byte) current_piece_char#68 ← phi( main::@32/(byte~) current_piece_char#106 main::@39/(byte~) current_piece_char#107 )
-  [129] (byte*) current_piece_gfx#64 ← phi( main::@32/(byte*~) current_piece_gfx#118 main::@39/(byte*~) current_piece_gfx#119 )
-  [129] (byte) current_xpos#59 ← phi( main::@32/(byte~) current_xpos#128 main::@39/(byte~) current_xpos#129 )
-  [129] (byte) render_screen_render#33 ← phi( main::@32/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@39/(byte~) render_screen_render#69 )
-  [129] (byte) current_ypos#13 ← phi( main::@32/(byte~) current_ypos#104 main::@39/(byte~) current_ypos#105 )
+  to:render_next::@6
+render_moving: scope:[render_moving]  from main::@15 main::@21
+  [129] (byte) current_piece_char#68 ← phi( main::@15/(byte~) current_piece_char#106 main::@21/(byte~) current_piece_char#107 )
+  [129] (byte*) current_piece_gfx#64 ← phi( main::@15/(byte*~) current_piece_gfx#118 main::@21/(byte*~) current_piece_gfx#119 )
+  [129] (byte) current_xpos#59 ← phi( main::@15/(byte~) current_xpos#128 main::@21/(byte~) current_xpos#129 )
+  [129] (byte) render_screen_render#33 ← phi( main::@15/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@21/(byte~) render_screen_render#69 )
+  [129] (byte) current_ypos#13 ← phi( main::@15/(byte~) current_ypos#104 main::@21/(byte~) current_ypos#105 )
   [130] (byte) render_moving::ypos2#0 ← (byte) current_ypos#13 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:render_moving::@1
 render_moving::@1: scope:[render_moving]  from render_moving render_moving::@3
@@ -10360,12 +10488,12 @@ render_moving::@1: scope:[render_moving]  from render_moving render_moving::@3
   [131] (byte) render_moving::i#3 ← phi( render_moving/(byte/signed byte/word/signed word/dword/signed dword) 0 render_moving::@3/(byte) render_moving::i#8 )
   [131] (byte) render_moving::ypos2#2 ← phi( render_moving/(byte) render_moving::ypos2#0 render_moving::@3/(byte) render_moving::ypos2#1 )
   [132] if((byte) render_moving::ypos2#2>(byte/signed byte/word/signed word/dword/signed dword) 2) goto render_moving::@2
-  to:render_moving::@8
-render_moving::@8: scope:[render_moving]  from render_moving::@1
+  to:render_moving::@7
+render_moving::@7: scope:[render_moving]  from render_moving::@1
   [133] (byte) render_moving::i#1 ← (byte) render_moving::i#3 + (byte/signed byte/word/signed word/dword/signed dword) 4
   to:render_moving::@3
-render_moving::@3: scope:[render_moving]  from render_moving::@5 render_moving::@8
-  [134] (byte) render_moving::i#8 ← phi( render_moving::@5/(byte) render_moving::i#2 render_moving::@8/(byte) render_moving::i#1 )
+render_moving::@3: scope:[render_moving]  from render_moving::@5 render_moving::@7
+  [134] (byte) render_moving::i#8 ← phi( render_moving::@5/(byte) render_moving::i#2 render_moving::@7/(byte) render_moving::i#1 )
   [135] (byte) render_moving::ypos2#1 ← (byte) render_moving::ypos2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [136] (byte) render_moving::l#1 ← ++ (byte) render_moving::l#4
   [137] if((byte) render_moving::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_moving::@1
@@ -10394,8 +10522,8 @@ render_moving::@5: scope:[render_moving]  from render_moving::@4 render_moving::
   [148] (byte) render_moving::c#1 ← ++ (byte) render_moving::c#2
   [149] if((byte) render_moving::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_moving::@4
   to:render_moving::@3
-render_playfield: scope:[render_playfield]  from main::@23 main::@31
-  [150] (byte) render_screen_render#22 ← phi( main::@23/(byte~) render_screen_render#70 main::@31/(byte/signed byte/word/signed word/dword/signed dword) $40 )
+render_playfield: scope:[render_playfield]  from main::@14 main::@7
+  [150] (byte) render_screen_render#22 ← phi( main::@7/(byte~) render_screen_render#70 main::@14/(byte/signed byte/word/signed word/dword/signed dword) $40 )
   to:render_playfield::@1
 render_playfield::@1: scope:[render_playfield]  from render_playfield render_playfield::@3
   [151] (byte) render_playfield::i#3 ← phi( render_playfield/(const byte) PLAYFIELD_COLS#0*(byte/signed byte/word/signed word/dword/signed dword) 2 render_playfield::@3/(byte) render_playfield::i#1 )
@@ -10421,56 +10549,56 @@ render_playfield::@3: scope:[render_playfield]  from render_playfield::@2
 render_playfield::@return: scope:[render_playfield]  from render_playfield::@3
   [163] return 
   to:@return
-play_movement: scope:[play_movement]  from main::@9
+play_movement: scope:[play_movement]  from main::@4
   [164] (byte) play_move_down::key_event#0 ← (byte) play_movement::key_event#0
   [165] call play_move_down 
   [166] (byte) play_move_down::return#0 ← (byte) play_move_down::return#3
-  to:play_movement::@5
-play_movement::@5: scope:[play_movement]  from play_movement
+  to:play_movement::@2
+play_movement::@2: scope:[play_movement]  from play_movement
   [167] (byte~) play_movement::$0 ← (byte) play_move_down::return#0
   [168] (byte) play_movement::render#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 + (byte~) play_movement::$0
   [169] if((byte) game_over#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_movement::@1
   to:play_movement::@return
-play_movement::@return: scope:[play_movement]  from play_movement::@5 play_movement::@7
-  [170] (byte) current_xpos#19 ← phi( play_movement::@5/(byte) current_xpos#22 play_movement::@7/(byte) current_xpos#26 )
-  [170] (byte*) current_piece_gfx#18 ← phi( play_movement::@5/(byte*) current_piece_gfx#20 play_movement::@7/(byte*) current_piece_gfx#21 )
-  [170] (byte) current_orientation#17 ← phi( play_movement::@5/(byte) current_orientation#20 play_movement::@7/(byte) current_orientation#25 )
-  [170] (byte) play_movement::return#2 ← phi( play_movement::@5/(byte) play_movement::render#1 play_movement::@7/(byte) play_movement::return#0 )
+play_movement::@return: scope:[play_movement]  from play_movement::@2 play_movement::@4
+  [170] (byte) current_xpos#19 ← phi( play_movement::@2/(byte) current_xpos#22 play_movement::@4/(byte) current_xpos#26 )
+  [170] (byte*) current_piece_gfx#18 ← phi( play_movement::@2/(byte*) current_piece_gfx#20 play_movement::@4/(byte*) current_piece_gfx#21 )
+  [170] (byte) current_orientation#17 ← phi( play_movement::@2/(byte) current_orientation#20 play_movement::@4/(byte) current_orientation#25 )
+  [170] (byte) play_movement::return#2 ← phi( play_movement::@2/(byte) play_movement::render#1 play_movement::@4/(byte) play_movement::return#0 )
   [171] return 
   to:@return
-play_movement::@1: scope:[play_movement]  from play_movement::@5
+play_movement::@1: scope:[play_movement]  from play_movement::@2
   [172] (byte) play_move_leftright::key_event#0 ← (byte) play_movement::key_event#0
   [173] call play_move_leftright 
   [174] (byte) play_move_leftright::return#0 ← (byte) play_move_leftright::return#2
-  to:play_movement::@6
-play_movement::@6: scope:[play_movement]  from play_movement::@1
+  to:play_movement::@3
+play_movement::@3: scope:[play_movement]  from play_movement::@1
   [175] (byte~) play_movement::$3 ← (byte) play_move_leftright::return#0
   [176] (byte) play_movement::render#2 ← (byte) play_movement::render#1 + (byte~) play_movement::$3
   [177] (byte) play_move_rotate::key_event#0 ← (byte) play_movement::key_event#0
   [178] call play_move_rotate 
   [179] (byte) play_move_rotate::return#0 ← (byte) play_move_rotate::return#2
-  to:play_movement::@7
-play_movement::@7: scope:[play_movement]  from play_movement::@6
+  to:play_movement::@4
+play_movement::@4: scope:[play_movement]  from play_movement::@3
   [180] (byte~) play_movement::$4 ← (byte) play_move_rotate::return#0
   [181] (byte) play_movement::return#0 ← (byte) play_movement::render#2 + (byte~) play_movement::$4
   to:play_movement::@return
-play_move_rotate: scope:[play_move_rotate]  from play_movement::@6
+play_move_rotate: scope:[play_move_rotate]  from play_movement::@3
   [182] if((byte) play_move_rotate::key_event#0==(const byte) KEY_Z#0) goto play_move_rotate::@1
-  to:play_move_rotate::@6
-play_move_rotate::@6: scope:[play_move_rotate]  from play_move_rotate
+  to:play_move_rotate::@4
+play_move_rotate::@4: scope:[play_move_rotate]  from play_move_rotate
   [183] if((byte) play_move_rotate::key_event#0==(const byte) KEY_X#0) goto play_move_rotate::@2
   to:play_move_rotate::@return
-play_move_rotate::@return: scope:[play_move_rotate]  from play_move_rotate::@11 play_move_rotate::@14 play_move_rotate::@6
-  [184] (byte*) current_piece_gfx#21 ← phi( play_move_rotate::@11/(byte*) current_piece_gfx#7 play_move_rotate::@14/(byte*) current_piece_gfx#20 play_move_rotate::@6/(byte*) current_piece_gfx#20 )
-  [184] (byte) current_orientation#25 ← phi( play_move_rotate::@11/(byte) current_orientation#7 play_move_rotate::@14/(byte) current_orientation#20 play_move_rotate::@6/(byte) current_orientation#20 )
-  [184] (byte) play_move_rotate::return#2 ← phi( play_move_rotate::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_rotate::@14/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_rotate::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+play_move_rotate::@return: scope:[play_move_rotate]  from play_move_rotate::@4 play_move_rotate::@5 play_move_rotate::@6
+  [184] (byte*) current_piece_gfx#21 ← phi( play_move_rotate::@5/(byte*) current_piece_gfx#7 play_move_rotate::@6/(byte*) current_piece_gfx#20 play_move_rotate::@4/(byte*) current_piece_gfx#20 )
+  [184] (byte) current_orientation#25 ← phi( play_move_rotate::@5/(byte) current_orientation#7 play_move_rotate::@6/(byte) current_orientation#20 play_move_rotate::@4/(byte) current_orientation#20 )
+  [184] (byte) play_move_rotate::return#2 ← phi( play_move_rotate::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_rotate::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_rotate::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [185] return 
   to:@return
-play_move_rotate::@2: scope:[play_move_rotate]  from play_move_rotate::@6
+play_move_rotate::@2: scope:[play_move_rotate]  from play_move_rotate::@4
   [186] (byte/signed word/word/dword/signed dword~) play_move_rotate::$5 ← (byte) current_orientation#20 + (byte/signed byte/word/signed word/dword/signed dword) $10
   [187] (byte) play_move_rotate::orientation#2 ← (byte/signed word/word/dword/signed dword~) play_move_rotate::$5 & (byte/signed byte/word/signed word/dword/signed dword) $3f
-  to:play_move_rotate::@4
-play_move_rotate::@4: scope:[play_move_rotate]  from play_move_rotate::@1 play_move_rotate::@2
+  to:play_move_rotate::@3
+play_move_rotate::@3: scope:[play_move_rotate]  from play_move_rotate::@1 play_move_rotate::@2
   [188] (byte) play_move_rotate::orientation#3 ← phi( play_move_rotate::@1/(byte) play_move_rotate::orientation#1 play_move_rotate::@2/(byte) play_move_rotate::orientation#2 )
   [189] (byte) play_collision::xpos#3 ← (byte) current_xpos#26
   [190] (byte) play_collision::ypos#3 ← (byte) current_ypos#19
@@ -10478,49 +10606,49 @@ play_move_rotate::@4: scope:[play_move_rotate]  from play_move_rotate::@1 play_m
   [192] (byte*~) current_piece#101 ← (byte*) current_piece#15
   [193] call play_collision 
   [194] (byte) play_collision::return#14 ← (byte) play_collision::return#15
-  to:play_move_rotate::@14
-play_move_rotate::@14: scope:[play_move_rotate]  from play_move_rotate::@4
+  to:play_move_rotate::@6
+play_move_rotate::@6: scope:[play_move_rotate]  from play_move_rotate::@3
   [195] (byte~) play_move_rotate::$2 ← (byte) play_collision::return#14
   [196] if((byte~) play_move_rotate::$2!=(const byte) COLLISION_NONE#0) goto play_move_rotate::@return
-  to:play_move_rotate::@11
-play_move_rotate::@11: scope:[play_move_rotate]  from play_move_rotate::@14
+  to:play_move_rotate::@5
+play_move_rotate::@5: scope:[play_move_rotate]  from play_move_rotate::@6
   [197] (byte) current_orientation#7 ← (byte) play_move_rotate::orientation#3
   [198] (byte*) current_piece_gfx#7 ← (byte*) current_piece#15 + (byte) current_orientation#7
   to:play_move_rotate::@return
 play_move_rotate::@1: scope:[play_move_rotate]  from play_move_rotate
   [199] (byte/signed word/word/dword/signed dword~) play_move_rotate::$7 ← (byte) current_orientation#20 - (byte/signed byte/word/signed word/dword/signed dword) $10
   [200] (byte) play_move_rotate::orientation#1 ← (byte/signed word/word/dword/signed dword~) play_move_rotate::$7 & (byte/signed byte/word/signed word/dword/signed dword) $3f
-  to:play_move_rotate::@4
-play_collision: scope:[play_collision]  from play_move_down::@9 play_move_leftright::@1 play_move_leftright::@5 play_move_rotate::@4 play_spawn_current
-  [201] (byte) play_collision::xpos#6 ← phi( play_move_down::@9/(byte) play_collision::xpos#0 play_move_leftright::@1/(byte) play_collision::xpos#1 play_move_leftright::@5/(byte) play_collision::xpos#2 play_move_rotate::@4/(byte) play_collision::xpos#3 play_spawn_current/(byte) play_collision::xpos#4 )
-  [201] (byte) play_collision::ypos#5 ← phi( play_move_down::@9/(byte) play_collision::ypos#0 play_move_leftright::@1/(byte) play_collision::ypos#1 play_move_leftright::@5/(byte) play_collision::ypos#2 play_move_rotate::@4/(byte) play_collision::ypos#3 play_spawn_current/(byte) play_collision::ypos#4 )
-  [201] (byte) play_collision::orientation#5 ← phi( play_move_down::@9/(byte) play_collision::orientation#0 play_move_leftright::@1/(byte) play_collision::orientation#1 play_move_leftright::@5/(byte) play_collision::orientation#2 play_move_rotate::@4/(byte) play_collision::orientation#3 play_spawn_current/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [201] (byte*) current_piece#17 ← phi( play_move_down::@9/(byte*~) current_piece#98 play_move_leftright::@1/(byte*~) current_piece#99 play_move_leftright::@5/(byte*~) current_piece#100 play_move_rotate::@4/(byte*~) current_piece#101 play_spawn_current/(byte*~) current_piece#102 )
+  to:play_move_rotate::@3
+play_collision: scope:[play_collision]  from play_move_down::@8 play_move_leftright::@1 play_move_leftright::@3 play_move_rotate::@3 play_spawn_current
+  [201] (byte) play_collision::xpos#6 ← phi( play_move_down::@8/(byte) play_collision::xpos#0 play_move_leftright::@1/(byte) play_collision::xpos#1 play_move_leftright::@3/(byte) play_collision::xpos#2 play_move_rotate::@3/(byte) play_collision::xpos#3 play_spawn_current/(byte) play_collision::xpos#4 )
+  [201] (byte) play_collision::ypos#5 ← phi( play_move_down::@8/(byte) play_collision::ypos#0 play_move_leftright::@1/(byte) play_collision::ypos#1 play_move_leftright::@3/(byte) play_collision::ypos#2 play_move_rotate::@3/(byte) play_collision::ypos#3 play_spawn_current/(byte) play_collision::ypos#4 )
+  [201] (byte) play_collision::orientation#5 ← phi( play_move_down::@8/(byte) play_collision::orientation#0 play_move_leftright::@1/(byte) play_collision::orientation#1 play_move_leftright::@3/(byte) play_collision::orientation#2 play_move_rotate::@3/(byte) play_collision::orientation#3 play_spawn_current/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [201] (byte*) current_piece#17 ← phi( play_move_down::@8/(byte*~) current_piece#98 play_move_leftright::@1/(byte*~) current_piece#99 play_move_leftright::@3/(byte*~) current_piece#100 play_move_rotate::@3/(byte*~) current_piece#101 play_spawn_current/(byte*~) current_piece#102 )
   [202] (byte*) play_collision::piece_gfx#0 ← (byte*) current_piece#17 + (byte) play_collision::orientation#5
   [203] (byte) play_collision::ypos2#0 ← (byte) play_collision::ypos#5 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:play_collision::@1
-play_collision::@1: scope:[play_collision]  from play_collision play_collision::@20
-  [204] (byte) play_collision::l#6 ← phi( play_collision/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@20/(byte) play_collision::l#1 )
-  [204] (byte) play_collision::i#3 ← phi( play_collision/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@20/(byte~) play_collision::i#11 )
-  [204] (byte) play_collision::ypos2#2 ← phi( play_collision/(byte) play_collision::ypos2#0 play_collision::@20/(byte) play_collision::ypos2#1 )
+play_collision::@1: scope:[play_collision]  from play_collision play_collision::@9
+  [204] (byte) play_collision::l#6 ← phi( play_collision/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@9/(byte) play_collision::l#1 )
+  [204] (byte) play_collision::i#3 ← phi( play_collision/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@9/(byte~) play_collision::i#11 )
+  [204] (byte) play_collision::ypos2#2 ← phi( play_collision/(byte) play_collision::ypos2#0 play_collision::@9/(byte) play_collision::ypos2#1 )
   [205] (byte*) play_collision::playfield_line#0 ← *((const byte*[PLAYFIELD_LINES#0]) playfield_lines#0 + (byte) play_collision::ypos2#2)
   [206] (byte~) play_collision::col#9 ← (byte) play_collision::xpos#6
   to:play_collision::@2
-play_collision::@2: scope:[play_collision]  from play_collision::@1 play_collision::@21
-  [207] (byte) play_collision::c#2 ← phi( play_collision::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@21/(byte) play_collision::c#1 )
-  [207] (byte) play_collision::col#2 ← phi( play_collision::@1/(byte~) play_collision::col#9 play_collision::@21/(byte) play_collision::col#1 )
-  [207] (byte) play_collision::i#2 ← phi( play_collision::@1/(byte) play_collision::i#3 play_collision::@21/(byte~) play_collision::i#13 )
+play_collision::@2: scope:[play_collision]  from play_collision::@1 play_collision::@10
+  [207] (byte) play_collision::c#2 ← phi( play_collision::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 play_collision::@10/(byte) play_collision::c#1 )
+  [207] (byte) play_collision::col#2 ← phi( play_collision::@1/(byte~) play_collision::col#9 play_collision::@10/(byte) play_collision::col#1 )
+  [207] (byte) play_collision::i#2 ← phi( play_collision::@1/(byte) play_collision::i#3 play_collision::@10/(byte~) play_collision::i#13 )
   [208] (byte) play_collision::i#1 ← ++ (byte) play_collision::i#2
   [209] if(*((byte*) play_collision::piece_gfx#0 + (byte) play_collision::i#2)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_collision::@3
-  to:play_collision::@14
-play_collision::@14: scope:[play_collision]  from play_collision::@2
+  to:play_collision::@7
+play_collision::@7: scope:[play_collision]  from play_collision::@2
   [210] if((byte) play_collision::ypos2#2<(byte/signed byte/word/signed word/dword/signed dword) 2*(const byte) PLAYFIELD_LINES#0) goto play_collision::@4
   to:play_collision::@return
-play_collision::@return: scope:[play_collision]  from play_collision::@14 play_collision::@17 play_collision::@4 play_collision::@5 play_collision::@6
-  [211] (byte) play_collision::return#15 ← phi( play_collision::@5/(const byte) COLLISION_RIGHT#0 play_collision::@6/(const byte) COLLISION_PLAYFIELD#0 play_collision::@14/(const byte) COLLISION_BOTTOM#0 play_collision::@17/(const byte) COLLISION_NONE#0 play_collision::@4/(const byte) COLLISION_LEFT#0 )
+play_collision::@return: scope:[play_collision]  from play_collision::@4 play_collision::@5 play_collision::@6 play_collision::@7 play_collision::@8
+  [211] (byte) play_collision::return#15 ← phi( play_collision::@5/(const byte) COLLISION_RIGHT#0 play_collision::@6/(const byte) COLLISION_PLAYFIELD#0 play_collision::@7/(const byte) COLLISION_BOTTOM#0 play_collision::@8/(const byte) COLLISION_NONE#0 play_collision::@4/(const byte) COLLISION_LEFT#0 )
   [212] return 
   to:@return
-play_collision::@4: scope:[play_collision]  from play_collision::@14
+play_collision::@4: scope:[play_collision]  from play_collision::@7
   [213] (byte~) play_collision::$7 ← (byte) play_collision::col#2 & (byte/word/signed word/dword/signed dword) $80
   [214] if((byte~) play_collision::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_collision::@5
   to:play_collision::@return
@@ -10533,43 +10661,43 @@ play_collision::@6: scope:[play_collision]  from play_collision::@5
 play_collision::@3: scope:[play_collision]  from play_collision::@2 play_collision::@6
   [217] (byte) play_collision::col#1 ← ++ (byte) play_collision::col#2
   [218] (byte) play_collision::c#1 ← ++ (byte) play_collision::c#2
-  [219] if((byte) play_collision::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@21
-  to:play_collision::@17
-play_collision::@17: scope:[play_collision]  from play_collision::@3
+  [219] if((byte) play_collision::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@10
+  to:play_collision::@8
+play_collision::@8: scope:[play_collision]  from play_collision::@3
   [220] (byte) play_collision::ypos2#1 ← (byte) play_collision::ypos2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [221] (byte) play_collision::l#1 ← ++ (byte) play_collision::l#6
-  [222] if((byte) play_collision::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@20
+  [222] if((byte) play_collision::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@9
   to:play_collision::@return
-play_collision::@20: scope:[play_collision]  from play_collision::@17
+play_collision::@9: scope:[play_collision]  from play_collision::@8
   [223] (byte~) play_collision::i#11 ← (byte) play_collision::i#1
   to:play_collision::@1
-play_collision::@21: scope:[play_collision]  from play_collision::@3
+play_collision::@10: scope:[play_collision]  from play_collision::@3
   [224] (byte~) play_collision::i#13 ← (byte) play_collision::i#1
   to:play_collision::@2
 play_move_leftright: scope:[play_move_leftright]  from play_movement::@1
   [225] if((byte) play_move_leftright::key_event#0==(const byte) KEY_COMMA#0) goto play_move_leftright::@1
-  to:play_move_leftright::@4
-play_move_leftright::@4: scope:[play_move_leftright]  from play_move_leftright
+  to:play_move_leftright::@2
+play_move_leftright::@2: scope:[play_move_leftright]  from play_move_leftright
   [226] if((byte) play_move_leftright::key_event#0!=(const byte) KEY_DOT#0) goto play_move_leftright::@return
-  to:play_move_leftright::@5
-play_move_leftright::@5: scope:[play_move_leftright]  from play_move_leftright::@4
+  to:play_move_leftright::@3
+play_move_leftright::@3: scope:[play_move_leftright]  from play_move_leftright::@2
   [227] (byte) play_collision::xpos#2 ← (byte) current_xpos#22 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [228] (byte) play_collision::ypos#2 ← (byte) current_ypos#19
   [229] (byte) play_collision::orientation#2 ← (byte) current_orientation#20
   [230] (byte*~) current_piece#100 ← (byte*) current_piece#15
   [231] call play_collision 
   [232] (byte) play_collision::return#13 ← (byte) play_collision::return#15
-  to:play_move_leftright::@15
-play_move_leftright::@15: scope:[play_move_leftright]  from play_move_leftright::@5
+  to:play_move_leftright::@7
+play_move_leftright::@7: scope:[play_move_leftright]  from play_move_leftright::@3
   [233] (byte~) play_move_leftright::$4 ← (byte) play_collision::return#13
   [234] if((byte~) play_move_leftright::$4!=(const byte) COLLISION_NONE#0) goto play_move_leftright::@return
-  to:play_move_leftright::@6
-play_move_leftright::@6: scope:[play_move_leftright]  from play_move_leftright::@15
+  to:play_move_leftright::@4
+play_move_leftright::@4: scope:[play_move_leftright]  from play_move_leftright::@7
   [235] (byte) current_xpos#6 ← ++ (byte) current_xpos#22
   to:play_move_leftright::@return
-play_move_leftright::@return: scope:[play_move_leftright]  from play_move_leftright::@14 play_move_leftright::@15 play_move_leftright::@4 play_move_leftright::@6 play_move_leftright::@9
-  [236] (byte) current_xpos#26 ← phi( play_move_leftright::@14/(byte) current_xpos#22 play_move_leftright::@6/(byte) current_xpos#6 play_move_leftright::@9/(byte) current_xpos#8 play_move_leftright::@15/(byte) current_xpos#22 play_move_leftright::@4/(byte) current_xpos#22 )
-  [236] (byte) play_move_leftright::return#2 ← phi( play_move_leftright::@14/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_leftright::@6/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_leftright::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_leftright::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_leftright::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+play_move_leftright::@return: scope:[play_move_leftright]  from play_move_leftright::@2 play_move_leftright::@4 play_move_leftright::@5 play_move_leftright::@6 play_move_leftright::@7
+  [236] (byte) current_xpos#26 ← phi( play_move_leftright::@6/(byte) current_xpos#22 play_move_leftright::@4/(byte) current_xpos#6 play_move_leftright::@5/(byte) current_xpos#8 play_move_leftright::@7/(byte) current_xpos#22 play_move_leftright::@2/(byte) current_xpos#22 )
+  [236] (byte) play_move_leftright::return#2 ← phi( play_move_leftright::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_leftright::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_leftright::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_leftright::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_leftright::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [237] return 
   to:@return
 play_move_leftright::@1: scope:[play_move_leftright]  from play_move_leftright
@@ -10579,117 +10707,117 @@ play_move_leftright::@1: scope:[play_move_leftright]  from play_move_leftright
   [241] (byte*~) current_piece#99 ← (byte*) current_piece#15
   [242] call play_collision 
   [243] (byte) play_collision::return#1 ← (byte) play_collision::return#15
-  to:play_move_leftright::@14
-play_move_leftright::@14: scope:[play_move_leftright]  from play_move_leftright::@1
+  to:play_move_leftright::@6
+play_move_leftright::@6: scope:[play_move_leftright]  from play_move_leftright::@1
   [244] (byte~) play_move_leftright::$8 ← (byte) play_collision::return#1
   [245] if((byte~) play_move_leftright::$8!=(const byte) COLLISION_NONE#0) goto play_move_leftright::@return
-  to:play_move_leftright::@9
-play_move_leftright::@9: scope:[play_move_leftright]  from play_move_leftright::@14
+  to:play_move_leftright::@5
+play_move_leftright::@5: scope:[play_move_leftright]  from play_move_leftright::@6
   [246] (byte) current_xpos#8 ← -- (byte) current_xpos#22
   to:play_move_leftright::@return
 play_move_down: scope:[play_move_down]  from play_movement
   [247] (byte) current_movedown_counter#12 ← ++ (byte) current_movedown_counter#16
   [248] if((byte) play_move_down::key_event#0!=(const byte) KEY_SPACE#0) goto play_move_down::@1
-  to:play_move_down::@5
-play_move_down::@5: scope:[play_move_down]  from play_move_down
+  to:play_move_down::@4
+play_move_down::@4: scope:[play_move_down]  from play_move_down
   [249] phi()
   to:play_move_down::@1
-play_move_down::@1: scope:[play_move_down]  from play_move_down play_move_down::@5
-  [250] (byte) play_move_down::movedown#10 ← phi( play_move_down/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_down::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+play_move_down::@1: scope:[play_move_down]  from play_move_down play_move_down::@4
+  [250] (byte) play_move_down::movedown#10 ← phi( play_move_down/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_down::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [251] call keyboard_event_pressed 
   [252] (byte) keyboard_event_pressed::return#12 ← (byte) keyboard_event_pressed::return#11
-  to:play_move_down::@17
-play_move_down::@17: scope:[play_move_down]  from play_move_down::@1
+  to:play_move_down::@12
+play_move_down::@12: scope:[play_move_down]  from play_move_down::@1
   [253] (byte~) play_move_down::$2 ← (byte) keyboard_event_pressed::return#12
   [254] if((byte~) play_move_down::$2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_move_down::@2
-  to:play_move_down::@6
-play_move_down::@6: scope:[play_move_down]  from play_move_down::@17
+  to:play_move_down::@5
+play_move_down::@5: scope:[play_move_down]  from play_move_down::@12
   [255] if((byte) current_movedown_counter#12<(const byte) current_movedown_fast#0) goto play_move_down::@2
-  to:play_move_down::@7
-play_move_down::@7: scope:[play_move_down]  from play_move_down::@6
+  to:play_move_down::@6
+play_move_down::@6: scope:[play_move_down]  from play_move_down::@5
   [256] (byte) play_move_down::movedown#2 ← ++ (byte) play_move_down::movedown#10
   to:play_move_down::@2
-play_move_down::@2: scope:[play_move_down]  from play_move_down::@17 play_move_down::@6 play_move_down::@7
-  [257] (byte) play_move_down::movedown#7 ← phi( play_move_down::@6/(byte) play_move_down::movedown#10 play_move_down::@17/(byte) play_move_down::movedown#10 play_move_down::@7/(byte) play_move_down::movedown#2 )
+play_move_down::@2: scope:[play_move_down]  from play_move_down::@12 play_move_down::@5 play_move_down::@6
+  [257] (byte) play_move_down::movedown#7 ← phi( play_move_down::@5/(byte) play_move_down::movedown#10 play_move_down::@12/(byte) play_move_down::movedown#10 play_move_down::@6/(byte) play_move_down::movedown#2 )
   [258] if((byte) current_movedown_counter#12<(byte) current_movedown_slow#14) goto play_move_down::@3
-  to:play_move_down::@8
-play_move_down::@8: scope:[play_move_down]  from play_move_down::@2
+  to:play_move_down::@7
+play_move_down::@7: scope:[play_move_down]  from play_move_down::@2
   [259] (byte) play_move_down::movedown#3 ← ++ (byte) play_move_down::movedown#7
   to:play_move_down::@3
-play_move_down::@3: scope:[play_move_down]  from play_move_down::@2 play_move_down::@8
-  [260] (byte) play_move_down::movedown#6 ← phi( play_move_down::@2/(byte) play_move_down::movedown#7 play_move_down::@8/(byte) play_move_down::movedown#3 )
+play_move_down::@3: scope:[play_move_down]  from play_move_down::@2 play_move_down::@7
+  [260] (byte) play_move_down::movedown#6 ← phi( play_move_down::@2/(byte) play_move_down::movedown#7 play_move_down::@7/(byte) play_move_down::movedown#3 )
   [261] if((byte) play_move_down::movedown#6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_move_down::@return
-  to:play_move_down::@9
-play_move_down::@9: scope:[play_move_down]  from play_move_down::@3
+  to:play_move_down::@8
+play_move_down::@8: scope:[play_move_down]  from play_move_down::@3
   [262] (byte) play_collision::ypos#0 ← (byte) current_ypos#11 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [263] (byte) play_collision::xpos#0 ← (byte) current_xpos#122
   [264] (byte) play_collision::orientation#0 ← (byte) current_orientation#13
   [265] (byte*~) current_piece#98 ← (byte*) current_piece#10
   [266] call play_collision 
   [267] (byte) play_collision::return#0 ← (byte) play_collision::return#15
-  to:play_move_down::@18
-play_move_down::@18: scope:[play_move_down]  from play_move_down::@9
+  to:play_move_down::@13
+play_move_down::@13: scope:[play_move_down]  from play_move_down::@8
   [268] (byte~) play_move_down::$12 ← (byte) play_collision::return#0
-  [269] if((byte~) play_move_down::$12==(const byte) COLLISION_NONE#0) goto play_move_down::@14
-  to:play_move_down::@10
-play_move_down::@10: scope:[play_move_down]  from play_move_down::@18
+  [269] if((byte~) play_move_down::$12==(const byte) COLLISION_NONE#0) goto play_move_down::@10
+  to:play_move_down::@9
+play_move_down::@9: scope:[play_move_down]  from play_move_down::@13
   [270] phi()
   [271] call play_lock_current 
-  to:play_move_down::@19
-play_move_down::@19: scope:[play_move_down]  from play_move_down::@10
+  to:play_move_down::@14
+play_move_down::@14: scope:[play_move_down]  from play_move_down::@9
   [272] phi()
   [273] call play_remove_lines 
   [274] (byte) play_remove_lines::return#0 ← (byte) play_remove_lines::removed#7
-  to:play_move_down::@20
-play_move_down::@20: scope:[play_move_down]  from play_move_down::@19
+  to:play_move_down::@15
+play_move_down::@15: scope:[play_move_down]  from play_move_down::@14
   [275] (byte) play_move_down::removed#0 ← (byte) play_remove_lines::return#0
   [276] (byte) play_update_score::removed#0 ← (byte) play_move_down::removed#0
   [277] call play_update_score 
-  to:play_move_down::@21
-play_move_down::@21: scope:[play_move_down]  from play_move_down::@20
+  to:play_move_down::@16
+play_move_down::@16: scope:[play_move_down]  from play_move_down::@15
   [278] phi()
   [279] call play_spawn_current 
   [280] (byte*~) current_piece#104 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0)
-  to:play_move_down::@15
-play_move_down::@15: scope:[play_move_down]  from play_move_down::@14 play_move_down::@21
-  [281] (byte) next_piece_idx#30 ← phi( play_move_down::@14/(byte) next_piece_idx#10 play_move_down::@21/(byte) play_spawn_current::piece_idx#2 )
-  [281] (byte) game_over#27 ← phi( play_move_down::@14/(byte) game_over#10 play_move_down::@21/(byte) game_over#52 )
-  [281] (byte) current_xpos#43 ← phi( play_move_down::@14/(byte) current_xpos#122 play_move_down::@21/(byte) current_xpos#103 )
-  [281] (byte*) current_piece_gfx#35 ← phi( play_move_down::@14/(byte*) current_piece_gfx#112 play_move_down::@21/(byte*) current_piece_gfx#74 )
-  [281] (byte) current_orientation#37 ← phi( play_move_down::@14/(byte) current_orientation#13 play_move_down::@21/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [281] (byte) current_piece_char#29 ← phi( play_move_down::@14/(byte) current_piece_char#10 play_move_down::@21/(byte) current_piece_char#5 )
-  [281] (byte*) current_piece#28 ← phi( play_move_down::@14/(byte*) current_piece#10 play_move_down::@21/(byte*~) current_piece#104 )
-  [281] (byte) level_bcd#31 ← phi( play_move_down::@14/(byte) level_bcd#11 play_move_down::@21/(byte) level_bcd#19 )
-  [281] (byte) current_movedown_slow#37 ← phi( play_move_down::@14/(byte) current_movedown_slow#14 play_move_down::@21/(byte) current_movedown_slow#23 )
-  [281] (byte) level#33 ← phi( play_move_down::@14/(byte) level#10 play_move_down::@21/(byte) level#19 )
-  [281] (dword) score_bcd#26 ← phi( play_move_down::@14/(dword) score_bcd#18 play_move_down::@21/(dword) score_bcd#16 )
-  [281] (word) lines_bcd#26 ← phi( play_move_down::@14/(word) lines_bcd#19 play_move_down::@21/(word) lines_bcd#17 )
-  [281] (byte) current_ypos#38 ← phi( play_move_down::@14/(byte) current_ypos#3 play_move_down::@21/(byte) current_ypos#6 )
+  to:play_move_down::@11
+play_move_down::@11: scope:[play_move_down]  from play_move_down::@10 play_move_down::@16
+  [281] (byte) next_piece_idx#30 ← phi( play_move_down::@10/(byte) next_piece_idx#10 play_move_down::@16/(byte) play_spawn_current::piece_idx#2 )
+  [281] (byte) game_over#27 ← phi( play_move_down::@10/(byte) game_over#10 play_move_down::@16/(byte) game_over#52 )
+  [281] (byte) current_xpos#43 ← phi( play_move_down::@10/(byte) current_xpos#122 play_move_down::@16/(byte) current_xpos#103 )
+  [281] (byte*) current_piece_gfx#35 ← phi( play_move_down::@10/(byte*) current_piece_gfx#112 play_move_down::@16/(byte*) current_piece_gfx#74 )
+  [281] (byte) current_orientation#37 ← phi( play_move_down::@10/(byte) current_orientation#13 play_move_down::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [281] (byte) current_piece_char#29 ← phi( play_move_down::@10/(byte) current_piece_char#10 play_move_down::@16/(byte) current_piece_char#5 )
+  [281] (byte*) current_piece#28 ← phi( play_move_down::@10/(byte*) current_piece#10 play_move_down::@16/(byte*~) current_piece#104 )
+  [281] (byte) level_bcd#31 ← phi( play_move_down::@10/(byte) level_bcd#11 play_move_down::@16/(byte) level_bcd#19 )
+  [281] (byte) current_movedown_slow#37 ← phi( play_move_down::@10/(byte) current_movedown_slow#14 play_move_down::@16/(byte) current_movedown_slow#23 )
+  [281] (byte) level#33 ← phi( play_move_down::@10/(byte) level#10 play_move_down::@16/(byte) level#19 )
+  [281] (dword) score_bcd#26 ← phi( play_move_down::@10/(dword) score_bcd#18 play_move_down::@16/(dword) score_bcd#16 )
+  [281] (word) lines_bcd#26 ← phi( play_move_down::@10/(word) lines_bcd#19 play_move_down::@16/(word) lines_bcd#17 )
+  [281] (byte) current_ypos#38 ← phi( play_move_down::@10/(byte) current_ypos#3 play_move_down::@16/(byte) current_ypos#6 )
   to:play_move_down::@return
-play_move_down::@return: scope:[play_move_down]  from play_move_down::@15 play_move_down::@3
-  [282] (byte) next_piece_idx#16 ← phi( play_move_down::@15/(byte) next_piece_idx#30 play_move_down::@3/(byte) next_piece_idx#10 )
-  [282] (byte) game_over#15 ← phi( play_move_down::@15/(byte) game_over#27 play_move_down::@3/(byte) game_over#10 )
-  [282] (byte) current_xpos#22 ← phi( play_move_down::@15/(byte) current_xpos#43 play_move_down::@3/(byte) current_xpos#122 )
-  [282] (byte*) current_piece_gfx#20 ← phi( play_move_down::@15/(byte*) current_piece_gfx#35 play_move_down::@3/(byte*) current_piece_gfx#112 )
-  [282] (byte) current_orientation#20 ← phi( play_move_down::@15/(byte) current_orientation#37 play_move_down::@3/(byte) current_orientation#13 )
-  [282] (byte) current_piece_char#16 ← phi( play_move_down::@15/(byte) current_piece_char#29 play_move_down::@3/(byte) current_piece_char#10 )
-  [282] (byte*) current_piece#15 ← phi( play_move_down::@15/(byte*) current_piece#28 play_move_down::@3/(byte*) current_piece#10 )
-  [282] (byte) level_bcd#17 ← phi( play_move_down::@15/(byte) level_bcd#31 play_move_down::@3/(byte) level_bcd#11 )
-  [282] (byte) current_movedown_slow#21 ← phi( play_move_down::@15/(byte) current_movedown_slow#37 play_move_down::@3/(byte) current_movedown_slow#14 )
-  [282] (byte) level#17 ← phi( play_move_down::@15/(byte) level#33 play_move_down::@3/(byte) level#10 )
-  [282] (dword) score_bcd#14 ← phi( play_move_down::@15/(dword) score_bcd#26 play_move_down::@3/(dword) score_bcd#18 )
-  [282] (word) lines_bcd#15 ← phi( play_move_down::@15/(word) lines_bcd#26 play_move_down::@3/(word) lines_bcd#19 )
-  [282] (byte) current_ypos#19 ← phi( play_move_down::@15/(byte) current_ypos#38 play_move_down::@3/(byte) current_ypos#11 )
-  [282] (byte) current_movedown_counter#14 ← phi( play_move_down::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_down::@3/(byte) current_movedown_counter#12 )
-  [282] (byte) play_move_down::return#3 ← phi( play_move_down::@15/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_down::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+play_move_down::@return: scope:[play_move_down]  from play_move_down::@11 play_move_down::@3
+  [282] (byte) next_piece_idx#16 ← phi( play_move_down::@11/(byte) next_piece_idx#30 play_move_down::@3/(byte) next_piece_idx#10 )
+  [282] (byte) game_over#15 ← phi( play_move_down::@11/(byte) game_over#27 play_move_down::@3/(byte) game_over#10 )
+  [282] (byte) current_xpos#22 ← phi( play_move_down::@11/(byte) current_xpos#43 play_move_down::@3/(byte) current_xpos#122 )
+  [282] (byte*) current_piece_gfx#20 ← phi( play_move_down::@11/(byte*) current_piece_gfx#35 play_move_down::@3/(byte*) current_piece_gfx#112 )
+  [282] (byte) current_orientation#20 ← phi( play_move_down::@11/(byte) current_orientation#37 play_move_down::@3/(byte) current_orientation#13 )
+  [282] (byte) current_piece_char#16 ← phi( play_move_down::@11/(byte) current_piece_char#29 play_move_down::@3/(byte) current_piece_char#10 )
+  [282] (byte*) current_piece#15 ← phi( play_move_down::@11/(byte*) current_piece#28 play_move_down::@3/(byte*) current_piece#10 )
+  [282] (byte) level_bcd#17 ← phi( play_move_down::@11/(byte) level_bcd#31 play_move_down::@3/(byte) level_bcd#11 )
+  [282] (byte) current_movedown_slow#21 ← phi( play_move_down::@11/(byte) current_movedown_slow#37 play_move_down::@3/(byte) current_movedown_slow#14 )
+  [282] (byte) level#17 ← phi( play_move_down::@11/(byte) level#33 play_move_down::@3/(byte) level#10 )
+  [282] (dword) score_bcd#14 ← phi( play_move_down::@11/(dword) score_bcd#26 play_move_down::@3/(dword) score_bcd#18 )
+  [282] (word) lines_bcd#15 ← phi( play_move_down::@11/(word) lines_bcd#26 play_move_down::@3/(word) lines_bcd#19 )
+  [282] (byte) current_ypos#19 ← phi( play_move_down::@11/(byte) current_ypos#38 play_move_down::@3/(byte) current_ypos#11 )
+  [282] (byte) current_movedown_counter#14 ← phi( play_move_down::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 play_move_down::@3/(byte) current_movedown_counter#12 )
+  [282] (byte) play_move_down::return#3 ← phi( play_move_down::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 play_move_down::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [283] return 
   to:@return
-play_move_down::@14: scope:[play_move_down]  from play_move_down::@18
+play_move_down::@10: scope:[play_move_down]  from play_move_down::@13
   [284] (byte) current_ypos#3 ← ++ (byte) current_ypos#11
-  to:play_move_down::@15
-play_spawn_current: scope:[play_spawn_current]  from main::@29 main::@30 play_move_down::@21
-  [285] (byte) game_over#65 ← phi( main::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@30/(byte) game_over#52 play_move_down::@21/(byte) game_over#10 )
-  [285] (byte) next_piece_idx#17 ← phi( main::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@30/(byte) play_spawn_current::piece_idx#2 play_move_down::@21/(byte) next_piece_idx#10 )
+  to:play_move_down::@11
+play_spawn_current: scope:[play_spawn_current]  from main::@12 main::@13 play_move_down::@16
+  [285] (byte) game_over#65 ← phi( main::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@13/(byte) game_over#52 play_move_down::@16/(byte) game_over#10 )
+  [285] (byte) next_piece_idx#17 ← phi( main::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@13/(byte) play_spawn_current::piece_idx#2 play_move_down::@16/(byte) next_piece_idx#10 )
   [286] (byte) play_spawn_current::current_piece_idx#0 ← (byte) next_piece_idx#17
   [287] (byte~) play_spawn_current::$0 ← (byte) play_spawn_current::current_piece_idx#0 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [288] (byte) current_piece_char#5 ← *((const byte[]) PIECES_CHARS#0 + (byte) play_spawn_current::current_piece_idx#0)
@@ -10701,16 +10829,16 @@ play_spawn_current: scope:[play_spawn_current]  from main::@29 main::@30 play_mo
   [294] (byte*~) current_piece#102 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0)
   [295] call play_collision 
   [296] (byte) play_collision::return#10 ← (byte) play_collision::return#15
-  to:play_spawn_current::@9
-play_spawn_current::@9: scope:[play_spawn_current]  from play_spawn_current
+  to:play_spawn_current::@4
+play_spawn_current::@4: scope:[play_spawn_current]  from play_spawn_current
   [297] (byte~) play_spawn_current::$2 ← (byte) play_collision::return#10
-  [298] if((byte~) play_spawn_current::$2!=(const byte) COLLISION_PLAYFIELD#0) goto play_spawn_current::@11
+  [298] if((byte~) play_spawn_current::$2!=(const byte) COLLISION_PLAYFIELD#0) goto play_spawn_current::@6
   to:play_spawn_current::@1
-play_spawn_current::@1: scope:[play_spawn_current]  from play_spawn_current::@11 play_spawn_current::@9
-  [299] (byte) game_over#52 ← phi( play_spawn_current::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 play_spawn_current::@11/(byte) game_over#65 )
+play_spawn_current::@1: scope:[play_spawn_current]  from play_spawn_current::@4 play_spawn_current::@6
+  [299] (byte) game_over#52 ← phi( play_spawn_current::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 play_spawn_current::@6/(byte) game_over#65 )
   to:play_spawn_current::@2
-play_spawn_current::@2: scope:[play_spawn_current]  from play_spawn_current::@1 play_spawn_current::@10
-  [300] (byte) play_spawn_current::piece_idx#2 ← phi( play_spawn_current::@1/(byte/signed byte/word/signed word/dword/signed dword) 7 play_spawn_current::@10/(byte) play_spawn_current::piece_idx#1 )
+play_spawn_current::@2: scope:[play_spawn_current]  from play_spawn_current::@1 play_spawn_current::@5
+  [300] (byte) play_spawn_current::piece_idx#2 ← phi( play_spawn_current::@1/(byte/signed byte/word/signed word/dword/signed dword) 7 play_spawn_current::@5/(byte) play_spawn_current::piece_idx#1 )
   [301] if((byte) play_spawn_current::piece_idx#2==(byte/signed byte/word/signed word/dword/signed dword) 7) goto play_spawn_current::@3
   to:play_spawn_current::@return
 play_spawn_current::@return: scope:[play_spawn_current]  from play_spawn_current::@2
@@ -10720,12 +10848,12 @@ play_spawn_current::@3: scope:[play_spawn_current]  from play_spawn_current::@2
   [303] phi()
   [304] call sid_rnd 
   [305] (byte) sid_rnd::return#2 ← (byte) sid_rnd::return#0
-  to:play_spawn_current::@10
-play_spawn_current::@10: scope:[play_spawn_current]  from play_spawn_current::@3
+  to:play_spawn_current::@5
+play_spawn_current::@5: scope:[play_spawn_current]  from play_spawn_current::@3
   [306] (byte~) play_spawn_current::$6 ← (byte) sid_rnd::return#2
   [307] (byte) play_spawn_current::piece_idx#1 ← (byte~) play_spawn_current::$6 & (byte/signed byte/word/signed word/dword/signed dword) 7
   to:play_spawn_current::@2
-play_spawn_current::@11: scope:[play_spawn_current]  from play_spawn_current::@9
+play_spawn_current::@6: scope:[play_spawn_current]  from play_spawn_current::@4
   [308] phi()
   to:play_spawn_current::@1
 sid_rnd: scope:[sid_rnd]  from play_spawn_current::@3
@@ -10734,10 +10862,10 @@ sid_rnd: scope:[sid_rnd]  from play_spawn_current::@3
 sid_rnd::@return: scope:[sid_rnd]  from sid_rnd
   [310] return 
   to:@return
-play_update_score: scope:[play_update_score]  from play_move_down::@20
+play_update_score: scope:[play_update_score]  from play_move_down::@15
   [311] if((byte) play_update_score::removed#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_update_score::@return
-  to:play_update_score::@2
-play_update_score::@2: scope:[play_update_score]  from play_update_score
+  to:play_update_score::@1
+play_update_score::@1: scope:[play_update_score]  from play_update_score
   [312] (byte~) play_update_score::$2 ← < (word) lines_bcd#19
   [313] (byte) play_update_score::lines_before#0 ← (byte~) play_update_score::$2 & (byte/word/signed word/dword/signed dword) $f0
   [314] (byte~) play_update_score::$4 ← (byte) play_update_score::removed#0 << (byte/signed byte/word/signed word/dword/signed dword) 2
@@ -10749,92 +10877,92 @@ play_update_score::@2: scope:[play_update_score]  from play_update_score
   [320] (byte~) play_update_score::$5 ← < (word) lines_bcd#30
   [321] (byte) play_update_score::lines_after#0 ← (byte~) play_update_score::$5 & (byte/word/signed word/dword/signed dword) $f0
   [322] if((byte) play_update_score::lines_before#0==(byte) play_update_score::lines_after#0) goto play_update_score::@return
-  to:play_update_score::@3
-play_update_score::@3: scope:[play_update_score]  from play_update_score::@2
+  to:play_update_score::@2
+play_update_score::@2: scope:[play_update_score]  from play_update_score::@1
   [323] phi()
   [324] call play_increase_level 
   to:play_update_score::@return
-play_update_score::@return: scope:[play_update_score]  from play_update_score play_update_score::@2 play_update_score::@3
-  [325] (byte) level_bcd#19 ← phi( play_update_score/(byte) level_bcd#11 play_update_score::@2/(byte) level_bcd#11 play_update_score::@3/(byte) level_bcd#64 )
-  [325] (byte) current_movedown_slow#23 ← phi( play_update_score/(byte) current_movedown_slow#14 play_update_score::@2/(byte) current_movedown_slow#14 play_update_score::@3/(byte) current_movedown_slow#69 )
-  [325] (byte) level#19 ← phi( play_update_score/(byte) level#10 play_update_score::@2/(byte) level#10 play_update_score::@3/(byte) level#21 )
-  [325] (dword) score_bcd#16 ← phi( play_update_score/(dword) score_bcd#18 play_update_score::@2/(dword) score_bcd#30 play_update_score::@3/(dword) score_bcd#30 )
-  [325] (word) lines_bcd#17 ← phi( play_update_score/(word) lines_bcd#19 play_update_score::@2/(word) lines_bcd#30 play_update_score::@3/(word) lines_bcd#30 )
+play_update_score::@return: scope:[play_update_score]  from play_update_score play_update_score::@1 play_update_score::@2
+  [325] (byte) level_bcd#19 ← phi( play_update_score/(byte) level_bcd#11 play_update_score::@1/(byte) level_bcd#11 play_update_score::@2/(byte) level_bcd#64 )
+  [325] (byte) current_movedown_slow#23 ← phi( play_update_score/(byte) current_movedown_slow#14 play_update_score::@1/(byte) current_movedown_slow#14 play_update_score::@2/(byte) current_movedown_slow#69 )
+  [325] (byte) level#19 ← phi( play_update_score/(byte) level#10 play_update_score::@1/(byte) level#10 play_update_score::@2/(byte) level#21 )
+  [325] (dword) score_bcd#16 ← phi( play_update_score/(dword) score_bcd#18 play_update_score::@1/(dword) score_bcd#30 play_update_score::@2/(dword) score_bcd#30 )
+  [325] (word) lines_bcd#17 ← phi( play_update_score/(word) lines_bcd#19 play_update_score::@1/(word) lines_bcd#30 play_update_score::@2/(word) lines_bcd#30 )
   [326] return 
   to:@return
-play_increase_level: scope:[play_increase_level]  from play_update_score::@3
+play_increase_level: scope:[play_increase_level]  from play_update_score::@2
   [327] (byte) level#21 ← ++ (byte) level#10
-  [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@2
-  to:play_increase_level::@4
-play_increase_level::@4: scope:[play_increase_level]  from play_increase_level
+  [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@1
+  to:play_increase_level::@3
+play_increase_level::@3: scope:[play_increase_level]  from play_increase_level
   [329] (byte) current_movedown_slow#10 ← *((const byte[]) MOVEDOWN_SLOW_SPEEDS#0 + (byte) level#21)
-  to:play_increase_level::@2
-play_increase_level::@2: scope:[play_increase_level]  from play_increase_level play_increase_level::@4
-  [330] (byte) current_movedown_slow#69 ← phi( play_increase_level/(byte/signed byte/word/signed word/dword/signed dword) 1 play_increase_level::@4/(byte) current_movedown_slow#10 )
+  to:play_increase_level::@1
+play_increase_level::@1: scope:[play_increase_level]  from play_increase_level play_increase_level::@3
+  [330] (byte) current_movedown_slow#69 ← phi( play_increase_level/(byte/signed byte/word/signed word/dword/signed dword) 1 play_increase_level::@3/(byte) current_movedown_slow#10 )
   [331] (byte) level_bcd#21 ← ++ (byte) level_bcd#11
   [332] (byte~) play_increase_level::$1 ← (byte) level_bcd#21 & (byte/signed byte/word/signed word/dword/signed dword) $f
-  [333] if((byte~) play_increase_level::$1!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto play_increase_level::@3
-  to:play_increase_level::@6
-play_increase_level::@6: scope:[play_increase_level]  from play_increase_level::@2
+  [333] if((byte~) play_increase_level::$1!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto play_increase_level::@2
+  to:play_increase_level::@4
+play_increase_level::@4: scope:[play_increase_level]  from play_increase_level::@1
   [334] (byte) level_bcd#8 ← (byte) level_bcd#21 + (byte/signed byte/word/signed word/dword/signed dword) 6
-  to:play_increase_level::@3
-play_increase_level::@3: scope:[play_increase_level]  from play_increase_level::@2 play_increase_level::@6
-  [335] (byte) level_bcd#64 ← phi( play_increase_level::@2/(byte) level_bcd#21 play_increase_level::@6/(byte) level_bcd#8 )
+  to:play_increase_level::@2
+play_increase_level::@2: scope:[play_increase_level]  from play_increase_level::@1 play_increase_level::@4
+  [335] (byte) level_bcd#64 ← phi( play_increase_level::@1/(byte) level_bcd#21 play_increase_level::@4/(byte) level_bcd#8 )
   asm { sed  }
-  to:play_increase_level::@7
-play_increase_level::@7: scope:[play_increase_level]  from play_increase_level::@3 play_increase_level::@7
-  [337] (byte) play_increase_level::b#2 ← phi( play_increase_level::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 play_increase_level::@7/(byte) play_increase_level::b#1 )
+  to:play_increase_level::@5
+play_increase_level::@5: scope:[play_increase_level]  from play_increase_level::@2 play_increase_level::@5
+  [337] (byte) play_increase_level::b#2 ← phi( play_increase_level::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 play_increase_level::@5/(byte) play_increase_level::b#1 )
   [338] (byte) play_increase_level::b4#0 ← (byte) play_increase_level::b#2 << (byte/signed byte/word/signed word/dword/signed dword) 2
   [339] *((const dword[5]) score_add_bcd#0 + (byte) play_increase_level::b4#0) ← *((const dword[5]) score_add_bcd#0 + (byte) play_increase_level::b4#0) + *((const dword[]) SCORE_BASE_BCD#0 + (byte) play_increase_level::b4#0)
   [340] (byte) play_increase_level::b#1 ← ++ (byte) play_increase_level::b#2
-  [341] if((byte) play_increase_level::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto play_increase_level::@7
-  to:play_increase_level::@8
-play_increase_level::@8: scope:[play_increase_level]  from play_increase_level::@7
+  [341] if((byte) play_increase_level::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto play_increase_level::@5
+  to:play_increase_level::@6
+play_increase_level::@6: scope:[play_increase_level]  from play_increase_level::@5
   asm { cld  }
   to:play_increase_level::@return
-play_increase_level::@return: scope:[play_increase_level]  from play_increase_level::@8
+play_increase_level::@return: scope:[play_increase_level]  from play_increase_level::@6
   [343] return 
   to:@return
-play_remove_lines: scope:[play_remove_lines]  from play_move_down::@19
+play_remove_lines: scope:[play_remove_lines]  from play_move_down::@14
   [344] phi()
-  to:play_remove_lines::@8
-play_remove_lines::@8: scope:[play_remove_lines]  from play_remove_lines play_remove_lines::@14
-  [345] (byte) play_remove_lines::removed#11 ← phi( play_remove_lines/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@14/(byte) play_remove_lines::removed#7 )
-  [345] (byte) play_remove_lines::y#8 ← phi( play_remove_lines/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@14/(byte) play_remove_lines::y#1 )
-  [345] (byte) play_remove_lines::w#12 ← phi( play_remove_lines/(const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 play_remove_lines::@14/(byte) play_remove_lines::w#11 )
-  [345] (byte) play_remove_lines::r#4 ← phi( play_remove_lines/(const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 play_remove_lines::@14/(byte) play_remove_lines::r#1 )
-  to:play_remove_lines::@9
-play_remove_lines::@9: scope:[play_remove_lines]  from play_remove_lines::@10 play_remove_lines::@8
-  [346] (byte) play_remove_lines::full#4 ← phi( play_remove_lines::@10/(byte) play_remove_lines::full#2 play_remove_lines::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [346] (byte) play_remove_lines::x#2 ← phi( play_remove_lines::@10/(byte) play_remove_lines::x#1 play_remove_lines::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [346] (byte) play_remove_lines::w#4 ← phi( play_remove_lines::@10/(byte) play_remove_lines::w#1 play_remove_lines::@8/(byte) play_remove_lines::w#12 )
-  [346] (byte) play_remove_lines::r#2 ← phi( play_remove_lines::@10/(byte) play_remove_lines::r#1 play_remove_lines::@8/(byte) play_remove_lines::r#4 )
+  to:play_remove_lines::@3
+play_remove_lines::@3: scope:[play_remove_lines]  from play_remove_lines play_remove_lines::@8
+  [345] (byte) play_remove_lines::removed#11 ← phi( play_remove_lines/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@8/(byte) play_remove_lines::removed#7 )
+  [345] (byte) play_remove_lines::y#8 ← phi( play_remove_lines/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@8/(byte) play_remove_lines::y#1 )
+  [345] (byte) play_remove_lines::w#12 ← phi( play_remove_lines/(const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 play_remove_lines::@8/(byte) play_remove_lines::w#11 )
+  [345] (byte) play_remove_lines::r#4 ← phi( play_remove_lines/(const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 play_remove_lines::@8/(byte) play_remove_lines::r#1 )
+  to:play_remove_lines::@4
+play_remove_lines::@4: scope:[play_remove_lines]  from play_remove_lines::@3 play_remove_lines::@5
+  [346] (byte) play_remove_lines::full#4 ← phi( play_remove_lines::@5/(byte) play_remove_lines::full#2 play_remove_lines::@3/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [346] (byte) play_remove_lines::x#2 ← phi( play_remove_lines::@5/(byte) play_remove_lines::x#1 play_remove_lines::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [346] (byte) play_remove_lines::w#4 ← phi( play_remove_lines::@5/(byte) play_remove_lines::w#1 play_remove_lines::@3/(byte) play_remove_lines::w#12 )
+  [346] (byte) play_remove_lines::r#2 ← phi( play_remove_lines::@5/(byte) play_remove_lines::r#1 play_remove_lines::@3/(byte) play_remove_lines::r#4 )
   [347] (byte) play_remove_lines::c#0 ← *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::r#2)
   [348] (byte) play_remove_lines::r#1 ← -- (byte) play_remove_lines::r#2
-  [349] if((byte) play_remove_lines::c#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_remove_lines::@18
-  to:play_remove_lines::@10
-play_remove_lines::@10: scope:[play_remove_lines]  from play_remove_lines::@18 play_remove_lines::@9
-  [350] (byte) play_remove_lines::full#2 ← phi( play_remove_lines::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@18/(byte) play_remove_lines::full#4 )
+  [349] if((byte) play_remove_lines::c#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_remove_lines::@9
+  to:play_remove_lines::@5
+play_remove_lines::@5: scope:[play_remove_lines]  from play_remove_lines::@4 play_remove_lines::@9
+  [350] (byte) play_remove_lines::full#2 ← phi( play_remove_lines::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 play_remove_lines::@9/(byte) play_remove_lines::full#4 )
   [351] *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::w#4) ← (byte) play_remove_lines::c#0
   [352] (byte) play_remove_lines::w#1 ← -- (byte) play_remove_lines::w#4
   [353] (byte) play_remove_lines::x#1 ← ++ (byte) play_remove_lines::x#2
-  [354] if((byte) play_remove_lines::x#1!=(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@9
-  to:play_remove_lines::@12
-play_remove_lines::@12: scope:[play_remove_lines]  from play_remove_lines::@10
-  [355] if((byte) play_remove_lines::full#2!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@14
-  to:play_remove_lines::@13
-play_remove_lines::@13: scope:[play_remove_lines]  from play_remove_lines::@12
+  [354] if((byte) play_remove_lines::x#1!=(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@4
+  to:play_remove_lines::@6
+play_remove_lines::@6: scope:[play_remove_lines]  from play_remove_lines::@5
+  [355] if((byte) play_remove_lines::full#2!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@8
+  to:play_remove_lines::@7
+play_remove_lines::@7: scope:[play_remove_lines]  from play_remove_lines::@6
   [356] (byte) play_remove_lines::w#2 ← (byte) play_remove_lines::w#1 + (const byte) PLAYFIELD_COLS#0
   [357] (byte) play_remove_lines::removed#1 ← ++ (byte) play_remove_lines::removed#11
-  to:play_remove_lines::@14
-play_remove_lines::@14: scope:[play_remove_lines]  from play_remove_lines::@12 play_remove_lines::@13
-  [358] (byte) play_remove_lines::removed#7 ← phi( play_remove_lines::@12/(byte) play_remove_lines::removed#11 play_remove_lines::@13/(byte) play_remove_lines::removed#1 )
-  [358] (byte) play_remove_lines::w#11 ← phi( play_remove_lines::@12/(byte) play_remove_lines::w#1 play_remove_lines::@13/(byte) play_remove_lines::w#2 )
+  to:play_remove_lines::@8
+play_remove_lines::@8: scope:[play_remove_lines]  from play_remove_lines::@6 play_remove_lines::@7
+  [358] (byte) play_remove_lines::removed#7 ← phi( play_remove_lines::@6/(byte) play_remove_lines::removed#11 play_remove_lines::@7/(byte) play_remove_lines::removed#1 )
+  [358] (byte) play_remove_lines::w#11 ← phi( play_remove_lines::@6/(byte) play_remove_lines::w#1 play_remove_lines::@7/(byte) play_remove_lines::w#2 )
   [359] (byte) play_remove_lines::y#1 ← ++ (byte) play_remove_lines::y#8
-  [360] if((byte) play_remove_lines::y#1!=(const byte) PLAYFIELD_LINES#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@8
+  [360] if((byte) play_remove_lines::y#1!=(const byte) PLAYFIELD_LINES#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@3
   to:play_remove_lines::@1
-play_remove_lines::@1: scope:[play_remove_lines]  from play_remove_lines::@14 play_remove_lines::@2
-  [361] (byte) play_remove_lines::w#6 ← phi( play_remove_lines::@14/(byte) play_remove_lines::w#11 play_remove_lines::@2/(byte) play_remove_lines::w#3 )
+play_remove_lines::@1: scope:[play_remove_lines]  from play_remove_lines::@2 play_remove_lines::@8
+  [361] (byte) play_remove_lines::w#6 ← phi( play_remove_lines::@8/(byte) play_remove_lines::w#11 play_remove_lines::@2/(byte) play_remove_lines::w#3 )
   [362] if((byte) play_remove_lines::w#6!=(byte/word/signed word/dword/signed dword) $ff) goto play_remove_lines::@2
   to:play_remove_lines::@return
 play_remove_lines::@return: scope:[play_remove_lines]  from play_remove_lines::@1
@@ -10844,23 +10972,23 @@ play_remove_lines::@2: scope:[play_remove_lines]  from play_remove_lines::@1
   [364] *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::w#6) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [365] (byte) play_remove_lines::w#3 ← -- (byte) play_remove_lines::w#6
   to:play_remove_lines::@1
-play_remove_lines::@18: scope:[play_remove_lines]  from play_remove_lines::@9
+play_remove_lines::@9: scope:[play_remove_lines]  from play_remove_lines::@4
   [366] phi()
-  to:play_remove_lines::@10
-play_lock_current: scope:[play_lock_current]  from play_move_down::@10
+  to:play_remove_lines::@5
+play_lock_current: scope:[play_lock_current]  from play_move_down::@9
   [367] (byte) play_lock_current::ypos2#0 ← (byte) current_ypos#11 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:play_lock_current::@1
-play_lock_current::@1: scope:[play_lock_current]  from play_lock_current play_lock_current::@7
-  [368] (byte) play_lock_current::l#6 ← phi( play_lock_current/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@7/(byte) play_lock_current::l#1 )
-  [368] (byte) play_lock_current::i#3 ← phi( play_lock_current/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@7/(byte~) play_lock_current::i#7 )
-  [368] (byte) play_lock_current::ypos2#2 ← phi( play_lock_current/(byte) play_lock_current::ypos2#0 play_lock_current::@7/(byte) play_lock_current::ypos2#1 )
+play_lock_current::@1: scope:[play_lock_current]  from play_lock_current play_lock_current::@6
+  [368] (byte) play_lock_current::l#6 ← phi( play_lock_current/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@6/(byte) play_lock_current::l#1 )
+  [368] (byte) play_lock_current::i#3 ← phi( play_lock_current/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@6/(byte~) play_lock_current::i#7 )
+  [368] (byte) play_lock_current::ypos2#2 ← phi( play_lock_current/(byte) play_lock_current::ypos2#0 play_lock_current::@6/(byte) play_lock_current::ypos2#1 )
   [369] (byte*) play_lock_current::playfield_line#0 ← *((const byte*[PLAYFIELD_LINES#0]) playfield_lines#0 + (byte) play_lock_current::ypos2#2)
   [370] (byte) play_lock_current::col#0 ← (byte) current_xpos#122
   to:play_lock_current::@2
-play_lock_current::@2: scope:[play_lock_current]  from play_lock_current::@1 play_lock_current::@8
-  [371] (byte) play_lock_current::c#2 ← phi( play_lock_current::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@8/(byte) play_lock_current::c#1 )
-  [371] (byte) play_lock_current::col#2 ← phi( play_lock_current::@1/(byte) play_lock_current::col#0 play_lock_current::@8/(byte) play_lock_current::col#1 )
-  [371] (byte) play_lock_current::i#2 ← phi( play_lock_current::@1/(byte) play_lock_current::i#3 play_lock_current::@8/(byte~) play_lock_current::i#9 )
+play_lock_current::@2: scope:[play_lock_current]  from play_lock_current::@1 play_lock_current::@7
+  [371] (byte) play_lock_current::c#2 ← phi( play_lock_current::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 play_lock_current::@7/(byte) play_lock_current::c#1 )
+  [371] (byte) play_lock_current::col#2 ← phi( play_lock_current::@1/(byte) play_lock_current::col#0 play_lock_current::@7/(byte) play_lock_current::col#1 )
+  [371] (byte) play_lock_current::i#2 ← phi( play_lock_current::@1/(byte) play_lock_current::i#3 play_lock_current::@7/(byte~) play_lock_current::i#9 )
   [372] (byte) play_lock_current::i#1 ← ++ (byte) play_lock_current::i#2
   [373] if(*((byte*) current_piece_gfx#112 + (byte) play_lock_current::i#2)==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_lock_current::@3
   to:play_lock_current::@4
@@ -10870,24 +10998,24 @@ play_lock_current::@4: scope:[play_lock_current]  from play_lock_current::@2
 play_lock_current::@3: scope:[play_lock_current]  from play_lock_current::@2 play_lock_current::@4
   [375] (byte) play_lock_current::col#1 ← ++ (byte) play_lock_current::col#2
   [376] (byte) play_lock_current::c#1 ← ++ (byte) play_lock_current::c#2
-  [377] if((byte) play_lock_current::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@8
+  [377] if((byte) play_lock_current::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@7
   to:play_lock_current::@5
 play_lock_current::@5: scope:[play_lock_current]  from play_lock_current::@3
   [378] (byte) play_lock_current::ypos2#1 ← (byte) play_lock_current::ypos2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [379] (byte) play_lock_current::l#1 ← ++ (byte) play_lock_current::l#6
-  [380] if((byte) play_lock_current::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@7
+  [380] if((byte) play_lock_current::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@6
   to:play_lock_current::@return
 play_lock_current::@return: scope:[play_lock_current]  from play_lock_current::@5
   [381] return 
   to:@return
-play_lock_current::@7: scope:[play_lock_current]  from play_lock_current::@5
+play_lock_current::@6: scope:[play_lock_current]  from play_lock_current::@5
   [382] (byte~) play_lock_current::i#7 ← (byte) play_lock_current::i#1
   to:play_lock_current::@1
-play_lock_current::@8: scope:[play_lock_current]  from play_lock_current::@3
+play_lock_current::@7: scope:[play_lock_current]  from play_lock_current::@3
   [383] (byte~) play_lock_current::i#9 ← (byte) play_lock_current::i#1
   to:play_lock_current::@2
-keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan::@1 keyboard_event_scan::@2 keyboard_event_scan::@23 keyboard_event_scan::@3 play_move_down::@1
-  [384] (byte) keyboard_event_pressed::keycode#5 ← phi( keyboard_event_scan::@1/(const byte) KEY_RSHIFT#0 keyboard_event_scan::@2/(const byte) KEY_CTRL#0 keyboard_event_scan::@23/(const byte) KEY_LSHIFT#0 keyboard_event_scan::@3/(const byte) KEY_COMMODORE#0 play_move_down::@1/(const byte) KEY_SPACE#0 )
+keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan::@1 keyboard_event_scan::@17 keyboard_event_scan::@2 keyboard_event_scan::@3 play_move_down::@1
+  [384] (byte) keyboard_event_pressed::keycode#5 ← phi( keyboard_event_scan::@1/(const byte) KEY_RSHIFT#0 keyboard_event_scan::@2/(const byte) KEY_CTRL#0 keyboard_event_scan::@17/(const byte) KEY_LSHIFT#0 keyboard_event_scan::@3/(const byte) KEY_COMMODORE#0 play_move_down::@1/(const byte) KEY_SPACE#0 )
   [385] (byte~) keyboard_event_pressed::$0 ← (byte) keyboard_event_pressed::keycode#5 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [386] (byte) keyboard_event_pressed::row_bits#0 ← *((const byte[8]) keyboard_scan_values#0 + (byte~) keyboard_event_pressed::$0)
   [387] (byte~) keyboard_event_pressed::$1 ← (byte) keyboard_event_pressed::keycode#5 & (byte/signed byte/word/signed word/dword/signed dword) 7
@@ -10896,153 +11024,153 @@ keyboard_event_pressed: scope:[keyboard_event_pressed]  from keyboard_event_scan
 keyboard_event_pressed::@return: scope:[keyboard_event_pressed]  from keyboard_event_pressed
   [389] return 
   to:@return
-keyboard_event_get: scope:[keyboard_event_get]  from main::@36
+keyboard_event_get: scope:[keyboard_event_get]  from main::@18
   [390] if((byte) keyboard_events_size#13==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_get::@return
-  to:keyboard_event_get::@3
-keyboard_event_get::@3: scope:[keyboard_event_get]  from keyboard_event_get
+  to:keyboard_event_get::@1
+keyboard_event_get::@1: scope:[keyboard_event_get]  from keyboard_event_get
   [391] (byte) keyboard_events_size#4 ← -- (byte) keyboard_events_size#13
   [392] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4)
   to:keyboard_event_get::@return
-keyboard_event_get::@return: scope:[keyboard_event_get]  from keyboard_event_get keyboard_event_get::@3
-  [393] (byte) keyboard_events_size#16 ← phi( keyboard_event_get/(byte) keyboard_events_size#13 keyboard_event_get::@3/(byte) keyboard_events_size#4 )
-  [393] (byte) keyboard_event_get::return#2 ← phi( keyboard_event_get/(byte/word/signed word/dword/signed dword) $ff keyboard_event_get::@3/(byte) keyboard_event_get::return#1 )
+keyboard_event_get::@return: scope:[keyboard_event_get]  from keyboard_event_get keyboard_event_get::@1
+  [393] (byte) keyboard_events_size#16 ← phi( keyboard_event_get/(byte) keyboard_events_size#13 keyboard_event_get::@1/(byte) keyboard_events_size#4 )
+  [393] (byte) keyboard_event_get::return#2 ← phi( keyboard_event_get/(byte/word/signed word/dword/signed dword) $ff keyboard_event_get::@1/(byte) keyboard_event_get::return#1 )
   [394] return 
   to:@return
-keyboard_event_scan: scope:[keyboard_event_scan]  from main::@35
+keyboard_event_scan: scope:[keyboard_event_scan]  from main::@17
   [395] phi()
-  to:keyboard_event_scan::@8
-keyboard_event_scan::@8: scope:[keyboard_event_scan]  from keyboard_event_scan keyboard_event_scan::@10
-  [396] (byte) keyboard_events_size#30 ← phi( keyboard_event_scan/(byte) keyboard_events_size#19 keyboard_event_scan::@10/(byte) keyboard_events_size#13 )
-  [396] (byte) keyboard_event_scan::keycode#11 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@10/(byte) keyboard_event_scan::keycode#14 )
-  [396] (byte) keyboard_event_scan::row#2 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@10/(byte) keyboard_event_scan::row#1 )
+  to:keyboard_event_scan::@7
+keyboard_event_scan::@7: scope:[keyboard_event_scan]  from keyboard_event_scan keyboard_event_scan::@8
+  [396] (byte) keyboard_events_size#30 ← phi( keyboard_event_scan/(byte) keyboard_events_size#19 keyboard_event_scan::@8/(byte) keyboard_events_size#13 )
+  [396] (byte) keyboard_event_scan::keycode#11 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@8/(byte) keyboard_event_scan::keycode#14 )
+  [396] (byte) keyboard_event_scan::row#2 ← phi( keyboard_event_scan/(byte/signed byte/word/signed word/dword/signed dword) 0 keyboard_event_scan::@8/(byte) keyboard_event_scan::row#1 )
   [397] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_event_scan::row#2
   [398] call keyboard_matrix_read 
   [399] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_event_scan::@25
-keyboard_event_scan::@25: scope:[keyboard_event_scan]  from keyboard_event_scan::@8
+  to:keyboard_event_scan::@19
+keyboard_event_scan::@19: scope:[keyboard_event_scan]  from keyboard_event_scan::@7
   [400] (byte) keyboard_event_scan::row_scan#0 ← (byte) keyboard_matrix_read::return#2
-  [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11
-  to:keyboard_event_scan::@21
-keyboard_event_scan::@21: scope:[keyboard_event_scan]  from keyboard_event_scan::@25
+  [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9
+  to:keyboard_event_scan::@16
+keyboard_event_scan::@16: scope:[keyboard_event_scan]  from keyboard_event_scan::@19
   [402] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8
-  to:keyboard_event_scan::@10
-keyboard_event_scan::@10: scope:[keyboard_event_scan]  from keyboard_event_scan::@20 keyboard_event_scan::@21
-  [403] (byte) keyboard_events_size#13 ← phi( keyboard_event_scan::@20/(byte) keyboard_events_size#29 keyboard_event_scan::@21/(byte) keyboard_events_size#30 )
-  [403] (byte) keyboard_event_scan::keycode#14 ← phi( keyboard_event_scan::@20/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@21/(byte) keyboard_event_scan::keycode#1 )
+  to:keyboard_event_scan::@8
+keyboard_event_scan::@8: scope:[keyboard_event_scan]  from keyboard_event_scan::@15 keyboard_event_scan::@16
+  [403] (byte) keyboard_events_size#13 ← phi( keyboard_event_scan::@15/(byte) keyboard_events_size#29 keyboard_event_scan::@16/(byte) keyboard_events_size#30 )
+  [403] (byte) keyboard_event_scan::keycode#14 ← phi( keyboard_event_scan::@15/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@16/(byte) keyboard_event_scan::keycode#1 )
   [404] (byte) keyboard_event_scan::row#1 ← ++ (byte) keyboard_event_scan::row#2
-  [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8
-  to:keyboard_event_scan::@23
-keyboard_event_scan::@23: scope:[keyboard_event_scan]  from keyboard_event_scan::@10
+  [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7
+  to:keyboard_event_scan::@17
+keyboard_event_scan::@17: scope:[keyboard_event_scan]  from keyboard_event_scan::@8
   [406] phi()
   [407] call keyboard_event_pressed 
   [408] (byte) keyboard_event_pressed::return#0 ← (byte) keyboard_event_pressed::return#11
-  to:keyboard_event_scan::@26
-keyboard_event_scan::@26: scope:[keyboard_event_scan]  from keyboard_event_scan::@23
+  to:keyboard_event_scan::@20
+keyboard_event_scan::@20: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
   [409] (byte~) keyboard_event_scan::$0 ← (byte) keyboard_event_pressed::return#0
   [410] if((byte~) keyboard_event_scan::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@1
-  to:keyboard_event_scan::@24
-keyboard_event_scan::@24: scope:[keyboard_event_scan]  from keyboard_event_scan::@26
+  to:keyboard_event_scan::@18
+keyboard_event_scan::@18: scope:[keyboard_event_scan]  from keyboard_event_scan::@20
   [411] phi()
   to:keyboard_event_scan::@1
-keyboard_event_scan::@1: scope:[keyboard_event_scan]  from keyboard_event_scan::@24 keyboard_event_scan::@26
-  [412] (byte) keyboard_modifiers#11 ← phi( keyboard_event_scan::@24/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 keyboard_event_scan::@26/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+keyboard_event_scan::@1: scope:[keyboard_event_scan]  from keyboard_event_scan::@18 keyboard_event_scan::@20
+  [412] (byte) keyboard_modifiers#11 ← phi( keyboard_event_scan::@18/(byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 keyboard_event_scan::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [413] call keyboard_event_pressed 
   [414] (byte) keyboard_event_pressed::return#1 ← (byte) keyboard_event_pressed::return#11
-  to:keyboard_event_scan::@27
-keyboard_event_scan::@27: scope:[keyboard_event_scan]  from keyboard_event_scan::@1
+  to:keyboard_event_scan::@21
+keyboard_event_scan::@21: scope:[keyboard_event_scan]  from keyboard_event_scan::@1
   [415] (byte~) keyboard_event_scan::$3 ← (byte) keyboard_event_pressed::return#1
   [416] if((byte~) keyboard_event_scan::$3==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@2
-  to:keyboard_event_scan::@5
-keyboard_event_scan::@5: scope:[keyboard_event_scan]  from keyboard_event_scan::@27
+  to:keyboard_event_scan::@4
+keyboard_event_scan::@4: scope:[keyboard_event_scan]  from keyboard_event_scan::@21
   [417] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#11 | (const byte) KEY_MODIFIER_RSHIFT#0
   to:keyboard_event_scan::@2
-keyboard_event_scan::@2: scope:[keyboard_event_scan]  from keyboard_event_scan::@27 keyboard_event_scan::@5
-  [418] (byte) keyboard_modifiers#12 ← phi( keyboard_event_scan::@27/(byte) keyboard_modifiers#11 keyboard_event_scan::@5/(byte) keyboard_modifiers#3 )
+keyboard_event_scan::@2: scope:[keyboard_event_scan]  from keyboard_event_scan::@21 keyboard_event_scan::@4
+  [418] (byte) keyboard_modifiers#12 ← phi( keyboard_event_scan::@21/(byte) keyboard_modifiers#11 keyboard_event_scan::@4/(byte) keyboard_modifiers#3 )
   [419] call keyboard_event_pressed 
   [420] (byte) keyboard_event_pressed::return#2 ← (byte) keyboard_event_pressed::return#11
-  to:keyboard_event_scan::@28
-keyboard_event_scan::@28: scope:[keyboard_event_scan]  from keyboard_event_scan::@2
+  to:keyboard_event_scan::@22
+keyboard_event_scan::@22: scope:[keyboard_event_scan]  from keyboard_event_scan::@2
   [421] (byte~) keyboard_event_scan::$6 ← (byte) keyboard_event_pressed::return#2
   [422] if((byte~) keyboard_event_scan::$6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@3
-  to:keyboard_event_scan::@6
-keyboard_event_scan::@6: scope:[keyboard_event_scan]  from keyboard_event_scan::@28
+  to:keyboard_event_scan::@5
+keyboard_event_scan::@5: scope:[keyboard_event_scan]  from keyboard_event_scan::@22
   [423] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#12 | (const byte) KEY_MODIFIER_CTRL#0
   to:keyboard_event_scan::@3
-keyboard_event_scan::@3: scope:[keyboard_event_scan]  from keyboard_event_scan::@28 keyboard_event_scan::@6
-  [424] (byte) keyboard_modifiers#13 ← phi( keyboard_event_scan::@28/(byte) keyboard_modifiers#12 keyboard_event_scan::@6/(byte) keyboard_modifiers#4 )
+keyboard_event_scan::@3: scope:[keyboard_event_scan]  from keyboard_event_scan::@22 keyboard_event_scan::@5
+  [424] (byte) keyboard_modifiers#13 ← phi( keyboard_event_scan::@22/(byte) keyboard_modifiers#12 keyboard_event_scan::@5/(byte) keyboard_modifiers#4 )
   [425] call keyboard_event_pressed 
   [426] (byte) keyboard_event_pressed::return#10 ← (byte) keyboard_event_pressed::return#11
-  to:keyboard_event_scan::@29
-keyboard_event_scan::@29: scope:[keyboard_event_scan]  from keyboard_event_scan::@3
+  to:keyboard_event_scan::@23
+keyboard_event_scan::@23: scope:[keyboard_event_scan]  from keyboard_event_scan::@3
   [427] (byte~) keyboard_event_scan::$9 ← (byte) keyboard_event_pressed::return#10
   [428] if((byte~) keyboard_event_scan::$9==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@return
-  to:keyboard_event_scan::@7
-keyboard_event_scan::@7: scope:[keyboard_event_scan]  from keyboard_event_scan::@29
+  to:keyboard_event_scan::@6
+keyboard_event_scan::@6: scope:[keyboard_event_scan]  from keyboard_event_scan::@23
   [429] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#13 | (const byte) KEY_MODIFIER_COMMODORE#0
   to:keyboard_event_scan::@return
-keyboard_event_scan::@return: scope:[keyboard_event_scan]  from keyboard_event_scan::@29 keyboard_event_scan::@7
+keyboard_event_scan::@return: scope:[keyboard_event_scan]  from keyboard_event_scan::@23 keyboard_event_scan::@6
   [430] return 
   to:@return
-keyboard_event_scan::@11: scope:[keyboard_event_scan]  from keyboard_event_scan::@12 keyboard_event_scan::@25
-  [431] (byte) keyboard_events_size#10 ← phi( keyboard_event_scan::@12/(byte) keyboard_events_size#29 keyboard_event_scan::@25/(byte) keyboard_events_size#30 )
-  [431] (byte) keyboard_event_scan::keycode#10 ← phi( keyboard_event_scan::@12/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@25/(byte) keyboard_event_scan::keycode#11 )
-  [431] (byte) keyboard_event_scan::col#2 ← phi( keyboard_event_scan::@12/(byte) keyboard_event_scan::col#1 keyboard_event_scan::@25/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+keyboard_event_scan::@9: scope:[keyboard_event_scan]  from keyboard_event_scan::@10 keyboard_event_scan::@19
+  [431] (byte) keyboard_events_size#10 ← phi( keyboard_event_scan::@10/(byte) keyboard_events_size#29 keyboard_event_scan::@19/(byte) keyboard_events_size#30 )
+  [431] (byte) keyboard_event_scan::keycode#10 ← phi( keyboard_event_scan::@10/(byte) keyboard_event_scan::keycode#15 keyboard_event_scan::@19/(byte) keyboard_event_scan::keycode#11 )
+  [431] (byte) keyboard_event_scan::col#2 ← phi( keyboard_event_scan::@10/(byte) keyboard_event_scan::col#1 keyboard_event_scan::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [432] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)
   [433] (byte~) keyboard_event_scan::$16 ← (byte~) keyboard_event_scan::$15 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2)
-  [434] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@12
-  to:keyboard_event_scan::@16
-keyboard_event_scan::@16: scope:[keyboard_event_scan]  from keyboard_event_scan::@11
-  [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12
-  to:keyboard_event_scan::@17
-keyboard_event_scan::@17: scope:[keyboard_event_scan]  from keyboard_event_scan::@16
+  [434] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@10
+  to:keyboard_event_scan::@12
+keyboard_event_scan::@12: scope:[keyboard_event_scan]  from keyboard_event_scan::@9
+  [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10
+  to:keyboard_event_scan::@13
+keyboard_event_scan::@13: scope:[keyboard_event_scan]  from keyboard_event_scan::@12
   [436] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2)
-  [437] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@14
-  to:keyboard_event_scan::@18
-keyboard_event_scan::@18: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
+  [437] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@11
+  to:keyboard_event_scan::@14
+keyboard_event_scan::@14: scope:[keyboard_event_scan]  from keyboard_event_scan::@13
   [438] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#10) ← (byte) keyboard_event_scan::keycode#10
   [439] (byte) keyboard_events_size#2 ← ++ (byte) keyboard_events_size#10
-  to:keyboard_event_scan::@12
-keyboard_event_scan::@12: scope:[keyboard_event_scan]  from keyboard_event_scan::@11 keyboard_event_scan::@14 keyboard_event_scan::@16 keyboard_event_scan::@18
-  [440] (byte) keyboard_events_size#29 ← phi( keyboard_event_scan::@11/(byte) keyboard_events_size#10 keyboard_event_scan::@16/(byte) keyboard_events_size#10 keyboard_event_scan::@14/(byte) keyboard_events_size#1 keyboard_event_scan::@18/(byte) keyboard_events_size#2 )
+  to:keyboard_event_scan::@10
+keyboard_event_scan::@10: scope:[keyboard_event_scan]  from keyboard_event_scan::@11 keyboard_event_scan::@12 keyboard_event_scan::@14 keyboard_event_scan::@9
+  [440] (byte) keyboard_events_size#29 ← phi( keyboard_event_scan::@9/(byte) keyboard_events_size#10 keyboard_event_scan::@12/(byte) keyboard_events_size#10 keyboard_event_scan::@11/(byte) keyboard_events_size#1 keyboard_event_scan::@14/(byte) keyboard_events_size#2 )
   [441] (byte) keyboard_event_scan::keycode#15 ← ++ (byte) keyboard_event_scan::keycode#10
   [442] (byte) keyboard_event_scan::col#1 ← ++ (byte) keyboard_event_scan::col#2
-  [443] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@11
-  to:keyboard_event_scan::@20
-keyboard_event_scan::@20: scope:[keyboard_event_scan]  from keyboard_event_scan::@12
+  [443] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@9
+  to:keyboard_event_scan::@15
+keyboard_event_scan::@15: scope:[keyboard_event_scan]  from keyboard_event_scan::@10
   [444] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0
-  to:keyboard_event_scan::@10
-keyboard_event_scan::@14: scope:[keyboard_event_scan]  from keyboard_event_scan::@17
+  to:keyboard_event_scan::@8
+keyboard_event_scan::@11: scope:[keyboard_event_scan]  from keyboard_event_scan::@13
   [445] (byte/word/dword~) keyboard_event_scan::$23 ← (byte) keyboard_event_scan::keycode#10 | (byte/signed byte/word/signed word/dword/signed dword) $40
   [446] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#10) ← (byte/word/dword~) keyboard_event_scan::$23
   [447] (byte) keyboard_events_size#1 ← ++ (byte) keyboard_events_size#10
-  to:keyboard_event_scan::@12
-keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_event_scan::@8
+  to:keyboard_event_scan::@10
+keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_event_scan::@7
   [448] *((const byte*) CIA1_PORT_A#0) ← *((const byte[8]) keyboard_matrix_row_bitmask#0 + (byte) keyboard_matrix_read::rowid#0)
   [449] (byte) keyboard_matrix_read::return#0 ← ~ *((const byte*) CIA1_PORT_B#0)
   to:keyboard_matrix_read::@return
 keyboard_matrix_read::@return: scope:[keyboard_matrix_read]  from keyboard_matrix_read
   [450] return 
   to:@return
-render_show: scope:[render_show]  from main::@8
+render_show: scope:[render_show]  from main::@3
   [451] if((byte) render_screen_show#16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_show::toD0181
   to:render_show::toD0182
 render_show::toD0182: scope:[render_show]  from render_show
   [452] phi()
-  to:render_show::@2
-render_show::@2: scope:[render_show]  from render_show::toD0181 render_show::toD0182
+  to:render_show::@1
+render_show::@1: scope:[render_show]  from render_show::toD0181 render_show::toD0182
   [453] (byte) render_show::d018val#3 ← phi( render_show::toD0181/(const byte) render_show::toD0181_return#0 render_show::toD0182/(const byte) render_show::toD0182_return#0 )
   [454] *((const byte*) D018#0) ← (byte) render_show::d018val#3
   [455] *((const byte*) BGCOL2#0) ← *((const byte[]) PIECES_COLORS_1#0 + (byte) level#10)
   [456] *((const byte*) BGCOL3#0) ← *((const byte[]) PIECES_COLORS_2#0 + (byte) level#10)
   [457] (byte) render_screen_showing#1 ← (byte) render_screen_show#16
   to:render_show::@return
-render_show::@return: scope:[render_show]  from render_show::@2
+render_show::@return: scope:[render_show]  from render_show::@1
   [458] return 
   to:@return
 render_show::toD0181: scope:[render_show]  from render_show
   [459] phi()
-  to:render_show::@2
-play_init: scope:[play_init]  from main::@28
+  to:render_show::@1
+play_init: scope:[play_init]  from main::@11
   [460] phi()
   to:play_init::@1
 play_init::@1: scope:[play_init]  from play_init play_init::@1
@@ -11071,7 +11199,7 @@ play_init::@3: scope:[play_init]  from play_init::@2 play_init::@3
 play_init::@return: scope:[play_init]  from play_init::@3
   [476] return 
   to:@return
-sprites_irq_init: scope:[sprites_irq_init]  from main::@27
+sprites_irq_init: scope:[sprites_irq_init]  from main::@10
   asm { sei  }
   [478] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
   asm { ldaCIA1_INTERRUPT  }
@@ -11087,7 +11215,7 @@ sprites_irq_init: scope:[sprites_irq_init]  from main::@27
 sprites_irq_init::@return: scope:[sprites_irq_init]  from sprites_irq_init
   [488] return 
   to:@return
-sprites_init: scope:[sprites_init]  from main::@26
+sprites_init: scope:[sprites_init]  from main::@9
   [489] *((const byte*) SPRITES_ENABLE#0) ← (byte/signed byte/word/signed word/dword/signed dword) $f
   [490] *((const byte*) SPRITES_MC#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [491] *((const byte*) SPRITES_EXPAND_Y#0) ← *((const byte*) SPRITES_MC#0)
@@ -11106,7 +11234,7 @@ sprites_init::@1: scope:[sprites_init]  from sprites_init sprites_init::@1
 sprites_init::@return: scope:[sprites_init]  from sprites_init::@1
   [500] return 
   to:@return
-render_init: scope:[render_init]  from main::@25
+render_init: scope:[render_init]  from main::@8
   [501] phi()
   to:render_init::vicSelectGfxBank1
 render_init::vicSelectGfxBank1: scope:[render_init]  from render_init
@@ -11117,8 +11245,8 @@ render_init::vicSelectGfxBank1_toDd001: scope:[render_init]  from render_init::v
   to:render_init::vicSelectGfxBank1_@1
 render_init::vicSelectGfxBank1_@1: scope:[render_init]  from render_init::vicSelectGfxBank1_toDd001
   [504] *((const byte*) CIA2_PORT_A#0) ← (const byte) render_init::vicSelectGfxBank1_toDd001_return#0
-  to:render_init::@3
-render_init::@3: scope:[render_init]  from render_init::vicSelectGfxBank1_@1
+  to:render_init::@2
+render_init::@2: scope:[render_init]  from render_init::vicSelectGfxBank1_@1
   [505] *((const byte*) D011#0) ← (const byte) VIC_ECM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [506] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0
   [507] *((const byte*) BGCOL1#0) ← (const byte) BLACK#0
@@ -11126,15 +11254,15 @@ render_init::@3: scope:[render_init]  from render_init::vicSelectGfxBank1_@1
   [509] *((const byte*) BGCOL3#0) ← *((const byte[]) PIECES_COLORS_2#0)
   [510] *((const byte*) BGCOL4#0) ← (const byte) GREY#0
   [511] call render_screen_original 
-  to:render_init::@4
-render_init::@4: scope:[render_init]  from render_init::@3
+  to:render_init::@3
+render_init::@3: scope:[render_init]  from render_init::@2
   [512] phi()
   [513] call render_screen_original 
   to:render_init::@1
-render_init::@1: scope:[render_init]  from render_init::@1 render_init::@4
-  [514] (byte*) render_init::li_2#2 ← phi( render_init::@1/(byte*) render_init::li_2#1 render_init::@4/(const byte*) PLAYFIELD_SCREEN_2#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 )
-  [514] (byte*) render_init::li_1#2 ← phi( render_init::@1/(byte*) render_init::li_1#1 render_init::@4/(const byte*) PLAYFIELD_SCREEN_1#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 )
-  [514] (byte) render_init::i#2 ← phi( render_init::@1/(byte) render_init::i#1 render_init::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+render_init::@1: scope:[render_init]  from render_init::@1 render_init::@3
+  [514] (byte*) render_init::li_2#2 ← phi( render_init::@1/(byte*) render_init::li_2#1 render_init::@3/(const byte*) PLAYFIELD_SCREEN_2#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 )
+  [514] (byte*) render_init::li_1#2 ← phi( render_init::@1/(byte*) render_init::li_1#1 render_init::@3/(const byte*) PLAYFIELD_SCREEN_1#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 )
+  [514] (byte) render_init::i#2 ← phi( render_init::@1/(byte) render_init::i#1 render_init::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [515] (byte~) render_init::$13 ← (byte) render_init::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [516] *((const byte*[PLAYFIELD_LINES#0]) screen_lines_1#0 + (byte~) render_init::$13) ← (byte*) render_init::li_1#2
   [517] (byte~) render_init::$14 ← (byte) render_init::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
@@ -11147,15 +11275,15 @@ render_init::@1: scope:[render_init]  from render_init::@1 render_init::@4
 render_init::@return: scope:[render_init]  from render_init::@1
   [523] return 
   to:@return
-render_screen_original: scope:[render_screen_original]  from render_init::@3 render_init::@4
-  [524] (byte*) render_screen_original::screen#9 ← phi( render_init::@3/(const byte*) PLAYFIELD_SCREEN_1#0 render_init::@4/(const byte*) PLAYFIELD_SCREEN_2#0 )
+render_screen_original: scope:[render_screen_original]  from render_init::@2 render_init::@3
+  [524] (byte*) render_screen_original::screen#9 ← phi( render_init::@2/(const byte*) PLAYFIELD_SCREEN_1#0 render_init::@3/(const byte*) PLAYFIELD_SCREEN_2#0 )
   to:render_screen_original::@1
-render_screen_original::@1: scope:[render_screen_original]  from render_screen_original render_screen_original::@7
-  [525] (byte) render_screen_original::y#6 ← phi( render_screen_original/(byte/signed byte/word/signed word/dword/signed dword) 0 render_screen_original::@7/(byte) render_screen_original::y#1 )
-  [525] (byte*) render_screen_original::ocols#4 ← phi( render_screen_original/(const byte*) PLAYFIELD_COLORS_ORIGINAL#0+(byte/signed byte/word/signed word/dword/signed dword) $20*(byte/signed byte/word/signed word/dword/signed dword) 2 render_screen_original::@7/(byte*) render_screen_original::ocols#1 )
-  [525] (byte*) render_screen_original::oscr#4 ← phi( render_screen_original/(const byte*) PLAYFIELD_SCREEN_ORIGINAL#0+(byte/signed byte/word/signed word/dword/signed dword) $20*(byte/signed byte/word/signed word/dword/signed dword) 2 render_screen_original::@7/(byte*) render_screen_original::oscr#1 )
-  [525] (byte*) render_screen_original::cols#7 ← phi( render_screen_original/(const byte*) COLS#0 render_screen_original::@7/(byte*) render_screen_original::cols#3 )
-  [525] (byte*) render_screen_original::screen#8 ← phi( render_screen_original/(byte*) render_screen_original::screen#9 render_screen_original::@7/(byte*) render_screen_original::screen#10 )
+render_screen_original::@1: scope:[render_screen_original]  from render_screen_original render_screen_original::@5
+  [525] (byte) render_screen_original::y#6 ← phi( render_screen_original/(byte/signed byte/word/signed word/dword/signed dword) 0 render_screen_original::@5/(byte) render_screen_original::y#1 )
+  [525] (byte*) render_screen_original::ocols#4 ← phi( render_screen_original/(const byte*) PLAYFIELD_COLORS_ORIGINAL#0+(byte/signed byte/word/signed word/dword/signed dword) $20*(byte/signed byte/word/signed word/dword/signed dword) 2 render_screen_original::@5/(byte*) render_screen_original::ocols#1 )
+  [525] (byte*) render_screen_original::oscr#4 ← phi( render_screen_original/(const byte*) PLAYFIELD_SCREEN_ORIGINAL#0+(byte/signed byte/word/signed word/dword/signed dword) $20*(byte/signed byte/word/signed word/dword/signed dword) 2 render_screen_original::@5/(byte*) render_screen_original::oscr#1 )
+  [525] (byte*) render_screen_original::cols#7 ← phi( render_screen_original/(const byte*) COLS#0 render_screen_original::@5/(byte*) render_screen_original::cols#3 )
+  [525] (byte*) render_screen_original::screen#8 ← phi( render_screen_original/(byte*) render_screen_original::screen#9 render_screen_original::@5/(byte*) render_screen_original::screen#10 )
   to:render_screen_original::@2
 render_screen_original::@2: scope:[render_screen_original]  from render_screen_original::@1 render_screen_original::@2
   [526] (byte) render_screen_original::x#4 ← phi( render_screen_original::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render_screen_original::@2/(byte) render_screen_original::x#1 )
@@ -11167,13 +11295,13 @@ render_screen_original::@2: scope:[render_screen_original]  from render_screen_o
   [530] (byte*) render_screen_original::cols#1 ← ++ (byte*) render_screen_original::cols#4
   [531] (byte) render_screen_original::x#1 ← ++ (byte) render_screen_original::x#4
   [532] if((byte) render_screen_original::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_screen_original::@2
-  to:render_screen_original::@4
-render_screen_original::@4: scope:[render_screen_original]  from render_screen_original::@2 render_screen_original::@4
-  [533] (byte) render_screen_original::x#5 ← phi( render_screen_original::@2/(byte) render_screen_original::x#1 render_screen_original::@4/(byte) render_screen_original::x#2 )
-  [533] (byte*) render_screen_original::cols#5 ← phi( render_screen_original::@2/(byte*) render_screen_original::cols#1 render_screen_original::@4/(byte*) render_screen_original::cols#2 )
-  [533] (byte*) render_screen_original::ocols#2 ← phi( render_screen_original::@2/(byte*) render_screen_original::ocols#4 render_screen_original::@4/(byte*) render_screen_original::ocols#1 )
-  [533] (byte*) render_screen_original::screen#6 ← phi( render_screen_original::@2/(byte*) render_screen_original::screen#2 render_screen_original::@4/(byte*) render_screen_original::screen#3 )
-  [533] (byte*) render_screen_original::oscr#2 ← phi( render_screen_original::@2/(byte*) render_screen_original::oscr#4 render_screen_original::@4/(byte*) render_screen_original::oscr#1 )
+  to:render_screen_original::@3
+render_screen_original::@3: scope:[render_screen_original]  from render_screen_original::@2 render_screen_original::@3
+  [533] (byte) render_screen_original::x#5 ← phi( render_screen_original::@2/(byte) render_screen_original::x#1 render_screen_original::@3/(byte) render_screen_original::x#2 )
+  [533] (byte*) render_screen_original::cols#5 ← phi( render_screen_original::@2/(byte*) render_screen_original::cols#1 render_screen_original::@3/(byte*) render_screen_original::cols#2 )
+  [533] (byte*) render_screen_original::ocols#2 ← phi( render_screen_original::@2/(byte*) render_screen_original::ocols#4 render_screen_original::@3/(byte*) render_screen_original::ocols#1 )
+  [533] (byte*) render_screen_original::screen#6 ← phi( render_screen_original::@2/(byte*) render_screen_original::screen#2 render_screen_original::@3/(byte*) render_screen_original::screen#3 )
+  [533] (byte*) render_screen_original::oscr#2 ← phi( render_screen_original::@2/(byte*) render_screen_original::oscr#4 render_screen_original::@3/(byte*) render_screen_original::oscr#1 )
   [534] *((byte*) render_screen_original::screen#6) ← *((byte*) render_screen_original::oscr#2)
   [535] (byte*) render_screen_original::screen#3 ← ++ (byte*) render_screen_original::screen#6
   [536] (byte*) render_screen_original::oscr#1 ← ++ (byte*) render_screen_original::oscr#2
@@ -11181,24 +11309,24 @@ render_screen_original::@4: scope:[render_screen_original]  from render_screen_o
   [538] (byte*) render_screen_original::cols#2 ← ++ (byte*) render_screen_original::cols#5
   [539] (byte*) render_screen_original::ocols#1 ← ++ (byte*) render_screen_original::ocols#2
   [540] (byte) render_screen_original::x#2 ← ++ (byte) render_screen_original::x#5
-  [541] if((byte) render_screen_original::x#2!=(byte/signed byte/word/signed word/dword/signed dword) $24) goto render_screen_original::@4
-  to:render_screen_original::@6
-render_screen_original::@6: scope:[render_screen_original]  from render_screen_original::@4 render_screen_original::@6
-  [542] (byte) render_screen_original::x#6 ← phi( render_screen_original::@4/(byte) render_screen_original::x#2 render_screen_original::@6/(byte) render_screen_original::x#3 )
-  [542] (byte*) render_screen_original::cols#6 ← phi( render_screen_original::@4/(byte*) render_screen_original::cols#2 render_screen_original::@6/(byte*) render_screen_original::cols#3 )
-  [542] (byte*) render_screen_original::screen#7 ← phi( render_screen_original::@4/(byte*) render_screen_original::screen#3 render_screen_original::@6/(byte*) render_screen_original::screen#10 )
+  [541] if((byte) render_screen_original::x#2!=(byte/signed byte/word/signed word/dword/signed dword) $24) goto render_screen_original::@3
+  to:render_screen_original::@4
+render_screen_original::@4: scope:[render_screen_original]  from render_screen_original::@3 render_screen_original::@4
+  [542] (byte) render_screen_original::x#6 ← phi( render_screen_original::@3/(byte) render_screen_original::x#2 render_screen_original::@4/(byte) render_screen_original::x#3 )
+  [542] (byte*) render_screen_original::cols#6 ← phi( render_screen_original::@3/(byte*) render_screen_original::cols#2 render_screen_original::@4/(byte*) render_screen_original::cols#3 )
+  [542] (byte*) render_screen_original::screen#7 ← phi( render_screen_original::@3/(byte*) render_screen_original::screen#3 render_screen_original::@4/(byte*) render_screen_original::screen#10 )
   [543] *((byte*) render_screen_original::screen#7) ← (const byte) render_screen_original::SPACE#0
   [544] (byte*) render_screen_original::screen#10 ← ++ (byte*) render_screen_original::screen#7
   [545] *((byte*) render_screen_original::cols#6) ← (const byte) BLACK#0
   [546] (byte*) render_screen_original::cols#3 ← ++ (byte*) render_screen_original::cols#6
   [547] (byte) render_screen_original::x#3 ← ++ (byte) render_screen_original::x#6
-  [548] if((byte) render_screen_original::x#3!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_screen_original::@6
-  to:render_screen_original::@7
-render_screen_original::@7: scope:[render_screen_original]  from render_screen_original::@6
+  [548] if((byte) render_screen_original::x#3!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_screen_original::@4
+  to:render_screen_original::@5
+render_screen_original::@5: scope:[render_screen_original]  from render_screen_original::@4
   [549] (byte) render_screen_original::y#1 ← ++ (byte) render_screen_original::y#6
   [550] if((byte) render_screen_original::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto render_screen_original::@1
   to:render_screen_original::@return
-render_screen_original::@return: scope:[render_screen_original]  from render_screen_original::@7
+render_screen_original::@return: scope:[render_screen_original]  from render_screen_original::@5
   [551] return 
   to:@return
 sid_rnd_init: scope:[sid_rnd_init]  from main
@@ -11217,15 +11345,15 @@ sprites_irq: scope:[sprites_irq]  from
   [560] *((const byte*) SPRITES_YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 6) ← (byte) sprites_irq::ypos#0
   [561] (byte/signed word/word/dword/signed dword~) sprites_irq::$0 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [562] (byte) sprites_irq::raster_sprite_gfx_modify#0 ← (byte/signed word/word/dword/signed dword~) sprites_irq::$0
-  to:sprites_irq::@11
-sprites_irq::@11: scope:[sprites_irq]  from sprites_irq sprites_irq::@11
-  [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11
-  to:sprites_irq::@12
-sprites_irq::@12: scope:[sprites_irq]  from sprites_irq::@11
+  to:sprites_irq::@8
+sprites_irq::@8: scope:[sprites_irq]  from sprites_irq sprites_irq::@8
+  [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8
+  to:sprites_irq::@9
+sprites_irq::@9: scope:[sprites_irq]  from sprites_irq::@8
   [564] (byte) sprites_irq::ptr#0 ← (byte) irq_sprite_ptr#0
   [565] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1
-  to:sprites_irq::@13
-sprites_irq::@13: scope:[sprites_irq]  from sprites_irq::@12
+  to:sprites_irq::@10
+sprites_irq::@10: scope:[sprites_irq]  from sprites_irq::@9
   [566] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0) ← (byte) sprites_irq::ptr#0
   [567] (byte) sprites_irq::ptr#3 ← ++ (byte) sprites_irq::ptr#0
   [568] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) sprites_irq::ptr#3
@@ -11233,43 +11361,43 @@ sprites_irq::@13: scope:[sprites_irq]  from sprites_irq::@12
   [570] (byte) sprites_irq::ptr#4 ← ++ (byte) sprites_irq::ptr#3
   [571] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte) sprites_irq::ptr#4
   to:sprites_irq::@2
-sprites_irq::@2: scope:[sprites_irq]  from sprites_irq::@1 sprites_irq::@13
+sprites_irq::@2: scope:[sprites_irq]  from sprites_irq::@1 sprites_irq::@10
   [572] (byte) irq_cnt#1 ← ++ (byte) irq_cnt#0
   [573] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) 9) goto sprites_irq::@3
-  to:sprites_irq::@7
-sprites_irq::@7: scope:[sprites_irq]  from sprites_irq::@2
+  to:sprites_irq::@6
+sprites_irq::@6: scope:[sprites_irq]  from sprites_irq::@2
   [574] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) $a) goto sprites_irq::@4
-  to:sprites_irq::@8
-sprites_irq::@8: scope:[sprites_irq]  from sprites_irq::@7
+  to:sprites_irq::@7
+sprites_irq::@7: scope:[sprites_irq]  from sprites_irq::@6
   [575] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14
   [576] (byte) irq_sprite_ypos#3 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [577] (byte) irq_sprite_ptr#3 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3
-  to:sprites_irq::@6
-sprites_irq::@6: scope:[sprites_irq]  from sprites_irq::@15 sprites_irq::@4 sprites_irq::@8
-  [578] (byte) irq_raster_next#4 ← phi( sprites_irq::@15/(byte) irq_raster_next#1 sprites_irq::@4/(byte) irq_raster_next#2 sprites_irq::@8/(byte) irq_raster_next#3 )
+  to:sprites_irq::@5
+sprites_irq::@5: scope:[sprites_irq]  from sprites_irq::@11 sprites_irq::@4 sprites_irq::@7
+  [578] (byte) irq_raster_next#4 ← phi( sprites_irq::@11/(byte) irq_raster_next#1 sprites_irq::@4/(byte) irq_raster_next#2 sprites_irq::@7/(byte) irq_raster_next#3 )
   [579] *((const byte*) RASTER#0) ← (byte) irq_raster_next#4
   [580] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
   to:sprites_irq::@return
-sprites_irq::@return: scope:[sprites_irq]  from sprites_irq::@6
+sprites_irq::@return: scope:[sprites_irq]  from sprites_irq::@5
   [581] return 
   to:@return
-sprites_irq::@4: scope:[sprites_irq]  from sprites_irq::@7
+sprites_irq::@4: scope:[sprites_irq]  from sprites_irq::@6
   [582] (byte) irq_cnt#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [583] (byte) irq_raster_next#2 ← (const byte) IRQ_RASTER_FIRST#0
   [584] (byte) irq_sprite_ypos#2 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [585] (byte) irq_sprite_ptr#2 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3
-  to:sprites_irq::@6
+  to:sprites_irq::@5
 sprites_irq::@3: scope:[sprites_irq]  from sprites_irq::@2
   [586] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15
   [587] (byte) irq_sprite_ypos#1 ← (const byte) SPRITES_FIRST_YPOS#0
   to:sprites_irq::toSpritePtr2
 sprites_irq::toSpritePtr2: scope:[sprites_irq]  from sprites_irq::@3
   [588] phi()
-  to:sprites_irq::@15
-sprites_irq::@15: scope:[sprites_irq]  from sprites_irq::toSpritePtr2
+  to:sprites_irq::@11
+sprites_irq::@11: scope:[sprites_irq]  from sprites_irq::toSpritePtr2
   [589] (byte) irq_sprite_ptr#1 ← (const byte) sprites_irq::toSpritePtr2_return#0
-  to:sprites_irq::@6
-sprites_irq::@1: scope:[sprites_irq]  from sprites_irq::@12
+  to:sprites_irq::@5
+sprites_irq::@1: scope:[sprites_irq]  from sprites_irq::@9
   [590] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0) ← (byte) sprites_irq::ptr#0
   [591] (byte) sprites_irq::ptr#1 ← ++ (byte) sprites_irq::ptr#0
   [592] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) sprites_irq::ptr#1
@@ -12958,9 +13086,9 @@ INITIAL ASM
   .label current_piece_102 = $2b
 //SEG3 @begin
 bbegin:
-  jmp b14
-//SEG4 @14
-b14:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 [1] (byte) render_screen_showing#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The screen currently being showed to the user. $00 for screen 1 / $40 for screen 2.
   lda #0
@@ -12969,13 +13097,13 @@ b14:
 //SEG7 kickasm(location (const byte*) PLAYFIELD_SCREEN_ORIGINAL#0) {{ // Load chars for the screen   .var screen = LoadBinary("playfield-screen.iscr")    // Load extended colors for the screen   .var extended = LoadBinary("playfield-extended.col")   // screen.get(i)+1 because the charset is loaded into PLAYFIELD_CHARSET+8   // extended.get(i)-1 because the extended colors are 1-based (1/2/3/4)   // <<6 to move extended colors to the upper 2 bits   .fill screen.getSize(), ( (screen.get(i)+1) | (extended.get(i)-1)<<6 )  }}
 //SEG8 kickasm(location (const byte*) PLAYFIELD_COLORS_ORIGINAL#0) {{ .import binary "playfield-screen.col"  }}
   // Original Color Data
-  jmp b23
-//SEG9 @23
-b23:
+  jmp b2
+//SEG9 @2
+b2:
 //SEG10 kickasm(location (const byte*) PLAYFIELD_SPRITES#0) {{ .var sprites = LoadPicture("playfield-sprites.png", List().add($010101, $000000)) 	// Put the sprites into memory  	.for(var sy=0;sy<10;sy++) { 	    .var sprite_gfx_y = sy*20 		.for(var sx=0;sx<3;sx++) { 	    	.for (var y=0;y<21; y++) { 	    	    .var gfx_y =  sprite_gfx_y + mod(2100+y-sprite_gfx_y,21) 		    	.for (var c=0; c<3; c++) { 	            	.byte sprites.getSinglecolorByte(sx*3+c,gfx_y) 	            } 	        } 	    	.byte 0 	  	} 	}  }}
-  jmp b24
-//SEG11 @24
-b24:
+  jmp b3
+//SEG11 @3
+b3:
 //SEG12 [6] (byte) irq_raster_next#0 ← (const byte) IRQ_RASTER_FIRST#0 -- vbuz1=vbuc1 
   // The raster line of the next IRQ
   lda #IRQ_RASTER_FIRST
@@ -12984,14 +13112,14 @@ b24:
   // Y-pos of the sprites on the next IRQ
   lda #SPRITES_FIRST_YPOS+$15
   sta irq_sprite_ypos
-//SEG14 [8] phi from @24 to toSpritePtr1 [phi:@24->toSpritePtr1]
-toSpritePtr1_from_b24:
+//SEG14 [8] phi from @3 to toSpritePtr1 [phi:@3->toSpritePtr1]
+toSpritePtr1_from_b3:
   jmp toSpritePtr1
 //SEG15 toSpritePtr1
 toSpritePtr1:
-  jmp b39
-//SEG16 @39
-b39:
+  jmp b5
+//SEG16 @5
+b5:
 //SEG17 [9] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuc1 
   // Index of the sprites to show on the next IRQ
   lda #toSpritePtr1_return+3
@@ -13000,17 +13128,17 @@ b39:
   // Counting the 10 IRQs
   lda #0
   sta irq_cnt
-//SEG19 [11] phi from @39 to @38 [phi:@39->@38]
-b38_from_b39:
-  jmp b38
-//SEG20 @38
-b38:
+//SEG19 [11] phi from @5 to @4 [phi:@5->@4]
+b4_from_b5:
+  jmp b4
+//SEG20 @4
+b4:
 //SEG21 [12] call main 
-//SEG22 [14] phi from @38 to main [phi:@38->main]
-main_from_b38:
+//SEG22 [14] phi from @4 to main [phi:@4->main]
+main_from_b4:
   jsr main
-//SEG23 [13] phi from @38 to @end [phi:@38->@end]
-bend_from_b38:
+//SEG23 [13] phi from @4 to @end [phi:@4->@end]
+bend_from_b4:
   jmp bend
 //SEG24 @end
 bend:
@@ -13020,79 +13148,79 @@ main: {
     .label render = $80
   //SEG26 [15] call sid_rnd_init 
     jsr sid_rnd_init
-    jmp b25
-  //SEG27 main::@25
-  b25:
+    jmp b8
+  //SEG27 main::@8
+  b8:
   //SEG28 asm { sei  }
     sei
   //SEG29 [17] call render_init 
-  //SEG30 [501] phi from main::@25 to render_init [phi:main::@25->render_init]
-  render_init_from_b25:
+  //SEG30 [501] phi from main::@8 to render_init [phi:main::@8->render_init]
+  render_init_from_b8:
     jsr render_init
-  //SEG31 [18] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
-  b26_from_b25:
-    jmp b26
-  //SEG32 main::@26
-  b26:
+  //SEG31 [18] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG32 main::@9
+  b9:
   //SEG33 [19] call sprites_init 
     jsr sprites_init
-  //SEG34 [20] phi from main::@26 to main::@27 [phi:main::@26->main::@27]
-  b27_from_b26:
-    jmp b27
-  //SEG35 main::@27
-  b27:
+  //SEG34 [20] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG35 main::@10
+  b10:
   //SEG36 [21] call sprites_irq_init 
     jsr sprites_irq_init
-  //SEG37 [22] phi from main::@27 to main::@28 [phi:main::@27->main::@28]
-  b28_from_b27:
-    jmp b28
-  //SEG38 main::@28
-  b28:
+  //SEG37 [22] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
+  b11_from_b10:
+    jmp b11
+  //SEG38 main::@11
+  b11:
   //SEG39 [23] call play_init 
-  //SEG40 [460] phi from main::@28 to play_init [phi:main::@28->play_init]
-  play_init_from_b28:
+  //SEG40 [460] phi from main::@11 to play_init [phi:main::@11->play_init]
+  play_init_from_b11:
     jsr play_init
-  //SEG41 [24] phi from main::@28 to main::@29 [phi:main::@28->main::@29]
-  b29_from_b28:
-    jmp b29
-  //SEG42 main::@29
-  b29:
+  //SEG41 [24] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG42 main::@12
+  b12:
   //SEG43 [25] call play_spawn_current 
-  //SEG44 [285] phi from main::@29 to play_spawn_current [phi:main::@29->play_spawn_current]
-  play_spawn_current_from_b29:
-  //SEG45 [285] phi (byte) game_over#65 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@29->play_spawn_current#0] -- vbuz1=vbuc1 
+  //SEG44 [285] phi from main::@12 to play_spawn_current [phi:main::@12->play_spawn_current]
+  play_spawn_current_from_b12:
+  //SEG45 [285] phi (byte) game_over#65 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@12->play_spawn_current#0] -- vbuz1=vbuc1 
     lda #0
     sta game_over
-  //SEG46 [285] phi (byte) next_piece_idx#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@29->play_spawn_current#1] -- vbuz1=vbuc1 
+  //SEG46 [285] phi (byte) next_piece_idx#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@12->play_spawn_current#1] -- vbuz1=vbuc1 
     lda #0
     sta next_piece_idx
     jsr play_spawn_current
-  //SEG47 [26] phi from main::@29 to main::@30 [phi:main::@29->main::@30]
-  b30_from_b29:
-    jmp b30
-  //SEG48 main::@30
-  b30:
+  //SEG47 [26] phi from main::@12 to main::@13 [phi:main::@12->main::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG48 main::@13
+  b13:
   //SEG49 [27] call play_spawn_current 
-  //SEG50 [285] phi from main::@30 to play_spawn_current [phi:main::@30->play_spawn_current]
-  play_spawn_current_from_b30:
-  //SEG51 [285] phi (byte) game_over#65 = (byte) game_over#52 [phi:main::@30->play_spawn_current#0] -- register_copy 
-  //SEG52 [285] phi (byte) next_piece_idx#17 = (byte) play_spawn_current::piece_idx#2 [phi:main::@30->play_spawn_current#1] -- register_copy 
+  //SEG50 [285] phi from main::@13 to play_spawn_current [phi:main::@13->play_spawn_current]
+  play_spawn_current_from_b13:
+  //SEG51 [285] phi (byte) game_over#65 = (byte) game_over#52 [phi:main::@13->play_spawn_current#0] -- register_copy 
+  //SEG52 [285] phi (byte) next_piece_idx#17 = (byte) play_spawn_current::piece_idx#2 [phi:main::@13->play_spawn_current#1] -- register_copy 
     jsr play_spawn_current
-  //SEG53 [28] phi from main::@30 to main::@31 [phi:main::@30->main::@31]
-  b31_from_b30:
-    jmp b31
-  //SEG54 main::@31
-  b31:
+  //SEG53 [28] phi from main::@13 to main::@14 [phi:main::@13->main::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG54 main::@14
+  b14:
   //SEG55 [29] call render_playfield 
-  //SEG56 [150] phi from main::@31 to render_playfield [phi:main::@31->render_playfield]
-  render_playfield_from_b31:
-  //SEG57 [150] phi (byte) render_screen_render#22 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@31->render_playfield#0] -- vbuz1=vbuc1 
+  //SEG56 [150] phi from main::@14 to render_playfield [phi:main::@14->render_playfield]
+  render_playfield_from_b14:
+  //SEG57 [150] phi (byte) render_screen_render#22 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@14->render_playfield#0] -- vbuz1=vbuc1 
     lda #$40
     sta render_screen_render_22
     jsr render_playfield
-    jmp b32
-  //SEG58 main::@32
-  b32:
+    jmp b15
+  //SEG58 main::@15
+  b15:
   //SEG59 [30] (byte~) current_ypos#104 ← (byte) current_ypos#6 -- vbuz1=vbuz2 
     lda current_ypos
     sta current_ypos_104
@@ -13108,27 +13236,27 @@ main: {
     lda current_piece_char
     sta current_piece_char_106
   //SEG63 [34] call render_moving 
-  //SEG64 [129] phi from main::@32 to render_moving [phi:main::@32->render_moving]
-  render_moving_from_b32:
-  //SEG65 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#106 [phi:main::@32->render_moving#0] -- register_copy 
-  //SEG66 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#118 [phi:main::@32->render_moving#1] -- register_copy 
-  //SEG67 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#128 [phi:main::@32->render_moving#2] -- register_copy 
-  //SEG68 [129] phi (byte) render_screen_render#33 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@32->render_moving#3] -- vbuz1=vbuc1 
+  //SEG64 [129] phi from main::@15 to render_moving [phi:main::@15->render_moving]
+  render_moving_from_b15:
+  //SEG65 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#106 [phi:main::@15->render_moving#0] -- register_copy 
+  //SEG66 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#118 [phi:main::@15->render_moving#1] -- register_copy 
+  //SEG67 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#128 [phi:main::@15->render_moving#2] -- register_copy 
+  //SEG68 [129] phi (byte) render_screen_render#33 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@15->render_moving#3] -- vbuz1=vbuc1 
     lda #$40
     sta render_screen_render_33
-  //SEG69 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#104 [phi:main::@32->render_moving#4] -- register_copy 
+  //SEG69 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#104 [phi:main::@15->render_moving#4] -- register_copy 
     jsr render_moving
-    jmp b33
-  //SEG70 main::@33
-  b33:
+    jmp b16
+  //SEG70 main::@16
+  b16:
   //SEG71 [35] (byte~) next_piece_idx#84 ← (byte) play_spawn_current::piece_idx#2 -- vbuz1=vbuz2 
     lda play_spawn_current.piece_idx
     sta next_piece_idx_84
   //SEG72 [36] call render_next 
-  //SEG73 [108] phi from main::@33 to render_next [phi:main::@33->render_next]
-  render_next_from_b33:
-  //SEG74 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#84 [phi:main::@33->render_next#0] -- register_copy 
-  //SEG75 [108] phi (byte) render_screen_render#15 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@33->render_next#1] -- vbuz1=vbuc1 
+  //SEG73 [108] phi from main::@16 to render_next [phi:main::@16->render_next]
+  render_next_from_b16:
+  //SEG74 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#84 [phi:main::@16->render_next#0] -- register_copy 
+  //SEG75 [108] phi (byte) render_screen_render#15 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@16->render_next#1] -- vbuz1=vbuc1 
     lda #$40
     sta render_screen_render_15
     jsr render_next
@@ -13138,122 +13266,122 @@ main: {
     sta current_piece
     lda PIECES+1,y
     sta current_piece+1
-  //SEG77 [38] phi from main::@33 to main::@1 [phi:main::@33->main::@1]
-  b1_from_b33:
-  //SEG78 [38] phi (byte) level_bcd#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#0] -- vbuz1=vbuc1 
+  //SEG77 [38] phi from main::@16 to main::@1 [phi:main::@16->main::@1]
+  b1_from_b16:
+  //SEG78 [38] phi (byte) level_bcd#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta level_bcd
-  //SEG79 [38] phi (byte) level#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#1] -- vbuz1=vbuc1 
+  //SEG79 [38] phi (byte) level#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta level
-  //SEG80 [38] phi (dword) score_bcd#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#2] -- vduz1=vbuc1 
+  //SEG80 [38] phi (dword) score_bcd#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#2] -- vduz1=vbuc1 
     lda #0
     sta score_bcd
     lda #0
     sta score_bcd+1
     sta score_bcd+2
     sta score_bcd+3
-  //SEG81 [38] phi (word) lines_bcd#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#3] -- vwuz1=vbuc1 
+  //SEG81 [38] phi (word) lines_bcd#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#3] -- vwuz1=vbuc1 
     lda #0
     sta lines_bcd
     lda #0
     sta lines_bcd+1
-  //SEG82 [38] phi (byte) current_movedown_counter#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#4] -- vbuz1=vbuc1 
+  //SEG82 [38] phi (byte) current_movedown_counter#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#4] -- vbuz1=vbuc1 
     lda #0
     sta current_movedown_counter
-  //SEG83 [38] phi (byte) keyboard_events_size#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#5] -- vbuz1=vbuc1 
+  //SEG83 [38] phi (byte) keyboard_events_size#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#5] -- vbuz1=vbuc1 
     lda #0
     sta keyboard_events_size
-  //SEG84 [38] phi (byte) next_piece_idx#10 = (byte) play_spawn_current::piece_idx#2 [phi:main::@33->main::@1#6] -- register_copy 
-  //SEG85 [38] phi (byte) game_over#10 = (byte) game_over#52 [phi:main::@33->main::@1#7] -- register_copy 
-  //SEG86 [38] phi (byte) current_ypos#11 = (byte) current_ypos#6 [phi:main::@33->main::@1#8] -- register_copy 
-  //SEG87 [38] phi (byte) current_xpos#122 = (byte) current_xpos#103 [phi:main::@33->main::@1#9] -- register_copy 
-  //SEG88 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#74 [phi:main::@33->main::@1#10] -- register_copy 
-  //SEG89 [38] phi (byte) current_orientation#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#11] -- vbuz1=vbuc1 
+  //SEG84 [38] phi (byte) next_piece_idx#10 = (byte) play_spawn_current::piece_idx#2 [phi:main::@16->main::@1#6] -- register_copy 
+  //SEG85 [38] phi (byte) game_over#10 = (byte) game_over#52 [phi:main::@16->main::@1#7] -- register_copy 
+  //SEG86 [38] phi (byte) current_ypos#11 = (byte) current_ypos#6 [phi:main::@16->main::@1#8] -- register_copy 
+  //SEG87 [38] phi (byte) current_xpos#122 = (byte) current_xpos#103 [phi:main::@16->main::@1#9] -- register_copy 
+  //SEG88 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#74 [phi:main::@16->main::@1#10] -- register_copy 
+  //SEG89 [38] phi (byte) current_orientation#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#11] -- vbuz1=vbuc1 
     lda #0
     sta current_orientation
-  //SEG90 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#5 [phi:main::@33->main::@1#12] -- register_copy 
-  //SEG91 [38] phi (byte*) current_piece#10 = (byte*~) current_piece#96 [phi:main::@33->main::@1#13] -- register_copy 
-  //SEG92 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#1 [phi:main::@33->main::@1#14] -- register_copy 
-  //SEG93 [38] phi (byte) render_screen_render#18 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@33->main::@1#15] -- vbuz1=vbuc1 
+  //SEG90 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#5 [phi:main::@16->main::@1#12] -- register_copy 
+  //SEG91 [38] phi (byte*) current_piece#10 = (byte*~) current_piece#96 [phi:main::@16->main::@1#13] -- register_copy 
+  //SEG92 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#1 [phi:main::@16->main::@1#14] -- register_copy 
+  //SEG93 [38] phi (byte) render_screen_render#18 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@16->main::@1#15] -- vbuz1=vbuc1 
     lda #$40
     sta render_screen_render
-  //SEG94 [38] phi (byte) render_screen_show#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#16] -- vbuz1=vbuc1 
+  //SEG94 [38] phi (byte) render_screen_show#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#16] -- vbuz1=vbuc1 
     lda #0
     sta render_screen_show
     jmp b1
-  //SEG95 [38] phi from main::@17 to main::@1 [phi:main::@17->main::@1]
-  b1_from_b17:
-  //SEG96 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@17->main::@1#0] -- register_copy 
-  //SEG97 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@17->main::@1#1] -- register_copy 
-  //SEG98 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@17->main::@1#2] -- register_copy 
-  //SEG99 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@17->main::@1#3] -- register_copy 
-  //SEG100 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@17->main::@1#4] -- register_copy 
-  //SEG101 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@17->main::@1#5] -- register_copy 
-  //SEG102 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@17->main::@1#6] -- register_copy 
-  //SEG103 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@17->main::@1#7] -- register_copy 
-  //SEG104 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@17->main::@1#8] -- register_copy 
-  //SEG105 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@17->main::@1#9] -- register_copy 
-  //SEG106 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@17->main::@1#10] -- register_copy 
-  //SEG107 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@17->main::@1#11] -- register_copy 
-  //SEG108 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@17->main::@1#12] -- register_copy 
-  //SEG109 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@17->main::@1#13] -- register_copy 
-  //SEG110 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@17->main::@1#14] -- register_copy 
+  //SEG95 [38] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG96 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG97 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@6->main::@1#1] -- register_copy 
+  //SEG98 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@6->main::@1#2] -- register_copy 
+  //SEG99 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@6->main::@1#3] -- register_copy 
+  //SEG100 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@6->main::@1#4] -- register_copy 
+  //SEG101 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@6->main::@1#5] -- register_copy 
+  //SEG102 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@6->main::@1#6] -- register_copy 
+  //SEG103 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@6->main::@1#7] -- register_copy 
+  //SEG104 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@6->main::@1#8] -- register_copy 
+  //SEG105 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@6->main::@1#9] -- register_copy 
+  //SEG106 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@6->main::@1#10] -- register_copy 
+  //SEG107 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@6->main::@1#11] -- register_copy 
+  //SEG108 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@6->main::@1#12] -- register_copy 
+  //SEG109 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@6->main::@1#13] -- register_copy 
+  //SEG110 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@6->main::@1#14] -- register_copy 
     jmp b1
   //SEG111 main::@1
   b1:
-    jmp b6
+    jmp b2
   // Wait for a frame to pass
-  //SEG112 main::@6
-  b6:
-  //SEG113 [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG112 main::@2
+  b2:
+  //SEG113 [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG114 [40] phi from main::@6 to main::@8 [phi:main::@6->main::@8]
-  b8_from_b6:
-    jmp b8
-  //SEG115 main::@8
-  b8:
+    bne b2
+  //SEG114 [40] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG115 main::@3
+  b3:
   //SEG116 [41] call render_show 
     jsr render_show
-  //SEG117 [42] phi from main::@8 to main::@35 [phi:main::@8->main::@35]
-  b35_from_b8:
-    jmp b35
-  //SEG118 main::@35
-  b35:
+  //SEG117 [42] phi from main::@3 to main::@17 [phi:main::@3->main::@17]
+  b17_from_b3:
+    jmp b17
+  //SEG118 main::@17
+  b17:
   //SEG119 [43] call keyboard_event_scan 
-  //SEG120 [395] phi from main::@35 to keyboard_event_scan [phi:main::@35->keyboard_event_scan]
-  keyboard_event_scan_from_b35:
+  //SEG120 [395] phi from main::@17 to keyboard_event_scan [phi:main::@17->keyboard_event_scan]
+  keyboard_event_scan_from_b17:
     jsr keyboard_event_scan
-  //SEG121 [44] phi from main::@35 to main::@36 [phi:main::@35->main::@36]
-  b36_from_b35:
-    jmp b36
-  //SEG122 main::@36
-  b36:
+  //SEG121 [44] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
+  b18_from_b17:
+    jmp b18
+  //SEG122 main::@18
+  b18:
   //SEG123 [45] call keyboard_event_get 
     jsr keyboard_event_get
   //SEG124 [46] (byte) keyboard_event_get::return#3 ← (byte) keyboard_event_get::return#2 -- vbuz1=vbuz2 
     lda keyboard_event_get.return
     sta keyboard_event_get.return_3
-    jmp b37
-  //SEG125 main::@37
-  b37:
+    jmp b19
+  //SEG125 main::@19
+  b19:
   //SEG126 [47] (byte) main::key_event#0 ← (byte) keyboard_event_get::return#3 -- vbuz1=vbuz2 
     lda keyboard_event_get.return_3
     sta key_event
-  //SEG127 [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9 -- vbuz1_eq_0_then_la1 
+  //SEG127 [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4 -- vbuz1_eq_0_then_la1 
     lda game_over
     cmp #0
-    beq b9
-    jmp b11
-  //SEG128 main::@11
-  b11:
+    beq b4
+    jmp b5
+  //SEG128 main::@5
+  b5:
   //SEG129 [49] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-    jmp b11
-  //SEG130 main::@9
-  b9:
+    jmp b5
+  //SEG130 main::@4
+  b4:
   //SEG131 [50] (byte) play_movement::key_event#0 ← (byte) main::key_event#0 -- vbuz1=vbuz2 
     lda key_event
     sta play_movement.key_event
@@ -13262,33 +13390,33 @@ main: {
   //SEG133 [52] (byte) play_movement::return#3 ← (byte) play_movement::return#2 -- vbuz1=vbuz2 
     lda play_movement.return
     sta play_movement.return_3
-    jmp b38
-  //SEG134 main::@38
-  b38:
+    jmp b20
+  //SEG134 main::@20
+  b20:
   //SEG135 [53] (byte) main::render#1 ← (byte) play_movement::return#3 -- vbuz1=vbuz2 
     lda play_movement.return_3
     sta render
-    jmp b17
-  //SEG136 main::@17
-  b17:
+    jmp b6
+  //SEG136 main::@6
+  b6:
   //SEG137 [54] if((byte) main::render#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuz1_eq_0_then_la1 
     lda render
     cmp #0
-    beq b1_from_b17
-    jmp b23
-  //SEG138 main::@23
-  b23:
+    beq b1_from_b6
+    jmp b7
+  //SEG138 main::@7
+  b7:
   //SEG139 [55] (byte~) render_screen_render#70 ← (byte) render_screen_render#18 -- vbuz1=vbuz2 
     lda render_screen_render
     sta render_screen_render_70
   //SEG140 [56] call render_playfield 
-  //SEG141 [150] phi from main::@23 to render_playfield [phi:main::@23->render_playfield]
-  render_playfield_from_b23:
-  //SEG142 [150] phi (byte) render_screen_render#22 = (byte~) render_screen_render#70 [phi:main::@23->render_playfield#0] -- register_copy 
+  //SEG141 [150] phi from main::@7 to render_playfield [phi:main::@7->render_playfield]
+  render_playfield_from_b7:
+  //SEG142 [150] phi (byte) render_screen_render#22 = (byte~) render_screen_render#70 [phi:main::@7->render_playfield#0] -- register_copy 
     jsr render_playfield
-    jmp b39
-  //SEG143 main::@39
-  b39:
+    jmp b21
+  //SEG143 main::@21
+  b21:
   //SEG144 [57] (byte~) current_ypos#105 ← (byte) current_ypos#19 -- vbuz1=vbuz2 
     lda current_ypos
     sta current_ypos_105
@@ -13307,17 +13435,17 @@ main: {
     lda current_piece_char
     sta current_piece_char_107
   //SEG149 [62] call render_moving 
-  //SEG150 [129] phi from main::@39 to render_moving [phi:main::@39->render_moving]
-  render_moving_from_b39:
-  //SEG151 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#107 [phi:main::@39->render_moving#0] -- register_copy 
-  //SEG152 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#119 [phi:main::@39->render_moving#1] -- register_copy 
-  //SEG153 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#129 [phi:main::@39->render_moving#2] -- register_copy 
-  //SEG154 [129] phi (byte) render_screen_render#33 = (byte~) render_screen_render#69 [phi:main::@39->render_moving#3] -- register_copy 
-  //SEG155 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#105 [phi:main::@39->render_moving#4] -- register_copy 
+  //SEG150 [129] phi from main::@21 to render_moving [phi:main::@21->render_moving]
+  render_moving_from_b21:
+  //SEG151 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#107 [phi:main::@21->render_moving#0] -- register_copy 
+  //SEG152 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#119 [phi:main::@21->render_moving#1] -- register_copy 
+  //SEG153 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#129 [phi:main::@21->render_moving#2] -- register_copy 
+  //SEG154 [129] phi (byte) render_screen_render#33 = (byte~) render_screen_render#69 [phi:main::@21->render_moving#3] -- register_copy 
+  //SEG155 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#105 [phi:main::@21->render_moving#4] -- register_copy 
     jsr render_moving
-    jmp b40
-  //SEG156 main::@40
-  b40:
+    jmp b22
+  //SEG156 main::@22
+  b22:
   //SEG157 [63] (byte~) render_screen_render#68 ← (byte) render_screen_render#18 -- vbuz1=vbuz2 
     lda render_screen_render
     sta render_screen_render_68
@@ -13325,44 +13453,44 @@ main: {
     lda next_piece_idx
     sta next_piece_idx_85
   //SEG159 [65] call render_next 
-  //SEG160 [108] phi from main::@40 to render_next [phi:main::@40->render_next]
-  render_next_from_b40:
-  //SEG161 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#85 [phi:main::@40->render_next#0] -- register_copy 
-  //SEG162 [108] phi (byte) render_screen_render#15 = (byte~) render_screen_render#68 [phi:main::@40->render_next#1] -- register_copy 
+  //SEG160 [108] phi from main::@22 to render_next [phi:main::@22->render_next]
+  render_next_from_b22:
+  //SEG161 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#85 [phi:main::@22->render_next#0] -- register_copy 
+  //SEG162 [108] phi (byte) render_screen_render#15 = (byte~) render_screen_render#68 [phi:main::@22->render_next#1] -- register_copy 
     jsr render_next
-  //SEG163 [66] phi from main::@40 to main::@41 [phi:main::@40->main::@41]
-  b41_from_b40:
-    jmp b41
-  //SEG164 main::@41
-  b41:
+  //SEG163 [66] phi from main::@22 to main::@23 [phi:main::@22->main::@23]
+  b23_from_b22:
+    jmp b23
+  //SEG164 main::@23
+  b23:
   //SEG165 [67] call render_score 
     jsr render_score
-  //SEG166 [68] phi from main::@41 to main::@42 [phi:main::@41->main::@42]
-  b42_from_b41:
-    jmp b42
-  //SEG167 main::@42
-  b42:
+  //SEG166 [68] phi from main::@23 to main::@24 [phi:main::@23->main::@24]
+  b24_from_b23:
+    jmp b24
+  //SEG167 main::@24
+  b24:
   //SEG168 [69] call render_screen_swap 
     jsr render_screen_swap
-  //SEG169 [38] phi from main::@42 to main::@1 [phi:main::@42->main::@1]
-  b1_from_b42:
-  //SEG170 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@42->main::@1#0] -- register_copy 
-  //SEG171 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@42->main::@1#1] -- register_copy 
-  //SEG172 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@42->main::@1#2] -- register_copy 
-  //SEG173 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@42->main::@1#3] -- register_copy 
-  //SEG174 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@42->main::@1#4] -- register_copy 
-  //SEG175 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@42->main::@1#5] -- register_copy 
-  //SEG176 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@42->main::@1#6] -- register_copy 
-  //SEG177 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@42->main::@1#7] -- register_copy 
-  //SEG178 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@42->main::@1#8] -- register_copy 
-  //SEG179 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@42->main::@1#9] -- register_copy 
-  //SEG180 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@42->main::@1#10] -- register_copy 
-  //SEG181 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@42->main::@1#11] -- register_copy 
-  //SEG182 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@42->main::@1#12] -- register_copy 
-  //SEG183 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@42->main::@1#13] -- register_copy 
-  //SEG184 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@42->main::@1#14] -- register_copy 
-  //SEG185 [38] phi (byte) render_screen_render#18 = (byte) render_screen_render#11 [phi:main::@42->main::@1#15] -- register_copy 
-  //SEG186 [38] phi (byte) render_screen_show#16 = (byte) render_screen_show#13 [phi:main::@42->main::@1#16] -- register_copy 
+  //SEG169 [38] phi from main::@24 to main::@1 [phi:main::@24->main::@1]
+  b1_from_b24:
+  //SEG170 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@24->main::@1#0] -- register_copy 
+  //SEG171 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@24->main::@1#1] -- register_copy 
+  //SEG172 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@24->main::@1#2] -- register_copy 
+  //SEG173 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@24->main::@1#3] -- register_copy 
+  //SEG174 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@24->main::@1#4] -- register_copy 
+  //SEG175 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@24->main::@1#5] -- register_copy 
+  //SEG176 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@24->main::@1#6] -- register_copy 
+  //SEG177 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@24->main::@1#7] -- register_copy 
+  //SEG178 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@24->main::@1#8] -- register_copy 
+  //SEG179 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@24->main::@1#9] -- register_copy 
+  //SEG180 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@24->main::@1#10] -- register_copy 
+  //SEG181 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@24->main::@1#11] -- register_copy 
+  //SEG182 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@24->main::@1#12] -- register_copy 
+  //SEG183 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@24->main::@1#13] -- register_copy 
+  //SEG184 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@24->main::@1#14] -- register_copy 
+  //SEG185 [38] phi (byte) render_screen_render#18 = (byte) render_screen_render#11 [phi:main::@24->main::@1#15] -- register_copy 
+  //SEG186 [38] phi (byte) render_screen_show#16 = (byte) render_screen_show#13 [phi:main::@24->main::@1#16] -- register_copy 
     jmp b1
 }
 //SEG187 render_screen_swap
@@ -13390,33 +13518,33 @@ render_score: {
     .const lines_offset = $28*1+$16
     .const level_offset = $28*$13+$1f
     .label screen = 5
-  //SEG193 [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@2 -- vbuz1_eq_0_then_la1 
+  //SEG193 [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@1 -- vbuz1_eq_0_then_la1 
     lda render_screen_render
     cmp #0
-    beq b2_from_render_score
-  //SEG194 [74] phi from render_score to render_score::@3 [phi:render_score->render_score::@3]
-  b3_from_render_score:
-    jmp b3
-  //SEG195 render_score::@3
-  b3:
-  //SEG196 [75] phi from render_score::@3 to render_score::@2 [phi:render_score::@3->render_score::@2]
-  b2_from_b3:
-  //SEG197 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_score::@3->render_score::@2#0] -- pbuz1=pbuc1 
+    beq b1_from_render_score
+  //SEG194 [74] phi from render_score to render_score::@2 [phi:render_score->render_score::@2]
+  b2_from_render_score:
+    jmp b2
+  //SEG195 render_score::@2
+  b2:
+  //SEG196 [75] phi from render_score::@2 to render_score::@1 [phi:render_score::@2->render_score::@1]
+  b1_from_b2:
+  //SEG197 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_score::@2->render_score::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2
     sta screen
     lda #>PLAYFIELD_SCREEN_2
     sta screen+1
-    jmp b2
-  //SEG198 [75] phi from render_score to render_score::@2 [phi:render_score->render_score::@2]
-  b2_from_render_score:
-  //SEG199 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_score->render_score::@2#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG198 [75] phi from render_score to render_score::@1 [phi:render_score->render_score::@1]
+  b1_from_render_score:
+  //SEG199 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_score->render_score::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1
     sta screen
     lda #>PLAYFIELD_SCREEN_1
     sta screen+1
-    jmp b2
-  //SEG200 render_score::@2
-  b2:
+    jmp b1
+  //SEG200 render_score::@1
+  b1:
   //SEG201 [76] (byte*) render_bcd::screen#0 ← (byte*) render_score::screen#3 -- pbuz1=pbuz2 
     lda screen
     sta render_bcd.screen
@@ -13426,22 +13554,22 @@ render_score: {
     lda score_bytes+2
     sta render_bcd.bcd
   //SEG203 [78] call render_bcd 
-  //SEG204 [95] phi from render_score::@2 to render_bcd [phi:render_score::@2->render_bcd]
-  render_bcd_from_b2:
-  //SEG205 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#0 [phi:render_score::@2->render_bcd#0] -- register_copy 
-  //SEG206 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@2->render_bcd#1] -- vbuz1=vbuc1 
+  //SEG204 [95] phi from render_score::@1 to render_bcd [phi:render_score::@1->render_bcd]
+  render_bcd_from_b1:
+  //SEG205 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#0 [phi:render_score::@1->render_bcd#0] -- register_copy 
+  //SEG206 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@1->render_bcd#1] -- vbuz1=vbuc1 
     lda #0
     sta render_bcd.only_low
-  //SEG207 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0 [phi:render_score::@2->render_bcd#2] -- vwuz1=vwuc1 
+  //SEG207 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0 [phi:render_score::@1->render_bcd#2] -- vwuz1=vwuc1 
     lda #<score_offset
     sta render_bcd.offset
     lda #>score_offset
     sta render_bcd.offset+1
-  //SEG208 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#0 [phi:render_score::@2->render_bcd#3] -- register_copy 
+  //SEG208 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#0 [phi:render_score::@1->render_bcd#3] -- register_copy 
     jsr render_bcd
-    jmp b5
-  //SEG209 render_score::@5
-  b5:
+    jmp b3
+  //SEG209 render_score::@3
+  b3:
   //SEG210 [79] (byte*) render_bcd::screen#1 ← (byte*) render_score::screen#3 -- pbuz1=pbuz2 
     lda screen
     sta render_bcd.screen
@@ -13451,22 +13579,22 @@ render_score: {
     lda score_bytes+1
     sta render_bcd.bcd
   //SEG212 [81] call render_bcd 
-  //SEG213 [95] phi from render_score::@5 to render_bcd [phi:render_score::@5->render_bcd]
-  render_bcd_from_b5:
-  //SEG214 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#1 [phi:render_score::@5->render_bcd#0] -- register_copy 
-  //SEG215 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@5->render_bcd#1] -- vbuz1=vbuc1 
+  //SEG213 [95] phi from render_score::@3 to render_bcd [phi:render_score::@3->render_bcd]
+  render_bcd_from_b3:
+  //SEG214 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#1 [phi:render_score::@3->render_bcd#0] -- register_copy 
+  //SEG215 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@3->render_bcd#1] -- vbuz1=vbuc1 
     lda #0
     sta render_bcd.only_low
-  //SEG216 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:render_score::@5->render_bcd#2] -- vwuz1=vbuc1 
+  //SEG216 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:render_score::@3->render_bcd#2] -- vwuz1=vbuc1 
     lda #score_offset+2
     sta render_bcd.offset
     lda #0
     sta render_bcd.offset+1
-  //SEG217 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#1 [phi:render_score::@5->render_bcd#3] -- register_copy 
+  //SEG217 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#1 [phi:render_score::@3->render_bcd#3] -- register_copy 
     jsr render_bcd
-    jmp b6
-  //SEG218 render_score::@6
-  b6:
+    jmp b4
+  //SEG218 render_score::@4
+  b4:
   //SEG219 [82] (byte*) render_bcd::screen#2 ← (byte*) render_score::screen#3 -- pbuz1=pbuz2 
     lda screen
     sta render_bcd.screen
@@ -13476,22 +13604,22 @@ render_score: {
     lda score_bytes
     sta render_bcd.bcd
   //SEG221 [84] call render_bcd 
-  //SEG222 [95] phi from render_score::@6 to render_bcd [phi:render_score::@6->render_bcd]
-  render_bcd_from_b6:
-  //SEG223 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#2 [phi:render_score::@6->render_bcd#0] -- register_copy 
-  //SEG224 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@6->render_bcd#1] -- vbuz1=vbuc1 
+  //SEG222 [95] phi from render_score::@4 to render_bcd [phi:render_score::@4->render_bcd]
+  render_bcd_from_b4:
+  //SEG223 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#2 [phi:render_score::@4->render_bcd#0] -- register_copy 
+  //SEG224 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@4->render_bcd#1] -- vbuz1=vbuc1 
     lda #0
     sta render_bcd.only_low
-  //SEG225 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 4 [phi:render_score::@6->render_bcd#2] -- vwuz1=vbuc1 
+  //SEG225 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 4 [phi:render_score::@4->render_bcd#2] -- vwuz1=vbuc1 
     lda #score_offset+4
     sta render_bcd.offset
     lda #0
     sta render_bcd.offset+1
-  //SEG226 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#2 [phi:render_score::@6->render_bcd#3] -- register_copy 
+  //SEG226 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#2 [phi:render_score::@4->render_bcd#3] -- register_copy 
     jsr render_bcd
-    jmp b7
-  //SEG227 render_score::@7
-  b7:
+    jmp b5
+  //SEG227 render_score::@5
+  b5:
   //SEG228 [85] (byte) render_bcd::bcd#3 ← > (word) lines_bcd#15 -- vbuz1=_hi_vwuz2 
     lda lines_bcd+1
     sta render_bcd.bcd
@@ -13501,22 +13629,22 @@ render_score: {
     lda screen+1
     sta render_bcd.screen+1
   //SEG230 [87] call render_bcd 
-  //SEG231 [95] phi from render_score::@7 to render_bcd [phi:render_score::@7->render_bcd]
-  render_bcd_from_b7:
-  //SEG232 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#3 [phi:render_score::@7->render_bcd#0] -- register_copy 
-  //SEG233 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@7->render_bcd#1] -- vbuz1=vbuc1 
+  //SEG231 [95] phi from render_score::@5 to render_bcd [phi:render_score::@5->render_bcd]
+  render_bcd_from_b5:
+  //SEG232 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#3 [phi:render_score::@5->render_bcd#0] -- register_copy 
+  //SEG233 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@5->render_bcd#1] -- vbuz1=vbuc1 
     lda #1
     sta render_bcd.only_low
-  //SEG234 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0 [phi:render_score::@7->render_bcd#2] -- vwuz1=vwuc1 
+  //SEG234 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0 [phi:render_score::@5->render_bcd#2] -- vwuz1=vwuc1 
     lda #<lines_offset
     sta render_bcd.offset
     lda #>lines_offset
     sta render_bcd.offset+1
-  //SEG235 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#3 [phi:render_score::@7->render_bcd#3] -- register_copy 
+  //SEG235 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#3 [phi:render_score::@5->render_bcd#3] -- register_copy 
     jsr render_bcd
-    jmp b8
-  //SEG236 render_score::@8
-  b8:
+    jmp b6
+  //SEG236 render_score::@6
+  b6:
   //SEG237 [88] (byte) render_bcd::bcd#4 ← < (word) lines_bcd#15 -- vbuz1=_lo_vwuz2 
     lda lines_bcd
     sta render_bcd.bcd
@@ -13526,22 +13654,22 @@ render_score: {
     lda screen+1
     sta render_bcd.screen+1
   //SEG239 [90] call render_bcd 
-  //SEG240 [95] phi from render_score::@8 to render_bcd [phi:render_score::@8->render_bcd]
-  render_bcd_from_b8:
-  //SEG241 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#4 [phi:render_score::@8->render_bcd#0] -- register_copy 
-  //SEG242 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@8->render_bcd#1] -- vbuz1=vbuc1 
+  //SEG240 [95] phi from render_score::@6 to render_bcd [phi:render_score::@6->render_bcd]
+  render_bcd_from_b6:
+  //SEG241 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#4 [phi:render_score::@6->render_bcd#0] -- register_copy 
+  //SEG242 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@6->render_bcd#1] -- vbuz1=vbuc1 
     lda #0
     sta render_bcd.only_low
-  //SEG243 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@8->render_bcd#2] -- vwuz1=vbuc1 
+  //SEG243 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@6->render_bcd#2] -- vwuz1=vbuc1 
     lda #lines_offset+1
     sta render_bcd.offset
     lda #0
     sta render_bcd.offset+1
-  //SEG244 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#4 [phi:render_score::@8->render_bcd#3] -- register_copy 
+  //SEG244 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#4 [phi:render_score::@6->render_bcd#3] -- register_copy 
     jsr render_bcd
-    jmp b9
-  //SEG245 render_score::@9
-  b9:
+    jmp b7
+  //SEG245 render_score::@7
+  b7:
   //SEG246 [91] (byte*) render_bcd::screen#5 ← (byte*) render_score::screen#3 -- pbuz1=pbuz2 
     lda screen
     sta render_bcd.screen
@@ -13551,18 +13679,18 @@ render_score: {
     lda level_bcd
     sta render_bcd.bcd
   //SEG248 [93] call render_bcd 
-  //SEG249 [95] phi from render_score::@9 to render_bcd [phi:render_score::@9->render_bcd]
-  render_bcd_from_b9:
-  //SEG250 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#5 [phi:render_score::@9->render_bcd#0] -- register_copy 
-  //SEG251 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@9->render_bcd#1] -- vbuz1=vbuc1 
+  //SEG249 [95] phi from render_score::@7 to render_bcd [phi:render_score::@7->render_bcd]
+  render_bcd_from_b7:
+  //SEG250 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#5 [phi:render_score::@7->render_bcd#0] -- register_copy 
+  //SEG251 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@7->render_bcd#1] -- vbuz1=vbuc1 
     lda #0
     sta render_bcd.only_low
-  //SEG252 [95] phi (word) render_bcd::offset#6 = (const word) render_score::level_offset#0 [phi:render_score::@9->render_bcd#2] -- vwuz1=vwuc1 
+  //SEG252 [95] phi (word) render_bcd::offset#6 = (const word) render_score::level_offset#0 [phi:render_score::@7->render_bcd#2] -- vwuz1=vwuc1 
     lda #<level_offset
     sta render_bcd.offset
     lda #>level_offset
     sta render_bcd.offset+1
-  //SEG253 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#5 [phi:render_score::@9->render_bcd#3] -- register_copy 
+  //SEG253 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#5 [phi:render_score::@7->render_bcd#3] -- register_copy 
     jsr render_bcd
     jmp breturn
   //SEG254 render_score::@return
@@ -13668,33 +13796,33 @@ render_next: {
     .label screen_next_area = $14
     .label c = $16
     .label l = $11
-  //SEG274 [109] if((byte) render_screen_render#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@2 -- vbuz1_eq_0_then_la1 
+  //SEG274 [109] if((byte) render_screen_render#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@1 -- vbuz1_eq_0_then_la1 
     lda render_screen_render_15
     cmp #0
-    beq b2_from_render_next
-  //SEG275 [110] phi from render_next to render_next::@3 [phi:render_next->render_next::@3]
-  b3_from_render_next:
-    jmp b3
-  //SEG276 render_next::@3
-  b3:
-  //SEG277 [111] phi from render_next::@3 to render_next::@2 [phi:render_next::@3->render_next::@2]
-  b2_from_b3:
-  //SEG278 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_2#0+(const word) render_next::next_area_offset#0 [phi:render_next::@3->render_next::@2#0] -- pbuz1=pbuc1 
+    beq b1_from_render_next
+  //SEG275 [110] phi from render_next to render_next::@2 [phi:render_next->render_next::@2]
+  b2_from_render_next:
+    jmp b2
+  //SEG276 render_next::@2
+  b2:
+  //SEG277 [111] phi from render_next::@2 to render_next::@1 [phi:render_next::@2->render_next::@1]
+  b1_from_b2:
+  //SEG278 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_2#0+(const word) render_next::next_area_offset#0 [phi:render_next::@2->render_next::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2+next_area_offset
     sta screen_next_area
     lda #>PLAYFIELD_SCREEN_2+next_area_offset
     sta screen_next_area+1
-    jmp b2
-  //SEG279 [111] phi from render_next to render_next::@2 [phi:render_next->render_next::@2]
-  b2_from_render_next:
-  //SEG280 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_1#0+(const word) render_next::next_area_offset#0 [phi:render_next->render_next::@2#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG279 [111] phi from render_next to render_next::@1 [phi:render_next->render_next::@1]
+  b1_from_render_next:
+  //SEG280 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_1#0+(const word) render_next::next_area_offset#0 [phi:render_next->render_next::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1+next_area_offset
     sta screen_next_area
     lda #>PLAYFIELD_SCREEN_1+next_area_offset
     sta screen_next_area+1
-    jmp b2
-  //SEG281 render_next::@2
-  b2:
+    jmp b1
+  //SEG281 render_next::@1
+  b1:
   //SEG282 [112] (byte~) render_next::$4 ← (byte) next_piece_idx#12 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_rol_1 
     lda next_piece_idx_12
     asl
@@ -13709,38 +13837,38 @@ render_next: {
     sta next_piece_gfx
     lda PIECES+1,y
     sta next_piece_gfx+1
-  //SEG285 [115] phi from render_next::@2 to render_next::@5 [phi:render_next::@2->render_next::@5]
-  b5_from_b2:
-  //SEG286 [115] phi (byte) render_next::l#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@2->render_next::@5#0] -- vbuz1=vbuc1 
+  //SEG285 [115] phi from render_next::@1 to render_next::@3 [phi:render_next::@1->render_next::@3]
+  b3_from_b1:
+  //SEG286 [115] phi (byte) render_next::l#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@1->render_next::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta l
-  //SEG287 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#11 [phi:render_next::@2->render_next::@5#1] -- register_copy 
-  //SEG288 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*~) render_next::next_piece_gfx#9 [phi:render_next::@2->render_next::@5#2] -- register_copy 
-    jmp b5
-  //SEG289 [115] phi from render_next::@11 to render_next::@5 [phi:render_next::@11->render_next::@5]
-  b5_from_b11:
-  //SEG290 [115] phi (byte) render_next::l#7 = (byte) render_next::l#1 [phi:render_next::@11->render_next::@5#0] -- register_copy 
-  //SEG291 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#4 [phi:render_next::@11->render_next::@5#1] -- register_copy 
-  //SEG292 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@11->render_next::@5#2] -- register_copy 
-    jmp b5
-  //SEG293 render_next::@5
-  b5:
-  //SEG294 [116] phi from render_next::@5 to render_next::@6 [phi:render_next::@5->render_next::@6]
-  b6_from_b5:
-  //SEG295 [116] phi (byte) render_next::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@5->render_next::@6#0] -- vbuz1=vbuc1 
+  //SEG287 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#11 [phi:render_next::@1->render_next::@3#1] -- register_copy 
+  //SEG288 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*~) render_next::next_piece_gfx#9 [phi:render_next::@1->render_next::@3#2] -- register_copy 
+    jmp b3
+  //SEG289 [115] phi from render_next::@8 to render_next::@3 [phi:render_next::@8->render_next::@3]
+  b3_from_b8:
+  //SEG290 [115] phi (byte) render_next::l#7 = (byte) render_next::l#1 [phi:render_next::@8->render_next::@3#0] -- register_copy 
+  //SEG291 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#4 [phi:render_next::@8->render_next::@3#1] -- register_copy 
+  //SEG292 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@8->render_next::@3#2] -- register_copy 
+    jmp b3
+  //SEG293 render_next::@3
+  b3:
+  //SEG294 [116] phi from render_next::@3 to render_next::@4 [phi:render_next::@3->render_next::@4]
+  b4_from_b3:
+  //SEG295 [116] phi (byte) render_next::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@3->render_next::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta c
-  //SEG296 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#10 [phi:render_next::@5->render_next::@6#1] -- register_copy 
-  //SEG297 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#3 [phi:render_next::@5->render_next::@6#2] -- register_copy 
-    jmp b6
-  //SEG298 [116] phi from render_next::@8 to render_next::@6 [phi:render_next::@8->render_next::@6]
-  b6_from_b8:
-  //SEG299 [116] phi (byte) render_next::c#2 = (byte) render_next::c#1 [phi:render_next::@8->render_next::@6#0] -- register_copy 
-  //SEG300 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#3 [phi:render_next::@8->render_next::@6#1] -- register_copy 
-  //SEG301 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@8->render_next::@6#2] -- register_copy 
-    jmp b6
-  //SEG302 render_next::@6
-  b6:
+  //SEG296 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#10 [phi:render_next::@3->render_next::@4#1] -- register_copy 
+  //SEG297 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#3 [phi:render_next::@3->render_next::@4#2] -- register_copy 
+    jmp b4
+  //SEG298 [116] phi from render_next::@6 to render_next::@4 [phi:render_next::@6->render_next::@4]
+  b4_from_b6:
+  //SEG299 [116] phi (byte) render_next::c#2 = (byte) render_next::c#1 [phi:render_next::@6->render_next::@4#0] -- register_copy 
+  //SEG300 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#3 [phi:render_next::@6->render_next::@4#1] -- register_copy 
+  //SEG301 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@6->render_next::@4#2] -- register_copy 
+    jmp b4
+  //SEG302 render_next::@4
+  b4:
   //SEG303 [117] (byte) render_next::cell#0 ← *((byte*) render_next::next_piece_gfx#2) -- vbuz1=_deref_pbuz2 
     ldy #0
     lda (next_piece_gfx),y
@@ -13750,20 +13878,20 @@ render_next: {
     bne !+
     inc next_piece_gfx+1
   !:
-  //SEG305 [119] if((byte) render_next::cell#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@7 -- vbuz1_neq_0_then_la1 
+  //SEG305 [119] if((byte) render_next::cell#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@5 -- vbuz1_neq_0_then_la1 
     lda cell
     cmp #0
-    bne b7
-    jmp b9
-  //SEG306 render_next::@9
-  b9:
+    bne b5
+    jmp b7
+  //SEG306 render_next::@7
+  b7:
   //SEG307 [120] *((byte*) render_next::screen_next_area#5) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuz1=vbuc1 
     lda #0
     ldy #0
     sta (screen_next_area),y
-    jmp b8
-  //SEG308 render_next::@8
-  b8:
+    jmp b6
+  //SEG308 render_next::@6
+  b6:
   //SEG309 [121] (byte*) render_next::screen_next_area#3 ← ++ (byte*) render_next::screen_next_area#5 -- pbuz1=_inc_pbuz1 
     inc screen_next_area
     bne !+
@@ -13771,13 +13899,13 @@ render_next: {
   !:
   //SEG310 [122] (byte) render_next::c#1 ← ++ (byte) render_next::c#2 -- vbuz1=_inc_vbuz1 
     inc c
-  //SEG311 [123] if((byte) render_next::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG311 [123] if((byte) render_next::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp c
-    bne b6_from_b8
-    jmp b11
-  //SEG312 render_next::@11
-  b11:
+    bne b4_from_b6
+    jmp b8
+  //SEG312 render_next::@8
+  b8:
   //SEG313 [124] (byte*) render_next::screen_next_area#4 ← (byte*) render_next::screen_next_area#3 + (byte/signed byte/word/signed word/dword/signed dword) $24 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$24
     clc
@@ -13788,22 +13916,22 @@ render_next: {
   !:
   //SEG314 [125] (byte) render_next::l#1 ← ++ (byte) render_next::l#7 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG315 [126] if((byte) render_next::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@5 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG315 [126] if((byte) render_next::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp l
-    bne b5_from_b11
+    bne b3_from_b8
     jmp breturn
   //SEG316 render_next::@return
   breturn:
   //SEG317 [127] return 
     rts
-  //SEG318 render_next::@7
-  b7:
+  //SEG318 render_next::@5
+  b5:
   //SEG319 [128] *((byte*) render_next::screen_next_area#5) ← (byte) render_next::next_piece_char#0 -- _deref_pbuz1=vbuz2 
     lda next_piece_char
     ldy #0
     sta (screen_next_area),y
-    jmp b8
+    jmp b6
 }
 //SEG320 render_moving
 // Render the current moving piece at position (current_xpos, current_ypos)
@@ -13843,17 +13971,17 @@ render_moving: {
     lda #2
     cmp ypos2
     bcc b2
-    jmp b8
-  //SEG332 render_moving::@8
-  b8:
+    jmp b7
+  //SEG332 render_moving::@7
+  b7:
   //SEG333 [133] (byte) render_moving::i#1 ← (byte) render_moving::i#3 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax i
     axs #-[4]
     stx i
-  //SEG334 [134] phi from render_moving::@5 render_moving::@8 to render_moving::@3 [phi:render_moving::@5/render_moving::@8->render_moving::@3]
+  //SEG334 [134] phi from render_moving::@5 render_moving::@7 to render_moving::@3 [phi:render_moving::@5/render_moving::@7->render_moving::@3]
   b3_from_b5:
-  b3_from_b8:
-  //SEG335 [134] phi (byte) render_moving::i#8 = (byte) render_moving::i#2 [phi:render_moving::@5/render_moving::@8->render_moving::@3#0] -- register_copy 
+  b3_from_b7:
+  //SEG335 [134] phi (byte) render_moving::i#8 = (byte) render_moving::i#2 [phi:render_moving::@5/render_moving::@7->render_moving::@3#0] -- register_copy 
     jmp b3
   //SEG336 render_moving::@3
   b3:
@@ -14046,9 +14174,9 @@ play_movement: {
   //SEG397 [166] (byte) play_move_down::return#0 ← (byte) play_move_down::return#3 -- vbuz1=vbuz2 
     lda play_move_down.return_3
     sta play_move_down.return
-    jmp b5
-  //SEG398 play_movement::@5
-  b5:
+    jmp b2
+  //SEG398 play_movement::@2
+  b2:
   //SEG399 [167] (byte~) play_movement::$0 ← (byte) play_move_down::return#0 -- vbuz1=vbuz2 
     lda play_move_down.return
     sta _0
@@ -14060,13 +14188,13 @@ play_movement: {
     lda game_over
     cmp #0
     beq b1
-  //SEG402 [170] phi from play_movement::@5 play_movement::@7 to play_movement::@return [phi:play_movement::@5/play_movement::@7->play_movement::@return]
-  breturn_from_b5:
-  breturn_from_b7:
-  //SEG403 [170] phi (byte) current_xpos#19 = (byte) current_xpos#22 [phi:play_movement::@5/play_movement::@7->play_movement::@return#0] -- register_copy 
-  //SEG404 [170] phi (byte*) current_piece_gfx#18 = (byte*) current_piece_gfx#20 [phi:play_movement::@5/play_movement::@7->play_movement::@return#1] -- register_copy 
-  //SEG405 [170] phi (byte) current_orientation#17 = (byte) current_orientation#20 [phi:play_movement::@5/play_movement::@7->play_movement::@return#2] -- register_copy 
-  //SEG406 [170] phi (byte) play_movement::return#2 = (byte) play_movement::render#1 [phi:play_movement::@5/play_movement::@7->play_movement::@return#3] -- register_copy 
+  //SEG402 [170] phi from play_movement::@2 play_movement::@4 to play_movement::@return [phi:play_movement::@2/play_movement::@4->play_movement::@return]
+  breturn_from_b2:
+  breturn_from_b4:
+  //SEG403 [170] phi (byte) current_xpos#19 = (byte) current_xpos#22 [phi:play_movement::@2/play_movement::@4->play_movement::@return#0] -- register_copy 
+  //SEG404 [170] phi (byte*) current_piece_gfx#18 = (byte*) current_piece_gfx#20 [phi:play_movement::@2/play_movement::@4->play_movement::@return#1] -- register_copy 
+  //SEG405 [170] phi (byte) current_orientation#17 = (byte) current_orientation#20 [phi:play_movement::@2/play_movement::@4->play_movement::@return#2] -- register_copy 
+  //SEG406 [170] phi (byte) play_movement::return#2 = (byte) play_movement::render#1 [phi:play_movement::@2/play_movement::@4->play_movement::@return#3] -- register_copy 
     jmp breturn
   //SEG407 play_movement::@return
   breturn:
@@ -14082,9 +14210,9 @@ play_movement: {
   //SEG412 [174] (byte) play_move_leftright::return#0 ← (byte) play_move_leftright::return#2 -- vbuz1=vbuz2 
     lda play_move_leftright.return_2
     sta play_move_leftright.return
-    jmp b6
-  //SEG413 play_movement::@6
-  b6:
+    jmp b3
+  //SEG413 play_movement::@3
+  b3:
   //SEG414 [175] (byte~) play_movement::$3 ← (byte) play_move_leftright::return#0 -- vbuz1=vbuz2 
     lda play_move_leftright.return
     sta _3
@@ -14101,9 +14229,9 @@ play_movement: {
   //SEG418 [179] (byte) play_move_rotate::return#0 ← (byte) play_move_rotate::return#2 -- vbuz1=vbuz2 
     lda play_move_rotate.return_2
     sta play_move_rotate.return
-    jmp b7
-  //SEG419 play_movement::@7
-  b7:
+    jmp b4
+  //SEG419 play_movement::@4
+  b4:
   //SEG420 [180] (byte~) play_movement::$4 ← (byte) play_move_rotate::return#0 -- vbuz1=vbuz2 
     lda play_move_rotate.return
     sta _4
@@ -14112,7 +14240,7 @@ play_movement: {
     clc
     adc _4
     sta return
-    jmp breturn_from_b7
+    jmp breturn_from_b4
 }
 //SEG422 play_move_rotate
 // Rotate the current piece  based on key-presses
@@ -14130,19 +14258,19 @@ play_move_rotate: {
     lda #KEY_Z
     cmp key_event
     beq b1
-    jmp b6
-  //SEG424 play_move_rotate::@6
-  b6:
+    jmp b4
+  //SEG424 play_move_rotate::@4
+  b4:
   //SEG425 [183] if((byte) play_move_rotate::key_event#0==(const byte) KEY_X#0) goto play_move_rotate::@2 -- vbuz1_eq_vbuc1_then_la1 
     lda #KEY_X
     cmp key_event
     beq b2
-  //SEG426 [184] phi from play_move_rotate::@14 play_move_rotate::@6 to play_move_rotate::@return [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return]
-  breturn_from_b14:
+  //SEG426 [184] phi from play_move_rotate::@4 play_move_rotate::@6 to play_move_rotate::@return [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return]
+  breturn_from_b4:
   breturn_from_b6:
-  //SEG427 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#20 [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return#0] -- register_copy 
-  //SEG428 [184] phi (byte) current_orientation#25 = (byte) current_orientation#20 [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return#1] -- register_copy 
-  //SEG429 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return#2] -- vbuz1=vbuc1 
+  //SEG427 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#20 [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return#0] -- register_copy 
+  //SEG428 [184] phi (byte) current_orientation#25 = (byte) current_orientation#20 [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return#1] -- register_copy 
+  //SEG429 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return#2] -- vbuz1=vbuc1 
     lda #0
     sta return_2
     jmp breturn
@@ -14160,13 +14288,13 @@ play_move_rotate: {
     lda #$3f
     and _5
     sta orientation
-  //SEG435 [188] phi from play_move_rotate::@1 play_move_rotate::@2 to play_move_rotate::@4 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@4]
-  b4_from_b1:
-  b4_from_b2:
-  //SEG436 [188] phi (byte) play_move_rotate::orientation#3 = (byte) play_move_rotate::orientation#1 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@4#0] -- register_copy 
-    jmp b4
-  //SEG437 play_move_rotate::@4
-  b4:
+  //SEG435 [188] phi from play_move_rotate::@1 play_move_rotate::@2 to play_move_rotate::@3 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@3]
+  b3_from_b1:
+  b3_from_b2:
+  //SEG436 [188] phi (byte) play_move_rotate::orientation#3 = (byte) play_move_rotate::orientation#1 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@3#0] -- register_copy 
+    jmp b3
+  //SEG437 play_move_rotate::@3
+  b3:
   //SEG438 [189] (byte) play_collision::xpos#3 ← (byte) current_xpos#26 -- vbuz1=vbuz2 
     lda current_xpos
     sta play_collision.xpos
@@ -14182,29 +14310,29 @@ play_move_rotate: {
     lda current_piece+1
     sta current_piece_101+1
   //SEG442 [193] call play_collision 
-  //SEG443 [201] phi from play_move_rotate::@4 to play_collision [phi:play_move_rotate::@4->play_collision]
-  play_collision_from_b4:
-  //SEG444 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#3 [phi:play_move_rotate::@4->play_collision#0] -- register_copy 
-  //SEG445 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#3 [phi:play_move_rotate::@4->play_collision#1] -- register_copy 
-  //SEG446 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#3 [phi:play_move_rotate::@4->play_collision#2] -- register_copy 
-  //SEG447 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#101 [phi:play_move_rotate::@4->play_collision#3] -- register_copy 
+  //SEG443 [201] phi from play_move_rotate::@3 to play_collision [phi:play_move_rotate::@3->play_collision]
+  play_collision_from_b3:
+  //SEG444 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#3 [phi:play_move_rotate::@3->play_collision#0] -- register_copy 
+  //SEG445 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#3 [phi:play_move_rotate::@3->play_collision#1] -- register_copy 
+  //SEG446 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#3 [phi:play_move_rotate::@3->play_collision#2] -- register_copy 
+  //SEG447 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#101 [phi:play_move_rotate::@3->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG448 [194] (byte) play_collision::return#14 ← (byte) play_collision::return#15 -- vbuz1=vbuz2 
     lda play_collision.return_15
     sta play_collision.return_14
-    jmp b14
-  //SEG449 play_move_rotate::@14
-  b14:
+    jmp b6
+  //SEG449 play_move_rotate::@6
+  b6:
   //SEG450 [195] (byte~) play_move_rotate::$2 ← (byte) play_collision::return#14 -- vbuz1=vbuz2 
     lda play_collision.return_14
     sta _2
   //SEG451 [196] if((byte~) play_move_rotate::$2!=(const byte) COLLISION_NONE#0) goto play_move_rotate::@return -- vbuz1_neq_vbuc1_then_la1 
     lda #COLLISION_NONE
     cmp _2
-    bne breturn_from_b14
-    jmp b11
-  //SEG452 play_move_rotate::@11
-  b11:
+    bne breturn_from_b6
+    jmp b5
+  //SEG452 play_move_rotate::@5
+  b5:
   //SEG453 [197] (byte) current_orientation#7 ← (byte) play_move_rotate::orientation#3 -- vbuz1=vbuz2 
     lda orientation
     sta current_orientation
@@ -14216,11 +14344,11 @@ play_move_rotate: {
     lda #0
     adc current_piece+1
     sta current_piece_gfx+1
-  //SEG455 [184] phi from play_move_rotate::@11 to play_move_rotate::@return [phi:play_move_rotate::@11->play_move_rotate::@return]
-  breturn_from_b11:
-  //SEG456 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#7 [phi:play_move_rotate::@11->play_move_rotate::@return#0] -- register_copy 
-  //SEG457 [184] phi (byte) current_orientation#25 = (byte) current_orientation#7 [phi:play_move_rotate::@11->play_move_rotate::@return#1] -- register_copy 
-  //SEG458 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_rotate::@11->play_move_rotate::@return#2] -- vbuz1=vbuc1 
+  //SEG455 [184] phi from play_move_rotate::@5 to play_move_rotate::@return [phi:play_move_rotate::@5->play_move_rotate::@return]
+  breturn_from_b5:
+  //SEG456 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#7 [phi:play_move_rotate::@5->play_move_rotate::@return#0] -- register_copy 
+  //SEG457 [184] phi (byte) current_orientation#25 = (byte) current_orientation#7 [phi:play_move_rotate::@5->play_move_rotate::@return#1] -- register_copy 
+  //SEG458 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_rotate::@5->play_move_rotate::@return#2] -- vbuz1=vbuc1 
     lda #1
     sta return_2
     jmp breturn
@@ -14234,7 +14362,7 @@ play_move_rotate: {
     lda #$3f
     and _7
     sta orientation
-    jmp b4_from_b1
+    jmp b3_from_b1
 }
 //SEG462 play_collision
 // Test if there is a collision between the current piece moved to (x, y) and anything on the playfield or the playfield boundaries
@@ -14314,16 +14442,16 @@ play_collision: {
     lda (piece_gfx),y
     cmp #0
     beq b3
-    jmp b14
-  //SEG479 play_collision::@14
-  b14:
+    jmp b7
+  //SEG479 play_collision::@7
+  b7:
   //SEG480 [210] if((byte) play_collision::ypos2#2<(byte/signed byte/word/signed word/dword/signed dword) 2*(const byte) PLAYFIELD_LINES#0) goto play_collision::@4 -- vbuz1_lt_vbuc1_then_la1 
     lda ypos2
     cmp #2*PLAYFIELD_LINES
     bcc b4
-  //SEG481 [211] phi from play_collision::@14 to play_collision::@return [phi:play_collision::@14->play_collision::@return]
-  breturn_from_b14:
-  //SEG482 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_BOTTOM#0 [phi:play_collision::@14->play_collision::@return#0] -- vbuz1=vbuc1 
+  //SEG481 [211] phi from play_collision::@7 to play_collision::@return [phi:play_collision::@7->play_collision::@return]
+  breturn_from_b7:
+  //SEG482 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_BOTTOM#0 [phi:play_collision::@7->play_collision::@return#0] -- vbuz1=vbuc1 
     lda #COLLISION_BOTTOM
     sta return_15
     jmp breturn
@@ -14378,13 +14506,13 @@ play_collision: {
     inc col
   //SEG500 [218] (byte) play_collision::c#1 ← ++ (byte) play_collision::c#2 -- vbuz1=_inc_vbuz1 
     inc c
-  //SEG501 [219] if((byte) play_collision::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@21 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG501 [219] if((byte) play_collision::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@10 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp c
-    bne b21
-    jmp b17
-  //SEG502 play_collision::@17
-  b17:
+    bne b10
+    jmp b8
+  //SEG502 play_collision::@8
+  b8:
   //SEG503 [220] (byte) play_collision::ypos2#1 ← (byte) play_collision::ypos2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda ypos2
     clc
@@ -14392,37 +14520,37 @@ play_collision: {
     sta ypos2
   //SEG504 [221] (byte) play_collision::l#1 ← ++ (byte) play_collision::l#6 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG505 [222] if((byte) play_collision::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@20 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG505 [222] if((byte) play_collision::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp l
-    bne b20
-  //SEG506 [211] phi from play_collision::@17 to play_collision::@return [phi:play_collision::@17->play_collision::@return]
-  breturn_from_b17:
-  //SEG507 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_NONE#0 [phi:play_collision::@17->play_collision::@return#0] -- vbuz1=vbuc1 
+    bne b9
+  //SEG506 [211] phi from play_collision::@8 to play_collision::@return [phi:play_collision::@8->play_collision::@return]
+  breturn_from_b8:
+  //SEG507 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_NONE#0 [phi:play_collision::@8->play_collision::@return#0] -- vbuz1=vbuc1 
     lda #COLLISION_NONE
     sta return_15
     jmp breturn
-  //SEG508 play_collision::@20
-  b20:
+  //SEG508 play_collision::@9
+  b9:
   //SEG509 [223] (byte~) play_collision::i#11 ← (byte) play_collision::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_11
-  //SEG510 [204] phi from play_collision::@20 to play_collision::@1 [phi:play_collision::@20->play_collision::@1]
-  b1_from_b20:
-  //SEG511 [204] phi (byte) play_collision::l#6 = (byte) play_collision::l#1 [phi:play_collision::@20->play_collision::@1#0] -- register_copy 
-  //SEG512 [204] phi (byte) play_collision::i#3 = (byte~) play_collision::i#11 [phi:play_collision::@20->play_collision::@1#1] -- register_copy 
-  //SEG513 [204] phi (byte) play_collision::ypos2#2 = (byte) play_collision::ypos2#1 [phi:play_collision::@20->play_collision::@1#2] -- register_copy 
+  //SEG510 [204] phi from play_collision::@9 to play_collision::@1 [phi:play_collision::@9->play_collision::@1]
+  b1_from_b9:
+  //SEG511 [204] phi (byte) play_collision::l#6 = (byte) play_collision::l#1 [phi:play_collision::@9->play_collision::@1#0] -- register_copy 
+  //SEG512 [204] phi (byte) play_collision::i#3 = (byte~) play_collision::i#11 [phi:play_collision::@9->play_collision::@1#1] -- register_copy 
+  //SEG513 [204] phi (byte) play_collision::ypos2#2 = (byte) play_collision::ypos2#1 [phi:play_collision::@9->play_collision::@1#2] -- register_copy 
     jmp b1
-  //SEG514 play_collision::@21
-  b21:
+  //SEG514 play_collision::@10
+  b10:
   //SEG515 [224] (byte~) play_collision::i#13 ← (byte) play_collision::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_13
-  //SEG516 [207] phi from play_collision::@21 to play_collision::@2 [phi:play_collision::@21->play_collision::@2]
-  b2_from_b21:
-  //SEG517 [207] phi (byte) play_collision::c#2 = (byte) play_collision::c#1 [phi:play_collision::@21->play_collision::@2#0] -- register_copy 
-  //SEG518 [207] phi (byte) play_collision::col#2 = (byte) play_collision::col#1 [phi:play_collision::@21->play_collision::@2#1] -- register_copy 
-  //SEG519 [207] phi (byte) play_collision::i#2 = (byte~) play_collision::i#13 [phi:play_collision::@21->play_collision::@2#2] -- register_copy 
+  //SEG516 [207] phi from play_collision::@10 to play_collision::@2 [phi:play_collision::@10->play_collision::@2]
+  b2_from_b10:
+  //SEG517 [207] phi (byte) play_collision::c#2 = (byte) play_collision::c#1 [phi:play_collision::@10->play_collision::@2#0] -- register_copy 
+  //SEG518 [207] phi (byte) play_collision::col#2 = (byte) play_collision::col#1 [phi:play_collision::@10->play_collision::@2#1] -- register_copy 
+  //SEG519 [207] phi (byte) play_collision::i#2 = (byte~) play_collision::i#13 [phi:play_collision::@10->play_collision::@2#2] -- register_copy 
     jmp b2
 }
 //SEG520 play_move_leftright
@@ -14440,16 +14568,16 @@ play_move_leftright: {
     lda #KEY_COMMA
     cmp key_event
     beq b1
-    jmp b4
-  //SEG522 play_move_leftright::@4
-  b4:
+    jmp b2
+  //SEG522 play_move_leftright::@2
+  b2:
   //SEG523 [226] if((byte) play_move_leftright::key_event#0!=(const byte) KEY_DOT#0) goto play_move_leftright::@return -- vbuz1_neq_vbuc1_then_la1 
     lda #KEY_DOT
     cmp key_event
-    bne breturn_from_b4
-    jmp b5
-  //SEG524 play_move_leftright::@5
-  b5:
+    bne breturn_from_b2
+    jmp b3
+  //SEG524 play_move_leftright::@3
+  b3:
   //SEG525 [227] (byte) play_collision::xpos#2 ← (byte) current_xpos#22 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_plus_1 
     ldy current_xpos
     iny
@@ -14466,45 +14594,45 @@ play_move_leftright: {
     lda current_piece+1
     sta current_piece_100+1
   //SEG529 [231] call play_collision 
-  //SEG530 [201] phi from play_move_leftright::@5 to play_collision [phi:play_move_leftright::@5->play_collision]
-  play_collision_from_b5:
-  //SEG531 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#2 [phi:play_move_leftright::@5->play_collision#0] -- register_copy 
-  //SEG532 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#2 [phi:play_move_leftright::@5->play_collision#1] -- register_copy 
-  //SEG533 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#2 [phi:play_move_leftright::@5->play_collision#2] -- register_copy 
-  //SEG534 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#100 [phi:play_move_leftright::@5->play_collision#3] -- register_copy 
+  //SEG530 [201] phi from play_move_leftright::@3 to play_collision [phi:play_move_leftright::@3->play_collision]
+  play_collision_from_b3:
+  //SEG531 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#2 [phi:play_move_leftright::@3->play_collision#0] -- register_copy 
+  //SEG532 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#2 [phi:play_move_leftright::@3->play_collision#1] -- register_copy 
+  //SEG533 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#2 [phi:play_move_leftright::@3->play_collision#2] -- register_copy 
+  //SEG534 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#100 [phi:play_move_leftright::@3->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG535 [232] (byte) play_collision::return#13 ← (byte) play_collision::return#15 -- vbuz1=vbuz2 
     lda play_collision.return_15
     sta play_collision.return_13
-    jmp b15
-  //SEG536 play_move_leftright::@15
-  b15:
+    jmp b7
+  //SEG536 play_move_leftright::@7
+  b7:
   //SEG537 [233] (byte~) play_move_leftright::$4 ← (byte) play_collision::return#13 -- vbuz1=vbuz2 
     lda play_collision.return_13
     sta _4
   //SEG538 [234] if((byte~) play_move_leftright::$4!=(const byte) COLLISION_NONE#0) goto play_move_leftright::@return -- vbuz1_neq_vbuc1_then_la1 
     lda #COLLISION_NONE
     cmp _4
-    bne breturn_from_b15
-    jmp b6
-  //SEG539 play_move_leftright::@6
-  b6:
+    bne breturn_from_b7
+    jmp b4
+  //SEG539 play_move_leftright::@4
+  b4:
   //SEG540 [235] (byte) current_xpos#6 ← ++ (byte) current_xpos#22 -- vbuz1=_inc_vbuz1 
     inc current_xpos
-  //SEG541 [236] phi from play_move_leftright::@6 play_move_leftright::@9 to play_move_leftright::@return [phi:play_move_leftright::@6/play_move_leftright::@9->play_move_leftright::@return]
-  breturn_from_b6:
-  breturn_from_b9:
-  //SEG542 [236] phi (byte) current_xpos#26 = (byte) current_xpos#6 [phi:play_move_leftright::@6/play_move_leftright::@9->play_move_leftright::@return#0] -- register_copy 
-  //SEG543 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_leftright::@6/play_move_leftright::@9->play_move_leftright::@return#1] -- vbuz1=vbuc1 
+  //SEG541 [236] phi from play_move_leftright::@4 play_move_leftright::@5 to play_move_leftright::@return [phi:play_move_leftright::@4/play_move_leftright::@5->play_move_leftright::@return]
+  breturn_from_b4:
+  breturn_from_b5:
+  //SEG542 [236] phi (byte) current_xpos#26 = (byte) current_xpos#6 [phi:play_move_leftright::@4/play_move_leftright::@5->play_move_leftright::@return#0] -- register_copy 
+  //SEG543 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_leftright::@4/play_move_leftright::@5->play_move_leftright::@return#1] -- vbuz1=vbuc1 
     lda #1
     sta return_2
     jmp breturn
-  //SEG544 [236] phi from play_move_leftright::@14 play_move_leftright::@15 play_move_leftright::@4 to play_move_leftright::@return [phi:play_move_leftright::@14/play_move_leftright::@15/play_move_leftright::@4->play_move_leftright::@return]
-  breturn_from_b14:
-  breturn_from_b15:
-  breturn_from_b4:
-  //SEG545 [236] phi (byte) current_xpos#26 = (byte) current_xpos#22 [phi:play_move_leftright::@14/play_move_leftright::@15/play_move_leftright::@4->play_move_leftright::@return#0] -- register_copy 
-  //SEG546 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_leftright::@14/play_move_leftright::@15/play_move_leftright::@4->play_move_leftright::@return#1] -- vbuz1=vbuc1 
+  //SEG544 [236] phi from play_move_leftright::@2 play_move_leftright::@6 play_move_leftright::@7 to play_move_leftright::@return [phi:play_move_leftright::@2/play_move_leftright::@6/play_move_leftright::@7->play_move_leftright::@return]
+  breturn_from_b2:
+  breturn_from_b6:
+  breturn_from_b7:
+  //SEG545 [236] phi (byte) current_xpos#26 = (byte) current_xpos#22 [phi:play_move_leftright::@2/play_move_leftright::@6/play_move_leftright::@7->play_move_leftright::@return#0] -- register_copy 
+  //SEG546 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_leftright::@2/play_move_leftright::@6/play_move_leftright::@7->play_move_leftright::@return#1] -- vbuz1=vbuc1 
     lda #0
     sta return_2
     jmp breturn
@@ -14540,22 +14668,22 @@ play_move_leftright: {
   //SEG560 [243] (byte) play_collision::return#1 ← (byte) play_collision::return#15 -- vbuz1=vbuz2 
     lda play_collision.return_15
     sta play_collision.return_1
-    jmp b14
-  //SEG561 play_move_leftright::@14
-  b14:
+    jmp b6
+  //SEG561 play_move_leftright::@6
+  b6:
   //SEG562 [244] (byte~) play_move_leftright::$8 ← (byte) play_collision::return#1 -- vbuz1=vbuz2 
     lda play_collision.return_1
     sta _8
   //SEG563 [245] if((byte~) play_move_leftright::$8!=(const byte) COLLISION_NONE#0) goto play_move_leftright::@return -- vbuz1_neq_vbuc1_then_la1 
     lda #COLLISION_NONE
     cmp _8
-    bne breturn_from_b14
-    jmp b9
-  //SEG564 play_move_leftright::@9
-  b9:
+    bne breturn_from_b6
+    jmp b5
+  //SEG564 play_move_leftright::@5
+  b5:
   //SEG565 [246] (byte) current_xpos#8 ← -- (byte) current_xpos#22 -- vbuz1=_dec_vbuz1 
     dec current_xpos
-    jmp breturn_from_b9
+    jmp breturn_from_b5
 }
 //SEG566 play_move_down
 // Move down the current piece
@@ -14575,14 +14703,14 @@ play_move_down: {
     lda #KEY_SPACE
     cmp key_event
     bne b1_from_play_move_down
-  //SEG569 [249] phi from play_move_down to play_move_down::@5 [phi:play_move_down->play_move_down::@5]
-  b5_from_play_move_down:
-    jmp b5
-  //SEG570 play_move_down::@5
-  b5:
-  //SEG571 [250] phi from play_move_down::@5 to play_move_down::@1 [phi:play_move_down::@5->play_move_down::@1]
-  b1_from_b5:
-  //SEG572 [250] phi (byte) play_move_down::movedown#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@5->play_move_down::@1#0] -- vbuz1=vbuc1 
+  //SEG569 [249] phi from play_move_down to play_move_down::@4 [phi:play_move_down->play_move_down::@4]
+  b4_from_play_move_down:
+    jmp b4
+  //SEG570 play_move_down::@4
+  b4:
+  //SEG571 [250] phi from play_move_down::@4 to play_move_down::@1 [phi:play_move_down::@4->play_move_down::@1]
+  b1_from_b4:
+  //SEG572 [250] phi (byte) play_move_down::movedown#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@4->play_move_down::@1#0] -- vbuz1=vbuc1 
     lda #1
     sta movedown
     jmp b1
@@ -14604,33 +14732,33 @@ play_move_down: {
   //SEG579 [252] (byte) keyboard_event_pressed::return#12 ← (byte) keyboard_event_pressed::return#11 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_11
     sta keyboard_event_pressed.return_12
-    jmp b17
-  //SEG580 play_move_down::@17
-  b17:
+    jmp b12
+  //SEG580 play_move_down::@12
+  b12:
   //SEG581 [253] (byte~) play_move_down::$2 ← (byte) keyboard_event_pressed::return#12 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_12
     sta _2
   //SEG582 [254] if((byte~) play_move_down::$2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_move_down::@2 -- vbuz1_eq_0_then_la1 
     lda _2
     cmp #0
-    beq b2_from_b17
-    jmp b6
-  //SEG583 play_move_down::@6
-  b6:
+    beq b2_from_b12
+    jmp b5
+  //SEG583 play_move_down::@5
+  b5:
   //SEG584 [255] if((byte) current_movedown_counter#12<(const byte) current_movedown_fast#0) goto play_move_down::@2 -- vbuz1_lt_vbuc1_then_la1 
     lda current_movedown_counter
     cmp #current_movedown_fast
-    bcc b2_from_b6
-    jmp b7
-  //SEG585 play_move_down::@7
-  b7:
+    bcc b2_from_b5
+    jmp b6
+  //SEG585 play_move_down::@6
+  b6:
   //SEG586 [256] (byte) play_move_down::movedown#2 ← ++ (byte) play_move_down::movedown#10 -- vbuz1=_inc_vbuz1 
     inc movedown
-  //SEG587 [257] phi from play_move_down::@17 play_move_down::@6 play_move_down::@7 to play_move_down::@2 [phi:play_move_down::@17/play_move_down::@6/play_move_down::@7->play_move_down::@2]
-  b2_from_b17:
+  //SEG587 [257] phi from play_move_down::@12 play_move_down::@5 play_move_down::@6 to play_move_down::@2 [phi:play_move_down::@12/play_move_down::@5/play_move_down::@6->play_move_down::@2]
+  b2_from_b12:
+  b2_from_b5:
   b2_from_b6:
-  b2_from_b7:
-  //SEG588 [257] phi (byte) play_move_down::movedown#7 = (byte) play_move_down::movedown#10 [phi:play_move_down::@17/play_move_down::@6/play_move_down::@7->play_move_down::@2#0] -- register_copy 
+  //SEG588 [257] phi (byte) play_move_down::movedown#7 = (byte) play_move_down::movedown#10 [phi:play_move_down::@12/play_move_down::@5/play_move_down::@6->play_move_down::@2#0] -- register_copy 
     jmp b2
   //SEG589 play_move_down::@2
   b2:
@@ -14638,15 +14766,15 @@ play_move_down: {
     lda current_movedown_counter
     cmp current_movedown_slow
     bcc b3_from_b2
-    jmp b8
-  //SEG591 play_move_down::@8
-  b8:
+    jmp b7
+  //SEG591 play_move_down::@7
+  b7:
   //SEG592 [259] (byte) play_move_down::movedown#3 ← ++ (byte) play_move_down::movedown#7 -- vbuz1=_inc_vbuz1 
     inc movedown
-  //SEG593 [260] phi from play_move_down::@2 play_move_down::@8 to play_move_down::@3 [phi:play_move_down::@2/play_move_down::@8->play_move_down::@3]
+  //SEG593 [260] phi from play_move_down::@2 play_move_down::@7 to play_move_down::@3 [phi:play_move_down::@2/play_move_down::@7->play_move_down::@3]
   b3_from_b2:
-  b3_from_b8:
-  //SEG594 [260] phi (byte) play_move_down::movedown#6 = (byte) play_move_down::movedown#7 [phi:play_move_down::@2/play_move_down::@8->play_move_down::@3#0] -- register_copy 
+  b3_from_b7:
+  //SEG594 [260] phi (byte) play_move_down::movedown#6 = (byte) play_move_down::movedown#7 [phi:play_move_down::@2/play_move_down::@7->play_move_down::@3#0] -- register_copy 
     jmp b3
   //SEG595 play_move_down::@3
   b3:
@@ -14654,9 +14782,9 @@ play_move_down: {
     lda movedown
     cmp #0
     beq breturn_from_b3
-    jmp b9
-  //SEG597 play_move_down::@9
-  b9:
+    jmp b8
+  //SEG597 play_move_down::@8
+  b8:
   //SEG598 [262] (byte) play_collision::ypos#0 ← (byte) current_ypos#11 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_plus_1 
     ldy current_ypos
     iny
@@ -14673,48 +14801,48 @@ play_move_down: {
     lda current_piece+1
     sta current_piece_98+1
   //SEG602 [266] call play_collision 
-  //SEG603 [201] phi from play_move_down::@9 to play_collision [phi:play_move_down::@9->play_collision]
-  play_collision_from_b9:
-  //SEG604 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#0 [phi:play_move_down::@9->play_collision#0] -- register_copy 
-  //SEG605 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#0 [phi:play_move_down::@9->play_collision#1] -- register_copy 
-  //SEG606 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#0 [phi:play_move_down::@9->play_collision#2] -- register_copy 
-  //SEG607 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#98 [phi:play_move_down::@9->play_collision#3] -- register_copy 
+  //SEG603 [201] phi from play_move_down::@8 to play_collision [phi:play_move_down::@8->play_collision]
+  play_collision_from_b8:
+  //SEG604 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#0 [phi:play_move_down::@8->play_collision#0] -- register_copy 
+  //SEG605 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#0 [phi:play_move_down::@8->play_collision#1] -- register_copy 
+  //SEG606 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#0 [phi:play_move_down::@8->play_collision#2] -- register_copy 
+  //SEG607 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#98 [phi:play_move_down::@8->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG608 [267] (byte) play_collision::return#0 ← (byte) play_collision::return#15 -- vbuz1=vbuz2 
     lda play_collision.return_15
     sta play_collision.return
-    jmp b18
-  //SEG609 play_move_down::@18
-  b18:
+    jmp b13
+  //SEG609 play_move_down::@13
+  b13:
   //SEG610 [268] (byte~) play_move_down::$12 ← (byte) play_collision::return#0 -- vbuz1=vbuz2 
     lda play_collision.return
     sta _12
-  //SEG611 [269] if((byte~) play_move_down::$12==(const byte) COLLISION_NONE#0) goto play_move_down::@14 -- vbuz1_eq_vbuc1_then_la1 
+  //SEG611 [269] if((byte~) play_move_down::$12==(const byte) COLLISION_NONE#0) goto play_move_down::@10 -- vbuz1_eq_vbuc1_then_la1 
     lda #COLLISION_NONE
     cmp _12
-    beq b14
-  //SEG612 [270] phi from play_move_down::@18 to play_move_down::@10 [phi:play_move_down::@18->play_move_down::@10]
-  b10_from_b18:
-    jmp b10
-  //SEG613 play_move_down::@10
-  b10:
+    beq b10
+  //SEG612 [270] phi from play_move_down::@13 to play_move_down::@9 [phi:play_move_down::@13->play_move_down::@9]
+  b9_from_b13:
+    jmp b9
+  //SEG613 play_move_down::@9
+  b9:
   //SEG614 [271] call play_lock_current 
     jsr play_lock_current
-  //SEG615 [272] phi from play_move_down::@10 to play_move_down::@19 [phi:play_move_down::@10->play_move_down::@19]
-  b19_from_b10:
-    jmp b19
-  //SEG616 play_move_down::@19
-  b19:
+  //SEG615 [272] phi from play_move_down::@9 to play_move_down::@14 [phi:play_move_down::@9->play_move_down::@14]
+  b14_from_b9:
+    jmp b14
+  //SEG616 play_move_down::@14
+  b14:
   //SEG617 [273] call play_remove_lines 
-  //SEG618 [344] phi from play_move_down::@19 to play_remove_lines [phi:play_move_down::@19->play_remove_lines]
-  play_remove_lines_from_b19:
+  //SEG618 [344] phi from play_move_down::@14 to play_remove_lines [phi:play_move_down::@14->play_remove_lines]
+  play_remove_lines_from_b14:
     jsr play_remove_lines
   //SEG619 [274] (byte) play_remove_lines::return#0 ← (byte) play_remove_lines::removed#7 -- vbuz1=vbuz2 
     lda play_remove_lines.removed
     sta play_remove_lines.return
-    jmp b20
-  //SEG620 play_move_down::@20
-  b20:
+    jmp b15
+  //SEG620 play_move_down::@15
+  b15:
   //SEG621 [275] (byte) play_move_down::removed#0 ← (byte) play_remove_lines::return#0 -- vbuz1=vbuz2 
     lda play_remove_lines.return
     sta removed
@@ -14723,16 +14851,16 @@ play_move_down: {
     sta play_update_score.removed
   //SEG623 [277] call play_update_score 
     jsr play_update_score
-  //SEG624 [278] phi from play_move_down::@20 to play_move_down::@21 [phi:play_move_down::@20->play_move_down::@21]
-  b21_from_b20:
-    jmp b21
-  //SEG625 play_move_down::@21
-  b21:
+  //SEG624 [278] phi from play_move_down::@15 to play_move_down::@16 [phi:play_move_down::@15->play_move_down::@16]
+  b16_from_b15:
+    jmp b16
+  //SEG625 play_move_down::@16
+  b16:
   //SEG626 [279] call play_spawn_current 
-  //SEG627 [285] phi from play_move_down::@21 to play_spawn_current [phi:play_move_down::@21->play_spawn_current]
-  play_spawn_current_from_b21:
-  //SEG628 [285] phi (byte) game_over#65 = (byte) game_over#10 [phi:play_move_down::@21->play_spawn_current#0] -- register_copy 
-  //SEG629 [285] phi (byte) next_piece_idx#17 = (byte) next_piece_idx#10 [phi:play_move_down::@21->play_spawn_current#1] -- register_copy 
+  //SEG627 [285] phi from play_move_down::@16 to play_spawn_current [phi:play_move_down::@16->play_spawn_current]
+  play_spawn_current_from_b16:
+  //SEG628 [285] phi (byte) game_over#65 = (byte) game_over#10 [phi:play_move_down::@16->play_spawn_current#0] -- register_copy 
+  //SEG629 [285] phi (byte) next_piece_idx#17 = (byte) next_piece_idx#10 [phi:play_move_down::@16->play_spawn_current#1] -- register_copy 
     jsr play_spawn_current
   //SEG630 [280] (byte*~) current_piece#104 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0) -- pbuz1=pptc1_derefidx_vbuz2 
     ldy play_spawn_current._0
@@ -14740,45 +14868,45 @@ play_move_down: {
     sta current_piece
     lda PIECES+1,y
     sta current_piece+1
-  //SEG631 [281] phi from play_move_down::@21 to play_move_down::@15 [phi:play_move_down::@21->play_move_down::@15]
-  b15_from_b21:
-  //SEG632 [281] phi (byte) next_piece_idx#30 = (byte) play_spawn_current::piece_idx#2 [phi:play_move_down::@21->play_move_down::@15#0] -- register_copy 
-  //SEG633 [281] phi (byte) game_over#27 = (byte) game_over#52 [phi:play_move_down::@21->play_move_down::@15#1] -- register_copy 
-  //SEG634 [281] phi (byte) current_xpos#43 = (byte) current_xpos#103 [phi:play_move_down::@21->play_move_down::@15#2] -- register_copy 
-  //SEG635 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#74 [phi:play_move_down::@21->play_move_down::@15#3] -- register_copy 
-  //SEG636 [281] phi (byte) current_orientation#37 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@21->play_move_down::@15#4] -- vbuz1=vbuc1 
+  //SEG631 [281] phi from play_move_down::@16 to play_move_down::@11 [phi:play_move_down::@16->play_move_down::@11]
+  b11_from_b16:
+  //SEG632 [281] phi (byte) next_piece_idx#30 = (byte) play_spawn_current::piece_idx#2 [phi:play_move_down::@16->play_move_down::@11#0] -- register_copy 
+  //SEG633 [281] phi (byte) game_over#27 = (byte) game_over#52 [phi:play_move_down::@16->play_move_down::@11#1] -- register_copy 
+  //SEG634 [281] phi (byte) current_xpos#43 = (byte) current_xpos#103 [phi:play_move_down::@16->play_move_down::@11#2] -- register_copy 
+  //SEG635 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#74 [phi:play_move_down::@16->play_move_down::@11#3] -- register_copy 
+  //SEG636 [281] phi (byte) current_orientation#37 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@16->play_move_down::@11#4] -- vbuz1=vbuc1 
     lda #0
     sta current_orientation
-  //SEG637 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#5 [phi:play_move_down::@21->play_move_down::@15#5] -- register_copy 
-  //SEG638 [281] phi (byte*) current_piece#28 = (byte*~) current_piece#104 [phi:play_move_down::@21->play_move_down::@15#6] -- register_copy 
-  //SEG639 [281] phi (byte) level_bcd#31 = (byte) level_bcd#19 [phi:play_move_down::@21->play_move_down::@15#7] -- register_copy 
-  //SEG640 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#23 [phi:play_move_down::@21->play_move_down::@15#8] -- register_copy 
-  //SEG641 [281] phi (byte) level#33 = (byte) level#19 [phi:play_move_down::@21->play_move_down::@15#9] -- register_copy 
-  //SEG642 [281] phi (dword) score_bcd#26 = (dword) score_bcd#16 [phi:play_move_down::@21->play_move_down::@15#10] -- register_copy 
-  //SEG643 [281] phi (word) lines_bcd#26 = (word) lines_bcd#17 [phi:play_move_down::@21->play_move_down::@15#11] -- register_copy 
-  //SEG644 [281] phi (byte) current_ypos#38 = (byte) current_ypos#6 [phi:play_move_down::@21->play_move_down::@15#12] -- register_copy 
-    jmp b15
-  //SEG645 play_move_down::@15
-  b15:
-  //SEG646 [282] phi from play_move_down::@15 to play_move_down::@return [phi:play_move_down::@15->play_move_down::@return]
-  breturn_from_b15:
-  //SEG647 [282] phi (byte) next_piece_idx#16 = (byte) next_piece_idx#30 [phi:play_move_down::@15->play_move_down::@return#0] -- register_copy 
-  //SEG648 [282] phi (byte) game_over#15 = (byte) game_over#27 [phi:play_move_down::@15->play_move_down::@return#1] -- register_copy 
-  //SEG649 [282] phi (byte) current_xpos#22 = (byte) current_xpos#43 [phi:play_move_down::@15->play_move_down::@return#2] -- register_copy 
-  //SEG650 [282] phi (byte*) current_piece_gfx#20 = (byte*) current_piece_gfx#35 [phi:play_move_down::@15->play_move_down::@return#3] -- register_copy 
-  //SEG651 [282] phi (byte) current_orientation#20 = (byte) current_orientation#37 [phi:play_move_down::@15->play_move_down::@return#4] -- register_copy 
-  //SEG652 [282] phi (byte) current_piece_char#16 = (byte) current_piece_char#29 [phi:play_move_down::@15->play_move_down::@return#5] -- register_copy 
-  //SEG653 [282] phi (byte*) current_piece#15 = (byte*) current_piece#28 [phi:play_move_down::@15->play_move_down::@return#6] -- register_copy 
-  //SEG654 [282] phi (byte) level_bcd#17 = (byte) level_bcd#31 [phi:play_move_down::@15->play_move_down::@return#7] -- register_copy 
-  //SEG655 [282] phi (byte) current_movedown_slow#21 = (byte) current_movedown_slow#37 [phi:play_move_down::@15->play_move_down::@return#8] -- register_copy 
-  //SEG656 [282] phi (byte) level#17 = (byte) level#33 [phi:play_move_down::@15->play_move_down::@return#9] -- register_copy 
-  //SEG657 [282] phi (dword) score_bcd#14 = (dword) score_bcd#26 [phi:play_move_down::@15->play_move_down::@return#10] -- register_copy 
-  //SEG658 [282] phi (word) lines_bcd#15 = (word) lines_bcd#26 [phi:play_move_down::@15->play_move_down::@return#11] -- register_copy 
-  //SEG659 [282] phi (byte) current_ypos#19 = (byte) current_ypos#38 [phi:play_move_down::@15->play_move_down::@return#12] -- register_copy 
-  //SEG660 [282] phi (byte) current_movedown_counter#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@15->play_move_down::@return#13] -- vbuz1=vbuc1 
+  //SEG637 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#5 [phi:play_move_down::@16->play_move_down::@11#5] -- register_copy 
+  //SEG638 [281] phi (byte*) current_piece#28 = (byte*~) current_piece#104 [phi:play_move_down::@16->play_move_down::@11#6] -- register_copy 
+  //SEG639 [281] phi (byte) level_bcd#31 = (byte) level_bcd#19 [phi:play_move_down::@16->play_move_down::@11#7] -- register_copy 
+  //SEG640 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#23 [phi:play_move_down::@16->play_move_down::@11#8] -- register_copy 
+  //SEG641 [281] phi (byte) level#33 = (byte) level#19 [phi:play_move_down::@16->play_move_down::@11#9] -- register_copy 
+  //SEG642 [281] phi (dword) score_bcd#26 = (dword) score_bcd#16 [phi:play_move_down::@16->play_move_down::@11#10] -- register_copy 
+  //SEG643 [281] phi (word) lines_bcd#26 = (word) lines_bcd#17 [phi:play_move_down::@16->play_move_down::@11#11] -- register_copy 
+  //SEG644 [281] phi (byte) current_ypos#38 = (byte) current_ypos#6 [phi:play_move_down::@16->play_move_down::@11#12] -- register_copy 
+    jmp b11
+  //SEG645 play_move_down::@11
+  b11:
+  //SEG646 [282] phi from play_move_down::@11 to play_move_down::@return [phi:play_move_down::@11->play_move_down::@return]
+  breturn_from_b11:
+  //SEG647 [282] phi (byte) next_piece_idx#16 = (byte) next_piece_idx#30 [phi:play_move_down::@11->play_move_down::@return#0] -- register_copy 
+  //SEG648 [282] phi (byte) game_over#15 = (byte) game_over#27 [phi:play_move_down::@11->play_move_down::@return#1] -- register_copy 
+  //SEG649 [282] phi (byte) current_xpos#22 = (byte) current_xpos#43 [phi:play_move_down::@11->play_move_down::@return#2] -- register_copy 
+  //SEG650 [282] phi (byte*) current_piece_gfx#20 = (byte*) current_piece_gfx#35 [phi:play_move_down::@11->play_move_down::@return#3] -- register_copy 
+  //SEG651 [282] phi (byte) current_orientation#20 = (byte) current_orientation#37 [phi:play_move_down::@11->play_move_down::@return#4] -- register_copy 
+  //SEG652 [282] phi (byte) current_piece_char#16 = (byte) current_piece_char#29 [phi:play_move_down::@11->play_move_down::@return#5] -- register_copy 
+  //SEG653 [282] phi (byte*) current_piece#15 = (byte*) current_piece#28 [phi:play_move_down::@11->play_move_down::@return#6] -- register_copy 
+  //SEG654 [282] phi (byte) level_bcd#17 = (byte) level_bcd#31 [phi:play_move_down::@11->play_move_down::@return#7] -- register_copy 
+  //SEG655 [282] phi (byte) current_movedown_slow#21 = (byte) current_movedown_slow#37 [phi:play_move_down::@11->play_move_down::@return#8] -- register_copy 
+  //SEG656 [282] phi (byte) level#17 = (byte) level#33 [phi:play_move_down::@11->play_move_down::@return#9] -- register_copy 
+  //SEG657 [282] phi (dword) score_bcd#14 = (dword) score_bcd#26 [phi:play_move_down::@11->play_move_down::@return#10] -- register_copy 
+  //SEG658 [282] phi (word) lines_bcd#15 = (word) lines_bcd#26 [phi:play_move_down::@11->play_move_down::@return#11] -- register_copy 
+  //SEG659 [282] phi (byte) current_ypos#19 = (byte) current_ypos#38 [phi:play_move_down::@11->play_move_down::@return#12] -- register_copy 
+  //SEG660 [282] phi (byte) current_movedown_counter#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@11->play_move_down::@return#13] -- vbuz1=vbuc1 
     lda #0
     sta current_movedown_counter
-  //SEG661 [282] phi (byte) play_move_down::return#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@15->play_move_down::@return#14] -- vbuz1=vbuc1 
+  //SEG661 [282] phi (byte) play_move_down::return#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@11->play_move_down::@return#14] -- vbuz1=vbuc1 
     lda #1
     sta return_3
     jmp breturn
@@ -14806,26 +14934,26 @@ play_move_down: {
   breturn:
   //SEG679 [283] return 
     rts
-  //SEG680 play_move_down::@14
-  b14:
+  //SEG680 play_move_down::@10
+  b10:
   //SEG681 [284] (byte) current_ypos#3 ← ++ (byte) current_ypos#11 -- vbuz1=_inc_vbuz1 
     inc current_ypos
-  //SEG682 [281] phi from play_move_down::@14 to play_move_down::@15 [phi:play_move_down::@14->play_move_down::@15]
-  b15_from_b14:
-  //SEG683 [281] phi (byte) next_piece_idx#30 = (byte) next_piece_idx#10 [phi:play_move_down::@14->play_move_down::@15#0] -- register_copy 
-  //SEG684 [281] phi (byte) game_over#27 = (byte) game_over#10 [phi:play_move_down::@14->play_move_down::@15#1] -- register_copy 
-  //SEG685 [281] phi (byte) current_xpos#43 = (byte) current_xpos#122 [phi:play_move_down::@14->play_move_down::@15#2] -- register_copy 
-  //SEG686 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#112 [phi:play_move_down::@14->play_move_down::@15#3] -- register_copy 
-  //SEG687 [281] phi (byte) current_orientation#37 = (byte) current_orientation#13 [phi:play_move_down::@14->play_move_down::@15#4] -- register_copy 
-  //SEG688 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#10 [phi:play_move_down::@14->play_move_down::@15#5] -- register_copy 
-  //SEG689 [281] phi (byte*) current_piece#28 = (byte*) current_piece#10 [phi:play_move_down::@14->play_move_down::@15#6] -- register_copy 
-  //SEG690 [281] phi (byte) level_bcd#31 = (byte) level_bcd#11 [phi:play_move_down::@14->play_move_down::@15#7] -- register_copy 
-  //SEG691 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#14 [phi:play_move_down::@14->play_move_down::@15#8] -- register_copy 
-  //SEG692 [281] phi (byte) level#33 = (byte) level#10 [phi:play_move_down::@14->play_move_down::@15#9] -- register_copy 
-  //SEG693 [281] phi (dword) score_bcd#26 = (dword) score_bcd#18 [phi:play_move_down::@14->play_move_down::@15#10] -- register_copy 
-  //SEG694 [281] phi (word) lines_bcd#26 = (word) lines_bcd#19 [phi:play_move_down::@14->play_move_down::@15#11] -- register_copy 
-  //SEG695 [281] phi (byte) current_ypos#38 = (byte) current_ypos#3 [phi:play_move_down::@14->play_move_down::@15#12] -- register_copy 
-    jmp b15
+  //SEG682 [281] phi from play_move_down::@10 to play_move_down::@11 [phi:play_move_down::@10->play_move_down::@11]
+  b11_from_b10:
+  //SEG683 [281] phi (byte) next_piece_idx#30 = (byte) next_piece_idx#10 [phi:play_move_down::@10->play_move_down::@11#0] -- register_copy 
+  //SEG684 [281] phi (byte) game_over#27 = (byte) game_over#10 [phi:play_move_down::@10->play_move_down::@11#1] -- register_copy 
+  //SEG685 [281] phi (byte) current_xpos#43 = (byte) current_xpos#122 [phi:play_move_down::@10->play_move_down::@11#2] -- register_copy 
+  //SEG686 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#112 [phi:play_move_down::@10->play_move_down::@11#3] -- register_copy 
+  //SEG687 [281] phi (byte) current_orientation#37 = (byte) current_orientation#13 [phi:play_move_down::@10->play_move_down::@11#4] -- register_copy 
+  //SEG688 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#10 [phi:play_move_down::@10->play_move_down::@11#5] -- register_copy 
+  //SEG689 [281] phi (byte*) current_piece#28 = (byte*) current_piece#10 [phi:play_move_down::@10->play_move_down::@11#6] -- register_copy 
+  //SEG690 [281] phi (byte) level_bcd#31 = (byte) level_bcd#11 [phi:play_move_down::@10->play_move_down::@11#7] -- register_copy 
+  //SEG691 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#14 [phi:play_move_down::@10->play_move_down::@11#8] -- register_copy 
+  //SEG692 [281] phi (byte) level#33 = (byte) level#10 [phi:play_move_down::@10->play_move_down::@11#9] -- register_copy 
+  //SEG693 [281] phi (dword) score_bcd#26 = (dword) score_bcd#18 [phi:play_move_down::@10->play_move_down::@11#10] -- register_copy 
+  //SEG694 [281] phi (word) lines_bcd#26 = (word) lines_bcd#19 [phi:play_move_down::@10->play_move_down::@11#11] -- register_copy 
+  //SEG695 [281] phi (byte) current_ypos#38 = (byte) current_ypos#3 [phi:play_move_down::@10->play_move_down::@11#12] -- register_copy 
+    jmp b11
 }
 //SEG696 play_spawn_current
 // Spawn a new piece
@@ -14887,19 +15015,19 @@ play_spawn_current: {
   //SEG712 [296] (byte) play_collision::return#10 ← (byte) play_collision::return#15 -- vbuz1=vbuz2 
     lda play_collision.return_15
     sta play_collision.return_10
-    jmp b9
-  //SEG713 play_spawn_current::@9
-  b9:
+    jmp b4
+  //SEG713 play_spawn_current::@4
+  b4:
   //SEG714 [297] (byte~) play_spawn_current::$2 ← (byte) play_collision::return#10 -- vbuz1=vbuz2 
     lda play_collision.return_10
     sta _2
-  //SEG715 [298] if((byte~) play_spawn_current::$2!=(const byte) COLLISION_PLAYFIELD#0) goto play_spawn_current::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG715 [298] if((byte~) play_spawn_current::$2!=(const byte) COLLISION_PLAYFIELD#0) goto play_spawn_current::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #COLLISION_PLAYFIELD
     cmp _2
-    bne b11_from_b9
-  //SEG716 [299] phi from play_spawn_current::@9 to play_spawn_current::@1 [phi:play_spawn_current::@9->play_spawn_current::@1]
-  b1_from_b9:
-  //SEG717 [299] phi (byte) game_over#52 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_spawn_current::@9->play_spawn_current::@1#0] -- vbuz1=vbuc1 
+    bne b6_from_b4
+  //SEG716 [299] phi from play_spawn_current::@4 to play_spawn_current::@1 [phi:play_spawn_current::@4->play_spawn_current::@1]
+  b1_from_b4:
+  //SEG717 [299] phi (byte) game_over#52 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_spawn_current::@4->play_spawn_current::@1#0] -- vbuz1=vbuc1 
     lda #1
     sta game_over
     jmp b1
@@ -14932,9 +15060,9 @@ play_spawn_current: {
   //SEG728 [305] (byte) sid_rnd::return#2 ← (byte) sid_rnd::return#0 -- vbuz1=vbuz2 
     lda sid_rnd.return
     sta sid_rnd.return_2
-    jmp b10
-  //SEG729 play_spawn_current::@10
-  b10:
+    jmp b5
+  //SEG729 play_spawn_current::@5
+  b5:
   //SEG730 [306] (byte~) play_spawn_current::$6 ← (byte) sid_rnd::return#2 -- vbuz1=vbuz2 
     lda sid_rnd.return_2
     sta _6
@@ -14942,18 +15070,18 @@ play_spawn_current: {
     lda #7
     and _6
     sta piece_idx
-  //SEG732 [300] phi from play_spawn_current::@10 to play_spawn_current::@2 [phi:play_spawn_current::@10->play_spawn_current::@2]
-  b2_from_b10:
-  //SEG733 [300] phi (byte) play_spawn_current::piece_idx#2 = (byte) play_spawn_current::piece_idx#1 [phi:play_spawn_current::@10->play_spawn_current::@2#0] -- register_copy 
+  //SEG732 [300] phi from play_spawn_current::@5 to play_spawn_current::@2 [phi:play_spawn_current::@5->play_spawn_current::@2]
+  b2_from_b5:
+  //SEG733 [300] phi (byte) play_spawn_current::piece_idx#2 = (byte) play_spawn_current::piece_idx#1 [phi:play_spawn_current::@5->play_spawn_current::@2#0] -- register_copy 
     jmp b2
-  //SEG734 [308] phi from play_spawn_current::@9 to play_spawn_current::@11 [phi:play_spawn_current::@9->play_spawn_current::@11]
-  b11_from_b9:
-    jmp b11
-  //SEG735 play_spawn_current::@11
-  b11:
-  //SEG736 [299] phi from play_spawn_current::@11 to play_spawn_current::@1 [phi:play_spawn_current::@11->play_spawn_current::@1]
-  b1_from_b11:
-  //SEG737 [299] phi (byte) game_over#52 = (byte) game_over#65 [phi:play_spawn_current::@11->play_spawn_current::@1#0] -- register_copy 
+  //SEG734 [308] phi from play_spawn_current::@4 to play_spawn_current::@6 [phi:play_spawn_current::@4->play_spawn_current::@6]
+  b6_from_b4:
+    jmp b6
+  //SEG735 play_spawn_current::@6
+  b6:
+  //SEG736 [299] phi from play_spawn_current::@6 to play_spawn_current::@1 [phi:play_spawn_current::@6->play_spawn_current::@1]
+  b1_from_b6:
+  //SEG737 [299] phi (byte) game_over#52 = (byte) game_over#65 [phi:play_spawn_current::@6->play_spawn_current::@1#0] -- register_copy 
     jmp b1
 }
 //SEG738 sid_rnd
@@ -14986,9 +15114,9 @@ play_update_score: {
     lda removed
     cmp #0
     beq breturn_from_play_update_score
-    jmp b2
-  //SEG744 play_update_score::@2
-  b2:
+    jmp b1
+  //SEG744 play_update_score::@1
+  b1:
   //SEG745 [312] (byte~) play_update_score::$2 ← < (word) lines_bcd#19 -- vbuz1=_lo_vwuz2 
     lda lines_bcd
     sta _2
@@ -15047,23 +15175,23 @@ play_update_score: {
   //SEG755 [322] if((byte) play_update_score::lines_before#0==(byte) play_update_score::lines_after#0) goto play_update_score::@return -- vbuz1_eq_vbuz2_then_la1 
     lda lines_before
     cmp lines_after
-    beq breturn_from_b2
-  //SEG756 [323] phi from play_update_score::@2 to play_update_score::@3 [phi:play_update_score::@2->play_update_score::@3]
-  b3_from_b2:
-    jmp b3
-  //SEG757 play_update_score::@3
-  b3:
+    beq breturn_from_b1
+  //SEG756 [323] phi from play_update_score::@1 to play_update_score::@2 [phi:play_update_score::@1->play_update_score::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG757 play_update_score::@2
+  b2:
   //SEG758 [324] call play_increase_level 
     jsr play_increase_level
-  //SEG759 [325] phi from play_update_score play_update_score::@2 play_update_score::@3 to play_update_score::@return [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return]
+  //SEG759 [325] phi from play_update_score play_update_score::@1 play_update_score::@2 to play_update_score::@return [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return]
   breturn_from_play_update_score:
+  breturn_from_b1:
   breturn_from_b2:
-  breturn_from_b3:
-  //SEG760 [325] phi (byte) level_bcd#19 = (byte) level_bcd#11 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#0] -- register_copy 
-  //SEG761 [325] phi (byte) current_movedown_slow#23 = (byte) current_movedown_slow#14 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#1] -- register_copy 
-  //SEG762 [325] phi (byte) level#19 = (byte) level#10 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#2] -- register_copy 
-  //SEG763 [325] phi (dword) score_bcd#16 = (dword) score_bcd#18 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#3] -- register_copy 
-  //SEG764 [325] phi (word) lines_bcd#17 = (word) lines_bcd#19 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#4] -- register_copy 
+  //SEG760 [325] phi (byte) level_bcd#19 = (byte) level_bcd#11 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#0] -- register_copy 
+  //SEG761 [325] phi (byte) current_movedown_slow#23 = (byte) current_movedown_slow#14 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#1] -- register_copy 
+  //SEG762 [325] phi (byte) level#19 = (byte) level#10 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#2] -- register_copy 
+  //SEG763 [325] phi (dword) score_bcd#16 = (dword) score_bcd#18 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#3] -- register_copy 
+  //SEG764 [325] phi (word) lines_bcd#17 = (word) lines_bcd#19 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#4] -- register_copy 
     jmp breturn
   //SEG765 play_update_score::@return
   breturn:
@@ -15078,70 +15206,70 @@ play_increase_level: {
     .label b = $4c
   //SEG768 [327] (byte) level#21 ← ++ (byte) level#10 -- vbuz1=_inc_vbuz1 
     inc level
-  //SEG769 [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@2 -- vbuz1_gt_vbuc1_then_la1 
+  //SEG769 [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@1 -- vbuz1_gt_vbuc1_then_la1 
     // Update speed of moving tetrominos down
     lda #$1d
     cmp level
-    bcc b2_from_play_increase_level
-    jmp b4
-  //SEG770 play_increase_level::@4
-  b4:
+    bcc b1_from_play_increase_level
+    jmp b3
+  //SEG770 play_increase_level::@3
+  b3:
   //SEG771 [329] (byte) current_movedown_slow#10 ← *((const byte[]) MOVEDOWN_SLOW_SPEEDS#0 + (byte) level#21) -- vbuz1=pbuc1_derefidx_vbuz2 
     ldy level
     lda MOVEDOWN_SLOW_SPEEDS,y
     sta current_movedown_slow
-  //SEG772 [330] phi from play_increase_level::@4 to play_increase_level::@2 [phi:play_increase_level::@4->play_increase_level::@2]
-  b2_from_b4:
-  //SEG773 [330] phi (byte) current_movedown_slow#69 = (byte) current_movedown_slow#10 [phi:play_increase_level::@4->play_increase_level::@2#0] -- register_copy 
-    jmp b2
-  //SEG774 [330] phi from play_increase_level to play_increase_level::@2 [phi:play_increase_level->play_increase_level::@2]
-  b2_from_play_increase_level:
-  //SEG775 [330] phi (byte) current_movedown_slow#69 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_increase_level->play_increase_level::@2#0] -- vbuz1=vbuc1 
+  //SEG772 [330] phi from play_increase_level::@3 to play_increase_level::@1 [phi:play_increase_level::@3->play_increase_level::@1]
+  b1_from_b3:
+  //SEG773 [330] phi (byte) current_movedown_slow#69 = (byte) current_movedown_slow#10 [phi:play_increase_level::@3->play_increase_level::@1#0] -- register_copy 
+    jmp b1
+  //SEG774 [330] phi from play_increase_level to play_increase_level::@1 [phi:play_increase_level->play_increase_level::@1]
+  b1_from_play_increase_level:
+  //SEG775 [330] phi (byte) current_movedown_slow#69 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_increase_level->play_increase_level::@1#0] -- vbuz1=vbuc1 
     lda #1
     sta current_movedown_slow
-    jmp b2
-  //SEG776 play_increase_level::@2
-  b2:
+    jmp b1
+  //SEG776 play_increase_level::@1
+  b1:
   //SEG777 [331] (byte) level_bcd#21 ← ++ (byte) level_bcd#11 -- vbuz1=_inc_vbuz1 
     inc level_bcd
   //SEG778 [332] (byte~) play_increase_level::$1 ← (byte) level_bcd#21 & (byte/signed byte/word/signed word/dword/signed dword) $f -- vbuz1=vbuz2_band_vbuc1 
     lda #$f
     and level_bcd
     sta _1
-  //SEG779 [333] if((byte~) play_increase_level::$1!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto play_increase_level::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG779 [333] if((byte~) play_increase_level::$1!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto play_increase_level::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$a
     cmp _1
-    bne b3_from_b2
-    jmp b6
-  //SEG780 play_increase_level::@6
-  b6:
+    bne b2_from_b1
+    jmp b4
+  //SEG780 play_increase_level::@4
+  b4:
   //SEG781 [334] (byte) level_bcd#8 ← (byte) level_bcd#21 + (byte/signed byte/word/signed word/dword/signed dword) 6 -- vbuz1=vbuz1_plus_vbuc1 
     // If level low nybble hits $a change to $10
     lax level_bcd
     axs #-[6]
     stx level_bcd
-  //SEG782 [335] phi from play_increase_level::@2 play_increase_level::@6 to play_increase_level::@3 [phi:play_increase_level::@2/play_increase_level::@6->play_increase_level::@3]
-  b3_from_b2:
-  b3_from_b6:
-  //SEG783 [335] phi (byte) level_bcd#64 = (byte) level_bcd#21 [phi:play_increase_level::@2/play_increase_level::@6->play_increase_level::@3#0] -- register_copy 
-    jmp b3
-  //SEG784 play_increase_level::@3
-  b3:
+  //SEG782 [335] phi from play_increase_level::@1 play_increase_level::@4 to play_increase_level::@2 [phi:play_increase_level::@1/play_increase_level::@4->play_increase_level::@2]
+  b2_from_b1:
+  b2_from_b4:
+  //SEG783 [335] phi (byte) level_bcd#64 = (byte) level_bcd#21 [phi:play_increase_level::@1/play_increase_level::@4->play_increase_level::@2#0] -- register_copy 
+    jmp b2
+  //SEG784 play_increase_level::@2
+  b2:
   //SEG785 asm { sed  }
     // Increase the score values gained
     sed
-  //SEG786 [337] phi from play_increase_level::@3 to play_increase_level::@7 [phi:play_increase_level::@3->play_increase_level::@7]
-  b7_from_b3:
-  //SEG787 [337] phi (byte) play_increase_level::b#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_increase_level::@3->play_increase_level::@7#0] -- vbuz1=vbuc1 
+  //SEG786 [337] phi from play_increase_level::@2 to play_increase_level::@5 [phi:play_increase_level::@2->play_increase_level::@5]
+  b5_from_b2:
+  //SEG787 [337] phi (byte) play_increase_level::b#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_increase_level::@2->play_increase_level::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta b
-    jmp b7
-  //SEG788 [337] phi from play_increase_level::@7 to play_increase_level::@7 [phi:play_increase_level::@7->play_increase_level::@7]
-  b7_from_b7:
-  //SEG789 [337] phi (byte) play_increase_level::b#2 = (byte) play_increase_level::b#1 [phi:play_increase_level::@7->play_increase_level::@7#0] -- register_copy 
-    jmp b7
-  //SEG790 play_increase_level::@7
-  b7:
+    jmp b5
+  //SEG788 [337] phi from play_increase_level::@5 to play_increase_level::@5 [phi:play_increase_level::@5->play_increase_level::@5]
+  b5_from_b5:
+  //SEG789 [337] phi (byte) play_increase_level::b#2 = (byte) play_increase_level::b#1 [phi:play_increase_level::@5->play_increase_level::@5#0] -- register_copy 
+    jmp b5
+  //SEG790 play_increase_level::@5
+  b5:
   //SEG791 [338] (byte) play_increase_level::b4#0 ← (byte) play_increase_level::b#2 << (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz2_rol_2 
     lda b
     asl
@@ -15164,13 +15292,13 @@ play_increase_level: {
     sta score_add_bcd+3,y
   //SEG793 [340] (byte) play_increase_level::b#1 ← ++ (byte) play_increase_level::b#2 -- vbuz1=_inc_vbuz1 
     inc b
-  //SEG794 [341] if((byte) play_increase_level::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto play_increase_level::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG794 [341] if((byte) play_increase_level::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto play_increase_level::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #5
     cmp b
-    bne b7_from_b7
-    jmp b8
-  //SEG795 play_increase_level::@8
-  b8:
+    bne b5_from_b5
+    jmp b6
+  //SEG795 play_increase_level::@6
+  b6:
   //SEG796 asm { cld  }
     cld
     jmp breturn
@@ -15193,69 +15321,69 @@ play_remove_lines: {
     .label y = $4d
     .label removed = $4e
     .label full = $51
-  //SEG800 [345] phi from play_remove_lines to play_remove_lines::@8 [phi:play_remove_lines->play_remove_lines::@8]
-  b8_from_play_remove_lines:
-  //SEG801 [345] phi (byte) play_remove_lines::removed#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@8#0] -- vbuz1=vbuc1 
+  //SEG800 [345] phi from play_remove_lines to play_remove_lines::@3 [phi:play_remove_lines->play_remove_lines::@3]
+  b3_from_play_remove_lines:
+  //SEG801 [345] phi (byte) play_remove_lines::removed#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta removed
-  //SEG802 [345] phi (byte) play_remove_lines::y#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@8#1] -- vbuz1=vbuc1 
+  //SEG802 [345] phi (byte) play_remove_lines::y#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@3#1] -- vbuz1=vbuc1 
     lda #0
     sta y
-  //SEG803 [345] phi (byte) play_remove_lines::w#12 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@8#2] -- vbuz1=vbuc1 
+  //SEG803 [345] phi (byte) play_remove_lines::w#12 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@3#2] -- vbuz1=vbuc1 
     lda #PLAYFIELD_LINES*PLAYFIELD_COLS-1
     sta w
-  //SEG804 [345] phi (byte) play_remove_lines::r#4 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@8#3] -- vbuz1=vbuc1 
+  //SEG804 [345] phi (byte) play_remove_lines::r#4 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@3#3] -- vbuz1=vbuc1 
     lda #PLAYFIELD_LINES*PLAYFIELD_COLS-1
     sta r
-    jmp b8
+    jmp b3
   // Read all lines and rewrite them
-  //SEG805 [345] phi from play_remove_lines::@14 to play_remove_lines::@8 [phi:play_remove_lines::@14->play_remove_lines::@8]
-  b8_from_b14:
-  //SEG806 [345] phi (byte) play_remove_lines::removed#11 = (byte) play_remove_lines::removed#7 [phi:play_remove_lines::@14->play_remove_lines::@8#0] -- register_copy 
-  //SEG807 [345] phi (byte) play_remove_lines::y#8 = (byte) play_remove_lines::y#1 [phi:play_remove_lines::@14->play_remove_lines::@8#1] -- register_copy 
-  //SEG808 [345] phi (byte) play_remove_lines::w#12 = (byte) play_remove_lines::w#11 [phi:play_remove_lines::@14->play_remove_lines::@8#2] -- register_copy 
-  //SEG809 [345] phi (byte) play_remove_lines::r#4 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@14->play_remove_lines::@8#3] -- register_copy 
-    jmp b8
-  //SEG810 play_remove_lines::@8
-  b8:
-  //SEG811 [346] phi from play_remove_lines::@8 to play_remove_lines::@9 [phi:play_remove_lines::@8->play_remove_lines::@9]
-  b9_from_b8:
-  //SEG812 [346] phi (byte) play_remove_lines::full#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines::@8->play_remove_lines::@9#0] -- vbuz1=vbuc1 
+  //SEG805 [345] phi from play_remove_lines::@8 to play_remove_lines::@3 [phi:play_remove_lines::@8->play_remove_lines::@3]
+  b3_from_b8:
+  //SEG806 [345] phi (byte) play_remove_lines::removed#11 = (byte) play_remove_lines::removed#7 [phi:play_remove_lines::@8->play_remove_lines::@3#0] -- register_copy 
+  //SEG807 [345] phi (byte) play_remove_lines::y#8 = (byte) play_remove_lines::y#1 [phi:play_remove_lines::@8->play_remove_lines::@3#1] -- register_copy 
+  //SEG808 [345] phi (byte) play_remove_lines::w#12 = (byte) play_remove_lines::w#11 [phi:play_remove_lines::@8->play_remove_lines::@3#2] -- register_copy 
+  //SEG809 [345] phi (byte) play_remove_lines::r#4 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@8->play_remove_lines::@3#3] -- register_copy 
+    jmp b3
+  //SEG810 play_remove_lines::@3
+  b3:
+  //SEG811 [346] phi from play_remove_lines::@3 to play_remove_lines::@4 [phi:play_remove_lines::@3->play_remove_lines::@4]
+  b4_from_b3:
+  //SEG812 [346] phi (byte) play_remove_lines::full#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines::@3->play_remove_lines::@4#0] -- vbuz1=vbuc1 
     lda #1
     sta full
-  //SEG813 [346] phi (byte) play_remove_lines::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@8->play_remove_lines::@9#1] -- vbuz1=vbuc1 
+  //SEG813 [346] phi (byte) play_remove_lines::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@3->play_remove_lines::@4#1] -- vbuz1=vbuc1 
     lda #0
     sta x
-  //SEG814 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#12 [phi:play_remove_lines::@8->play_remove_lines::@9#2] -- register_copy 
-  //SEG815 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#4 [phi:play_remove_lines::@8->play_remove_lines::@9#3] -- register_copy 
-    jmp b9
-  //SEG816 [346] phi from play_remove_lines::@10 to play_remove_lines::@9 [phi:play_remove_lines::@10->play_remove_lines::@9]
-  b9_from_b10:
-  //SEG817 [346] phi (byte) play_remove_lines::full#4 = (byte) play_remove_lines::full#2 [phi:play_remove_lines::@10->play_remove_lines::@9#0] -- register_copy 
-  //SEG818 [346] phi (byte) play_remove_lines::x#2 = (byte) play_remove_lines::x#1 [phi:play_remove_lines::@10->play_remove_lines::@9#1] -- register_copy 
-  //SEG819 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@10->play_remove_lines::@9#2] -- register_copy 
-  //SEG820 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@10->play_remove_lines::@9#3] -- register_copy 
-    jmp b9
-  //SEG821 play_remove_lines::@9
-  b9:
+  //SEG814 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#12 [phi:play_remove_lines::@3->play_remove_lines::@4#2] -- register_copy 
+  //SEG815 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#4 [phi:play_remove_lines::@3->play_remove_lines::@4#3] -- register_copy 
+    jmp b4
+  //SEG816 [346] phi from play_remove_lines::@5 to play_remove_lines::@4 [phi:play_remove_lines::@5->play_remove_lines::@4]
+  b4_from_b5:
+  //SEG817 [346] phi (byte) play_remove_lines::full#4 = (byte) play_remove_lines::full#2 [phi:play_remove_lines::@5->play_remove_lines::@4#0] -- register_copy 
+  //SEG818 [346] phi (byte) play_remove_lines::x#2 = (byte) play_remove_lines::x#1 [phi:play_remove_lines::@5->play_remove_lines::@4#1] -- register_copy 
+  //SEG819 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@5->play_remove_lines::@4#2] -- register_copy 
+  //SEG820 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@5->play_remove_lines::@4#3] -- register_copy 
+    jmp b4
+  //SEG821 play_remove_lines::@4
+  b4:
   //SEG822 [347] (byte) play_remove_lines::c#0 ← *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::r#2) -- vbuz1=pbuc1_derefidx_vbuz2 
     ldy r
     lda playfield,y
     sta c
   //SEG823 [348] (byte) play_remove_lines::r#1 ← -- (byte) play_remove_lines::r#2 -- vbuz1=_dec_vbuz1 
     dec r
-  //SEG824 [349] if((byte) play_remove_lines::c#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_remove_lines::@18 -- vbuz1_neq_0_then_la1 
+  //SEG824 [349] if((byte) play_remove_lines::c#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_remove_lines::@9 -- vbuz1_neq_0_then_la1 
     lda c
     cmp #0
-    bne b18_from_b9
-  //SEG825 [350] phi from play_remove_lines::@9 to play_remove_lines::@10 [phi:play_remove_lines::@9->play_remove_lines::@10]
-  b10_from_b9:
-  //SEG826 [350] phi (byte) play_remove_lines::full#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@9->play_remove_lines::@10#0] -- vbuz1=vbuc1 
+    bne b9_from_b4
+  //SEG825 [350] phi from play_remove_lines::@4 to play_remove_lines::@5 [phi:play_remove_lines::@4->play_remove_lines::@5]
+  b5_from_b4:
+  //SEG826 [350] phi (byte) play_remove_lines::full#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@4->play_remove_lines::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta full
-    jmp b10
-  //SEG827 play_remove_lines::@10
-  b10:
+    jmp b5
+  //SEG827 play_remove_lines::@5
+  b5:
   //SEG828 [351] *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::w#4) ← (byte) play_remove_lines::c#0 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda c
     ldy w
@@ -15264,44 +15392,44 @@ play_remove_lines: {
     dec w
   //SEG830 [353] (byte) play_remove_lines::x#1 ← ++ (byte) play_remove_lines::x#2 -- vbuz1=_inc_vbuz1 
     inc x
-  //SEG831 [354] if((byte) play_remove_lines::x#1!=(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@9 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG831 [354] if((byte) play_remove_lines::x#1!=(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #PLAYFIELD_COLS-1+1
     cmp x
-    bne b9_from_b10
-    jmp b12
-  //SEG832 play_remove_lines::@12
-  b12:
-  //SEG833 [355] if((byte) play_remove_lines::full#2!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@14 -- vbuz1_neq_vbuc1_then_la1 
+    bne b4_from_b5
+    jmp b6
+  //SEG832 play_remove_lines::@6
+  b6:
+  //SEG833 [355] if((byte) play_remove_lines::full#2!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@8 -- vbuz1_neq_vbuc1_then_la1 
     lda #1
     cmp full
-    bne b14_from_b12
-    jmp b13
-  //SEG834 play_remove_lines::@13
-  b13:
+    bne b8_from_b6
+    jmp b7
+  //SEG834 play_remove_lines::@7
+  b7:
   //SEG835 [356] (byte) play_remove_lines::w#2 ← (byte) play_remove_lines::w#1 + (const byte) PLAYFIELD_COLS#0 -- vbuz1=vbuz1_plus_vbuc1 
     lax w
     axs #-[PLAYFIELD_COLS]
     stx w
   //SEG836 [357] (byte) play_remove_lines::removed#1 ← ++ (byte) play_remove_lines::removed#11 -- vbuz1=_inc_vbuz1 
     inc removed
-  //SEG837 [358] phi from play_remove_lines::@12 play_remove_lines::@13 to play_remove_lines::@14 [phi:play_remove_lines::@12/play_remove_lines::@13->play_remove_lines::@14]
-  b14_from_b12:
-  b14_from_b13:
-  //SEG838 [358] phi (byte) play_remove_lines::removed#7 = (byte) play_remove_lines::removed#11 [phi:play_remove_lines::@12/play_remove_lines::@13->play_remove_lines::@14#0] -- register_copy 
-  //SEG839 [358] phi (byte) play_remove_lines::w#11 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@12/play_remove_lines::@13->play_remove_lines::@14#1] -- register_copy 
-    jmp b14
-  //SEG840 play_remove_lines::@14
-  b14:
+  //SEG837 [358] phi from play_remove_lines::@6 play_remove_lines::@7 to play_remove_lines::@8 [phi:play_remove_lines::@6/play_remove_lines::@7->play_remove_lines::@8]
+  b8_from_b6:
+  b8_from_b7:
+  //SEG838 [358] phi (byte) play_remove_lines::removed#7 = (byte) play_remove_lines::removed#11 [phi:play_remove_lines::@6/play_remove_lines::@7->play_remove_lines::@8#0] -- register_copy 
+  //SEG839 [358] phi (byte) play_remove_lines::w#11 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@6/play_remove_lines::@7->play_remove_lines::@8#1] -- register_copy 
+    jmp b8
+  //SEG840 play_remove_lines::@8
+  b8:
   //SEG841 [359] (byte) play_remove_lines::y#1 ← ++ (byte) play_remove_lines::y#8 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG842 [360] if((byte) play_remove_lines::y#1!=(const byte) PLAYFIELD_LINES#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG842 [360] if((byte) play_remove_lines::y#1!=(const byte) PLAYFIELD_LINES#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #PLAYFIELD_LINES-1+1
     cmp y
-    bne b8_from_b14
-  //SEG843 [361] phi from play_remove_lines::@14 play_remove_lines::@2 to play_remove_lines::@1 [phi:play_remove_lines::@14/play_remove_lines::@2->play_remove_lines::@1]
-  b1_from_b14:
+    bne b3_from_b8
+  //SEG843 [361] phi from play_remove_lines::@2 play_remove_lines::@8 to play_remove_lines::@1 [phi:play_remove_lines::@2/play_remove_lines::@8->play_remove_lines::@1]
   b1_from_b2:
-  //SEG844 [361] phi (byte) play_remove_lines::w#6 = (byte) play_remove_lines::w#11 [phi:play_remove_lines::@14/play_remove_lines::@2->play_remove_lines::@1#0] -- register_copy 
+  b1_from_b8:
+  //SEG844 [361] phi (byte) play_remove_lines::w#6 = (byte) play_remove_lines::w#3 [phi:play_remove_lines::@2/play_remove_lines::@8->play_remove_lines::@1#0] -- register_copy 
     jmp b1
   // Write zeros in the rest of the lines
   //SEG845 play_remove_lines::@1
@@ -15324,15 +15452,15 @@ play_remove_lines: {
   //SEG851 [365] (byte) play_remove_lines::w#3 ← -- (byte) play_remove_lines::w#6 -- vbuz1=_dec_vbuz1 
     dec w
     jmp b1_from_b2
-  //SEG852 [366] phi from play_remove_lines::@9 to play_remove_lines::@18 [phi:play_remove_lines::@9->play_remove_lines::@18]
-  b18_from_b9:
-    jmp b18
-  //SEG853 play_remove_lines::@18
-  b18:
-  //SEG854 [350] phi from play_remove_lines::@18 to play_remove_lines::@10 [phi:play_remove_lines::@18->play_remove_lines::@10]
-  b10_from_b18:
-  //SEG855 [350] phi (byte) play_remove_lines::full#2 = (byte) play_remove_lines::full#4 [phi:play_remove_lines::@18->play_remove_lines::@10#0] -- register_copy 
-    jmp b10
+  //SEG852 [366] phi from play_remove_lines::@4 to play_remove_lines::@9 [phi:play_remove_lines::@4->play_remove_lines::@9]
+  b9_from_b4:
+    jmp b9
+  //SEG853 play_remove_lines::@9
+  b9:
+  //SEG854 [350] phi from play_remove_lines::@9 to play_remove_lines::@5 [phi:play_remove_lines::@9->play_remove_lines::@5]
+  b5_from_b9:
+  //SEG855 [350] phi (byte) play_remove_lines::full#2 = (byte) play_remove_lines::full#4 [phi:play_remove_lines::@9->play_remove_lines::@5#0] -- register_copy 
+    jmp b5
 }
 //SEG856 play_lock_current
 // Lock the current piece onto the playfield
@@ -15405,10 +15533,10 @@ play_lock_current: {
     inc col
   //SEG876 [376] (byte) play_lock_current::c#1 ← ++ (byte) play_lock_current::c#2 -- vbuz1=_inc_vbuz1 
     inc c
-  //SEG877 [377] if((byte) play_lock_current::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG877 [377] if((byte) play_lock_current::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp c
-    bne b8
+    bne b7
     jmp b5
   //SEG878 play_lock_current::@5
   b5:
@@ -15419,36 +15547,36 @@ play_lock_current: {
     sta ypos2
   //SEG880 [379] (byte) play_lock_current::l#1 ← ++ (byte) play_lock_current::l#6 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG881 [380] if((byte) play_lock_current::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG881 [380] if((byte) play_lock_current::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp l
-    bne b7
+    bne b6
     jmp breturn
   //SEG882 play_lock_current::@return
   breturn:
   //SEG883 [381] return 
     rts
-  //SEG884 play_lock_current::@7
-  b7:
+  //SEG884 play_lock_current::@6
+  b6:
   //SEG885 [382] (byte~) play_lock_current::i#7 ← (byte) play_lock_current::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_7
-  //SEG886 [368] phi from play_lock_current::@7 to play_lock_current::@1 [phi:play_lock_current::@7->play_lock_current::@1]
-  b1_from_b7:
-  //SEG887 [368] phi (byte) play_lock_current::l#6 = (byte) play_lock_current::l#1 [phi:play_lock_current::@7->play_lock_current::@1#0] -- register_copy 
-  //SEG888 [368] phi (byte) play_lock_current::i#3 = (byte~) play_lock_current::i#7 [phi:play_lock_current::@7->play_lock_current::@1#1] -- register_copy 
-  //SEG889 [368] phi (byte) play_lock_current::ypos2#2 = (byte) play_lock_current::ypos2#1 [phi:play_lock_current::@7->play_lock_current::@1#2] -- register_copy 
+  //SEG886 [368] phi from play_lock_current::@6 to play_lock_current::@1 [phi:play_lock_current::@6->play_lock_current::@1]
+  b1_from_b6:
+  //SEG887 [368] phi (byte) play_lock_current::l#6 = (byte) play_lock_current::l#1 [phi:play_lock_current::@6->play_lock_current::@1#0] -- register_copy 
+  //SEG888 [368] phi (byte) play_lock_current::i#3 = (byte~) play_lock_current::i#7 [phi:play_lock_current::@6->play_lock_current::@1#1] -- register_copy 
+  //SEG889 [368] phi (byte) play_lock_current::ypos2#2 = (byte) play_lock_current::ypos2#1 [phi:play_lock_current::@6->play_lock_current::@1#2] -- register_copy 
     jmp b1
-  //SEG890 play_lock_current::@8
-  b8:
+  //SEG890 play_lock_current::@7
+  b7:
   //SEG891 [383] (byte~) play_lock_current::i#9 ← (byte) play_lock_current::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_9
-  //SEG892 [371] phi from play_lock_current::@8 to play_lock_current::@2 [phi:play_lock_current::@8->play_lock_current::@2]
-  b2_from_b8:
-  //SEG893 [371] phi (byte) play_lock_current::c#2 = (byte) play_lock_current::c#1 [phi:play_lock_current::@8->play_lock_current::@2#0] -- register_copy 
-  //SEG894 [371] phi (byte) play_lock_current::col#2 = (byte) play_lock_current::col#1 [phi:play_lock_current::@8->play_lock_current::@2#1] -- register_copy 
-  //SEG895 [371] phi (byte) play_lock_current::i#2 = (byte~) play_lock_current::i#9 [phi:play_lock_current::@8->play_lock_current::@2#2] -- register_copy 
+  //SEG892 [371] phi from play_lock_current::@7 to play_lock_current::@2 [phi:play_lock_current::@7->play_lock_current::@2]
+  b2_from_b7:
+  //SEG893 [371] phi (byte) play_lock_current::c#2 = (byte) play_lock_current::c#1 [phi:play_lock_current::@7->play_lock_current::@2#0] -- register_copy 
+  //SEG894 [371] phi (byte) play_lock_current::col#2 = (byte) play_lock_current::col#1 [phi:play_lock_current::@7->play_lock_current::@2#1] -- register_copy 
+  //SEG895 [371] phi (byte) play_lock_current::i#2 = (byte~) play_lock_current::i#9 [phi:play_lock_current::@7->play_lock_current::@2#2] -- register_copy 
     jmp b2
 }
 //SEG896 keyboard_event_pressed
@@ -15502,19 +15630,19 @@ keyboard_event_get: {
     lda keyboard_events_size
     cmp #0
     beq breturn_from_keyboard_event_get
-    jmp b3
-  //SEG905 keyboard_event_get::@3
-  b3:
+    jmp b1
+  //SEG905 keyboard_event_get::@1
+  b1:
   //SEG906 [391] (byte) keyboard_events_size#4 ← -- (byte) keyboard_events_size#13 -- vbuz1=_dec_vbuz1 
     dec keyboard_events_size
   //SEG907 [392] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4) -- vbuz1=pbuc1_derefidx_vbuz2 
     ldy keyboard_events_size
     lda keyboard_events,y
     sta return
-  //SEG908 [393] phi from keyboard_event_get::@3 to keyboard_event_get::@return [phi:keyboard_event_get::@3->keyboard_event_get::@return]
-  breturn_from_b3:
-  //SEG909 [393] phi (byte) keyboard_events_size#16 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@3->keyboard_event_get::@return#0] -- register_copy 
-  //SEG910 [393] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@3->keyboard_event_get::@return#1] -- register_copy 
+  //SEG908 [393] phi from keyboard_event_get::@1 to keyboard_event_get::@return [phi:keyboard_event_get::@1->keyboard_event_get::@return]
+  breturn_from_b1:
+  //SEG909 [393] phi (byte) keyboard_events_size#16 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@1->keyboard_event_get::@return#0] -- register_copy 
+  //SEG910 [393] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@1->keyboard_event_get::@return#1] -- register_copy 
     jmp breturn
   //SEG911 [393] phi from keyboard_event_get to keyboard_event_get::@return [phi:keyboard_event_get->keyboard_event_get::@return]
   breturn_from_keyboard_event_get:
@@ -15546,24 +15674,24 @@ keyboard_event_scan: {
     .label row = $5a
     .label col = $5c
     .label event_type = $d7
-  //SEG917 [396] phi from keyboard_event_scan to keyboard_event_scan::@8 [phi:keyboard_event_scan->keyboard_event_scan::@8]
-  b8_from_keyboard_event_scan:
-  //SEG918 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#19 [phi:keyboard_event_scan->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG919 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#1] -- vbuz1=vbuc1 
+  //SEG917 [396] phi from keyboard_event_scan to keyboard_event_scan::@7 [phi:keyboard_event_scan->keyboard_event_scan::@7]
+  b7_from_keyboard_event_scan:
+  //SEG918 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#19 [phi:keyboard_event_scan->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG919 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#1] -- vbuz1=vbuc1 
     lda #0
     sta keycode
-  //SEG920 [396] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#2] -- vbuz1=vbuc1 
+  //SEG920 [396] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#2] -- vbuz1=vbuc1 
     lda #0
     sta row
-    jmp b8
-  //SEG921 [396] phi from keyboard_event_scan::@10 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8]
-  b8_from_b10:
-  //SEG922 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#13 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG923 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#1] -- register_copy 
-  //SEG924 [396] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#2] -- register_copy 
-    jmp b8
-  //SEG925 keyboard_event_scan::@8
-  b8:
+    jmp b7
+  //SEG921 [396] phi from keyboard_event_scan::@8 to keyboard_event_scan::@7 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7]
+  b7_from_b8:
+  //SEG922 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#13 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG923 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#1] -- register_copy 
+  //SEG924 [396] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#2] -- register_copy 
+    jmp b7
+  //SEG925 keyboard_event_scan::@7
+  b7:
   //SEG926 [397] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_event_scan::row#2 -- vbuz1=vbuz2 
     lda row
     sta keyboard_matrix_read.rowid
@@ -15572,77 +15700,77 @@ keyboard_event_scan: {
   //SEG928 [399] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return
     sta keyboard_matrix_read.return_2
-    jmp b25
-  //SEG929 keyboard_event_scan::@25
-  b25:
+    jmp b19
+  //SEG929 keyboard_event_scan::@19
+  b19:
   //SEG930 [400] (byte) keyboard_event_scan::row_scan#0 ← (byte) keyboard_matrix_read::return#2 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return_2
     sta row_scan
-  //SEG931 [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
+  //SEG931 [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
     lda row_scan
     ldy row
     cmp keyboard_scan_values,y
-    bne b11_from_b25
-    jmp b21
-  //SEG932 keyboard_event_scan::@21
-  b21:
+    bne b9_from_b19
+    jmp b16
+  //SEG932 keyboard_event_scan::@16
+  b16:
   //SEG933 [402] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
     axs #-[8]
     stx keycode
-  //SEG934 [403] phi from keyboard_event_scan::@20 keyboard_event_scan::@21 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10]
-  b10_from_b20:
-  b10_from_b21:
-  //SEG935 [403] phi (byte) keyboard_events_size#13 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#0] -- register_copy 
-  //SEG936 [403] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#1] -- register_copy 
-    jmp b10
-  //SEG937 keyboard_event_scan::@10
-  b10:
+  //SEG934 [403] phi from keyboard_event_scan::@15 keyboard_event_scan::@16 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8]
+  b8_from_b15:
+  b8_from_b16:
+  //SEG935 [403] phi (byte) keyboard_events_size#13 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#0] -- register_copy 
+  //SEG936 [403] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#1] -- register_copy 
+    jmp b8
+  //SEG937 keyboard_event_scan::@8
+  b8:
   //SEG938 [404] (byte) keyboard_event_scan::row#1 ← ++ (byte) keyboard_event_scan::row#2 -- vbuz1=_inc_vbuz1 
     inc row
-  //SEG939 [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG939 [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp row
-    bne b8_from_b10
-  //SEG940 [406] phi from keyboard_event_scan::@10 to keyboard_event_scan::@23 [phi:keyboard_event_scan::@10->keyboard_event_scan::@23]
-  b23_from_b10:
-    jmp b23
-  //SEG941 keyboard_event_scan::@23
-  b23:
+    bne b7_from_b8
+  //SEG940 [406] phi from keyboard_event_scan::@8 to keyboard_event_scan::@17 [phi:keyboard_event_scan::@8->keyboard_event_scan::@17]
+  b17_from_b8:
+    jmp b17
+  //SEG941 keyboard_event_scan::@17
+  b17:
   //SEG942 [407] call keyboard_event_pressed 
-  //SEG943 [384] phi from keyboard_event_scan::@23 to keyboard_event_pressed [phi:keyboard_event_scan::@23->keyboard_event_pressed]
-  keyboard_event_pressed_from_b23:
-  //SEG944 [384] phi (byte) keyboard_event_pressed::keycode#5 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@23->keyboard_event_pressed#0] -- vbuz1=vbuc1 
+  //SEG943 [384] phi from keyboard_event_scan::@17 to keyboard_event_pressed [phi:keyboard_event_scan::@17->keyboard_event_pressed]
+  keyboard_event_pressed_from_b17:
+  //SEG944 [384] phi (byte) keyboard_event_pressed::keycode#5 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@17->keyboard_event_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_LSHIFT
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG945 [408] (byte) keyboard_event_pressed::return#0 ← (byte) keyboard_event_pressed::return#11 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_11
     sta keyboard_event_pressed.return
-    jmp b26
-  //SEG946 keyboard_event_scan::@26
-  b26:
+    jmp b20
+  //SEG946 keyboard_event_scan::@20
+  b20:
   //SEG947 [409] (byte~) keyboard_event_scan::$0 ← (byte) keyboard_event_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return
     sta _0
   //SEG948 [410] if((byte~) keyboard_event_scan::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@1 -- vbuz1_eq_0_then_la1 
     lda _0
     cmp #0
-    beq b1_from_b26
-  //SEG949 [411] phi from keyboard_event_scan::@26 to keyboard_event_scan::@24 [phi:keyboard_event_scan::@26->keyboard_event_scan::@24]
-  b24_from_b26:
-    jmp b24
-  //SEG950 keyboard_event_scan::@24
-  b24:
-  //SEG951 [412] phi from keyboard_event_scan::@24 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1]
-  b1_from_b24:
-  //SEG952 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1#0] -- vbuz1=vbuc1 
+    beq b1_from_b20
+  //SEG949 [411] phi from keyboard_event_scan::@20 to keyboard_event_scan::@18 [phi:keyboard_event_scan::@20->keyboard_event_scan::@18]
+  b18_from_b20:
+    jmp b18
+  //SEG950 keyboard_event_scan::@18
+  b18:
+  //SEG951 [412] phi from keyboard_event_scan::@18 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1]
+  b1_from_b18:
+  //SEG952 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1#0] -- vbuz1=vbuc1 
     lda #0|KEY_MODIFIER_LSHIFT
     sta keyboard_modifiers
     jmp b1
-  //SEG953 [412] phi from keyboard_event_scan::@26 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1]
-  b1_from_b26:
-  //SEG954 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1#0] -- vbuz1=vbuc1 
+  //SEG953 [412] phi from keyboard_event_scan::@20 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1]
+  b1_from_b20:
+  //SEG954 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta keyboard_modifiers
     jmp b1
@@ -15658,27 +15786,27 @@ keyboard_event_scan: {
   //SEG959 [414] (byte) keyboard_event_pressed::return#1 ← (byte) keyboard_event_pressed::return#11 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_11
     sta keyboard_event_pressed.return_1
-    jmp b27
-  //SEG960 keyboard_event_scan::@27
-  b27:
+    jmp b21
+  //SEG960 keyboard_event_scan::@21
+  b21:
   //SEG961 [415] (byte~) keyboard_event_scan::$3 ← (byte) keyboard_event_pressed::return#1 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_1
     sta _3
   //SEG962 [416] if((byte~) keyboard_event_scan::$3==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@2 -- vbuz1_eq_0_then_la1 
     lda _3
     cmp #0
-    beq b2_from_b27
-    jmp b5
-  //SEG963 keyboard_event_scan::@5
-  b5:
+    beq b2_from_b21
+    jmp b4
+  //SEG963 keyboard_event_scan::@4
+  b4:
   //SEG964 [417] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#11 | (const byte) KEY_MODIFIER_RSHIFT#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #KEY_MODIFIER_RSHIFT
     ora keyboard_modifiers
     sta keyboard_modifiers
-  //SEG965 [418] phi from keyboard_event_scan::@27 keyboard_event_scan::@5 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2]
-  b2_from_b27:
-  b2_from_b5:
-  //SEG966 [418] phi (byte) keyboard_modifiers#12 = (byte) keyboard_modifiers#11 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2#0] -- register_copy 
+  //SEG965 [418] phi from keyboard_event_scan::@21 keyboard_event_scan::@4 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2]
+  b2_from_b21:
+  b2_from_b4:
+  //SEG966 [418] phi (byte) keyboard_modifiers#12 = (byte) keyboard_modifiers#11 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2#0] -- register_copy 
     jmp b2
   //SEG967 keyboard_event_scan::@2
   b2:
@@ -15692,27 +15820,27 @@ keyboard_event_scan: {
   //SEG971 [420] (byte) keyboard_event_pressed::return#2 ← (byte) keyboard_event_pressed::return#11 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_11
     sta keyboard_event_pressed.return_2
-    jmp b28
-  //SEG972 keyboard_event_scan::@28
-  b28:
+    jmp b22
+  //SEG972 keyboard_event_scan::@22
+  b22:
   //SEG973 [421] (byte~) keyboard_event_scan::$6 ← (byte) keyboard_event_pressed::return#2 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_2
     sta _6
   //SEG974 [422] if((byte~) keyboard_event_scan::$6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@3 -- vbuz1_eq_0_then_la1 
     lda _6
     cmp #0
-    beq b3_from_b28
-    jmp b6
-  //SEG975 keyboard_event_scan::@6
-  b6:
+    beq b3_from_b22
+    jmp b5
+  //SEG975 keyboard_event_scan::@5
+  b5:
   //SEG976 [423] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#12 | (const byte) KEY_MODIFIER_CTRL#0 -- vbuz1=vbuz1_bor_vbuc1 
     lda #KEY_MODIFIER_CTRL
     ora keyboard_modifiers
     sta keyboard_modifiers
-  //SEG977 [424] phi from keyboard_event_scan::@28 keyboard_event_scan::@6 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3]
-  b3_from_b28:
-  b3_from_b6:
-  //SEG978 [424] phi (byte) keyboard_modifiers#13 = (byte) keyboard_modifiers#12 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3#0] -- register_copy 
+  //SEG977 [424] phi from keyboard_event_scan::@22 keyboard_event_scan::@5 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3]
+  b3_from_b22:
+  b3_from_b5:
+  //SEG978 [424] phi (byte) keyboard_modifiers#13 = (byte) keyboard_modifiers#12 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3#0] -- register_copy 
     jmp b3
   //SEG979 keyboard_event_scan::@3
   b3:
@@ -15726,9 +15854,9 @@ keyboard_event_scan: {
   //SEG983 [426] (byte) keyboard_event_pressed::return#10 ← (byte) keyboard_event_pressed::return#11 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_11
     sta keyboard_event_pressed.return_10
-    jmp b29
-  //SEG984 keyboard_event_scan::@29
-  b29:
+    jmp b23
+  //SEG984 keyboard_event_scan::@23
+  b23:
   //SEG985 [427] (byte~) keyboard_event_scan::$9 ← (byte) keyboard_event_pressed::return#10 -- vbuz1=vbuz2 
     lda keyboard_event_pressed.return_10
     sta _9
@@ -15736,9 +15864,9 @@ keyboard_event_scan: {
     lda _9
     cmp #0
     beq breturn
-    jmp b7
-  //SEG987 keyboard_event_scan::@7
-  b7:
+    jmp b6
+  //SEG987 keyboard_event_scan::@6
+  b6:
   //SEG988 [429] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#13 | (const byte) KEY_MODIFIER_COMMODORE#0 -- vbuz1=vbuz2_bor_vbuc1 
     lda #KEY_MODIFIER_COMMODORE
     ora keyboard_modifiers
@@ -15749,22 +15877,22 @@ keyboard_event_scan: {
   //SEG990 [430] return 
     rts
   // Something has changed on the keyboard row - check each column
-  //SEG991 [431] phi from keyboard_event_scan::@12 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11]
-  b11_from_b12:
-  //SEG992 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG993 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG994 [431] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#2] -- register_copy 
-    jmp b11
-  //SEG995 [431] phi from keyboard_event_scan::@25 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11]
-  b11_from_b25:
-  //SEG996 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#30 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG997 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG998 [431] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#2] -- vbuz1=vbuc1 
+  //SEG991 [431] phi from keyboard_event_scan::@10 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9]
+  b9_from_b10:
+  //SEG992 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG993 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG994 [431] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#2] -- register_copy 
+    jmp b9
+  //SEG995 [431] phi from keyboard_event_scan::@19 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9]
+  b9_from_b19:
+  //SEG996 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#30 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG997 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG998 [431] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#2] -- vbuz1=vbuc1 
     lda #0
     sta col
-    jmp b11
-  //SEG999 keyboard_event_scan::@11
-  b11:
+    jmp b9
+  //SEG999 keyboard_event_scan::@9
+  b9:
   //SEG1000 [432] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) -- vbuz1=vbuz2_bxor_pbuc1_derefidx_vbuz3 
     lda row_scan
     ldy row
@@ -15775,32 +15903,32 @@ keyboard_event_scan: {
     ldy col
     and keyboard_matrix_col_bitmask,y
     sta _16
-  //SEG1002 [434] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@12 -- vbuz1_eq_0_then_la1 
+  //SEG1002 [434] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@10 -- vbuz1_eq_0_then_la1 
     lda _16
     cmp #0
-    beq b12_from_b11
-    jmp b16
-  //SEG1003 keyboard_event_scan::@16
-  b16:
-  //SEG1004 [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12 -- vbuz1_eq_vbuc1_then_la1 
+    beq b10_from_b9
+    jmp b12
+  //SEG1003 keyboard_event_scan::@12
+  b12:
+  //SEG1004 [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10 -- vbuz1_eq_vbuc1_then_la1 
     lda #8
     cmp keyboard_events_size
-    beq b12_from_b16
-    jmp b17
-  //SEG1005 keyboard_event_scan::@17
-  b17:
+    beq b10_from_b12
+    jmp b13
+  //SEG1005 keyboard_event_scan::@13
+  b13:
   //SEG1006 [436] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) -- vbuz1=vbuz2_band_pbuc1_derefidx_vbuz3 
     lda row_scan
     ldy col
     and keyboard_matrix_col_bitmask,y
     sta event_type
-  //SEG1007 [437] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@14 -- vbuz1_eq_0_then_la1 
+  //SEG1007 [437] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@11 -- vbuz1_eq_0_then_la1 
     lda event_type
     cmp #0
-    beq b14
-    jmp b18
-  //SEG1008 keyboard_event_scan::@18
-  b18:
+    beq b11
+    jmp b14
+  //SEG1008 keyboard_event_scan::@14
+  b14:
   //SEG1009 [438] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#10) ← (byte) keyboard_event_scan::keycode#10 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Key pressed
     lda keycode
@@ -15808,34 +15936,34 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG1010 [439] (byte) keyboard_events_size#2 ← ++ (byte) keyboard_events_size#10 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-  //SEG1011 [440] phi from keyboard_event_scan::@11 keyboard_event_scan::@14 keyboard_event_scan::@16 keyboard_event_scan::@18 to keyboard_event_scan::@12 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12]
-  b12_from_b11:
-  b12_from_b14:
-  b12_from_b16:
-  b12_from_b18:
-  //SEG1012 [440] phi (byte) keyboard_events_size#29 = (byte) keyboard_events_size#10 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12#0] -- register_copy 
-    jmp b12
-  //SEG1013 keyboard_event_scan::@12
-  b12:
+  //SEG1011 [440] phi from keyboard_event_scan::@11 keyboard_event_scan::@12 keyboard_event_scan::@14 keyboard_event_scan::@9 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10]
+  b10_from_b11:
+  b10_from_b12:
+  b10_from_b14:
+  b10_from_b9:
+  //SEG1012 [440] phi (byte) keyboard_events_size#29 = (byte) keyboard_events_size#1 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10#0] -- register_copy 
+    jmp b10
+  //SEG1013 keyboard_event_scan::@10
+  b10:
   //SEG1014 [441] (byte) keyboard_event_scan::keycode#15 ← ++ (byte) keyboard_event_scan::keycode#10 -- vbuz1=_inc_vbuz1 
     inc keycode
   //SEG1015 [442] (byte) keyboard_event_scan::col#1 ← ++ (byte) keyboard_event_scan::col#2 -- vbuz1=_inc_vbuz1 
     inc col
-  //SEG1016 [443] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG1016 [443] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp col
-    bne b11_from_b12
-    jmp b20
-  //SEG1017 keyboard_event_scan::@20
-  b20:
+    bne b9_from_b10
+    jmp b15
+  //SEG1017 keyboard_event_scan::@15
+  b15:
   //SEG1018 [444] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Store the current keyboard status for the row to debounce
     lda row_scan
     ldy row
     sta keyboard_scan_values,y
-    jmp b10_from_b20
-  //SEG1019 keyboard_event_scan::@14
-  b14:
+    jmp b8_from_b15
+  //SEG1019 keyboard_event_scan::@11
+  b11:
   //SEG1020 [445] (byte/word/dword~) keyboard_event_scan::$23 ← (byte) keyboard_event_scan::keycode#10 | (byte/signed byte/word/signed word/dword/signed dword) $40 -- vbuz1=vbuz2_bor_vbuc1 
     lda #$40
     ora keycode
@@ -15847,7 +15975,7 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG1022 [447] (byte) keyboard_events_size#1 ← ++ (byte) keyboard_events_size#10 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-    jmp b12_from_b14
+    jmp b10_from_b11
 }
 //SEG1023 keyboard_matrix_read
 // Read a single row of the keyboard matrix
@@ -15889,14 +16017,14 @@ render_show: {
     jmp toD0182
   //SEG1031 render_show::toD0182
   toD0182:
-  //SEG1032 [453] phi from render_show::toD0182 to render_show::@2 [phi:render_show::toD0182->render_show::@2]
-  b2_from_toD0182:
-  //SEG1033 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0182_return#0 [phi:render_show::toD0182->render_show::@2#0] -- vbuz1=vbuc1 
+  //SEG1032 [453] phi from render_show::toD0182 to render_show::@1 [phi:render_show::toD0182->render_show::@1]
+  b1_from_toD0182:
+  //SEG1033 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0182_return#0 [phi:render_show::toD0182->render_show::@1#0] -- vbuz1=vbuc1 
     lda #toD0182_return
     sta d018val
-    jmp b2
-  //SEG1034 render_show::@2
-  b2:
+    jmp b1
+  //SEG1034 render_show::@1
+  b1:
   //SEG1035 [454] *((const byte*) D018#0) ← (byte) render_show::d018val#3 -- _deref_pbuc1=vbuz1 
     lda d018val
     sta D018
@@ -15921,12 +16049,12 @@ render_show: {
     jmp toD0181
   //SEG1042 render_show::toD0181
   toD0181:
-  //SEG1043 [453] phi from render_show::toD0181 to render_show::@2 [phi:render_show::toD0181->render_show::@2]
-  b2_from_toD0181:
-  //SEG1044 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0181_return#0 [phi:render_show::toD0181->render_show::@2#0] -- vbuz1=vbuc1 
+  //SEG1043 [453] phi from render_show::toD0181 to render_show::@1 [phi:render_show::toD0181->render_show::@1]
+  b1_from_toD0181:
+  //SEG1044 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0181_return#0 [phi:render_show::toD0181->render_show::@1#0] -- vbuz1=vbuc1 
     lda #toD0181_return
     sta d018val
-    jmp b2
+    jmp b1
 }
 //SEG1045 play_init
 // Initialize play data tables
@@ -16177,9 +16305,9 @@ render_init: {
   //SEG1116 [504] *((const byte*) CIA2_PORT_A#0) ← (const byte) render_init::vicSelectGfxBank1_toDd001_return#0 -- _deref_pbuc1=vbuc2 
     lda #vicSelectGfxBank1_toDd001_return
     sta CIA2_PORT_A
-    jmp b3
-  //SEG1117 render_init::@3
-  b3:
+    jmp b2
+  //SEG1117 render_init::@2
+  b2:
   //SEG1118 [505] *((const byte*) D011#0) ← (const byte) VIC_ECM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 -- _deref_pbuc1=vbuc2 
     // Enable Extended Background Color Mode
     lda #VIC_ECM|VIC_DEN|VIC_RSEL|3
@@ -16200,41 +16328,41 @@ render_init: {
     lda #GREY
     sta BGCOL4
   //SEG1124 [511] call render_screen_original 
-  //SEG1125 [524] phi from render_init::@3 to render_screen_original [phi:render_init::@3->render_screen_original]
-  render_screen_original_from_b3:
-  //SEG1126 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_init::@3->render_screen_original#0] -- pbuz1=pbuc1 
+  //SEG1125 [524] phi from render_init::@2 to render_screen_original [phi:render_init::@2->render_screen_original]
+  render_screen_original_from_b2:
+  //SEG1126 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_init::@2->render_screen_original#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1
     sta render_screen_original.screen
     lda #>PLAYFIELD_SCREEN_1
     sta render_screen_original.screen+1
     jsr render_screen_original
-  //SEG1127 [512] phi from render_init::@3 to render_init::@4 [phi:render_init::@3->render_init::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG1128 render_init::@4
-  b4:
+  //SEG1127 [512] phi from render_init::@2 to render_init::@3 [phi:render_init::@2->render_init::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG1128 render_init::@3
+  b3:
   //SEG1129 [513] call render_screen_original 
-  //SEG1130 [524] phi from render_init::@4 to render_screen_original [phi:render_init::@4->render_screen_original]
-  render_screen_original_from_b4:
-  //SEG1131 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_init::@4->render_screen_original#0] -- pbuz1=pbuc1 
+  //SEG1130 [524] phi from render_init::@3 to render_screen_original [phi:render_init::@3->render_screen_original]
+  render_screen_original_from_b3:
+  //SEG1131 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_init::@3->render_screen_original#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2
     sta render_screen_original.screen
     lda #>PLAYFIELD_SCREEN_2
     sta render_screen_original.screen+1
     jsr render_screen_original
-  //SEG1132 [514] phi from render_init::@4 to render_init::@1 [phi:render_init::@4->render_init::@1]
-  b1_from_b4:
-  //SEG1133 [514] phi (byte*) render_init::li_2#2 = (const byte*) PLAYFIELD_SCREEN_2#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@4->render_init::@1#0] -- pbuz1=pbuc1 
+  //SEG1132 [514] phi from render_init::@3 to render_init::@1 [phi:render_init::@3->render_init::@1]
+  b1_from_b3:
+  //SEG1133 [514] phi (byte*) render_init::li_2#2 = (const byte*) PLAYFIELD_SCREEN_2#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@3->render_init::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2+2*$28+$10
     sta li_2
     lda #>PLAYFIELD_SCREEN_2+2*$28+$10
     sta li_2+1
-  //SEG1134 [514] phi (byte*) render_init::li_1#2 = (const byte*) PLAYFIELD_SCREEN_1#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@4->render_init::@1#1] -- pbuz1=pbuc1 
+  //SEG1134 [514] phi (byte*) render_init::li_1#2 = (const byte*) PLAYFIELD_SCREEN_1#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@3->render_init::@1#1] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1+2*$28+$10
     sta li_1
     lda #>PLAYFIELD_SCREEN_1+2*$28+$10
     sta li_1+1
-  //SEG1135 [514] phi (byte) render_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_init::@4->render_init::@1#2] -- vbuz1=vbuc1 
+  //SEG1135 [514] phi (byte) render_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_init::@3->render_init::@1#2] -- vbuz1=vbuc1 
     lda #0
     sta i
     jmp b1
@@ -16328,13 +16456,13 @@ render_screen_original: {
     sta cols+1
   //SEG1157 [525] phi (byte*) render_screen_original::screen#8 = (byte*) render_screen_original::screen#9 [phi:render_screen_original->render_screen_original::@1#4] -- register_copy 
     jmp b1
-  //SEG1158 [525] phi from render_screen_original::@7 to render_screen_original::@1 [phi:render_screen_original::@7->render_screen_original::@1]
-  b1_from_b7:
-  //SEG1159 [525] phi (byte) render_screen_original::y#6 = (byte) render_screen_original::y#1 [phi:render_screen_original::@7->render_screen_original::@1#0] -- register_copy 
-  //SEG1160 [525] phi (byte*) render_screen_original::ocols#4 = (byte*) render_screen_original::ocols#1 [phi:render_screen_original::@7->render_screen_original::@1#1] -- register_copy 
-  //SEG1161 [525] phi (byte*) render_screen_original::oscr#4 = (byte*) render_screen_original::oscr#1 [phi:render_screen_original::@7->render_screen_original::@1#2] -- register_copy 
-  //SEG1162 [525] phi (byte*) render_screen_original::cols#7 = (byte*) render_screen_original::cols#3 [phi:render_screen_original::@7->render_screen_original::@1#3] -- register_copy 
-  //SEG1163 [525] phi (byte*) render_screen_original::screen#8 = (byte*) render_screen_original::screen#10 [phi:render_screen_original::@7->render_screen_original::@1#4] -- register_copy 
+  //SEG1158 [525] phi from render_screen_original::@5 to render_screen_original::@1 [phi:render_screen_original::@5->render_screen_original::@1]
+  b1_from_b5:
+  //SEG1159 [525] phi (byte) render_screen_original::y#6 = (byte) render_screen_original::y#1 [phi:render_screen_original::@5->render_screen_original::@1#0] -- register_copy 
+  //SEG1160 [525] phi (byte*) render_screen_original::ocols#4 = (byte*) render_screen_original::ocols#1 [phi:render_screen_original::@5->render_screen_original::@1#1] -- register_copy 
+  //SEG1161 [525] phi (byte*) render_screen_original::oscr#4 = (byte*) render_screen_original::oscr#1 [phi:render_screen_original::@5->render_screen_original::@1#2] -- register_copy 
+  //SEG1162 [525] phi (byte*) render_screen_original::cols#7 = (byte*) render_screen_original::cols#3 [phi:render_screen_original::@5->render_screen_original::@1#3] -- register_copy 
+  //SEG1163 [525] phi (byte*) render_screen_original::screen#8 = (byte*) render_screen_original::screen#10 [phi:render_screen_original::@5->render_screen_original::@1#4] -- register_copy 
     jmp b1
   //SEG1164 render_screen_original::@1
   b1:
@@ -16378,17 +16506,17 @@ render_screen_original: {
     lda #4
     cmp x
     bne b2_from_b2
-  //SEG1180 [533] phi from render_screen_original::@2 render_screen_original::@4 to render_screen_original::@4 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4]
-  b4_from_b2:
-  b4_from_b4:
-  //SEG1181 [533] phi (byte) render_screen_original::x#5 = (byte) render_screen_original::x#1 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#0] -- register_copy 
-  //SEG1182 [533] phi (byte*) render_screen_original::cols#5 = (byte*) render_screen_original::cols#1 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#1] -- register_copy 
-  //SEG1183 [533] phi (byte*) render_screen_original::ocols#2 = (byte*) render_screen_original::ocols#4 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#2] -- register_copy 
-  //SEG1184 [533] phi (byte*) render_screen_original::screen#6 = (byte*) render_screen_original::screen#2 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#3] -- register_copy 
-  //SEG1185 [533] phi (byte*) render_screen_original::oscr#2 = (byte*) render_screen_original::oscr#4 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#4] -- register_copy 
-    jmp b4
-  //SEG1186 render_screen_original::@4
-  b4:
+  //SEG1180 [533] phi from render_screen_original::@2 render_screen_original::@3 to render_screen_original::@3 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3]
+  b3_from_b2:
+  b3_from_b3:
+  //SEG1181 [533] phi (byte) render_screen_original::x#5 = (byte) render_screen_original::x#1 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#0] -- register_copy 
+  //SEG1182 [533] phi (byte*) render_screen_original::cols#5 = (byte*) render_screen_original::cols#1 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#1] -- register_copy 
+  //SEG1183 [533] phi (byte*) render_screen_original::ocols#2 = (byte*) render_screen_original::ocols#4 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#2] -- register_copy 
+  //SEG1184 [533] phi (byte*) render_screen_original::screen#6 = (byte*) render_screen_original::screen#2 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#3] -- register_copy 
+  //SEG1185 [533] phi (byte*) render_screen_original::oscr#2 = (byte*) render_screen_original::oscr#4 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#4] -- register_copy 
+    jmp b3
+  //SEG1186 render_screen_original::@3
+  b3:
   //SEG1187 [534] *((byte*) render_screen_original::screen#6) ← *((byte*) render_screen_original::oscr#2) -- _deref_pbuz1=_deref_pbuz2 
     ldy #0
     lda (oscr),y
@@ -16421,19 +16549,19 @@ render_screen_original: {
   !:
   //SEG1193 [540] (byte) render_screen_original::x#2 ← ++ (byte) render_screen_original::x#5 -- vbuz1=_inc_vbuz1 
     inc x
-  //SEG1194 [541] if((byte) render_screen_original::x#2!=(byte/signed byte/word/signed word/dword/signed dword) $24) goto render_screen_original::@4 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG1194 [541] if((byte) render_screen_original::x#2!=(byte/signed byte/word/signed word/dword/signed dword) $24) goto render_screen_original::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #$24
     cmp x
-    bne b4_from_b4
-  //SEG1195 [542] phi from render_screen_original::@4 render_screen_original::@6 to render_screen_original::@6 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6]
-  b6_from_b4:
-  b6_from_b6:
-  //SEG1196 [542] phi (byte) render_screen_original::x#6 = (byte) render_screen_original::x#2 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6#0] -- register_copy 
-  //SEG1197 [542] phi (byte*) render_screen_original::cols#6 = (byte*) render_screen_original::cols#2 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6#1] -- register_copy 
-  //SEG1198 [542] phi (byte*) render_screen_original::screen#7 = (byte*) render_screen_original::screen#3 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6#2] -- register_copy 
-    jmp b6
-  //SEG1199 render_screen_original::@6
-  b6:
+    bne b3_from_b3
+  //SEG1195 [542] phi from render_screen_original::@3 render_screen_original::@4 to render_screen_original::@4 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4]
+  b4_from_b3:
+  b4_from_b4:
+  //SEG1196 [542] phi (byte) render_screen_original::x#6 = (byte) render_screen_original::x#2 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4#0] -- register_copy 
+  //SEG1197 [542] phi (byte*) render_screen_original::cols#6 = (byte*) render_screen_original::cols#2 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4#1] -- register_copy 
+  //SEG1198 [542] phi (byte*) render_screen_original::screen#7 = (byte*) render_screen_original::screen#3 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4#2] -- register_copy 
+    jmp b4
+  //SEG1199 render_screen_original::@4
+  b4:
   //SEG1200 [543] *((byte*) render_screen_original::screen#7) ← (const byte) render_screen_original::SPACE#0 -- _deref_pbuz1=vbuc1 
     lda #SPACE
     ldy #0
@@ -16454,19 +16582,19 @@ render_screen_original: {
   !:
   //SEG1204 [547] (byte) render_screen_original::x#3 ← ++ (byte) render_screen_original::x#6 -- vbuz1=_inc_vbuz1 
     inc x
-  //SEG1205 [548] if((byte) render_screen_original::x#3!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_screen_original::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG1205 [548] if((byte) render_screen_original::x#3!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_screen_original::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp x
-    bne b6_from_b6
-    jmp b7
-  //SEG1206 render_screen_original::@7
-  b7:
+    bne b4_from_b4
+    jmp b5
+  //SEG1206 render_screen_original::@5
+  b5:
   //SEG1207 [549] (byte) render_screen_original::y#1 ← ++ (byte) render_screen_original::y#6 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1208 [550] if((byte) render_screen_original::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto render_screen_original::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$19
     cmp y
-    bne b1_from_b7
+    bne b1_from_b5
     jmp breturn
   //SEG1209 render_screen_original::@return
   breturn:
@@ -16536,16 +16664,16 @@ sprites_irq: {
     // Wait for the y-position before changing sprite pointers
     lda _0
     sta raster_sprite_gfx_modify
-    jmp b11
-  //SEG1226 sprites_irq::@11
-  b11:
-  //SEG1227 [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11 -- _deref_pbuc1_lt_vbuz1_then_la1 
+    jmp b8
+  //SEG1226 sprites_irq::@8
+  b8:
+  //SEG1227 [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8 -- _deref_pbuc1_lt_vbuz1_then_la1 
     lda RASTER
     cmp raster_sprite_gfx_modify
-    bcc b11
-    jmp b12
-  //SEG1228 sprites_irq::@12
-  b12:
+    bcc b8
+    jmp b9
+  //SEG1228 sprites_irq::@9
+  b9:
   //SEG1229 [564] (byte) sprites_irq::ptr#0 ← (byte) irq_sprite_ptr#0 -- vbuz1=vbuz2 
     lda irq_sprite_ptr
     sta ptr
@@ -16553,9 +16681,9 @@ sprites_irq: {
     lda render_screen_showing
     cmp #0
     beq b1
-    jmp b13
-  //SEG1231 sprites_irq::@13
-  b13:
+    jmp b10
+  //SEG1231 sprites_irq::@10
+  b10:
   //SEG1232 [566] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuz1 
     lda ptr
     sta PLAYFIELD_SPRITE_PTRS_2
@@ -16587,16 +16715,16 @@ sprites_irq: {
     lda #9
     cmp irq_cnt_1
     beq b3
-    jmp b7
-  //SEG1241 sprites_irq::@7
-  b7:
+    jmp b6
+  //SEG1241 sprites_irq::@6
+  b6:
   //SEG1242 [574] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) $a) goto sprites_irq::@4 -- vbuz1_eq_vbuc1_then_la1 
     lda #$a
     cmp irq_cnt_1
     beq b4
-    jmp b8
-  //SEG1243 sprites_irq::@8
-  b8:
+    jmp b7
+  //SEG1243 sprites_irq::@7
+  b7:
   //SEG1244 [575] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_raster_next
     axs #-[$14]
@@ -16609,14 +16737,14 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr_3
-  //SEG1247 [578] phi from sprites_irq::@15 sprites_irq::@4 sprites_irq::@8 to sprites_irq::@6 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6]
-  b6_from_b15:
-  b6_from_b4:
-  b6_from_b8:
-  //SEG1248 [578] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6#0] -- register_copy 
-    jmp b6
-  //SEG1249 sprites_irq::@6
-  b6:
+  //SEG1247 [578] phi from sprites_irq::@11 sprites_irq::@4 sprites_irq::@7 to sprites_irq::@5 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5]
+  b5_from_b11:
+  b5_from_b4:
+  b5_from_b7:
+  //SEG1248 [578] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5#0] -- register_copy 
+    jmp b5
+  //SEG1249 sprites_irq::@5
+  b5:
   //SEG1250 [579] *((const byte*) RASTER#0) ← (byte) irq_raster_next#4 -- _deref_pbuc1=vbuz1 
     // Setup next interrupt
     lda irq_raster_next_4
@@ -16652,7 +16780,7 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr_2
-    jmp b6_from_b4
+    jmp b5_from_b4
   //SEG1259 sprites_irq::@3
   b3:
   //SEG1260 [586] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz2_plus_vbuc1 
@@ -16667,13 +16795,13 @@ sprites_irq: {
     jmp toSpritePtr2
   //SEG1263 sprites_irq::toSpritePtr2
   toSpritePtr2:
-    jmp b15
-  //SEG1264 sprites_irq::@15
-  b15:
+    jmp b11
+  //SEG1264 sprites_irq::@11
+  b11:
   //SEG1265 [589] (byte) irq_sprite_ptr#1 ← (const byte) sprites_irq::toSpritePtr2_return#0 -- vbuz1=vbuc1 
     lda #toSpritePtr2_return
     sta irq_sprite_ptr_1
-    jmp b6_from_b15
+    jmp b5_from_b11
   //SEG1266 sprites_irq::@1
   b1:
   //SEG1267 [590] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuz1 
@@ -16813,7 +16941,7 @@ Removing always clobbered register reg byte a as potential for zp ZP_BYTE:176 [
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:64 [ current_movedown_slow#37 current_movedown_slow#14 current_movedown_slow#21 current_movedown_slow#1 current_movedown_slow#23 current_movedown_slow#69 current_movedown_slow#10 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:75 [ game_over#65 game_over#27 game_over#10 game_over#15 game_over#52 ]
 Statement [37] (byte*~) current_piece#96 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0) [ current_ypos#6 current_xpos#103 current_piece_gfx#74 current_piece_char#5 play_spawn_current::piece_idx#2 current_piece#96 current_movedown_slow#1 game_over#52 ] ( main:12 [ current_ypos#6 current_xpos#103 current_piece_gfx#74 current_piece_char#5 play_spawn_current::piece_idx#2 current_piece#96 current_movedown_slow#1 game_over#52 ] ) always clobbers reg byte a 
-Statement [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ) always clobbers reg byte a 
+Statement [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ render_screen_show#16 render_screen_show#13 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:3 [ render_screen_render#18 render_screen_render#11 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:69 [ current_orientation#37 current_orientation#13 current_orientation#17 current_orientation#20 current_orientation#25 current_orientation#7 ]
@@ -16934,7 +17062,7 @@ Statement [315] (dword) play_update_score::add_bcd#0 ← *((const dword[5]) scor
 Statement [317] (word) lines_bcd#30 ← (word) lines_bcd#19 + (byte) play_update_score::removed#0 [ current_movedown_slow#14 score_bcd#18 level#10 level_bcd#11 play_update_score::lines_before#0 play_update_score::add_bcd#0 lines_bcd#30 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 current_movedown_slow#14 score_bcd#18 level#10 level_bcd#11 play_update_score::lines_before#0 play_update_score::add_bcd#0 lines_bcd#30 ] ) always clobbers reg byte a 
 Statement [318] (dword) score_bcd#30 ← (dword) score_bcd#18 + (dword) play_update_score::add_bcd#0 [ current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 ] ) always clobbers reg byte a 
 Statement [320] (byte~) play_update_score::$5 ← < (word) lines_bcd#30 [ current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 play_update_score::$5 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 play_update_score::$5 ] ) always clobbers reg byte a 
-Statement [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@2 [ level_bcd#11 level#21 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level_bcd#11 level#21 ] ) always clobbers reg byte a 
+Statement [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@1 [ level_bcd#11 level#21 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level_bcd#11 level#21 ] ) always clobbers reg byte a 
 Statement [332] (byte~) play_increase_level::$1 ← (byte) level_bcd#21 & (byte/signed byte/word/signed word/dword/signed dword) $f [ level#21 current_movedown_slow#69 level_bcd#21 play_increase_level::$1 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level#21 current_movedown_slow#69 level_bcd#21 play_increase_level::$1 ] ) always clobbers reg byte a 
 Statement [334] (byte) level_bcd#8 ← (byte) level_bcd#21 + (byte/signed byte/word/signed word/dword/signed dword) 6 [ level#21 current_movedown_slow#69 level_bcd#8 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level#21 current_movedown_slow#69 level_bcd#8 ] ) always clobbers reg byte a reg byte x 
 Removing always clobbered register reg byte x as potential for zp ZP_BYTE:2 [ render_screen_show#16 render_screen_show#13 ]
@@ -16982,7 +17110,7 @@ Statement [432] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan:
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:203 [ keyboard_event_scan::row_scan#0 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:92 [ keyboard_event_scan::col#2 keyboard_event_scan::col#1 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:93 [ keyboard_event_scan::keycode#10 keyboard_event_scan::keycode#11 keyboard_event_scan::keycode#14 keyboard_event_scan::keycode#15 keyboard_event_scan::keycode#1 ]
-Statement [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12 [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ) always clobbers reg byte a 
+Statement [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10 [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ) always clobbers reg byte a 
 Statement [436] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::event_type#0 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::event_type#0 ] ) always clobbers reg byte a 
 Statement [438] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#10) ← (byte) keyboard_event_scan::keycode#10 [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ) always clobbers reg byte a reg byte y 
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:90 [ keyboard_event_scan::row#2 keyboard_event_scan::row#1 ]
@@ -17056,7 +17184,7 @@ Statement [543] *((byte*) render_screen_original::screen#7) ← (const byte) ren
 Statement [545] *((byte*) render_screen_original::cols#6) ← (const byte) BLACK#0 [ render_screen_original::y#6 render_screen_original::screen#10 render_screen_original::oscr#1 render_screen_original::ocols#1 render_screen_original::cols#6 render_screen_original::x#6 ] ( main:12::render_init:17::render_screen_original:511 [ render_screen_original::y#6 render_screen_original::screen#10 render_screen_original::oscr#1 render_screen_original::ocols#1 render_screen_original::cols#6 render_screen_original::x#6 ] main:12::render_init:17::render_screen_original:513 [ render_screen_original::y#6 render_screen_original::screen#10 render_screen_original::oscr#1 render_screen_original::ocols#1 render_screen_original::cols#6 render_screen_original::x#6 ] ) always clobbers reg byte a reg byte y 
 Statement [552] *((const word*) SID_VOICE3_FREQ#0) ← (word/dword/signed dword) $ffff [ ] ( main:12::sid_rnd_init:15 [ ] ) always clobbers reg byte a 
 Statement [553] *((const byte*) SID_VOICE3_CONTROL#0) ← (const byte) SID_CONTROL_NOISE#0 [ ] ( main:12::sid_rnd_init:15 [ ] ) always clobbers reg byte a 
-Statement [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11 [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] (  [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] ) always clobbers reg byte a 
+Statement [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8 [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] (  [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] ) always clobbers reg byte a 
 Statement [565] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::ptr#0 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::ptr#0 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:227 [ sprites_irq::ptr#0 ]
 Statement [572] (byte) irq_cnt#1 ← ++ (byte) irq_cnt#0 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] ) always clobbers reg byte y 
@@ -17082,13 +17210,13 @@ Statement [9] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(by
 Statement [10] (byte) irq_cnt#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( ) always clobbers reg byte a 
 Statement [32] (byte*~) current_piece_gfx#118 ← (byte*) current_piece_gfx#74 [ current_ypos#104 current_ypos#6 current_xpos#128 current_xpos#103 current_piece_gfx#118 current_piece_gfx#74 current_piece_char#5 play_spawn_current::piece_idx#2 play_spawn_current::$0 current_movedown_slow#1 game_over#52 ] ( main:12 [ current_ypos#104 current_ypos#6 current_xpos#128 current_xpos#103 current_piece_gfx#118 current_piece_gfx#74 current_piece_char#5 play_spawn_current::piece_idx#2 play_spawn_current::$0 current_movedown_slow#1 game_over#52 ] ) always clobbers reg byte a 
 Statement [37] (byte*~) current_piece#96 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0) [ current_ypos#6 current_xpos#103 current_piece_gfx#74 current_piece_char#5 play_spawn_current::piece_idx#2 current_piece#96 current_movedown_slow#1 game_over#52 ] ( main:12 [ current_ypos#6 current_xpos#103 current_piece_gfx#74 current_piece_char#5 play_spawn_current::piece_idx#2 current_piece#96 current_movedown_slow#1 game_over#52 ] ) always clobbers reg byte a 
-Statement [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ) always clobbers reg byte a 
-Statement [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#16 main::key_event#0 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#16 main::key_event#0 ] ) always clobbers reg byte a 
+Statement [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ) always clobbers reg byte a 
+Statement [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#16 main::key_event#0 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#16 main::key_event#0 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:125 [ main::key_event#0 ]
 Statement [60] (byte*~) current_piece_gfx#119 ← (byte*) current_piece_gfx#18 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 lines_bcd#15 score_bcd#14 level#17 level_bcd#17 current_ypos#105 render_screen_render#69 current_xpos#129 current_piece_gfx#119 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 lines_bcd#15 score_bcd#14 level#17 level_bcd#17 current_ypos#105 render_screen_render#69 current_xpos#129 current_piece_gfx#119 ] ) always clobbers reg byte a 
 Statement [70] (byte) render_screen_render#11 ← (byte) render_screen_render#18 ^ (byte/signed byte/word/signed word/dword/signed dword) $40 [ render_screen_show#16 render_screen_render#11 ] ( main:12::render_screen_swap:69 [ current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 lines_bcd#15 score_bcd#14 level#17 level_bcd#17 render_screen_show#16 render_screen_render#11 ] ) always clobbers reg byte a 
 Statement [71] (byte) render_screen_show#13 ← (byte) render_screen_show#16 ^ (byte/signed byte/word/signed word/dword/signed dword) $40 [ render_screen_show#13 render_screen_render#11 ] ( main:12::render_screen_swap:69 [ current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 lines_bcd#15 score_bcd#14 level#17 level_bcd#17 render_screen_show#13 render_screen_render#11 ] ) always clobbers reg byte a 
-Statement [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@2 [ render_screen_render#18 lines_bcd#15 level_bcd#17 ] ( main:12::render_score:67 [ render_screen_show#16 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 score_bcd#14 level#17 render_screen_render#18 lines_bcd#15 level_bcd#17 ] ) always clobbers reg byte a 
+Statement [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@1 [ render_screen_render#18 lines_bcd#15 level_bcd#17 ] ( main:12::render_score:67 [ render_screen_show#16 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 score_bcd#14 level#17 render_screen_render#18 lines_bcd#15 level_bcd#17 ] ) always clobbers reg byte a 
 Statement [76] (byte*) render_bcd::screen#0 ← (byte*) render_score::screen#3 [ render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#0 ] ( main:12::render_score:67 [ render_screen_show#16 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 score_bcd#14 level#17 render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#0 ] ) always clobbers reg byte a 
 Statement [79] (byte*) render_bcd::screen#1 ← (byte*) render_score::screen#3 [ render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#1 ] ( main:12::render_score:67 [ render_screen_show#16 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 score_bcd#14 level#17 render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#1 ] ) always clobbers reg byte a 
 Statement [82] (byte*) render_bcd::screen#2 ← (byte*) render_score::screen#3 [ render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#2 ] ( main:12::render_score:67 [ render_screen_show#16 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 score_bcd#14 level#17 render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#2 ] ) always clobbers reg byte a 
@@ -17148,7 +17276,7 @@ Statement [315] (dword) play_update_score::add_bcd#0 ← *((const dword[5]) scor
 Statement [317] (word) lines_bcd#30 ← (word) lines_bcd#19 + (byte) play_update_score::removed#0 [ current_movedown_slow#14 score_bcd#18 level#10 level_bcd#11 play_update_score::lines_before#0 play_update_score::add_bcd#0 lines_bcd#30 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 current_movedown_slow#14 score_bcd#18 level#10 level_bcd#11 play_update_score::lines_before#0 play_update_score::add_bcd#0 lines_bcd#30 ] ) always clobbers reg byte a 
 Statement [318] (dword) score_bcd#30 ← (dword) score_bcd#18 + (dword) play_update_score::add_bcd#0 [ current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 ] ) always clobbers reg byte a 
 Statement [320] (byte~) play_update_score::$5 ← < (word) lines_bcd#30 [ current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 play_update_score::$5 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 play_update_score::$5 ] ) always clobbers reg byte a 
-Statement [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@2 [ level_bcd#11 level#21 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level_bcd#11 level#21 ] ) always clobbers reg byte a 
+Statement [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@1 [ level_bcd#11 level#21 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level_bcd#11 level#21 ] ) always clobbers reg byte a 
 Statement [329] (byte) current_movedown_slow#10 ← *((const byte[]) MOVEDOWN_SLOW_SPEEDS#0 + (byte) level#21) [ level_bcd#11 level#21 current_movedown_slow#10 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level_bcd#11 level#21 current_movedown_slow#10 ] ) always clobbers reg byte a reg byte y 
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:126 [ play_movement::key_event#0 ]
 Statement [332] (byte~) play_increase_level::$1 ← (byte) level_bcd#21 & (byte/signed byte/word/signed word/dword/signed dword) $f [ level#21 current_movedown_slow#69 level_bcd#21 play_increase_level::$1 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level#21 current_movedown_slow#69 level_bcd#21 play_increase_level::$1 ] ) always clobbers reg byte a 
@@ -17166,7 +17294,7 @@ Statement [387] (byte~) keyboard_event_pressed::$1 ← (byte) keyboard_event_pre
 Statement [388] (byte) keyboard_event_pressed::return#11 ← (byte) keyboard_event_pressed::row_bits#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte~) keyboard_event_pressed::$1) [ keyboard_event_pressed::return#11 ] ( main:12::play_movement:51::play_move_down:165::keyboard_event_pressed:251 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 current_movedown_counter#12 play_move_down::movedown#10 keyboard_event_pressed::return#11 ] main:12::keyboard_event_scan:43::keyboard_event_pressed:407 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_event_pressed::return#11 ] main:12::keyboard_event_scan:43::keyboard_event_pressed:413 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_modifiers#11 keyboard_event_pressed::return#11 ] main:12::keyboard_event_scan:43::keyboard_event_pressed:419 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_modifiers#12 keyboard_event_pressed::return#11 ] main:12::keyboard_event_scan:43::keyboard_event_pressed:425 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_modifiers#13 keyboard_event_pressed::return#11 ] ) always clobbers reg byte a 
 Statement [390] if((byte) keyboard_events_size#13==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_get::@return [ keyboard_events_size#13 ] ( main:12::keyboard_event_get:45 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 ] ) always clobbers reg byte a 
 Statement [392] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4) [ keyboard_events_size#4 keyboard_event_get::return#1 ] ( main:12::keyboard_event_get:45 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#4 keyboard_event_get::return#1 ] ) always clobbers reg byte y 
-Statement [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11 [ keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#30 keyboard_event_scan::row_scan#0 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#30 keyboard_event_scan::row_scan#0 ] ) always clobbers reg byte a 
+Statement [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9 [ keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#30 keyboard_event_scan::row_scan#0 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#30 keyboard_event_scan::row_scan#0 ] ) always clobbers reg byte a 
 Statement [402] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 [ keyboard_event_scan::row#2 keyboard_events_size#30 keyboard_event_scan::keycode#1 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_events_size#30 keyboard_event_scan::keycode#1 ] ) always clobbers reg byte a reg byte x 
 Removing always clobbered register reg byte x as potential for zp ZP_BYTE:68 [ current_piece_char#29 current_piece_char#10 current_piece_char#16 current_piece_char#5 ]
 Removing always clobbered register reg byte x as potential for zp ZP_BYTE:69 [ current_orientation#37 current_orientation#13 current_orientation#17 current_orientation#20 current_orientation#25 current_orientation#7 ]
@@ -17175,13 +17303,13 @@ Removing always clobbered register reg byte x as potential for zp ZP_BYTE:56 [ c
 Removing always clobbered register reg byte x as potential for zp ZP_BYTE:4 [ current_movedown_counter#16 current_movedown_counter#14 current_movedown_counter#12 ]
 Removing always clobbered register reg byte x as potential for zp ZP_BYTE:65 [ level_bcd#31 level_bcd#11 level_bcd#17 level_bcd#19 level_bcd#64 level_bcd#21 level_bcd#8 ]
 Removing always clobbered register reg byte x as potential for zp ZP_BYTE:90 [ keyboard_event_scan::row#2 keyboard_event_scan::row#1 ]
-Statement [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8 [ keyboard_events_size#13 keyboard_event_scan::row#1 keyboard_event_scan::keycode#14 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_event_scan::row#1 keyboard_event_scan::keycode#14 ] ) always clobbers reg byte a 
+Statement [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7 [ keyboard_events_size#13 keyboard_event_scan::row#1 keyboard_event_scan::keycode#14 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_event_scan::row#1 keyboard_event_scan::keycode#14 ] ) always clobbers reg byte a 
 Statement [417] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#11 | (const byte) KEY_MODIFIER_RSHIFT#0 [ keyboard_events_size#13 keyboard_modifiers#3 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_modifiers#3 ] ) always clobbers reg byte a 
 Statement [423] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#12 | (const byte) KEY_MODIFIER_CTRL#0 [ keyboard_events_size#13 keyboard_modifiers#4 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_modifiers#4 ] ) always clobbers reg byte a 
 Statement [429] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#13 | (const byte) KEY_MODIFIER_COMMODORE#0 [ keyboard_events_size#13 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 ] ) always clobbers reg byte a 
 Statement [432] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::$15 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::$15 ] ) always clobbers reg byte a 
 Statement [433] (byte~) keyboard_event_scan::$16 ← (byte~) keyboard_event_scan::$15 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::$16 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::$16 ] ) always clobbers reg byte a 
-Statement [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12 [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ) always clobbers reg byte a 
+Statement [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10 [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ) always clobbers reg byte a 
 Statement [436] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::event_type#0 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::event_type#0 ] ) always clobbers reg byte a 
 Statement [438] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#10) ← (byte) keyboard_event_scan::keycode#10 [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ) always clobbers reg byte a reg byte y 
 Statement [444] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0 [ keyboard_event_scan::row#2 keyboard_event_scan::keycode#15 keyboard_events_size#29 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::keycode#15 keyboard_events_size#29 ] ) always clobbers reg byte a reg byte y 
@@ -17241,7 +17369,7 @@ Statement [543] *((byte*) render_screen_original::screen#7) ← (const byte) ren
 Statement [545] *((byte*) render_screen_original::cols#6) ← (const byte) BLACK#0 [ render_screen_original::y#6 render_screen_original::screen#10 render_screen_original::oscr#1 render_screen_original::ocols#1 render_screen_original::cols#6 render_screen_original::x#6 ] ( main:12::render_init:17::render_screen_original:511 [ render_screen_original::y#6 render_screen_original::screen#10 render_screen_original::oscr#1 render_screen_original::ocols#1 render_screen_original::cols#6 render_screen_original::x#6 ] main:12::render_init:17::render_screen_original:513 [ render_screen_original::y#6 render_screen_original::screen#10 render_screen_original::oscr#1 render_screen_original::ocols#1 render_screen_original::cols#6 render_screen_original::x#6 ] ) always clobbers reg byte a reg byte y 
 Statement [552] *((const word*) SID_VOICE3_FREQ#0) ← (word/dword/signed dword) $ffff [ ] ( main:12::sid_rnd_init:15 [ ] ) always clobbers reg byte a 
 Statement [553] *((const byte*) SID_VOICE3_CONTROL#0) ← (const byte) SID_CONTROL_NOISE#0 [ ] ( main:12::sid_rnd_init:15 [ ] ) always clobbers reg byte a 
-Statement [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11 [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] (  [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] ) always clobbers reg byte a 
+Statement [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8 [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] (  [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] ) always clobbers reg byte a 
 Statement [565] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::ptr#0 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::ptr#0 ] ) always clobbers reg byte a 
 Statement [572] (byte) irq_cnt#1 ← ++ (byte) irq_cnt#0 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] ) always clobbers reg byte y 
 Statement [573] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) 9) goto sprites_irq::@3 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] ) always clobbers reg byte a 
@@ -17266,12 +17394,12 @@ Statement [9] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(by
 Statement [10] (byte) irq_cnt#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( ) always clobbers reg byte a 
 Statement [32] (byte*~) current_piece_gfx#118 ← (byte*) current_piece_gfx#74 [ current_ypos#104 current_ypos#6 current_xpos#128 current_xpos#103 current_piece_gfx#118 current_piece_gfx#74 current_piece_char#5 play_spawn_current::piece_idx#2 play_spawn_current::$0 current_movedown_slow#1 game_over#52 ] ( main:12 [ current_ypos#104 current_ypos#6 current_xpos#128 current_xpos#103 current_piece_gfx#118 current_piece_gfx#74 current_piece_char#5 play_spawn_current::piece_idx#2 play_spawn_current::$0 current_movedown_slow#1 game_over#52 ] ) always clobbers reg byte a 
 Statement [37] (byte*~) current_piece#96 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0) [ current_ypos#6 current_xpos#103 current_piece_gfx#74 current_piece_char#5 play_spawn_current::piece_idx#2 current_piece#96 current_movedown_slow#1 game_over#52 ] ( main:12 [ current_ypos#6 current_xpos#103 current_piece_gfx#74 current_piece_char#5 play_spawn_current::piece_idx#2 current_piece#96 current_movedown_slow#1 game_over#52 ] ) always clobbers reg byte a 
-Statement [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ) always clobbers reg byte a 
-Statement [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#16 main::key_event#0 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#16 main::key_event#0 ] ) always clobbers reg byte a 
+Statement [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 keyboard_events_size#19 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 ] ) always clobbers reg byte a 
+Statement [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#16 main::key_event#0 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#16 main::key_event#0 ] ) always clobbers reg byte a 
 Statement [60] (byte*~) current_piece_gfx#119 ← (byte*) current_piece_gfx#18 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 lines_bcd#15 score_bcd#14 level#17 level_bcd#17 current_ypos#105 render_screen_render#69 current_xpos#129 current_piece_gfx#119 ] ( main:12 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 lines_bcd#15 score_bcd#14 level#17 level_bcd#17 current_ypos#105 render_screen_render#69 current_xpos#129 current_piece_gfx#119 ] ) always clobbers reg byte a 
 Statement [70] (byte) render_screen_render#11 ← (byte) render_screen_render#18 ^ (byte/signed byte/word/signed word/dword/signed dword) $40 [ render_screen_show#16 render_screen_render#11 ] ( main:12::render_screen_swap:69 [ current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 lines_bcd#15 score_bcd#14 level#17 level_bcd#17 render_screen_show#16 render_screen_render#11 ] ) always clobbers reg byte a 
 Statement [71] (byte) render_screen_show#13 ← (byte) render_screen_show#16 ^ (byte/signed byte/word/signed word/dword/signed dword) $40 [ render_screen_show#13 render_screen_render#11 ] ( main:12::render_screen_swap:69 [ current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 lines_bcd#15 score_bcd#14 level#17 level_bcd#17 render_screen_show#13 render_screen_render#11 ] ) always clobbers reg byte a 
-Statement [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@2 [ render_screen_render#18 lines_bcd#15 level_bcd#17 ] ( main:12::render_score:67 [ render_screen_show#16 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 score_bcd#14 level#17 render_screen_render#18 lines_bcd#15 level_bcd#17 ] ) always clobbers reg byte a 
+Statement [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@1 [ render_screen_render#18 lines_bcd#15 level_bcd#17 ] ( main:12::render_score:67 [ render_screen_show#16 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 score_bcd#14 level#17 render_screen_render#18 lines_bcd#15 level_bcd#17 ] ) always clobbers reg byte a 
 Statement [76] (byte*) render_bcd::screen#0 ← (byte*) render_score::screen#3 [ render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#0 ] ( main:12::render_score:67 [ render_screen_show#16 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 score_bcd#14 level#17 render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#0 ] ) always clobbers reg byte a 
 Statement [79] (byte*) render_bcd::screen#1 ← (byte*) render_score::screen#3 [ render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#1 ] ( main:12::render_score:67 [ render_screen_show#16 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 score_bcd#14 level#17 render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#1 ] ) always clobbers reg byte a 
 Statement [82] (byte*) render_bcd::screen#2 ← (byte*) render_score::screen#3 [ render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#2 ] ( main:12::render_score:67 [ render_screen_show#16 current_movedown_slow#21 current_piece#15 current_piece_char#16 current_orientation#17 current_piece_gfx#18 current_xpos#19 current_ypos#19 game_over#15 next_piece_idx#16 keyboard_events_size#16 current_movedown_counter#14 score_bcd#14 level#17 render_screen_render#18 lines_bcd#15 level_bcd#17 render_score::screen#3 render_bcd::screen#2 ] ) always clobbers reg byte a 
@@ -17336,7 +17464,7 @@ Statement [315] (dword) play_update_score::add_bcd#0 ← *((const dword[5]) scor
 Statement [317] (word) lines_bcd#30 ← (word) lines_bcd#19 + (byte) play_update_score::removed#0 [ current_movedown_slow#14 score_bcd#18 level#10 level_bcd#11 play_update_score::lines_before#0 play_update_score::add_bcd#0 lines_bcd#30 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 current_movedown_slow#14 score_bcd#18 level#10 level_bcd#11 play_update_score::lines_before#0 play_update_score::add_bcd#0 lines_bcd#30 ] ) always clobbers reg byte a 
 Statement [318] (dword) score_bcd#30 ← (dword) score_bcd#18 + (dword) play_update_score::add_bcd#0 [ current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 ] ) always clobbers reg byte a 
 Statement [320] (byte~) play_update_score::$5 ← < (word) lines_bcd#30 [ current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 play_update_score::$5 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 current_movedown_slow#14 level#10 level_bcd#11 play_update_score::lines_before#0 lines_bcd#30 score_bcd#30 play_update_score::$5 ] ) always clobbers reg byte a 
-Statement [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@2 [ level_bcd#11 level#21 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level_bcd#11 level#21 ] ) always clobbers reg byte a 
+Statement [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@1 [ level_bcd#11 level#21 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level_bcd#11 level#21 ] ) always clobbers reg byte a 
 Statement [329] (byte) current_movedown_slow#10 ← *((const byte[]) MOVEDOWN_SLOW_SPEEDS#0 + (byte) level#21) [ level_bcd#11 level#21 current_movedown_slow#10 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level_bcd#11 level#21 current_movedown_slow#10 ] ) always clobbers reg byte a reg byte y 
 Statement [332] (byte~) play_increase_level::$1 ← (byte) level_bcd#21 & (byte/signed byte/word/signed word/dword/signed dword) $f [ level#21 current_movedown_slow#69 level_bcd#21 play_increase_level::$1 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level#21 current_movedown_slow#69 level_bcd#21 play_increase_level::$1 ] ) always clobbers reg byte a 
 Statement [334] (byte) level_bcd#8 ← (byte) level_bcd#21 + (byte/signed byte/word/signed word/dword/signed dword) 6 [ level#21 current_movedown_slow#69 level_bcd#8 ] ( main:12::play_movement:51::play_move_down:165::play_update_score:277::play_increase_level:324 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 game_over#10 next_piece_idx#10 lines_bcd#30 score_bcd#30 level#21 current_movedown_slow#69 level_bcd#8 ] ) always clobbers reg byte a reg byte x 
@@ -17353,15 +17481,15 @@ Statement [387] (byte~) keyboard_event_pressed::$1 ← (byte) keyboard_event_pre
 Statement [388] (byte) keyboard_event_pressed::return#11 ← (byte) keyboard_event_pressed::row_bits#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte~) keyboard_event_pressed::$1) [ keyboard_event_pressed::return#11 ] ( main:12::play_movement:51::play_move_down:165::keyboard_event_pressed:251 [ render_screen_show#16 render_screen_render#18 keyboard_events_size#16 play_movement::key_event#0 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 current_movedown_counter#12 play_move_down::movedown#10 keyboard_event_pressed::return#11 ] main:12::keyboard_event_scan:43::keyboard_event_pressed:407 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_event_pressed::return#11 ] main:12::keyboard_event_scan:43::keyboard_event_pressed:413 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_modifiers#11 keyboard_event_pressed::return#11 ] main:12::keyboard_event_scan:43::keyboard_event_pressed:419 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_modifiers#12 keyboard_event_pressed::return#11 ] main:12::keyboard_event_scan:43::keyboard_event_pressed:425 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_modifiers#13 keyboard_event_pressed::return#11 ] ) always clobbers reg byte a 
 Statement [390] if((byte) keyboard_events_size#13==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_get::@return [ keyboard_events_size#13 ] ( main:12::keyboard_event_get:45 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 ] ) always clobbers reg byte a 
 Statement [392] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4) [ keyboard_events_size#4 keyboard_event_get::return#1 ] ( main:12::keyboard_event_get:45 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#4 keyboard_event_get::return#1 ] ) always clobbers reg byte y 
-Statement [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11 [ keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#30 keyboard_event_scan::row_scan#0 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#30 keyboard_event_scan::row_scan#0 ] ) always clobbers reg byte a reg byte y 
+Statement [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9 [ keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#30 keyboard_event_scan::row_scan#0 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::keycode#11 keyboard_events_size#30 keyboard_event_scan::row_scan#0 ] ) always clobbers reg byte a reg byte y 
 Statement [402] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 [ keyboard_event_scan::row#2 keyboard_events_size#30 keyboard_event_scan::keycode#1 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_events_size#30 keyboard_event_scan::keycode#1 ] ) always clobbers reg byte a reg byte x 
-Statement [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8 [ keyboard_events_size#13 keyboard_event_scan::row#1 keyboard_event_scan::keycode#14 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_event_scan::row#1 keyboard_event_scan::keycode#14 ] ) always clobbers reg byte a 
+Statement [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7 [ keyboard_events_size#13 keyboard_event_scan::row#1 keyboard_event_scan::keycode#14 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_event_scan::row#1 keyboard_event_scan::keycode#14 ] ) always clobbers reg byte a 
 Statement [417] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#11 | (const byte) KEY_MODIFIER_RSHIFT#0 [ keyboard_events_size#13 keyboard_modifiers#3 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_modifiers#3 ] ) always clobbers reg byte a 
 Statement [423] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#12 | (const byte) KEY_MODIFIER_CTRL#0 [ keyboard_events_size#13 keyboard_modifiers#4 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 keyboard_modifiers#4 ] ) always clobbers reg byte a 
 Statement [429] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#13 | (const byte) KEY_MODIFIER_COMMODORE#0 [ keyboard_events_size#13 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_events_size#13 ] ) always clobbers reg byte a 
 Statement [432] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::$15 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::$15 ] ) always clobbers reg byte a 
 Statement [433] (byte~) keyboard_event_scan::$16 ← (byte~) keyboard_event_scan::$15 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::$16 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::$16 ] ) always clobbers reg byte a 
-Statement [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12 [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ) always clobbers reg byte a 
+Statement [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10 [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ) always clobbers reg byte a 
 Statement [436] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::event_type#0 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 keyboard_event_scan::event_type#0 ] ) always clobbers reg byte a 
 Statement [438] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#10) ← (byte) keyboard_event_scan::keycode#10 [ keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::row_scan#0 keyboard_event_scan::col#2 keyboard_event_scan::keycode#10 keyboard_events_size#10 ] ) always clobbers reg byte a reg byte y 
 Statement [444] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0 [ keyboard_event_scan::row#2 keyboard_event_scan::keycode#15 keyboard_events_size#29 ] ( main:12::keyboard_event_scan:43 [ render_screen_show#16 render_screen_render#18 current_movedown_slow#14 current_piece#10 current_piece_char#10 current_orientation#13 current_piece_gfx#112 current_xpos#122 current_ypos#11 game_over#10 next_piece_idx#10 current_movedown_counter#16 lines_bcd#19 score_bcd#18 level#10 level_bcd#11 keyboard_event_scan::row#2 keyboard_event_scan::keycode#15 keyboard_events_size#29 ] ) always clobbers reg byte a reg byte y 
@@ -17421,7 +17549,7 @@ Statement [543] *((byte*) render_screen_original::screen#7) ← (const byte) ren
 Statement [545] *((byte*) render_screen_original::cols#6) ← (const byte) BLACK#0 [ render_screen_original::y#6 render_screen_original::screen#10 render_screen_original::oscr#1 render_screen_original::ocols#1 render_screen_original::cols#6 render_screen_original::x#6 ] ( main:12::render_init:17::render_screen_original:511 [ render_screen_original::y#6 render_screen_original::screen#10 render_screen_original::oscr#1 render_screen_original::ocols#1 render_screen_original::cols#6 render_screen_original::x#6 ] main:12::render_init:17::render_screen_original:513 [ render_screen_original::y#6 render_screen_original::screen#10 render_screen_original::oscr#1 render_screen_original::ocols#1 render_screen_original::cols#6 render_screen_original::x#6 ] ) always clobbers reg byte a reg byte y 
 Statement [552] *((const word*) SID_VOICE3_FREQ#0) ← (word/dword/signed dword) $ffff [ ] ( main:12::sid_rnd_init:15 [ ] ) always clobbers reg byte a 
 Statement [553] *((const byte*) SID_VOICE3_CONTROL#0) ← (const byte) SID_CONTROL_NOISE#0 [ ] ( main:12::sid_rnd_init:15 [ ] ) always clobbers reg byte a 
-Statement [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11 [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] (  [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] ) always clobbers reg byte a 
+Statement [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8 [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] (  [ render_screen_showing#0 irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::raster_sprite_gfx_modify#0 ] ) always clobbers reg byte a 
 Statement [565] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::ptr#0 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#0 sprites_irq::ptr#0 ] ) always clobbers reg byte a 
 Statement [572] (byte) irq_cnt#1 ← ++ (byte) irq_cnt#0 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] ) always clobbers reg byte y 
 Statement [573] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) 9) goto sprites_irq::@3 [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] (  [ irq_raster_next#0 irq_sprite_ypos#0 irq_sprite_ptr#0 irq_cnt#1 ] ) always clobbers reg byte a 
@@ -18215,9 +18343,9 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label current_piece_102 = 5
 //SEG3 @begin
 bbegin:
-  jmp b14
-//SEG4 @14
-b14:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 [1] (byte) render_screen_showing#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The screen currently being showed to the user. $00 for screen 1 / $40 for screen 2.
   lda #0
@@ -18226,13 +18354,13 @@ b14:
 //SEG7 kickasm(location (const byte*) PLAYFIELD_SCREEN_ORIGINAL#0) {{ // Load chars for the screen   .var screen = LoadBinary("playfield-screen.iscr")    // Load extended colors for the screen   .var extended = LoadBinary("playfield-extended.col")   // screen.get(i)+1 because the charset is loaded into PLAYFIELD_CHARSET+8   // extended.get(i)-1 because the extended colors are 1-based (1/2/3/4)   // <<6 to move extended colors to the upper 2 bits   .fill screen.getSize(), ( (screen.get(i)+1) | (extended.get(i)-1)<<6 )  }}
 //SEG8 kickasm(location (const byte*) PLAYFIELD_COLORS_ORIGINAL#0) {{ .import binary "playfield-screen.col"  }}
   // Original Color Data
-  jmp b23
-//SEG9 @23
-b23:
+  jmp b2
+//SEG9 @2
+b2:
 //SEG10 kickasm(location (const byte*) PLAYFIELD_SPRITES#0) {{ .var sprites = LoadPicture("playfield-sprites.png", List().add($010101, $000000)) 	// Put the sprites into memory  	.for(var sy=0;sy<10;sy++) { 	    .var sprite_gfx_y = sy*20 		.for(var sx=0;sx<3;sx++) { 	    	.for (var y=0;y<21; y++) { 	    	    .var gfx_y =  sprite_gfx_y + mod(2100+y-sprite_gfx_y,21) 		    	.for (var c=0; c<3; c++) { 	            	.byte sprites.getSinglecolorByte(sx*3+c,gfx_y) 	            } 	        } 	    	.byte 0 	  	} 	}  }}
-  jmp b24
-//SEG11 @24
-b24:
+  jmp b3
+//SEG11 @3
+b3:
 //SEG12 [6] (byte) irq_raster_next#0 ← (const byte) IRQ_RASTER_FIRST#0 -- vbuz1=vbuc1 
   // The raster line of the next IRQ
   lda #IRQ_RASTER_FIRST
@@ -18241,14 +18369,14 @@ b24:
   // Y-pos of the sprites on the next IRQ
   lda #SPRITES_FIRST_YPOS+$15
   sta irq_sprite_ypos
-//SEG14 [8] phi from @24 to toSpritePtr1 [phi:@24->toSpritePtr1]
-toSpritePtr1_from_b24:
+//SEG14 [8] phi from @3 to toSpritePtr1 [phi:@3->toSpritePtr1]
+toSpritePtr1_from_b3:
   jmp toSpritePtr1
 //SEG15 toSpritePtr1
 toSpritePtr1:
-  jmp b39
-//SEG16 @39
-b39:
+  jmp b5
+//SEG16 @5
+b5:
 //SEG17 [9] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuc1 
   // Index of the sprites to show on the next IRQ
   lda #toSpritePtr1_return+3
@@ -18257,17 +18385,17 @@ b39:
   // Counting the 10 IRQs
   lda #0
   sta irq_cnt
-//SEG19 [11] phi from @39 to @38 [phi:@39->@38]
-b38_from_b39:
-  jmp b38
-//SEG20 @38
-b38:
+//SEG19 [11] phi from @5 to @4 [phi:@5->@4]
+b4_from_b5:
+  jmp b4
+//SEG20 @4
+b4:
 //SEG21 [12] call main 
-//SEG22 [14] phi from @38 to main [phi:@38->main]
-main_from_b38:
+//SEG22 [14] phi from @4 to main [phi:@4->main]
+main_from_b4:
   jsr main
-//SEG23 [13] phi from @38 to @end [phi:@38->@end]
-bend_from_b38:
+//SEG23 [13] phi from @4 to @end [phi:@4->@end]
+bend_from_b4:
   jmp bend
 //SEG24 @end
 bend:
@@ -18275,78 +18403,78 @@ bend:
 main: {
   //SEG26 [15] call sid_rnd_init 
     jsr sid_rnd_init
-    jmp b25
-  //SEG27 main::@25
-  b25:
+    jmp b8
+  //SEG27 main::@8
+  b8:
   //SEG28 asm { sei  }
     sei
   //SEG29 [17] call render_init 
-  //SEG30 [501] phi from main::@25 to render_init [phi:main::@25->render_init]
-  render_init_from_b25:
+  //SEG30 [501] phi from main::@8 to render_init [phi:main::@8->render_init]
+  render_init_from_b8:
     jsr render_init
-  //SEG31 [18] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
-  b26_from_b25:
-    jmp b26
-  //SEG32 main::@26
-  b26:
+  //SEG31 [18] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG32 main::@9
+  b9:
   //SEG33 [19] call sprites_init 
     jsr sprites_init
-  //SEG34 [20] phi from main::@26 to main::@27 [phi:main::@26->main::@27]
-  b27_from_b26:
-    jmp b27
-  //SEG35 main::@27
-  b27:
+  //SEG34 [20] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG35 main::@10
+  b10:
   //SEG36 [21] call sprites_irq_init 
     jsr sprites_irq_init
-  //SEG37 [22] phi from main::@27 to main::@28 [phi:main::@27->main::@28]
-  b28_from_b27:
-    jmp b28
-  //SEG38 main::@28
-  b28:
+  //SEG37 [22] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
+  b11_from_b10:
+    jmp b11
+  //SEG38 main::@11
+  b11:
   //SEG39 [23] call play_init 
-  //SEG40 [460] phi from main::@28 to play_init [phi:main::@28->play_init]
-  play_init_from_b28:
+  //SEG40 [460] phi from main::@11 to play_init [phi:main::@11->play_init]
+  play_init_from_b11:
     jsr play_init
-  //SEG41 [24] phi from main::@28 to main::@29 [phi:main::@28->main::@29]
-  b29_from_b28:
-    jmp b29
-  //SEG42 main::@29
-  b29:
+  //SEG41 [24] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG42 main::@12
+  b12:
   //SEG43 [25] call play_spawn_current 
-  //SEG44 [285] phi from main::@29 to play_spawn_current [phi:main::@29->play_spawn_current]
-  play_spawn_current_from_b29:
-  //SEG45 [285] phi (byte) game_over#65 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@29->play_spawn_current#0] -- vbuz1=vbuc1 
+  //SEG44 [285] phi from main::@12 to play_spawn_current [phi:main::@12->play_spawn_current]
+  play_spawn_current_from_b12:
+  //SEG45 [285] phi (byte) game_over#65 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@12->play_spawn_current#0] -- vbuz1=vbuc1 
     lda #0
     sta game_over
-  //SEG46 [285] phi (byte) next_piece_idx#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@29->play_spawn_current#1] -- vbuz1=vbuc1 
+  //SEG46 [285] phi (byte) next_piece_idx#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@12->play_spawn_current#1] -- vbuz1=vbuc1 
     lda #0
     sta next_piece_idx
     jsr play_spawn_current
-  //SEG47 [26] phi from main::@29 to main::@30 [phi:main::@29->main::@30]
-  b30_from_b29:
-    jmp b30
-  //SEG48 main::@30
-  b30:
+  //SEG47 [26] phi from main::@12 to main::@13 [phi:main::@12->main::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG48 main::@13
+  b13:
   //SEG49 [27] call play_spawn_current 
-  //SEG50 [285] phi from main::@30 to play_spawn_current [phi:main::@30->play_spawn_current]
-  play_spawn_current_from_b30:
-  //SEG51 [285] phi (byte) game_over#65 = (byte) game_over#52 [phi:main::@30->play_spawn_current#0] -- register_copy 
-  //SEG52 [285] phi (byte) next_piece_idx#17 = (byte) play_spawn_current::piece_idx#2 [phi:main::@30->play_spawn_current#1] -- register_copy 
+  //SEG50 [285] phi from main::@13 to play_spawn_current [phi:main::@13->play_spawn_current]
+  play_spawn_current_from_b13:
+  //SEG51 [285] phi (byte) game_over#65 = (byte) game_over#52 [phi:main::@13->play_spawn_current#0] -- register_copy 
+  //SEG52 [285] phi (byte) next_piece_idx#17 = (byte) play_spawn_current::piece_idx#2 [phi:main::@13->play_spawn_current#1] -- register_copy 
     jsr play_spawn_current
-  //SEG53 [28] phi from main::@30 to main::@31 [phi:main::@30->main::@31]
-  b31_from_b30:
-    jmp b31
-  //SEG54 main::@31
-  b31:
+  //SEG53 [28] phi from main::@13 to main::@14 [phi:main::@13->main::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG54 main::@14
+  b14:
   //SEG55 [29] call render_playfield 
-  //SEG56 [150] phi from main::@31 to render_playfield [phi:main::@31->render_playfield]
-  render_playfield_from_b31:
-  //SEG57 [150] phi (byte) render_screen_render#22 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@31->render_playfield#0] -- vbuxx=vbuc1 
+  //SEG56 [150] phi from main::@14 to render_playfield [phi:main::@14->render_playfield]
+  render_playfield_from_b14:
+  //SEG57 [150] phi (byte) render_screen_render#22 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@14->render_playfield#0] -- vbuxx=vbuc1 
     ldx #$40
     jsr render_playfield
-    jmp b32
-  //SEG58 main::@32
-  b32:
+    jmp b15
+  //SEG58 main::@15
+  b15:
   //SEG59 [30] (byte~) current_ypos#104 ← (byte) current_ypos#6 -- vbuxx=vbuz1 
     ldx current_ypos
   //SEG60 [31] (byte~) current_xpos#128 ← (byte) current_xpos#103 -- vbuz1=vbuz2 
@@ -18361,26 +18489,26 @@ main: {
     lda current_piece_char
     sta current_piece_char_106
   //SEG63 [34] call render_moving 
-  //SEG64 [129] phi from main::@32 to render_moving [phi:main::@32->render_moving]
-  render_moving_from_b32:
-  //SEG65 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#106 [phi:main::@32->render_moving#0] -- register_copy 
-  //SEG66 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#118 [phi:main::@32->render_moving#1] -- register_copy 
-  //SEG67 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#128 [phi:main::@32->render_moving#2] -- register_copy 
-  //SEG68 [129] phi (byte) render_screen_render#33 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@32->render_moving#3] -- vbuz1=vbuc1 
+  //SEG64 [129] phi from main::@15 to render_moving [phi:main::@15->render_moving]
+  render_moving_from_b15:
+  //SEG65 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#106 [phi:main::@15->render_moving#0] -- register_copy 
+  //SEG66 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#118 [phi:main::@15->render_moving#1] -- register_copy 
+  //SEG67 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#128 [phi:main::@15->render_moving#2] -- register_copy 
+  //SEG68 [129] phi (byte) render_screen_render#33 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@15->render_moving#3] -- vbuz1=vbuc1 
     lda #$40
     sta render_screen_render_33
-  //SEG69 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#104 [phi:main::@32->render_moving#4] -- register_copy 
+  //SEG69 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#104 [phi:main::@15->render_moving#4] -- register_copy 
     jsr render_moving
-    jmp b33
-  //SEG70 main::@33
-  b33:
+    jmp b16
+  //SEG70 main::@16
+  b16:
   //SEG71 [35] (byte~) next_piece_idx#84 ← (byte) play_spawn_current::piece_idx#2 -- vbuxx=vbuz1 
     ldx play_spawn_current.piece_idx
   //SEG72 [36] call render_next 
-  //SEG73 [108] phi from main::@33 to render_next [phi:main::@33->render_next]
-  render_next_from_b33:
-  //SEG74 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#84 [phi:main::@33->render_next#0] -- register_copy 
-  //SEG75 [108] phi (byte) render_screen_render#15 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@33->render_next#1] -- vbuaa=vbuc1 
+  //SEG73 [108] phi from main::@16 to render_next [phi:main::@16->render_next]
+  render_next_from_b16:
+  //SEG74 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#84 [phi:main::@16->render_next#0] -- register_copy 
+  //SEG75 [108] phi (byte) render_screen_render#15 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@16->render_next#1] -- vbuaa=vbuc1 
     lda #$40
     jsr render_next
   //SEG76 [37] (byte*~) current_piece#96 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0) -- pbuz1=pptc1_derefidx_vbuz2 
@@ -18389,147 +18517,147 @@ main: {
     sta current_piece
     lda PIECES+1,y
     sta current_piece+1
-  //SEG77 [38] phi from main::@33 to main::@1 [phi:main::@33->main::@1]
-  b1_from_b33:
-  //SEG78 [38] phi (byte) level_bcd#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#0] -- vbuz1=vbuc1 
+  //SEG77 [38] phi from main::@16 to main::@1 [phi:main::@16->main::@1]
+  b1_from_b16:
+  //SEG78 [38] phi (byte) level_bcd#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta level_bcd
-  //SEG79 [38] phi (byte) level#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#1] -- vbuz1=vbuc1 
+  //SEG79 [38] phi (byte) level#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta level
-  //SEG80 [38] phi (dword) score_bcd#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#2] -- vduz1=vbuc1 
+  //SEG80 [38] phi (dword) score_bcd#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#2] -- vduz1=vbuc1 
     lda #0
     sta score_bcd
     lda #0
     sta score_bcd+1
     sta score_bcd+2
     sta score_bcd+3
-  //SEG81 [38] phi (word) lines_bcd#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#3] -- vwuz1=vbuc1 
+  //SEG81 [38] phi (word) lines_bcd#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#3] -- vwuz1=vbuc1 
     lda #0
     sta lines_bcd
     lda #0
     sta lines_bcd+1
-  //SEG82 [38] phi (byte) current_movedown_counter#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#4] -- vbuz1=vbuc1 
+  //SEG82 [38] phi (byte) current_movedown_counter#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#4] -- vbuz1=vbuc1 
     lda #0
     sta current_movedown_counter
-  //SEG83 [38] phi (byte) keyboard_events_size#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#5] -- vbuz1=vbuc1 
+  //SEG83 [38] phi (byte) keyboard_events_size#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#5] -- vbuz1=vbuc1 
     lda #0
     sta keyboard_events_size
-  //SEG84 [38] phi (byte) next_piece_idx#10 = (byte) play_spawn_current::piece_idx#2 [phi:main::@33->main::@1#6] -- register_copy 
-  //SEG85 [38] phi (byte) game_over#10 = (byte) game_over#52 [phi:main::@33->main::@1#7] -- register_copy 
-  //SEG86 [38] phi (byte) current_ypos#11 = (byte) current_ypos#6 [phi:main::@33->main::@1#8] -- register_copy 
-  //SEG87 [38] phi (byte) current_xpos#122 = (byte) current_xpos#103 [phi:main::@33->main::@1#9] -- register_copy 
-  //SEG88 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#74 [phi:main::@33->main::@1#10] -- register_copy 
-  //SEG89 [38] phi (byte) current_orientation#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#11] -- vbuz1=vbuc1 
+  //SEG84 [38] phi (byte) next_piece_idx#10 = (byte) play_spawn_current::piece_idx#2 [phi:main::@16->main::@1#6] -- register_copy 
+  //SEG85 [38] phi (byte) game_over#10 = (byte) game_over#52 [phi:main::@16->main::@1#7] -- register_copy 
+  //SEG86 [38] phi (byte) current_ypos#11 = (byte) current_ypos#6 [phi:main::@16->main::@1#8] -- register_copy 
+  //SEG87 [38] phi (byte) current_xpos#122 = (byte) current_xpos#103 [phi:main::@16->main::@1#9] -- register_copy 
+  //SEG88 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#74 [phi:main::@16->main::@1#10] -- register_copy 
+  //SEG89 [38] phi (byte) current_orientation#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#11] -- vbuz1=vbuc1 
     lda #0
     sta current_orientation
-  //SEG90 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#5 [phi:main::@33->main::@1#12] -- register_copy 
-  //SEG91 [38] phi (byte*) current_piece#10 = (byte*~) current_piece#96 [phi:main::@33->main::@1#13] -- register_copy 
-  //SEG92 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#1 [phi:main::@33->main::@1#14] -- register_copy 
-  //SEG93 [38] phi (byte) render_screen_render#18 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@33->main::@1#15] -- vbuz1=vbuc1 
+  //SEG90 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#5 [phi:main::@16->main::@1#12] -- register_copy 
+  //SEG91 [38] phi (byte*) current_piece#10 = (byte*~) current_piece#96 [phi:main::@16->main::@1#13] -- register_copy 
+  //SEG92 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#1 [phi:main::@16->main::@1#14] -- register_copy 
+  //SEG93 [38] phi (byte) render_screen_render#18 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@16->main::@1#15] -- vbuz1=vbuc1 
     lda #$40
     sta render_screen_render
-  //SEG94 [38] phi (byte) render_screen_show#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#16] -- vbuz1=vbuc1 
+  //SEG94 [38] phi (byte) render_screen_show#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#16] -- vbuz1=vbuc1 
     lda #0
     sta render_screen_show
     jmp b1
-  //SEG95 [38] phi from main::@17 to main::@1 [phi:main::@17->main::@1]
-  b1_from_b17:
-  //SEG96 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@17->main::@1#0] -- register_copy 
-  //SEG97 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@17->main::@1#1] -- register_copy 
-  //SEG98 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@17->main::@1#2] -- register_copy 
-  //SEG99 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@17->main::@1#3] -- register_copy 
-  //SEG100 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@17->main::@1#4] -- register_copy 
-  //SEG101 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@17->main::@1#5] -- register_copy 
-  //SEG102 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@17->main::@1#6] -- register_copy 
-  //SEG103 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@17->main::@1#7] -- register_copy 
-  //SEG104 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@17->main::@1#8] -- register_copy 
-  //SEG105 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@17->main::@1#9] -- register_copy 
-  //SEG106 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@17->main::@1#10] -- register_copy 
-  //SEG107 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@17->main::@1#11] -- register_copy 
-  //SEG108 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@17->main::@1#12] -- register_copy 
-  //SEG109 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@17->main::@1#13] -- register_copy 
-  //SEG110 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@17->main::@1#14] -- register_copy 
+  //SEG95 [38] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG96 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG97 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@6->main::@1#1] -- register_copy 
+  //SEG98 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@6->main::@1#2] -- register_copy 
+  //SEG99 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@6->main::@1#3] -- register_copy 
+  //SEG100 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@6->main::@1#4] -- register_copy 
+  //SEG101 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@6->main::@1#5] -- register_copy 
+  //SEG102 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@6->main::@1#6] -- register_copy 
+  //SEG103 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@6->main::@1#7] -- register_copy 
+  //SEG104 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@6->main::@1#8] -- register_copy 
+  //SEG105 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@6->main::@1#9] -- register_copy 
+  //SEG106 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@6->main::@1#10] -- register_copy 
+  //SEG107 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@6->main::@1#11] -- register_copy 
+  //SEG108 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@6->main::@1#12] -- register_copy 
+  //SEG109 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@6->main::@1#13] -- register_copy 
+  //SEG110 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@6->main::@1#14] -- register_copy 
     jmp b1
   //SEG111 main::@1
   b1:
-    jmp b6
+    jmp b2
   // Wait for a frame to pass
-  //SEG112 main::@6
-  b6:
-  //SEG113 [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG112 main::@2
+  b2:
+  //SEG113 [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG114 [40] phi from main::@6 to main::@8 [phi:main::@6->main::@8]
-  b8_from_b6:
-    jmp b8
-  //SEG115 main::@8
-  b8:
+    bne b2
+  //SEG114 [40] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG115 main::@3
+  b3:
   //SEG116 [41] call render_show 
     jsr render_show
-  //SEG117 [42] phi from main::@8 to main::@35 [phi:main::@8->main::@35]
-  b35_from_b8:
-    jmp b35
-  //SEG118 main::@35
-  b35:
+  //SEG117 [42] phi from main::@3 to main::@17 [phi:main::@3->main::@17]
+  b17_from_b3:
+    jmp b17
+  //SEG118 main::@17
+  b17:
   //SEG119 [43] call keyboard_event_scan 
-  //SEG120 [395] phi from main::@35 to keyboard_event_scan [phi:main::@35->keyboard_event_scan]
-  keyboard_event_scan_from_b35:
+  //SEG120 [395] phi from main::@17 to keyboard_event_scan [phi:main::@17->keyboard_event_scan]
+  keyboard_event_scan_from_b17:
     jsr keyboard_event_scan
-  //SEG121 [44] phi from main::@35 to main::@36 [phi:main::@35->main::@36]
-  b36_from_b35:
-    jmp b36
-  //SEG122 main::@36
-  b36:
+  //SEG121 [44] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
+  b18_from_b17:
+    jmp b18
+  //SEG122 main::@18
+  b18:
   //SEG123 [45] call keyboard_event_get 
     jsr keyboard_event_get
   //SEG124 [46] (byte) keyboard_event_get::return#3 ← (byte) keyboard_event_get::return#2
-    jmp b37
-  //SEG125 main::@37
-  b37:
+    jmp b19
+  //SEG125 main::@19
+  b19:
   //SEG126 [47] (byte) main::key_event#0 ← (byte) keyboard_event_get::return#3
-  //SEG127 [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9 -- vbuz1_eq_0_then_la1 
+  //SEG127 [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4 -- vbuz1_eq_0_then_la1 
     lda game_over
     cmp #0
-    beq b9
-    jmp b11
-  //SEG128 main::@11
-  b11:
+    beq b4
+    jmp b5
+  //SEG128 main::@5
+  b5:
   //SEG129 [49] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-    jmp b11
-  //SEG130 main::@9
-  b9:
+    jmp b5
+  //SEG130 main::@4
+  b4:
   //SEG131 [50] (byte) play_movement::key_event#0 ← (byte) main::key_event#0 -- vbuz1=vbuxx 
     stx play_movement.key_event
   //SEG132 [51] call play_movement 
     jsr play_movement
   //SEG133 [52] (byte) play_movement::return#3 ← (byte) play_movement::return#2 -- vbuaa=vbuz1 
     lda play_movement.return
-    jmp b38
-  //SEG134 main::@38
-  b38:
+    jmp b20
+  //SEG134 main::@20
+  b20:
   //SEG135 [53] (byte) main::render#1 ← (byte) play_movement::return#3
-    jmp b17
-  //SEG136 main::@17
-  b17:
+    jmp b6
+  //SEG136 main::@6
+  b6:
   //SEG137 [54] if((byte) main::render#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b1_from_b17
-    jmp b23
-  //SEG138 main::@23
-  b23:
+    beq b1_from_b6
+    jmp b7
+  //SEG138 main::@7
+  b7:
   //SEG139 [55] (byte~) render_screen_render#70 ← (byte) render_screen_render#18 -- vbuxx=vbuz1 
     ldx render_screen_render
   //SEG140 [56] call render_playfield 
-  //SEG141 [150] phi from main::@23 to render_playfield [phi:main::@23->render_playfield]
-  render_playfield_from_b23:
-  //SEG142 [150] phi (byte) render_screen_render#22 = (byte~) render_screen_render#70 [phi:main::@23->render_playfield#0] -- register_copy 
+  //SEG141 [150] phi from main::@7 to render_playfield [phi:main::@7->render_playfield]
+  render_playfield_from_b7:
+  //SEG142 [150] phi (byte) render_screen_render#22 = (byte~) render_screen_render#70 [phi:main::@7->render_playfield#0] -- register_copy 
     jsr render_playfield
-    jmp b39
-  //SEG143 main::@39
-  b39:
+    jmp b21
+  //SEG143 main::@21
+  b21:
   //SEG144 [57] (byte~) current_ypos#105 ← (byte) current_ypos#19 -- vbuxx=vbuz1 
     ldx current_ypos
   //SEG145 [58] (byte~) render_screen_render#69 ← (byte) render_screen_render#18 -- vbuz1=vbuz2 
@@ -18547,60 +18675,60 @@ main: {
     lda current_piece_char
     sta current_piece_char_107
   //SEG149 [62] call render_moving 
-  //SEG150 [129] phi from main::@39 to render_moving [phi:main::@39->render_moving]
-  render_moving_from_b39:
-  //SEG151 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#107 [phi:main::@39->render_moving#0] -- register_copy 
-  //SEG152 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#119 [phi:main::@39->render_moving#1] -- register_copy 
-  //SEG153 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#129 [phi:main::@39->render_moving#2] -- register_copy 
-  //SEG154 [129] phi (byte) render_screen_render#33 = (byte~) render_screen_render#69 [phi:main::@39->render_moving#3] -- register_copy 
-  //SEG155 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#105 [phi:main::@39->render_moving#4] -- register_copy 
+  //SEG150 [129] phi from main::@21 to render_moving [phi:main::@21->render_moving]
+  render_moving_from_b21:
+  //SEG151 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#107 [phi:main::@21->render_moving#0] -- register_copy 
+  //SEG152 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#119 [phi:main::@21->render_moving#1] -- register_copy 
+  //SEG153 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#129 [phi:main::@21->render_moving#2] -- register_copy 
+  //SEG154 [129] phi (byte) render_screen_render#33 = (byte~) render_screen_render#69 [phi:main::@21->render_moving#3] -- register_copy 
+  //SEG155 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#105 [phi:main::@21->render_moving#4] -- register_copy 
     jsr render_moving
-    jmp b40
-  //SEG156 main::@40
-  b40:
+    jmp b22
+  //SEG156 main::@22
+  b22:
   //SEG157 [63] (byte~) render_screen_render#68 ← (byte) render_screen_render#18 -- vbuaa=vbuz1 
     lda render_screen_render
   //SEG158 [64] (byte~) next_piece_idx#85 ← (byte) next_piece_idx#16 -- vbuxx=vbuz1 
     ldx next_piece_idx
   //SEG159 [65] call render_next 
-  //SEG160 [108] phi from main::@40 to render_next [phi:main::@40->render_next]
-  render_next_from_b40:
-  //SEG161 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#85 [phi:main::@40->render_next#0] -- register_copy 
-  //SEG162 [108] phi (byte) render_screen_render#15 = (byte~) render_screen_render#68 [phi:main::@40->render_next#1] -- register_copy 
+  //SEG160 [108] phi from main::@22 to render_next [phi:main::@22->render_next]
+  render_next_from_b22:
+  //SEG161 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#85 [phi:main::@22->render_next#0] -- register_copy 
+  //SEG162 [108] phi (byte) render_screen_render#15 = (byte~) render_screen_render#68 [phi:main::@22->render_next#1] -- register_copy 
     jsr render_next
-  //SEG163 [66] phi from main::@40 to main::@41 [phi:main::@40->main::@41]
-  b41_from_b40:
-    jmp b41
-  //SEG164 main::@41
-  b41:
+  //SEG163 [66] phi from main::@22 to main::@23 [phi:main::@22->main::@23]
+  b23_from_b22:
+    jmp b23
+  //SEG164 main::@23
+  b23:
   //SEG165 [67] call render_score 
     jsr render_score
-  //SEG166 [68] phi from main::@41 to main::@42 [phi:main::@41->main::@42]
-  b42_from_b41:
-    jmp b42
-  //SEG167 main::@42
-  b42:
+  //SEG166 [68] phi from main::@23 to main::@24 [phi:main::@23->main::@24]
+  b24_from_b23:
+    jmp b24
+  //SEG167 main::@24
+  b24:
   //SEG168 [69] call render_screen_swap 
     jsr render_screen_swap
-  //SEG169 [38] phi from main::@42 to main::@1 [phi:main::@42->main::@1]
-  b1_from_b42:
-  //SEG170 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@42->main::@1#0] -- register_copy 
-  //SEG171 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@42->main::@1#1] -- register_copy 
-  //SEG172 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@42->main::@1#2] -- register_copy 
-  //SEG173 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@42->main::@1#3] -- register_copy 
-  //SEG174 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@42->main::@1#4] -- register_copy 
-  //SEG175 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@42->main::@1#5] -- register_copy 
-  //SEG176 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@42->main::@1#6] -- register_copy 
-  //SEG177 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@42->main::@1#7] -- register_copy 
-  //SEG178 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@42->main::@1#8] -- register_copy 
-  //SEG179 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@42->main::@1#9] -- register_copy 
-  //SEG180 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@42->main::@1#10] -- register_copy 
-  //SEG181 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@42->main::@1#11] -- register_copy 
-  //SEG182 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@42->main::@1#12] -- register_copy 
-  //SEG183 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@42->main::@1#13] -- register_copy 
-  //SEG184 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@42->main::@1#14] -- register_copy 
-  //SEG185 [38] phi (byte) render_screen_render#18 = (byte) render_screen_render#11 [phi:main::@42->main::@1#15] -- register_copy 
-  //SEG186 [38] phi (byte) render_screen_show#16 = (byte) render_screen_show#13 [phi:main::@42->main::@1#16] -- register_copy 
+  //SEG169 [38] phi from main::@24 to main::@1 [phi:main::@24->main::@1]
+  b1_from_b24:
+  //SEG170 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@24->main::@1#0] -- register_copy 
+  //SEG171 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@24->main::@1#1] -- register_copy 
+  //SEG172 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@24->main::@1#2] -- register_copy 
+  //SEG173 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@24->main::@1#3] -- register_copy 
+  //SEG174 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@24->main::@1#4] -- register_copy 
+  //SEG175 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@24->main::@1#5] -- register_copy 
+  //SEG176 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@24->main::@1#6] -- register_copy 
+  //SEG177 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@24->main::@1#7] -- register_copy 
+  //SEG178 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@24->main::@1#8] -- register_copy 
+  //SEG179 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@24->main::@1#9] -- register_copy 
+  //SEG180 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@24->main::@1#10] -- register_copy 
+  //SEG181 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@24->main::@1#11] -- register_copy 
+  //SEG182 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@24->main::@1#12] -- register_copy 
+  //SEG183 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@24->main::@1#13] -- register_copy 
+  //SEG184 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@24->main::@1#14] -- register_copy 
+  //SEG185 [38] phi (byte) render_screen_render#18 = (byte) render_screen_render#11 [phi:main::@24->main::@1#15] -- register_copy 
+  //SEG186 [38] phi (byte) render_screen_show#16 = (byte) render_screen_show#13 [phi:main::@24->main::@1#16] -- register_copy 
     jmp b1
 }
 //SEG187 render_screen_swap
@@ -18628,145 +18756,145 @@ render_score: {
     .const lines_offset = $28*1+$16
     .const level_offset = $28*$13+$1f
     .label screen = 5
-  //SEG193 [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@2 -- vbuz1_eq_0_then_la1 
+  //SEG193 [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@1 -- vbuz1_eq_0_then_la1 
     lda render_screen_render
     cmp #0
-    beq b2_from_render_score
-  //SEG194 [74] phi from render_score to render_score::@3 [phi:render_score->render_score::@3]
-  b3_from_render_score:
-    jmp b3
-  //SEG195 render_score::@3
-  b3:
-  //SEG196 [75] phi from render_score::@3 to render_score::@2 [phi:render_score::@3->render_score::@2]
-  b2_from_b3:
-  //SEG197 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_score::@3->render_score::@2#0] -- pbuz1=pbuc1 
+    beq b1_from_render_score
+  //SEG194 [74] phi from render_score to render_score::@2 [phi:render_score->render_score::@2]
+  b2_from_render_score:
+    jmp b2
+  //SEG195 render_score::@2
+  b2:
+  //SEG196 [75] phi from render_score::@2 to render_score::@1 [phi:render_score::@2->render_score::@1]
+  b1_from_b2:
+  //SEG197 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_score::@2->render_score::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2
     sta screen
     lda #>PLAYFIELD_SCREEN_2
     sta screen+1
-    jmp b2
-  //SEG198 [75] phi from render_score to render_score::@2 [phi:render_score->render_score::@2]
-  b2_from_render_score:
-  //SEG199 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_score->render_score::@2#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG198 [75] phi from render_score to render_score::@1 [phi:render_score->render_score::@1]
+  b1_from_render_score:
+  //SEG199 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_score->render_score::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1
     sta screen
     lda #>PLAYFIELD_SCREEN_1
     sta screen+1
-    jmp b2
-  //SEG200 render_score::@2
-  b2:
+    jmp b1
+  //SEG200 render_score::@1
+  b1:
   //SEG201 [76] (byte*) render_bcd::screen#0 ← (byte*) render_score::screen#3
   //SEG202 [77] (byte) render_bcd::bcd#0 ← *((const byte*) render_score::score_bytes#0+(byte/signed byte/word/signed word/dword/signed dword) 2) -- vbuxx=_deref_pbuc1 
     ldx score_bytes+2
   //SEG203 [78] call render_bcd 
-  //SEG204 [95] phi from render_score::@2 to render_bcd [phi:render_score::@2->render_bcd]
-  render_bcd_from_b2:
-  //SEG205 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#0 [phi:render_score::@2->render_bcd#0] -- register_copy 
-  //SEG206 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@2->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG204 [95] phi from render_score::@1 to render_bcd [phi:render_score::@1->render_bcd]
+  render_bcd_from_b1:
+  //SEG205 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#0 [phi:render_score::@1->render_bcd#0] -- register_copy 
+  //SEG206 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@1->render_bcd#1] -- vbuyy=vbuc1 
     ldy #0
-  //SEG207 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0 [phi:render_score::@2->render_bcd#2] -- vwuz1=vwuc1 
+  //SEG207 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0 [phi:render_score::@1->render_bcd#2] -- vwuz1=vwuc1 
     lda #<score_offset
     sta render_bcd.offset
     lda #>score_offset
     sta render_bcd.offset+1
-  //SEG208 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#0 [phi:render_score::@2->render_bcd#3] -- register_copy 
+  //SEG208 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#0 [phi:render_score::@1->render_bcd#3] -- register_copy 
     jsr render_bcd
-    jmp b5
-  //SEG209 render_score::@5
-  b5:
+    jmp b3
+  //SEG209 render_score::@3
+  b3:
   //SEG210 [79] (byte*) render_bcd::screen#1 ← (byte*) render_score::screen#3
   //SEG211 [80] (byte) render_bcd::bcd#1 ← *((const byte*) render_score::score_bytes#0+(byte/signed byte/word/signed word/dword/signed dword) 1) -- vbuxx=_deref_pbuc1 
     ldx score_bytes+1
   //SEG212 [81] call render_bcd 
-  //SEG213 [95] phi from render_score::@5 to render_bcd [phi:render_score::@5->render_bcd]
-  render_bcd_from_b5:
-  //SEG214 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#1 [phi:render_score::@5->render_bcd#0] -- register_copy 
-  //SEG215 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@5->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG213 [95] phi from render_score::@3 to render_bcd [phi:render_score::@3->render_bcd]
+  render_bcd_from_b3:
+  //SEG214 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#1 [phi:render_score::@3->render_bcd#0] -- register_copy 
+  //SEG215 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@3->render_bcd#1] -- vbuyy=vbuc1 
     ldy #0
-  //SEG216 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:render_score::@5->render_bcd#2] -- vwuz1=vbuc1 
+  //SEG216 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:render_score::@3->render_bcd#2] -- vwuz1=vbuc1 
     lda #score_offset+2
     sta render_bcd.offset
     lda #0
     sta render_bcd.offset+1
-  //SEG217 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#1 [phi:render_score::@5->render_bcd#3] -- register_copy 
+  //SEG217 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#1 [phi:render_score::@3->render_bcd#3] -- register_copy 
     jsr render_bcd
-    jmp b6
-  //SEG218 render_score::@6
-  b6:
+    jmp b4
+  //SEG218 render_score::@4
+  b4:
   //SEG219 [82] (byte*) render_bcd::screen#2 ← (byte*) render_score::screen#3
   //SEG220 [83] (byte) render_bcd::bcd#2 ← *((const byte*) render_score::score_bytes#0) -- vbuxx=_deref_pbuc1 
     ldx score_bytes
   //SEG221 [84] call render_bcd 
-  //SEG222 [95] phi from render_score::@6 to render_bcd [phi:render_score::@6->render_bcd]
-  render_bcd_from_b6:
-  //SEG223 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#2 [phi:render_score::@6->render_bcd#0] -- register_copy 
-  //SEG224 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@6->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG222 [95] phi from render_score::@4 to render_bcd [phi:render_score::@4->render_bcd]
+  render_bcd_from_b4:
+  //SEG223 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#2 [phi:render_score::@4->render_bcd#0] -- register_copy 
+  //SEG224 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@4->render_bcd#1] -- vbuyy=vbuc1 
     ldy #0
-  //SEG225 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 4 [phi:render_score::@6->render_bcd#2] -- vwuz1=vbuc1 
+  //SEG225 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 4 [phi:render_score::@4->render_bcd#2] -- vwuz1=vbuc1 
     lda #score_offset+4
     sta render_bcd.offset
     lda #0
     sta render_bcd.offset+1
-  //SEG226 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#2 [phi:render_score::@6->render_bcd#3] -- register_copy 
+  //SEG226 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#2 [phi:render_score::@4->render_bcd#3] -- register_copy 
     jsr render_bcd
-    jmp b7
-  //SEG227 render_score::@7
-  b7:
+    jmp b5
+  //SEG227 render_score::@5
+  b5:
   //SEG228 [85] (byte) render_bcd::bcd#3 ← > (word) lines_bcd#15 -- vbuxx=_hi_vwuz1 
     lda lines_bcd+1
     tax
   //SEG229 [86] (byte*) render_bcd::screen#3 ← (byte*) render_score::screen#3
   //SEG230 [87] call render_bcd 
-  //SEG231 [95] phi from render_score::@7 to render_bcd [phi:render_score::@7->render_bcd]
-  render_bcd_from_b7:
-  //SEG232 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#3 [phi:render_score::@7->render_bcd#0] -- register_copy 
-  //SEG233 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@7->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG231 [95] phi from render_score::@5 to render_bcd [phi:render_score::@5->render_bcd]
+  render_bcd_from_b5:
+  //SEG232 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#3 [phi:render_score::@5->render_bcd#0] -- register_copy 
+  //SEG233 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@5->render_bcd#1] -- vbuyy=vbuc1 
     ldy #1
-  //SEG234 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0 [phi:render_score::@7->render_bcd#2] -- vwuz1=vwuc1 
+  //SEG234 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0 [phi:render_score::@5->render_bcd#2] -- vwuz1=vwuc1 
     lda #<lines_offset
     sta render_bcd.offset
     lda #>lines_offset
     sta render_bcd.offset+1
-  //SEG235 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#3 [phi:render_score::@7->render_bcd#3] -- register_copy 
+  //SEG235 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#3 [phi:render_score::@5->render_bcd#3] -- register_copy 
     jsr render_bcd
-    jmp b8
-  //SEG236 render_score::@8
-  b8:
+    jmp b6
+  //SEG236 render_score::@6
+  b6:
   //SEG237 [88] (byte) render_bcd::bcd#4 ← < (word) lines_bcd#15 -- vbuxx=_lo_vwuz1 
     lda lines_bcd
     tax
   //SEG238 [89] (byte*) render_bcd::screen#4 ← (byte*) render_score::screen#3
   //SEG239 [90] call render_bcd 
-  //SEG240 [95] phi from render_score::@8 to render_bcd [phi:render_score::@8->render_bcd]
-  render_bcd_from_b8:
-  //SEG241 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#4 [phi:render_score::@8->render_bcd#0] -- register_copy 
-  //SEG242 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@8->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG240 [95] phi from render_score::@6 to render_bcd [phi:render_score::@6->render_bcd]
+  render_bcd_from_b6:
+  //SEG241 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#4 [phi:render_score::@6->render_bcd#0] -- register_copy 
+  //SEG242 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@6->render_bcd#1] -- vbuyy=vbuc1 
     ldy #0
-  //SEG243 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@8->render_bcd#2] -- vwuz1=vbuc1 
+  //SEG243 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@6->render_bcd#2] -- vwuz1=vbuc1 
     lda #lines_offset+1
     sta render_bcd.offset
     lda #0
     sta render_bcd.offset+1
-  //SEG244 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#4 [phi:render_score::@8->render_bcd#3] -- register_copy 
+  //SEG244 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#4 [phi:render_score::@6->render_bcd#3] -- register_copy 
     jsr render_bcd
-    jmp b9
-  //SEG245 render_score::@9
-  b9:
+    jmp b7
+  //SEG245 render_score::@7
+  b7:
   //SEG246 [91] (byte*) render_bcd::screen#5 ← (byte*) render_score::screen#3
   //SEG247 [92] (byte) render_bcd::bcd#5 ← (byte) level_bcd#17 -- vbuxx=vbuz1 
     ldx level_bcd
   //SEG248 [93] call render_bcd 
-  //SEG249 [95] phi from render_score::@9 to render_bcd [phi:render_score::@9->render_bcd]
-  render_bcd_from_b9:
-  //SEG250 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#5 [phi:render_score::@9->render_bcd#0] -- register_copy 
-  //SEG251 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@9->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG249 [95] phi from render_score::@7 to render_bcd [phi:render_score::@7->render_bcd]
+  render_bcd_from_b7:
+  //SEG250 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#5 [phi:render_score::@7->render_bcd#0] -- register_copy 
+  //SEG251 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@7->render_bcd#1] -- vbuyy=vbuc1 
     ldy #0
-  //SEG252 [95] phi (word) render_bcd::offset#6 = (const word) render_score::level_offset#0 [phi:render_score::@9->render_bcd#2] -- vwuz1=vwuc1 
+  //SEG252 [95] phi (word) render_bcd::offset#6 = (const word) render_score::level_offset#0 [phi:render_score::@7->render_bcd#2] -- vwuz1=vwuc1 
     lda #<level_offset
     sta render_bcd.offset
     lda #>level_offset
     sta render_bcd.offset+1
-  //SEG253 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#5 [phi:render_score::@9->render_bcd#3] -- register_copy 
+  //SEG253 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#5 [phi:render_score::@7->render_bcd#3] -- register_copy 
     jsr render_bcd
     jmp breturn
   //SEG254 render_score::@return
@@ -18852,32 +18980,32 @@ render_next: {
     .label next_piece_gfx = 5
     .label screen_next_area = 7
     .label l = 9
-  //SEG274 [109] if((byte) render_screen_render#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@2 -- vbuaa_eq_0_then_la1 
+  //SEG274 [109] if((byte) render_screen_render#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b2_from_render_next
-  //SEG275 [110] phi from render_next to render_next::@3 [phi:render_next->render_next::@3]
-  b3_from_render_next:
-    jmp b3
-  //SEG276 render_next::@3
-  b3:
-  //SEG277 [111] phi from render_next::@3 to render_next::@2 [phi:render_next::@3->render_next::@2]
-  b2_from_b3:
-  //SEG278 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_2#0+(const word) render_next::next_area_offset#0 [phi:render_next::@3->render_next::@2#0] -- pbuz1=pbuc1 
+    beq b1_from_render_next
+  //SEG275 [110] phi from render_next to render_next::@2 [phi:render_next->render_next::@2]
+  b2_from_render_next:
+    jmp b2
+  //SEG276 render_next::@2
+  b2:
+  //SEG277 [111] phi from render_next::@2 to render_next::@1 [phi:render_next::@2->render_next::@1]
+  b1_from_b2:
+  //SEG278 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_2#0+(const word) render_next::next_area_offset#0 [phi:render_next::@2->render_next::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2+next_area_offset
     sta screen_next_area
     lda #>PLAYFIELD_SCREEN_2+next_area_offset
     sta screen_next_area+1
-    jmp b2
-  //SEG279 [111] phi from render_next to render_next::@2 [phi:render_next->render_next::@2]
-  b2_from_render_next:
-  //SEG280 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_1#0+(const word) render_next::next_area_offset#0 [phi:render_next->render_next::@2#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG279 [111] phi from render_next to render_next::@1 [phi:render_next->render_next::@1]
+  b1_from_render_next:
+  //SEG280 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_1#0+(const word) render_next::next_area_offset#0 [phi:render_next->render_next::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1+next_area_offset
     sta screen_next_area
     lda #>PLAYFIELD_SCREEN_1+next_area_offset
     sta screen_next_area+1
-    jmp b2
-  //SEG281 render_next::@2
-  b2:
+    jmp b1
+  //SEG281 render_next::@1
+  b1:
   //SEG282 [112] (byte~) render_next::$4 ← (byte) next_piece_idx#12 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuyy=vbuxx_rol_1 
     txa
     asl
@@ -18890,37 +19018,37 @@ render_next: {
     sta next_piece_gfx
     lda PIECES+1,y
     sta next_piece_gfx+1
-  //SEG285 [115] phi from render_next::@2 to render_next::@5 [phi:render_next::@2->render_next::@5]
-  b5_from_b2:
-  //SEG286 [115] phi (byte) render_next::l#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@2->render_next::@5#0] -- vbuz1=vbuc1 
+  //SEG285 [115] phi from render_next::@1 to render_next::@3 [phi:render_next::@1->render_next::@3]
+  b3_from_b1:
+  //SEG286 [115] phi (byte) render_next::l#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@1->render_next::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta l
-  //SEG287 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#11 [phi:render_next::@2->render_next::@5#1] -- register_copy 
-  //SEG288 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*~) render_next::next_piece_gfx#9 [phi:render_next::@2->render_next::@5#2] -- register_copy 
-    jmp b5
-  //SEG289 [115] phi from render_next::@11 to render_next::@5 [phi:render_next::@11->render_next::@5]
-  b5_from_b11:
-  //SEG290 [115] phi (byte) render_next::l#7 = (byte) render_next::l#1 [phi:render_next::@11->render_next::@5#0] -- register_copy 
-  //SEG291 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#4 [phi:render_next::@11->render_next::@5#1] -- register_copy 
-  //SEG292 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@11->render_next::@5#2] -- register_copy 
-    jmp b5
-  //SEG293 render_next::@5
-  b5:
-  //SEG294 [116] phi from render_next::@5 to render_next::@6 [phi:render_next::@5->render_next::@6]
-  b6_from_b5:
-  //SEG295 [116] phi (byte) render_next::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@5->render_next::@6#0] -- vbuxx=vbuc1 
+  //SEG287 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#11 [phi:render_next::@1->render_next::@3#1] -- register_copy 
+  //SEG288 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*~) render_next::next_piece_gfx#9 [phi:render_next::@1->render_next::@3#2] -- register_copy 
+    jmp b3
+  //SEG289 [115] phi from render_next::@8 to render_next::@3 [phi:render_next::@8->render_next::@3]
+  b3_from_b8:
+  //SEG290 [115] phi (byte) render_next::l#7 = (byte) render_next::l#1 [phi:render_next::@8->render_next::@3#0] -- register_copy 
+  //SEG291 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#4 [phi:render_next::@8->render_next::@3#1] -- register_copy 
+  //SEG292 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@8->render_next::@3#2] -- register_copy 
+    jmp b3
+  //SEG293 render_next::@3
+  b3:
+  //SEG294 [116] phi from render_next::@3 to render_next::@4 [phi:render_next::@3->render_next::@4]
+  b4_from_b3:
+  //SEG295 [116] phi (byte) render_next::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@3->render_next::@4#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG296 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#10 [phi:render_next::@5->render_next::@6#1] -- register_copy 
-  //SEG297 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#3 [phi:render_next::@5->render_next::@6#2] -- register_copy 
-    jmp b6
-  //SEG298 [116] phi from render_next::@8 to render_next::@6 [phi:render_next::@8->render_next::@6]
-  b6_from_b8:
-  //SEG299 [116] phi (byte) render_next::c#2 = (byte) render_next::c#1 [phi:render_next::@8->render_next::@6#0] -- register_copy 
-  //SEG300 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#3 [phi:render_next::@8->render_next::@6#1] -- register_copy 
-  //SEG301 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@8->render_next::@6#2] -- register_copy 
-    jmp b6
-  //SEG302 render_next::@6
-  b6:
+  //SEG296 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#10 [phi:render_next::@3->render_next::@4#1] -- register_copy 
+  //SEG297 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#3 [phi:render_next::@3->render_next::@4#2] -- register_copy 
+    jmp b4
+  //SEG298 [116] phi from render_next::@6 to render_next::@4 [phi:render_next::@6->render_next::@4]
+  b4_from_b6:
+  //SEG299 [116] phi (byte) render_next::c#2 = (byte) render_next::c#1 [phi:render_next::@6->render_next::@4#0] -- register_copy 
+  //SEG300 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#3 [phi:render_next::@6->render_next::@4#1] -- register_copy 
+  //SEG301 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@6->render_next::@4#2] -- register_copy 
+    jmp b4
+  //SEG302 render_next::@4
+  b4:
   //SEG303 [117] (byte) render_next::cell#0 ← *((byte*) render_next::next_piece_gfx#2) -- vbuaa=_deref_pbuz1 
     ldy #0
     lda (next_piece_gfx),y
@@ -18929,19 +19057,19 @@ render_next: {
     bne !+
     inc next_piece_gfx+1
   !:
-  //SEG305 [119] if((byte) render_next::cell#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@7 -- vbuaa_neq_0_then_la1 
+  //SEG305 [119] if((byte) render_next::cell#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@5 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b7
-    jmp b9
-  //SEG306 render_next::@9
-  b9:
+    bne b5
+    jmp b7
+  //SEG306 render_next::@7
+  b7:
   //SEG307 [120] *((byte*) render_next::screen_next_area#5) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuz1=vbuc1 
     lda #0
     ldy #0
     sta (screen_next_area),y
-    jmp b8
-  //SEG308 render_next::@8
-  b8:
+    jmp b6
+  //SEG308 render_next::@6
+  b6:
   //SEG309 [121] (byte*) render_next::screen_next_area#3 ← ++ (byte*) render_next::screen_next_area#5 -- pbuz1=_inc_pbuz1 
     inc screen_next_area
     bne !+
@@ -18949,12 +19077,12 @@ render_next: {
   !:
   //SEG310 [122] (byte) render_next::c#1 ← ++ (byte) render_next::c#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG311 [123] if((byte) render_next::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG311 [123] if((byte) render_next::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #4
-    bne b6_from_b8
-    jmp b11
-  //SEG312 render_next::@11
-  b11:
+    bne b4_from_b6
+    jmp b8
+  //SEG312 render_next::@8
+  b8:
   //SEG313 [124] (byte*) render_next::screen_next_area#4 ← (byte*) render_next::screen_next_area#3 + (byte/signed byte/word/signed word/dword/signed dword) $24 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$24
     clc
@@ -18965,22 +19093,22 @@ render_next: {
   !:
   //SEG314 [125] (byte) render_next::l#1 ← ++ (byte) render_next::l#7 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG315 [126] if((byte) render_next::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@5 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG315 [126] if((byte) render_next::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp l
-    bne b5_from_b11
+    bne b3_from_b8
     jmp breturn
   //SEG316 render_next::@return
   breturn:
   //SEG317 [127] return 
     rts
-  //SEG318 render_next::@7
-  b7:
+  //SEG318 render_next::@5
+  b5:
   //SEG319 [128] *((byte*) render_next::screen_next_area#5) ← (byte) render_next::next_piece_char#0 -- _deref_pbuz1=vbuz2 
     lda next_piece_char
     ldy #0
     sta (screen_next_area),y
-    jmp b8
+    jmp b6
 }
 //SEG320 render_moving
 // Render the current moving piece at position (current_xpos, current_ypos)
@@ -19017,17 +19145,17 @@ render_moving: {
     lda #2
     cmp ypos2
     bcc b2
-    jmp b8
-  //SEG332 render_moving::@8
-  b8:
+    jmp b7
+  //SEG332 render_moving::@7
+  b7:
   //SEG333 [133] (byte) render_moving::i#1 ← (byte) render_moving::i#3 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax i
     axs #-[4]
     stx i
-  //SEG334 [134] phi from render_moving::@5 render_moving::@8 to render_moving::@3 [phi:render_moving::@5/render_moving::@8->render_moving::@3]
+  //SEG334 [134] phi from render_moving::@5 render_moving::@7 to render_moving::@3 [phi:render_moving::@5/render_moving::@7->render_moving::@3]
   b3_from_b5:
-  b3_from_b8:
-  //SEG335 [134] phi (byte) render_moving::i#8 = (byte) render_moving::i#2 [phi:render_moving::@5/render_moving::@8->render_moving::@3#0] -- register_copy 
+  b3_from_b7:
+  //SEG335 [134] phi (byte) render_moving::i#8 = (byte) render_moving::i#2 [phi:render_moving::@5/render_moving::@7->render_moving::@3#0] -- register_copy 
     jmp b3
   //SEG336 render_moving::@3
   b3:
@@ -19204,9 +19332,9 @@ play_movement: {
     jsr play_move_down
   //SEG397 [166] (byte) play_move_down::return#0 ← (byte) play_move_down::return#3 -- vbuaa=vbuxx 
     txa
-    jmp b5
-  //SEG398 play_movement::@5
-  b5:
+    jmp b2
+  //SEG398 play_movement::@2
+  b2:
   //SEG399 [167] (byte~) play_movement::$0 ← (byte) play_move_down::return#0
   //SEG400 [168] (byte) play_movement::render#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 + (byte~) play_movement::$0 -- vbuz1=vbuc1_plus_vbuaa 
     clc
@@ -19216,13 +19344,13 @@ play_movement: {
     lda game_over
     cmp #0
     beq b1
-  //SEG402 [170] phi from play_movement::@5 play_movement::@7 to play_movement::@return [phi:play_movement::@5/play_movement::@7->play_movement::@return]
-  breturn_from_b5:
-  breturn_from_b7:
-  //SEG403 [170] phi (byte) current_xpos#19 = (byte) current_xpos#22 [phi:play_movement::@5/play_movement::@7->play_movement::@return#0] -- register_copy 
-  //SEG404 [170] phi (byte*) current_piece_gfx#18 = (byte*) current_piece_gfx#20 [phi:play_movement::@5/play_movement::@7->play_movement::@return#1] -- register_copy 
-  //SEG405 [170] phi (byte) current_orientation#17 = (byte) current_orientation#20 [phi:play_movement::@5/play_movement::@7->play_movement::@return#2] -- register_copy 
-  //SEG406 [170] phi (byte) play_movement::return#2 = (byte) play_movement::render#1 [phi:play_movement::@5/play_movement::@7->play_movement::@return#3] -- register_copy 
+  //SEG402 [170] phi from play_movement::@2 play_movement::@4 to play_movement::@return [phi:play_movement::@2/play_movement::@4->play_movement::@return]
+  breturn_from_b2:
+  breturn_from_b4:
+  //SEG403 [170] phi (byte) current_xpos#19 = (byte) current_xpos#22 [phi:play_movement::@2/play_movement::@4->play_movement::@return#0] -- register_copy 
+  //SEG404 [170] phi (byte*) current_piece_gfx#18 = (byte*) current_piece_gfx#20 [phi:play_movement::@2/play_movement::@4->play_movement::@return#1] -- register_copy 
+  //SEG405 [170] phi (byte) current_orientation#17 = (byte) current_orientation#20 [phi:play_movement::@2/play_movement::@4->play_movement::@return#2] -- register_copy 
+  //SEG406 [170] phi (byte) play_movement::return#2 = (byte) play_movement::render#1 [phi:play_movement::@2/play_movement::@4->play_movement::@return#3] -- register_copy 
     jmp breturn
   //SEG407 play_movement::@return
   breturn:
@@ -19235,9 +19363,9 @@ play_movement: {
   //SEG411 [173] call play_move_leftright 
     jsr play_move_leftright
   //SEG412 [174] (byte) play_move_leftright::return#0 ← (byte) play_move_leftright::return#2
-    jmp b6
-  //SEG413 play_movement::@6
-  b6:
+    jmp b3
+  //SEG413 play_movement::@3
+  b3:
   //SEG414 [175] (byte~) play_movement::$3 ← (byte) play_move_leftright::return#0
   //SEG415 [176] (byte) play_movement::render#2 ← (byte) play_movement::render#1 + (byte~) play_movement::$3 -- vbuz1=vbuz1_plus_vbuaa 
     clc
@@ -19248,15 +19376,15 @@ play_movement: {
   //SEG417 [178] call play_move_rotate 
     jsr play_move_rotate
   //SEG418 [179] (byte) play_move_rotate::return#0 ← (byte) play_move_rotate::return#2
-    jmp b7
-  //SEG419 play_movement::@7
-  b7:
+    jmp b4
+  //SEG419 play_movement::@4
+  b4:
   //SEG420 [180] (byte~) play_movement::$4 ← (byte) play_move_rotate::return#0
   //SEG421 [181] (byte) play_movement::return#0 ← (byte) play_movement::render#2 + (byte~) play_movement::$4 -- vbuz1=vbuz1_plus_vbuaa 
     clc
     adc return
     sta return
-    jmp breturn_from_b7
+    jmp breturn_from_b4
 }
 //SEG422 play_move_rotate
 // Rotate the current piece  based on key-presses
@@ -19267,18 +19395,18 @@ play_move_rotate: {
   //SEG423 [182] if((byte) play_move_rotate::key_event#0==(const byte) KEY_Z#0) goto play_move_rotate::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #KEY_Z
     beq b1
-    jmp b6
-  //SEG424 play_move_rotate::@6
-  b6:
+    jmp b4
+  //SEG424 play_move_rotate::@4
+  b4:
   //SEG425 [183] if((byte) play_move_rotate::key_event#0==(const byte) KEY_X#0) goto play_move_rotate::@2 -- vbuaa_eq_vbuc1_then_la1 
     cmp #KEY_X
     beq b2
-  //SEG426 [184] phi from play_move_rotate::@14 play_move_rotate::@6 to play_move_rotate::@return [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return]
-  breturn_from_b14:
+  //SEG426 [184] phi from play_move_rotate::@4 play_move_rotate::@6 to play_move_rotate::@return [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return]
+  breturn_from_b4:
   breturn_from_b6:
-  //SEG427 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#20 [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return#0] -- register_copy 
-  //SEG428 [184] phi (byte) current_orientation#25 = (byte) current_orientation#20 [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return#1] -- register_copy 
-  //SEG429 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return#2] -- vbuaa=vbuc1 
+  //SEG427 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#20 [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return#0] -- register_copy 
+  //SEG428 [184] phi (byte) current_orientation#25 = (byte) current_orientation#20 [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return#1] -- register_copy 
+  //SEG429 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return#2] -- vbuaa=vbuc1 
     lda #0
     jmp breturn
   //SEG430 play_move_rotate::@return
@@ -19293,13 +19421,13 @@ play_move_rotate: {
   //SEG434 [187] (byte) play_move_rotate::orientation#2 ← (byte/signed word/word/dword/signed dword~) play_move_rotate::$5 & (byte/signed byte/word/signed word/dword/signed dword) $3f -- vbuz1=vbuxx_band_vbuc1 
     lda #$3f
     sax orientation
-  //SEG435 [188] phi from play_move_rotate::@1 play_move_rotate::@2 to play_move_rotate::@4 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@4]
-  b4_from_b1:
-  b4_from_b2:
-  //SEG436 [188] phi (byte) play_move_rotate::orientation#3 = (byte) play_move_rotate::orientation#1 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@4#0] -- register_copy 
-    jmp b4
-  //SEG437 play_move_rotate::@4
-  b4:
+  //SEG435 [188] phi from play_move_rotate::@1 play_move_rotate::@2 to play_move_rotate::@3 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@3]
+  b3_from_b1:
+  b3_from_b2:
+  //SEG436 [188] phi (byte) play_move_rotate::orientation#3 = (byte) play_move_rotate::orientation#1 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@3#0] -- register_copy 
+    jmp b3
+  //SEG437 play_move_rotate::@3
+  b3:
   //SEG438 [189] (byte) play_collision::xpos#3 ← (byte) current_xpos#26 -- vbuz1=vbuz2 
     lda current_xpos
     sta play_collision.xpos
@@ -19314,24 +19442,24 @@ play_move_rotate: {
     lda current_piece+1
     sta current_piece_101+1
   //SEG442 [193] call play_collision 
-  //SEG443 [201] phi from play_move_rotate::@4 to play_collision [phi:play_move_rotate::@4->play_collision]
-  play_collision_from_b4:
-  //SEG444 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#3 [phi:play_move_rotate::@4->play_collision#0] -- register_copy 
-  //SEG445 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#3 [phi:play_move_rotate::@4->play_collision#1] -- register_copy 
-  //SEG446 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#3 [phi:play_move_rotate::@4->play_collision#2] -- register_copy 
-  //SEG447 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#101 [phi:play_move_rotate::@4->play_collision#3] -- register_copy 
+  //SEG443 [201] phi from play_move_rotate::@3 to play_collision [phi:play_move_rotate::@3->play_collision]
+  play_collision_from_b3:
+  //SEG444 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#3 [phi:play_move_rotate::@3->play_collision#0] -- register_copy 
+  //SEG445 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#3 [phi:play_move_rotate::@3->play_collision#1] -- register_copy 
+  //SEG446 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#3 [phi:play_move_rotate::@3->play_collision#2] -- register_copy 
+  //SEG447 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#101 [phi:play_move_rotate::@3->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG448 [194] (byte) play_collision::return#14 ← (byte) play_collision::return#15
-    jmp b14
-  //SEG449 play_move_rotate::@14
-  b14:
+    jmp b6
+  //SEG449 play_move_rotate::@6
+  b6:
   //SEG450 [195] (byte~) play_move_rotate::$2 ← (byte) play_collision::return#14
   //SEG451 [196] if((byte~) play_move_rotate::$2!=(const byte) COLLISION_NONE#0) goto play_move_rotate::@return -- vbuaa_neq_vbuc1_then_la1 
     cmp #COLLISION_NONE
-    bne breturn_from_b14
-    jmp b11
-  //SEG452 play_move_rotate::@11
-  b11:
+    bne breturn_from_b6
+    jmp b5
+  //SEG452 play_move_rotate::@5
+  b5:
   //SEG453 [197] (byte) current_orientation#7 ← (byte) play_move_rotate::orientation#3 -- vbuz1=vbuz2 
     lda orientation
     sta current_orientation
@@ -19343,11 +19471,11 @@ play_move_rotate: {
     lda #0
     adc current_piece+1
     sta current_piece_gfx+1
-  //SEG455 [184] phi from play_move_rotate::@11 to play_move_rotate::@return [phi:play_move_rotate::@11->play_move_rotate::@return]
-  breturn_from_b11:
-  //SEG456 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#7 [phi:play_move_rotate::@11->play_move_rotate::@return#0] -- register_copy 
-  //SEG457 [184] phi (byte) current_orientation#25 = (byte) current_orientation#7 [phi:play_move_rotate::@11->play_move_rotate::@return#1] -- register_copy 
-  //SEG458 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_rotate::@11->play_move_rotate::@return#2] -- vbuaa=vbuc1 
+  //SEG455 [184] phi from play_move_rotate::@5 to play_move_rotate::@return [phi:play_move_rotate::@5->play_move_rotate::@return]
+  breturn_from_b5:
+  //SEG456 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#7 [phi:play_move_rotate::@5->play_move_rotate::@return#0] -- register_copy 
+  //SEG457 [184] phi (byte) current_orientation#25 = (byte) current_orientation#7 [phi:play_move_rotate::@5->play_move_rotate::@return#1] -- register_copy 
+  //SEG458 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_rotate::@5->play_move_rotate::@return#2] -- vbuaa=vbuc1 
     lda #1
     jmp breturn
   //SEG459 play_move_rotate::@1
@@ -19358,7 +19486,7 @@ play_move_rotate: {
   //SEG461 [200] (byte) play_move_rotate::orientation#1 ← (byte/signed word/word/dword/signed dword~) play_move_rotate::$7 & (byte/signed byte/word/signed word/dword/signed dword) $3f -- vbuz1=vbuxx_band_vbuc1 
     lda #$3f
     sax orientation
-    jmp b4_from_b1
+    jmp b3_from_b1
 }
 //SEG462 play_collision
 // Test if there is a collision between the current piece moved to (x, y) and anything on the playfield or the playfield boundaries
@@ -19426,16 +19554,16 @@ play_collision: {
     lda (piece_gfx),y
     cmp #0
     beq b3
-    jmp b14
-  //SEG479 play_collision::@14
-  b14:
+    jmp b7
+  //SEG479 play_collision::@7
+  b7:
   //SEG480 [210] if((byte) play_collision::ypos2#2<(byte/signed byte/word/signed word/dword/signed dword) 2*(const byte) PLAYFIELD_LINES#0) goto play_collision::@4 -- vbuz1_lt_vbuc1_then_la1 
     lda ypos2
     cmp #2*PLAYFIELD_LINES
     bcc b4
-  //SEG481 [211] phi from play_collision::@14 to play_collision::@return [phi:play_collision::@14->play_collision::@return]
-  breturn_from_b14:
-  //SEG482 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_BOTTOM#0 [phi:play_collision::@14->play_collision::@return#0] -- vbuaa=vbuc1 
+  //SEG481 [211] phi from play_collision::@7 to play_collision::@return [phi:play_collision::@7->play_collision::@return]
+  breturn_from_b7:
+  //SEG482 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_BOTTOM#0 [phi:play_collision::@7->play_collision::@return#0] -- vbuaa=vbuc1 
     lda #COLLISION_BOTTOM
     jmp breturn
   //SEG483 play_collision::@return
@@ -19484,12 +19612,12 @@ play_collision: {
     inc col
   //SEG500 [218] (byte) play_collision::c#1 ← ++ (byte) play_collision::c#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG501 [219] if((byte) play_collision::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@21 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG501 [219] if((byte) play_collision::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@10 -- vbuxx_neq_vbuc1_then_la1 
     cpx #4
-    bne b21
-    jmp b17
-  //SEG502 play_collision::@17
-  b17:
+    bne b10
+    jmp b8
+  //SEG502 play_collision::@8
+  b8:
   //SEG503 [220] (byte) play_collision::ypos2#1 ← (byte) play_collision::ypos2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda ypos2
     clc
@@ -19497,36 +19625,36 @@ play_collision: {
     sta ypos2
   //SEG504 [221] (byte) play_collision::l#1 ← ++ (byte) play_collision::l#6 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG505 [222] if((byte) play_collision::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@20 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG505 [222] if((byte) play_collision::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp l
-    bne b20
-  //SEG506 [211] phi from play_collision::@17 to play_collision::@return [phi:play_collision::@17->play_collision::@return]
-  breturn_from_b17:
-  //SEG507 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_NONE#0 [phi:play_collision::@17->play_collision::@return#0] -- vbuaa=vbuc1 
+    bne b9
+  //SEG506 [211] phi from play_collision::@8 to play_collision::@return [phi:play_collision::@8->play_collision::@return]
+  breturn_from_b8:
+  //SEG507 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_NONE#0 [phi:play_collision::@8->play_collision::@return#0] -- vbuaa=vbuc1 
     lda #COLLISION_NONE
     jmp breturn
-  //SEG508 play_collision::@20
-  b20:
+  //SEG508 play_collision::@9
+  b9:
   //SEG509 [223] (byte~) play_collision::i#11 ← (byte) play_collision::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_11
-  //SEG510 [204] phi from play_collision::@20 to play_collision::@1 [phi:play_collision::@20->play_collision::@1]
-  b1_from_b20:
-  //SEG511 [204] phi (byte) play_collision::l#6 = (byte) play_collision::l#1 [phi:play_collision::@20->play_collision::@1#0] -- register_copy 
-  //SEG512 [204] phi (byte) play_collision::i#3 = (byte~) play_collision::i#11 [phi:play_collision::@20->play_collision::@1#1] -- register_copy 
-  //SEG513 [204] phi (byte) play_collision::ypos2#2 = (byte) play_collision::ypos2#1 [phi:play_collision::@20->play_collision::@1#2] -- register_copy 
+  //SEG510 [204] phi from play_collision::@9 to play_collision::@1 [phi:play_collision::@9->play_collision::@1]
+  b1_from_b9:
+  //SEG511 [204] phi (byte) play_collision::l#6 = (byte) play_collision::l#1 [phi:play_collision::@9->play_collision::@1#0] -- register_copy 
+  //SEG512 [204] phi (byte) play_collision::i#3 = (byte~) play_collision::i#11 [phi:play_collision::@9->play_collision::@1#1] -- register_copy 
+  //SEG513 [204] phi (byte) play_collision::ypos2#2 = (byte) play_collision::ypos2#1 [phi:play_collision::@9->play_collision::@1#2] -- register_copy 
     jmp b1
-  //SEG514 play_collision::@21
-  b21:
+  //SEG514 play_collision::@10
+  b10:
   //SEG515 [224] (byte~) play_collision::i#13 ← (byte) play_collision::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_13
-  //SEG516 [207] phi from play_collision::@21 to play_collision::@2 [phi:play_collision::@21->play_collision::@2]
-  b2_from_b21:
-  //SEG517 [207] phi (byte) play_collision::c#2 = (byte) play_collision::c#1 [phi:play_collision::@21->play_collision::@2#0] -- register_copy 
-  //SEG518 [207] phi (byte) play_collision::col#2 = (byte) play_collision::col#1 [phi:play_collision::@21->play_collision::@2#1] -- register_copy 
-  //SEG519 [207] phi (byte) play_collision::i#2 = (byte~) play_collision::i#13 [phi:play_collision::@21->play_collision::@2#2] -- register_copy 
+  //SEG516 [207] phi from play_collision::@10 to play_collision::@2 [phi:play_collision::@10->play_collision::@2]
+  b2_from_b10:
+  //SEG517 [207] phi (byte) play_collision::c#2 = (byte) play_collision::c#1 [phi:play_collision::@10->play_collision::@2#0] -- register_copy 
+  //SEG518 [207] phi (byte) play_collision::col#2 = (byte) play_collision::col#1 [phi:play_collision::@10->play_collision::@2#1] -- register_copy 
+  //SEG519 [207] phi (byte) play_collision::i#2 = (byte~) play_collision::i#13 [phi:play_collision::@10->play_collision::@2#2] -- register_copy 
     jmp b2
 }
 //SEG520 play_move_leftright
@@ -19538,15 +19666,15 @@ play_move_leftright: {
     // Handle keyboard events
     cmp #KEY_COMMA
     beq b1
-    jmp b4
-  //SEG522 play_move_leftright::@4
-  b4:
+    jmp b2
+  //SEG522 play_move_leftright::@2
+  b2:
   //SEG523 [226] if((byte) play_move_leftright::key_event#0!=(const byte) KEY_DOT#0) goto play_move_leftright::@return -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_DOT
-    bne breturn_from_b4
-    jmp b5
-  //SEG524 play_move_leftright::@5
-  b5:
+    bne breturn_from_b2
+    jmp b3
+  //SEG524 play_move_leftright::@3
+  b3:
   //SEG525 [227] (byte) play_collision::xpos#2 ← (byte) current_xpos#22 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_plus_1 
     ldy current_xpos
     iny
@@ -19562,39 +19690,39 @@ play_move_leftright: {
     lda current_piece+1
     sta current_piece_100+1
   //SEG529 [231] call play_collision 
-  //SEG530 [201] phi from play_move_leftright::@5 to play_collision [phi:play_move_leftright::@5->play_collision]
-  play_collision_from_b5:
-  //SEG531 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#2 [phi:play_move_leftright::@5->play_collision#0] -- register_copy 
-  //SEG532 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#2 [phi:play_move_leftright::@5->play_collision#1] -- register_copy 
-  //SEG533 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#2 [phi:play_move_leftright::@5->play_collision#2] -- register_copy 
-  //SEG534 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#100 [phi:play_move_leftright::@5->play_collision#3] -- register_copy 
+  //SEG530 [201] phi from play_move_leftright::@3 to play_collision [phi:play_move_leftright::@3->play_collision]
+  play_collision_from_b3:
+  //SEG531 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#2 [phi:play_move_leftright::@3->play_collision#0] -- register_copy 
+  //SEG532 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#2 [phi:play_move_leftright::@3->play_collision#1] -- register_copy 
+  //SEG533 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#2 [phi:play_move_leftright::@3->play_collision#2] -- register_copy 
+  //SEG534 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#100 [phi:play_move_leftright::@3->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG535 [232] (byte) play_collision::return#13 ← (byte) play_collision::return#15
-    jmp b15
-  //SEG536 play_move_leftright::@15
-  b15:
+    jmp b7
+  //SEG536 play_move_leftright::@7
+  b7:
   //SEG537 [233] (byte~) play_move_leftright::$4 ← (byte) play_collision::return#13
   //SEG538 [234] if((byte~) play_move_leftright::$4!=(const byte) COLLISION_NONE#0) goto play_move_leftright::@return -- vbuaa_neq_vbuc1_then_la1 
     cmp #COLLISION_NONE
-    bne breturn_from_b15
-    jmp b6
-  //SEG539 play_move_leftright::@6
-  b6:
+    bne breturn_from_b7
+    jmp b4
+  //SEG539 play_move_leftright::@4
+  b4:
   //SEG540 [235] (byte) current_xpos#6 ← ++ (byte) current_xpos#22 -- vbuz1=_inc_vbuz1 
     inc current_xpos
-  //SEG541 [236] phi from play_move_leftright::@6 play_move_leftright::@9 to play_move_leftright::@return [phi:play_move_leftright::@6/play_move_leftright::@9->play_move_leftright::@return]
-  breturn_from_b6:
-  breturn_from_b9:
-  //SEG542 [236] phi (byte) current_xpos#26 = (byte) current_xpos#6 [phi:play_move_leftright::@6/play_move_leftright::@9->play_move_leftright::@return#0] -- register_copy 
-  //SEG543 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_leftright::@6/play_move_leftright::@9->play_move_leftright::@return#1] -- vbuaa=vbuc1 
+  //SEG541 [236] phi from play_move_leftright::@4 play_move_leftright::@5 to play_move_leftright::@return [phi:play_move_leftright::@4/play_move_leftright::@5->play_move_leftright::@return]
+  breturn_from_b4:
+  breturn_from_b5:
+  //SEG542 [236] phi (byte) current_xpos#26 = (byte) current_xpos#6 [phi:play_move_leftright::@4/play_move_leftright::@5->play_move_leftright::@return#0] -- register_copy 
+  //SEG543 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_leftright::@4/play_move_leftright::@5->play_move_leftright::@return#1] -- vbuaa=vbuc1 
     lda #1
     jmp breturn
-  //SEG544 [236] phi from play_move_leftright::@14 play_move_leftright::@15 play_move_leftright::@4 to play_move_leftright::@return [phi:play_move_leftright::@14/play_move_leftright::@15/play_move_leftright::@4->play_move_leftright::@return]
-  breturn_from_b14:
-  breturn_from_b15:
-  breturn_from_b4:
-  //SEG545 [236] phi (byte) current_xpos#26 = (byte) current_xpos#22 [phi:play_move_leftright::@14/play_move_leftright::@15/play_move_leftright::@4->play_move_leftright::@return#0] -- register_copy 
-  //SEG546 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_leftright::@14/play_move_leftright::@15/play_move_leftright::@4->play_move_leftright::@return#1] -- vbuaa=vbuc1 
+  //SEG544 [236] phi from play_move_leftright::@2 play_move_leftright::@6 play_move_leftright::@7 to play_move_leftright::@return [phi:play_move_leftright::@2/play_move_leftright::@6/play_move_leftright::@7->play_move_leftright::@return]
+  breturn_from_b2:
+  breturn_from_b6:
+  breturn_from_b7:
+  //SEG545 [236] phi (byte) current_xpos#26 = (byte) current_xpos#22 [phi:play_move_leftright::@2/play_move_leftright::@6/play_move_leftright::@7->play_move_leftright::@return#0] -- register_copy 
+  //SEG546 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_leftright::@2/play_move_leftright::@6/play_move_leftright::@7->play_move_leftright::@return#1] -- vbuaa=vbuc1 
     lda #0
     jmp breturn
   //SEG547 play_move_leftright::@return
@@ -19626,19 +19754,19 @@ play_move_leftright: {
   //SEG559 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#99 [phi:play_move_leftright::@1->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG560 [243] (byte) play_collision::return#1 ← (byte) play_collision::return#15
-    jmp b14
-  //SEG561 play_move_leftright::@14
-  b14:
+    jmp b6
+  //SEG561 play_move_leftright::@6
+  b6:
   //SEG562 [244] (byte~) play_move_leftright::$8 ← (byte) play_collision::return#1
   //SEG563 [245] if((byte~) play_move_leftright::$8!=(const byte) COLLISION_NONE#0) goto play_move_leftright::@return -- vbuaa_neq_vbuc1_then_la1 
     cmp #COLLISION_NONE
-    bne breturn_from_b14
-    jmp b9
-  //SEG564 play_move_leftright::@9
-  b9:
+    bne breturn_from_b6
+    jmp b5
+  //SEG564 play_move_leftright::@5
+  b5:
   //SEG565 [246] (byte) current_xpos#8 ← -- (byte) current_xpos#22 -- vbuz1=_dec_vbuz1 
     dec current_xpos
-    jmp breturn_from_b9
+    jmp breturn_from_b5
 }
 //SEG566 play_move_down
 // Move down the current piece
@@ -19650,14 +19778,14 @@ play_move_down: {
   //SEG568 [248] if((byte) play_move_down::key_event#0!=(const byte) KEY_SPACE#0) goto play_move_down::@1 -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_SPACE
     bne b1_from_play_move_down
-  //SEG569 [249] phi from play_move_down to play_move_down::@5 [phi:play_move_down->play_move_down::@5]
-  b5_from_play_move_down:
-    jmp b5
-  //SEG570 play_move_down::@5
-  b5:
-  //SEG571 [250] phi from play_move_down::@5 to play_move_down::@1 [phi:play_move_down::@5->play_move_down::@1]
-  b1_from_b5:
-  //SEG572 [250] phi (byte) play_move_down::movedown#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@5->play_move_down::@1#0] -- vbuxx=vbuc1 
+  //SEG569 [249] phi from play_move_down to play_move_down::@4 [phi:play_move_down->play_move_down::@4]
+  b4_from_play_move_down:
+    jmp b4
+  //SEG570 play_move_down::@4
+  b4:
+  //SEG571 [250] phi from play_move_down::@4 to play_move_down::@1 [phi:play_move_down::@4->play_move_down::@1]
+  b1_from_b4:
+  //SEG572 [250] phi (byte) play_move_down::movedown#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@4->play_move_down::@1#0] -- vbuxx=vbuc1 
     ldx #1
     jmp b1
   //SEG573 [250] phi from play_move_down to play_move_down::@1 [phi:play_move_down->play_move_down::@1]
@@ -19675,30 +19803,30 @@ play_move_down: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG579 [252] (byte) keyboard_event_pressed::return#12 ← (byte) keyboard_event_pressed::return#11
-    jmp b17
-  //SEG580 play_move_down::@17
-  b17:
+    jmp b12
+  //SEG580 play_move_down::@12
+  b12:
   //SEG581 [253] (byte~) play_move_down::$2 ← (byte) keyboard_event_pressed::return#12
   //SEG582 [254] if((byte~) play_move_down::$2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_move_down::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b2_from_b17
-    jmp b6
-  //SEG583 play_move_down::@6
-  b6:
+    beq b2_from_b12
+    jmp b5
+  //SEG583 play_move_down::@5
+  b5:
   //SEG584 [255] if((byte) current_movedown_counter#12<(const byte) current_movedown_fast#0) goto play_move_down::@2 -- vbuz1_lt_vbuc1_then_la1 
     lda current_movedown_counter
     cmp #current_movedown_fast
-    bcc b2_from_b6
-    jmp b7
-  //SEG585 play_move_down::@7
-  b7:
+    bcc b2_from_b5
+    jmp b6
+  //SEG585 play_move_down::@6
+  b6:
   //SEG586 [256] (byte) play_move_down::movedown#2 ← ++ (byte) play_move_down::movedown#10 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG587 [257] phi from play_move_down::@17 play_move_down::@6 play_move_down::@7 to play_move_down::@2 [phi:play_move_down::@17/play_move_down::@6/play_move_down::@7->play_move_down::@2]
-  b2_from_b17:
+  //SEG587 [257] phi from play_move_down::@12 play_move_down::@5 play_move_down::@6 to play_move_down::@2 [phi:play_move_down::@12/play_move_down::@5/play_move_down::@6->play_move_down::@2]
+  b2_from_b12:
+  b2_from_b5:
   b2_from_b6:
-  b2_from_b7:
-  //SEG588 [257] phi (byte) play_move_down::movedown#7 = (byte) play_move_down::movedown#10 [phi:play_move_down::@17/play_move_down::@6/play_move_down::@7->play_move_down::@2#0] -- register_copy 
+  //SEG588 [257] phi (byte) play_move_down::movedown#7 = (byte) play_move_down::movedown#10 [phi:play_move_down::@12/play_move_down::@5/play_move_down::@6->play_move_down::@2#0] -- register_copy 
     jmp b2
   //SEG589 play_move_down::@2
   b2:
@@ -19706,24 +19834,24 @@ play_move_down: {
     lda current_movedown_counter
     cmp current_movedown_slow
     bcc b3_from_b2
-    jmp b8
-  //SEG591 play_move_down::@8
-  b8:
+    jmp b7
+  //SEG591 play_move_down::@7
+  b7:
   //SEG592 [259] (byte) play_move_down::movedown#3 ← ++ (byte) play_move_down::movedown#7 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG593 [260] phi from play_move_down::@2 play_move_down::@8 to play_move_down::@3 [phi:play_move_down::@2/play_move_down::@8->play_move_down::@3]
+  //SEG593 [260] phi from play_move_down::@2 play_move_down::@7 to play_move_down::@3 [phi:play_move_down::@2/play_move_down::@7->play_move_down::@3]
   b3_from_b2:
-  b3_from_b8:
-  //SEG594 [260] phi (byte) play_move_down::movedown#6 = (byte) play_move_down::movedown#7 [phi:play_move_down::@2/play_move_down::@8->play_move_down::@3#0] -- register_copy 
+  b3_from_b7:
+  //SEG594 [260] phi (byte) play_move_down::movedown#6 = (byte) play_move_down::movedown#7 [phi:play_move_down::@2/play_move_down::@7->play_move_down::@3#0] -- register_copy 
     jmp b3
   //SEG595 play_move_down::@3
   b3:
   //SEG596 [261] if((byte) play_move_down::movedown#6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_move_down::@return -- vbuxx_eq_0_then_la1 
     cpx #0
     beq breturn_from_b3
-    jmp b9
-  //SEG597 play_move_down::@9
-  b9:
+    jmp b8
+  //SEG597 play_move_down::@8
+  b8:
   //SEG598 [262] (byte) play_collision::ypos#0 ← (byte) current_ypos#11 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_plus_1 
     ldy current_ypos
     iny
@@ -19739,57 +19867,57 @@ play_move_down: {
     lda current_piece+1
     sta current_piece_98+1
   //SEG602 [266] call play_collision 
-  //SEG603 [201] phi from play_move_down::@9 to play_collision [phi:play_move_down::@9->play_collision]
-  play_collision_from_b9:
-  //SEG604 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#0 [phi:play_move_down::@9->play_collision#0] -- register_copy 
-  //SEG605 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#0 [phi:play_move_down::@9->play_collision#1] -- register_copy 
-  //SEG606 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#0 [phi:play_move_down::@9->play_collision#2] -- register_copy 
-  //SEG607 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#98 [phi:play_move_down::@9->play_collision#3] -- register_copy 
+  //SEG603 [201] phi from play_move_down::@8 to play_collision [phi:play_move_down::@8->play_collision]
+  play_collision_from_b8:
+  //SEG604 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#0 [phi:play_move_down::@8->play_collision#0] -- register_copy 
+  //SEG605 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#0 [phi:play_move_down::@8->play_collision#1] -- register_copy 
+  //SEG606 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#0 [phi:play_move_down::@8->play_collision#2] -- register_copy 
+  //SEG607 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#98 [phi:play_move_down::@8->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG608 [267] (byte) play_collision::return#0 ← (byte) play_collision::return#15
-    jmp b18
-  //SEG609 play_move_down::@18
-  b18:
+    jmp b13
+  //SEG609 play_move_down::@13
+  b13:
   //SEG610 [268] (byte~) play_move_down::$12 ← (byte) play_collision::return#0
-  //SEG611 [269] if((byte~) play_move_down::$12==(const byte) COLLISION_NONE#0) goto play_move_down::@14 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG611 [269] if((byte~) play_move_down::$12==(const byte) COLLISION_NONE#0) goto play_move_down::@10 -- vbuaa_eq_vbuc1_then_la1 
     cmp #COLLISION_NONE
-    beq b14
-  //SEG612 [270] phi from play_move_down::@18 to play_move_down::@10 [phi:play_move_down::@18->play_move_down::@10]
-  b10_from_b18:
-    jmp b10
-  //SEG613 play_move_down::@10
-  b10:
+    beq b10
+  //SEG612 [270] phi from play_move_down::@13 to play_move_down::@9 [phi:play_move_down::@13->play_move_down::@9]
+  b9_from_b13:
+    jmp b9
+  //SEG613 play_move_down::@9
+  b9:
   //SEG614 [271] call play_lock_current 
     jsr play_lock_current
-  //SEG615 [272] phi from play_move_down::@10 to play_move_down::@19 [phi:play_move_down::@10->play_move_down::@19]
-  b19_from_b10:
-    jmp b19
-  //SEG616 play_move_down::@19
-  b19:
+  //SEG615 [272] phi from play_move_down::@9 to play_move_down::@14 [phi:play_move_down::@9->play_move_down::@14]
+  b14_from_b9:
+    jmp b14
+  //SEG616 play_move_down::@14
+  b14:
   //SEG617 [273] call play_remove_lines 
-  //SEG618 [344] phi from play_move_down::@19 to play_remove_lines [phi:play_move_down::@19->play_remove_lines]
-  play_remove_lines_from_b19:
+  //SEG618 [344] phi from play_move_down::@14 to play_remove_lines [phi:play_move_down::@14->play_remove_lines]
+  play_remove_lines_from_b14:
     jsr play_remove_lines
   //SEG619 [274] (byte) play_remove_lines::return#0 ← (byte) play_remove_lines::removed#7 -- vbuaa=vbuz1 
     lda play_remove_lines.removed
-    jmp b20
-  //SEG620 play_move_down::@20
-  b20:
+    jmp b15
+  //SEG620 play_move_down::@15
+  b15:
   //SEG621 [275] (byte) play_move_down::removed#0 ← (byte) play_remove_lines::return#0
   //SEG622 [276] (byte) play_update_score::removed#0 ← (byte) play_move_down::removed#0 -- vbuxx=vbuaa 
     tax
   //SEG623 [277] call play_update_score 
     jsr play_update_score
-  //SEG624 [278] phi from play_move_down::@20 to play_move_down::@21 [phi:play_move_down::@20->play_move_down::@21]
-  b21_from_b20:
-    jmp b21
-  //SEG625 play_move_down::@21
-  b21:
+  //SEG624 [278] phi from play_move_down::@15 to play_move_down::@16 [phi:play_move_down::@15->play_move_down::@16]
+  b16_from_b15:
+    jmp b16
+  //SEG625 play_move_down::@16
+  b16:
   //SEG626 [279] call play_spawn_current 
-  //SEG627 [285] phi from play_move_down::@21 to play_spawn_current [phi:play_move_down::@21->play_spawn_current]
-  play_spawn_current_from_b21:
-  //SEG628 [285] phi (byte) game_over#65 = (byte) game_over#10 [phi:play_move_down::@21->play_spawn_current#0] -- register_copy 
-  //SEG629 [285] phi (byte) next_piece_idx#17 = (byte) next_piece_idx#10 [phi:play_move_down::@21->play_spawn_current#1] -- register_copy 
+  //SEG627 [285] phi from play_move_down::@16 to play_spawn_current [phi:play_move_down::@16->play_spawn_current]
+  play_spawn_current_from_b16:
+  //SEG628 [285] phi (byte) game_over#65 = (byte) game_over#10 [phi:play_move_down::@16->play_spawn_current#0] -- register_copy 
+  //SEG629 [285] phi (byte) next_piece_idx#17 = (byte) next_piece_idx#10 [phi:play_move_down::@16->play_spawn_current#1] -- register_copy 
     jsr play_spawn_current
   //SEG630 [280] (byte*~) current_piece#104 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0) -- pbuz1=pptc1_derefidx_vbuz2 
     ldy play_spawn_current._0
@@ -19797,45 +19925,45 @@ play_move_down: {
     sta current_piece
     lda PIECES+1,y
     sta current_piece+1
-  //SEG631 [281] phi from play_move_down::@21 to play_move_down::@15 [phi:play_move_down::@21->play_move_down::@15]
-  b15_from_b21:
-  //SEG632 [281] phi (byte) next_piece_idx#30 = (byte) play_spawn_current::piece_idx#2 [phi:play_move_down::@21->play_move_down::@15#0] -- register_copy 
-  //SEG633 [281] phi (byte) game_over#27 = (byte) game_over#52 [phi:play_move_down::@21->play_move_down::@15#1] -- register_copy 
-  //SEG634 [281] phi (byte) current_xpos#43 = (byte) current_xpos#103 [phi:play_move_down::@21->play_move_down::@15#2] -- register_copy 
-  //SEG635 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#74 [phi:play_move_down::@21->play_move_down::@15#3] -- register_copy 
-  //SEG636 [281] phi (byte) current_orientation#37 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@21->play_move_down::@15#4] -- vbuz1=vbuc1 
+  //SEG631 [281] phi from play_move_down::@16 to play_move_down::@11 [phi:play_move_down::@16->play_move_down::@11]
+  b11_from_b16:
+  //SEG632 [281] phi (byte) next_piece_idx#30 = (byte) play_spawn_current::piece_idx#2 [phi:play_move_down::@16->play_move_down::@11#0] -- register_copy 
+  //SEG633 [281] phi (byte) game_over#27 = (byte) game_over#52 [phi:play_move_down::@16->play_move_down::@11#1] -- register_copy 
+  //SEG634 [281] phi (byte) current_xpos#43 = (byte) current_xpos#103 [phi:play_move_down::@16->play_move_down::@11#2] -- register_copy 
+  //SEG635 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#74 [phi:play_move_down::@16->play_move_down::@11#3] -- register_copy 
+  //SEG636 [281] phi (byte) current_orientation#37 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@16->play_move_down::@11#4] -- vbuz1=vbuc1 
     lda #0
     sta current_orientation
-  //SEG637 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#5 [phi:play_move_down::@21->play_move_down::@15#5] -- register_copy 
-  //SEG638 [281] phi (byte*) current_piece#28 = (byte*~) current_piece#104 [phi:play_move_down::@21->play_move_down::@15#6] -- register_copy 
-  //SEG639 [281] phi (byte) level_bcd#31 = (byte) level_bcd#19 [phi:play_move_down::@21->play_move_down::@15#7] -- register_copy 
-  //SEG640 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#23 [phi:play_move_down::@21->play_move_down::@15#8] -- register_copy 
-  //SEG641 [281] phi (byte) level#33 = (byte) level#19 [phi:play_move_down::@21->play_move_down::@15#9] -- register_copy 
-  //SEG642 [281] phi (dword) score_bcd#26 = (dword) score_bcd#16 [phi:play_move_down::@21->play_move_down::@15#10] -- register_copy 
-  //SEG643 [281] phi (word) lines_bcd#26 = (word) lines_bcd#17 [phi:play_move_down::@21->play_move_down::@15#11] -- register_copy 
-  //SEG644 [281] phi (byte) current_ypos#38 = (byte) current_ypos#6 [phi:play_move_down::@21->play_move_down::@15#12] -- register_copy 
-    jmp b15
-  //SEG645 play_move_down::@15
-  b15:
-  //SEG646 [282] phi from play_move_down::@15 to play_move_down::@return [phi:play_move_down::@15->play_move_down::@return]
-  breturn_from_b15:
-  //SEG647 [282] phi (byte) next_piece_idx#16 = (byte) next_piece_idx#30 [phi:play_move_down::@15->play_move_down::@return#0] -- register_copy 
-  //SEG648 [282] phi (byte) game_over#15 = (byte) game_over#27 [phi:play_move_down::@15->play_move_down::@return#1] -- register_copy 
-  //SEG649 [282] phi (byte) current_xpos#22 = (byte) current_xpos#43 [phi:play_move_down::@15->play_move_down::@return#2] -- register_copy 
-  //SEG650 [282] phi (byte*) current_piece_gfx#20 = (byte*) current_piece_gfx#35 [phi:play_move_down::@15->play_move_down::@return#3] -- register_copy 
-  //SEG651 [282] phi (byte) current_orientation#20 = (byte) current_orientation#37 [phi:play_move_down::@15->play_move_down::@return#4] -- register_copy 
-  //SEG652 [282] phi (byte) current_piece_char#16 = (byte) current_piece_char#29 [phi:play_move_down::@15->play_move_down::@return#5] -- register_copy 
-  //SEG653 [282] phi (byte*) current_piece#15 = (byte*) current_piece#28 [phi:play_move_down::@15->play_move_down::@return#6] -- register_copy 
-  //SEG654 [282] phi (byte) level_bcd#17 = (byte) level_bcd#31 [phi:play_move_down::@15->play_move_down::@return#7] -- register_copy 
-  //SEG655 [282] phi (byte) current_movedown_slow#21 = (byte) current_movedown_slow#37 [phi:play_move_down::@15->play_move_down::@return#8] -- register_copy 
-  //SEG656 [282] phi (byte) level#17 = (byte) level#33 [phi:play_move_down::@15->play_move_down::@return#9] -- register_copy 
-  //SEG657 [282] phi (dword) score_bcd#14 = (dword) score_bcd#26 [phi:play_move_down::@15->play_move_down::@return#10] -- register_copy 
-  //SEG658 [282] phi (word) lines_bcd#15 = (word) lines_bcd#26 [phi:play_move_down::@15->play_move_down::@return#11] -- register_copy 
-  //SEG659 [282] phi (byte) current_ypos#19 = (byte) current_ypos#38 [phi:play_move_down::@15->play_move_down::@return#12] -- register_copy 
-  //SEG660 [282] phi (byte) current_movedown_counter#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@15->play_move_down::@return#13] -- vbuz1=vbuc1 
+  //SEG637 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#5 [phi:play_move_down::@16->play_move_down::@11#5] -- register_copy 
+  //SEG638 [281] phi (byte*) current_piece#28 = (byte*~) current_piece#104 [phi:play_move_down::@16->play_move_down::@11#6] -- register_copy 
+  //SEG639 [281] phi (byte) level_bcd#31 = (byte) level_bcd#19 [phi:play_move_down::@16->play_move_down::@11#7] -- register_copy 
+  //SEG640 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#23 [phi:play_move_down::@16->play_move_down::@11#8] -- register_copy 
+  //SEG641 [281] phi (byte) level#33 = (byte) level#19 [phi:play_move_down::@16->play_move_down::@11#9] -- register_copy 
+  //SEG642 [281] phi (dword) score_bcd#26 = (dword) score_bcd#16 [phi:play_move_down::@16->play_move_down::@11#10] -- register_copy 
+  //SEG643 [281] phi (word) lines_bcd#26 = (word) lines_bcd#17 [phi:play_move_down::@16->play_move_down::@11#11] -- register_copy 
+  //SEG644 [281] phi (byte) current_ypos#38 = (byte) current_ypos#6 [phi:play_move_down::@16->play_move_down::@11#12] -- register_copy 
+    jmp b11
+  //SEG645 play_move_down::@11
+  b11:
+  //SEG646 [282] phi from play_move_down::@11 to play_move_down::@return [phi:play_move_down::@11->play_move_down::@return]
+  breturn_from_b11:
+  //SEG647 [282] phi (byte) next_piece_idx#16 = (byte) next_piece_idx#30 [phi:play_move_down::@11->play_move_down::@return#0] -- register_copy 
+  //SEG648 [282] phi (byte) game_over#15 = (byte) game_over#27 [phi:play_move_down::@11->play_move_down::@return#1] -- register_copy 
+  //SEG649 [282] phi (byte) current_xpos#22 = (byte) current_xpos#43 [phi:play_move_down::@11->play_move_down::@return#2] -- register_copy 
+  //SEG650 [282] phi (byte*) current_piece_gfx#20 = (byte*) current_piece_gfx#35 [phi:play_move_down::@11->play_move_down::@return#3] -- register_copy 
+  //SEG651 [282] phi (byte) current_orientation#20 = (byte) current_orientation#37 [phi:play_move_down::@11->play_move_down::@return#4] -- register_copy 
+  //SEG652 [282] phi (byte) current_piece_char#16 = (byte) current_piece_char#29 [phi:play_move_down::@11->play_move_down::@return#5] -- register_copy 
+  //SEG653 [282] phi (byte*) current_piece#15 = (byte*) current_piece#28 [phi:play_move_down::@11->play_move_down::@return#6] -- register_copy 
+  //SEG654 [282] phi (byte) level_bcd#17 = (byte) level_bcd#31 [phi:play_move_down::@11->play_move_down::@return#7] -- register_copy 
+  //SEG655 [282] phi (byte) current_movedown_slow#21 = (byte) current_movedown_slow#37 [phi:play_move_down::@11->play_move_down::@return#8] -- register_copy 
+  //SEG656 [282] phi (byte) level#17 = (byte) level#33 [phi:play_move_down::@11->play_move_down::@return#9] -- register_copy 
+  //SEG657 [282] phi (dword) score_bcd#14 = (dword) score_bcd#26 [phi:play_move_down::@11->play_move_down::@return#10] -- register_copy 
+  //SEG658 [282] phi (word) lines_bcd#15 = (word) lines_bcd#26 [phi:play_move_down::@11->play_move_down::@return#11] -- register_copy 
+  //SEG659 [282] phi (byte) current_ypos#19 = (byte) current_ypos#38 [phi:play_move_down::@11->play_move_down::@return#12] -- register_copy 
+  //SEG660 [282] phi (byte) current_movedown_counter#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@11->play_move_down::@return#13] -- vbuz1=vbuc1 
     lda #0
     sta current_movedown_counter
-  //SEG661 [282] phi (byte) play_move_down::return#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@15->play_move_down::@return#14] -- vbuxx=vbuc1 
+  //SEG661 [282] phi (byte) play_move_down::return#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@11->play_move_down::@return#14] -- vbuxx=vbuc1 
     ldx #1
     jmp breturn
   //SEG662 [282] phi from play_move_down::@3 to play_move_down::@return [phi:play_move_down::@3->play_move_down::@return]
@@ -19861,26 +19989,26 @@ play_move_down: {
   breturn:
   //SEG679 [283] return 
     rts
-  //SEG680 play_move_down::@14
-  b14:
+  //SEG680 play_move_down::@10
+  b10:
   //SEG681 [284] (byte) current_ypos#3 ← ++ (byte) current_ypos#11 -- vbuz1=_inc_vbuz1 
     inc current_ypos
-  //SEG682 [281] phi from play_move_down::@14 to play_move_down::@15 [phi:play_move_down::@14->play_move_down::@15]
-  b15_from_b14:
-  //SEG683 [281] phi (byte) next_piece_idx#30 = (byte) next_piece_idx#10 [phi:play_move_down::@14->play_move_down::@15#0] -- register_copy 
-  //SEG684 [281] phi (byte) game_over#27 = (byte) game_over#10 [phi:play_move_down::@14->play_move_down::@15#1] -- register_copy 
-  //SEG685 [281] phi (byte) current_xpos#43 = (byte) current_xpos#122 [phi:play_move_down::@14->play_move_down::@15#2] -- register_copy 
-  //SEG686 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#112 [phi:play_move_down::@14->play_move_down::@15#3] -- register_copy 
-  //SEG687 [281] phi (byte) current_orientation#37 = (byte) current_orientation#13 [phi:play_move_down::@14->play_move_down::@15#4] -- register_copy 
-  //SEG688 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#10 [phi:play_move_down::@14->play_move_down::@15#5] -- register_copy 
-  //SEG689 [281] phi (byte*) current_piece#28 = (byte*) current_piece#10 [phi:play_move_down::@14->play_move_down::@15#6] -- register_copy 
-  //SEG690 [281] phi (byte) level_bcd#31 = (byte) level_bcd#11 [phi:play_move_down::@14->play_move_down::@15#7] -- register_copy 
-  //SEG691 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#14 [phi:play_move_down::@14->play_move_down::@15#8] -- register_copy 
-  //SEG692 [281] phi (byte) level#33 = (byte) level#10 [phi:play_move_down::@14->play_move_down::@15#9] -- register_copy 
-  //SEG693 [281] phi (dword) score_bcd#26 = (dword) score_bcd#18 [phi:play_move_down::@14->play_move_down::@15#10] -- register_copy 
-  //SEG694 [281] phi (word) lines_bcd#26 = (word) lines_bcd#19 [phi:play_move_down::@14->play_move_down::@15#11] -- register_copy 
-  //SEG695 [281] phi (byte) current_ypos#38 = (byte) current_ypos#3 [phi:play_move_down::@14->play_move_down::@15#12] -- register_copy 
-    jmp b15
+  //SEG682 [281] phi from play_move_down::@10 to play_move_down::@11 [phi:play_move_down::@10->play_move_down::@11]
+  b11_from_b10:
+  //SEG683 [281] phi (byte) next_piece_idx#30 = (byte) next_piece_idx#10 [phi:play_move_down::@10->play_move_down::@11#0] -- register_copy 
+  //SEG684 [281] phi (byte) game_over#27 = (byte) game_over#10 [phi:play_move_down::@10->play_move_down::@11#1] -- register_copy 
+  //SEG685 [281] phi (byte) current_xpos#43 = (byte) current_xpos#122 [phi:play_move_down::@10->play_move_down::@11#2] -- register_copy 
+  //SEG686 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#112 [phi:play_move_down::@10->play_move_down::@11#3] -- register_copy 
+  //SEG687 [281] phi (byte) current_orientation#37 = (byte) current_orientation#13 [phi:play_move_down::@10->play_move_down::@11#4] -- register_copy 
+  //SEG688 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#10 [phi:play_move_down::@10->play_move_down::@11#5] -- register_copy 
+  //SEG689 [281] phi (byte*) current_piece#28 = (byte*) current_piece#10 [phi:play_move_down::@10->play_move_down::@11#6] -- register_copy 
+  //SEG690 [281] phi (byte) level_bcd#31 = (byte) level_bcd#11 [phi:play_move_down::@10->play_move_down::@11#7] -- register_copy 
+  //SEG691 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#14 [phi:play_move_down::@10->play_move_down::@11#8] -- register_copy 
+  //SEG692 [281] phi (byte) level#33 = (byte) level#10 [phi:play_move_down::@10->play_move_down::@11#9] -- register_copy 
+  //SEG693 [281] phi (dword) score_bcd#26 = (dword) score_bcd#18 [phi:play_move_down::@10->play_move_down::@11#10] -- register_copy 
+  //SEG694 [281] phi (word) lines_bcd#26 = (word) lines_bcd#19 [phi:play_move_down::@10->play_move_down::@11#11] -- register_copy 
+  //SEG695 [281] phi (byte) current_ypos#38 = (byte) current_ypos#3 [phi:play_move_down::@10->play_move_down::@11#12] -- register_copy 
+    jmp b11
 }
 //SEG696 play_spawn_current
 // Spawn a new piece
@@ -19932,16 +20060,16 @@ play_spawn_current: {
   //SEG711 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#102 [phi:play_spawn_current->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG712 [296] (byte) play_collision::return#10 ← (byte) play_collision::return#15
-    jmp b9
-  //SEG713 play_spawn_current::@9
-  b9:
+    jmp b4
+  //SEG713 play_spawn_current::@4
+  b4:
   //SEG714 [297] (byte~) play_spawn_current::$2 ← (byte) play_collision::return#10
-  //SEG715 [298] if((byte~) play_spawn_current::$2!=(const byte) COLLISION_PLAYFIELD#0) goto play_spawn_current::@11 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG715 [298] if((byte~) play_spawn_current::$2!=(const byte) COLLISION_PLAYFIELD#0) goto play_spawn_current::@6 -- vbuaa_neq_vbuc1_then_la1 
     cmp #COLLISION_PLAYFIELD
-    bne b11_from_b9
-  //SEG716 [299] phi from play_spawn_current::@9 to play_spawn_current::@1 [phi:play_spawn_current::@9->play_spawn_current::@1]
-  b1_from_b9:
-  //SEG717 [299] phi (byte) game_over#52 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_spawn_current::@9->play_spawn_current::@1#0] -- vbuz1=vbuc1 
+    bne b6_from_b4
+  //SEG716 [299] phi from play_spawn_current::@4 to play_spawn_current::@1 [phi:play_spawn_current::@4->play_spawn_current::@1]
+  b1_from_b4:
+  //SEG717 [299] phi (byte) game_over#52 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_spawn_current::@4->play_spawn_current::@1#0] -- vbuz1=vbuc1 
     lda #1
     sta game_over
     jmp b1
@@ -19972,25 +20100,25 @@ play_spawn_current: {
   //SEG727 [304] call sid_rnd 
     jsr sid_rnd
   //SEG728 [305] (byte) sid_rnd::return#2 ← (byte) sid_rnd::return#0
-    jmp b10
-  //SEG729 play_spawn_current::@10
-  b10:
+    jmp b5
+  //SEG729 play_spawn_current::@5
+  b5:
   //SEG730 [306] (byte~) play_spawn_current::$6 ← (byte) sid_rnd::return#2
   //SEG731 [307] (byte) play_spawn_current::piece_idx#1 ← (byte~) play_spawn_current::$6 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuaa_band_vbuc1 
     and #7
     sta piece_idx
-  //SEG732 [300] phi from play_spawn_current::@10 to play_spawn_current::@2 [phi:play_spawn_current::@10->play_spawn_current::@2]
-  b2_from_b10:
-  //SEG733 [300] phi (byte) play_spawn_current::piece_idx#2 = (byte) play_spawn_current::piece_idx#1 [phi:play_spawn_current::@10->play_spawn_current::@2#0] -- register_copy 
+  //SEG732 [300] phi from play_spawn_current::@5 to play_spawn_current::@2 [phi:play_spawn_current::@5->play_spawn_current::@2]
+  b2_from_b5:
+  //SEG733 [300] phi (byte) play_spawn_current::piece_idx#2 = (byte) play_spawn_current::piece_idx#1 [phi:play_spawn_current::@5->play_spawn_current::@2#0] -- register_copy 
     jmp b2
-  //SEG734 [308] phi from play_spawn_current::@9 to play_spawn_current::@11 [phi:play_spawn_current::@9->play_spawn_current::@11]
-  b11_from_b9:
-    jmp b11
-  //SEG735 play_spawn_current::@11
-  b11:
-  //SEG736 [299] phi from play_spawn_current::@11 to play_spawn_current::@1 [phi:play_spawn_current::@11->play_spawn_current::@1]
-  b1_from_b11:
-  //SEG737 [299] phi (byte) game_over#52 = (byte) game_over#65 [phi:play_spawn_current::@11->play_spawn_current::@1#0] -- register_copy 
+  //SEG734 [308] phi from play_spawn_current::@4 to play_spawn_current::@6 [phi:play_spawn_current::@4->play_spawn_current::@6]
+  b6_from_b4:
+    jmp b6
+  //SEG735 play_spawn_current::@6
+  b6:
+  //SEG736 [299] phi from play_spawn_current::@6 to play_spawn_current::@1 [phi:play_spawn_current::@6->play_spawn_current::@1]
+  b1_from_b6:
+  //SEG737 [299] phi (byte) game_over#52 = (byte) game_over#65 [phi:play_spawn_current::@6->play_spawn_current::@1#0] -- register_copy 
     jmp b1
 }
 //SEG738 sid_rnd
@@ -20014,9 +20142,9 @@ play_update_score: {
   //SEG743 [311] if((byte) play_update_score::removed#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_update_score::@return -- vbuxx_eq_0_then_la1 
     cpx #0
     beq breturn_from_play_update_score
-    jmp b2
-  //SEG744 play_update_score::@2
-  b2:
+    jmp b1
+  //SEG744 play_update_score::@1
+  b1:
   //SEG745 [312] (byte~) play_update_score::$2 ← < (word) lines_bcd#19 -- vbuaa=_lo_vwuz1 
     lda lines_bcd
   //SEG746 [313] (byte) play_update_score::lines_before#0 ← (byte~) play_update_score::$2 & (byte/word/signed word/dword/signed dword) $f0 -- vbuz1=vbuaa_band_vbuc1 
@@ -20068,23 +20196,23 @@ play_update_score: {
     and #$f0
   //SEG755 [322] if((byte) play_update_score::lines_before#0==(byte) play_update_score::lines_after#0) goto play_update_score::@return -- vbuz1_eq_vbuaa_then_la1 
     cmp lines_before
-    beq breturn_from_b2
-  //SEG756 [323] phi from play_update_score::@2 to play_update_score::@3 [phi:play_update_score::@2->play_update_score::@3]
-  b3_from_b2:
-    jmp b3
-  //SEG757 play_update_score::@3
-  b3:
+    beq breturn_from_b1
+  //SEG756 [323] phi from play_update_score::@1 to play_update_score::@2 [phi:play_update_score::@1->play_update_score::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG757 play_update_score::@2
+  b2:
   //SEG758 [324] call play_increase_level 
     jsr play_increase_level
-  //SEG759 [325] phi from play_update_score play_update_score::@2 play_update_score::@3 to play_update_score::@return [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return]
+  //SEG759 [325] phi from play_update_score play_update_score::@1 play_update_score::@2 to play_update_score::@return [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return]
   breturn_from_play_update_score:
+  breturn_from_b1:
   breturn_from_b2:
-  breturn_from_b3:
-  //SEG760 [325] phi (byte) level_bcd#19 = (byte) level_bcd#11 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#0] -- register_copy 
-  //SEG761 [325] phi (byte) current_movedown_slow#23 = (byte) current_movedown_slow#14 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#1] -- register_copy 
-  //SEG762 [325] phi (byte) level#19 = (byte) level#10 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#2] -- register_copy 
-  //SEG763 [325] phi (dword) score_bcd#16 = (dword) score_bcd#18 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#3] -- register_copy 
-  //SEG764 [325] phi (word) lines_bcd#17 = (word) lines_bcd#19 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#4] -- register_copy 
+  //SEG760 [325] phi (byte) level_bcd#19 = (byte) level_bcd#11 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#0] -- register_copy 
+  //SEG761 [325] phi (byte) current_movedown_slow#23 = (byte) current_movedown_slow#14 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#1] -- register_copy 
+  //SEG762 [325] phi (byte) level#19 = (byte) level#10 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#2] -- register_copy 
+  //SEG763 [325] phi (dword) score_bcd#16 = (dword) score_bcd#18 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#3] -- register_copy 
+  //SEG764 [325] phi (word) lines_bcd#17 = (word) lines_bcd#19 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#4] -- register_copy 
     jmp breturn
   //SEG765 play_update_score::@return
   breturn:
@@ -20096,67 +20224,67 @@ play_update_score: {
 play_increase_level: {
   //SEG768 [327] (byte) level#21 ← ++ (byte) level#10 -- vbuz1=_inc_vbuz1 
     inc level
-  //SEG769 [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@2 -- vbuz1_gt_vbuc1_then_la1 
+  //SEG769 [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@1 -- vbuz1_gt_vbuc1_then_la1 
     // Update speed of moving tetrominos down
     lda #$1d
     cmp level
-    bcc b2_from_play_increase_level
-    jmp b4
-  //SEG770 play_increase_level::@4
-  b4:
+    bcc b1_from_play_increase_level
+    jmp b3
+  //SEG770 play_increase_level::@3
+  b3:
   //SEG771 [329] (byte) current_movedown_slow#10 ← *((const byte[]) MOVEDOWN_SLOW_SPEEDS#0 + (byte) level#21) -- vbuz1=pbuc1_derefidx_vbuz2 
     ldy level
     lda MOVEDOWN_SLOW_SPEEDS,y
     sta current_movedown_slow
-  //SEG772 [330] phi from play_increase_level::@4 to play_increase_level::@2 [phi:play_increase_level::@4->play_increase_level::@2]
-  b2_from_b4:
-  //SEG773 [330] phi (byte) current_movedown_slow#69 = (byte) current_movedown_slow#10 [phi:play_increase_level::@4->play_increase_level::@2#0] -- register_copy 
-    jmp b2
-  //SEG774 [330] phi from play_increase_level to play_increase_level::@2 [phi:play_increase_level->play_increase_level::@2]
-  b2_from_play_increase_level:
-  //SEG775 [330] phi (byte) current_movedown_slow#69 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_increase_level->play_increase_level::@2#0] -- vbuz1=vbuc1 
+  //SEG772 [330] phi from play_increase_level::@3 to play_increase_level::@1 [phi:play_increase_level::@3->play_increase_level::@1]
+  b1_from_b3:
+  //SEG773 [330] phi (byte) current_movedown_slow#69 = (byte) current_movedown_slow#10 [phi:play_increase_level::@3->play_increase_level::@1#0] -- register_copy 
+    jmp b1
+  //SEG774 [330] phi from play_increase_level to play_increase_level::@1 [phi:play_increase_level->play_increase_level::@1]
+  b1_from_play_increase_level:
+  //SEG775 [330] phi (byte) current_movedown_slow#69 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_increase_level->play_increase_level::@1#0] -- vbuz1=vbuc1 
     lda #1
     sta current_movedown_slow
-    jmp b2
-  //SEG776 play_increase_level::@2
-  b2:
+    jmp b1
+  //SEG776 play_increase_level::@1
+  b1:
   //SEG777 [331] (byte) level_bcd#21 ← ++ (byte) level_bcd#11 -- vbuz1=_inc_vbuz1 
     inc level_bcd
   //SEG778 [332] (byte~) play_increase_level::$1 ← (byte) level_bcd#21 & (byte/signed byte/word/signed word/dword/signed dword) $f -- vbuaa=vbuz1_band_vbuc1 
     lda #$f
     and level_bcd
-  //SEG779 [333] if((byte~) play_increase_level::$1!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto play_increase_level::@3 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG779 [333] if((byte~) play_increase_level::$1!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto play_increase_level::@2 -- vbuaa_neq_vbuc1_then_la1 
     cmp #$a
-    bne b3_from_b2
-    jmp b6
-  //SEG780 play_increase_level::@6
-  b6:
+    bne b2_from_b1
+    jmp b4
+  //SEG780 play_increase_level::@4
+  b4:
   //SEG781 [334] (byte) level_bcd#8 ← (byte) level_bcd#21 + (byte/signed byte/word/signed word/dword/signed dword) 6 -- vbuz1=vbuz1_plus_vbuc1 
     // If level low nybble hits $a change to $10
     lax level_bcd
     axs #-[6]
     stx level_bcd
-  //SEG782 [335] phi from play_increase_level::@2 play_increase_level::@6 to play_increase_level::@3 [phi:play_increase_level::@2/play_increase_level::@6->play_increase_level::@3]
-  b3_from_b2:
-  b3_from_b6:
-  //SEG783 [335] phi (byte) level_bcd#64 = (byte) level_bcd#21 [phi:play_increase_level::@2/play_increase_level::@6->play_increase_level::@3#0] -- register_copy 
-    jmp b3
-  //SEG784 play_increase_level::@3
-  b3:
+  //SEG782 [335] phi from play_increase_level::@1 play_increase_level::@4 to play_increase_level::@2 [phi:play_increase_level::@1/play_increase_level::@4->play_increase_level::@2]
+  b2_from_b1:
+  b2_from_b4:
+  //SEG783 [335] phi (byte) level_bcd#64 = (byte) level_bcd#21 [phi:play_increase_level::@1/play_increase_level::@4->play_increase_level::@2#0] -- register_copy 
+    jmp b2
+  //SEG784 play_increase_level::@2
+  b2:
   //SEG785 asm { sed  }
     // Increase the score values gained
     sed
-  //SEG786 [337] phi from play_increase_level::@3 to play_increase_level::@7 [phi:play_increase_level::@3->play_increase_level::@7]
-  b7_from_b3:
-  //SEG787 [337] phi (byte) play_increase_level::b#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_increase_level::@3->play_increase_level::@7#0] -- vbuxx=vbuc1 
+  //SEG786 [337] phi from play_increase_level::@2 to play_increase_level::@5 [phi:play_increase_level::@2->play_increase_level::@5]
+  b5_from_b2:
+  //SEG787 [337] phi (byte) play_increase_level::b#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_increase_level::@2->play_increase_level::@5#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b7
-  //SEG788 [337] phi from play_increase_level::@7 to play_increase_level::@7 [phi:play_increase_level::@7->play_increase_level::@7]
-  b7_from_b7:
-  //SEG789 [337] phi (byte) play_increase_level::b#2 = (byte) play_increase_level::b#1 [phi:play_increase_level::@7->play_increase_level::@7#0] -- register_copy 
-    jmp b7
-  //SEG790 play_increase_level::@7
-  b7:
+    jmp b5
+  //SEG788 [337] phi from play_increase_level::@5 to play_increase_level::@5 [phi:play_increase_level::@5->play_increase_level::@5]
+  b5_from_b5:
+  //SEG789 [337] phi (byte) play_increase_level::b#2 = (byte) play_increase_level::b#1 [phi:play_increase_level::@5->play_increase_level::@5#0] -- register_copy 
+    jmp b5
+  //SEG790 play_increase_level::@5
+  b5:
   //SEG791 [338] (byte) play_increase_level::b4#0 ← (byte) play_increase_level::b#2 << (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuaa=vbuxx_rol_2 
     txa
     asl
@@ -20178,12 +20306,12 @@ play_increase_level: {
     sta score_add_bcd+3,y
   //SEG793 [340] (byte) play_increase_level::b#1 ← ++ (byte) play_increase_level::b#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG794 [341] if((byte) play_increase_level::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto play_increase_level::@7 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG794 [341] if((byte) play_increase_level::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto play_increase_level::@5 -- vbuxx_neq_vbuc1_then_la1 
     cpx #5
-    bne b7_from_b7
-    jmp b8
-  //SEG795 play_increase_level::@8
-  b8:
+    bne b5_from_b5
+    jmp b6
+  //SEG795 play_increase_level::@6
+  b6:
   //SEG796 asm { cld  }
     cld
     jmp breturn
@@ -20203,66 +20331,66 @@ play_remove_lines: {
     .label y = 4
     .label removed = 9
     .label full = $b
-  //SEG800 [345] phi from play_remove_lines to play_remove_lines::@8 [phi:play_remove_lines->play_remove_lines::@8]
-  b8_from_play_remove_lines:
-  //SEG801 [345] phi (byte) play_remove_lines::removed#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@8#0] -- vbuz1=vbuc1 
+  //SEG800 [345] phi from play_remove_lines to play_remove_lines::@3 [phi:play_remove_lines->play_remove_lines::@3]
+  b3_from_play_remove_lines:
+  //SEG801 [345] phi (byte) play_remove_lines::removed#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta removed
-  //SEG802 [345] phi (byte) play_remove_lines::y#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@8#1] -- vbuz1=vbuc1 
+  //SEG802 [345] phi (byte) play_remove_lines::y#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@3#1] -- vbuz1=vbuc1 
     lda #0
     sta y
-  //SEG803 [345] phi (byte) play_remove_lines::w#12 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@8#2] -- vbuxx=vbuc1 
+  //SEG803 [345] phi (byte) play_remove_lines::w#12 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@3#2] -- vbuxx=vbuc1 
     ldx #PLAYFIELD_LINES*PLAYFIELD_COLS-1
-  //SEG804 [345] phi (byte) play_remove_lines::r#4 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@8#3] -- vbuyy=vbuc1 
+  //SEG804 [345] phi (byte) play_remove_lines::r#4 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@3#3] -- vbuyy=vbuc1 
     ldy #PLAYFIELD_LINES*PLAYFIELD_COLS-1
-    jmp b8
+    jmp b3
   // Read all lines and rewrite them
-  //SEG805 [345] phi from play_remove_lines::@14 to play_remove_lines::@8 [phi:play_remove_lines::@14->play_remove_lines::@8]
-  b8_from_b14:
-  //SEG806 [345] phi (byte) play_remove_lines::removed#11 = (byte) play_remove_lines::removed#7 [phi:play_remove_lines::@14->play_remove_lines::@8#0] -- register_copy 
-  //SEG807 [345] phi (byte) play_remove_lines::y#8 = (byte) play_remove_lines::y#1 [phi:play_remove_lines::@14->play_remove_lines::@8#1] -- register_copy 
-  //SEG808 [345] phi (byte) play_remove_lines::w#12 = (byte) play_remove_lines::w#11 [phi:play_remove_lines::@14->play_remove_lines::@8#2] -- register_copy 
-  //SEG809 [345] phi (byte) play_remove_lines::r#4 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@14->play_remove_lines::@8#3] -- register_copy 
-    jmp b8
-  //SEG810 play_remove_lines::@8
-  b8:
-  //SEG811 [346] phi from play_remove_lines::@8 to play_remove_lines::@9 [phi:play_remove_lines::@8->play_remove_lines::@9]
-  b9_from_b8:
-  //SEG812 [346] phi (byte) play_remove_lines::full#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines::@8->play_remove_lines::@9#0] -- vbuz1=vbuc1 
+  //SEG805 [345] phi from play_remove_lines::@8 to play_remove_lines::@3 [phi:play_remove_lines::@8->play_remove_lines::@3]
+  b3_from_b8:
+  //SEG806 [345] phi (byte) play_remove_lines::removed#11 = (byte) play_remove_lines::removed#7 [phi:play_remove_lines::@8->play_remove_lines::@3#0] -- register_copy 
+  //SEG807 [345] phi (byte) play_remove_lines::y#8 = (byte) play_remove_lines::y#1 [phi:play_remove_lines::@8->play_remove_lines::@3#1] -- register_copy 
+  //SEG808 [345] phi (byte) play_remove_lines::w#12 = (byte) play_remove_lines::w#11 [phi:play_remove_lines::@8->play_remove_lines::@3#2] -- register_copy 
+  //SEG809 [345] phi (byte) play_remove_lines::r#4 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@8->play_remove_lines::@3#3] -- register_copy 
+    jmp b3
+  //SEG810 play_remove_lines::@3
+  b3:
+  //SEG811 [346] phi from play_remove_lines::@3 to play_remove_lines::@4 [phi:play_remove_lines::@3->play_remove_lines::@4]
+  b4_from_b3:
+  //SEG812 [346] phi (byte) play_remove_lines::full#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines::@3->play_remove_lines::@4#0] -- vbuz1=vbuc1 
     lda #1
     sta full
-  //SEG813 [346] phi (byte) play_remove_lines::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@8->play_remove_lines::@9#1] -- vbuz1=vbuc1 
+  //SEG813 [346] phi (byte) play_remove_lines::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@3->play_remove_lines::@4#1] -- vbuz1=vbuc1 
     lda #0
     sta x
-  //SEG814 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#12 [phi:play_remove_lines::@8->play_remove_lines::@9#2] -- register_copy 
-  //SEG815 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#4 [phi:play_remove_lines::@8->play_remove_lines::@9#3] -- register_copy 
-    jmp b9
-  //SEG816 [346] phi from play_remove_lines::@10 to play_remove_lines::@9 [phi:play_remove_lines::@10->play_remove_lines::@9]
-  b9_from_b10:
-  //SEG817 [346] phi (byte) play_remove_lines::full#4 = (byte) play_remove_lines::full#2 [phi:play_remove_lines::@10->play_remove_lines::@9#0] -- register_copy 
-  //SEG818 [346] phi (byte) play_remove_lines::x#2 = (byte) play_remove_lines::x#1 [phi:play_remove_lines::@10->play_remove_lines::@9#1] -- register_copy 
-  //SEG819 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@10->play_remove_lines::@9#2] -- register_copy 
-  //SEG820 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@10->play_remove_lines::@9#3] -- register_copy 
-    jmp b9
-  //SEG821 play_remove_lines::@9
-  b9:
+  //SEG814 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#12 [phi:play_remove_lines::@3->play_remove_lines::@4#2] -- register_copy 
+  //SEG815 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#4 [phi:play_remove_lines::@3->play_remove_lines::@4#3] -- register_copy 
+    jmp b4
+  //SEG816 [346] phi from play_remove_lines::@5 to play_remove_lines::@4 [phi:play_remove_lines::@5->play_remove_lines::@4]
+  b4_from_b5:
+  //SEG817 [346] phi (byte) play_remove_lines::full#4 = (byte) play_remove_lines::full#2 [phi:play_remove_lines::@5->play_remove_lines::@4#0] -- register_copy 
+  //SEG818 [346] phi (byte) play_remove_lines::x#2 = (byte) play_remove_lines::x#1 [phi:play_remove_lines::@5->play_remove_lines::@4#1] -- register_copy 
+  //SEG819 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@5->play_remove_lines::@4#2] -- register_copy 
+  //SEG820 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@5->play_remove_lines::@4#3] -- register_copy 
+    jmp b4
+  //SEG821 play_remove_lines::@4
+  b4:
   //SEG822 [347] (byte) play_remove_lines::c#0 ← *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::r#2) -- vbuz1=pbuc1_derefidx_vbuyy 
     lda playfield,y
     sta c
   //SEG823 [348] (byte) play_remove_lines::r#1 ← -- (byte) play_remove_lines::r#2 -- vbuyy=_dec_vbuyy 
     dey
-  //SEG824 [349] if((byte) play_remove_lines::c#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_remove_lines::@18 -- vbuz1_neq_0_then_la1 
+  //SEG824 [349] if((byte) play_remove_lines::c#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_remove_lines::@9 -- vbuz1_neq_0_then_la1 
     lda c
     cmp #0
-    bne b18_from_b9
-  //SEG825 [350] phi from play_remove_lines::@9 to play_remove_lines::@10 [phi:play_remove_lines::@9->play_remove_lines::@10]
-  b10_from_b9:
-  //SEG826 [350] phi (byte) play_remove_lines::full#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@9->play_remove_lines::@10#0] -- vbuz1=vbuc1 
+    bne b9_from_b4
+  //SEG825 [350] phi from play_remove_lines::@4 to play_remove_lines::@5 [phi:play_remove_lines::@4->play_remove_lines::@5]
+  b5_from_b4:
+  //SEG826 [350] phi (byte) play_remove_lines::full#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@4->play_remove_lines::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta full
-    jmp b10
-  //SEG827 play_remove_lines::@10
-  b10:
+    jmp b5
+  //SEG827 play_remove_lines::@5
+  b5:
   //SEG828 [351] *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::w#4) ← (byte) play_remove_lines::c#0 -- pbuc1_derefidx_vbuxx=vbuz1 
     lda c
     sta playfield,x
@@ -20270,43 +20398,43 @@ play_remove_lines: {
     dex
   //SEG830 [353] (byte) play_remove_lines::x#1 ← ++ (byte) play_remove_lines::x#2 -- vbuz1=_inc_vbuz1 
     inc x
-  //SEG831 [354] if((byte) play_remove_lines::x#1!=(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@9 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG831 [354] if((byte) play_remove_lines::x#1!=(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #PLAYFIELD_COLS-1+1
     cmp x
-    bne b9_from_b10
-    jmp b12
-  //SEG832 play_remove_lines::@12
-  b12:
-  //SEG833 [355] if((byte) play_remove_lines::full#2!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@14 -- vbuz1_neq_vbuc1_then_la1 
+    bne b4_from_b5
+    jmp b6
+  //SEG832 play_remove_lines::@6
+  b6:
+  //SEG833 [355] if((byte) play_remove_lines::full#2!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@8 -- vbuz1_neq_vbuc1_then_la1 
     lda #1
     cmp full
-    bne b14_from_b12
-    jmp b13
-  //SEG834 play_remove_lines::@13
-  b13:
+    bne b8_from_b6
+    jmp b7
+  //SEG834 play_remove_lines::@7
+  b7:
   //SEG835 [356] (byte) play_remove_lines::w#2 ← (byte) play_remove_lines::w#1 + (const byte) PLAYFIELD_COLS#0 -- vbuxx=vbuxx_plus_vbuc1 
     txa
     axs #-[PLAYFIELD_COLS]
   //SEG836 [357] (byte) play_remove_lines::removed#1 ← ++ (byte) play_remove_lines::removed#11 -- vbuz1=_inc_vbuz1 
     inc removed
-  //SEG837 [358] phi from play_remove_lines::@12 play_remove_lines::@13 to play_remove_lines::@14 [phi:play_remove_lines::@12/play_remove_lines::@13->play_remove_lines::@14]
-  b14_from_b12:
-  b14_from_b13:
-  //SEG838 [358] phi (byte) play_remove_lines::removed#7 = (byte) play_remove_lines::removed#11 [phi:play_remove_lines::@12/play_remove_lines::@13->play_remove_lines::@14#0] -- register_copy 
-  //SEG839 [358] phi (byte) play_remove_lines::w#11 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@12/play_remove_lines::@13->play_remove_lines::@14#1] -- register_copy 
-    jmp b14
-  //SEG840 play_remove_lines::@14
-  b14:
+  //SEG837 [358] phi from play_remove_lines::@6 play_remove_lines::@7 to play_remove_lines::@8 [phi:play_remove_lines::@6/play_remove_lines::@7->play_remove_lines::@8]
+  b8_from_b6:
+  b8_from_b7:
+  //SEG838 [358] phi (byte) play_remove_lines::removed#7 = (byte) play_remove_lines::removed#11 [phi:play_remove_lines::@6/play_remove_lines::@7->play_remove_lines::@8#0] -- register_copy 
+  //SEG839 [358] phi (byte) play_remove_lines::w#11 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@6/play_remove_lines::@7->play_remove_lines::@8#1] -- register_copy 
+    jmp b8
+  //SEG840 play_remove_lines::@8
+  b8:
   //SEG841 [359] (byte) play_remove_lines::y#1 ← ++ (byte) play_remove_lines::y#8 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG842 [360] if((byte) play_remove_lines::y#1!=(const byte) PLAYFIELD_LINES#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG842 [360] if((byte) play_remove_lines::y#1!=(const byte) PLAYFIELD_LINES#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #PLAYFIELD_LINES-1+1
     cmp y
-    bne b8_from_b14
-  //SEG843 [361] phi from play_remove_lines::@14 play_remove_lines::@2 to play_remove_lines::@1 [phi:play_remove_lines::@14/play_remove_lines::@2->play_remove_lines::@1]
-  b1_from_b14:
+    bne b3_from_b8
+  //SEG843 [361] phi from play_remove_lines::@2 play_remove_lines::@8 to play_remove_lines::@1 [phi:play_remove_lines::@2/play_remove_lines::@8->play_remove_lines::@1]
   b1_from_b2:
-  //SEG844 [361] phi (byte) play_remove_lines::w#6 = (byte) play_remove_lines::w#11 [phi:play_remove_lines::@14/play_remove_lines::@2->play_remove_lines::@1#0] -- register_copy 
+  b1_from_b8:
+  //SEG844 [361] phi (byte) play_remove_lines::w#6 = (byte) play_remove_lines::w#3 [phi:play_remove_lines::@2/play_remove_lines::@8->play_remove_lines::@1#0] -- register_copy 
     jmp b1
   // Write zeros in the rest of the lines
   //SEG845 play_remove_lines::@1
@@ -20327,15 +20455,15 @@ play_remove_lines: {
   //SEG851 [365] (byte) play_remove_lines::w#3 ← -- (byte) play_remove_lines::w#6 -- vbuxx=_dec_vbuxx 
     dex
     jmp b1_from_b2
-  //SEG852 [366] phi from play_remove_lines::@9 to play_remove_lines::@18 [phi:play_remove_lines::@9->play_remove_lines::@18]
-  b18_from_b9:
-    jmp b18
-  //SEG853 play_remove_lines::@18
-  b18:
-  //SEG854 [350] phi from play_remove_lines::@18 to play_remove_lines::@10 [phi:play_remove_lines::@18->play_remove_lines::@10]
-  b10_from_b18:
-  //SEG855 [350] phi (byte) play_remove_lines::full#2 = (byte) play_remove_lines::full#4 [phi:play_remove_lines::@18->play_remove_lines::@10#0] -- register_copy 
-    jmp b10
+  //SEG852 [366] phi from play_remove_lines::@4 to play_remove_lines::@9 [phi:play_remove_lines::@4->play_remove_lines::@9]
+  b9_from_b4:
+    jmp b9
+  //SEG853 play_remove_lines::@9
+  b9:
+  //SEG854 [350] phi from play_remove_lines::@9 to play_remove_lines::@5 [phi:play_remove_lines::@9->play_remove_lines::@5]
+  b5_from_b9:
+  //SEG855 [350] phi (byte) play_remove_lines::full#2 = (byte) play_remove_lines::full#4 [phi:play_remove_lines::@9->play_remove_lines::@5#0] -- register_copy 
+    jmp b5
 }
 //SEG856 play_lock_current
 // Lock the current piece onto the playfield
@@ -20404,9 +20532,9 @@ play_lock_current: {
     inc col
   //SEG876 [376] (byte) play_lock_current::c#1 ← ++ (byte) play_lock_current::c#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG877 [377] if((byte) play_lock_current::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG877 [377] if((byte) play_lock_current::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@7 -- vbuxx_neq_vbuc1_then_la1 
     cpx #4
-    bne b8
+    bne b7
     jmp b5
   //SEG878 play_lock_current::@5
   b5:
@@ -20417,36 +20545,36 @@ play_lock_current: {
     sta ypos2
   //SEG880 [379] (byte) play_lock_current::l#1 ← ++ (byte) play_lock_current::l#6 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG881 [380] if((byte) play_lock_current::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG881 [380] if((byte) play_lock_current::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp l
-    bne b7
+    bne b6
     jmp breturn
   //SEG882 play_lock_current::@return
   breturn:
   //SEG883 [381] return 
     rts
-  //SEG884 play_lock_current::@7
-  b7:
+  //SEG884 play_lock_current::@6
+  b6:
   //SEG885 [382] (byte~) play_lock_current::i#7 ← (byte) play_lock_current::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_7
-  //SEG886 [368] phi from play_lock_current::@7 to play_lock_current::@1 [phi:play_lock_current::@7->play_lock_current::@1]
-  b1_from_b7:
-  //SEG887 [368] phi (byte) play_lock_current::l#6 = (byte) play_lock_current::l#1 [phi:play_lock_current::@7->play_lock_current::@1#0] -- register_copy 
-  //SEG888 [368] phi (byte) play_lock_current::i#3 = (byte~) play_lock_current::i#7 [phi:play_lock_current::@7->play_lock_current::@1#1] -- register_copy 
-  //SEG889 [368] phi (byte) play_lock_current::ypos2#2 = (byte) play_lock_current::ypos2#1 [phi:play_lock_current::@7->play_lock_current::@1#2] -- register_copy 
+  //SEG886 [368] phi from play_lock_current::@6 to play_lock_current::@1 [phi:play_lock_current::@6->play_lock_current::@1]
+  b1_from_b6:
+  //SEG887 [368] phi (byte) play_lock_current::l#6 = (byte) play_lock_current::l#1 [phi:play_lock_current::@6->play_lock_current::@1#0] -- register_copy 
+  //SEG888 [368] phi (byte) play_lock_current::i#3 = (byte~) play_lock_current::i#7 [phi:play_lock_current::@6->play_lock_current::@1#1] -- register_copy 
+  //SEG889 [368] phi (byte) play_lock_current::ypos2#2 = (byte) play_lock_current::ypos2#1 [phi:play_lock_current::@6->play_lock_current::@1#2] -- register_copy 
     jmp b1
-  //SEG890 play_lock_current::@8
-  b8:
+  //SEG890 play_lock_current::@7
+  b7:
   //SEG891 [383] (byte~) play_lock_current::i#9 ← (byte) play_lock_current::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_9
-  //SEG892 [371] phi from play_lock_current::@8 to play_lock_current::@2 [phi:play_lock_current::@8->play_lock_current::@2]
-  b2_from_b8:
-  //SEG893 [371] phi (byte) play_lock_current::c#2 = (byte) play_lock_current::c#1 [phi:play_lock_current::@8->play_lock_current::@2#0] -- register_copy 
-  //SEG894 [371] phi (byte) play_lock_current::col#2 = (byte) play_lock_current::col#1 [phi:play_lock_current::@8->play_lock_current::@2#1] -- register_copy 
-  //SEG895 [371] phi (byte) play_lock_current::i#2 = (byte~) play_lock_current::i#9 [phi:play_lock_current::@8->play_lock_current::@2#2] -- register_copy 
+  //SEG892 [371] phi from play_lock_current::@7 to play_lock_current::@2 [phi:play_lock_current::@7->play_lock_current::@2]
+  b2_from_b7:
+  //SEG893 [371] phi (byte) play_lock_current::c#2 = (byte) play_lock_current::c#1 [phi:play_lock_current::@7->play_lock_current::@2#0] -- register_copy 
+  //SEG894 [371] phi (byte) play_lock_current::col#2 = (byte) play_lock_current::col#1 [phi:play_lock_current::@7->play_lock_current::@2#1] -- register_copy 
+  //SEG895 [371] phi (byte) play_lock_current::i#2 = (byte~) play_lock_current::i#9 [phi:play_lock_current::@7->play_lock_current::@2#2] -- register_copy 
     jmp b2
 }
 //SEG896 keyboard_event_pressed
@@ -20487,18 +20615,18 @@ keyboard_event_get: {
     lda keyboard_events_size
     cmp #0
     beq breturn_from_keyboard_event_get
-    jmp b3
-  //SEG905 keyboard_event_get::@3
-  b3:
+    jmp b1
+  //SEG905 keyboard_event_get::@1
+  b1:
   //SEG906 [391] (byte) keyboard_events_size#4 ← -- (byte) keyboard_events_size#13 -- vbuz1=_dec_vbuz1 
     dec keyboard_events_size
   //SEG907 [392] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4) -- vbuxx=pbuc1_derefidx_vbuz1 
     ldy keyboard_events_size
     ldx keyboard_events,y
-  //SEG908 [393] phi from keyboard_event_get::@3 to keyboard_event_get::@return [phi:keyboard_event_get::@3->keyboard_event_get::@return]
-  breturn_from_b3:
-  //SEG909 [393] phi (byte) keyboard_events_size#16 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@3->keyboard_event_get::@return#0] -- register_copy 
-  //SEG910 [393] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@3->keyboard_event_get::@return#1] -- register_copy 
+  //SEG908 [393] phi from keyboard_event_get::@1 to keyboard_event_get::@return [phi:keyboard_event_get::@1->keyboard_event_get::@return]
+  breturn_from_b1:
+  //SEG909 [393] phi (byte) keyboard_events_size#16 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@1->keyboard_event_get::@return#0] -- register_copy 
+  //SEG910 [393] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@1->keyboard_event_get::@return#1] -- register_copy 
     jmp breturn
   //SEG911 [393] phi from keyboard_event_get to keyboard_event_get::@return [phi:keyboard_event_get->keyboard_event_get::@return]
   breturn_from_keyboard_event_get:
@@ -20520,93 +20648,93 @@ keyboard_event_scan: {
     .label row_scan = $b
     .label keycode = $a
     .label row = 9
-  //SEG917 [396] phi from keyboard_event_scan to keyboard_event_scan::@8 [phi:keyboard_event_scan->keyboard_event_scan::@8]
-  b8_from_keyboard_event_scan:
-  //SEG918 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#19 [phi:keyboard_event_scan->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG919 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#1] -- vbuz1=vbuc1 
+  //SEG917 [396] phi from keyboard_event_scan to keyboard_event_scan::@7 [phi:keyboard_event_scan->keyboard_event_scan::@7]
+  b7_from_keyboard_event_scan:
+  //SEG918 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#19 [phi:keyboard_event_scan->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG919 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#1] -- vbuz1=vbuc1 
     lda #0
     sta keycode
-  //SEG920 [396] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#2] -- vbuz1=vbuc1 
+  //SEG920 [396] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#2] -- vbuz1=vbuc1 
     lda #0
     sta row
-    jmp b8
-  //SEG921 [396] phi from keyboard_event_scan::@10 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8]
-  b8_from_b10:
-  //SEG922 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#13 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG923 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#1] -- register_copy 
-  //SEG924 [396] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#2] -- register_copy 
-    jmp b8
-  //SEG925 keyboard_event_scan::@8
-  b8:
+    jmp b7
+  //SEG921 [396] phi from keyboard_event_scan::@8 to keyboard_event_scan::@7 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7]
+  b7_from_b8:
+  //SEG922 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#13 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG923 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#1] -- register_copy 
+  //SEG924 [396] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#2] -- register_copy 
+    jmp b7
+  //SEG925 keyboard_event_scan::@7
+  b7:
   //SEG926 [397] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_event_scan::row#2 -- vbuxx=vbuz1 
     ldx row
   //SEG927 [398] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG928 [399] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-    jmp b25
-  //SEG929 keyboard_event_scan::@25
-  b25:
+    jmp b19
+  //SEG929 keyboard_event_scan::@19
+  b19:
   //SEG930 [400] (byte) keyboard_event_scan::row_scan#0 ← (byte) keyboard_matrix_read::return#2 -- vbuz1=vbuaa 
     sta row_scan
-  //SEG931 [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
+  //SEG931 [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
     lda row_scan
     ldy row
     cmp keyboard_scan_values,y
-    bne b11_from_b25
-    jmp b21
-  //SEG932 keyboard_event_scan::@21
-  b21:
+    bne b9_from_b19
+    jmp b16
+  //SEG932 keyboard_event_scan::@16
+  b16:
   //SEG933 [402] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
     axs #-[8]
     stx keycode
-  //SEG934 [403] phi from keyboard_event_scan::@20 keyboard_event_scan::@21 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10]
-  b10_from_b20:
-  b10_from_b21:
-  //SEG935 [403] phi (byte) keyboard_events_size#13 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#0] -- register_copy 
-  //SEG936 [403] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#1] -- register_copy 
-    jmp b10
-  //SEG937 keyboard_event_scan::@10
-  b10:
+  //SEG934 [403] phi from keyboard_event_scan::@15 keyboard_event_scan::@16 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8]
+  b8_from_b15:
+  b8_from_b16:
+  //SEG935 [403] phi (byte) keyboard_events_size#13 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#0] -- register_copy 
+  //SEG936 [403] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#1] -- register_copy 
+    jmp b8
+  //SEG937 keyboard_event_scan::@8
+  b8:
   //SEG938 [404] (byte) keyboard_event_scan::row#1 ← ++ (byte) keyboard_event_scan::row#2 -- vbuz1=_inc_vbuz1 
     inc row
-  //SEG939 [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG939 [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp row
-    bne b8_from_b10
-  //SEG940 [406] phi from keyboard_event_scan::@10 to keyboard_event_scan::@23 [phi:keyboard_event_scan::@10->keyboard_event_scan::@23]
-  b23_from_b10:
-    jmp b23
-  //SEG941 keyboard_event_scan::@23
-  b23:
+    bne b7_from_b8
+  //SEG940 [406] phi from keyboard_event_scan::@8 to keyboard_event_scan::@17 [phi:keyboard_event_scan::@8->keyboard_event_scan::@17]
+  b17_from_b8:
+    jmp b17
+  //SEG941 keyboard_event_scan::@17
+  b17:
   //SEG942 [407] call keyboard_event_pressed 
-  //SEG943 [384] phi from keyboard_event_scan::@23 to keyboard_event_pressed [phi:keyboard_event_scan::@23->keyboard_event_pressed]
-  keyboard_event_pressed_from_b23:
-  //SEG944 [384] phi (byte) keyboard_event_pressed::keycode#5 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@23->keyboard_event_pressed#0] -- vbuz1=vbuc1 
+  //SEG943 [384] phi from keyboard_event_scan::@17 to keyboard_event_pressed [phi:keyboard_event_scan::@17->keyboard_event_pressed]
+  keyboard_event_pressed_from_b17:
+  //SEG944 [384] phi (byte) keyboard_event_pressed::keycode#5 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@17->keyboard_event_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_LSHIFT
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG945 [408] (byte) keyboard_event_pressed::return#0 ← (byte) keyboard_event_pressed::return#11
-    jmp b26
-  //SEG946 keyboard_event_scan::@26
-  b26:
+    jmp b20
+  //SEG946 keyboard_event_scan::@20
+  b20:
   //SEG947 [409] (byte~) keyboard_event_scan::$0 ← (byte) keyboard_event_pressed::return#0
   //SEG948 [410] if((byte~) keyboard_event_scan::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b1_from_b26
-  //SEG949 [411] phi from keyboard_event_scan::@26 to keyboard_event_scan::@24 [phi:keyboard_event_scan::@26->keyboard_event_scan::@24]
-  b24_from_b26:
-    jmp b24
-  //SEG950 keyboard_event_scan::@24
-  b24:
-  //SEG951 [412] phi from keyboard_event_scan::@24 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1]
-  b1_from_b24:
-  //SEG952 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
+    beq b1_from_b20
+  //SEG949 [411] phi from keyboard_event_scan::@20 to keyboard_event_scan::@18 [phi:keyboard_event_scan::@20->keyboard_event_scan::@18]
+  b18_from_b20:
+    jmp b18
+  //SEG950 keyboard_event_scan::@18
+  b18:
+  //SEG951 [412] phi from keyboard_event_scan::@18 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1]
+  b1_from_b18:
+  //SEG952 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
     ldx #0|KEY_MODIFIER_LSHIFT
     jmp b1
-  //SEG953 [412] phi from keyboard_event_scan::@26 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1]
-  b1_from_b26:
-  //SEG954 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
+  //SEG953 [412] phi from keyboard_event_scan::@20 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1]
+  b1_from_b20:
+  //SEG954 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
   //SEG955 keyboard_event_scan::@1
@@ -20619,24 +20747,24 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG959 [414] (byte) keyboard_event_pressed::return#1 ← (byte) keyboard_event_pressed::return#11
-    jmp b27
-  //SEG960 keyboard_event_scan::@27
-  b27:
+    jmp b21
+  //SEG960 keyboard_event_scan::@21
+  b21:
   //SEG961 [415] (byte~) keyboard_event_scan::$3 ← (byte) keyboard_event_pressed::return#1
   //SEG962 [416] if((byte~) keyboard_event_scan::$3==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b2_from_b27
-    jmp b5
-  //SEG963 keyboard_event_scan::@5
-  b5:
+    beq b2_from_b21
+    jmp b4
+  //SEG963 keyboard_event_scan::@4
+  b4:
   //SEG964 [417] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#11 | (const byte) KEY_MODIFIER_RSHIFT#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_RSHIFT
     tax
-  //SEG965 [418] phi from keyboard_event_scan::@27 keyboard_event_scan::@5 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2]
-  b2_from_b27:
-  b2_from_b5:
-  //SEG966 [418] phi (byte) keyboard_modifiers#12 = (byte) keyboard_modifiers#11 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2#0] -- register_copy 
+  //SEG965 [418] phi from keyboard_event_scan::@21 keyboard_event_scan::@4 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2]
+  b2_from_b21:
+  b2_from_b4:
+  //SEG966 [418] phi (byte) keyboard_modifiers#12 = (byte) keyboard_modifiers#11 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2#0] -- register_copy 
     jmp b2
   //SEG967 keyboard_event_scan::@2
   b2:
@@ -20648,24 +20776,24 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG971 [420] (byte) keyboard_event_pressed::return#2 ← (byte) keyboard_event_pressed::return#11
-    jmp b28
-  //SEG972 keyboard_event_scan::@28
-  b28:
+    jmp b22
+  //SEG972 keyboard_event_scan::@22
+  b22:
   //SEG973 [421] (byte~) keyboard_event_scan::$6 ← (byte) keyboard_event_pressed::return#2
   //SEG974 [422] if((byte~) keyboard_event_scan::$6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@3 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b3_from_b28
-    jmp b6
-  //SEG975 keyboard_event_scan::@6
-  b6:
+    beq b3_from_b22
+    jmp b5
+  //SEG975 keyboard_event_scan::@5
+  b5:
   //SEG976 [423] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#12 | (const byte) KEY_MODIFIER_CTRL#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_CTRL
     tax
-  //SEG977 [424] phi from keyboard_event_scan::@28 keyboard_event_scan::@6 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3]
-  b3_from_b28:
-  b3_from_b6:
-  //SEG978 [424] phi (byte) keyboard_modifiers#13 = (byte) keyboard_modifiers#12 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3#0] -- register_copy 
+  //SEG977 [424] phi from keyboard_event_scan::@22 keyboard_event_scan::@5 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3]
+  b3_from_b22:
+  b3_from_b5:
+  //SEG978 [424] phi (byte) keyboard_modifiers#13 = (byte) keyboard_modifiers#12 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3#0] -- register_copy 
     jmp b3
   //SEG979 keyboard_event_scan::@3
   b3:
@@ -20677,16 +20805,16 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG983 [426] (byte) keyboard_event_pressed::return#10 ← (byte) keyboard_event_pressed::return#11
-    jmp b29
-  //SEG984 keyboard_event_scan::@29
-  b29:
+    jmp b23
+  //SEG984 keyboard_event_scan::@23
+  b23:
   //SEG985 [427] (byte~) keyboard_event_scan::$9 ← (byte) keyboard_event_pressed::return#10
   //SEG986 [428] if((byte~) keyboard_event_scan::$9==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@return -- vbuaa_eq_0_then_la1 
     cmp #0
     beq breturn
-    jmp b7
-  //SEG987 keyboard_event_scan::@7
-  b7:
+    jmp b6
+  //SEG987 keyboard_event_scan::@6
+  b6:
   //SEG988 [429] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#13 | (const byte) KEY_MODIFIER_COMMODORE#0 -- vbuaa=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_COMMODORE
@@ -20696,49 +20824,49 @@ keyboard_event_scan: {
   //SEG990 [430] return 
     rts
   // Something has changed on the keyboard row - check each column
-  //SEG991 [431] phi from keyboard_event_scan::@12 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11]
-  b11_from_b12:
-  //SEG992 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG993 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG994 [431] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#2] -- register_copy 
-    jmp b11
-  //SEG995 [431] phi from keyboard_event_scan::@25 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11]
-  b11_from_b25:
-  //SEG996 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#30 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG997 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG998 [431] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#2] -- vbuxx=vbuc1 
+  //SEG991 [431] phi from keyboard_event_scan::@10 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9]
+  b9_from_b10:
+  //SEG992 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG993 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG994 [431] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#2] -- register_copy 
+    jmp b9
+  //SEG995 [431] phi from keyboard_event_scan::@19 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9]
+  b9_from_b19:
+  //SEG996 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#30 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG997 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG998 [431] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#2] -- vbuxx=vbuc1 
     ldx #0
-    jmp b11
-  //SEG999 keyboard_event_scan::@11
-  b11:
+    jmp b9
+  //SEG999 keyboard_event_scan::@9
+  b9:
   //SEG1000 [432] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) -- vbuaa=vbuz1_bxor_pbuc1_derefidx_vbuz2 
     lda row_scan
     ldy row
     eor keyboard_scan_values,y
   //SEG1001 [433] (byte~) keyboard_event_scan::$16 ← (byte~) keyboard_event_scan::$15 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuxx 
     and keyboard_matrix_col_bitmask,x
-  //SEG1002 [434] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@12 -- vbuaa_eq_0_then_la1 
+  //SEG1002 [434] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@10 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b12_from_b11
-    jmp b16
-  //SEG1003 keyboard_event_scan::@16
-  b16:
-  //SEG1004 [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12 -- vbuz1_eq_vbuc1_then_la1 
+    beq b10_from_b9
+    jmp b12
+  //SEG1003 keyboard_event_scan::@12
+  b12:
+  //SEG1004 [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10 -- vbuz1_eq_vbuc1_then_la1 
     lda #8
     cmp keyboard_events_size
-    beq b12_from_b16
-    jmp b17
-  //SEG1005 keyboard_event_scan::@17
-  b17:
+    beq b10_from_b12
+    jmp b13
+  //SEG1005 keyboard_event_scan::@13
+  b13:
   //SEG1006 [436] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) -- vbuaa=vbuz1_band_pbuc1_derefidx_vbuxx 
     lda keyboard_matrix_col_bitmask,x
     and row_scan
-  //SEG1007 [437] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@14 -- vbuaa_eq_0_then_la1 
+  //SEG1007 [437] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@11 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b14
-    jmp b18
-  //SEG1008 keyboard_event_scan::@18
-  b18:
+    beq b11
+    jmp b14
+  //SEG1008 keyboard_event_scan::@14
+  b14:
   //SEG1009 [438] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#10) ← (byte) keyboard_event_scan::keycode#10 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Key pressed
     lda keycode
@@ -20746,33 +20874,33 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG1010 [439] (byte) keyboard_events_size#2 ← ++ (byte) keyboard_events_size#10 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-  //SEG1011 [440] phi from keyboard_event_scan::@11 keyboard_event_scan::@14 keyboard_event_scan::@16 keyboard_event_scan::@18 to keyboard_event_scan::@12 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12]
-  b12_from_b11:
-  b12_from_b14:
-  b12_from_b16:
-  b12_from_b18:
-  //SEG1012 [440] phi (byte) keyboard_events_size#29 = (byte) keyboard_events_size#10 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12#0] -- register_copy 
-    jmp b12
-  //SEG1013 keyboard_event_scan::@12
-  b12:
+  //SEG1011 [440] phi from keyboard_event_scan::@11 keyboard_event_scan::@12 keyboard_event_scan::@14 keyboard_event_scan::@9 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10]
+  b10_from_b11:
+  b10_from_b12:
+  b10_from_b14:
+  b10_from_b9:
+  //SEG1012 [440] phi (byte) keyboard_events_size#29 = (byte) keyboard_events_size#1 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10#0] -- register_copy 
+    jmp b10
+  //SEG1013 keyboard_event_scan::@10
+  b10:
   //SEG1014 [441] (byte) keyboard_event_scan::keycode#15 ← ++ (byte) keyboard_event_scan::keycode#10 -- vbuz1=_inc_vbuz1 
     inc keycode
   //SEG1015 [442] (byte) keyboard_event_scan::col#1 ← ++ (byte) keyboard_event_scan::col#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1016 [443] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG1016 [443] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@9 -- vbuxx_neq_vbuc1_then_la1 
     cpx #8
-    bne b11_from_b12
-    jmp b20
-  //SEG1017 keyboard_event_scan::@20
-  b20:
+    bne b9_from_b10
+    jmp b15
+  //SEG1017 keyboard_event_scan::@15
+  b15:
   //SEG1018 [444] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Store the current keyboard status for the row to debounce
     lda row_scan
     ldy row
     sta keyboard_scan_values,y
-    jmp b10_from_b20
-  //SEG1019 keyboard_event_scan::@14
-  b14:
+    jmp b8_from_b15
+  //SEG1019 keyboard_event_scan::@11
+  b11:
   //SEG1020 [445] (byte/word/dword~) keyboard_event_scan::$23 ← (byte) keyboard_event_scan::keycode#10 | (byte/signed byte/word/signed word/dword/signed dword) $40 -- vbuaa=vbuz1_bor_vbuc1 
     lda #$40
     ora keycode
@@ -20782,7 +20910,7 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG1022 [447] (byte) keyboard_events_size#1 ← ++ (byte) keyboard_events_size#10 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-    jmp b12_from_b14
+    jmp b10_from_b11
 }
 //SEG1023 keyboard_matrix_read
 // Read a single row of the keyboard matrix
@@ -20818,13 +20946,13 @@ render_show: {
     jmp toD0182
   //SEG1031 render_show::toD0182
   toD0182:
-  //SEG1032 [453] phi from render_show::toD0182 to render_show::@2 [phi:render_show::toD0182->render_show::@2]
-  b2_from_toD0182:
-  //SEG1033 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0182_return#0 [phi:render_show::toD0182->render_show::@2#0] -- vbuaa=vbuc1 
+  //SEG1032 [453] phi from render_show::toD0182 to render_show::@1 [phi:render_show::toD0182->render_show::@1]
+  b1_from_toD0182:
+  //SEG1033 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0182_return#0 [phi:render_show::toD0182->render_show::@1#0] -- vbuaa=vbuc1 
     lda #toD0182_return
-    jmp b2
-  //SEG1034 render_show::@2
-  b2:
+    jmp b1
+  //SEG1034 render_show::@1
+  b1:
   //SEG1035 [454] *((const byte*) D018#0) ← (byte) render_show::d018val#3 -- _deref_pbuc1=vbuaa 
     sta D018
   //SEG1036 [455] *((const byte*) BGCOL2#0) ← *((const byte[]) PIECES_COLORS_1#0 + (byte) level#10) -- _deref_pbuc1=pbuc2_derefidx_vbuz1 
@@ -20848,11 +20976,11 @@ render_show: {
     jmp toD0181
   //SEG1042 render_show::toD0181
   toD0181:
-  //SEG1043 [453] phi from render_show::toD0181 to render_show::@2 [phi:render_show::toD0181->render_show::@2]
-  b2_from_toD0181:
-  //SEG1044 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0181_return#0 [phi:render_show::toD0181->render_show::@2#0] -- vbuaa=vbuc1 
+  //SEG1043 [453] phi from render_show::toD0181 to render_show::@1 [phi:render_show::toD0181->render_show::@1]
+  b1_from_toD0181:
+  //SEG1044 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0181_return#0 [phi:render_show::toD0181->render_show::@1#0] -- vbuaa=vbuc1 
     lda #toD0181_return
-    jmp b2
+    jmp b1
 }
 //SEG1045 play_init
 // Initialize play data tables
@@ -21083,9 +21211,9 @@ render_init: {
   //SEG1116 [504] *((const byte*) CIA2_PORT_A#0) ← (const byte) render_init::vicSelectGfxBank1_toDd001_return#0 -- _deref_pbuc1=vbuc2 
     lda #vicSelectGfxBank1_toDd001_return
     sta CIA2_PORT_A
-    jmp b3
-  //SEG1117 render_init::@3
-  b3:
+    jmp b2
+  //SEG1117 render_init::@2
+  b2:
   //SEG1118 [505] *((const byte*) D011#0) ← (const byte) VIC_ECM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 -- _deref_pbuc1=vbuc2 
     // Enable Extended Background Color Mode
     lda #VIC_ECM|VIC_DEN|VIC_RSEL|3
@@ -21106,41 +21234,41 @@ render_init: {
     lda #GREY
     sta BGCOL4
   //SEG1124 [511] call render_screen_original 
-  //SEG1125 [524] phi from render_init::@3 to render_screen_original [phi:render_init::@3->render_screen_original]
-  render_screen_original_from_b3:
-  //SEG1126 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_init::@3->render_screen_original#0] -- pbuz1=pbuc1 
+  //SEG1125 [524] phi from render_init::@2 to render_screen_original [phi:render_init::@2->render_screen_original]
+  render_screen_original_from_b2:
+  //SEG1126 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_init::@2->render_screen_original#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1
     sta render_screen_original.screen
     lda #>PLAYFIELD_SCREEN_1
     sta render_screen_original.screen+1
     jsr render_screen_original
-  //SEG1127 [512] phi from render_init::@3 to render_init::@4 [phi:render_init::@3->render_init::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG1128 render_init::@4
-  b4:
+  //SEG1127 [512] phi from render_init::@2 to render_init::@3 [phi:render_init::@2->render_init::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG1128 render_init::@3
+  b3:
   //SEG1129 [513] call render_screen_original 
-  //SEG1130 [524] phi from render_init::@4 to render_screen_original [phi:render_init::@4->render_screen_original]
-  render_screen_original_from_b4:
-  //SEG1131 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_init::@4->render_screen_original#0] -- pbuz1=pbuc1 
+  //SEG1130 [524] phi from render_init::@3 to render_screen_original [phi:render_init::@3->render_screen_original]
+  render_screen_original_from_b3:
+  //SEG1131 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_init::@3->render_screen_original#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2
     sta render_screen_original.screen
     lda #>PLAYFIELD_SCREEN_2
     sta render_screen_original.screen+1
     jsr render_screen_original
-  //SEG1132 [514] phi from render_init::@4 to render_init::@1 [phi:render_init::@4->render_init::@1]
-  b1_from_b4:
-  //SEG1133 [514] phi (byte*) render_init::li_2#2 = (const byte*) PLAYFIELD_SCREEN_2#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@4->render_init::@1#0] -- pbuz1=pbuc1 
+  //SEG1132 [514] phi from render_init::@3 to render_init::@1 [phi:render_init::@3->render_init::@1]
+  b1_from_b3:
+  //SEG1133 [514] phi (byte*) render_init::li_2#2 = (const byte*) PLAYFIELD_SCREEN_2#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@3->render_init::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2+2*$28+$10
     sta li_2
     lda #>PLAYFIELD_SCREEN_2+2*$28+$10
     sta li_2+1
-  //SEG1134 [514] phi (byte*) render_init::li_1#2 = (const byte*) PLAYFIELD_SCREEN_1#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@4->render_init::@1#1] -- pbuz1=pbuc1 
+  //SEG1134 [514] phi (byte*) render_init::li_1#2 = (const byte*) PLAYFIELD_SCREEN_1#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@3->render_init::@1#1] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1+2*$28+$10
     sta li_1
     lda #>PLAYFIELD_SCREEN_1+2*$28+$10
     sta li_1+1
-  //SEG1135 [514] phi (byte) render_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_init::@4->render_init::@1#2] -- vbuxx=vbuc1 
+  //SEG1135 [514] phi (byte) render_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_init::@3->render_init::@1#2] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
   //SEG1136 [514] phi from render_init::@1 to render_init::@1 [phi:render_init::@1->render_init::@1]
@@ -21229,13 +21357,13 @@ render_screen_original: {
     sta cols+1
   //SEG1157 [525] phi (byte*) render_screen_original::screen#8 = (byte*) render_screen_original::screen#9 [phi:render_screen_original->render_screen_original::@1#4] -- register_copy 
     jmp b1
-  //SEG1158 [525] phi from render_screen_original::@7 to render_screen_original::@1 [phi:render_screen_original::@7->render_screen_original::@1]
-  b1_from_b7:
-  //SEG1159 [525] phi (byte) render_screen_original::y#6 = (byte) render_screen_original::y#1 [phi:render_screen_original::@7->render_screen_original::@1#0] -- register_copy 
-  //SEG1160 [525] phi (byte*) render_screen_original::ocols#4 = (byte*) render_screen_original::ocols#1 [phi:render_screen_original::@7->render_screen_original::@1#1] -- register_copy 
-  //SEG1161 [525] phi (byte*) render_screen_original::oscr#4 = (byte*) render_screen_original::oscr#1 [phi:render_screen_original::@7->render_screen_original::@1#2] -- register_copy 
-  //SEG1162 [525] phi (byte*) render_screen_original::cols#7 = (byte*) render_screen_original::cols#3 [phi:render_screen_original::@7->render_screen_original::@1#3] -- register_copy 
-  //SEG1163 [525] phi (byte*) render_screen_original::screen#8 = (byte*) render_screen_original::screen#10 [phi:render_screen_original::@7->render_screen_original::@1#4] -- register_copy 
+  //SEG1158 [525] phi from render_screen_original::@5 to render_screen_original::@1 [phi:render_screen_original::@5->render_screen_original::@1]
+  b1_from_b5:
+  //SEG1159 [525] phi (byte) render_screen_original::y#6 = (byte) render_screen_original::y#1 [phi:render_screen_original::@5->render_screen_original::@1#0] -- register_copy 
+  //SEG1160 [525] phi (byte*) render_screen_original::ocols#4 = (byte*) render_screen_original::ocols#1 [phi:render_screen_original::@5->render_screen_original::@1#1] -- register_copy 
+  //SEG1161 [525] phi (byte*) render_screen_original::oscr#4 = (byte*) render_screen_original::oscr#1 [phi:render_screen_original::@5->render_screen_original::@1#2] -- register_copy 
+  //SEG1162 [525] phi (byte*) render_screen_original::cols#7 = (byte*) render_screen_original::cols#3 [phi:render_screen_original::@5->render_screen_original::@1#3] -- register_copy 
+  //SEG1163 [525] phi (byte*) render_screen_original::screen#8 = (byte*) render_screen_original::screen#10 [phi:render_screen_original::@5->render_screen_original::@1#4] -- register_copy 
     jmp b1
   //SEG1164 render_screen_original::@1
   b1:
@@ -21277,17 +21405,17 @@ render_screen_original: {
   //SEG1179 [532] if((byte) render_screen_original::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_screen_original::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #4
     bne b2_from_b2
-  //SEG1180 [533] phi from render_screen_original::@2 render_screen_original::@4 to render_screen_original::@4 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4]
-  b4_from_b2:
-  b4_from_b4:
-  //SEG1181 [533] phi (byte) render_screen_original::x#5 = (byte) render_screen_original::x#1 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#0] -- register_copy 
-  //SEG1182 [533] phi (byte*) render_screen_original::cols#5 = (byte*) render_screen_original::cols#1 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#1] -- register_copy 
-  //SEG1183 [533] phi (byte*) render_screen_original::ocols#2 = (byte*) render_screen_original::ocols#4 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#2] -- register_copy 
-  //SEG1184 [533] phi (byte*) render_screen_original::screen#6 = (byte*) render_screen_original::screen#2 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#3] -- register_copy 
-  //SEG1185 [533] phi (byte*) render_screen_original::oscr#2 = (byte*) render_screen_original::oscr#4 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#4] -- register_copy 
-    jmp b4
-  //SEG1186 render_screen_original::@4
-  b4:
+  //SEG1180 [533] phi from render_screen_original::@2 render_screen_original::@3 to render_screen_original::@3 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3]
+  b3_from_b2:
+  b3_from_b3:
+  //SEG1181 [533] phi (byte) render_screen_original::x#5 = (byte) render_screen_original::x#1 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#0] -- register_copy 
+  //SEG1182 [533] phi (byte*) render_screen_original::cols#5 = (byte*) render_screen_original::cols#1 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#1] -- register_copy 
+  //SEG1183 [533] phi (byte*) render_screen_original::ocols#2 = (byte*) render_screen_original::ocols#4 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#2] -- register_copy 
+  //SEG1184 [533] phi (byte*) render_screen_original::screen#6 = (byte*) render_screen_original::screen#2 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#3] -- register_copy 
+  //SEG1185 [533] phi (byte*) render_screen_original::oscr#2 = (byte*) render_screen_original::oscr#4 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#4] -- register_copy 
+    jmp b3
+  //SEG1186 render_screen_original::@3
+  b3:
   //SEG1187 [534] *((byte*) render_screen_original::screen#6) ← *((byte*) render_screen_original::oscr#2) -- _deref_pbuz1=_deref_pbuz2 
     ldy #0
     lda (oscr),y
@@ -21320,18 +21448,18 @@ render_screen_original: {
   !:
   //SEG1193 [540] (byte) render_screen_original::x#2 ← ++ (byte) render_screen_original::x#5 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1194 [541] if((byte) render_screen_original::x#2!=(byte/signed byte/word/signed word/dword/signed dword) $24) goto render_screen_original::@4 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG1194 [541] if((byte) render_screen_original::x#2!=(byte/signed byte/word/signed word/dword/signed dword) $24) goto render_screen_original::@3 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$24
-    bne b4_from_b4
-  //SEG1195 [542] phi from render_screen_original::@4 render_screen_original::@6 to render_screen_original::@6 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6]
-  b6_from_b4:
-  b6_from_b6:
-  //SEG1196 [542] phi (byte) render_screen_original::x#6 = (byte) render_screen_original::x#2 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6#0] -- register_copy 
-  //SEG1197 [542] phi (byte*) render_screen_original::cols#6 = (byte*) render_screen_original::cols#2 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6#1] -- register_copy 
-  //SEG1198 [542] phi (byte*) render_screen_original::screen#7 = (byte*) render_screen_original::screen#3 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6#2] -- register_copy 
-    jmp b6
-  //SEG1199 render_screen_original::@6
-  b6:
+    bne b3_from_b3
+  //SEG1195 [542] phi from render_screen_original::@3 render_screen_original::@4 to render_screen_original::@4 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4]
+  b4_from_b3:
+  b4_from_b4:
+  //SEG1196 [542] phi (byte) render_screen_original::x#6 = (byte) render_screen_original::x#2 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4#0] -- register_copy 
+  //SEG1197 [542] phi (byte*) render_screen_original::cols#6 = (byte*) render_screen_original::cols#2 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4#1] -- register_copy 
+  //SEG1198 [542] phi (byte*) render_screen_original::screen#7 = (byte*) render_screen_original::screen#3 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4#2] -- register_copy 
+    jmp b4
+  //SEG1199 render_screen_original::@4
+  b4:
   //SEG1200 [543] *((byte*) render_screen_original::screen#7) ← (const byte) render_screen_original::SPACE#0 -- _deref_pbuz1=vbuc1 
     lda #SPACE
     ldy #0
@@ -21352,18 +21480,18 @@ render_screen_original: {
   !:
   //SEG1204 [547] (byte) render_screen_original::x#3 ← ++ (byte) render_screen_original::x#6 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1205 [548] if((byte) render_screen_original::x#3!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_screen_original::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG1205 [548] if((byte) render_screen_original::x#3!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_screen_original::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b6_from_b6
-    jmp b7
-  //SEG1206 render_screen_original::@7
-  b7:
+    bne b4_from_b4
+    jmp b5
+  //SEG1206 render_screen_original::@5
+  b5:
   //SEG1207 [549] (byte) render_screen_original::y#1 ← ++ (byte) render_screen_original::y#6 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1208 [550] if((byte) render_screen_original::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto render_screen_original::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$19
     cmp y
-    bne b1_from_b7
+    bne b1_from_b5
     jmp breturn
   //SEG1209 render_screen_original::@return
   breturn:
@@ -21418,25 +21546,25 @@ sprites_irq: {
   //SEG1225 [562] (byte) sprites_irq::raster_sprite_gfx_modify#0 ← (byte/signed word/word/dword/signed dword~) sprites_irq::$0 -- vbuz1=vbuxx 
     // Wait for the y-position before changing sprite pointers
     stx raster_sprite_gfx_modify
-    jmp b11
-  //SEG1226 sprites_irq::@11
-  b11:
-  //SEG1227 [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11 -- _deref_pbuc1_lt_vbuz1_then_la1 
+    jmp b8
+  //SEG1226 sprites_irq::@8
+  b8:
+  //SEG1227 [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8 -- _deref_pbuc1_lt_vbuz1_then_la1 
     lda RASTER
     cmp raster_sprite_gfx_modify
-    bcc b11
-    jmp b12
-  //SEG1228 sprites_irq::@12
-  b12:
+    bcc b8
+    jmp b9
+  //SEG1228 sprites_irq::@9
+  b9:
   //SEG1229 [564] (byte) sprites_irq::ptr#0 ← (byte) irq_sprite_ptr#0 -- vbuxx=vbuz1 
     ldx irq_sprite_ptr
   //SEG1230 [565] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1 -- vbuz1_eq_0_then_la1 
     lda render_screen_showing
     cmp #0
     beq b1
-    jmp b13
-  //SEG1231 sprites_irq::@13
-  b13:
+    jmp b10
+  //SEG1231 sprites_irq::@10
+  b10:
   //SEG1232 [566] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuxx 
     stx PLAYFIELD_SPRITE_PTRS_2
   //SEG1233 [567] (byte) sprites_irq::ptr#3 ← ++ (byte) sprites_irq::ptr#0 -- vbuaa=_inc_vbuxx 
@@ -21460,16 +21588,16 @@ sprites_irq: {
     lda #9
     cmp irq_cnt
     beq b3
-    jmp b7
-  //SEG1241 sprites_irq::@7
-  b7:
+    jmp b6
+  //SEG1241 sprites_irq::@6
+  b6:
   //SEG1242 [574] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) $a) goto sprites_irq::@4 -- vbuz1_eq_vbuc1_then_la1 
     lda #$a
     cmp irq_cnt
     beq b4
-    jmp b8
-  //SEG1243 sprites_irq::@8
-  b8:
+    jmp b7
+  //SEG1243 sprites_irq::@7
+  b7:
   //SEG1244 [575] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
     axs #-[$14]
@@ -21482,14 +21610,14 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-  //SEG1247 [578] phi from sprites_irq::@15 sprites_irq::@4 sprites_irq::@8 to sprites_irq::@6 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6]
-  b6_from_b15:
-  b6_from_b4:
-  b6_from_b8:
-  //SEG1248 [578] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6#0] -- register_copy 
-    jmp b6
-  //SEG1249 sprites_irq::@6
-  b6:
+  //SEG1247 [578] phi from sprites_irq::@11 sprites_irq::@4 sprites_irq::@7 to sprites_irq::@5 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5]
+  b5_from_b11:
+  b5_from_b4:
+  b5_from_b7:
+  //SEG1248 [578] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5#0] -- register_copy 
+    jmp b5
+  //SEG1249 sprites_irq::@5
+  b5:
   //SEG1250 [579] *((const byte*) RASTER#0) ← (byte) irq_raster_next#4 -- _deref_pbuc1=vbuz1 
     // Setup next interrupt
     lda irq_raster_next
@@ -21523,7 +21651,7 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-    jmp b6_from_b4
+    jmp b5_from_b4
   //SEG1259 sprites_irq::@3
   b3:
   //SEG1260 [586] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
@@ -21538,13 +21666,13 @@ sprites_irq: {
     jmp toSpritePtr2
   //SEG1263 sprites_irq::toSpritePtr2
   toSpritePtr2:
-    jmp b15
-  //SEG1264 sprites_irq::@15
-  b15:
+    jmp b11
+  //SEG1264 sprites_irq::@11
+  b11:
   //SEG1265 [589] (byte) irq_sprite_ptr#1 ← (const byte) sprites_irq::toSpritePtr2_return#0 -- vbuz1=vbuc1 
     lda #toSpritePtr2_return
     sta irq_sprite_ptr
-    jmp b6_from_b15
+    jmp b5_from_b11
   //SEG1266 sprites_irq::@1
   b1:
   //SEG1267 [590] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuxx 
@@ -21661,131 +21789,131 @@ sprites_irq: {
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b14
-Removing instruction jmp b23
-Removing instruction jmp b24
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp toSpritePtr1
-Removing instruction jmp b39
-Removing instruction jmp b38
+Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp bend
-Removing instruction jmp b25
-Removing instruction jmp b26
-Removing instruction jmp b27
-Removing instruction jmp b28
-Removing instruction jmp b29
-Removing instruction jmp b30
-Removing instruction jmp b31
-Removing instruction jmp b32
-Removing instruction jmp b33
-Removing instruction jmp b1
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b35
-Removing instruction jmp b36
-Removing instruction jmp b37
-Removing instruction jmp b11
-Removing instruction jmp b38
-Removing instruction jmp b17
-Removing instruction jmp b23
-Removing instruction jmp b39
-Removing instruction jmp b40
-Removing instruction jmp b41
-Removing instruction jmp b42
-Removing instruction jmp breturn
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp breturn
-Removing instruction jmp b2
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp b9
-Removing instruction jmp b8
-Removing instruction jmp b11
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b8
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b4
-Removing instruction jmp b6
-Removing instruction jmp b5
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b5
-Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b6
-Removing instruction jmp breturn
-Removing instruction jmp b4
-Removing instruction jmp b14
-Removing instruction jmp b11
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b14
-Removing instruction jmp breturn
-Removing instruction jmp b17
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b15
-Removing instruction jmp b6
-Removing instruction jmp breturn
-Removing instruction jmp b14
-Removing instruction jmp b9
-Removing instruction jmp b5
-Removing instruction jmp b1
-Removing instruction jmp b17
-Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b2
-Removing instruction jmp b8
-Removing instruction jmp b3
-Removing instruction jmp b9
-Removing instruction jmp b18
-Removing instruction jmp b10
-Removing instruction jmp b19
-Removing instruction jmp b20
-Removing instruction jmp b21
-Removing instruction jmp b15
-Removing instruction jmp breturn
-Removing instruction jmp b9
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b3
-Removing instruction jmp b10
-Removing instruction jmp b11
-Removing instruction jmp breturn
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b4
-Removing instruction jmp b2
-Removing instruction jmp b6
-Removing instruction jmp b3
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp breturn
 Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
+Removing instruction jmp b11
 Removing instruction jmp b12
 Removing instruction jmp b13
 Removing instruction jmp b14
+Removing instruction jmp b15
+Removing instruction jmp b16
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b17
+Removing instruction jmp b18
+Removing instruction jmp b19
+Removing instruction jmp b5
+Removing instruction jmp b20
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b21
+Removing instruction jmp b22
+Removing instruction jmp b23
+Removing instruction jmp b24
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp breturn
+Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b18
+Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b7
+Removing instruction jmp b6
+Removing instruction jmp b8
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b7
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b4
+Removing instruction jmp b6
+Removing instruction jmp b5
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b4
+Removing instruction jmp breturn
+Removing instruction jmp b3
+Removing instruction jmp b6
+Removing instruction jmp b5
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b7
+Removing instruction jmp breturn
+Removing instruction jmp b8
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b7
+Removing instruction jmp b4
+Removing instruction jmp breturn
+Removing instruction jmp b6
+Removing instruction jmp b5
+Removing instruction jmp b4
+Removing instruction jmp b1
+Removing instruction jmp b12
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b2
+Removing instruction jmp b7
+Removing instruction jmp b3
+Removing instruction jmp b8
+Removing instruction jmp b13
+Removing instruction jmp b9
+Removing instruction jmp b14
+Removing instruction jmp b15
+Removing instruction jmp b16
+Removing instruction jmp b11
+Removing instruction jmp breturn
+Removing instruction jmp b4
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b3
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b2
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp breturn
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b9
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b4
@@ -21793,34 +21921,34 @@ Removing instruction jmp b3
 Removing instruction jmp b5
 Removing instruction jmp breturn
 Removing instruction jmp breturn
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b8
-Removing instruction jmp b25
-Removing instruction jmp b21
-Removing instruction jmp b10
-Removing instruction jmp b23
-Removing instruction jmp b26
-Removing instruction jmp b24
 Removing instruction jmp b1
-Removing instruction jmp b27
-Removing instruction jmp b5
-Removing instruction jmp b2
-Removing instruction jmp b28
-Removing instruction jmp b6
-Removing instruction jmp b3
-Removing instruction jmp b29
-Removing instruction jmp b7
 Removing instruction jmp breturn
-Removing instruction jmp b11
+Removing instruction jmp b7
+Removing instruction jmp b19
 Removing instruction jmp b16
+Removing instruction jmp b8
 Removing instruction jmp b17
-Removing instruction jmp b18
-Removing instruction jmp b12
 Removing instruction jmp b20
+Removing instruction jmp b18
+Removing instruction jmp b1
+Removing instruction jmp b21
+Removing instruction jmp b4
+Removing instruction jmp b2
+Removing instruction jmp b22
+Removing instruction jmp b5
+Removing instruction jmp b3
+Removing instruction jmp b23
+Removing instruction jmp b6
+Removing instruction jmp breturn
+Removing instruction jmp b9
+Removing instruction jmp b12
+Removing instruction jmp b13
+Removing instruction jmp b14
+Removing instruction jmp b10
+Removing instruction jmp b15
 Removing instruction jmp breturn
 Removing instruction jmp toD0182
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp toD0181
 Removing instruction jmp b1
@@ -21833,27 +21961,27 @@ Removing instruction jmp breturn
 Removing instruction jmp vicSelectGfxBank1
 Removing instruction jmp vicSelectGfxBank1_toDd001
 Removing instruction jmp vicSelectGfxBank1_b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b4
-Removing instruction jmp b6
-Removing instruction jmp b7
+Removing instruction jmp b5
 Removing instruction jmp breturn
 Removing instruction jmp breturn
-Removing instruction jmp b11
-Removing instruction jmp b12
-Removing instruction jmp b13
-Removing instruction jmp b2
-Removing instruction jmp b7
 Removing instruction jmp b8
+Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp b2
 Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b5
 Removing instruction jmp breturn
 Removing instruction jmp toSpritePtr2
-Removing instruction jmp b15
+Removing instruction jmp b11
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Removing instruction lda #0
@@ -21884,230 +22012,230 @@ Removing instruction lda #BLACK
 Removing instruction ldy #0
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b1_from_b17 with b1
+Replacing label b1_from_b6 with b1
 Replacing label b1_from_render_bcd with b1
-Replacing label b6_from_b8 with b6
-Replacing label b5_from_b11 with b5
+Replacing label b4_from_b6 with b4
+Replacing label b3_from_b8 with b3
 Replacing label b1_from_b3 with b1
 Replacing label b4_from_b5 with b4
 Replacing label b3_from_b5 with b3
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
-Replacing label breturn_from_b7 with breturn
-Replacing label breturn_from_b14 with breturn_from_b6
-Replacing label b4_from_b1 with b4
-Replacing label breturn_from_b15 with breturn_from_b4
-Replacing label breturn_from_b14 with breturn_from_b4
-Replacing label b2_from_b17 with b2
-Replacing label b2_from_b6 with b2
+Replacing label breturn_from_b4 with breturn
+Replacing label b3_from_b1 with b3
+Replacing label breturn_from_b2 with breturn_from_b7
+Replacing label breturn_from_b6 with breturn_from_b7
+Replacing label b2_from_b12 with b2
+Replacing label b2_from_b5 with b2
 Replacing label b3_from_b2 with b3
-Replacing label b11_from_b9 with b11
+Replacing label b6_from_b4 with b6
 Replacing label b3_from_b2 with b3
 Replacing label breturn_from_play_update_score with breturn
-Replacing label breturn_from_b2 with breturn
-Replacing label b3_from_b2 with b3
-Replacing label b7_from_b7 with b7
-Replacing label b18_from_b9 with b18
-Replacing label b9_from_b10 with b9
-Replacing label b14_from_b12 with b14
-Replacing label b8_from_b14 with b8
-Replacing label b8_from_b10 with b8
-Replacing label b2_from_b27 with b2
-Replacing label b3_from_b28 with b3
-Replacing label b12_from_b11 with b12
-Replacing label b12_from_b16 with b12
-Replacing label b10_from_b20 with b10
-Replacing label b12_from_b14 with b12
+Replacing label breturn_from_b1 with breturn
+Replacing label b2_from_b1 with b2
+Replacing label b5_from_b5 with b5
+Replacing label b9_from_b4 with b9
+Replacing label b4_from_b5 with b4
+Replacing label b8_from_b6 with b8
+Replacing label b3_from_b8 with b3
+Replacing label b1_from_b2 with b1_from_b8
+Replacing label b7_from_b8 with b7
+Replacing label b2_from_b21 with b2
+Replacing label b3_from_b22 with b3
+Replacing label b10_from_b9 with b10
+Replacing label b10_from_b12 with b10
+Replacing label b8_from_b15 with b8
+Replacing label b10_from_b11 with b10
 Replacing label toD0181_from_render_show with toD0181
 Replacing label b1_from_b1 with b1
 Replacing label b3_from_b3 with b3
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b2_from_b2 with b2
+Replacing label b3_from_b3 with b3
 Replacing label b4_from_b4 with b4
-Replacing label b6_from_b6 with b6
-Replacing label b1_from_b7 with b1
-Replacing label b6_from_b4 with b6
-Replacing label b6_from_b15 with b6
-Removing instruction b14:
-Removing instruction b23:
-Removing instruction toSpritePtr1_from_b24:
+Replacing label b1_from_b5 with b1
+Replacing label b5_from_b4 with b5
+Replacing label b5_from_b11 with b5
+Removing instruction b1:
+Removing instruction b2:
+Removing instruction toSpritePtr1_from_b3:
 Removing instruction toSpritePtr1:
-Removing instruction b38_from_b39:
-Removing instruction main_from_b38:
-Removing instruction bend_from_b38:
-Removing instruction b26_from_b25:
-Removing instruction b27_from_b26:
-Removing instruction b28_from_b27:
-Removing instruction play_init_from_b28:
-Removing instruction b29_from_b28:
-Removing instruction play_spawn_current_from_b29:
-Removing instruction b30_from_b29:
-Removing instruction play_spawn_current_from_b30:
-Removing instruction b31_from_b30:
-Removing instruction render_playfield_from_b31:
-Removing instruction b1_from_b17:
-Removing instruction b8_from_b6:
-Removing instruction b35_from_b8:
-Removing instruction keyboard_event_scan_from_b35:
-Removing instruction b36_from_b35:
-Removing instruction b38:
-Removing instruction b41_from_b40:
-Removing instruction b42_from_b41:
-Removing instruction b3_from_render_score:
-Removing instruction b2_from_b3:
+Removing instruction b4_from_b5:
+Removing instruction main_from_b4:
+Removing instruction bend_from_b4:
+Removing instruction b9_from_b8:
+Removing instruction b10_from_b9:
+Removing instruction b11_from_b10:
+Removing instruction play_init_from_b11:
+Removing instruction b12_from_b11:
+Removing instruction play_spawn_current_from_b12:
+Removing instruction b13_from_b12:
+Removing instruction play_spawn_current_from_b13:
+Removing instruction b14_from_b13:
+Removing instruction render_playfield_from_b14:
+Removing instruction b1_from_b6:
+Removing instruction b3_from_b2:
+Removing instruction b17_from_b3:
+Removing instruction keyboard_event_scan_from_b17:
+Removing instruction b18_from_b17:
+Removing instruction b20:
+Removing instruction b23_from_b22:
+Removing instruction b24_from_b23:
+Removing instruction b2_from_render_score:
+Removing instruction b1_from_b2:
 Removing instruction b1_from_render_bcd:
 Removing instruction b1_from_b2:
-Removing instruction b3_from_render_next:
-Removing instruction b2_from_b3:
-Removing instruction b5_from_b11:
-Removing instruction b6_from_b5:
-Removing instruction b6_from_b8:
+Removing instruction b2_from_render_next:
+Removing instruction b1_from_b2:
+Removing instruction b3_from_b8:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b6:
 Removing instruction b1_from_b3:
 Removing instruction b3_from_b5:
-Removing instruction b3_from_b8:
+Removing instruction b3_from_b7:
 Removing instruction b4_from_b5:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b2:
-Removing instruction breturn_from_b5:
-Removing instruction breturn_from_b7:
-Removing instruction breturn_from_b14:
-Removing instruction b4_from_b1:
-Removing instruction b4_from_b2:
-Removing instruction breturn_from_b6:
-Removing instruction breturn_from_b14:
-Removing instruction breturn_from_b15:
-Removing instruction b5_from_play_move_down:
-Removing instruction b1_from_b5:
-Removing instruction keyboard_event_pressed_from_b1:
-Removing instruction b2_from_b17:
-Removing instruction b2_from_b6:
-Removing instruction b2_from_b7:
+Removing instruction breturn_from_b2:
+Removing instruction breturn_from_b4:
+Removing instruction breturn_from_b4:
+Removing instruction b3_from_b1:
 Removing instruction b3_from_b2:
-Removing instruction b3_from_b8:
-Removing instruction b10_from_b18:
-Removing instruction b19_from_b10:
-Removing instruction play_remove_lines_from_b19:
-Removing instruction b21_from_b20:
-Removing instruction play_spawn_current_from_b21:
-Removing instruction breturn_from_b15:
+Removing instruction breturn_from_b4:
+Removing instruction breturn_from_b2:
+Removing instruction breturn_from_b6:
+Removing instruction b4_from_play_move_down:
+Removing instruction b1_from_b4:
+Removing instruction keyboard_event_pressed_from_b1:
+Removing instruction b2_from_b12:
+Removing instruction b2_from_b5:
+Removing instruction b2_from_b6:
+Removing instruction b3_from_b2:
+Removing instruction b3_from_b7:
+Removing instruction b9_from_b13:
+Removing instruction b14_from_b9:
+Removing instruction play_remove_lines_from_b14:
+Removing instruction b16_from_b15:
+Removing instruction play_spawn_current_from_b16:
+Removing instruction breturn_from_b11:
 Removing instruction b2_from_b1:
 Removing instruction b3_from_b2:
-Removing instruction b11_from_b9:
-Removing instruction b1_from_b11:
-Removing instruction b3_from_b2:
+Removing instruction b6_from_b4:
+Removing instruction b1_from_b6:
+Removing instruction b2_from_b1:
 Removing instruction breturn_from_play_update_score:
+Removing instruction breturn_from_b1:
 Removing instruction breturn_from_b2:
-Removing instruction breturn_from_b3:
-Removing instruction b3_from_b2:
-Removing instruction b3_from_b6:
-Removing instruction b7_from_b7:
-Removing instruction b8_from_b14:
-Removing instruction b9_from_b8:
-Removing instruction b9_from_b10:
-Removing instruction b14_from_b12:
-Removing instruction b14_from_b13:
-Removing instruction b1_from_b14:
-Removing instruction b18_from_b9:
-Removing instruction b10_from_b18:
-Removing instruction b8_from_b10:
-Removing instruction b10_from_b20:
-Removing instruction b10_from_b21:
-Removing instruction b23_from_b10:
-Removing instruction keyboard_event_pressed_from_b23:
-Removing instruction b24_from_b26:
-Removing instruction b1_from_b24:
+Removing instruction b2_from_b1:
+Removing instruction b2_from_b4:
+Removing instruction b5_from_b5:
+Removing instruction b3_from_b8:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b5:
+Removing instruction b8_from_b6:
+Removing instruction b8_from_b7:
+Removing instruction b1_from_b2:
+Removing instruction b9_from_b4:
+Removing instruction b5_from_b9:
+Removing instruction b7_from_b8:
+Removing instruction b8_from_b15:
+Removing instruction b8_from_b16:
+Removing instruction b17_from_b8:
+Removing instruction keyboard_event_pressed_from_b17:
+Removing instruction b18_from_b20:
+Removing instruction b1_from_b18:
 Removing instruction keyboard_event_pressed_from_b1:
-Removing instruction b2_from_b27:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b21:
+Removing instruction b2_from_b4:
 Removing instruction keyboard_event_pressed_from_b2:
-Removing instruction b3_from_b28:
-Removing instruction b3_from_b6:
+Removing instruction b3_from_b22:
+Removing instruction b3_from_b5:
 Removing instruction keyboard_event_pressed_from_b3:
-Removing instruction b12_from_b11:
-Removing instruction b12_from_b14:
-Removing instruction b12_from_b16:
-Removing instruction b12_from_b18:
+Removing instruction b10_from_b11:
+Removing instruction b10_from_b12:
+Removing instruction b10_from_b14:
+Removing instruction b10_from_b9:
 Removing instruction toD0182_from_render_show:
-Removing instruction b2_from_toD0182:
+Removing instruction b1_from_toD0182:
 Removing instruction toD0181_from_render_show:
-Removing instruction b2_from_toD0181:
+Removing instruction b1_from_toD0181:
 Removing instruction b1_from_b1:
 Removing instruction b3_from_b3:
 Removing instruction b1_from_b1:
 Removing instruction vicSelectGfxBank1_toDd001_from_vicSelectGfxBank1:
 Removing instruction vicSelectGfxBank1_toDd001:
-Removing instruction b4_from_b3:
-Removing instruction render_screen_original_from_b4:
+Removing instruction b3_from_b2:
+Removing instruction render_screen_original_from_b3:
 Removing instruction b1_from_b1:
-Removing instruction b1_from_b7:
+Removing instruction b1_from_b5:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
-Removing instruction b4_from_b2:
+Removing instruction b3_from_b2:
+Removing instruction b3_from_b3:
+Removing instruction b4_from_b3:
 Removing instruction b4_from_b4:
-Removing instruction b6_from_b4:
-Removing instruction b6_from_b6:
-Removing instruction b6_from_b15:
-Removing instruction b6_from_b4:
-Removing instruction b6_from_b8:
+Removing instruction b5_from_b11:
+Removing instruction b5_from_b4:
+Removing instruction b5_from_b7:
 Removing instruction breturn:
 Removing instruction toSpritePtr2_from_b3:
 Removing instruction toSpritePtr2:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b24:
-Removing instruction b39:
-Removing instruction b38:
-Removing instruction bend:
-Removing instruction b25:
-Removing instruction render_init_from_b25:
-Removing instruction b26:
-Removing instruction b27:
-Removing instruction b28:
-Removing instruction b29:
-Removing instruction b30:
-Removing instruction b31:
-Removing instruction b32:
-Removing instruction render_moving_from_b32:
-Removing instruction b33:
-Removing instruction render_next_from_b33:
-Removing instruction b1_from_b33:
-Removing instruction b8:
-Removing instruction b35:
-Removing instruction b36:
-Removing instruction b37:
-Removing instruction b17:
-Removing instruction b23:
-Removing instruction render_playfield_from_b23:
-Removing instruction b39:
-Removing instruction render_moving_from_b39:
-Removing instruction b40:
-Removing instruction render_next_from_b40:
-Removing instruction b41:
-Removing instruction b42:
-Removing instruction b1_from_b42:
-Removing instruction breturn:
 Removing instruction b3:
-Removing instruction render_bcd_from_b2:
+Removing instruction b5:
+Removing instruction b4:
+Removing instruction bend:
+Removing instruction b8:
+Removing instruction render_init_from_b8:
+Removing instruction b9:
+Removing instruction b10:
+Removing instruction b11:
+Removing instruction b12:
+Removing instruction b13:
+Removing instruction b14:
+Removing instruction b15:
+Removing instruction render_moving_from_b15:
+Removing instruction b16:
+Removing instruction render_next_from_b16:
+Removing instruction b1_from_b16:
+Removing instruction b3:
+Removing instruction b17:
+Removing instruction b18:
+Removing instruction b19:
+Removing instruction b6:
+Removing instruction b7:
+Removing instruction render_playfield_from_b7:
+Removing instruction b21:
+Removing instruction render_moving_from_b21:
+Removing instruction b22:
+Removing instruction render_next_from_b22:
+Removing instruction b23:
+Removing instruction b24:
+Removing instruction b1_from_b24:
+Removing instruction breturn:
+Removing instruction b2:
+Removing instruction render_bcd_from_b1:
+Removing instruction b3:
+Removing instruction render_bcd_from_b3:
+Removing instruction b4:
+Removing instruction render_bcd_from_b4:
 Removing instruction b5:
 Removing instruction render_bcd_from_b5:
 Removing instruction b6:
 Removing instruction render_bcd_from_b6:
 Removing instruction b7:
 Removing instruction render_bcd_from_b7:
-Removing instruction b8:
-Removing instruction render_bcd_from_b8:
-Removing instruction b9:
-Removing instruction render_bcd_from_b9:
 Removing instruction breturn:
 Removing instruction b2:
 Removing instruction breturn:
-Removing instruction b3:
-Removing instruction b5_from_b2:
-Removing instruction b9:
-Removing instruction b11:
+Removing instruction b2:
+Removing instruction b3_from_b1:
+Removing instruction b7:
+Removing instruction b8:
 Removing instruction breturn:
 Removing instruction b1_from_render_moving:
-Removing instruction b8:
+Removing instruction b7:
 Removing instruction breturn:
 Removing instruction b4_from_b2:
 Removing instruction b6:
@@ -22115,66 +22243,66 @@ Removing instruction b1_from_render_playfield:
 Removing instruction b2_from_b1:
 Removing instruction b3:
 Removing instruction breturn:
-Removing instruction b5:
-Removing instruction b6:
-Removing instruction b7:
-Removing instruction b6:
-Removing instruction play_collision_from_b4:
-Removing instruction b14:
-Removing instruction b11:
-Removing instruction breturn_from_b11:
-Removing instruction b1_from_play_collision:
-Removing instruction b2_from_b1:
-Removing instruction b14:
-Removing instruction breturn_from_b14:
-Removing instruction breturn_from_b4:
-Removing instruction breturn_from_b5:
-Removing instruction breturn_from_b6:
-Removing instruction b17:
-Removing instruction breturn_from_b17:
-Removing instruction b1_from_b20:
-Removing instruction b2_from_b21:
-Removing instruction b4:
-Removing instruction b5:
-Removing instruction play_collision_from_b5:
-Removing instruction b15:
-Removing instruction b6:
-Removing instruction play_collision_from_b1:
-Removing instruction b14:
-Removing instruction b9:
-Removing instruction b5:
-Removing instruction b17:
-Removing instruction b6:
-Removing instruction b7:
-Removing instruction b8:
-Removing instruction b9:
-Removing instruction play_collision_from_b9:
-Removing instruction b18:
-Removing instruction b10:
-Removing instruction b19:
-Removing instruction b20:
-Removing instruction b21:
-Removing instruction b15_from_b21:
-Removing instruction b15_from_b14:
-Removing instruction play_collision_from_play_spawn_current:
-Removing instruction b9:
-Removing instruction b1_from_b9:
-Removing instruction breturn:
-Removing instruction b10:
-Removing instruction b2_from_b10:
-Removing instruction breturn:
 Removing instruction b2:
 Removing instruction b3:
 Removing instruction b4:
-Removing instruction b2_from_b4:
+Removing instruction b4:
+Removing instruction play_collision_from_b3:
 Removing instruction b6:
-Removing instruction b7_from_b3:
+Removing instruction b5:
+Removing instruction breturn_from_b5:
+Removing instruction b1_from_play_collision:
+Removing instruction b2_from_b1:
+Removing instruction b7:
+Removing instruction breturn_from_b7:
+Removing instruction breturn_from_b4:
+Removing instruction breturn_from_b5:
+Removing instruction breturn_from_b6:
 Removing instruction b8:
-Removing instruction breturn:
-Removing instruction b8_from_play_remove_lines:
-Removing instruction b10_from_b9:
+Removing instruction breturn_from_b8:
+Removing instruction b1_from_b9:
+Removing instruction b2_from_b10:
+Removing instruction b2:
+Removing instruction b3:
+Removing instruction play_collision_from_b3:
+Removing instruction b7:
+Removing instruction b4:
+Removing instruction play_collision_from_b1:
+Removing instruction b6:
+Removing instruction b5:
+Removing instruction b4:
 Removing instruction b12:
+Removing instruction b5:
+Removing instruction b6:
+Removing instruction b7:
+Removing instruction b8:
+Removing instruction play_collision_from_b8:
 Removing instruction b13:
+Removing instruction b9:
+Removing instruction b14:
+Removing instruction b15:
+Removing instruction b16:
+Removing instruction b11_from_b16:
+Removing instruction b11_from_b10:
+Removing instruction play_collision_from_play_spawn_current:
+Removing instruction b4:
+Removing instruction b1_from_b4:
+Removing instruction breturn:
+Removing instruction b5:
+Removing instruction b2_from_b5:
+Removing instruction breturn:
+Removing instruction b1:
+Removing instruction b2:
+Removing instruction b3:
+Removing instruction b1_from_b3:
+Removing instruction b4:
+Removing instruction b5_from_b2:
+Removing instruction b6:
+Removing instruction breturn:
+Removing instruction b3_from_play_remove_lines:
+Removing instruction b5_from_b4:
+Removing instruction b6:
+Removing instruction b7:
 Removing instruction b1:
 Removing instruction breturn:
 Removing instruction b1_from_play_lock_current:
@@ -22182,27 +22310,27 @@ Removing instruction b2_from_b1:
 Removing instruction b4:
 Removing instruction b5:
 Removing instruction breturn:
-Removing instruction b1_from_b7:
-Removing instruction b2_from_b8:
+Removing instruction b1_from_b6:
+Removing instruction b2_from_b7:
 Removing instruction breturn:
-Removing instruction b3:
-Removing instruction breturn_from_b3:
-Removing instruction b8_from_keyboard_event_scan:
-Removing instruction b25:
-Removing instruction b21:
-Removing instruction b23:
-Removing instruction b26:
-Removing instruction b24:
-Removing instruction b27:
-Removing instruction b5:
-Removing instruction b28:
-Removing instruction b6:
-Removing instruction b29:
-Removing instruction b7:
+Removing instruction b1:
+Removing instruction breturn_from_b1:
+Removing instruction b7_from_keyboard_event_scan:
+Removing instruction b19:
 Removing instruction b16:
 Removing instruction b17:
-Removing instruction b18:
 Removing instruction b20:
+Removing instruction b18:
+Removing instruction b21:
+Removing instruction b4:
+Removing instruction b22:
+Removing instruction b5:
+Removing instruction b23:
+Removing instruction b6:
+Removing instruction b12:
+Removing instruction b13:
+Removing instruction b14:
+Removing instruction b15:
 Removing instruction breturn:
 Removing instruction toD0182:
 Removing instruction breturn:
@@ -22215,50 +22343,50 @@ Removing instruction b1_from_sprites_init:
 Removing instruction breturn:
 Removing instruction vicSelectGfxBank1:
 Removing instruction vicSelectGfxBank1_b1:
+Removing instruction b2:
+Removing instruction render_screen_original_from_b2:
 Removing instruction b3:
-Removing instruction render_screen_original_from_b3:
-Removing instruction b4:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction breturn:
 Removing instruction b1_from_render_screen_original:
-Removing instruction b7:
+Removing instruction b5:
 Removing instruction breturn:
 Removing instruction breturn:
-Removing instruction b12:
-Removing instruction b13:
+Removing instruction b9:
+Removing instruction b10:
+Removing instruction b6:
 Removing instruction b7:
-Removing instruction b8:
-Removing instruction b15:
+Removing instruction b11:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Skipping double jump to b1 in bne b11
-Skipping double jump to b10 in bne b18
-Skipping double jump to b11 in bne b11_from_b12
+Skipping double jump to b1 in bne b6
+Skipping double jump to b5 in bne b9
+Skipping double jump to b9 in bne b9_from_b10
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b2_from_render_score to b1
-Relabelling long label b2_from_render_next to b1
-Relabelling long label breturn_from_b6 to b3
-Relabelling long label breturn_from_b9 to b2
-Relabelling long label breturn_from_b4 to b3
+Relabelling long label b1_from_render_score to b2
+Relabelling long label b1_from_render_next to b2
+Relabelling long label breturn_from_b6 to b4
+Relabelling long label breturn_from_b5 to b2
+Relabelling long label breturn_from_b7 to b3
 Relabelling long label b1_from_play_move_down to b4
 Relabelling long label breturn_from_b3 to b5
-Relabelling long label b2_from_play_increase_level to b1
-Relabelling long label b1_from_b2 to b1
+Relabelling long label b1_from_play_increase_level to b3
+Relabelling long label b1_from_b8 to b1
 Relabelling long label breturn_from_keyboard_event_get to b1
-Relabelling long label b1_from_b26 to b4
-Relabelling long label b11_from_b12 to b5
-Relabelling long label b11_from_b25 to b6
+Relabelling long label b1_from_b20 to b4
+Relabelling long label b9_from_b10 to b5
+Relabelling long label b9_from_b19 to b6
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b6
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b2
+Removing instruction jmp b5
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b8
 Removing instruction jmp b1
 Removing instruction jmp b3
 Removing instruction jmp b1
@@ -22266,21 +22394,21 @@ Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b11:
-Removing instruction b18:
+Removing instruction b6:
+Removing instruction b9:
 Removing instruction b5:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b1
-Removing unreachable instruction jmp b10
-Removing unreachable instruction jmp b11
+Removing unreachable instruction jmp b5
+Removing unreachable instruction jmp b9
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @14
-(label) @23
-(label) @24
-(label) @38
-(label) @39
+(label) @1
+(label) @2
+(label) @3
+(label) @4
+(label) @5
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -22676,7 +22804,7 @@ FINAL SYMBOL TABLE
 (byte) irq_sprite_ypos#3 irq_sprite_ypos zp ZP_BYTE:38 20.0
 (byte[]) keyboard_char_keycodes
 (byte()) keyboard_event_get()
-(label) keyboard_event_get::@3
+(label) keyboard_event_get::@1
 (label) keyboard_event_get::@return
 (byte) keyboard_event_get::return
 (byte) keyboard_event_get::return#1 reg byte x 4.0
@@ -22709,25 +22837,25 @@ FINAL SYMBOL TABLE
 (label) keyboard_event_scan::@10
 (label) keyboard_event_scan::@11
 (label) keyboard_event_scan::@12
+(label) keyboard_event_scan::@13
 (label) keyboard_event_scan::@14
+(label) keyboard_event_scan::@15
 (label) keyboard_event_scan::@16
 (label) keyboard_event_scan::@17
 (label) keyboard_event_scan::@18
+(label) keyboard_event_scan::@19
 (label) keyboard_event_scan::@2
 (label) keyboard_event_scan::@20
 (label) keyboard_event_scan::@21
+(label) keyboard_event_scan::@22
 (label) keyboard_event_scan::@23
-(label) keyboard_event_scan::@24
-(label) keyboard_event_scan::@25
-(label) keyboard_event_scan::@26
-(label) keyboard_event_scan::@27
-(label) keyboard_event_scan::@28
-(label) keyboard_event_scan::@29
 (label) keyboard_event_scan::@3
+(label) keyboard_event_scan::@4
 (label) keyboard_event_scan::@5
 (label) keyboard_event_scan::@6
 (label) keyboard_event_scan::@7
 (label) keyboard_event_scan::@8
+(label) keyboard_event_scan::@9
 (label) keyboard_event_scan::@return
 (byte) keyboard_event_scan::col
 (byte) keyboard_event_scan::col#1 reg byte x 15001.5
@@ -22800,27 +22928,27 @@ FINAL SYMBOL TABLE
 (word) lines_bcd#30 lines_bcd zp ZP_WORD:17 1.0
 (void()) main()
 (label) main::@1
+(label) main::@10
 (label) main::@11
+(label) main::@12
+(label) main::@13
+(label) main::@14
+(label) main::@15
+(label) main::@16
 (label) main::@17
+(label) main::@18
+(label) main::@19
+(label) main::@2
+(label) main::@20
+(label) main::@21
+(label) main::@22
 (label) main::@23
-(label) main::@25
-(label) main::@26
-(label) main::@27
-(label) main::@28
-(label) main::@29
-(label) main::@30
-(label) main::@31
-(label) main::@32
-(label) main::@33
-(label) main::@35
-(label) main::@36
-(label) main::@37
-(label) main::@38
-(label) main::@39
-(label) main::@40
-(label) main::@41
-(label) main::@42
+(label) main::@24
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
+(label) main::@7
 (label) main::@8
 (label) main::@9
 (byte) main::key_event
@@ -22838,15 +22966,15 @@ FINAL SYMBOL TABLE
 (byte()) play_collision((byte) play_collision::xpos , (byte) play_collision::ypos , (byte) play_collision::orientation)
 (byte~) play_collision::$7 reg byte a 20002.0
 (label) play_collision::@1
-(label) play_collision::@14
-(label) play_collision::@17
+(label) play_collision::@10
 (label) play_collision::@2
-(label) play_collision::@20
-(label) play_collision::@21
 (label) play_collision::@3
 (label) play_collision::@4
 (label) play_collision::@5
 (label) play_collision::@6
+(label) play_collision::@7
+(label) play_collision::@8
+(label) play_collision::@9
 (label) play_collision::@return
 (byte) play_collision::c
 (byte) play_collision::c#1 reg byte x 10001.0
@@ -22901,12 +23029,12 @@ FINAL SYMBOL TABLE
 (byte) play_collision::ypos2#2 ypos2 zp ZP_BYTE:11 867.0666666666667
 (void()) play_increase_level()
 (byte~) play_increase_level::$1 reg byte a 4.0
+(label) play_increase_level::@1
 (label) play_increase_level::@2
 (label) play_increase_level::@3
 (label) play_increase_level::@4
+(label) play_increase_level::@5
 (label) play_increase_level::@6
-(label) play_increase_level::@7
-(label) play_increase_level::@8
 (label) play_increase_level::@return
 (byte) play_increase_level::b
 (byte) play_increase_level::b#1 reg byte x 1501.5
@@ -22939,8 +23067,8 @@ FINAL SYMBOL TABLE
 (label) play_lock_current::@3
 (label) play_lock_current::@4
 (label) play_lock_current::@5
+(label) play_lock_current::@6
 (label) play_lock_current::@7
-(label) play_lock_current::@8
 (label) play_lock_current::@return
 (byte) play_lock_current::c
 (byte) play_lock_current::c#1 reg byte x 10001.0
@@ -22969,15 +23097,15 @@ FINAL SYMBOL TABLE
 (byte~) play_move_down::$2 reg byte a 4.0
 (label) play_move_down::@1
 (label) play_move_down::@10
+(label) play_move_down::@11
+(label) play_move_down::@12
+(label) play_move_down::@13
 (label) play_move_down::@14
 (label) play_move_down::@15
-(label) play_move_down::@17
-(label) play_move_down::@18
-(label) play_move_down::@19
+(label) play_move_down::@16
 (label) play_move_down::@2
-(label) play_move_down::@20
-(label) play_move_down::@21
 (label) play_move_down::@3
+(label) play_move_down::@4
 (label) play_move_down::@5
 (label) play_move_down::@6
 (label) play_move_down::@7
@@ -23001,12 +23129,12 @@ FINAL SYMBOL TABLE
 (byte~) play_move_leftright::$4 reg byte a 4.0
 (byte~) play_move_leftright::$8 reg byte a 4.0
 (label) play_move_leftright::@1
-(label) play_move_leftright::@14
-(label) play_move_leftright::@15
+(label) play_move_leftright::@2
+(label) play_move_leftright::@3
 (label) play_move_leftright::@4
 (label) play_move_leftright::@5
 (label) play_move_leftright::@6
-(label) play_move_leftright::@9
+(label) play_move_leftright::@7
 (label) play_move_leftright::@return
 (byte) play_move_leftright::key_event
 (byte) play_move_leftright::key_event#0 reg byte a 3.0
@@ -23018,10 +23146,10 @@ FINAL SYMBOL TABLE
 (byte/signed word/word/dword/signed dword~) play_move_rotate::$5 reg byte x 4.0
 (byte/signed word/word/dword/signed dword~) play_move_rotate::$7 reg byte x 4.0
 (label) play_move_rotate::@1
-(label) play_move_rotate::@11
-(label) play_move_rotate::@14
 (label) play_move_rotate::@2
+(label) play_move_rotate::@3
 (label) play_move_rotate::@4
+(label) play_move_rotate::@5
 (label) play_move_rotate::@6
 (label) play_move_rotate::@return
 (byte) play_move_rotate::key_event
@@ -23038,9 +23166,9 @@ FINAL SYMBOL TABLE
 (byte~) play_movement::$3 reg byte a 4.0
 (byte~) play_movement::$4 reg byte a 4.0
 (label) play_movement::@1
-(label) play_movement::@5
-(label) play_movement::@6
-(label) play_movement::@7
+(label) play_movement::@2
+(label) play_movement::@3
+(label) play_movement::@4
 (label) play_movement::@return
 (byte) play_movement::key_event
 (byte) play_movement::key_event#0 key_event zp ZP_BYTE:41 8.916666666666664
@@ -23053,12 +23181,12 @@ FINAL SYMBOL TABLE
 (byte) play_movement::return#3 reg byte a 202.0
 (byte()) play_remove_lines()
 (label) play_remove_lines::@1
-(label) play_remove_lines::@10
-(label) play_remove_lines::@12
-(label) play_remove_lines::@13
-(label) play_remove_lines::@14
-(label) play_remove_lines::@18
 (label) play_remove_lines::@2
+(label) play_remove_lines::@3
+(label) play_remove_lines::@4
+(label) play_remove_lines::@5
+(label) play_remove_lines::@6
+(label) play_remove_lines::@7
 (label) play_remove_lines::@8
 (label) play_remove_lines::@9
 (label) play_remove_lines::@return
@@ -23096,11 +23224,11 @@ FINAL SYMBOL TABLE
 (byte~) play_spawn_current::$2 reg byte a 4.0
 (byte~) play_spawn_current::$6 reg byte a 2002.0
 (label) play_spawn_current::@1
-(label) play_spawn_current::@10
-(label) play_spawn_current::@11
 (label) play_spawn_current::@2
 (label) play_spawn_current::@3
-(label) play_spawn_current::@9
+(label) play_spawn_current::@4
+(label) play_spawn_current::@5
+(label) play_spawn_current::@6
 (label) play_spawn_current::@return
 (byte) play_spawn_current::current_piece_idx
 (byte) play_spawn_current::current_piece_idx#0 reg byte x 2.0
@@ -23111,8 +23239,8 @@ FINAL SYMBOL TABLE
 (byte~) play_update_score::$2 reg byte a 4.0
 (byte~) play_update_score::$4 reg byte a 4.0
 (byte~) play_update_score::$5 reg byte a 4.0
+(label) play_update_score::@1
 (label) play_update_score::@2
-(label) play_update_score::@3
 (label) play_update_score::@return
 (dword) play_update_score::add_bcd
 (dword) play_update_score::add_bcd#0 add_bcd zp ZP_DWORD:43 1.3333333333333333
@@ -23167,8 +23295,8 @@ FINAL SYMBOL TABLE
 (byte~) render_init::$13 reg byte a 22.0
 (byte~) render_init::$14 reg byte a 22.0
 (label) render_init::@1
+(label) render_init::@2
 (label) render_init::@3
-(label) render_init::@4
 (label) render_init::@return
 (byte) render_init::i
 (byte) render_init::i#1 reg byte x 16.5
@@ -23199,7 +23327,7 @@ FINAL SYMBOL TABLE
 (label) render_moving::@4
 (label) render_moving::@5
 (label) render_moving::@6
-(label) render_moving::@8
+(label) render_moving::@7
 (label) render_moving::@return
 (byte) render_moving::c
 (byte) render_moving::c#1 reg byte x 1501.5
@@ -23227,14 +23355,14 @@ FINAL SYMBOL TABLE
 (byte) render_moving::ypos2#2 ypos2 zp ZP_BYTE:12 27.06666666666667
 (void()) render_next()
 (byte~) render_next::$4 reg byte y 1.0
-(label) render_next::@11
+(label) render_next::@1
 (label) render_next::@2
 (label) render_next::@3
+(label) render_next::@4
 (label) render_next::@5
 (label) render_next::@6
 (label) render_next::@7
 (label) render_next::@8
-(label) render_next::@9
 (label) render_next::@return
 (byte) render_next::c
 (byte) render_next::c#1 reg byte x 1501.5
@@ -23281,13 +23409,13 @@ FINAL SYMBOL TABLE
 (byte*) render_playfield::screen_line#1 screen_line zp ZP_WORD:5 500.5
 (byte*) render_playfield::screen_line#2 screen_line zp ZP_WORD:5 1552.0
 (void()) render_score()
+(label) render_score::@1
 (label) render_score::@2
 (label) render_score::@3
+(label) render_score::@4
 (label) render_score::@5
 (label) render_score::@6
 (label) render_score::@7
-(label) render_score::@8
-(label) render_score::@9
 (label) render_score::@return
 (word) render_score::level_offset
 (const word) render_score::level_offset#0 level_offset = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13+(byte/signed byte/word/signed word/dword/signed dword) $1f
@@ -23302,9 +23430,9 @@ FINAL SYMBOL TABLE
 (void()) render_screen_original((byte*) render_screen_original::screen)
 (label) render_screen_original::@1
 (label) render_screen_original::@2
+(label) render_screen_original::@3
 (label) render_screen_original::@4
-(label) render_screen_original::@6
-(label) render_screen_original::@7
+(label) render_screen_original::@5
 (label) render_screen_original::@return
 (byte) render_screen_original::SPACE
 (const byte) render_screen_original::SPACE#0 SPACE = (byte/signed byte/word/signed word/dword/signed dword) 0
@@ -23361,7 +23489,7 @@ FINAL SYMBOL TABLE
 (void()) render_screen_swap()
 (label) render_screen_swap::@return
 (void()) render_show()
-(label) render_show::@2
+(label) render_show::@1
 (label) render_show::@return
 (byte) render_show::d018val
 (byte) render_show::d018val#3 reg byte a 2.0
@@ -23426,16 +23554,16 @@ FINAL SYMBOL TABLE
 interrupt(HARDWARE_CLOBBER)(void()) sprites_irq()
 (byte/signed word/word/dword/signed dword~) sprites_irq::$0 reg byte x 4.0
 (label) sprites_irq::@1
+(label) sprites_irq::@10
 (label) sprites_irq::@11
-(label) sprites_irq::@12
-(label) sprites_irq::@13
-(label) sprites_irq::@15
 (label) sprites_irq::@2
 (label) sprites_irq::@3
 (label) sprites_irq::@4
+(label) sprites_irq::@5
 (label) sprites_irq::@6
 (label) sprites_irq::@7
 (label) sprites_irq::@8
+(label) sprites_irq::@9
 (label) sprites_irq::@return
 (byte) sprites_irq::ptr
 (byte) sprites_irq::ptr#0 reg byte x 2.5
@@ -23786,7 +23914,7 @@ Score: 3350872
   .label current_piece_102 = 5
 //SEG3 @begin
 bbegin:
-//SEG4 @14
+//SEG4 @1
 //SEG5 [1] (byte) render_screen_showing#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The screen currently being showed to the user. $00 for screen 1 / $40 for screen 2.
   lda #0
@@ -23795,9 +23923,9 @@ bbegin:
 //SEG7 kickasm(location (const byte*) PLAYFIELD_SCREEN_ORIGINAL#0) {{ // Load chars for the screen   .var screen = LoadBinary("playfield-screen.iscr")    // Load extended colors for the screen   .var extended = LoadBinary("playfield-extended.col")   // screen.get(i)+1 because the charset is loaded into PLAYFIELD_CHARSET+8   // extended.get(i)-1 because the extended colors are 1-based (1/2/3/4)   // <<6 to move extended colors to the upper 2 bits   .fill screen.getSize(), ( (screen.get(i)+1) | (extended.get(i)-1)<<6 )  }}
 //SEG8 kickasm(location (const byte*) PLAYFIELD_COLORS_ORIGINAL#0) {{ .import binary "playfield-screen.col"  }}
 // Original Color Data
-//SEG9 @23
+//SEG9 @2
 //SEG10 kickasm(location (const byte*) PLAYFIELD_SPRITES#0) {{ .var sprites = LoadPicture("playfield-sprites.png", List().add($010101, $000000)) 	// Put the sprites into memory  	.for(var sy=0;sy<10;sy++) { 	    .var sprite_gfx_y = sy*20 		.for(var sx=0;sx<3;sx++) { 	    	.for (var y=0;y<21; y++) { 	    	    .var gfx_y =  sprite_gfx_y + mod(2100+y-sprite_gfx_y,21) 		    	.for (var c=0; c<3; c++) { 	            	.byte sprites.getSinglecolorByte(sx*3+c,gfx_y) 	            } 	        } 	    	.byte 0 	  	} 	}  }}
-//SEG11 @24
+//SEG11 @3
 //SEG12 [6] (byte) irq_raster_next#0 ← (const byte) IRQ_RASTER_FIRST#0 -- vbuz1=vbuc1 
   // The raster line of the next IRQ
   lda #IRQ_RASTER_FIRST
@@ -23806,9 +23934,9 @@ bbegin:
   // Y-pos of the sprites on the next IRQ
   lda #SPRITES_FIRST_YPOS+$15
   sta irq_sprite_ypos
-//SEG14 [8] phi from @24 to toSpritePtr1 [phi:@24->toSpritePtr1]
+//SEG14 [8] phi from @3 to toSpritePtr1 [phi:@3->toSpritePtr1]
 //SEG15 toSpritePtr1
-//SEG16 @39
+//SEG16 @5
 //SEG17 [9] (byte) irq_sprite_ptr#0 ← (const byte) toSpritePtr1_return#0+(byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuc1 
   // Index of the sprites to show on the next IRQ
   lda #toSpritePtr1_return+3
@@ -23817,61 +23945,61 @@ bbegin:
   // Counting the 10 IRQs
   lda #0
   sta irq_cnt
-//SEG19 [11] phi from @39 to @38 [phi:@39->@38]
-//SEG20 @38
+//SEG19 [11] phi from @5 to @4 [phi:@5->@4]
+//SEG20 @4
 //SEG21 [12] call main 
-//SEG22 [14] phi from @38 to main [phi:@38->main]
+//SEG22 [14] phi from @4 to main [phi:@4->main]
   jsr main
-//SEG23 [13] phi from @38 to @end [phi:@38->@end]
+//SEG23 [13] phi from @4 to @end [phi:@4->@end]
 //SEG24 @end
 //SEG25 main
 main: {
   //SEG26 [15] call sid_rnd_init 
     jsr sid_rnd_init
-  //SEG27 main::@25
+  //SEG27 main::@8
   //SEG28 asm { sei  }
     sei
   //SEG29 [17] call render_init 
-  //SEG30 [501] phi from main::@25 to render_init [phi:main::@25->render_init]
+  //SEG30 [501] phi from main::@8 to render_init [phi:main::@8->render_init]
     jsr render_init
-  //SEG31 [18] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
-  //SEG32 main::@26
+  //SEG31 [18] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
+  //SEG32 main::@9
   //SEG33 [19] call sprites_init 
     jsr sprites_init
-  //SEG34 [20] phi from main::@26 to main::@27 [phi:main::@26->main::@27]
-  //SEG35 main::@27
+  //SEG34 [20] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  //SEG35 main::@10
   //SEG36 [21] call sprites_irq_init 
     jsr sprites_irq_init
-  //SEG37 [22] phi from main::@27 to main::@28 [phi:main::@27->main::@28]
-  //SEG38 main::@28
+  //SEG37 [22] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
+  //SEG38 main::@11
   //SEG39 [23] call play_init 
-  //SEG40 [460] phi from main::@28 to play_init [phi:main::@28->play_init]
+  //SEG40 [460] phi from main::@11 to play_init [phi:main::@11->play_init]
     jsr play_init
-  //SEG41 [24] phi from main::@28 to main::@29 [phi:main::@28->main::@29]
-  //SEG42 main::@29
+  //SEG41 [24] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
+  //SEG42 main::@12
   //SEG43 [25] call play_spawn_current 
-  //SEG44 [285] phi from main::@29 to play_spawn_current [phi:main::@29->play_spawn_current]
-  //SEG45 [285] phi (byte) game_over#65 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@29->play_spawn_current#0] -- vbuz1=vbuc1 
+  //SEG44 [285] phi from main::@12 to play_spawn_current [phi:main::@12->play_spawn_current]
+  //SEG45 [285] phi (byte) game_over#65 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@12->play_spawn_current#0] -- vbuz1=vbuc1 
     lda #0
     sta game_over
-  //SEG46 [285] phi (byte) next_piece_idx#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@29->play_spawn_current#1] -- vbuz1=vbuc1 
+  //SEG46 [285] phi (byte) next_piece_idx#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@12->play_spawn_current#1] -- vbuz1=vbuc1 
     sta next_piece_idx
     jsr play_spawn_current
-  //SEG47 [26] phi from main::@29 to main::@30 [phi:main::@29->main::@30]
-  //SEG48 main::@30
+  //SEG47 [26] phi from main::@12 to main::@13 [phi:main::@12->main::@13]
+  //SEG48 main::@13
   //SEG49 [27] call play_spawn_current 
-  //SEG50 [285] phi from main::@30 to play_spawn_current [phi:main::@30->play_spawn_current]
-  //SEG51 [285] phi (byte) game_over#65 = (byte) game_over#52 [phi:main::@30->play_spawn_current#0] -- register_copy 
-  //SEG52 [285] phi (byte) next_piece_idx#17 = (byte) play_spawn_current::piece_idx#2 [phi:main::@30->play_spawn_current#1] -- register_copy 
+  //SEG50 [285] phi from main::@13 to play_spawn_current [phi:main::@13->play_spawn_current]
+  //SEG51 [285] phi (byte) game_over#65 = (byte) game_over#52 [phi:main::@13->play_spawn_current#0] -- register_copy 
+  //SEG52 [285] phi (byte) next_piece_idx#17 = (byte) play_spawn_current::piece_idx#2 [phi:main::@13->play_spawn_current#1] -- register_copy 
     jsr play_spawn_current
-  //SEG53 [28] phi from main::@30 to main::@31 [phi:main::@30->main::@31]
-  //SEG54 main::@31
+  //SEG53 [28] phi from main::@13 to main::@14 [phi:main::@13->main::@14]
+  //SEG54 main::@14
   //SEG55 [29] call render_playfield 
-  //SEG56 [150] phi from main::@31 to render_playfield [phi:main::@31->render_playfield]
-  //SEG57 [150] phi (byte) render_screen_render#22 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@31->render_playfield#0] -- vbuxx=vbuc1 
+  //SEG56 [150] phi from main::@14 to render_playfield [phi:main::@14->render_playfield]
+  //SEG57 [150] phi (byte) render_screen_render#22 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@14->render_playfield#0] -- vbuxx=vbuc1 
     ldx #$40
     jsr render_playfield
-  //SEG58 main::@32
+  //SEG58 main::@15
   //SEG59 [30] (byte~) current_ypos#104 ← (byte) current_ypos#6 -- vbuxx=vbuz1 
     ldx current_ypos
   //SEG60 [31] (byte~) current_xpos#128 ← (byte) current_xpos#103 -- vbuz1=vbuz2 
@@ -23886,22 +24014,22 @@ main: {
     lda current_piece_char
     sta current_piece_char_106
   //SEG63 [34] call render_moving 
-  //SEG64 [129] phi from main::@32 to render_moving [phi:main::@32->render_moving]
-  //SEG65 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#106 [phi:main::@32->render_moving#0] -- register_copy 
-  //SEG66 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#118 [phi:main::@32->render_moving#1] -- register_copy 
-  //SEG67 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#128 [phi:main::@32->render_moving#2] -- register_copy 
-  //SEG68 [129] phi (byte) render_screen_render#33 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@32->render_moving#3] -- vbuz1=vbuc1 
+  //SEG64 [129] phi from main::@15 to render_moving [phi:main::@15->render_moving]
+  //SEG65 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#106 [phi:main::@15->render_moving#0] -- register_copy 
+  //SEG66 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#118 [phi:main::@15->render_moving#1] -- register_copy 
+  //SEG67 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#128 [phi:main::@15->render_moving#2] -- register_copy 
+  //SEG68 [129] phi (byte) render_screen_render#33 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@15->render_moving#3] -- vbuz1=vbuc1 
     lda #$40
     sta render_screen_render_33
-  //SEG69 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#104 [phi:main::@32->render_moving#4] -- register_copy 
+  //SEG69 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#104 [phi:main::@15->render_moving#4] -- register_copy 
     jsr render_moving
-  //SEG70 main::@33
+  //SEG70 main::@16
   //SEG71 [35] (byte~) next_piece_idx#84 ← (byte) play_spawn_current::piece_idx#2 -- vbuxx=vbuz1 
     ldx play_spawn_current.piece_idx
   //SEG72 [36] call render_next 
-  //SEG73 [108] phi from main::@33 to render_next [phi:main::@33->render_next]
-  //SEG74 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#84 [phi:main::@33->render_next#0] -- register_copy 
-  //SEG75 [108] phi (byte) render_screen_render#15 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@33->render_next#1] -- vbuaa=vbuc1 
+  //SEG73 [108] phi from main::@16 to render_next [phi:main::@16->render_next]
+  //SEG74 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#84 [phi:main::@16->render_next#0] -- register_copy 
+  //SEG75 [108] phi (byte) render_screen_render#15 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@16->render_next#1] -- vbuaa=vbuc1 
     lda #$40
     jsr render_next
   //SEG76 [37] (byte*~) current_piece#96 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0) -- pbuz1=pptc1_derefidx_vbuz2 
@@ -23910,112 +24038,112 @@ main: {
     sta current_piece
     lda PIECES+1,y
     sta current_piece+1
-  //SEG77 [38] phi from main::@33 to main::@1 [phi:main::@33->main::@1]
-  //SEG78 [38] phi (byte) level_bcd#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#0] -- vbuz1=vbuc1 
+  //SEG77 [38] phi from main::@16 to main::@1 [phi:main::@16->main::@1]
+  //SEG78 [38] phi (byte) level_bcd#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta level_bcd
-  //SEG79 [38] phi (byte) level#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#1] -- vbuz1=vbuc1 
+  //SEG79 [38] phi (byte) level#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#1] -- vbuz1=vbuc1 
     sta level
-  //SEG80 [38] phi (dword) score_bcd#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#2] -- vduz1=vbuc1 
+  //SEG80 [38] phi (dword) score_bcd#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#2] -- vduz1=vbuc1 
     sta score_bcd
     sta score_bcd+1
     sta score_bcd+2
     sta score_bcd+3
-  //SEG81 [38] phi (word) lines_bcd#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#3] -- vwuz1=vbuc1 
+  //SEG81 [38] phi (word) lines_bcd#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#3] -- vwuz1=vbuc1 
     sta lines_bcd
     sta lines_bcd+1
-  //SEG82 [38] phi (byte) current_movedown_counter#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#4] -- vbuz1=vbuc1 
+  //SEG82 [38] phi (byte) current_movedown_counter#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#4] -- vbuz1=vbuc1 
     sta current_movedown_counter
-  //SEG83 [38] phi (byte) keyboard_events_size#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#5] -- vbuz1=vbuc1 
+  //SEG83 [38] phi (byte) keyboard_events_size#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#5] -- vbuz1=vbuc1 
     sta keyboard_events_size
-  //SEG84 [38] phi (byte) next_piece_idx#10 = (byte) play_spawn_current::piece_idx#2 [phi:main::@33->main::@1#6] -- register_copy 
-  //SEG85 [38] phi (byte) game_over#10 = (byte) game_over#52 [phi:main::@33->main::@1#7] -- register_copy 
-  //SEG86 [38] phi (byte) current_ypos#11 = (byte) current_ypos#6 [phi:main::@33->main::@1#8] -- register_copy 
-  //SEG87 [38] phi (byte) current_xpos#122 = (byte) current_xpos#103 [phi:main::@33->main::@1#9] -- register_copy 
-  //SEG88 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#74 [phi:main::@33->main::@1#10] -- register_copy 
-  //SEG89 [38] phi (byte) current_orientation#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#11] -- vbuz1=vbuc1 
+  //SEG84 [38] phi (byte) next_piece_idx#10 = (byte) play_spawn_current::piece_idx#2 [phi:main::@16->main::@1#6] -- register_copy 
+  //SEG85 [38] phi (byte) game_over#10 = (byte) game_over#52 [phi:main::@16->main::@1#7] -- register_copy 
+  //SEG86 [38] phi (byte) current_ypos#11 = (byte) current_ypos#6 [phi:main::@16->main::@1#8] -- register_copy 
+  //SEG87 [38] phi (byte) current_xpos#122 = (byte) current_xpos#103 [phi:main::@16->main::@1#9] -- register_copy 
+  //SEG88 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#74 [phi:main::@16->main::@1#10] -- register_copy 
+  //SEG89 [38] phi (byte) current_orientation#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#11] -- vbuz1=vbuc1 
     sta current_orientation
-  //SEG90 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#5 [phi:main::@33->main::@1#12] -- register_copy 
-  //SEG91 [38] phi (byte*) current_piece#10 = (byte*~) current_piece#96 [phi:main::@33->main::@1#13] -- register_copy 
-  //SEG92 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#1 [phi:main::@33->main::@1#14] -- register_copy 
-  //SEG93 [38] phi (byte) render_screen_render#18 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@33->main::@1#15] -- vbuz1=vbuc1 
+  //SEG90 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#5 [phi:main::@16->main::@1#12] -- register_copy 
+  //SEG91 [38] phi (byte*) current_piece#10 = (byte*~) current_piece#96 [phi:main::@16->main::@1#13] -- register_copy 
+  //SEG92 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#1 [phi:main::@16->main::@1#14] -- register_copy 
+  //SEG93 [38] phi (byte) render_screen_render#18 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@16->main::@1#15] -- vbuz1=vbuc1 
     lda #$40
     sta render_screen_render
-  //SEG94 [38] phi (byte) render_screen_show#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@33->main::@1#16] -- vbuz1=vbuc1 
+  //SEG94 [38] phi (byte) render_screen_show#16 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@1#16] -- vbuz1=vbuc1 
     lda #0
     sta render_screen_show
-  //SEG95 [38] phi from main::@17 to main::@1 [phi:main::@17->main::@1]
-  //SEG96 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@17->main::@1#0] -- register_copy 
-  //SEG97 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@17->main::@1#1] -- register_copy 
-  //SEG98 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@17->main::@1#2] -- register_copy 
-  //SEG99 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@17->main::@1#3] -- register_copy 
-  //SEG100 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@17->main::@1#4] -- register_copy 
-  //SEG101 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@17->main::@1#5] -- register_copy 
-  //SEG102 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@17->main::@1#6] -- register_copy 
-  //SEG103 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@17->main::@1#7] -- register_copy 
-  //SEG104 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@17->main::@1#8] -- register_copy 
-  //SEG105 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@17->main::@1#9] -- register_copy 
-  //SEG106 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@17->main::@1#10] -- register_copy 
-  //SEG107 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@17->main::@1#11] -- register_copy 
-  //SEG108 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@17->main::@1#12] -- register_copy 
-  //SEG109 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@17->main::@1#13] -- register_copy 
-  //SEG110 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@17->main::@1#14] -- register_copy 
+  //SEG95 [38] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  //SEG96 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG97 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@6->main::@1#1] -- register_copy 
+  //SEG98 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@6->main::@1#2] -- register_copy 
+  //SEG99 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@6->main::@1#3] -- register_copy 
+  //SEG100 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@6->main::@1#4] -- register_copy 
+  //SEG101 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@6->main::@1#5] -- register_copy 
+  //SEG102 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@6->main::@1#6] -- register_copy 
+  //SEG103 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@6->main::@1#7] -- register_copy 
+  //SEG104 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@6->main::@1#8] -- register_copy 
+  //SEG105 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@6->main::@1#9] -- register_copy 
+  //SEG106 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@6->main::@1#10] -- register_copy 
+  //SEG107 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@6->main::@1#11] -- register_copy 
+  //SEG108 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@6->main::@1#12] -- register_copy 
+  //SEG109 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@6->main::@1#13] -- register_copy 
+  //SEG110 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@6->main::@1#14] -- register_copy 
   //SEG111 main::@1
   b1:
   // Wait for a frame to pass
-  //SEG112 main::@6
-  b6:
-  //SEG113 [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG112 main::@2
+  b2:
+  //SEG113 [39] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG114 [40] phi from main::@6 to main::@8 [phi:main::@6->main::@8]
-  //SEG115 main::@8
+    bne b2
+  //SEG114 [40] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  //SEG115 main::@3
   //SEG116 [41] call render_show 
     jsr render_show
-  //SEG117 [42] phi from main::@8 to main::@35 [phi:main::@8->main::@35]
-  //SEG118 main::@35
+  //SEG117 [42] phi from main::@3 to main::@17 [phi:main::@3->main::@17]
+  //SEG118 main::@17
   //SEG119 [43] call keyboard_event_scan 
-  //SEG120 [395] phi from main::@35 to keyboard_event_scan [phi:main::@35->keyboard_event_scan]
+  //SEG120 [395] phi from main::@17 to keyboard_event_scan [phi:main::@17->keyboard_event_scan]
     jsr keyboard_event_scan
-  //SEG121 [44] phi from main::@35 to main::@36 [phi:main::@35->main::@36]
-  //SEG122 main::@36
+  //SEG121 [44] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
+  //SEG122 main::@18
   //SEG123 [45] call keyboard_event_get 
     jsr keyboard_event_get
   //SEG124 [46] (byte) keyboard_event_get::return#3 ← (byte) keyboard_event_get::return#2
-  //SEG125 main::@37
+  //SEG125 main::@19
   //SEG126 [47] (byte) main::key_event#0 ← (byte) keyboard_event_get::return#3
-  //SEG127 [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9 -- vbuz1_eq_0_then_la1 
+  //SEG127 [48] if((byte) game_over#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4 -- vbuz1_eq_0_then_la1 
     lda game_over
     cmp #0
-    beq b9
-  //SEG128 main::@11
-  b11:
+    beq b4
+  //SEG128 main::@5
+  b5:
   //SEG129 [49] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-    jmp b11
-  //SEG130 main::@9
-  b9:
+    jmp b5
+  //SEG130 main::@4
+  b4:
   //SEG131 [50] (byte) play_movement::key_event#0 ← (byte) main::key_event#0 -- vbuz1=vbuxx 
     stx play_movement.key_event
   //SEG132 [51] call play_movement 
     jsr play_movement
   //SEG133 [52] (byte) play_movement::return#3 ← (byte) play_movement::return#2 -- vbuaa=vbuz1 
     lda play_movement.return
-  //SEG134 main::@38
+  //SEG134 main::@20
   //SEG135 [53] (byte) main::render#1 ← (byte) play_movement::return#3
-  //SEG136 main::@17
+  //SEG136 main::@6
   //SEG137 [54] if((byte) main::render#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b1
-  //SEG138 main::@23
+  //SEG138 main::@7
   //SEG139 [55] (byte~) render_screen_render#70 ← (byte) render_screen_render#18 -- vbuxx=vbuz1 
     ldx render_screen_render
   //SEG140 [56] call render_playfield 
-  //SEG141 [150] phi from main::@23 to render_playfield [phi:main::@23->render_playfield]
-  //SEG142 [150] phi (byte) render_screen_render#22 = (byte~) render_screen_render#70 [phi:main::@23->render_playfield#0] -- register_copy 
+  //SEG141 [150] phi from main::@7 to render_playfield [phi:main::@7->render_playfield]
+  //SEG142 [150] phi (byte) render_screen_render#22 = (byte~) render_screen_render#70 [phi:main::@7->render_playfield#0] -- register_copy 
     jsr render_playfield
-  //SEG143 main::@39
+  //SEG143 main::@21
   //SEG144 [57] (byte~) current_ypos#105 ← (byte) current_ypos#19 -- vbuxx=vbuz1 
     ldx current_ypos
   //SEG145 [58] (byte~) render_screen_render#69 ← (byte) render_screen_render#18 -- vbuz1=vbuz2 
@@ -24033,49 +24161,49 @@ main: {
     lda current_piece_char
     sta current_piece_char_107
   //SEG149 [62] call render_moving 
-  //SEG150 [129] phi from main::@39 to render_moving [phi:main::@39->render_moving]
-  //SEG151 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#107 [phi:main::@39->render_moving#0] -- register_copy 
-  //SEG152 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#119 [phi:main::@39->render_moving#1] -- register_copy 
-  //SEG153 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#129 [phi:main::@39->render_moving#2] -- register_copy 
-  //SEG154 [129] phi (byte) render_screen_render#33 = (byte~) render_screen_render#69 [phi:main::@39->render_moving#3] -- register_copy 
-  //SEG155 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#105 [phi:main::@39->render_moving#4] -- register_copy 
+  //SEG150 [129] phi from main::@21 to render_moving [phi:main::@21->render_moving]
+  //SEG151 [129] phi (byte) current_piece_char#68 = (byte~) current_piece_char#107 [phi:main::@21->render_moving#0] -- register_copy 
+  //SEG152 [129] phi (byte*) current_piece_gfx#64 = (byte*~) current_piece_gfx#119 [phi:main::@21->render_moving#1] -- register_copy 
+  //SEG153 [129] phi (byte) current_xpos#59 = (byte~) current_xpos#129 [phi:main::@21->render_moving#2] -- register_copy 
+  //SEG154 [129] phi (byte) render_screen_render#33 = (byte~) render_screen_render#69 [phi:main::@21->render_moving#3] -- register_copy 
+  //SEG155 [129] phi (byte) current_ypos#13 = (byte~) current_ypos#105 [phi:main::@21->render_moving#4] -- register_copy 
     jsr render_moving
-  //SEG156 main::@40
+  //SEG156 main::@22
   //SEG157 [63] (byte~) render_screen_render#68 ← (byte) render_screen_render#18 -- vbuaa=vbuz1 
     lda render_screen_render
   //SEG158 [64] (byte~) next_piece_idx#85 ← (byte) next_piece_idx#16 -- vbuxx=vbuz1 
     ldx next_piece_idx
   //SEG159 [65] call render_next 
-  //SEG160 [108] phi from main::@40 to render_next [phi:main::@40->render_next]
-  //SEG161 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#85 [phi:main::@40->render_next#0] -- register_copy 
-  //SEG162 [108] phi (byte) render_screen_render#15 = (byte~) render_screen_render#68 [phi:main::@40->render_next#1] -- register_copy 
+  //SEG160 [108] phi from main::@22 to render_next [phi:main::@22->render_next]
+  //SEG161 [108] phi (byte) next_piece_idx#12 = (byte~) next_piece_idx#85 [phi:main::@22->render_next#0] -- register_copy 
+  //SEG162 [108] phi (byte) render_screen_render#15 = (byte~) render_screen_render#68 [phi:main::@22->render_next#1] -- register_copy 
     jsr render_next
-  //SEG163 [66] phi from main::@40 to main::@41 [phi:main::@40->main::@41]
-  //SEG164 main::@41
+  //SEG163 [66] phi from main::@22 to main::@23 [phi:main::@22->main::@23]
+  //SEG164 main::@23
   //SEG165 [67] call render_score 
     jsr render_score
-  //SEG166 [68] phi from main::@41 to main::@42 [phi:main::@41->main::@42]
-  //SEG167 main::@42
+  //SEG166 [68] phi from main::@23 to main::@24 [phi:main::@23->main::@24]
+  //SEG167 main::@24
   //SEG168 [69] call render_screen_swap 
     jsr render_screen_swap
-  //SEG169 [38] phi from main::@42 to main::@1 [phi:main::@42->main::@1]
-  //SEG170 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@42->main::@1#0] -- register_copy 
-  //SEG171 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@42->main::@1#1] -- register_copy 
-  //SEG172 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@42->main::@1#2] -- register_copy 
-  //SEG173 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@42->main::@1#3] -- register_copy 
-  //SEG174 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@42->main::@1#4] -- register_copy 
-  //SEG175 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@42->main::@1#5] -- register_copy 
-  //SEG176 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@42->main::@1#6] -- register_copy 
-  //SEG177 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@42->main::@1#7] -- register_copy 
-  //SEG178 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@42->main::@1#8] -- register_copy 
-  //SEG179 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@42->main::@1#9] -- register_copy 
-  //SEG180 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@42->main::@1#10] -- register_copy 
-  //SEG181 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@42->main::@1#11] -- register_copy 
-  //SEG182 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@42->main::@1#12] -- register_copy 
-  //SEG183 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@42->main::@1#13] -- register_copy 
-  //SEG184 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@42->main::@1#14] -- register_copy 
-  //SEG185 [38] phi (byte) render_screen_render#18 = (byte) render_screen_render#11 [phi:main::@42->main::@1#15] -- register_copy 
-  //SEG186 [38] phi (byte) render_screen_show#16 = (byte) render_screen_show#13 [phi:main::@42->main::@1#16] -- register_copy 
+  //SEG169 [38] phi from main::@24 to main::@1 [phi:main::@24->main::@1]
+  //SEG170 [38] phi (byte) level_bcd#11 = (byte) level_bcd#17 [phi:main::@24->main::@1#0] -- register_copy 
+  //SEG171 [38] phi (byte) level#10 = (byte) level#17 [phi:main::@24->main::@1#1] -- register_copy 
+  //SEG172 [38] phi (dword) score_bcd#18 = (dword) score_bcd#14 [phi:main::@24->main::@1#2] -- register_copy 
+  //SEG173 [38] phi (word) lines_bcd#19 = (word) lines_bcd#15 [phi:main::@24->main::@1#3] -- register_copy 
+  //SEG174 [38] phi (byte) current_movedown_counter#16 = (byte) current_movedown_counter#14 [phi:main::@24->main::@1#4] -- register_copy 
+  //SEG175 [38] phi (byte) keyboard_events_size#19 = (byte) keyboard_events_size#16 [phi:main::@24->main::@1#5] -- register_copy 
+  //SEG176 [38] phi (byte) next_piece_idx#10 = (byte) next_piece_idx#16 [phi:main::@24->main::@1#6] -- register_copy 
+  //SEG177 [38] phi (byte) game_over#10 = (byte) game_over#15 [phi:main::@24->main::@1#7] -- register_copy 
+  //SEG178 [38] phi (byte) current_ypos#11 = (byte) current_ypos#19 [phi:main::@24->main::@1#8] -- register_copy 
+  //SEG179 [38] phi (byte) current_xpos#122 = (byte) current_xpos#19 [phi:main::@24->main::@1#9] -- register_copy 
+  //SEG180 [38] phi (byte*) current_piece_gfx#112 = (byte*) current_piece_gfx#18 [phi:main::@24->main::@1#10] -- register_copy 
+  //SEG181 [38] phi (byte) current_orientation#13 = (byte) current_orientation#17 [phi:main::@24->main::@1#11] -- register_copy 
+  //SEG182 [38] phi (byte) current_piece_char#10 = (byte) current_piece_char#16 [phi:main::@24->main::@1#12] -- register_copy 
+  //SEG183 [38] phi (byte*) current_piece#10 = (byte*) current_piece#15 [phi:main::@24->main::@1#13] -- register_copy 
+  //SEG184 [38] phi (byte) current_movedown_slow#14 = (byte) current_movedown_slow#21 [phi:main::@24->main::@1#14] -- register_copy 
+  //SEG185 [38] phi (byte) render_screen_render#18 = (byte) render_screen_render#11 [phi:main::@24->main::@1#15] -- register_copy 
+  //SEG186 [38] phi (byte) render_screen_show#16 = (byte) render_screen_show#13 [phi:main::@24->main::@1#16] -- register_copy 
     jmp b1
 }
 //SEG187 render_screen_swap
@@ -24101,124 +24229,124 @@ render_score: {
     .const lines_offset = $28*1+$16
     .const level_offset = $28*$13+$1f
     .label screen = 5
-  //SEG193 [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@2 -- vbuz1_eq_0_then_la1 
+  //SEG193 [73] if((byte) render_screen_render#18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_score::@1 -- vbuz1_eq_0_then_la1 
     lda render_screen_render
     cmp #0
-    beq b1
-  //SEG194 [74] phi from render_score to render_score::@3 [phi:render_score->render_score::@3]
-  //SEG195 render_score::@3
-  //SEG196 [75] phi from render_score::@3 to render_score::@2 [phi:render_score::@3->render_score::@2]
-  //SEG197 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_score::@3->render_score::@2#0] -- pbuz1=pbuc1 
+    beq b2
+  //SEG194 [74] phi from render_score to render_score::@2 [phi:render_score->render_score::@2]
+  //SEG195 render_score::@2
+  //SEG196 [75] phi from render_score::@2 to render_score::@1 [phi:render_score::@2->render_score::@1]
+  //SEG197 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_score::@2->render_score::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2
     sta screen
     lda #>PLAYFIELD_SCREEN_2
     sta screen+1
-    jmp b2
-  //SEG198 [75] phi from render_score to render_score::@2 [phi:render_score->render_score::@2]
-  b1:
-  //SEG199 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_score->render_score::@2#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG198 [75] phi from render_score to render_score::@1 [phi:render_score->render_score::@1]
+  b2:
+  //SEG199 [75] phi (byte*) render_score::screen#3 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_score->render_score::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1
     sta screen
     lda #>PLAYFIELD_SCREEN_1
     sta screen+1
-  //SEG200 render_score::@2
-  b2:
+  //SEG200 render_score::@1
+  b1:
   //SEG201 [76] (byte*) render_bcd::screen#0 ← (byte*) render_score::screen#3
   //SEG202 [77] (byte) render_bcd::bcd#0 ← *((const byte*) render_score::score_bytes#0+(byte/signed byte/word/signed word/dword/signed dword) 2) -- vbuxx=_deref_pbuc1 
     ldx score_bytes+2
   //SEG203 [78] call render_bcd 
-  //SEG204 [95] phi from render_score::@2 to render_bcd [phi:render_score::@2->render_bcd]
-  //SEG205 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#0 [phi:render_score::@2->render_bcd#0] -- register_copy 
-  //SEG206 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@2->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG204 [95] phi from render_score::@1 to render_bcd [phi:render_score::@1->render_bcd]
+  //SEG205 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#0 [phi:render_score::@1->render_bcd#0] -- register_copy 
+  //SEG206 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@1->render_bcd#1] -- vbuyy=vbuc1 
     ldy #0
-  //SEG207 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0 [phi:render_score::@2->render_bcd#2] -- vwuz1=vwuc1 
+  //SEG207 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0 [phi:render_score::@1->render_bcd#2] -- vwuz1=vwuc1 
     lda #<score_offset
     sta render_bcd.offset
     lda #>score_offset
     sta render_bcd.offset+1
-  //SEG208 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#0 [phi:render_score::@2->render_bcd#3] -- register_copy 
+  //SEG208 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#0 [phi:render_score::@1->render_bcd#3] -- register_copy 
     jsr render_bcd
-  //SEG209 render_score::@5
+  //SEG209 render_score::@3
   //SEG210 [79] (byte*) render_bcd::screen#1 ← (byte*) render_score::screen#3
   //SEG211 [80] (byte) render_bcd::bcd#1 ← *((const byte*) render_score::score_bytes#0+(byte/signed byte/word/signed word/dword/signed dword) 1) -- vbuxx=_deref_pbuc1 
     ldx score_bytes+1
   //SEG212 [81] call render_bcd 
-  //SEG213 [95] phi from render_score::@5 to render_bcd [phi:render_score::@5->render_bcd]
-  //SEG214 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#1 [phi:render_score::@5->render_bcd#0] -- register_copy 
-  //SEG215 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@5->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG213 [95] phi from render_score::@3 to render_bcd [phi:render_score::@3->render_bcd]
+  //SEG214 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#1 [phi:render_score::@3->render_bcd#0] -- register_copy 
+  //SEG215 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@3->render_bcd#1] -- vbuyy=vbuc1 
     ldy #0
-  //SEG216 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:render_score::@5->render_bcd#2] -- vwuz1=vbuc1 
+  //SEG216 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 2 [phi:render_score::@3->render_bcd#2] -- vwuz1=vbuc1 
     lda #score_offset+2
     sta render_bcd.offset
     tya
     sta render_bcd.offset+1
-  //SEG217 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#1 [phi:render_score::@5->render_bcd#3] -- register_copy 
+  //SEG217 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#1 [phi:render_score::@3->render_bcd#3] -- register_copy 
     jsr render_bcd
-  //SEG218 render_score::@6
+  //SEG218 render_score::@4
   //SEG219 [82] (byte*) render_bcd::screen#2 ← (byte*) render_score::screen#3
   //SEG220 [83] (byte) render_bcd::bcd#2 ← *((const byte*) render_score::score_bytes#0) -- vbuxx=_deref_pbuc1 
     ldx score_bytes
   //SEG221 [84] call render_bcd 
-  //SEG222 [95] phi from render_score::@6 to render_bcd [phi:render_score::@6->render_bcd]
-  //SEG223 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#2 [phi:render_score::@6->render_bcd#0] -- register_copy 
-  //SEG224 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@6->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG222 [95] phi from render_score::@4 to render_bcd [phi:render_score::@4->render_bcd]
+  //SEG223 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#2 [phi:render_score::@4->render_bcd#0] -- register_copy 
+  //SEG224 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@4->render_bcd#1] -- vbuyy=vbuc1 
     ldy #0
-  //SEG225 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 4 [phi:render_score::@6->render_bcd#2] -- vwuz1=vbuc1 
+  //SEG225 [95] phi (word) render_bcd::offset#6 = (const word) render_score::score_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 4 [phi:render_score::@4->render_bcd#2] -- vwuz1=vbuc1 
     lda #score_offset+4
     sta render_bcd.offset
     tya
     sta render_bcd.offset+1
-  //SEG226 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#2 [phi:render_score::@6->render_bcd#3] -- register_copy 
+  //SEG226 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#2 [phi:render_score::@4->render_bcd#3] -- register_copy 
     jsr render_bcd
-  //SEG227 render_score::@7
+  //SEG227 render_score::@5
   //SEG228 [85] (byte) render_bcd::bcd#3 ← > (word) lines_bcd#15 -- vbuxx=_hi_vwuz1 
     lda lines_bcd+1
     tax
   //SEG229 [86] (byte*) render_bcd::screen#3 ← (byte*) render_score::screen#3
   //SEG230 [87] call render_bcd 
-  //SEG231 [95] phi from render_score::@7 to render_bcd [phi:render_score::@7->render_bcd]
-  //SEG232 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#3 [phi:render_score::@7->render_bcd#0] -- register_copy 
-  //SEG233 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@7->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG231 [95] phi from render_score::@5 to render_bcd [phi:render_score::@5->render_bcd]
+  //SEG232 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#3 [phi:render_score::@5->render_bcd#0] -- register_copy 
+  //SEG233 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@5->render_bcd#1] -- vbuyy=vbuc1 
     ldy #1
-  //SEG234 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0 [phi:render_score::@7->render_bcd#2] -- vwuz1=vwuc1 
+  //SEG234 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0 [phi:render_score::@5->render_bcd#2] -- vwuz1=vwuc1 
     lda #<lines_offset
     sta render_bcd.offset
     lda #>lines_offset
     sta render_bcd.offset+1
-  //SEG235 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#3 [phi:render_score::@7->render_bcd#3] -- register_copy 
+  //SEG235 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#3 [phi:render_score::@5->render_bcd#3] -- register_copy 
     jsr render_bcd
-  //SEG236 render_score::@8
+  //SEG236 render_score::@6
   //SEG237 [88] (byte) render_bcd::bcd#4 ← < (word) lines_bcd#15 -- vbuxx=_lo_vwuz1 
     lda lines_bcd
     tax
   //SEG238 [89] (byte*) render_bcd::screen#4 ← (byte*) render_score::screen#3
   //SEG239 [90] call render_bcd 
-  //SEG240 [95] phi from render_score::@8 to render_bcd [phi:render_score::@8->render_bcd]
-  //SEG241 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#4 [phi:render_score::@8->render_bcd#0] -- register_copy 
-  //SEG242 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@8->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG240 [95] phi from render_score::@6 to render_bcd [phi:render_score::@6->render_bcd]
+  //SEG241 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#4 [phi:render_score::@6->render_bcd#0] -- register_copy 
+  //SEG242 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@6->render_bcd#1] -- vbuyy=vbuc1 
     ldy #0
-  //SEG243 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@8->render_bcd#2] -- vwuz1=vbuc1 
+  //SEG243 [95] phi (word) render_bcd::offset#6 = (const word) render_score::lines_offset#0+(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:render_score::@6->render_bcd#2] -- vwuz1=vbuc1 
     lda #lines_offset+1
     sta render_bcd.offset
     tya
     sta render_bcd.offset+1
-  //SEG244 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#4 [phi:render_score::@8->render_bcd#3] -- register_copy 
+  //SEG244 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#4 [phi:render_score::@6->render_bcd#3] -- register_copy 
     jsr render_bcd
-  //SEG245 render_score::@9
+  //SEG245 render_score::@7
   //SEG246 [91] (byte*) render_bcd::screen#5 ← (byte*) render_score::screen#3
   //SEG247 [92] (byte) render_bcd::bcd#5 ← (byte) level_bcd#17 -- vbuxx=vbuz1 
     ldx level_bcd
   //SEG248 [93] call render_bcd 
-  //SEG249 [95] phi from render_score::@9 to render_bcd [phi:render_score::@9->render_bcd]
-  //SEG250 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#5 [phi:render_score::@9->render_bcd#0] -- register_copy 
-  //SEG251 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@9->render_bcd#1] -- vbuyy=vbuc1 
+  //SEG249 [95] phi from render_score::@7 to render_bcd [phi:render_score::@7->render_bcd]
+  //SEG250 [95] phi (byte) render_bcd::bcd#6 = (byte) render_bcd::bcd#5 [phi:render_score::@7->render_bcd#0] -- register_copy 
+  //SEG251 [95] phi (byte) render_bcd::only_low#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_score::@7->render_bcd#1] -- vbuyy=vbuc1 
     ldy #0
-  //SEG252 [95] phi (word) render_bcd::offset#6 = (const word) render_score::level_offset#0 [phi:render_score::@9->render_bcd#2] -- vwuz1=vwuc1 
+  //SEG252 [95] phi (word) render_bcd::offset#6 = (const word) render_score::level_offset#0 [phi:render_score::@7->render_bcd#2] -- vwuz1=vwuc1 
     lda #<level_offset
     sta render_bcd.offset
     lda #>level_offset
     sta render_bcd.offset+1
-  //SEG253 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#5 [phi:render_score::@9->render_bcd#3] -- register_copy 
+  //SEG253 [95] phi (byte*) render_bcd::screen#6 = (byte*) render_bcd::screen#5 [phi:render_score::@7->render_bcd#3] -- register_copy 
     jsr render_bcd
   //SEG254 render_score::@return
   //SEG255 [94] return 
@@ -24295,27 +24423,27 @@ render_next: {
     .label next_piece_gfx = 5
     .label screen_next_area = 7
     .label l = 9
-  //SEG274 [109] if((byte) render_screen_render#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@2 -- vbuaa_eq_0_then_la1 
+  //SEG274 [109] if((byte) render_screen_render#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b1
-  //SEG275 [110] phi from render_next to render_next::@3 [phi:render_next->render_next::@3]
-  //SEG276 render_next::@3
-  //SEG277 [111] phi from render_next::@3 to render_next::@2 [phi:render_next::@3->render_next::@2]
-  //SEG278 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_2#0+(const word) render_next::next_area_offset#0 [phi:render_next::@3->render_next::@2#0] -- pbuz1=pbuc1 
+    beq b2
+  //SEG275 [110] phi from render_next to render_next::@2 [phi:render_next->render_next::@2]
+  //SEG276 render_next::@2
+  //SEG277 [111] phi from render_next::@2 to render_next::@1 [phi:render_next::@2->render_next::@1]
+  //SEG278 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_2#0+(const word) render_next::next_area_offset#0 [phi:render_next::@2->render_next::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2+next_area_offset
     sta screen_next_area
     lda #>PLAYFIELD_SCREEN_2+next_area_offset
     sta screen_next_area+1
-    jmp b2
-  //SEG279 [111] phi from render_next to render_next::@2 [phi:render_next->render_next::@2]
-  b1:
-  //SEG280 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_1#0+(const word) render_next::next_area_offset#0 [phi:render_next->render_next::@2#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG279 [111] phi from render_next to render_next::@1 [phi:render_next->render_next::@1]
+  b2:
+  //SEG280 [111] phi (byte*) render_next::screen_next_area#11 = (const byte*) PLAYFIELD_SCREEN_1#0+(const word) render_next::next_area_offset#0 [phi:render_next->render_next::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1+next_area_offset
     sta screen_next_area
     lda #>PLAYFIELD_SCREEN_1+next_area_offset
     sta screen_next_area+1
-  //SEG281 render_next::@2
-  b2:
+  //SEG281 render_next::@1
+  b1:
   //SEG282 [112] (byte~) render_next::$4 ← (byte) next_piece_idx#12 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuyy=vbuxx_rol_1 
     txa
     asl
@@ -24328,29 +24456,29 @@ render_next: {
     sta next_piece_gfx
     lda PIECES+1,y
     sta next_piece_gfx+1
-  //SEG285 [115] phi from render_next::@2 to render_next::@5 [phi:render_next::@2->render_next::@5]
-  //SEG286 [115] phi (byte) render_next::l#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@2->render_next::@5#0] -- vbuz1=vbuc1 
+  //SEG285 [115] phi from render_next::@1 to render_next::@3 [phi:render_next::@1->render_next::@3]
+  //SEG286 [115] phi (byte) render_next::l#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@1->render_next::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta l
-  //SEG287 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#11 [phi:render_next::@2->render_next::@5#1] -- register_copy 
-  //SEG288 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*~) render_next::next_piece_gfx#9 [phi:render_next::@2->render_next::@5#2] -- register_copy 
-  //SEG289 [115] phi from render_next::@11 to render_next::@5 [phi:render_next::@11->render_next::@5]
-  //SEG290 [115] phi (byte) render_next::l#7 = (byte) render_next::l#1 [phi:render_next::@11->render_next::@5#0] -- register_copy 
-  //SEG291 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#4 [phi:render_next::@11->render_next::@5#1] -- register_copy 
-  //SEG292 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@11->render_next::@5#2] -- register_copy 
-  //SEG293 render_next::@5
-  b5:
-  //SEG294 [116] phi from render_next::@5 to render_next::@6 [phi:render_next::@5->render_next::@6]
-  //SEG295 [116] phi (byte) render_next::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@5->render_next::@6#0] -- vbuxx=vbuc1 
+  //SEG287 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#11 [phi:render_next::@1->render_next::@3#1] -- register_copy 
+  //SEG288 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*~) render_next::next_piece_gfx#9 [phi:render_next::@1->render_next::@3#2] -- register_copy 
+  //SEG289 [115] phi from render_next::@8 to render_next::@3 [phi:render_next::@8->render_next::@3]
+  //SEG290 [115] phi (byte) render_next::l#7 = (byte) render_next::l#1 [phi:render_next::@8->render_next::@3#0] -- register_copy 
+  //SEG291 [115] phi (byte*) render_next::screen_next_area#10 = (byte*) render_next::screen_next_area#4 [phi:render_next::@8->render_next::@3#1] -- register_copy 
+  //SEG292 [115] phi (byte*) render_next::next_piece_gfx#3 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@8->render_next::@3#2] -- register_copy 
+  //SEG293 render_next::@3
+  b3:
+  //SEG294 [116] phi from render_next::@3 to render_next::@4 [phi:render_next::@3->render_next::@4]
+  //SEG295 [116] phi (byte) render_next::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_next::@3->render_next::@4#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG296 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#10 [phi:render_next::@5->render_next::@6#1] -- register_copy 
-  //SEG297 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#3 [phi:render_next::@5->render_next::@6#2] -- register_copy 
-  //SEG298 [116] phi from render_next::@8 to render_next::@6 [phi:render_next::@8->render_next::@6]
-  //SEG299 [116] phi (byte) render_next::c#2 = (byte) render_next::c#1 [phi:render_next::@8->render_next::@6#0] -- register_copy 
-  //SEG300 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#3 [phi:render_next::@8->render_next::@6#1] -- register_copy 
-  //SEG301 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@8->render_next::@6#2] -- register_copy 
-  //SEG302 render_next::@6
-  b6:
+  //SEG296 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#10 [phi:render_next::@3->render_next::@4#1] -- register_copy 
+  //SEG297 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#3 [phi:render_next::@3->render_next::@4#2] -- register_copy 
+  //SEG298 [116] phi from render_next::@6 to render_next::@4 [phi:render_next::@6->render_next::@4]
+  //SEG299 [116] phi (byte) render_next::c#2 = (byte) render_next::c#1 [phi:render_next::@6->render_next::@4#0] -- register_copy 
+  //SEG300 [116] phi (byte*) render_next::screen_next_area#5 = (byte*) render_next::screen_next_area#3 [phi:render_next::@6->render_next::@4#1] -- register_copy 
+  //SEG301 [116] phi (byte*) render_next::next_piece_gfx#2 = (byte*) render_next::next_piece_gfx#1 [phi:render_next::@6->render_next::@4#2] -- register_copy 
+  //SEG302 render_next::@4
+  b4:
   //SEG303 [117] (byte) render_next::cell#0 ← *((byte*) render_next::next_piece_gfx#2) -- vbuaa=_deref_pbuz1 
     ldy #0
     lda (next_piece_gfx),y
@@ -24359,16 +24487,16 @@ render_next: {
     bne !+
     inc next_piece_gfx+1
   !:
-  //SEG305 [119] if((byte) render_next::cell#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@7 -- vbuaa_neq_0_then_la1 
+  //SEG305 [119] if((byte) render_next::cell#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_next::@5 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b7
-  //SEG306 render_next::@9
+    bne b5
+  //SEG306 render_next::@7
   //SEG307 [120] *((byte*) render_next::screen_next_area#5) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuz1=vbuc1 
     lda #0
     tay
     sta (screen_next_area),y
-  //SEG308 render_next::@8
-  b8:
+  //SEG308 render_next::@6
+  b6:
   //SEG309 [121] (byte*) render_next::screen_next_area#3 ← ++ (byte*) render_next::screen_next_area#5 -- pbuz1=_inc_pbuz1 
     inc screen_next_area
     bne !+
@@ -24376,10 +24504,10 @@ render_next: {
   !:
   //SEG310 [122] (byte) render_next::c#1 ← ++ (byte) render_next::c#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG311 [123] if((byte) render_next::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG311 [123] if((byte) render_next::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #4
-    bne b6
-  //SEG312 render_next::@11
+    bne b4
+  //SEG312 render_next::@8
   //SEG313 [124] (byte*) render_next::screen_next_area#4 ← (byte*) render_next::screen_next_area#3 + (byte/signed byte/word/signed word/dword/signed dword) $24 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$24
     clc
@@ -24390,20 +24518,20 @@ render_next: {
   !:
   //SEG314 [125] (byte) render_next::l#1 ← ++ (byte) render_next::l#7 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG315 [126] if((byte) render_next::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@5 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG315 [126] if((byte) render_next::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_next::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp l
-    bne b5
+    bne b3
   //SEG316 render_next::@return
   //SEG317 [127] return 
     rts
-  //SEG318 render_next::@7
-  b7:
+  //SEG318 render_next::@5
+  b5:
   //SEG319 [128] *((byte*) render_next::screen_next_area#5) ← (byte) render_next::next_piece_char#0 -- _deref_pbuz1=vbuz2 
     lda next_piece_char
     ldy #0
     sta (screen_next_area),y
-    jmp b8
+    jmp b6
 }
 //SEG320 render_moving
 // Render the current moving piece at position (current_xpos, current_ypos)
@@ -24435,13 +24563,13 @@ render_moving: {
     lda #2
     cmp ypos2
     bcc b2
-  //SEG332 render_moving::@8
+  //SEG332 render_moving::@7
   //SEG333 [133] (byte) render_moving::i#1 ← (byte) render_moving::i#3 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax i
     axs #-[4]
     stx i
-  //SEG334 [134] phi from render_moving::@5 render_moving::@8 to render_moving::@3 [phi:render_moving::@5/render_moving::@8->render_moving::@3]
-  //SEG335 [134] phi (byte) render_moving::i#8 = (byte) render_moving::i#2 [phi:render_moving::@5/render_moving::@8->render_moving::@3#0] -- register_copy 
+  //SEG334 [134] phi from render_moving::@5 render_moving::@7 to render_moving::@3 [phi:render_moving::@5/render_moving::@7->render_moving::@3]
+  //SEG335 [134] phi (byte) render_moving::i#8 = (byte) render_moving::i#2 [phi:render_moving::@5/render_moving::@7->render_moving::@3#0] -- register_copy 
   //SEG336 render_moving::@3
   b3:
   //SEG337 [135] (byte) render_moving::ypos2#1 ← (byte) render_moving::ypos2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
@@ -24596,7 +24724,7 @@ play_movement: {
     jsr play_move_down
   //SEG397 [166] (byte) play_move_down::return#0 ← (byte) play_move_down::return#3 -- vbuaa=vbuxx 
     txa
-  //SEG398 play_movement::@5
+  //SEG398 play_movement::@2
   //SEG399 [167] (byte~) play_movement::$0 ← (byte) play_move_down::return#0
   //SEG400 [168] (byte) play_movement::render#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 + (byte~) play_movement::$0 -- vbuz1=vbuc1_plus_vbuaa 
     clc
@@ -24606,11 +24734,11 @@ play_movement: {
     lda game_over
     cmp #0
     beq b1
-  //SEG402 [170] phi from play_movement::@5 play_movement::@7 to play_movement::@return [phi:play_movement::@5/play_movement::@7->play_movement::@return]
-  //SEG403 [170] phi (byte) current_xpos#19 = (byte) current_xpos#22 [phi:play_movement::@5/play_movement::@7->play_movement::@return#0] -- register_copy 
-  //SEG404 [170] phi (byte*) current_piece_gfx#18 = (byte*) current_piece_gfx#20 [phi:play_movement::@5/play_movement::@7->play_movement::@return#1] -- register_copy 
-  //SEG405 [170] phi (byte) current_orientation#17 = (byte) current_orientation#20 [phi:play_movement::@5/play_movement::@7->play_movement::@return#2] -- register_copy 
-  //SEG406 [170] phi (byte) play_movement::return#2 = (byte) play_movement::render#1 [phi:play_movement::@5/play_movement::@7->play_movement::@return#3] -- register_copy 
+  //SEG402 [170] phi from play_movement::@2 play_movement::@4 to play_movement::@return [phi:play_movement::@2/play_movement::@4->play_movement::@return]
+  //SEG403 [170] phi (byte) current_xpos#19 = (byte) current_xpos#22 [phi:play_movement::@2/play_movement::@4->play_movement::@return#0] -- register_copy 
+  //SEG404 [170] phi (byte*) current_piece_gfx#18 = (byte*) current_piece_gfx#20 [phi:play_movement::@2/play_movement::@4->play_movement::@return#1] -- register_copy 
+  //SEG405 [170] phi (byte) current_orientation#17 = (byte) current_orientation#20 [phi:play_movement::@2/play_movement::@4->play_movement::@return#2] -- register_copy 
+  //SEG406 [170] phi (byte) play_movement::return#2 = (byte) play_movement::render#1 [phi:play_movement::@2/play_movement::@4->play_movement::@return#3] -- register_copy 
   //SEG407 play_movement::@return
   breturn:
   //SEG408 [171] return 
@@ -24622,7 +24750,7 @@ play_movement: {
   //SEG411 [173] call play_move_leftright 
     jsr play_move_leftright
   //SEG412 [174] (byte) play_move_leftright::return#0 ← (byte) play_move_leftright::return#2
-  //SEG413 play_movement::@6
+  //SEG413 play_movement::@3
   //SEG414 [175] (byte~) play_movement::$3 ← (byte) play_move_leftright::return#0
   //SEG415 [176] (byte) play_movement::render#2 ← (byte) play_movement::render#1 + (byte~) play_movement::$3 -- vbuz1=vbuz1_plus_vbuaa 
     clc
@@ -24633,7 +24761,7 @@ play_movement: {
   //SEG417 [178] call play_move_rotate 
     jsr play_move_rotate
   //SEG418 [179] (byte) play_move_rotate::return#0 ← (byte) play_move_rotate::return#2
-  //SEG419 play_movement::@7
+  //SEG419 play_movement::@4
   //SEG420 [180] (byte~) play_movement::$4 ← (byte) play_move_rotate::return#0
   //SEG421 [181] (byte) play_movement::return#0 ← (byte) play_movement::render#2 + (byte~) play_movement::$4 -- vbuz1=vbuz1_plus_vbuaa 
     clc
@@ -24650,15 +24778,15 @@ play_move_rotate: {
   //SEG423 [182] if((byte) play_move_rotate::key_event#0==(const byte) KEY_Z#0) goto play_move_rotate::@1 -- vbuaa_eq_vbuc1_then_la1 
     cmp #KEY_Z
     beq b1
-  //SEG424 play_move_rotate::@6
+  //SEG424 play_move_rotate::@4
   //SEG425 [183] if((byte) play_move_rotate::key_event#0==(const byte) KEY_X#0) goto play_move_rotate::@2 -- vbuaa_eq_vbuc1_then_la1 
     cmp #KEY_X
     beq b2
-  //SEG426 [184] phi from play_move_rotate::@14 play_move_rotate::@6 to play_move_rotate::@return [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return]
-  b3:
-  //SEG427 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#20 [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return#0] -- register_copy 
-  //SEG428 [184] phi (byte) current_orientation#25 = (byte) current_orientation#20 [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return#1] -- register_copy 
-  //SEG429 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_rotate::@14/play_move_rotate::@6->play_move_rotate::@return#2] -- vbuaa=vbuc1 
+  //SEG426 [184] phi from play_move_rotate::@4 play_move_rotate::@6 to play_move_rotate::@return [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return]
+  b4:
+  //SEG427 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#20 [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return#0] -- register_copy 
+  //SEG428 [184] phi (byte) current_orientation#25 = (byte) current_orientation#20 [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return#1] -- register_copy 
+  //SEG429 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_rotate::@4/play_move_rotate::@6->play_move_rotate::@return#2] -- vbuaa=vbuc1 
     lda #0
   //SEG430 play_move_rotate::@return
   breturn:
@@ -24672,10 +24800,10 @@ play_move_rotate: {
   //SEG434 [187] (byte) play_move_rotate::orientation#2 ← (byte/signed word/word/dword/signed dword~) play_move_rotate::$5 & (byte/signed byte/word/signed word/dword/signed dword) $3f -- vbuz1=vbuxx_band_vbuc1 
     lda #$3f
     sax orientation
-  //SEG435 [188] phi from play_move_rotate::@1 play_move_rotate::@2 to play_move_rotate::@4 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@4]
-  //SEG436 [188] phi (byte) play_move_rotate::orientation#3 = (byte) play_move_rotate::orientation#1 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@4#0] -- register_copy 
-  //SEG437 play_move_rotate::@4
-  b4:
+  //SEG435 [188] phi from play_move_rotate::@1 play_move_rotate::@2 to play_move_rotate::@3 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@3]
+  //SEG436 [188] phi (byte) play_move_rotate::orientation#3 = (byte) play_move_rotate::orientation#1 [phi:play_move_rotate::@1/play_move_rotate::@2->play_move_rotate::@3#0] -- register_copy 
+  //SEG437 play_move_rotate::@3
+  b3:
   //SEG438 [189] (byte) play_collision::xpos#3 ← (byte) current_xpos#26 -- vbuz1=vbuz2 
     lda current_xpos
     sta play_collision.xpos
@@ -24690,19 +24818,19 @@ play_move_rotate: {
     lda current_piece+1
     sta current_piece_101+1
   //SEG442 [193] call play_collision 
-  //SEG443 [201] phi from play_move_rotate::@4 to play_collision [phi:play_move_rotate::@4->play_collision]
-  //SEG444 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#3 [phi:play_move_rotate::@4->play_collision#0] -- register_copy 
-  //SEG445 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#3 [phi:play_move_rotate::@4->play_collision#1] -- register_copy 
-  //SEG446 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#3 [phi:play_move_rotate::@4->play_collision#2] -- register_copy 
-  //SEG447 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#101 [phi:play_move_rotate::@4->play_collision#3] -- register_copy 
+  //SEG443 [201] phi from play_move_rotate::@3 to play_collision [phi:play_move_rotate::@3->play_collision]
+  //SEG444 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#3 [phi:play_move_rotate::@3->play_collision#0] -- register_copy 
+  //SEG445 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#3 [phi:play_move_rotate::@3->play_collision#1] -- register_copy 
+  //SEG446 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#3 [phi:play_move_rotate::@3->play_collision#2] -- register_copy 
+  //SEG447 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#101 [phi:play_move_rotate::@3->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG448 [194] (byte) play_collision::return#14 ← (byte) play_collision::return#15
-  //SEG449 play_move_rotate::@14
+  //SEG449 play_move_rotate::@6
   //SEG450 [195] (byte~) play_move_rotate::$2 ← (byte) play_collision::return#14
   //SEG451 [196] if((byte~) play_move_rotate::$2!=(const byte) COLLISION_NONE#0) goto play_move_rotate::@return -- vbuaa_neq_vbuc1_then_la1 
     cmp #COLLISION_NONE
-    bne b3
-  //SEG452 play_move_rotate::@11
+    bne b4
+  //SEG452 play_move_rotate::@5
   //SEG453 [197] (byte) current_orientation#7 ← (byte) play_move_rotate::orientation#3 -- vbuz1=vbuz2 
     lda orientation
     sta current_orientation
@@ -24713,10 +24841,10 @@ play_move_rotate: {
     lda #0
     adc current_piece+1
     sta current_piece_gfx+1
-  //SEG455 [184] phi from play_move_rotate::@11 to play_move_rotate::@return [phi:play_move_rotate::@11->play_move_rotate::@return]
-  //SEG456 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#7 [phi:play_move_rotate::@11->play_move_rotate::@return#0] -- register_copy 
-  //SEG457 [184] phi (byte) current_orientation#25 = (byte) current_orientation#7 [phi:play_move_rotate::@11->play_move_rotate::@return#1] -- register_copy 
-  //SEG458 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_rotate::@11->play_move_rotate::@return#2] -- vbuaa=vbuc1 
+  //SEG455 [184] phi from play_move_rotate::@5 to play_move_rotate::@return [phi:play_move_rotate::@5->play_move_rotate::@return]
+  //SEG456 [184] phi (byte*) current_piece_gfx#21 = (byte*) current_piece_gfx#7 [phi:play_move_rotate::@5->play_move_rotate::@return#0] -- register_copy 
+  //SEG457 [184] phi (byte) current_orientation#25 = (byte) current_orientation#7 [phi:play_move_rotate::@5->play_move_rotate::@return#1] -- register_copy 
+  //SEG458 [184] phi (byte) play_move_rotate::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_rotate::@5->play_move_rotate::@return#2] -- vbuaa=vbuc1 
     lda #1
     jmp breturn
   //SEG459 play_move_rotate::@1
@@ -24727,7 +24855,7 @@ play_move_rotate: {
   //SEG461 [200] (byte) play_move_rotate::orientation#1 ← (byte/signed word/word/dword/signed dword~) play_move_rotate::$7 & (byte/signed byte/word/signed word/dword/signed dword) $3f -- vbuz1=vbuxx_band_vbuc1 
     lda #$3f
     sax orientation
-    jmp b4
+    jmp b3
 }
 //SEG462 play_collision
 // Test if there is a collision between the current piece moved to (x, y) and anything on the playfield or the playfield boundaries
@@ -24790,13 +24918,13 @@ play_collision: {
     lda (piece_gfx),y
     cmp #0
     beq b3
-  //SEG479 play_collision::@14
+  //SEG479 play_collision::@7
   //SEG480 [210] if((byte) play_collision::ypos2#2<(byte/signed byte/word/signed word/dword/signed dword) 2*(const byte) PLAYFIELD_LINES#0) goto play_collision::@4 -- vbuz1_lt_vbuc1_then_la1 
     lda ypos2
     cmp #2*PLAYFIELD_LINES
     bcc b4
-  //SEG481 [211] phi from play_collision::@14 to play_collision::@return [phi:play_collision::@14->play_collision::@return]
-  //SEG482 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_BOTTOM#0 [phi:play_collision::@14->play_collision::@return#0] -- vbuaa=vbuc1 
+  //SEG481 [211] phi from play_collision::@7 to play_collision::@return [phi:play_collision::@7->play_collision::@return]
+  //SEG482 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_BOTTOM#0 [phi:play_collision::@7->play_collision::@return#0] -- vbuaa=vbuc1 
     lda #COLLISION_BOTTOM
   //SEG483 play_collision::@return
   breturn:
@@ -24841,10 +24969,10 @@ play_collision: {
     inc col
   //SEG500 [218] (byte) play_collision::c#1 ← ++ (byte) play_collision::c#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG501 [219] if((byte) play_collision::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@21 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG501 [219] if((byte) play_collision::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@10 -- vbuxx_neq_vbuc1_then_la1 
     cpx #4
-    bne b21
-  //SEG502 play_collision::@17
+    bne b10
+  //SEG502 play_collision::@8
   //SEG503 [220] (byte) play_collision::ypos2#1 ← (byte) play_collision::ypos2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda ypos2
     clc
@@ -24852,33 +24980,33 @@ play_collision: {
     sta ypos2
   //SEG504 [221] (byte) play_collision::l#1 ← ++ (byte) play_collision::l#6 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG505 [222] if((byte) play_collision::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@20 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG505 [222] if((byte) play_collision::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_collision::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp l
-    bne b20
-  //SEG506 [211] phi from play_collision::@17 to play_collision::@return [phi:play_collision::@17->play_collision::@return]
-  //SEG507 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_NONE#0 [phi:play_collision::@17->play_collision::@return#0] -- vbuaa=vbuc1 
+    bne b9
+  //SEG506 [211] phi from play_collision::@8 to play_collision::@return [phi:play_collision::@8->play_collision::@return]
+  //SEG507 [211] phi (byte) play_collision::return#15 = (const byte) COLLISION_NONE#0 [phi:play_collision::@8->play_collision::@return#0] -- vbuaa=vbuc1 
     lda #COLLISION_NONE
     jmp breturn
-  //SEG508 play_collision::@20
-  b20:
+  //SEG508 play_collision::@9
+  b9:
   //SEG509 [223] (byte~) play_collision::i#11 ← (byte) play_collision::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_11
-  //SEG510 [204] phi from play_collision::@20 to play_collision::@1 [phi:play_collision::@20->play_collision::@1]
-  //SEG511 [204] phi (byte) play_collision::l#6 = (byte) play_collision::l#1 [phi:play_collision::@20->play_collision::@1#0] -- register_copy 
-  //SEG512 [204] phi (byte) play_collision::i#3 = (byte~) play_collision::i#11 [phi:play_collision::@20->play_collision::@1#1] -- register_copy 
-  //SEG513 [204] phi (byte) play_collision::ypos2#2 = (byte) play_collision::ypos2#1 [phi:play_collision::@20->play_collision::@1#2] -- register_copy 
+  //SEG510 [204] phi from play_collision::@9 to play_collision::@1 [phi:play_collision::@9->play_collision::@1]
+  //SEG511 [204] phi (byte) play_collision::l#6 = (byte) play_collision::l#1 [phi:play_collision::@9->play_collision::@1#0] -- register_copy 
+  //SEG512 [204] phi (byte) play_collision::i#3 = (byte~) play_collision::i#11 [phi:play_collision::@9->play_collision::@1#1] -- register_copy 
+  //SEG513 [204] phi (byte) play_collision::ypos2#2 = (byte) play_collision::ypos2#1 [phi:play_collision::@9->play_collision::@1#2] -- register_copy 
     jmp b1
-  //SEG514 play_collision::@21
-  b21:
+  //SEG514 play_collision::@10
+  b10:
   //SEG515 [224] (byte~) play_collision::i#13 ← (byte) play_collision::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_13
-  //SEG516 [207] phi from play_collision::@21 to play_collision::@2 [phi:play_collision::@21->play_collision::@2]
-  //SEG517 [207] phi (byte) play_collision::c#2 = (byte) play_collision::c#1 [phi:play_collision::@21->play_collision::@2#0] -- register_copy 
-  //SEG518 [207] phi (byte) play_collision::col#2 = (byte) play_collision::col#1 [phi:play_collision::@21->play_collision::@2#1] -- register_copy 
-  //SEG519 [207] phi (byte) play_collision::i#2 = (byte~) play_collision::i#13 [phi:play_collision::@21->play_collision::@2#2] -- register_copy 
+  //SEG516 [207] phi from play_collision::@10 to play_collision::@2 [phi:play_collision::@10->play_collision::@2]
+  //SEG517 [207] phi (byte) play_collision::c#2 = (byte) play_collision::c#1 [phi:play_collision::@10->play_collision::@2#0] -- register_copy 
+  //SEG518 [207] phi (byte) play_collision::col#2 = (byte) play_collision::col#1 [phi:play_collision::@10->play_collision::@2#1] -- register_copy 
+  //SEG519 [207] phi (byte) play_collision::i#2 = (byte~) play_collision::i#13 [phi:play_collision::@10->play_collision::@2#2] -- register_copy 
     jmp b2
 }
 //SEG520 play_move_leftright
@@ -24890,11 +25018,11 @@ play_move_leftright: {
     // Handle keyboard events
     cmp #KEY_COMMA
     beq b1
-  //SEG522 play_move_leftright::@4
+  //SEG522 play_move_leftright::@2
   //SEG523 [226] if((byte) play_move_leftright::key_event#0!=(const byte) KEY_DOT#0) goto play_move_leftright::@return -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_DOT
     bne b3
-  //SEG524 play_move_leftright::@5
+  //SEG524 play_move_leftright::@3
   //SEG525 [227] (byte) play_collision::xpos#2 ← (byte) current_xpos#22 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_plus_1 
     ldy current_xpos
     iny
@@ -24910,31 +25038,31 @@ play_move_leftright: {
     lda current_piece+1
     sta current_piece_100+1
   //SEG529 [231] call play_collision 
-  //SEG530 [201] phi from play_move_leftright::@5 to play_collision [phi:play_move_leftright::@5->play_collision]
-  //SEG531 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#2 [phi:play_move_leftright::@5->play_collision#0] -- register_copy 
-  //SEG532 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#2 [phi:play_move_leftright::@5->play_collision#1] -- register_copy 
-  //SEG533 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#2 [phi:play_move_leftright::@5->play_collision#2] -- register_copy 
-  //SEG534 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#100 [phi:play_move_leftright::@5->play_collision#3] -- register_copy 
+  //SEG530 [201] phi from play_move_leftright::@3 to play_collision [phi:play_move_leftright::@3->play_collision]
+  //SEG531 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#2 [phi:play_move_leftright::@3->play_collision#0] -- register_copy 
+  //SEG532 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#2 [phi:play_move_leftright::@3->play_collision#1] -- register_copy 
+  //SEG533 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#2 [phi:play_move_leftright::@3->play_collision#2] -- register_copy 
+  //SEG534 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#100 [phi:play_move_leftright::@3->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG535 [232] (byte) play_collision::return#13 ← (byte) play_collision::return#15
-  //SEG536 play_move_leftright::@15
+  //SEG536 play_move_leftright::@7
   //SEG537 [233] (byte~) play_move_leftright::$4 ← (byte) play_collision::return#13
   //SEG538 [234] if((byte~) play_move_leftright::$4!=(const byte) COLLISION_NONE#0) goto play_move_leftright::@return -- vbuaa_neq_vbuc1_then_la1 
     cmp #COLLISION_NONE
     bne b3
-  //SEG539 play_move_leftright::@6
+  //SEG539 play_move_leftright::@4
   //SEG540 [235] (byte) current_xpos#6 ← ++ (byte) current_xpos#22 -- vbuz1=_inc_vbuz1 
     inc current_xpos
-  //SEG541 [236] phi from play_move_leftright::@6 play_move_leftright::@9 to play_move_leftright::@return [phi:play_move_leftright::@6/play_move_leftright::@9->play_move_leftright::@return]
+  //SEG541 [236] phi from play_move_leftright::@4 play_move_leftright::@5 to play_move_leftright::@return [phi:play_move_leftright::@4/play_move_leftright::@5->play_move_leftright::@return]
   b2:
-  //SEG542 [236] phi (byte) current_xpos#26 = (byte) current_xpos#6 [phi:play_move_leftright::@6/play_move_leftright::@9->play_move_leftright::@return#0] -- register_copy 
-  //SEG543 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_leftright::@6/play_move_leftright::@9->play_move_leftright::@return#1] -- vbuaa=vbuc1 
+  //SEG542 [236] phi (byte) current_xpos#26 = (byte) current_xpos#6 [phi:play_move_leftright::@4/play_move_leftright::@5->play_move_leftright::@return#0] -- register_copy 
+  //SEG543 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_leftright::@4/play_move_leftright::@5->play_move_leftright::@return#1] -- vbuaa=vbuc1 
     lda #1
     jmp breturn
-  //SEG544 [236] phi from play_move_leftright::@14 play_move_leftright::@15 play_move_leftright::@4 to play_move_leftright::@return [phi:play_move_leftright::@14/play_move_leftright::@15/play_move_leftright::@4->play_move_leftright::@return]
+  //SEG544 [236] phi from play_move_leftright::@2 play_move_leftright::@6 play_move_leftright::@7 to play_move_leftright::@return [phi:play_move_leftright::@2/play_move_leftright::@6/play_move_leftright::@7->play_move_leftright::@return]
   b3:
-  //SEG545 [236] phi (byte) current_xpos#26 = (byte) current_xpos#22 [phi:play_move_leftright::@14/play_move_leftright::@15/play_move_leftright::@4->play_move_leftright::@return#0] -- register_copy 
-  //SEG546 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_leftright::@14/play_move_leftright::@15/play_move_leftright::@4->play_move_leftright::@return#1] -- vbuaa=vbuc1 
+  //SEG545 [236] phi (byte) current_xpos#26 = (byte) current_xpos#22 [phi:play_move_leftright::@2/play_move_leftright::@6/play_move_leftright::@7->play_move_leftright::@return#0] -- register_copy 
+  //SEG546 [236] phi (byte) play_move_leftright::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_leftright::@2/play_move_leftright::@6/play_move_leftright::@7->play_move_leftright::@return#1] -- vbuaa=vbuc1 
     lda #0
   //SEG547 play_move_leftright::@return
   breturn:
@@ -24964,12 +25092,12 @@ play_move_leftright: {
   //SEG559 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#99 [phi:play_move_leftright::@1->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG560 [243] (byte) play_collision::return#1 ← (byte) play_collision::return#15
-  //SEG561 play_move_leftright::@14
+  //SEG561 play_move_leftright::@6
   //SEG562 [244] (byte~) play_move_leftright::$8 ← (byte) play_collision::return#1
   //SEG563 [245] if((byte~) play_move_leftright::$8!=(const byte) COLLISION_NONE#0) goto play_move_leftright::@return -- vbuaa_neq_vbuc1_then_la1 
     cmp #COLLISION_NONE
     bne b3
-  //SEG564 play_move_leftright::@9
+  //SEG564 play_move_leftright::@5
   //SEG565 [246] (byte) current_xpos#8 ← -- (byte) current_xpos#22 -- vbuz1=_dec_vbuz1 
     dec current_xpos
     jmp b2
@@ -24984,10 +25112,10 @@ play_move_down: {
   //SEG568 [248] if((byte) play_move_down::key_event#0!=(const byte) KEY_SPACE#0) goto play_move_down::@1 -- vbuaa_neq_vbuc1_then_la1 
     cmp #KEY_SPACE
     bne b4
-  //SEG569 [249] phi from play_move_down to play_move_down::@5 [phi:play_move_down->play_move_down::@5]
-  //SEG570 play_move_down::@5
-  //SEG571 [250] phi from play_move_down::@5 to play_move_down::@1 [phi:play_move_down::@5->play_move_down::@1]
-  //SEG572 [250] phi (byte) play_move_down::movedown#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@5->play_move_down::@1#0] -- vbuxx=vbuc1 
+  //SEG569 [249] phi from play_move_down to play_move_down::@4 [phi:play_move_down->play_move_down::@4]
+  //SEG570 play_move_down::@4
+  //SEG571 [250] phi from play_move_down::@4 to play_move_down::@1 [phi:play_move_down::@4->play_move_down::@1]
+  //SEG572 [250] phi (byte) play_move_down::movedown#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@4->play_move_down::@1#0] -- vbuxx=vbuc1 
     ldx #1
     jmp b1
   //SEG573 [250] phi from play_move_down to play_move_down::@1 [phi:play_move_down->play_move_down::@1]
@@ -25003,38 +25131,38 @@ play_move_down: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG579 [252] (byte) keyboard_event_pressed::return#12 ← (byte) keyboard_event_pressed::return#11
-  //SEG580 play_move_down::@17
+  //SEG580 play_move_down::@12
   //SEG581 [253] (byte~) play_move_down::$2 ← (byte) keyboard_event_pressed::return#12
   //SEG582 [254] if((byte~) play_move_down::$2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_move_down::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b2
-  //SEG583 play_move_down::@6
+  //SEG583 play_move_down::@5
   //SEG584 [255] if((byte) current_movedown_counter#12<(const byte) current_movedown_fast#0) goto play_move_down::@2 -- vbuz1_lt_vbuc1_then_la1 
     lda current_movedown_counter
     cmp #current_movedown_fast
     bcc b2
-  //SEG585 play_move_down::@7
+  //SEG585 play_move_down::@6
   //SEG586 [256] (byte) play_move_down::movedown#2 ← ++ (byte) play_move_down::movedown#10 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG587 [257] phi from play_move_down::@17 play_move_down::@6 play_move_down::@7 to play_move_down::@2 [phi:play_move_down::@17/play_move_down::@6/play_move_down::@7->play_move_down::@2]
-  //SEG588 [257] phi (byte) play_move_down::movedown#7 = (byte) play_move_down::movedown#10 [phi:play_move_down::@17/play_move_down::@6/play_move_down::@7->play_move_down::@2#0] -- register_copy 
+  //SEG587 [257] phi from play_move_down::@12 play_move_down::@5 play_move_down::@6 to play_move_down::@2 [phi:play_move_down::@12/play_move_down::@5/play_move_down::@6->play_move_down::@2]
+  //SEG588 [257] phi (byte) play_move_down::movedown#7 = (byte) play_move_down::movedown#10 [phi:play_move_down::@12/play_move_down::@5/play_move_down::@6->play_move_down::@2#0] -- register_copy 
   //SEG589 play_move_down::@2
   b2:
   //SEG590 [258] if((byte) current_movedown_counter#12<(byte) current_movedown_slow#14) goto play_move_down::@3 -- vbuz1_lt_vbuz2_then_la1 
     lda current_movedown_counter
     cmp current_movedown_slow
     bcc b3
-  //SEG591 play_move_down::@8
+  //SEG591 play_move_down::@7
   //SEG592 [259] (byte) play_move_down::movedown#3 ← ++ (byte) play_move_down::movedown#7 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG593 [260] phi from play_move_down::@2 play_move_down::@8 to play_move_down::@3 [phi:play_move_down::@2/play_move_down::@8->play_move_down::@3]
-  //SEG594 [260] phi (byte) play_move_down::movedown#6 = (byte) play_move_down::movedown#7 [phi:play_move_down::@2/play_move_down::@8->play_move_down::@3#0] -- register_copy 
+  //SEG593 [260] phi from play_move_down::@2 play_move_down::@7 to play_move_down::@3 [phi:play_move_down::@2/play_move_down::@7->play_move_down::@3]
+  //SEG594 [260] phi (byte) play_move_down::movedown#6 = (byte) play_move_down::movedown#7 [phi:play_move_down::@2/play_move_down::@7->play_move_down::@3#0] -- register_copy 
   //SEG595 play_move_down::@3
   b3:
   //SEG596 [261] if((byte) play_move_down::movedown#6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_move_down::@return -- vbuxx_eq_0_then_la1 
     cpx #0
     beq b5
-  //SEG597 play_move_down::@9
+  //SEG597 play_move_down::@8
   //SEG598 [262] (byte) play_collision::ypos#0 ← (byte) current_ypos#11 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_plus_1 
     ldy current_ypos
     iny
@@ -25050,41 +25178,41 @@ play_move_down: {
     lda current_piece+1
     sta current_piece_98+1
   //SEG602 [266] call play_collision 
-  //SEG603 [201] phi from play_move_down::@9 to play_collision [phi:play_move_down::@9->play_collision]
-  //SEG604 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#0 [phi:play_move_down::@9->play_collision#0] -- register_copy 
-  //SEG605 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#0 [phi:play_move_down::@9->play_collision#1] -- register_copy 
-  //SEG606 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#0 [phi:play_move_down::@9->play_collision#2] -- register_copy 
-  //SEG607 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#98 [phi:play_move_down::@9->play_collision#3] -- register_copy 
+  //SEG603 [201] phi from play_move_down::@8 to play_collision [phi:play_move_down::@8->play_collision]
+  //SEG604 [201] phi (byte) play_collision::xpos#6 = (byte) play_collision::xpos#0 [phi:play_move_down::@8->play_collision#0] -- register_copy 
+  //SEG605 [201] phi (byte) play_collision::ypos#5 = (byte) play_collision::ypos#0 [phi:play_move_down::@8->play_collision#1] -- register_copy 
+  //SEG606 [201] phi (byte) play_collision::orientation#5 = (byte) play_collision::orientation#0 [phi:play_move_down::@8->play_collision#2] -- register_copy 
+  //SEG607 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#98 [phi:play_move_down::@8->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG608 [267] (byte) play_collision::return#0 ← (byte) play_collision::return#15
-  //SEG609 play_move_down::@18
+  //SEG609 play_move_down::@13
   //SEG610 [268] (byte~) play_move_down::$12 ← (byte) play_collision::return#0
-  //SEG611 [269] if((byte~) play_move_down::$12==(const byte) COLLISION_NONE#0) goto play_move_down::@14 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG611 [269] if((byte~) play_move_down::$12==(const byte) COLLISION_NONE#0) goto play_move_down::@10 -- vbuaa_eq_vbuc1_then_la1 
     cmp #COLLISION_NONE
-    beq b14
-  //SEG612 [270] phi from play_move_down::@18 to play_move_down::@10 [phi:play_move_down::@18->play_move_down::@10]
-  //SEG613 play_move_down::@10
+    beq b10
+  //SEG612 [270] phi from play_move_down::@13 to play_move_down::@9 [phi:play_move_down::@13->play_move_down::@9]
+  //SEG613 play_move_down::@9
   //SEG614 [271] call play_lock_current 
     jsr play_lock_current
-  //SEG615 [272] phi from play_move_down::@10 to play_move_down::@19 [phi:play_move_down::@10->play_move_down::@19]
-  //SEG616 play_move_down::@19
+  //SEG615 [272] phi from play_move_down::@9 to play_move_down::@14 [phi:play_move_down::@9->play_move_down::@14]
+  //SEG616 play_move_down::@14
   //SEG617 [273] call play_remove_lines 
-  //SEG618 [344] phi from play_move_down::@19 to play_remove_lines [phi:play_move_down::@19->play_remove_lines]
+  //SEG618 [344] phi from play_move_down::@14 to play_remove_lines [phi:play_move_down::@14->play_remove_lines]
     jsr play_remove_lines
   //SEG619 [274] (byte) play_remove_lines::return#0 ← (byte) play_remove_lines::removed#7 -- vbuaa=vbuz1 
     lda play_remove_lines.removed
-  //SEG620 play_move_down::@20
+  //SEG620 play_move_down::@15
   //SEG621 [275] (byte) play_move_down::removed#0 ← (byte) play_remove_lines::return#0
   //SEG622 [276] (byte) play_update_score::removed#0 ← (byte) play_move_down::removed#0 -- vbuxx=vbuaa 
     tax
   //SEG623 [277] call play_update_score 
     jsr play_update_score
-  //SEG624 [278] phi from play_move_down::@20 to play_move_down::@21 [phi:play_move_down::@20->play_move_down::@21]
-  //SEG625 play_move_down::@21
+  //SEG624 [278] phi from play_move_down::@15 to play_move_down::@16 [phi:play_move_down::@15->play_move_down::@16]
+  //SEG625 play_move_down::@16
   //SEG626 [279] call play_spawn_current 
-  //SEG627 [285] phi from play_move_down::@21 to play_spawn_current [phi:play_move_down::@21->play_spawn_current]
-  //SEG628 [285] phi (byte) game_over#65 = (byte) game_over#10 [phi:play_move_down::@21->play_spawn_current#0] -- register_copy 
-  //SEG629 [285] phi (byte) next_piece_idx#17 = (byte) next_piece_idx#10 [phi:play_move_down::@21->play_spawn_current#1] -- register_copy 
+  //SEG627 [285] phi from play_move_down::@16 to play_spawn_current [phi:play_move_down::@16->play_spawn_current]
+  //SEG628 [285] phi (byte) game_over#65 = (byte) game_over#10 [phi:play_move_down::@16->play_spawn_current#0] -- register_copy 
+  //SEG629 [285] phi (byte) next_piece_idx#17 = (byte) next_piece_idx#10 [phi:play_move_down::@16->play_spawn_current#1] -- register_copy 
     jsr play_spawn_current
   //SEG630 [280] (byte*~) current_piece#104 ← (byte*)*((const word[]) PIECES#0 + (byte~) play_spawn_current::$0) -- pbuz1=pptc1_derefidx_vbuz2 
     ldy play_spawn_current._0
@@ -25092,42 +25220,42 @@ play_move_down: {
     sta current_piece
     lda PIECES+1,y
     sta current_piece+1
-  //SEG631 [281] phi from play_move_down::@21 to play_move_down::@15 [phi:play_move_down::@21->play_move_down::@15]
-  //SEG632 [281] phi (byte) next_piece_idx#30 = (byte) play_spawn_current::piece_idx#2 [phi:play_move_down::@21->play_move_down::@15#0] -- register_copy 
-  //SEG633 [281] phi (byte) game_over#27 = (byte) game_over#52 [phi:play_move_down::@21->play_move_down::@15#1] -- register_copy 
-  //SEG634 [281] phi (byte) current_xpos#43 = (byte) current_xpos#103 [phi:play_move_down::@21->play_move_down::@15#2] -- register_copy 
-  //SEG635 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#74 [phi:play_move_down::@21->play_move_down::@15#3] -- register_copy 
-  //SEG636 [281] phi (byte) current_orientation#37 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@21->play_move_down::@15#4] -- vbuz1=vbuc1 
+  //SEG631 [281] phi from play_move_down::@16 to play_move_down::@11 [phi:play_move_down::@16->play_move_down::@11]
+  //SEG632 [281] phi (byte) next_piece_idx#30 = (byte) play_spawn_current::piece_idx#2 [phi:play_move_down::@16->play_move_down::@11#0] -- register_copy 
+  //SEG633 [281] phi (byte) game_over#27 = (byte) game_over#52 [phi:play_move_down::@16->play_move_down::@11#1] -- register_copy 
+  //SEG634 [281] phi (byte) current_xpos#43 = (byte) current_xpos#103 [phi:play_move_down::@16->play_move_down::@11#2] -- register_copy 
+  //SEG635 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#74 [phi:play_move_down::@16->play_move_down::@11#3] -- register_copy 
+  //SEG636 [281] phi (byte) current_orientation#37 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@16->play_move_down::@11#4] -- vbuz1=vbuc1 
     lda #0
     sta current_orientation
-  //SEG637 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#5 [phi:play_move_down::@21->play_move_down::@15#5] -- register_copy 
-  //SEG638 [281] phi (byte*) current_piece#28 = (byte*~) current_piece#104 [phi:play_move_down::@21->play_move_down::@15#6] -- register_copy 
-  //SEG639 [281] phi (byte) level_bcd#31 = (byte) level_bcd#19 [phi:play_move_down::@21->play_move_down::@15#7] -- register_copy 
-  //SEG640 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#23 [phi:play_move_down::@21->play_move_down::@15#8] -- register_copy 
-  //SEG641 [281] phi (byte) level#33 = (byte) level#19 [phi:play_move_down::@21->play_move_down::@15#9] -- register_copy 
-  //SEG642 [281] phi (dword) score_bcd#26 = (dword) score_bcd#16 [phi:play_move_down::@21->play_move_down::@15#10] -- register_copy 
-  //SEG643 [281] phi (word) lines_bcd#26 = (word) lines_bcd#17 [phi:play_move_down::@21->play_move_down::@15#11] -- register_copy 
-  //SEG644 [281] phi (byte) current_ypos#38 = (byte) current_ypos#6 [phi:play_move_down::@21->play_move_down::@15#12] -- register_copy 
-  //SEG645 play_move_down::@15
-  b15:
-  //SEG646 [282] phi from play_move_down::@15 to play_move_down::@return [phi:play_move_down::@15->play_move_down::@return]
-  //SEG647 [282] phi (byte) next_piece_idx#16 = (byte) next_piece_idx#30 [phi:play_move_down::@15->play_move_down::@return#0] -- register_copy 
-  //SEG648 [282] phi (byte) game_over#15 = (byte) game_over#27 [phi:play_move_down::@15->play_move_down::@return#1] -- register_copy 
-  //SEG649 [282] phi (byte) current_xpos#22 = (byte) current_xpos#43 [phi:play_move_down::@15->play_move_down::@return#2] -- register_copy 
-  //SEG650 [282] phi (byte*) current_piece_gfx#20 = (byte*) current_piece_gfx#35 [phi:play_move_down::@15->play_move_down::@return#3] -- register_copy 
-  //SEG651 [282] phi (byte) current_orientation#20 = (byte) current_orientation#37 [phi:play_move_down::@15->play_move_down::@return#4] -- register_copy 
-  //SEG652 [282] phi (byte) current_piece_char#16 = (byte) current_piece_char#29 [phi:play_move_down::@15->play_move_down::@return#5] -- register_copy 
-  //SEG653 [282] phi (byte*) current_piece#15 = (byte*) current_piece#28 [phi:play_move_down::@15->play_move_down::@return#6] -- register_copy 
-  //SEG654 [282] phi (byte) level_bcd#17 = (byte) level_bcd#31 [phi:play_move_down::@15->play_move_down::@return#7] -- register_copy 
-  //SEG655 [282] phi (byte) current_movedown_slow#21 = (byte) current_movedown_slow#37 [phi:play_move_down::@15->play_move_down::@return#8] -- register_copy 
-  //SEG656 [282] phi (byte) level#17 = (byte) level#33 [phi:play_move_down::@15->play_move_down::@return#9] -- register_copy 
-  //SEG657 [282] phi (dword) score_bcd#14 = (dword) score_bcd#26 [phi:play_move_down::@15->play_move_down::@return#10] -- register_copy 
-  //SEG658 [282] phi (word) lines_bcd#15 = (word) lines_bcd#26 [phi:play_move_down::@15->play_move_down::@return#11] -- register_copy 
-  //SEG659 [282] phi (byte) current_ypos#19 = (byte) current_ypos#38 [phi:play_move_down::@15->play_move_down::@return#12] -- register_copy 
-  //SEG660 [282] phi (byte) current_movedown_counter#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@15->play_move_down::@return#13] -- vbuz1=vbuc1 
+  //SEG637 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#5 [phi:play_move_down::@16->play_move_down::@11#5] -- register_copy 
+  //SEG638 [281] phi (byte*) current_piece#28 = (byte*~) current_piece#104 [phi:play_move_down::@16->play_move_down::@11#6] -- register_copy 
+  //SEG639 [281] phi (byte) level_bcd#31 = (byte) level_bcd#19 [phi:play_move_down::@16->play_move_down::@11#7] -- register_copy 
+  //SEG640 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#23 [phi:play_move_down::@16->play_move_down::@11#8] -- register_copy 
+  //SEG641 [281] phi (byte) level#33 = (byte) level#19 [phi:play_move_down::@16->play_move_down::@11#9] -- register_copy 
+  //SEG642 [281] phi (dword) score_bcd#26 = (dword) score_bcd#16 [phi:play_move_down::@16->play_move_down::@11#10] -- register_copy 
+  //SEG643 [281] phi (word) lines_bcd#26 = (word) lines_bcd#17 [phi:play_move_down::@16->play_move_down::@11#11] -- register_copy 
+  //SEG644 [281] phi (byte) current_ypos#38 = (byte) current_ypos#6 [phi:play_move_down::@16->play_move_down::@11#12] -- register_copy 
+  //SEG645 play_move_down::@11
+  b11:
+  //SEG646 [282] phi from play_move_down::@11 to play_move_down::@return [phi:play_move_down::@11->play_move_down::@return]
+  //SEG647 [282] phi (byte) next_piece_idx#16 = (byte) next_piece_idx#30 [phi:play_move_down::@11->play_move_down::@return#0] -- register_copy 
+  //SEG648 [282] phi (byte) game_over#15 = (byte) game_over#27 [phi:play_move_down::@11->play_move_down::@return#1] -- register_copy 
+  //SEG649 [282] phi (byte) current_xpos#22 = (byte) current_xpos#43 [phi:play_move_down::@11->play_move_down::@return#2] -- register_copy 
+  //SEG650 [282] phi (byte*) current_piece_gfx#20 = (byte*) current_piece_gfx#35 [phi:play_move_down::@11->play_move_down::@return#3] -- register_copy 
+  //SEG651 [282] phi (byte) current_orientation#20 = (byte) current_orientation#37 [phi:play_move_down::@11->play_move_down::@return#4] -- register_copy 
+  //SEG652 [282] phi (byte) current_piece_char#16 = (byte) current_piece_char#29 [phi:play_move_down::@11->play_move_down::@return#5] -- register_copy 
+  //SEG653 [282] phi (byte*) current_piece#15 = (byte*) current_piece#28 [phi:play_move_down::@11->play_move_down::@return#6] -- register_copy 
+  //SEG654 [282] phi (byte) level_bcd#17 = (byte) level_bcd#31 [phi:play_move_down::@11->play_move_down::@return#7] -- register_copy 
+  //SEG655 [282] phi (byte) current_movedown_slow#21 = (byte) current_movedown_slow#37 [phi:play_move_down::@11->play_move_down::@return#8] -- register_copy 
+  //SEG656 [282] phi (byte) level#17 = (byte) level#33 [phi:play_move_down::@11->play_move_down::@return#9] -- register_copy 
+  //SEG657 [282] phi (dword) score_bcd#14 = (dword) score_bcd#26 [phi:play_move_down::@11->play_move_down::@return#10] -- register_copy 
+  //SEG658 [282] phi (word) lines_bcd#15 = (word) lines_bcd#26 [phi:play_move_down::@11->play_move_down::@return#11] -- register_copy 
+  //SEG659 [282] phi (byte) current_ypos#19 = (byte) current_ypos#38 [phi:play_move_down::@11->play_move_down::@return#12] -- register_copy 
+  //SEG660 [282] phi (byte) current_movedown_counter#14 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_move_down::@11->play_move_down::@return#13] -- vbuz1=vbuc1 
     lda #0
     sta current_movedown_counter
-  //SEG661 [282] phi (byte) play_move_down::return#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@15->play_move_down::@return#14] -- vbuxx=vbuc1 
+  //SEG661 [282] phi (byte) play_move_down::return#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_move_down::@11->play_move_down::@return#14] -- vbuxx=vbuc1 
     ldx #1
     jmp breturn
   //SEG662 [282] phi from play_move_down::@3 to play_move_down::@return [phi:play_move_down::@3->play_move_down::@return]
@@ -25152,25 +25280,25 @@ play_move_down: {
   breturn:
   //SEG679 [283] return 
     rts
-  //SEG680 play_move_down::@14
-  b14:
+  //SEG680 play_move_down::@10
+  b10:
   //SEG681 [284] (byte) current_ypos#3 ← ++ (byte) current_ypos#11 -- vbuz1=_inc_vbuz1 
     inc current_ypos
-  //SEG682 [281] phi from play_move_down::@14 to play_move_down::@15 [phi:play_move_down::@14->play_move_down::@15]
-  //SEG683 [281] phi (byte) next_piece_idx#30 = (byte) next_piece_idx#10 [phi:play_move_down::@14->play_move_down::@15#0] -- register_copy 
-  //SEG684 [281] phi (byte) game_over#27 = (byte) game_over#10 [phi:play_move_down::@14->play_move_down::@15#1] -- register_copy 
-  //SEG685 [281] phi (byte) current_xpos#43 = (byte) current_xpos#122 [phi:play_move_down::@14->play_move_down::@15#2] -- register_copy 
-  //SEG686 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#112 [phi:play_move_down::@14->play_move_down::@15#3] -- register_copy 
-  //SEG687 [281] phi (byte) current_orientation#37 = (byte) current_orientation#13 [phi:play_move_down::@14->play_move_down::@15#4] -- register_copy 
-  //SEG688 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#10 [phi:play_move_down::@14->play_move_down::@15#5] -- register_copy 
-  //SEG689 [281] phi (byte*) current_piece#28 = (byte*) current_piece#10 [phi:play_move_down::@14->play_move_down::@15#6] -- register_copy 
-  //SEG690 [281] phi (byte) level_bcd#31 = (byte) level_bcd#11 [phi:play_move_down::@14->play_move_down::@15#7] -- register_copy 
-  //SEG691 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#14 [phi:play_move_down::@14->play_move_down::@15#8] -- register_copy 
-  //SEG692 [281] phi (byte) level#33 = (byte) level#10 [phi:play_move_down::@14->play_move_down::@15#9] -- register_copy 
-  //SEG693 [281] phi (dword) score_bcd#26 = (dword) score_bcd#18 [phi:play_move_down::@14->play_move_down::@15#10] -- register_copy 
-  //SEG694 [281] phi (word) lines_bcd#26 = (word) lines_bcd#19 [phi:play_move_down::@14->play_move_down::@15#11] -- register_copy 
-  //SEG695 [281] phi (byte) current_ypos#38 = (byte) current_ypos#3 [phi:play_move_down::@14->play_move_down::@15#12] -- register_copy 
-    jmp b15
+  //SEG682 [281] phi from play_move_down::@10 to play_move_down::@11 [phi:play_move_down::@10->play_move_down::@11]
+  //SEG683 [281] phi (byte) next_piece_idx#30 = (byte) next_piece_idx#10 [phi:play_move_down::@10->play_move_down::@11#0] -- register_copy 
+  //SEG684 [281] phi (byte) game_over#27 = (byte) game_over#10 [phi:play_move_down::@10->play_move_down::@11#1] -- register_copy 
+  //SEG685 [281] phi (byte) current_xpos#43 = (byte) current_xpos#122 [phi:play_move_down::@10->play_move_down::@11#2] -- register_copy 
+  //SEG686 [281] phi (byte*) current_piece_gfx#35 = (byte*) current_piece_gfx#112 [phi:play_move_down::@10->play_move_down::@11#3] -- register_copy 
+  //SEG687 [281] phi (byte) current_orientation#37 = (byte) current_orientation#13 [phi:play_move_down::@10->play_move_down::@11#4] -- register_copy 
+  //SEG688 [281] phi (byte) current_piece_char#29 = (byte) current_piece_char#10 [phi:play_move_down::@10->play_move_down::@11#5] -- register_copy 
+  //SEG689 [281] phi (byte*) current_piece#28 = (byte*) current_piece#10 [phi:play_move_down::@10->play_move_down::@11#6] -- register_copy 
+  //SEG690 [281] phi (byte) level_bcd#31 = (byte) level_bcd#11 [phi:play_move_down::@10->play_move_down::@11#7] -- register_copy 
+  //SEG691 [281] phi (byte) current_movedown_slow#37 = (byte) current_movedown_slow#14 [phi:play_move_down::@10->play_move_down::@11#8] -- register_copy 
+  //SEG692 [281] phi (byte) level#33 = (byte) level#10 [phi:play_move_down::@10->play_move_down::@11#9] -- register_copy 
+  //SEG693 [281] phi (dword) score_bcd#26 = (dword) score_bcd#18 [phi:play_move_down::@10->play_move_down::@11#10] -- register_copy 
+  //SEG694 [281] phi (word) lines_bcd#26 = (word) lines_bcd#19 [phi:play_move_down::@10->play_move_down::@11#11] -- register_copy 
+  //SEG695 [281] phi (byte) current_ypos#38 = (byte) current_ypos#3 [phi:play_move_down::@10->play_move_down::@11#12] -- register_copy 
+    jmp b11
 }
 //SEG696 play_spawn_current
 // Spawn a new piece
@@ -25220,13 +25348,13 @@ play_spawn_current: {
   //SEG711 [201] phi (byte*) current_piece#17 = (byte*~) current_piece#102 [phi:play_spawn_current->play_collision#3] -- register_copy 
     jsr play_collision
   //SEG712 [296] (byte) play_collision::return#10 ← (byte) play_collision::return#15
-  //SEG713 play_spawn_current::@9
+  //SEG713 play_spawn_current::@4
   //SEG714 [297] (byte~) play_spawn_current::$2 ← (byte) play_collision::return#10
-  //SEG715 [298] if((byte~) play_spawn_current::$2!=(const byte) COLLISION_PLAYFIELD#0) goto play_spawn_current::@11 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG715 [298] if((byte~) play_spawn_current::$2!=(const byte) COLLISION_PLAYFIELD#0) goto play_spawn_current::@6 -- vbuaa_neq_vbuc1_then_la1 
     cmp #COLLISION_PLAYFIELD
     bne b1
-  //SEG716 [299] phi from play_spawn_current::@9 to play_spawn_current::@1 [phi:play_spawn_current::@9->play_spawn_current::@1]
-  //SEG717 [299] phi (byte) game_over#52 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_spawn_current::@9->play_spawn_current::@1#0] -- vbuz1=vbuc1 
+  //SEG716 [299] phi from play_spawn_current::@4 to play_spawn_current::@1 [phi:play_spawn_current::@4->play_spawn_current::@1]
+  //SEG717 [299] phi (byte) game_over#52 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_spawn_current::@4->play_spawn_current::@1#0] -- vbuz1=vbuc1 
     lda #1
     sta game_over
   //SEG718 play_spawn_current::@1
@@ -25250,18 +25378,18 @@ play_spawn_current: {
   //SEG727 [304] call sid_rnd 
     jsr sid_rnd
   //SEG728 [305] (byte) sid_rnd::return#2 ← (byte) sid_rnd::return#0
-  //SEG729 play_spawn_current::@10
+  //SEG729 play_spawn_current::@5
   //SEG730 [306] (byte~) play_spawn_current::$6 ← (byte) sid_rnd::return#2
   //SEG731 [307] (byte) play_spawn_current::piece_idx#1 ← (byte~) play_spawn_current::$6 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuaa_band_vbuc1 
     and #7
     sta piece_idx
-  //SEG732 [300] phi from play_spawn_current::@10 to play_spawn_current::@2 [phi:play_spawn_current::@10->play_spawn_current::@2]
-  //SEG733 [300] phi (byte) play_spawn_current::piece_idx#2 = (byte) play_spawn_current::piece_idx#1 [phi:play_spawn_current::@10->play_spawn_current::@2#0] -- register_copy 
+  //SEG732 [300] phi from play_spawn_current::@5 to play_spawn_current::@2 [phi:play_spawn_current::@5->play_spawn_current::@2]
+  //SEG733 [300] phi (byte) play_spawn_current::piece_idx#2 = (byte) play_spawn_current::piece_idx#1 [phi:play_spawn_current::@5->play_spawn_current::@2#0] -- register_copy 
     jmp b2
-  //SEG734 [308] phi from play_spawn_current::@9 to play_spawn_current::@11 [phi:play_spawn_current::@9->play_spawn_current::@11]
-  //SEG735 play_spawn_current::@11
-  //SEG736 [299] phi from play_spawn_current::@11 to play_spawn_current::@1 [phi:play_spawn_current::@11->play_spawn_current::@1]
-  //SEG737 [299] phi (byte) game_over#52 = (byte) game_over#65 [phi:play_spawn_current::@11->play_spawn_current::@1#0] -- register_copy 
+  //SEG734 [308] phi from play_spawn_current::@4 to play_spawn_current::@6 [phi:play_spawn_current::@4->play_spawn_current::@6]
+  //SEG735 play_spawn_current::@6
+  //SEG736 [299] phi from play_spawn_current::@6 to play_spawn_current::@1 [phi:play_spawn_current::@6->play_spawn_current::@1]
+  //SEG737 [299] phi (byte) game_over#52 = (byte) game_over#65 [phi:play_spawn_current::@6->play_spawn_current::@1#0] -- register_copy 
 }
 //SEG738 sid_rnd
 // Get a random number from the SID voice 3,
@@ -25282,7 +25410,7 @@ play_update_score: {
   //SEG743 [311] if((byte) play_update_score::removed#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_update_score::@return -- vbuxx_eq_0_then_la1 
     cpx #0
     beq breturn
-  //SEG744 play_update_score::@2
+  //SEG744 play_update_score::@1
   //SEG745 [312] (byte~) play_update_score::$2 ← < (word) lines_bcd#19 -- vbuaa=_lo_vwuz1 
     lda lines_bcd
   //SEG746 [313] (byte) play_update_score::lines_before#0 ← (byte~) play_update_score::$2 & (byte/word/signed word/dword/signed dword) $f0 -- vbuz1=vbuaa_band_vbuc1 
@@ -25335,16 +25463,16 @@ play_update_score: {
   //SEG755 [322] if((byte) play_update_score::lines_before#0==(byte) play_update_score::lines_after#0) goto play_update_score::@return -- vbuz1_eq_vbuaa_then_la1 
     cmp lines_before
     beq breturn
-  //SEG756 [323] phi from play_update_score::@2 to play_update_score::@3 [phi:play_update_score::@2->play_update_score::@3]
-  //SEG757 play_update_score::@3
+  //SEG756 [323] phi from play_update_score::@1 to play_update_score::@2 [phi:play_update_score::@1->play_update_score::@2]
+  //SEG757 play_update_score::@2
   //SEG758 [324] call play_increase_level 
     jsr play_increase_level
-  //SEG759 [325] phi from play_update_score play_update_score::@2 play_update_score::@3 to play_update_score::@return [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return]
-  //SEG760 [325] phi (byte) level_bcd#19 = (byte) level_bcd#11 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#0] -- register_copy 
-  //SEG761 [325] phi (byte) current_movedown_slow#23 = (byte) current_movedown_slow#14 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#1] -- register_copy 
-  //SEG762 [325] phi (byte) level#19 = (byte) level#10 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#2] -- register_copy 
-  //SEG763 [325] phi (dword) score_bcd#16 = (dword) score_bcd#18 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#3] -- register_copy 
-  //SEG764 [325] phi (word) lines_bcd#17 = (word) lines_bcd#19 [phi:play_update_score/play_update_score::@2/play_update_score::@3->play_update_score::@return#4] -- register_copy 
+  //SEG759 [325] phi from play_update_score play_update_score::@1 play_update_score::@2 to play_update_score::@return [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return]
+  //SEG760 [325] phi (byte) level_bcd#19 = (byte) level_bcd#11 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#0] -- register_copy 
+  //SEG761 [325] phi (byte) current_movedown_slow#23 = (byte) current_movedown_slow#14 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#1] -- register_copy 
+  //SEG762 [325] phi (byte) level#19 = (byte) level#10 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#2] -- register_copy 
+  //SEG763 [325] phi (dword) score_bcd#16 = (dword) score_bcd#18 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#3] -- register_copy 
+  //SEG764 [325] phi (word) lines_bcd#17 = (word) lines_bcd#19 [phi:play_update_score/play_update_score::@1/play_update_score::@2->play_update_score::@return#4] -- register_copy 
   //SEG765 play_update_score::@return
   breturn:
   //SEG766 [326] return 
@@ -25355,54 +25483,54 @@ play_update_score: {
 play_increase_level: {
   //SEG768 [327] (byte) level#21 ← ++ (byte) level#10 -- vbuz1=_inc_vbuz1 
     inc level
-  //SEG769 [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@2 -- vbuz1_gt_vbuc1_then_la1 
+  //SEG769 [328] if((byte) level#21>(byte/signed byte/word/signed word/dword/signed dword) $1d) goto play_increase_level::@1 -- vbuz1_gt_vbuc1_then_la1 
     // Update speed of moving tetrominos down
     lda #$1d
     cmp level
-    bcc b1
-  //SEG770 play_increase_level::@4
+    bcc b3
+  //SEG770 play_increase_level::@3
   //SEG771 [329] (byte) current_movedown_slow#10 ← *((const byte[]) MOVEDOWN_SLOW_SPEEDS#0 + (byte) level#21) -- vbuz1=pbuc1_derefidx_vbuz2 
     ldy level
     lda MOVEDOWN_SLOW_SPEEDS,y
     sta current_movedown_slow
-  //SEG772 [330] phi from play_increase_level::@4 to play_increase_level::@2 [phi:play_increase_level::@4->play_increase_level::@2]
-  //SEG773 [330] phi (byte) current_movedown_slow#69 = (byte) current_movedown_slow#10 [phi:play_increase_level::@4->play_increase_level::@2#0] -- register_copy 
-    jmp b2
-  //SEG774 [330] phi from play_increase_level to play_increase_level::@2 [phi:play_increase_level->play_increase_level::@2]
-  b1:
-  //SEG775 [330] phi (byte) current_movedown_slow#69 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_increase_level->play_increase_level::@2#0] -- vbuz1=vbuc1 
+  //SEG772 [330] phi from play_increase_level::@3 to play_increase_level::@1 [phi:play_increase_level::@3->play_increase_level::@1]
+  //SEG773 [330] phi (byte) current_movedown_slow#69 = (byte) current_movedown_slow#10 [phi:play_increase_level::@3->play_increase_level::@1#0] -- register_copy 
+    jmp b1
+  //SEG774 [330] phi from play_increase_level to play_increase_level::@1 [phi:play_increase_level->play_increase_level::@1]
+  b3:
+  //SEG775 [330] phi (byte) current_movedown_slow#69 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_increase_level->play_increase_level::@1#0] -- vbuz1=vbuc1 
     lda #1
     sta current_movedown_slow
-  //SEG776 play_increase_level::@2
-  b2:
+  //SEG776 play_increase_level::@1
+  b1:
   //SEG777 [331] (byte) level_bcd#21 ← ++ (byte) level_bcd#11 -- vbuz1=_inc_vbuz1 
     inc level_bcd
   //SEG778 [332] (byte~) play_increase_level::$1 ← (byte) level_bcd#21 & (byte/signed byte/word/signed word/dword/signed dword) $f -- vbuaa=vbuz1_band_vbuc1 
     lda #$f
     and level_bcd
-  //SEG779 [333] if((byte~) play_increase_level::$1!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto play_increase_level::@3 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG779 [333] if((byte~) play_increase_level::$1!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto play_increase_level::@2 -- vbuaa_neq_vbuc1_then_la1 
     cmp #$a
-    bne b3
-  //SEG780 play_increase_level::@6
+    bne b2
+  //SEG780 play_increase_level::@4
   //SEG781 [334] (byte) level_bcd#8 ← (byte) level_bcd#21 + (byte/signed byte/word/signed word/dword/signed dword) 6 -- vbuz1=vbuz1_plus_vbuc1 
     // If level low nybble hits $a change to $10
     lax level_bcd
     axs #-[6]
     stx level_bcd
-  //SEG782 [335] phi from play_increase_level::@2 play_increase_level::@6 to play_increase_level::@3 [phi:play_increase_level::@2/play_increase_level::@6->play_increase_level::@3]
-  //SEG783 [335] phi (byte) level_bcd#64 = (byte) level_bcd#21 [phi:play_increase_level::@2/play_increase_level::@6->play_increase_level::@3#0] -- register_copy 
-  //SEG784 play_increase_level::@3
-  b3:
+  //SEG782 [335] phi from play_increase_level::@1 play_increase_level::@4 to play_increase_level::@2 [phi:play_increase_level::@1/play_increase_level::@4->play_increase_level::@2]
+  //SEG783 [335] phi (byte) level_bcd#64 = (byte) level_bcd#21 [phi:play_increase_level::@1/play_increase_level::@4->play_increase_level::@2#0] -- register_copy 
+  //SEG784 play_increase_level::@2
+  b2:
   //SEG785 asm { sed  }
     // Increase the score values gained
     sed
-  //SEG786 [337] phi from play_increase_level::@3 to play_increase_level::@7 [phi:play_increase_level::@3->play_increase_level::@7]
-  //SEG787 [337] phi (byte) play_increase_level::b#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_increase_level::@3->play_increase_level::@7#0] -- vbuxx=vbuc1 
+  //SEG786 [337] phi from play_increase_level::@2 to play_increase_level::@5 [phi:play_increase_level::@2->play_increase_level::@5]
+  //SEG787 [337] phi (byte) play_increase_level::b#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_increase_level::@2->play_increase_level::@5#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG788 [337] phi from play_increase_level::@7 to play_increase_level::@7 [phi:play_increase_level::@7->play_increase_level::@7]
-  //SEG789 [337] phi (byte) play_increase_level::b#2 = (byte) play_increase_level::b#1 [phi:play_increase_level::@7->play_increase_level::@7#0] -- register_copy 
-  //SEG790 play_increase_level::@7
-  b7:
+  //SEG788 [337] phi from play_increase_level::@5 to play_increase_level::@5 [phi:play_increase_level::@5->play_increase_level::@5]
+  //SEG789 [337] phi (byte) play_increase_level::b#2 = (byte) play_increase_level::b#1 [phi:play_increase_level::@5->play_increase_level::@5#0] -- register_copy 
+  //SEG790 play_increase_level::@5
+  b5:
   //SEG791 [338] (byte) play_increase_level::b4#0 ← (byte) play_increase_level::b#2 << (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuaa=vbuxx_rol_2 
     txa
     asl
@@ -25424,10 +25552,10 @@ play_increase_level: {
     sta score_add_bcd+3,y
   //SEG793 [340] (byte) play_increase_level::b#1 ← ++ (byte) play_increase_level::b#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG794 [341] if((byte) play_increase_level::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto play_increase_level::@7 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG794 [341] if((byte) play_increase_level::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto play_increase_level::@5 -- vbuxx_neq_vbuc1_then_la1 
     cpx #5
-    bne b7
-  //SEG795 play_increase_level::@8
+    bne b5
+  //SEG795 play_increase_level::@6
   //SEG796 asm { cld  }
     cld
   //SEG797 play_increase_level::@return
@@ -25445,54 +25573,54 @@ play_remove_lines: {
     .label y = 4
     .label removed = 9
     .label full = $b
-  //SEG800 [345] phi from play_remove_lines to play_remove_lines::@8 [phi:play_remove_lines->play_remove_lines::@8]
-  //SEG801 [345] phi (byte) play_remove_lines::removed#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@8#0] -- vbuz1=vbuc1 
+  //SEG800 [345] phi from play_remove_lines to play_remove_lines::@3 [phi:play_remove_lines->play_remove_lines::@3]
+  //SEG801 [345] phi (byte) play_remove_lines::removed#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta removed
-  //SEG802 [345] phi (byte) play_remove_lines::y#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@8#1] -- vbuz1=vbuc1 
+  //SEG802 [345] phi (byte) play_remove_lines::y#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines->play_remove_lines::@3#1] -- vbuz1=vbuc1 
     sta y
-  //SEG803 [345] phi (byte) play_remove_lines::w#12 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@8#2] -- vbuxx=vbuc1 
+  //SEG803 [345] phi (byte) play_remove_lines::w#12 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@3#2] -- vbuxx=vbuc1 
     ldx #PLAYFIELD_LINES*PLAYFIELD_COLS-1
-  //SEG804 [345] phi (byte) play_remove_lines::r#4 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@8#3] -- vbuyy=vbuc1 
+  //SEG804 [345] phi (byte) play_remove_lines::r#4 = (const byte) PLAYFIELD_LINES#0*(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines->play_remove_lines::@3#3] -- vbuyy=vbuc1 
     ldy #PLAYFIELD_LINES*PLAYFIELD_COLS-1
   // Read all lines and rewrite them
-  //SEG805 [345] phi from play_remove_lines::@14 to play_remove_lines::@8 [phi:play_remove_lines::@14->play_remove_lines::@8]
-  //SEG806 [345] phi (byte) play_remove_lines::removed#11 = (byte) play_remove_lines::removed#7 [phi:play_remove_lines::@14->play_remove_lines::@8#0] -- register_copy 
-  //SEG807 [345] phi (byte) play_remove_lines::y#8 = (byte) play_remove_lines::y#1 [phi:play_remove_lines::@14->play_remove_lines::@8#1] -- register_copy 
-  //SEG808 [345] phi (byte) play_remove_lines::w#12 = (byte) play_remove_lines::w#11 [phi:play_remove_lines::@14->play_remove_lines::@8#2] -- register_copy 
-  //SEG809 [345] phi (byte) play_remove_lines::r#4 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@14->play_remove_lines::@8#3] -- register_copy 
-  //SEG810 play_remove_lines::@8
-  b8:
-  //SEG811 [346] phi from play_remove_lines::@8 to play_remove_lines::@9 [phi:play_remove_lines::@8->play_remove_lines::@9]
-  //SEG812 [346] phi (byte) play_remove_lines::full#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines::@8->play_remove_lines::@9#0] -- vbuz1=vbuc1 
+  //SEG805 [345] phi from play_remove_lines::@8 to play_remove_lines::@3 [phi:play_remove_lines::@8->play_remove_lines::@3]
+  //SEG806 [345] phi (byte) play_remove_lines::removed#11 = (byte) play_remove_lines::removed#7 [phi:play_remove_lines::@8->play_remove_lines::@3#0] -- register_copy 
+  //SEG807 [345] phi (byte) play_remove_lines::y#8 = (byte) play_remove_lines::y#1 [phi:play_remove_lines::@8->play_remove_lines::@3#1] -- register_copy 
+  //SEG808 [345] phi (byte) play_remove_lines::w#12 = (byte) play_remove_lines::w#11 [phi:play_remove_lines::@8->play_remove_lines::@3#2] -- register_copy 
+  //SEG809 [345] phi (byte) play_remove_lines::r#4 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@8->play_remove_lines::@3#3] -- register_copy 
+  //SEG810 play_remove_lines::@3
+  b3:
+  //SEG811 [346] phi from play_remove_lines::@3 to play_remove_lines::@4 [phi:play_remove_lines::@3->play_remove_lines::@4]
+  //SEG812 [346] phi (byte) play_remove_lines::full#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:play_remove_lines::@3->play_remove_lines::@4#0] -- vbuz1=vbuc1 
     lda #1
     sta full
-  //SEG813 [346] phi (byte) play_remove_lines::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@8->play_remove_lines::@9#1] -- vbuz1=vbuc1 
+  //SEG813 [346] phi (byte) play_remove_lines::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@3->play_remove_lines::@4#1] -- vbuz1=vbuc1 
     lda #0
     sta x
-  //SEG814 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#12 [phi:play_remove_lines::@8->play_remove_lines::@9#2] -- register_copy 
-  //SEG815 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#4 [phi:play_remove_lines::@8->play_remove_lines::@9#3] -- register_copy 
-  //SEG816 [346] phi from play_remove_lines::@10 to play_remove_lines::@9 [phi:play_remove_lines::@10->play_remove_lines::@9]
-  //SEG817 [346] phi (byte) play_remove_lines::full#4 = (byte) play_remove_lines::full#2 [phi:play_remove_lines::@10->play_remove_lines::@9#0] -- register_copy 
-  //SEG818 [346] phi (byte) play_remove_lines::x#2 = (byte) play_remove_lines::x#1 [phi:play_remove_lines::@10->play_remove_lines::@9#1] -- register_copy 
-  //SEG819 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@10->play_remove_lines::@9#2] -- register_copy 
-  //SEG820 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@10->play_remove_lines::@9#3] -- register_copy 
-  //SEG821 play_remove_lines::@9
-  b9:
+  //SEG814 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#12 [phi:play_remove_lines::@3->play_remove_lines::@4#2] -- register_copy 
+  //SEG815 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#4 [phi:play_remove_lines::@3->play_remove_lines::@4#3] -- register_copy 
+  //SEG816 [346] phi from play_remove_lines::@5 to play_remove_lines::@4 [phi:play_remove_lines::@5->play_remove_lines::@4]
+  //SEG817 [346] phi (byte) play_remove_lines::full#4 = (byte) play_remove_lines::full#2 [phi:play_remove_lines::@5->play_remove_lines::@4#0] -- register_copy 
+  //SEG818 [346] phi (byte) play_remove_lines::x#2 = (byte) play_remove_lines::x#1 [phi:play_remove_lines::@5->play_remove_lines::@4#1] -- register_copy 
+  //SEG819 [346] phi (byte) play_remove_lines::w#4 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@5->play_remove_lines::@4#2] -- register_copy 
+  //SEG820 [346] phi (byte) play_remove_lines::r#2 = (byte) play_remove_lines::r#1 [phi:play_remove_lines::@5->play_remove_lines::@4#3] -- register_copy 
+  //SEG821 play_remove_lines::@4
+  b4:
   //SEG822 [347] (byte) play_remove_lines::c#0 ← *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::r#2) -- vbuz1=pbuc1_derefidx_vbuyy 
     lda playfield,y
     sta c
   //SEG823 [348] (byte) play_remove_lines::r#1 ← -- (byte) play_remove_lines::r#2 -- vbuyy=_dec_vbuyy 
     dey
-  //SEG824 [349] if((byte) play_remove_lines::c#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_remove_lines::@18 -- vbuz1_neq_0_then_la1 
+  //SEG824 [349] if((byte) play_remove_lines::c#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_remove_lines::@9 -- vbuz1_neq_0_then_la1 
     cmp #0
-    bne b10
-  //SEG825 [350] phi from play_remove_lines::@9 to play_remove_lines::@10 [phi:play_remove_lines::@9->play_remove_lines::@10]
-  //SEG826 [350] phi (byte) play_remove_lines::full#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@9->play_remove_lines::@10#0] -- vbuz1=vbuc1 
+    bne b5
+  //SEG825 [350] phi from play_remove_lines::@4 to play_remove_lines::@5 [phi:play_remove_lines::@4->play_remove_lines::@5]
+  //SEG826 [350] phi (byte) play_remove_lines::full#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:play_remove_lines::@4->play_remove_lines::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta full
-  //SEG827 play_remove_lines::@10
-  b10:
+  //SEG827 play_remove_lines::@5
+  b5:
   //SEG828 [351] *((const byte[PLAYFIELD_LINES#0*PLAYFIELD_COLS#0]) playfield#0 + (byte) play_remove_lines::w#4) ← (byte) play_remove_lines::c#0 -- pbuc1_derefidx_vbuxx=vbuz1 
     lda c
     sta playfield,x
@@ -25500,35 +25628,35 @@ play_remove_lines: {
     dex
   //SEG830 [353] (byte) play_remove_lines::x#1 ← ++ (byte) play_remove_lines::x#2 -- vbuz1=_inc_vbuz1 
     inc x
-  //SEG831 [354] if((byte) play_remove_lines::x#1!=(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@9 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG831 [354] if((byte) play_remove_lines::x#1!=(const byte) PLAYFIELD_COLS#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #PLAYFIELD_COLS-1+1
     cmp x
-    bne b9
-  //SEG832 play_remove_lines::@12
-  //SEG833 [355] if((byte) play_remove_lines::full#2!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@14 -- vbuz1_neq_vbuc1_then_la1 
+    bne b4
+  //SEG832 play_remove_lines::@6
+  //SEG833 [355] if((byte) play_remove_lines::full#2!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@8 -- vbuz1_neq_vbuc1_then_la1 
     lda #1
     cmp full
-    bne b14
-  //SEG834 play_remove_lines::@13
+    bne b8
+  //SEG834 play_remove_lines::@7
   //SEG835 [356] (byte) play_remove_lines::w#2 ← (byte) play_remove_lines::w#1 + (const byte) PLAYFIELD_COLS#0 -- vbuxx=vbuxx_plus_vbuc1 
     txa
     axs #-[PLAYFIELD_COLS]
   //SEG836 [357] (byte) play_remove_lines::removed#1 ← ++ (byte) play_remove_lines::removed#11 -- vbuz1=_inc_vbuz1 
     inc removed
-  //SEG837 [358] phi from play_remove_lines::@12 play_remove_lines::@13 to play_remove_lines::@14 [phi:play_remove_lines::@12/play_remove_lines::@13->play_remove_lines::@14]
-  //SEG838 [358] phi (byte) play_remove_lines::removed#7 = (byte) play_remove_lines::removed#11 [phi:play_remove_lines::@12/play_remove_lines::@13->play_remove_lines::@14#0] -- register_copy 
-  //SEG839 [358] phi (byte) play_remove_lines::w#11 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@12/play_remove_lines::@13->play_remove_lines::@14#1] -- register_copy 
-  //SEG840 play_remove_lines::@14
-  b14:
+  //SEG837 [358] phi from play_remove_lines::@6 play_remove_lines::@7 to play_remove_lines::@8 [phi:play_remove_lines::@6/play_remove_lines::@7->play_remove_lines::@8]
+  //SEG838 [358] phi (byte) play_remove_lines::removed#7 = (byte) play_remove_lines::removed#11 [phi:play_remove_lines::@6/play_remove_lines::@7->play_remove_lines::@8#0] -- register_copy 
+  //SEG839 [358] phi (byte) play_remove_lines::w#11 = (byte) play_remove_lines::w#1 [phi:play_remove_lines::@6/play_remove_lines::@7->play_remove_lines::@8#1] -- register_copy 
+  //SEG840 play_remove_lines::@8
+  b8:
   //SEG841 [359] (byte) play_remove_lines::y#1 ← ++ (byte) play_remove_lines::y#8 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG842 [360] if((byte) play_remove_lines::y#1!=(const byte) PLAYFIELD_LINES#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG842 [360] if((byte) play_remove_lines::y#1!=(const byte) PLAYFIELD_LINES#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto play_remove_lines::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #PLAYFIELD_LINES-1+1
     cmp y
-    bne b8
-  //SEG843 [361] phi from play_remove_lines::@14 play_remove_lines::@2 to play_remove_lines::@1 [phi:play_remove_lines::@14/play_remove_lines::@2->play_remove_lines::@1]
+    bne b3
+  //SEG843 [361] phi from play_remove_lines::@2 play_remove_lines::@8 to play_remove_lines::@1 [phi:play_remove_lines::@2/play_remove_lines::@8->play_remove_lines::@1]
   b1:
-  //SEG844 [361] phi (byte) play_remove_lines::w#6 = (byte) play_remove_lines::w#11 [phi:play_remove_lines::@14/play_remove_lines::@2->play_remove_lines::@1#0] -- register_copy 
+  //SEG844 [361] phi (byte) play_remove_lines::w#6 = (byte) play_remove_lines::w#3 [phi:play_remove_lines::@2/play_remove_lines::@8->play_remove_lines::@1#0] -- register_copy 
   // Write zeros in the rest of the lines
   //SEG845 play_remove_lines::@1
   //SEG846 [362] if((byte) play_remove_lines::w#6!=(byte/word/signed word/dword/signed dword) $ff) goto play_remove_lines::@2 -- vbuxx_neq_vbuc1_then_la1 
@@ -25545,10 +25673,10 @@ play_remove_lines: {
   //SEG851 [365] (byte) play_remove_lines::w#3 ← -- (byte) play_remove_lines::w#6 -- vbuxx=_dec_vbuxx 
     dex
     jmp b1
-  //SEG852 [366] phi from play_remove_lines::@9 to play_remove_lines::@18 [phi:play_remove_lines::@9->play_remove_lines::@18]
-  //SEG853 play_remove_lines::@18
-  //SEG854 [350] phi from play_remove_lines::@18 to play_remove_lines::@10 [phi:play_remove_lines::@18->play_remove_lines::@10]
-  //SEG855 [350] phi (byte) play_remove_lines::full#2 = (byte) play_remove_lines::full#4 [phi:play_remove_lines::@18->play_remove_lines::@10#0] -- register_copy 
+  //SEG852 [366] phi from play_remove_lines::@4 to play_remove_lines::@9 [phi:play_remove_lines::@4->play_remove_lines::@9]
+  //SEG853 play_remove_lines::@9
+  //SEG854 [350] phi from play_remove_lines::@9 to play_remove_lines::@5 [phi:play_remove_lines::@9->play_remove_lines::@5]
+  //SEG855 [350] phi (byte) play_remove_lines::full#2 = (byte) play_remove_lines::full#4 [phi:play_remove_lines::@9->play_remove_lines::@5#0] -- register_copy 
 }
 //SEG856 play_lock_current
 // Lock the current piece onto the playfield
@@ -25609,9 +25737,9 @@ play_lock_current: {
     inc col
   //SEG876 [376] (byte) play_lock_current::c#1 ← ++ (byte) play_lock_current::c#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG877 [377] if((byte) play_lock_current::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG877 [377] if((byte) play_lock_current::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@7 -- vbuxx_neq_vbuc1_then_la1 
     cpx #4
-    bne b8
+    bne b7
   //SEG878 play_lock_current::@5
   //SEG879 [378] (byte) play_lock_current::ypos2#1 ← (byte) play_lock_current::ypos2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda ypos2
@@ -25620,32 +25748,32 @@ play_lock_current: {
     sta ypos2
   //SEG880 [379] (byte) play_lock_current::l#1 ← ++ (byte) play_lock_current::l#6 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG881 [380] if((byte) play_lock_current::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG881 [380] if((byte) play_lock_current::l#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto play_lock_current::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp l
-    bne b7
+    bne b6
   //SEG882 play_lock_current::@return
   //SEG883 [381] return 
     rts
-  //SEG884 play_lock_current::@7
-  b7:
+  //SEG884 play_lock_current::@6
+  b6:
   //SEG885 [382] (byte~) play_lock_current::i#7 ← (byte) play_lock_current::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_7
-  //SEG886 [368] phi from play_lock_current::@7 to play_lock_current::@1 [phi:play_lock_current::@7->play_lock_current::@1]
-  //SEG887 [368] phi (byte) play_lock_current::l#6 = (byte) play_lock_current::l#1 [phi:play_lock_current::@7->play_lock_current::@1#0] -- register_copy 
-  //SEG888 [368] phi (byte) play_lock_current::i#3 = (byte~) play_lock_current::i#7 [phi:play_lock_current::@7->play_lock_current::@1#1] -- register_copy 
-  //SEG889 [368] phi (byte) play_lock_current::ypos2#2 = (byte) play_lock_current::ypos2#1 [phi:play_lock_current::@7->play_lock_current::@1#2] -- register_copy 
+  //SEG886 [368] phi from play_lock_current::@6 to play_lock_current::@1 [phi:play_lock_current::@6->play_lock_current::@1]
+  //SEG887 [368] phi (byte) play_lock_current::l#6 = (byte) play_lock_current::l#1 [phi:play_lock_current::@6->play_lock_current::@1#0] -- register_copy 
+  //SEG888 [368] phi (byte) play_lock_current::i#3 = (byte~) play_lock_current::i#7 [phi:play_lock_current::@6->play_lock_current::@1#1] -- register_copy 
+  //SEG889 [368] phi (byte) play_lock_current::ypos2#2 = (byte) play_lock_current::ypos2#1 [phi:play_lock_current::@6->play_lock_current::@1#2] -- register_copy 
     jmp b1
-  //SEG890 play_lock_current::@8
-  b8:
+  //SEG890 play_lock_current::@7
+  b7:
   //SEG891 [383] (byte~) play_lock_current::i#9 ← (byte) play_lock_current::i#1 -- vbuz1=vbuz2 
     lda i
     sta i_9
-  //SEG892 [371] phi from play_lock_current::@8 to play_lock_current::@2 [phi:play_lock_current::@8->play_lock_current::@2]
-  //SEG893 [371] phi (byte) play_lock_current::c#2 = (byte) play_lock_current::c#1 [phi:play_lock_current::@8->play_lock_current::@2#0] -- register_copy 
-  //SEG894 [371] phi (byte) play_lock_current::col#2 = (byte) play_lock_current::col#1 [phi:play_lock_current::@8->play_lock_current::@2#1] -- register_copy 
-  //SEG895 [371] phi (byte) play_lock_current::i#2 = (byte~) play_lock_current::i#9 [phi:play_lock_current::@8->play_lock_current::@2#2] -- register_copy 
+  //SEG892 [371] phi from play_lock_current::@7 to play_lock_current::@2 [phi:play_lock_current::@7->play_lock_current::@2]
+  //SEG893 [371] phi (byte) play_lock_current::c#2 = (byte) play_lock_current::c#1 [phi:play_lock_current::@7->play_lock_current::@2#0] -- register_copy 
+  //SEG894 [371] phi (byte) play_lock_current::col#2 = (byte) play_lock_current::col#1 [phi:play_lock_current::@7->play_lock_current::@2#1] -- register_copy 
+  //SEG895 [371] phi (byte) play_lock_current::i#2 = (byte~) play_lock_current::i#9 [phi:play_lock_current::@7->play_lock_current::@2#2] -- register_copy 
     jmp b2
 }
 //SEG896 keyboard_event_pressed
@@ -25684,15 +25812,15 @@ keyboard_event_get: {
     lda keyboard_events_size
     cmp #0
     beq b1
-  //SEG905 keyboard_event_get::@3
+  //SEG905 keyboard_event_get::@1
   //SEG906 [391] (byte) keyboard_events_size#4 ← -- (byte) keyboard_events_size#13 -- vbuz1=_dec_vbuz1 
     dec keyboard_events_size
   //SEG907 [392] (byte) keyboard_event_get::return#1 ← *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#4) -- vbuxx=pbuc1_derefidx_vbuz1 
     ldy keyboard_events_size
     ldx keyboard_events,y
-  //SEG908 [393] phi from keyboard_event_get::@3 to keyboard_event_get::@return [phi:keyboard_event_get::@3->keyboard_event_get::@return]
-  //SEG909 [393] phi (byte) keyboard_events_size#16 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@3->keyboard_event_get::@return#0] -- register_copy 
-  //SEG910 [393] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@3->keyboard_event_get::@return#1] -- register_copy 
+  //SEG908 [393] phi from keyboard_event_get::@1 to keyboard_event_get::@return [phi:keyboard_event_get::@1->keyboard_event_get::@return]
+  //SEG909 [393] phi (byte) keyboard_events_size#16 = (byte) keyboard_events_size#4 [phi:keyboard_event_get::@1->keyboard_event_get::@return#0] -- register_copy 
+  //SEG910 [393] phi (byte) keyboard_event_get::return#2 = (byte) keyboard_event_get::return#1 [phi:keyboard_event_get::@1->keyboard_event_get::@return#1] -- register_copy 
     jmp breturn
   //SEG911 [393] phi from keyboard_event_get to keyboard_event_get::@return [phi:keyboard_event_get->keyboard_event_get::@return]
   b1:
@@ -25713,70 +25841,70 @@ keyboard_event_scan: {
     .label row_scan = $b
     .label keycode = $a
     .label row = 9
-  //SEG917 [396] phi from keyboard_event_scan to keyboard_event_scan::@8 [phi:keyboard_event_scan->keyboard_event_scan::@8]
-  //SEG918 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#19 [phi:keyboard_event_scan->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG919 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#1] -- vbuz1=vbuc1 
+  //SEG917 [396] phi from keyboard_event_scan to keyboard_event_scan::@7 [phi:keyboard_event_scan->keyboard_event_scan::@7]
+  //SEG918 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#19 [phi:keyboard_event_scan->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG919 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#1] -- vbuz1=vbuc1 
     lda #0
     sta keycode
-  //SEG920 [396] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@8#2] -- vbuz1=vbuc1 
+  //SEG920 [396] phi (byte) keyboard_event_scan::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan->keyboard_event_scan::@7#2] -- vbuz1=vbuc1 
     sta row
-  //SEG921 [396] phi from keyboard_event_scan::@10 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8]
-  //SEG922 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#13 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#0] -- register_copy 
-  //SEG923 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#1] -- register_copy 
-  //SEG924 [396] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@8#2] -- register_copy 
-  //SEG925 keyboard_event_scan::@8
-  b8:
+  //SEG921 [396] phi from keyboard_event_scan::@8 to keyboard_event_scan::@7 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7]
+  //SEG922 [396] phi (byte) keyboard_events_size#30 = (byte) keyboard_events_size#13 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#0] -- register_copy 
+  //SEG923 [396] phi (byte) keyboard_event_scan::keycode#11 = (byte) keyboard_event_scan::keycode#14 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#1] -- register_copy 
+  //SEG924 [396] phi (byte) keyboard_event_scan::row#2 = (byte) keyboard_event_scan::row#1 [phi:keyboard_event_scan::@8->keyboard_event_scan::@7#2] -- register_copy 
+  //SEG925 keyboard_event_scan::@7
+  b7:
   //SEG926 [397] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_event_scan::row#2 -- vbuxx=vbuz1 
     ldx row
   //SEG927 [398] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG928 [399] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  //SEG929 keyboard_event_scan::@25
+  //SEG929 keyboard_event_scan::@19
   //SEG930 [400] (byte) keyboard_event_scan::row_scan#0 ← (byte) keyboard_matrix_read::return#2 -- vbuz1=vbuaa 
     sta row_scan
-  //SEG931 [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@11 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
+  //SEG931 [401] if((byte) keyboard_event_scan::row_scan#0!=*((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2)) goto keyboard_event_scan::@9 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
     ldy row
     cmp keyboard_scan_values,y
     bne b6
-  //SEG932 keyboard_event_scan::@21
+  //SEG932 keyboard_event_scan::@16
   //SEG933 [402] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
     axs #-[8]
     stx keycode
-  //SEG934 [403] phi from keyboard_event_scan::@20 keyboard_event_scan::@21 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10]
-  //SEG935 [403] phi (byte) keyboard_events_size#13 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#0] -- register_copy 
-  //SEG936 [403] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@20/keyboard_event_scan::@21->keyboard_event_scan::@10#1] -- register_copy 
-  //SEG937 keyboard_event_scan::@10
-  b10:
+  //SEG934 [403] phi from keyboard_event_scan::@15 keyboard_event_scan::@16 to keyboard_event_scan::@8 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8]
+  //SEG935 [403] phi (byte) keyboard_events_size#13 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#0] -- register_copy 
+  //SEG936 [403] phi (byte) keyboard_event_scan::keycode#14 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@15/keyboard_event_scan::@16->keyboard_event_scan::@8#1] -- register_copy 
+  //SEG937 keyboard_event_scan::@8
+  b8:
   //SEG938 [404] (byte) keyboard_event_scan::row#1 ← ++ (byte) keyboard_event_scan::row#2 -- vbuz1=_inc_vbuz1 
     inc row
-  //SEG939 [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG939 [405] if((byte) keyboard_event_scan::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp row
-    bne b8
-  //SEG940 [406] phi from keyboard_event_scan::@10 to keyboard_event_scan::@23 [phi:keyboard_event_scan::@10->keyboard_event_scan::@23]
-  //SEG941 keyboard_event_scan::@23
+    bne b7
+  //SEG940 [406] phi from keyboard_event_scan::@8 to keyboard_event_scan::@17 [phi:keyboard_event_scan::@8->keyboard_event_scan::@17]
+  //SEG941 keyboard_event_scan::@17
   //SEG942 [407] call keyboard_event_pressed 
-  //SEG943 [384] phi from keyboard_event_scan::@23 to keyboard_event_pressed [phi:keyboard_event_scan::@23->keyboard_event_pressed]
-  //SEG944 [384] phi (byte) keyboard_event_pressed::keycode#5 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@23->keyboard_event_pressed#0] -- vbuz1=vbuc1 
+  //SEG943 [384] phi from keyboard_event_scan::@17 to keyboard_event_pressed [phi:keyboard_event_scan::@17->keyboard_event_pressed]
+  //SEG944 [384] phi (byte) keyboard_event_pressed::keycode#5 = (const byte) KEY_LSHIFT#0 [phi:keyboard_event_scan::@17->keyboard_event_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_LSHIFT
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG945 [408] (byte) keyboard_event_pressed::return#0 ← (byte) keyboard_event_pressed::return#11
-  //SEG946 keyboard_event_scan::@26
+  //SEG946 keyboard_event_scan::@20
   //SEG947 [409] (byte~) keyboard_event_scan::$0 ← (byte) keyboard_event_pressed::return#0
   //SEG948 [410] if((byte~) keyboard_event_scan::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b4
-  //SEG949 [411] phi from keyboard_event_scan::@26 to keyboard_event_scan::@24 [phi:keyboard_event_scan::@26->keyboard_event_scan::@24]
-  //SEG950 keyboard_event_scan::@24
-  //SEG951 [412] phi from keyboard_event_scan::@24 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1]
-  //SEG952 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@24->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
+  //SEG949 [411] phi from keyboard_event_scan::@20 to keyboard_event_scan::@18 [phi:keyboard_event_scan::@20->keyboard_event_scan::@18]
+  //SEG950 keyboard_event_scan::@18
+  //SEG951 [412] phi from keyboard_event_scan::@18 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1]
+  //SEG952 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0|(const byte) KEY_MODIFIER_LSHIFT#0 [phi:keyboard_event_scan::@18->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
     ldx #0|KEY_MODIFIER_LSHIFT
     jmp b1
-  //SEG953 [412] phi from keyboard_event_scan::@26 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1]
+  //SEG953 [412] phi from keyboard_event_scan::@20 to keyboard_event_scan::@1 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1]
   b4:
-  //SEG954 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@26->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
+  //SEG954 [412] phi (byte) keyboard_modifiers#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@20->keyboard_event_scan::@1#0] -- vbuxx=vbuc1 
     ldx #0
   //SEG955 keyboard_event_scan::@1
   b1:
@@ -25787,18 +25915,18 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG959 [414] (byte) keyboard_event_pressed::return#1 ← (byte) keyboard_event_pressed::return#11
-  //SEG960 keyboard_event_scan::@27
+  //SEG960 keyboard_event_scan::@21
   //SEG961 [415] (byte~) keyboard_event_scan::$3 ← (byte) keyboard_event_pressed::return#1
   //SEG962 [416] if((byte~) keyboard_event_scan::$3==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@2 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b2
-  //SEG963 keyboard_event_scan::@5
+  //SEG963 keyboard_event_scan::@4
   //SEG964 [417] (byte) keyboard_modifiers#3 ← (byte) keyboard_modifiers#11 | (const byte) KEY_MODIFIER_RSHIFT#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_RSHIFT
     tax
-  //SEG965 [418] phi from keyboard_event_scan::@27 keyboard_event_scan::@5 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2]
-  //SEG966 [418] phi (byte) keyboard_modifiers#12 = (byte) keyboard_modifiers#11 [phi:keyboard_event_scan::@27/keyboard_event_scan::@5->keyboard_event_scan::@2#0] -- register_copy 
+  //SEG965 [418] phi from keyboard_event_scan::@21 keyboard_event_scan::@4 to keyboard_event_scan::@2 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2]
+  //SEG966 [418] phi (byte) keyboard_modifiers#12 = (byte) keyboard_modifiers#11 [phi:keyboard_event_scan::@21/keyboard_event_scan::@4->keyboard_event_scan::@2#0] -- register_copy 
   //SEG967 keyboard_event_scan::@2
   b2:
   //SEG968 [419] call keyboard_event_pressed 
@@ -25808,18 +25936,18 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG971 [420] (byte) keyboard_event_pressed::return#2 ← (byte) keyboard_event_pressed::return#11
-  //SEG972 keyboard_event_scan::@28
+  //SEG972 keyboard_event_scan::@22
   //SEG973 [421] (byte~) keyboard_event_scan::$6 ← (byte) keyboard_event_pressed::return#2
   //SEG974 [422] if((byte~) keyboard_event_scan::$6==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@3 -- vbuaa_eq_0_then_la1 
     cmp #0
     beq b3
-  //SEG975 keyboard_event_scan::@6
+  //SEG975 keyboard_event_scan::@5
   //SEG976 [423] (byte) keyboard_modifiers#4 ← (byte) keyboard_modifiers#12 | (const byte) KEY_MODIFIER_CTRL#0 -- vbuxx=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_CTRL
     tax
-  //SEG977 [424] phi from keyboard_event_scan::@28 keyboard_event_scan::@6 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3]
-  //SEG978 [424] phi (byte) keyboard_modifiers#13 = (byte) keyboard_modifiers#12 [phi:keyboard_event_scan::@28/keyboard_event_scan::@6->keyboard_event_scan::@3#0] -- register_copy 
+  //SEG977 [424] phi from keyboard_event_scan::@22 keyboard_event_scan::@5 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3]
+  //SEG978 [424] phi (byte) keyboard_modifiers#13 = (byte) keyboard_modifiers#12 [phi:keyboard_event_scan::@22/keyboard_event_scan::@5->keyboard_event_scan::@3#0] -- register_copy 
   //SEG979 keyboard_event_scan::@3
   b3:
   //SEG980 [425] call keyboard_event_pressed 
@@ -25829,12 +25957,12 @@ keyboard_event_scan: {
     sta keyboard_event_pressed.keycode
     jsr keyboard_event_pressed
   //SEG983 [426] (byte) keyboard_event_pressed::return#10 ← (byte) keyboard_event_pressed::return#11
-  //SEG984 keyboard_event_scan::@29
+  //SEG984 keyboard_event_scan::@23
   //SEG985 [427] (byte~) keyboard_event_scan::$9 ← (byte) keyboard_event_pressed::return#10
   //SEG986 [428] if((byte~) keyboard_event_scan::$9==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@return -- vbuaa_eq_0_then_la1 
     cmp #0
     beq breturn
-  //SEG987 keyboard_event_scan::@7
+  //SEG987 keyboard_event_scan::@6
   //SEG988 [429] (byte) keyboard_modifiers#5 ← (byte) keyboard_modifiers#13 | (const byte) KEY_MODIFIER_COMMODORE#0 -- vbuaa=vbuxx_bor_vbuc1 
     txa
     ora #KEY_MODIFIER_COMMODORE
@@ -25843,40 +25971,40 @@ keyboard_event_scan: {
   //SEG990 [430] return 
     rts
   // Something has changed on the keyboard row - check each column
-  //SEG991 [431] phi from keyboard_event_scan::@12 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11]
-  //SEG992 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG993 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG994 [431] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@12->keyboard_event_scan::@11#2] -- register_copy 
-  //SEG995 [431] phi from keyboard_event_scan::@25 to keyboard_event_scan::@11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11]
+  //SEG991 [431] phi from keyboard_event_scan::@10 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9]
+  //SEG992 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG993 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#15 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG994 [431] phi (byte) keyboard_event_scan::col#2 = (byte) keyboard_event_scan::col#1 [phi:keyboard_event_scan::@10->keyboard_event_scan::@9#2] -- register_copy 
+  //SEG995 [431] phi from keyboard_event_scan::@19 to keyboard_event_scan::@9 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9]
   b6:
-  //SEG996 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#30 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#0] -- register_copy 
-  //SEG997 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#1] -- register_copy 
-  //SEG998 [431] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@25->keyboard_event_scan::@11#2] -- vbuxx=vbuc1 
+  //SEG996 [431] phi (byte) keyboard_events_size#10 = (byte) keyboard_events_size#30 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#0] -- register_copy 
+  //SEG997 [431] phi (byte) keyboard_event_scan::keycode#10 = (byte) keyboard_event_scan::keycode#11 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#1] -- register_copy 
+  //SEG998 [431] phi (byte) keyboard_event_scan::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:keyboard_event_scan::@19->keyboard_event_scan::@9#2] -- vbuxx=vbuc1 
     ldx #0
-  //SEG999 keyboard_event_scan::@11
-  b11:
+  //SEG999 keyboard_event_scan::@9
+  b9:
   //SEG1000 [432] (byte~) keyboard_event_scan::$15 ← (byte) keyboard_event_scan::row_scan#0 ^ *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) -- vbuaa=vbuz1_bxor_pbuc1_derefidx_vbuz2 
     lda row_scan
     ldy row
     eor keyboard_scan_values,y
   //SEG1001 [433] (byte~) keyboard_event_scan::$16 ← (byte~) keyboard_event_scan::$15 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuxx 
     and keyboard_matrix_col_bitmask,x
-  //SEG1002 [434] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@12 -- vbuaa_eq_0_then_la1 
+  //SEG1002 [434] if((byte~) keyboard_event_scan::$16==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@10 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b12
-  //SEG1003 keyboard_event_scan::@16
-  //SEG1004 [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@12 -- vbuz1_eq_vbuc1_then_la1 
+    beq b10
+  //SEG1003 keyboard_event_scan::@12
+  //SEG1004 [435] if((byte) keyboard_events_size#10==(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@10 -- vbuz1_eq_vbuc1_then_la1 
     lda #8
     cmp keyboard_events_size
-    beq b12
-  //SEG1005 keyboard_event_scan::@17
+    beq b10
+  //SEG1005 keyboard_event_scan::@13
   //SEG1006 [436] (byte) keyboard_event_scan::event_type#0 ← (byte) keyboard_event_scan::row_scan#0 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_event_scan::col#2) -- vbuaa=vbuz1_band_pbuc1_derefidx_vbuxx 
     lda keyboard_matrix_col_bitmask,x
     and row_scan
-  //SEG1007 [437] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@14 -- vbuaa_eq_0_then_la1 
+  //SEG1007 [437] if((byte) keyboard_event_scan::event_type#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto keyboard_event_scan::@11 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b14
-  //SEG1008 keyboard_event_scan::@18
+    beq b11
+  //SEG1008 keyboard_event_scan::@14
   //SEG1009 [438] *((const byte[8]) keyboard_events#0 + (byte) keyboard_events_size#10) ← (byte) keyboard_event_scan::keycode#10 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Key pressed
     lda keycode
@@ -25884,26 +26012,26 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG1010 [439] (byte) keyboard_events_size#2 ← ++ (byte) keyboard_events_size#10 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-  //SEG1011 [440] phi from keyboard_event_scan::@11 keyboard_event_scan::@14 keyboard_event_scan::@16 keyboard_event_scan::@18 to keyboard_event_scan::@12 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12]
-  //SEG1012 [440] phi (byte) keyboard_events_size#29 = (byte) keyboard_events_size#10 [phi:keyboard_event_scan::@11/keyboard_event_scan::@14/keyboard_event_scan::@16/keyboard_event_scan::@18->keyboard_event_scan::@12#0] -- register_copy 
-  //SEG1013 keyboard_event_scan::@12
-  b12:
+  //SEG1011 [440] phi from keyboard_event_scan::@11 keyboard_event_scan::@12 keyboard_event_scan::@14 keyboard_event_scan::@9 to keyboard_event_scan::@10 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10]
+  //SEG1012 [440] phi (byte) keyboard_events_size#29 = (byte) keyboard_events_size#1 [phi:keyboard_event_scan::@11/keyboard_event_scan::@12/keyboard_event_scan::@14/keyboard_event_scan::@9->keyboard_event_scan::@10#0] -- register_copy 
+  //SEG1013 keyboard_event_scan::@10
+  b10:
   //SEG1014 [441] (byte) keyboard_event_scan::keycode#15 ← ++ (byte) keyboard_event_scan::keycode#10 -- vbuz1=_inc_vbuz1 
     inc keycode
   //SEG1015 [442] (byte) keyboard_event_scan::col#1 ← ++ (byte) keyboard_event_scan::col#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1016 [443] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG1016 [443] if((byte) keyboard_event_scan::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto keyboard_event_scan::@9 -- vbuxx_neq_vbuc1_then_la1 
     cpx #8
-    bne b11
-  //SEG1017 keyboard_event_scan::@20
+    bne b9
+  //SEG1017 keyboard_event_scan::@15
   //SEG1018 [444] *((const byte[8]) keyboard_scan_values#0 + (byte) keyboard_event_scan::row#2) ← (byte) keyboard_event_scan::row_scan#0 -- pbuc1_derefidx_vbuz1=vbuz2 
     // Store the current keyboard status for the row to debounce
     lda row_scan
     ldy row
     sta keyboard_scan_values,y
-    jmp b10
-  //SEG1019 keyboard_event_scan::@14
-  b14:
+    jmp b8
+  //SEG1019 keyboard_event_scan::@11
+  b11:
   //SEG1020 [445] (byte/word/dword~) keyboard_event_scan::$23 ← (byte) keyboard_event_scan::keycode#10 | (byte/signed byte/word/signed word/dword/signed dword) $40 -- vbuaa=vbuz1_bor_vbuc1 
     lda #$40
     ora keycode
@@ -25913,7 +26041,7 @@ keyboard_event_scan: {
     sta keyboard_events,y
   //SEG1022 [447] (byte) keyboard_events_size#1 ← ++ (byte) keyboard_events_size#10 -- vbuz1=_inc_vbuz1 
     inc keyboard_events_size
-    jmp b12
+    jmp b10
 }
 //SEG1023 keyboard_matrix_read
 // Read a single row of the keyboard matrix
@@ -25944,11 +26072,11 @@ render_show: {
     beq toD0181
   //SEG1030 [452] phi from render_show to render_show::toD0182 [phi:render_show->render_show::toD0182]
   //SEG1031 render_show::toD0182
-  //SEG1032 [453] phi from render_show::toD0182 to render_show::@2 [phi:render_show::toD0182->render_show::@2]
-  //SEG1033 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0182_return#0 [phi:render_show::toD0182->render_show::@2#0] -- vbuaa=vbuc1 
+  //SEG1032 [453] phi from render_show::toD0182 to render_show::@1 [phi:render_show::toD0182->render_show::@1]
+  //SEG1033 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0182_return#0 [phi:render_show::toD0182->render_show::@1#0] -- vbuaa=vbuc1 
     lda #toD0182_return
-  //SEG1034 render_show::@2
-  b2:
+  //SEG1034 render_show::@1
+  b1:
   //SEG1035 [454] *((const byte*) D018#0) ← (byte) render_show::d018val#3 -- _deref_pbuc1=vbuaa 
     sta D018
   //SEG1036 [455] *((const byte*) BGCOL2#0) ← *((const byte[]) PIECES_COLORS_1#0 + (byte) level#10) -- _deref_pbuc1=pbuc2_derefidx_vbuz1 
@@ -25967,10 +26095,10 @@ render_show: {
   //SEG1041 [459] phi from render_show to render_show::toD0181 [phi:render_show->render_show::toD0181]
   //SEG1042 render_show::toD0181
   toD0181:
-  //SEG1043 [453] phi from render_show::toD0181 to render_show::@2 [phi:render_show::toD0181->render_show::@2]
-  //SEG1044 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0181_return#0 [phi:render_show::toD0181->render_show::@2#0] -- vbuaa=vbuc1 
+  //SEG1043 [453] phi from render_show::toD0181 to render_show::@1 [phi:render_show::toD0181->render_show::@1]
+  //SEG1044 [453] phi (byte) render_show::d018val#3 = (const byte) render_show::toD0181_return#0 [phi:render_show::toD0181->render_show::@1#0] -- vbuaa=vbuc1 
     lda #toD0181_return
-    jmp b2
+    jmp b1
 }
 //SEG1045 play_init
 // Initialize play data tables
@@ -26172,7 +26300,7 @@ render_init: {
   //SEG1116 [504] *((const byte*) CIA2_PORT_A#0) ← (const byte) render_init::vicSelectGfxBank1_toDd001_return#0 -- _deref_pbuc1=vbuc2 
     lda #vicSelectGfxBank1_toDd001_return
     sta CIA2_PORT_A
-  //SEG1117 render_init::@3
+  //SEG1117 render_init::@2
   //SEG1118 [505] *((const byte*) D011#0) ← (const byte) VIC_ECM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3 -- _deref_pbuc1=vbuc2 
     // Enable Extended Background Color Mode
     lda #VIC_ECM|VIC_DEN|VIC_RSEL|3
@@ -26192,35 +26320,35 @@ render_init: {
     lda #GREY
     sta BGCOL4
   //SEG1124 [511] call render_screen_original 
-  //SEG1125 [524] phi from render_init::@3 to render_screen_original [phi:render_init::@3->render_screen_original]
-  //SEG1126 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_init::@3->render_screen_original#0] -- pbuz1=pbuc1 
+  //SEG1125 [524] phi from render_init::@2 to render_screen_original [phi:render_init::@2->render_screen_original]
+  //SEG1126 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_1#0 [phi:render_init::@2->render_screen_original#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1
     sta render_screen_original.screen
     lda #>PLAYFIELD_SCREEN_1
     sta render_screen_original.screen+1
     jsr render_screen_original
-  //SEG1127 [512] phi from render_init::@3 to render_init::@4 [phi:render_init::@3->render_init::@4]
-  //SEG1128 render_init::@4
+  //SEG1127 [512] phi from render_init::@2 to render_init::@3 [phi:render_init::@2->render_init::@3]
+  //SEG1128 render_init::@3
   //SEG1129 [513] call render_screen_original 
-  //SEG1130 [524] phi from render_init::@4 to render_screen_original [phi:render_init::@4->render_screen_original]
-  //SEG1131 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_init::@4->render_screen_original#0] -- pbuz1=pbuc1 
+  //SEG1130 [524] phi from render_init::@3 to render_screen_original [phi:render_init::@3->render_screen_original]
+  //SEG1131 [524] phi (byte*) render_screen_original::screen#9 = (const byte*) PLAYFIELD_SCREEN_2#0 [phi:render_init::@3->render_screen_original#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2
     sta render_screen_original.screen
     lda #>PLAYFIELD_SCREEN_2
     sta render_screen_original.screen+1
     jsr render_screen_original
-  //SEG1132 [514] phi from render_init::@4 to render_init::@1 [phi:render_init::@4->render_init::@1]
-  //SEG1133 [514] phi (byte*) render_init::li_2#2 = (const byte*) PLAYFIELD_SCREEN_2#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@4->render_init::@1#0] -- pbuz1=pbuc1 
+  //SEG1132 [514] phi from render_init::@3 to render_init::@1 [phi:render_init::@3->render_init::@1]
+  //SEG1133 [514] phi (byte*) render_init::li_2#2 = (const byte*) PLAYFIELD_SCREEN_2#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@3->render_init::@1#0] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_2+2*$28+$10
     sta li_2
     lda #>PLAYFIELD_SCREEN_2+2*$28+$10
     sta li_2+1
-  //SEG1134 [514] phi (byte*) render_init::li_1#2 = (const byte*) PLAYFIELD_SCREEN_1#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@4->render_init::@1#1] -- pbuz1=pbuc1 
+  //SEG1134 [514] phi (byte*) render_init::li_1#2 = (const byte*) PLAYFIELD_SCREEN_1#0+(byte/signed byte/word/signed word/dword/signed dword) 2*(byte/signed byte/word/signed word/dword/signed dword) $28+(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:render_init::@3->render_init::@1#1] -- pbuz1=pbuc1 
     lda #<PLAYFIELD_SCREEN_1+2*$28+$10
     sta li_1
     lda #>PLAYFIELD_SCREEN_1+2*$28+$10
     sta li_1+1
-  //SEG1135 [514] phi (byte) render_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_init::@4->render_init::@1#2] -- vbuxx=vbuc1 
+  //SEG1135 [514] phi (byte) render_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_init::@3->render_init::@1#2] -- vbuxx=vbuc1 
     ldx #0
   //SEG1136 [514] phi from render_init::@1 to render_init::@1 [phi:render_init::@1->render_init::@1]
   //SEG1137 [514] phi (byte*) render_init::li_2#2 = (byte*) render_init::li_2#1 [phi:render_init::@1->render_init::@1#0] -- register_copy 
@@ -26302,12 +26430,12 @@ render_screen_original: {
     lda #>COLS
     sta cols+1
   //SEG1157 [525] phi (byte*) render_screen_original::screen#8 = (byte*) render_screen_original::screen#9 [phi:render_screen_original->render_screen_original::@1#4] -- register_copy 
-  //SEG1158 [525] phi from render_screen_original::@7 to render_screen_original::@1 [phi:render_screen_original::@7->render_screen_original::@1]
-  //SEG1159 [525] phi (byte) render_screen_original::y#6 = (byte) render_screen_original::y#1 [phi:render_screen_original::@7->render_screen_original::@1#0] -- register_copy 
-  //SEG1160 [525] phi (byte*) render_screen_original::ocols#4 = (byte*) render_screen_original::ocols#1 [phi:render_screen_original::@7->render_screen_original::@1#1] -- register_copy 
-  //SEG1161 [525] phi (byte*) render_screen_original::oscr#4 = (byte*) render_screen_original::oscr#1 [phi:render_screen_original::@7->render_screen_original::@1#2] -- register_copy 
-  //SEG1162 [525] phi (byte*) render_screen_original::cols#7 = (byte*) render_screen_original::cols#3 [phi:render_screen_original::@7->render_screen_original::@1#3] -- register_copy 
-  //SEG1163 [525] phi (byte*) render_screen_original::screen#8 = (byte*) render_screen_original::screen#10 [phi:render_screen_original::@7->render_screen_original::@1#4] -- register_copy 
+  //SEG1158 [525] phi from render_screen_original::@5 to render_screen_original::@1 [phi:render_screen_original::@5->render_screen_original::@1]
+  //SEG1159 [525] phi (byte) render_screen_original::y#6 = (byte) render_screen_original::y#1 [phi:render_screen_original::@5->render_screen_original::@1#0] -- register_copy 
+  //SEG1160 [525] phi (byte*) render_screen_original::ocols#4 = (byte*) render_screen_original::ocols#1 [phi:render_screen_original::@5->render_screen_original::@1#1] -- register_copy 
+  //SEG1161 [525] phi (byte*) render_screen_original::oscr#4 = (byte*) render_screen_original::oscr#1 [phi:render_screen_original::@5->render_screen_original::@1#2] -- register_copy 
+  //SEG1162 [525] phi (byte*) render_screen_original::cols#7 = (byte*) render_screen_original::cols#3 [phi:render_screen_original::@5->render_screen_original::@1#3] -- register_copy 
+  //SEG1163 [525] phi (byte*) render_screen_original::screen#8 = (byte*) render_screen_original::screen#10 [phi:render_screen_original::@5->render_screen_original::@1#4] -- register_copy 
   //SEG1164 render_screen_original::@1
   b1:
   //SEG1165 [526] phi from render_screen_original::@1 to render_screen_original::@2 [phi:render_screen_original::@1->render_screen_original::@2]
@@ -26344,14 +26472,14 @@ render_screen_original: {
   //SEG1179 [532] if((byte) render_screen_original::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto render_screen_original::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #4
     bne b2
-  //SEG1180 [533] phi from render_screen_original::@2 render_screen_original::@4 to render_screen_original::@4 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4]
-  //SEG1181 [533] phi (byte) render_screen_original::x#5 = (byte) render_screen_original::x#1 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#0] -- register_copy 
-  //SEG1182 [533] phi (byte*) render_screen_original::cols#5 = (byte*) render_screen_original::cols#1 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#1] -- register_copy 
-  //SEG1183 [533] phi (byte*) render_screen_original::ocols#2 = (byte*) render_screen_original::ocols#4 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#2] -- register_copy 
-  //SEG1184 [533] phi (byte*) render_screen_original::screen#6 = (byte*) render_screen_original::screen#2 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#3] -- register_copy 
-  //SEG1185 [533] phi (byte*) render_screen_original::oscr#2 = (byte*) render_screen_original::oscr#4 [phi:render_screen_original::@2/render_screen_original::@4->render_screen_original::@4#4] -- register_copy 
-  //SEG1186 render_screen_original::@4
-  b4:
+  //SEG1180 [533] phi from render_screen_original::@2 render_screen_original::@3 to render_screen_original::@3 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3]
+  //SEG1181 [533] phi (byte) render_screen_original::x#5 = (byte) render_screen_original::x#1 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#0] -- register_copy 
+  //SEG1182 [533] phi (byte*) render_screen_original::cols#5 = (byte*) render_screen_original::cols#1 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#1] -- register_copy 
+  //SEG1183 [533] phi (byte*) render_screen_original::ocols#2 = (byte*) render_screen_original::ocols#4 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#2] -- register_copy 
+  //SEG1184 [533] phi (byte*) render_screen_original::screen#6 = (byte*) render_screen_original::screen#2 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#3] -- register_copy 
+  //SEG1185 [533] phi (byte*) render_screen_original::oscr#2 = (byte*) render_screen_original::oscr#4 [phi:render_screen_original::@2/render_screen_original::@3->render_screen_original::@3#4] -- register_copy 
+  //SEG1186 render_screen_original::@3
+  b3:
   //SEG1187 [534] *((byte*) render_screen_original::screen#6) ← *((byte*) render_screen_original::oscr#2) -- _deref_pbuz1=_deref_pbuz2 
     ldy #0
     lda (oscr),y
@@ -26382,15 +26510,15 @@ render_screen_original: {
   !:
   //SEG1193 [540] (byte) render_screen_original::x#2 ← ++ (byte) render_screen_original::x#5 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1194 [541] if((byte) render_screen_original::x#2!=(byte/signed byte/word/signed word/dword/signed dword) $24) goto render_screen_original::@4 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG1194 [541] if((byte) render_screen_original::x#2!=(byte/signed byte/word/signed word/dword/signed dword) $24) goto render_screen_original::@3 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$24
-    bne b4
-  //SEG1195 [542] phi from render_screen_original::@4 render_screen_original::@6 to render_screen_original::@6 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6]
-  //SEG1196 [542] phi (byte) render_screen_original::x#6 = (byte) render_screen_original::x#2 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6#0] -- register_copy 
-  //SEG1197 [542] phi (byte*) render_screen_original::cols#6 = (byte*) render_screen_original::cols#2 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6#1] -- register_copy 
-  //SEG1198 [542] phi (byte*) render_screen_original::screen#7 = (byte*) render_screen_original::screen#3 [phi:render_screen_original::@4/render_screen_original::@6->render_screen_original::@6#2] -- register_copy 
-  //SEG1199 render_screen_original::@6
-  b6:
+    bne b3
+  //SEG1195 [542] phi from render_screen_original::@3 render_screen_original::@4 to render_screen_original::@4 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4]
+  //SEG1196 [542] phi (byte) render_screen_original::x#6 = (byte) render_screen_original::x#2 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4#0] -- register_copy 
+  //SEG1197 [542] phi (byte*) render_screen_original::cols#6 = (byte*) render_screen_original::cols#2 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4#1] -- register_copy 
+  //SEG1198 [542] phi (byte*) render_screen_original::screen#7 = (byte*) render_screen_original::screen#3 [phi:render_screen_original::@3/render_screen_original::@4->render_screen_original::@4#2] -- register_copy 
+  //SEG1199 render_screen_original::@4
+  b4:
   //SEG1200 [543] *((byte*) render_screen_original::screen#7) ← (const byte) render_screen_original::SPACE#0 -- _deref_pbuz1=vbuc1 
     lda #SPACE
     ldy #0
@@ -26411,10 +26539,10 @@ render_screen_original: {
   !:
   //SEG1204 [547] (byte) render_screen_original::x#3 ← ++ (byte) render_screen_original::x#6 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG1205 [548] if((byte) render_screen_original::x#3!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_screen_original::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG1205 [548] if((byte) render_screen_original::x#3!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_screen_original::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b6
-  //SEG1206 render_screen_original::@7
+    bne b4
+  //SEG1206 render_screen_original::@5
   //SEG1207 [549] (byte) render_screen_original::y#1 ← ++ (byte) render_screen_original::y#6 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG1208 [550] if((byte) render_screen_original::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto render_screen_original::@1 -- vbuz1_neq_vbuc1_then_la1 
@@ -26471,20 +26599,20 @@ sprites_irq: {
   //SEG1225 [562] (byte) sprites_irq::raster_sprite_gfx_modify#0 ← (byte/signed word/word/dword/signed dword~) sprites_irq::$0 -- vbuz1=vbuxx 
     // Wait for the y-position before changing sprite pointers
     stx raster_sprite_gfx_modify
-  //SEG1226 sprites_irq::@11
-  b11:
-  //SEG1227 [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@11 -- _deref_pbuc1_lt_vbuz1_then_la1 
+  //SEG1226 sprites_irq::@8
+  b8:
+  //SEG1227 [563] if(*((const byte*) RASTER#0)<(byte) sprites_irq::raster_sprite_gfx_modify#0) goto sprites_irq::@8 -- _deref_pbuc1_lt_vbuz1_then_la1 
     lda RASTER
     cmp raster_sprite_gfx_modify
-    bcc b11
-  //SEG1228 sprites_irq::@12
+    bcc b8
+  //SEG1228 sprites_irq::@9
   //SEG1229 [564] (byte) sprites_irq::ptr#0 ← (byte) irq_sprite_ptr#0 -- vbuxx=vbuz1 
     ldx irq_sprite_ptr
   //SEG1230 [565] if((byte) render_screen_showing#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sprites_irq::@1 -- vbuz1_eq_0_then_la1 
     lda render_screen_showing
     cmp #0
     beq b1
-  //SEG1231 sprites_irq::@13
+  //SEG1231 sprites_irq::@10
   //SEG1232 [566] *((const byte*) PLAYFIELD_SPRITE_PTRS_2#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuxx 
     stx PLAYFIELD_SPRITE_PTRS_2
   //SEG1233 [567] (byte) sprites_irq::ptr#3 ← ++ (byte) sprites_irq::ptr#0 -- vbuaa=_inc_vbuxx 
@@ -26507,12 +26635,12 @@ sprites_irq: {
     lda #9
     cmp irq_cnt
     beq b3
-  //SEG1241 sprites_irq::@7
+  //SEG1241 sprites_irq::@6
   //SEG1242 [574] if((byte) irq_cnt#1==(byte/signed byte/word/signed word/dword/signed dword) $a) goto sprites_irq::@4 -- vbuz1_eq_vbuc1_then_la1 
     lda #$a
     cmp irq_cnt
     beq b4
-  //SEG1243 sprites_irq::@8
+  //SEG1243 sprites_irq::@7
   //SEG1244 [575] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
     axs #-[$14]
@@ -26525,10 +26653,10 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-  //SEG1247 [578] phi from sprites_irq::@15 sprites_irq::@4 sprites_irq::@8 to sprites_irq::@6 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6]
-  //SEG1248 [578] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@15/sprites_irq::@4/sprites_irq::@8->sprites_irq::@6#0] -- register_copy 
-  //SEG1249 sprites_irq::@6
-  b6:
+  //SEG1247 [578] phi from sprites_irq::@11 sprites_irq::@4 sprites_irq::@7 to sprites_irq::@5 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5]
+  //SEG1248 [578] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#1 [phi:sprites_irq::@11/sprites_irq::@4/sprites_irq::@7->sprites_irq::@5#0] -- register_copy 
+  //SEG1249 sprites_irq::@5
+  b5:
   //SEG1250 [579] *((const byte*) RASTER#0) ← (byte) irq_raster_next#4 -- _deref_pbuc1=vbuz1 
     // Setup next interrupt
     lda irq_raster_next
@@ -26560,7 +26688,7 @@ sprites_irq: {
     lax irq_sprite_ptr
     axs #-[3]
     stx irq_sprite_ptr
-    jmp b6
+    jmp b5
   //SEG1259 sprites_irq::@3
   b3:
   //SEG1260 [586] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
@@ -26572,11 +26700,11 @@ sprites_irq: {
     sta irq_sprite_ypos
   //SEG1262 [588] phi from sprites_irq::@3 to sprites_irq::toSpritePtr2 [phi:sprites_irq::@3->sprites_irq::toSpritePtr2]
   //SEG1263 sprites_irq::toSpritePtr2
-  //SEG1264 sprites_irq::@15
+  //SEG1264 sprites_irq::@11
   //SEG1265 [589] (byte) irq_sprite_ptr#1 ← (const byte) sprites_irq::toSpritePtr2_return#0 -- vbuz1=vbuc1 
     lda #toSpritePtr2_return
     sta irq_sprite_ptr
-    jmp b6
+    jmp b5
   //SEG1266 sprites_irq::@1
   b1:
   //SEG1267 [590] *((const byte*) PLAYFIELD_SPRITE_PTRS_1#0) ← (byte) sprites_irq::ptr#0 -- _deref_pbuc1=vbuxx 
diff --git a/src/test/ref/complex/tetris/tetris.sym b/src/test/ref/complex/tetris/tetris.sym
index d4efe4316..a6327e363 100644
--- a/src/test/ref/complex/tetris/tetris.sym
+++ b/src/test/ref/complex/tetris/tetris.sym
@@ -1,8 +1,8 @@
-(label) @14
-(label) @23
-(label) @24
-(label) @38
-(label) @39
+(label) @1
+(label) @2
+(label) @3
+(label) @4
+(label) @5
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -398,7 +398,7 @@
 (byte) irq_sprite_ypos#3 irq_sprite_ypos zp ZP_BYTE:38 20.0
 (byte[]) keyboard_char_keycodes
 (byte()) keyboard_event_get()
-(label) keyboard_event_get::@3
+(label) keyboard_event_get::@1
 (label) keyboard_event_get::@return
 (byte) keyboard_event_get::return
 (byte) keyboard_event_get::return#1 reg byte x 4.0
@@ -431,25 +431,25 @@
 (label) keyboard_event_scan::@10
 (label) keyboard_event_scan::@11
 (label) keyboard_event_scan::@12
+(label) keyboard_event_scan::@13
 (label) keyboard_event_scan::@14
+(label) keyboard_event_scan::@15
 (label) keyboard_event_scan::@16
 (label) keyboard_event_scan::@17
 (label) keyboard_event_scan::@18
+(label) keyboard_event_scan::@19
 (label) keyboard_event_scan::@2
 (label) keyboard_event_scan::@20
 (label) keyboard_event_scan::@21
+(label) keyboard_event_scan::@22
 (label) keyboard_event_scan::@23
-(label) keyboard_event_scan::@24
-(label) keyboard_event_scan::@25
-(label) keyboard_event_scan::@26
-(label) keyboard_event_scan::@27
-(label) keyboard_event_scan::@28
-(label) keyboard_event_scan::@29
 (label) keyboard_event_scan::@3
+(label) keyboard_event_scan::@4
 (label) keyboard_event_scan::@5
 (label) keyboard_event_scan::@6
 (label) keyboard_event_scan::@7
 (label) keyboard_event_scan::@8
+(label) keyboard_event_scan::@9
 (label) keyboard_event_scan::@return
 (byte) keyboard_event_scan::col
 (byte) keyboard_event_scan::col#1 reg byte x 15001.5
@@ -522,27 +522,27 @@
 (word) lines_bcd#30 lines_bcd zp ZP_WORD:17 1.0
 (void()) main()
 (label) main::@1
+(label) main::@10
 (label) main::@11
+(label) main::@12
+(label) main::@13
+(label) main::@14
+(label) main::@15
+(label) main::@16
 (label) main::@17
+(label) main::@18
+(label) main::@19
+(label) main::@2
+(label) main::@20
+(label) main::@21
+(label) main::@22
 (label) main::@23
-(label) main::@25
-(label) main::@26
-(label) main::@27
-(label) main::@28
-(label) main::@29
-(label) main::@30
-(label) main::@31
-(label) main::@32
-(label) main::@33
-(label) main::@35
-(label) main::@36
-(label) main::@37
-(label) main::@38
-(label) main::@39
-(label) main::@40
-(label) main::@41
-(label) main::@42
+(label) main::@24
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
+(label) main::@7
 (label) main::@8
 (label) main::@9
 (byte) main::key_event
@@ -560,15 +560,15 @@
 (byte()) play_collision((byte) play_collision::xpos , (byte) play_collision::ypos , (byte) play_collision::orientation)
 (byte~) play_collision::$7 reg byte a 20002.0
 (label) play_collision::@1
-(label) play_collision::@14
-(label) play_collision::@17
+(label) play_collision::@10
 (label) play_collision::@2
-(label) play_collision::@20
-(label) play_collision::@21
 (label) play_collision::@3
 (label) play_collision::@4
 (label) play_collision::@5
 (label) play_collision::@6
+(label) play_collision::@7
+(label) play_collision::@8
+(label) play_collision::@9
 (label) play_collision::@return
 (byte) play_collision::c
 (byte) play_collision::c#1 reg byte x 10001.0
@@ -623,12 +623,12 @@
 (byte) play_collision::ypos2#2 ypos2 zp ZP_BYTE:11 867.0666666666667
 (void()) play_increase_level()
 (byte~) play_increase_level::$1 reg byte a 4.0
+(label) play_increase_level::@1
 (label) play_increase_level::@2
 (label) play_increase_level::@3
 (label) play_increase_level::@4
+(label) play_increase_level::@5
 (label) play_increase_level::@6
-(label) play_increase_level::@7
-(label) play_increase_level::@8
 (label) play_increase_level::@return
 (byte) play_increase_level::b
 (byte) play_increase_level::b#1 reg byte x 1501.5
@@ -661,8 +661,8 @@
 (label) play_lock_current::@3
 (label) play_lock_current::@4
 (label) play_lock_current::@5
+(label) play_lock_current::@6
 (label) play_lock_current::@7
-(label) play_lock_current::@8
 (label) play_lock_current::@return
 (byte) play_lock_current::c
 (byte) play_lock_current::c#1 reg byte x 10001.0
@@ -691,15 +691,15 @@
 (byte~) play_move_down::$2 reg byte a 4.0
 (label) play_move_down::@1
 (label) play_move_down::@10
+(label) play_move_down::@11
+(label) play_move_down::@12
+(label) play_move_down::@13
 (label) play_move_down::@14
 (label) play_move_down::@15
-(label) play_move_down::@17
-(label) play_move_down::@18
-(label) play_move_down::@19
+(label) play_move_down::@16
 (label) play_move_down::@2
-(label) play_move_down::@20
-(label) play_move_down::@21
 (label) play_move_down::@3
+(label) play_move_down::@4
 (label) play_move_down::@5
 (label) play_move_down::@6
 (label) play_move_down::@7
@@ -723,12 +723,12 @@
 (byte~) play_move_leftright::$4 reg byte a 4.0
 (byte~) play_move_leftright::$8 reg byte a 4.0
 (label) play_move_leftright::@1
-(label) play_move_leftright::@14
-(label) play_move_leftright::@15
+(label) play_move_leftright::@2
+(label) play_move_leftright::@3
 (label) play_move_leftright::@4
 (label) play_move_leftright::@5
 (label) play_move_leftright::@6
-(label) play_move_leftright::@9
+(label) play_move_leftright::@7
 (label) play_move_leftright::@return
 (byte) play_move_leftright::key_event
 (byte) play_move_leftright::key_event#0 reg byte a 3.0
@@ -740,10 +740,10 @@
 (byte/signed word/word/dword/signed dword~) play_move_rotate::$5 reg byte x 4.0
 (byte/signed word/word/dword/signed dword~) play_move_rotate::$7 reg byte x 4.0
 (label) play_move_rotate::@1
-(label) play_move_rotate::@11
-(label) play_move_rotate::@14
 (label) play_move_rotate::@2
+(label) play_move_rotate::@3
 (label) play_move_rotate::@4
+(label) play_move_rotate::@5
 (label) play_move_rotate::@6
 (label) play_move_rotate::@return
 (byte) play_move_rotate::key_event
@@ -760,9 +760,9 @@
 (byte~) play_movement::$3 reg byte a 4.0
 (byte~) play_movement::$4 reg byte a 4.0
 (label) play_movement::@1
-(label) play_movement::@5
-(label) play_movement::@6
-(label) play_movement::@7
+(label) play_movement::@2
+(label) play_movement::@3
+(label) play_movement::@4
 (label) play_movement::@return
 (byte) play_movement::key_event
 (byte) play_movement::key_event#0 key_event zp ZP_BYTE:41 8.916666666666664
@@ -775,12 +775,12 @@
 (byte) play_movement::return#3 reg byte a 202.0
 (byte()) play_remove_lines()
 (label) play_remove_lines::@1
-(label) play_remove_lines::@10
-(label) play_remove_lines::@12
-(label) play_remove_lines::@13
-(label) play_remove_lines::@14
-(label) play_remove_lines::@18
 (label) play_remove_lines::@2
+(label) play_remove_lines::@3
+(label) play_remove_lines::@4
+(label) play_remove_lines::@5
+(label) play_remove_lines::@6
+(label) play_remove_lines::@7
 (label) play_remove_lines::@8
 (label) play_remove_lines::@9
 (label) play_remove_lines::@return
@@ -818,11 +818,11 @@
 (byte~) play_spawn_current::$2 reg byte a 4.0
 (byte~) play_spawn_current::$6 reg byte a 2002.0
 (label) play_spawn_current::@1
-(label) play_spawn_current::@10
-(label) play_spawn_current::@11
 (label) play_spawn_current::@2
 (label) play_spawn_current::@3
-(label) play_spawn_current::@9
+(label) play_spawn_current::@4
+(label) play_spawn_current::@5
+(label) play_spawn_current::@6
 (label) play_spawn_current::@return
 (byte) play_spawn_current::current_piece_idx
 (byte) play_spawn_current::current_piece_idx#0 reg byte x 2.0
@@ -833,8 +833,8 @@
 (byte~) play_update_score::$2 reg byte a 4.0
 (byte~) play_update_score::$4 reg byte a 4.0
 (byte~) play_update_score::$5 reg byte a 4.0
+(label) play_update_score::@1
 (label) play_update_score::@2
-(label) play_update_score::@3
 (label) play_update_score::@return
 (dword) play_update_score::add_bcd
 (dword) play_update_score::add_bcd#0 add_bcd zp ZP_DWORD:43 1.3333333333333333
@@ -889,8 +889,8 @@
 (byte~) render_init::$13 reg byte a 22.0
 (byte~) render_init::$14 reg byte a 22.0
 (label) render_init::@1
+(label) render_init::@2
 (label) render_init::@3
-(label) render_init::@4
 (label) render_init::@return
 (byte) render_init::i
 (byte) render_init::i#1 reg byte x 16.5
@@ -921,7 +921,7 @@
 (label) render_moving::@4
 (label) render_moving::@5
 (label) render_moving::@6
-(label) render_moving::@8
+(label) render_moving::@7
 (label) render_moving::@return
 (byte) render_moving::c
 (byte) render_moving::c#1 reg byte x 1501.5
@@ -949,14 +949,14 @@
 (byte) render_moving::ypos2#2 ypos2 zp ZP_BYTE:12 27.06666666666667
 (void()) render_next()
 (byte~) render_next::$4 reg byte y 1.0
-(label) render_next::@11
+(label) render_next::@1
 (label) render_next::@2
 (label) render_next::@3
+(label) render_next::@4
 (label) render_next::@5
 (label) render_next::@6
 (label) render_next::@7
 (label) render_next::@8
-(label) render_next::@9
 (label) render_next::@return
 (byte) render_next::c
 (byte) render_next::c#1 reg byte x 1501.5
@@ -1003,13 +1003,13 @@
 (byte*) render_playfield::screen_line#1 screen_line zp ZP_WORD:5 500.5
 (byte*) render_playfield::screen_line#2 screen_line zp ZP_WORD:5 1552.0
 (void()) render_score()
+(label) render_score::@1
 (label) render_score::@2
 (label) render_score::@3
+(label) render_score::@4
 (label) render_score::@5
 (label) render_score::@6
 (label) render_score::@7
-(label) render_score::@8
-(label) render_score::@9
 (label) render_score::@return
 (word) render_score::level_offset
 (const word) render_score::level_offset#0 level_offset = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13+(byte/signed byte/word/signed word/dword/signed dword) $1f
@@ -1024,9 +1024,9 @@
 (void()) render_screen_original((byte*) render_screen_original::screen)
 (label) render_screen_original::@1
 (label) render_screen_original::@2
+(label) render_screen_original::@3
 (label) render_screen_original::@4
-(label) render_screen_original::@6
-(label) render_screen_original::@7
+(label) render_screen_original::@5
 (label) render_screen_original::@return
 (byte) render_screen_original::SPACE
 (const byte) render_screen_original::SPACE#0 SPACE = (byte/signed byte/word/signed word/dword/signed dword) 0
@@ -1083,7 +1083,7 @@
 (void()) render_screen_swap()
 (label) render_screen_swap::@return
 (void()) render_show()
-(label) render_show::@2
+(label) render_show::@1
 (label) render_show::@return
 (byte) render_show::d018val
 (byte) render_show::d018val#3 reg byte a 2.0
@@ -1148,16 +1148,16 @@
 interrupt(HARDWARE_CLOBBER)(void()) sprites_irq()
 (byte/signed word/word/dword/signed dword~) sprites_irq::$0 reg byte x 4.0
 (label) sprites_irq::@1
+(label) sprites_irq::@10
 (label) sprites_irq::@11
-(label) sprites_irq::@12
-(label) sprites_irq::@13
-(label) sprites_irq::@15
 (label) sprites_irq::@2
 (label) sprites_irq::@3
 (label) sprites_irq::@4
+(label) sprites_irq::@5
 (label) sprites_irq::@6
 (label) sprites_irq::@7
 (label) sprites_irq::@8
+(label) sprites_irq::@9
 (label) sprites_irq::@return
 (byte) sprites_irq::ptr
 (byte) sprites_irq::ptr#0 reg byte x 2.5
diff --git a/src/test/ref/const-condition.cfg b/src/test/ref/const-condition.cfg
index c9f1b082d..9161aa44c 100644
--- a/src/test/ref/const-condition.cfg
+++ b/src/test/ref/const-condition.cfg
@@ -9,10 +9,10 @@
   [3] phi()
 main: scope:[main]  from @1
   [4] phi()
-  to:main::@3
-main::@3: scope:[main]  from main
+  to:main::@1
+main::@1: scope:[main]  from main
   [5] *((const byte*) main::SCREEN#0) ← (byte) '!'
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@1
   [6] return 
   to:@return
diff --git a/src/test/ref/const-condition.log b/src/test/ref/const-condition.log
index ab28abead..33688d5e4 100644
--- a/src/test/ref/const-condition.log
+++ b/src/test/ref/const-condition.log
@@ -59,6 +59,7 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block main::@3 to main::@1
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -76,11 +77,11 @@ FINAL CONTROL FLOW GRAPH
   [3] phi()
 main: scope:[main]  from @1
   [4] phi()
-  to:main::@3
-main::@3: scope:[main]  from main
+  to:main::@1
+main::@1: scope:[main]  from main
   [5] *((const byte*) main::SCREEN#0) ← (byte) '!'
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@1
   [6] return 
   to:@return
 
@@ -119,9 +120,9 @@ bend:
 //SEG10 main
 main: {
     .label SCREEN = $400
-    jmp b3
-  //SEG11 main::@3
-  b3:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) main::SCREEN#0) ← (byte) '!' -- _deref_pbuc1=vbuc2 
     lda #'!'
     sta SCREEN
@@ -169,9 +170,9 @@ bend:
 //SEG10 main
 main: {
     .label SCREEN = $400
-    jmp b3
-  //SEG11 main::@3
-  b3:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) main::SCREEN#0) ← (byte) '!' -- _deref_pbuc1=vbuc2 
     lda #'!'
     sta SCREEN
@@ -185,7 +186,7 @@ main: {
 ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction b1_from_bbegin:
@@ -194,7 +195,7 @@ Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b3:
+Removing instruction b1:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
@@ -208,7 +209,7 @@ FINAL SYMBOL TABLE
 (label) @begin
 (label) @end
 (void()) main()
-(label) main::@3
+(label) main::@1
 (label) main::@return
 (byte*) main::SCREEN
 (const byte*) main::SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
@@ -235,7 +236,7 @@ Score: 12
 //SEG10 main
 main: {
     .label SCREEN = $400
-  //SEG11 main::@3
+  //SEG11 main::@1
   //SEG12 [5] *((const byte*) main::SCREEN#0) ← (byte) '!' -- _deref_pbuc1=vbuc2 
     lda #'!'
     sta SCREEN
diff --git a/src/test/ref/const-condition.sym b/src/test/ref/const-condition.sym
index c514bc5c7..e6ede9557 100644
--- a/src/test/ref/const-condition.sym
+++ b/src/test/ref/const-condition.sym
@@ -2,7 +2,7 @@
 (label) @begin
 (label) @end
 (void()) main()
-(label) main::@3
+(label) main::@1
 (label) main::@return
 (byte*) main::SCREEN
 (const byte*) main::SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
diff --git a/src/test/ref/const-early-identification.cfg b/src/test/ref/const-early-identification.cfg
index bcad524e9..ba224a47e 100644
--- a/src/test/ref/const-early-identification.cfg
+++ b/src/test/ref/const-early-identification.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] (byte) A#0 ← (byte) 'a'
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const byte*) SCREEN#0) ← (byte) A#0
   [5] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (const byte) main::B#0
   [6] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← *((const byte*) main::addrA#0)
diff --git a/src/test/ref/const-early-identification.log b/src/test/ref/const-early-identification.log
index 344db308e..8c78ee105 100644
--- a/src/test/ref/const-early-identification.log
+++ b/src/test/ref/const-early-identification.log
@@ -99,20 +99,21 @@ Calls in [main] to sub:7
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
-Adding NOP phi() at start of @2
+Renumbering block @2 to @1
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] (byte) A#0 ← (byte) 'a'
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const byte*) SCREEN#0) ← (byte) A#0
   [5] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (const byte) main::B#0
   [6] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← *((const byte*) main::addrA#0)
@@ -168,15 +169,15 @@ bbegin:
   // Not an early constant (address-of is used)
   lda #'a'
   sta A
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG6 @2
-b2:
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG6 @1
+b1:
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -258,15 +259,15 @@ bbegin:
   // Not an early constant (address-of is used)
   lda #'a'
   sta A
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG6 @2
-b2:
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG6 @1
+b1:
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -310,22 +311,22 @@ sub: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction bend:
 Removing instruction breturn:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte) A
@@ -367,11 +368,11 @@ bbegin:
   // Not an early constant (address-of is used)
   lda #'a'
   sta A
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG6 @2
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG6 @1
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/const-early-identification.sym b/src/test/ref/const-early-identification.sym
index 638b8d966..f46f2ba27 100644
--- a/src/test/ref/const-early-identification.sym
+++ b/src/test/ref/const-early-identification.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte) A
diff --git a/src/test/ref/const-identification.asm b/src/test/ref/const-identification.asm
index 2063d7e38..42abf8fdb 100644
--- a/src/test/ref/const-identification.asm
+++ b/src/test/ref/const-identification.asm
@@ -13,20 +13,20 @@ main: {
     inx
     cpx #$28
     bne b1
-  b3:
+  b2:
     jsr line
-    jmp b3
+    jmp b2
 }
 line: {
     .const x0 = 0
     .const x1 = $a
     ldy #x0
-  b5:
+  b1:
     jsr plot
     iny
     cpy #x1
-    bcc b5
-    beq b5
+    bcc b1
+    beq b1
     rts
 }
 // plot(byte register(Y) x)
diff --git a/src/test/ref/const-identification.cfg b/src/test/ref/const-identification.cfg
index db1c23b5c..9466d263f 100644
--- a/src/test/ref/const-identification.cfg
+++ b/src/test/ref/const-identification.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@1
@@ -16,27 +16,27 @@ main::@1: scope:[main]  from main main::@1
   [7] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [8] (byte) main::i#1 ← ++ (byte) main::i#2
   [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@1 main::@3
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
   [10] phi()
   [11] call line 
-  to:main::@3
-line: scope:[line]  from main::@3
+  to:main::@2
+line: scope:[line]  from main::@2
   [12] phi()
-  to:line::@5
-line::@5: scope:[line]  from line line::@8
-  [13] (byte) line::x#2 ← phi( line/(const byte) line::x0#0 line::@8/(byte) line::x#1 )
+  to:line::@1
+line::@1: scope:[line]  from line line::@2
+  [13] (byte) line::x#2 ← phi( line/(const byte) line::x0#0 line::@2/(byte) line::x#1 )
   [14] (byte) plot::x#1 ← (byte) line::x#2
   [15] call plot 
-  to:line::@8
-line::@8: scope:[line]  from line::@5
+  to:line::@2
+line::@2: scope:[line]  from line::@1
   [16] (byte) line::x#1 ← ++ (byte) line::x#2
-  [17] if((byte) line::x#1<=(const byte) line::x1#0) goto line::@5
+  [17] if((byte) line::x#1<=(const byte) line::x1#0) goto line::@1
   to:line::@return
-line::@return: scope:[line]  from line::@8
+line::@return: scope:[line]  from line::@2
   [18] return 
   to:@return
-plot: scope:[plot]  from line::@5
+plot: scope:[plot]  from line::@1
   [19] (byte) plot::idx#0 ← *((const byte*) plots#0 + (byte) plot::x#1)
   [20] (byte/signed word/word/dword/signed dword~) plot::$0 ← *((const byte*) SCREEN#0 + (byte) plot::idx#0) + (byte/signed byte/word/signed word/dword/signed dword) 1
   [21] *((const byte*) SCREEN#0 + (byte) plot::idx#0) ← (byte/signed word/word/dword/signed dword~) plot::$0
diff --git a/src/test/ref/const-identification.log b/src/test/ref/const-identification.log
index c2d263d8d..c8ea472da 100644
--- a/src/test/ref/const-identification.log
+++ b/src/test/ref/const-identification.log
@@ -193,24 +193,28 @@ Coalesced [20] line::x#4 ← line::x#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@6
 Culled Empty Block (label) line::@9
+Renumbering block @3 to @1
+Renumbering block main::@3 to main::@2
+Renumbering block line::@5 to line::@1
+Renumbering block line::@8 to line::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@3
+Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of line
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@1
@@ -219,27 +223,27 @@ main::@1: scope:[main]  from main main::@1
   [7] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [8] (byte) main::i#1 ← ++ (byte) main::i#2
   [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@1 main::@3
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
   [10] phi()
   [11] call line 
-  to:main::@3
-line: scope:[line]  from main::@3
+  to:main::@2
+line: scope:[line]  from main::@2
   [12] phi()
-  to:line::@5
-line::@5: scope:[line]  from line line::@8
-  [13] (byte) line::x#2 ← phi( line/(const byte) line::x0#0 line::@8/(byte) line::x#1 )
+  to:line::@1
+line::@1: scope:[line]  from line line::@2
+  [13] (byte) line::x#2 ← phi( line/(const byte) line::x0#0 line::@2/(byte) line::x#1 )
   [14] (byte) plot::x#1 ← (byte) line::x#2
   [15] call plot 
-  to:line::@8
-line::@8: scope:[line]  from line::@5
+  to:line::@2
+line::@2: scope:[line]  from line::@1
   [16] (byte) line::x#1 ← ++ (byte) line::x#2
-  [17] if((byte) line::x#1<=(const byte) line::x1#0) goto line::@5
+  [17] if((byte) line::x#1<=(const byte) line::x1#0) goto line::@1
   to:line::@return
-line::@return: scope:[line]  from line::@8
+line::@return: scope:[line]  from line::@2
   [18] return 
   to:@return
-plot: scope:[plot]  from line::@5
+plot: scope:[plot]  from line::@1
   [19] (byte) plot::idx#0 ← *((const byte*) plots#0 + (byte) plot::x#1)
   [20] (byte/signed word/word/dword/signed dword~) plot::$0 ← *((const byte*) SCREEN#0 + (byte) plot::idx#0) + (byte/signed byte/word/signed word/dword/signed dword) 1
   [21] *((const byte*) SCREEN#0 + (byte) plot::idx#0) ← (byte/signed word/word/dword/signed dword~) plot::$0
@@ -298,17 +302,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -341,49 +345,49 @@ main: {
     lda #$28
     cmp i
     bne b1_from_b1
-  //SEG20 [10] phi from main::@1 main::@3 to main::@3 [phi:main::@1/main::@3->main::@3]
-  b3_from_b1:
-  b3_from_b3:
-    jmp b3
-  //SEG21 main::@3
-  b3:
+  //SEG20 [10] phi from main::@1 main::@2 to main::@2 [phi:main::@1/main::@2->main::@2]
+  b2_from_b1:
+  b2_from_b2:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [11] call line 
-  //SEG23 [12] phi from main::@3 to line [phi:main::@3->line]
-  line_from_b3:
+  //SEG23 [12] phi from main::@2 to line [phi:main::@2->line]
+  line_from_b2:
     jsr line
-    jmp b3_from_b3
+    jmp b2_from_b2
 }
 //SEG24 line
 line: {
     .const x0 = 0
     .const x1 = $a
     .label x = 3
-  //SEG25 [13] phi from line to line::@5 [phi:line->line::@5]
-  b5_from_line:
-  //SEG26 [13] phi (byte) line::x#2 = (const byte) line::x0#0 [phi:line->line::@5#0] -- vbuz1=vbuc1 
+  //SEG25 [13] phi from line to line::@1 [phi:line->line::@1]
+  b1_from_line:
+  //SEG26 [13] phi (byte) line::x#2 = (const byte) line::x0#0 [phi:line->line::@1#0] -- vbuz1=vbuc1 
     lda #x0
     sta x
-    jmp b5
-  //SEG27 [13] phi from line::@8 to line::@5 [phi:line::@8->line::@5]
-  b5_from_b8:
-  //SEG28 [13] phi (byte) line::x#2 = (byte) line::x#1 [phi:line::@8->line::@5#0] -- register_copy 
-    jmp b5
-  //SEG29 line::@5
-  b5:
+    jmp b1
+  //SEG27 [13] phi from line::@2 to line::@1 [phi:line::@2->line::@1]
+  b1_from_b2:
+  //SEG28 [13] phi (byte) line::x#2 = (byte) line::x#1 [phi:line::@2->line::@1#0] -- register_copy 
+    jmp b1
+  //SEG29 line::@1
+  b1:
   //SEG30 [14] (byte) plot::x#1 ← (byte) line::x#2 -- vbuz1=vbuz2 
     lda x
     sta plot.x
   //SEG31 [15] call plot 
     jsr plot
-    jmp b8
-  //SEG32 line::@8
-  b8:
+    jmp b2
+  //SEG32 line::@2
+  b2:
   //SEG33 [16] (byte) line::x#1 ← ++ (byte) line::x#2 -- vbuz1=_inc_vbuz1 
     inc x
-  //SEG34 [17] if((byte) line::x#1<=(const byte) line::x1#0) goto line::@5 -- vbuz1_le_vbuc1_then_la1 
+  //SEG34 [17] if((byte) line::x#1<=(const byte) line::x1#0) goto line::@1 -- vbuz1_le_vbuc1_then_la1 
     lda #x1
     cmp x
-    bcs b5_from_b8
+    bcs b1_from_b2
     jmp breturn
   //SEG35 line::@return
   breturn:
@@ -451,17 +455,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -489,45 +493,45 @@ main: {
   //SEG19 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
     bne b1_from_b1
-  //SEG20 [10] phi from main::@1 main::@3 to main::@3 [phi:main::@1/main::@3->main::@3]
-  b3_from_b1:
-  b3_from_b3:
-    jmp b3
-  //SEG21 main::@3
-  b3:
+  //SEG20 [10] phi from main::@1 main::@2 to main::@2 [phi:main::@1/main::@2->main::@2]
+  b2_from_b1:
+  b2_from_b2:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [11] call line 
-  //SEG23 [12] phi from main::@3 to line [phi:main::@3->line]
-  line_from_b3:
+  //SEG23 [12] phi from main::@2 to line [phi:main::@2->line]
+  line_from_b2:
     jsr line
-    jmp b3_from_b3
+    jmp b2_from_b2
 }
 //SEG24 line
 line: {
     .const x0 = 0
     .const x1 = $a
-  //SEG25 [13] phi from line to line::@5 [phi:line->line::@5]
-  b5_from_line:
-  //SEG26 [13] phi (byte) line::x#2 = (const byte) line::x0#0 [phi:line->line::@5#0] -- vbuyy=vbuc1 
+  //SEG25 [13] phi from line to line::@1 [phi:line->line::@1]
+  b1_from_line:
+  //SEG26 [13] phi (byte) line::x#2 = (const byte) line::x0#0 [phi:line->line::@1#0] -- vbuyy=vbuc1 
     ldy #x0
-    jmp b5
-  //SEG27 [13] phi from line::@8 to line::@5 [phi:line::@8->line::@5]
-  b5_from_b8:
-  //SEG28 [13] phi (byte) line::x#2 = (byte) line::x#1 [phi:line::@8->line::@5#0] -- register_copy 
-    jmp b5
-  //SEG29 line::@5
-  b5:
+    jmp b1
+  //SEG27 [13] phi from line::@2 to line::@1 [phi:line::@2->line::@1]
+  b1_from_b2:
+  //SEG28 [13] phi (byte) line::x#2 = (byte) line::x#1 [phi:line::@2->line::@1#0] -- register_copy 
+    jmp b1
+  //SEG29 line::@1
+  b1:
   //SEG30 [14] (byte) plot::x#1 ← (byte) line::x#2
   //SEG31 [15] call plot 
     jsr plot
-    jmp b8
-  //SEG32 line::@8
-  b8:
+    jmp b2
+  //SEG32 line::@2
+  b2:
   //SEG33 [16] (byte) line::x#1 ← ++ (byte) line::x#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG34 [17] if((byte) line::x#1<=(const byte) line::x1#0) goto line::@5 -- vbuyy_le_vbuc1_then_la1 
+  //SEG34 [17] if((byte) line::x#1<=(const byte) line::x1#0) goto line::@1 -- vbuyy_le_vbuc1_then_la1 
     cpy #x1
-    bcc b5_from_b8
-    beq b5_from_b8
+    bcc b1_from_b2
+    beq b1_from_b2
     jmp breturn
   //SEG35 line::@return
   breturn:
@@ -553,33 +557,33 @@ plot: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
-Removing instruction jmp b5
-Removing instruction jmp b8
+Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
-Replacing label b3_from_b3 with b3
-Replacing label b5_from_b8 with b5
-Replacing label b5_from_b8 with b5
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
+Replacing label b2_from_b2 with b2
+Replacing label b1_from_b2 with b1
+Replacing label b1_from_b2 with b1
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b1:
-Removing instruction b3_from_b1:
-Removing instruction b3_from_b3:
-Removing instruction line_from_b3:
-Removing instruction b5_from_b8:
+Removing instruction b2_from_b1:
+Removing instruction b2_from_b2:
+Removing instruction line_from_b2:
+Removing instruction b1_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b5_from_line:
-Removing instruction b8:
+Removing instruction b1_from_line:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -587,20 +591,20 @@ Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) line((byte) line::x0 , (byte) line::x1)
-(label) line::@5
-(label) line::@8
+(label) line::@1
+(label) line::@2
 (label) line::@return
 (byte) line::x
 (byte) line::x#1 reg byte y 151.5
@@ -611,7 +615,7 @@ FINAL SYMBOL TABLE
 (const byte) line::x1#0 x1 = (byte/signed byte/word/signed word/dword/signed dword) $a
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
 (byte) main::i#2 reg byte x 18.333333333333332
@@ -644,11 +648,11 @@ Score: 1963
   .label plots = $1000
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -670,35 +674,35 @@ main: {
   //SEG19 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
     bne b1
-  //SEG20 [10] phi from main::@1 main::@3 to main::@3 [phi:main::@1/main::@3->main::@3]
-  //SEG21 main::@3
-  b3:
+  //SEG20 [10] phi from main::@1 main::@2 to main::@2 [phi:main::@1/main::@2->main::@2]
+  //SEG21 main::@2
+  b2:
   //SEG22 [11] call line 
-  //SEG23 [12] phi from main::@3 to line [phi:main::@3->line]
+  //SEG23 [12] phi from main::@2 to line [phi:main::@2->line]
     jsr line
-    jmp b3
+    jmp b2
 }
 //SEG24 line
 line: {
     .const x0 = 0
     .const x1 = $a
-  //SEG25 [13] phi from line to line::@5 [phi:line->line::@5]
-  //SEG26 [13] phi (byte) line::x#2 = (const byte) line::x0#0 [phi:line->line::@5#0] -- vbuyy=vbuc1 
+  //SEG25 [13] phi from line to line::@1 [phi:line->line::@1]
+  //SEG26 [13] phi (byte) line::x#2 = (const byte) line::x0#0 [phi:line->line::@1#0] -- vbuyy=vbuc1 
     ldy #x0
-  //SEG27 [13] phi from line::@8 to line::@5 [phi:line::@8->line::@5]
-  //SEG28 [13] phi (byte) line::x#2 = (byte) line::x#1 [phi:line::@8->line::@5#0] -- register_copy 
-  //SEG29 line::@5
-  b5:
+  //SEG27 [13] phi from line::@2 to line::@1 [phi:line::@2->line::@1]
+  //SEG28 [13] phi (byte) line::x#2 = (byte) line::x#1 [phi:line::@2->line::@1#0] -- register_copy 
+  //SEG29 line::@1
+  b1:
   //SEG30 [14] (byte) plot::x#1 ← (byte) line::x#2
   //SEG31 [15] call plot 
     jsr plot
-  //SEG32 line::@8
+  //SEG32 line::@2
   //SEG33 [16] (byte) line::x#1 ← ++ (byte) line::x#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG34 [17] if((byte) line::x#1<=(const byte) line::x1#0) goto line::@5 -- vbuyy_le_vbuc1_then_la1 
+  //SEG34 [17] if((byte) line::x#1<=(const byte) line::x1#0) goto line::@1 -- vbuyy_le_vbuc1_then_la1 
     cpy #x1
-    bcc b5
-    beq b5
+    bcc b1
+    beq b1
   //SEG35 line::@return
   //SEG36 [18] return 
     rts
diff --git a/src/test/ref/const-identification.sym b/src/test/ref/const-identification.sym
index 3e2075b71..22372458f 100644
--- a/src/test/ref/const-identification.sym
+++ b/src/test/ref/const-identification.sym
@@ -1,11 +1,11 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) line((byte) line::x0 , (byte) line::x1)
-(label) line::@5
-(label) line::@8
+(label) line::@1
+(label) line::@2
 (label) line::@return
 (byte) line::x
 (byte) line::x#1 reg byte y 151.5
@@ -16,7 +16,7 @@
 (const byte) line::x1#0 x1 = (byte/signed byte/word/signed word/dword/signed dword) $a
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
 (byte) main::i#2 reg byte x 18.333333333333332
diff --git a/src/test/ref/const-if-problem.cfg b/src/test/ref/const-if-problem.cfg
index 51d8d7a62..0838dbf87 100644
--- a/src/test/ref/const-if-problem.cfg
+++ b/src/test/ref/const-if-problem.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main
diff --git a/src/test/ref/const-if-problem.log b/src/test/ref/const-if-problem.log
index 2edc6a6af..47a822d12 100644
--- a/src/test/ref/const-if-problem.log
+++ b/src/test/ref/const-if-problem.log
@@ -103,22 +103,23 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @3 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main
@@ -148,17 +149,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -198,17 +199,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -228,15 +229,15 @@ main: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1:
@@ -249,7 +250,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -273,11 +274,11 @@ Score: 12
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/const-if-problem.sym b/src/test/ref/const-if-problem.sym
index c30439752..c10bf9edc 100644
--- a/src/test/ref/const-if-problem.sym
+++ b/src/test/ref/const-if-problem.sym
@@ -1,4 +1,4 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
diff --git a/src/test/ref/const-param.cfg b/src/test/ref/const-param.cfg
index e0898f4c3..b8dd1a3ee 100644
--- a/src/test/ref/const-param.cfg
+++ b/src/test/ref/const-param.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call sum 
   [6] (byte) sum::return#0 ← (byte) sum::return#3
diff --git a/src/test/ref/const-param.log b/src/test/ref/const-param.log
index 69c348bb7..e79faeb81 100644
--- a/src/test/ref/const-param.log
+++ b/src/test/ref/const-param.log
@@ -143,22 +143,23 @@ Calls in [main] to sum:5 sum:9 sum:13
 
 Created 1 initial phi equivalence classes
 Coalesced down to 1 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call sum 
   [6] (byte) sum::return#0 ← (byte) sum::return#3
@@ -245,17 +246,17 @@ INITIAL ASM
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -380,17 +381,17 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -457,7 +458,7 @@ sum: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -465,10 +466,10 @@ Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction sum_from_main:
@@ -487,7 +488,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -534,11 +535,11 @@ Score: 52
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/const-param.sym b/src/test/ref/const-param.sym
index a4472bf35..32dc0b696 100644
--- a/src/test/ref/const-param.sym
+++ b/src/test/ref/const-param.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/constants.cfg b/src/test/ref/constants.cfg
index 102765784..8d50f5b48 100644
--- a/src/test/ref/constants.cfg
+++ b/src/test/ref/constants.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@24
-@24: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @24
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @24
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
@@ -52,15 +52,15 @@ assert_sbyte: scope:[assert_sbyte]  from test_sbytes test_sbytes::@1 test_sbytes
   [23] (byte*) print_str::str#5 ← (byte*) assert_sbyte::msg#5
   [24] (byte*~) print_char_cursor#87 ← (byte*) print_line_cursor#1
   [25] call print_str 
-  to:assert_sbyte::@5
-assert_sbyte::@5: scope:[assert_sbyte]  from assert_sbyte
+  to:assert_sbyte::@4
+assert_sbyte::@4: scope:[assert_sbyte]  from assert_sbyte
   [26] phi()
   [27] call print_str 
-  to:assert_sbyte::@6
-assert_sbyte::@6: scope:[assert_sbyte]  from assert_sbyte::@5
+  to:assert_sbyte::@5
+assert_sbyte::@5: scope:[assert_sbyte]  from assert_sbyte::@4
   [28] if((signed byte) assert_sbyte::b#5!=(signed byte) assert_sbyte::c#5) goto assert_sbyte::@1
   to:assert_sbyte::@3
-assert_sbyte::@3: scope:[assert_sbyte]  from assert_sbyte::@6
+assert_sbyte::@3: scope:[assert_sbyte]  from assert_sbyte::@5
   [29] phi()
   [30] call print_str 
   to:assert_sbyte::@2
@@ -71,13 +71,13 @@ assert_sbyte::@2: scope:[assert_sbyte]  from assert_sbyte::@1 assert_sbyte::@3
 assert_sbyte::@return: scope:[assert_sbyte]  from assert_sbyte::@2
   [33] return 
   to:@return
-assert_sbyte::@1: scope:[assert_sbyte]  from assert_sbyte::@6
+assert_sbyte::@1: scope:[assert_sbyte]  from assert_sbyte::@5
   [34] *((const byte*) BGCOL#0) ← (const byte) RED#0
   [35] call print_str 
   to:assert_sbyte::@2
-print_str: scope:[print_str]  from assert_byte assert_byte::@1 assert_byte::@3 assert_byte::@5 assert_sbyte assert_sbyte::@1 assert_sbyte::@3 assert_sbyte::@5
-  [36] (byte*) print_char_cursor#80 ← phi( assert_byte/(byte*) print_char_cursor#70 assert_byte::@1/(byte*) print_char_cursor#2 assert_byte::@3/(byte*) print_char_cursor#2 assert_byte::@5/(byte*) print_char_cursor#2 assert_sbyte/(byte*~) print_char_cursor#87 assert_sbyte::@1/(byte*) print_char_cursor#2 assert_sbyte::@3/(byte*) print_char_cursor#2 assert_sbyte::@5/(byte*) print_char_cursor#2 )
-  [36] (byte*) print_str::str#11 ← phi( assert_byte/(byte*) print_str::str#1 assert_byte::@1/(const string) str1 assert_byte::@3/(const string) str2 assert_byte::@5/(const string) str assert_sbyte/(byte*) print_str::str#5 assert_sbyte::@1/(const string) str1 assert_sbyte::@3/(const string) str2 assert_sbyte::@5/(const string) str )
+print_str: scope:[print_str]  from assert_byte assert_byte::@1 assert_byte::@3 assert_byte::@4 assert_sbyte assert_sbyte::@1 assert_sbyte::@3 assert_sbyte::@4
+  [36] (byte*) print_char_cursor#80 ← phi( assert_byte/(byte*) print_char_cursor#70 assert_byte::@1/(byte*) print_char_cursor#2 assert_byte::@3/(byte*) print_char_cursor#2 assert_byte::@4/(byte*) print_char_cursor#2 assert_sbyte/(byte*~) print_char_cursor#87 assert_sbyte::@1/(byte*) print_char_cursor#2 assert_sbyte::@3/(byte*) print_char_cursor#2 assert_sbyte::@4/(byte*) print_char_cursor#2 )
+  [36] (byte*) print_str::str#11 ← phi( assert_byte/(byte*) print_str::str#1 assert_byte::@1/(const string) str1 assert_byte::@3/(const string) str2 assert_byte::@4/(const string) str assert_sbyte/(byte*) print_str::str#5 assert_sbyte::@1/(const string) str1 assert_sbyte::@3/(const string) str2 assert_sbyte::@4/(const string) str )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [37] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#80 print_str::@2/(byte*) print_char_cursor#1 )
@@ -126,15 +126,15 @@ assert_byte: scope:[assert_byte]  from test_bytes test_bytes::@1 test_bytes::@2
   [55] (byte*) assert_byte::msg#3 ← phi( test_bytes/(const string) msg test_bytes::@1/(const string) msg1 test_bytes::@2/(const string) test_bytes::msg2 )
   [56] (byte*) print_str::str#1 ← (byte*) assert_byte::msg#3
   [57] call print_str 
-  to:assert_byte::@5
-assert_byte::@5: scope:[assert_byte]  from assert_byte
+  to:assert_byte::@4
+assert_byte::@4: scope:[assert_byte]  from assert_byte
   [58] phi()
   [59] call print_str 
-  to:assert_byte::@6
-assert_byte::@6: scope:[assert_byte]  from assert_byte::@5
+  to:assert_byte::@5
+assert_byte::@5: scope:[assert_byte]  from assert_byte::@4
   [60] if((byte) assert_byte::b#3!=(byte) assert_byte::c#3) goto assert_byte::@1
   to:assert_byte::@3
-assert_byte::@3: scope:[assert_byte]  from assert_byte::@6
+assert_byte::@3: scope:[assert_byte]  from assert_byte::@5
   [61] phi()
   [62] call print_str 
   to:assert_byte::@2
@@ -145,7 +145,7 @@ assert_byte::@2: scope:[assert_byte]  from assert_byte::@1 assert_byte::@3
 assert_byte::@return: scope:[assert_byte]  from assert_byte::@2
   [65] return 
   to:@return
-assert_byte::@1: scope:[assert_byte]  from assert_byte::@6
+assert_byte::@1: scope:[assert_byte]  from assert_byte::@5
   [66] *((const byte*) BGCOL#0) ← (const byte) RED#0
   [67] call print_str 
   to:assert_byte::@2
diff --git a/src/test/ref/constants.log b/src/test/ref/constants.log
index 978f51ea1..5c77e24cb 100644
--- a/src/test/ref/constants.log
+++ b/src/test/ref/constants.log
@@ -1064,8 +1064,13 @@ Coalesced [87] print_cls::sc#3 ← print_cls::sc#1
 Coalesced down to 10 phi equivalence classes
 Culled Empty Block (label) print_ln::@3
 Culled Empty Block (label) print_cls::@3
+Renumbering block @24 to @1
+Renumbering block assert_byte::@5 to assert_byte::@4
+Renumbering block assert_byte::@6 to assert_byte::@5
+Renumbering block assert_sbyte::@5 to assert_sbyte::@4
+Renumbering block assert_sbyte::@6 to assert_sbyte::@5
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @24
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@2
@@ -1074,11 +1079,11 @@ Adding NOP phi() at start of test_sbytes::@1
 Adding NOP phi() at start of test_sbytes::@2
 Adding NOP phi() at start of test_sbytes::@3
 Adding NOP phi() at start of test_sbytes::@4
-Adding NOP phi() at start of assert_sbyte::@5
+Adding NOP phi() at start of assert_sbyte::@4
 Adding NOP phi() at start of assert_sbyte::@3
 Adding NOP phi() at start of assert_sbyte::@2
 Adding NOP phi() at start of test_bytes
-Adding NOP phi() at start of assert_byte::@5
+Adding NOP phi() at start of assert_byte::@4
 Adding NOP phi() at start of assert_byte::@3
 Adding NOP phi() at start of assert_byte::@2
 Adding NOP phi() at start of print_cls
@@ -1086,14 +1091,14 @@ Adding NOP phi() at start of print_cls
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@24
-@24: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @24
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @24
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
@@ -1138,15 +1143,15 @@ assert_sbyte: scope:[assert_sbyte]  from test_sbytes test_sbytes::@1 test_sbytes
   [23] (byte*) print_str::str#5 ← (byte*) assert_sbyte::msg#5
   [24] (byte*~) print_char_cursor#87 ← (byte*) print_line_cursor#1
   [25] call print_str 
-  to:assert_sbyte::@5
-assert_sbyte::@5: scope:[assert_sbyte]  from assert_sbyte
+  to:assert_sbyte::@4
+assert_sbyte::@4: scope:[assert_sbyte]  from assert_sbyte
   [26] phi()
   [27] call print_str 
-  to:assert_sbyte::@6
-assert_sbyte::@6: scope:[assert_sbyte]  from assert_sbyte::@5
+  to:assert_sbyte::@5
+assert_sbyte::@5: scope:[assert_sbyte]  from assert_sbyte::@4
   [28] if((signed byte) assert_sbyte::b#5!=(signed byte) assert_sbyte::c#5) goto assert_sbyte::@1
   to:assert_sbyte::@3
-assert_sbyte::@3: scope:[assert_sbyte]  from assert_sbyte::@6
+assert_sbyte::@3: scope:[assert_sbyte]  from assert_sbyte::@5
   [29] phi()
   [30] call print_str 
   to:assert_sbyte::@2
@@ -1157,13 +1162,13 @@ assert_sbyte::@2: scope:[assert_sbyte]  from assert_sbyte::@1 assert_sbyte::@3
 assert_sbyte::@return: scope:[assert_sbyte]  from assert_sbyte::@2
   [33] return 
   to:@return
-assert_sbyte::@1: scope:[assert_sbyte]  from assert_sbyte::@6
+assert_sbyte::@1: scope:[assert_sbyte]  from assert_sbyte::@5
   [34] *((const byte*) BGCOL#0) ← (const byte) RED#0
   [35] call print_str 
   to:assert_sbyte::@2
-print_str: scope:[print_str]  from assert_byte assert_byte::@1 assert_byte::@3 assert_byte::@5 assert_sbyte assert_sbyte::@1 assert_sbyte::@3 assert_sbyte::@5
-  [36] (byte*) print_char_cursor#80 ← phi( assert_byte/(byte*) print_char_cursor#70 assert_byte::@1/(byte*) print_char_cursor#2 assert_byte::@3/(byte*) print_char_cursor#2 assert_byte::@5/(byte*) print_char_cursor#2 assert_sbyte/(byte*~) print_char_cursor#87 assert_sbyte::@1/(byte*) print_char_cursor#2 assert_sbyte::@3/(byte*) print_char_cursor#2 assert_sbyte::@5/(byte*) print_char_cursor#2 )
-  [36] (byte*) print_str::str#11 ← phi( assert_byte/(byte*) print_str::str#1 assert_byte::@1/(const string) str1 assert_byte::@3/(const string) str2 assert_byte::@5/(const string) str assert_sbyte/(byte*) print_str::str#5 assert_sbyte::@1/(const string) str1 assert_sbyte::@3/(const string) str2 assert_sbyte::@5/(const string) str )
+print_str: scope:[print_str]  from assert_byte assert_byte::@1 assert_byte::@3 assert_byte::@4 assert_sbyte assert_sbyte::@1 assert_sbyte::@3 assert_sbyte::@4
+  [36] (byte*) print_char_cursor#80 ← phi( assert_byte/(byte*) print_char_cursor#70 assert_byte::@1/(byte*) print_char_cursor#2 assert_byte::@3/(byte*) print_char_cursor#2 assert_byte::@4/(byte*) print_char_cursor#2 assert_sbyte/(byte*~) print_char_cursor#87 assert_sbyte::@1/(byte*) print_char_cursor#2 assert_sbyte::@3/(byte*) print_char_cursor#2 assert_sbyte::@4/(byte*) print_char_cursor#2 )
+  [36] (byte*) print_str::str#11 ← phi( assert_byte/(byte*) print_str::str#1 assert_byte::@1/(const string) str1 assert_byte::@3/(const string) str2 assert_byte::@4/(const string) str assert_sbyte/(byte*) print_str::str#5 assert_sbyte::@1/(const string) str1 assert_sbyte::@3/(const string) str2 assert_sbyte::@4/(const string) str )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [37] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#80 print_str::@2/(byte*) print_char_cursor#1 )
@@ -1212,15 +1217,15 @@ assert_byte: scope:[assert_byte]  from test_bytes test_bytes::@1 test_bytes::@2
   [55] (byte*) assert_byte::msg#3 ← phi( test_bytes/(const string) msg test_bytes::@1/(const string) msg1 test_bytes::@2/(const string) test_bytes::msg2 )
   [56] (byte*) print_str::str#1 ← (byte*) assert_byte::msg#3
   [57] call print_str 
-  to:assert_byte::@5
-assert_byte::@5: scope:[assert_byte]  from assert_byte
+  to:assert_byte::@4
+assert_byte::@4: scope:[assert_byte]  from assert_byte
   [58] phi()
   [59] call print_str 
-  to:assert_byte::@6
-assert_byte::@6: scope:[assert_byte]  from assert_byte::@5
+  to:assert_byte::@5
+assert_byte::@5: scope:[assert_byte]  from assert_byte::@4
   [60] if((byte) assert_byte::b#3!=(byte) assert_byte::c#3) goto assert_byte::@1
   to:assert_byte::@3
-assert_byte::@3: scope:[assert_byte]  from assert_byte::@6
+assert_byte::@3: scope:[assert_byte]  from assert_byte::@5
   [61] phi()
   [62] call print_str 
   to:assert_byte::@2
@@ -1231,7 +1236,7 @@ assert_byte::@2: scope:[assert_byte]  from assert_byte::@1 assert_byte::@3
 assert_byte::@return: scope:[assert_byte]  from assert_byte::@2
   [65] return 
   to:@return
-assert_byte::@1: scope:[assert_byte]  from assert_byte::@6
+assert_byte::@1: scope:[assert_byte]  from assert_byte::@5
   [66] *((const byte*) BGCOL#0) ← (const byte) RED#0
   [67] call print_str 
   to:assert_byte::@2
@@ -1353,17 +1358,17 @@ INITIAL ASM
   .label print_line_cursor = $a
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @24 [phi:@begin->@24]
-b24_from_bbegin:
-  jmp b24
-//SEG5 @24
-b24:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @24 to main [phi:@24->main]
-main_from_b24:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @24 to @end [phi:@24->@end]
-bend_from_b24:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1532,30 +1537,30 @@ assert_sbyte: {
   //SEG64 [36] phi (byte*) print_char_cursor#80 = (byte*~) print_char_cursor#87 [phi:assert_sbyte->print_str#0] -- register_copy 
   //SEG65 [36] phi (byte*) print_str::str#11 = (byte*) print_str::str#5 [phi:assert_sbyte->print_str#1] -- register_copy 
     jsr print_str
-  //SEG66 [26] phi from assert_sbyte to assert_sbyte::@5 [phi:assert_sbyte->assert_sbyte::@5]
-  b5_from_assert_sbyte:
-    jmp b5
-  //SEG67 assert_sbyte::@5
-  b5:
+  //SEG66 [26] phi from assert_sbyte to assert_sbyte::@4 [phi:assert_sbyte->assert_sbyte::@4]
+  b4_from_assert_sbyte:
+    jmp b4
+  //SEG67 assert_sbyte::@4
+  b4:
   //SEG68 [27] call print_str 
-  //SEG69 [36] phi from assert_sbyte::@5 to print_str [phi:assert_sbyte::@5->print_str]
-  print_str_from_b5:
-  //SEG70 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_sbyte::@5->print_str#0] -- register_copy 
-  //SEG71 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_sbyte::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG69 [36] phi from assert_sbyte::@4 to print_str [phi:assert_sbyte::@4->print_str]
+  print_str_from_b4:
+  //SEG70 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_sbyte::@4->print_str#0] -- register_copy 
+  //SEG71 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_sbyte::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b6
-  //SEG72 assert_sbyte::@6
-  b6:
+    jmp b5
+  //SEG72 assert_sbyte::@5
+  b5:
   //SEG73 [28] if((signed byte) assert_sbyte::b#5!=(signed byte) assert_sbyte::c#5) goto assert_sbyte::@1 -- vbsz1_neq_vbsz2_then_la1 
     lda b
     cmp c
     bne b1
-  //SEG74 [29] phi from assert_sbyte::@6 to assert_sbyte::@3 [phi:assert_sbyte::@6->assert_sbyte::@3]
-  b3_from_b6:
+  //SEG74 [29] phi from assert_sbyte::@5 to assert_sbyte::@3 [phi:assert_sbyte::@5->assert_sbyte::@3]
+  b3_from_b5:
     jmp b3
   //SEG75 assert_sbyte::@3
   b3:
@@ -1782,30 +1787,30 @@ assert_byte: {
   //SEG145 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#70 [phi:assert_byte->print_str#0] -- register_copy 
   //SEG146 [36] phi (byte*) print_str::str#11 = (byte*) print_str::str#1 [phi:assert_byte->print_str#1] -- register_copy 
     jsr print_str
-  //SEG147 [58] phi from assert_byte to assert_byte::@5 [phi:assert_byte->assert_byte::@5]
-  b5_from_assert_byte:
-    jmp b5
-  //SEG148 assert_byte::@5
-  b5:
+  //SEG147 [58] phi from assert_byte to assert_byte::@4 [phi:assert_byte->assert_byte::@4]
+  b4_from_assert_byte:
+    jmp b4
+  //SEG148 assert_byte::@4
+  b4:
   //SEG149 [59] call print_str 
-  //SEG150 [36] phi from assert_byte::@5 to print_str [phi:assert_byte::@5->print_str]
-  print_str_from_b5:
-  //SEG151 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_byte::@5->print_str#0] -- register_copy 
-  //SEG152 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_byte::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG150 [36] phi from assert_byte::@4 to print_str [phi:assert_byte::@4->print_str]
+  print_str_from_b4:
+  //SEG151 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_byte::@4->print_str#0] -- register_copy 
+  //SEG152 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_byte::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b6
-  //SEG153 assert_byte::@6
-  b6:
+    jmp b5
+  //SEG153 assert_byte::@5
+  b5:
   //SEG154 [60] if((byte) assert_byte::b#3!=(byte) assert_byte::c#3) goto assert_byte::@1 -- vbuz1_neq_vbuz2_then_la1 
     lda b
     cmp c
     bne b1
-  //SEG155 [61] phi from assert_byte::@6 to assert_byte::@3 [phi:assert_byte::@6->assert_byte::@3]
-  b3_from_b6:
+  //SEG155 [61] phi from assert_byte::@5 to assert_byte::@3 [phi:assert_byte::@5->assert_byte::@3]
+  b3_from_b5:
     jmp b3
   //SEG156 assert_byte::@3
   b3:
@@ -1992,17 +1997,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 7
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @24 [phi:@begin->@24]
-b24_from_bbegin:
-  jmp b24
-//SEG5 @24
-b24:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @24 to main [phi:@24->main]
-main_from_b24:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @24 to @end [phi:@24->@end]
-bend_from_b24:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -2161,29 +2166,29 @@ assert_sbyte: {
   //SEG64 [36] phi (byte*) print_char_cursor#80 = (byte*~) print_char_cursor#87 [phi:assert_sbyte->print_str#0] -- register_copy 
   //SEG65 [36] phi (byte*) print_str::str#11 = (byte*) print_str::str#5 [phi:assert_sbyte->print_str#1] -- register_copy 
     jsr print_str
-  //SEG66 [26] phi from assert_sbyte to assert_sbyte::@5 [phi:assert_sbyte->assert_sbyte::@5]
-  b5_from_assert_sbyte:
-    jmp b5
-  //SEG67 assert_sbyte::@5
-  b5:
+  //SEG66 [26] phi from assert_sbyte to assert_sbyte::@4 [phi:assert_sbyte->assert_sbyte::@4]
+  b4_from_assert_sbyte:
+    jmp b4
+  //SEG67 assert_sbyte::@4
+  b4:
   //SEG68 [27] call print_str 
-  //SEG69 [36] phi from assert_sbyte::@5 to print_str [phi:assert_sbyte::@5->print_str]
-  print_str_from_b5:
-  //SEG70 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_sbyte::@5->print_str#0] -- register_copy 
-  //SEG71 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_sbyte::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG69 [36] phi from assert_sbyte::@4 to print_str [phi:assert_sbyte::@4->print_str]
+  print_str_from_b4:
+  //SEG70 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_sbyte::@4->print_str#0] -- register_copy 
+  //SEG71 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_sbyte::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b6
-  //SEG72 assert_sbyte::@6
-  b6:
+    jmp b5
+  //SEG72 assert_sbyte::@5
+  b5:
   //SEG73 [28] if((signed byte) assert_sbyte::b#5!=(signed byte) assert_sbyte::c#5) goto assert_sbyte::@1 -- vbsxx_neq_vbsz1_then_la1 
     cpx c
     bne b1
-  //SEG74 [29] phi from assert_sbyte::@6 to assert_sbyte::@3 [phi:assert_sbyte::@6->assert_sbyte::@3]
-  b3_from_b6:
+  //SEG74 [29] phi from assert_sbyte::@5 to assert_sbyte::@3 [phi:assert_sbyte::@5->assert_sbyte::@3]
+  b3_from_b5:
     jmp b3
   //SEG75 assert_sbyte::@3
   b3:
@@ -2402,29 +2407,29 @@ assert_byte: {
   //SEG145 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#70 [phi:assert_byte->print_str#0] -- register_copy 
   //SEG146 [36] phi (byte*) print_str::str#11 = (byte*) print_str::str#1 [phi:assert_byte->print_str#1] -- register_copy 
     jsr print_str
-  //SEG147 [58] phi from assert_byte to assert_byte::@5 [phi:assert_byte->assert_byte::@5]
-  b5_from_assert_byte:
-    jmp b5
-  //SEG148 assert_byte::@5
-  b5:
+  //SEG147 [58] phi from assert_byte to assert_byte::@4 [phi:assert_byte->assert_byte::@4]
+  b4_from_assert_byte:
+    jmp b4
+  //SEG148 assert_byte::@4
+  b4:
   //SEG149 [59] call print_str 
-  //SEG150 [36] phi from assert_byte::@5 to print_str [phi:assert_byte::@5->print_str]
-  print_str_from_b5:
-  //SEG151 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_byte::@5->print_str#0] -- register_copy 
-  //SEG152 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_byte::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG150 [36] phi from assert_byte::@4 to print_str [phi:assert_byte::@4->print_str]
+  print_str_from_b4:
+  //SEG151 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_byte::@4->print_str#0] -- register_copy 
+  //SEG152 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_byte::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b6
-  //SEG153 assert_byte::@6
-  b6:
+    jmp b5
+  //SEG153 assert_byte::@5
+  b5:
   //SEG154 [60] if((byte) assert_byte::b#3!=(byte) assert_byte::c#3) goto assert_byte::@1 -- vbuxx_neq_vbuz1_then_la1 
     cpx c
     bne b1
-  //SEG155 [61] phi from assert_byte::@6 to assert_byte::@3 [phi:assert_byte::@6->assert_byte::@3]
-  b3_from_b6:
+  //SEG155 [61] phi from assert_byte::@5 to assert_byte::@3 [phi:assert_byte::@5->assert_byte::@3]
+  b3_from_b5:
     jmp b3
   //SEG156 assert_byte::@3
   b3:
@@ -2518,7 +2523,7 @@ print_cls: {
   str1: .text "fail!@"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b24
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -2528,8 +2533,8 @@ Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp breturn
+Removing instruction jmp b4
 Removing instruction jmp b5
-Removing instruction jmp b6
 Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp breturn
@@ -2540,8 +2545,8 @@ Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp breturn
+Removing instruction jmp b4
 Removing instruction jmp b5
-Removing instruction jmp b6
 Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp breturn
@@ -2557,10 +2562,10 @@ Replacing label b1_from_b1 with b1
 Replacing label b2_from_b1 with b2
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b24_from_bbegin:
-Removing instruction b24:
-Removing instruction main_from_b24:
-Removing instruction bend_from_b24:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b2_from_b1:
 Removing instruction test_sbytes_from_b2:
 Removing instruction b1_from_test_sbytes:
@@ -2571,9 +2576,9 @@ Removing instruction b3_from_b2:
 Removing instruction assert_sbyte_from_b3:
 Removing instruction b4_from_b3:
 Removing instruction assert_sbyte_from_b4:
-Removing instruction b5_from_assert_sbyte:
-Removing instruction print_str_from_b5:
-Removing instruction b3_from_b6:
+Removing instruction b4_from_assert_sbyte:
+Removing instruction print_str_from_b4:
+Removing instruction b3_from_b5:
 Removing instruction print_str_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b3:
@@ -2582,9 +2587,9 @@ Removing instruction b1_from_print_str:
 Removing instruction b1_from_b2:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
-Removing instruction b5_from_assert_byte:
-Removing instruction print_str_from_b5:
-Removing instruction b3_from_b6:
+Removing instruction b4_from_assert_byte:
+Removing instruction print_str_from_b4:
+Removing instruction b3_from_b5:
 Removing instruction print_str_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b3:
@@ -2604,8 +2609,8 @@ Removing instruction b3:
 Removing instruction b4:
 Removing instruction breturn:
 Removing instruction print_str_from_assert_sbyte:
+Removing instruction b4:
 Removing instruction b5:
-Removing instruction b6:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction print_str_from_b1:
@@ -2618,8 +2623,8 @@ Removing instruction b2:
 Removing instruction assert_byte_from_b2:
 Removing instruction breturn:
 Removing instruction print_str_from_assert_byte:
+Removing instruction b4:
 Removing instruction b5:
-Removing instruction b6:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction print_str_from_b1:
@@ -2635,7 +2640,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @24
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -2648,8 +2653,8 @@ FINAL SYMBOL TABLE
 (label) assert_byte::@1
 (label) assert_byte::@2
 (label) assert_byte::@3
+(label) assert_byte::@4
 (label) assert_byte::@5
-(label) assert_byte::@6
 (label) assert_byte::@return
 (byte) assert_byte::b
 (byte) assert_byte::b#3 reg byte x 0.4
@@ -2661,8 +2666,8 @@ FINAL SYMBOL TABLE
 (label) assert_sbyte::@1
 (label) assert_sbyte::@2
 (label) assert_sbyte::@3
+(label) assert_sbyte::@4
 (label) assert_sbyte::@5
-(label) assert_sbyte::@6
 (label) assert_sbyte::@return
 (signed byte) assert_sbyte::b
 (signed byte) assert_sbyte::b#5 reg byte x 0.3333333333333333
@@ -2767,11 +2772,11 @@ Score: 1840
   .label print_char_cursor = 5
   .label print_line_cursor = 7
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @24 [phi:@begin->@24]
-//SEG5 @24
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @24 to main [phi:@24->main]
-//SEG8 [3] phi from @24 to @end [phi:@24->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -2898,22 +2903,22 @@ assert_sbyte: {
   //SEG64 [36] phi (byte*) print_char_cursor#80 = (byte*~) print_char_cursor#87 [phi:assert_sbyte->print_str#0] -- register_copy 
   //SEG65 [36] phi (byte*) print_str::str#11 = (byte*) print_str::str#5 [phi:assert_sbyte->print_str#1] -- register_copy 
     jsr print_str
-  //SEG66 [26] phi from assert_sbyte to assert_sbyte::@5 [phi:assert_sbyte->assert_sbyte::@5]
-  //SEG67 assert_sbyte::@5
+  //SEG66 [26] phi from assert_sbyte to assert_sbyte::@4 [phi:assert_sbyte->assert_sbyte::@4]
+  //SEG67 assert_sbyte::@4
   //SEG68 [27] call print_str 
-  //SEG69 [36] phi from assert_sbyte::@5 to print_str [phi:assert_sbyte::@5->print_str]
-  //SEG70 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_sbyte::@5->print_str#0] -- register_copy 
-  //SEG71 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_sbyte::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG69 [36] phi from assert_sbyte::@4 to print_str [phi:assert_sbyte::@4->print_str]
+  //SEG70 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_sbyte::@4->print_str#0] -- register_copy 
+  //SEG71 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_sbyte::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG72 assert_sbyte::@6
+  //SEG72 assert_sbyte::@5
   //SEG73 [28] if((signed byte) assert_sbyte::b#5!=(signed byte) assert_sbyte::c#5) goto assert_sbyte::@1 -- vbsxx_neq_vbsz1_then_la1 
     cpx c
     bne b1
-  //SEG74 [29] phi from assert_sbyte::@6 to assert_sbyte::@3 [phi:assert_sbyte::@6->assert_sbyte::@3]
+  //SEG74 [29] phi from assert_sbyte::@5 to assert_sbyte::@3 [phi:assert_sbyte::@5->assert_sbyte::@3]
   //SEG75 assert_sbyte::@3
   //SEG76 [30] call print_str 
   //SEG77 [36] phi from assert_sbyte::@3 to print_str [phi:assert_sbyte::@3->print_str]
@@ -3101,22 +3106,22 @@ assert_byte: {
   //SEG145 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#70 [phi:assert_byte->print_str#0] -- register_copy 
   //SEG146 [36] phi (byte*) print_str::str#11 = (byte*) print_str::str#1 [phi:assert_byte->print_str#1] -- register_copy 
     jsr print_str
-  //SEG147 [58] phi from assert_byte to assert_byte::@5 [phi:assert_byte->assert_byte::@5]
-  //SEG148 assert_byte::@5
+  //SEG147 [58] phi from assert_byte to assert_byte::@4 [phi:assert_byte->assert_byte::@4]
+  //SEG148 assert_byte::@4
   //SEG149 [59] call print_str 
-  //SEG150 [36] phi from assert_byte::@5 to print_str [phi:assert_byte::@5->print_str]
-  //SEG151 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_byte::@5->print_str#0] -- register_copy 
-  //SEG152 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_byte::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG150 [36] phi from assert_byte::@4 to print_str [phi:assert_byte::@4->print_str]
+  //SEG151 [36] phi (byte*) print_char_cursor#80 = (byte*) print_char_cursor#2 [phi:assert_byte::@4->print_str#0] -- register_copy 
+  //SEG152 [36] phi (byte*) print_str::str#11 = (const string) str [phi:assert_byte::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG153 assert_byte::@6
+  //SEG153 assert_byte::@5
   //SEG154 [60] if((byte) assert_byte::b#3!=(byte) assert_byte::c#3) goto assert_byte::@1 -- vbuxx_neq_vbuz1_then_la1 
     cpx c
     bne b1
-  //SEG155 [61] phi from assert_byte::@6 to assert_byte::@3 [phi:assert_byte::@6->assert_byte::@3]
+  //SEG155 [61] phi from assert_byte::@5 to assert_byte::@3 [phi:assert_byte::@5->assert_byte::@3]
   //SEG156 assert_byte::@3
   //SEG157 [62] call print_str 
   //SEG158 [36] phi from assert_byte::@3 to print_str [phi:assert_byte::@3->print_str]
diff --git a/src/test/ref/constants.sym b/src/test/ref/constants.sym
index ad1014e17..2d2c14d87 100644
--- a/src/test/ref/constants.sym
+++ b/src/test/ref/constants.sym
@@ -1,4 +1,4 @@
-(label) @24
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -11,8 +11,8 @@
 (label) assert_byte::@1
 (label) assert_byte::@2
 (label) assert_byte::@3
+(label) assert_byte::@4
 (label) assert_byte::@5
-(label) assert_byte::@6
 (label) assert_byte::@return
 (byte) assert_byte::b
 (byte) assert_byte::b#3 reg byte x 0.4
@@ -24,8 +24,8 @@
 (label) assert_sbyte::@1
 (label) assert_sbyte::@2
 (label) assert_sbyte::@3
+(label) assert_sbyte::@4
 (label) assert_sbyte::@5
-(label) assert_sbyte::@6
 (label) assert_sbyte::@return
 (signed byte) assert_sbyte::b
 (signed byte) assert_sbyte::b#5 reg byte x 0.3333333333333333
diff --git a/src/test/ref/duplicate-loop-problem.asm b/src/test/ref/duplicate-loop-problem.asm
index 77bbcf0bd..95e11cd44 100644
--- a/src/test/ref/duplicate-loop-problem.asm
+++ b/src/test/ref/duplicate-loop-problem.asm
@@ -13,9 +13,9 @@ main: {
     txa
     and #$1f
     cpx #0
-    beq b5
+    beq b3
     jmp b1
-  b5:
+  b3:
     cmp #$1f
     beq b2
     jmp b1
diff --git a/src/test/ref/duplicate-loop-problem.cfg b/src/test/ref/duplicate-loop-problem.cfg
index cc120be4a..9bd5def3f 100644
--- a/src/test/ref/duplicate-loop-problem.cfg
+++ b/src/test/ref/duplicate-loop-problem.cfg
@@ -10,15 +10,15 @@
 main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@2 main::@5
-  [5] (byte) rpc#4 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) rpc#1 main::@5/(byte) rpc#1 )
+main::@1: scope:[main]  from main main::@2 main::@3
+  [5] (byte) rpc#4 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) rpc#1 main::@3/(byte) rpc#1 )
   [6] (byte) rpc#1 ← ++ (byte) rpc#4
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@5
+main::@2: scope:[main]  from main::@1 main::@3
   [7] (byte) key#1 ← *((const byte*) DC00#0)
   [8] (byte~) main::$1 ← (byte) key#1 & (byte/signed byte/word/signed word/dword/signed dword) $1f
-  [9] if((byte) key#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@5
+  [9] if((byte) key#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3
   to:main::@1
-main::@5: scope:[main]  from main::@2
+main::@3: scope:[main]  from main::@2
   [10] if((byte~) main::$1==(byte/signed byte/word/signed word/dword/signed dword) $1f) goto main::@2
   to:main::@1
diff --git a/src/test/ref/duplicate-loop-problem.log b/src/test/ref/duplicate-loop-problem.log
index 3ac6e221c..23bd5c8ee 100644
--- a/src/test/ref/duplicate-loop-problem.log
+++ b/src/test/ref/duplicate-loop-problem.log
@@ -133,6 +133,7 @@ Coalesced (already) [12] rpc#12 ← rpc#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) main::@6
 Culled Empty Block (label) main::@7
+Renumbering block main::@5 to main::@3
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -151,16 +152,16 @@ FINAL CONTROL FLOW GRAPH
 main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@2 main::@5
-  [5] (byte) rpc#4 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) rpc#1 main::@5/(byte) rpc#1 )
+main::@1: scope:[main]  from main main::@2 main::@3
+  [5] (byte) rpc#4 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) rpc#1 main::@3/(byte) rpc#1 )
   [6] (byte) rpc#1 ← ++ (byte) rpc#4
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@5
+main::@2: scope:[main]  from main::@1 main::@3
   [7] (byte) key#1 ← *((const byte*) DC00#0)
   [8] (byte~) main::$1 ← (byte) key#1 & (byte/signed byte/word/signed word/dword/signed dword) $1f
-  [9] if((byte) key#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@5
+  [9] if((byte) key#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3
   to:main::@1
-main::@5: scope:[main]  from main::@2
+main::@3: scope:[main]  from main::@2
   [10] if((byte~) main::$1==(byte/signed byte/word/signed word/dword/signed dword) $1f) goto main::@2
   to:main::@1
 
@@ -238,22 +239,22 @@ main: {
     lda #$1f
     and key
     sta _1
-  //SEG18 [9] if((byte) key#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@5 -- vbuz1_eq_0_then_la1 
+  //SEG18 [9] if((byte) key#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuz1_eq_0_then_la1 
     lda key
     cmp #0
-    beq b5
-  //SEG19 [5] phi from main::@2 main::@5 to main::@1 [phi:main::@2/main::@5->main::@1]
+    beq b3
+  //SEG19 [5] phi from main::@2 main::@3 to main::@1 [phi:main::@2/main::@3->main::@1]
   b1_from_b2:
-  b1_from_b5:
-  //SEG20 [5] phi (byte) rpc#4 = (byte) rpc#1 [phi:main::@2/main::@5->main::@1#0] -- register_copy 
+  b1_from_b3:
+  //SEG20 [5] phi (byte) rpc#4 = (byte) rpc#1 [phi:main::@2/main::@3->main::@1#0] -- register_copy 
     jmp b1
-  //SEG21 main::@5
-  b5:
+  //SEG21 main::@3
+  b3:
   //SEG22 [10] if((byte~) main::$1==(byte/signed byte/word/signed word/dword/signed dword) $1f) goto main::@2 -- vbuz1_eq_vbuc1_then_la1 
     lda #$1f
     cmp _1
     beq b2
-    jmp b1_from_b5
+    jmp b1_from_b3
 }
 
 REGISTER UPLIFT POTENTIAL REGISTERS
@@ -313,20 +314,20 @@ main: {
   //SEG17 [8] (byte~) main::$1 ← (byte) key#1 & (byte/signed byte/word/signed word/dword/signed dword) $1f -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #$1f
-  //SEG18 [9] if((byte) key#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@5 -- vbuxx_eq_0_then_la1 
+  //SEG18 [9] if((byte) key#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuxx_eq_0_then_la1 
     cpx #0
-    beq b5
-  //SEG19 [5] phi from main::@2 main::@5 to main::@1 [phi:main::@2/main::@5->main::@1]
+    beq b3
+  //SEG19 [5] phi from main::@2 main::@3 to main::@1 [phi:main::@2/main::@3->main::@1]
   b1_from_b2:
-  b1_from_b5:
-  //SEG20 [5] phi (byte) rpc#4 = (byte) rpc#1 [phi:main::@2/main::@5->main::@1#0] -- register_copy 
+  b1_from_b3:
+  //SEG20 [5] phi (byte) rpc#4 = (byte) rpc#1 [phi:main::@2/main::@3->main::@1#0] -- register_copy 
     jmp b1
-  //SEG21 main::@5
-  b5:
+  //SEG21 main::@3
+  b3:
   //SEG22 [10] if((byte~) main::$1==(byte/signed byte/word/signed word/dword/signed dword) $1f) goto main::@2 -- vbuaa_eq_vbuc1_then_la1 
     cmp #$1f
     beq b2
-    jmp b1_from_b5
+    jmp b1_from_b3
 }
 
 ASSEMBLER OPTIMIZATIONS
@@ -347,12 +348,12 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b1 in jmp b1_from_b5
+Skipping double jump to b1 in jmp b1_from_b3
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b1_from_b5 to b3
+Relabelling long label b1_from_b3 to b4
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction bbegin:
-Removing instruction b3:
+Removing instruction b4:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
@@ -367,7 +368,7 @@ FINAL SYMBOL TABLE
 (byte~) main::$1 reg byte a 101.0
 (label) main::@1
 (label) main::@2
-(label) main::@5
+(label) main::@3
 (byte) rpc
 (byte) rpc#1 reg byte y 42.6
 (byte) rpc#4 reg byte y 213.0
@@ -412,14 +413,14 @@ main: {
   //SEG17 [8] (byte~) main::$1 ← (byte) key#1 & (byte/signed byte/word/signed word/dword/signed dword) $1f -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #$1f
-  //SEG18 [9] if((byte) key#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@5 -- vbuxx_eq_0_then_la1 
+  //SEG18 [9] if((byte) key#1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuxx_eq_0_then_la1 
     cpx #0
-    beq b5
-  //SEG19 [5] phi from main::@2 main::@5 to main::@1 [phi:main::@2/main::@5->main::@1]
-  //SEG20 [5] phi (byte) rpc#4 = (byte) rpc#1 [phi:main::@2/main::@5->main::@1#0] -- register_copy 
+    beq b3
+  //SEG19 [5] phi from main::@2 main::@3 to main::@1 [phi:main::@2/main::@3->main::@1]
+  //SEG20 [5] phi (byte) rpc#4 = (byte) rpc#1 [phi:main::@2/main::@3->main::@1#0] -- register_copy 
     jmp b1
-  //SEG21 main::@5
-  b5:
+  //SEG21 main::@3
+  b3:
   //SEG22 [10] if((byte~) main::$1==(byte/signed byte/word/signed word/dword/signed dword) $1f) goto main::@2 -- vbuaa_eq_vbuc1_then_la1 
     cmp #$1f
     beq b2
diff --git a/src/test/ref/duplicate-loop-problem.sym b/src/test/ref/duplicate-loop-problem.sym
index 3eabd3345..eb86bb403 100644
--- a/src/test/ref/duplicate-loop-problem.sym
+++ b/src/test/ref/duplicate-loop-problem.sym
@@ -9,7 +9,7 @@
 (byte~) main::$1 reg byte a 101.0
 (label) main::@1
 (label) main::@2
-(label) main::@5
+(label) main::@3
 (byte) rpc
 (byte) rpc#1 reg byte y 42.6
 (byte) rpc#4 reg byte y 213.0
diff --git a/src/test/ref/emptyblock-error.cfg b/src/test/ref/emptyblock-error.cfg
index b1dbc9ae1..0bc0905e5 100644
--- a/src/test/ref/emptyblock-error.cfg
+++ b/src/test/ref/emptyblock-error.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@2
@@ -19,23 +19,23 @@ main::@2: scope:[main]  from main::@1
   to:main::@1
 menu: scope:[menu]  from main::@2
   [8] phi()
-  to:menu::@2
-menu::@2: scope:[menu]  from menu
+  to:menu::@1
+menu::@1: scope:[menu]  from menu
   [9] phi()
   [10] call mode 
   to:menu::@return
-menu::@return: scope:[menu]  from menu::@2
+menu::@return: scope:[menu]  from menu::@1
   [11] return 
   to:@return
-mode: scope:[mode]  from menu::@2
+mode: scope:[mode]  from menu::@1
   [12] phi()
   to:mode::@1
-mode::@1: scope:[mode]  from mode mode::@2 mode::@6
-  [13] (byte) a#12 ← phi( mode/(byte) a#1 mode::@6/(byte) a#5 )
+mode::@1: scope:[mode]  from mode mode::@2 mode::@3
+  [13] (byte) a#12 ← phi( mode/(byte) a#1 mode::@3/(byte) a#5 )
   to:mode::@2
 mode::@2: scope:[mode]  from mode::@1
   [14] if(*((const byte*) B#0)!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode::@1
-  to:mode::@6
-mode::@6: scope:[mode]  from mode::@2
+  to:mode::@3
+mode::@3: scope:[mode]  from mode::@2
   [15] (byte) a#5 ← *((const byte*) B#0)
   to:mode::@1
diff --git a/src/test/ref/emptyblock-error.log b/src/test/ref/emptyblock-error.log
index ef8dca3bf..8df274b71 100644
--- a/src/test/ref/emptyblock-error.log
+++ b/src/test/ref/emptyblock-error.log
@@ -196,26 +196,29 @@ Coalesced [8] a#25 ← a#12
 Coalesced (already) [13] a#26 ← a#1
 Coalesced [17] a#27 ← a#5
 Coalesced down to 1 phi equivalence classes
+Renumbering block @3 to @1
+Renumbering block menu::@2 to menu::@1
+Renumbering block mode::@6 to mode::@3
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of menu
-Adding NOP phi() at start of menu::@2
+Adding NOP phi() at start of menu::@1
 Adding NOP phi() at start of mode
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@2
@@ -227,24 +230,24 @@ main::@2: scope:[main]  from main::@1
   to:main::@1
 menu: scope:[menu]  from main::@2
   [8] phi()
-  to:menu::@2
-menu::@2: scope:[menu]  from menu
+  to:menu::@1
+menu::@1: scope:[menu]  from menu
   [9] phi()
   [10] call mode 
   to:menu::@return
-menu::@return: scope:[menu]  from menu::@2
+menu::@return: scope:[menu]  from menu::@1
   [11] return 
   to:@return
-mode: scope:[mode]  from menu::@2
+mode: scope:[mode]  from menu::@1
   [12] phi()
   to:mode::@1
-mode::@1: scope:[mode]  from mode mode::@2 mode::@6
-  [13] (byte) a#12 ← phi( mode/(byte) a#1 mode::@6/(byte) a#5 )
+mode::@1: scope:[mode]  from mode mode::@2 mode::@3
+  [13] (byte) a#12 ← phi( mode/(byte) a#1 mode::@3/(byte) a#5 )
   to:mode::@2
 mode::@2: scope:[mode]  from mode::@1
   [14] if(*((const byte*) B#0)!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mode::@1
-  to:mode::@6
-mode::@6: scope:[mode]  from mode::@2
+  to:mode::@3
+mode::@3: scope:[mode]  from mode::@2
   [15] (byte) a#5 ← *((const byte*) B#0)
   to:mode::@1
 
@@ -277,17 +280,17 @@ INITIAL ASM
   .label a = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -317,14 +320,14 @@ main: {
 }
 //SEG20 menu
 menu: {
-  //SEG21 [9] phi from menu to menu::@2 [phi:menu->menu::@2]
-  b2_from_menu:
-    jmp b2
-  //SEG22 menu::@2
-  b2:
+  //SEG21 [9] phi from menu to menu::@1 [phi:menu->menu::@1]
+  b1_from_menu:
+    jmp b1
+  //SEG22 menu::@1
+  b1:
   //SEG23 [10] call mode 
-  //SEG24 [12] phi from menu::@2 to mode [phi:menu::@2->mode]
-  mode_from_b2:
+  //SEG24 [12] phi from menu::@1 to mode [phi:menu::@1->mode]
+  mode_from_b1:
     jsr mode
     jmp breturn
   //SEG25 menu::@return
@@ -334,10 +337,10 @@ menu: {
 }
 //SEG27 mode
 mode: {
-  //SEG28 [13] phi from mode mode::@6 to mode::@1 [phi:mode/mode::@6->mode::@1]
+  //SEG28 [13] phi from mode mode::@3 to mode::@1 [phi:mode/mode::@3->mode::@1]
   b1_from_mode:
-  b1_from_b6:
-  //SEG29 [13] phi (byte) a#12 = (byte) a#1 [phi:mode/mode::@6->mode::@1#0] -- register_copy 
+  b1_from_b3:
+  //SEG29 [13] phi (byte) a#12 = (byte) a#1 [phi:mode/mode::@3->mode::@1#0] -- register_copy 
     jmp b1
   //SEG30 [13] phi from mode::@2 to mode::@1 [phi:mode::@2->mode::@1]
   b1_from_b2:
@@ -351,13 +354,13 @@ mode: {
     lda B
     cmp #0
     bne b1_from_b2
-    jmp b6
-  //SEG34 mode::@6
-  b6:
+    jmp b3
+  //SEG34 mode::@3
+  b3:
   //SEG35 [15] (byte) a#5 ← *((const byte*) B#0) -- vbuz1=_deref_pbuc1 
     lda B
     sta a
-    jmp b1_from_b6
+    jmp b1_from_b3
 }
 
 REGISTER UPLIFT POTENTIAL REGISTERS
@@ -386,17 +389,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label B = $1000
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -425,14 +428,14 @@ main: {
 }
 //SEG20 menu
 menu: {
-  //SEG21 [9] phi from menu to menu::@2 [phi:menu->menu::@2]
-  b2_from_menu:
-    jmp b2
-  //SEG22 menu::@2
-  b2:
+  //SEG21 [9] phi from menu to menu::@1 [phi:menu->menu::@1]
+  b1_from_menu:
+    jmp b1
+  //SEG22 menu::@1
+  b1:
   //SEG23 [10] call mode 
-  //SEG24 [12] phi from menu::@2 to mode [phi:menu::@2->mode]
-  mode_from_b2:
+  //SEG24 [12] phi from menu::@1 to mode [phi:menu::@1->mode]
+  mode_from_b1:
     jsr mode
     jmp breturn
   //SEG25 menu::@return
@@ -442,10 +445,10 @@ menu: {
 }
 //SEG27 mode
 mode: {
-  //SEG28 [13] phi from mode mode::@6 to mode::@1 [phi:mode/mode::@6->mode::@1]
+  //SEG28 [13] phi from mode mode::@3 to mode::@1 [phi:mode/mode::@3->mode::@1]
   b1_from_mode:
-  b1_from_b6:
-  //SEG29 [13] phi (byte) a#12 = (byte) a#1 [phi:mode/mode::@6->mode::@1#0] -- register_copy 
+  b1_from_b3:
+  //SEG29 [13] phi (byte) a#12 = (byte) a#1 [phi:mode/mode::@3->mode::@1#0] -- register_copy 
     jmp b1
   //SEG30 [13] phi from mode::@2 to mode::@1 [phi:mode::@2->mode::@1]
   b1_from_b2:
@@ -459,37 +462,37 @@ mode: {
     lda B
     cmp #0
     bne b1_from_b2
-    jmp b6
-  //SEG34 mode::@6
-  b6:
+    jmp b3
+  //SEG34 mode::@3
+  b3:
   //SEG35 [15] (byte) a#5 ← *((const byte*) B#0) -- vbuaa=_deref_pbuc1 
     lda B
-    jmp b1_from_b6
+    jmp b1_from_b3
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b6
+Removing instruction jmp b3
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1 with b2
 Replacing label b1 with b2
 Replacing label b1_from_b2 with b2
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1:
 Removing instruction b2_from_b1:
 Removing instruction menu_from_b2:
-Removing instruction b2_from_menu:
-Removing instruction mode_from_b2:
+Removing instruction b1_from_menu:
+Removing instruction mode_from_b1:
 Removing instruction b1_from_mode:
 Removing instruction b1_from_b2:
 Removing instruction b1:
@@ -497,16 +500,16 @@ Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
 Removing instruction b1_from_b2:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction breturn:
-Removing instruction b6:
+Removing instruction b3:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b2 in jmp b1_from_b6
+Skipping double jump to b2 in jmp b1_from_b3
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b1_from_b6 to b1
+Relabelling long label b1_from_b3 to b1
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
@@ -518,7 +521,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) B
@@ -531,12 +534,12 @@ FINAL SYMBOL TABLE
 (label) main::@1
 (label) main::@2
 (void()) menu()
-(label) menu::@2
+(label) menu::@1
 (label) menu::@return
 (void()) mode()
 (label) mode::@1
 (label) mode::@2
-(label) mode::@6
+(label) mode::@3
 
 reg byte a [ a#1 a#12 a#5 ]
 
@@ -553,11 +556,11 @@ Score: 8868
 //SEG2 Global Constants & labels
   .label B = $1000
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -577,10 +580,10 @@ main: {
 }
 //SEG20 menu
 menu: {
-  //SEG21 [9] phi from menu to menu::@2 [phi:menu->menu::@2]
-  //SEG22 menu::@2
+  //SEG21 [9] phi from menu to menu::@1 [phi:menu->menu::@1]
+  //SEG22 menu::@1
   //SEG23 [10] call mode 
-  //SEG24 [12] phi from menu::@2 to mode [phi:menu::@2->mode]
+  //SEG24 [12] phi from menu::@1 to mode [phi:menu::@1->mode]
     jsr mode
   //SEG25 menu::@return
   //SEG26 [11] return 
@@ -588,8 +591,8 @@ menu: {
 }
 //SEG27 mode
 mode: {
-  //SEG28 [13] phi from mode mode::@6 to mode::@1 [phi:mode/mode::@6->mode::@1]
-  //SEG29 [13] phi (byte) a#12 = (byte) a#1 [phi:mode/mode::@6->mode::@1#0] -- register_copy 
+  //SEG28 [13] phi from mode mode::@3 to mode::@1 [phi:mode/mode::@3->mode::@1]
+  //SEG29 [13] phi (byte) a#12 = (byte) a#1 [phi:mode/mode::@3->mode::@1#0] -- register_copy 
   //SEG30 [13] phi from mode::@2 to mode::@1 [phi:mode::@2->mode::@1]
   //SEG31 mode::@1
   //SEG32 mode::@2
@@ -598,7 +601,7 @@ mode: {
     lda B
     cmp #0
     bne b2
-  //SEG34 mode::@6
+  //SEG34 mode::@3
   //SEG35 [15] (byte) a#5 ← *((const byte*) B#0) -- vbuaa=_deref_pbuc1 
     jmp b2
 }
diff --git a/src/test/ref/emptyblock-error.sym b/src/test/ref/emptyblock-error.sym
index 44a84883a..4edf36139 100644
--- a/src/test/ref/emptyblock-error.sym
+++ b/src/test/ref/emptyblock-error.sym
@@ -1,4 +1,4 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) B
@@ -11,11 +11,11 @@
 (label) main::@1
 (label) main::@2
 (void()) menu()
-(label) menu::@2
+(label) menu::@1
 (label) menu::@return
 (void()) mode()
 (label) mode::@1
 (label) mode::@2
-(label) mode::@6
+(label) mode::@3
 
 reg byte a [ a#1 a#12 a#5 ]
diff --git a/src/test/ref/examples/3d/3d.asm b/src/test/ref/examples/3d/3d.asm
index 4ccb8482c..892420e83 100644
--- a/src/test/ref/examples/3d/3d.asm
+++ b/src/test/ref/examples/3d/3d.asm
@@ -84,25 +84,25 @@ anim: {
     sta sx
   //signed byte xmin = 0;
   //signed byte xmax = 0;
-  b6:
+  b2:
     lda #$ff
     cmp RASTER
-    bne b6
-  b9:
+    bne b2
+  b3:
     lda #$fe
     cmp RASTER
-    bne b9
-  b12:
+    bne b3
+  b4:
     lda #$fd
     cmp RASTER
-    bne b12
+    bne b4
     inc BORDERCOL
     ldy sx
     jsr calculate_matrix
     jsr store_matrix
     lda #0
     sta i
-  b15:
+  b6:
     inc BORDERCOL
     ldy i
     ldx xs,y
@@ -140,7 +140,7 @@ anim: {
     inc i
     lda #8
     cmp i
-    bne b15
+    bne b6
     lda #LIGHT_GREY
     sta BORDERCOL
     jsr debug_print
@@ -153,7 +153,7 @@ anim: {
     sec
     sbc #3
     sta sy
-    jmp b6
+    jmp b2
 }
 debug_print: {
     .const print_sbyte_pos1_row = 0
diff --git a/src/test/ref/examples/3d/3d.cfg b/src/test/ref/examples/3d/3d.cfg
index c859f951f..f9e1c704f 100644
--- a/src/test/ref/examples/3d/3d.cfg
+++ b/src/test/ref/examples/3d/3d.cfg
@@ -1,7 +1,7 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@33
-@33: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) mulf_sqr1#0) {{ .for(var i=0;i<$200;i++) {
     	.if(i<=159) { .byte round((i*i)/256) }
     	.if(i>159 && i<=351 ) { .byte round(((i-256)*(i-256))/256) }
@@ -94,9 +94,9 @@
  }}
   [11] call main 
   to:@end
-@end: scope:[]  from @33
+@end: scope:[]  from @1
   [12] phi()
-main: scope:[main]  from @33
+main: scope:[main]  from @1
   asm { sei  }
   [14] call sprites_init 
   to:main::@1
@@ -115,38 +115,38 @@ main::@return: scope:[main]  from main::@2
 anim: scope:[anim]  from main::@2
   [21] phi()
   to:anim::@1
-anim::@1: scope:[anim]  from anim anim::@30
-  [22] (signed byte) sy#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@30/(signed byte) sy#3 )
-  [22] (signed byte) sx#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@30/(signed byte) sx#3 )
-  to:anim::@6
-anim::@6: scope:[anim]  from anim::@1 anim::@6
-  [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6
-  to:anim::@9
-anim::@9: scope:[anim]  from anim::@6 anim::@9
-  [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@9
-  to:anim::@12
-anim::@12: scope:[anim]  from anim::@12 anim::@9
-  [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@12
-  to:anim::@14
-anim::@14: scope:[anim]  from anim::@12
+anim::@1: scope:[anim]  from anim anim::@10
+  [22] (signed byte) sy#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@10/(signed byte) sy#3 )
+  [22] (signed byte) sx#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@10/(signed byte) sx#3 )
+  to:anim::@2
+anim::@2: scope:[anim]  from anim::@1 anim::@2
+  [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2
+  to:anim::@3
+anim::@3: scope:[anim]  from anim::@2 anim::@3
+  [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@3
+  to:anim::@4
+anim::@4: scope:[anim]  from anim::@3 anim::@4
+  [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@4
+  to:anim::@5
+anim::@5: scope:[anim]  from anim::@4
   [26] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [27] (signed byte) calculate_matrix::sx#0 ← (signed byte) sx#10
   [28] (signed byte) calculate_matrix::sy#0 ← (signed byte) sy#10
   [29] call calculate_matrix 
-  to:anim::@27
-anim::@27: scope:[anim]  from anim::@14
+  to:anim::@8
+anim::@8: scope:[anim]  from anim::@5
   [30] phi()
   [31] call store_matrix 
-  to:anim::@15
-anim::@15: scope:[anim]  from anim::@27 anim::@29
-  [32] (byte) anim::i#2 ← phi( anim::@27/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@29/(byte) anim::i#1 )
+  to:anim::@6
+anim::@6: scope:[anim]  from anim::@8 anim::@9
+  [32] (byte) anim::i#2 ← phi( anim::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@9/(byte) anim::i#1 )
   [33] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [34] (signed byte) rotate_matrix::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#2)
   [35] (signed byte) rotate_matrix::y#0 ← *((const signed byte[8]) ys#0 + (byte) anim::i#2)
   [36] (signed byte) rotate_matrix::z#0 ← *((const signed byte[8]) zs#0 + (byte) anim::i#2)
   [37] call rotate_matrix 
-  to:anim::@29
-anim::@29: scope:[anim]  from anim::@15
+  to:anim::@9
+anim::@9: scope:[anim]  from anim::@6
   [38] *((const signed byte[8]) xrs#0 + (byte) anim::i#2) ← *((const signed byte*) xr#0)
   [39] *((const signed byte[8]) yrs#0 + (byte) anim::i#2) ← *((const signed byte*) yr#0)
   [40] *((const signed byte[8]) zrs#0 + (byte) anim::i#2) ← *((const signed byte*) zr#0)
@@ -159,149 +159,149 @@ anim::@29: scope:[anim]  from anim::@15
   [47] (byte/word/signed word/dword/signed dword~) anim::$10 ← (byte/word/signed word/dword/signed dword) $80 + (byte)*((const signed byte*) yp#0)
   [48] *((const byte*) SPRITES_YPOS#0 + (byte) anim::i2#0) ← (byte/word/signed word/dword/signed dword~) anim::$10
   [49] (byte) anim::i#1 ← ++ (byte) anim::i#2
-  [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@15
-  to:anim::@16
-anim::@16: scope:[anim]  from anim::@29
+  [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@6
+  to:anim::@7
+anim::@7: scope:[anim]  from anim::@9
   [51] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_GREY#0
   [52] call debug_print 
-  to:anim::@30
-anim::@30: scope:[anim]  from anim::@16
+  to:anim::@10
+anim::@10: scope:[anim]  from anim::@7
   [53] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0
   [54] (signed byte) sx#3 ← (signed byte) sx#10 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [55] (signed byte) sy#3 ← (signed byte) sy#10 - (byte/signed byte/word/signed word/dword/signed dword) 3
   to:anim::@1
-debug_print: scope:[debug_print]  from anim::@16
+debug_print: scope:[debug_print]  from anim::@7
   [56] (signed byte) debug_print::print_sbyte_pos1_sb#0 ← (signed byte) sx#10
   to:debug_print::print_sbyte_pos1
 debug_print::print_sbyte_pos1: scope:[debug_print]  from debug_print
   [57] (signed byte) print_sbyte_at::b#4 ← (signed byte) debug_print::print_sbyte_pos1_sb#0
   [58] call print_sbyte_at 
-  to:debug_print::@3
-debug_print::@3: scope:[debug_print]  from debug_print::print_sbyte_pos1
+  to:debug_print::@2
+debug_print::@2: scope:[debug_print]  from debug_print::print_sbyte_pos1
   [59] (signed byte) debug_print::print_sbyte_pos2_sb#0 ← (signed byte) sy#10
   to:debug_print::print_sbyte_pos2
-debug_print::print_sbyte_pos2: scope:[debug_print]  from debug_print::@3
+debug_print::print_sbyte_pos2: scope:[debug_print]  from debug_print::@2
   [60] (signed byte) print_sbyte_at::b#5 ← (signed byte) debug_print::print_sbyte_pos2_sb#0
   [61] call print_sbyte_at 
   to:debug_print::print_sbyte_pos3
 debug_print::print_sbyte_pos3: scope:[debug_print]  from debug_print::print_sbyte_pos2
   [62] phi()
   [63] call print_sbyte_at 
-  to:debug_print::@5
-debug_print::@5: scope:[debug_print]  from debug_print::print_sbyte_pos3
+  to:debug_print::@3
+debug_print::@3: scope:[debug_print]  from debug_print::print_sbyte_pos3
   [64] (signed byte) debug_print::print_sbyte_pos4_sb#0 ← *((const signed byte[9]) rotation_matrix#0)
   to:debug_print::print_sbyte_pos4
-debug_print::print_sbyte_pos4: scope:[debug_print]  from debug_print::@5
+debug_print::print_sbyte_pos4: scope:[debug_print]  from debug_print::@3
   [65] (signed byte) print_sbyte_at::b#7 ← (signed byte) debug_print::print_sbyte_pos4_sb#0
   [66] call print_sbyte_at 
-  to:debug_print::@6
-debug_print::@6: scope:[debug_print]  from debug_print::print_sbyte_pos4
+  to:debug_print::@4
+debug_print::@4: scope:[debug_print]  from debug_print::print_sbyte_pos4
   [67] (signed byte) debug_print::print_sbyte_pos5_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 1)
   to:debug_print::print_sbyte_pos5
-debug_print::print_sbyte_pos5: scope:[debug_print]  from debug_print::@6
+debug_print::print_sbyte_pos5: scope:[debug_print]  from debug_print::@4
   [68] (signed byte) print_sbyte_at::b#8 ← (signed byte) debug_print::print_sbyte_pos5_sb#0
   [69] call print_sbyte_at 
-  to:debug_print::@7
-debug_print::@7: scope:[debug_print]  from debug_print::print_sbyte_pos5
+  to:debug_print::@5
+debug_print::@5: scope:[debug_print]  from debug_print::print_sbyte_pos5
   [70] (signed byte) debug_print::print_sbyte_pos6_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 2)
   to:debug_print::print_sbyte_pos6
-debug_print::print_sbyte_pos6: scope:[debug_print]  from debug_print::@7
+debug_print::print_sbyte_pos6: scope:[debug_print]  from debug_print::@5
   [71] (signed byte) print_sbyte_at::b#9 ← (signed byte) debug_print::print_sbyte_pos6_sb#0
   [72] call print_sbyte_at 
-  to:debug_print::@8
-debug_print::@8: scope:[debug_print]  from debug_print::print_sbyte_pos6
+  to:debug_print::@6
+debug_print::@6: scope:[debug_print]  from debug_print::print_sbyte_pos6
   [73] (signed byte) debug_print::print_sbyte_pos7_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 3)
   to:debug_print::print_sbyte_pos7
-debug_print::print_sbyte_pos7: scope:[debug_print]  from debug_print::@8
+debug_print::print_sbyte_pos7: scope:[debug_print]  from debug_print::@6
   [74] (signed byte) print_sbyte_at::b#10 ← (signed byte) debug_print::print_sbyte_pos7_sb#0
   [75] call print_sbyte_at 
-  to:debug_print::@9
-debug_print::@9: scope:[debug_print]  from debug_print::print_sbyte_pos7
+  to:debug_print::@7
+debug_print::@7: scope:[debug_print]  from debug_print::print_sbyte_pos7
   [76] (signed byte) debug_print::print_sbyte_pos8_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 4)
   to:debug_print::print_sbyte_pos8
-debug_print::print_sbyte_pos8: scope:[debug_print]  from debug_print::@9
+debug_print::print_sbyte_pos8: scope:[debug_print]  from debug_print::@7
   [77] (signed byte) print_sbyte_at::b#11 ← (signed byte) debug_print::print_sbyte_pos8_sb#0
   [78] call print_sbyte_at 
-  to:debug_print::@10
-debug_print::@10: scope:[debug_print]  from debug_print::print_sbyte_pos8
+  to:debug_print::@8
+debug_print::@8: scope:[debug_print]  from debug_print::print_sbyte_pos8
   [79] (signed byte) debug_print::print_sbyte_pos9_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 5)
   to:debug_print::print_sbyte_pos9
-debug_print::print_sbyte_pos9: scope:[debug_print]  from debug_print::@10
+debug_print::print_sbyte_pos9: scope:[debug_print]  from debug_print::@8
   [80] (signed byte) print_sbyte_at::b#12 ← (signed byte) debug_print::print_sbyte_pos9_sb#0
   [81] call print_sbyte_at 
-  to:debug_print::@11
-debug_print::@11: scope:[debug_print]  from debug_print::print_sbyte_pos9
+  to:debug_print::@9
+debug_print::@9: scope:[debug_print]  from debug_print::print_sbyte_pos9
   [82] (signed byte) debug_print::print_sbyte_pos10_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 6)
   to:debug_print::print_sbyte_pos10
-debug_print::print_sbyte_pos10: scope:[debug_print]  from debug_print::@11
+debug_print::print_sbyte_pos10: scope:[debug_print]  from debug_print::@9
   [83] (signed byte) print_sbyte_at::b#13 ← (signed byte) debug_print::print_sbyte_pos10_sb#0
   [84] call print_sbyte_at 
-  to:debug_print::@12
-debug_print::@12: scope:[debug_print]  from debug_print::print_sbyte_pos10
+  to:debug_print::@10
+debug_print::@10: scope:[debug_print]  from debug_print::print_sbyte_pos10
   [85] (signed byte) debug_print::print_sbyte_pos11_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 7)
   to:debug_print::print_sbyte_pos11
-debug_print::print_sbyte_pos11: scope:[debug_print]  from debug_print::@12
+debug_print::print_sbyte_pos11: scope:[debug_print]  from debug_print::@10
   [86] (signed byte) print_sbyte_at::b#14 ← (signed byte) debug_print::print_sbyte_pos11_sb#0
   [87] call print_sbyte_at 
-  to:debug_print::@13
-debug_print::@13: scope:[debug_print]  from debug_print::print_sbyte_pos11
+  to:debug_print::@11
+debug_print::@11: scope:[debug_print]  from debug_print::print_sbyte_pos11
   [88] (signed byte) debug_print::print_sbyte_pos12_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 8)
   to:debug_print::print_sbyte_pos12
-debug_print::print_sbyte_pos12: scope:[debug_print]  from debug_print::@13
+debug_print::print_sbyte_pos12: scope:[debug_print]  from debug_print::@11
   [89] (signed byte) print_sbyte_at::b#15 ← (signed byte) debug_print::print_sbyte_pos12_sb#0
   [90] call print_sbyte_at 
   to:debug_print::@1
-debug_print::@1: scope:[debug_print]  from debug_print::@32 debug_print::print_sbyte_pos12
-  [91] (byte) debug_print::i#2 ← phi( debug_print::print_sbyte_pos12/(byte/signed byte/word/signed word/dword/signed dword) 0 debug_print::@32/(byte) debug_print::i#1 )
-  [91] (byte) debug_print::c#2 ← phi( debug_print::print_sbyte_pos12/(byte/signed byte/word/signed word/dword/signed dword) 4 debug_print::@32/(byte) debug_print::c#1 )
+debug_print::@1: scope:[debug_print]  from debug_print::@17 debug_print::print_sbyte_pos12
+  [91] (byte) debug_print::i#2 ← phi( debug_print::print_sbyte_pos12/(byte/signed byte/word/signed word/dword/signed dword) 0 debug_print::@17/(byte) debug_print::i#1 )
+  [91] (byte) debug_print::c#2 ← phi( debug_print::print_sbyte_pos12/(byte/signed byte/word/signed word/dword/signed dword) 4 debug_print::@17/(byte) debug_print::c#1 )
   [92] (byte*) print_sbyte_at::at#15 ← (const byte*) debug_print::at_line#0 + (byte) debug_print::c#2
   [93] (signed byte) print_sbyte_at::b#16 ← *((const signed byte[8]) xrs#0 + (byte) debug_print::i#2)
   [94] call print_sbyte_at 
-  to:debug_print::@27
-debug_print::@27: scope:[debug_print]  from debug_print::@1
+  to:debug_print::@12
+debug_print::@12: scope:[debug_print]  from debug_print::@1
   [95] (byte*) print_sbyte_at::at#16 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) debug_print::c#2
   [96] (signed byte) print_sbyte_at::b#17 ← *((const signed byte[8]) yrs#0 + (byte) debug_print::i#2)
   [97] call print_sbyte_at 
-  to:debug_print::@28
-debug_print::@28: scope:[debug_print]  from debug_print::@27
+  to:debug_print::@13
+debug_print::@13: scope:[debug_print]  from debug_print::@12
   [98] (byte*) print_sbyte_at::at#17 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) debug_print::c#2
   [99] (signed byte) print_sbyte_at::b#18 ← *((const signed byte[8]) zrs#0 + (byte) debug_print::i#2)
   [100] call print_sbyte_at 
-  to:debug_print::@29
-debug_print::@29: scope:[debug_print]  from debug_print::@28
+  to:debug_print::@14
+debug_print::@14: scope:[debug_print]  from debug_print::@13
   [101] (byte*) print_sbyte_at::at#18 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 3 + (byte) debug_print::c#2
   [102] (signed byte) print_sbyte_at::b#19 ← *((const signed byte[8]) pps#0 + (byte) debug_print::i#2)
   [103] call print_sbyte_at 
-  to:debug_print::@30
-debug_print::@30: scope:[debug_print]  from debug_print::@29
+  to:debug_print::@15
+debug_print::@15: scope:[debug_print]  from debug_print::@14
   [104] (byte*) print_sbyte_at::at#19 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 4 + (byte) debug_print::c#2
   [105] (signed byte) print_sbyte_at::b#20 ← *((const signed byte[8]) xps#0 + (byte) debug_print::i#2)
   [106] call print_sbyte_at 
-  to:debug_print::@31
-debug_print::@31: scope:[debug_print]  from debug_print::@30
+  to:debug_print::@16
+debug_print::@16: scope:[debug_print]  from debug_print::@15
   [107] (byte*) print_sbyte_at::at#20 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) debug_print::c#2
   [108] (signed byte) print_sbyte_at::b#21 ← *((const signed byte[8]) yps#0 + (byte) debug_print::i#2)
   [109] call print_sbyte_at 
-  to:debug_print::@32
-debug_print::@32: scope:[debug_print]  from debug_print::@31
+  to:debug_print::@17
+debug_print::@17: scope:[debug_print]  from debug_print::@16
   [110] (byte) debug_print::c#1 ← (byte) debug_print::c#2 + (byte/signed byte/word/signed word/dword/signed dword) 4
   [111] (byte) debug_print::i#1 ← ++ (byte) debug_print::i#2
   [112] if((byte) debug_print::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto debug_print::@1
   to:debug_print::@return
-debug_print::@return: scope:[debug_print]  from debug_print::@32
+debug_print::@return: scope:[debug_print]  from debug_print::@17
   [113] return 
   to:@return
-print_sbyte_at: scope:[print_sbyte_at]  from debug_print::@1 debug_print::@27 debug_print::@28 debug_print::@29 debug_print::@30 debug_print::@31 debug_print::print_sbyte_pos1 debug_print::print_sbyte_pos10 debug_print::print_sbyte_pos11 debug_print::print_sbyte_pos12 debug_print::print_sbyte_pos2 debug_print::print_sbyte_pos3 debug_print::print_sbyte_pos4 debug_print::print_sbyte_pos5 debug_print::print_sbyte_pos6 debug_print::print_sbyte_pos7 debug_print::print_sbyte_pos8 debug_print::print_sbyte_pos9 debug_print_init::@1 debug_print_init::@18 debug_print_init::@19
-  [114] (byte*) print_sbyte_at::at#21 ← phi( debug_print::@1/(byte*) print_sbyte_at::at#15 debug_print::@27/(byte*) print_sbyte_at::at#16 debug_print::@28/(byte*) print_sbyte_at::at#17 debug_print::@29/(byte*) print_sbyte_at::at#18 debug_print::@30/(byte*) print_sbyte_at::at#19 debug_print::@31/(byte*) print_sbyte_at::at#20 debug_print::print_sbyte_pos1/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos1_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos1_col#0 debug_print::print_sbyte_pos10/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos10_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos10_col#0 debug_print::print_sbyte_pos11/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos11_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos11_col#0 debug_print::print_sbyte_pos12/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos12_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos12_col#0 debug_print::print_sbyte_pos2/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos2_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos2_col#0 debug_print::print_sbyte_pos3/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos3_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos3_col#0 debug_print::print_sbyte_pos4/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos4_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos4_col#0 debug_print::print_sbyte_pos5/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos5_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos5_col#0 debug_print::print_sbyte_pos6/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos6_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos6_col#0 debug_print::print_sbyte_pos7/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos7_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos7_col#0 debug_print::print_sbyte_pos8/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos8_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos8_col#0 debug_print::print_sbyte_pos9/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos9_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos9_col#0 debug_print_init::@1/(byte*) print_sbyte_at::at#0 debug_print_init::@18/(byte*) print_sbyte_at::at#1 debug_print_init::@19/(byte*) print_sbyte_at::at#2 )
-  [114] (signed byte) print_sbyte_at::b#22 ← phi( debug_print::@1/(signed byte) print_sbyte_at::b#16 debug_print::@27/(signed byte) print_sbyte_at::b#17 debug_print::@28/(signed byte) print_sbyte_at::b#18 debug_print::@29/(signed byte) print_sbyte_at::b#19 debug_print::@30/(signed byte) print_sbyte_at::b#20 debug_print::@31/(signed byte) print_sbyte_at::b#21 debug_print::print_sbyte_pos1/(signed byte) print_sbyte_at::b#4 debug_print::print_sbyte_pos10/(signed byte) print_sbyte_at::b#13 debug_print::print_sbyte_pos11/(signed byte) print_sbyte_at::b#14 debug_print::print_sbyte_pos12/(signed byte) print_sbyte_at::b#15 debug_print::print_sbyte_pos2/(signed byte) print_sbyte_at::b#5 debug_print::print_sbyte_pos3/(const signed byte) sz#0 debug_print::print_sbyte_pos4/(signed byte) print_sbyte_at::b#7 debug_print::print_sbyte_pos5/(signed byte) print_sbyte_at::b#8 debug_print::print_sbyte_pos6/(signed byte) print_sbyte_at::b#9 debug_print::print_sbyte_pos7/(signed byte) print_sbyte_at::b#10 debug_print::print_sbyte_pos8/(signed byte) print_sbyte_at::b#11 debug_print::print_sbyte_pos9/(signed byte) print_sbyte_at::b#12 debug_print_init::@1/(signed byte) print_sbyte_at::b#1 debug_print_init::@18/(signed byte) print_sbyte_at::b#2 debug_print_init::@19/(signed byte) print_sbyte_at::b#3 )
+print_sbyte_at: scope:[print_sbyte_at]  from debug_print::@1 debug_print::@12 debug_print::@13 debug_print::@14 debug_print::@15 debug_print::@16 debug_print::print_sbyte_pos1 debug_print::print_sbyte_pos10 debug_print::print_sbyte_pos11 debug_print::print_sbyte_pos12 debug_print::print_sbyte_pos2 debug_print::print_sbyte_pos3 debug_print::print_sbyte_pos4 debug_print::print_sbyte_pos5 debug_print::print_sbyte_pos6 debug_print::print_sbyte_pos7 debug_print::print_sbyte_pos8 debug_print::print_sbyte_pos9 debug_print_init::@1 debug_print_init::@16 debug_print_init::@17
+  [114] (byte*) print_sbyte_at::at#21 ← phi( debug_print::@1/(byte*) print_sbyte_at::at#15 debug_print::@12/(byte*) print_sbyte_at::at#16 debug_print::@13/(byte*) print_sbyte_at::at#17 debug_print::@14/(byte*) print_sbyte_at::at#18 debug_print::@15/(byte*) print_sbyte_at::at#19 debug_print::@16/(byte*) print_sbyte_at::at#20 debug_print::print_sbyte_pos1/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos1_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos1_col#0 debug_print::print_sbyte_pos10/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos10_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos10_col#0 debug_print::print_sbyte_pos11/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos11_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos11_col#0 debug_print::print_sbyte_pos12/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos12_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos12_col#0 debug_print::print_sbyte_pos2/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos2_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos2_col#0 debug_print::print_sbyte_pos3/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos3_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos3_col#0 debug_print::print_sbyte_pos4/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos4_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos4_col#0 debug_print::print_sbyte_pos5/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos5_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos5_col#0 debug_print::print_sbyte_pos6/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos6_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos6_col#0 debug_print::print_sbyte_pos7/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos7_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos7_col#0 debug_print::print_sbyte_pos8/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos8_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos8_col#0 debug_print::print_sbyte_pos9/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos9_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos9_col#0 debug_print_init::@1/(byte*) print_sbyte_at::at#0 debug_print_init::@16/(byte*) print_sbyte_at::at#1 debug_print_init::@17/(byte*) print_sbyte_at::at#2 )
+  [114] (signed byte) print_sbyte_at::b#22 ← phi( debug_print::@1/(signed byte) print_sbyte_at::b#16 debug_print::@12/(signed byte) print_sbyte_at::b#17 debug_print::@13/(signed byte) print_sbyte_at::b#18 debug_print::@14/(signed byte) print_sbyte_at::b#19 debug_print::@15/(signed byte) print_sbyte_at::b#20 debug_print::@16/(signed byte) print_sbyte_at::b#21 debug_print::print_sbyte_pos1/(signed byte) print_sbyte_at::b#4 debug_print::print_sbyte_pos10/(signed byte) print_sbyte_at::b#13 debug_print::print_sbyte_pos11/(signed byte) print_sbyte_at::b#14 debug_print::print_sbyte_pos12/(signed byte) print_sbyte_at::b#15 debug_print::print_sbyte_pos2/(signed byte) print_sbyte_at::b#5 debug_print::print_sbyte_pos3/(const signed byte) sz#0 debug_print::print_sbyte_pos4/(signed byte) print_sbyte_at::b#7 debug_print::print_sbyte_pos5/(signed byte) print_sbyte_at::b#8 debug_print::print_sbyte_pos6/(signed byte) print_sbyte_at::b#9 debug_print::print_sbyte_pos7/(signed byte) print_sbyte_at::b#10 debug_print::print_sbyte_pos8/(signed byte) print_sbyte_at::b#11 debug_print::print_sbyte_pos9/(signed byte) print_sbyte_at::b#12 debug_print_init::@1/(signed byte) print_sbyte_at::b#1 debug_print_init::@16/(signed byte) print_sbyte_at::b#2 debug_print_init::@17/(signed byte) print_sbyte_at::b#3 )
   [115] if((signed byte) print_sbyte_at::b#22<(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sbyte_at::@1
   to:print_sbyte_at::@3
 print_sbyte_at::@3: scope:[print_sbyte_at]  from print_sbyte_at
   [116] (byte*) print_char_at::at#1 ← (byte*) print_sbyte_at::at#21
   [117] call print_char_at 
   to:print_sbyte_at::@2
-print_sbyte_at::@2: scope:[print_sbyte_at]  from print_sbyte_at::@3 print_sbyte_at::@5
-  [118] (signed byte) print_sbyte_at::b#24 ← phi( print_sbyte_at::@5/(signed byte) print_sbyte_at::b#0 print_sbyte_at::@3/(signed byte) print_sbyte_at::b#22 )
+print_sbyte_at::@2: scope:[print_sbyte_at]  from print_sbyte_at::@3 print_sbyte_at::@4
+  [118] (signed byte) print_sbyte_at::b#24 ← phi( print_sbyte_at::@4/(signed byte) print_sbyte_at::b#0 print_sbyte_at::@3/(signed byte) print_sbyte_at::b#22 )
   [119] (byte*) print_byte_at::at#0 ← (byte*) print_sbyte_at::at#21 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [120] call print_byte_at 
   to:print_sbyte_at::@return
@@ -311,8 +311,8 @@ print_sbyte_at::@return: scope:[print_sbyte_at]  from print_sbyte_at::@2
 print_sbyte_at::@1: scope:[print_sbyte_at]  from print_sbyte_at
   [122] (byte*) print_char_at::at#0 ← (byte*) print_sbyte_at::at#21
   [123] call print_char_at 
-  to:print_sbyte_at::@5
-print_sbyte_at::@5: scope:[print_sbyte_at]  from print_sbyte_at::@1
+  to:print_sbyte_at::@4
+print_sbyte_at::@4: scope:[print_sbyte_at]  from print_sbyte_at::@1
   [124] (signed byte) print_sbyte_at::b#0 ← - (signed byte) print_sbyte_at::b#22
   to:print_sbyte_at::@2
 print_char_at: scope:[print_char_at]  from print_byte_at print_byte_at::@1 print_sbyte_at::@1 print_sbyte_at::@3
@@ -338,7 +338,7 @@ print_byte_at::@1: scope:[print_byte_at]  from print_byte_at
 print_byte_at::@return: scope:[print_byte_at]  from print_byte_at::@1
   [136] return 
   to:@return
-rotate_matrix: scope:[rotate_matrix]  from anim::@15
+rotate_matrix: scope:[rotate_matrix]  from anim::@6
   [137] *((const signed byte*) xr#0) ← (signed byte) rotate_matrix::x#0
   [138] *((const signed byte*) yr#0) ← (signed byte) rotate_matrix::y#0
   [139] *((const signed byte*) zr#0) ← (signed byte) rotate_matrix::z#0
@@ -347,13 +347,13 @@ rotate_matrix: scope:[rotate_matrix]  from anim::@15
 rotate_matrix::@return: scope:[rotate_matrix]  from rotate_matrix
   [141] return 
   to:@return
-store_matrix: scope:[store_matrix]  from anim::@27
+store_matrix: scope:[store_matrix]  from anim::@8
   asm { ldarotation_matrix+0 starotate_matrix.A1+1 eor#$ff starotate_matrix.A2+1 ldarotation_matrix+1 starotate_matrix.B1+1 eor#$ff starotate_matrix.B2+1 ldarotation_matrix+2 starotate_matrix.C1+1 eor#$ff starotate_matrix.C2+1 ldarotation_matrix+3 starotate_matrix.D1+1 eor#$ff starotate_matrix.D2+1 ldarotation_matrix+4 starotate_matrix.E1+1 eor#$ff starotate_matrix.E2+1 ldarotation_matrix+5 starotate_matrix.F1+1 eor#$ff starotate_matrix.F2+1 ldarotation_matrix+6 starotate_matrix.G1+1 eor#$ff starotate_matrix.G2+1 ldarotation_matrix+7 starotate_matrix.H1+1 eor#$ff starotate_matrix.H2+1 ldarotation_matrix+8 starotate_matrix.I1+1 eor#$ff starotate_matrix.I2+1  }
   to:store_matrix::@return
 store_matrix::@return: scope:[store_matrix]  from store_matrix
   [143] return 
   to:@return
-calculate_matrix: scope:[calculate_matrix]  from anim::@14
+calculate_matrix: scope:[calculate_matrix]  from anim::@5
   [144] (signed byte) calculate_matrix::t1#0 ← (signed byte) calculate_matrix::sy#0 - (const signed byte) sz#0
   [145] (signed byte) calculate_matrix::t2#0 ← (signed byte) calculate_matrix::sy#0 + (const signed byte) sz#0
   [146] (signed byte) calculate_matrix::t3#0 ← (signed byte) calculate_matrix::sx#0 + (const signed byte) sz#0
@@ -405,74 +405,74 @@ calculate_matrix::@return: scope:[calculate_matrix]  from calculate_matrix
 debug_print_init: scope:[debug_print_init]  from main::@1
   [189] phi()
   [190] call print_cls 
-  to:debug_print_init::@5
-debug_print_init::@5: scope:[debug_print_init]  from debug_print_init
+  to:debug_print_init::@4
+debug_print_init::@4: scope:[debug_print_init]  from debug_print_init
   [191] phi()
   [192] call print_str_at 
-  to:debug_print_init::@6
-debug_print_init::@6: scope:[debug_print_init]  from debug_print_init::@5
+  to:debug_print_init::@5
+debug_print_init::@5: scope:[debug_print_init]  from debug_print_init::@4
   [193] phi()
   [194] call print_str_at 
-  to:debug_print_init::@7
-debug_print_init::@7: scope:[debug_print_init]  from debug_print_init::@6
+  to:debug_print_init::@6
+debug_print_init::@6: scope:[debug_print_init]  from debug_print_init::@5
   [195] phi()
   [196] call print_str_at 
-  to:debug_print_init::@8
-debug_print_init::@8: scope:[debug_print_init]  from debug_print_init::@7
+  to:debug_print_init::@7
+debug_print_init::@7: scope:[debug_print_init]  from debug_print_init::@6
   [197] phi()
   [198] call print_str_at 
-  to:debug_print_init::@9
-debug_print_init::@9: scope:[debug_print_init]  from debug_print_init::@8
+  to:debug_print_init::@8
+debug_print_init::@8: scope:[debug_print_init]  from debug_print_init::@7
   [199] phi()
   [200] call print_str_at 
-  to:debug_print_init::@10
-debug_print_init::@10: scope:[debug_print_init]  from debug_print_init::@9
+  to:debug_print_init::@9
+debug_print_init::@9: scope:[debug_print_init]  from debug_print_init::@8
   [201] phi()
   [202] call print_str_at 
-  to:debug_print_init::@11
-debug_print_init::@11: scope:[debug_print_init]  from debug_print_init::@10
+  to:debug_print_init::@10
+debug_print_init::@10: scope:[debug_print_init]  from debug_print_init::@9
   [203] phi()
   [204] call print_str_at 
-  to:debug_print_init::@12
-debug_print_init::@12: scope:[debug_print_init]  from debug_print_init::@11
+  to:debug_print_init::@11
+debug_print_init::@11: scope:[debug_print_init]  from debug_print_init::@10
   [205] phi()
   [206] call print_str_at 
-  to:debug_print_init::@13
-debug_print_init::@13: scope:[debug_print_init]  from debug_print_init::@12
+  to:debug_print_init::@12
+debug_print_init::@12: scope:[debug_print_init]  from debug_print_init::@11
   [207] phi()
   [208] call print_str_at 
-  to:debug_print_init::@14
-debug_print_init::@14: scope:[debug_print_init]  from debug_print_init::@13
+  to:debug_print_init::@13
+debug_print_init::@13: scope:[debug_print_init]  from debug_print_init::@12
   [209] phi()
   [210] call print_str_at 
-  to:debug_print_init::@15
-debug_print_init::@15: scope:[debug_print_init]  from debug_print_init::@14
+  to:debug_print_init::@14
+debug_print_init::@14: scope:[debug_print_init]  from debug_print_init::@13
   [211] phi()
   [212] call print_str_at 
-  to:debug_print_init::@16
-debug_print_init::@16: scope:[debug_print_init]  from debug_print_init::@15
+  to:debug_print_init::@15
+debug_print_init::@15: scope:[debug_print_init]  from debug_print_init::@14
   [213] phi()
   [214] call print_str_at 
   to:debug_print_init::@1
-debug_print_init::@1: scope:[debug_print_init]  from debug_print_init::@16 debug_print_init::@3
-  [215] (byte) debug_print_init::i#2 ← phi( debug_print_init::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 debug_print_init::@3/(byte) debug_print_init::i#1 )
-  [215] (byte) debug_print_init::c#2 ← phi( debug_print_init::@16/(byte/signed byte/word/signed word/dword/signed dword) 4 debug_print_init::@3/(byte) debug_print_init::c#1 )
+debug_print_init::@1: scope:[debug_print_init]  from debug_print_init::@15 debug_print_init::@3
+  [215] (byte) debug_print_init::i#2 ← phi( debug_print_init::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 debug_print_init::@3/(byte) debug_print_init::i#1 )
+  [215] (byte) debug_print_init::c#2 ← phi( debug_print_init::@15/(byte/signed byte/word/signed word/dword/signed dword) 4 debug_print_init::@3/(byte) debug_print_init::c#1 )
   [216] (byte*) print_sbyte_at::at#0 ← (const byte*) debug_print_init::at_line#0 + (byte) debug_print_init::c#2
   [217] (signed byte) print_sbyte_at::b#1 ← *((const signed byte[8]) xs#0 + (byte) debug_print_init::i#2)
   [218] call print_sbyte_at 
-  to:debug_print_init::@18
-debug_print_init::@18: scope:[debug_print_init]  from debug_print_init::@1
+  to:debug_print_init::@16
+debug_print_init::@16: scope:[debug_print_init]  from debug_print_init::@1
   [219] (byte*) print_sbyte_at::at#1 ← (const byte*) debug_print_init::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) debug_print_init::c#2
   [220] (signed byte) print_sbyte_at::b#2 ← *((const signed byte[8]) ys#0 + (byte) debug_print_init::i#2)
   [221] call print_sbyte_at 
-  to:debug_print_init::@19
-debug_print_init::@19: scope:[debug_print_init]  from debug_print_init::@18
+  to:debug_print_init::@17
+debug_print_init::@17: scope:[debug_print_init]  from debug_print_init::@16
   [222] (byte*) print_sbyte_at::at#2 ← (const byte*) debug_print_init::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) debug_print_init::c#2
   [223] (signed byte) print_sbyte_at::b#3 ← *((const signed byte[8]) zs#0 + (byte) debug_print_init::i#2)
   [224] call print_sbyte_at 
   to:debug_print_init::@2
-debug_print_init::@2: scope:[debug_print_init]  from debug_print_init::@19 debug_print_init::@2
-  [225] (byte) debug_print_init::j#2 ← phi( debug_print_init::@2/(byte) debug_print_init::j#1 debug_print_init::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+debug_print_init::@2: scope:[debug_print_init]  from debug_print_init::@17 debug_print_init::@2
+  [225] (byte) debug_print_init::j#2 ← phi( debug_print_init::@2/(byte) debug_print_init::j#1 debug_print_init::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [226] (byte) debug_print_init::col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 8 + (byte) debug_print_init::i#2
   [227] (byte*~) debug_print_init::$59 ← (const byte*) debug_print_init::at_cols#0 + (byte) debug_print_init::c#2
   [228] (byte*~) debug_print_init::$60 ← (byte*~) debug_print_init::$59 + (byte) debug_print_init::j#2
@@ -512,9 +512,9 @@ debug_print_init::@3: scope:[debug_print_init]  from debug_print_init::@2
 debug_print_init::@return: scope:[debug_print_init]  from debug_print_init::@3
   [259] return 
   to:@return
-print_str_at: scope:[print_str_at]  from debug_print_init::@10 debug_print_init::@11 debug_print_init::@12 debug_print_init::@13 debug_print_init::@14 debug_print_init::@15 debug_print_init::@16 debug_print_init::@5 debug_print_init::@6 debug_print_init::@7 debug_print_init::@8 debug_print_init::@9
-  [260] (byte*) print_str_at::at#15 ← phi( debug_print_init::@10/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $12 debug_print_init::@11/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13 debug_print_init::@12/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $14 debug_print_init::@13/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $15 debug_print_init::@14/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $16 debug_print_init::@15/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $17 debug_print_init::@16/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18 debug_print_init::@5/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@6/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@7/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@8/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $10 debug_print_init::@9/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $11 )
-  [260] (byte*) print_str_at::str#15 ← phi( debug_print_init::@10/(const string) debug_print_init::str5 debug_print_init::@11/(const string) debug_print_init::str6 debug_print_init::@12/(const string) debug_print_init::str7 debug_print_init::@13/(const string) debug_print_init::str8 debug_print_init::@14/(const string) debug_print_init::str9 debug_print_init::@15/(const string) debug_print_init::str10 debug_print_init::@16/(const string) debug_print_init::str11 debug_print_init::@5/(const string) debug_print_init::str debug_print_init::@6/(const string) debug_print_init::str1 debug_print_init::@7/(const string) debug_print_init::str2 debug_print_init::@8/(const string) debug_print_init::str3 debug_print_init::@9/(const string) debug_print_init::str4 )
+print_str_at: scope:[print_str_at]  from debug_print_init::@10 debug_print_init::@11 debug_print_init::@12 debug_print_init::@13 debug_print_init::@14 debug_print_init::@15 debug_print_init::@4 debug_print_init::@5 debug_print_init::@6 debug_print_init::@7 debug_print_init::@8 debug_print_init::@9
+  [260] (byte*) print_str_at::at#15 ← phi( debug_print_init::@9/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $12 debug_print_init::@10/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13 debug_print_init::@11/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $14 debug_print_init::@12/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $15 debug_print_init::@13/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $16 debug_print_init::@14/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $17 debug_print_init::@15/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18 debug_print_init::@4/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@5/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@6/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@7/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $10 debug_print_init::@8/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $11 )
+  [260] (byte*) print_str_at::str#15 ← phi( debug_print_init::@9/(const string) debug_print_init::str5 debug_print_init::@10/(const string) debug_print_init::str6 debug_print_init::@11/(const string) debug_print_init::str7 debug_print_init::@12/(const string) debug_print_init::str8 debug_print_init::@13/(const string) debug_print_init::str9 debug_print_init::@14/(const string) debug_print_init::str10 debug_print_init::@15/(const string) debug_print_init::str11 debug_print_init::@4/(const string) debug_print_init::str debug_print_init::@5/(const string) debug_print_init::str1 debug_print_init::@6/(const string) debug_print_init::str2 debug_print_init::@7/(const string) debug_print_init::str3 debug_print_init::@8/(const string) debug_print_init::str4 )
   to:print_str_at::@1
 print_str_at::@1: scope:[print_str_at]  from print_str_at print_str_at::@2
   [261] (byte*) print_str_at::at#13 ← phi( print_str_at/(byte*) print_str_at::at#15 print_str_at::@2/(byte*) print_str_at::at#0 )
diff --git a/src/test/ref/examples/3d/3d.log b/src/test/ref/examples/3d/3d.log
index 03f9ea879..1412d2eaf 100644
--- a/src/test/ref/examples/3d/3d.log
+++ b/src/test/ref/examples/3d/3d.log
@@ -3624,13 +3624,55 @@ Culled Empty Block (label) debug_print_init::@21
 Culled Empty Block (label) debug_print_init::@22
 Culled Empty Block (label) print_cls::@3
 Culled Empty Block (label) sprites_init::@3
+Renumbering block @33 to @1
+Renumbering block print_sbyte_at::@5 to print_sbyte_at::@4
+Renumbering block anim::@6 to anim::@2
+Renumbering block anim::@9 to anim::@3
+Renumbering block anim::@12 to anim::@4
+Renumbering block anim::@14 to anim::@5
+Renumbering block anim::@15 to anim::@6
+Renumbering block anim::@16 to anim::@7
+Renumbering block anim::@27 to anim::@8
+Renumbering block anim::@29 to anim::@9
+Renumbering block anim::@30 to anim::@10
+Renumbering block debug_print_init::@5 to debug_print_init::@4
+Renumbering block debug_print_init::@6 to debug_print_init::@5
+Renumbering block debug_print_init::@7 to debug_print_init::@6
+Renumbering block debug_print_init::@8 to debug_print_init::@7
+Renumbering block debug_print_init::@9 to debug_print_init::@8
+Renumbering block debug_print_init::@10 to debug_print_init::@9
+Renumbering block debug_print_init::@11 to debug_print_init::@10
+Renumbering block debug_print_init::@12 to debug_print_init::@11
+Renumbering block debug_print_init::@13 to debug_print_init::@12
+Renumbering block debug_print_init::@14 to debug_print_init::@13
+Renumbering block debug_print_init::@15 to debug_print_init::@14
+Renumbering block debug_print_init::@16 to debug_print_init::@15
+Renumbering block debug_print_init::@18 to debug_print_init::@16
+Renumbering block debug_print_init::@19 to debug_print_init::@17
+Renumbering block debug_print::@3 to debug_print::@2
+Renumbering block debug_print::@5 to debug_print::@3
+Renumbering block debug_print::@6 to debug_print::@4
+Renumbering block debug_print::@7 to debug_print::@5
+Renumbering block debug_print::@8 to debug_print::@6
+Renumbering block debug_print::@9 to debug_print::@7
+Renumbering block debug_print::@10 to debug_print::@8
+Renumbering block debug_print::@11 to debug_print::@9
+Renumbering block debug_print::@12 to debug_print::@10
+Renumbering block debug_print::@13 to debug_print::@11
+Renumbering block debug_print::@27 to debug_print::@12
+Renumbering block debug_print::@28 to debug_print::@13
+Renumbering block debug_print::@29 to debug_print::@14
+Renumbering block debug_print::@30 to debug_print::@15
+Renumbering block debug_print::@31 to debug_print::@16
+Renumbering block debug_print::@32 to debug_print::@17
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of anim
-Adding NOP phi() at start of anim::@27
+Adding NOP phi() at start of anim::@8
 Adding NOP phi() at start of debug_print::print_sbyte_pos3
 Adding NOP phi() at start of debug_print_init
+Adding NOP phi() at start of debug_print_init::@4
 Adding NOP phi() at start of debug_print_init::@5
 Adding NOP phi() at start of debug_print_init::@6
 Adding NOP phi() at start of debug_print_init::@7
@@ -3642,14 +3684,13 @@ Adding NOP phi() at start of debug_print_init::@12
 Adding NOP phi() at start of debug_print_init::@13
 Adding NOP phi() at start of debug_print_init::@14
 Adding NOP phi() at start of debug_print_init::@15
-Adding NOP phi() at start of debug_print_init::@16
 Adding NOP phi() at start of print_cls
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@33
-@33: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) mulf_sqr1#0) {{ .for(var i=0;i<$200;i++) {
     	.if(i<=159) { .byte round((i*i)/256) }
     	.if(i>159 && i<=351 ) { .byte round(((i-256)*(i-256))/256) }
@@ -3742,9 +3783,9 @@ FINAL CONTROL FLOW GRAPH
  }}
   [11] call main 
   to:@end
-@end: scope:[]  from @33
+@end: scope:[]  from @1
   [12] phi()
-main: scope:[main]  from @33
+main: scope:[main]  from @1
   asm { sei  }
   [14] call sprites_init 
   to:main::@1
@@ -3763,38 +3804,38 @@ main::@return: scope:[main]  from main::@2
 anim: scope:[anim]  from main::@2
   [21] phi()
   to:anim::@1
-anim::@1: scope:[anim]  from anim anim::@30
-  [22] (signed byte) sy#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@30/(signed byte) sy#3 )
-  [22] (signed byte) sx#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@30/(signed byte) sx#3 )
-  to:anim::@6
-anim::@6: scope:[anim]  from anim::@1 anim::@6
-  [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6
-  to:anim::@9
-anim::@9: scope:[anim]  from anim::@6 anim::@9
-  [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@9
-  to:anim::@12
-anim::@12: scope:[anim]  from anim::@12 anim::@9
-  [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@12
-  to:anim::@14
-anim::@14: scope:[anim]  from anim::@12
+anim::@1: scope:[anim]  from anim anim::@10
+  [22] (signed byte) sy#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@10/(signed byte) sy#3 )
+  [22] (signed byte) sx#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@10/(signed byte) sx#3 )
+  to:anim::@2
+anim::@2: scope:[anim]  from anim::@1 anim::@2
+  [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2
+  to:anim::@3
+anim::@3: scope:[anim]  from anim::@2 anim::@3
+  [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@3
+  to:anim::@4
+anim::@4: scope:[anim]  from anim::@3 anim::@4
+  [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@4
+  to:anim::@5
+anim::@5: scope:[anim]  from anim::@4
   [26] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [27] (signed byte) calculate_matrix::sx#0 ← (signed byte) sx#10
   [28] (signed byte) calculate_matrix::sy#0 ← (signed byte) sy#10
   [29] call calculate_matrix 
-  to:anim::@27
-anim::@27: scope:[anim]  from anim::@14
+  to:anim::@8
+anim::@8: scope:[anim]  from anim::@5
   [30] phi()
   [31] call store_matrix 
-  to:anim::@15
-anim::@15: scope:[anim]  from anim::@27 anim::@29
-  [32] (byte) anim::i#2 ← phi( anim::@27/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@29/(byte) anim::i#1 )
+  to:anim::@6
+anim::@6: scope:[anim]  from anim::@8 anim::@9
+  [32] (byte) anim::i#2 ← phi( anim::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@9/(byte) anim::i#1 )
   [33] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [34] (signed byte) rotate_matrix::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#2)
   [35] (signed byte) rotate_matrix::y#0 ← *((const signed byte[8]) ys#0 + (byte) anim::i#2)
   [36] (signed byte) rotate_matrix::z#0 ← *((const signed byte[8]) zs#0 + (byte) anim::i#2)
   [37] call rotate_matrix 
-  to:anim::@29
-anim::@29: scope:[anim]  from anim::@15
+  to:anim::@9
+anim::@9: scope:[anim]  from anim::@6
   [38] *((const signed byte[8]) xrs#0 + (byte) anim::i#2) ← *((const signed byte*) xr#0)
   [39] *((const signed byte[8]) yrs#0 + (byte) anim::i#2) ← *((const signed byte*) yr#0)
   [40] *((const signed byte[8]) zrs#0 + (byte) anim::i#2) ← *((const signed byte*) zr#0)
@@ -3807,149 +3848,149 @@ anim::@29: scope:[anim]  from anim::@15
   [47] (byte/word/signed word/dword/signed dword~) anim::$10 ← (byte/word/signed word/dword/signed dword) $80 + (byte)*((const signed byte*) yp#0)
   [48] *((const byte*) SPRITES_YPOS#0 + (byte) anim::i2#0) ← (byte/word/signed word/dword/signed dword~) anim::$10
   [49] (byte) anim::i#1 ← ++ (byte) anim::i#2
-  [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@15
-  to:anim::@16
-anim::@16: scope:[anim]  from anim::@29
+  [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@6
+  to:anim::@7
+anim::@7: scope:[anim]  from anim::@9
   [51] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_GREY#0
   [52] call debug_print 
-  to:anim::@30
-anim::@30: scope:[anim]  from anim::@16
+  to:anim::@10
+anim::@10: scope:[anim]  from anim::@7
   [53] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0
   [54] (signed byte) sx#3 ← (signed byte) sx#10 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [55] (signed byte) sy#3 ← (signed byte) sy#10 - (byte/signed byte/word/signed word/dword/signed dword) 3
   to:anim::@1
-debug_print: scope:[debug_print]  from anim::@16
+debug_print: scope:[debug_print]  from anim::@7
   [56] (signed byte) debug_print::print_sbyte_pos1_sb#0 ← (signed byte) sx#10
   to:debug_print::print_sbyte_pos1
 debug_print::print_sbyte_pos1: scope:[debug_print]  from debug_print
   [57] (signed byte) print_sbyte_at::b#4 ← (signed byte) debug_print::print_sbyte_pos1_sb#0
   [58] call print_sbyte_at 
-  to:debug_print::@3
-debug_print::@3: scope:[debug_print]  from debug_print::print_sbyte_pos1
+  to:debug_print::@2
+debug_print::@2: scope:[debug_print]  from debug_print::print_sbyte_pos1
   [59] (signed byte) debug_print::print_sbyte_pos2_sb#0 ← (signed byte) sy#10
   to:debug_print::print_sbyte_pos2
-debug_print::print_sbyte_pos2: scope:[debug_print]  from debug_print::@3
+debug_print::print_sbyte_pos2: scope:[debug_print]  from debug_print::@2
   [60] (signed byte) print_sbyte_at::b#5 ← (signed byte) debug_print::print_sbyte_pos2_sb#0
   [61] call print_sbyte_at 
   to:debug_print::print_sbyte_pos3
 debug_print::print_sbyte_pos3: scope:[debug_print]  from debug_print::print_sbyte_pos2
   [62] phi()
   [63] call print_sbyte_at 
-  to:debug_print::@5
-debug_print::@5: scope:[debug_print]  from debug_print::print_sbyte_pos3
+  to:debug_print::@3
+debug_print::@3: scope:[debug_print]  from debug_print::print_sbyte_pos3
   [64] (signed byte) debug_print::print_sbyte_pos4_sb#0 ← *((const signed byte[9]) rotation_matrix#0)
   to:debug_print::print_sbyte_pos4
-debug_print::print_sbyte_pos4: scope:[debug_print]  from debug_print::@5
+debug_print::print_sbyte_pos4: scope:[debug_print]  from debug_print::@3
   [65] (signed byte) print_sbyte_at::b#7 ← (signed byte) debug_print::print_sbyte_pos4_sb#0
   [66] call print_sbyte_at 
-  to:debug_print::@6
-debug_print::@6: scope:[debug_print]  from debug_print::print_sbyte_pos4
+  to:debug_print::@4
+debug_print::@4: scope:[debug_print]  from debug_print::print_sbyte_pos4
   [67] (signed byte) debug_print::print_sbyte_pos5_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 1)
   to:debug_print::print_sbyte_pos5
-debug_print::print_sbyte_pos5: scope:[debug_print]  from debug_print::@6
+debug_print::print_sbyte_pos5: scope:[debug_print]  from debug_print::@4
   [68] (signed byte) print_sbyte_at::b#8 ← (signed byte) debug_print::print_sbyte_pos5_sb#0
   [69] call print_sbyte_at 
-  to:debug_print::@7
-debug_print::@7: scope:[debug_print]  from debug_print::print_sbyte_pos5
+  to:debug_print::@5
+debug_print::@5: scope:[debug_print]  from debug_print::print_sbyte_pos5
   [70] (signed byte) debug_print::print_sbyte_pos6_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 2)
   to:debug_print::print_sbyte_pos6
-debug_print::print_sbyte_pos6: scope:[debug_print]  from debug_print::@7
+debug_print::print_sbyte_pos6: scope:[debug_print]  from debug_print::@5
   [71] (signed byte) print_sbyte_at::b#9 ← (signed byte) debug_print::print_sbyte_pos6_sb#0
   [72] call print_sbyte_at 
-  to:debug_print::@8
-debug_print::@8: scope:[debug_print]  from debug_print::print_sbyte_pos6
+  to:debug_print::@6
+debug_print::@6: scope:[debug_print]  from debug_print::print_sbyte_pos6
   [73] (signed byte) debug_print::print_sbyte_pos7_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 3)
   to:debug_print::print_sbyte_pos7
-debug_print::print_sbyte_pos7: scope:[debug_print]  from debug_print::@8
+debug_print::print_sbyte_pos7: scope:[debug_print]  from debug_print::@6
   [74] (signed byte) print_sbyte_at::b#10 ← (signed byte) debug_print::print_sbyte_pos7_sb#0
   [75] call print_sbyte_at 
-  to:debug_print::@9
-debug_print::@9: scope:[debug_print]  from debug_print::print_sbyte_pos7
+  to:debug_print::@7
+debug_print::@7: scope:[debug_print]  from debug_print::print_sbyte_pos7
   [76] (signed byte) debug_print::print_sbyte_pos8_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 4)
   to:debug_print::print_sbyte_pos8
-debug_print::print_sbyte_pos8: scope:[debug_print]  from debug_print::@9
+debug_print::print_sbyte_pos8: scope:[debug_print]  from debug_print::@7
   [77] (signed byte) print_sbyte_at::b#11 ← (signed byte) debug_print::print_sbyte_pos8_sb#0
   [78] call print_sbyte_at 
-  to:debug_print::@10
-debug_print::@10: scope:[debug_print]  from debug_print::print_sbyte_pos8
+  to:debug_print::@8
+debug_print::@8: scope:[debug_print]  from debug_print::print_sbyte_pos8
   [79] (signed byte) debug_print::print_sbyte_pos9_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 5)
   to:debug_print::print_sbyte_pos9
-debug_print::print_sbyte_pos9: scope:[debug_print]  from debug_print::@10
+debug_print::print_sbyte_pos9: scope:[debug_print]  from debug_print::@8
   [80] (signed byte) print_sbyte_at::b#12 ← (signed byte) debug_print::print_sbyte_pos9_sb#0
   [81] call print_sbyte_at 
-  to:debug_print::@11
-debug_print::@11: scope:[debug_print]  from debug_print::print_sbyte_pos9
+  to:debug_print::@9
+debug_print::@9: scope:[debug_print]  from debug_print::print_sbyte_pos9
   [82] (signed byte) debug_print::print_sbyte_pos10_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 6)
   to:debug_print::print_sbyte_pos10
-debug_print::print_sbyte_pos10: scope:[debug_print]  from debug_print::@11
+debug_print::print_sbyte_pos10: scope:[debug_print]  from debug_print::@9
   [83] (signed byte) print_sbyte_at::b#13 ← (signed byte) debug_print::print_sbyte_pos10_sb#0
   [84] call print_sbyte_at 
-  to:debug_print::@12
-debug_print::@12: scope:[debug_print]  from debug_print::print_sbyte_pos10
+  to:debug_print::@10
+debug_print::@10: scope:[debug_print]  from debug_print::print_sbyte_pos10
   [85] (signed byte) debug_print::print_sbyte_pos11_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 7)
   to:debug_print::print_sbyte_pos11
-debug_print::print_sbyte_pos11: scope:[debug_print]  from debug_print::@12
+debug_print::print_sbyte_pos11: scope:[debug_print]  from debug_print::@10
   [86] (signed byte) print_sbyte_at::b#14 ← (signed byte) debug_print::print_sbyte_pos11_sb#0
   [87] call print_sbyte_at 
-  to:debug_print::@13
-debug_print::@13: scope:[debug_print]  from debug_print::print_sbyte_pos11
+  to:debug_print::@11
+debug_print::@11: scope:[debug_print]  from debug_print::print_sbyte_pos11
   [88] (signed byte) debug_print::print_sbyte_pos12_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 8)
   to:debug_print::print_sbyte_pos12
-debug_print::print_sbyte_pos12: scope:[debug_print]  from debug_print::@13
+debug_print::print_sbyte_pos12: scope:[debug_print]  from debug_print::@11
   [89] (signed byte) print_sbyte_at::b#15 ← (signed byte) debug_print::print_sbyte_pos12_sb#0
   [90] call print_sbyte_at 
   to:debug_print::@1
-debug_print::@1: scope:[debug_print]  from debug_print::@32 debug_print::print_sbyte_pos12
-  [91] (byte) debug_print::i#2 ← phi( debug_print::print_sbyte_pos12/(byte/signed byte/word/signed word/dword/signed dword) 0 debug_print::@32/(byte) debug_print::i#1 )
-  [91] (byte) debug_print::c#2 ← phi( debug_print::print_sbyte_pos12/(byte/signed byte/word/signed word/dword/signed dword) 4 debug_print::@32/(byte) debug_print::c#1 )
+debug_print::@1: scope:[debug_print]  from debug_print::@17 debug_print::print_sbyte_pos12
+  [91] (byte) debug_print::i#2 ← phi( debug_print::print_sbyte_pos12/(byte/signed byte/word/signed word/dword/signed dword) 0 debug_print::@17/(byte) debug_print::i#1 )
+  [91] (byte) debug_print::c#2 ← phi( debug_print::print_sbyte_pos12/(byte/signed byte/word/signed word/dword/signed dword) 4 debug_print::@17/(byte) debug_print::c#1 )
   [92] (byte*) print_sbyte_at::at#15 ← (const byte*) debug_print::at_line#0 + (byte) debug_print::c#2
   [93] (signed byte) print_sbyte_at::b#16 ← *((const signed byte[8]) xrs#0 + (byte) debug_print::i#2)
   [94] call print_sbyte_at 
-  to:debug_print::@27
-debug_print::@27: scope:[debug_print]  from debug_print::@1
+  to:debug_print::@12
+debug_print::@12: scope:[debug_print]  from debug_print::@1
   [95] (byte*) print_sbyte_at::at#16 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) debug_print::c#2
   [96] (signed byte) print_sbyte_at::b#17 ← *((const signed byte[8]) yrs#0 + (byte) debug_print::i#2)
   [97] call print_sbyte_at 
-  to:debug_print::@28
-debug_print::@28: scope:[debug_print]  from debug_print::@27
+  to:debug_print::@13
+debug_print::@13: scope:[debug_print]  from debug_print::@12
   [98] (byte*) print_sbyte_at::at#17 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) debug_print::c#2
   [99] (signed byte) print_sbyte_at::b#18 ← *((const signed byte[8]) zrs#0 + (byte) debug_print::i#2)
   [100] call print_sbyte_at 
-  to:debug_print::@29
-debug_print::@29: scope:[debug_print]  from debug_print::@28
+  to:debug_print::@14
+debug_print::@14: scope:[debug_print]  from debug_print::@13
   [101] (byte*) print_sbyte_at::at#18 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 3 + (byte) debug_print::c#2
   [102] (signed byte) print_sbyte_at::b#19 ← *((const signed byte[8]) pps#0 + (byte) debug_print::i#2)
   [103] call print_sbyte_at 
-  to:debug_print::@30
-debug_print::@30: scope:[debug_print]  from debug_print::@29
+  to:debug_print::@15
+debug_print::@15: scope:[debug_print]  from debug_print::@14
   [104] (byte*) print_sbyte_at::at#19 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 4 + (byte) debug_print::c#2
   [105] (signed byte) print_sbyte_at::b#20 ← *((const signed byte[8]) xps#0 + (byte) debug_print::i#2)
   [106] call print_sbyte_at 
-  to:debug_print::@31
-debug_print::@31: scope:[debug_print]  from debug_print::@30
+  to:debug_print::@16
+debug_print::@16: scope:[debug_print]  from debug_print::@15
   [107] (byte*) print_sbyte_at::at#20 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) debug_print::c#2
   [108] (signed byte) print_sbyte_at::b#21 ← *((const signed byte[8]) yps#0 + (byte) debug_print::i#2)
   [109] call print_sbyte_at 
-  to:debug_print::@32
-debug_print::@32: scope:[debug_print]  from debug_print::@31
+  to:debug_print::@17
+debug_print::@17: scope:[debug_print]  from debug_print::@16
   [110] (byte) debug_print::c#1 ← (byte) debug_print::c#2 + (byte/signed byte/word/signed word/dword/signed dword) 4
   [111] (byte) debug_print::i#1 ← ++ (byte) debug_print::i#2
   [112] if((byte) debug_print::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto debug_print::@1
   to:debug_print::@return
-debug_print::@return: scope:[debug_print]  from debug_print::@32
+debug_print::@return: scope:[debug_print]  from debug_print::@17
   [113] return 
   to:@return
-print_sbyte_at: scope:[print_sbyte_at]  from debug_print::@1 debug_print::@27 debug_print::@28 debug_print::@29 debug_print::@30 debug_print::@31 debug_print::print_sbyte_pos1 debug_print::print_sbyte_pos10 debug_print::print_sbyte_pos11 debug_print::print_sbyte_pos12 debug_print::print_sbyte_pos2 debug_print::print_sbyte_pos3 debug_print::print_sbyte_pos4 debug_print::print_sbyte_pos5 debug_print::print_sbyte_pos6 debug_print::print_sbyte_pos7 debug_print::print_sbyte_pos8 debug_print::print_sbyte_pos9 debug_print_init::@1 debug_print_init::@18 debug_print_init::@19
-  [114] (byte*) print_sbyte_at::at#21 ← phi( debug_print::@1/(byte*) print_sbyte_at::at#15 debug_print::@27/(byte*) print_sbyte_at::at#16 debug_print::@28/(byte*) print_sbyte_at::at#17 debug_print::@29/(byte*) print_sbyte_at::at#18 debug_print::@30/(byte*) print_sbyte_at::at#19 debug_print::@31/(byte*) print_sbyte_at::at#20 debug_print::print_sbyte_pos1/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos1_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos1_col#0 debug_print::print_sbyte_pos10/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos10_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos10_col#0 debug_print::print_sbyte_pos11/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos11_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos11_col#0 debug_print::print_sbyte_pos12/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos12_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos12_col#0 debug_print::print_sbyte_pos2/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos2_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos2_col#0 debug_print::print_sbyte_pos3/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos3_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos3_col#0 debug_print::print_sbyte_pos4/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos4_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos4_col#0 debug_print::print_sbyte_pos5/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos5_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos5_col#0 debug_print::print_sbyte_pos6/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos6_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos6_col#0 debug_print::print_sbyte_pos7/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos7_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos7_col#0 debug_print::print_sbyte_pos8/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos8_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos8_col#0 debug_print::print_sbyte_pos9/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos9_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos9_col#0 debug_print_init::@1/(byte*) print_sbyte_at::at#0 debug_print_init::@18/(byte*) print_sbyte_at::at#1 debug_print_init::@19/(byte*) print_sbyte_at::at#2 )
-  [114] (signed byte) print_sbyte_at::b#22 ← phi( debug_print::@1/(signed byte) print_sbyte_at::b#16 debug_print::@27/(signed byte) print_sbyte_at::b#17 debug_print::@28/(signed byte) print_sbyte_at::b#18 debug_print::@29/(signed byte) print_sbyte_at::b#19 debug_print::@30/(signed byte) print_sbyte_at::b#20 debug_print::@31/(signed byte) print_sbyte_at::b#21 debug_print::print_sbyte_pos1/(signed byte) print_sbyte_at::b#4 debug_print::print_sbyte_pos10/(signed byte) print_sbyte_at::b#13 debug_print::print_sbyte_pos11/(signed byte) print_sbyte_at::b#14 debug_print::print_sbyte_pos12/(signed byte) print_sbyte_at::b#15 debug_print::print_sbyte_pos2/(signed byte) print_sbyte_at::b#5 debug_print::print_sbyte_pos3/(const signed byte) sz#0 debug_print::print_sbyte_pos4/(signed byte) print_sbyte_at::b#7 debug_print::print_sbyte_pos5/(signed byte) print_sbyte_at::b#8 debug_print::print_sbyte_pos6/(signed byte) print_sbyte_at::b#9 debug_print::print_sbyte_pos7/(signed byte) print_sbyte_at::b#10 debug_print::print_sbyte_pos8/(signed byte) print_sbyte_at::b#11 debug_print::print_sbyte_pos9/(signed byte) print_sbyte_at::b#12 debug_print_init::@1/(signed byte) print_sbyte_at::b#1 debug_print_init::@18/(signed byte) print_sbyte_at::b#2 debug_print_init::@19/(signed byte) print_sbyte_at::b#3 )
+print_sbyte_at: scope:[print_sbyte_at]  from debug_print::@1 debug_print::@12 debug_print::@13 debug_print::@14 debug_print::@15 debug_print::@16 debug_print::print_sbyte_pos1 debug_print::print_sbyte_pos10 debug_print::print_sbyte_pos11 debug_print::print_sbyte_pos12 debug_print::print_sbyte_pos2 debug_print::print_sbyte_pos3 debug_print::print_sbyte_pos4 debug_print::print_sbyte_pos5 debug_print::print_sbyte_pos6 debug_print::print_sbyte_pos7 debug_print::print_sbyte_pos8 debug_print::print_sbyte_pos9 debug_print_init::@1 debug_print_init::@16 debug_print_init::@17
+  [114] (byte*) print_sbyte_at::at#21 ← phi( debug_print::@1/(byte*) print_sbyte_at::at#15 debug_print::@12/(byte*) print_sbyte_at::at#16 debug_print::@13/(byte*) print_sbyte_at::at#17 debug_print::@14/(byte*) print_sbyte_at::at#18 debug_print::@15/(byte*) print_sbyte_at::at#19 debug_print::@16/(byte*) print_sbyte_at::at#20 debug_print::print_sbyte_pos1/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos1_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos1_col#0 debug_print::print_sbyte_pos10/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos10_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos10_col#0 debug_print::print_sbyte_pos11/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos11_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos11_col#0 debug_print::print_sbyte_pos12/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos12_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos12_col#0 debug_print::print_sbyte_pos2/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos2_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos2_col#0 debug_print::print_sbyte_pos3/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos3_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos3_col#0 debug_print::print_sbyte_pos4/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos4_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos4_col#0 debug_print::print_sbyte_pos5/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos5_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos5_col#0 debug_print::print_sbyte_pos6/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos6_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos6_col#0 debug_print::print_sbyte_pos7/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos7_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos7_col#0 debug_print::print_sbyte_pos8/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos8_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos8_col#0 debug_print::print_sbyte_pos9/(const byte*) print_line_cursor#0+(const byte) debug_print::print_sbyte_pos9_row#0*(byte/signed byte/word/signed word/dword/signed dword) $28+(const byte) debug_print::print_sbyte_pos9_col#0 debug_print_init::@1/(byte*) print_sbyte_at::at#0 debug_print_init::@16/(byte*) print_sbyte_at::at#1 debug_print_init::@17/(byte*) print_sbyte_at::at#2 )
+  [114] (signed byte) print_sbyte_at::b#22 ← phi( debug_print::@1/(signed byte) print_sbyte_at::b#16 debug_print::@12/(signed byte) print_sbyte_at::b#17 debug_print::@13/(signed byte) print_sbyte_at::b#18 debug_print::@14/(signed byte) print_sbyte_at::b#19 debug_print::@15/(signed byte) print_sbyte_at::b#20 debug_print::@16/(signed byte) print_sbyte_at::b#21 debug_print::print_sbyte_pos1/(signed byte) print_sbyte_at::b#4 debug_print::print_sbyte_pos10/(signed byte) print_sbyte_at::b#13 debug_print::print_sbyte_pos11/(signed byte) print_sbyte_at::b#14 debug_print::print_sbyte_pos12/(signed byte) print_sbyte_at::b#15 debug_print::print_sbyte_pos2/(signed byte) print_sbyte_at::b#5 debug_print::print_sbyte_pos3/(const signed byte) sz#0 debug_print::print_sbyte_pos4/(signed byte) print_sbyte_at::b#7 debug_print::print_sbyte_pos5/(signed byte) print_sbyte_at::b#8 debug_print::print_sbyte_pos6/(signed byte) print_sbyte_at::b#9 debug_print::print_sbyte_pos7/(signed byte) print_sbyte_at::b#10 debug_print::print_sbyte_pos8/(signed byte) print_sbyte_at::b#11 debug_print::print_sbyte_pos9/(signed byte) print_sbyte_at::b#12 debug_print_init::@1/(signed byte) print_sbyte_at::b#1 debug_print_init::@16/(signed byte) print_sbyte_at::b#2 debug_print_init::@17/(signed byte) print_sbyte_at::b#3 )
   [115] if((signed byte) print_sbyte_at::b#22<(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sbyte_at::@1
   to:print_sbyte_at::@3
 print_sbyte_at::@3: scope:[print_sbyte_at]  from print_sbyte_at
   [116] (byte*) print_char_at::at#1 ← (byte*) print_sbyte_at::at#21
   [117] call print_char_at 
   to:print_sbyte_at::@2
-print_sbyte_at::@2: scope:[print_sbyte_at]  from print_sbyte_at::@3 print_sbyte_at::@5
-  [118] (signed byte) print_sbyte_at::b#24 ← phi( print_sbyte_at::@5/(signed byte) print_sbyte_at::b#0 print_sbyte_at::@3/(signed byte) print_sbyte_at::b#22 )
+print_sbyte_at::@2: scope:[print_sbyte_at]  from print_sbyte_at::@3 print_sbyte_at::@4
+  [118] (signed byte) print_sbyte_at::b#24 ← phi( print_sbyte_at::@4/(signed byte) print_sbyte_at::b#0 print_sbyte_at::@3/(signed byte) print_sbyte_at::b#22 )
   [119] (byte*) print_byte_at::at#0 ← (byte*) print_sbyte_at::at#21 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [120] call print_byte_at 
   to:print_sbyte_at::@return
@@ -3959,8 +4000,8 @@ print_sbyte_at::@return: scope:[print_sbyte_at]  from print_sbyte_at::@2
 print_sbyte_at::@1: scope:[print_sbyte_at]  from print_sbyte_at
   [122] (byte*) print_char_at::at#0 ← (byte*) print_sbyte_at::at#21
   [123] call print_char_at 
-  to:print_sbyte_at::@5
-print_sbyte_at::@5: scope:[print_sbyte_at]  from print_sbyte_at::@1
+  to:print_sbyte_at::@4
+print_sbyte_at::@4: scope:[print_sbyte_at]  from print_sbyte_at::@1
   [124] (signed byte) print_sbyte_at::b#0 ← - (signed byte) print_sbyte_at::b#22
   to:print_sbyte_at::@2
 print_char_at: scope:[print_char_at]  from print_byte_at print_byte_at::@1 print_sbyte_at::@1 print_sbyte_at::@3
@@ -3986,7 +4027,7 @@ print_byte_at::@1: scope:[print_byte_at]  from print_byte_at
 print_byte_at::@return: scope:[print_byte_at]  from print_byte_at::@1
   [136] return 
   to:@return
-rotate_matrix: scope:[rotate_matrix]  from anim::@15
+rotate_matrix: scope:[rotate_matrix]  from anim::@6
   [137] *((const signed byte*) xr#0) ← (signed byte) rotate_matrix::x#0
   [138] *((const signed byte*) yr#0) ← (signed byte) rotate_matrix::y#0
   [139] *((const signed byte*) zr#0) ← (signed byte) rotate_matrix::z#0
@@ -3995,13 +4036,13 @@ rotate_matrix: scope:[rotate_matrix]  from anim::@15
 rotate_matrix::@return: scope:[rotate_matrix]  from rotate_matrix
   [141] return 
   to:@return
-store_matrix: scope:[store_matrix]  from anim::@27
+store_matrix: scope:[store_matrix]  from anim::@8
   asm { ldarotation_matrix+0 starotate_matrix.A1+1 eor#$ff starotate_matrix.A2+1 ldarotation_matrix+1 starotate_matrix.B1+1 eor#$ff starotate_matrix.B2+1 ldarotation_matrix+2 starotate_matrix.C1+1 eor#$ff starotate_matrix.C2+1 ldarotation_matrix+3 starotate_matrix.D1+1 eor#$ff starotate_matrix.D2+1 ldarotation_matrix+4 starotate_matrix.E1+1 eor#$ff starotate_matrix.E2+1 ldarotation_matrix+5 starotate_matrix.F1+1 eor#$ff starotate_matrix.F2+1 ldarotation_matrix+6 starotate_matrix.G1+1 eor#$ff starotate_matrix.G2+1 ldarotation_matrix+7 starotate_matrix.H1+1 eor#$ff starotate_matrix.H2+1 ldarotation_matrix+8 starotate_matrix.I1+1 eor#$ff starotate_matrix.I2+1  }
   to:store_matrix::@return
 store_matrix::@return: scope:[store_matrix]  from store_matrix
   [143] return 
   to:@return
-calculate_matrix: scope:[calculate_matrix]  from anim::@14
+calculate_matrix: scope:[calculate_matrix]  from anim::@5
   [144] (signed byte) calculate_matrix::t1#0 ← (signed byte) calculate_matrix::sy#0 - (const signed byte) sz#0
   [145] (signed byte) calculate_matrix::t2#0 ← (signed byte) calculate_matrix::sy#0 + (const signed byte) sz#0
   [146] (signed byte) calculate_matrix::t3#0 ← (signed byte) calculate_matrix::sx#0 + (const signed byte) sz#0
@@ -4053,74 +4094,74 @@ calculate_matrix::@return: scope:[calculate_matrix]  from calculate_matrix
 debug_print_init: scope:[debug_print_init]  from main::@1
   [189] phi()
   [190] call print_cls 
-  to:debug_print_init::@5
-debug_print_init::@5: scope:[debug_print_init]  from debug_print_init
+  to:debug_print_init::@4
+debug_print_init::@4: scope:[debug_print_init]  from debug_print_init
   [191] phi()
   [192] call print_str_at 
-  to:debug_print_init::@6
-debug_print_init::@6: scope:[debug_print_init]  from debug_print_init::@5
+  to:debug_print_init::@5
+debug_print_init::@5: scope:[debug_print_init]  from debug_print_init::@4
   [193] phi()
   [194] call print_str_at 
-  to:debug_print_init::@7
-debug_print_init::@7: scope:[debug_print_init]  from debug_print_init::@6
+  to:debug_print_init::@6
+debug_print_init::@6: scope:[debug_print_init]  from debug_print_init::@5
   [195] phi()
   [196] call print_str_at 
-  to:debug_print_init::@8
-debug_print_init::@8: scope:[debug_print_init]  from debug_print_init::@7
+  to:debug_print_init::@7
+debug_print_init::@7: scope:[debug_print_init]  from debug_print_init::@6
   [197] phi()
   [198] call print_str_at 
-  to:debug_print_init::@9
-debug_print_init::@9: scope:[debug_print_init]  from debug_print_init::@8
+  to:debug_print_init::@8
+debug_print_init::@8: scope:[debug_print_init]  from debug_print_init::@7
   [199] phi()
   [200] call print_str_at 
-  to:debug_print_init::@10
-debug_print_init::@10: scope:[debug_print_init]  from debug_print_init::@9
+  to:debug_print_init::@9
+debug_print_init::@9: scope:[debug_print_init]  from debug_print_init::@8
   [201] phi()
   [202] call print_str_at 
-  to:debug_print_init::@11
-debug_print_init::@11: scope:[debug_print_init]  from debug_print_init::@10
+  to:debug_print_init::@10
+debug_print_init::@10: scope:[debug_print_init]  from debug_print_init::@9
   [203] phi()
   [204] call print_str_at 
-  to:debug_print_init::@12
-debug_print_init::@12: scope:[debug_print_init]  from debug_print_init::@11
+  to:debug_print_init::@11
+debug_print_init::@11: scope:[debug_print_init]  from debug_print_init::@10
   [205] phi()
   [206] call print_str_at 
-  to:debug_print_init::@13
-debug_print_init::@13: scope:[debug_print_init]  from debug_print_init::@12
+  to:debug_print_init::@12
+debug_print_init::@12: scope:[debug_print_init]  from debug_print_init::@11
   [207] phi()
   [208] call print_str_at 
-  to:debug_print_init::@14
-debug_print_init::@14: scope:[debug_print_init]  from debug_print_init::@13
+  to:debug_print_init::@13
+debug_print_init::@13: scope:[debug_print_init]  from debug_print_init::@12
   [209] phi()
   [210] call print_str_at 
-  to:debug_print_init::@15
-debug_print_init::@15: scope:[debug_print_init]  from debug_print_init::@14
+  to:debug_print_init::@14
+debug_print_init::@14: scope:[debug_print_init]  from debug_print_init::@13
   [211] phi()
   [212] call print_str_at 
-  to:debug_print_init::@16
-debug_print_init::@16: scope:[debug_print_init]  from debug_print_init::@15
+  to:debug_print_init::@15
+debug_print_init::@15: scope:[debug_print_init]  from debug_print_init::@14
   [213] phi()
   [214] call print_str_at 
   to:debug_print_init::@1
-debug_print_init::@1: scope:[debug_print_init]  from debug_print_init::@16 debug_print_init::@3
-  [215] (byte) debug_print_init::i#2 ← phi( debug_print_init::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 debug_print_init::@3/(byte) debug_print_init::i#1 )
-  [215] (byte) debug_print_init::c#2 ← phi( debug_print_init::@16/(byte/signed byte/word/signed word/dword/signed dword) 4 debug_print_init::@3/(byte) debug_print_init::c#1 )
+debug_print_init::@1: scope:[debug_print_init]  from debug_print_init::@15 debug_print_init::@3
+  [215] (byte) debug_print_init::i#2 ← phi( debug_print_init::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 debug_print_init::@3/(byte) debug_print_init::i#1 )
+  [215] (byte) debug_print_init::c#2 ← phi( debug_print_init::@15/(byte/signed byte/word/signed word/dword/signed dword) 4 debug_print_init::@3/(byte) debug_print_init::c#1 )
   [216] (byte*) print_sbyte_at::at#0 ← (const byte*) debug_print_init::at_line#0 + (byte) debug_print_init::c#2
   [217] (signed byte) print_sbyte_at::b#1 ← *((const signed byte[8]) xs#0 + (byte) debug_print_init::i#2)
   [218] call print_sbyte_at 
-  to:debug_print_init::@18
-debug_print_init::@18: scope:[debug_print_init]  from debug_print_init::@1
+  to:debug_print_init::@16
+debug_print_init::@16: scope:[debug_print_init]  from debug_print_init::@1
   [219] (byte*) print_sbyte_at::at#1 ← (const byte*) debug_print_init::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) debug_print_init::c#2
   [220] (signed byte) print_sbyte_at::b#2 ← *((const signed byte[8]) ys#0 + (byte) debug_print_init::i#2)
   [221] call print_sbyte_at 
-  to:debug_print_init::@19
-debug_print_init::@19: scope:[debug_print_init]  from debug_print_init::@18
+  to:debug_print_init::@17
+debug_print_init::@17: scope:[debug_print_init]  from debug_print_init::@16
   [222] (byte*) print_sbyte_at::at#2 ← (const byte*) debug_print_init::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) debug_print_init::c#2
   [223] (signed byte) print_sbyte_at::b#3 ← *((const signed byte[8]) zs#0 + (byte) debug_print_init::i#2)
   [224] call print_sbyte_at 
   to:debug_print_init::@2
-debug_print_init::@2: scope:[debug_print_init]  from debug_print_init::@19 debug_print_init::@2
-  [225] (byte) debug_print_init::j#2 ← phi( debug_print_init::@2/(byte) debug_print_init::j#1 debug_print_init::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+debug_print_init::@2: scope:[debug_print_init]  from debug_print_init::@17 debug_print_init::@2
+  [225] (byte) debug_print_init::j#2 ← phi( debug_print_init::@2/(byte) debug_print_init::j#1 debug_print_init::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [226] (byte) debug_print_init::col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 8 + (byte) debug_print_init::i#2
   [227] (byte*~) debug_print_init::$59 ← (const byte*) debug_print_init::at_cols#0 + (byte) debug_print_init::c#2
   [228] (byte*~) debug_print_init::$60 ← (byte*~) debug_print_init::$59 + (byte) debug_print_init::j#2
@@ -4160,9 +4201,9 @@ debug_print_init::@3: scope:[debug_print_init]  from debug_print_init::@2
 debug_print_init::@return: scope:[debug_print_init]  from debug_print_init::@3
   [259] return 
   to:@return
-print_str_at: scope:[print_str_at]  from debug_print_init::@10 debug_print_init::@11 debug_print_init::@12 debug_print_init::@13 debug_print_init::@14 debug_print_init::@15 debug_print_init::@16 debug_print_init::@5 debug_print_init::@6 debug_print_init::@7 debug_print_init::@8 debug_print_init::@9
-  [260] (byte*) print_str_at::at#15 ← phi( debug_print_init::@10/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $12 debug_print_init::@11/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13 debug_print_init::@12/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $14 debug_print_init::@13/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $15 debug_print_init::@14/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $16 debug_print_init::@15/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $17 debug_print_init::@16/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18 debug_print_init::@5/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@6/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@7/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@8/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $10 debug_print_init::@9/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $11 )
-  [260] (byte*) print_str_at::str#15 ← phi( debug_print_init::@10/(const string) debug_print_init::str5 debug_print_init::@11/(const string) debug_print_init::str6 debug_print_init::@12/(const string) debug_print_init::str7 debug_print_init::@13/(const string) debug_print_init::str8 debug_print_init::@14/(const string) debug_print_init::str9 debug_print_init::@15/(const string) debug_print_init::str10 debug_print_init::@16/(const string) debug_print_init::str11 debug_print_init::@5/(const string) debug_print_init::str debug_print_init::@6/(const string) debug_print_init::str1 debug_print_init::@7/(const string) debug_print_init::str2 debug_print_init::@8/(const string) debug_print_init::str3 debug_print_init::@9/(const string) debug_print_init::str4 )
+print_str_at: scope:[print_str_at]  from debug_print_init::@10 debug_print_init::@11 debug_print_init::@12 debug_print_init::@13 debug_print_init::@14 debug_print_init::@15 debug_print_init::@4 debug_print_init::@5 debug_print_init::@6 debug_print_init::@7 debug_print_init::@8 debug_print_init::@9
+  [260] (byte*) print_str_at::at#15 ← phi( debug_print_init::@9/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $12 debug_print_init::@10/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13 debug_print_init::@11/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $14 debug_print_init::@12/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $15 debug_print_init::@13/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $16 debug_print_init::@14/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $17 debug_print_init::@15/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18 debug_print_init::@4/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@5/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@6/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) $22 debug_print_init::@7/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $10 debug_print_init::@8/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $11 )
+  [260] (byte*) print_str_at::str#15 ← phi( debug_print_init::@9/(const string) debug_print_init::str5 debug_print_init::@10/(const string) debug_print_init::str6 debug_print_init::@11/(const string) debug_print_init::str7 debug_print_init::@12/(const string) debug_print_init::str8 debug_print_init::@13/(const string) debug_print_init::str9 debug_print_init::@14/(const string) debug_print_init::str10 debug_print_init::@15/(const string) debug_print_init::str11 debug_print_init::@4/(const string) debug_print_init::str debug_print_init::@5/(const string) debug_print_init::str1 debug_print_init::@6/(const string) debug_print_init::str2 debug_print_init::@7/(const string) debug_print_init::str3 debug_print_init::@8/(const string) debug_print_init::str4 )
   to:print_str_at::@1
 print_str_at::@1: scope:[print_str_at]  from print_str_at print_str_at::@2
   [261] (byte*) print_str_at::at#13 ← phi( print_str_at/(byte*) print_str_at::at#15 print_str_at::@2/(byte*) print_str_at::at#0 )
@@ -4203,12 +4244,12 @@ sprites_init::@return: scope:[sprites_init]  from sprites_init::@1
   [279] return 
   to:@return
 
-null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@32 blocks: debug_print::@32 debug_print::@31 debug_print::@30 debug_print::@29 debug_print::@28 debug_print::@27 debug_print::@1  in scope print_sbyte_at
-null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@32 blocks: debug_print::@32 debug_print::@31 debug_print::@30 debug_print::@29 debug_print::@28 debug_print::@27 debug_print::@1  in scope print_sbyte_at
-null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@32 blocks: debug_print::@32 debug_print::@31 debug_print::@30 debug_print::@29 debug_print::@28 debug_print::@27 debug_print::@1  in scope print_sbyte_at
-null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@32 blocks: debug_print::@32 debug_print::@31 debug_print::@30 debug_print::@29 debug_print::@28 debug_print::@27 debug_print::@1  in scope print_sbyte_at
-null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@32 blocks: debug_print::@32 debug_print::@31 debug_print::@30 debug_print::@29 debug_print::@28 debug_print::@27 debug_print::@1  in scope print_sbyte_at
-null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@32 blocks: debug_print::@32 debug_print::@31 debug_print::@30 debug_print::@29 debug_print::@28 debug_print::@27 debug_print::@1  in scope print_sbyte_at
+null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@17 blocks: debug_print::@17 debug_print::@16 debug_print::@15 debug_print::@14 debug_print::@13 debug_print::@12 debug_print::@1  in scope print_sbyte_at
+null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@17 blocks: debug_print::@17 debug_print::@16 debug_print::@15 debug_print::@14 debug_print::@13 debug_print::@12 debug_print::@1  in scope print_sbyte_at
+null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@17 blocks: debug_print::@17 debug_print::@16 debug_print::@15 debug_print::@14 debug_print::@13 debug_print::@12 debug_print::@1  in scope print_sbyte_at
+null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@17 blocks: debug_print::@17 debug_print::@16 debug_print::@15 debug_print::@14 debug_print::@13 debug_print::@12 debug_print::@1  in scope print_sbyte_at
+null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@17 blocks: debug_print::@17 debug_print::@16 debug_print::@15 debug_print::@14 debug_print::@13 debug_print::@12 debug_print::@1  in scope print_sbyte_at
+null depth in calling loop Loop head: debug_print::@1 tails: debug_print::@17 blocks: debug_print::@17 debug_print::@16 debug_print::@15 debug_print::@14 debug_print::@13 debug_print::@12 debug_print::@1  in scope print_sbyte_at
 
 VARIABLE REGISTER WEIGHTS
 (byte*) BGCOL
@@ -4947,9 +4988,9 @@ INITIAL ASM
   .label sy = 3
 //SEG3 @begin
 bbegin:
-  jmp b33
-//SEG4 @33
-b33:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) mulf_sqr1#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((i*i)/256) }     	.if(i>159 && i<=351 ) { .byte round(((i-256)*(i-256))/256) }     	.if(i>351) { .byte round(((512-i)*(512-i))/256) }     }  }}
 //SEG6 kickasm(location (const byte*) mulf_sqr2#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((-i-1)*(-i-1)/256) }     	.if(i>159 && i<=351 ) { .byte round(((255-i)*(255-i))/256) }     	.if(i>351) { .byte round(((i-511)*(i-511))/256) }       }  }}
 //SEG7 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
@@ -4964,8 +5005,8 @@ b33:
 //SEG14 kickasm(location (const byte*) SINQ_HI#0) {{ {     .var min = -$1000     .var max = $1000     .var ampl = max-min;     .for(var i=0;i<$140;i++) {         .var rad = i*2*PI/256;         .byte >(min+(ampl/2)+(ampl/2)*sin(rad))     }     }  }}
 //SEG15 [11] call main 
   jsr main
-//SEG16 [12] phi from @33 to @end [phi:@33->@end]
-bend_from_b33:
+//SEG16 [12] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG17 @end
 bend:
@@ -5027,30 +5068,30 @@ anim: {
   //signed byte xmax = 0;
   //SEG36 anim::@1
   b1:
-    jmp b6
-  //SEG37 anim::@6
-  b6:
-  //SEG38 [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG37 anim::@2
+  b2:
+  //SEG38 [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b9
-  //SEG39 anim::@9
-  b9:
-  //SEG40 [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@9 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b2
+    jmp b3
+  //SEG39 anim::@3
+  b3:
+  //SEG40 [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b9
-    jmp b12
-  //SEG41 anim::@12
-  b12:
-  //SEG42 [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@12 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b3
+    jmp b4
+  //SEG41 anim::@4
+  b4:
+  //SEG42 [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fd
     cmp RASTER
-    bne b12
-    jmp b14
-  //SEG43 anim::@14
-  b14:
+    bne b4
+    jmp b5
+  //SEG43 anim::@5
+  b5:
   //SEG44 [26] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG45 [27] (signed byte) calculate_matrix::sx#0 ← (signed byte) sx#10 -- vbsz1=vbsz2 
@@ -5061,25 +5102,25 @@ anim: {
     sta calculate_matrix.sy
   //SEG47 [29] call calculate_matrix 
     jsr calculate_matrix
-  //SEG48 [30] phi from anim::@14 to anim::@27 [phi:anim::@14->anim::@27]
-  b27_from_b14:
-    jmp b27
-  //SEG49 anim::@27
-  b27:
+  //SEG48 [30] phi from anim::@5 to anim::@8 [phi:anim::@5->anim::@8]
+  b8_from_b5:
+    jmp b8
+  //SEG49 anim::@8
+  b8:
   //SEG50 [31] call store_matrix 
     jsr store_matrix
-  //SEG51 [32] phi from anim::@27 to anim::@15 [phi:anim::@27->anim::@15]
-  b15_from_b27:
-  //SEG52 [32] phi (byte) anim::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@27->anim::@15#0] -- vbuz1=vbuc1 
+  //SEG51 [32] phi from anim::@8 to anim::@6 [phi:anim::@8->anim::@6]
+  b6_from_b8:
+  //SEG52 [32] phi (byte) anim::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@6#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b15
-  //SEG53 [32] phi from anim::@29 to anim::@15 [phi:anim::@29->anim::@15]
-  b15_from_b29:
-  //SEG54 [32] phi (byte) anim::i#2 = (byte) anim::i#1 [phi:anim::@29->anim::@15#0] -- register_copy 
-    jmp b15
-  //SEG55 anim::@15
-  b15:
+    jmp b6
+  //SEG53 [32] phi from anim::@9 to anim::@6 [phi:anim::@9->anim::@6]
+  b6_from_b9:
+  //SEG54 [32] phi (byte) anim::i#2 = (byte) anim::i#1 [phi:anim::@9->anim::@6#0] -- register_copy 
+    jmp b6
+  //SEG55 anim::@6
+  b6:
   //SEG56 [33] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG57 [34] (signed byte) rotate_matrix::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#2) -- vbsz1=pbsc1_derefidx_vbuz2 
@@ -5096,9 +5137,9 @@ anim: {
     sta rotate_matrix.z
   //SEG60 [37] call rotate_matrix 
     jsr rotate_matrix
-    jmp b29
-  //SEG61 anim::@29
-  b29:
+    jmp b9
+  //SEG61 anim::@9
+  b9:
   //SEG62 [38] *((const signed byte[8]) xrs#0 + (byte) anim::i#2) ← *((const signed byte*) xr#0) -- pbsc1_derefidx_vbuz1=_deref_pbsc2 
     //if(*xr<xmin) xmin = *xr;
     //if(*xr>xmax) xmax = *xr;
@@ -5149,21 +5190,21 @@ anim: {
     sta SPRITES_YPOS,y
   //SEG73 [49] (byte) anim::i#1 ← ++ (byte) anim::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG74 [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@15 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG74 [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    bne b15_from_b29
-    jmp b16
-  //SEG75 anim::@16
-  b16:
+    bne b6_from_b9
+    jmp b7
+  //SEG75 anim::@7
+  b7:
   //SEG76 [51] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_GREY#0 -- _deref_pbuc1=vbuc2 
     lda #LIGHT_GREY
     sta BORDERCOL
   //SEG77 [52] call debug_print 
     jsr debug_print
-    jmp b30
-  //SEG78 anim::@30
-  b30:
+    jmp b10
+  //SEG78 anim::@10
+  b10:
   //SEG79 [53] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0 -- _deref_pbuc1=vbuc2 
     lda #LIGHT_BLUE
     sta BORDERCOL
@@ -5176,10 +5217,10 @@ anim: {
     sec
     sbc #3
     sta sy
-  //SEG82 [22] phi from anim::@30 to anim::@1 [phi:anim::@30->anim::@1]
-  b1_from_b30:
-  //SEG83 [22] phi (signed byte) sy#10 = (signed byte) sy#3 [phi:anim::@30->anim::@1#0] -- register_copy 
-  //SEG84 [22] phi (signed byte) sx#10 = (signed byte) sx#3 [phi:anim::@30->anim::@1#1] -- register_copy 
+  //SEG82 [22] phi from anim::@10 to anim::@1 [phi:anim::@10->anim::@1]
+  b1_from_b10:
+  //SEG83 [22] phi (signed byte) sy#10 = (signed byte) sy#3 [phi:anim::@10->anim::@1#0] -- register_copy 
+  //SEG84 [22] phi (signed byte) sx#10 = (signed byte) sx#3 [phi:anim::@10->anim::@1#1] -- register_copy 
     jmp b1
 }
 //SEG85 debug_print
@@ -5241,9 +5282,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG92 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#4 [phi:debug_print::print_sbyte_pos1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b3
-  //SEG93 debug_print::@3
-  b3:
+    jmp b2
+  //SEG93 debug_print::@2
+  b2:
   //SEG94 [59] (signed byte) debug_print::print_sbyte_pos2_sb#0 ← (signed byte) sy#10 -- vbsz1=vbsz2 
     lda sy
     sta print_sbyte_pos2_sb
@@ -5280,9 +5321,9 @@ debug_print: {
     lda #sz
     sta print_sbyte_at.b
     jsr print_sbyte_at
-    jmp b5
-  //SEG107 debug_print::@5
-  b5:
+    jmp b3
+  //SEG107 debug_print::@3
+  b3:
   //SEG108 [64] (signed byte) debug_print::print_sbyte_pos4_sb#0 ← *((const signed byte[9]) rotation_matrix#0) -- vbsz1=_deref_pbsc1 
     lda rotation_matrix
     sta print_sbyte_pos4_sb
@@ -5302,9 +5343,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG114 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#7 [phi:debug_print::print_sbyte_pos4->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b6
-  //SEG115 debug_print::@6
-  b6:
+    jmp b4
+  //SEG115 debug_print::@4
+  b4:
   //SEG116 [67] (signed byte) debug_print::print_sbyte_pos5_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 1) -- vbsz1=_deref_pbsc1 
     lda rotation_matrix+1
     sta print_sbyte_pos5_sb
@@ -5324,9 +5365,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG122 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#8 [phi:debug_print::print_sbyte_pos5->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b7
-  //SEG123 debug_print::@7
-  b7:
+    jmp b5
+  //SEG123 debug_print::@5
+  b5:
   //SEG124 [70] (signed byte) debug_print::print_sbyte_pos6_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 2) -- vbsz1=_deref_pbsc1 
     lda rotation_matrix+2
     sta print_sbyte_pos6_sb
@@ -5346,9 +5387,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG130 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#9 [phi:debug_print::print_sbyte_pos6->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b8
-  //SEG131 debug_print::@8
-  b8:
+    jmp b6
+  //SEG131 debug_print::@6
+  b6:
   //SEG132 [73] (signed byte) debug_print::print_sbyte_pos7_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 3) -- vbsz1=_deref_pbsc1 
     lda rotation_matrix+3
     sta print_sbyte_pos7_sb
@@ -5368,9 +5409,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG138 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#10 [phi:debug_print::print_sbyte_pos7->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b9
-  //SEG139 debug_print::@9
-  b9:
+    jmp b7
+  //SEG139 debug_print::@7
+  b7:
   //SEG140 [76] (signed byte) debug_print::print_sbyte_pos8_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 4) -- vbsz1=_deref_pbsc1 
     lda rotation_matrix+4
     sta print_sbyte_pos8_sb
@@ -5390,9 +5431,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG146 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#11 [phi:debug_print::print_sbyte_pos8->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b10
-  //SEG147 debug_print::@10
-  b10:
+    jmp b8
+  //SEG147 debug_print::@8
+  b8:
   //SEG148 [79] (signed byte) debug_print::print_sbyte_pos9_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 5) -- vbsz1=_deref_pbsc1 
     lda rotation_matrix+5
     sta print_sbyte_pos9_sb
@@ -5412,9 +5453,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG154 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#12 [phi:debug_print::print_sbyte_pos9->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b11
-  //SEG155 debug_print::@11
-  b11:
+    jmp b9
+  //SEG155 debug_print::@9
+  b9:
   //SEG156 [82] (signed byte) debug_print::print_sbyte_pos10_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 6) -- vbsz1=_deref_pbsc1 
     lda rotation_matrix+6
     sta print_sbyte_pos10_sb
@@ -5434,9 +5475,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG162 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#13 [phi:debug_print::print_sbyte_pos10->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b12
-  //SEG163 debug_print::@12
-  b12:
+    jmp b10
+  //SEG163 debug_print::@10
+  b10:
   //SEG164 [85] (signed byte) debug_print::print_sbyte_pos11_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 7) -- vbsz1=_deref_pbsc1 
     lda rotation_matrix+7
     sta print_sbyte_pos11_sb
@@ -5456,9 +5497,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG170 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#14 [phi:debug_print::print_sbyte_pos11->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b13
-  //SEG171 debug_print::@13
-  b13:
+    jmp b11
+  //SEG171 debug_print::@11
+  b11:
   //SEG172 [88] (signed byte) debug_print::print_sbyte_pos12_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 8) -- vbsz1=_deref_pbsc1 
     lda rotation_matrix+8
     sta print_sbyte_pos12_sb
@@ -5487,10 +5528,10 @@ debug_print: {
     lda #4
     sta c
     jmp b1
-  //SEG182 [91] phi from debug_print::@32 to debug_print::@1 [phi:debug_print::@32->debug_print::@1]
-  b1_from_b32:
-  //SEG183 [91] phi (byte) debug_print::i#2 = (byte) debug_print::i#1 [phi:debug_print::@32->debug_print::@1#0] -- register_copy 
-  //SEG184 [91] phi (byte) debug_print::c#2 = (byte) debug_print::c#1 [phi:debug_print::@32->debug_print::@1#1] -- register_copy 
+  //SEG182 [91] phi from debug_print::@17 to debug_print::@1 [phi:debug_print::@17->debug_print::@1]
+  b1_from_b17:
+  //SEG183 [91] phi (byte) debug_print::i#2 = (byte) debug_print::i#1 [phi:debug_print::@17->debug_print::@1#0] -- register_copy 
+  //SEG184 [91] phi (byte) debug_print::c#2 = (byte) debug_print::c#1 [phi:debug_print::@17->debug_print::@1#1] -- register_copy 
     jmp b1
   //SEG185 debug_print::@1
   b1:
@@ -5512,9 +5553,9 @@ debug_print: {
   //SEG190 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#15 [phi:debug_print::@1->print_sbyte_at#0] -- register_copy 
   //SEG191 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#16 [phi:debug_print::@1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b27
-  //SEG192 debug_print::@27
-  b27:
+    jmp b12
+  //SEG192 debug_print::@12
+  b12:
   //SEG193 [95] (byte*) print_sbyte_at::at#16 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -5528,14 +5569,14 @@ debug_print: {
     lda yrs,y
     sta print_sbyte_at.b
   //SEG195 [97] call print_sbyte_at 
-  //SEG196 [114] phi from debug_print::@27 to print_sbyte_at [phi:debug_print::@27->print_sbyte_at]
-  print_sbyte_at_from_b27:
-  //SEG197 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#16 [phi:debug_print::@27->print_sbyte_at#0] -- register_copy 
-  //SEG198 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#17 [phi:debug_print::@27->print_sbyte_at#1] -- register_copy 
+  //SEG196 [114] phi from debug_print::@12 to print_sbyte_at [phi:debug_print::@12->print_sbyte_at]
+  print_sbyte_at_from_b12:
+  //SEG197 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#16 [phi:debug_print::@12->print_sbyte_at#0] -- register_copy 
+  //SEG198 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#17 [phi:debug_print::@12->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b28
-  //SEG199 debug_print::@28
-  b28:
+    jmp b13
+  //SEG199 debug_print::@13
+  b13:
   //SEG200 [98] (byte*) print_sbyte_at::at#17 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -5549,14 +5590,14 @@ debug_print: {
     lda zrs,y
     sta print_sbyte_at.b
   //SEG202 [100] call print_sbyte_at 
-  //SEG203 [114] phi from debug_print::@28 to print_sbyte_at [phi:debug_print::@28->print_sbyte_at]
-  print_sbyte_at_from_b28:
-  //SEG204 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#17 [phi:debug_print::@28->print_sbyte_at#0] -- register_copy 
-  //SEG205 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#18 [phi:debug_print::@28->print_sbyte_at#1] -- register_copy 
+  //SEG203 [114] phi from debug_print::@13 to print_sbyte_at [phi:debug_print::@13->print_sbyte_at]
+  print_sbyte_at_from_b13:
+  //SEG204 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#17 [phi:debug_print::@13->print_sbyte_at#0] -- register_copy 
+  //SEG205 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#18 [phi:debug_print::@13->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b29
-  //SEG206 debug_print::@29
-  b29:
+    jmp b14
+  //SEG206 debug_print::@14
+  b14:
   //SEG207 [101] (byte*) print_sbyte_at::at#18 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 3 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -5570,14 +5611,14 @@ debug_print: {
     lda pps,y
     sta print_sbyte_at.b
   //SEG209 [103] call print_sbyte_at 
-  //SEG210 [114] phi from debug_print::@29 to print_sbyte_at [phi:debug_print::@29->print_sbyte_at]
-  print_sbyte_at_from_b29:
-  //SEG211 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#18 [phi:debug_print::@29->print_sbyte_at#0] -- register_copy 
-  //SEG212 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#19 [phi:debug_print::@29->print_sbyte_at#1] -- register_copy 
+  //SEG210 [114] phi from debug_print::@14 to print_sbyte_at [phi:debug_print::@14->print_sbyte_at]
+  print_sbyte_at_from_b14:
+  //SEG211 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#18 [phi:debug_print::@14->print_sbyte_at#0] -- register_copy 
+  //SEG212 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#19 [phi:debug_print::@14->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b30
-  //SEG213 debug_print::@30
-  b30:
+    jmp b15
+  //SEG213 debug_print::@15
+  b15:
   //SEG214 [104] (byte*) print_sbyte_at::at#19 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 4 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -5591,14 +5632,14 @@ debug_print: {
     lda xps,y
     sta print_sbyte_at.b
   //SEG216 [106] call print_sbyte_at 
-  //SEG217 [114] phi from debug_print::@30 to print_sbyte_at [phi:debug_print::@30->print_sbyte_at]
-  print_sbyte_at_from_b30:
-  //SEG218 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#19 [phi:debug_print::@30->print_sbyte_at#0] -- register_copy 
-  //SEG219 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#20 [phi:debug_print::@30->print_sbyte_at#1] -- register_copy 
+  //SEG217 [114] phi from debug_print::@15 to print_sbyte_at [phi:debug_print::@15->print_sbyte_at]
+  print_sbyte_at_from_b15:
+  //SEG218 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#19 [phi:debug_print::@15->print_sbyte_at#0] -- register_copy 
+  //SEG219 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#20 [phi:debug_print::@15->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b31
-  //SEG220 debug_print::@31
-  b31:
+    jmp b16
+  //SEG220 debug_print::@16
+  b16:
   //SEG221 [107] (byte*) print_sbyte_at::at#20 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -5612,14 +5653,14 @@ debug_print: {
     lda yps,y
     sta print_sbyte_at.b
   //SEG223 [109] call print_sbyte_at 
-  //SEG224 [114] phi from debug_print::@31 to print_sbyte_at [phi:debug_print::@31->print_sbyte_at]
-  print_sbyte_at_from_b31:
-  //SEG225 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#20 [phi:debug_print::@31->print_sbyte_at#0] -- register_copy 
-  //SEG226 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#21 [phi:debug_print::@31->print_sbyte_at#1] -- register_copy 
+  //SEG224 [114] phi from debug_print::@16 to print_sbyte_at [phi:debug_print::@16->print_sbyte_at]
+  print_sbyte_at_from_b16:
+  //SEG225 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#20 [phi:debug_print::@16->print_sbyte_at#0] -- register_copy 
+  //SEG226 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#21 [phi:debug_print::@16->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b32
-  //SEG227 debug_print::@32
-  b32:
+    jmp b17
+  //SEG227 debug_print::@17
+  b17:
   //SEG228 [110] (byte) debug_print::c#1 ← (byte) debug_print::c#2 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax c
     axs #-[4]
@@ -5629,7 +5670,7 @@ debug_print: {
   //SEG230 [112] if((byte) debug_print::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto debug_print::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    bne b1_from_b32
+    bne b1_from_b17
     jmp breturn
   //SEG231 debug_print::@return
   breturn:
@@ -5661,10 +5702,10 @@ print_sbyte_at: {
     lda #' '
     sta print_char_at.ch
     jsr print_char_at
-  //SEG241 [118] phi from print_sbyte_at::@3 print_sbyte_at::@5 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2]
+  //SEG241 [118] phi from print_sbyte_at::@3 print_sbyte_at::@4 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG242 [118] phi (signed byte) print_sbyte_at::b#24 = (signed byte) print_sbyte_at::b#22 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG242 [118] phi (signed byte) print_sbyte_at::b#24 = (signed byte) print_sbyte_at::b#22 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2#0] -- register_copy 
     jmp b2
   //SEG243 print_sbyte_at::@2
   b2:
@@ -5698,16 +5739,16 @@ print_sbyte_at: {
     lda #'-'
     sta print_char_at.ch
     jsr print_char_at
-    jmp b5
-  //SEG254 print_sbyte_at::@5
-  b5:
+    jmp b4
+  //SEG254 print_sbyte_at::@4
+  b4:
   //SEG255 [124] (signed byte) print_sbyte_at::b#0 ← - (signed byte) print_sbyte_at::b#22 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG256 print_char_at
 // Print a single char
@@ -6256,240 +6297,240 @@ debug_print_init: {
   //SEG338 [267] phi from debug_print_init to print_cls [phi:debug_print_init->print_cls]
   print_cls_from_debug_print_init:
     jsr print_cls
-  //SEG339 [191] phi from debug_print_init to debug_print_init::@5 [phi:debug_print_init->debug_print_init::@5]
-  b5_from_debug_print_init:
-    jmp b5
-  //SEG340 debug_print_init::@5
-  b5:
+  //SEG339 [191] phi from debug_print_init to debug_print_init::@4 [phi:debug_print_init->debug_print_init::@4]
+  b4_from_debug_print_init:
+    jmp b4
+  //SEG340 debug_print_init::@4
+  b4:
   //SEG341 [192] call print_str_at 
-  //SEG342 [260] phi from debug_print_init::@5 to print_str_at [phi:debug_print_init::@5->print_str_at]
-  print_str_at_from_b5:
-  //SEG343 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@5->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG342 [260] phi from debug_print_init::@4 to print_str_at [phi:debug_print_init::@4->print_str_at]
+  print_str_at_from_b4:
+  //SEG343 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@4->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$22
     sta print_str_at.at
     lda #>SCREEN+$22
     sta print_str_at.at+1
-  //SEG344 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str [phi:debug_print_init::@5->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG344 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str [phi:debug_print_init::@4->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str_at.str
     lda #>str
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG345 [193] phi from debug_print_init::@5 to debug_print_init::@6 [phi:debug_print_init::@5->debug_print_init::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG346 debug_print_init::@6
-  b6:
+  //SEG345 [193] phi from debug_print_init::@4 to debug_print_init::@5 [phi:debug_print_init::@4->debug_print_init::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG346 debug_print_init::@5
+  b5:
   //SEG347 [194] call print_str_at 
-  //SEG348 [260] phi from debug_print_init::@6 to print_str_at [phi:debug_print_init::@6->print_str_at]
-  print_str_at_from_b6:
-  //SEG349 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@6->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG348 [260] phi from debug_print_init::@5 to print_str_at [phi:debug_print_init::@5->print_str_at]
+  print_str_at_from_b5:
+  //SEG349 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@5->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*1+$22
     sta print_str_at.at
     lda #>SCREEN+$28*1+$22
     sta print_str_at.at+1
-  //SEG350 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str1 [phi:debug_print_init::@6->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG350 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str1 [phi:debug_print_init::@5->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str_at.str
     lda #>str1
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG351 [195] phi from debug_print_init::@6 to debug_print_init::@7 [phi:debug_print_init::@6->debug_print_init::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG352 debug_print_init::@7
-  b7:
+  //SEG351 [195] phi from debug_print_init::@5 to debug_print_init::@6 [phi:debug_print_init::@5->debug_print_init::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG352 debug_print_init::@6
+  b6:
   //SEG353 [196] call print_str_at 
-  //SEG354 [260] phi from debug_print_init::@7 to print_str_at [phi:debug_print_init::@7->print_str_at]
-  print_str_at_from_b7:
-  //SEG355 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@7->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG354 [260] phi from debug_print_init::@6 to print_str_at [phi:debug_print_init::@6->print_str_at]
+  print_str_at_from_b6:
+  //SEG355 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@6->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*2+$22
     sta print_str_at.at
     lda #>SCREEN+$28*2+$22
     sta print_str_at.at+1
-  //SEG356 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str2 [phi:debug_print_init::@7->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG356 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str2 [phi:debug_print_init::@6->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str_at.str
     lda #>str2
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG357 [197] phi from debug_print_init::@7 to debug_print_init::@8 [phi:debug_print_init::@7->debug_print_init::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG358 debug_print_init::@8
-  b8:
+  //SEG357 [197] phi from debug_print_init::@6 to debug_print_init::@7 [phi:debug_print_init::@6->debug_print_init::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG358 debug_print_init::@7
+  b7:
   //SEG359 [198] call print_str_at 
-  //SEG360 [260] phi from debug_print_init::@8 to print_str_at [phi:debug_print_init::@8->print_str_at]
-  print_str_at_from_b8:
-  //SEG361 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:debug_print_init::@8->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG360 [260] phi from debug_print_init::@7 to print_str_at [phi:debug_print_init::@7->print_str_at]
+  print_str_at_from_b7:
+  //SEG361 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:debug_print_init::@7->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$10
     sta print_str_at.at
     lda #>SCREEN+$28*$10
     sta print_str_at.at+1
-  //SEG362 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str3 [phi:debug_print_init::@8->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG362 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str3 [phi:debug_print_init::@7->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str3
     sta print_str_at.str
     lda #>str3
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG363 [199] phi from debug_print_init::@8 to debug_print_init::@9 [phi:debug_print_init::@8->debug_print_init::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG364 debug_print_init::@9
-  b9:
+  //SEG363 [199] phi from debug_print_init::@7 to debug_print_init::@8 [phi:debug_print_init::@7->debug_print_init::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG364 debug_print_init::@8
+  b8:
   //SEG365 [200] call print_str_at 
-  //SEG366 [260] phi from debug_print_init::@9 to print_str_at [phi:debug_print_init::@9->print_str_at]
-  print_str_at_from_b9:
-  //SEG367 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $11 [phi:debug_print_init::@9->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG366 [260] phi from debug_print_init::@8 to print_str_at [phi:debug_print_init::@8->print_str_at]
+  print_str_at_from_b8:
+  //SEG367 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $11 [phi:debug_print_init::@8->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$11
     sta print_str_at.at
     lda #>SCREEN+$28*$11
     sta print_str_at.at+1
-  //SEG368 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str4 [phi:debug_print_init::@9->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG368 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str4 [phi:debug_print_init::@8->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str4
     sta print_str_at.str
     lda #>str4
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG369 [201] phi from debug_print_init::@9 to debug_print_init::@10 [phi:debug_print_init::@9->debug_print_init::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG370 debug_print_init::@10
-  b10:
+  //SEG369 [201] phi from debug_print_init::@8 to debug_print_init::@9 [phi:debug_print_init::@8->debug_print_init::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG370 debug_print_init::@9
+  b9:
   //SEG371 [202] call print_str_at 
-  //SEG372 [260] phi from debug_print_init::@10 to print_str_at [phi:debug_print_init::@10->print_str_at]
-  print_str_at_from_b10:
-  //SEG373 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $12 [phi:debug_print_init::@10->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG372 [260] phi from debug_print_init::@9 to print_str_at [phi:debug_print_init::@9->print_str_at]
+  print_str_at_from_b9:
+  //SEG373 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $12 [phi:debug_print_init::@9->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$12
     sta print_str_at.at
     lda #>SCREEN+$28*$12
     sta print_str_at.at+1
-  //SEG374 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str5 [phi:debug_print_init::@10->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG374 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str5 [phi:debug_print_init::@9->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str5
     sta print_str_at.str
     lda #>str5
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG375 [203] phi from debug_print_init::@10 to debug_print_init::@11 [phi:debug_print_init::@10->debug_print_init::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG376 debug_print_init::@11
-  b11:
+  //SEG375 [203] phi from debug_print_init::@9 to debug_print_init::@10 [phi:debug_print_init::@9->debug_print_init::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG376 debug_print_init::@10
+  b10:
   //SEG377 [204] call print_str_at 
-  //SEG378 [260] phi from debug_print_init::@11 to print_str_at [phi:debug_print_init::@11->print_str_at]
-  print_str_at_from_b11:
-  //SEG379 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13 [phi:debug_print_init::@11->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG378 [260] phi from debug_print_init::@10 to print_str_at [phi:debug_print_init::@10->print_str_at]
+  print_str_at_from_b10:
+  //SEG379 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13 [phi:debug_print_init::@10->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$13
     sta print_str_at.at
     lda #>SCREEN+$28*$13
     sta print_str_at.at+1
-  //SEG380 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str6 [phi:debug_print_init::@11->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG380 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str6 [phi:debug_print_init::@10->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str6
     sta print_str_at.str
     lda #>str6
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG381 [205] phi from debug_print_init::@11 to debug_print_init::@12 [phi:debug_print_init::@11->debug_print_init::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG382 debug_print_init::@12
-  b12:
+  //SEG381 [205] phi from debug_print_init::@10 to debug_print_init::@11 [phi:debug_print_init::@10->debug_print_init::@11]
+  b11_from_b10:
+    jmp b11
+  //SEG382 debug_print_init::@11
+  b11:
   //SEG383 [206] call print_str_at 
-  //SEG384 [260] phi from debug_print_init::@12 to print_str_at [phi:debug_print_init::@12->print_str_at]
-  print_str_at_from_b12:
-  //SEG385 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:debug_print_init::@12->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG384 [260] phi from debug_print_init::@11 to print_str_at [phi:debug_print_init::@11->print_str_at]
+  print_str_at_from_b11:
+  //SEG385 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:debug_print_init::@11->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$14
     sta print_str_at.at
     lda #>SCREEN+$28*$14
     sta print_str_at.at+1
-  //SEG386 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str7 [phi:debug_print_init::@12->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG386 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str7 [phi:debug_print_init::@11->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str7
     sta print_str_at.str
     lda #>str7
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG387 [207] phi from debug_print_init::@12 to debug_print_init::@13 [phi:debug_print_init::@12->debug_print_init::@13]
-  b13_from_b12:
-    jmp b13
-  //SEG388 debug_print_init::@13
-  b13:
+  //SEG387 [207] phi from debug_print_init::@11 to debug_print_init::@12 [phi:debug_print_init::@11->debug_print_init::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG388 debug_print_init::@12
+  b12:
   //SEG389 [208] call print_str_at 
-  //SEG390 [260] phi from debug_print_init::@13 to print_str_at [phi:debug_print_init::@13->print_str_at]
-  print_str_at_from_b13:
-  //SEG391 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $15 [phi:debug_print_init::@13->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG390 [260] phi from debug_print_init::@12 to print_str_at [phi:debug_print_init::@12->print_str_at]
+  print_str_at_from_b12:
+  //SEG391 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $15 [phi:debug_print_init::@12->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$15
     sta print_str_at.at
     lda #>SCREEN+$28*$15
     sta print_str_at.at+1
-  //SEG392 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str8 [phi:debug_print_init::@13->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG392 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str8 [phi:debug_print_init::@12->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str8
     sta print_str_at.str
     lda #>str8
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG393 [209] phi from debug_print_init::@13 to debug_print_init::@14 [phi:debug_print_init::@13->debug_print_init::@14]
-  b14_from_b13:
-    jmp b14
-  //SEG394 debug_print_init::@14
-  b14:
+  //SEG393 [209] phi from debug_print_init::@12 to debug_print_init::@13 [phi:debug_print_init::@12->debug_print_init::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG394 debug_print_init::@13
+  b13:
   //SEG395 [210] call print_str_at 
-  //SEG396 [260] phi from debug_print_init::@14 to print_str_at [phi:debug_print_init::@14->print_str_at]
-  print_str_at_from_b14:
-  //SEG397 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $16 [phi:debug_print_init::@14->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG396 [260] phi from debug_print_init::@13 to print_str_at [phi:debug_print_init::@13->print_str_at]
+  print_str_at_from_b13:
+  //SEG397 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $16 [phi:debug_print_init::@13->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$16
     sta print_str_at.at
     lda #>SCREEN+$28*$16
     sta print_str_at.at+1
-  //SEG398 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str9 [phi:debug_print_init::@14->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG398 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str9 [phi:debug_print_init::@13->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str9
     sta print_str_at.str
     lda #>str9
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG399 [211] phi from debug_print_init::@14 to debug_print_init::@15 [phi:debug_print_init::@14->debug_print_init::@15]
-  b15_from_b14:
-    jmp b15
-  //SEG400 debug_print_init::@15
-  b15:
+  //SEG399 [211] phi from debug_print_init::@13 to debug_print_init::@14 [phi:debug_print_init::@13->debug_print_init::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG400 debug_print_init::@14
+  b14:
   //SEG401 [212] call print_str_at 
-  //SEG402 [260] phi from debug_print_init::@15 to print_str_at [phi:debug_print_init::@15->print_str_at]
-  print_str_at_from_b15:
-  //SEG403 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $17 [phi:debug_print_init::@15->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG402 [260] phi from debug_print_init::@14 to print_str_at [phi:debug_print_init::@14->print_str_at]
+  print_str_at_from_b14:
+  //SEG403 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $17 [phi:debug_print_init::@14->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$17
     sta print_str_at.at
     lda #>SCREEN+$28*$17
     sta print_str_at.at+1
-  //SEG404 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str10 [phi:debug_print_init::@15->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG404 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str10 [phi:debug_print_init::@14->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str10
     sta print_str_at.str
     lda #>str10
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG405 [213] phi from debug_print_init::@15 to debug_print_init::@16 [phi:debug_print_init::@15->debug_print_init::@16]
-  b16_from_b15:
-    jmp b16
-  //SEG406 debug_print_init::@16
-  b16:
+  //SEG405 [213] phi from debug_print_init::@14 to debug_print_init::@15 [phi:debug_print_init::@14->debug_print_init::@15]
+  b15_from_b14:
+    jmp b15
+  //SEG406 debug_print_init::@15
+  b15:
   //SEG407 [214] call print_str_at 
-  //SEG408 [260] phi from debug_print_init::@16 to print_str_at [phi:debug_print_init::@16->print_str_at]
-  print_str_at_from_b16:
-  //SEG409 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18 [phi:debug_print_init::@16->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG408 [260] phi from debug_print_init::@15 to print_str_at [phi:debug_print_init::@15->print_str_at]
+  print_str_at_from_b15:
+  //SEG409 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18 [phi:debug_print_init::@15->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$18
     sta print_str_at.at
     lda #>SCREEN+$28*$18
     sta print_str_at.at+1
-  //SEG410 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str11 [phi:debug_print_init::@16->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG410 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str11 [phi:debug_print_init::@15->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str11
     sta print_str_at.str
     lda #>str11
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG411 [215] phi from debug_print_init::@16 to debug_print_init::@1 [phi:debug_print_init::@16->debug_print_init::@1]
-  b1_from_b16:
-  //SEG412 [215] phi (byte) debug_print_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@16->debug_print_init::@1#0] -- vbuz1=vbuc1 
+  //SEG411 [215] phi from debug_print_init::@15 to debug_print_init::@1 [phi:debug_print_init::@15->debug_print_init::@1]
+  b1_from_b15:
+  //SEG412 [215] phi (byte) debug_print_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@15->debug_print_init::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG413 [215] phi (byte) debug_print_init::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:debug_print_init::@16->debug_print_init::@1#1] -- vbuz1=vbuc1 
+  //SEG413 [215] phi (byte) debug_print_init::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:debug_print_init::@15->debug_print_init::@1#1] -- vbuz1=vbuc1 
     lda #4
     sta c
     jmp b1
@@ -6518,9 +6559,9 @@ debug_print_init: {
   //SEG422 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#0 [phi:debug_print_init::@1->print_sbyte_at#0] -- register_copy 
   //SEG423 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#1 [phi:debug_print_init::@1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b18
-  //SEG424 debug_print_init::@18
-  b18:
+    jmp b16
+  //SEG424 debug_print_init::@16
+  b16:
   //SEG425 [219] (byte*) print_sbyte_at::at#1 ← (const byte*) debug_print_init::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) debug_print_init::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -6534,14 +6575,14 @@ debug_print_init: {
     lda ys,y
     sta print_sbyte_at.b
   //SEG427 [221] call print_sbyte_at 
-  //SEG428 [114] phi from debug_print_init::@18 to print_sbyte_at [phi:debug_print_init::@18->print_sbyte_at]
-  print_sbyte_at_from_b18:
-  //SEG429 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#1 [phi:debug_print_init::@18->print_sbyte_at#0] -- register_copy 
-  //SEG430 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#2 [phi:debug_print_init::@18->print_sbyte_at#1] -- register_copy 
+  //SEG428 [114] phi from debug_print_init::@16 to print_sbyte_at [phi:debug_print_init::@16->print_sbyte_at]
+  print_sbyte_at_from_b16:
+  //SEG429 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#1 [phi:debug_print_init::@16->print_sbyte_at#0] -- register_copy 
+  //SEG430 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#2 [phi:debug_print_init::@16->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b19
-  //SEG431 debug_print_init::@19
-  b19:
+    jmp b17
+  //SEG431 debug_print_init::@17
+  b17:
   //SEG432 [222] (byte*) print_sbyte_at::at#2 ← (const byte*) debug_print_init::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) debug_print_init::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -6555,14 +6596,14 @@ debug_print_init: {
     lda zs,y
     sta print_sbyte_at.b
   //SEG434 [224] call print_sbyte_at 
-  //SEG435 [114] phi from debug_print_init::@19 to print_sbyte_at [phi:debug_print_init::@19->print_sbyte_at]
-  print_sbyte_at_from_b19:
-  //SEG436 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#2 [phi:debug_print_init::@19->print_sbyte_at#0] -- register_copy 
-  //SEG437 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#3 [phi:debug_print_init::@19->print_sbyte_at#1] -- register_copy 
+  //SEG435 [114] phi from debug_print_init::@17 to print_sbyte_at [phi:debug_print_init::@17->print_sbyte_at]
+  print_sbyte_at_from_b17:
+  //SEG436 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#2 [phi:debug_print_init::@17->print_sbyte_at#0] -- register_copy 
+  //SEG437 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#3 [phi:debug_print_init::@17->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG438 [225] phi from debug_print_init::@19 to debug_print_init::@2 [phi:debug_print_init::@19->debug_print_init::@2]
-  b2_from_b19:
-  //SEG439 [225] phi (byte) debug_print_init::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@19->debug_print_init::@2#0] -- vbuz1=vbuc1 
+  //SEG438 [225] phi from debug_print_init::@17 to debug_print_init::@2 [phi:debug_print_init::@17->debug_print_init::@2]
+  b2_from_b17:
+  //SEG439 [225] phi (byte) debug_print_init::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@17->debug_print_init::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta j
     jmp b2
@@ -7037,11 +7078,11 @@ sprites_init: {
 REGISTER UPLIFT POTENTIAL REGISTERS
 Statement [15] *((const word*) psp1#0) ← ((word))(const byte*) mulf_sqr1#0 [ ] ( main:11 [ ] ) always clobbers reg byte a 
 Statement [16] *((const word*) psp2#0) ← ((word))(const byte*) mulf_sqr2#0 [ ] ( main:11 [ ] ) always clobbers reg byte a 
-Statement [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
+Statement [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ sx#10 sx#3 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:3 [ sy#10 sy#3 ]
-Statement [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@9 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
-Statement [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@12 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
+Statement [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@3 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
+Statement [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@4 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
 Statement [38] *((const signed byte[8]) xrs#0 + (byte) anim::i#2) ← *((const signed byte*) xr#0) [ sx#10 sy#10 anim::i#2 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:4 [ anim::i#2 anim::i#1 ]
 Statement [39] *((const signed byte[8]) yrs#0 + (byte) anim::i#2) ← *((const signed byte*) yr#0) [ sx#10 sy#10 anim::i#2 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 ] ) always clobbers reg byte a 
@@ -7233,9 +7274,9 @@ Removing always clobbered register reg byte a as potential for zp ZP_BYTE:22 [ s
 Statement [276] *((const byte*) SPRITES_COLS#0 + (byte) sprites_init::i#2) ← (const byte) GREEN#0 [ sprites_init::i#2 ] ( main:11::sprites_init:14 [ sprites_init::i#2 ] ) always clobbers reg byte a 
 Statement [15] *((const word*) psp1#0) ← ((word))(const byte*) mulf_sqr1#0 [ ] ( main:11 [ ] ) always clobbers reg byte a 
 Statement [16] *((const word*) psp2#0) ← ((word))(const byte*) mulf_sqr2#0 [ ] ( main:11 [ ] ) always clobbers reg byte a 
-Statement [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
-Statement [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@9 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
-Statement [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@12 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
+Statement [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
+Statement [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@3 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
+Statement [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@4 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
 Statement [34] (signed byte) rotate_matrix::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#2) [ sx#10 sy#10 anim::i#2 rotate_matrix::x#0 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 rotate_matrix::x#0 ] ) always clobbers reg byte y 
 Statement [35] (signed byte) rotate_matrix::y#0 ← *((const signed byte[8]) ys#0 + (byte) anim::i#2) [ sx#10 sy#10 anim::i#2 rotate_matrix::x#0 rotate_matrix::y#0 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 rotate_matrix::x#0 rotate_matrix::y#0 ] ) always clobbers reg byte y 
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:25 [ rotate_matrix::x#0 ]
@@ -7250,7 +7291,7 @@ Statement [43] *((const signed byte[8]) yps#0 + (byte) anim::i#2) ← *((const s
 Statement [44] (byte) anim::i2#0 ← (byte) anim::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 [ sx#10 sy#10 anim::i#2 anim::i2#0 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 anim::i2#0 ] ) always clobbers reg byte a 
 Statement [45] (byte/word/signed word/dword/signed dword~) anim::$8 ← (byte/word/signed word/dword/signed dword) $80 + (byte)*((const signed byte*) xp#0) [ sx#10 sy#10 anim::i#2 anim::i2#0 anim::$8 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 anim::i2#0 anim::$8 ] ) always clobbers reg byte a 
 Statement [47] (byte/word/signed word/dword/signed dword~) anim::$10 ← (byte/word/signed word/dword/signed dword) $80 + (byte)*((const signed byte*) yp#0) [ sx#10 sy#10 anim::i#2 anim::i2#0 anim::$10 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 anim::i2#0 anim::$10 ] ) always clobbers reg byte a 
-Statement [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@15 [ sx#10 sy#10 anim::i#1 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#1 ] ) always clobbers reg byte a 
+Statement [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@6 [ sx#10 sy#10 anim::i#1 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#1 ] ) always clobbers reg byte a 
 Statement [51] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_GREY#0 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
 Statement [53] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
 Statement [55] (signed byte) sy#3 ← (signed byte) sy#10 - (byte/signed byte/word/signed word/dword/signed dword) 3 [ sx#3 sy#3 ] ( main:11::anim:19 [ sx#3 sy#3 ] ) always clobbers reg byte a 
@@ -7407,9 +7448,9 @@ Statement [275] *((const byte*) sprites_init::sprites_ptr#0 + (byte) sprites_ini
 Statement [276] *((const byte*) SPRITES_COLS#0 + (byte) sprites_init::i#2) ← (const byte) GREEN#0 [ sprites_init::i#2 ] ( main:11::sprites_init:14 [ sprites_init::i#2 ] ) always clobbers reg byte a 
 Statement [15] *((const word*) psp1#0) ← ((word))(const byte*) mulf_sqr1#0 [ ] ( main:11 [ ] ) always clobbers reg byte a 
 Statement [16] *((const word*) psp2#0) ← ((word))(const byte*) mulf_sqr2#0 [ ] ( main:11 [ ] ) always clobbers reg byte a 
-Statement [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
-Statement [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@9 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
-Statement [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@12 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
+Statement [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
+Statement [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@3 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
+Statement [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@4 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
 Statement [34] (signed byte) rotate_matrix::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#2) [ sx#10 sy#10 anim::i#2 rotate_matrix::x#0 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 rotate_matrix::x#0 ] ) always clobbers reg byte y 
 Statement [35] (signed byte) rotate_matrix::y#0 ← *((const signed byte[8]) ys#0 + (byte) anim::i#2) [ sx#10 sy#10 anim::i#2 rotate_matrix::x#0 rotate_matrix::y#0 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 rotate_matrix::x#0 rotate_matrix::y#0 ] ) always clobbers reg byte y 
 Statement [36] (signed byte) rotate_matrix::z#0 ← *((const signed byte[8]) zs#0 + (byte) anim::i#2) [ sx#10 sy#10 anim::i#2 rotate_matrix::x#0 rotate_matrix::y#0 rotate_matrix::z#0 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 rotate_matrix::x#0 rotate_matrix::y#0 rotate_matrix::z#0 ] ) always clobbers reg byte y 
@@ -7422,7 +7463,7 @@ Statement [43] *((const signed byte[8]) yps#0 + (byte) anim::i#2) ← *((const s
 Statement [44] (byte) anim::i2#0 ← (byte) anim::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 [ sx#10 sy#10 anim::i#2 anim::i2#0 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 anim::i2#0 ] ) always clobbers reg byte a 
 Statement [45] (byte/word/signed word/dword/signed dword~) anim::$8 ← (byte/word/signed word/dword/signed dword) $80 + (byte)*((const signed byte*) xp#0) [ sx#10 sy#10 anim::i#2 anim::i2#0 anim::$8 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 anim::i2#0 anim::$8 ] ) always clobbers reg byte a 
 Statement [47] (byte/word/signed word/dword/signed dword~) anim::$10 ← (byte/word/signed word/dword/signed dword) $80 + (byte)*((const signed byte*) yp#0) [ sx#10 sy#10 anim::i#2 anim::i2#0 anim::$10 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#2 anim::i2#0 anim::$10 ] ) always clobbers reg byte a 
-Statement [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@15 [ sx#10 sy#10 anim::i#1 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#1 ] ) always clobbers reg byte a 
+Statement [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@6 [ sx#10 sy#10 anim::i#1 ] ( main:11::anim:19 [ sx#10 sy#10 anim::i#1 ] ) always clobbers reg byte a 
 Statement [51] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_GREY#0 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
 Statement [53] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0 [ sx#10 sy#10 ] ( main:11::anim:19 [ sx#10 sy#10 ] ) always clobbers reg byte a 
 Statement [55] (signed byte) sy#3 ← (signed byte) sy#10 - (byte/signed byte/word/signed word/dword/signed dword) 3 [ sx#3 sy#3 ] ( main:11::anim:19 [ sx#3 sy#3 ] ) always clobbers reg byte a 
@@ -7925,9 +7966,9 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label sy = 3
 //SEG3 @begin
 bbegin:
-  jmp b33
-//SEG4 @33
-b33:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) mulf_sqr1#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((i*i)/256) }     	.if(i>159 && i<=351 ) { .byte round(((i-256)*(i-256))/256) }     	.if(i>351) { .byte round(((512-i)*(512-i))/256) }     }  }}
 //SEG6 kickasm(location (const byte*) mulf_sqr2#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((-i-1)*(-i-1)/256) }     	.if(i>159 && i<=351 ) { .byte round(((255-i)*(255-i))/256) }     	.if(i>351) { .byte round(((i-511)*(i-511))/256) }       }  }}
 //SEG7 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
@@ -7942,8 +7983,8 @@ b33:
 //SEG14 kickasm(location (const byte*) SINQ_HI#0) {{ {     .var min = -$1000     .var max = $1000     .var ampl = max-min;     .for(var i=0;i<$140;i++) {         .var rad = i*2*PI/256;         .byte >(min+(ampl/2)+(ampl/2)*sin(rad))     }     }  }}
 //SEG15 [11] call main 
   jsr main
-//SEG16 [12] phi from @33 to @end [phi:@33->@end]
-bend_from_b33:
+//SEG16 [12] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG17 @end
 bend:
@@ -8002,30 +8043,30 @@ anim: {
   //signed byte xmax = 0;
   //SEG36 anim::@1
   b1:
-    jmp b6
-  //SEG37 anim::@6
-  b6:
-  //SEG38 [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG37 anim::@2
+  b2:
+  //SEG38 [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b9
-  //SEG39 anim::@9
-  b9:
-  //SEG40 [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@9 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b2
+    jmp b3
+  //SEG39 anim::@3
+  b3:
+  //SEG40 [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b9
-    jmp b12
-  //SEG41 anim::@12
-  b12:
-  //SEG42 [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@12 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b3
+    jmp b4
+  //SEG41 anim::@4
+  b4:
+  //SEG42 [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fd
     cmp RASTER
-    bne b12
-    jmp b14
-  //SEG43 anim::@14
-  b14:
+    bne b4
+    jmp b5
+  //SEG43 anim::@5
+  b5:
   //SEG44 [26] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG45 [27] (signed byte) calculate_matrix::sx#0 ← (signed byte) sx#10 -- vbsyy=vbsz1 
@@ -8033,25 +8074,25 @@ anim: {
   //SEG46 [28] (signed byte) calculate_matrix::sy#0 ← (signed byte) sy#10
   //SEG47 [29] call calculate_matrix 
     jsr calculate_matrix
-  //SEG48 [30] phi from anim::@14 to anim::@27 [phi:anim::@14->anim::@27]
-  b27_from_b14:
-    jmp b27
-  //SEG49 anim::@27
-  b27:
+  //SEG48 [30] phi from anim::@5 to anim::@8 [phi:anim::@5->anim::@8]
+  b8_from_b5:
+    jmp b8
+  //SEG49 anim::@8
+  b8:
   //SEG50 [31] call store_matrix 
     jsr store_matrix
-  //SEG51 [32] phi from anim::@27 to anim::@15 [phi:anim::@27->anim::@15]
-  b15_from_b27:
-  //SEG52 [32] phi (byte) anim::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@27->anim::@15#0] -- vbuz1=vbuc1 
+  //SEG51 [32] phi from anim::@8 to anim::@6 [phi:anim::@8->anim::@6]
+  b6_from_b8:
+  //SEG52 [32] phi (byte) anim::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@6#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b15
-  //SEG53 [32] phi from anim::@29 to anim::@15 [phi:anim::@29->anim::@15]
-  b15_from_b29:
-  //SEG54 [32] phi (byte) anim::i#2 = (byte) anim::i#1 [phi:anim::@29->anim::@15#0] -- register_copy 
-    jmp b15
-  //SEG55 anim::@15
-  b15:
+    jmp b6
+  //SEG53 [32] phi from anim::@9 to anim::@6 [phi:anim::@9->anim::@6]
+  b6_from_b9:
+  //SEG54 [32] phi (byte) anim::i#2 = (byte) anim::i#1 [phi:anim::@9->anim::@6#0] -- register_copy 
+    jmp b6
+  //SEG55 anim::@6
+  b6:
   //SEG56 [33] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG57 [34] (signed byte) rotate_matrix::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#2) -- vbsxx=pbsc1_derefidx_vbuz1 
@@ -8067,9 +8108,9 @@ anim: {
     sta rotate_matrix.z
   //SEG60 [37] call rotate_matrix 
     jsr rotate_matrix
-    jmp b29
-  //SEG61 anim::@29
-  b29:
+    jmp b9
+  //SEG61 anim::@9
+  b9:
   //SEG62 [38] *((const signed byte[8]) xrs#0 + (byte) anim::i#2) ← *((const signed byte*) xr#0) -- pbsc1_derefidx_vbuz1=_deref_pbsc2 
     //if(*xr<xmin) xmin = *xr;
     //if(*xr>xmax) xmax = *xr;
@@ -8114,21 +8155,21 @@ anim: {
     sta SPRITES_YPOS,x
   //SEG73 [49] (byte) anim::i#1 ← ++ (byte) anim::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG74 [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@15 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG74 [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    bne b15_from_b29
-    jmp b16
-  //SEG75 anim::@16
-  b16:
+    bne b6_from_b9
+    jmp b7
+  //SEG75 anim::@7
+  b7:
   //SEG76 [51] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_GREY#0 -- _deref_pbuc1=vbuc2 
     lda #LIGHT_GREY
     sta BORDERCOL
   //SEG77 [52] call debug_print 
     jsr debug_print
-    jmp b30
-  //SEG78 anim::@30
-  b30:
+    jmp b10
+  //SEG78 anim::@10
+  b10:
   //SEG79 [53] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0 -- _deref_pbuc1=vbuc2 
     lda #LIGHT_BLUE
     sta BORDERCOL
@@ -8141,10 +8182,10 @@ anim: {
     sec
     sbc #3
     sta sy
-  //SEG82 [22] phi from anim::@30 to anim::@1 [phi:anim::@30->anim::@1]
-  b1_from_b30:
-  //SEG83 [22] phi (signed byte) sy#10 = (signed byte) sy#3 [phi:anim::@30->anim::@1#0] -- register_copy 
-  //SEG84 [22] phi (signed byte) sx#10 = (signed byte) sx#3 [phi:anim::@30->anim::@1#1] -- register_copy 
+  //SEG82 [22] phi from anim::@10 to anim::@1 [phi:anim::@10->anim::@1]
+  b1_from_b10:
+  //SEG83 [22] phi (signed byte) sy#10 = (signed byte) sy#3 [phi:anim::@10->anim::@1#0] -- register_copy 
+  //SEG84 [22] phi (signed byte) sx#10 = (signed byte) sx#3 [phi:anim::@10->anim::@1#1] -- register_copy 
     jmp b1
 }
 //SEG85 debug_print
@@ -8192,9 +8233,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG92 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#4 [phi:debug_print::print_sbyte_pos1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b3
-  //SEG93 debug_print::@3
-  b3:
+    jmp b2
+  //SEG93 debug_print::@2
+  b2:
   //SEG94 [59] (signed byte) debug_print::print_sbyte_pos2_sb#0 ← (signed byte) sy#10 -- vbsxx=vbsz1 
     ldx sy
     jmp print_sbyte_pos2
@@ -8227,9 +8268,9 @@ debug_print: {
   //SEG106 [114] phi (signed byte) print_sbyte_at::b#22 = (const signed byte) sz#0 [phi:debug_print::print_sbyte_pos3->print_sbyte_at#1] -- vbsxx=vbsc1 
     ldx #sz
     jsr print_sbyte_at
-    jmp b5
-  //SEG107 debug_print::@5
-  b5:
+    jmp b3
+  //SEG107 debug_print::@3
+  b3:
   //SEG108 [64] (signed byte) debug_print::print_sbyte_pos4_sb#0 ← *((const signed byte[9]) rotation_matrix#0) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix
     jmp print_sbyte_pos4
@@ -8246,9 +8287,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG114 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#7 [phi:debug_print::print_sbyte_pos4->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b6
-  //SEG115 debug_print::@6
-  b6:
+    jmp b4
+  //SEG115 debug_print::@4
+  b4:
   //SEG116 [67] (signed byte) debug_print::print_sbyte_pos5_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 1) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+1
     jmp print_sbyte_pos5
@@ -8265,9 +8306,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG122 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#8 [phi:debug_print::print_sbyte_pos5->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b7
-  //SEG123 debug_print::@7
-  b7:
+    jmp b5
+  //SEG123 debug_print::@5
+  b5:
   //SEG124 [70] (signed byte) debug_print::print_sbyte_pos6_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 2) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+2
     jmp print_sbyte_pos6
@@ -8284,9 +8325,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG130 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#9 [phi:debug_print::print_sbyte_pos6->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b8
-  //SEG131 debug_print::@8
-  b8:
+    jmp b6
+  //SEG131 debug_print::@6
+  b6:
   //SEG132 [73] (signed byte) debug_print::print_sbyte_pos7_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 3) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+3
     jmp print_sbyte_pos7
@@ -8303,9 +8344,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG138 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#10 [phi:debug_print::print_sbyte_pos7->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b9
-  //SEG139 debug_print::@9
-  b9:
+    jmp b7
+  //SEG139 debug_print::@7
+  b7:
   //SEG140 [76] (signed byte) debug_print::print_sbyte_pos8_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 4) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+4
     jmp print_sbyte_pos8
@@ -8322,9 +8363,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG146 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#11 [phi:debug_print::print_sbyte_pos8->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b10
-  //SEG147 debug_print::@10
-  b10:
+    jmp b8
+  //SEG147 debug_print::@8
+  b8:
   //SEG148 [79] (signed byte) debug_print::print_sbyte_pos9_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 5) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+5
     jmp print_sbyte_pos9
@@ -8341,9 +8382,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG154 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#12 [phi:debug_print::print_sbyte_pos9->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b11
-  //SEG155 debug_print::@11
-  b11:
+    jmp b9
+  //SEG155 debug_print::@9
+  b9:
   //SEG156 [82] (signed byte) debug_print::print_sbyte_pos10_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 6) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+6
     jmp print_sbyte_pos10
@@ -8360,9 +8401,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG162 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#13 [phi:debug_print::print_sbyte_pos10->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b12
-  //SEG163 debug_print::@12
-  b12:
+    jmp b10
+  //SEG163 debug_print::@10
+  b10:
   //SEG164 [85] (signed byte) debug_print::print_sbyte_pos11_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 7) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+7
     jmp print_sbyte_pos11
@@ -8379,9 +8420,9 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG170 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#14 [phi:debug_print::print_sbyte_pos11->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b13
-  //SEG171 debug_print::@13
-  b13:
+    jmp b11
+  //SEG171 debug_print::@11
+  b11:
   //SEG172 [88] (signed byte) debug_print::print_sbyte_pos12_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 8) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+8
     jmp print_sbyte_pos12
@@ -8407,10 +8448,10 @@ debug_print: {
     lda #4
     sta c
     jmp b1
-  //SEG182 [91] phi from debug_print::@32 to debug_print::@1 [phi:debug_print::@32->debug_print::@1]
-  b1_from_b32:
-  //SEG183 [91] phi (byte) debug_print::i#2 = (byte) debug_print::i#1 [phi:debug_print::@32->debug_print::@1#0] -- register_copy 
-  //SEG184 [91] phi (byte) debug_print::c#2 = (byte) debug_print::c#1 [phi:debug_print::@32->debug_print::@1#1] -- register_copy 
+  //SEG182 [91] phi from debug_print::@17 to debug_print::@1 [phi:debug_print::@17->debug_print::@1]
+  b1_from_b17:
+  //SEG183 [91] phi (byte) debug_print::i#2 = (byte) debug_print::i#1 [phi:debug_print::@17->debug_print::@1#0] -- register_copy 
+  //SEG184 [91] phi (byte) debug_print::c#2 = (byte) debug_print::c#1 [phi:debug_print::@17->debug_print::@1#1] -- register_copy 
     jmp b1
   //SEG185 debug_print::@1
   b1:
@@ -8431,9 +8472,9 @@ debug_print: {
   //SEG190 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#15 [phi:debug_print::@1->print_sbyte_at#0] -- register_copy 
   //SEG191 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#16 [phi:debug_print::@1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b27
-  //SEG192 debug_print::@27
-  b27:
+    jmp b12
+  //SEG192 debug_print::@12
+  b12:
   //SEG193 [95] (byte*) print_sbyte_at::at#16 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -8446,14 +8487,14 @@ debug_print: {
     ldy i
     ldx yrs,y
   //SEG195 [97] call print_sbyte_at 
-  //SEG196 [114] phi from debug_print::@27 to print_sbyte_at [phi:debug_print::@27->print_sbyte_at]
-  print_sbyte_at_from_b27:
-  //SEG197 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#16 [phi:debug_print::@27->print_sbyte_at#0] -- register_copy 
-  //SEG198 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#17 [phi:debug_print::@27->print_sbyte_at#1] -- register_copy 
+  //SEG196 [114] phi from debug_print::@12 to print_sbyte_at [phi:debug_print::@12->print_sbyte_at]
+  print_sbyte_at_from_b12:
+  //SEG197 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#16 [phi:debug_print::@12->print_sbyte_at#0] -- register_copy 
+  //SEG198 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#17 [phi:debug_print::@12->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b28
-  //SEG199 debug_print::@28
-  b28:
+    jmp b13
+  //SEG199 debug_print::@13
+  b13:
   //SEG200 [98] (byte*) print_sbyte_at::at#17 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -8466,14 +8507,14 @@ debug_print: {
     ldy i
     ldx zrs,y
   //SEG202 [100] call print_sbyte_at 
-  //SEG203 [114] phi from debug_print::@28 to print_sbyte_at [phi:debug_print::@28->print_sbyte_at]
-  print_sbyte_at_from_b28:
-  //SEG204 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#17 [phi:debug_print::@28->print_sbyte_at#0] -- register_copy 
-  //SEG205 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#18 [phi:debug_print::@28->print_sbyte_at#1] -- register_copy 
+  //SEG203 [114] phi from debug_print::@13 to print_sbyte_at [phi:debug_print::@13->print_sbyte_at]
+  print_sbyte_at_from_b13:
+  //SEG204 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#17 [phi:debug_print::@13->print_sbyte_at#0] -- register_copy 
+  //SEG205 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#18 [phi:debug_print::@13->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b29
-  //SEG206 debug_print::@29
-  b29:
+    jmp b14
+  //SEG206 debug_print::@14
+  b14:
   //SEG207 [101] (byte*) print_sbyte_at::at#18 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 3 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -8486,14 +8527,14 @@ debug_print: {
     ldy i
     ldx pps,y
   //SEG209 [103] call print_sbyte_at 
-  //SEG210 [114] phi from debug_print::@29 to print_sbyte_at [phi:debug_print::@29->print_sbyte_at]
-  print_sbyte_at_from_b29:
-  //SEG211 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#18 [phi:debug_print::@29->print_sbyte_at#0] -- register_copy 
-  //SEG212 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#19 [phi:debug_print::@29->print_sbyte_at#1] -- register_copy 
+  //SEG210 [114] phi from debug_print::@14 to print_sbyte_at [phi:debug_print::@14->print_sbyte_at]
+  print_sbyte_at_from_b14:
+  //SEG211 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#18 [phi:debug_print::@14->print_sbyte_at#0] -- register_copy 
+  //SEG212 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#19 [phi:debug_print::@14->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b30
-  //SEG213 debug_print::@30
-  b30:
+    jmp b15
+  //SEG213 debug_print::@15
+  b15:
   //SEG214 [104] (byte*) print_sbyte_at::at#19 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 4 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -8506,14 +8547,14 @@ debug_print: {
     ldy i
     ldx xps,y
   //SEG216 [106] call print_sbyte_at 
-  //SEG217 [114] phi from debug_print::@30 to print_sbyte_at [phi:debug_print::@30->print_sbyte_at]
-  print_sbyte_at_from_b30:
-  //SEG218 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#19 [phi:debug_print::@30->print_sbyte_at#0] -- register_copy 
-  //SEG219 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#20 [phi:debug_print::@30->print_sbyte_at#1] -- register_copy 
+  //SEG217 [114] phi from debug_print::@15 to print_sbyte_at [phi:debug_print::@15->print_sbyte_at]
+  print_sbyte_at_from_b15:
+  //SEG218 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#19 [phi:debug_print::@15->print_sbyte_at#0] -- register_copy 
+  //SEG219 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#20 [phi:debug_print::@15->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b31
-  //SEG220 debug_print::@31
-  b31:
+    jmp b16
+  //SEG220 debug_print::@16
+  b16:
   //SEG221 [107] (byte*) print_sbyte_at::at#20 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -8526,14 +8567,14 @@ debug_print: {
     ldy i
     ldx yps,y
   //SEG223 [109] call print_sbyte_at 
-  //SEG224 [114] phi from debug_print::@31 to print_sbyte_at [phi:debug_print::@31->print_sbyte_at]
-  print_sbyte_at_from_b31:
-  //SEG225 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#20 [phi:debug_print::@31->print_sbyte_at#0] -- register_copy 
-  //SEG226 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#21 [phi:debug_print::@31->print_sbyte_at#1] -- register_copy 
+  //SEG224 [114] phi from debug_print::@16 to print_sbyte_at [phi:debug_print::@16->print_sbyte_at]
+  print_sbyte_at_from_b16:
+  //SEG225 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#20 [phi:debug_print::@16->print_sbyte_at#0] -- register_copy 
+  //SEG226 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#21 [phi:debug_print::@16->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b32
-  //SEG227 debug_print::@32
-  b32:
+    jmp b17
+  //SEG227 debug_print::@17
+  b17:
   //SEG228 [110] (byte) debug_print::c#1 ← (byte) debug_print::c#2 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax c
     axs #-[4]
@@ -8543,7 +8584,7 @@ debug_print: {
   //SEG230 [112] if((byte) debug_print::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto debug_print::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    bne b1_from_b32
+    bne b1_from_b17
     jmp breturn
   //SEG231 debug_print::@return
   breturn:
@@ -8570,10 +8611,10 @@ print_sbyte_at: {
     lda #' '
     sta print_char_at.ch
     jsr print_char_at
-  //SEG241 [118] phi from print_sbyte_at::@3 print_sbyte_at::@5 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2]
+  //SEG241 [118] phi from print_sbyte_at::@3 print_sbyte_at::@4 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG242 [118] phi (signed byte) print_sbyte_at::b#24 = (signed byte) print_sbyte_at::b#22 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG242 [118] phi (signed byte) print_sbyte_at::b#24 = (signed byte) print_sbyte_at::b#22 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2#0] -- register_copy 
     jmp b2
   //SEG243 print_sbyte_at::@2
   b2:
@@ -8600,16 +8641,16 @@ print_sbyte_at: {
     lda #'-'
     sta print_char_at.ch
     jsr print_char_at
-    jmp b5
-  //SEG254 print_sbyte_at::@5
-  b5:
+    jmp b4
+  //SEG254 print_sbyte_at::@4
+  b4:
   //SEG255 [124] (signed byte) print_sbyte_at::b#0 ← - (signed byte) print_sbyte_at::b#22 -- vbsxx=_neg_vbsxx 
     txa
     eor #$ff
     clc
     adc #1
     tax
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG256 print_char_at
 // Print a single char
@@ -9069,240 +9110,240 @@ debug_print_init: {
   //SEG338 [267] phi from debug_print_init to print_cls [phi:debug_print_init->print_cls]
   print_cls_from_debug_print_init:
     jsr print_cls
-  //SEG339 [191] phi from debug_print_init to debug_print_init::@5 [phi:debug_print_init->debug_print_init::@5]
-  b5_from_debug_print_init:
-    jmp b5
-  //SEG340 debug_print_init::@5
-  b5:
+  //SEG339 [191] phi from debug_print_init to debug_print_init::@4 [phi:debug_print_init->debug_print_init::@4]
+  b4_from_debug_print_init:
+    jmp b4
+  //SEG340 debug_print_init::@4
+  b4:
   //SEG341 [192] call print_str_at 
-  //SEG342 [260] phi from debug_print_init::@5 to print_str_at [phi:debug_print_init::@5->print_str_at]
-  print_str_at_from_b5:
-  //SEG343 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@5->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG342 [260] phi from debug_print_init::@4 to print_str_at [phi:debug_print_init::@4->print_str_at]
+  print_str_at_from_b4:
+  //SEG343 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@4->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$22
     sta print_str_at.at
     lda #>SCREEN+$22
     sta print_str_at.at+1
-  //SEG344 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str [phi:debug_print_init::@5->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG344 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str [phi:debug_print_init::@4->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str_at.str
     lda #>str
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG345 [193] phi from debug_print_init::@5 to debug_print_init::@6 [phi:debug_print_init::@5->debug_print_init::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG346 debug_print_init::@6
-  b6:
+  //SEG345 [193] phi from debug_print_init::@4 to debug_print_init::@5 [phi:debug_print_init::@4->debug_print_init::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG346 debug_print_init::@5
+  b5:
   //SEG347 [194] call print_str_at 
-  //SEG348 [260] phi from debug_print_init::@6 to print_str_at [phi:debug_print_init::@6->print_str_at]
-  print_str_at_from_b6:
-  //SEG349 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@6->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG348 [260] phi from debug_print_init::@5 to print_str_at [phi:debug_print_init::@5->print_str_at]
+  print_str_at_from_b5:
+  //SEG349 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@5->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*1+$22
     sta print_str_at.at
     lda #>SCREEN+$28*1+$22
     sta print_str_at.at+1
-  //SEG350 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str1 [phi:debug_print_init::@6->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG350 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str1 [phi:debug_print_init::@5->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str_at.str
     lda #>str1
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG351 [195] phi from debug_print_init::@6 to debug_print_init::@7 [phi:debug_print_init::@6->debug_print_init::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG352 debug_print_init::@7
-  b7:
+  //SEG351 [195] phi from debug_print_init::@5 to debug_print_init::@6 [phi:debug_print_init::@5->debug_print_init::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG352 debug_print_init::@6
+  b6:
   //SEG353 [196] call print_str_at 
-  //SEG354 [260] phi from debug_print_init::@7 to print_str_at [phi:debug_print_init::@7->print_str_at]
-  print_str_at_from_b7:
-  //SEG355 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@7->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG354 [260] phi from debug_print_init::@6 to print_str_at [phi:debug_print_init::@6->print_str_at]
+  print_str_at_from_b6:
+  //SEG355 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@6->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*2+$22
     sta print_str_at.at
     lda #>SCREEN+$28*2+$22
     sta print_str_at.at+1
-  //SEG356 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str2 [phi:debug_print_init::@7->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG356 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str2 [phi:debug_print_init::@6->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str_at.str
     lda #>str2
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG357 [197] phi from debug_print_init::@7 to debug_print_init::@8 [phi:debug_print_init::@7->debug_print_init::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG358 debug_print_init::@8
-  b8:
+  //SEG357 [197] phi from debug_print_init::@6 to debug_print_init::@7 [phi:debug_print_init::@6->debug_print_init::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG358 debug_print_init::@7
+  b7:
   //SEG359 [198] call print_str_at 
-  //SEG360 [260] phi from debug_print_init::@8 to print_str_at [phi:debug_print_init::@8->print_str_at]
-  print_str_at_from_b8:
-  //SEG361 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:debug_print_init::@8->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG360 [260] phi from debug_print_init::@7 to print_str_at [phi:debug_print_init::@7->print_str_at]
+  print_str_at_from_b7:
+  //SEG361 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:debug_print_init::@7->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$10
     sta print_str_at.at
     lda #>SCREEN+$28*$10
     sta print_str_at.at+1
-  //SEG362 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str3 [phi:debug_print_init::@8->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG362 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str3 [phi:debug_print_init::@7->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str3
     sta print_str_at.str
     lda #>str3
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG363 [199] phi from debug_print_init::@8 to debug_print_init::@9 [phi:debug_print_init::@8->debug_print_init::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG364 debug_print_init::@9
-  b9:
+  //SEG363 [199] phi from debug_print_init::@7 to debug_print_init::@8 [phi:debug_print_init::@7->debug_print_init::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG364 debug_print_init::@8
+  b8:
   //SEG365 [200] call print_str_at 
-  //SEG366 [260] phi from debug_print_init::@9 to print_str_at [phi:debug_print_init::@9->print_str_at]
-  print_str_at_from_b9:
-  //SEG367 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $11 [phi:debug_print_init::@9->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG366 [260] phi from debug_print_init::@8 to print_str_at [phi:debug_print_init::@8->print_str_at]
+  print_str_at_from_b8:
+  //SEG367 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $11 [phi:debug_print_init::@8->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$11
     sta print_str_at.at
     lda #>SCREEN+$28*$11
     sta print_str_at.at+1
-  //SEG368 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str4 [phi:debug_print_init::@9->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG368 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str4 [phi:debug_print_init::@8->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str4
     sta print_str_at.str
     lda #>str4
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG369 [201] phi from debug_print_init::@9 to debug_print_init::@10 [phi:debug_print_init::@9->debug_print_init::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG370 debug_print_init::@10
-  b10:
+  //SEG369 [201] phi from debug_print_init::@8 to debug_print_init::@9 [phi:debug_print_init::@8->debug_print_init::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG370 debug_print_init::@9
+  b9:
   //SEG371 [202] call print_str_at 
-  //SEG372 [260] phi from debug_print_init::@10 to print_str_at [phi:debug_print_init::@10->print_str_at]
-  print_str_at_from_b10:
-  //SEG373 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $12 [phi:debug_print_init::@10->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG372 [260] phi from debug_print_init::@9 to print_str_at [phi:debug_print_init::@9->print_str_at]
+  print_str_at_from_b9:
+  //SEG373 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $12 [phi:debug_print_init::@9->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$12
     sta print_str_at.at
     lda #>SCREEN+$28*$12
     sta print_str_at.at+1
-  //SEG374 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str5 [phi:debug_print_init::@10->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG374 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str5 [phi:debug_print_init::@9->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str5
     sta print_str_at.str
     lda #>str5
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG375 [203] phi from debug_print_init::@10 to debug_print_init::@11 [phi:debug_print_init::@10->debug_print_init::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG376 debug_print_init::@11
-  b11:
+  //SEG375 [203] phi from debug_print_init::@9 to debug_print_init::@10 [phi:debug_print_init::@9->debug_print_init::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG376 debug_print_init::@10
+  b10:
   //SEG377 [204] call print_str_at 
-  //SEG378 [260] phi from debug_print_init::@11 to print_str_at [phi:debug_print_init::@11->print_str_at]
-  print_str_at_from_b11:
-  //SEG379 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13 [phi:debug_print_init::@11->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG378 [260] phi from debug_print_init::@10 to print_str_at [phi:debug_print_init::@10->print_str_at]
+  print_str_at_from_b10:
+  //SEG379 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13 [phi:debug_print_init::@10->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$13
     sta print_str_at.at
     lda #>SCREEN+$28*$13
     sta print_str_at.at+1
-  //SEG380 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str6 [phi:debug_print_init::@11->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG380 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str6 [phi:debug_print_init::@10->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str6
     sta print_str_at.str
     lda #>str6
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG381 [205] phi from debug_print_init::@11 to debug_print_init::@12 [phi:debug_print_init::@11->debug_print_init::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG382 debug_print_init::@12
-  b12:
+  //SEG381 [205] phi from debug_print_init::@10 to debug_print_init::@11 [phi:debug_print_init::@10->debug_print_init::@11]
+  b11_from_b10:
+    jmp b11
+  //SEG382 debug_print_init::@11
+  b11:
   //SEG383 [206] call print_str_at 
-  //SEG384 [260] phi from debug_print_init::@12 to print_str_at [phi:debug_print_init::@12->print_str_at]
-  print_str_at_from_b12:
-  //SEG385 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:debug_print_init::@12->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG384 [260] phi from debug_print_init::@11 to print_str_at [phi:debug_print_init::@11->print_str_at]
+  print_str_at_from_b11:
+  //SEG385 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:debug_print_init::@11->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$14
     sta print_str_at.at
     lda #>SCREEN+$28*$14
     sta print_str_at.at+1
-  //SEG386 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str7 [phi:debug_print_init::@12->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG386 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str7 [phi:debug_print_init::@11->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str7
     sta print_str_at.str
     lda #>str7
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG387 [207] phi from debug_print_init::@12 to debug_print_init::@13 [phi:debug_print_init::@12->debug_print_init::@13]
-  b13_from_b12:
-    jmp b13
-  //SEG388 debug_print_init::@13
-  b13:
+  //SEG387 [207] phi from debug_print_init::@11 to debug_print_init::@12 [phi:debug_print_init::@11->debug_print_init::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG388 debug_print_init::@12
+  b12:
   //SEG389 [208] call print_str_at 
-  //SEG390 [260] phi from debug_print_init::@13 to print_str_at [phi:debug_print_init::@13->print_str_at]
-  print_str_at_from_b13:
-  //SEG391 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $15 [phi:debug_print_init::@13->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG390 [260] phi from debug_print_init::@12 to print_str_at [phi:debug_print_init::@12->print_str_at]
+  print_str_at_from_b12:
+  //SEG391 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $15 [phi:debug_print_init::@12->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$15
     sta print_str_at.at
     lda #>SCREEN+$28*$15
     sta print_str_at.at+1
-  //SEG392 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str8 [phi:debug_print_init::@13->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG392 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str8 [phi:debug_print_init::@12->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str8
     sta print_str_at.str
     lda #>str8
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG393 [209] phi from debug_print_init::@13 to debug_print_init::@14 [phi:debug_print_init::@13->debug_print_init::@14]
-  b14_from_b13:
-    jmp b14
-  //SEG394 debug_print_init::@14
-  b14:
+  //SEG393 [209] phi from debug_print_init::@12 to debug_print_init::@13 [phi:debug_print_init::@12->debug_print_init::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG394 debug_print_init::@13
+  b13:
   //SEG395 [210] call print_str_at 
-  //SEG396 [260] phi from debug_print_init::@14 to print_str_at [phi:debug_print_init::@14->print_str_at]
-  print_str_at_from_b14:
-  //SEG397 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $16 [phi:debug_print_init::@14->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG396 [260] phi from debug_print_init::@13 to print_str_at [phi:debug_print_init::@13->print_str_at]
+  print_str_at_from_b13:
+  //SEG397 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $16 [phi:debug_print_init::@13->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$16
     sta print_str_at.at
     lda #>SCREEN+$28*$16
     sta print_str_at.at+1
-  //SEG398 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str9 [phi:debug_print_init::@14->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG398 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str9 [phi:debug_print_init::@13->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str9
     sta print_str_at.str
     lda #>str9
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG399 [211] phi from debug_print_init::@14 to debug_print_init::@15 [phi:debug_print_init::@14->debug_print_init::@15]
-  b15_from_b14:
-    jmp b15
-  //SEG400 debug_print_init::@15
-  b15:
+  //SEG399 [211] phi from debug_print_init::@13 to debug_print_init::@14 [phi:debug_print_init::@13->debug_print_init::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG400 debug_print_init::@14
+  b14:
   //SEG401 [212] call print_str_at 
-  //SEG402 [260] phi from debug_print_init::@15 to print_str_at [phi:debug_print_init::@15->print_str_at]
-  print_str_at_from_b15:
-  //SEG403 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $17 [phi:debug_print_init::@15->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG402 [260] phi from debug_print_init::@14 to print_str_at [phi:debug_print_init::@14->print_str_at]
+  print_str_at_from_b14:
+  //SEG403 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $17 [phi:debug_print_init::@14->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$17
     sta print_str_at.at
     lda #>SCREEN+$28*$17
     sta print_str_at.at+1
-  //SEG404 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str10 [phi:debug_print_init::@15->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG404 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str10 [phi:debug_print_init::@14->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str10
     sta print_str_at.str
     lda #>str10
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG405 [213] phi from debug_print_init::@15 to debug_print_init::@16 [phi:debug_print_init::@15->debug_print_init::@16]
-  b16_from_b15:
-    jmp b16
-  //SEG406 debug_print_init::@16
-  b16:
+  //SEG405 [213] phi from debug_print_init::@14 to debug_print_init::@15 [phi:debug_print_init::@14->debug_print_init::@15]
+  b15_from_b14:
+    jmp b15
+  //SEG406 debug_print_init::@15
+  b15:
   //SEG407 [214] call print_str_at 
-  //SEG408 [260] phi from debug_print_init::@16 to print_str_at [phi:debug_print_init::@16->print_str_at]
-  print_str_at_from_b16:
-  //SEG409 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18 [phi:debug_print_init::@16->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG408 [260] phi from debug_print_init::@15 to print_str_at [phi:debug_print_init::@15->print_str_at]
+  print_str_at_from_b15:
+  //SEG409 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18 [phi:debug_print_init::@15->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$18
     sta print_str_at.at
     lda #>SCREEN+$28*$18
     sta print_str_at.at+1
-  //SEG410 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str11 [phi:debug_print_init::@16->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG410 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str11 [phi:debug_print_init::@15->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str11
     sta print_str_at.str
     lda #>str11
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG411 [215] phi from debug_print_init::@16 to debug_print_init::@1 [phi:debug_print_init::@16->debug_print_init::@1]
-  b1_from_b16:
-  //SEG412 [215] phi (byte) debug_print_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@16->debug_print_init::@1#0] -- vbuz1=vbuc1 
+  //SEG411 [215] phi from debug_print_init::@15 to debug_print_init::@1 [phi:debug_print_init::@15->debug_print_init::@1]
+  b1_from_b15:
+  //SEG412 [215] phi (byte) debug_print_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@15->debug_print_init::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG413 [215] phi (byte) debug_print_init::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:debug_print_init::@16->debug_print_init::@1#1] -- vbuz1=vbuc1 
+  //SEG413 [215] phi (byte) debug_print_init::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:debug_print_init::@15->debug_print_init::@1#1] -- vbuz1=vbuc1 
     lda #4
     sta c
     jmp b1
@@ -9330,9 +9371,9 @@ debug_print_init: {
   //SEG422 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#0 [phi:debug_print_init::@1->print_sbyte_at#0] -- register_copy 
   //SEG423 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#1 [phi:debug_print_init::@1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b18
-  //SEG424 debug_print_init::@18
-  b18:
+    jmp b16
+  //SEG424 debug_print_init::@16
+  b16:
   //SEG425 [219] (byte*) print_sbyte_at::at#1 ← (const byte*) debug_print_init::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) debug_print_init::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -9345,14 +9386,14 @@ debug_print_init: {
     ldy i
     ldx ys,y
   //SEG427 [221] call print_sbyte_at 
-  //SEG428 [114] phi from debug_print_init::@18 to print_sbyte_at [phi:debug_print_init::@18->print_sbyte_at]
-  print_sbyte_at_from_b18:
-  //SEG429 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#1 [phi:debug_print_init::@18->print_sbyte_at#0] -- register_copy 
-  //SEG430 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#2 [phi:debug_print_init::@18->print_sbyte_at#1] -- register_copy 
+  //SEG428 [114] phi from debug_print_init::@16 to print_sbyte_at [phi:debug_print_init::@16->print_sbyte_at]
+  print_sbyte_at_from_b16:
+  //SEG429 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#1 [phi:debug_print_init::@16->print_sbyte_at#0] -- register_copy 
+  //SEG430 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#2 [phi:debug_print_init::@16->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b19
-  //SEG431 debug_print_init::@19
-  b19:
+    jmp b17
+  //SEG431 debug_print_init::@17
+  b17:
   //SEG432 [222] (byte*) print_sbyte_at::at#2 ← (const byte*) debug_print_init::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) debug_print_init::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -9365,14 +9406,14 @@ debug_print_init: {
     ldy i
     ldx zs,y
   //SEG434 [224] call print_sbyte_at 
-  //SEG435 [114] phi from debug_print_init::@19 to print_sbyte_at [phi:debug_print_init::@19->print_sbyte_at]
-  print_sbyte_at_from_b19:
-  //SEG436 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#2 [phi:debug_print_init::@19->print_sbyte_at#0] -- register_copy 
-  //SEG437 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#3 [phi:debug_print_init::@19->print_sbyte_at#1] -- register_copy 
+  //SEG435 [114] phi from debug_print_init::@17 to print_sbyte_at [phi:debug_print_init::@17->print_sbyte_at]
+  print_sbyte_at_from_b17:
+  //SEG436 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#2 [phi:debug_print_init::@17->print_sbyte_at#0] -- register_copy 
+  //SEG437 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#3 [phi:debug_print_init::@17->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG438 [225] phi from debug_print_init::@19 to debug_print_init::@2 [phi:debug_print_init::@19->debug_print_init::@2]
-  b2_from_b19:
-  //SEG439 [225] phi (byte) debug_print_init::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@19->debug_print_init::@2#0] -- vbuz1=vbuc1 
+  //SEG438 [225] phi from debug_print_init::@17 to debug_print_init::@2 [phi:debug_print_init::@17->debug_print_init::@2]
+  b2_from_b17:
+  //SEG439 [225] phi (byte) debug_print_init::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@17->debug_print_init::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta j
     jmp b2
@@ -9839,61 +9880,62 @@ sprites_init: {
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b33
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b8
 Removing instruction jmp b6
 Removing instruction jmp b9
-Removing instruction jmp b12
-Removing instruction jmp b14
-Removing instruction jmp b27
-Removing instruction jmp b15
-Removing instruction jmp b29
-Removing instruction jmp b16
-Removing instruction jmp b30
+Removing instruction jmp b7
+Removing instruction jmp b10
 Removing instruction jmp print_sbyte_pos1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp print_sbyte_pos2
 Removing instruction jmp print_sbyte_pos3
-Removing instruction jmp b5
+Removing instruction jmp b3
 Removing instruction jmp print_sbyte_pos4
-Removing instruction jmp b6
+Removing instruction jmp b4
 Removing instruction jmp print_sbyte_pos5
-Removing instruction jmp b7
+Removing instruction jmp b5
 Removing instruction jmp print_sbyte_pos6
-Removing instruction jmp b8
+Removing instruction jmp b6
 Removing instruction jmp print_sbyte_pos7
-Removing instruction jmp b9
+Removing instruction jmp b7
 Removing instruction jmp print_sbyte_pos8
-Removing instruction jmp b10
+Removing instruction jmp b8
 Removing instruction jmp print_sbyte_pos9
-Removing instruction jmp b11
+Removing instruction jmp b9
 Removing instruction jmp print_sbyte_pos10
-Removing instruction jmp b12
+Removing instruction jmp b10
 Removing instruction jmp print_sbyte_pos11
-Removing instruction jmp b13
+Removing instruction jmp b11
 Removing instruction jmp print_sbyte_pos12
 Removing instruction jmp b1
-Removing instruction jmp b27
-Removing instruction jmp b28
-Removing instruction jmp b29
-Removing instruction jmp b30
-Removing instruction jmp b31
-Removing instruction jmp b32
+Removing instruction jmp b12
+Removing instruction jmp b13
+Removing instruction jmp b14
+Removing instruction jmp b15
+Removing instruction jmp b16
+Removing instruction jmp b17
 Removing instruction jmp breturn
 Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp breturn
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
+Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp b6
 Removing instruction jmp b7
@@ -9905,10 +9947,9 @@ Removing instruction jmp b12
 Removing instruction jmp b13
 Removing instruction jmp b14
 Removing instruction jmp b15
-Removing instruction jmp b16
 Removing instruction jmp b1
-Removing instruction jmp b18
-Removing instruction jmp b19
+Removing instruction jmp b16
+Removing instruction jmp b17
 Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp breturn
@@ -9933,23 +9974,23 @@ Removing instruction ldy t1
 Removing instruction ldx t3
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b15_from_b29 with b15
-Replacing label b1 with b6
-Replacing label b1_from_b32 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b6_from_b9 with b6
+Replacing label b1 with b2
+Replacing label b1_from_b17 with b1
+Replacing label b2_from_b4 with b2
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b33:
-Removing instruction bend_from_b33:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Removing instruction b2_from_b1:
 Removing instruction anim_from_b2:
 Removing instruction b1:
-Removing instruction b27_from_b14:
-Removing instruction b15_from_b29:
+Removing instruction b8_from_b5:
+Removing instruction b6_from_b9:
 Removing instruction print_sbyte_at_from_print_sbyte_pos1:
 Removing instruction print_sbyte_at_from_print_sbyte_pos2:
 Removing instruction print_sbyte_pos3_from_print_sbyte_pos2:
@@ -9963,12 +10004,14 @@ Removing instruction print_sbyte_at_from_print_sbyte_pos9:
 Removing instruction print_sbyte_at_from_print_sbyte_pos10:
 Removing instruction print_sbyte_at_from_print_sbyte_pos11:
 Removing instruction print_sbyte_at_from_print_sbyte_pos12:
-Removing instruction b1_from_b32:
+Removing instruction b1_from_b17:
 Removing instruction print_char_at_from_b3:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction print_char_at_from_b1:
-Removing instruction b5_from_debug_print_init:
+Removing instruction b4_from_debug_print_init:
+Removing instruction print_str_at_from_b4:
+Removing instruction b5_from_b4:
 Removing instruction print_str_at_from_b5:
 Removing instruction b6_from_b5:
 Removing instruction print_str_at_from_b6:
@@ -9990,8 +10033,6 @@ Removing instruction b14_from_b13:
 Removing instruction print_str_at_from_b14:
 Removing instruction b15_from_b14:
 Removing instruction print_str_at_from_b15:
-Removing instruction b16_from_b15:
-Removing instruction print_str_at_from_b16:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b2:
 Removing instruction b1_from_print_str_at:
@@ -10005,52 +10046,52 @@ Removing instruction debug_print_init_from_b1:
 Removing instruction b2:
 Removing instruction breturn:
 Removing instruction b1_from_anim:
-Removing instruction b14:
-Removing instruction b27:
-Removing instruction b15_from_b27:
-Removing instruction b29:
-Removing instruction b16:
-Removing instruction b30:
-Removing instruction b1_from_b30:
+Removing instruction b5:
+Removing instruction b8:
+Removing instruction b6_from_b8:
+Removing instruction b9:
+Removing instruction b7:
+Removing instruction b10:
+Removing instruction b1_from_b10:
 Removing instruction print_sbyte_pos1:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction print_sbyte_pos2:
 Removing instruction print_sbyte_pos3:
-Removing instruction b5:
+Removing instruction b3:
 Removing instruction print_sbyte_pos4:
-Removing instruction b6:
+Removing instruction b4:
 Removing instruction print_sbyte_pos5:
-Removing instruction b7:
+Removing instruction b5:
 Removing instruction print_sbyte_pos6:
-Removing instruction b8:
+Removing instruction b6:
 Removing instruction print_sbyte_pos7:
-Removing instruction b9:
+Removing instruction b7:
 Removing instruction print_sbyte_pos8:
-Removing instruction b10:
+Removing instruction b8:
 Removing instruction print_sbyte_pos9:
-Removing instruction b11:
+Removing instruction b9:
 Removing instruction print_sbyte_pos10:
-Removing instruction b12:
+Removing instruction b10:
 Removing instruction print_sbyte_pos11:
-Removing instruction b13:
+Removing instruction b11:
 Removing instruction print_sbyte_pos12:
 Removing instruction b1_from_print_sbyte_pos12:
 Removing instruction print_sbyte_at_from_b1:
-Removing instruction b27:
-Removing instruction print_sbyte_at_from_b27:
-Removing instruction b28:
-Removing instruction print_sbyte_at_from_b28:
-Removing instruction b29:
-Removing instruction print_sbyte_at_from_b29:
-Removing instruction b30:
-Removing instruction print_sbyte_at_from_b30:
-Removing instruction b31:
-Removing instruction print_sbyte_at_from_b31:
-Removing instruction b32:
+Removing instruction b12:
+Removing instruction print_sbyte_at_from_b12:
+Removing instruction b13:
+Removing instruction print_sbyte_at_from_b13:
+Removing instruction b14:
+Removing instruction print_sbyte_at_from_b14:
+Removing instruction b15:
+Removing instruction print_sbyte_at_from_b15:
+Removing instruction b16:
+Removing instruction print_sbyte_at_from_b16:
+Removing instruction b17:
 Removing instruction breturn:
 Removing instruction b3:
 Removing instruction breturn:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction breturn:
 Removing instruction print_char_at_from_print_byte_at:
 Removing instruction b1:
@@ -10060,6 +10101,7 @@ Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction print_cls_from_debug_print_init:
+Removing instruction b4:
 Removing instruction b5:
 Removing instruction b6:
 Removing instruction b7:
@@ -10071,14 +10113,13 @@ Removing instruction b12:
 Removing instruction b13:
 Removing instruction b14:
 Removing instruction b15:
-Removing instruction b16:
-Removing instruction b1_from_b16:
+Removing instruction b1_from_b15:
 Removing instruction print_sbyte_at_from_b1:
-Removing instruction b18:
-Removing instruction print_sbyte_at_from_b18:
-Removing instruction b19:
-Removing instruction print_sbyte_at_from_b19:
-Removing instruction b2_from_b19:
+Removing instruction b16:
+Removing instruction print_sbyte_at_from_b16:
+Removing instruction b17:
+Removing instruction print_sbyte_at_from_b17:
+Removing instruction b2_from_b17:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction breturn:
@@ -10090,7 +10131,7 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Removing instruction jmp b15
+Removing instruction jmp b6
 Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -10104,7 +10145,7 @@ Fixing long branch [1022] bne b2 to beq
 Fixing long branch [1031] bne b1 to beq
 
 FINAL SYMBOL TABLE
-(label) @33
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -10225,14 +10266,14 @@ FINAL SYMBOL TABLE
 (byte/word/signed word/dword/signed dword~) anim::$10 reg byte a 202.0
 (byte/word/signed word/dword/signed dword~) anim::$8 reg byte a 202.0
 (label) anim::@1
-(label) anim::@12
-(label) anim::@14
-(label) anim::@15
-(label) anim::@16
-(label) anim::@27
-(label) anim::@29
-(label) anim::@30
+(label) anim::@10
+(label) anim::@2
+(label) anim::@3
+(label) anim::@4
+(label) anim::@5
 (label) anim::@6
+(label) anim::@7
+(label) anim::@8
 (label) anim::@9
 (byte) anim::i
 (byte) anim::i#1 i zp ZP_BYTE:4 151.5
@@ -10297,13 +10338,13 @@ FINAL SYMBOL TABLE
 (label) debug_print::@11
 (label) debug_print::@12
 (label) debug_print::@13
-(label) debug_print::@27
-(label) debug_print::@28
-(label) debug_print::@29
+(label) debug_print::@14
+(label) debug_print::@15
+(label) debug_print::@16
+(label) debug_print::@17
+(label) debug_print::@2
 (label) debug_print::@3
-(label) debug_print::@30
-(label) debug_print::@31
-(label) debug_print::@32
+(label) debug_print::@4
 (label) debug_print::@5
 (label) debug_print::@6
 (label) debug_print::@7
@@ -10464,10 +10505,10 @@ FINAL SYMBOL TABLE
 (label) debug_print_init::@14
 (label) debug_print_init::@15
 (label) debug_print_init::@16
-(label) debug_print_init::@18
-(label) debug_print_init::@19
+(label) debug_print_init::@17
 (label) debug_print_init::@2
 (label) debug_print_init::@3
+(label) debug_print_init::@4
 (label) debug_print_init::@5
 (label) debug_print_init::@6
 (label) debug_print_init::@7
@@ -10550,7 +10591,7 @@ FINAL SYMBOL TABLE
 (label) print_sbyte_at::@1
 (label) print_sbyte_at::@2
 (label) print_sbyte_at::@3
-(label) print_sbyte_at::@5
+(label) print_sbyte_at::@4
 (label) print_sbyte_at::@return
 (byte*) print_sbyte_at::at
 (byte*) print_sbyte_at::at#0 at zp ZP_WORD:6 11.0
@@ -10791,7 +10832,7 @@ Score: 85397
   .label sx = 2
   .label sy = 3
 //SEG3 @begin
-//SEG4 @33
+//SEG4 @1
 //SEG5 kickasm(location (const byte*) mulf_sqr1#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((i*i)/256) }     	.if(i>159 && i<=351 ) { .byte round(((i-256)*(i-256))/256) }     	.if(i>351) { .byte round(((512-i)*(512-i))/256) }     }  }}
 //SEG6 kickasm(location (const byte*) mulf_sqr2#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((-i-1)*(-i-1)/256) }     	.if(i>159 && i<=351 ) { .byte round(((255-i)*(255-i))/256) }     	.if(i>351) { .byte round(((i-511)*(i-511))/256) }       }  }}
 //SEG7 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
@@ -10805,7 +10846,7 @@ Score: 85397
 //SEG13 kickasm(location (const byte*) SINQ_LO#0) {{ {     .var min = -$1000     .var max = $1000     .var ampl = max-min;     .for(var i=0;i<$140;i++) {         .var rad = i*2*PI/256;         .byte <(min+(ampl/2)+(ampl/2)*sin(rad))     }     }  }}
 //SEG14 kickasm(location (const byte*) SINQ_HI#0) {{ {     .var min = -$1000     .var max = $1000     .var ampl = max-min;     .for(var i=0;i<$140;i++) {         .var rad = i*2*PI/256;         .byte >(min+(ampl/2)+(ampl/2)*sin(rad))     }     }  }}
 //SEG15 [11] call main 
-//SEG16 [12] phi from @33 to @end [phi:@33->@end]
+//SEG16 [12] phi from @1 to @end [phi:@1->@end]
 //SEG17 @end
 //SEG18 main
 main: {
@@ -10849,25 +10890,25 @@ anim: {
   //signed byte xmin = 0;
   //signed byte xmax = 0;
   //SEG36 anim::@1
-  //SEG37 anim::@6
-  b6:
-  //SEG38 [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG37 anim::@2
+  b2:
+  //SEG38 [23] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG39 anim::@9
-  b9:
-  //SEG40 [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@9 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b2
+  //SEG39 anim::@3
+  b3:
+  //SEG40 [24] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto anim::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b9
-  //SEG41 anim::@12
-  b12:
-  //SEG42 [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@12 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b3
+  //SEG41 anim::@4
+  b4:
+  //SEG42 [25] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto anim::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fd
     cmp RASTER
-    bne b12
-  //SEG43 anim::@14
+    bne b4
+  //SEG43 anim::@5
   //SEG44 [26] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG45 [27] (signed byte) calculate_matrix::sx#0 ← (signed byte) sx#10 -- vbsyy=vbsz1 
@@ -10875,18 +10916,18 @@ anim: {
   //SEG46 [28] (signed byte) calculate_matrix::sy#0 ← (signed byte) sy#10
   //SEG47 [29] call calculate_matrix 
     jsr calculate_matrix
-  //SEG48 [30] phi from anim::@14 to anim::@27 [phi:anim::@14->anim::@27]
-  //SEG49 anim::@27
+  //SEG48 [30] phi from anim::@5 to anim::@8 [phi:anim::@5->anim::@8]
+  //SEG49 anim::@8
   //SEG50 [31] call store_matrix 
     jsr store_matrix
-  //SEG51 [32] phi from anim::@27 to anim::@15 [phi:anim::@27->anim::@15]
-  //SEG52 [32] phi (byte) anim::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@27->anim::@15#0] -- vbuz1=vbuc1 
+  //SEG51 [32] phi from anim::@8 to anim::@6 [phi:anim::@8->anim::@6]
+  //SEG52 [32] phi (byte) anim::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@6#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG53 [32] phi from anim::@29 to anim::@15 [phi:anim::@29->anim::@15]
-  //SEG54 [32] phi (byte) anim::i#2 = (byte) anim::i#1 [phi:anim::@29->anim::@15#0] -- register_copy 
-  //SEG55 anim::@15
-  b15:
+  //SEG53 [32] phi from anim::@9 to anim::@6 [phi:anim::@9->anim::@6]
+  //SEG54 [32] phi (byte) anim::i#2 = (byte) anim::i#1 [phi:anim::@9->anim::@6#0] -- register_copy 
+  //SEG55 anim::@6
+  b6:
   //SEG56 [33] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG57 [34] (signed byte) rotate_matrix::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#2) -- vbsxx=pbsc1_derefidx_vbuz1 
@@ -10900,7 +10941,7 @@ anim: {
     sta rotate_matrix.z
   //SEG60 [37] call rotate_matrix 
     jsr rotate_matrix
-  //SEG61 anim::@29
+  //SEG61 anim::@9
   //SEG62 [38] *((const signed byte[8]) xrs#0 + (byte) anim::i#2) ← *((const signed byte*) xr#0) -- pbsc1_derefidx_vbuz1=_deref_pbsc2 
     //if(*xr<xmin) xmin = *xr;
     //if(*xr>xmax) xmax = *xr;
@@ -10940,17 +10981,17 @@ anim: {
     sta SPRITES_YPOS,x
   //SEG73 [49] (byte) anim::i#1 ← ++ (byte) anim::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG74 [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@15 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG74 [50] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    bne b15
-  //SEG75 anim::@16
+    bne b6
+  //SEG75 anim::@7
   //SEG76 [51] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_GREY#0 -- _deref_pbuc1=vbuc2 
     lda #LIGHT_GREY
     sta BORDERCOL
   //SEG77 [52] call debug_print 
     jsr debug_print
-  //SEG78 anim::@30
+  //SEG78 anim::@10
   //SEG79 [53] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0 -- _deref_pbuc1=vbuc2 
     lda #LIGHT_BLUE
     sta BORDERCOL
@@ -10963,10 +11004,10 @@ anim: {
     sec
     sbc #3
     sta sy
-  //SEG82 [22] phi from anim::@30 to anim::@1 [phi:anim::@30->anim::@1]
-  //SEG83 [22] phi (signed byte) sy#10 = (signed byte) sy#3 [phi:anim::@30->anim::@1#0] -- register_copy 
-  //SEG84 [22] phi (signed byte) sx#10 = (signed byte) sx#3 [phi:anim::@30->anim::@1#1] -- register_copy 
-    jmp b6
+  //SEG82 [22] phi from anim::@10 to anim::@1 [phi:anim::@10->anim::@1]
+  //SEG83 [22] phi (signed byte) sy#10 = (signed byte) sy#3 [phi:anim::@10->anim::@1#0] -- register_copy 
+  //SEG84 [22] phi (signed byte) sx#10 = (signed byte) sx#3 [phi:anim::@10->anim::@1#1] -- register_copy 
+    jmp b2
 }
 //SEG85 debug_print
 debug_print: {
@@ -11010,7 +11051,7 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG92 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#4 [phi:debug_print::print_sbyte_pos1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG93 debug_print::@3
+  //SEG93 debug_print::@2
   //SEG94 [59] (signed byte) debug_print::print_sbyte_pos2_sb#0 ← (signed byte) sy#10 -- vbsxx=vbsz1 
     ldx sy
   //SEG95 debug_print::print_sbyte_pos2
@@ -11036,7 +11077,7 @@ debug_print: {
   //SEG106 [114] phi (signed byte) print_sbyte_at::b#22 = (const signed byte) sz#0 [phi:debug_print::print_sbyte_pos3->print_sbyte_at#1] -- vbsxx=vbsc1 
     ldx #sz
     jsr print_sbyte_at
-  //SEG107 debug_print::@5
+  //SEG107 debug_print::@3
   //SEG108 [64] (signed byte) debug_print::print_sbyte_pos4_sb#0 ← *((const signed byte[9]) rotation_matrix#0) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix
   //SEG109 debug_print::print_sbyte_pos4
@@ -11050,7 +11091,7 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG114 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#7 [phi:debug_print::print_sbyte_pos4->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG115 debug_print::@6
+  //SEG115 debug_print::@4
   //SEG116 [67] (signed byte) debug_print::print_sbyte_pos5_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 1) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+1
   //SEG117 debug_print::print_sbyte_pos5
@@ -11064,7 +11105,7 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG122 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#8 [phi:debug_print::print_sbyte_pos5->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG123 debug_print::@7
+  //SEG123 debug_print::@5
   //SEG124 [70] (signed byte) debug_print::print_sbyte_pos6_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 2) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+2
   //SEG125 debug_print::print_sbyte_pos6
@@ -11078,7 +11119,7 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG130 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#9 [phi:debug_print::print_sbyte_pos6->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG131 debug_print::@8
+  //SEG131 debug_print::@6
   //SEG132 [73] (signed byte) debug_print::print_sbyte_pos7_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 3) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+3
   //SEG133 debug_print::print_sbyte_pos7
@@ -11092,7 +11133,7 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG138 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#10 [phi:debug_print::print_sbyte_pos7->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG139 debug_print::@9
+  //SEG139 debug_print::@7
   //SEG140 [76] (signed byte) debug_print::print_sbyte_pos8_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 4) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+4
   //SEG141 debug_print::print_sbyte_pos8
@@ -11106,7 +11147,7 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG146 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#11 [phi:debug_print::print_sbyte_pos8->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG147 debug_print::@10
+  //SEG147 debug_print::@8
   //SEG148 [79] (signed byte) debug_print::print_sbyte_pos9_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 5) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+5
   //SEG149 debug_print::print_sbyte_pos9
@@ -11120,7 +11161,7 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG154 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#12 [phi:debug_print::print_sbyte_pos9->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG155 debug_print::@11
+  //SEG155 debug_print::@9
   //SEG156 [82] (signed byte) debug_print::print_sbyte_pos10_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 6) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+6
   //SEG157 debug_print::print_sbyte_pos10
@@ -11134,7 +11175,7 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG162 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#13 [phi:debug_print::print_sbyte_pos10->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG163 debug_print::@12
+  //SEG163 debug_print::@10
   //SEG164 [85] (signed byte) debug_print::print_sbyte_pos11_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 7) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+7
   //SEG165 debug_print::print_sbyte_pos11
@@ -11148,7 +11189,7 @@ debug_print: {
     sta print_sbyte_at.at+1
   //SEG170 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#14 [phi:debug_print::print_sbyte_pos11->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG171 debug_print::@13
+  //SEG171 debug_print::@11
   //SEG172 [88] (signed byte) debug_print::print_sbyte_pos12_sb#0 ← *((const signed byte[9]) rotation_matrix#0+(byte/signed byte/word/signed word/dword/signed dword) 8) -- vbsxx=_deref_pbsc1 
     ldx rotation_matrix+8
   //SEG173 debug_print::print_sbyte_pos12
@@ -11169,9 +11210,9 @@ debug_print: {
   //SEG181 [91] phi (byte) debug_print::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:debug_print::print_sbyte_pos12->debug_print::@1#1] -- vbuz1=vbuc1 
     lda #4
     sta c
-  //SEG182 [91] phi from debug_print::@32 to debug_print::@1 [phi:debug_print::@32->debug_print::@1]
-  //SEG183 [91] phi (byte) debug_print::i#2 = (byte) debug_print::i#1 [phi:debug_print::@32->debug_print::@1#0] -- register_copy 
-  //SEG184 [91] phi (byte) debug_print::c#2 = (byte) debug_print::c#1 [phi:debug_print::@32->debug_print::@1#1] -- register_copy 
+  //SEG182 [91] phi from debug_print::@17 to debug_print::@1 [phi:debug_print::@17->debug_print::@1]
+  //SEG183 [91] phi (byte) debug_print::i#2 = (byte) debug_print::i#1 [phi:debug_print::@17->debug_print::@1#0] -- register_copy 
+  //SEG184 [91] phi (byte) debug_print::c#2 = (byte) debug_print::c#1 [phi:debug_print::@17->debug_print::@1#1] -- register_copy 
   //SEG185 debug_print::@1
   b1:
   //SEG186 [92] (byte*) print_sbyte_at::at#15 ← (const byte*) debug_print::at_line#0 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
@@ -11190,7 +11231,7 @@ debug_print: {
   //SEG190 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#15 [phi:debug_print::@1->print_sbyte_at#0] -- register_copy 
   //SEG191 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#16 [phi:debug_print::@1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG192 debug_print::@27
+  //SEG192 debug_print::@12
   //SEG193 [95] (byte*) print_sbyte_at::at#16 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -11203,11 +11244,11 @@ debug_print: {
     ldy i
     ldx yrs,y
   //SEG195 [97] call print_sbyte_at 
-  //SEG196 [114] phi from debug_print::@27 to print_sbyte_at [phi:debug_print::@27->print_sbyte_at]
-  //SEG197 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#16 [phi:debug_print::@27->print_sbyte_at#0] -- register_copy 
-  //SEG198 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#17 [phi:debug_print::@27->print_sbyte_at#1] -- register_copy 
+  //SEG196 [114] phi from debug_print::@12 to print_sbyte_at [phi:debug_print::@12->print_sbyte_at]
+  //SEG197 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#16 [phi:debug_print::@12->print_sbyte_at#0] -- register_copy 
+  //SEG198 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#17 [phi:debug_print::@12->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG199 debug_print::@28
+  //SEG199 debug_print::@13
   //SEG200 [98] (byte*) print_sbyte_at::at#17 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -11220,11 +11261,11 @@ debug_print: {
     ldy i
     ldx zrs,y
   //SEG202 [100] call print_sbyte_at 
-  //SEG203 [114] phi from debug_print::@28 to print_sbyte_at [phi:debug_print::@28->print_sbyte_at]
-  //SEG204 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#17 [phi:debug_print::@28->print_sbyte_at#0] -- register_copy 
-  //SEG205 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#18 [phi:debug_print::@28->print_sbyte_at#1] -- register_copy 
+  //SEG203 [114] phi from debug_print::@13 to print_sbyte_at [phi:debug_print::@13->print_sbyte_at]
+  //SEG204 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#17 [phi:debug_print::@13->print_sbyte_at#0] -- register_copy 
+  //SEG205 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#18 [phi:debug_print::@13->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG206 debug_print::@29
+  //SEG206 debug_print::@14
   //SEG207 [101] (byte*) print_sbyte_at::at#18 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 3 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -11237,11 +11278,11 @@ debug_print: {
     ldy i
     ldx pps,y
   //SEG209 [103] call print_sbyte_at 
-  //SEG210 [114] phi from debug_print::@29 to print_sbyte_at [phi:debug_print::@29->print_sbyte_at]
-  //SEG211 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#18 [phi:debug_print::@29->print_sbyte_at#0] -- register_copy 
-  //SEG212 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#19 [phi:debug_print::@29->print_sbyte_at#1] -- register_copy 
+  //SEG210 [114] phi from debug_print::@14 to print_sbyte_at [phi:debug_print::@14->print_sbyte_at]
+  //SEG211 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#18 [phi:debug_print::@14->print_sbyte_at#0] -- register_copy 
+  //SEG212 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#19 [phi:debug_print::@14->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG213 debug_print::@30
+  //SEG213 debug_print::@15
   //SEG214 [104] (byte*) print_sbyte_at::at#19 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 4 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -11254,11 +11295,11 @@ debug_print: {
     ldy i
     ldx xps,y
   //SEG216 [106] call print_sbyte_at 
-  //SEG217 [114] phi from debug_print::@30 to print_sbyte_at [phi:debug_print::@30->print_sbyte_at]
-  //SEG218 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#19 [phi:debug_print::@30->print_sbyte_at#0] -- register_copy 
-  //SEG219 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#20 [phi:debug_print::@30->print_sbyte_at#1] -- register_copy 
+  //SEG217 [114] phi from debug_print::@15 to print_sbyte_at [phi:debug_print::@15->print_sbyte_at]
+  //SEG218 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#19 [phi:debug_print::@15->print_sbyte_at#0] -- register_copy 
+  //SEG219 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#20 [phi:debug_print::@15->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG220 debug_print::@31
+  //SEG220 debug_print::@16
   //SEG221 [107] (byte*) print_sbyte_at::at#20 ← (const byte*) debug_print::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) debug_print::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -11271,11 +11312,11 @@ debug_print: {
     ldy i
     ldx yps,y
   //SEG223 [109] call print_sbyte_at 
-  //SEG224 [114] phi from debug_print::@31 to print_sbyte_at [phi:debug_print::@31->print_sbyte_at]
-  //SEG225 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#20 [phi:debug_print::@31->print_sbyte_at#0] -- register_copy 
-  //SEG226 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#21 [phi:debug_print::@31->print_sbyte_at#1] -- register_copy 
+  //SEG224 [114] phi from debug_print::@16 to print_sbyte_at [phi:debug_print::@16->print_sbyte_at]
+  //SEG225 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#20 [phi:debug_print::@16->print_sbyte_at#0] -- register_copy 
+  //SEG226 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#21 [phi:debug_print::@16->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG227 debug_print::@32
+  //SEG227 debug_print::@17
   //SEG228 [110] (byte) debug_print::c#1 ← (byte) debug_print::c#2 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax c
     axs #-[4]
@@ -11309,8 +11350,8 @@ print_sbyte_at: {
     lda #' '
     sta print_char_at.ch
     jsr print_char_at
-  //SEG241 [118] phi from print_sbyte_at::@3 print_sbyte_at::@5 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2]
-  //SEG242 [118] phi (signed byte) print_sbyte_at::b#24 = (signed byte) print_sbyte_at::b#22 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2#0] -- register_copy 
+  //SEG241 [118] phi from print_sbyte_at::@3 print_sbyte_at::@4 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2]
+  //SEG242 [118] phi (signed byte) print_sbyte_at::b#24 = (signed byte) print_sbyte_at::b#22 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2#0] -- register_copy 
   //SEG243 print_sbyte_at::@2
   b2:
   //SEG244 [119] (byte*) print_byte_at::at#0 ← (byte*) print_sbyte_at::at#21 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- pbuz1=pbuz1_plus_1 
@@ -11333,7 +11374,7 @@ print_sbyte_at: {
     lda #'-'
     sta print_char_at.ch
     jsr print_char_at
-  //SEG254 print_sbyte_at::@5
+  //SEG254 print_sbyte_at::@4
   //SEG255 [124] (signed byte) print_sbyte_at::b#0 ← - (signed byte) print_sbyte_at::b#22 -- vbsxx=_neg_vbsxx 
     txa
     eor #$ff
@@ -11783,191 +11824,191 @@ debug_print_init: {
   //SEG337 [190] call print_cls 
   //SEG338 [267] phi from debug_print_init to print_cls [phi:debug_print_init->print_cls]
     jsr print_cls
-  //SEG339 [191] phi from debug_print_init to debug_print_init::@5 [phi:debug_print_init->debug_print_init::@5]
-  //SEG340 debug_print_init::@5
+  //SEG339 [191] phi from debug_print_init to debug_print_init::@4 [phi:debug_print_init->debug_print_init::@4]
+  //SEG340 debug_print_init::@4
   //SEG341 [192] call print_str_at 
-  //SEG342 [260] phi from debug_print_init::@5 to print_str_at [phi:debug_print_init::@5->print_str_at]
-  //SEG343 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@5->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG342 [260] phi from debug_print_init::@4 to print_str_at [phi:debug_print_init::@4->print_str_at]
+  //SEG343 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@4->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$22
     sta print_str_at.at
     lda #>SCREEN+$22
     sta print_str_at.at+1
-  //SEG344 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str [phi:debug_print_init::@5->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG344 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str [phi:debug_print_init::@4->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str_at.str
     lda #>str
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG345 [193] phi from debug_print_init::@5 to debug_print_init::@6 [phi:debug_print_init::@5->debug_print_init::@6]
-  //SEG346 debug_print_init::@6
+  //SEG345 [193] phi from debug_print_init::@4 to debug_print_init::@5 [phi:debug_print_init::@4->debug_print_init::@5]
+  //SEG346 debug_print_init::@5
   //SEG347 [194] call print_str_at 
-  //SEG348 [260] phi from debug_print_init::@6 to print_str_at [phi:debug_print_init::@6->print_str_at]
-  //SEG349 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@6->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG348 [260] phi from debug_print_init::@5 to print_str_at [phi:debug_print_init::@5->print_str_at]
+  //SEG349 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@5->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*1+$22
     sta print_str_at.at
     lda #>SCREEN+$28*1+$22
     sta print_str_at.at+1
-  //SEG350 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str1 [phi:debug_print_init::@6->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG350 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str1 [phi:debug_print_init::@5->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str_at.str
     lda #>str1
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG351 [195] phi from debug_print_init::@6 to debug_print_init::@7 [phi:debug_print_init::@6->debug_print_init::@7]
-  //SEG352 debug_print_init::@7
+  //SEG351 [195] phi from debug_print_init::@5 to debug_print_init::@6 [phi:debug_print_init::@5->debug_print_init::@6]
+  //SEG352 debug_print_init::@6
   //SEG353 [196] call print_str_at 
-  //SEG354 [260] phi from debug_print_init::@7 to print_str_at [phi:debug_print_init::@7->print_str_at]
-  //SEG355 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@7->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG354 [260] phi from debug_print_init::@6 to print_str_at [phi:debug_print_init::@6->print_str_at]
+  //SEG355 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) $22 [phi:debug_print_init::@6->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*2+$22
     sta print_str_at.at
     lda #>SCREEN+$28*2+$22
     sta print_str_at.at+1
-  //SEG356 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str2 [phi:debug_print_init::@7->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG356 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str2 [phi:debug_print_init::@6->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str_at.str
     lda #>str2
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG357 [197] phi from debug_print_init::@7 to debug_print_init::@8 [phi:debug_print_init::@7->debug_print_init::@8]
-  //SEG358 debug_print_init::@8
+  //SEG357 [197] phi from debug_print_init::@6 to debug_print_init::@7 [phi:debug_print_init::@6->debug_print_init::@7]
+  //SEG358 debug_print_init::@7
   //SEG359 [198] call print_str_at 
-  //SEG360 [260] phi from debug_print_init::@8 to print_str_at [phi:debug_print_init::@8->print_str_at]
-  //SEG361 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:debug_print_init::@8->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG360 [260] phi from debug_print_init::@7 to print_str_at [phi:debug_print_init::@7->print_str_at]
+  //SEG361 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $10 [phi:debug_print_init::@7->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$10
     sta print_str_at.at
     lda #>SCREEN+$28*$10
     sta print_str_at.at+1
-  //SEG362 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str3 [phi:debug_print_init::@8->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG362 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str3 [phi:debug_print_init::@7->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str3
     sta print_str_at.str
     lda #>str3
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG363 [199] phi from debug_print_init::@8 to debug_print_init::@9 [phi:debug_print_init::@8->debug_print_init::@9]
-  //SEG364 debug_print_init::@9
+  //SEG363 [199] phi from debug_print_init::@7 to debug_print_init::@8 [phi:debug_print_init::@7->debug_print_init::@8]
+  //SEG364 debug_print_init::@8
   //SEG365 [200] call print_str_at 
-  //SEG366 [260] phi from debug_print_init::@9 to print_str_at [phi:debug_print_init::@9->print_str_at]
-  //SEG367 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $11 [phi:debug_print_init::@9->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG366 [260] phi from debug_print_init::@8 to print_str_at [phi:debug_print_init::@8->print_str_at]
+  //SEG367 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $11 [phi:debug_print_init::@8->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$11
     sta print_str_at.at
     lda #>SCREEN+$28*$11
     sta print_str_at.at+1
-  //SEG368 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str4 [phi:debug_print_init::@9->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG368 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str4 [phi:debug_print_init::@8->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str4
     sta print_str_at.str
     lda #>str4
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG369 [201] phi from debug_print_init::@9 to debug_print_init::@10 [phi:debug_print_init::@9->debug_print_init::@10]
-  //SEG370 debug_print_init::@10
+  //SEG369 [201] phi from debug_print_init::@8 to debug_print_init::@9 [phi:debug_print_init::@8->debug_print_init::@9]
+  //SEG370 debug_print_init::@9
   //SEG371 [202] call print_str_at 
-  //SEG372 [260] phi from debug_print_init::@10 to print_str_at [phi:debug_print_init::@10->print_str_at]
-  //SEG373 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $12 [phi:debug_print_init::@10->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG372 [260] phi from debug_print_init::@9 to print_str_at [phi:debug_print_init::@9->print_str_at]
+  //SEG373 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $12 [phi:debug_print_init::@9->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$12
     sta print_str_at.at
     lda #>SCREEN+$28*$12
     sta print_str_at.at+1
-  //SEG374 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str5 [phi:debug_print_init::@10->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG374 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str5 [phi:debug_print_init::@9->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str5
     sta print_str_at.str
     lda #>str5
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG375 [203] phi from debug_print_init::@10 to debug_print_init::@11 [phi:debug_print_init::@10->debug_print_init::@11]
-  //SEG376 debug_print_init::@11
+  //SEG375 [203] phi from debug_print_init::@9 to debug_print_init::@10 [phi:debug_print_init::@9->debug_print_init::@10]
+  //SEG376 debug_print_init::@10
   //SEG377 [204] call print_str_at 
-  //SEG378 [260] phi from debug_print_init::@11 to print_str_at [phi:debug_print_init::@11->print_str_at]
-  //SEG379 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13 [phi:debug_print_init::@11->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG378 [260] phi from debug_print_init::@10 to print_str_at [phi:debug_print_init::@10->print_str_at]
+  //SEG379 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $13 [phi:debug_print_init::@10->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$13
     sta print_str_at.at
     lda #>SCREEN+$28*$13
     sta print_str_at.at+1
-  //SEG380 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str6 [phi:debug_print_init::@11->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG380 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str6 [phi:debug_print_init::@10->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str6
     sta print_str_at.str
     lda #>str6
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG381 [205] phi from debug_print_init::@11 to debug_print_init::@12 [phi:debug_print_init::@11->debug_print_init::@12]
-  //SEG382 debug_print_init::@12
+  //SEG381 [205] phi from debug_print_init::@10 to debug_print_init::@11 [phi:debug_print_init::@10->debug_print_init::@11]
+  //SEG382 debug_print_init::@11
   //SEG383 [206] call print_str_at 
-  //SEG384 [260] phi from debug_print_init::@12 to print_str_at [phi:debug_print_init::@12->print_str_at]
-  //SEG385 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:debug_print_init::@12->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG384 [260] phi from debug_print_init::@11 to print_str_at [phi:debug_print_init::@11->print_str_at]
+  //SEG385 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:debug_print_init::@11->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$14
     sta print_str_at.at
     lda #>SCREEN+$28*$14
     sta print_str_at.at+1
-  //SEG386 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str7 [phi:debug_print_init::@12->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG386 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str7 [phi:debug_print_init::@11->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str7
     sta print_str_at.str
     lda #>str7
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG387 [207] phi from debug_print_init::@12 to debug_print_init::@13 [phi:debug_print_init::@12->debug_print_init::@13]
-  //SEG388 debug_print_init::@13
+  //SEG387 [207] phi from debug_print_init::@11 to debug_print_init::@12 [phi:debug_print_init::@11->debug_print_init::@12]
+  //SEG388 debug_print_init::@12
   //SEG389 [208] call print_str_at 
-  //SEG390 [260] phi from debug_print_init::@13 to print_str_at [phi:debug_print_init::@13->print_str_at]
-  //SEG391 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $15 [phi:debug_print_init::@13->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG390 [260] phi from debug_print_init::@12 to print_str_at [phi:debug_print_init::@12->print_str_at]
+  //SEG391 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $15 [phi:debug_print_init::@12->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$15
     sta print_str_at.at
     lda #>SCREEN+$28*$15
     sta print_str_at.at+1
-  //SEG392 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str8 [phi:debug_print_init::@13->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG392 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str8 [phi:debug_print_init::@12->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str8
     sta print_str_at.str
     lda #>str8
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG393 [209] phi from debug_print_init::@13 to debug_print_init::@14 [phi:debug_print_init::@13->debug_print_init::@14]
-  //SEG394 debug_print_init::@14
+  //SEG393 [209] phi from debug_print_init::@12 to debug_print_init::@13 [phi:debug_print_init::@12->debug_print_init::@13]
+  //SEG394 debug_print_init::@13
   //SEG395 [210] call print_str_at 
-  //SEG396 [260] phi from debug_print_init::@14 to print_str_at [phi:debug_print_init::@14->print_str_at]
-  //SEG397 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $16 [phi:debug_print_init::@14->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG396 [260] phi from debug_print_init::@13 to print_str_at [phi:debug_print_init::@13->print_str_at]
+  //SEG397 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $16 [phi:debug_print_init::@13->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$16
     sta print_str_at.at
     lda #>SCREEN+$28*$16
     sta print_str_at.at+1
-  //SEG398 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str9 [phi:debug_print_init::@14->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG398 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str9 [phi:debug_print_init::@13->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str9
     sta print_str_at.str
     lda #>str9
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG399 [211] phi from debug_print_init::@14 to debug_print_init::@15 [phi:debug_print_init::@14->debug_print_init::@15]
-  //SEG400 debug_print_init::@15
+  //SEG399 [211] phi from debug_print_init::@13 to debug_print_init::@14 [phi:debug_print_init::@13->debug_print_init::@14]
+  //SEG400 debug_print_init::@14
   //SEG401 [212] call print_str_at 
-  //SEG402 [260] phi from debug_print_init::@15 to print_str_at [phi:debug_print_init::@15->print_str_at]
-  //SEG403 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $17 [phi:debug_print_init::@15->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG402 [260] phi from debug_print_init::@14 to print_str_at [phi:debug_print_init::@14->print_str_at]
+  //SEG403 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $17 [phi:debug_print_init::@14->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$17
     sta print_str_at.at
     lda #>SCREEN+$28*$17
     sta print_str_at.at+1
-  //SEG404 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str10 [phi:debug_print_init::@15->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG404 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str10 [phi:debug_print_init::@14->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str10
     sta print_str_at.str
     lda #>str10
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG405 [213] phi from debug_print_init::@15 to debug_print_init::@16 [phi:debug_print_init::@15->debug_print_init::@16]
-  //SEG406 debug_print_init::@16
+  //SEG405 [213] phi from debug_print_init::@14 to debug_print_init::@15 [phi:debug_print_init::@14->debug_print_init::@15]
+  //SEG406 debug_print_init::@15
   //SEG407 [214] call print_str_at 
-  //SEG408 [260] phi from debug_print_init::@16 to print_str_at [phi:debug_print_init::@16->print_str_at]
-  //SEG409 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18 [phi:debug_print_init::@16->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG408 [260] phi from debug_print_init::@15 to print_str_at [phi:debug_print_init::@15->print_str_at]
+  //SEG409 [260] phi (byte*) print_str_at::at#15 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18 [phi:debug_print_init::@15->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28*$18
     sta print_str_at.at
     lda #>SCREEN+$28*$18
     sta print_str_at.at+1
-  //SEG410 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str11 [phi:debug_print_init::@16->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG410 [260] phi (byte*) print_str_at::str#15 = (const string) debug_print_init::str11 [phi:debug_print_init::@15->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str11
     sta print_str_at.str
     lda #>str11
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG411 [215] phi from debug_print_init::@16 to debug_print_init::@1 [phi:debug_print_init::@16->debug_print_init::@1]
-  //SEG412 [215] phi (byte) debug_print_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@16->debug_print_init::@1#0] -- vbuz1=vbuc1 
+  //SEG411 [215] phi from debug_print_init::@15 to debug_print_init::@1 [phi:debug_print_init::@15->debug_print_init::@1]
+  //SEG412 [215] phi (byte) debug_print_init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@15->debug_print_init::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG413 [215] phi (byte) debug_print_init::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:debug_print_init::@16->debug_print_init::@1#1] -- vbuz1=vbuc1 
+  //SEG413 [215] phi (byte) debug_print_init::c#2 = (byte/signed byte/word/signed word/dword/signed dword) 4 [phi:debug_print_init::@15->debug_print_init::@1#1] -- vbuz1=vbuc1 
     lda #4
     sta c
   //SEG414 [215] phi from debug_print_init::@3 to debug_print_init::@1 [phi:debug_print_init::@3->debug_print_init::@1]
@@ -11991,7 +12032,7 @@ debug_print_init: {
   //SEG422 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#0 [phi:debug_print_init::@1->print_sbyte_at#0] -- register_copy 
   //SEG423 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#1 [phi:debug_print_init::@1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG424 debug_print_init::@18
+  //SEG424 debug_print_init::@16
   //SEG425 [219] (byte*) print_sbyte_at::at#1 ← (const byte*) debug_print_init::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) debug_print_init::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -12004,11 +12045,11 @@ debug_print_init: {
     ldy i
     ldx ys,y
   //SEG427 [221] call print_sbyte_at 
-  //SEG428 [114] phi from debug_print_init::@18 to print_sbyte_at [phi:debug_print_init::@18->print_sbyte_at]
-  //SEG429 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#1 [phi:debug_print_init::@18->print_sbyte_at#0] -- register_copy 
-  //SEG430 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#2 [phi:debug_print_init::@18->print_sbyte_at#1] -- register_copy 
+  //SEG428 [114] phi from debug_print_init::@16 to print_sbyte_at [phi:debug_print_init::@16->print_sbyte_at]
+  //SEG429 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#1 [phi:debug_print_init::@16->print_sbyte_at#0] -- register_copy 
+  //SEG430 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#2 [phi:debug_print_init::@16->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG431 debug_print_init::@19
+  //SEG431 debug_print_init::@17
   //SEG432 [222] (byte*) print_sbyte_at::at#2 ← (const byte*) debug_print_init::at_line#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) debug_print_init::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -12021,12 +12062,12 @@ debug_print_init: {
     ldy i
     ldx zs,y
   //SEG434 [224] call print_sbyte_at 
-  //SEG435 [114] phi from debug_print_init::@19 to print_sbyte_at [phi:debug_print_init::@19->print_sbyte_at]
-  //SEG436 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#2 [phi:debug_print_init::@19->print_sbyte_at#0] -- register_copy 
-  //SEG437 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#3 [phi:debug_print_init::@19->print_sbyte_at#1] -- register_copy 
+  //SEG435 [114] phi from debug_print_init::@17 to print_sbyte_at [phi:debug_print_init::@17->print_sbyte_at]
+  //SEG436 [114] phi (byte*) print_sbyte_at::at#21 = (byte*) print_sbyte_at::at#2 [phi:debug_print_init::@17->print_sbyte_at#0] -- register_copy 
+  //SEG437 [114] phi (signed byte) print_sbyte_at::b#22 = (signed byte) print_sbyte_at::b#3 [phi:debug_print_init::@17->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG438 [225] phi from debug_print_init::@19 to debug_print_init::@2 [phi:debug_print_init::@19->debug_print_init::@2]
-  //SEG439 [225] phi (byte) debug_print_init::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@19->debug_print_init::@2#0] -- vbuz1=vbuc1 
+  //SEG438 [225] phi from debug_print_init::@17 to debug_print_init::@2 [phi:debug_print_init::@17->debug_print_init::@2]
+  //SEG439 [225] phi (byte) debug_print_init::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:debug_print_init::@17->debug_print_init::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta j
   //SEG440 [225] phi from debug_print_init::@2 to debug_print_init::@2 [phi:debug_print_init::@2->debug_print_init::@2]
diff --git a/src/test/ref/examples/3d/3d.sym b/src/test/ref/examples/3d/3d.sym
index daa2b74e7..3cde59e6c 100644
--- a/src/test/ref/examples/3d/3d.sym
+++ b/src/test/ref/examples/3d/3d.sym
@@ -1,4 +1,4 @@
-(label) @33
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -119,14 +119,14 @@
 (byte/word/signed word/dword/signed dword~) anim::$10 reg byte a 202.0
 (byte/word/signed word/dword/signed dword~) anim::$8 reg byte a 202.0
 (label) anim::@1
-(label) anim::@12
-(label) anim::@14
-(label) anim::@15
-(label) anim::@16
-(label) anim::@27
-(label) anim::@29
-(label) anim::@30
+(label) anim::@10
+(label) anim::@2
+(label) anim::@3
+(label) anim::@4
+(label) anim::@5
 (label) anim::@6
+(label) anim::@7
+(label) anim::@8
 (label) anim::@9
 (byte) anim::i
 (byte) anim::i#1 i zp ZP_BYTE:4 151.5
@@ -191,13 +191,13 @@
 (label) debug_print::@11
 (label) debug_print::@12
 (label) debug_print::@13
-(label) debug_print::@27
-(label) debug_print::@28
-(label) debug_print::@29
+(label) debug_print::@14
+(label) debug_print::@15
+(label) debug_print::@16
+(label) debug_print::@17
+(label) debug_print::@2
 (label) debug_print::@3
-(label) debug_print::@30
-(label) debug_print::@31
-(label) debug_print::@32
+(label) debug_print::@4
 (label) debug_print::@5
 (label) debug_print::@6
 (label) debug_print::@7
@@ -358,10 +358,10 @@
 (label) debug_print_init::@14
 (label) debug_print_init::@15
 (label) debug_print_init::@16
-(label) debug_print_init::@18
-(label) debug_print_init::@19
+(label) debug_print_init::@17
 (label) debug_print_init::@2
 (label) debug_print_init::@3
+(label) debug_print_init::@4
 (label) debug_print_init::@5
 (label) debug_print_init::@6
 (label) debug_print_init::@7
@@ -444,7 +444,7 @@
 (label) print_sbyte_at::@1
 (label) print_sbyte_at::@2
 (label) print_sbyte_at::@3
-(label) print_sbyte_at::@5
+(label) print_sbyte_at::@4
 (label) print_sbyte_at::@return
 (byte*) print_sbyte_at::at
 (byte*) print_sbyte_at::at#0 at zp ZP_WORD:6 11.0
diff --git a/src/test/ref/examples/3d/perspective.cfg b/src/test/ref/examples/3d/perspective.cfg
index 9a5911f8a..2376bbe7c 100644
--- a/src/test/ref/examples/3d/perspective.cfg
+++ b/src/test/ref/examples/3d/perspective.cfg
@@ -1,7 +1,7 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@27
-@27: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const signed byte*) PERSP_Z#0) {{ {
     .var d = 256.0	
     .var z0 = 5.0	
@@ -16,9 +16,9 @@
  }}
   [2] call main 
   to:@end
-@end: scope:[]  from @27
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @27
+main: scope:[main]  from @1
   asm { sei  }
   [5] call mulf_init 
   to:main::@1
@@ -158,8 +158,8 @@ print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [70] phi()
   [71] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [72] (signed byte) print_sbyte::b#6 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#4 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [72] (signed byte) print_sbyte::b#6 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#4 )
   [73] (byte~) print_byte::b#7 ← (byte)(signed byte) print_sbyte::b#6
   [74] call print_byte 
   to:print_sbyte::@return
@@ -169,8 +169,8 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [76] phi()
   [77] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [78] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#4
   to:print_sbyte::@2
 print_cls: scope:[print_cls]  from main::@1
diff --git a/src/test/ref/examples/3d/perspective.log b/src/test/ref/examples/3d/perspective.log
index 21dd83ce2..f5aabcda5 100644
--- a/src/test/ref/examples/3d/perspective.log
+++ b/src/test/ref/examples/3d/perspective.log
@@ -1358,6 +1358,8 @@ Coalesced down to 10 phi equivalence classes
 Culled Empty Block (label) print_ln::@3
 Culled Empty Block (label) print_cls::@3
 Culled Empty Block (label) mulf_init::@3
+Renumbering block @27 to @1
+Renumbering block print_sbyte::@5 to print_sbyte::@4
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::@2
@@ -1381,8 +1383,8 @@ Adding NOP phi() at start of mulf_init
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@27
-@27: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const signed byte*) PERSP_Z#0) {{ {
     .var d = 256.0	
     .var z0 = 5.0	
@@ -1397,9 +1399,9 @@ FINAL CONTROL FLOW GRAPH
  }}
   [2] call main 
   to:@end
-@end: scope:[]  from @27
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @27
+main: scope:[main]  from @1
   asm { sei  }
   [5] call mulf_init 
   to:main::@1
@@ -1539,8 +1541,8 @@ print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [70] phi()
   [71] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [72] (signed byte) print_sbyte::b#6 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#4 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [72] (signed byte) print_sbyte::b#6 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#4 )
   [73] (byte~) print_byte::b#7 ← (byte)(signed byte) print_sbyte::b#6
   [74] call print_byte 
   to:print_sbyte::@return
@@ -1550,8 +1552,8 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [76] phi()
   [77] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [78] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#4
   to:print_sbyte::@2
 print_cls: scope:[print_cls]  from main::@1
@@ -1828,14 +1830,14 @@ INITIAL ASM
   .label print_line_cursor = 2
 //SEG3 @begin
 bbegin:
-  jmp b27
-//SEG4 @27
-b27:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const signed byte*) PERSP_Z#0) {{ {     .var d = 256.0	     .var z0 = 5.0	     .for(var z=0;z<$100;z++) {     	.if(z>127) {     		.byte round(d / (z0 - ((z - 256) / 64.0)));     	} else {     		.byte round(d / (z0 - (z / 64.0)));     	}     } 	}  }}
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @27 to @end [phi:@27->@end]
-bend_from_b27:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -2268,10 +2270,10 @@ print_sbyte: {
     lda #' '
     sta print_char.ch
     jsr print_char
-  //SEG153 [72] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG153 [72] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG154 [72] phi (signed byte) print_sbyte::b#6 = (signed byte) print_sbyte::b#4 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG154 [72] phi (signed byte) print_sbyte::b#6 = (signed byte) print_sbyte::b#4 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG155 print_sbyte::@2
   b2:
@@ -2302,16 +2304,16 @@ print_sbyte: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b5
-  //SEG169 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG169 print_sbyte::@4
+  b4:
   //SEG170 [78] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#4 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG171 print_cls
 // Clear the screen. Also resets current line/char cursor.
@@ -2647,14 +2649,14 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 2
 //SEG3 @begin
 bbegin:
-  jmp b27
-//SEG4 @27
-b27:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const signed byte*) PERSP_Z#0) {{ {     .var d = 256.0	     .var z0 = 5.0	     .for(var z=0;z<$100;z++) {     	.if(z>127) {     		.byte round(d / (z0 - ((z - 256) / 64.0)));     	} else {     		.byte round(d / (z0 - (z / 64.0)));     	}     } 	}  }}
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @27 to @end [phi:@27->@end]
-bend_from_b27:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -3070,10 +3072,10 @@ print_sbyte: {
   //SEG152 [59] phi (byte) print_char::ch#4 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG153 [72] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG153 [72] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG154 [72] phi (signed byte) print_sbyte::b#6 = (signed byte) print_sbyte::b#4 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG154 [72] phi (signed byte) print_sbyte::b#6 = (signed byte) print_sbyte::b#4 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG155 print_sbyte::@2
   b2:
@@ -3101,16 +3103,16 @@ print_sbyte: {
   //SEG168 [59] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b5
-  //SEG169 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG169 print_sbyte::@4
+  b4:
   //SEG170 [78] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#4 -- vbsxx=_neg_vbsxx 
     txa
     eor #$ff
     clc
     adc #1
     tax
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG171 print_cls
 // Clear the screen. Also resets current line/char cursor.
@@ -3288,7 +3290,7 @@ mulf_init: {
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b27
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -3318,7 +3320,7 @@ Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -3338,12 +3340,12 @@ Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_print_sbyte with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b27:
-Removing instruction bend_from_b27:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Removing instruction b2_from_b1:
 Removing instruction do_perspective_from_b2:
 Removing instruction b1_from_do_perspective:
@@ -3371,7 +3373,7 @@ Removing instruction b1_from_b2:
 Removing instruction b3_from_print_sbyte:
 Removing instruction print_char_from_b3:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction print_byte_from_b2:
 Removing instruction b1_from_print_sbyte:
 Removing instruction print_char_from_b1:
@@ -3411,7 +3413,7 @@ Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b3:
 Removing instruction breturn:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
 Removing instruction b1_from_mulf_init:
@@ -3428,7 +3430,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @27
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -3608,7 +3610,7 @@ FINAL SYMBOL TABLE
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 reg byte x 4.0
@@ -3674,10 +3676,10 @@ Score: 3739
   .label print_char_cursor = 4
   .label print_line_cursor = 2
 //SEG3 @begin
-//SEG4 @27
+//SEG4 @1
 //SEG5 kickasm(location (const signed byte*) PERSP_Z#0) {{ {     .var d = 256.0	     .var z0 = 5.0	     .for(var z=0;z<$100;z++) {     	.if(z>127) {     		.byte round(d / (z0 - ((z - 256) / 64.0)));     	} else {     		.byte round(d / (z0 - (z / 64.0)));     	}     } 	}  }}
 //SEG6 [2] call main 
-//SEG7 [3] phi from @27 to @end [phi:@27->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -4006,8 +4008,8 @@ print_sbyte: {
   //SEG152 [59] phi (byte) print_char::ch#4 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG153 [72] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
-  //SEG154 [72] phi (signed byte) print_sbyte::b#6 = (signed byte) print_sbyte::b#4 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  //SEG153 [72] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
+  //SEG154 [72] phi (signed byte) print_sbyte::b#6 = (signed byte) print_sbyte::b#4 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
   //SEG155 print_sbyte::@2
   b2:
   //SEG156 [73] (byte~) print_byte::b#7 ← (byte)(signed byte) print_sbyte::b#6
@@ -4028,7 +4030,7 @@ print_sbyte: {
   //SEG168 [59] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG169 print_sbyte::@5
+  //SEG169 print_sbyte::@4
   //SEG170 [78] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#4 -- vbsxx=_neg_vbsxx 
     txa
     eor #$ff
diff --git a/src/test/ref/examples/3d/perspective.sym b/src/test/ref/examples/3d/perspective.sym
index 01c240a2f..6b25a9960 100644
--- a/src/test/ref/examples/3d/perspective.sym
+++ b/src/test/ref/examples/3d/perspective.sym
@@ -1,4 +1,4 @@
-(label) @27
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -178,7 +178,7 @@
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 reg byte x 4.0
diff --git a/src/test/ref/examples/bresenham/bitmap-bresenham.asm b/src/test/ref/examples/bresenham/bitmap-bresenham.asm
index 2c7cc6bf0..a5a9862b2 100644
--- a/src/test/ref/examples/bresenham/bitmap-bresenham.asm
+++ b/src/test/ref/examples/bresenham/bitmap-bresenham.asm
@@ -64,7 +64,7 @@ bitmap_line: {
     tya
     cmp y0
     beq !+
-    bcs b10
+    bcs b7
   !:
     tya
     eor #$ff
@@ -72,31 +72,31 @@ bitmap_line: {
     adc y0
     sta yd
     cmp xd
-    bcc b11
+    bcc b8
     sty bitmap_line_ydxi.y
     ldx x1
     jsr bitmap_line_ydxi
   breturn:
     rts
-  b11:
+  b8:
     ldx x1
     sty bitmap_line_xdyi.y
     jsr bitmap_line_xdyi
     jmp breturn
-  b10:
+  b7:
     tya
     sec
     sbc y0
     sta yd
     cmp xd
-    bcc b15
+    bcc b9
     lda y0
     sta bitmap_line_ydxd.y
     ldx x0
     sty bitmap_line_ydxd.y1
     jsr bitmap_line_ydxd
     jmp breturn
-  b15:
+  b9:
     ldx x1
     sty bitmap_line_xdyd.y
     lda x0
@@ -111,7 +111,7 @@ bitmap_line: {
     tya
     cmp y0
     beq !+
-    bcs b20
+    bcs b11
   !:
     tya
     eor #$ff
@@ -119,29 +119,29 @@ bitmap_line: {
     adc y0
     sta yd
     cmp xd
-    bcc b21
+    bcc b12
     sty bitmap_line_ydxd.y
     ldx x1
     jsr bitmap_line_ydxd
     jmp breturn
-  b21:
+  b12:
     ldx x0
     jsr bitmap_line_xdyd
     jmp breturn
-  b20:
+  b11:
     tya
     sec
     sbc y0
     sta yd
     cmp xd
-    bcc b25
+    bcc b13
     lda y0
     sta bitmap_line_ydxi.y
     ldx x0
     sty bitmap_line_ydxi.y1
     jsr bitmap_line_ydxi
     jmp breturn
-  b25:
+  b13:
     ldx x0
     lda x1
     sta bitmap_line_xdyi.x1
@@ -390,7 +390,7 @@ bitmap_init: {
     sta yoffs
     sta yoffs+1
     tax
-  b5:
+  b3:
     lda #7
     sax _6
     lda yoffs
@@ -401,7 +401,7 @@ bitmap_init: {
     txa
     and #7
     cmp #7
-    bne b6
+    bne b4
     clc
     lda yoffs
     adc #<$28*8
@@ -409,10 +409,10 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  b6:
+  b4:
     inx
     cpx #0
-    bne b5
+    bne b3
     rts
 }
   // Tables for the plotter - initialized by calling bitmap_draw_init();
diff --git a/src/test/ref/examples/bresenham/bitmap-bresenham.cfg b/src/test/ref/examples/bresenham/bitmap-bresenham.cfg
index 5fbe2ea35..fa48e23ba 100644
--- a/src/test/ref/examples/bresenham/bitmap-bresenham.cfg
+++ b/src/test/ref/examples/bresenham/bitmap-bresenham.cfg
@@ -1,61 +1,61 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@15
-@15: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @15
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @15
+main: scope:[main]  from @1
   [4] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [5] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [6] *((const byte*) D011#0) ← (const byte) VIC_BMM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [7] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) SCREEN#0&(word/signed word/dword/signed dword) $3fff/(byte/signed byte/word/signed word/dword/signed dword) $40|((word))(const byte*) BITMAP#0&(word/signed word/dword/signed dword) $3fff/(word/signed word/dword/signed dword) $400
   [8] call bitmap_init 
-  to:main::@3
-main::@3: scope:[main]  from main
+  to:main::@2
+main::@2: scope:[main]  from main
   [9] phi()
   [10] call bitmap_clear 
-  to:main::@4
-main::@4: scope:[main]  from main::@3
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [11] phi()
   [12] call init_screen 
   to:main::@1
-main::@1: scope:[main]  from main::@1 main::@4
+main::@1: scope:[main]  from main::@1 main::@3
   [13] phi()
   [14] call lines 
   to:main::@1
 lines: scope:[lines]  from main::@1
   [15] phi()
   to:lines::@1
-lines::@1: scope:[lines]  from lines lines::@3
-  [16] (byte) lines::l#2 ← phi( lines/(byte/signed byte/word/signed word/dword/signed dword) 0 lines::@3/(byte) lines::l#1 )
+lines::@1: scope:[lines]  from lines lines::@2
+  [16] (byte) lines::l#2 ← phi( lines/(byte/signed byte/word/signed word/dword/signed dword) 0 lines::@2/(byte) lines::l#1 )
   [17] (byte) bitmap_line::x0#0 ← *((const byte[]) lines_x#0 + (byte) lines::l#2)
   [18] (byte) bitmap_line::x1#0 ← *((const byte[]) lines_x#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) lines::l#2)
   [19] (byte) bitmap_line::y0#0 ← *((const byte[]) lines_y#0 + (byte) lines::l#2)
   [20] (byte) bitmap_line::y1#0 ← *((const byte[]) lines_y#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) lines::l#2)
   [21] call bitmap_line 
-  to:lines::@3
-lines::@3: scope:[lines]  from lines::@1
+  to:lines::@2
+lines::@2: scope:[lines]  from lines::@1
   [22] (byte) lines::l#1 ← ++ (byte) lines::l#2
   [23] if((byte) lines::l#1<(const byte) lines_cnt#0) goto lines::@1
   to:lines::@return
-lines::@return: scope:[lines]  from lines::@3
+lines::@return: scope:[lines]  from lines::@2
   [24] return 
   to:@return
 bitmap_line: scope:[bitmap_line]  from lines::@1
   [25] if((byte) bitmap_line::x0#0<(byte) bitmap_line::x1#0) goto bitmap_line::@1
-  to:bitmap_line::@3
-bitmap_line::@3: scope:[bitmap_line]  from bitmap_line
+  to:bitmap_line::@2
+bitmap_line::@2: scope:[bitmap_line]  from bitmap_line
   [26] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0
-  [27] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10
+  [27] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7
+  to:bitmap_line::@3
+bitmap_line::@3: scope:[bitmap_line]  from bitmap_line::@2
+  [28] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
+  [29] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8
   to:bitmap_line::@4
 bitmap_line::@4: scope:[bitmap_line]  from bitmap_line::@3
-  [28] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [29] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11
-  to:bitmap_line::@5
-bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [30] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0
   [31] (byte) bitmap_line_ydxi::x#0 ← (byte) bitmap_line::x1#0
   [32] (byte) bitmap_line_ydxi::y1#0 ← (byte) bitmap_line::y0#0
@@ -63,10 +63,10 @@ bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [34] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   [35] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@11 bitmap_line::@15 bitmap_line::@17 bitmap_line::@21 bitmap_line::@25 bitmap_line::@27 bitmap_line::@5 bitmap_line::@8
+bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@10 bitmap_line::@12 bitmap_line::@13 bitmap_line::@14 bitmap_line::@4 bitmap_line::@6 bitmap_line::@8 bitmap_line::@9
   [36] return 
   to:@return
-bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
+bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@3
   [37] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0
   [38] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0
   [39] (byte) bitmap_line_xdyi::x1#0 ← (byte) bitmap_line::x0#0
@@ -74,11 +74,11 @@ bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
   [41] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2
   [42] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@3
+bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@2
   [43] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [44] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15
-  to:bitmap_line::@17
-bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
+  [44] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9
+  to:bitmap_line::@10
+bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@7
   [45] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0
   [46] (byte) bitmap_line_ydxd::x#0 ← (byte) bitmap_line::x0#0
   [47] (byte) bitmap_line_ydxd::y1#0 ← (byte) bitmap_line::y1#0
@@ -86,7 +86,7 @@ bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
   [49] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   [50] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
+bitmap_line::@9: scope:[bitmap_line]  from bitmap_line::@7
   [51] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0
   [52] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0
   [53] (byte) bitmap_line_xdyd::x1#0 ← (byte) bitmap_line::x0#0
@@ -96,13 +96,13 @@ bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
   to:bitmap_line::@return
 bitmap_line::@1: scope:[bitmap_line]  from bitmap_line
   [57] (byte) bitmap_line::xd#1 ← (byte) bitmap_line::x1#0 - (byte) bitmap_line::x0#0
-  [58] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20
-  to:bitmap_line::@7
-bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@1
+  [58] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11
+  to:bitmap_line::@5
+bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@1
   [59] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [60] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21
-  to:bitmap_line::@8
-bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
+  [60] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12
+  to:bitmap_line::@6
+bitmap_line::@6: scope:[bitmap_line]  from bitmap_line::@5
   [61] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0
   [62] (byte) bitmap_line_ydxd::x#1 ← (byte) bitmap_line::x1#0
   [63] (byte) bitmap_line_ydxd::y1#1 ← (byte) bitmap_line::y0#0
@@ -110,7 +110,7 @@ bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
   [65] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   [66] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
+bitmap_line::@12: scope:[bitmap_line]  from bitmap_line::@5
   [67] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0
   [68] (byte) bitmap_line_xdyd::y#1 ← (byte) bitmap_line::y0#0
   [69] (byte) bitmap_line_xdyd::x1#1 ← (byte) bitmap_line::x1#0
@@ -118,11 +118,11 @@ bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
   [71] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10
   [72] call bitmap_line_xdyd 
   to:bitmap_line::@return
-bitmap_line::@20: scope:[bitmap_line]  from bitmap_line::@1
+bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@1
   [73] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [74] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25
-  to:bitmap_line::@27
-bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
+  [74] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13
+  to:bitmap_line::@14
+bitmap_line::@14: scope:[bitmap_line]  from bitmap_line::@11
   [75] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0
   [76] (byte) bitmap_line_ydxi::x#1 ← (byte) bitmap_line::x0#0
   [77] (byte) bitmap_line_ydxi::y1#1 ← (byte) bitmap_line::y1#0
@@ -130,7 +130,7 @@ bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
   [79] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   [80] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
+bitmap_line::@13: scope:[bitmap_line]  from bitmap_line::@11
   [81] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0
   [82] (byte) bitmap_line_xdyi::y#1 ← (byte) bitmap_line::y0#0
   [83] (byte) bitmap_line_xdyi::x1#1 ← (byte) bitmap_line::x1#0
@@ -138,12 +138,12 @@ bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
   [85] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11
   [86] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@11 bitmap_line::@25
-  [87] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x1#1 )
-  [87] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::xd#1 )
-  [87] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::y#0 bitmap_line::@25/(byte) bitmap_line_xdyi::y#1 )
-  [87] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x#1 )
-  [87] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::yd#1 )
+bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@13 bitmap_line::@8
+  [87] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x1#1 )
+  [87] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::xd#1 )
+  [87] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::y#0 bitmap_line::@13/(byte) bitmap_line_xdyi::y#1 )
+  [87] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x#1 )
+  [87] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::yd#1 )
   [88] (byte) bitmap_line_xdyi::e#0 ← (byte) bitmap_line_xdyi::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyi::@1
 bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_line_xdyi::@2
@@ -153,19 +153,19 @@ bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_lin
   [90] (byte) bitmap_plot::x#0 ← (byte) bitmap_line_xdyi::x#3
   [91] (byte) bitmap_plot::y#0 ← (byte) bitmap_line_xdyi::y#3
   [92] call bitmap_plot 
-  to:bitmap_line_xdyi::@5
-bitmap_line_xdyi::@5: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
+  to:bitmap_line_xdyi::@4
+bitmap_line_xdyi::@4: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
   [93] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3
   [94] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2
   [95] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2
   to:bitmap_line_xdyi::@3
-bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@5
+bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@4
   [96] (byte) bitmap_line_xdyi::y#2 ← ++ (byte) bitmap_line_xdyi::y#3
   [97] (byte) bitmap_line_xdyi::e#2 ← (byte) bitmap_line_xdyi::e#1 - (byte) bitmap_line_xdyi::xd#5
   to:bitmap_line_xdyi::@2
-bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5
-  [98] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::e#1 )
-  [98] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::y#3 )
+bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4
+  [98] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::e#1 )
+  [98] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::y#3 )
   [99] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6 ← (byte) bitmap_line_xdyi::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [100] if((byte) bitmap_line_xdyi::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6) goto bitmap_line_xdyi::@1
   to:bitmap_line_xdyi::@return
@@ -184,12 +184,12 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line_xdyd::@1 bitmap_line_xdyi::@1
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [108] return 
   to:@return
-bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@27 bitmap_line::@5
-  [109] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y1#0 )
-  [109] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::yd#0 )
-  [109] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y#0 )
-  [109] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::x#1 bitmap_line::@5/(byte) bitmap_line_ydxi::x#0 )
-  [109] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::xd#0 )
+bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@14 bitmap_line::@4
+  [109] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y1#0 )
+  [109] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::yd#0 )
+  [109] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y#0 )
+  [109] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::x#1 bitmap_line::@4/(byte) bitmap_line_ydxi::x#0 )
+  [109] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::xd#0 )
   [110] (byte) bitmap_line_ydxi::e#0 ← (byte) bitmap_line_ydxi::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxi::@1
 bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_line_ydxi::@2
@@ -199,31 +199,31 @@ bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_lin
   [112] (byte) bitmap_plot::x#2 ← (byte) bitmap_line_ydxi::x#3
   [113] (byte) bitmap_plot::y#2 ← (byte) bitmap_line_ydxi::y#3
   [114] call bitmap_plot 
-  to:bitmap_line_ydxi::@5
-bitmap_line_ydxi::@5: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
+  to:bitmap_line_ydxi::@4
+bitmap_line_ydxi::@4: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
   [115] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3
   [116] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2
   [117] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2
   to:bitmap_line_ydxi::@3
-bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@5
+bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@4
   [118] (byte) bitmap_line_ydxi::x#2 ← ++ (byte) bitmap_line_ydxi::x#3
   [119] (byte) bitmap_line_ydxi::e#2 ← (byte) bitmap_line_ydxi::e#1 - (byte) bitmap_line_ydxi::yd#5
   to:bitmap_line_ydxi::@2
-bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5
-  [120] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::e#1 )
-  [120] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::x#3 )
+bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4
+  [120] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::e#1 )
+  [120] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::x#3 )
   [121] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6 ← (byte) bitmap_line_ydxi::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [122] if((byte) bitmap_line_ydxi::y#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6) goto bitmap_line_ydxi::@1
   to:bitmap_line_ydxi::@return
 bitmap_line_ydxi::@return: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@2
   [123] return 
   to:@return
-bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@15 bitmap_line::@21
-  [124] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x1#1 )
-  [124] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::xd#1 )
-  [124] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::y#0 bitmap_line::@21/(byte) bitmap_line_xdyd::y#1 )
-  [124] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x#1 )
-  [124] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::yd#1 )
+bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@12 bitmap_line::@9
+  [124] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x1#1 )
+  [124] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::xd#1 )
+  [124] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::y#0 bitmap_line::@12/(byte) bitmap_line_xdyd::y#1 )
+  [124] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x#1 )
+  [124] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::yd#1 )
   [125] (byte) bitmap_line_xdyd::e#0 ← (byte) bitmap_line_xdyd::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyd::@1
 bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_line_xdyd::@2
@@ -233,31 +233,31 @@ bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_lin
   [127] (byte) bitmap_plot::x#1 ← (byte) bitmap_line_xdyd::x#3
   [128] (byte) bitmap_plot::y#1 ← (byte) bitmap_line_xdyd::y#3
   [129] call bitmap_plot 
-  to:bitmap_line_xdyd::@5
-bitmap_line_xdyd::@5: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
+  to:bitmap_line_xdyd::@4
+bitmap_line_xdyd::@4: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
   [130] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3
   [131] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2
   [132] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2
   to:bitmap_line_xdyd::@3
-bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@5
+bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@4
   [133] (byte) bitmap_line_xdyd::y#2 ← -- (byte) bitmap_line_xdyd::y#3
   [134] (byte) bitmap_line_xdyd::e#2 ← (byte) bitmap_line_xdyd::e#1 - (byte) bitmap_line_xdyd::xd#5
   to:bitmap_line_xdyd::@2
-bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5
-  [135] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::e#1 )
-  [135] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::y#3 )
+bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4
+  [135] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::e#1 )
+  [135] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::y#3 )
   [136] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6 ← (byte) bitmap_line_xdyd::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [137] if((byte) bitmap_line_xdyd::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6) goto bitmap_line_xdyd::@1
   to:bitmap_line_xdyd::@return
 bitmap_line_xdyd::@return: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@2
   [138] return 
   to:@return
-bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@17 bitmap_line::@8
-  [139] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y1#1 )
-  [139] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::yd#1 )
-  [139] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y#1 )
-  [139] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::x#0 bitmap_line::@8/(byte) bitmap_line_ydxd::x#1 )
-  [139] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::xd#1 )
+bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@10 bitmap_line::@6
+  [139] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y1#1 )
+  [139] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::yd#1 )
+  [139] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y#1 )
+  [139] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::x#0 bitmap_line::@6/(byte) bitmap_line_ydxd::x#1 )
+  [139] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::xd#1 )
   [140] (byte) bitmap_line_ydxd::e#0 ← (byte) bitmap_line_ydxd::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxd::@1
 bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_line_ydxd::@2
@@ -267,26 +267,26 @@ bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_lin
   [142] (byte) bitmap_plot::x#3 ← (byte) bitmap_line_ydxd::x#3
   [143] (byte) bitmap_plot::y#3 ← (byte) bitmap_line_ydxd::y#2
   [144] call bitmap_plot 
-  to:bitmap_line_ydxd::@5
-bitmap_line_ydxd::@5: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
+  to:bitmap_line_ydxd::@4
+bitmap_line_ydxd::@4: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
   [145] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2
   [146] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2
   [147] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2
   to:bitmap_line_ydxd::@3
-bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@5
+bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@4
   [148] (byte) bitmap_line_ydxd::x#2 ← -- (byte) bitmap_line_ydxd::x#3
   [149] (byte) bitmap_line_ydxd::e#2 ← (byte) bitmap_line_ydxd::e#1 - (byte) bitmap_line_ydxd::yd#5
   to:bitmap_line_ydxd::@2
-bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5
-  [150] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::e#1 )
-  [150] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::x#3 )
+bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4
+  [150] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::e#1 )
+  [150] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::x#3 )
   [151] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6 ← (byte) bitmap_line_ydxd::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [152] if((byte) bitmap_line_ydxd::y#3!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6) goto bitmap_line_ydxd::@1
   to:bitmap_line_ydxd::@return
 bitmap_line_ydxd::@return: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@2
   [153] return 
   to:@return
-init_screen: scope:[init_screen]  from main::@4
+init_screen: scope:[init_screen]  from main::@3
   [154] phi()
   to:init_screen::@1
 init_screen::@1: scope:[init_screen]  from init_screen init_screen::@1
@@ -298,7 +298,7 @@ init_screen::@1: scope:[init_screen]  from init_screen init_screen::@1
 init_screen::@return: scope:[init_screen]  from init_screen::@1
   [159] return 
   to:@return
-bitmap_clear: scope:[bitmap_clear]  from main::@3
+bitmap_clear: scope:[bitmap_clear]  from main::@2
   [160] (word~) bitmap_clear::$3 ← *((const byte[$100]) bitmap_plot_xhi#0) w= *((const byte[$100]) bitmap_plot_xlo#0)
   [161] (byte*~) bitmap_clear::bitmap#5 ← (byte*)(word~) bitmap_clear::$3
   to:bitmap_clear::@1
@@ -332,16 +332,16 @@ bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
   [175] *((const byte[$100]) bitmap_plot_xhi#0 + (byte) bitmap_init::x#2) ← >(const byte*) BITMAP#0
   [176] *((const byte[$100]) bitmap_plot_bit#0 + (byte) bitmap_init::x#2) ← (byte) bitmap_init::bits#3
   [177] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [178] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10
+  [178] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6
   to:bitmap_init::@2
-bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@10
-  [179] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@10/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
+bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@6
+  [179] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@6/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
   [180] (byte) bitmap_init::x#1 ← ++ (byte) bitmap_init::x#2
   [181] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1
-  to:bitmap_init::@5
-bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
-  [182] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte*) bitmap_init::yoffs#4 )
-  [182] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte) bitmap_init::y#1 )
+  to:bitmap_init::@3
+bitmap_init::@3: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@4
+  [182] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte*) bitmap_init::yoffs#4 )
+  [182] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte) bitmap_init::y#1 )
   [183] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [184] (byte~) bitmap_init::$7 ← < (byte*) bitmap_init::yoffs#2
   [185] (byte~) bitmap_init::$8 ← (byte~) bitmap_init::$6 | (byte~) bitmap_init::$7
@@ -349,19 +349,19 @@ bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
   [187] (byte~) bitmap_init::$9 ← > (byte*) bitmap_init::yoffs#2
   [188] *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_init::y#2) ← (byte~) bitmap_init::$9
   [189] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [190] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6
-  to:bitmap_init::@7
-bitmap_init::@7: scope:[bitmap_init]  from bitmap_init::@5
+  [190] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4
+  to:bitmap_init::@5
+bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@3
   [191] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:bitmap_init::@6
-bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@5 bitmap_init::@7
-  [192] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@5/(byte*) bitmap_init::yoffs#2 bitmap_init::@7/(byte*) bitmap_init::yoffs#1 )
+  to:bitmap_init::@4
+bitmap_init::@4: scope:[bitmap_init]  from bitmap_init::@3 bitmap_init::@5
+  [192] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@3/(byte*) bitmap_init::yoffs#2 bitmap_init::@5/(byte*) bitmap_init::yoffs#1 )
   [193] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2
-  [194] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5
+  [194] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3
   to:bitmap_init::@return
-bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@6
+bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@4
   [195] return 
   to:@return
-bitmap_init::@10: scope:[bitmap_init]  from bitmap_init::@1
+bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@1
   [196] phi()
   to:bitmap_init::@2
diff --git a/src/test/ref/examples/bresenham/bitmap-bresenham.log b/src/test/ref/examples/bresenham/bitmap-bresenham.log
index c36a7d43f..110804ffe 100644
--- a/src/test/ref/examples/bresenham/bitmap-bresenham.log
+++ b/src/test/ref/examples/bresenham/bitmap-bresenham.log
@@ -1934,76 +1934,101 @@ Culled Empty Block (label) bitmap_init::@3
 Culled Empty Block (label) bitmap_init::@11
 Culled Empty Block (label) bitmap_init::@12
 Culled Empty Block (label) bitmap_init::@9
+Renumbering block @15 to @1
+Renumbering block bitmap_init::@5 to bitmap_init::@3
+Renumbering block bitmap_init::@6 to bitmap_init::@4
+Renumbering block bitmap_init::@7 to bitmap_init::@5
+Renumbering block bitmap_init::@10 to bitmap_init::@6
+Renumbering block bitmap_line::@3 to bitmap_line::@2
+Renumbering block bitmap_line::@4 to bitmap_line::@3
+Renumbering block bitmap_line::@5 to bitmap_line::@4
+Renumbering block bitmap_line::@7 to bitmap_line::@5
+Renumbering block bitmap_line::@8 to bitmap_line::@6
+Renumbering block bitmap_line::@10 to bitmap_line::@7
+Renumbering block bitmap_line::@11 to bitmap_line::@8
+Renumbering block bitmap_line::@15 to bitmap_line::@9
+Renumbering block bitmap_line::@17 to bitmap_line::@10
+Renumbering block bitmap_line::@20 to bitmap_line::@11
+Renumbering block bitmap_line::@21 to bitmap_line::@12
+Renumbering block bitmap_line::@25 to bitmap_line::@13
+Renumbering block bitmap_line::@27 to bitmap_line::@14
+Renumbering block bitmap_line_xdyi::@5 to bitmap_line_xdyi::@4
+Renumbering block bitmap_line_xdyd::@5 to bitmap_line_xdyd::@4
+Renumbering block bitmap_line_ydxi::@5 to bitmap_line_ydxi::@4
+Renumbering block bitmap_line_ydxd::@5 to bitmap_line_ydxd::@4
+Renumbering block main::@3 to main::@2
+Renumbering block main::@4 to main::@3
+Renumbering block lines::@3 to lines::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @15
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
+Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of main::@3
-Adding NOP phi() at start of main::@4
 Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of lines
 Adding NOP phi() at start of init_screen
 Adding NOP phi() at start of bitmap_init
-Adding NOP phi() at start of bitmap_init::@10
+Adding NOP phi() at start of bitmap_init::@6
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@15
-@15: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @15
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @15
+main: scope:[main]  from @1
   [4] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [5] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [6] *((const byte*) D011#0) ← (const byte) VIC_BMM#0|(const byte) VIC_DEN#0|(const byte) VIC_RSEL#0|(byte/signed byte/word/signed word/dword/signed dword) 3
   [7] *((const byte*) VIC_MEMORY#0) ← ((byte))((word))(const byte*) SCREEN#0&(word/signed word/dword/signed dword) $3fff/(byte/signed byte/word/signed word/dword/signed dword) $40|((word))(const byte*) BITMAP#0&(word/signed word/dword/signed dword) $3fff/(word/signed word/dword/signed dword) $400
   [8] call bitmap_init 
-  to:main::@3
-main::@3: scope:[main]  from main
+  to:main::@2
+main::@2: scope:[main]  from main
   [9] phi()
   [10] call bitmap_clear 
-  to:main::@4
-main::@4: scope:[main]  from main::@3
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [11] phi()
   [12] call init_screen 
   to:main::@1
-main::@1: scope:[main]  from main::@1 main::@4
+main::@1: scope:[main]  from main::@1 main::@3
   [13] phi()
   [14] call lines 
   to:main::@1
 lines: scope:[lines]  from main::@1
   [15] phi()
   to:lines::@1
-lines::@1: scope:[lines]  from lines lines::@3
-  [16] (byte) lines::l#2 ← phi( lines/(byte/signed byte/word/signed word/dword/signed dword) 0 lines::@3/(byte) lines::l#1 )
+lines::@1: scope:[lines]  from lines lines::@2
+  [16] (byte) lines::l#2 ← phi( lines/(byte/signed byte/word/signed word/dword/signed dword) 0 lines::@2/(byte) lines::l#1 )
   [17] (byte) bitmap_line::x0#0 ← *((const byte[]) lines_x#0 + (byte) lines::l#2)
   [18] (byte) bitmap_line::x1#0 ← *((const byte[]) lines_x#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) lines::l#2)
   [19] (byte) bitmap_line::y0#0 ← *((const byte[]) lines_y#0 + (byte) lines::l#2)
   [20] (byte) bitmap_line::y1#0 ← *((const byte[]) lines_y#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) lines::l#2)
   [21] call bitmap_line 
-  to:lines::@3
-lines::@3: scope:[lines]  from lines::@1
+  to:lines::@2
+lines::@2: scope:[lines]  from lines::@1
   [22] (byte) lines::l#1 ← ++ (byte) lines::l#2
   [23] if((byte) lines::l#1<(const byte) lines_cnt#0) goto lines::@1
   to:lines::@return
-lines::@return: scope:[lines]  from lines::@3
+lines::@return: scope:[lines]  from lines::@2
   [24] return 
   to:@return
 bitmap_line: scope:[bitmap_line]  from lines::@1
   [25] if((byte) bitmap_line::x0#0<(byte) bitmap_line::x1#0) goto bitmap_line::@1
-  to:bitmap_line::@3
-bitmap_line::@3: scope:[bitmap_line]  from bitmap_line
+  to:bitmap_line::@2
+bitmap_line::@2: scope:[bitmap_line]  from bitmap_line
   [26] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0
-  [27] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10
+  [27] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7
+  to:bitmap_line::@3
+bitmap_line::@3: scope:[bitmap_line]  from bitmap_line::@2
+  [28] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
+  [29] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8
   to:bitmap_line::@4
 bitmap_line::@4: scope:[bitmap_line]  from bitmap_line::@3
-  [28] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [29] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11
-  to:bitmap_line::@5
-bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [30] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0
   [31] (byte) bitmap_line_ydxi::x#0 ← (byte) bitmap_line::x1#0
   [32] (byte) bitmap_line_ydxi::y1#0 ← (byte) bitmap_line::y0#0
@@ -2011,10 +2036,10 @@ bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@4
   [34] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   [35] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@11 bitmap_line::@15 bitmap_line::@17 bitmap_line::@21 bitmap_line::@25 bitmap_line::@27 bitmap_line::@5 bitmap_line::@8
+bitmap_line::@return: scope:[bitmap_line]  from bitmap_line::@10 bitmap_line::@12 bitmap_line::@13 bitmap_line::@14 bitmap_line::@4 bitmap_line::@6 bitmap_line::@8 bitmap_line::@9
   [36] return 
   to:@return
-bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
+bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@3
   [37] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0
   [38] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0
   [39] (byte) bitmap_line_xdyi::x1#0 ← (byte) bitmap_line::x0#0
@@ -2022,11 +2047,11 @@ bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@4
   [41] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2
   [42] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@3
+bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@2
   [43] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [44] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15
-  to:bitmap_line::@17
-bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
+  [44] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9
+  to:bitmap_line::@10
+bitmap_line::@10: scope:[bitmap_line]  from bitmap_line::@7
   [45] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0
   [46] (byte) bitmap_line_ydxd::x#0 ← (byte) bitmap_line::x0#0
   [47] (byte) bitmap_line_ydxd::y1#0 ← (byte) bitmap_line::y1#0
@@ -2034,7 +2059,7 @@ bitmap_line::@17: scope:[bitmap_line]  from bitmap_line::@10
   [49] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   [50] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
+bitmap_line::@9: scope:[bitmap_line]  from bitmap_line::@7
   [51] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0
   [52] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0
   [53] (byte) bitmap_line_xdyd::x1#0 ← (byte) bitmap_line::x0#0
@@ -2044,13 +2069,13 @@ bitmap_line::@15: scope:[bitmap_line]  from bitmap_line::@10
   to:bitmap_line::@return
 bitmap_line::@1: scope:[bitmap_line]  from bitmap_line
   [57] (byte) bitmap_line::xd#1 ← (byte) bitmap_line::x1#0 - (byte) bitmap_line::x0#0
-  [58] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20
-  to:bitmap_line::@7
-bitmap_line::@7: scope:[bitmap_line]  from bitmap_line::@1
+  [58] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11
+  to:bitmap_line::@5
+bitmap_line::@5: scope:[bitmap_line]  from bitmap_line::@1
   [59] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0
-  [60] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21
-  to:bitmap_line::@8
-bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
+  [60] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12
+  to:bitmap_line::@6
+bitmap_line::@6: scope:[bitmap_line]  from bitmap_line::@5
   [61] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0
   [62] (byte) bitmap_line_ydxd::x#1 ← (byte) bitmap_line::x1#0
   [63] (byte) bitmap_line_ydxd::y1#1 ← (byte) bitmap_line::y0#0
@@ -2058,7 +2083,7 @@ bitmap_line::@8: scope:[bitmap_line]  from bitmap_line::@7
   [65] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   [66] call bitmap_line_ydxd 
   to:bitmap_line::@return
-bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
+bitmap_line::@12: scope:[bitmap_line]  from bitmap_line::@5
   [67] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0
   [68] (byte) bitmap_line_xdyd::y#1 ← (byte) bitmap_line::y0#0
   [69] (byte) bitmap_line_xdyd::x1#1 ← (byte) bitmap_line::x1#0
@@ -2066,11 +2091,11 @@ bitmap_line::@21: scope:[bitmap_line]  from bitmap_line::@7
   [71] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10
   [72] call bitmap_line_xdyd 
   to:bitmap_line::@return
-bitmap_line::@20: scope:[bitmap_line]  from bitmap_line::@1
+bitmap_line::@11: scope:[bitmap_line]  from bitmap_line::@1
   [73] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0
-  [74] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25
-  to:bitmap_line::@27
-bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
+  [74] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13
+  to:bitmap_line::@14
+bitmap_line::@14: scope:[bitmap_line]  from bitmap_line::@11
   [75] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0
   [76] (byte) bitmap_line_ydxi::x#1 ← (byte) bitmap_line::x0#0
   [77] (byte) bitmap_line_ydxi::y1#1 ← (byte) bitmap_line::y1#0
@@ -2078,7 +2103,7 @@ bitmap_line::@27: scope:[bitmap_line]  from bitmap_line::@20
   [79] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   [80] call bitmap_line_ydxi 
   to:bitmap_line::@return
-bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
+bitmap_line::@13: scope:[bitmap_line]  from bitmap_line::@11
   [81] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0
   [82] (byte) bitmap_line_xdyi::y#1 ← (byte) bitmap_line::y0#0
   [83] (byte) bitmap_line_xdyi::x1#1 ← (byte) bitmap_line::x1#0
@@ -2086,12 +2111,12 @@ bitmap_line::@25: scope:[bitmap_line]  from bitmap_line::@20
   [85] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11
   [86] call bitmap_line_xdyi 
   to:bitmap_line::@return
-bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@11 bitmap_line::@25
-  [87] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x1#1 )
-  [87] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::xd#1 )
-  [87] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::y#0 bitmap_line::@25/(byte) bitmap_line_xdyi::y#1 )
-  [87] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::x#0 bitmap_line::@25/(byte) bitmap_line_xdyi::x#1 )
-  [87] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@11/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@25/(byte) bitmap_line_xdyi::yd#1 )
+bitmap_line_xdyi: scope:[bitmap_line_xdyi]  from bitmap_line::@13 bitmap_line::@8
+  [87] (byte) bitmap_line_xdyi::x1#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x1#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x1#1 )
+  [87] (byte) bitmap_line_xdyi::xd#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::xd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::xd#1 )
+  [87] (byte) bitmap_line_xdyi::y#5 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::y#0 bitmap_line::@13/(byte) bitmap_line_xdyi::y#1 )
+  [87] (byte) bitmap_line_xdyi::x#6 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::x#0 bitmap_line::@13/(byte) bitmap_line_xdyi::x#1 )
+  [87] (byte) bitmap_line_xdyi::yd#2 ← phi( bitmap_line::@8/(byte) bitmap_line_xdyi::yd#0 bitmap_line::@13/(byte) bitmap_line_xdyi::yd#1 )
   [88] (byte) bitmap_line_xdyi::e#0 ← (byte) bitmap_line_xdyi::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyi::@1
 bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_line_xdyi::@2
@@ -2101,19 +2126,19 @@ bitmap_line_xdyi::@1: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi bitmap_lin
   [90] (byte) bitmap_plot::x#0 ← (byte) bitmap_line_xdyi::x#3
   [91] (byte) bitmap_plot::y#0 ← (byte) bitmap_line_xdyi::y#3
   [92] call bitmap_plot 
-  to:bitmap_line_xdyi::@5
-bitmap_line_xdyi::@5: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
+  to:bitmap_line_xdyi::@4
+bitmap_line_xdyi::@4: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@1
   [93] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3
   [94] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2
   [95] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2
   to:bitmap_line_xdyi::@3
-bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@5
+bitmap_line_xdyi::@3: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@4
   [96] (byte) bitmap_line_xdyi::y#2 ← ++ (byte) bitmap_line_xdyi::y#3
   [97] (byte) bitmap_line_xdyi::e#2 ← (byte) bitmap_line_xdyi::e#1 - (byte) bitmap_line_xdyi::xd#5
   to:bitmap_line_xdyi::@2
-bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5
-  [98] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::e#1 )
-  [98] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@5/(byte) bitmap_line_xdyi::y#3 )
+bitmap_line_xdyi::@2: scope:[bitmap_line_xdyi]  from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4
+  [98] (byte) bitmap_line_xdyi::e#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::e#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::e#1 )
+  [98] (byte) bitmap_line_xdyi::y#6 ← phi( bitmap_line_xdyi::@3/(byte) bitmap_line_xdyi::y#2 bitmap_line_xdyi::@4/(byte) bitmap_line_xdyi::y#3 )
   [99] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6 ← (byte) bitmap_line_xdyi::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [100] if((byte) bitmap_line_xdyi::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6) goto bitmap_line_xdyi::@1
   to:bitmap_line_xdyi::@return
@@ -2132,12 +2157,12 @@ bitmap_plot: scope:[bitmap_plot]  from bitmap_line_xdyd::@1 bitmap_line_xdyi::@1
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [108] return 
   to:@return
-bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@27 bitmap_line::@5
-  [109] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y1#0 )
-  [109] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::yd#0 )
-  [109] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::y#1 bitmap_line::@5/(byte) bitmap_line_ydxi::y#0 )
-  [109] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::x#1 bitmap_line::@5/(byte) bitmap_line_ydxi::x#0 )
-  [109] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@27/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@5/(byte) bitmap_line_ydxi::xd#0 )
+bitmap_line_ydxi: scope:[bitmap_line_ydxi]  from bitmap_line::@14 bitmap_line::@4
+  [109] (byte) bitmap_line_ydxi::y1#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y1#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y1#0 )
+  [109] (byte) bitmap_line_ydxi::yd#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::yd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::yd#0 )
+  [109] (byte) bitmap_line_ydxi::y#6 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::y#1 bitmap_line::@4/(byte) bitmap_line_ydxi::y#0 )
+  [109] (byte) bitmap_line_ydxi::x#5 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::x#1 bitmap_line::@4/(byte) bitmap_line_ydxi::x#0 )
+  [109] (byte) bitmap_line_ydxi::xd#2 ← phi( bitmap_line::@14/(byte) bitmap_line_ydxi::xd#1 bitmap_line::@4/(byte) bitmap_line_ydxi::xd#0 )
   [110] (byte) bitmap_line_ydxi::e#0 ← (byte) bitmap_line_ydxi::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxi::@1
 bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_line_ydxi::@2
@@ -2147,31 +2172,31 @@ bitmap_line_ydxi::@1: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi bitmap_lin
   [112] (byte) bitmap_plot::x#2 ← (byte) bitmap_line_ydxi::x#3
   [113] (byte) bitmap_plot::y#2 ← (byte) bitmap_line_ydxi::y#3
   [114] call bitmap_plot 
-  to:bitmap_line_ydxi::@5
-bitmap_line_ydxi::@5: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
+  to:bitmap_line_ydxi::@4
+bitmap_line_ydxi::@4: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@1
   [115] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3
   [116] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2
   [117] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2
   to:bitmap_line_ydxi::@3
-bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@5
+bitmap_line_ydxi::@3: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@4
   [118] (byte) bitmap_line_ydxi::x#2 ← ++ (byte) bitmap_line_ydxi::x#3
   [119] (byte) bitmap_line_ydxi::e#2 ← (byte) bitmap_line_ydxi::e#1 - (byte) bitmap_line_ydxi::yd#5
   to:bitmap_line_ydxi::@2
-bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5
-  [120] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::e#1 )
-  [120] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@5/(byte) bitmap_line_ydxi::x#3 )
+bitmap_line_ydxi::@2: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4
+  [120] (byte) bitmap_line_ydxi::e#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::e#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::e#1 )
+  [120] (byte) bitmap_line_ydxi::x#6 ← phi( bitmap_line_ydxi::@3/(byte) bitmap_line_ydxi::x#2 bitmap_line_ydxi::@4/(byte) bitmap_line_ydxi::x#3 )
   [121] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6 ← (byte) bitmap_line_ydxi::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [122] if((byte) bitmap_line_ydxi::y#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6) goto bitmap_line_ydxi::@1
   to:bitmap_line_ydxi::@return
 bitmap_line_ydxi::@return: scope:[bitmap_line_ydxi]  from bitmap_line_ydxi::@2
   [123] return 
   to:@return
-bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@15 bitmap_line::@21
-  [124] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x1#1 )
-  [124] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::xd#1 )
-  [124] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::y#0 bitmap_line::@21/(byte) bitmap_line_xdyd::y#1 )
-  [124] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::x#0 bitmap_line::@21/(byte) bitmap_line_xdyd::x#1 )
-  [124] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@15/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@21/(byte) bitmap_line_xdyd::yd#1 )
+bitmap_line_xdyd: scope:[bitmap_line_xdyd]  from bitmap_line::@12 bitmap_line::@9
+  [124] (byte) bitmap_line_xdyd::x1#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x1#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x1#1 )
+  [124] (byte) bitmap_line_xdyd::xd#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::xd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::xd#1 )
+  [124] (byte) bitmap_line_xdyd::y#5 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::y#0 bitmap_line::@12/(byte) bitmap_line_xdyd::y#1 )
+  [124] (byte) bitmap_line_xdyd::x#6 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::x#0 bitmap_line::@12/(byte) bitmap_line_xdyd::x#1 )
+  [124] (byte) bitmap_line_xdyd::yd#2 ← phi( bitmap_line::@9/(byte) bitmap_line_xdyd::yd#0 bitmap_line::@12/(byte) bitmap_line_xdyd::yd#1 )
   [125] (byte) bitmap_line_xdyd::e#0 ← (byte) bitmap_line_xdyd::yd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_xdyd::@1
 bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_line_xdyd::@2
@@ -2181,31 +2206,31 @@ bitmap_line_xdyd::@1: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd bitmap_lin
   [127] (byte) bitmap_plot::x#1 ← (byte) bitmap_line_xdyd::x#3
   [128] (byte) bitmap_plot::y#1 ← (byte) bitmap_line_xdyd::y#3
   [129] call bitmap_plot 
-  to:bitmap_line_xdyd::@5
-bitmap_line_xdyd::@5: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
+  to:bitmap_line_xdyd::@4
+bitmap_line_xdyd::@4: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@1
   [130] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3
   [131] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2
   [132] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2
   to:bitmap_line_xdyd::@3
-bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@5
+bitmap_line_xdyd::@3: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@4
   [133] (byte) bitmap_line_xdyd::y#2 ← -- (byte) bitmap_line_xdyd::y#3
   [134] (byte) bitmap_line_xdyd::e#2 ← (byte) bitmap_line_xdyd::e#1 - (byte) bitmap_line_xdyd::xd#5
   to:bitmap_line_xdyd::@2
-bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5
-  [135] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::e#1 )
-  [135] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@5/(byte) bitmap_line_xdyd::y#3 )
+bitmap_line_xdyd::@2: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4
+  [135] (byte) bitmap_line_xdyd::e#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::e#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::e#1 )
+  [135] (byte) bitmap_line_xdyd::y#6 ← phi( bitmap_line_xdyd::@3/(byte) bitmap_line_xdyd::y#2 bitmap_line_xdyd::@4/(byte) bitmap_line_xdyd::y#3 )
   [136] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6 ← (byte) bitmap_line_xdyd::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [137] if((byte) bitmap_line_xdyd::x#2!=(byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6) goto bitmap_line_xdyd::@1
   to:bitmap_line_xdyd::@return
 bitmap_line_xdyd::@return: scope:[bitmap_line_xdyd]  from bitmap_line_xdyd::@2
   [138] return 
   to:@return
-bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@17 bitmap_line::@8
-  [139] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y1#1 )
-  [139] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::yd#1 )
-  [139] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::y#0 bitmap_line::@8/(byte) bitmap_line_ydxd::y#1 )
-  [139] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::x#0 bitmap_line::@8/(byte) bitmap_line_ydxd::x#1 )
-  [139] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@17/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@8/(byte) bitmap_line_ydxd::xd#1 )
+bitmap_line_ydxd: scope:[bitmap_line_ydxd]  from bitmap_line::@10 bitmap_line::@6
+  [139] (byte) bitmap_line_ydxd::y1#6 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y1#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y1#1 )
+  [139] (byte) bitmap_line_ydxd::yd#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::yd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::yd#1 )
+  [139] (byte) bitmap_line_ydxd::y#7 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::y#0 bitmap_line::@6/(byte) bitmap_line_ydxd::y#1 )
+  [139] (byte) bitmap_line_ydxd::x#5 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::x#0 bitmap_line::@6/(byte) bitmap_line_ydxd::x#1 )
+  [139] (byte) bitmap_line_ydxd::xd#2 ← phi( bitmap_line::@10/(byte) bitmap_line_ydxd::xd#0 bitmap_line::@6/(byte) bitmap_line_ydxd::xd#1 )
   [140] (byte) bitmap_line_ydxd::e#0 ← (byte) bitmap_line_ydxd::xd#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   to:bitmap_line_ydxd::@1
 bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_line_ydxd::@2
@@ -2215,26 +2240,26 @@ bitmap_line_ydxd::@1: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd bitmap_lin
   [142] (byte) bitmap_plot::x#3 ← (byte) bitmap_line_ydxd::x#3
   [143] (byte) bitmap_plot::y#3 ← (byte) bitmap_line_ydxd::y#2
   [144] call bitmap_plot 
-  to:bitmap_line_ydxd::@5
-bitmap_line_ydxd::@5: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
+  to:bitmap_line_ydxd::@4
+bitmap_line_ydxd::@4: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@1
   [145] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2
   [146] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2
   [147] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2
   to:bitmap_line_ydxd::@3
-bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@5
+bitmap_line_ydxd::@3: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@4
   [148] (byte) bitmap_line_ydxd::x#2 ← -- (byte) bitmap_line_ydxd::x#3
   [149] (byte) bitmap_line_ydxd::e#2 ← (byte) bitmap_line_ydxd::e#1 - (byte) bitmap_line_ydxd::yd#5
   to:bitmap_line_ydxd::@2
-bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5
-  [150] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::e#1 )
-  [150] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@5/(byte) bitmap_line_ydxd::x#3 )
+bitmap_line_ydxd::@2: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4
+  [150] (byte) bitmap_line_ydxd::e#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::e#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::e#1 )
+  [150] (byte) bitmap_line_ydxd::x#6 ← phi( bitmap_line_ydxd::@3/(byte) bitmap_line_ydxd::x#2 bitmap_line_ydxd::@4/(byte) bitmap_line_ydxd::x#3 )
   [151] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6 ← (byte) bitmap_line_ydxd::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [152] if((byte) bitmap_line_ydxd::y#3!=(byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6) goto bitmap_line_ydxd::@1
   to:bitmap_line_ydxd::@return
 bitmap_line_ydxd::@return: scope:[bitmap_line_ydxd]  from bitmap_line_ydxd::@2
   [153] return 
   to:@return
-init_screen: scope:[init_screen]  from main::@4
+init_screen: scope:[init_screen]  from main::@3
   [154] phi()
   to:init_screen::@1
 init_screen::@1: scope:[init_screen]  from init_screen init_screen::@1
@@ -2246,7 +2271,7 @@ init_screen::@1: scope:[init_screen]  from init_screen init_screen::@1
 init_screen::@return: scope:[init_screen]  from init_screen::@1
   [159] return 
   to:@return
-bitmap_clear: scope:[bitmap_clear]  from main::@3
+bitmap_clear: scope:[bitmap_clear]  from main::@2
   [160] (word~) bitmap_clear::$3 ← *((const byte[$100]) bitmap_plot_xhi#0) w= *((const byte[$100]) bitmap_plot_xlo#0)
   [161] (byte*~) bitmap_clear::bitmap#5 ← (byte*)(word~) bitmap_clear::$3
   to:bitmap_clear::@1
@@ -2280,16 +2305,16 @@ bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
   [175] *((const byte[$100]) bitmap_plot_xhi#0 + (byte) bitmap_init::x#2) ← >(const byte*) BITMAP#0
   [176] *((const byte[$100]) bitmap_plot_bit#0 + (byte) bitmap_init::x#2) ← (byte) bitmap_init::bits#3
   [177] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [178] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10
+  [178] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6
   to:bitmap_init::@2
-bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@10
-  [179] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@10/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
+bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@6
+  [179] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@6/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
   [180] (byte) bitmap_init::x#1 ← ++ (byte) bitmap_init::x#2
   [181] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1
-  to:bitmap_init::@5
-bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
-  [182] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte*) bitmap_init::yoffs#4 )
-  [182] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte) bitmap_init::y#1 )
+  to:bitmap_init::@3
+bitmap_init::@3: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@4
+  [182] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte*) bitmap_init::yoffs#4 )
+  [182] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte) bitmap_init::y#1 )
   [183] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [184] (byte~) bitmap_init::$7 ← < (byte*) bitmap_init::yoffs#2
   [185] (byte~) bitmap_init::$8 ← (byte~) bitmap_init::$6 | (byte~) bitmap_init::$7
@@ -2297,20 +2322,20 @@ bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
   [187] (byte~) bitmap_init::$9 ← > (byte*) bitmap_init::yoffs#2
   [188] *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_init::y#2) ← (byte~) bitmap_init::$9
   [189] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [190] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6
-  to:bitmap_init::@7
-bitmap_init::@7: scope:[bitmap_init]  from bitmap_init::@5
+  [190] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4
+  to:bitmap_init::@5
+bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@3
   [191] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:bitmap_init::@6
-bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@5 bitmap_init::@7
-  [192] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@5/(byte*) bitmap_init::yoffs#2 bitmap_init::@7/(byte*) bitmap_init::yoffs#1 )
+  to:bitmap_init::@4
+bitmap_init::@4: scope:[bitmap_init]  from bitmap_init::@3 bitmap_init::@5
+  [192] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@3/(byte*) bitmap_init::yoffs#2 bitmap_init::@5/(byte*) bitmap_init::yoffs#1 )
   [193] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2
-  [194] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5
+  [194] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3
   to:bitmap_init::@return
-bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@6
+bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@4
   [195] return 
   to:@return
-bitmap_init::@10: scope:[bitmap_init]  from bitmap_init::@1
+bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@1
   [196] phi()
   to:bitmap_init::@2
 
@@ -2821,15 +2846,15 @@ INITIAL ASM
   .const lines_cnt = 8
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @15 [phi:@begin->@15]
-b15_from_bbegin:
-  jmp b15
-//SEG5 @15
-b15:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @15 to @end [phi:@15->@end]
-bend_from_b15:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -2851,25 +2876,25 @@ main: {
   //SEG15 [171] phi from main to bitmap_init [phi:main->bitmap_init]
   bitmap_init_from_main:
     jsr bitmap_init
-  //SEG16 [9] phi from main to main::@3 [phi:main->main::@3]
-  b3_from_main:
-    jmp b3
-  //SEG17 main::@3
-  b3:
+  //SEG16 [9] phi from main to main::@2 [phi:main->main::@2]
+  b2_from_main:
+    jmp b2
+  //SEG17 main::@2
+  b2:
   //SEG18 [10] call bitmap_clear 
     jsr bitmap_clear
-  //SEG19 [11] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG20 main::@4
-  b4:
+  //SEG19 [11] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG20 main::@3
+  b3:
   //SEG21 [12] call init_screen 
-  //SEG22 [154] phi from main::@4 to init_screen [phi:main::@4->init_screen]
-  init_screen_from_b4:
+  //SEG22 [154] phi from main::@3 to init_screen [phi:main::@3->init_screen]
+  init_screen_from_b3:
     jsr init_screen
-  //SEG23 [13] phi from main::@1 main::@4 to main::@1 [phi:main::@1/main::@4->main::@1]
+  //SEG23 [13] phi from main::@1 main::@3 to main::@1 [phi:main::@1/main::@3->main::@1]
   b1_from_b1:
-  b1_from_b4:
+  b1_from_b3:
     jmp b1
   //SEG24 main::@1
   b1:
@@ -2888,9 +2913,9 @@ lines: {
     lda #0
     sta l
     jmp b1
-  //SEG30 [16] phi from lines::@3 to lines::@1 [phi:lines::@3->lines::@1]
-  b1_from_b3:
-  //SEG31 [16] phi (byte) lines::l#2 = (byte) lines::l#1 [phi:lines::@3->lines::@1#0] -- register_copy 
+  //SEG30 [16] phi from lines::@2 to lines::@1 [phi:lines::@2->lines::@1]
+  b1_from_b2:
+  //SEG31 [16] phi (byte) lines::l#2 = (byte) lines::l#1 [phi:lines::@2->lines::@1#0] -- register_copy 
     jmp b1
   //SEG32 lines::@1
   b1:
@@ -2912,15 +2937,15 @@ lines: {
     sta bitmap_line.y1
   //SEG37 [21] call bitmap_line 
     jsr bitmap_line
-    jmp b3
-  //SEG38 lines::@3
-  b3:
+    jmp b2
+  //SEG38 lines::@2
+  b2:
   //SEG39 [22] (byte) lines::l#1 ← ++ (byte) lines::l#2 -- vbuz1=_inc_vbuz1 
     inc l
   //SEG40 [23] if((byte) lines::l#1<(const byte) lines_cnt#0) goto lines::@1 -- vbuz1_lt_vbuc1_then_la1 
     lda l
     cmp #lines_cnt
-    bcc b1_from_b3
+    bcc b1_from_b2
     jmp breturn
   //SEG41 lines::@return
   breturn:
@@ -2945,33 +2970,33 @@ bitmap_line: {
     lda x0
     cmp x1
     bcc b1
-    jmp b3
-  //SEG45 bitmap_line::@3
-  b3:
+    jmp b2
+  //SEG45 bitmap_line::@2
+  b2:
   //SEG46 [26] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda x0
     sec
     sbc x1
     sta xd_2
-  //SEG47 [27] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG47 [27] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b10
-    jmp b4
-  //SEG48 bitmap_line::@4
-  b4:
+    bcc b7
+    jmp b3
+  //SEG48 bitmap_line::@3
+  b3:
   //SEG49 [28] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y0
     sec
     sbc y1
     sta yd_2
-  //SEG50 [29] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG50 [29] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8 -- vbuz1_lt_vbuz2_then_la1 
     lda yd_2
     cmp xd_2
-    bcc b11
-    jmp b5
-  //SEG51 bitmap_line::@5
-  b5:
+    bcc b8
+    jmp b4
+  //SEG51 bitmap_line::@4
+  b4:
   //SEG52 [30] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxi.y
@@ -2988,21 +3013,21 @@ bitmap_line: {
     lda xd_2
     sta bitmap_line_ydxi.xd
   //SEG57 [35] call bitmap_line_ydxi 
-  //SEG58 [109] phi from bitmap_line::@5 to bitmap_line_ydxi [phi:bitmap_line::@5->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b5:
-  //SEG59 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@5->bitmap_line_ydxi#0] -- register_copy 
-  //SEG60 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#1] -- register_copy 
-  //SEG61 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@5->bitmap_line_ydxi#2] -- register_copy 
-  //SEG62 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@5->bitmap_line_ydxi#3] -- register_copy 
-  //SEG63 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#4] -- register_copy 
+  //SEG58 [109] phi from bitmap_line::@4 to bitmap_line_ydxi [phi:bitmap_line::@4->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b4:
+  //SEG59 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@4->bitmap_line_ydxi#0] -- register_copy 
+  //SEG60 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#1] -- register_copy 
+  //SEG61 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@4->bitmap_line_ydxi#2] -- register_copy 
+  //SEG62 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@4->bitmap_line_ydxi#3] -- register_copy 
+  //SEG63 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
   //SEG64 bitmap_line::@return
   breturn:
   //SEG65 [36] return 
     rts
-  //SEG66 bitmap_line::@11
-  b11:
+  //SEG66 bitmap_line::@8
+  b8:
   //SEG67 [37] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuz2 
     lda x1
     sta bitmap_line_xdyi.x
@@ -3019,29 +3044,29 @@ bitmap_line: {
     lda yd_2
     sta bitmap_line_xdyi.yd
   //SEG72 [42] call bitmap_line_xdyi 
-  //SEG73 [87] phi from bitmap_line::@11 to bitmap_line_xdyi [phi:bitmap_line::@11->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b11:
-  //SEG74 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@11->bitmap_line_xdyi#0] -- register_copy 
-  //SEG75 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#1] -- register_copy 
-  //SEG76 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@11->bitmap_line_xdyi#2] -- register_copy 
-  //SEG77 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@11->bitmap_line_xdyi#3] -- register_copy 
-  //SEG78 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#4] -- register_copy 
+  //SEG73 [87] phi from bitmap_line::@8 to bitmap_line_xdyi [phi:bitmap_line::@8->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b8:
+  //SEG74 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@8->bitmap_line_xdyi#0] -- register_copy 
+  //SEG75 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#1] -- register_copy 
+  //SEG76 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@8->bitmap_line_xdyi#2] -- register_copy 
+  //SEG77 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@8->bitmap_line_xdyi#3] -- register_copy 
+  //SEG78 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
-  //SEG79 bitmap_line::@10
-  b10:
+  //SEG79 bitmap_line::@7
+  b7:
   //SEG80 [43] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y1
     sec
     sbc y0
     sta yd
-  //SEG81 [44] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG81 [44] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9 -- vbuz1_lt_vbuz2_then_la1 
     lda yd
     cmp xd_2
-    bcc b15
-    jmp b17
-  //SEG82 bitmap_line::@17
-  b17:
+    bcc b9
+    jmp b10
+  //SEG82 bitmap_line::@10
+  b10:
   //SEG83 [45] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxd.y
@@ -3058,17 +3083,17 @@ bitmap_line: {
     lda xd_2
     sta bitmap_line_ydxd.xd
   //SEG88 [50] call bitmap_line_ydxd 
-  //SEG89 [139] phi from bitmap_line::@17 to bitmap_line_ydxd [phi:bitmap_line::@17->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b17:
-  //SEG90 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@17->bitmap_line_ydxd#0] -- register_copy 
-  //SEG91 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#1] -- register_copy 
-  //SEG92 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@17->bitmap_line_ydxd#2] -- register_copy 
-  //SEG93 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@17->bitmap_line_ydxd#3] -- register_copy 
-  //SEG94 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#4] -- register_copy 
+  //SEG89 [139] phi from bitmap_line::@10 to bitmap_line_ydxd [phi:bitmap_line::@10->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b10:
+  //SEG90 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@10->bitmap_line_ydxd#0] -- register_copy 
+  //SEG91 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#1] -- register_copy 
+  //SEG92 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@10->bitmap_line_ydxd#2] -- register_copy 
+  //SEG93 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@10->bitmap_line_ydxd#3] -- register_copy 
+  //SEG94 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG95 bitmap_line::@15
-  b15:
+  //SEG95 bitmap_line::@9
+  b9:
   //SEG96 [51] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0 -- vbuz1=vbuz2 
     lda x1
     sta bitmap_line_xdyd.x
@@ -3085,13 +3110,13 @@ bitmap_line: {
     lda yd
     sta bitmap_line_xdyd.yd
   //SEG101 [56] call bitmap_line_xdyd 
-  //SEG102 [124] phi from bitmap_line::@15 to bitmap_line_xdyd [phi:bitmap_line::@15->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b15:
-  //SEG103 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@15->bitmap_line_xdyd#0] -- register_copy 
-  //SEG104 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#1] -- register_copy 
-  //SEG105 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@15->bitmap_line_xdyd#2] -- register_copy 
-  //SEG106 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@15->bitmap_line_xdyd#3] -- register_copy 
-  //SEG107 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#4] -- register_copy 
+  //SEG102 [124] phi from bitmap_line::@9 to bitmap_line_xdyd [phi:bitmap_line::@9->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b9:
+  //SEG103 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@9->bitmap_line_xdyd#0] -- register_copy 
+  //SEG104 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#1] -- register_copy 
+  //SEG105 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@9->bitmap_line_xdyd#2] -- register_copy 
+  //SEG106 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@9->bitmap_line_xdyd#3] -- register_copy 
+  //SEG107 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
   //SEG108 bitmap_line::@1
@@ -3101,25 +3126,25 @@ bitmap_line: {
     sec
     sbc x0
     sta xd
-  //SEG110 [58] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG110 [58] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
     lda y0
     cmp y1
-    bcc b20
-    jmp b7
-  //SEG111 bitmap_line::@7
-  b7:
+    bcc b11
+    jmp b5
+  //SEG111 bitmap_line::@5
+  b5:
   //SEG112 [59] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y0
     sec
     sbc y1
     sta yd_10
-  //SEG113 [60] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG113 [60] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12 -- vbuz1_lt_vbuz2_then_la1 
     lda yd_10
     cmp xd
-    bcc b21
-    jmp b8
-  //SEG114 bitmap_line::@8
-  b8:
+    bcc b12
+    jmp b6
+  //SEG114 bitmap_line::@6
+  b6:
   //SEG115 [61] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuz2 
     lda y1
     sta bitmap_line_ydxd.y
@@ -3136,17 +3161,17 @@ bitmap_line: {
     lda xd
     sta bitmap_line_ydxd.xd
   //SEG120 [66] call bitmap_line_ydxd 
-  //SEG121 [139] phi from bitmap_line::@8 to bitmap_line_ydxd [phi:bitmap_line::@8->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b8:
-  //SEG122 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@8->bitmap_line_ydxd#0] -- register_copy 
-  //SEG123 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#1] -- register_copy 
-  //SEG124 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@8->bitmap_line_ydxd#2] -- register_copy 
-  //SEG125 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@8->bitmap_line_ydxd#3] -- register_copy 
-  //SEG126 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#4] -- register_copy 
+  //SEG121 [139] phi from bitmap_line::@6 to bitmap_line_ydxd [phi:bitmap_line::@6->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b6:
+  //SEG122 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@6->bitmap_line_ydxd#0] -- register_copy 
+  //SEG123 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#1] -- register_copy 
+  //SEG124 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@6->bitmap_line_ydxd#2] -- register_copy 
+  //SEG125 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@6->bitmap_line_ydxd#3] -- register_copy 
+  //SEG126 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG127 bitmap_line::@21
-  b21:
+  //SEG127 bitmap_line::@12
+  b12:
   //SEG128 [67] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyd.x
@@ -3163,29 +3188,29 @@ bitmap_line: {
     lda yd_10
     sta bitmap_line_xdyd.yd
   //SEG133 [72] call bitmap_line_xdyd 
-  //SEG134 [124] phi from bitmap_line::@21 to bitmap_line_xdyd [phi:bitmap_line::@21->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b21:
-  //SEG135 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@21->bitmap_line_xdyd#0] -- register_copy 
-  //SEG136 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#1] -- register_copy 
-  //SEG137 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@21->bitmap_line_xdyd#2] -- register_copy 
-  //SEG138 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@21->bitmap_line_xdyd#3] -- register_copy 
-  //SEG139 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#4] -- register_copy 
+  //SEG134 [124] phi from bitmap_line::@12 to bitmap_line_xdyd [phi:bitmap_line::@12->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b12:
+  //SEG135 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@12->bitmap_line_xdyd#0] -- register_copy 
+  //SEG136 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#1] -- register_copy 
+  //SEG137 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@12->bitmap_line_xdyd#2] -- register_copy 
+  //SEG138 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@12->bitmap_line_xdyd#3] -- register_copy 
+  //SEG139 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
-  //SEG140 bitmap_line::@20
-  b20:
+  //SEG140 bitmap_line::@11
+  b11:
   //SEG141 [73] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y1
     sec
     sbc y0
     sta yd_11
-  //SEG142 [74] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG142 [74] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13 -- vbuz1_lt_vbuz2_then_la1 
     lda yd_11
     cmp xd
-    bcc b25
-    jmp b27
-  //SEG143 bitmap_line::@27
-  b27:
+    bcc b13
+    jmp b14
+  //SEG143 bitmap_line::@14
+  b14:
   //SEG144 [75] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxi.y
@@ -3202,17 +3227,17 @@ bitmap_line: {
     lda xd
     sta bitmap_line_ydxi.xd
   //SEG149 [80] call bitmap_line_ydxi 
-  //SEG150 [109] phi from bitmap_line::@27 to bitmap_line_ydxi [phi:bitmap_line::@27->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b27:
-  //SEG151 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@27->bitmap_line_ydxi#0] -- register_copy 
-  //SEG152 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#1] -- register_copy 
-  //SEG153 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@27->bitmap_line_ydxi#2] -- register_copy 
-  //SEG154 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@27->bitmap_line_ydxi#3] -- register_copy 
-  //SEG155 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#4] -- register_copy 
+  //SEG150 [109] phi from bitmap_line::@14 to bitmap_line_ydxi [phi:bitmap_line::@14->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b14:
+  //SEG151 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@14->bitmap_line_ydxi#0] -- register_copy 
+  //SEG152 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#1] -- register_copy 
+  //SEG153 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@14->bitmap_line_ydxi#2] -- register_copy 
+  //SEG154 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@14->bitmap_line_ydxi#3] -- register_copy 
+  //SEG155 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
-  //SEG156 bitmap_line::@25
-  b25:
+  //SEG156 bitmap_line::@13
+  b13:
   //SEG157 [81] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0 -- vbuz1=vbuz2 
     lda x0
     sta bitmap_line_xdyi.x
@@ -3229,13 +3254,13 @@ bitmap_line: {
     lda yd_11
     sta bitmap_line_xdyi.yd
   //SEG162 [86] call bitmap_line_xdyi 
-  //SEG163 [87] phi from bitmap_line::@25 to bitmap_line_xdyi [phi:bitmap_line::@25->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b25:
-  //SEG164 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@25->bitmap_line_xdyi#0] -- register_copy 
-  //SEG165 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#1] -- register_copy 
-  //SEG166 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@25->bitmap_line_xdyi#2] -- register_copy 
-  //SEG167 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@25->bitmap_line_xdyi#3] -- register_copy 
-  //SEG168 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#4] -- register_copy 
+  //SEG163 [87] phi from bitmap_line::@13 to bitmap_line_xdyi [phi:bitmap_line::@13->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b13:
+  //SEG164 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@13->bitmap_line_xdyi#0] -- register_copy 
+  //SEG165 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#1] -- register_copy 
+  //SEG166 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@13->bitmap_line_xdyi#2] -- register_copy 
+  //SEG167 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@13->bitmap_line_xdyi#3] -- register_copy 
+  //SEG168 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
 }
@@ -3274,9 +3299,9 @@ bitmap_line_xdyi: {
   //SEG180 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#0] -- register_copy 
   //SEG181 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG182 bitmap_line_xdyi::@5
-  b5:
+    jmp b4
+  //SEG182 bitmap_line_xdyi::@4
+  b4:
   //SEG183 [93] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG184 [94] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -3287,7 +3312,7 @@ bitmap_line_xdyi: {
   //SEG185 [95] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG186 bitmap_line_xdyi::@3
   b3:
@@ -3298,11 +3323,11 @@ bitmap_line_xdyi: {
     sec
     sbc xd
     sta e
-  //SEG189 [98] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2]
+  //SEG189 [98] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG190 [98] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#0] -- register_copy 
-  //SEG191 [98] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG190 [98] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#0] -- register_copy 
+  //SEG191 [98] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#1] -- register_copy 
     jmp b2
   //SEG192 bitmap_line_xdyi::@2
   b2:
@@ -3400,9 +3425,9 @@ bitmap_line_ydxi: {
   //SEG216 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#0] -- register_copy 
   //SEG217 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG218 bitmap_line_ydxi::@5
-  b5:
+    jmp b4
+  //SEG218 bitmap_line_ydxi::@4
+  b4:
   //SEG219 [115] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG220 [116] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -3413,7 +3438,7 @@ bitmap_line_ydxi: {
   //SEG221 [117] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG222 bitmap_line_ydxi::@3
   b3:
@@ -3424,11 +3449,11 @@ bitmap_line_ydxi: {
     sec
     sbc yd
     sta e
-  //SEG225 [120] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2]
+  //SEG225 [120] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG226 [120] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#0] -- register_copy 
-  //SEG227 [120] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG226 [120] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#0] -- register_copy 
+  //SEG227 [120] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#1] -- register_copy 
     jmp b2
   //SEG228 bitmap_line_ydxi::@2
   b2:
@@ -3481,9 +3506,9 @@ bitmap_line_xdyd: {
   //SEG244 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#0] -- register_copy 
   //SEG245 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG246 bitmap_line_xdyd::@5
-  b5:
+    jmp b4
+  //SEG246 bitmap_line_xdyd::@4
+  b4:
   //SEG247 [130] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG248 [131] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -3494,7 +3519,7 @@ bitmap_line_xdyd: {
   //SEG249 [132] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG250 bitmap_line_xdyd::@3
   b3:
@@ -3505,11 +3530,11 @@ bitmap_line_xdyd: {
     sec
     sbc xd
     sta e
-  //SEG253 [135] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2]
+  //SEG253 [135] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG254 [135] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#0] -- register_copy 
-  //SEG255 [135] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG254 [135] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#0] -- register_copy 
+  //SEG255 [135] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#1] -- register_copy 
     jmp b2
   //SEG256 bitmap_line_xdyd::@2
   b2:
@@ -3562,9 +3587,9 @@ bitmap_line_ydxd: {
   //SEG272 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#0] -- register_copy 
   //SEG273 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG274 bitmap_line_ydxd::@5
-  b5:
+    jmp b4
+  //SEG274 bitmap_line_ydxd::@4
+  b4:
   //SEG275 [145] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG276 [146] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -3575,7 +3600,7 @@ bitmap_line_ydxd: {
   //SEG277 [147] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG278 bitmap_line_ydxd::@3
   b3:
@@ -3586,11 +3611,11 @@ bitmap_line_ydxd: {
     sec
     sbc yd
     sta e
-  //SEG281 [150] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2]
+  //SEG281 [150] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG282 [150] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#0] -- register_copy 
-  //SEG283 [150] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG282 [150] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#0] -- register_copy 
+  //SEG283 [150] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#1] -- register_copy 
     jmp b2
   //SEG284 bitmap_line_ydxd::@2
   b2:
@@ -3769,10 +3794,10 @@ bitmap_init: {
     sta bitmap_plot_bit,y
   //SEG338 [177] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr bits
-  //SEG339 [178] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuz1_neq_0_then_la1 
+  //SEG339 [178] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuz1_neq_0_then_la1 
     lda bits
     cmp #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG340 [179] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
   b2_from_b1:
   //SEG341 [179] phi (byte) bitmap_init::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:bitmap_init::@1->bitmap_init::@2#0] -- vbuz1=vbuc1 
@@ -3787,24 +3812,24 @@ bitmap_init: {
     lda x
     cmp #0
     bne b1_from_b2
-  //SEG345 [182] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  b5_from_b2:
-  //SEG346 [182] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG345 [182] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  b3_from_b2:
+  //SEG346 [182] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     lda #>0
     sta yoffs+1
-  //SEG347 [182] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuz1=vbuc1 
+  //SEG347 [182] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuz1=vbuc1 
     lda #0
     sta y
-    jmp b5
-  //SEG348 [182] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  b5_from_b6:
-  //SEG349 [182] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG350 [182] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-    jmp b5
-  //SEG351 bitmap_init::@5
-  b5:
+    jmp b3
+  //SEG348 [182] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  b3_from_b4:
+  //SEG349 [182] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG350 [182] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+    jmp b3
+  //SEG351 bitmap_init::@3
+  b3:
   //SEG352 [183] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuz2_band_vbuc1 
     lda #7
     and y
@@ -3831,13 +3856,13 @@ bitmap_init: {
     lda #7
     and y
     sta _10
-  //SEG359 [190] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG359 [190] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp _10
-    bne b6_from_b5
-    jmp b7
-  //SEG360 bitmap_init::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG360 bitmap_init::@5
+  b5:
   //SEG361 [191] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -3846,32 +3871,32 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG362 [192] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG363 [192] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-    jmp b6
-  //SEG364 bitmap_init::@6
-  b6:
+  //SEG362 [192] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG363 [192] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+    jmp b4
+  //SEG364 bitmap_init::@4
+  b4:
   //SEG365 [193] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG366 [194] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuz1_neq_0_then_la1 
+  //SEG366 [194] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuz1_neq_0_then_la1 
     lda y
     cmp #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG367 bitmap_init::@return
   breturn:
   //SEG368 [195] return 
     rts
-  //SEG369 [196] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG370 bitmap_init::@10
-  b10:
-  //SEG371 [179] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  b2_from_b10:
-  //SEG372 [179] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG369 [196] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG370 bitmap_init::@6
+  b6:
+  //SEG371 [179] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  b2_from_b6:
+  //SEG372 [179] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
     jmp b2
 }
   // Tables for the plotter - initialized by calling bitmap_draw_init();
@@ -4249,15 +4274,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const lines_cnt = 8
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @15 [phi:@begin->@15]
-b15_from_bbegin:
-  jmp b15
-//SEG5 @15
-b15:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @15 to @end [phi:@15->@end]
-bend_from_b15:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -4279,25 +4304,25 @@ main: {
   //SEG15 [171] phi from main to bitmap_init [phi:main->bitmap_init]
   bitmap_init_from_main:
     jsr bitmap_init
-  //SEG16 [9] phi from main to main::@3 [phi:main->main::@3]
-  b3_from_main:
-    jmp b3
-  //SEG17 main::@3
-  b3:
+  //SEG16 [9] phi from main to main::@2 [phi:main->main::@2]
+  b2_from_main:
+    jmp b2
+  //SEG17 main::@2
+  b2:
   //SEG18 [10] call bitmap_clear 
     jsr bitmap_clear
-  //SEG19 [11] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG20 main::@4
-  b4:
+  //SEG19 [11] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG20 main::@3
+  b3:
   //SEG21 [12] call init_screen 
-  //SEG22 [154] phi from main::@4 to init_screen [phi:main::@4->init_screen]
-  init_screen_from_b4:
+  //SEG22 [154] phi from main::@3 to init_screen [phi:main::@3->init_screen]
+  init_screen_from_b3:
     jsr init_screen
-  //SEG23 [13] phi from main::@1 main::@4 to main::@1 [phi:main::@1/main::@4->main::@1]
+  //SEG23 [13] phi from main::@1 main::@3 to main::@1 [phi:main::@1/main::@3->main::@1]
   b1_from_b1:
-  b1_from_b4:
+  b1_from_b3:
     jmp b1
   //SEG24 main::@1
   b1:
@@ -4316,9 +4341,9 @@ lines: {
     lda #0
     sta l
     jmp b1
-  //SEG30 [16] phi from lines::@3 to lines::@1 [phi:lines::@3->lines::@1]
-  b1_from_b3:
-  //SEG31 [16] phi (byte) lines::l#2 = (byte) lines::l#1 [phi:lines::@3->lines::@1#0] -- register_copy 
+  //SEG30 [16] phi from lines::@2 to lines::@1 [phi:lines::@2->lines::@1]
+  b1_from_b2:
+  //SEG31 [16] phi (byte) lines::l#2 = (byte) lines::l#1 [phi:lines::@2->lines::@1#0] -- register_copy 
     jmp b1
   //SEG32 lines::@1
   b1:
@@ -4339,15 +4364,15 @@ lines: {
     ldy lines_y+1,x
   //SEG37 [21] call bitmap_line 
     jsr bitmap_line
-    jmp b3
-  //SEG38 lines::@3
-  b3:
+    jmp b2
+  //SEG38 lines::@2
+  b2:
   //SEG39 [22] (byte) lines::l#1 ← ++ (byte) lines::l#2 -- vbuz1=_inc_vbuz1 
     inc l
   //SEG40 [23] if((byte) lines::l#1<(const byte) lines_cnt#0) goto lines::@1 -- vbuz1_lt_vbuc1_then_la1 
     lda l
     cmp #lines_cnt
-    bcc b1_from_b3
+    bcc b1_from_b2
     jmp breturn
   //SEG41 lines::@return
   breturn:
@@ -4367,36 +4392,36 @@ bitmap_line: {
     lda x0
     cmp x1
     bcc b1
-    jmp b3
-  //SEG45 bitmap_line::@3
-  b3:
+    jmp b2
+  //SEG45 bitmap_line::@2
+  b2:
   //SEG46 [26] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda x0
     sec
     sbc x1
     sta xd
-  //SEG47 [27] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10 -- vbuz1_lt_vbuyy_then_la1 
+  //SEG47 [27] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7 -- vbuz1_lt_vbuyy_then_la1 
     tya
     cmp y0
     beq !+
-    bcs b10
+    bcs b7
   !:
-    jmp b4
-  //SEG48 bitmap_line::@4
-  b4:
+    jmp b3
+  //SEG48 bitmap_line::@3
+  b3:
   //SEG49 [28] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuz1=vbuz2_minus_vbuyy 
     tya
     eor #$ff
     sec
     adc y0
     sta yd
-  //SEG50 [29] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG50 [29] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8 -- vbuz1_lt_vbuz2_then_la1 
     lda yd
     cmp xd
-    bcc b11
-    jmp b5
-  //SEG51 bitmap_line::@5
-  b5:
+    bcc b8
+    jmp b4
+  //SEG51 bitmap_line::@4
+  b4:
   //SEG52 [30] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuyy 
     sty bitmap_line_ydxi.y
   //SEG53 [31] (byte) bitmap_line_ydxi::x#0 ← (byte) bitmap_line::x1#0 -- vbuxx=vbuz1 
@@ -4405,21 +4430,21 @@ bitmap_line: {
   //SEG55 [33] (byte) bitmap_line_ydxi::yd#0 ← (byte) bitmap_line::yd#2
   //SEG56 [34] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   //SEG57 [35] call bitmap_line_ydxi 
-  //SEG58 [109] phi from bitmap_line::@5 to bitmap_line_ydxi [phi:bitmap_line::@5->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b5:
-  //SEG59 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@5->bitmap_line_ydxi#0] -- register_copy 
-  //SEG60 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#1] -- register_copy 
-  //SEG61 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@5->bitmap_line_ydxi#2] -- register_copy 
-  //SEG62 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@5->bitmap_line_ydxi#3] -- register_copy 
-  //SEG63 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#4] -- register_copy 
+  //SEG58 [109] phi from bitmap_line::@4 to bitmap_line_ydxi [phi:bitmap_line::@4->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b4:
+  //SEG59 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@4->bitmap_line_ydxi#0] -- register_copy 
+  //SEG60 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#1] -- register_copy 
+  //SEG61 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@4->bitmap_line_ydxi#2] -- register_copy 
+  //SEG62 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@4->bitmap_line_ydxi#3] -- register_copy 
+  //SEG63 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
   //SEG64 bitmap_line::@return
   breturn:
   //SEG65 [36] return 
     rts
-  //SEG66 bitmap_line::@11
-  b11:
+  //SEG66 bitmap_line::@8
+  b8:
   //SEG67 [37] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0 -- vbuxx=vbuz1 
     ldx x1
   //SEG68 [38] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuyy 
@@ -4428,29 +4453,29 @@ bitmap_line: {
   //SEG70 [40] (byte) bitmap_line_xdyi::xd#0 ← (byte) bitmap_line::xd#2
   //SEG71 [41] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2
   //SEG72 [42] call bitmap_line_xdyi 
-  //SEG73 [87] phi from bitmap_line::@11 to bitmap_line_xdyi [phi:bitmap_line::@11->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b11:
-  //SEG74 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@11->bitmap_line_xdyi#0] -- register_copy 
-  //SEG75 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#1] -- register_copy 
-  //SEG76 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@11->bitmap_line_xdyi#2] -- register_copy 
-  //SEG77 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@11->bitmap_line_xdyi#3] -- register_copy 
-  //SEG78 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#4] -- register_copy 
+  //SEG73 [87] phi from bitmap_line::@8 to bitmap_line_xdyi [phi:bitmap_line::@8->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b8:
+  //SEG74 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@8->bitmap_line_xdyi#0] -- register_copy 
+  //SEG75 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#1] -- register_copy 
+  //SEG76 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@8->bitmap_line_xdyi#2] -- register_copy 
+  //SEG77 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@8->bitmap_line_xdyi#3] -- register_copy 
+  //SEG78 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
-  //SEG79 bitmap_line::@10
-  b10:
+  //SEG79 bitmap_line::@7
+  b7:
   //SEG80 [43] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuz1=vbuyy_minus_vbuz2 
     tya
     sec
     sbc y0
     sta yd
-  //SEG81 [44] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG81 [44] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9 -- vbuz1_lt_vbuz2_then_la1 
     lda yd
     cmp xd
-    bcc b15
-    jmp b17
-  //SEG82 bitmap_line::@17
-  b17:
+    bcc b9
+    jmp b10
+  //SEG82 bitmap_line::@10
+  b10:
   //SEG83 [45] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxd.y
@@ -4461,17 +4486,17 @@ bitmap_line: {
   //SEG86 [48] (byte) bitmap_line_ydxd::yd#0 ← (byte) bitmap_line::yd#1
   //SEG87 [49] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   //SEG88 [50] call bitmap_line_ydxd 
-  //SEG89 [139] phi from bitmap_line::@17 to bitmap_line_ydxd [phi:bitmap_line::@17->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b17:
-  //SEG90 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@17->bitmap_line_ydxd#0] -- register_copy 
-  //SEG91 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#1] -- register_copy 
-  //SEG92 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@17->bitmap_line_ydxd#2] -- register_copy 
-  //SEG93 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@17->bitmap_line_ydxd#3] -- register_copy 
-  //SEG94 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#4] -- register_copy 
+  //SEG89 [139] phi from bitmap_line::@10 to bitmap_line_ydxd [phi:bitmap_line::@10->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b10:
+  //SEG90 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@10->bitmap_line_ydxd#0] -- register_copy 
+  //SEG91 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#1] -- register_copy 
+  //SEG92 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@10->bitmap_line_ydxd#2] -- register_copy 
+  //SEG93 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@10->bitmap_line_ydxd#3] -- register_copy 
+  //SEG94 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG95 bitmap_line::@15
-  b15:
+  //SEG95 bitmap_line::@9
+  b9:
   //SEG96 [51] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0 -- vbuxx=vbuz1 
     ldx x1
   //SEG97 [52] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuyy 
@@ -4482,13 +4507,13 @@ bitmap_line: {
   //SEG99 [54] (byte) bitmap_line_xdyd::xd#0 ← (byte) bitmap_line::xd#2
   //SEG100 [55] (byte) bitmap_line_xdyd::yd#0 ← (byte) bitmap_line::yd#1
   //SEG101 [56] call bitmap_line_xdyd 
-  //SEG102 [124] phi from bitmap_line::@15 to bitmap_line_xdyd [phi:bitmap_line::@15->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b15:
-  //SEG103 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@15->bitmap_line_xdyd#0] -- register_copy 
-  //SEG104 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#1] -- register_copy 
-  //SEG105 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@15->bitmap_line_xdyd#2] -- register_copy 
-  //SEG106 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@15->bitmap_line_xdyd#3] -- register_copy 
-  //SEG107 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#4] -- register_copy 
+  //SEG102 [124] phi from bitmap_line::@9 to bitmap_line_xdyd [phi:bitmap_line::@9->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b9:
+  //SEG103 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@9->bitmap_line_xdyd#0] -- register_copy 
+  //SEG104 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#1] -- register_copy 
+  //SEG105 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@9->bitmap_line_xdyd#2] -- register_copy 
+  //SEG106 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@9->bitmap_line_xdyd#3] -- register_copy 
+  //SEG107 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
   //SEG108 bitmap_line::@1
@@ -4498,28 +4523,28 @@ bitmap_line: {
     sec
     sbc x0
     sta xd
-  //SEG110 [58] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20 -- vbuz1_lt_vbuyy_then_la1 
+  //SEG110 [58] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11 -- vbuz1_lt_vbuyy_then_la1 
     tya
     cmp y0
     beq !+
-    bcs b20
+    bcs b11
   !:
-    jmp b7
-  //SEG111 bitmap_line::@7
-  b7:
+    jmp b5
+  //SEG111 bitmap_line::@5
+  b5:
   //SEG112 [59] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuz1=vbuz2_minus_vbuyy 
     tya
     eor #$ff
     sec
     adc y0
     sta yd
-  //SEG113 [60] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG113 [60] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12 -- vbuz1_lt_vbuz2_then_la1 
     lda yd
     cmp xd
-    bcc b21
-    jmp b8
-  //SEG114 bitmap_line::@8
-  b8:
+    bcc b12
+    jmp b6
+  //SEG114 bitmap_line::@6
+  b6:
   //SEG115 [61] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuyy 
     sty bitmap_line_ydxd.y
   //SEG116 [62] (byte) bitmap_line_ydxd::x#1 ← (byte) bitmap_line::x1#0 -- vbuxx=vbuz1 
@@ -4528,17 +4553,17 @@ bitmap_line: {
   //SEG118 [64] (byte) bitmap_line_ydxd::yd#1 ← (byte) bitmap_line::yd#10
   //SEG119 [65] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   //SEG120 [66] call bitmap_line_ydxd 
-  //SEG121 [139] phi from bitmap_line::@8 to bitmap_line_ydxd [phi:bitmap_line::@8->bitmap_line_ydxd]
-  bitmap_line_ydxd_from_b8:
-  //SEG122 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@8->bitmap_line_ydxd#0] -- register_copy 
-  //SEG123 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#1] -- register_copy 
-  //SEG124 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@8->bitmap_line_ydxd#2] -- register_copy 
-  //SEG125 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@8->bitmap_line_ydxd#3] -- register_copy 
-  //SEG126 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#4] -- register_copy 
+  //SEG121 [139] phi from bitmap_line::@6 to bitmap_line_ydxd [phi:bitmap_line::@6->bitmap_line_ydxd]
+  bitmap_line_ydxd_from_b6:
+  //SEG122 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@6->bitmap_line_ydxd#0] -- register_copy 
+  //SEG123 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#1] -- register_copy 
+  //SEG124 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@6->bitmap_line_ydxd#2] -- register_copy 
+  //SEG125 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@6->bitmap_line_ydxd#3] -- register_copy 
+  //SEG126 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG127 bitmap_line::@21
-  b21:
+  //SEG127 bitmap_line::@12
+  b12:
   //SEG128 [67] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0 -- vbuxx=vbuz1 
     ldx x0
   //SEG129 [68] (byte) bitmap_line_xdyd::y#1 ← (byte) bitmap_line::y0#0
@@ -4546,29 +4571,29 @@ bitmap_line: {
   //SEG131 [70] (byte) bitmap_line_xdyd::xd#1 ← (byte) bitmap_line::xd#1
   //SEG132 [71] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10
   //SEG133 [72] call bitmap_line_xdyd 
-  //SEG134 [124] phi from bitmap_line::@21 to bitmap_line_xdyd [phi:bitmap_line::@21->bitmap_line_xdyd]
-  bitmap_line_xdyd_from_b21:
-  //SEG135 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@21->bitmap_line_xdyd#0] -- register_copy 
-  //SEG136 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#1] -- register_copy 
-  //SEG137 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@21->bitmap_line_xdyd#2] -- register_copy 
-  //SEG138 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@21->bitmap_line_xdyd#3] -- register_copy 
-  //SEG139 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#4] -- register_copy 
+  //SEG134 [124] phi from bitmap_line::@12 to bitmap_line_xdyd [phi:bitmap_line::@12->bitmap_line_xdyd]
+  bitmap_line_xdyd_from_b12:
+  //SEG135 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@12->bitmap_line_xdyd#0] -- register_copy 
+  //SEG136 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#1] -- register_copy 
+  //SEG137 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@12->bitmap_line_xdyd#2] -- register_copy 
+  //SEG138 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@12->bitmap_line_xdyd#3] -- register_copy 
+  //SEG139 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
-  //SEG140 bitmap_line::@20
-  b20:
+  //SEG140 bitmap_line::@11
+  b11:
   //SEG141 [73] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuz1=vbuyy_minus_vbuz2 
     tya
     sec
     sbc y0
     sta yd
-  //SEG142 [74] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG142 [74] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13 -- vbuz1_lt_vbuz2_then_la1 
     lda yd
     cmp xd
-    bcc b25
-    jmp b27
-  //SEG143 bitmap_line::@27
-  b27:
+    bcc b13
+    jmp b14
+  //SEG143 bitmap_line::@14
+  b14:
   //SEG144 [75] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxi.y
@@ -4579,17 +4604,17 @@ bitmap_line: {
   //SEG147 [78] (byte) bitmap_line_ydxi::yd#1 ← (byte) bitmap_line::yd#11
   //SEG148 [79] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   //SEG149 [80] call bitmap_line_ydxi 
-  //SEG150 [109] phi from bitmap_line::@27 to bitmap_line_ydxi [phi:bitmap_line::@27->bitmap_line_ydxi]
-  bitmap_line_ydxi_from_b27:
-  //SEG151 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@27->bitmap_line_ydxi#0] -- register_copy 
-  //SEG152 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#1] -- register_copy 
-  //SEG153 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@27->bitmap_line_ydxi#2] -- register_copy 
-  //SEG154 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@27->bitmap_line_ydxi#3] -- register_copy 
-  //SEG155 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#4] -- register_copy 
+  //SEG150 [109] phi from bitmap_line::@14 to bitmap_line_ydxi [phi:bitmap_line::@14->bitmap_line_ydxi]
+  bitmap_line_ydxi_from_b14:
+  //SEG151 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@14->bitmap_line_ydxi#0] -- register_copy 
+  //SEG152 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#1] -- register_copy 
+  //SEG153 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@14->bitmap_line_ydxi#2] -- register_copy 
+  //SEG154 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@14->bitmap_line_ydxi#3] -- register_copy 
+  //SEG155 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
-  //SEG156 bitmap_line::@25
-  b25:
+  //SEG156 bitmap_line::@13
+  b13:
   //SEG157 [81] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0 -- vbuxx=vbuz1 
     ldx x0
   //SEG158 [82] (byte) bitmap_line_xdyi::y#1 ← (byte) bitmap_line::y0#0
@@ -4599,13 +4624,13 @@ bitmap_line: {
   //SEG160 [84] (byte) bitmap_line_xdyi::xd#1 ← (byte) bitmap_line::xd#1
   //SEG161 [85] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11
   //SEG162 [86] call bitmap_line_xdyi 
-  //SEG163 [87] phi from bitmap_line::@25 to bitmap_line_xdyi [phi:bitmap_line::@25->bitmap_line_xdyi]
-  bitmap_line_xdyi_from_b25:
-  //SEG164 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@25->bitmap_line_xdyi#0] -- register_copy 
-  //SEG165 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#1] -- register_copy 
-  //SEG166 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@25->bitmap_line_xdyi#2] -- register_copy 
-  //SEG167 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@25->bitmap_line_xdyi#3] -- register_copy 
-  //SEG168 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#4] -- register_copy 
+  //SEG163 [87] phi from bitmap_line::@13 to bitmap_line_xdyi [phi:bitmap_line::@13->bitmap_line_xdyi]
+  bitmap_line_xdyi_from_b13:
+  //SEG164 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@13->bitmap_line_xdyi#0] -- register_copy 
+  //SEG165 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#1] -- register_copy 
+  //SEG166 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@13->bitmap_line_xdyi#2] -- register_copy 
+  //SEG167 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@13->bitmap_line_xdyi#3] -- register_copy 
+  //SEG168 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
 }
@@ -4640,9 +4665,9 @@ bitmap_line_xdyi: {
   //SEG180 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#0] -- register_copy 
   //SEG181 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG182 bitmap_line_xdyi::@5
-  b5:
+    jmp b4
+  //SEG182 bitmap_line_xdyi::@4
+  b4:
   //SEG183 [93] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3 -- vbuxx=_inc_vbuxx 
     inx
   //SEG184 [94] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -4653,7 +4678,7 @@ bitmap_line_xdyi: {
   //SEG185 [95] if((byte) bitmap_line_xdyi::xd#5>=(byte) bitmap_line_xdyi::e#1) goto bitmap_line_xdyi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG186 bitmap_line_xdyi::@3
   b3:
@@ -4664,11 +4689,11 @@ bitmap_line_xdyi: {
     sec
     sbc xd
     sta e
-  //SEG189 [98] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2]
+  //SEG189 [98] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG190 [98] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#0] -- register_copy 
-  //SEG191 [98] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG190 [98] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#0] -- register_copy 
+  //SEG191 [98] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#1] -- register_copy 
     jmp b2
   //SEG192 bitmap_line_xdyi::@2
   b2:
@@ -4752,9 +4777,9 @@ bitmap_line_ydxi: {
   //SEG216 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#0] -- register_copy 
   //SEG217 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG218 bitmap_line_ydxi::@5
-  b5:
+    jmp b4
+  //SEG218 bitmap_line_ydxi::@4
+  b4:
   //SEG219 [115] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG220 [116] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -4765,7 +4790,7 @@ bitmap_line_ydxi: {
   //SEG221 [117] if((byte) bitmap_line_ydxi::yd#5>=(byte) bitmap_line_ydxi::e#1) goto bitmap_line_ydxi::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG222 bitmap_line_ydxi::@3
   b3:
@@ -4776,11 +4801,11 @@ bitmap_line_ydxi: {
     sec
     sbc yd
     sta e
-  //SEG225 [120] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2]
+  //SEG225 [120] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG226 [120] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#0] -- register_copy 
-  //SEG227 [120] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG226 [120] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#0] -- register_copy 
+  //SEG227 [120] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#1] -- register_copy 
     jmp b2
   //SEG228 bitmap_line_ydxi::@2
   b2:
@@ -4827,9 +4852,9 @@ bitmap_line_xdyd: {
   //SEG244 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#0] -- register_copy 
   //SEG245 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG246 bitmap_line_xdyd::@5
-  b5:
+    jmp b4
+  //SEG246 bitmap_line_xdyd::@4
+  b4:
   //SEG247 [130] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3 -- vbuxx=_inc_vbuxx 
     inx
   //SEG248 [131] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -4840,7 +4865,7 @@ bitmap_line_xdyd: {
   //SEG249 [132] if((byte) bitmap_line_xdyd::xd#5>=(byte) bitmap_line_xdyd::e#1) goto bitmap_line_xdyd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda xd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG250 bitmap_line_xdyd::@3
   b3:
@@ -4851,11 +4876,11 @@ bitmap_line_xdyd: {
     sec
     sbc xd
     sta e
-  //SEG253 [135] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2]
+  //SEG253 [135] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG254 [135] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#0] -- register_copy 
-  //SEG255 [135] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG254 [135] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#0] -- register_copy 
+  //SEG255 [135] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#1] -- register_copy 
     jmp b2
   //SEG256 bitmap_line_xdyd::@2
   b2:
@@ -4902,9 +4927,9 @@ bitmap_line_ydxd: {
   //SEG272 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#0] -- register_copy 
   //SEG273 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b5
-  //SEG274 bitmap_line_ydxd::@5
-  b5:
+    jmp b4
+  //SEG274 bitmap_line_ydxd::@4
+  b4:
   //SEG275 [145] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG276 [146] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -4915,7 +4940,7 @@ bitmap_line_ydxd: {
   //SEG277 [147] if((byte) bitmap_line_ydxd::yd#5>=(byte) bitmap_line_ydxd::e#1) goto bitmap_line_ydxd::@2 -- vbuz1_ge_vbuz2_then_la1 
     lda yd
     cmp e
-    bcs b2_from_b5
+    bcs b2_from_b4
     jmp b3
   //SEG278 bitmap_line_ydxd::@3
   b3:
@@ -4926,11 +4951,11 @@ bitmap_line_ydxd: {
     sec
     sbc yd
     sta e
-  //SEG281 [150] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2]
+  //SEG281 [150] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG282 [150] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#0] -- register_copy 
-  //SEG283 [150] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#1] -- register_copy 
+  b2_from_b4:
+  //SEG282 [150] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#0] -- register_copy 
+  //SEG283 [150] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#1] -- register_copy 
     jmp b2
   //SEG284 bitmap_line_ydxd::@2
   b2:
@@ -5087,9 +5112,9 @@ bitmap_init: {
     tya
     lsr
     tay
-  //SEG339 [178] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuyy_neq_0_then_la1 
+  //SEG339 [178] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuyy_neq_0_then_la1 
     cpy #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG340 [179] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
   b2_from_b1:
   //SEG341 [179] phi (byte) bitmap_init::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:bitmap_init::@1->bitmap_init::@2#0] -- vbuyy=vbuc1 
@@ -5102,23 +5127,23 @@ bitmap_init: {
   //SEG344 [181] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1_from_b2
-  //SEG345 [182] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  b5_from_b2:
-  //SEG346 [182] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG345 [182] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  b3_from_b2:
+  //SEG346 [182] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     lda #>0
     sta yoffs+1
-  //SEG347 [182] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuxx=vbuc1 
+  //SEG347 [182] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuxx=vbuc1 
     ldx #0
-    jmp b5
-  //SEG348 [182] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  b5_from_b6:
-  //SEG349 [182] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG350 [182] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-    jmp b5
-  //SEG351 bitmap_init::@5
-  b5:
+    jmp b3
+  //SEG348 [182] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  b3_from_b4:
+  //SEG349 [182] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG350 [182] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+    jmp b3
+  //SEG351 bitmap_init::@3
+  b3:
   //SEG352 [183] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _6
@@ -5135,12 +5160,12 @@ bitmap_init: {
   //SEG358 [189] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG359 [190] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG359 [190] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6_from_b5
-    jmp b7
-  //SEG360 bitmap_init::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG360 bitmap_init::@5
+  b5:
   //SEG361 [191] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -5149,31 +5174,31 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG362 [192] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG363 [192] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-    jmp b6
-  //SEG364 bitmap_init::@6
-  b6:
+  //SEG362 [192] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG363 [192] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+    jmp b4
+  //SEG364 bitmap_init::@4
+  b4:
   //SEG365 [193] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG366 [194] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuxx_neq_0_then_la1 
+  //SEG366 [194] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG367 bitmap_init::@return
   breturn:
   //SEG368 [195] return 
     rts
-  //SEG369 [196] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG370 bitmap_init::@10
-  b10:
-  //SEG371 [179] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  b2_from_b10:
-  //SEG372 [179] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG369 [196] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG370 bitmap_init::@6
+  b6:
+  //SEG371 [179] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  b2_from_b6:
+  //SEG372 [179] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
     jmp b2
 }
   // Tables for the plotter - initialized by calling bitmap_draw_init();
@@ -5186,56 +5211,56 @@ bitmap_init: {
   lines_y: .byte $a, $28, $3c, $50, $6e, $50, $3c, $28, $a
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b15
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
-Removing instruction jmp b1
-Removing instruction jmp b1
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp breturn
-Removing instruction jmp b17
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b27
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b5
-Removing instruction jmp b7
-Removing instruction jmp b6
 Removing instruction jmp breturn
 Removing instruction jmp b10
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b14
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b5
+Removing instruction jmp b4
+Removing instruction jmp breturn
+Removing instruction jmp b6
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Removing instruction ldy l
@@ -5250,97 +5275,97 @@ Removing instruction lda #>0
 Replacing instruction ldx #0 with TAX
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b1_from_b1 with b1
-Replacing label b1_from_b3 with b1
-Replacing label b2_from_b5 with b2
 Replacing label b1_from_b2 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b2 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b2 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
+Replacing label b1_from_b2 with b1
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
-Replacing label b10_from_b1 with b10
+Replacing label b6_from_b1 with b6
 Replacing label b1_from_b2 with b1
-Replacing label b6_from_b5 with b6
-Replacing label b5_from_b6 with b5
-Removing instruction b15_from_bbegin:
-Removing instruction b15:
-Removing instruction bend_from_b15:
-Removing instruction b3_from_main:
-Removing instruction b4_from_b3:
-Removing instruction init_screen_from_b4:
+Replacing label b4_from_b3 with b4
+Replacing label b3_from_b4 with b3
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction b2_from_main:
+Removing instruction b3_from_b2:
+Removing instruction init_screen_from_b3:
 Removing instruction b1_from_b1:
-Removing instruction b1_from_b4:
-Removing instruction lines_from_b1:
 Removing instruction b1_from_b3:
+Removing instruction lines_from_b1:
+Removing instruction b1_from_b2:
 Removing instruction b1_from_bitmap_line_xdyi:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_bitmap_line_ydxi:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_bitmap_line_xdyd:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_bitmap_line_ydxd:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_b1:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
 Removing instruction b1_from_b2:
-Removing instruction b5_from_b6:
-Removing instruction b6_from_b5:
-Removing instruction b6_from_b7:
-Removing instruction b10_from_b1:
-Removing instruction b2_from_b10:
+Removing instruction b3_from_b4:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b5:
+Removing instruction b6_from_b1:
+Removing instruction b2_from_b6:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction bitmap_init_from_main:
+Removing instruction b2:
 Removing instruction b3:
-Removing instruction b4:
 Removing instruction b1_from_lines:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
+Removing instruction b2:
 Removing instruction b3:
 Removing instruction b4:
+Removing instruction bitmap_line_ydxi_from_b4:
+Removing instruction bitmap_line_xdyi_from_b8:
+Removing instruction b10:
+Removing instruction bitmap_line_ydxd_from_b10:
+Removing instruction bitmap_line_xdyd_from_b9:
 Removing instruction b5:
-Removing instruction bitmap_line_ydxi_from_b5:
-Removing instruction bitmap_line_xdyi_from_b11:
-Removing instruction b17:
-Removing instruction bitmap_line_ydxd_from_b17:
-Removing instruction bitmap_line_xdyd_from_b15:
-Removing instruction b7:
-Removing instruction b8:
-Removing instruction bitmap_line_ydxd_from_b8:
-Removing instruction bitmap_line_xdyd_from_b21:
-Removing instruction b27:
-Removing instruction bitmap_line_ydxi_from_b27:
-Removing instruction bitmap_line_xdyi_from_b25:
+Removing instruction b6:
+Removing instruction bitmap_line_ydxd_from_b6:
+Removing instruction bitmap_line_xdyd_from_b12:
+Removing instruction b14:
+Removing instruction bitmap_line_ydxi_from_b14:
+Removing instruction bitmap_line_xdyi_from_b13:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction bitmap_plot_from_b1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_init_screen:
@@ -5350,32 +5375,32 @@ Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_bitmap_init:
 Removing instruction b2_from_b1:
-Removing instruction b5_from_b2:
-Removing instruction b7:
+Removing instruction b3_from_b2:
+Removing instruction b5:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b2 in bne b10
+Skipping double jump to b2 in bne b6
 Succesful ASM optimization Pass5DoubleJumpElimination
 Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b3
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda x0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
-Removing instruction b10:
+Removing instruction b6:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b2
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @15
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -5493,11 +5518,11 @@ FINAL SYMBOL TABLE
 (byte~) bitmap_init::$8 reg byte a 22.0
 (byte~) bitmap_init::$9 reg byte a 22.0
 (label) bitmap_init::@1
-(label) bitmap_init::@10
 (label) bitmap_init::@2
+(label) bitmap_init::@3
+(label) bitmap_init::@4
 (label) bitmap_init::@5
 (label) bitmap_init::@6
-(label) bitmap_init::@7
 (label) bitmap_init::@return
 (byte*) bitmap_init::bitmap
 (byte) bitmap_init::bits
@@ -5518,17 +5543,17 @@ FINAL SYMBOL TABLE
 (label) bitmap_line::@1
 (label) bitmap_line::@10
 (label) bitmap_line::@11
-(label) bitmap_line::@15
-(label) bitmap_line::@17
-(label) bitmap_line::@20
-(label) bitmap_line::@21
-(label) bitmap_line::@25
-(label) bitmap_line::@27
+(label) bitmap_line::@12
+(label) bitmap_line::@13
+(label) bitmap_line::@14
+(label) bitmap_line::@2
 (label) bitmap_line::@3
 (label) bitmap_line::@4
 (label) bitmap_line::@5
+(label) bitmap_line::@6
 (label) bitmap_line::@7
 (label) bitmap_line::@8
+(label) bitmap_line::@9
 (label) bitmap_line::@return
 (byte) bitmap_line::x0
 (byte) bitmap_line::x0#0 x0 zp ZP_BYTE:5 5.173913043478264
@@ -5551,7 +5576,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_xdyd::@1
 (label) bitmap_line_xdyd::@2
 (label) bitmap_line_xdyd::@3
-(label) bitmap_line_xdyd::@5
+(label) bitmap_line_xdyd::@4
 (label) bitmap_line_xdyd::@return
 (byte) bitmap_line_xdyd::e
 (byte) bitmap_line_xdyd::e#0 e zp ZP_BYTE:5 4.0
@@ -5589,7 +5614,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_xdyi::@1
 (label) bitmap_line_xdyi::@2
 (label) bitmap_line_xdyi::@3
-(label) bitmap_line_xdyi::@5
+(label) bitmap_line_xdyi::@4
 (label) bitmap_line_xdyi::@return
 (byte) bitmap_line_xdyi::e
 (byte) bitmap_line_xdyi::e#0 e zp ZP_BYTE:7 4.0
@@ -5627,7 +5652,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_ydxd::@1
 (label) bitmap_line_ydxd::@2
 (label) bitmap_line_ydxd::@3
-(label) bitmap_line_ydxd::@5
+(label) bitmap_line_ydxd::@4
 (label) bitmap_line_ydxd::@return
 (byte) bitmap_line_ydxd::e
 (byte) bitmap_line_ydxd::e#0 e zp ZP_BYTE:5 4.0
@@ -5665,7 +5690,7 @@ FINAL SYMBOL TABLE
 (label) bitmap_line_ydxi::@1
 (label) bitmap_line_ydxi::@2
 (label) bitmap_line_ydxi::@3
-(label) bitmap_line_ydxi::@5
+(label) bitmap_line_ydxi::@4
 (label) bitmap_line_ydxi::@return
 (byte) bitmap_line_ydxi::e
 (byte) bitmap_line_ydxi::e#0 e zp ZP_BYTE:5 4.0
@@ -5737,7 +5762,7 @@ FINAL SYMBOL TABLE
 (byte*) init_screen::c#2 c zp ZP_WORD:9 16.5
 (void()) lines()
 (label) lines::@1
-(label) lines::@3
+(label) lines::@2
 (label) lines::@return
 (byte) lines::l
 (byte) lines::l#1 l zp ZP_BYTE:2 151.5
@@ -5750,8 +5775,8 @@ FINAL SYMBOL TABLE
 (const byte[]) lines_y#0 lines_y = { (byte/signed byte/word/signed word/dword/signed dword) $a, (byte/signed byte/word/signed word/dword/signed dword) $28, (byte/signed byte/word/signed word/dword/signed dword) $3c, (byte/signed byte/word/signed word/dword/signed dword) $50, (byte/signed byte/word/signed word/dword/signed dword) $6e, (byte/signed byte/word/signed word/dword/signed dword) $50, (byte/signed byte/word/signed word/dword/signed dword) $3c, (byte/signed byte/word/signed word/dword/signed dword) $28, (byte/signed byte/word/signed word/dword/signed dword) $a }
 (void()) main()
 (label) main::@1
+(label) main::@2
 (label) main::@3
-(label) main::@4
 
 zp ZP_BYTE:2 [ lines::l#2 lines::l#1 bitmap_clear::y#4 bitmap_clear::y#1 bitmap_init::$6 ]
 zp ZP_BYTE:3 [ bitmap_line_xdyi::yd#2 bitmap_line_xdyi::yd#0 bitmap_line_xdyi::yd#1 bitmap_line::yd#2 bitmap_line::yd#11 bitmap_line_ydxi::yd#5 bitmap_line_ydxi::yd#1 bitmap_line_ydxi::yd#0 bitmap_line_xdyd::yd#2 bitmap_line_xdyd::yd#0 bitmap_line_xdyd::yd#1 bitmap_line::yd#1 bitmap_line::yd#10 bitmap_line_ydxd::yd#5 bitmap_line_ydxd::yd#0 bitmap_line_ydxd::yd#1 ]
@@ -5803,10 +5828,10 @@ Score: 221023
   .label BITMAP = $2000
   .const lines_cnt = 8
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @15 [phi:@begin->@15]
-//SEG5 @15
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @15 to @end [phi:@15->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -5824,16 +5849,16 @@ main: {
   //SEG14 [8] call bitmap_init 
   //SEG15 [171] phi from main to bitmap_init [phi:main->bitmap_init]
     jsr bitmap_init
-  //SEG16 [9] phi from main to main::@3 [phi:main->main::@3]
-  //SEG17 main::@3
+  //SEG16 [9] phi from main to main::@2 [phi:main->main::@2]
+  //SEG17 main::@2
   //SEG18 [10] call bitmap_clear 
     jsr bitmap_clear
-  //SEG19 [11] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
-  //SEG20 main::@4
+  //SEG19 [11] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  //SEG20 main::@3
   //SEG21 [12] call init_screen 
-  //SEG22 [154] phi from main::@4 to init_screen [phi:main::@4->init_screen]
+  //SEG22 [154] phi from main::@3 to init_screen [phi:main::@3->init_screen]
     jsr init_screen
-  //SEG23 [13] phi from main::@1 main::@4 to main::@1 [phi:main::@1/main::@4->main::@1]
+  //SEG23 [13] phi from main::@1 main::@3 to main::@1 [phi:main::@1/main::@3->main::@1]
   //SEG24 main::@1
   b1:
   //SEG25 [14] call lines 
@@ -5848,8 +5873,8 @@ lines: {
   //SEG29 [16] phi (byte) lines::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lines->lines::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta l
-  //SEG30 [16] phi from lines::@3 to lines::@1 [phi:lines::@3->lines::@1]
-  //SEG31 [16] phi (byte) lines::l#2 = (byte) lines::l#1 [phi:lines::@3->lines::@1#0] -- register_copy 
+  //SEG30 [16] phi from lines::@2 to lines::@1 [phi:lines::@2->lines::@1]
+  //SEG31 [16] phi (byte) lines::l#2 = (byte) lines::l#1 [phi:lines::@2->lines::@1#0] -- register_copy 
   //SEG32 lines::@1
   b1:
   //SEG33 [17] (byte) bitmap_line::x0#0 ← *((const byte[]) lines_x#0 + (byte) lines::l#2) -- vbuz1=pbuc1_derefidx_vbuz2 
@@ -5867,7 +5892,7 @@ lines: {
     ldy lines_y+1,x
   //SEG37 [21] call bitmap_line 
     jsr bitmap_line
-  //SEG38 lines::@3
+  //SEG38 lines::@2
   //SEG39 [22] (byte) lines::l#1 ← ++ (byte) lines::l#2 -- vbuz1=_inc_vbuz1 
     inc l
   //SEG40 [23] if((byte) lines::l#1<(const byte) lines_cnt#0) goto lines::@1 -- vbuz1_lt_vbuc1_then_la1 
@@ -5891,28 +5916,28 @@ bitmap_line: {
     lda x0
     cmp x1
     bcc b1
-  //SEG45 bitmap_line::@3
+  //SEG45 bitmap_line::@2
   //SEG46 [26] (byte) bitmap_line::xd#2 ← (byte) bitmap_line::x0#0 - (byte) bitmap_line::x1#0 -- vbuz1=vbuz2_minus_vbuz3 
     sec
     sbc x1
     sta xd
-  //SEG47 [27] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@10 -- vbuz1_lt_vbuyy_then_la1 
+  //SEG47 [27] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@7 -- vbuz1_lt_vbuyy_then_la1 
     tya
     cmp y0
     beq !+
-    bcs b10
+    bcs b7
   !:
-  //SEG48 bitmap_line::@4
+  //SEG48 bitmap_line::@3
   //SEG49 [28] (byte) bitmap_line::yd#2 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuz1=vbuz2_minus_vbuyy 
     tya
     eor #$ff
     sec
     adc y0
     sta yd
-  //SEG50 [29] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@11 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG50 [29] if((byte) bitmap_line::yd#2<(byte) bitmap_line::xd#2) goto bitmap_line::@8 -- vbuz1_lt_vbuz2_then_la1 
     cmp xd
-    bcc b11
-  //SEG51 bitmap_line::@5
+    bcc b8
+  //SEG51 bitmap_line::@4
   //SEG52 [30] (byte) bitmap_line_ydxi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuyy 
     sty bitmap_line_ydxi.y
   //SEG53 [31] (byte) bitmap_line_ydxi::x#0 ← (byte) bitmap_line::x1#0 -- vbuxx=vbuz1 
@@ -5921,19 +5946,19 @@ bitmap_line: {
   //SEG55 [33] (byte) bitmap_line_ydxi::yd#0 ← (byte) bitmap_line::yd#2
   //SEG56 [34] (byte) bitmap_line_ydxi::xd#0 ← (byte) bitmap_line::xd#2
   //SEG57 [35] call bitmap_line_ydxi 
-  //SEG58 [109] phi from bitmap_line::@5 to bitmap_line_ydxi [phi:bitmap_line::@5->bitmap_line_ydxi]
-  //SEG59 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@5->bitmap_line_ydxi#0] -- register_copy 
-  //SEG60 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#1] -- register_copy 
-  //SEG61 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@5->bitmap_line_ydxi#2] -- register_copy 
-  //SEG62 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@5->bitmap_line_ydxi#3] -- register_copy 
-  //SEG63 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@5->bitmap_line_ydxi#4] -- register_copy 
+  //SEG58 [109] phi from bitmap_line::@4 to bitmap_line_ydxi [phi:bitmap_line::@4->bitmap_line_ydxi]
+  //SEG59 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#0 [phi:bitmap_line::@4->bitmap_line_ydxi#0] -- register_copy 
+  //SEG60 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#1] -- register_copy 
+  //SEG61 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#0 [phi:bitmap_line::@4->bitmap_line_ydxi#2] -- register_copy 
+  //SEG62 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#0 [phi:bitmap_line::@4->bitmap_line_ydxi#3] -- register_copy 
+  //SEG63 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#0 [phi:bitmap_line::@4->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
   //SEG64 bitmap_line::@return
   breturn:
   //SEG65 [36] return 
     rts
-  //SEG66 bitmap_line::@11
-  b11:
+  //SEG66 bitmap_line::@8
+  b8:
   //SEG67 [37] (byte) bitmap_line_xdyi::x#0 ← (byte) bitmap_line::x1#0 -- vbuxx=vbuz1 
     ldx x1
   //SEG68 [38] (byte) bitmap_line_xdyi::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuyy 
@@ -5942,25 +5967,25 @@ bitmap_line: {
   //SEG70 [40] (byte) bitmap_line_xdyi::xd#0 ← (byte) bitmap_line::xd#2
   //SEG71 [41] (byte) bitmap_line_xdyi::yd#0 ← (byte) bitmap_line::yd#2
   //SEG72 [42] call bitmap_line_xdyi 
-  //SEG73 [87] phi from bitmap_line::@11 to bitmap_line_xdyi [phi:bitmap_line::@11->bitmap_line_xdyi]
-  //SEG74 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@11->bitmap_line_xdyi#0] -- register_copy 
-  //SEG75 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#1] -- register_copy 
-  //SEG76 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@11->bitmap_line_xdyi#2] -- register_copy 
-  //SEG77 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@11->bitmap_line_xdyi#3] -- register_copy 
-  //SEG78 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@11->bitmap_line_xdyi#4] -- register_copy 
+  //SEG73 [87] phi from bitmap_line::@8 to bitmap_line_xdyi [phi:bitmap_line::@8->bitmap_line_xdyi]
+  //SEG74 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#0 [phi:bitmap_line::@8->bitmap_line_xdyi#0] -- register_copy 
+  //SEG75 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#1] -- register_copy 
+  //SEG76 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#0 [phi:bitmap_line::@8->bitmap_line_xdyi#2] -- register_copy 
+  //SEG77 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#0 [phi:bitmap_line::@8->bitmap_line_xdyi#3] -- register_copy 
+  //SEG78 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#0 [phi:bitmap_line::@8->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
-  //SEG79 bitmap_line::@10
-  b10:
+  //SEG79 bitmap_line::@7
+  b7:
   //SEG80 [43] (byte) bitmap_line::yd#1 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuz1=vbuyy_minus_vbuz2 
     tya
     sec
     sbc y0
     sta yd
-  //SEG81 [44] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@15 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG81 [44] if((byte) bitmap_line::yd#1<(byte) bitmap_line::xd#2) goto bitmap_line::@9 -- vbuz1_lt_vbuz2_then_la1 
     cmp xd
-    bcc b15
-  //SEG82 bitmap_line::@17
+    bcc b9
+  //SEG82 bitmap_line::@10
   //SEG83 [45] (byte) bitmap_line_ydxd::y#0 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxd.y
@@ -5971,16 +5996,16 @@ bitmap_line: {
   //SEG86 [48] (byte) bitmap_line_ydxd::yd#0 ← (byte) bitmap_line::yd#1
   //SEG87 [49] (byte) bitmap_line_ydxd::xd#0 ← (byte) bitmap_line::xd#2
   //SEG88 [50] call bitmap_line_ydxd 
-  //SEG89 [139] phi from bitmap_line::@17 to bitmap_line_ydxd [phi:bitmap_line::@17->bitmap_line_ydxd]
-  //SEG90 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@17->bitmap_line_ydxd#0] -- register_copy 
-  //SEG91 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#1] -- register_copy 
-  //SEG92 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@17->bitmap_line_ydxd#2] -- register_copy 
-  //SEG93 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@17->bitmap_line_ydxd#3] -- register_copy 
-  //SEG94 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@17->bitmap_line_ydxd#4] -- register_copy 
+  //SEG89 [139] phi from bitmap_line::@10 to bitmap_line_ydxd [phi:bitmap_line::@10->bitmap_line_ydxd]
+  //SEG90 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#0 [phi:bitmap_line::@10->bitmap_line_ydxd#0] -- register_copy 
+  //SEG91 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#1] -- register_copy 
+  //SEG92 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#0 [phi:bitmap_line::@10->bitmap_line_ydxd#2] -- register_copy 
+  //SEG93 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#0 [phi:bitmap_line::@10->bitmap_line_ydxd#3] -- register_copy 
+  //SEG94 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#0 [phi:bitmap_line::@10->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG95 bitmap_line::@15
-  b15:
+  //SEG95 bitmap_line::@9
+  b9:
   //SEG96 [51] (byte) bitmap_line_xdyd::x#0 ← (byte) bitmap_line::x1#0 -- vbuxx=vbuz1 
     ldx x1
   //SEG97 [52] (byte) bitmap_line_xdyd::y#0 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuyy 
@@ -5991,12 +6016,12 @@ bitmap_line: {
   //SEG99 [54] (byte) bitmap_line_xdyd::xd#0 ← (byte) bitmap_line::xd#2
   //SEG100 [55] (byte) bitmap_line_xdyd::yd#0 ← (byte) bitmap_line::yd#1
   //SEG101 [56] call bitmap_line_xdyd 
-  //SEG102 [124] phi from bitmap_line::@15 to bitmap_line_xdyd [phi:bitmap_line::@15->bitmap_line_xdyd]
-  //SEG103 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@15->bitmap_line_xdyd#0] -- register_copy 
-  //SEG104 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#1] -- register_copy 
-  //SEG105 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@15->bitmap_line_xdyd#2] -- register_copy 
-  //SEG106 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@15->bitmap_line_xdyd#3] -- register_copy 
-  //SEG107 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@15->bitmap_line_xdyd#4] -- register_copy 
+  //SEG102 [124] phi from bitmap_line::@9 to bitmap_line_xdyd [phi:bitmap_line::@9->bitmap_line_xdyd]
+  //SEG103 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#0 [phi:bitmap_line::@9->bitmap_line_xdyd#0] -- register_copy 
+  //SEG104 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#1] -- register_copy 
+  //SEG105 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#0 [phi:bitmap_line::@9->bitmap_line_xdyd#2] -- register_copy 
+  //SEG106 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#0 [phi:bitmap_line::@9->bitmap_line_xdyd#3] -- register_copy 
+  //SEG107 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#0 [phi:bitmap_line::@9->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
   //SEG108 bitmap_line::@1
@@ -6006,23 +6031,23 @@ bitmap_line: {
     sec
     sbc x0
     sta xd
-  //SEG110 [58] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@20 -- vbuz1_lt_vbuyy_then_la1 
+  //SEG110 [58] if((byte) bitmap_line::y0#0<(byte) bitmap_line::y1#0) goto bitmap_line::@11 -- vbuz1_lt_vbuyy_then_la1 
     tya
     cmp y0
     beq !+
-    bcs b20
+    bcs b11
   !:
-  //SEG111 bitmap_line::@7
+  //SEG111 bitmap_line::@5
   //SEG112 [59] (byte) bitmap_line::yd#10 ← (byte) bitmap_line::y0#0 - (byte) bitmap_line::y1#0 -- vbuz1=vbuz2_minus_vbuyy 
     tya
     eor #$ff
     sec
     adc y0
     sta yd
-  //SEG113 [60] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@21 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG113 [60] if((byte) bitmap_line::yd#10<(byte) bitmap_line::xd#1) goto bitmap_line::@12 -- vbuz1_lt_vbuz2_then_la1 
     cmp xd
-    bcc b21
-  //SEG114 bitmap_line::@8
+    bcc b12
+  //SEG114 bitmap_line::@6
   //SEG115 [61] (byte) bitmap_line_ydxd::y#1 ← (byte) bitmap_line::y1#0 -- vbuz1=vbuyy 
     sty bitmap_line_ydxd.y
   //SEG116 [62] (byte) bitmap_line_ydxd::x#1 ← (byte) bitmap_line::x1#0 -- vbuxx=vbuz1 
@@ -6031,16 +6056,16 @@ bitmap_line: {
   //SEG118 [64] (byte) bitmap_line_ydxd::yd#1 ← (byte) bitmap_line::yd#10
   //SEG119 [65] (byte) bitmap_line_ydxd::xd#1 ← (byte) bitmap_line::xd#1
   //SEG120 [66] call bitmap_line_ydxd 
-  //SEG121 [139] phi from bitmap_line::@8 to bitmap_line_ydxd [phi:bitmap_line::@8->bitmap_line_ydxd]
-  //SEG122 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@8->bitmap_line_ydxd#0] -- register_copy 
-  //SEG123 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#1] -- register_copy 
-  //SEG124 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@8->bitmap_line_ydxd#2] -- register_copy 
-  //SEG125 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@8->bitmap_line_ydxd#3] -- register_copy 
-  //SEG126 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@8->bitmap_line_ydxd#4] -- register_copy 
+  //SEG121 [139] phi from bitmap_line::@6 to bitmap_line_ydxd [phi:bitmap_line::@6->bitmap_line_ydxd]
+  //SEG122 [139] phi (byte) bitmap_line_ydxd::y1#6 = (byte) bitmap_line_ydxd::y1#1 [phi:bitmap_line::@6->bitmap_line_ydxd#0] -- register_copy 
+  //SEG123 [139] phi (byte) bitmap_line_ydxd::yd#5 = (byte) bitmap_line_ydxd::yd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#1] -- register_copy 
+  //SEG124 [139] phi (byte) bitmap_line_ydxd::y#7 = (byte) bitmap_line_ydxd::y#1 [phi:bitmap_line::@6->bitmap_line_ydxd#2] -- register_copy 
+  //SEG125 [139] phi (byte) bitmap_line_ydxd::x#5 = (byte) bitmap_line_ydxd::x#1 [phi:bitmap_line::@6->bitmap_line_ydxd#3] -- register_copy 
+  //SEG126 [139] phi (byte) bitmap_line_ydxd::xd#2 = (byte) bitmap_line_ydxd::xd#1 [phi:bitmap_line::@6->bitmap_line_ydxd#4] -- register_copy 
     jsr bitmap_line_ydxd
     jmp breturn
-  //SEG127 bitmap_line::@21
-  b21:
+  //SEG127 bitmap_line::@12
+  b12:
   //SEG128 [67] (byte) bitmap_line_xdyd::x#1 ← (byte) bitmap_line::x0#0 -- vbuxx=vbuz1 
     ldx x0
   //SEG129 [68] (byte) bitmap_line_xdyd::y#1 ← (byte) bitmap_line::y0#0
@@ -6048,25 +6073,25 @@ bitmap_line: {
   //SEG131 [70] (byte) bitmap_line_xdyd::xd#1 ← (byte) bitmap_line::xd#1
   //SEG132 [71] (byte) bitmap_line_xdyd::yd#1 ← (byte) bitmap_line::yd#10
   //SEG133 [72] call bitmap_line_xdyd 
-  //SEG134 [124] phi from bitmap_line::@21 to bitmap_line_xdyd [phi:bitmap_line::@21->bitmap_line_xdyd]
-  //SEG135 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@21->bitmap_line_xdyd#0] -- register_copy 
-  //SEG136 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#1] -- register_copy 
-  //SEG137 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@21->bitmap_line_xdyd#2] -- register_copy 
-  //SEG138 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@21->bitmap_line_xdyd#3] -- register_copy 
-  //SEG139 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@21->bitmap_line_xdyd#4] -- register_copy 
+  //SEG134 [124] phi from bitmap_line::@12 to bitmap_line_xdyd [phi:bitmap_line::@12->bitmap_line_xdyd]
+  //SEG135 [124] phi (byte) bitmap_line_xdyd::x1#6 = (byte) bitmap_line_xdyd::x1#1 [phi:bitmap_line::@12->bitmap_line_xdyd#0] -- register_copy 
+  //SEG136 [124] phi (byte) bitmap_line_xdyd::xd#5 = (byte) bitmap_line_xdyd::xd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#1] -- register_copy 
+  //SEG137 [124] phi (byte) bitmap_line_xdyd::y#5 = (byte) bitmap_line_xdyd::y#1 [phi:bitmap_line::@12->bitmap_line_xdyd#2] -- register_copy 
+  //SEG138 [124] phi (byte) bitmap_line_xdyd::x#6 = (byte) bitmap_line_xdyd::x#1 [phi:bitmap_line::@12->bitmap_line_xdyd#3] -- register_copy 
+  //SEG139 [124] phi (byte) bitmap_line_xdyd::yd#2 = (byte) bitmap_line_xdyd::yd#1 [phi:bitmap_line::@12->bitmap_line_xdyd#4] -- register_copy 
     jsr bitmap_line_xdyd
     jmp breturn
-  //SEG140 bitmap_line::@20
-  b20:
+  //SEG140 bitmap_line::@11
+  b11:
   //SEG141 [73] (byte) bitmap_line::yd#11 ← (byte) bitmap_line::y1#0 - (byte) bitmap_line::y0#0 -- vbuz1=vbuyy_minus_vbuz2 
     tya
     sec
     sbc y0
     sta yd
-  //SEG142 [74] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@25 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG142 [74] if((byte) bitmap_line::yd#11<(byte) bitmap_line::xd#1) goto bitmap_line::@13 -- vbuz1_lt_vbuz2_then_la1 
     cmp xd
-    bcc b25
-  //SEG143 bitmap_line::@27
+    bcc b13
+  //SEG143 bitmap_line::@14
   //SEG144 [75] (byte) bitmap_line_ydxi::y#1 ← (byte) bitmap_line::y0#0 -- vbuz1=vbuz2 
     lda y0
     sta bitmap_line_ydxi.y
@@ -6077,16 +6102,16 @@ bitmap_line: {
   //SEG147 [78] (byte) bitmap_line_ydxi::yd#1 ← (byte) bitmap_line::yd#11
   //SEG148 [79] (byte) bitmap_line_ydxi::xd#1 ← (byte) bitmap_line::xd#1
   //SEG149 [80] call bitmap_line_ydxi 
-  //SEG150 [109] phi from bitmap_line::@27 to bitmap_line_ydxi [phi:bitmap_line::@27->bitmap_line_ydxi]
-  //SEG151 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@27->bitmap_line_ydxi#0] -- register_copy 
-  //SEG152 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#1] -- register_copy 
-  //SEG153 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@27->bitmap_line_ydxi#2] -- register_copy 
-  //SEG154 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@27->bitmap_line_ydxi#3] -- register_copy 
-  //SEG155 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@27->bitmap_line_ydxi#4] -- register_copy 
+  //SEG150 [109] phi from bitmap_line::@14 to bitmap_line_ydxi [phi:bitmap_line::@14->bitmap_line_ydxi]
+  //SEG151 [109] phi (byte) bitmap_line_ydxi::y1#6 = (byte) bitmap_line_ydxi::y1#1 [phi:bitmap_line::@14->bitmap_line_ydxi#0] -- register_copy 
+  //SEG152 [109] phi (byte) bitmap_line_ydxi::yd#5 = (byte) bitmap_line_ydxi::yd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#1] -- register_copy 
+  //SEG153 [109] phi (byte) bitmap_line_ydxi::y#6 = (byte) bitmap_line_ydxi::y#1 [phi:bitmap_line::@14->bitmap_line_ydxi#2] -- register_copy 
+  //SEG154 [109] phi (byte) bitmap_line_ydxi::x#5 = (byte) bitmap_line_ydxi::x#1 [phi:bitmap_line::@14->bitmap_line_ydxi#3] -- register_copy 
+  //SEG155 [109] phi (byte) bitmap_line_ydxi::xd#2 = (byte) bitmap_line_ydxi::xd#1 [phi:bitmap_line::@14->bitmap_line_ydxi#4] -- register_copy 
     jsr bitmap_line_ydxi
     jmp breturn
-  //SEG156 bitmap_line::@25
-  b25:
+  //SEG156 bitmap_line::@13
+  b13:
   //SEG157 [81] (byte) bitmap_line_xdyi::x#1 ← (byte) bitmap_line::x0#0 -- vbuxx=vbuz1 
     ldx x0
   //SEG158 [82] (byte) bitmap_line_xdyi::y#1 ← (byte) bitmap_line::y0#0
@@ -6096,12 +6121,12 @@ bitmap_line: {
   //SEG160 [84] (byte) bitmap_line_xdyi::xd#1 ← (byte) bitmap_line::xd#1
   //SEG161 [85] (byte) bitmap_line_xdyi::yd#1 ← (byte) bitmap_line::yd#11
   //SEG162 [86] call bitmap_line_xdyi 
-  //SEG163 [87] phi from bitmap_line::@25 to bitmap_line_xdyi [phi:bitmap_line::@25->bitmap_line_xdyi]
-  //SEG164 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@25->bitmap_line_xdyi#0] -- register_copy 
-  //SEG165 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#1] -- register_copy 
-  //SEG166 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@25->bitmap_line_xdyi#2] -- register_copy 
-  //SEG167 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@25->bitmap_line_xdyi#3] -- register_copy 
-  //SEG168 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@25->bitmap_line_xdyi#4] -- register_copy 
+  //SEG163 [87] phi from bitmap_line::@13 to bitmap_line_xdyi [phi:bitmap_line::@13->bitmap_line_xdyi]
+  //SEG164 [87] phi (byte) bitmap_line_xdyi::x1#6 = (byte) bitmap_line_xdyi::x1#1 [phi:bitmap_line::@13->bitmap_line_xdyi#0] -- register_copy 
+  //SEG165 [87] phi (byte) bitmap_line_xdyi::xd#5 = (byte) bitmap_line_xdyi::xd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#1] -- register_copy 
+  //SEG166 [87] phi (byte) bitmap_line_xdyi::y#5 = (byte) bitmap_line_xdyi::y#1 [phi:bitmap_line::@13->bitmap_line_xdyi#2] -- register_copy 
+  //SEG167 [87] phi (byte) bitmap_line_xdyi::x#6 = (byte) bitmap_line_xdyi::x#1 [phi:bitmap_line::@13->bitmap_line_xdyi#3] -- register_copy 
+  //SEG168 [87] phi (byte) bitmap_line_xdyi::yd#2 = (byte) bitmap_line_xdyi::yd#1 [phi:bitmap_line::@13->bitmap_line_xdyi#4] -- register_copy 
     jsr bitmap_line_xdyi
     jmp breturn
 }
@@ -6132,7 +6157,7 @@ bitmap_line_xdyi: {
   //SEG180 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#0] -- register_copy 
   //SEG181 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#0 [phi:bitmap_line_xdyi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG182 bitmap_line_xdyi::@5
+  //SEG182 bitmap_line_xdyi::@4
   //SEG183 [93] (byte) bitmap_line_xdyi::x#2 ← ++ (byte) bitmap_line_xdyi::x#3 -- vbuxx=_inc_vbuxx 
     inx
   //SEG184 [94] (byte) bitmap_line_xdyi::e#1 ← (byte) bitmap_line_xdyi::e#3 + (byte) bitmap_line_xdyi::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -6152,9 +6177,9 @@ bitmap_line_xdyi: {
     sec
     sbc xd
     sta e
-  //SEG189 [98] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@5 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2]
-  //SEG190 [98] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#0] -- register_copy 
-  //SEG191 [98] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@5->bitmap_line_xdyi::@2#1] -- register_copy 
+  //SEG189 [98] phi from bitmap_line_xdyi::@3 bitmap_line_xdyi::@4 to bitmap_line_xdyi::@2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2]
+  //SEG190 [98] phi (byte) bitmap_line_xdyi::e#6 = (byte) bitmap_line_xdyi::e#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#0] -- register_copy 
+  //SEG191 [98] phi (byte) bitmap_line_xdyi::y#6 = (byte) bitmap_line_xdyi::y#2 [phi:bitmap_line_xdyi::@3/bitmap_line_xdyi::@4->bitmap_line_xdyi::@2#1] -- register_copy 
   //SEG192 bitmap_line_xdyi::@2
   b2:
   //SEG193 [99] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyi::$6 ← (byte) bitmap_line_xdyi::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_plus_1 
@@ -6228,7 +6253,7 @@ bitmap_line_ydxi: {
   //SEG216 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#0] -- register_copy 
   //SEG217 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#2 [phi:bitmap_line_ydxi::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG218 bitmap_line_ydxi::@5
+  //SEG218 bitmap_line_ydxi::@4
   //SEG219 [115] (byte) bitmap_line_ydxi::y#2 ← ++ (byte) bitmap_line_ydxi::y#3 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG220 [116] (byte) bitmap_line_ydxi::e#1 ← (byte) bitmap_line_ydxi::e#3 + (byte) bitmap_line_ydxi::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -6248,9 +6273,9 @@ bitmap_line_ydxi: {
     sec
     sbc yd
     sta e
-  //SEG225 [120] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@5 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2]
-  //SEG226 [120] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#0] -- register_copy 
-  //SEG227 [120] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@5->bitmap_line_ydxi::@2#1] -- register_copy 
+  //SEG225 [120] phi from bitmap_line_ydxi::@3 bitmap_line_ydxi::@4 to bitmap_line_ydxi::@2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2]
+  //SEG226 [120] phi (byte) bitmap_line_ydxi::e#6 = (byte) bitmap_line_ydxi::e#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#0] -- register_copy 
+  //SEG227 [120] phi (byte) bitmap_line_ydxi::x#6 = (byte) bitmap_line_ydxi::x#2 [phi:bitmap_line_ydxi::@3/bitmap_line_ydxi::@4->bitmap_line_ydxi::@2#1] -- register_copy 
   //SEG228 bitmap_line_ydxi::@2
   b2:
   //SEG229 [121] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxi::$6 ← (byte) bitmap_line_ydxi::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuyy=vbuz1_plus_1 
@@ -6290,7 +6315,7 @@ bitmap_line_xdyd: {
   //SEG244 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#0] -- register_copy 
   //SEG245 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#1 [phi:bitmap_line_xdyd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG246 bitmap_line_xdyd::@5
+  //SEG246 bitmap_line_xdyd::@4
   //SEG247 [130] (byte) bitmap_line_xdyd::x#2 ← ++ (byte) bitmap_line_xdyd::x#3 -- vbuxx=_inc_vbuxx 
     inx
   //SEG248 [131] (byte) bitmap_line_xdyd::e#1 ← (byte) bitmap_line_xdyd::e#3 + (byte) bitmap_line_xdyd::yd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -6310,9 +6335,9 @@ bitmap_line_xdyd: {
     sec
     sbc xd
     sta e
-  //SEG253 [135] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@5 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2]
-  //SEG254 [135] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#0] -- register_copy 
-  //SEG255 [135] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@5->bitmap_line_xdyd::@2#1] -- register_copy 
+  //SEG253 [135] phi from bitmap_line_xdyd::@3 bitmap_line_xdyd::@4 to bitmap_line_xdyd::@2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2]
+  //SEG254 [135] phi (byte) bitmap_line_xdyd::e#6 = (byte) bitmap_line_xdyd::e#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#0] -- register_copy 
+  //SEG255 [135] phi (byte) bitmap_line_xdyd::y#6 = (byte) bitmap_line_xdyd::y#2 [phi:bitmap_line_xdyd::@3/bitmap_line_xdyd::@4->bitmap_line_xdyd::@2#1] -- register_copy 
   //SEG256 bitmap_line_xdyd::@2
   b2:
   //SEG257 [136] (byte/signed word/word/dword/signed dword~) bitmap_line_xdyd::$6 ← (byte) bitmap_line_xdyd::x1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_plus_1 
@@ -6352,7 +6377,7 @@ bitmap_line_ydxd: {
   //SEG272 [102] phi (byte) bitmap_plot::y#4 = (byte) bitmap_plot::y#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#0] -- register_copy 
   //SEG273 [102] phi (byte) bitmap_plot::x#4 = (byte) bitmap_plot::x#3 [phi:bitmap_line_ydxd::@1->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG274 bitmap_line_ydxd::@5
+  //SEG274 bitmap_line_ydxd::@4
   //SEG275 [145] (byte) bitmap_line_ydxd::y#3 ← ++ (byte) bitmap_line_ydxd::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG276 [146] (byte) bitmap_line_ydxd::e#1 ← (byte) bitmap_line_ydxd::e#3 + (byte) bitmap_line_ydxd::xd#2 -- vbuz1=vbuz1_plus_vbuz2 
@@ -6372,9 +6397,9 @@ bitmap_line_ydxd: {
     sec
     sbc yd
     sta e
-  //SEG281 [150] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@5 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2]
-  //SEG282 [150] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#0] -- register_copy 
-  //SEG283 [150] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@5->bitmap_line_ydxd::@2#1] -- register_copy 
+  //SEG281 [150] phi from bitmap_line_ydxd::@3 bitmap_line_ydxd::@4 to bitmap_line_ydxd::@2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2]
+  //SEG282 [150] phi (byte) bitmap_line_ydxd::e#6 = (byte) bitmap_line_ydxd::e#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#0] -- register_copy 
+  //SEG283 [150] phi (byte) bitmap_line_ydxd::x#6 = (byte) bitmap_line_ydxd::x#2 [phi:bitmap_line_ydxd::@3/bitmap_line_ydxd::@4->bitmap_line_ydxd::@2#1] -- register_copy 
   //SEG284 bitmap_line_ydxd::@2
   b2:
   //SEG285 [151] (byte/signed word/word/dword/signed dword~) bitmap_line_ydxd::$6 ← (byte) bitmap_line_ydxd::y1#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuyy=vbuz1_plus_1 
@@ -6506,7 +6531,7 @@ bitmap_init: {
     tya
     lsr
     tay
-  //SEG339 [178] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuyy_neq_0_then_la1 
+  //SEG339 [178] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuyy_neq_0_then_la1 
     cpy #0
     bne b2
   //SEG340 [179] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
@@ -6519,18 +6544,18 @@ bitmap_init: {
   //SEG344 [181] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1
-  //SEG345 [182] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  //SEG346 [182] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG345 [182] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  //SEG346 [182] phi (byte*) bitmap_init::yoffs#2 = ((byte*))(byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<0
     sta yoffs
     sta yoffs+1
-  //SEG347 [182] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuxx=vbuc1 
+  //SEG347 [182] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuxx=vbuc1 
     tax
-  //SEG348 [182] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  //SEG349 [182] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG350 [182] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-  //SEG351 bitmap_init::@5
-  b5:
+  //SEG348 [182] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  //SEG349 [182] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG350 [182] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+  //SEG351 bitmap_init::@3
+  b3:
   //SEG352 [183] (byte~) bitmap_init::$6 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _6
@@ -6547,10 +6572,10 @@ bitmap_init: {
   //SEG358 [189] (byte~) bitmap_init::$10 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG359 [190] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG359 [190] if((byte~) bitmap_init::$10!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6
-  //SEG360 bitmap_init::@7
+    bne b4
+  //SEG360 bitmap_init::@5
   //SEG361 [191] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -6559,22 +6584,22 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG362 [192] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  //SEG363 [192] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-  //SEG364 bitmap_init::@6
-  b6:
+  //SEG362 [192] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  //SEG363 [192] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+  //SEG364 bitmap_init::@4
+  b4:
   //SEG365 [193] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG366 [194] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuxx_neq_0_then_la1 
+  //SEG366 [194] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5
+    bne b3
   //SEG367 bitmap_init::@return
   //SEG368 [195] return 
     rts
-  //SEG369 [196] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  //SEG370 bitmap_init::@10
-  //SEG371 [179] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  //SEG372 [179] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG369 [196] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  //SEG370 bitmap_init::@6
+  //SEG371 [179] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  //SEG372 [179] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
 }
   // Tables for the plotter - initialized by calling bitmap_draw_init();
   bitmap_plot_xlo: .fill $100, 0
diff --git a/src/test/ref/examples/bresenham/bitmap-bresenham.sym b/src/test/ref/examples/bresenham/bitmap-bresenham.sym
index 27289b777..e29b82dc6 100644
--- a/src/test/ref/examples/bresenham/bitmap-bresenham.sym
+++ b/src/test/ref/examples/bresenham/bitmap-bresenham.sym
@@ -1,4 +1,4 @@
-(label) @15
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -116,11 +116,11 @@
 (byte~) bitmap_init::$8 reg byte a 22.0
 (byte~) bitmap_init::$9 reg byte a 22.0
 (label) bitmap_init::@1
-(label) bitmap_init::@10
 (label) bitmap_init::@2
+(label) bitmap_init::@3
+(label) bitmap_init::@4
 (label) bitmap_init::@5
 (label) bitmap_init::@6
-(label) bitmap_init::@7
 (label) bitmap_init::@return
 (byte*) bitmap_init::bitmap
 (byte) bitmap_init::bits
@@ -141,17 +141,17 @@
 (label) bitmap_line::@1
 (label) bitmap_line::@10
 (label) bitmap_line::@11
-(label) bitmap_line::@15
-(label) bitmap_line::@17
-(label) bitmap_line::@20
-(label) bitmap_line::@21
-(label) bitmap_line::@25
-(label) bitmap_line::@27
+(label) bitmap_line::@12
+(label) bitmap_line::@13
+(label) bitmap_line::@14
+(label) bitmap_line::@2
 (label) bitmap_line::@3
 (label) bitmap_line::@4
 (label) bitmap_line::@5
+(label) bitmap_line::@6
 (label) bitmap_line::@7
 (label) bitmap_line::@8
+(label) bitmap_line::@9
 (label) bitmap_line::@return
 (byte) bitmap_line::x0
 (byte) bitmap_line::x0#0 x0 zp ZP_BYTE:5 5.173913043478264
@@ -174,7 +174,7 @@
 (label) bitmap_line_xdyd::@1
 (label) bitmap_line_xdyd::@2
 (label) bitmap_line_xdyd::@3
-(label) bitmap_line_xdyd::@5
+(label) bitmap_line_xdyd::@4
 (label) bitmap_line_xdyd::@return
 (byte) bitmap_line_xdyd::e
 (byte) bitmap_line_xdyd::e#0 e zp ZP_BYTE:5 4.0
@@ -212,7 +212,7 @@
 (label) bitmap_line_xdyi::@1
 (label) bitmap_line_xdyi::@2
 (label) bitmap_line_xdyi::@3
-(label) bitmap_line_xdyi::@5
+(label) bitmap_line_xdyi::@4
 (label) bitmap_line_xdyi::@return
 (byte) bitmap_line_xdyi::e
 (byte) bitmap_line_xdyi::e#0 e zp ZP_BYTE:7 4.0
@@ -250,7 +250,7 @@
 (label) bitmap_line_ydxd::@1
 (label) bitmap_line_ydxd::@2
 (label) bitmap_line_ydxd::@3
-(label) bitmap_line_ydxd::@5
+(label) bitmap_line_ydxd::@4
 (label) bitmap_line_ydxd::@return
 (byte) bitmap_line_ydxd::e
 (byte) bitmap_line_ydxd::e#0 e zp ZP_BYTE:5 4.0
@@ -288,7 +288,7 @@
 (label) bitmap_line_ydxi::@1
 (label) bitmap_line_ydxi::@2
 (label) bitmap_line_ydxi::@3
-(label) bitmap_line_ydxi::@5
+(label) bitmap_line_ydxi::@4
 (label) bitmap_line_ydxi::@return
 (byte) bitmap_line_ydxi::e
 (byte) bitmap_line_ydxi::e#0 e zp ZP_BYTE:5 4.0
@@ -360,7 +360,7 @@
 (byte*) init_screen::c#2 c zp ZP_WORD:9 16.5
 (void()) lines()
 (label) lines::@1
-(label) lines::@3
+(label) lines::@2
 (label) lines::@return
 (byte) lines::l
 (byte) lines::l#1 l zp ZP_BYTE:2 151.5
@@ -373,8 +373,8 @@
 (const byte[]) lines_y#0 lines_y = { (byte/signed byte/word/signed word/dword/signed dword) $a, (byte/signed byte/word/signed word/dword/signed dword) $28, (byte/signed byte/word/signed word/dword/signed dword) $3c, (byte/signed byte/word/signed word/dword/signed dword) $50, (byte/signed byte/word/signed word/dword/signed dword) $6e, (byte/signed byte/word/signed word/dword/signed dword) $50, (byte/signed byte/word/signed word/dword/signed dword) $3c, (byte/signed byte/word/signed word/dword/signed dword) $28, (byte/signed byte/word/signed word/dword/signed dword) $a }
 (void()) main()
 (label) main::@1
+(label) main::@2
 (label) main::@3
-(label) main::@4
 
 zp ZP_BYTE:2 [ lines::l#2 lines::l#1 bitmap_clear::y#4 bitmap_clear::y#1 bitmap_init::$6 ]
 zp ZP_BYTE:3 [ bitmap_line_xdyi::yd#2 bitmap_line_xdyi::yd#0 bitmap_line_xdyi::yd#1 bitmap_line::yd#2 bitmap_line::yd#11 bitmap_line_ydxi::yd#5 bitmap_line_ydxi::yd#1 bitmap_line_ydxi::yd#0 bitmap_line_xdyd::yd#2 bitmap_line_xdyd::yd#0 bitmap_line_xdyd::yd#1 bitmap_line::yd#1 bitmap_line::yd#10 bitmap_line_ydxd::yd#5 bitmap_line_ydxd::yd#0 bitmap_line_ydxd::yd#1 ]
diff --git a/src/test/ref/examples/chargen/chargen-analysis.asm b/src/test/ref/examples/chargen/chargen-analysis.asm
index 2918670b1..9b8f1b2dc 100644
--- a/src/test/ref/examples/chargen/chargen-analysis.asm
+++ b/src/test/ref/examples/chargen/chargen-analysis.asm
@@ -142,72 +142,72 @@ main: {
     bne b3
     lda #0
     sta cur_pos
-  b5:
+  b4:
     ldx #KEY_F1
     jsr keyboard_key_pressed
     cmp #0
-    beq b6
+    beq b5
     lda #0
     sta cur_pos
-  b6:
+  b5:
     ldx #KEY_F3
     jsr keyboard_key_pressed
     cmp #0
-    beq b7
+    beq b6
     lda #1
     sta cur_pos
-  b7:
+  b6:
     ldx #KEY_F5
     jsr keyboard_key_pressed
     cmp #0
-    beq b8
+    beq b7
     lda #2
     sta cur_pos
-  b8:
+  b7:
     ldx #KEY_F7
     jsr keyboard_key_pressed
     cmp #0
-    beq b9
+    beq b8
     lda #3
     sta cur_pos
-  b9:
+  b8:
     ldx #KEY_LSHIFT
     jsr keyboard_key_pressed
     cmp #0
     bne b2
     lda #0
     sta shift
-    jmp b11
+    jmp b9
   b2:
     lda #1
     sta shift
-  b11:
+  b9:
     lda #0
     sta ch
   // Check for key presses - and plot char if found
-  b12:
+  b10:
     ldx ch
     jsr keyboard_get_keycode
     cmp #$3f
-    beq b4
+    beq b13
     tax
     jsr keyboard_key_pressed
-    jmp b13
-  b4:
-    lda #0
+    jmp b11
   b13:
+    lda #0
+  b11:
     cmp #0
-    beq b14
+    beq b12
     ldy cur_pos
     lda ch
     ldx shift
     jsr plot_chargen
-  b14:
+  b12:
     inc ch
     lda #$40
     cmp ch
-    bne b12
-    jmp b5
+    bne b10
+    jmp b4
     str: .text "f1@"
     str1: .text "f3@"
     str2: .text "f5@"
@@ -326,7 +326,7 @@ mul8u: {
     txa
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -334,7 +334,7 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  b8:
+  b4:
     txa
     lsr
     tax
diff --git a/src/test/ref/examples/chargen/chargen-analysis.cfg b/src/test/ref/examples/chargen/chargen-analysis.cfg
index 63e9eefe5..622a3e21f 100644
--- a/src/test/ref/examples/chargen/chargen-analysis.cfg
+++ b/src/test/ref/examples/chargen/chargen-analysis.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@19
-@19: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @19
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @19
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@1
@@ -19,127 +19,127 @@ main::@1: scope:[main]  from main main::@1
 main::@2: scope:[main]  from main::@1
   [9] phi()
   [10] call print_str_at 
-  to:main::@25
-main::@25: scope:[main]  from main::@2
+  to:main::@16
+main::@16: scope:[main]  from main::@2
   [11] phi()
   [12] call print_str_at 
-  to:main::@26
-main::@26: scope:[main]  from main::@25
+  to:main::@17
+main::@17: scope:[main]  from main::@16
   [13] phi()
   [14] call print_str_at 
-  to:main::@27
-main::@27: scope:[main]  from main::@26
+  to:main::@18
+main::@18: scope:[main]  from main::@17
   [15] phi()
   [16] call print_str_at 
   to:main::@3
-main::@3: scope:[main]  from main::@27 main::@29
-  [17] (byte) main::i#2 ← phi( main::@27/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@29/(byte) main::i#1 )
+main::@3: scope:[main]  from main::@18 main::@19
+  [17] (byte) main::i#2 ← phi( main::@18/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@19/(byte) main::i#1 )
   [18] (byte) plot_chargen::pos#0 ← (byte) main::i#2
   [19] call plot_chargen 
-  to:main::@29
-main::@29: scope:[main]  from main::@3
+  to:main::@19
+main::@19: scope:[main]  from main::@3
   [20] (byte) main::i#1 ← ++ (byte) main::i#2
   [21] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto main::@3
-  to:main::@5
-main::@5: scope:[main]  from main::@14 main::@29
-  [22] (byte) main::cur_pos#24 ← phi( main::@14/(byte) main::cur_pos#11 main::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@4
+main::@4: scope:[main]  from main::@12 main::@19
+  [22] (byte) main::cur_pos#24 ← phi( main::@12/(byte) main::cur_pos#11 main::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [23] call keyboard_key_pressed 
   [24] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  to:main::@30
-main::@30: scope:[main]  from main::@5
+  to:main::@20
+main::@20: scope:[main]  from main::@4
   [25] (byte~) main::$15 ← (byte) keyboard_key_pressed::return#2
-  [26] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@41
-  to:main::@6
-main::@6: scope:[main]  from main::@30 main::@41
-  [27] (byte) main::cur_pos#22 ← phi( main::@30/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@41/(byte) main::cur_pos#24 )
+  [26] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@27
+  to:main::@5
+main::@5: scope:[main]  from main::@20 main::@27
+  [27] (byte) main::cur_pos#22 ← phi( main::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@27/(byte) main::cur_pos#24 )
   [28] call keyboard_key_pressed 
   [29] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-  to:main::@31
-main::@31: scope:[main]  from main::@6
+  to:main::@21
+main::@21: scope:[main]  from main::@5
   [30] (byte~) main::$18 ← (byte) keyboard_key_pressed::return#10
-  [31] if((byte~) main::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@42
-  to:main::@7
-main::@7: scope:[main]  from main::@31 main::@42
-  [32] (byte) main::cur_pos#20 ← phi( main::@31/(byte/signed byte/word/signed word/dword/signed dword) 1 main::@42/(byte) main::cur_pos#22 )
+  [31] if((byte~) main::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@28
+  to:main::@6
+main::@6: scope:[main]  from main::@21 main::@28
+  [32] (byte) main::cur_pos#20 ← phi( main::@21/(byte/signed byte/word/signed word/dword/signed dword) 1 main::@28/(byte) main::cur_pos#22 )
   [33] call keyboard_key_pressed 
   [34] (byte) keyboard_key_pressed::return#11 ← (byte) keyboard_key_pressed::return#0
-  to:main::@32
-main::@32: scope:[main]  from main::@7
+  to:main::@22
+main::@22: scope:[main]  from main::@6
   [35] (byte~) main::$21 ← (byte) keyboard_key_pressed::return#11
-  [36] if((byte~) main::$21==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@43
-  to:main::@8
-main::@8: scope:[main]  from main::@32 main::@43
-  [37] (byte) main::cur_pos#18 ← phi( main::@32/(byte/signed byte/word/signed word/dword/signed dword) 2 main::@43/(byte) main::cur_pos#20 )
+  [36] if((byte~) main::$21==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@29
+  to:main::@7
+main::@7: scope:[main]  from main::@22 main::@29
+  [37] (byte) main::cur_pos#18 ← phi( main::@22/(byte/signed byte/word/signed word/dword/signed dword) 2 main::@29/(byte) main::cur_pos#20 )
   [38] call keyboard_key_pressed 
   [39] (byte) keyboard_key_pressed::return#12 ← (byte) keyboard_key_pressed::return#0
-  to:main::@33
-main::@33: scope:[main]  from main::@8
+  to:main::@23
+main::@23: scope:[main]  from main::@7
   [40] (byte~) main::$24 ← (byte) keyboard_key_pressed::return#12
-  [41] if((byte~) main::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@44
-  to:main::@9
-main::@9: scope:[main]  from main::@33 main::@44
-  [42] (byte) main::cur_pos#11 ← phi( main::@33/(byte/signed byte/word/signed word/dword/signed dword) 3 main::@44/(byte) main::cur_pos#18 )
+  [41] if((byte~) main::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@30
+  to:main::@8
+main::@8: scope:[main]  from main::@23 main::@30
+  [42] (byte) main::cur_pos#11 ← phi( main::@23/(byte/signed byte/word/signed word/dword/signed dword) 3 main::@30/(byte) main::cur_pos#18 )
   [43] call keyboard_key_pressed 
   [44] (byte) keyboard_key_pressed::return#13 ← (byte) keyboard_key_pressed::return#0
-  to:main::@34
-main::@34: scope:[main]  from main::@9
+  to:main::@24
+main::@24: scope:[main]  from main::@8
   [45] (byte~) main::$27 ← (byte) keyboard_key_pressed::return#13
-  [46] if((byte~) main::$27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@11
-  to:main::@23
-main::@23: scope:[main]  from main::@34
+  [46] if((byte~) main::$27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9
+  to:main::@15
+main::@15: scope:[main]  from main::@24
   [47] phi()
-  to:main::@11
-main::@11: scope:[main]  from main::@23 main::@34
-  [48] (byte) main::shift#9 ← phi( main::@34/(byte/signed byte/word/signed word/dword/signed dword) 1 main::@23/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  to:main::@12
-main::@12: scope:[main]  from main::@11 main::@14
-  [49] (byte) main::ch#2 ← phi( main::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@14/(byte) main::ch#1 )
+  to:main::@9
+main::@9: scope:[main]  from main::@15 main::@24
+  [48] (byte) main::shift#9 ← phi( main::@24/(byte/signed byte/word/signed word/dword/signed dword) 1 main::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@10
+main::@10: scope:[main]  from main::@12 main::@9
+  [49] (byte) main::ch#2 ← phi( main::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@12/(byte) main::ch#1 )
   [50] (byte) keyboard_get_keycode::ch#0 ← (byte) main::ch#2
   [51] call keyboard_get_keycode 
   [52] (byte) keyboard_get_keycode::return#2 ← (byte) keyboard_get_keycode::return#0
-  to:main::@35
-main::@35: scope:[main]  from main::@12
+  to:main::@25
+main::@25: scope:[main]  from main::@10
   [53] (byte) main::key#0 ← (byte) keyboard_get_keycode::return#2
-  [54] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@13
-  to:main::@15
-main::@15: scope:[main]  from main::@35
+  [54] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@11
+  to:main::@13
+main::@13: scope:[main]  from main::@25
   [55] (byte) keyboard_key_pressed::key#5 ← (byte) main::key#0
   [56] call keyboard_key_pressed 
   [57] (byte) keyboard_key_pressed::return#14 ← (byte) keyboard_key_pressed::return#0
-  to:main::@36
-main::@36: scope:[main]  from main::@15
+  to:main::@26
+main::@26: scope:[main]  from main::@13
   [58] (byte) main::pressed#1 ← (byte) keyboard_key_pressed::return#14
-  to:main::@13
-main::@13: scope:[main]  from main::@35 main::@36
-  [59] (byte) main::pressed#2 ← phi( main::@35/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@36/(byte) main::pressed#1 )
-  [60] if((byte) main::pressed#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@14
-  to:main::@16
-main::@16: scope:[main]  from main::@13
+  to:main::@11
+main::@11: scope:[main]  from main::@25 main::@26
+  [59] (byte) main::pressed#2 ← phi( main::@25/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@26/(byte) main::pressed#1 )
+  [60] if((byte) main::pressed#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12
+  to:main::@14
+main::@14: scope:[main]  from main::@11
   [61] (byte) plot_chargen::pos#1 ← (byte) main::cur_pos#11
   [62] (byte) plot_chargen::ch#1 ← (byte) main::ch#2
   [63] (byte) plot_chargen::shift#1 ← (byte) main::shift#9
   [64] call plot_chargen 
-  to:main::@14
-main::@14: scope:[main]  from main::@13 main::@16
+  to:main::@12
+main::@12: scope:[main]  from main::@11 main::@14
   [65] (byte) main::ch#1 ← ++ (byte) main::ch#2
-  [66] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@12
-  to:main::@5
-main::@44: scope:[main]  from main::@33
+  [66] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@10
+  to:main::@4
+main::@30: scope:[main]  from main::@23
   [67] phi()
-  to:main::@9
-main::@43: scope:[main]  from main::@32
-  [68] phi()
   to:main::@8
-main::@42: scope:[main]  from main::@31
-  [69] phi()
+main::@29: scope:[main]  from main::@22
+  [68] phi()
   to:main::@7
-main::@41: scope:[main]  from main::@30
-  [70] phi()
+main::@28: scope:[main]  from main::@21
+  [69] phi()
   to:main::@6
-plot_chargen: scope:[plot_chargen]  from main::@16 main::@3
-  [71] (byte) plot_chargen::pos#2 ← phi( main::@16/(byte) plot_chargen::pos#1 main::@3/(byte) plot_chargen::pos#0 )
-  [71] (byte) plot_chargen::shift#2 ← phi( main::@16/(byte) plot_chargen::shift#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [71] (byte) plot_chargen::ch#2 ← phi( main::@16/(byte) plot_chargen::ch#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) $20 )
+main::@27: scope:[main]  from main::@20
+  [70] phi()
+  to:main::@5
+plot_chargen: scope:[plot_chargen]  from main::@14 main::@3
+  [71] (byte) plot_chargen::pos#2 ← phi( main::@14/(byte) plot_chargen::pos#1 main::@3/(byte) plot_chargen::pos#0 )
+  [71] (byte) plot_chargen::shift#2 ← phi( main::@14/(byte) plot_chargen::shift#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [71] (byte) plot_chargen::ch#2 ← phi( main::@14/(byte) plot_chargen::ch#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) $20 )
   asm { sei  }
   [73] (word~) plot_chargen::$0 ← ((word)) (byte) plot_chargen::ch#2
   [74] (word~) plot_chargen::$1 ← (word~) plot_chargen::$0 << (byte/signed byte/word/signed word/dword/signed dword) 3
@@ -198,10 +198,10 @@ plot_chargen::@return: scope:[plot_chargen]  from plot_chargen::@8
 mul8u: scope:[mul8u]  from plot_chargen::@1
   [103] phi()
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [104] (word) mul8u::mb#2 ← phi( mul8u/((word))(const byte) mul8u::b#0 mul8u::@8/(word) mul8u::mb#1 )
-  [104] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [104] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [104] (word) mul8u::mb#2 ← phi( mul8u/((word))(const byte) mul8u::b#0 mul8u::@4/(word) mul8u::mb#1 )
+  [104] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [104] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@4/(byte) mul8u::a#0 )
   [105] if((byte) mul8u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -209,29 +209,29 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [107] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [108] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [108] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [109] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [110] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [110] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [111] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [112] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
-keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@15 main::@5 main::@6 main::@7 main::@8 main::@9
-  [113] (byte) keyboard_key_pressed::key#6 ← phi( main::@15/(byte) keyboard_key_pressed::key#5 main::@5/(const byte) KEY_F1#0 main::@6/(const byte) KEY_F3#0 main::@7/(const byte) KEY_F5#0 main::@8/(const byte) KEY_F7#0 main::@9/(const byte) KEY_LSHIFT#0 )
+keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@13 main::@4 main::@5 main::@6 main::@7 main::@8
+  [113] (byte) keyboard_key_pressed::key#6 ← phi( main::@13/(byte) keyboard_key_pressed::key#5 main::@4/(const byte) KEY_F1#0 main::@5/(const byte) KEY_F3#0 main::@6/(const byte) KEY_F5#0 main::@7/(const byte) KEY_F7#0 main::@8/(const byte) KEY_LSHIFT#0 )
   [114] (byte) keyboard_key_pressed::colidx#0 ← (byte) keyboard_key_pressed::key#6 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [115] (byte) keyboard_key_pressed::rowidx#0 ← (byte) keyboard_key_pressed::key#6 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [116] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_key_pressed::rowidx#0
   [117] call keyboard_matrix_read 
   [118] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_key_pressed::@2
-keyboard_key_pressed::@2: scope:[keyboard_key_pressed]  from keyboard_key_pressed
+  to:keyboard_key_pressed::@1
+keyboard_key_pressed::@1: scope:[keyboard_key_pressed]  from keyboard_key_pressed
   [119] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   [120] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0)
   to:keyboard_key_pressed::@return
-keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@2
+keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@1
   [121] return 
   to:@return
 keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
@@ -241,15 +241,15 @@ keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
 keyboard_matrix_read::@return: scope:[keyboard_matrix_read]  from keyboard_matrix_read
   [124] return 
   to:@return
-keyboard_get_keycode: scope:[keyboard_get_keycode]  from main::@12
+keyboard_get_keycode: scope:[keyboard_get_keycode]  from main::@10
   [125] (byte) keyboard_get_keycode::return#0 ← *((const byte[]) keyboard_char_keycodes#0 + (byte) keyboard_get_keycode::ch#0)
   to:keyboard_get_keycode::@return
 keyboard_get_keycode::@return: scope:[keyboard_get_keycode]  from keyboard_get_keycode
   [126] return 
   to:@return
-print_str_at: scope:[print_str_at]  from main::@2 main::@25 main::@26 main::@27
-  [127] (byte*) print_str_at::at#7 ← phi( main::@2/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1 main::@25/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $a main::@26/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $14 main::@27/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $1e )
-  [127] (byte*) print_str_at::str#7 ← phi( main::@2/(const string) main::str main::@25/(const string) main::str1 main::@26/(const string) main::str2 main::@27/(const string) main::str3 )
+print_str_at: scope:[print_str_at]  from main::@16 main::@17 main::@18 main::@2
+  [127] (byte*) print_str_at::at#7 ← phi( main::@2/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1 main::@16/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $a main::@17/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $14 main::@18/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $1e )
+  [127] (byte*) print_str_at::str#7 ← phi( main::@2/(const string) main::str main::@16/(const string) main::str1 main::@17/(const string) main::str2 main::@18/(const string) main::str3 )
   to:print_str_at::@1
 print_str_at::@1: scope:[print_str_at]  from print_str_at print_str_at::@2
   [128] (byte*) print_str_at::at#5 ← phi( print_str_at/(byte*) print_str_at::at#7 print_str_at::@2/(byte*) print_str_at::at#4 )
diff --git a/src/test/ref/examples/chargen/chargen-analysis.log b/src/test/ref/examples/chargen/chargen-analysis.log
index 776defccb..51bc84b6a 100644
--- a/src/test/ref/examples/chargen/chargen-analysis.log
+++ b/src/test/ref/examples/chargen/chargen-analysis.log
@@ -1782,33 +1782,64 @@ Culled Empty Block (label) plot_chargen::@11
 Culled Empty Block (label) plot_chargen::@12
 Culled Empty Block (label) plot_chargen::@10
 Culled Empty Block (label) mul8u::@10
+Renumbering block @19 to @1
+Renumbering block mul8u::@6 to mul8u::@3
+Renumbering block mul8u::@8 to mul8u::@4
+Renumbering block keyboard_key_pressed::@2 to keyboard_key_pressed::@1
+Renumbering block main::@5 to main::@4
+Renumbering block main::@6 to main::@5
+Renumbering block main::@7 to main::@6
+Renumbering block main::@8 to main::@7
+Renumbering block main::@9 to main::@8
+Renumbering block main::@11 to main::@9
+Renumbering block main::@12 to main::@10
+Renumbering block main::@13 to main::@11
+Renumbering block main::@14 to main::@12
+Renumbering block main::@15 to main::@13
+Renumbering block main::@16 to main::@14
+Renumbering block main::@23 to main::@15
+Renumbering block main::@25 to main::@16
+Renumbering block main::@26 to main::@17
+Renumbering block main::@27 to main::@18
+Renumbering block main::@29 to main::@19
+Renumbering block main::@30 to main::@20
+Renumbering block main::@31 to main::@21
+Renumbering block main::@32 to main::@22
+Renumbering block main::@33 to main::@23
+Renumbering block main::@34 to main::@24
+Renumbering block main::@35 to main::@25
+Renumbering block main::@36 to main::@26
+Renumbering block main::@41 to main::@27
+Renumbering block main::@42 to main::@28
+Renumbering block main::@43 to main::@29
+Renumbering block main::@44 to main::@30
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @19
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@2
-Adding NOP phi() at start of main::@25
-Adding NOP phi() at start of main::@26
+Adding NOP phi() at start of main::@16
+Adding NOP phi() at start of main::@17
+Adding NOP phi() at start of main::@18
+Adding NOP phi() at start of main::@15
+Adding NOP phi() at start of main::@30
+Adding NOP phi() at start of main::@29
+Adding NOP phi() at start of main::@28
 Adding NOP phi() at start of main::@27
-Adding NOP phi() at start of main::@23
-Adding NOP phi() at start of main::@44
-Adding NOP phi() at start of main::@43
-Adding NOP phi() at start of main::@42
-Adding NOP phi() at start of main::@41
 Adding NOP phi() at start of plot_chargen::@6
 Adding NOP phi() at start of mul8u
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@19
-@19: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @19
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @19
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@1
@@ -1820,127 +1851,127 @@ main::@1: scope:[main]  from main main::@1
 main::@2: scope:[main]  from main::@1
   [9] phi()
   [10] call print_str_at 
-  to:main::@25
-main::@25: scope:[main]  from main::@2
+  to:main::@16
+main::@16: scope:[main]  from main::@2
   [11] phi()
   [12] call print_str_at 
-  to:main::@26
-main::@26: scope:[main]  from main::@25
+  to:main::@17
+main::@17: scope:[main]  from main::@16
   [13] phi()
   [14] call print_str_at 
-  to:main::@27
-main::@27: scope:[main]  from main::@26
+  to:main::@18
+main::@18: scope:[main]  from main::@17
   [15] phi()
   [16] call print_str_at 
   to:main::@3
-main::@3: scope:[main]  from main::@27 main::@29
-  [17] (byte) main::i#2 ← phi( main::@27/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@29/(byte) main::i#1 )
+main::@3: scope:[main]  from main::@18 main::@19
+  [17] (byte) main::i#2 ← phi( main::@18/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@19/(byte) main::i#1 )
   [18] (byte) plot_chargen::pos#0 ← (byte) main::i#2
   [19] call plot_chargen 
-  to:main::@29
-main::@29: scope:[main]  from main::@3
+  to:main::@19
+main::@19: scope:[main]  from main::@3
   [20] (byte) main::i#1 ← ++ (byte) main::i#2
   [21] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto main::@3
-  to:main::@5
-main::@5: scope:[main]  from main::@14 main::@29
-  [22] (byte) main::cur_pos#24 ← phi( main::@14/(byte) main::cur_pos#11 main::@29/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@4
+main::@4: scope:[main]  from main::@12 main::@19
+  [22] (byte) main::cur_pos#24 ← phi( main::@12/(byte) main::cur_pos#11 main::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [23] call keyboard_key_pressed 
   [24] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  to:main::@30
-main::@30: scope:[main]  from main::@5
+  to:main::@20
+main::@20: scope:[main]  from main::@4
   [25] (byte~) main::$15 ← (byte) keyboard_key_pressed::return#2
-  [26] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@41
-  to:main::@6
-main::@6: scope:[main]  from main::@30 main::@41
-  [27] (byte) main::cur_pos#22 ← phi( main::@30/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@41/(byte) main::cur_pos#24 )
+  [26] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@27
+  to:main::@5
+main::@5: scope:[main]  from main::@20 main::@27
+  [27] (byte) main::cur_pos#22 ← phi( main::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@27/(byte) main::cur_pos#24 )
   [28] call keyboard_key_pressed 
   [29] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-  to:main::@31
-main::@31: scope:[main]  from main::@6
+  to:main::@21
+main::@21: scope:[main]  from main::@5
   [30] (byte~) main::$18 ← (byte) keyboard_key_pressed::return#10
-  [31] if((byte~) main::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@42
-  to:main::@7
-main::@7: scope:[main]  from main::@31 main::@42
-  [32] (byte) main::cur_pos#20 ← phi( main::@31/(byte/signed byte/word/signed word/dword/signed dword) 1 main::@42/(byte) main::cur_pos#22 )
+  [31] if((byte~) main::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@28
+  to:main::@6
+main::@6: scope:[main]  from main::@21 main::@28
+  [32] (byte) main::cur_pos#20 ← phi( main::@21/(byte/signed byte/word/signed word/dword/signed dword) 1 main::@28/(byte) main::cur_pos#22 )
   [33] call keyboard_key_pressed 
   [34] (byte) keyboard_key_pressed::return#11 ← (byte) keyboard_key_pressed::return#0
-  to:main::@32
-main::@32: scope:[main]  from main::@7
+  to:main::@22
+main::@22: scope:[main]  from main::@6
   [35] (byte~) main::$21 ← (byte) keyboard_key_pressed::return#11
-  [36] if((byte~) main::$21==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@43
-  to:main::@8
-main::@8: scope:[main]  from main::@32 main::@43
-  [37] (byte) main::cur_pos#18 ← phi( main::@32/(byte/signed byte/word/signed word/dword/signed dword) 2 main::@43/(byte) main::cur_pos#20 )
+  [36] if((byte~) main::$21==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@29
+  to:main::@7
+main::@7: scope:[main]  from main::@22 main::@29
+  [37] (byte) main::cur_pos#18 ← phi( main::@22/(byte/signed byte/word/signed word/dword/signed dword) 2 main::@29/(byte) main::cur_pos#20 )
   [38] call keyboard_key_pressed 
   [39] (byte) keyboard_key_pressed::return#12 ← (byte) keyboard_key_pressed::return#0
-  to:main::@33
-main::@33: scope:[main]  from main::@8
+  to:main::@23
+main::@23: scope:[main]  from main::@7
   [40] (byte~) main::$24 ← (byte) keyboard_key_pressed::return#12
-  [41] if((byte~) main::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@44
-  to:main::@9
-main::@9: scope:[main]  from main::@33 main::@44
-  [42] (byte) main::cur_pos#11 ← phi( main::@33/(byte/signed byte/word/signed word/dword/signed dword) 3 main::@44/(byte) main::cur_pos#18 )
+  [41] if((byte~) main::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@30
+  to:main::@8
+main::@8: scope:[main]  from main::@23 main::@30
+  [42] (byte) main::cur_pos#11 ← phi( main::@23/(byte/signed byte/word/signed word/dword/signed dword) 3 main::@30/(byte) main::cur_pos#18 )
   [43] call keyboard_key_pressed 
   [44] (byte) keyboard_key_pressed::return#13 ← (byte) keyboard_key_pressed::return#0
-  to:main::@34
-main::@34: scope:[main]  from main::@9
+  to:main::@24
+main::@24: scope:[main]  from main::@8
   [45] (byte~) main::$27 ← (byte) keyboard_key_pressed::return#13
-  [46] if((byte~) main::$27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@11
-  to:main::@23
-main::@23: scope:[main]  from main::@34
+  [46] if((byte~) main::$27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9
+  to:main::@15
+main::@15: scope:[main]  from main::@24
   [47] phi()
-  to:main::@11
-main::@11: scope:[main]  from main::@23 main::@34
-  [48] (byte) main::shift#9 ← phi( main::@34/(byte/signed byte/word/signed word/dword/signed dword) 1 main::@23/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  to:main::@12
-main::@12: scope:[main]  from main::@11 main::@14
-  [49] (byte) main::ch#2 ← phi( main::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@14/(byte) main::ch#1 )
+  to:main::@9
+main::@9: scope:[main]  from main::@15 main::@24
+  [48] (byte) main::shift#9 ← phi( main::@24/(byte/signed byte/word/signed word/dword/signed dword) 1 main::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@10
+main::@10: scope:[main]  from main::@12 main::@9
+  [49] (byte) main::ch#2 ← phi( main::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@12/(byte) main::ch#1 )
   [50] (byte) keyboard_get_keycode::ch#0 ← (byte) main::ch#2
   [51] call keyboard_get_keycode 
   [52] (byte) keyboard_get_keycode::return#2 ← (byte) keyboard_get_keycode::return#0
-  to:main::@35
-main::@35: scope:[main]  from main::@12
+  to:main::@25
+main::@25: scope:[main]  from main::@10
   [53] (byte) main::key#0 ← (byte) keyboard_get_keycode::return#2
-  [54] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@13
-  to:main::@15
-main::@15: scope:[main]  from main::@35
+  [54] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@11
+  to:main::@13
+main::@13: scope:[main]  from main::@25
   [55] (byte) keyboard_key_pressed::key#5 ← (byte) main::key#0
   [56] call keyboard_key_pressed 
   [57] (byte) keyboard_key_pressed::return#14 ← (byte) keyboard_key_pressed::return#0
-  to:main::@36
-main::@36: scope:[main]  from main::@15
+  to:main::@26
+main::@26: scope:[main]  from main::@13
   [58] (byte) main::pressed#1 ← (byte) keyboard_key_pressed::return#14
-  to:main::@13
-main::@13: scope:[main]  from main::@35 main::@36
-  [59] (byte) main::pressed#2 ← phi( main::@35/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@36/(byte) main::pressed#1 )
-  [60] if((byte) main::pressed#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@14
-  to:main::@16
-main::@16: scope:[main]  from main::@13
+  to:main::@11
+main::@11: scope:[main]  from main::@25 main::@26
+  [59] (byte) main::pressed#2 ← phi( main::@25/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@26/(byte) main::pressed#1 )
+  [60] if((byte) main::pressed#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12
+  to:main::@14
+main::@14: scope:[main]  from main::@11
   [61] (byte) plot_chargen::pos#1 ← (byte) main::cur_pos#11
   [62] (byte) plot_chargen::ch#1 ← (byte) main::ch#2
   [63] (byte) plot_chargen::shift#1 ← (byte) main::shift#9
   [64] call plot_chargen 
-  to:main::@14
-main::@14: scope:[main]  from main::@13 main::@16
+  to:main::@12
+main::@12: scope:[main]  from main::@11 main::@14
   [65] (byte) main::ch#1 ← ++ (byte) main::ch#2
-  [66] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@12
-  to:main::@5
-main::@44: scope:[main]  from main::@33
+  [66] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@10
+  to:main::@4
+main::@30: scope:[main]  from main::@23
   [67] phi()
-  to:main::@9
-main::@43: scope:[main]  from main::@32
-  [68] phi()
   to:main::@8
-main::@42: scope:[main]  from main::@31
-  [69] phi()
+main::@29: scope:[main]  from main::@22
+  [68] phi()
   to:main::@7
-main::@41: scope:[main]  from main::@30
-  [70] phi()
+main::@28: scope:[main]  from main::@21
+  [69] phi()
   to:main::@6
-plot_chargen: scope:[plot_chargen]  from main::@16 main::@3
-  [71] (byte) plot_chargen::pos#2 ← phi( main::@16/(byte) plot_chargen::pos#1 main::@3/(byte) plot_chargen::pos#0 )
-  [71] (byte) plot_chargen::shift#2 ← phi( main::@16/(byte) plot_chargen::shift#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [71] (byte) plot_chargen::ch#2 ← phi( main::@16/(byte) plot_chargen::ch#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) $20 )
+main::@27: scope:[main]  from main::@20
+  [70] phi()
+  to:main::@5
+plot_chargen: scope:[plot_chargen]  from main::@14 main::@3
+  [71] (byte) plot_chargen::pos#2 ← phi( main::@14/(byte) plot_chargen::pos#1 main::@3/(byte) plot_chargen::pos#0 )
+  [71] (byte) plot_chargen::shift#2 ← phi( main::@14/(byte) plot_chargen::shift#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [71] (byte) plot_chargen::ch#2 ← phi( main::@14/(byte) plot_chargen::ch#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) $20 )
   asm { sei  }
   [73] (word~) plot_chargen::$0 ← ((word)) (byte) plot_chargen::ch#2
   [74] (word~) plot_chargen::$1 ← (word~) plot_chargen::$0 << (byte/signed byte/word/signed word/dword/signed dword) 3
@@ -1999,10 +2030,10 @@ plot_chargen::@return: scope:[plot_chargen]  from plot_chargen::@8
 mul8u: scope:[mul8u]  from plot_chargen::@1
   [103] phi()
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [104] (word) mul8u::mb#2 ← phi( mul8u/((word))(const byte) mul8u::b#0 mul8u::@8/(word) mul8u::mb#1 )
-  [104] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [104] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [104] (word) mul8u::mb#2 ← phi( mul8u/((word))(const byte) mul8u::b#0 mul8u::@4/(word) mul8u::mb#1 )
+  [104] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [104] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@4/(byte) mul8u::a#0 )
   [105] if((byte) mul8u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -2010,29 +2041,29 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [107] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [108] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [108] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [109] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [110] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [110] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [111] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [112] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
-keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@15 main::@5 main::@6 main::@7 main::@8 main::@9
-  [113] (byte) keyboard_key_pressed::key#6 ← phi( main::@15/(byte) keyboard_key_pressed::key#5 main::@5/(const byte) KEY_F1#0 main::@6/(const byte) KEY_F3#0 main::@7/(const byte) KEY_F5#0 main::@8/(const byte) KEY_F7#0 main::@9/(const byte) KEY_LSHIFT#0 )
+keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@13 main::@4 main::@5 main::@6 main::@7 main::@8
+  [113] (byte) keyboard_key_pressed::key#6 ← phi( main::@13/(byte) keyboard_key_pressed::key#5 main::@4/(const byte) KEY_F1#0 main::@5/(const byte) KEY_F3#0 main::@6/(const byte) KEY_F5#0 main::@7/(const byte) KEY_F7#0 main::@8/(const byte) KEY_LSHIFT#0 )
   [114] (byte) keyboard_key_pressed::colidx#0 ← (byte) keyboard_key_pressed::key#6 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [115] (byte) keyboard_key_pressed::rowidx#0 ← (byte) keyboard_key_pressed::key#6 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [116] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_key_pressed::rowidx#0
   [117] call keyboard_matrix_read 
   [118] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_key_pressed::@2
-keyboard_key_pressed::@2: scope:[keyboard_key_pressed]  from keyboard_key_pressed
+  to:keyboard_key_pressed::@1
+keyboard_key_pressed::@1: scope:[keyboard_key_pressed]  from keyboard_key_pressed
   [119] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   [120] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0)
   to:keyboard_key_pressed::@return
-keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@2
+keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@1
   [121] return 
   to:@return
 keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
@@ -2042,15 +2073,15 @@ keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
 keyboard_matrix_read::@return: scope:[keyboard_matrix_read]  from keyboard_matrix_read
   [124] return 
   to:@return
-keyboard_get_keycode: scope:[keyboard_get_keycode]  from main::@12
+keyboard_get_keycode: scope:[keyboard_get_keycode]  from main::@10
   [125] (byte) keyboard_get_keycode::return#0 ← *((const byte[]) keyboard_char_keycodes#0 + (byte) keyboard_get_keycode::ch#0)
   to:keyboard_get_keycode::@return
 keyboard_get_keycode::@return: scope:[keyboard_get_keycode]  from keyboard_get_keycode
   [126] return 
   to:@return
-print_str_at: scope:[print_str_at]  from main::@2 main::@25 main::@26 main::@27
-  [127] (byte*) print_str_at::at#7 ← phi( main::@2/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1 main::@25/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $a main::@26/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $14 main::@27/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $1e )
-  [127] (byte*) print_str_at::str#7 ← phi( main::@2/(const string) main::str main::@25/(const string) main::str1 main::@26/(const string) main::str2 main::@27/(const string) main::str3 )
+print_str_at: scope:[print_str_at]  from main::@16 main::@17 main::@18 main::@2
+  [127] (byte*) print_str_at::at#7 ← phi( main::@2/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1 main::@16/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $a main::@17/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $14 main::@18/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $1e )
+  [127] (byte*) print_str_at::str#7 ← phi( main::@2/(const string) main::str main::@16/(const string) main::str1 main::@17/(const string) main::str2 main::@18/(const string) main::str3 )
   to:print_str_at::@1
 print_str_at::@1: scope:[print_str_at]  from print_str_at print_str_at::@2
   [128] (byte*) print_str_at::at#5 ← phi( print_str_at/(byte*) print_str_at::at#7 print_str_at::@2/(byte*) print_str_at::at#4 )
@@ -2569,17 +2600,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @19 [phi:@begin->@19]
-b19_from_bbegin:
-  jmp b19
-//SEG5 @19
-b19:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @19 to main [phi:@19->main]
-main_from_b19:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @19 to @end [phi:@19->@end]
-bend_from_b19:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -2649,72 +2680,72 @@ main: {
     lda #>str
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG25 [11] phi from main::@2 to main::@25 [phi:main::@2->main::@25]
-  b25_from_b2:
-    jmp b25
-  //SEG26 main::@25
-  b25:
+  //SEG25 [11] phi from main::@2 to main::@16 [phi:main::@2->main::@16]
+  b16_from_b2:
+    jmp b16
+  //SEG26 main::@16
+  b16:
   //SEG27 [12] call print_str_at 
-  //SEG28 [127] phi from main::@25 to print_str_at [phi:main::@25->print_str_at]
-  print_str_at_from_b25:
-  //SEG29 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@25->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG28 [127] phi from main::@16 to print_str_at [phi:main::@16->print_str_at]
+  print_str_at_from_b16:
+  //SEG29 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@16->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+1+$a
     sta print_str_at.at
     lda #>SCREEN+1+$a
     sta print_str_at.at+1
-  //SEG30 [127] phi (byte*) print_str_at::str#7 = (const string) main::str1 [phi:main::@25->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG30 [127] phi (byte*) print_str_at::str#7 = (const string) main::str1 [phi:main::@16->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str_at.str
     lda #>str1
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG31 [13] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
-  b26_from_b25:
-    jmp b26
-  //SEG32 main::@26
-  b26:
+  //SEG31 [13] phi from main::@16 to main::@17 [phi:main::@16->main::@17]
+  b17_from_b16:
+    jmp b17
+  //SEG32 main::@17
+  b17:
   //SEG33 [14] call print_str_at 
-  //SEG34 [127] phi from main::@26 to print_str_at [phi:main::@26->print_str_at]
-  print_str_at_from_b26:
-  //SEG35 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:main::@26->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG34 [127] phi from main::@17 to print_str_at [phi:main::@17->print_str_at]
+  print_str_at_from_b17:
+  //SEG35 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:main::@17->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+1+$14
     sta print_str_at.at
     lda #>SCREEN+1+$14
     sta print_str_at.at+1
-  //SEG36 [127] phi (byte*) print_str_at::str#7 = (const string) main::str2 [phi:main::@26->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG36 [127] phi (byte*) print_str_at::str#7 = (const string) main::str2 [phi:main::@17->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str_at.str
     lda #>str2
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG37 [15] phi from main::@26 to main::@27 [phi:main::@26->main::@27]
-  b27_from_b26:
-    jmp b27
-  //SEG38 main::@27
-  b27:
+  //SEG37 [15] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
+  b18_from_b17:
+    jmp b18
+  //SEG38 main::@18
+  b18:
   //SEG39 [16] call print_str_at 
-  //SEG40 [127] phi from main::@27 to print_str_at [phi:main::@27->print_str_at]
-  print_str_at_from_b27:
-  //SEG41 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $1e [phi:main::@27->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG40 [127] phi from main::@18 to print_str_at [phi:main::@18->print_str_at]
+  print_str_at_from_b18:
+  //SEG41 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $1e [phi:main::@18->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+1+$1e
     sta print_str_at.at
     lda #>SCREEN+1+$1e
     sta print_str_at.at+1
-  //SEG42 [127] phi (byte*) print_str_at::str#7 = (const string) main::str3 [phi:main::@27->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG42 [127] phi (byte*) print_str_at::str#7 = (const string) main::str3 [phi:main::@18->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str3
     sta print_str_at.str
     lda #>str3
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG43 [17] phi from main::@27 to main::@3 [phi:main::@27->main::@3]
-  b3_from_b27:
-  //SEG44 [17] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@27->main::@3#0] -- vbuz1=vbuc1 
+  //SEG43 [17] phi from main::@18 to main::@3 [phi:main::@18->main::@3]
+  b3_from_b18:
+  //SEG44 [17] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta i
     jmp b3
-  //SEG45 [17] phi from main::@29 to main::@3 [phi:main::@29->main::@3]
-  b3_from_b29:
-  //SEG46 [17] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@29->main::@3#0] -- register_copy 
+  //SEG45 [17] phi from main::@19 to main::@3 [phi:main::@19->main::@3]
+  b3_from_b19:
+  //SEG46 [17] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@19->main::@3#0] -- register_copy 
     jmp b3
   //SEG47 main::@3
   b3:
@@ -2732,187 +2763,187 @@ main: {
     lda #$20
     sta plot_chargen.ch
     jsr plot_chargen
-    jmp b29
-  //SEG54 main::@29
-  b29:
+    jmp b19
+  //SEG54 main::@19
+  b19:
   //SEG55 [20] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG56 [21] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp i
-    bne b3_from_b29
-  //SEG57 [22] phi from main::@29 to main::@5 [phi:main::@29->main::@5]
-  b5_from_b29:
-  //SEG58 [22] phi (byte) main::cur_pos#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@29->main::@5#0] -- vbuz1=vbuc1 
+    bne b3_from_b19
+  //SEG57 [22] phi from main::@19 to main::@4 [phi:main::@19->main::@4]
+  b4_from_b19:
+  //SEG58 [22] phi (byte) main::cur_pos#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@19->main::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta cur_pos
-    jmp b5
-  //SEG59 main::@5
-  b5:
+    jmp b4
+  //SEG59 main::@4
+  b4:
   //SEG60 [23] call keyboard_key_pressed 
-  //SEG61 [113] phi from main::@5 to keyboard_key_pressed [phi:main::@5->keyboard_key_pressed]
-  keyboard_key_pressed_from_b5:
-  //SEG62 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F1#0 [phi:main::@5->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG61 [113] phi from main::@4 to keyboard_key_pressed [phi:main::@4->keyboard_key_pressed]
+  keyboard_key_pressed_from_b4:
+  //SEG62 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F1#0 [phi:main::@4->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_F1
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG63 [24] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_2
-    jmp b30
-  //SEG64 main::@30
-  b30:
+    jmp b20
+  //SEG64 main::@20
+  b20:
   //SEG65 [25] (byte~) main::$15 ← (byte) keyboard_key_pressed::return#2 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_2
     sta _15
-  //SEG66 [26] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@41 -- vbuz1_eq_0_then_la1 
+  //SEG66 [26] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@27 -- vbuz1_eq_0_then_la1 
     lda _15
     cmp #0
-    beq b41_from_b30
-  //SEG67 [27] phi from main::@30 to main::@6 [phi:main::@30->main::@6]
-  b6_from_b30:
-  //SEG68 [27] phi (byte) main::cur_pos#22 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@30->main::@6#0] -- vbuz1=vbuc1 
+    beq b27_from_b20
+  //SEG67 [27] phi from main::@20 to main::@5 [phi:main::@20->main::@5]
+  b5_from_b20:
+  //SEG68 [27] phi (byte) main::cur_pos#22 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@20->main::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta cur_pos
-    jmp b6
-  //SEG69 main::@6
-  b6:
+    jmp b5
+  //SEG69 main::@5
+  b5:
   //SEG70 [28] call keyboard_key_pressed 
-  //SEG71 [113] phi from main::@6 to keyboard_key_pressed [phi:main::@6->keyboard_key_pressed]
-  keyboard_key_pressed_from_b6:
-  //SEG72 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F3#0 [phi:main::@6->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG71 [113] phi from main::@5 to keyboard_key_pressed [phi:main::@5->keyboard_key_pressed]
+  keyboard_key_pressed_from_b5:
+  //SEG72 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F3#0 [phi:main::@5->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_F3
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG73 [29] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_10
-    jmp b31
-  //SEG74 main::@31
-  b31:
+    jmp b21
+  //SEG74 main::@21
+  b21:
   //SEG75 [30] (byte~) main::$18 ← (byte) keyboard_key_pressed::return#10 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_10
     sta _18
-  //SEG76 [31] if((byte~) main::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@42 -- vbuz1_eq_0_then_la1 
+  //SEG76 [31] if((byte~) main::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@28 -- vbuz1_eq_0_then_la1 
     lda _18
     cmp #0
-    beq b42_from_b31
-  //SEG77 [32] phi from main::@31 to main::@7 [phi:main::@31->main::@7]
-  b7_from_b31:
-  //SEG78 [32] phi (byte) main::cur_pos#20 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@31->main::@7#0] -- vbuz1=vbuc1 
+    beq b28_from_b21
+  //SEG77 [32] phi from main::@21 to main::@6 [phi:main::@21->main::@6]
+  b6_from_b21:
+  //SEG78 [32] phi (byte) main::cur_pos#20 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@21->main::@6#0] -- vbuz1=vbuc1 
     lda #1
     sta cur_pos
-    jmp b7
-  //SEG79 main::@7
-  b7:
+    jmp b6
+  //SEG79 main::@6
+  b6:
   //SEG80 [33] call keyboard_key_pressed 
-  //SEG81 [113] phi from main::@7 to keyboard_key_pressed [phi:main::@7->keyboard_key_pressed]
-  keyboard_key_pressed_from_b7:
-  //SEG82 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F5#0 [phi:main::@7->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG81 [113] phi from main::@6 to keyboard_key_pressed [phi:main::@6->keyboard_key_pressed]
+  keyboard_key_pressed_from_b6:
+  //SEG82 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F5#0 [phi:main::@6->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_F5
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG83 [34] (byte) keyboard_key_pressed::return#11 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_11
-    jmp b32
-  //SEG84 main::@32
-  b32:
+    jmp b22
+  //SEG84 main::@22
+  b22:
   //SEG85 [35] (byte~) main::$21 ← (byte) keyboard_key_pressed::return#11 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_11
     sta _21
-  //SEG86 [36] if((byte~) main::$21==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@43 -- vbuz1_eq_0_then_la1 
+  //SEG86 [36] if((byte~) main::$21==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@29 -- vbuz1_eq_0_then_la1 
     lda _21
     cmp #0
-    beq b43_from_b32
-  //SEG87 [37] phi from main::@32 to main::@8 [phi:main::@32->main::@8]
-  b8_from_b32:
-  //SEG88 [37] phi (byte) main::cur_pos#18 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@32->main::@8#0] -- vbuz1=vbuc1 
+    beq b29_from_b22
+  //SEG87 [37] phi from main::@22 to main::@7 [phi:main::@22->main::@7]
+  b7_from_b22:
+  //SEG88 [37] phi (byte) main::cur_pos#18 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@22->main::@7#0] -- vbuz1=vbuc1 
     lda #2
     sta cur_pos
-    jmp b8
-  //SEG89 main::@8
-  b8:
+    jmp b7
+  //SEG89 main::@7
+  b7:
   //SEG90 [38] call keyboard_key_pressed 
-  //SEG91 [113] phi from main::@8 to keyboard_key_pressed [phi:main::@8->keyboard_key_pressed]
-  keyboard_key_pressed_from_b8:
-  //SEG92 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F7#0 [phi:main::@8->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG91 [113] phi from main::@7 to keyboard_key_pressed [phi:main::@7->keyboard_key_pressed]
+  keyboard_key_pressed_from_b7:
+  //SEG92 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F7#0 [phi:main::@7->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_F7
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG93 [39] (byte) keyboard_key_pressed::return#12 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_12
-    jmp b33
-  //SEG94 main::@33
-  b33:
+    jmp b23
+  //SEG94 main::@23
+  b23:
   //SEG95 [40] (byte~) main::$24 ← (byte) keyboard_key_pressed::return#12 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_12
     sta _24
-  //SEG96 [41] if((byte~) main::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@44 -- vbuz1_eq_0_then_la1 
+  //SEG96 [41] if((byte~) main::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@30 -- vbuz1_eq_0_then_la1 
     lda _24
     cmp #0
-    beq b44_from_b33
-  //SEG97 [42] phi from main::@33 to main::@9 [phi:main::@33->main::@9]
-  b9_from_b33:
-  //SEG98 [42] phi (byte) main::cur_pos#11 = (byte/signed byte/word/signed word/dword/signed dword) 3 [phi:main::@33->main::@9#0] -- vbuz1=vbuc1 
+    beq b30_from_b23
+  //SEG97 [42] phi from main::@23 to main::@8 [phi:main::@23->main::@8]
+  b8_from_b23:
+  //SEG98 [42] phi (byte) main::cur_pos#11 = (byte/signed byte/word/signed word/dword/signed dword) 3 [phi:main::@23->main::@8#0] -- vbuz1=vbuc1 
     lda #3
     sta cur_pos
-    jmp b9
-  //SEG99 main::@9
-  b9:
+    jmp b8
+  //SEG99 main::@8
+  b8:
   //SEG100 [43] call keyboard_key_pressed 
-  //SEG101 [113] phi from main::@9 to keyboard_key_pressed [phi:main::@9->keyboard_key_pressed]
-  keyboard_key_pressed_from_b9:
-  //SEG102 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_LSHIFT#0 [phi:main::@9->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG101 [113] phi from main::@8 to keyboard_key_pressed [phi:main::@8->keyboard_key_pressed]
+  keyboard_key_pressed_from_b8:
+  //SEG102 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_LSHIFT#0 [phi:main::@8->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_LSHIFT
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG103 [44] (byte) keyboard_key_pressed::return#13 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_13
-    jmp b34
-  //SEG104 main::@34
-  b34:
+    jmp b24
+  //SEG104 main::@24
+  b24:
   //SEG105 [45] (byte~) main::$27 ← (byte) keyboard_key_pressed::return#13 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_13
     sta _27
-  //SEG106 [46] if((byte~) main::$27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@11 -- vbuz1_neq_0_then_la1 
+  //SEG106 [46] if((byte~) main::$27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9 -- vbuz1_neq_0_then_la1 
     lda _27
     cmp #0
-    bne b11_from_b34
-  //SEG107 [47] phi from main::@34 to main::@23 [phi:main::@34->main::@23]
-  b23_from_b34:
-    jmp b23
-  //SEG108 main::@23
-  b23:
-  //SEG109 [48] phi from main::@23 to main::@11 [phi:main::@23->main::@11]
-  b11_from_b23:
-  //SEG110 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@23->main::@11#0] -- vbuz1=vbuc1 
+    bne b9_from_b24
+  //SEG107 [47] phi from main::@24 to main::@15 [phi:main::@24->main::@15]
+  b15_from_b24:
+    jmp b15
+  //SEG108 main::@15
+  b15:
+  //SEG109 [48] phi from main::@15 to main::@9 [phi:main::@15->main::@9]
+  b9_from_b15:
+  //SEG110 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@15->main::@9#0] -- vbuz1=vbuc1 
     lda #0
     sta shift
-    jmp b11
-  //SEG111 [48] phi from main::@34 to main::@11 [phi:main::@34->main::@11]
-  b11_from_b34:
-  //SEG112 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@34->main::@11#0] -- vbuz1=vbuc1 
+    jmp b9
+  //SEG111 [48] phi from main::@24 to main::@9 [phi:main::@24->main::@9]
+  b9_from_b24:
+  //SEG112 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@24->main::@9#0] -- vbuz1=vbuc1 
     lda #1
     sta shift
-    jmp b11
-  //SEG113 main::@11
-  b11:
-  //SEG114 [49] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  b12_from_b11:
-  //SEG115 [49] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@11->main::@12#0] -- vbuz1=vbuc1 
+    jmp b9
+  //SEG113 main::@9
+  b9:
+  //SEG114 [49] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  b10_from_b9:
+  //SEG115 [49] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@9->main::@10#0] -- vbuz1=vbuc1 
     lda #0
     sta ch
-    jmp b12
+    jmp b10
   // Check for key presses - and plot char if found
-  //SEG116 [49] phi from main::@14 to main::@12 [phi:main::@14->main::@12]
-  b12_from_b14:
-  //SEG117 [49] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@14->main::@12#0] -- register_copy 
-    jmp b12
-  //SEG118 main::@12
-  b12:
+  //SEG116 [49] phi from main::@12 to main::@10 [phi:main::@12->main::@10]
+  b10_from_b12:
+  //SEG117 [49] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@12->main::@10#0] -- register_copy 
+    jmp b10
+  //SEG118 main::@10
+  b10:
   //SEG119 [50] (byte) keyboard_get_keycode::ch#0 ← (byte) main::ch#2 -- vbuz1=vbuz2 
     lda ch
     sta keyboard_get_keycode.ch
@@ -2921,55 +2952,55 @@ main: {
   //SEG121 [52] (byte) keyboard_get_keycode::return#2 ← (byte) keyboard_get_keycode::return#0 -- vbuz1=vbuz2 
     lda keyboard_get_keycode.return
     sta keyboard_get_keycode.return_2
-    jmp b35
-  //SEG122 main::@35
-  b35:
+    jmp b25
+  //SEG122 main::@25
+  b25:
   //SEG123 [53] (byte) main::key#0 ← (byte) keyboard_get_keycode::return#2 -- vbuz1=vbuz2 
     lda keyboard_get_keycode.return_2
     sta key
-  //SEG124 [54] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@13 -- vbuz1_eq_vbuc1_then_la1 
+  //SEG124 [54] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@11 -- vbuz1_eq_vbuc1_then_la1 
     lda #$3f
     cmp key
-    beq b13_from_b35
-    jmp b15
-  //SEG125 main::@15
-  b15:
+    beq b11_from_b25
+    jmp b13
+  //SEG125 main::@13
+  b13:
   //SEG126 [55] (byte) keyboard_key_pressed::key#5 ← (byte) main::key#0 -- vbuz1=vbuz2 
     lda key
     sta keyboard_key_pressed.key
   //SEG127 [56] call keyboard_key_pressed 
-  //SEG128 [113] phi from main::@15 to keyboard_key_pressed [phi:main::@15->keyboard_key_pressed]
-  keyboard_key_pressed_from_b15:
-  //SEG129 [113] phi (byte) keyboard_key_pressed::key#6 = (byte) keyboard_key_pressed::key#5 [phi:main::@15->keyboard_key_pressed#0] -- register_copy 
+  //SEG128 [113] phi from main::@13 to keyboard_key_pressed [phi:main::@13->keyboard_key_pressed]
+  keyboard_key_pressed_from_b13:
+  //SEG129 [113] phi (byte) keyboard_key_pressed::key#6 = (byte) keyboard_key_pressed::key#5 [phi:main::@13->keyboard_key_pressed#0] -- register_copy 
     jsr keyboard_key_pressed
   //SEG130 [57] (byte) keyboard_key_pressed::return#14 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_14
-    jmp b36
-  //SEG131 main::@36
-  b36:
+    jmp b26
+  //SEG131 main::@26
+  b26:
   //SEG132 [58] (byte) main::pressed#1 ← (byte) keyboard_key_pressed::return#14 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_14
     sta pressed
-  //SEG133 [59] phi from main::@36 to main::@13 [phi:main::@36->main::@13]
-  b13_from_b36:
-  //SEG134 [59] phi (byte) main::pressed#2 = (byte) main::pressed#1 [phi:main::@36->main::@13#0] -- register_copy 
-    jmp b13
-  //SEG135 [59] phi from main::@35 to main::@13 [phi:main::@35->main::@13]
-  b13_from_b35:
-  //SEG136 [59] phi (byte) main::pressed#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@35->main::@13#0] -- vbuz1=vbuc1 
+  //SEG133 [59] phi from main::@26 to main::@11 [phi:main::@26->main::@11]
+  b11_from_b26:
+  //SEG134 [59] phi (byte) main::pressed#2 = (byte) main::pressed#1 [phi:main::@26->main::@11#0] -- register_copy 
+    jmp b11
+  //SEG135 [59] phi from main::@25 to main::@11 [phi:main::@25->main::@11]
+  b11_from_b25:
+  //SEG136 [59] phi (byte) main::pressed#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@25->main::@11#0] -- vbuz1=vbuc1 
     lda #0
     sta pressed
-    jmp b13
-  //SEG137 main::@13
-  b13:
-  //SEG138 [60] if((byte) main::pressed#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@14 -- vbuz1_eq_0_then_la1 
+    jmp b11
+  //SEG137 main::@11
+  b11:
+  //SEG138 [60] if((byte) main::pressed#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12 -- vbuz1_eq_0_then_la1 
     lda pressed
     cmp #0
-    beq b14
-    jmp b16
-  //SEG139 main::@16
-  b16:
+    beq b12
+    jmp b14
+  //SEG139 main::@14
+  b14:
   //SEG140 [61] (byte) plot_chargen::pos#1 ← (byte) main::cur_pos#11 -- vbuz1=vbuz2 
     lda cur_pos
     sta plot_chargen.pos
@@ -2980,61 +3011,61 @@ main: {
     lda shift
     sta plot_chargen.shift
   //SEG143 [64] call plot_chargen 
-  //SEG144 [71] phi from main::@16 to plot_chargen [phi:main::@16->plot_chargen]
-  plot_chargen_from_b16:
-  //SEG145 [71] phi (byte) plot_chargen::pos#2 = (byte) plot_chargen::pos#1 [phi:main::@16->plot_chargen#0] -- register_copy 
-  //SEG146 [71] phi (byte) plot_chargen::shift#2 = (byte) plot_chargen::shift#1 [phi:main::@16->plot_chargen#1] -- register_copy 
-  //SEG147 [71] phi (byte) plot_chargen::ch#2 = (byte) plot_chargen::ch#1 [phi:main::@16->plot_chargen#2] -- register_copy 
+  //SEG144 [71] phi from main::@14 to plot_chargen [phi:main::@14->plot_chargen]
+  plot_chargen_from_b14:
+  //SEG145 [71] phi (byte) plot_chargen::pos#2 = (byte) plot_chargen::pos#1 [phi:main::@14->plot_chargen#0] -- register_copy 
+  //SEG146 [71] phi (byte) plot_chargen::shift#2 = (byte) plot_chargen::shift#1 [phi:main::@14->plot_chargen#1] -- register_copy 
+  //SEG147 [71] phi (byte) plot_chargen::ch#2 = (byte) plot_chargen::ch#1 [phi:main::@14->plot_chargen#2] -- register_copy 
     jsr plot_chargen
-    jmp b14
-  //SEG148 main::@14
-  b14:
+    jmp b12
+  //SEG148 main::@12
+  b12:
   //SEG149 [65] (byte) main::ch#1 ← ++ (byte) main::ch#2 -- vbuz1=_inc_vbuz1 
     inc ch
-  //SEG150 [66] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@12 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG150 [66] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
     lda #$40
     cmp ch
-    bne b12_from_b14
-  //SEG151 [22] phi from main::@14 to main::@5 [phi:main::@14->main::@5]
-  b5_from_b14:
-  //SEG152 [22] phi (byte) main::cur_pos#24 = (byte) main::cur_pos#11 [phi:main::@14->main::@5#0] -- register_copy 
-    jmp b5
-  //SEG153 [67] phi from main::@33 to main::@44 [phi:main::@33->main::@44]
-  b44_from_b33:
-    jmp b44
-  //SEG154 main::@44
-  b44:
-  //SEG155 [42] phi from main::@44 to main::@9 [phi:main::@44->main::@9]
-  b9_from_b44:
-  //SEG156 [42] phi (byte) main::cur_pos#11 = (byte) main::cur_pos#18 [phi:main::@44->main::@9#0] -- register_copy 
-    jmp b9
-  //SEG157 [68] phi from main::@32 to main::@43 [phi:main::@32->main::@43]
-  b43_from_b32:
-    jmp b43
-  //SEG158 main::@43
-  b43:
-  //SEG159 [37] phi from main::@43 to main::@8 [phi:main::@43->main::@8]
-  b8_from_b43:
-  //SEG160 [37] phi (byte) main::cur_pos#18 = (byte) main::cur_pos#20 [phi:main::@43->main::@8#0] -- register_copy 
+    bne b10_from_b12
+  //SEG151 [22] phi from main::@12 to main::@4 [phi:main::@12->main::@4]
+  b4_from_b12:
+  //SEG152 [22] phi (byte) main::cur_pos#24 = (byte) main::cur_pos#11 [phi:main::@12->main::@4#0] -- register_copy 
+    jmp b4
+  //SEG153 [67] phi from main::@23 to main::@30 [phi:main::@23->main::@30]
+  b30_from_b23:
+    jmp b30
+  //SEG154 main::@30
+  b30:
+  //SEG155 [42] phi from main::@30 to main::@8 [phi:main::@30->main::@8]
+  b8_from_b30:
+  //SEG156 [42] phi (byte) main::cur_pos#11 = (byte) main::cur_pos#18 [phi:main::@30->main::@8#0] -- register_copy 
     jmp b8
-  //SEG161 [69] phi from main::@31 to main::@42 [phi:main::@31->main::@42]
-  b42_from_b31:
-    jmp b42
-  //SEG162 main::@42
-  b42:
-  //SEG163 [32] phi from main::@42 to main::@7 [phi:main::@42->main::@7]
-  b7_from_b42:
-  //SEG164 [32] phi (byte) main::cur_pos#20 = (byte) main::cur_pos#22 [phi:main::@42->main::@7#0] -- register_copy 
+  //SEG157 [68] phi from main::@22 to main::@29 [phi:main::@22->main::@29]
+  b29_from_b22:
+    jmp b29
+  //SEG158 main::@29
+  b29:
+  //SEG159 [37] phi from main::@29 to main::@7 [phi:main::@29->main::@7]
+  b7_from_b29:
+  //SEG160 [37] phi (byte) main::cur_pos#18 = (byte) main::cur_pos#20 [phi:main::@29->main::@7#0] -- register_copy 
     jmp b7
-  //SEG165 [70] phi from main::@30 to main::@41 [phi:main::@30->main::@41]
-  b41_from_b30:
-    jmp b41
-  //SEG166 main::@41
-  b41:
-  //SEG167 [27] phi from main::@41 to main::@6 [phi:main::@41->main::@6]
-  b6_from_b41:
-  //SEG168 [27] phi (byte) main::cur_pos#22 = (byte) main::cur_pos#24 [phi:main::@41->main::@6#0] -- register_copy 
+  //SEG161 [69] phi from main::@21 to main::@28 [phi:main::@21->main::@28]
+  b28_from_b21:
+    jmp b28
+  //SEG162 main::@28
+  b28:
+  //SEG163 [32] phi from main::@28 to main::@6 [phi:main::@28->main::@6]
+  b6_from_b28:
+  //SEG164 [32] phi (byte) main::cur_pos#20 = (byte) main::cur_pos#22 [phi:main::@28->main::@6#0] -- register_copy 
     jmp b6
+  //SEG165 [70] phi from main::@20 to main::@27 [phi:main::@20->main::@27]
+  b27_from_b20:
+    jmp b27
+  //SEG166 main::@27
+  b27:
+  //SEG167 [27] phi from main::@27 to main::@5 [phi:main::@27->main::@5]
+  b5_from_b27:
+  //SEG168 [27] phi (byte) main::cur_pos#22 = (byte) main::cur_pos#24 [phi:main::@27->main::@5#0] -- register_copy 
+    jmp b5
     str: .text "f1@"
     str1: .text "f3@"
     str2: .text "f5@"
@@ -3286,13 +3317,13 @@ mul8u: {
     lda #1
     and a
     sta _1
-  //SEG239 [108] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG239 [108] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG240 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG240 mul8u::@3
+  b3:
   //SEG241 [109] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -3301,23 +3332,23 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG242 [110] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG243 [110] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG244 mul8u::@8
-  b8:
+  //SEG242 [110] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG243 [110] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG244 mul8u::@4
+  b4:
   //SEG245 [111] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr a
   //SEG246 [112] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG247 [104] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG248 [104] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG249 [104] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG250 [104] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG247 [104] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG248 [104] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG249 [104] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG250 [104] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG251 keyboard_key_pressed
@@ -3356,9 +3387,9 @@ keyboard_key_pressed: {
   //SEG256 [118] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return
     sta keyboard_matrix_read.return_2
-    jmp b2
-  //SEG257 keyboard_key_pressed::@2
-  b2:
+    jmp b1
+  //SEG257 keyboard_key_pressed::@1
+  b1:
   //SEG258 [119] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return_2
     sta _2
@@ -3730,17 +3761,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @19 [phi:@begin->@19]
-b19_from_bbegin:
-  jmp b19
-//SEG5 @19
-b19:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @19 to main [phi:@19->main]
-main_from_b19:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @19 to @end [phi:@19->@end]
-bend_from_b19:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3803,72 +3834,72 @@ main: {
     lda #>str
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG25 [11] phi from main::@2 to main::@25 [phi:main::@2->main::@25]
-  b25_from_b2:
-    jmp b25
-  //SEG26 main::@25
-  b25:
+  //SEG25 [11] phi from main::@2 to main::@16 [phi:main::@2->main::@16]
+  b16_from_b2:
+    jmp b16
+  //SEG26 main::@16
+  b16:
   //SEG27 [12] call print_str_at 
-  //SEG28 [127] phi from main::@25 to print_str_at [phi:main::@25->print_str_at]
-  print_str_at_from_b25:
-  //SEG29 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@25->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG28 [127] phi from main::@16 to print_str_at [phi:main::@16->print_str_at]
+  print_str_at_from_b16:
+  //SEG29 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@16->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+1+$a
     sta print_str_at.at
     lda #>SCREEN+1+$a
     sta print_str_at.at+1
-  //SEG30 [127] phi (byte*) print_str_at::str#7 = (const string) main::str1 [phi:main::@25->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG30 [127] phi (byte*) print_str_at::str#7 = (const string) main::str1 [phi:main::@16->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str_at.str
     lda #>str1
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG31 [13] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
-  b26_from_b25:
-    jmp b26
-  //SEG32 main::@26
-  b26:
+  //SEG31 [13] phi from main::@16 to main::@17 [phi:main::@16->main::@17]
+  b17_from_b16:
+    jmp b17
+  //SEG32 main::@17
+  b17:
   //SEG33 [14] call print_str_at 
-  //SEG34 [127] phi from main::@26 to print_str_at [phi:main::@26->print_str_at]
-  print_str_at_from_b26:
-  //SEG35 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:main::@26->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG34 [127] phi from main::@17 to print_str_at [phi:main::@17->print_str_at]
+  print_str_at_from_b17:
+  //SEG35 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:main::@17->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+1+$14
     sta print_str_at.at
     lda #>SCREEN+1+$14
     sta print_str_at.at+1
-  //SEG36 [127] phi (byte*) print_str_at::str#7 = (const string) main::str2 [phi:main::@26->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG36 [127] phi (byte*) print_str_at::str#7 = (const string) main::str2 [phi:main::@17->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str_at.str
     lda #>str2
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG37 [15] phi from main::@26 to main::@27 [phi:main::@26->main::@27]
-  b27_from_b26:
-    jmp b27
-  //SEG38 main::@27
-  b27:
+  //SEG37 [15] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
+  b18_from_b17:
+    jmp b18
+  //SEG38 main::@18
+  b18:
   //SEG39 [16] call print_str_at 
-  //SEG40 [127] phi from main::@27 to print_str_at [phi:main::@27->print_str_at]
-  print_str_at_from_b27:
-  //SEG41 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $1e [phi:main::@27->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG40 [127] phi from main::@18 to print_str_at [phi:main::@18->print_str_at]
+  print_str_at_from_b18:
+  //SEG41 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $1e [phi:main::@18->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+1+$1e
     sta print_str_at.at
     lda #>SCREEN+1+$1e
     sta print_str_at.at+1
-  //SEG42 [127] phi (byte*) print_str_at::str#7 = (const string) main::str3 [phi:main::@27->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG42 [127] phi (byte*) print_str_at::str#7 = (const string) main::str3 [phi:main::@18->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str3
     sta print_str_at.str
     lda #>str3
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG43 [17] phi from main::@27 to main::@3 [phi:main::@27->main::@3]
-  b3_from_b27:
-  //SEG44 [17] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@27->main::@3#0] -- vbuz1=vbuc1 
+  //SEG43 [17] phi from main::@18 to main::@3 [phi:main::@18->main::@3]
+  b3_from_b18:
+  //SEG44 [17] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta i
     jmp b3
-  //SEG45 [17] phi from main::@29 to main::@3 [phi:main::@29->main::@3]
-  b3_from_b29:
-  //SEG46 [17] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@29->main::@3#0] -- register_copy 
+  //SEG45 [17] phi from main::@19 to main::@3 [phi:main::@19->main::@3]
+  b3_from_b19:
+  //SEG46 [17] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@19->main::@3#0] -- register_copy 
     jmp b3
   //SEG47 main::@3
   b3:
@@ -3883,201 +3914,201 @@ main: {
   //SEG53 [71] phi (byte) plot_chargen::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) $20 [phi:main::@3->plot_chargen#2] -- vbuaa=vbuc1 
     lda #$20
     jsr plot_chargen
-    jmp b29
-  //SEG54 main::@29
-  b29:
+    jmp b19
+  //SEG54 main::@19
+  b19:
   //SEG55 [20] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG56 [21] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp i
-    bne b3_from_b29
-  //SEG57 [22] phi from main::@29 to main::@5 [phi:main::@29->main::@5]
-  b5_from_b29:
-  //SEG58 [22] phi (byte) main::cur_pos#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@29->main::@5#0] -- vbuz1=vbuc1 
+    bne b3_from_b19
+  //SEG57 [22] phi from main::@19 to main::@4 [phi:main::@19->main::@4]
+  b4_from_b19:
+  //SEG58 [22] phi (byte) main::cur_pos#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@19->main::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta cur_pos
-    jmp b5
-  //SEG59 main::@5
-  b5:
+    jmp b4
+  //SEG59 main::@4
+  b4:
   //SEG60 [23] call keyboard_key_pressed 
-  //SEG61 [113] phi from main::@5 to keyboard_key_pressed [phi:main::@5->keyboard_key_pressed]
-  keyboard_key_pressed_from_b5:
-  //SEG62 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F1#0 [phi:main::@5->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG61 [113] phi from main::@4 to keyboard_key_pressed [phi:main::@4->keyboard_key_pressed]
+  keyboard_key_pressed_from_b4:
+  //SEG62 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F1#0 [phi:main::@4->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_F1
     jsr keyboard_key_pressed
   //SEG63 [24] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-    jmp b30
-  //SEG64 main::@30
-  b30:
+    jmp b20
+  //SEG64 main::@20
+  b20:
   //SEG65 [25] (byte~) main::$15 ← (byte) keyboard_key_pressed::return#2
-  //SEG66 [26] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@41 -- vbuaa_eq_0_then_la1 
+  //SEG66 [26] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@27 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b41_from_b30
-  //SEG67 [27] phi from main::@30 to main::@6 [phi:main::@30->main::@6]
-  b6_from_b30:
-  //SEG68 [27] phi (byte) main::cur_pos#22 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@30->main::@6#0] -- vbuz1=vbuc1 
+    beq b27_from_b20
+  //SEG67 [27] phi from main::@20 to main::@5 [phi:main::@20->main::@5]
+  b5_from_b20:
+  //SEG68 [27] phi (byte) main::cur_pos#22 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@20->main::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta cur_pos
-    jmp b6
-  //SEG69 main::@6
-  b6:
+    jmp b5
+  //SEG69 main::@5
+  b5:
   //SEG70 [28] call keyboard_key_pressed 
-  //SEG71 [113] phi from main::@6 to keyboard_key_pressed [phi:main::@6->keyboard_key_pressed]
-  keyboard_key_pressed_from_b6:
-  //SEG72 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F3#0 [phi:main::@6->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG71 [113] phi from main::@5 to keyboard_key_pressed [phi:main::@5->keyboard_key_pressed]
+  keyboard_key_pressed_from_b5:
+  //SEG72 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F3#0 [phi:main::@5->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_F3
     jsr keyboard_key_pressed
   //SEG73 [29] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-    jmp b31
-  //SEG74 main::@31
-  b31:
+    jmp b21
+  //SEG74 main::@21
+  b21:
   //SEG75 [30] (byte~) main::$18 ← (byte) keyboard_key_pressed::return#10
-  //SEG76 [31] if((byte~) main::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@42 -- vbuaa_eq_0_then_la1 
+  //SEG76 [31] if((byte~) main::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@28 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b42_from_b31
-  //SEG77 [32] phi from main::@31 to main::@7 [phi:main::@31->main::@7]
-  b7_from_b31:
-  //SEG78 [32] phi (byte) main::cur_pos#20 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@31->main::@7#0] -- vbuz1=vbuc1 
+    beq b28_from_b21
+  //SEG77 [32] phi from main::@21 to main::@6 [phi:main::@21->main::@6]
+  b6_from_b21:
+  //SEG78 [32] phi (byte) main::cur_pos#20 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@21->main::@6#0] -- vbuz1=vbuc1 
     lda #1
     sta cur_pos
-    jmp b7
-  //SEG79 main::@7
-  b7:
+    jmp b6
+  //SEG79 main::@6
+  b6:
   //SEG80 [33] call keyboard_key_pressed 
-  //SEG81 [113] phi from main::@7 to keyboard_key_pressed [phi:main::@7->keyboard_key_pressed]
-  keyboard_key_pressed_from_b7:
-  //SEG82 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F5#0 [phi:main::@7->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG81 [113] phi from main::@6 to keyboard_key_pressed [phi:main::@6->keyboard_key_pressed]
+  keyboard_key_pressed_from_b6:
+  //SEG82 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F5#0 [phi:main::@6->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_F5
     jsr keyboard_key_pressed
   //SEG83 [34] (byte) keyboard_key_pressed::return#11 ← (byte) keyboard_key_pressed::return#0
-    jmp b32
-  //SEG84 main::@32
-  b32:
+    jmp b22
+  //SEG84 main::@22
+  b22:
   //SEG85 [35] (byte~) main::$21 ← (byte) keyboard_key_pressed::return#11
-  //SEG86 [36] if((byte~) main::$21==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@43 -- vbuaa_eq_0_then_la1 
+  //SEG86 [36] if((byte~) main::$21==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@29 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b43_from_b32
-  //SEG87 [37] phi from main::@32 to main::@8 [phi:main::@32->main::@8]
-  b8_from_b32:
-  //SEG88 [37] phi (byte) main::cur_pos#18 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@32->main::@8#0] -- vbuz1=vbuc1 
+    beq b29_from_b22
+  //SEG87 [37] phi from main::@22 to main::@7 [phi:main::@22->main::@7]
+  b7_from_b22:
+  //SEG88 [37] phi (byte) main::cur_pos#18 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@22->main::@7#0] -- vbuz1=vbuc1 
     lda #2
     sta cur_pos
-    jmp b8
-  //SEG89 main::@8
-  b8:
+    jmp b7
+  //SEG89 main::@7
+  b7:
   //SEG90 [38] call keyboard_key_pressed 
-  //SEG91 [113] phi from main::@8 to keyboard_key_pressed [phi:main::@8->keyboard_key_pressed]
-  keyboard_key_pressed_from_b8:
-  //SEG92 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F7#0 [phi:main::@8->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG91 [113] phi from main::@7 to keyboard_key_pressed [phi:main::@7->keyboard_key_pressed]
+  keyboard_key_pressed_from_b7:
+  //SEG92 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F7#0 [phi:main::@7->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_F7
     jsr keyboard_key_pressed
   //SEG93 [39] (byte) keyboard_key_pressed::return#12 ← (byte) keyboard_key_pressed::return#0
-    jmp b33
-  //SEG94 main::@33
-  b33:
+    jmp b23
+  //SEG94 main::@23
+  b23:
   //SEG95 [40] (byte~) main::$24 ← (byte) keyboard_key_pressed::return#12
-  //SEG96 [41] if((byte~) main::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@44 -- vbuaa_eq_0_then_la1 
+  //SEG96 [41] if((byte~) main::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@30 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b44_from_b33
-  //SEG97 [42] phi from main::@33 to main::@9 [phi:main::@33->main::@9]
-  b9_from_b33:
-  //SEG98 [42] phi (byte) main::cur_pos#11 = (byte/signed byte/word/signed word/dword/signed dword) 3 [phi:main::@33->main::@9#0] -- vbuz1=vbuc1 
+    beq b30_from_b23
+  //SEG97 [42] phi from main::@23 to main::@8 [phi:main::@23->main::@8]
+  b8_from_b23:
+  //SEG98 [42] phi (byte) main::cur_pos#11 = (byte/signed byte/word/signed word/dword/signed dword) 3 [phi:main::@23->main::@8#0] -- vbuz1=vbuc1 
     lda #3
     sta cur_pos
-    jmp b9
-  //SEG99 main::@9
-  b9:
+    jmp b8
+  //SEG99 main::@8
+  b8:
   //SEG100 [43] call keyboard_key_pressed 
-  //SEG101 [113] phi from main::@9 to keyboard_key_pressed [phi:main::@9->keyboard_key_pressed]
-  keyboard_key_pressed_from_b9:
-  //SEG102 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_LSHIFT#0 [phi:main::@9->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG101 [113] phi from main::@8 to keyboard_key_pressed [phi:main::@8->keyboard_key_pressed]
+  keyboard_key_pressed_from_b8:
+  //SEG102 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_LSHIFT#0 [phi:main::@8->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_LSHIFT
     jsr keyboard_key_pressed
   //SEG103 [44] (byte) keyboard_key_pressed::return#13 ← (byte) keyboard_key_pressed::return#0
-    jmp b34
-  //SEG104 main::@34
-  b34:
+    jmp b24
+  //SEG104 main::@24
+  b24:
   //SEG105 [45] (byte~) main::$27 ← (byte) keyboard_key_pressed::return#13
-  //SEG106 [46] if((byte~) main::$27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@11 -- vbuaa_neq_0_then_la1 
+  //SEG106 [46] if((byte~) main::$27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b11_from_b34
-  //SEG107 [47] phi from main::@34 to main::@23 [phi:main::@34->main::@23]
-  b23_from_b34:
-    jmp b23
-  //SEG108 main::@23
-  b23:
-  //SEG109 [48] phi from main::@23 to main::@11 [phi:main::@23->main::@11]
-  b11_from_b23:
-  //SEG110 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@23->main::@11#0] -- vbuz1=vbuc1 
+    bne b9_from_b24
+  //SEG107 [47] phi from main::@24 to main::@15 [phi:main::@24->main::@15]
+  b15_from_b24:
+    jmp b15
+  //SEG108 main::@15
+  b15:
+  //SEG109 [48] phi from main::@15 to main::@9 [phi:main::@15->main::@9]
+  b9_from_b15:
+  //SEG110 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@15->main::@9#0] -- vbuz1=vbuc1 
     lda #0
     sta shift
-    jmp b11
-  //SEG111 [48] phi from main::@34 to main::@11 [phi:main::@34->main::@11]
-  b11_from_b34:
-  //SEG112 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@34->main::@11#0] -- vbuz1=vbuc1 
+    jmp b9
+  //SEG111 [48] phi from main::@24 to main::@9 [phi:main::@24->main::@9]
+  b9_from_b24:
+  //SEG112 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@24->main::@9#0] -- vbuz1=vbuc1 
     lda #1
     sta shift
-    jmp b11
-  //SEG113 main::@11
-  b11:
-  //SEG114 [49] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  b12_from_b11:
-  //SEG115 [49] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@11->main::@12#0] -- vbuz1=vbuc1 
+    jmp b9
+  //SEG113 main::@9
+  b9:
+  //SEG114 [49] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  b10_from_b9:
+  //SEG115 [49] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@9->main::@10#0] -- vbuz1=vbuc1 
     lda #0
     sta ch
-    jmp b12
+    jmp b10
   // Check for key presses - and plot char if found
-  //SEG116 [49] phi from main::@14 to main::@12 [phi:main::@14->main::@12]
-  b12_from_b14:
-  //SEG117 [49] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@14->main::@12#0] -- register_copy 
-    jmp b12
-  //SEG118 main::@12
-  b12:
+  //SEG116 [49] phi from main::@12 to main::@10 [phi:main::@12->main::@10]
+  b10_from_b12:
+  //SEG117 [49] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@12->main::@10#0] -- register_copy 
+    jmp b10
+  //SEG118 main::@10
+  b10:
   //SEG119 [50] (byte) keyboard_get_keycode::ch#0 ← (byte) main::ch#2 -- vbuxx=vbuz1 
     ldx ch
   //SEG120 [51] call keyboard_get_keycode 
     jsr keyboard_get_keycode
   //SEG121 [52] (byte) keyboard_get_keycode::return#2 ← (byte) keyboard_get_keycode::return#0
-    jmp b35
-  //SEG122 main::@35
-  b35:
+    jmp b25
+  //SEG122 main::@25
+  b25:
   //SEG123 [53] (byte) main::key#0 ← (byte) keyboard_get_keycode::return#2
-  //SEG124 [54] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@13 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG124 [54] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@11 -- vbuaa_eq_vbuc1_then_la1 
     cmp #$3f
-    beq b13_from_b35
-    jmp b15
-  //SEG125 main::@15
-  b15:
+    beq b11_from_b25
+    jmp b13
+  //SEG125 main::@13
+  b13:
   //SEG126 [55] (byte) keyboard_key_pressed::key#5 ← (byte) main::key#0 -- vbuxx=vbuaa 
     tax
   //SEG127 [56] call keyboard_key_pressed 
-  //SEG128 [113] phi from main::@15 to keyboard_key_pressed [phi:main::@15->keyboard_key_pressed]
-  keyboard_key_pressed_from_b15:
-  //SEG129 [113] phi (byte) keyboard_key_pressed::key#6 = (byte) keyboard_key_pressed::key#5 [phi:main::@15->keyboard_key_pressed#0] -- register_copy 
+  //SEG128 [113] phi from main::@13 to keyboard_key_pressed [phi:main::@13->keyboard_key_pressed]
+  keyboard_key_pressed_from_b13:
+  //SEG129 [113] phi (byte) keyboard_key_pressed::key#6 = (byte) keyboard_key_pressed::key#5 [phi:main::@13->keyboard_key_pressed#0] -- register_copy 
     jsr keyboard_key_pressed
   //SEG130 [57] (byte) keyboard_key_pressed::return#14 ← (byte) keyboard_key_pressed::return#0
-    jmp b36
-  //SEG131 main::@36
-  b36:
+    jmp b26
+  //SEG131 main::@26
+  b26:
   //SEG132 [58] (byte) main::pressed#1 ← (byte) keyboard_key_pressed::return#14
-  //SEG133 [59] phi from main::@36 to main::@13 [phi:main::@36->main::@13]
-  b13_from_b36:
-  //SEG134 [59] phi (byte) main::pressed#2 = (byte) main::pressed#1 [phi:main::@36->main::@13#0] -- register_copy 
-    jmp b13
-  //SEG135 [59] phi from main::@35 to main::@13 [phi:main::@35->main::@13]
-  b13_from_b35:
-  //SEG136 [59] phi (byte) main::pressed#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@35->main::@13#0] -- vbuaa=vbuc1 
+  //SEG133 [59] phi from main::@26 to main::@11 [phi:main::@26->main::@11]
+  b11_from_b26:
+  //SEG134 [59] phi (byte) main::pressed#2 = (byte) main::pressed#1 [phi:main::@26->main::@11#0] -- register_copy 
+    jmp b11
+  //SEG135 [59] phi from main::@25 to main::@11 [phi:main::@25->main::@11]
+  b11_from_b25:
+  //SEG136 [59] phi (byte) main::pressed#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@25->main::@11#0] -- vbuaa=vbuc1 
     lda #0
-    jmp b13
-  //SEG137 main::@13
-  b13:
-  //SEG138 [60] if((byte) main::pressed#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@14 -- vbuaa_eq_0_then_la1 
+    jmp b11
+  //SEG137 main::@11
+  b11:
+  //SEG138 [60] if((byte) main::pressed#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b14
-    jmp b16
-  //SEG139 main::@16
-  b16:
+    beq b12
+    jmp b14
+  //SEG139 main::@14
+  b14:
   //SEG140 [61] (byte) plot_chargen::pos#1 ← (byte) main::cur_pos#11 -- vbuyy=vbuz1 
     ldy cur_pos
   //SEG141 [62] (byte) plot_chargen::ch#1 ← (byte) main::ch#2 -- vbuaa=vbuz1 
@@ -4085,61 +4116,61 @@ main: {
   //SEG142 [63] (byte) plot_chargen::shift#1 ← (byte) main::shift#9 -- vbuxx=vbuz1 
     ldx shift
   //SEG143 [64] call plot_chargen 
-  //SEG144 [71] phi from main::@16 to plot_chargen [phi:main::@16->plot_chargen]
-  plot_chargen_from_b16:
-  //SEG145 [71] phi (byte) plot_chargen::pos#2 = (byte) plot_chargen::pos#1 [phi:main::@16->plot_chargen#0] -- register_copy 
-  //SEG146 [71] phi (byte) plot_chargen::shift#2 = (byte) plot_chargen::shift#1 [phi:main::@16->plot_chargen#1] -- register_copy 
-  //SEG147 [71] phi (byte) plot_chargen::ch#2 = (byte) plot_chargen::ch#1 [phi:main::@16->plot_chargen#2] -- register_copy 
+  //SEG144 [71] phi from main::@14 to plot_chargen [phi:main::@14->plot_chargen]
+  plot_chargen_from_b14:
+  //SEG145 [71] phi (byte) plot_chargen::pos#2 = (byte) plot_chargen::pos#1 [phi:main::@14->plot_chargen#0] -- register_copy 
+  //SEG146 [71] phi (byte) plot_chargen::shift#2 = (byte) plot_chargen::shift#1 [phi:main::@14->plot_chargen#1] -- register_copy 
+  //SEG147 [71] phi (byte) plot_chargen::ch#2 = (byte) plot_chargen::ch#1 [phi:main::@14->plot_chargen#2] -- register_copy 
     jsr plot_chargen
-    jmp b14
-  //SEG148 main::@14
-  b14:
+    jmp b12
+  //SEG148 main::@12
+  b12:
   //SEG149 [65] (byte) main::ch#1 ← ++ (byte) main::ch#2 -- vbuz1=_inc_vbuz1 
     inc ch
-  //SEG150 [66] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@12 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG150 [66] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
     lda #$40
     cmp ch
-    bne b12_from_b14
-  //SEG151 [22] phi from main::@14 to main::@5 [phi:main::@14->main::@5]
-  b5_from_b14:
-  //SEG152 [22] phi (byte) main::cur_pos#24 = (byte) main::cur_pos#11 [phi:main::@14->main::@5#0] -- register_copy 
-    jmp b5
-  //SEG153 [67] phi from main::@33 to main::@44 [phi:main::@33->main::@44]
-  b44_from_b33:
-    jmp b44
-  //SEG154 main::@44
-  b44:
-  //SEG155 [42] phi from main::@44 to main::@9 [phi:main::@44->main::@9]
-  b9_from_b44:
-  //SEG156 [42] phi (byte) main::cur_pos#11 = (byte) main::cur_pos#18 [phi:main::@44->main::@9#0] -- register_copy 
-    jmp b9
-  //SEG157 [68] phi from main::@32 to main::@43 [phi:main::@32->main::@43]
-  b43_from_b32:
-    jmp b43
-  //SEG158 main::@43
-  b43:
-  //SEG159 [37] phi from main::@43 to main::@8 [phi:main::@43->main::@8]
-  b8_from_b43:
-  //SEG160 [37] phi (byte) main::cur_pos#18 = (byte) main::cur_pos#20 [phi:main::@43->main::@8#0] -- register_copy 
+    bne b10_from_b12
+  //SEG151 [22] phi from main::@12 to main::@4 [phi:main::@12->main::@4]
+  b4_from_b12:
+  //SEG152 [22] phi (byte) main::cur_pos#24 = (byte) main::cur_pos#11 [phi:main::@12->main::@4#0] -- register_copy 
+    jmp b4
+  //SEG153 [67] phi from main::@23 to main::@30 [phi:main::@23->main::@30]
+  b30_from_b23:
+    jmp b30
+  //SEG154 main::@30
+  b30:
+  //SEG155 [42] phi from main::@30 to main::@8 [phi:main::@30->main::@8]
+  b8_from_b30:
+  //SEG156 [42] phi (byte) main::cur_pos#11 = (byte) main::cur_pos#18 [phi:main::@30->main::@8#0] -- register_copy 
     jmp b8
-  //SEG161 [69] phi from main::@31 to main::@42 [phi:main::@31->main::@42]
-  b42_from_b31:
-    jmp b42
-  //SEG162 main::@42
-  b42:
-  //SEG163 [32] phi from main::@42 to main::@7 [phi:main::@42->main::@7]
-  b7_from_b42:
-  //SEG164 [32] phi (byte) main::cur_pos#20 = (byte) main::cur_pos#22 [phi:main::@42->main::@7#0] -- register_copy 
+  //SEG157 [68] phi from main::@22 to main::@29 [phi:main::@22->main::@29]
+  b29_from_b22:
+    jmp b29
+  //SEG158 main::@29
+  b29:
+  //SEG159 [37] phi from main::@29 to main::@7 [phi:main::@29->main::@7]
+  b7_from_b29:
+  //SEG160 [37] phi (byte) main::cur_pos#18 = (byte) main::cur_pos#20 [phi:main::@29->main::@7#0] -- register_copy 
     jmp b7
-  //SEG165 [70] phi from main::@30 to main::@41 [phi:main::@30->main::@41]
-  b41_from_b30:
-    jmp b41
-  //SEG166 main::@41
-  b41:
-  //SEG167 [27] phi from main::@41 to main::@6 [phi:main::@41->main::@6]
-  b6_from_b41:
-  //SEG168 [27] phi (byte) main::cur_pos#22 = (byte) main::cur_pos#24 [phi:main::@41->main::@6#0] -- register_copy 
+  //SEG161 [69] phi from main::@21 to main::@28 [phi:main::@21->main::@28]
+  b28_from_b21:
+    jmp b28
+  //SEG162 main::@28
+  b28:
+  //SEG163 [32] phi from main::@28 to main::@6 [phi:main::@28->main::@6]
+  b6_from_b28:
+  //SEG164 [32] phi (byte) main::cur_pos#20 = (byte) main::cur_pos#22 [phi:main::@28->main::@6#0] -- register_copy 
     jmp b6
+  //SEG165 [70] phi from main::@20 to main::@27 [phi:main::@20->main::@27]
+  b27_from_b20:
+    jmp b27
+  //SEG166 main::@27
+  b27:
+  //SEG167 [27] phi from main::@27 to main::@5 [phi:main::@27->main::@5]
+  b5_from_b27:
+  //SEG168 [27] phi (byte) main::cur_pos#22 = (byte) main::cur_pos#24 [phi:main::@27->main::@5#0] -- register_copy 
+    jmp b5
     str: .text "f1@"
     str1: .text "f3@"
     str2: .text "f5@"
@@ -4360,12 +4391,12 @@ mul8u: {
   //SEG238 [107] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG239 [108] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG239 [108] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG240 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG240 mul8u::@3
+  b3:
   //SEG241 [109] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -4374,13 +4405,13 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG242 [110] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG243 [110] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG244 mul8u::@8
-  b8:
+  //SEG242 [110] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG243 [110] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG244 mul8u::@4
+  b4:
   //SEG245 [111] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -4388,11 +4419,11 @@ mul8u: {
   //SEG246 [112] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG247 [104] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG248 [104] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG249 [104] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG250 [104] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG247 [104] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG248 [104] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG249 [104] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG250 [104] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG251 keyboard_key_pressed
@@ -4416,9 +4447,9 @@ keyboard_key_pressed: {
   //SEG255 [117] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG256 [118] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-    jmp b2
-  //SEG257 keyboard_key_pressed::@2
-  b2:
+    jmp b1
+  //SEG257 keyboard_key_pressed::@1
+  b1:
   //SEG258 [119] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   //SEG259 [120] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuyy 
     and keyboard_matrix_col_bitmask,y
@@ -4515,38 +4546,38 @@ print_str_at: {
   keyboard_char_keycodes: .byte KEY_AT, KEY_A, KEY_B, KEY_C, KEY_D, KEY_E, KEY_F, KEY_G, KEY_H, KEY_I, KEY_J, KEY_K, KEY_L, KEY_M, KEY_N, KEY_O, KEY_P, KEY_Q, KEY_R, KEY_S, KEY_T, KEY_U, KEY_V, KEY_W, KEY_X, KEY_Y, KEY_Z, $3f, KEY_POUND, $3f, KEY_ARROW_UP, KEY_ARROW_LEFT, KEY_SPACE, $3f, $3f, $3f, $3f, $3f, $3f, $3f, $3f, $3f, KEY_ASTERISK, KEY_PLUS, KEY_COMMA, KEY_MINUS, KEY_DOT, KEY_SLASH, KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_COLON, KEY_SEMICOLON, $3f, KEY_EQUALS, $3f, $3f
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b19
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b25
-Removing instruction jmp b26
-Removing instruction jmp b27
-Removing instruction jmp b3
-Removing instruction jmp b29
-Removing instruction jmp b5
-Removing instruction jmp b30
-Removing instruction jmp b6
-Removing instruction jmp b31
-Removing instruction jmp b7
-Removing instruction jmp b32
-Removing instruction jmp b8
-Removing instruction jmp b33
-Removing instruction jmp b9
-Removing instruction jmp b34
-Removing instruction jmp b23
-Removing instruction jmp b11
-Removing instruction jmp b12
-Removing instruction jmp b35
-Removing instruction jmp b15
-Removing instruction jmp b36
-Removing instruction jmp b13
 Removing instruction jmp b16
+Removing instruction jmp b17
+Removing instruction jmp b18
+Removing instruction jmp b3
+Removing instruction jmp b19
+Removing instruction jmp b4
+Removing instruction jmp b20
+Removing instruction jmp b5
+Removing instruction jmp b21
+Removing instruction jmp b6
+Removing instruction jmp b22
+Removing instruction jmp b7
+Removing instruction jmp b23
+Removing instruction jmp b8
+Removing instruction jmp b24
+Removing instruction jmp b15
+Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp b25
+Removing instruction jmp b13
+Removing instruction jmp b26
+Removing instruction jmp b11
 Removing instruction jmp b14
-Removing instruction jmp b44
-Removing instruction jmp b43
-Removing instruction jmp b42
-Removing instruction jmp b41
+Removing instruction jmp b12
+Removing instruction jmp b30
+Removing instruction jmp b29
+Removing instruction jmp b28
+Removing instruction jmp b27
 Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp b9
@@ -4559,9 +4590,9 @@ Removing instruction jmp b8
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
@@ -4574,87 +4605,87 @@ Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Replacing label b3_from_b29 with b3
-Replacing label b41_from_b30 with b41
-Replacing label b42_from_b31 with b42
-Replacing label b43_from_b32 with b43
-Replacing label b44_from_b33 with b44
-Replacing label b12_from_b14 with b12
+Replacing label b3_from_b19 with b3
+Replacing label b27_from_b20 with b27
+Replacing label b28_from_b21 with b28
+Replacing label b29_from_b22 with b29
+Replacing label b30_from_b23 with b30
+Replacing label b10_from_b12 with b10
 Replacing label b1_from_plot_chargen with b1
 Replacing label b4_from_b5 with b4
 Replacing label b3_from_b7 with b3
-Replacing label b8_from_b2 with b8
+Replacing label b4_from_b2 with b4
 Replacing label b1_from_b2 with b1
-Removing instruction b19_from_bbegin:
-Removing instruction b19:
-Removing instruction main_from_b19:
-Removing instruction bend_from_b19:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b1:
 Removing instruction b2_from_b1:
 Removing instruction print_str_at_from_b2:
-Removing instruction b25_from_b2:
-Removing instruction print_str_at_from_b25:
-Removing instruction b26_from_b25:
-Removing instruction print_str_at_from_b26:
-Removing instruction b27_from_b26:
-Removing instruction print_str_at_from_b27:
-Removing instruction b3_from_b29:
+Removing instruction b16_from_b2:
+Removing instruction print_str_at_from_b16:
+Removing instruction b17_from_b16:
+Removing instruction print_str_at_from_b17:
+Removing instruction b18_from_b17:
+Removing instruction print_str_at_from_b18:
+Removing instruction b3_from_b19:
+Removing instruction keyboard_key_pressed_from_b4:
 Removing instruction keyboard_key_pressed_from_b5:
 Removing instruction keyboard_key_pressed_from_b6:
 Removing instruction keyboard_key_pressed_from_b7:
 Removing instruction keyboard_key_pressed_from_b8:
-Removing instruction keyboard_key_pressed_from_b9:
-Removing instruction b23_from_b34:
-Removing instruction b11_from_b23:
-Removing instruction b12_from_b11:
-Removing instruction b12_from_b14:
-Removing instruction b13_from_b36:
-Removing instruction b44_from_b33:
-Removing instruction b9_from_b44:
-Removing instruction b43_from_b32:
-Removing instruction b8_from_b43:
-Removing instruction b42_from_b31:
-Removing instruction b7_from_b42:
-Removing instruction b41_from_b30:
-Removing instruction b6_from_b41:
+Removing instruction b15_from_b24:
+Removing instruction b9_from_b15:
+Removing instruction b10_from_b9:
+Removing instruction b10_from_b12:
+Removing instruction b11_from_b26:
+Removing instruction b30_from_b23:
+Removing instruction b8_from_b30:
+Removing instruction b29_from_b22:
+Removing instruction b7_from_b29:
+Removing instruction b28_from_b21:
+Removing instruction b6_from_b28:
+Removing instruction b27_from_b20:
+Removing instruction b5_from_b27:
 Removing instruction b1_from_plot_chargen:
 Removing instruction b1_from_b2:
 Removing instruction b3_from_b7:
 Removing instruction b4_from_b5:
 Removing instruction b6_from_b4:
 Removing instruction b5_from_b6:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction b1_from_print_str_at:
 Removing instruction b1_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
 Removing instruction b2:
-Removing instruction b25:
-Removing instruction b26:
-Removing instruction b27:
-Removing instruction b3_from_b27:
-Removing instruction plot_chargen_from_b3:
-Removing instruction b29:
-Removing instruction b5_from_b29:
-Removing instruction b30:
-Removing instruction b6_from_b30:
-Removing instruction b31:
-Removing instruction b7_from_b31:
-Removing instruction b32:
-Removing instruction b8_from_b32:
-Removing instruction b33:
-Removing instruction b9_from_b33:
-Removing instruction b34:
-Removing instruction b23:
-Removing instruction b35:
-Removing instruction b15:
-Removing instruction keyboard_key_pressed_from_b15:
-Removing instruction b36:
 Removing instruction b16:
-Removing instruction plot_chargen_from_b16:
-Removing instruction b5_from_b14:
+Removing instruction b17:
+Removing instruction b18:
+Removing instruction b3_from_b18:
+Removing instruction plot_chargen_from_b3:
+Removing instruction b19:
+Removing instruction b4_from_b19:
+Removing instruction b20:
+Removing instruction b5_from_b20:
+Removing instruction b21:
+Removing instruction b6_from_b21:
+Removing instruction b22:
+Removing instruction b7_from_b22:
+Removing instruction b23:
+Removing instruction b8_from_b23:
+Removing instruction b24:
+Removing instruction b15:
+Removing instruction b25:
+Removing instruction b13:
+Removing instruction keyboard_key_pressed_from_b13:
+Removing instruction b26:
+Removing instruction b14:
+Removing instruction plot_chargen_from_b14:
+Removing instruction b4_from_b12:
 Removing instruction b2:
 Removing instruction mul8u_from_b1:
 Removing instruction b9:
@@ -4666,9 +4697,9 @@ Removing instruction b8:
 Removing instruction breturn:
 Removing instruction b1_from_mul8u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
-Removing instruction b2:
+Removing instruction b3:
+Removing instruction b1_from_b4:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction breturn:
@@ -4677,35 +4708,35 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b6 in beq b41
-Skipping double jump to b7 in beq b42
-Skipping double jump to b8 in beq b43
-Skipping double jump to b9 in beq b44
+Skipping double jump to b5 in beq b27
+Skipping double jump to b6 in beq b28
+Skipping double jump to b7 in beq b29
+Skipping double jump to b8 in beq b30
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b11_from_b34 to b2
-Relabelling long label b13_from_b35 to b4
+Relabelling long label b9_from_b24 to b2
+Relabelling long label b11_from_b25 to b13
 Relabelling long label b5_from_b4 to b2
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction jmp b1
 Removing instruction jmp b3
-Removing instruction jmp b12
+Removing instruction jmp b10
 Removing instruction jmp b3
 Removing instruction jmp b4
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
-Removing instruction b44:
-Removing instruction b43:
-Removing instruction b42:
-Removing instruction b41:
+Removing instruction b30:
+Removing instruction b29:
+Removing instruction b28:
+Removing instruction b27:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing unreachable instruction jmp b9
 Removing unreachable instruction jmp b8
 Removing unreachable instruction jmp b7
 Removing unreachable instruction jmp b6
+Removing unreachable instruction jmp b5
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @19
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -4930,7 +4961,7 @@ FINAL SYMBOL TABLE
 (byte) keyboard_get_keycode::return#2 reg byte a 202.0
 (byte()) keyboard_key_pressed((byte) keyboard_key_pressed::key)
 (byte~) keyboard_key_pressed::$2 reg byte a 4.0
-(label) keyboard_key_pressed::@2
+(label) keyboard_key_pressed::@1
 (label) keyboard_key_pressed::@return
 (byte) keyboard_key_pressed::colidx
 (byte) keyboard_key_pressed::colidx#0 reg byte y 0.6666666666666666
@@ -4968,30 +4999,30 @@ FINAL SYMBOL TABLE
 (byte~) main::$24 reg byte a 22.0
 (byte~) main::$27 reg byte a 22.0
 (label) main::@1
+(label) main::@10
 (label) main::@11
 (label) main::@12
 (label) main::@13
 (label) main::@14
 (label) main::@15
 (label) main::@16
+(label) main::@17
+(label) main::@18
+(label) main::@19
 (label) main::@2
+(label) main::@20
+(label) main::@21
+(label) main::@22
 (label) main::@23
+(label) main::@24
 (label) main::@25
 (label) main::@26
 (label) main::@27
+(label) main::@28
 (label) main::@29
 (label) main::@3
 (label) main::@30
-(label) main::@31
-(label) main::@32
-(label) main::@33
-(label) main::@34
-(label) main::@35
-(label) main::@36
-(label) main::@41
-(label) main::@42
-(label) main::@43
-(label) main::@44
+(label) main::@4
 (label) main::@5
 (label) main::@6
 (label) main::@7
@@ -5027,8 +5058,8 @@ FINAL SYMBOL TABLE
 (byte~) mul8u::$1 reg byte a 2002.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 1001.0
@@ -5222,11 +5253,11 @@ Score: 626893
   .const KEY_Q = $3e
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @19 [phi:@begin->@19]
-//SEG5 @19
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @19 to main [phi:@19->main]
-//SEG8 [3] phi from @19 to @end [phi:@19->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -5279,57 +5310,57 @@ main: {
     lda #>str
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG25 [11] phi from main::@2 to main::@25 [phi:main::@2->main::@25]
-  //SEG26 main::@25
+  //SEG25 [11] phi from main::@2 to main::@16 [phi:main::@2->main::@16]
+  //SEG26 main::@16
   //SEG27 [12] call print_str_at 
-  //SEG28 [127] phi from main::@25 to print_str_at [phi:main::@25->print_str_at]
-  //SEG29 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@25->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG28 [127] phi from main::@16 to print_str_at [phi:main::@16->print_str_at]
+  //SEG29 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@16->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+1+$a
     sta print_str_at.at
     lda #>SCREEN+1+$a
     sta print_str_at.at+1
-  //SEG30 [127] phi (byte*) print_str_at::str#7 = (const string) main::str1 [phi:main::@25->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG30 [127] phi (byte*) print_str_at::str#7 = (const string) main::str1 [phi:main::@16->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str_at.str
     lda #>str1
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG31 [13] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
-  //SEG32 main::@26
+  //SEG31 [13] phi from main::@16 to main::@17 [phi:main::@16->main::@17]
+  //SEG32 main::@17
   //SEG33 [14] call print_str_at 
-  //SEG34 [127] phi from main::@26 to print_str_at [phi:main::@26->print_str_at]
-  //SEG35 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:main::@26->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG34 [127] phi from main::@17 to print_str_at [phi:main::@17->print_str_at]
+  //SEG35 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $14 [phi:main::@17->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+1+$14
     sta print_str_at.at
     lda #>SCREEN+1+$14
     sta print_str_at.at+1
-  //SEG36 [127] phi (byte*) print_str_at::str#7 = (const string) main::str2 [phi:main::@26->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG36 [127] phi (byte*) print_str_at::str#7 = (const string) main::str2 [phi:main::@17->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str_at.str
     lda #>str2
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG37 [15] phi from main::@26 to main::@27 [phi:main::@26->main::@27]
-  //SEG38 main::@27
+  //SEG37 [15] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
+  //SEG38 main::@18
   //SEG39 [16] call print_str_at 
-  //SEG40 [127] phi from main::@27 to print_str_at [phi:main::@27->print_str_at]
-  //SEG41 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $1e [phi:main::@27->print_str_at#0] -- pbuz1=pbuc1 
+  //SEG40 [127] phi from main::@18 to print_str_at [phi:main::@18->print_str_at]
+  //SEG41 [127] phi (byte*) print_str_at::at#7 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) $1e [phi:main::@18->print_str_at#0] -- pbuz1=pbuc1 
     lda #<SCREEN+1+$1e
     sta print_str_at.at
     lda #>SCREEN+1+$1e
     sta print_str_at.at+1
-  //SEG42 [127] phi (byte*) print_str_at::str#7 = (const string) main::str3 [phi:main::@27->print_str_at#1] -- pbuz1=pbuc1 
+  //SEG42 [127] phi (byte*) print_str_at::str#7 = (const string) main::str3 [phi:main::@18->print_str_at#1] -- pbuz1=pbuc1 
     lda #<str3
     sta print_str_at.str
     lda #>str3
     sta print_str_at.str+1
     jsr print_str_at
-  //SEG43 [17] phi from main::@27 to main::@3 [phi:main::@27->main::@3]
-  //SEG44 [17] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@27->main::@3#0] -- vbuz1=vbuc1 
+  //SEG43 [17] phi from main::@18 to main::@3 [phi:main::@18->main::@3]
+  //SEG44 [17] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG45 [17] phi from main::@29 to main::@3 [phi:main::@29->main::@3]
-  //SEG46 [17] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@29->main::@3#0] -- register_copy 
+  //SEG45 [17] phi from main::@19 to main::@3 [phi:main::@19->main::@3]
+  //SEG46 [17] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@19->main::@3#0] -- register_copy 
   //SEG47 main::@3
   b3:
   //SEG48 [18] (byte) plot_chargen::pos#0 ← (byte) main::i#2 -- vbuyy=vbuz1 
@@ -5342,154 +5373,154 @@ main: {
   //SEG53 [71] phi (byte) plot_chargen::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) $20 [phi:main::@3->plot_chargen#2] -- vbuaa=vbuc1 
     lda #$20
     jsr plot_chargen
-  //SEG54 main::@29
+  //SEG54 main::@19
   //SEG55 [20] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG56 [21] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp i
     bne b3
-  //SEG57 [22] phi from main::@29 to main::@5 [phi:main::@29->main::@5]
-  //SEG58 [22] phi (byte) main::cur_pos#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@29->main::@5#0] -- vbuz1=vbuc1 
+  //SEG57 [22] phi from main::@19 to main::@4 [phi:main::@19->main::@4]
+  //SEG58 [22] phi (byte) main::cur_pos#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@19->main::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta cur_pos
-  //SEG59 main::@5
-  b5:
+  //SEG59 main::@4
+  b4:
   //SEG60 [23] call keyboard_key_pressed 
-  //SEG61 [113] phi from main::@5 to keyboard_key_pressed [phi:main::@5->keyboard_key_pressed]
-  //SEG62 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F1#0 [phi:main::@5->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG61 [113] phi from main::@4 to keyboard_key_pressed [phi:main::@4->keyboard_key_pressed]
+  //SEG62 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F1#0 [phi:main::@4->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_F1
     jsr keyboard_key_pressed
   //SEG63 [24] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  //SEG64 main::@30
+  //SEG64 main::@20
   //SEG65 [25] (byte~) main::$15 ← (byte) keyboard_key_pressed::return#2
-  //SEG66 [26] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@41 -- vbuaa_eq_0_then_la1 
+  //SEG66 [26] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@27 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b6
-  //SEG67 [27] phi from main::@30 to main::@6 [phi:main::@30->main::@6]
-  //SEG68 [27] phi (byte) main::cur_pos#22 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@30->main::@6#0] -- vbuz1=vbuc1 
+    beq b5
+  //SEG67 [27] phi from main::@20 to main::@5 [phi:main::@20->main::@5]
+  //SEG68 [27] phi (byte) main::cur_pos#22 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@20->main::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta cur_pos
-  //SEG69 main::@6
-  b6:
+  //SEG69 main::@5
+  b5:
   //SEG70 [28] call keyboard_key_pressed 
-  //SEG71 [113] phi from main::@6 to keyboard_key_pressed [phi:main::@6->keyboard_key_pressed]
-  //SEG72 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F3#0 [phi:main::@6->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG71 [113] phi from main::@5 to keyboard_key_pressed [phi:main::@5->keyboard_key_pressed]
+  //SEG72 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F3#0 [phi:main::@5->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_F3
     jsr keyboard_key_pressed
   //SEG73 [29] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-  //SEG74 main::@31
+  //SEG74 main::@21
   //SEG75 [30] (byte~) main::$18 ← (byte) keyboard_key_pressed::return#10
-  //SEG76 [31] if((byte~) main::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@42 -- vbuaa_eq_0_then_la1 
+  //SEG76 [31] if((byte~) main::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@28 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b7
-  //SEG77 [32] phi from main::@31 to main::@7 [phi:main::@31->main::@7]
-  //SEG78 [32] phi (byte) main::cur_pos#20 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@31->main::@7#0] -- vbuz1=vbuc1 
+    beq b6
+  //SEG77 [32] phi from main::@21 to main::@6 [phi:main::@21->main::@6]
+  //SEG78 [32] phi (byte) main::cur_pos#20 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@21->main::@6#0] -- vbuz1=vbuc1 
     lda #1
     sta cur_pos
-  //SEG79 main::@7
-  b7:
+  //SEG79 main::@6
+  b6:
   //SEG80 [33] call keyboard_key_pressed 
-  //SEG81 [113] phi from main::@7 to keyboard_key_pressed [phi:main::@7->keyboard_key_pressed]
-  //SEG82 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F5#0 [phi:main::@7->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG81 [113] phi from main::@6 to keyboard_key_pressed [phi:main::@6->keyboard_key_pressed]
+  //SEG82 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F5#0 [phi:main::@6->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_F5
     jsr keyboard_key_pressed
   //SEG83 [34] (byte) keyboard_key_pressed::return#11 ← (byte) keyboard_key_pressed::return#0
-  //SEG84 main::@32
+  //SEG84 main::@22
   //SEG85 [35] (byte~) main::$21 ← (byte) keyboard_key_pressed::return#11
-  //SEG86 [36] if((byte~) main::$21==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@43 -- vbuaa_eq_0_then_la1 
+  //SEG86 [36] if((byte~) main::$21==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@29 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG87 [37] phi from main::@32 to main::@8 [phi:main::@32->main::@8]
-  //SEG88 [37] phi (byte) main::cur_pos#18 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@32->main::@8#0] -- vbuz1=vbuc1 
+    beq b7
+  //SEG87 [37] phi from main::@22 to main::@7 [phi:main::@22->main::@7]
+  //SEG88 [37] phi (byte) main::cur_pos#18 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:main::@22->main::@7#0] -- vbuz1=vbuc1 
     lda #2
     sta cur_pos
-  //SEG89 main::@8
-  b8:
+  //SEG89 main::@7
+  b7:
   //SEG90 [38] call keyboard_key_pressed 
-  //SEG91 [113] phi from main::@8 to keyboard_key_pressed [phi:main::@8->keyboard_key_pressed]
-  //SEG92 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F7#0 [phi:main::@8->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG91 [113] phi from main::@7 to keyboard_key_pressed [phi:main::@7->keyboard_key_pressed]
+  //SEG92 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_F7#0 [phi:main::@7->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_F7
     jsr keyboard_key_pressed
   //SEG93 [39] (byte) keyboard_key_pressed::return#12 ← (byte) keyboard_key_pressed::return#0
-  //SEG94 main::@33
+  //SEG94 main::@23
   //SEG95 [40] (byte~) main::$24 ← (byte) keyboard_key_pressed::return#12
-  //SEG96 [41] if((byte~) main::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@44 -- vbuaa_eq_0_then_la1 
+  //SEG96 [41] if((byte~) main::$24==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@30 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b9
-  //SEG97 [42] phi from main::@33 to main::@9 [phi:main::@33->main::@9]
-  //SEG98 [42] phi (byte) main::cur_pos#11 = (byte/signed byte/word/signed word/dword/signed dword) 3 [phi:main::@33->main::@9#0] -- vbuz1=vbuc1 
+    beq b8
+  //SEG97 [42] phi from main::@23 to main::@8 [phi:main::@23->main::@8]
+  //SEG98 [42] phi (byte) main::cur_pos#11 = (byte/signed byte/word/signed word/dword/signed dword) 3 [phi:main::@23->main::@8#0] -- vbuz1=vbuc1 
     lda #3
     sta cur_pos
-  //SEG99 main::@9
-  b9:
+  //SEG99 main::@8
+  b8:
   //SEG100 [43] call keyboard_key_pressed 
-  //SEG101 [113] phi from main::@9 to keyboard_key_pressed [phi:main::@9->keyboard_key_pressed]
-  //SEG102 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_LSHIFT#0 [phi:main::@9->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG101 [113] phi from main::@8 to keyboard_key_pressed [phi:main::@8->keyboard_key_pressed]
+  //SEG102 [113] phi (byte) keyboard_key_pressed::key#6 = (const byte) KEY_LSHIFT#0 [phi:main::@8->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_LSHIFT
     jsr keyboard_key_pressed
   //SEG103 [44] (byte) keyboard_key_pressed::return#13 ← (byte) keyboard_key_pressed::return#0
-  //SEG104 main::@34
+  //SEG104 main::@24
   //SEG105 [45] (byte~) main::$27 ← (byte) keyboard_key_pressed::return#13
-  //SEG106 [46] if((byte~) main::$27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@11 -- vbuaa_neq_0_then_la1 
+  //SEG106 [46] if((byte~) main::$27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@9 -- vbuaa_neq_0_then_la1 
     cmp #0
     bne b2
-  //SEG107 [47] phi from main::@34 to main::@23 [phi:main::@34->main::@23]
-  //SEG108 main::@23
-  //SEG109 [48] phi from main::@23 to main::@11 [phi:main::@23->main::@11]
-  //SEG110 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@23->main::@11#0] -- vbuz1=vbuc1 
+  //SEG107 [47] phi from main::@24 to main::@15 [phi:main::@24->main::@15]
+  //SEG108 main::@15
+  //SEG109 [48] phi from main::@15 to main::@9 [phi:main::@15->main::@9]
+  //SEG110 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@15->main::@9#0] -- vbuz1=vbuc1 
     lda #0
     sta shift
-    jmp b11
-  //SEG111 [48] phi from main::@34 to main::@11 [phi:main::@34->main::@11]
+    jmp b9
+  //SEG111 [48] phi from main::@24 to main::@9 [phi:main::@24->main::@9]
   b2:
-  //SEG112 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@34->main::@11#0] -- vbuz1=vbuc1 
+  //SEG112 [48] phi (byte) main::shift#9 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@24->main::@9#0] -- vbuz1=vbuc1 
     lda #1
     sta shift
-  //SEG113 main::@11
-  b11:
-  //SEG114 [49] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  //SEG115 [49] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@11->main::@12#0] -- vbuz1=vbuc1 
+  //SEG113 main::@9
+  b9:
+  //SEG114 [49] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  //SEG115 [49] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@9->main::@10#0] -- vbuz1=vbuc1 
     lda #0
     sta ch
   // Check for key presses - and plot char if found
-  //SEG116 [49] phi from main::@14 to main::@12 [phi:main::@14->main::@12]
-  //SEG117 [49] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@14->main::@12#0] -- register_copy 
-  //SEG118 main::@12
-  b12:
+  //SEG116 [49] phi from main::@12 to main::@10 [phi:main::@12->main::@10]
+  //SEG117 [49] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@12->main::@10#0] -- register_copy 
+  //SEG118 main::@10
+  b10:
   //SEG119 [50] (byte) keyboard_get_keycode::ch#0 ← (byte) main::ch#2 -- vbuxx=vbuz1 
     ldx ch
   //SEG120 [51] call keyboard_get_keycode 
     jsr keyboard_get_keycode
   //SEG121 [52] (byte) keyboard_get_keycode::return#2 ← (byte) keyboard_get_keycode::return#0
-  //SEG122 main::@35
+  //SEG122 main::@25
   //SEG123 [53] (byte) main::key#0 ← (byte) keyboard_get_keycode::return#2
-  //SEG124 [54] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@13 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG124 [54] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@11 -- vbuaa_eq_vbuc1_then_la1 
     cmp #$3f
-    beq b4
-  //SEG125 main::@15
+    beq b13
+  //SEG125 main::@13
   //SEG126 [55] (byte) keyboard_key_pressed::key#5 ← (byte) main::key#0 -- vbuxx=vbuaa 
     tax
   //SEG127 [56] call keyboard_key_pressed 
-  //SEG128 [113] phi from main::@15 to keyboard_key_pressed [phi:main::@15->keyboard_key_pressed]
-  //SEG129 [113] phi (byte) keyboard_key_pressed::key#6 = (byte) keyboard_key_pressed::key#5 [phi:main::@15->keyboard_key_pressed#0] -- register_copy 
+  //SEG128 [113] phi from main::@13 to keyboard_key_pressed [phi:main::@13->keyboard_key_pressed]
+  //SEG129 [113] phi (byte) keyboard_key_pressed::key#6 = (byte) keyboard_key_pressed::key#5 [phi:main::@13->keyboard_key_pressed#0] -- register_copy 
     jsr keyboard_key_pressed
   //SEG130 [57] (byte) keyboard_key_pressed::return#14 ← (byte) keyboard_key_pressed::return#0
-  //SEG131 main::@36
+  //SEG131 main::@26
   //SEG132 [58] (byte) main::pressed#1 ← (byte) keyboard_key_pressed::return#14
-  //SEG133 [59] phi from main::@36 to main::@13 [phi:main::@36->main::@13]
-  //SEG134 [59] phi (byte) main::pressed#2 = (byte) main::pressed#1 [phi:main::@36->main::@13#0] -- register_copy 
-    jmp b13
-  //SEG135 [59] phi from main::@35 to main::@13 [phi:main::@35->main::@13]
-  b4:
-  //SEG136 [59] phi (byte) main::pressed#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@35->main::@13#0] -- vbuaa=vbuc1 
-    lda #0
-  //SEG137 main::@13
+  //SEG133 [59] phi from main::@26 to main::@11 [phi:main::@26->main::@11]
+  //SEG134 [59] phi (byte) main::pressed#2 = (byte) main::pressed#1 [phi:main::@26->main::@11#0] -- register_copy 
+    jmp b11
+  //SEG135 [59] phi from main::@25 to main::@11 [phi:main::@25->main::@11]
   b13:
-  //SEG138 [60] if((byte) main::pressed#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@14 -- vbuaa_eq_0_then_la1 
+  //SEG136 [59] phi (byte) main::pressed#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@25->main::@11#0] -- vbuaa=vbuc1 
+    lda #0
+  //SEG137 main::@11
+  b11:
+  //SEG138 [60] if((byte) main::pressed#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b14
-  //SEG139 main::@16
+    beq b12
+  //SEG139 main::@14
   //SEG140 [61] (byte) plot_chargen::pos#1 ← (byte) main::cur_pos#11 -- vbuyy=vbuz1 
     ldy cur_pos
   //SEG141 [62] (byte) plot_chargen::ch#1 ← (byte) main::ch#2 -- vbuaa=vbuz1 
@@ -5497,38 +5528,38 @@ main: {
   //SEG142 [63] (byte) plot_chargen::shift#1 ← (byte) main::shift#9 -- vbuxx=vbuz1 
     ldx shift
   //SEG143 [64] call plot_chargen 
-  //SEG144 [71] phi from main::@16 to plot_chargen [phi:main::@16->plot_chargen]
-  //SEG145 [71] phi (byte) plot_chargen::pos#2 = (byte) plot_chargen::pos#1 [phi:main::@16->plot_chargen#0] -- register_copy 
-  //SEG146 [71] phi (byte) plot_chargen::shift#2 = (byte) plot_chargen::shift#1 [phi:main::@16->plot_chargen#1] -- register_copy 
-  //SEG147 [71] phi (byte) plot_chargen::ch#2 = (byte) plot_chargen::ch#1 [phi:main::@16->plot_chargen#2] -- register_copy 
+  //SEG144 [71] phi from main::@14 to plot_chargen [phi:main::@14->plot_chargen]
+  //SEG145 [71] phi (byte) plot_chargen::pos#2 = (byte) plot_chargen::pos#1 [phi:main::@14->plot_chargen#0] -- register_copy 
+  //SEG146 [71] phi (byte) plot_chargen::shift#2 = (byte) plot_chargen::shift#1 [phi:main::@14->plot_chargen#1] -- register_copy 
+  //SEG147 [71] phi (byte) plot_chargen::ch#2 = (byte) plot_chargen::ch#1 [phi:main::@14->plot_chargen#2] -- register_copy 
     jsr plot_chargen
-  //SEG148 main::@14
-  b14:
+  //SEG148 main::@12
+  b12:
   //SEG149 [65] (byte) main::ch#1 ← ++ (byte) main::ch#2 -- vbuz1=_inc_vbuz1 
     inc ch
-  //SEG150 [66] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@12 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG150 [66] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
     lda #$40
     cmp ch
-    bne b12
-  //SEG151 [22] phi from main::@14 to main::@5 [phi:main::@14->main::@5]
-  //SEG152 [22] phi (byte) main::cur_pos#24 = (byte) main::cur_pos#11 [phi:main::@14->main::@5#0] -- register_copy 
-    jmp b5
-  //SEG153 [67] phi from main::@33 to main::@44 [phi:main::@33->main::@44]
-  //SEG154 main::@44
-  //SEG155 [42] phi from main::@44 to main::@9 [phi:main::@44->main::@9]
-  //SEG156 [42] phi (byte) main::cur_pos#11 = (byte) main::cur_pos#18 [phi:main::@44->main::@9#0] -- register_copy 
-  //SEG157 [68] phi from main::@32 to main::@43 [phi:main::@32->main::@43]
-  //SEG158 main::@43
-  //SEG159 [37] phi from main::@43 to main::@8 [phi:main::@43->main::@8]
-  //SEG160 [37] phi (byte) main::cur_pos#18 = (byte) main::cur_pos#20 [phi:main::@43->main::@8#0] -- register_copy 
-  //SEG161 [69] phi from main::@31 to main::@42 [phi:main::@31->main::@42]
-  //SEG162 main::@42
-  //SEG163 [32] phi from main::@42 to main::@7 [phi:main::@42->main::@7]
-  //SEG164 [32] phi (byte) main::cur_pos#20 = (byte) main::cur_pos#22 [phi:main::@42->main::@7#0] -- register_copy 
-  //SEG165 [70] phi from main::@30 to main::@41 [phi:main::@30->main::@41]
-  //SEG166 main::@41
-  //SEG167 [27] phi from main::@41 to main::@6 [phi:main::@41->main::@6]
-  //SEG168 [27] phi (byte) main::cur_pos#22 = (byte) main::cur_pos#24 [phi:main::@41->main::@6#0] -- register_copy 
+    bne b10
+  //SEG151 [22] phi from main::@12 to main::@4 [phi:main::@12->main::@4]
+  //SEG152 [22] phi (byte) main::cur_pos#24 = (byte) main::cur_pos#11 [phi:main::@12->main::@4#0] -- register_copy 
+    jmp b4
+  //SEG153 [67] phi from main::@23 to main::@30 [phi:main::@23->main::@30]
+  //SEG154 main::@30
+  //SEG155 [42] phi from main::@30 to main::@8 [phi:main::@30->main::@8]
+  //SEG156 [42] phi (byte) main::cur_pos#11 = (byte) main::cur_pos#18 [phi:main::@30->main::@8#0] -- register_copy 
+  //SEG157 [68] phi from main::@22 to main::@29 [phi:main::@22->main::@29]
+  //SEG158 main::@29
+  //SEG159 [37] phi from main::@29 to main::@7 [phi:main::@29->main::@7]
+  //SEG160 [37] phi (byte) main::cur_pos#18 = (byte) main::cur_pos#20 [phi:main::@29->main::@7#0] -- register_copy 
+  //SEG161 [69] phi from main::@21 to main::@28 [phi:main::@21->main::@28]
+  //SEG162 main::@28
+  //SEG163 [32] phi from main::@28 to main::@6 [phi:main::@28->main::@6]
+  //SEG164 [32] phi (byte) main::cur_pos#20 = (byte) main::cur_pos#22 [phi:main::@28->main::@6#0] -- register_copy 
+  //SEG165 [70] phi from main::@20 to main::@27 [phi:main::@20->main::@27]
+  //SEG166 main::@27
+  //SEG167 [27] phi from main::@27 to main::@5 [phi:main::@27->main::@5]
+  //SEG168 [27] phi (byte) main::cur_pos#22 = (byte) main::cur_pos#24 [phi:main::@27->main::@5#0] -- register_copy 
     str: .text "f1@"
     str1: .text "f3@"
     str2: .text "f5@"
@@ -5716,10 +5747,10 @@ mul8u: {
   //SEG238 [107] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG239 [108] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG239 [108] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG240 mul8u::@6
+    beq b4
+  //SEG240 mul8u::@3
   //SEG241 [109] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -5728,10 +5759,10 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG242 [110] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  //SEG243 [110] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-  //SEG244 mul8u::@8
-  b8:
+  //SEG242 [110] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  //SEG243 [110] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+  //SEG244 mul8u::@4
+  b4:
   //SEG245 [111] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -5739,10 +5770,10 @@ mul8u: {
   //SEG246 [112] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG247 [104] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  //SEG248 [104] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG249 [104] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG250 [104] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG247 [104] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  //SEG248 [104] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG249 [104] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG250 [104] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG251 keyboard_key_pressed
@@ -5766,7 +5797,7 @@ keyboard_key_pressed: {
   //SEG255 [117] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG256 [118] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  //SEG257 keyboard_key_pressed::@2
+  //SEG257 keyboard_key_pressed::@1
   //SEG258 [119] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   //SEG259 [120] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuyy 
     and keyboard_matrix_col_bitmask,y
diff --git a/src/test/ref/examples/chargen/chargen-analysis.sym b/src/test/ref/examples/chargen/chargen-analysis.sym
index 9e60aa361..2b44b0add 100644
--- a/src/test/ref/examples/chargen/chargen-analysis.sym
+++ b/src/test/ref/examples/chargen/chargen-analysis.sym
@@ -1,4 +1,4 @@
-(label) @19
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -223,7 +223,7 @@
 (byte) keyboard_get_keycode::return#2 reg byte a 202.0
 (byte()) keyboard_key_pressed((byte) keyboard_key_pressed::key)
 (byte~) keyboard_key_pressed::$2 reg byte a 4.0
-(label) keyboard_key_pressed::@2
+(label) keyboard_key_pressed::@1
 (label) keyboard_key_pressed::@return
 (byte) keyboard_key_pressed::colidx
 (byte) keyboard_key_pressed::colidx#0 reg byte y 0.6666666666666666
@@ -261,30 +261,30 @@
 (byte~) main::$24 reg byte a 22.0
 (byte~) main::$27 reg byte a 22.0
 (label) main::@1
+(label) main::@10
 (label) main::@11
 (label) main::@12
 (label) main::@13
 (label) main::@14
 (label) main::@15
 (label) main::@16
+(label) main::@17
+(label) main::@18
+(label) main::@19
 (label) main::@2
+(label) main::@20
+(label) main::@21
+(label) main::@22
 (label) main::@23
+(label) main::@24
 (label) main::@25
 (label) main::@26
 (label) main::@27
+(label) main::@28
 (label) main::@29
 (label) main::@3
 (label) main::@30
-(label) main::@31
-(label) main::@32
-(label) main::@33
-(label) main::@34
-(label) main::@35
-(label) main::@36
-(label) main::@41
-(label) main::@42
-(label) main::@43
-(label) main::@44
+(label) main::@4
 (label) main::@5
 (label) main::@6
 (label) main::@7
@@ -320,8 +320,8 @@
 (byte~) mul8u::$1 reg byte a 2002.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 1001.0
diff --git a/src/test/ref/examples/fastmultiply/fastmultiply8.asm b/src/test/ref/examples/fastmultiply/fastmultiply8.asm
index 406b8d993..ff0aec124 100644
--- a/src/test/ref/examples/fastmultiply/fastmultiply8.asm
+++ b/src/test/ref/examples/fastmultiply/fastmultiply8.asm
@@ -56,7 +56,7 @@ main: {
     sta at_line
     lda #>$400
     sta at_line+1
-  b3:
+  b2:
     lda #$28
     clc
     adc at
@@ -78,7 +78,7 @@ main: {
     sta at_12+1
     lda #0
     sta j
-  b4:
+  b3:
     lda #4
     clc
     adc at_3
@@ -100,10 +100,10 @@ main: {
     inc j
     lda #9
     cmp j
-    bne b4
+    bne b3
     inc i
     cmp i
-    bne b3
+    bne b2
     rts
 }
 // Print a signed byte as hex at a specific screen position
@@ -203,7 +203,7 @@ init_screen: {
     sta COLS
     lda #>$d800
     sta COLS+1
-  b3:
+  b2:
     lda #WHITE
     ldy #0
     sta (COLS),y
@@ -222,7 +222,7 @@ init_screen: {
   !:
     inx
     cpx #$19
-    bne b3
+    bne b2
     rts
 }
 // Clear the screen. Also resets current line/char cursor.
diff --git a/src/test/ref/examples/fastmultiply/fastmultiply8.cfg b/src/test/ref/examples/fastmultiply/fastmultiply8.cfg
index 66cabdbe7..a5bc91436 100644
--- a/src/test/ref/examples/fastmultiply/fastmultiply8.cfg
+++ b/src/test/ref/examples/fastmultiply/fastmultiply8.cfg
@@ -1,7 +1,7 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@22
-@22: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) mulf_sqr1#0) {{ .for(var i=0;i<$200;i++) {
     	.if(i<=159) { .byte round((i*i)/256) }
     	.if(i>159 && i<=351 ) { .byte round(((i-256)*(i-256))/256) }
@@ -16,70 +16,70 @@
  }}
   [3] call main 
   to:@end
-@end: scope:[]  from @22
+@end: scope:[]  from @1
   [4] phi()
-main: scope:[main]  from @22
+main: scope:[main]  from @1
   [5] phi()
   [6] call init_screen 
   to:main::@1
-main::@1: scope:[main]  from main main::@8
-  [7] (byte*) main::at#4 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 4 main::@8/(byte*) main::at#1 )
-  [7] (byte) main::k#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::k#1 )
+main::@1: scope:[main]  from main main::@5
+  [7] (byte*) main::at#4 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 4 main::@5/(byte*) main::at#1 )
+  [7] (byte) main::k#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::k#1 )
   [8] (signed byte) print_sbyte_at::b#1 ← *((const signed byte[]) vals#0 + (byte) main::k#2)
   [9] (byte*) print_sbyte_at::at#0 ← (byte*) main::at#4
   [10] call print_sbyte_at 
-  to:main::@8
-main::@8: scope:[main]  from main::@1
+  to:main::@5
+main::@5: scope:[main]  from main::@1
   [11] (byte*) main::at#1 ← (byte*) main::at#4 + (byte/signed byte/word/signed word/dword/signed dword) 4
   [12] (byte) main::k#1 ← ++ (byte) main::k#2
   [13] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@5 main::@8
-  [14] (byte) main::i#2 ← phi( main::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::i#1 )
-  [14] (byte*) main::at_line#2 ← phi( main::@8/((byte*))(word/signed word/dword/signed dword) $400 main::@5/(byte*) main::at#2 )
+  to:main::@2
+main::@2: scope:[main]  from main::@4 main::@5
+  [14] (byte) main::i#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::i#1 )
+  [14] (byte*) main::at_line#2 ← phi( main::@5/((byte*))(word/signed word/dword/signed dword) $400 main::@4/(byte*) main::at#2 )
   [15] (byte*) main::at#2 ← (byte*) main::at_line#2 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [16] (signed byte) print_sbyte_at::b#2 ← *((const signed byte[]) vals#0 + (byte) main::i#2)
   [17] (byte*) print_sbyte_at::at#1 ← (byte*) main::at#2
   [18] call print_sbyte_at 
   [19] (byte*~) main::at#12 ← (byte*) main::at#2
-  to:main::@4
-main::@4: scope:[main]  from main::@11 main::@3
-  [20] (byte) main::j#2 ← phi( main::@11/(byte) main::j#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [20] (byte*) main::at#6 ← phi( main::@11/(byte*) main::at#3 main::@3/(byte*~) main::at#12 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@7
+  [20] (byte) main::j#2 ← phi( main::@7/(byte) main::j#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [20] (byte*) main::at#6 ← phi( main::@7/(byte*) main::at#3 main::@2/(byte*~) main::at#12 )
   [21] (byte*) main::at#3 ← (byte*) main::at#6 + (byte/signed byte/word/signed word/dword/signed dword) 4
   [22] (signed byte) fmul8::a#0 ← *((const signed byte[]) vals#0 + (byte) main::i#2)
   [23] (signed byte) fmul8::b#0 ← *((const signed byte[]) vals#0 + (byte) main::j#2)
   [24] call fmul8 
   [25] (signed byte) fmul8::return#0 ← (signed byte) fmul8::return#1
-  to:main::@10
-main::@10: scope:[main]  from main::@4
+  to:main::@6
+main::@6: scope:[main]  from main::@3
   [26] (signed byte) main::r#0 ← (signed byte) fmul8::return#0
   [27] (signed byte) print_sbyte_at::b#3 ← (signed byte) main::r#0
   [28] (byte*) print_sbyte_at::at#2 ← (byte*) main::at#3
   [29] call print_sbyte_at 
-  to:main::@11
-main::@11: scope:[main]  from main::@10
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [30] (byte) main::j#1 ← ++ (byte) main::j#2
-  [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@4
-  to:main::@5
-main::@5: scope:[main]  from main::@11
+  [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@7
   [32] (byte) main::i#1 ← ++ (byte) main::i#2
-  [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3
+  [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@5
+main::@return: scope:[main]  from main::@4
   [34] return 
   to:@return
-print_sbyte_at: scope:[print_sbyte_at]  from main::@1 main::@10 main::@3
-  [35] (byte*) print_sbyte_at::at#3 ← phi( main::@1/(byte*) print_sbyte_at::at#0 main::@10/(byte*) print_sbyte_at::at#2 main::@3/(byte*) print_sbyte_at::at#1 )
-  [35] (signed byte) print_sbyte_at::b#4 ← phi( main::@1/(signed byte) print_sbyte_at::b#1 main::@10/(signed byte) print_sbyte_at::b#3 main::@3/(signed byte) print_sbyte_at::b#2 )
+print_sbyte_at: scope:[print_sbyte_at]  from main::@1 main::@2 main::@6
+  [35] (byte*) print_sbyte_at::at#3 ← phi( main::@1/(byte*) print_sbyte_at::at#0 main::@6/(byte*) print_sbyte_at::at#2 main::@2/(byte*) print_sbyte_at::at#1 )
+  [35] (signed byte) print_sbyte_at::b#4 ← phi( main::@1/(signed byte) print_sbyte_at::b#1 main::@6/(signed byte) print_sbyte_at::b#3 main::@2/(signed byte) print_sbyte_at::b#2 )
   [36] if((signed byte) print_sbyte_at::b#4<(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sbyte_at::@1
   to:print_sbyte_at::@3
 print_sbyte_at::@3: scope:[print_sbyte_at]  from print_sbyte_at
   [37] (byte*) print_char_at::at#1 ← (byte*) print_sbyte_at::at#3
   [38] call print_char_at 
   to:print_sbyte_at::@2
-print_sbyte_at::@2: scope:[print_sbyte_at]  from print_sbyte_at::@3 print_sbyte_at::@5
-  [39] (signed byte) print_sbyte_at::b#6 ← phi( print_sbyte_at::@5/(signed byte) print_sbyte_at::b#0 print_sbyte_at::@3/(signed byte) print_sbyte_at::b#4 )
+print_sbyte_at::@2: scope:[print_sbyte_at]  from print_sbyte_at::@3 print_sbyte_at::@4
+  [39] (signed byte) print_sbyte_at::b#6 ← phi( print_sbyte_at::@4/(signed byte) print_sbyte_at::b#0 print_sbyte_at::@3/(signed byte) print_sbyte_at::b#4 )
   [40] (byte*) print_byte_at::at#0 ← (byte*) print_sbyte_at::at#3 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [41] call print_byte_at 
   to:print_sbyte_at::@return
@@ -89,8 +89,8 @@ print_sbyte_at::@return: scope:[print_sbyte_at]  from print_sbyte_at::@2
 print_sbyte_at::@1: scope:[print_sbyte_at]  from print_sbyte_at
   [43] (byte*) print_char_at::at#0 ← (byte*) print_sbyte_at::at#3
   [44] call print_char_at 
-  to:print_sbyte_at::@5
-print_sbyte_at::@5: scope:[print_sbyte_at]  from print_sbyte_at::@1
+  to:print_sbyte_at::@4
+print_sbyte_at::@4: scope:[print_sbyte_at]  from print_sbyte_at::@1
   [45] (signed byte) print_sbyte_at::b#0 ← - (signed byte) print_sbyte_at::b#4
   to:print_sbyte_at::@2
 print_char_at: scope:[print_char_at]  from print_byte_at print_byte_at::@1 print_sbyte_at::@1 print_sbyte_at::@3
@@ -116,7 +116,7 @@ print_byte_at::@1: scope:[print_byte_at]  from print_byte_at
 print_byte_at::@return: scope:[print_byte_at]  from print_byte_at::@1
   [57] return 
   to:@return
-fmul8: scope:[fmul8]  from main::@4
+fmul8: scope:[fmul8]  from main::@3
   [58] *((const signed byte*) ap#0) ← (signed byte) fmul8::a#0
   [59] *((const signed byte*) bp#0) ← (signed byte) fmul8::b#0
   asm { ldaap staA1+1 eor#$ff staA2+1 ldxbp sec A1: ldamulf_sqr1,x A2: sbcmulf_sqr2,x stacp  }
@@ -134,19 +134,19 @@ init_screen::@1: scope:[init_screen]  from init_screen init_screen::@1
   [66] *(((byte*))(word/dword/signed dword) $d800 + (byte) init_screen::l#2) ← (const byte) init_screen::WHITE#0
   [67] (byte) init_screen::l#1 ← ++ (byte) init_screen::l#2
   [68] if((byte) init_screen::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto init_screen::@1
-  to:init_screen::@3
-init_screen::@3: scope:[init_screen]  from init_screen::@1 init_screen::@3
-  [69] (byte) init_screen::m#2 ← phi( init_screen::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 init_screen::@3/(byte) init_screen::m#1 )
-  [69] (byte*) init_screen::COLS#3 ← phi( init_screen::@1/((byte*))(word/dword/signed dword) $d800 init_screen::@3/(byte*) init_screen::COLS#1 )
+  to:init_screen::@2
+init_screen::@2: scope:[init_screen]  from init_screen::@1 init_screen::@2
+  [69] (byte) init_screen::m#2 ← phi( init_screen::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 init_screen::@2/(byte) init_screen::m#1 )
+  [69] (byte*) init_screen::COLS#3 ← phi( init_screen::@1/((byte*))(word/dword/signed dword) $d800 init_screen::@2/(byte*) init_screen::COLS#1 )
   [70] *((byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) 0) ← (const byte) init_screen::WHITE#0
   [71] *((byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) 1) ← (const byte) init_screen::WHITE#0
   [72] *((byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) 2) ← (const byte) init_screen::WHITE#0
   [73] *((byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) 3) ← (const byte) init_screen::WHITE#0
   [74] (byte*) init_screen::COLS#1 ← (byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [75] (byte) init_screen::m#1 ← ++ (byte) init_screen::m#2
-  [76] if((byte) init_screen::m#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto init_screen::@3
+  [76] if((byte) init_screen::m#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto init_screen::@2
   to:init_screen::@return
-init_screen::@return: scope:[init_screen]  from init_screen::@3
+init_screen::@return: scope:[init_screen]  from init_screen::@2
   [77] return 
   to:@return
 print_cls: scope:[print_cls]  from init_screen
diff --git a/src/test/ref/examples/fastmultiply/fastmultiply8.log b/src/test/ref/examples/fastmultiply/fastmultiply8.log
index cc3863931..1e3477db3 100644
--- a/src/test/ref/examples/fastmultiply/fastmultiply8.log
+++ b/src/test/ref/examples/fastmultiply/fastmultiply8.log
@@ -853,6 +853,15 @@ Culled Empty Block (label) main::@12
 Culled Empty Block (label) init_screen::@7
 Culled Empty Block (label) init_screen::@6
 Culled Empty Block (label) print_cls::@3
+Renumbering block @22 to @1
+Renumbering block print_sbyte_at::@5 to print_sbyte_at::@4
+Renumbering block main::@3 to main::@2
+Renumbering block main::@4 to main::@3
+Renumbering block main::@5 to main::@4
+Renumbering block main::@8 to main::@5
+Renumbering block main::@10 to main::@6
+Renumbering block main::@11 to main::@7
+Renumbering block init_screen::@3 to init_screen::@2
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
@@ -862,8 +871,8 @@ Adding NOP phi() at start of print_cls
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@22
-@22: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) mulf_sqr1#0) {{ .for(var i=0;i<$200;i++) {
     	.if(i<=159) { .byte round((i*i)/256) }
     	.if(i>159 && i<=351 ) { .byte round(((i-256)*(i-256))/256) }
@@ -878,70 +887,70 @@ FINAL CONTROL FLOW GRAPH
  }}
   [3] call main 
   to:@end
-@end: scope:[]  from @22
+@end: scope:[]  from @1
   [4] phi()
-main: scope:[main]  from @22
+main: scope:[main]  from @1
   [5] phi()
   [6] call init_screen 
   to:main::@1
-main::@1: scope:[main]  from main main::@8
-  [7] (byte*) main::at#4 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 4 main::@8/(byte*) main::at#1 )
-  [7] (byte) main::k#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::k#1 )
+main::@1: scope:[main]  from main main::@5
+  [7] (byte*) main::at#4 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400+(byte/signed byte/word/signed word/dword/signed dword) 4 main::@5/(byte*) main::at#1 )
+  [7] (byte) main::k#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::k#1 )
   [8] (signed byte) print_sbyte_at::b#1 ← *((const signed byte[]) vals#0 + (byte) main::k#2)
   [9] (byte*) print_sbyte_at::at#0 ← (byte*) main::at#4
   [10] call print_sbyte_at 
-  to:main::@8
-main::@8: scope:[main]  from main::@1
+  to:main::@5
+main::@5: scope:[main]  from main::@1
   [11] (byte*) main::at#1 ← (byte*) main::at#4 + (byte/signed byte/word/signed word/dword/signed dword) 4
   [12] (byte) main::k#1 ← ++ (byte) main::k#2
   [13] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@5 main::@8
-  [14] (byte) main::i#2 ← phi( main::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::i#1 )
-  [14] (byte*) main::at_line#2 ← phi( main::@8/((byte*))(word/signed word/dword/signed dword) $400 main::@5/(byte*) main::at#2 )
+  to:main::@2
+main::@2: scope:[main]  from main::@4 main::@5
+  [14] (byte) main::i#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::i#1 )
+  [14] (byte*) main::at_line#2 ← phi( main::@5/((byte*))(word/signed word/dword/signed dword) $400 main::@4/(byte*) main::at#2 )
   [15] (byte*) main::at#2 ← (byte*) main::at_line#2 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [16] (signed byte) print_sbyte_at::b#2 ← *((const signed byte[]) vals#0 + (byte) main::i#2)
   [17] (byte*) print_sbyte_at::at#1 ← (byte*) main::at#2
   [18] call print_sbyte_at 
   [19] (byte*~) main::at#12 ← (byte*) main::at#2
-  to:main::@4
-main::@4: scope:[main]  from main::@11 main::@3
-  [20] (byte) main::j#2 ← phi( main::@11/(byte) main::j#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [20] (byte*) main::at#6 ← phi( main::@11/(byte*) main::at#3 main::@3/(byte*~) main::at#12 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@7
+  [20] (byte) main::j#2 ← phi( main::@7/(byte) main::j#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [20] (byte*) main::at#6 ← phi( main::@7/(byte*) main::at#3 main::@2/(byte*~) main::at#12 )
   [21] (byte*) main::at#3 ← (byte*) main::at#6 + (byte/signed byte/word/signed word/dword/signed dword) 4
   [22] (signed byte) fmul8::a#0 ← *((const signed byte[]) vals#0 + (byte) main::i#2)
   [23] (signed byte) fmul8::b#0 ← *((const signed byte[]) vals#0 + (byte) main::j#2)
   [24] call fmul8 
   [25] (signed byte) fmul8::return#0 ← (signed byte) fmul8::return#1
-  to:main::@10
-main::@10: scope:[main]  from main::@4
+  to:main::@6
+main::@6: scope:[main]  from main::@3
   [26] (signed byte) main::r#0 ← (signed byte) fmul8::return#0
   [27] (signed byte) print_sbyte_at::b#3 ← (signed byte) main::r#0
   [28] (byte*) print_sbyte_at::at#2 ← (byte*) main::at#3
   [29] call print_sbyte_at 
-  to:main::@11
-main::@11: scope:[main]  from main::@10
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [30] (byte) main::j#1 ← ++ (byte) main::j#2
-  [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@4
-  to:main::@5
-main::@5: scope:[main]  from main::@11
+  [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@7
   [32] (byte) main::i#1 ← ++ (byte) main::i#2
-  [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3
+  [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@5
+main::@return: scope:[main]  from main::@4
   [34] return 
   to:@return
-print_sbyte_at: scope:[print_sbyte_at]  from main::@1 main::@10 main::@3
-  [35] (byte*) print_sbyte_at::at#3 ← phi( main::@1/(byte*) print_sbyte_at::at#0 main::@10/(byte*) print_sbyte_at::at#2 main::@3/(byte*) print_sbyte_at::at#1 )
-  [35] (signed byte) print_sbyte_at::b#4 ← phi( main::@1/(signed byte) print_sbyte_at::b#1 main::@10/(signed byte) print_sbyte_at::b#3 main::@3/(signed byte) print_sbyte_at::b#2 )
+print_sbyte_at: scope:[print_sbyte_at]  from main::@1 main::@2 main::@6
+  [35] (byte*) print_sbyte_at::at#3 ← phi( main::@1/(byte*) print_sbyte_at::at#0 main::@6/(byte*) print_sbyte_at::at#2 main::@2/(byte*) print_sbyte_at::at#1 )
+  [35] (signed byte) print_sbyte_at::b#4 ← phi( main::@1/(signed byte) print_sbyte_at::b#1 main::@6/(signed byte) print_sbyte_at::b#3 main::@2/(signed byte) print_sbyte_at::b#2 )
   [36] if((signed byte) print_sbyte_at::b#4<(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sbyte_at::@1
   to:print_sbyte_at::@3
 print_sbyte_at::@3: scope:[print_sbyte_at]  from print_sbyte_at
   [37] (byte*) print_char_at::at#1 ← (byte*) print_sbyte_at::at#3
   [38] call print_char_at 
   to:print_sbyte_at::@2
-print_sbyte_at::@2: scope:[print_sbyte_at]  from print_sbyte_at::@3 print_sbyte_at::@5
-  [39] (signed byte) print_sbyte_at::b#6 ← phi( print_sbyte_at::@5/(signed byte) print_sbyte_at::b#0 print_sbyte_at::@3/(signed byte) print_sbyte_at::b#4 )
+print_sbyte_at::@2: scope:[print_sbyte_at]  from print_sbyte_at::@3 print_sbyte_at::@4
+  [39] (signed byte) print_sbyte_at::b#6 ← phi( print_sbyte_at::@4/(signed byte) print_sbyte_at::b#0 print_sbyte_at::@3/(signed byte) print_sbyte_at::b#4 )
   [40] (byte*) print_byte_at::at#0 ← (byte*) print_sbyte_at::at#3 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [41] call print_byte_at 
   to:print_sbyte_at::@return
@@ -951,8 +960,8 @@ print_sbyte_at::@return: scope:[print_sbyte_at]  from print_sbyte_at::@2
 print_sbyte_at::@1: scope:[print_sbyte_at]  from print_sbyte_at
   [43] (byte*) print_char_at::at#0 ← (byte*) print_sbyte_at::at#3
   [44] call print_char_at 
-  to:print_sbyte_at::@5
-print_sbyte_at::@5: scope:[print_sbyte_at]  from print_sbyte_at::@1
+  to:print_sbyte_at::@4
+print_sbyte_at::@4: scope:[print_sbyte_at]  from print_sbyte_at::@1
   [45] (signed byte) print_sbyte_at::b#0 ← - (signed byte) print_sbyte_at::b#4
   to:print_sbyte_at::@2
 print_char_at: scope:[print_char_at]  from print_byte_at print_byte_at::@1 print_sbyte_at::@1 print_sbyte_at::@3
@@ -978,7 +987,7 @@ print_byte_at::@1: scope:[print_byte_at]  from print_byte_at
 print_byte_at::@return: scope:[print_byte_at]  from print_byte_at::@1
   [57] return 
   to:@return
-fmul8: scope:[fmul8]  from main::@4
+fmul8: scope:[fmul8]  from main::@3
   [58] *((const signed byte*) ap#0) ← (signed byte) fmul8::a#0
   [59] *((const signed byte*) bp#0) ← (signed byte) fmul8::b#0
   asm { ldaap staA1+1 eor#$ff staA2+1 ldxbp sec A1: ldamulf_sqr1,x A2: sbcmulf_sqr2,x stacp  }
@@ -996,19 +1005,19 @@ init_screen::@1: scope:[init_screen]  from init_screen init_screen::@1
   [66] *(((byte*))(word/dword/signed dword) $d800 + (byte) init_screen::l#2) ← (const byte) init_screen::WHITE#0
   [67] (byte) init_screen::l#1 ← ++ (byte) init_screen::l#2
   [68] if((byte) init_screen::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto init_screen::@1
-  to:init_screen::@3
-init_screen::@3: scope:[init_screen]  from init_screen::@1 init_screen::@3
-  [69] (byte) init_screen::m#2 ← phi( init_screen::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 init_screen::@3/(byte) init_screen::m#1 )
-  [69] (byte*) init_screen::COLS#3 ← phi( init_screen::@1/((byte*))(word/dword/signed dword) $d800 init_screen::@3/(byte*) init_screen::COLS#1 )
+  to:init_screen::@2
+init_screen::@2: scope:[init_screen]  from init_screen::@1 init_screen::@2
+  [69] (byte) init_screen::m#2 ← phi( init_screen::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 init_screen::@2/(byte) init_screen::m#1 )
+  [69] (byte*) init_screen::COLS#3 ← phi( init_screen::@1/((byte*))(word/dword/signed dword) $d800 init_screen::@2/(byte*) init_screen::COLS#1 )
   [70] *((byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) 0) ← (const byte) init_screen::WHITE#0
   [71] *((byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) 1) ← (const byte) init_screen::WHITE#0
   [72] *((byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) 2) ← (const byte) init_screen::WHITE#0
   [73] *((byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) 3) ← (const byte) init_screen::WHITE#0
   [74] (byte*) init_screen::COLS#1 ← (byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [75] (byte) init_screen::m#1 ← ++ (byte) init_screen::m#2
-  [76] if((byte) init_screen::m#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto init_screen::@3
+  [76] if((byte) init_screen::m#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto init_screen::@2
   to:init_screen::@return
-init_screen::@return: scope:[init_screen]  from init_screen::@3
+init_screen::@return: scope:[init_screen]  from init_screen::@2
   [77] return 
   to:@return
 print_cls: scope:[print_cls]  from init_screen
@@ -1206,17 +1215,17 @@ INITIAL ASM
   .label mulf_sqr2 = $2200
 //SEG3 @begin
 bbegin:
-  jmp b22
-//SEG4 @22
-b22:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) mulf_sqr1#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((i*i)/256) }     	.if(i>159 && i<=351 ) { .byte round(((i-256)*(i-256))/256) }     	.if(i>351) { .byte round(((512-i)*(512-i))/256) }     }  }}
 //SEG6 kickasm(location (const byte*) mulf_sqr2#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((-i-1)*(-i-1)/256) }     	.if(i>159 && i<=351 ) { .byte round(((255-i)*(255-i))/256) }     	.if(i>351) { .byte round(((i-511)*(i-511))/256) }       }  }}
 //SEG7 [3] call main 
-//SEG8 [5] phi from @22 to main [phi:@22->main]
-main_from_b22:
+//SEG8 [5] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG9 [4] phi from @22 to @end [phi:@22->@end]
-bend_from_b22:
+//SEG9 [4] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG10 @end
 bend:
@@ -1247,10 +1256,10 @@ main: {
     lda #0
     sta k
     jmp b1
-  //SEG17 [7] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  b1_from_b8:
-  //SEG18 [7] phi (byte*) main::at#4 = (byte*) main::at#1 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG19 [7] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG17 [7] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG18 [7] phi (byte*) main::at#4 = (byte*) main::at#1 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG19 [7] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@5->main::@1#1] -- register_copy 
     jmp b1
   //SEG20 main::@1
   b1:
@@ -1269,9 +1278,9 @@ main: {
   //SEG25 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#0 [phi:main::@1->print_sbyte_at#0] -- register_copy 
   //SEG26 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#1 [phi:main::@1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b8
-  //SEG27 main::@8
-  b8:
+    jmp b5
+  //SEG27 main::@5
+  b5:
   //SEG28 [11] (byte*) main::at#1 ← (byte*) main::at#4 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- pbuz1=pbuz1_plus_vbuc1 
     lda #4
     clc
@@ -1285,25 +1294,25 @@ main: {
   //SEG30 [13] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp k
-    bne b1_from_b8
-  //SEG31 [14] phi from main::@8 to main::@3 [phi:main::@8->main::@3]
-  b3_from_b8:
-  //SEG32 [14] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@3#0] -- vbuz1=vbuc1 
+    bne b1_from_b5
+  //SEG31 [14] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
+  b2_from_b5:
+  //SEG32 [14] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG33 [14] phi (byte*) main::at_line#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@8->main::@3#1] -- pbuz1=pbuc1 
+  //SEG33 [14] phi (byte*) main::at_line#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@5->main::@2#1] -- pbuz1=pbuc1 
     lda #<$400
     sta at_line
     lda #>$400
     sta at_line+1
-    jmp b3
-  //SEG34 [14] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
-  b3_from_b5:
-  //SEG35 [14] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@3#0] -- register_copy 
-  //SEG36 [14] phi (byte*) main::at_line#2 = (byte*) main::at#2 [phi:main::@5->main::@3#1] -- register_copy 
-    jmp b3
-  //SEG37 main::@3
-  b3:
+    jmp b2
+  //SEG34 [14] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG35 [14] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@2#0] -- register_copy 
+  //SEG36 [14] phi (byte*) main::at_line#2 = (byte*) main::at#2 [phi:main::@4->main::@2#1] -- register_copy 
+    jmp b2
+  //SEG37 main::@2
+  b2:
   //SEG38 [15] (byte*) main::at#2 ← (byte*) main::at_line#2 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$28
     clc
@@ -1322,30 +1331,30 @@ main: {
     lda at_2+1
     sta print_sbyte_at.at+1
   //SEG41 [18] call print_sbyte_at 
-  //SEG42 [35] phi from main::@3 to print_sbyte_at [phi:main::@3->print_sbyte_at]
-  print_sbyte_at_from_b3:
-  //SEG43 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#1 [phi:main::@3->print_sbyte_at#0] -- register_copy 
-  //SEG44 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#2 [phi:main::@3->print_sbyte_at#1] -- register_copy 
+  //SEG42 [35] phi from main::@2 to print_sbyte_at [phi:main::@2->print_sbyte_at]
+  print_sbyte_at_from_b2:
+  //SEG43 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#1 [phi:main::@2->print_sbyte_at#0] -- register_copy 
+  //SEG44 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#2 [phi:main::@2->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
   //SEG45 [19] (byte*~) main::at#12 ← (byte*) main::at#2 -- pbuz1=pbuz2 
     lda at_2
     sta at_12
     lda at_2+1
     sta at_12+1
-  //SEG46 [20] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
-  b4_from_b3:
-  //SEG47 [20] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuz1=vbuc1 
+  //SEG46 [20] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG47 [20] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-  //SEG48 [20] phi (byte*) main::at#6 = (byte*~) main::at#12 [phi:main::@3->main::@4#1] -- register_copy 
-    jmp b4
-  //SEG49 [20] phi from main::@11 to main::@4 [phi:main::@11->main::@4]
-  b4_from_b11:
-  //SEG50 [20] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@11->main::@4#0] -- register_copy 
-  //SEG51 [20] phi (byte*) main::at#6 = (byte*) main::at#3 [phi:main::@11->main::@4#1] -- register_copy 
-    jmp b4
-  //SEG52 main::@4
-  b4:
+  //SEG48 [20] phi (byte*) main::at#6 = (byte*~) main::at#12 [phi:main::@2->main::@3#1] -- register_copy 
+    jmp b3
+  //SEG49 [20] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
+  b3_from_b7:
+  //SEG50 [20] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG51 [20] phi (byte*) main::at#6 = (byte*) main::at#3 [phi:main::@7->main::@3#1] -- register_copy 
+    jmp b3
+  //SEG52 main::@3
+  b3:
   //SEG53 [21] (byte*) main::at#3 ← (byte*) main::at#6 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- pbuz1=pbuz1_plus_vbuc1 
     lda #4
     clc
@@ -1367,9 +1376,9 @@ main: {
   //SEG57 [25] (signed byte) fmul8::return#0 ← (signed byte) fmul8::return#1 -- vbsz1=vbsz2 
     lda fmul8.return_1
     sta fmul8.return
-    jmp b10
-  //SEG58 main::@10
-  b10:
+    jmp b6
+  //SEG58 main::@6
+  b6:
   //SEG59 [26] (signed byte) main::r#0 ← (signed byte) fmul8::return#0 -- vbsz1=vbsz2 
     lda fmul8.return
     sta r
@@ -1382,29 +1391,29 @@ main: {
     lda at_3+1
     sta print_sbyte_at.at+1
   //SEG62 [29] call print_sbyte_at 
-  //SEG63 [35] phi from main::@10 to print_sbyte_at [phi:main::@10->print_sbyte_at]
-  print_sbyte_at_from_b10:
-  //SEG64 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#2 [phi:main::@10->print_sbyte_at#0] -- register_copy 
-  //SEG65 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#3 [phi:main::@10->print_sbyte_at#1] -- register_copy 
+  //SEG63 [35] phi from main::@6 to print_sbyte_at [phi:main::@6->print_sbyte_at]
+  print_sbyte_at_from_b6:
+  //SEG64 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#2 [phi:main::@6->print_sbyte_at#0] -- register_copy 
+  //SEG65 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#3 [phi:main::@6->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b11
-  //SEG66 main::@11
-  b11:
+    jmp b7
+  //SEG66 main::@7
+  b7:
   //SEG67 [30] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG68 [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG68 [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp j
-    bne b4_from_b11
-    jmp b5
-  //SEG69 main::@5
-  b5:
+    bne b3_from_b7
+    jmp b4
+  //SEG69 main::@4
+  b4:
   //SEG70 [32] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG71 [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG71 [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp i
-    bne b3_from_b5
+    bne b2_from_b4
     jmp breturn
   //SEG72 main::@return
   breturn:
@@ -1436,10 +1445,10 @@ print_sbyte_at: {
     lda #' '
     sta print_char_at.ch
     jsr print_char_at
-  //SEG82 [39] phi from print_sbyte_at::@3 print_sbyte_at::@5 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2]
+  //SEG82 [39] phi from print_sbyte_at::@3 print_sbyte_at::@4 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG83 [39] phi (signed byte) print_sbyte_at::b#6 = (signed byte) print_sbyte_at::b#4 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG83 [39] phi (signed byte) print_sbyte_at::b#6 = (signed byte) print_sbyte_at::b#4 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2#0] -- register_copy 
     jmp b2
   //SEG84 print_sbyte_at::@2
   b2:
@@ -1473,16 +1482,16 @@ print_sbyte_at: {
     lda #'-'
     sta print_char_at.ch
     jsr print_char_at
-    jmp b5
-  //SEG95 print_sbyte_at::@5
-  b5:
+    jmp b4
+  //SEG95 print_sbyte_at::@4
+  b4:
   //SEG96 [45] (signed byte) print_sbyte_at::b#0 ← - (signed byte) print_sbyte_at::b#4 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG97 print_char_at
 // Print a single char
@@ -1626,24 +1635,24 @@ init_screen: {
     lda #$28
     cmp l
     bne b1_from_b1
-  //SEG137 [69] phi from init_screen::@1 to init_screen::@3 [phi:init_screen::@1->init_screen::@3]
-  b3_from_b1:
-  //SEG138 [69] phi (byte) init_screen::m#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_screen::@1->init_screen::@3#0] -- vbuz1=vbuc1 
+  //SEG137 [69] phi from init_screen::@1 to init_screen::@2 [phi:init_screen::@1->init_screen::@2]
+  b2_from_b1:
+  //SEG138 [69] phi (byte) init_screen::m#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_screen::@1->init_screen::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta m
-  //SEG139 [69] phi (byte*) init_screen::COLS#3 = ((byte*))(word/dword/signed dword) $d800 [phi:init_screen::@1->init_screen::@3#1] -- pbuz1=pbuc1 
+  //SEG139 [69] phi (byte*) init_screen::COLS#3 = ((byte*))(word/dword/signed dword) $d800 [phi:init_screen::@1->init_screen::@2#1] -- pbuz1=pbuc1 
     lda #<$d800
     sta COLS
     lda #>$d800
     sta COLS+1
-    jmp b3
-  //SEG140 [69] phi from init_screen::@3 to init_screen::@3 [phi:init_screen::@3->init_screen::@3]
-  b3_from_b3:
-  //SEG141 [69] phi (byte) init_screen::m#2 = (byte) init_screen::m#1 [phi:init_screen::@3->init_screen::@3#0] -- register_copy 
-  //SEG142 [69] phi (byte*) init_screen::COLS#3 = (byte*) init_screen::COLS#1 [phi:init_screen::@3->init_screen::@3#1] -- register_copy 
-    jmp b3
-  //SEG143 init_screen::@3
-  b3:
+    jmp b2
+  //SEG140 [69] phi from init_screen::@2 to init_screen::@2 [phi:init_screen::@2->init_screen::@2]
+  b2_from_b2:
+  //SEG141 [69] phi (byte) init_screen::m#2 = (byte) init_screen::m#1 [phi:init_screen::@2->init_screen::@2#0] -- register_copy 
+  //SEG142 [69] phi (byte*) init_screen::COLS#3 = (byte*) init_screen::COLS#1 [phi:init_screen::@2->init_screen::@2#1] -- register_copy 
+    jmp b2
+  //SEG143 init_screen::@2
+  b2:
   //SEG144 [70] *((byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) 0) ← (const byte) init_screen::WHITE#0 -- pbuz1_derefidx_vbuc1=vbuc2 
     lda #WHITE
     ldy #0
@@ -1670,10 +1679,10 @@ init_screen: {
   !:
   //SEG149 [75] (byte) init_screen::m#1 ← ++ (byte) init_screen::m#2 -- vbuz1=_inc_vbuz1 
     inc m
-  //SEG150 [76] if((byte) init_screen::m#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto init_screen::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG150 [76] if((byte) init_screen::m#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto init_screen::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$19
     cmp m
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG151 init_screen::@return
   breturn:
@@ -1789,8 +1798,8 @@ Statement [22] (signed byte) fmul8::a#0 ← *((const signed byte[]) vals#0 + (by
 Statement [23] (signed byte) fmul8::b#0 ← *((const signed byte[]) vals#0 + (byte) main::j#2) [ main::i#2 main::at#2 main::j#2 main::at#3 fmul8::a#0 fmul8::b#0 ] ( main:3 [ main::i#2 main::at#2 main::j#2 main::at#3 fmul8::a#0 fmul8::b#0 ] ) always clobbers reg byte y 
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:23 [ fmul8::a#0 ]
 Statement [28] (byte*) print_sbyte_at::at#2 ← (byte*) main::at#3 [ main::i#2 main::at#2 main::j#2 main::at#3 print_sbyte_at::b#3 print_sbyte_at::at#2 ] ( main:3 [ main::i#2 main::at#2 main::j#2 main::at#3 print_sbyte_at::b#3 print_sbyte_at::at#2 ] ) always clobbers reg byte a 
-Statement [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@4 [ main::i#2 main::at#2 main::at#3 main::j#1 ] ( main:3 [ main::i#2 main::at#2 main::at#3 main::j#1 ] ) always clobbers reg byte a 
-Statement [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3 [ main::at#2 main::i#1 ] ( main:3 [ main::at#2 main::i#1 ] ) always clobbers reg byte a 
+Statement [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3 [ main::i#2 main::at#2 main::at#3 main::j#1 ] ( main:3 [ main::i#2 main::at#2 main::at#3 main::j#1 ] ) always clobbers reg byte a 
+Statement [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2 [ main::at#2 main::i#1 ] ( main:3 [ main::at#2 main::i#1 ] ) always clobbers reg byte a 
 Statement [37] (byte*) print_char_at::at#1 ← (byte*) print_sbyte_at::at#3 [ print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#1 ] ( main:3::print_sbyte_at:10 [ main::k#2 main::at#4 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#1 ] main:3::print_sbyte_at:18 [ main::i#2 main::at#2 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#1 ] main:3::print_sbyte_at:29 [ main::i#2 main::at#2 main::j#2 main::at#3 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#1 ] ) always clobbers reg byte a 
 Statement [40] (byte*) print_byte_at::at#0 ← (byte*) print_sbyte_at::at#3 + (byte/signed byte/word/signed word/dword/signed dword) 1 [ print_sbyte_at::b#6 print_byte_at::at#0 ] ( main:3::print_sbyte_at:10 [ main::k#2 main::at#4 print_sbyte_at::b#6 print_byte_at::at#0 ] main:3::print_sbyte_at:18 [ main::i#2 main::at#2 print_sbyte_at::b#6 print_byte_at::at#0 ] main:3::print_sbyte_at:29 [ main::i#2 main::at#2 main::j#2 main::at#3 print_sbyte_at::b#6 print_byte_at::at#0 ] ) always clobbers reg byte a 
 Statement [43] (byte*) print_char_at::at#0 ← (byte*) print_sbyte_at::at#3 [ print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#0 ] ( main:3::print_sbyte_at:10 [ main::k#2 main::at#4 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#0 ] main:3::print_sbyte_at:18 [ main::i#2 main::at#2 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#0 ] main:3::print_sbyte_at:29 [ main::i#2 main::at#2 main::j#2 main::at#3 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#0 ] ) always clobbers reg byte a 
@@ -1819,8 +1828,8 @@ Statement [21] (byte*) main::at#3 ← (byte*) main::at#6 + (byte/signed byte/wor
 Statement [22] (signed byte) fmul8::a#0 ← *((const signed byte[]) vals#0 + (byte) main::i#2) [ main::i#2 main::at#2 main::j#2 main::at#3 fmul8::a#0 ] ( main:3 [ main::i#2 main::at#2 main::j#2 main::at#3 fmul8::a#0 ] ) always clobbers reg byte y 
 Statement [23] (signed byte) fmul8::b#0 ← *((const signed byte[]) vals#0 + (byte) main::j#2) [ main::i#2 main::at#2 main::j#2 main::at#3 fmul8::a#0 fmul8::b#0 ] ( main:3 [ main::i#2 main::at#2 main::j#2 main::at#3 fmul8::a#0 fmul8::b#0 ] ) always clobbers reg byte y 
 Statement [28] (byte*) print_sbyte_at::at#2 ← (byte*) main::at#3 [ main::i#2 main::at#2 main::j#2 main::at#3 print_sbyte_at::b#3 print_sbyte_at::at#2 ] ( main:3 [ main::i#2 main::at#2 main::j#2 main::at#3 print_sbyte_at::b#3 print_sbyte_at::at#2 ] ) always clobbers reg byte a 
-Statement [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@4 [ main::i#2 main::at#2 main::at#3 main::j#1 ] ( main:3 [ main::i#2 main::at#2 main::at#3 main::j#1 ] ) always clobbers reg byte a 
-Statement [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3 [ main::at#2 main::i#1 ] ( main:3 [ main::at#2 main::i#1 ] ) always clobbers reg byte a 
+Statement [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3 [ main::i#2 main::at#2 main::at#3 main::j#1 ] ( main:3 [ main::i#2 main::at#2 main::at#3 main::j#1 ] ) always clobbers reg byte a 
+Statement [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2 [ main::at#2 main::i#1 ] ( main:3 [ main::at#2 main::i#1 ] ) always clobbers reg byte a 
 Statement [37] (byte*) print_char_at::at#1 ← (byte*) print_sbyte_at::at#3 [ print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#1 ] ( main:3::print_sbyte_at:10 [ main::k#2 main::at#4 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#1 ] main:3::print_sbyte_at:18 [ main::i#2 main::at#2 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#1 ] main:3::print_sbyte_at:29 [ main::i#2 main::at#2 main::j#2 main::at#3 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#1 ] ) always clobbers reg byte a 
 Statement [40] (byte*) print_byte_at::at#0 ← (byte*) print_sbyte_at::at#3 + (byte/signed byte/word/signed word/dword/signed dword) 1 [ print_sbyte_at::b#6 print_byte_at::at#0 ] ( main:3::print_sbyte_at:10 [ main::k#2 main::at#4 print_sbyte_at::b#6 print_byte_at::at#0 ] main:3::print_sbyte_at:18 [ main::i#2 main::at#2 print_sbyte_at::b#6 print_byte_at::at#0 ] main:3::print_sbyte_at:29 [ main::i#2 main::at#2 main::j#2 main::at#3 print_sbyte_at::b#6 print_byte_at::at#0 ] ) always clobbers reg byte a 
 Statement [43] (byte*) print_char_at::at#0 ← (byte*) print_sbyte_at::at#3 [ print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#0 ] ( main:3::print_sbyte_at:10 [ main::k#2 main::at#4 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#0 ] main:3::print_sbyte_at:18 [ main::i#2 main::at#2 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#0 ] main:3::print_sbyte_at:29 [ main::i#2 main::at#2 main::j#2 main::at#3 print_sbyte_at::b#4 print_sbyte_at::at#3 print_char_at::at#0 ] ) always clobbers reg byte a 
@@ -1928,17 +1937,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label mulf_sqr2 = $2200
 //SEG3 @begin
 bbegin:
-  jmp b22
-//SEG4 @22
-b22:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) mulf_sqr1#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((i*i)/256) }     	.if(i>159 && i<=351 ) { .byte round(((i-256)*(i-256))/256) }     	.if(i>351) { .byte round(((512-i)*(512-i))/256) }     }  }}
 //SEG6 kickasm(location (const byte*) mulf_sqr2#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((-i-1)*(-i-1)/256) }     	.if(i>159 && i<=351 ) { .byte round(((255-i)*(255-i))/256) }     	.if(i>351) { .byte round(((i-511)*(i-511))/256) }       }  }}
 //SEG7 [3] call main 
-//SEG8 [5] phi from @22 to main [phi:@22->main]
-main_from_b22:
+//SEG8 [5] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG9 [4] phi from @22 to @end [phi:@22->@end]
-bend_from_b22:
+//SEG9 [4] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG10 @end
 bend:
@@ -1965,10 +1974,10 @@ main: {
   //SEG16 [7] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#1] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
-  //SEG17 [7] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  b1_from_b8:
-  //SEG18 [7] phi (byte*) main::at#4 = (byte*) main::at#1 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG19 [7] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG17 [7] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG18 [7] phi (byte*) main::at#4 = (byte*) main::at#1 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG19 [7] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@5->main::@1#1] -- register_copy 
     jmp b1
   //SEG20 main::@1
   b1:
@@ -1986,9 +1995,9 @@ main: {
   //SEG25 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#0 [phi:main::@1->print_sbyte_at#0] -- register_copy 
   //SEG26 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#1 [phi:main::@1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b8
-  //SEG27 main::@8
-  b8:
+    jmp b5
+  //SEG27 main::@5
+  b5:
   //SEG28 [11] (byte*) main::at#1 ← (byte*) main::at#4 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- pbuz1=pbuz1_plus_vbuc1 
     lda #4
     clc
@@ -2001,25 +2010,25 @@ main: {
     inx
   //SEG30 [13] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #9
-    bne b1_from_b8
-  //SEG31 [14] phi from main::@8 to main::@3 [phi:main::@8->main::@3]
-  b3_from_b8:
-  //SEG32 [14] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@3#0] -- vbuz1=vbuc1 
+    bne b1_from_b5
+  //SEG31 [14] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
+  b2_from_b5:
+  //SEG32 [14] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG33 [14] phi (byte*) main::at_line#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@8->main::@3#1] -- pbuz1=pbuc1 
+  //SEG33 [14] phi (byte*) main::at_line#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@5->main::@2#1] -- pbuz1=pbuc1 
     lda #<$400
     sta at_line
     lda #>$400
     sta at_line+1
-    jmp b3
-  //SEG34 [14] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
-  b3_from_b5:
-  //SEG35 [14] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@3#0] -- register_copy 
-  //SEG36 [14] phi (byte*) main::at_line#2 = (byte*) main::at#2 [phi:main::@5->main::@3#1] -- register_copy 
-    jmp b3
-  //SEG37 main::@3
-  b3:
+    jmp b2
+  //SEG34 [14] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG35 [14] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@2#0] -- register_copy 
+  //SEG36 [14] phi (byte*) main::at_line#2 = (byte*) main::at#2 [phi:main::@4->main::@2#1] -- register_copy 
+    jmp b2
+  //SEG37 main::@2
+  b2:
   //SEG38 [15] (byte*) main::at#2 ← (byte*) main::at_line#2 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$28
     clc
@@ -2038,30 +2047,30 @@ main: {
     lda at+1
     sta print_sbyte_at.at+1
   //SEG41 [18] call print_sbyte_at 
-  //SEG42 [35] phi from main::@3 to print_sbyte_at [phi:main::@3->print_sbyte_at]
-  print_sbyte_at_from_b3:
-  //SEG43 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#1 [phi:main::@3->print_sbyte_at#0] -- register_copy 
-  //SEG44 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#2 [phi:main::@3->print_sbyte_at#1] -- register_copy 
+  //SEG42 [35] phi from main::@2 to print_sbyte_at [phi:main::@2->print_sbyte_at]
+  print_sbyte_at_from_b2:
+  //SEG43 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#1 [phi:main::@2->print_sbyte_at#0] -- register_copy 
+  //SEG44 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#2 [phi:main::@2->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
   //SEG45 [19] (byte*~) main::at#12 ← (byte*) main::at#2 -- pbuz1=pbuz2 
     lda at
     sta at_12
     lda at+1
     sta at_12+1
-  //SEG46 [20] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
-  b4_from_b3:
-  //SEG47 [20] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuz1=vbuc1 
+  //SEG46 [20] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG47 [20] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-  //SEG48 [20] phi (byte*) main::at#6 = (byte*~) main::at#12 [phi:main::@3->main::@4#1] -- register_copy 
-    jmp b4
-  //SEG49 [20] phi from main::@11 to main::@4 [phi:main::@11->main::@4]
-  b4_from_b11:
-  //SEG50 [20] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@11->main::@4#0] -- register_copy 
-  //SEG51 [20] phi (byte*) main::at#6 = (byte*) main::at#3 [phi:main::@11->main::@4#1] -- register_copy 
-    jmp b4
-  //SEG52 main::@4
-  b4:
+  //SEG48 [20] phi (byte*) main::at#6 = (byte*~) main::at#12 [phi:main::@2->main::@3#1] -- register_copy 
+    jmp b3
+  //SEG49 [20] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
+  b3_from_b7:
+  //SEG50 [20] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG51 [20] phi (byte*) main::at#6 = (byte*) main::at#3 [phi:main::@7->main::@3#1] -- register_copy 
+    jmp b3
+  //SEG52 main::@3
+  b3:
   //SEG53 [21] (byte*) main::at#3 ← (byte*) main::at#6 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- pbuz1=pbuz1_plus_vbuc1 
     lda #4
     clc
@@ -2079,9 +2088,9 @@ main: {
   //SEG56 [24] call fmul8 
     jsr fmul8
   //SEG57 [25] (signed byte) fmul8::return#0 ← (signed byte) fmul8::return#1
-    jmp b10
-  //SEG58 main::@10
-  b10:
+    jmp b6
+  //SEG58 main::@6
+  b6:
   //SEG59 [26] (signed byte) main::r#0 ← (signed byte) fmul8::return#0
   //SEG60 [27] (signed byte) print_sbyte_at::b#3 ← (signed byte) main::r#0 -- vbsz1=vbsaa 
     sta print_sbyte_at.b
@@ -2091,29 +2100,29 @@ main: {
     lda at_3+1
     sta print_sbyte_at.at+1
   //SEG62 [29] call print_sbyte_at 
-  //SEG63 [35] phi from main::@10 to print_sbyte_at [phi:main::@10->print_sbyte_at]
-  print_sbyte_at_from_b10:
-  //SEG64 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#2 [phi:main::@10->print_sbyte_at#0] -- register_copy 
-  //SEG65 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#3 [phi:main::@10->print_sbyte_at#1] -- register_copy 
+  //SEG63 [35] phi from main::@6 to print_sbyte_at [phi:main::@6->print_sbyte_at]
+  print_sbyte_at_from_b6:
+  //SEG64 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#2 [phi:main::@6->print_sbyte_at#0] -- register_copy 
+  //SEG65 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#3 [phi:main::@6->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-    jmp b11
-  //SEG66 main::@11
-  b11:
+    jmp b7
+  //SEG66 main::@7
+  b7:
   //SEG67 [30] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG68 [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG68 [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp j
-    bne b4_from_b11
-    jmp b5
-  //SEG69 main::@5
-  b5:
+    bne b3_from_b7
+    jmp b4
+  //SEG69 main::@4
+  b4:
   //SEG70 [32] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG71 [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG71 [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp i
-    bne b3_from_b5
+    bne b2_from_b4
     jmp breturn
   //SEG72 main::@return
   breturn:
@@ -2141,10 +2150,10 @@ print_sbyte_at: {
     lda #' '
     sta print_char_at.ch
     jsr print_char_at
-  //SEG82 [39] phi from print_sbyte_at::@3 print_sbyte_at::@5 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2]
+  //SEG82 [39] phi from print_sbyte_at::@3 print_sbyte_at::@4 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG83 [39] phi (signed byte) print_sbyte_at::b#6 = (signed byte) print_sbyte_at::b#4 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG83 [39] phi (signed byte) print_sbyte_at::b#6 = (signed byte) print_sbyte_at::b#4 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2#0] -- register_copy 
     jmp b2
   //SEG84 print_sbyte_at::@2
   b2:
@@ -2171,16 +2180,16 @@ print_sbyte_at: {
     lda #'-'
     sta print_char_at.ch
     jsr print_char_at
-    jmp b5
-  //SEG95 print_sbyte_at::@5
-  b5:
+    jmp b4
+  //SEG95 print_sbyte_at::@4
+  b4:
   //SEG96 [45] (signed byte) print_sbyte_at::b#0 ← - (signed byte) print_sbyte_at::b#4 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG97 print_char_at
 // Print a single char
@@ -2302,23 +2311,23 @@ init_screen: {
   //SEG136 [68] if((byte) init_screen::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto init_screen::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
     bne b1_from_b1
-  //SEG137 [69] phi from init_screen::@1 to init_screen::@3 [phi:init_screen::@1->init_screen::@3]
-  b3_from_b1:
-  //SEG138 [69] phi (byte) init_screen::m#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_screen::@1->init_screen::@3#0] -- vbuxx=vbuc1 
+  //SEG137 [69] phi from init_screen::@1 to init_screen::@2 [phi:init_screen::@1->init_screen::@2]
+  b2_from_b1:
+  //SEG138 [69] phi (byte) init_screen::m#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_screen::@1->init_screen::@2#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG139 [69] phi (byte*) init_screen::COLS#3 = ((byte*))(word/dword/signed dword) $d800 [phi:init_screen::@1->init_screen::@3#1] -- pbuz1=pbuc1 
+  //SEG139 [69] phi (byte*) init_screen::COLS#3 = ((byte*))(word/dword/signed dword) $d800 [phi:init_screen::@1->init_screen::@2#1] -- pbuz1=pbuc1 
     lda #<$d800
     sta COLS
     lda #>$d800
     sta COLS+1
-    jmp b3
-  //SEG140 [69] phi from init_screen::@3 to init_screen::@3 [phi:init_screen::@3->init_screen::@3]
-  b3_from_b3:
-  //SEG141 [69] phi (byte) init_screen::m#2 = (byte) init_screen::m#1 [phi:init_screen::@3->init_screen::@3#0] -- register_copy 
-  //SEG142 [69] phi (byte*) init_screen::COLS#3 = (byte*) init_screen::COLS#1 [phi:init_screen::@3->init_screen::@3#1] -- register_copy 
-    jmp b3
-  //SEG143 init_screen::@3
-  b3:
+    jmp b2
+  //SEG140 [69] phi from init_screen::@2 to init_screen::@2 [phi:init_screen::@2->init_screen::@2]
+  b2_from_b2:
+  //SEG141 [69] phi (byte) init_screen::m#2 = (byte) init_screen::m#1 [phi:init_screen::@2->init_screen::@2#0] -- register_copy 
+  //SEG142 [69] phi (byte*) init_screen::COLS#3 = (byte*) init_screen::COLS#1 [phi:init_screen::@2->init_screen::@2#1] -- register_copy 
+    jmp b2
+  //SEG143 init_screen::@2
+  b2:
   //SEG144 [70] *((byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) 0) ← (const byte) init_screen::WHITE#0 -- pbuz1_derefidx_vbuc1=vbuc2 
     lda #WHITE
     ldy #0
@@ -2345,9 +2354,9 @@ init_screen: {
   !:
   //SEG149 [75] (byte) init_screen::m#1 ← ++ (byte) init_screen::m#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG150 [76] if((byte) init_screen::m#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto init_screen::@3 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG150 [76] if((byte) init_screen::m#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto init_screen::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$19
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG151 init_screen::@return
   breturn:
@@ -2412,26 +2421,26 @@ print_cls: {
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b22
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b8
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b10
-Removing instruction jmp b11
 Removing instruction jmp b5
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b4
 Removing instruction jmp breturn
 Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp breturn
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -2441,44 +2450,44 @@ Removing instruction lda #WHITE
 Removing instruction lda #WHITE
 Removing instruction lda #WHITE
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b1_from_b8 with b1
-Replacing label b4_from_b11 with b4
-Replacing label b3_from_b5 with b3
-Replacing label b2_from_b5 with b2
+Replacing label b1_from_b5 with b1
+Replacing label b3_from_b7 with b3
+Replacing label b2_from_b4 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b1 with b1
-Replacing label b3_from_b3 with b3
+Replacing label b2_from_b2 with b2
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b22:
-Removing instruction main_from_b22:
-Removing instruction bend_from_b22:
-Removing instruction b1_from_b8:
-Removing instruction b3_from_b5:
-Removing instruction b4_from_b11:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b5:
+Removing instruction b2_from_b4:
+Removing instruction b3_from_b7:
 Removing instruction print_char_at_from_b3:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction print_char_at_from_b1:
 Removing instruction b1_from_b1:
-Removing instruction b3_from_b3:
+Removing instruction b2_from_b2:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction init_screen_from_main:
 Removing instruction b1_from_main:
 Removing instruction print_sbyte_at_from_b1:
-Removing instruction b8:
-Removing instruction b3_from_b8:
-Removing instruction print_sbyte_at_from_b3:
-Removing instruction b4_from_b3:
-Removing instruction b10:
-Removing instruction print_sbyte_at_from_b10:
-Removing instruction b11:
 Removing instruction b5:
+Removing instruction b2_from_b5:
+Removing instruction print_sbyte_at_from_b2:
+Removing instruction b3_from_b2:
+Removing instruction b6:
+Removing instruction print_sbyte_at_from_b6:
+Removing instruction b7:
+Removing instruction b4:
 Removing instruction breturn:
 Removing instruction b3:
 Removing instruction breturn:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction breturn:
 Removing instruction print_char_at_from_print_byte_at:
 Removing instruction b1:
@@ -2487,7 +2496,7 @@ Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction print_cls_from_init_screen:
 Removing instruction b1_from_init_screen:
-Removing instruction b3_from_b1:
+Removing instruction b2_from_b1:
 Removing instruction breturn:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
@@ -2496,10 +2505,10 @@ Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp b4
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #9
@@ -2508,7 +2517,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @22
+(label) @1
 (label) @begin
 (label) @end
 (signed byte*) ap
@@ -2528,7 +2537,7 @@ FINAL SYMBOL TABLE
 (signed byte) fmul8::return#1 reg byte a 34.33333333333333
 (void()) init_screen()
 (label) init_screen::@1
-(label) init_screen::@3
+(label) init_screen::@2
 (label) init_screen::@return
 (byte*) init_screen::COLS
 (byte*) init_screen::COLS#1 COLS zp ZP_WORD:2 7.333333333333333
@@ -2543,12 +2552,12 @@ FINAL SYMBOL TABLE
 (byte) init_screen::m#2 reg byte x 3.6666666666666665
 (void()) main()
 (label) main::@1
-(label) main::@10
-(label) main::@11
+(label) main::@2
 (label) main::@3
 (label) main::@4
 (label) main::@5
-(label) main::@8
+(label) main::@6
+(label) main::@7
 (label) main::@return
 (byte*) main::at
 (byte*) main::at#1 at zp ZP_WORD:2 7.333333333333333
@@ -2609,7 +2618,7 @@ FINAL SYMBOL TABLE
 (label) print_sbyte_at::@1
 (label) print_sbyte_at::@2
 (label) print_sbyte_at::@3
-(label) print_sbyte_at::@5
+(label) print_sbyte_at::@4
 (label) print_sbyte_at::@return
 (byte*) print_sbyte_at::at
 (byte*) print_sbyte_at::at#0 at zp ZP_WORD:8 22.0
@@ -2673,12 +2682,12 @@ Score: 10516
   // g(x) =  >((( 1 - x ) * ( 1 - x )))
   .label mulf_sqr2 = $2200
 //SEG3 @begin
-//SEG4 @22
+//SEG4 @1
 //SEG5 kickasm(location (const byte*) mulf_sqr1#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((i*i)/256) }     	.if(i>159 && i<=351 ) { .byte round(((i-256)*(i-256))/256) }     	.if(i>351) { .byte round(((512-i)*(512-i))/256) }     }  }}
 //SEG6 kickasm(location (const byte*) mulf_sqr2#0) {{ .for(var i=0;i<$200;i++) {     	.if(i<=159) { .byte round((-i-1)*(-i-1)/256) }     	.if(i>159 && i<=351 ) { .byte round(((255-i)*(255-i))/256) }     	.if(i>351) { .byte round(((i-511)*(i-511))/256) }       }  }}
 //SEG7 [3] call main 
-//SEG8 [5] phi from @22 to main [phi:@22->main]
-//SEG9 [4] phi from @22 to @end [phi:@22->@end]
+//SEG8 [5] phi from @1 to main [phi:@1->main]
+//SEG9 [4] phi from @1 to @end [phi:@1->@end]
 //SEG10 @end
 //SEG11 main
 main: {
@@ -2700,9 +2709,9 @@ main: {
     sta at+1
   //SEG16 [7] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#1] -- vbuxx=vbuc1 
     ldx #0
-  //SEG17 [7] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  //SEG18 [7] phi (byte*) main::at#4 = (byte*) main::at#1 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG19 [7] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG17 [7] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  //SEG18 [7] phi (byte*) main::at#4 = (byte*) main::at#1 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG19 [7] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@5->main::@1#1] -- register_copy 
   //SEG20 main::@1
   b1:
   //SEG21 [8] (signed byte) print_sbyte_at::b#1 ← *((const signed byte[]) vals#0 + (byte) main::k#2) -- vbsz1=pbsc1_derefidx_vbuxx 
@@ -2718,7 +2727,7 @@ main: {
   //SEG25 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#0 [phi:main::@1->print_sbyte_at#0] -- register_copy 
   //SEG26 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#1 [phi:main::@1->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG27 main::@8
+  //SEG27 main::@5
   //SEG28 [11] (byte*) main::at#1 ← (byte*) main::at#4 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- pbuz1=pbuz1_plus_vbuc1 
     lda #4
     clc
@@ -2732,20 +2741,20 @@ main: {
   //SEG30 [13] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #9
     bne b1
-  //SEG31 [14] phi from main::@8 to main::@3 [phi:main::@8->main::@3]
-  //SEG32 [14] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@3#0] -- vbuz1=vbuc1 
+  //SEG31 [14] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
+  //SEG32 [14] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG33 [14] phi (byte*) main::at_line#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@8->main::@3#1] -- pbuz1=pbuc1 
+  //SEG33 [14] phi (byte*) main::at_line#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@5->main::@2#1] -- pbuz1=pbuc1 
     lda #<$400
     sta at_line
     lda #>$400
     sta at_line+1
-  //SEG34 [14] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
-  //SEG35 [14] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@3#0] -- register_copy 
-  //SEG36 [14] phi (byte*) main::at_line#2 = (byte*) main::at#2 [phi:main::@5->main::@3#1] -- register_copy 
-  //SEG37 main::@3
-  b3:
+  //SEG34 [14] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  //SEG35 [14] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@2#0] -- register_copy 
+  //SEG36 [14] phi (byte*) main::at_line#2 = (byte*) main::at#2 [phi:main::@4->main::@2#1] -- register_copy 
+  //SEG37 main::@2
+  b2:
   //SEG38 [15] (byte*) main::at#2 ← (byte*) main::at_line#2 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$28
     clc
@@ -2764,25 +2773,25 @@ main: {
     lda at+1
     sta print_sbyte_at.at+1
   //SEG41 [18] call print_sbyte_at 
-  //SEG42 [35] phi from main::@3 to print_sbyte_at [phi:main::@3->print_sbyte_at]
-  //SEG43 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#1 [phi:main::@3->print_sbyte_at#0] -- register_copy 
-  //SEG44 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#2 [phi:main::@3->print_sbyte_at#1] -- register_copy 
+  //SEG42 [35] phi from main::@2 to print_sbyte_at [phi:main::@2->print_sbyte_at]
+  //SEG43 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#1 [phi:main::@2->print_sbyte_at#0] -- register_copy 
+  //SEG44 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#2 [phi:main::@2->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
   //SEG45 [19] (byte*~) main::at#12 ← (byte*) main::at#2 -- pbuz1=pbuz2 
     lda at
     sta at_12
     lda at+1
     sta at_12+1
-  //SEG46 [20] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
-  //SEG47 [20] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuz1=vbuc1 
+  //SEG46 [20] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  //SEG47 [20] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-  //SEG48 [20] phi (byte*) main::at#6 = (byte*~) main::at#12 [phi:main::@3->main::@4#1] -- register_copy 
-  //SEG49 [20] phi from main::@11 to main::@4 [phi:main::@11->main::@4]
-  //SEG50 [20] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@11->main::@4#0] -- register_copy 
-  //SEG51 [20] phi (byte*) main::at#6 = (byte*) main::at#3 [phi:main::@11->main::@4#1] -- register_copy 
-  //SEG52 main::@4
-  b4:
+  //SEG48 [20] phi (byte*) main::at#6 = (byte*~) main::at#12 [phi:main::@2->main::@3#1] -- register_copy 
+  //SEG49 [20] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
+  //SEG50 [20] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG51 [20] phi (byte*) main::at#6 = (byte*) main::at#3 [phi:main::@7->main::@3#1] -- register_copy 
+  //SEG52 main::@3
+  b3:
   //SEG53 [21] (byte*) main::at#3 ← (byte*) main::at#6 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- pbuz1=pbuz1_plus_vbuc1 
     lda #4
     clc
@@ -2800,7 +2809,7 @@ main: {
   //SEG56 [24] call fmul8 
     jsr fmul8
   //SEG57 [25] (signed byte) fmul8::return#0 ← (signed byte) fmul8::return#1
-  //SEG58 main::@10
+  //SEG58 main::@6
   //SEG59 [26] (signed byte) main::r#0 ← (signed byte) fmul8::return#0
   //SEG60 [27] (signed byte) print_sbyte_at::b#3 ← (signed byte) main::r#0 -- vbsz1=vbsaa 
     sta print_sbyte_at.b
@@ -2810,23 +2819,23 @@ main: {
     lda at_3+1
     sta print_sbyte_at.at+1
   //SEG62 [29] call print_sbyte_at 
-  //SEG63 [35] phi from main::@10 to print_sbyte_at [phi:main::@10->print_sbyte_at]
-  //SEG64 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#2 [phi:main::@10->print_sbyte_at#0] -- register_copy 
-  //SEG65 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#3 [phi:main::@10->print_sbyte_at#1] -- register_copy 
+  //SEG63 [35] phi from main::@6 to print_sbyte_at [phi:main::@6->print_sbyte_at]
+  //SEG64 [35] phi (byte*) print_sbyte_at::at#3 = (byte*) print_sbyte_at::at#2 [phi:main::@6->print_sbyte_at#0] -- register_copy 
+  //SEG65 [35] phi (signed byte) print_sbyte_at::b#4 = (signed byte) print_sbyte_at::b#3 [phi:main::@6->print_sbyte_at#1] -- register_copy 
     jsr print_sbyte_at
-  //SEG66 main::@11
+  //SEG66 main::@7
   //SEG67 [30] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG68 [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG68 [31] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp j
-    bne b4
-  //SEG69 main::@5
+    bne b3
+  //SEG69 main::@4
   //SEG70 [32] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG71 [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG71 [33] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     cmp i
-    bne b3
+    bne b2
   //SEG72 main::@return
   //SEG73 [34] return 
     rts
@@ -2849,8 +2858,8 @@ print_sbyte_at: {
     lda #' '
     sta print_char_at.ch
     jsr print_char_at
-  //SEG82 [39] phi from print_sbyte_at::@3 print_sbyte_at::@5 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2]
-  //SEG83 [39] phi (signed byte) print_sbyte_at::b#6 = (signed byte) print_sbyte_at::b#4 [phi:print_sbyte_at::@3/print_sbyte_at::@5->print_sbyte_at::@2#0] -- register_copy 
+  //SEG82 [39] phi from print_sbyte_at::@3 print_sbyte_at::@4 to print_sbyte_at::@2 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2]
+  //SEG83 [39] phi (signed byte) print_sbyte_at::b#6 = (signed byte) print_sbyte_at::b#4 [phi:print_sbyte_at::@3/print_sbyte_at::@4->print_sbyte_at::@2#0] -- register_copy 
   //SEG84 print_sbyte_at::@2
   b2:
   //SEG85 [40] (byte*) print_byte_at::at#0 ← (byte*) print_sbyte_at::at#3 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- pbuz1=pbuz1_plus_1 
@@ -2873,7 +2882,7 @@ print_sbyte_at: {
     lda #'-'
     sta print_char_at.ch
     jsr print_char_at
-  //SEG95 print_sbyte_at::@5
+  //SEG95 print_sbyte_at::@4
   //SEG96 [45] (signed byte) print_sbyte_at::b#0 ← - (signed byte) print_sbyte_at::b#4 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
@@ -2986,19 +2995,19 @@ init_screen: {
   //SEG136 [68] if((byte) init_screen::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto init_screen::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
     bne b1
-  //SEG137 [69] phi from init_screen::@1 to init_screen::@3 [phi:init_screen::@1->init_screen::@3]
-  //SEG138 [69] phi (byte) init_screen::m#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_screen::@1->init_screen::@3#0] -- vbuxx=vbuc1 
+  //SEG137 [69] phi from init_screen::@1 to init_screen::@2 [phi:init_screen::@1->init_screen::@2]
+  //SEG138 [69] phi (byte) init_screen::m#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init_screen::@1->init_screen::@2#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG139 [69] phi (byte*) init_screen::COLS#3 = ((byte*))(word/dword/signed dword) $d800 [phi:init_screen::@1->init_screen::@3#1] -- pbuz1=pbuc1 
+  //SEG139 [69] phi (byte*) init_screen::COLS#3 = ((byte*))(word/dword/signed dword) $d800 [phi:init_screen::@1->init_screen::@2#1] -- pbuz1=pbuc1 
     lda #<$d800
     sta COLS
     lda #>$d800
     sta COLS+1
-  //SEG140 [69] phi from init_screen::@3 to init_screen::@3 [phi:init_screen::@3->init_screen::@3]
-  //SEG141 [69] phi (byte) init_screen::m#2 = (byte) init_screen::m#1 [phi:init_screen::@3->init_screen::@3#0] -- register_copy 
-  //SEG142 [69] phi (byte*) init_screen::COLS#3 = (byte*) init_screen::COLS#1 [phi:init_screen::@3->init_screen::@3#1] -- register_copy 
-  //SEG143 init_screen::@3
-  b3:
+  //SEG140 [69] phi from init_screen::@2 to init_screen::@2 [phi:init_screen::@2->init_screen::@2]
+  //SEG141 [69] phi (byte) init_screen::m#2 = (byte) init_screen::m#1 [phi:init_screen::@2->init_screen::@2#0] -- register_copy 
+  //SEG142 [69] phi (byte*) init_screen::COLS#3 = (byte*) init_screen::COLS#1 [phi:init_screen::@2->init_screen::@2#1] -- register_copy 
+  //SEG143 init_screen::@2
+  b2:
   //SEG144 [70] *((byte*) init_screen::COLS#3 + (byte/signed byte/word/signed word/dword/signed dword) 0) ← (const byte) init_screen::WHITE#0 -- pbuz1_derefidx_vbuc1=vbuc2 
     lda #WHITE
     ldy #0
@@ -3022,9 +3031,9 @@ init_screen: {
   !:
   //SEG149 [75] (byte) init_screen::m#1 ← ++ (byte) init_screen::m#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG150 [76] if((byte) init_screen::m#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto init_screen::@3 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG150 [76] if((byte) init_screen::m#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto init_screen::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$19
-    bne b3
+    bne b2
   //SEG151 init_screen::@return
   //SEG152 [77] return 
     rts
diff --git a/src/test/ref/examples/fastmultiply/fastmultiply8.sym b/src/test/ref/examples/fastmultiply/fastmultiply8.sym
index bf021c1ff..4fd2bb1f2 100644
--- a/src/test/ref/examples/fastmultiply/fastmultiply8.sym
+++ b/src/test/ref/examples/fastmultiply/fastmultiply8.sym
@@ -1,4 +1,4 @@
-(label) @22
+(label) @1
 (label) @begin
 (label) @end
 (signed byte*) ap
@@ -18,7 +18,7 @@
 (signed byte) fmul8::return#1 reg byte a 34.33333333333333
 (void()) init_screen()
 (label) init_screen::@1
-(label) init_screen::@3
+(label) init_screen::@2
 (label) init_screen::@return
 (byte*) init_screen::COLS
 (byte*) init_screen::COLS#1 COLS zp ZP_WORD:2 7.333333333333333
@@ -33,12 +33,12 @@
 (byte) init_screen::m#2 reg byte x 3.6666666666666665
 (void()) main()
 (label) main::@1
-(label) main::@10
-(label) main::@11
+(label) main::@2
 (label) main::@3
 (label) main::@4
 (label) main::@5
-(label) main::@8
+(label) main::@6
+(label) main::@7
 (label) main::@return
 (byte*) main::at
 (byte*) main::at#1 at zp ZP_WORD:2 7.333333333333333
@@ -99,7 +99,7 @@
 (label) print_sbyte_at::@1
 (label) print_sbyte_at::@2
 (label) print_sbyte_at::@3
-(label) print_sbyte_at::@5
+(label) print_sbyte_at::@4
 (label) print_sbyte_at::@return
 (byte*) print_sbyte_at::at
 (byte*) print_sbyte_at::at#0 at zp ZP_WORD:8 22.0
diff --git a/src/test/ref/examples/helloworld/helloworld.cfg b/src/test/ref/examples/helloworld/helloworld.cfg
index 755b1b697..db84a2e8f 100644
--- a/src/test/ref/examples/helloworld/helloworld.cfg
+++ b/src/test/ref/examples/helloworld/helloworld.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_str 
   to:main::@1
diff --git a/src/test/ref/examples/helloworld/helloworld.log b/src/test/ref/examples/helloworld/helloworld.log
index 44b0471bc..6d20c503d 100644
--- a/src/test/ref/examples/helloworld/helloworld.log
+++ b/src/test/ref/examples/helloworld/helloworld.log
@@ -232,8 +232,9 @@ Coalesced [22] print_str::str#5 ← print_str::str#0
 Coalesced [23] print_char_cursor#23 ← print_char_cursor#1
 Coalesced down to 3 phi equivalence classes
 Culled Empty Block (label) print_ln::@3
+Renumbering block @20 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @20
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -243,14 +244,14 @@ Adding NOP phi() at start of print_str
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_str 
   to:main::@1
@@ -329,17 +330,17 @@ INITIAL ASM
   .label print_line_cursor = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -492,17 +493,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -623,7 +624,7 @@ print_str: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b20
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -636,10 +637,10 @@ Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b20_from_bbegin:
-Removing instruction b20:
-Removing instruction main_from_b20:
-Removing instruction bend_from_b20:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction print_ln_from_b1:
 Removing instruction b1_from_b1:
@@ -663,7 +664,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -705,11 +706,11 @@ Score: 1235
   .label print_char_cursor = 4
   .label print_line_cursor = 2
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-//SEG5 @20
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/examples/helloworld/helloworld.sym b/src/test/ref/examples/helloworld/helloworld.sym
index 3446647cb..0776e46fd 100644
--- a/src/test/ref/examples/helloworld/helloworld.sym
+++ b/src/test/ref/examples/helloworld/helloworld.sym
@@ -1,4 +1,4 @@
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/examples/irq/irq-hyperscreen.cfg b/src/test/ref/examples/irq/irq-hyperscreen.cfg
index b0770b26e..2b94dd524 100644
--- a/src/test/ref/examples/irq/irq-hyperscreen.cfg
+++ b/src/test/ref/examples/irq/irq-hyperscreen.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@7
-@7: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @7
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @7
+main: scope:[main]  from @1
   [4] *((const byte*) GHOST_BYTE#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   asm { sei  }
   [6] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
diff --git a/src/test/ref/examples/irq/irq-hyperscreen.log b/src/test/ref/examples/irq/irq-hyperscreen.log
index cb82ac088..db0e4c84f 100644
--- a/src/test/ref/examples/irq/irq-hyperscreen.log
+++ b/src/test/ref/examples/irq/irq-hyperscreen.log
@@ -414,21 +414,22 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @7 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @7
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@7
-@7: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @7
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @7
+main: scope:[main]  from @1
   [4] *((const byte*) GHOST_BYTE#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   asm { sei  }
   [6] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
@@ -582,15 +583,15 @@ INITIAL ASM
   .label GHOST_BYTE = $3fff
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-b7_from_bbegin:
-  jmp b7
-//SEG5 @7
-b7:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @7 to @end [phi:@7->@end]
-bend_from_b7:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -760,15 +761,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label GHOST_BYTE = $3fff
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-b7_from_bbegin:
-  jmp b7
-//SEG5 @7
-b7:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @7 to @end [phi:@7->@end]
-bend_from_b7:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -879,15 +880,15 @@ irq_bottom_1: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b7
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b7_from_bbegin:
-Removing instruction b7:
-Removing instruction bend_from_b7:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction breturn:
@@ -901,7 +902,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @7
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -1036,10 +1037,10 @@ Score: 154
   .const RED = 2
   .label GHOST_BYTE = $3fff
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-//SEG5 @7
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @7 to @end [phi:@7->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
diff --git a/src/test/ref/examples/irq/irq-hyperscreen.sym b/src/test/ref/examples/irq/irq-hyperscreen.sym
index f56311f3b..1f7eb44c9 100644
--- a/src/test/ref/examples/irq/irq-hyperscreen.sym
+++ b/src/test/ref/examples/irq/irq-hyperscreen.sym
@@ -1,4 +1,4 @@
-(label) @7
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
diff --git a/src/test/ref/examples/multiplexer/simple-multiplexer.asm b/src/test/ref/examples/multiplexer/simple-multiplexer.asm
index 49d7f47fa..75a77ba73 100644
--- a/src/test/ref/examples/multiplexer/simple-multiplexer.asm
+++ b/src/test/ref/examples/multiplexer/simple-multiplexer.asm
@@ -40,31 +40,31 @@ loop: {
     .label ss = 7
     lda #0
     sta sin_idx
-  b6:
+  b2:
     lda #$ff
     cmp RASTER
-    bne b6
+    bne b2
     inc BORDERCOL
     ldx sin_idx
     ldy #0
-  b9:
+  b4:
     lda YSIN,x
     sta PLEX_YPOS,y
     txa
     axs #-[8]
     iny
     cpy #PLEX_COUNT-1+1
-    bne b9
+    bne b4
     inc sin_idx
     inc BORDERCOL
     jsr plexSort
     lda #BLACK
     sta BORDERCOL
-  b11:
+  b6:
     lda #VIC_RST8
     and D011
     cmp #0
-    bne b11
+    bne b6
     lda #0
     sta ss
     lda #1
@@ -74,25 +74,25 @@ loop: {
     sta plex_sprite_idx
     sta plex_free_next
   // Show the sprites
-  b14:
+  b7:
     lda #BLACK
     sta BORDERCOL
     ldy plex_free_next
     lda PLEX_FREE_YPOS,y
     sta plexFreeNextYpos1_return
-  b15:
+  b8:
     lda RASTER
     cmp plexFreeNextYpos1_return
-    bcc b15
+    bcc b8
     inc BORDERCOL
     jsr plexShowSprite
     inc ss
     lda #PLEX_COUNT-1+1
     cmp ss
-    bne b14
+    bne b7
     lda #BLACK
     sta BORDERCOL
-    jmp b6
+    jmp b2
 }
 // Show the next sprite.
 // plexSort() prepares showing the sprites
@@ -184,7 +184,7 @@ plexSort: {
     sta PLEX_SORTED_IDX+1,x
     dex
     cpx #$ff
-    bne b8
+    bne b5
   b4:
     inx
     lda nxt_idx
@@ -202,7 +202,7 @@ plexSort: {
     cpx #8
     bne plexFreePrepare1_b1
     rts
-  b8:
+  b5:
     lda nxt_y
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
diff --git a/src/test/ref/examples/multiplexer/simple-multiplexer.cfg b/src/test/ref/examples/multiplexer/simple-multiplexer.cfg
index c13d7fe1c..aa4efd915 100644
--- a/src/test/ref/examples/multiplexer/simple-multiplexer.cfg
+++ b/src/test/ref/examples/multiplexer/simple-multiplexer.cfg
@@ -1,7 +1,7 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@12
-@12: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) YSIN#0) {{ .var min = 50
     .var max = 250-21
     .var ampl = max-min;
@@ -13,14 +13,14 @@
         .for (var x=0;x<3; x++)
             .byte pic.getSinglecolorByte(x,y)
  }}
-  to:@15
-@15: scope:[]  from @12
+  to:@2
+@2: scope:[]  from @1
   [3] phi()
   [4] call main 
   to:@end
-@end: scope:[]  from @15
+@end: scope:[]  from @2
   [5] phi()
-main: scope:[main]  from @15
+main: scope:[main]  from @2
   asm { sei  }
   [7] call init 
   to:main::@1
@@ -34,62 +34,62 @@ main::@return: scope:[main]  from main::@1
 loop: scope:[loop]  from main::@1
   [11] phi()
   to:loop::@1
-loop::@1: scope:[loop]  from loop loop::@21
-  [12] (byte) loop::sin_idx#6 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@21/(byte) loop::sin_idx#1 )
-  to:loop::@6
-loop::@6: scope:[loop]  from loop::@1 loop::@6
-  [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6
-  to:loop::@8
-loop::@8: scope:[loop]  from loop::@6
+loop::@1: scope:[loop]  from loop loop::@10
+  [12] (byte) loop::sin_idx#6 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@10/(byte) loop::sin_idx#1 )
+  to:loop::@2
+loop::@2: scope:[loop]  from loop::@1 loop::@2
+  [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2
+  to:loop::@3
+loop::@3: scope:[loop]  from loop::@2
   [14] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [15] (byte~) loop::y_idx#3 ← (byte) loop::sin_idx#6
-  to:loop::@9
-loop::@9: scope:[loop]  from loop::@8 loop::@9
-  [16] (byte) loop::sy#2 ← phi( loop::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@9/(byte) loop::sy#1 )
-  [16] (byte) loop::y_idx#2 ← phi( loop::@8/(byte~) loop::y_idx#3 loop::@9/(byte) loop::y_idx#1 )
+  to:loop::@4
+loop::@4: scope:[loop]  from loop::@3 loop::@4
+  [16] (byte) loop::sy#2 ← phi( loop::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@4/(byte) loop::sy#1 )
+  [16] (byte) loop::y_idx#2 ← phi( loop::@3/(byte~) loop::y_idx#3 loop::@4/(byte) loop::y_idx#1 )
   [17] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2)
   [18] (byte) loop::y_idx#1 ← (byte) loop::y_idx#2 + (byte/signed byte/word/signed word/dword/signed dword) 8
   [19] (byte) loop::sy#1 ← ++ (byte) loop::sy#2
-  [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@9
-  to:loop::@10
-loop::@10: scope:[loop]  from loop::@9
+  [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@4
+  to:loop::@5
+loop::@5: scope:[loop]  from loop::@4
   [21] (byte) loop::sin_idx#1 ← (byte) loop::sin_idx#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [22] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [23] call plexSort 
-  to:loop::@30
-loop::@30: scope:[loop]  from loop::@10
-  [24] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0
   to:loop::@11
-loop::@11: scope:[loop]  from loop::@11 loop::@30
+loop::@11: scope:[loop]  from loop::@5
+  [24] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0
+  to:loop::@6
+loop::@6: scope:[loop]  from loop::@11 loop::@6
   [25] (byte~) loop::$4 ← *((const byte*) D011#0) & (const byte) VIC_RST8#0
-  [26] if((byte~) loop::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto loop::@11
-  to:loop::@14
-loop::@14: scope:[loop]  from loop::@11 loop::@31
-  [27] (byte) loop::ss#6 ← phi( loop::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@31/(byte) loop::ss#1 )
-  [27] (byte) plex_sprite_msb#44 ← phi( loop::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 loop::@31/(byte) plex_sprite_msb#16 )
-  [27] (byte) plex_show_idx#44 ← phi( loop::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@31/(byte) plex_show_idx#15 )
-  [27] (byte) plex_sprite_idx#44 ← phi( loop::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@31/(byte) plex_sprite_idx#15 )
-  [27] (byte) plex_free_next#17 ← phi( loop::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@31/(byte) plex_free_next#13 )
+  [26] if((byte~) loop::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto loop::@6
+  to:loop::@7
+loop::@7: scope:[loop]  from loop::@12 loop::@6
+  [27] (byte) loop::ss#6 ← phi( loop::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@12/(byte) loop::ss#1 )
+  [27] (byte) plex_sprite_msb#44 ← phi( loop::@6/(byte/signed byte/word/signed word/dword/signed dword) 1 loop::@12/(byte) plex_sprite_msb#16 )
+  [27] (byte) plex_show_idx#44 ← phi( loop::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@12/(byte) plex_show_idx#15 )
+  [27] (byte) plex_sprite_idx#44 ← phi( loop::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@12/(byte) plex_sprite_idx#15 )
+  [27] (byte) plex_free_next#17 ← phi( loop::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@12/(byte) plex_free_next#13 )
   [28] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0
   to:loop::plexFreeNextYpos1
-loop::plexFreeNextYpos1: scope:[loop]  from loop::@14
+loop::plexFreeNextYpos1: scope:[loop]  from loop::@7
   [29] (byte) loop::plexFreeNextYpos1_return#0 ← *((const byte[8]) PLEX_FREE_YPOS#0 + (byte) plex_free_next#17)
-  to:loop::@15
-loop::@15: scope:[loop]  from loop::@15 loop::plexFreeNextYpos1
-  [30] if(*((const byte*) RASTER#0)<(byte) loop::plexFreeNextYpos1_return#0) goto loop::@15
-  to:loop::@17
-loop::@17: scope:[loop]  from loop::@15
+  to:loop::@8
+loop::@8: scope:[loop]  from loop::@8 loop::plexFreeNextYpos1
+  [30] if(*((const byte*) RASTER#0)<(byte) loop::plexFreeNextYpos1_return#0) goto loop::@8
+  to:loop::@9
+loop::@9: scope:[loop]  from loop::@8
   [31] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [32] call plexShowSprite 
-  to:loop::@31
-loop::@31: scope:[loop]  from loop::@17
+  to:loop::@12
+loop::@12: scope:[loop]  from loop::@9
   [33] (byte) loop::ss#1 ← ++ (byte) loop::ss#6
-  [34] if((byte) loop::ss#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@14
-  to:loop::@21
-loop::@21: scope:[loop]  from loop::@31
+  [34] if((byte) loop::ss#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@7
+  to:loop::@10
+loop::@10: scope:[loop]  from loop::@12
   [35] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0
   to:loop::@1
-plexShowSprite: scope:[plexShowSprite]  from loop::@17
+plexShowSprite: scope:[plexShowSprite]  from loop::@9
   [36] (byte) plexShowSprite::plex_sprite_idx2#0 ← (byte) plex_sprite_idx#44 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [37] (byte) plexShowSprite::plexFreeAdd1_ypos#0 ← *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#44))
   [38] *((const byte*) SPRITES_YPOS#0 + (byte) plexShowSprite::plex_sprite_idx2#0) ← (byte) plexShowSprite::plexFreeAdd1_ypos#0
@@ -99,37 +99,37 @@ plexShowSprite::plexFreeAdd1: scope:[plexShowSprite]  from plexShowSprite
   [40] *((const byte[8]) PLEX_FREE_YPOS#0 + (byte) plex_free_next#17) ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$0#0
   [41] (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 ← (byte) plex_free_next#17 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [42] (byte) plex_free_next#13 ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  to:plexShowSprite::@7
-plexShowSprite::@7: scope:[plexShowSprite]  from plexShowSprite::plexFreeAdd1
+  to:plexShowSprite::@4
+plexShowSprite::@4: scope:[plexShowSprite]  from plexShowSprite::plexFreeAdd1
   [43] *((const byte*) PLEX_SCREEN_PTR#1 + (byte) plex_sprite_idx#44) ← *((const byte[PLEX_COUNT#0]) PLEX_PTR#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#44))
   [44] (byte) plexShowSprite::xpos_idx#0 ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#44) << (byte/signed byte/word/signed word/dword/signed dword) 1
   [45] (byte~) plexShowSprite::$3 ← < *((const word[PLEX_COUNT#0]) PLEX_XPOS#0 + (byte) plexShowSprite::xpos_idx#0)
   [46] *((const byte*) SPRITES_XPOS#0 + (byte) plexShowSprite::plex_sprite_idx2#0) ← (byte~) plexShowSprite::$3
   [47] (byte~) plexShowSprite::$4 ← > *((const word[PLEX_COUNT#0]) PLEX_XPOS#0 + (byte) plexShowSprite::xpos_idx#0)
   [48] if((byte~) plexShowSprite::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@1
-  to:plexShowSprite::@4
-plexShowSprite::@4: scope:[plexShowSprite]  from plexShowSprite::@7
+  to:plexShowSprite::@3
+plexShowSprite::@3: scope:[plexShowSprite]  from plexShowSprite::@4
   [49] (byte/word/dword~) plexShowSprite::$10 ← (byte/word/signed word/dword/signed dword) $ff ^ (byte) plex_sprite_msb#44
   [50] *((const byte*) SPRITES_XMSB#0) ← *((const byte*) SPRITES_XMSB#0) & (byte/word/dword~) plexShowSprite::$10
   to:plexShowSprite::@2
-plexShowSprite::@2: scope:[plexShowSprite]  from plexShowSprite::@1 plexShowSprite::@4
+plexShowSprite::@2: scope:[plexShowSprite]  from plexShowSprite::@1 plexShowSprite::@3
   [51] (byte/signed word/word/dword/signed dword~) plexShowSprite::$6 ← (byte) plex_sprite_idx#44 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [52] (byte) plex_sprite_idx#15 ← (byte/signed word/word/dword/signed dword~) plexShowSprite::$6 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [53] (byte) plex_show_idx#15 ← ++ (byte) plex_show_idx#44
   [54] (byte) plex_sprite_msb#25 ← (byte) plex_sprite_msb#44 << (byte/signed byte/word/signed word/dword/signed dword) 1
-  [55] if((byte) plex_sprite_msb#25!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@8
+  [55] if((byte) plex_sprite_msb#25!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@5
   to:plexShowSprite::@return
-plexShowSprite::@return: scope:[plexShowSprite]  from plexShowSprite::@2 plexShowSprite::@8
-  [56] (byte) plex_sprite_msb#16 ← phi( plexShowSprite::@8/(byte) plex_sprite_msb#25 plexShowSprite::@2/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+plexShowSprite::@return: scope:[plexShowSprite]  from plexShowSprite::@2 plexShowSprite::@5
+  [56] (byte) plex_sprite_msb#16 ← phi( plexShowSprite::@5/(byte) plex_sprite_msb#25 plexShowSprite::@2/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [57] return 
   to:@return
-plexShowSprite::@8: scope:[plexShowSprite]  from plexShowSprite::@2
+plexShowSprite::@5: scope:[plexShowSprite]  from plexShowSprite::@2
   [58] phi()
   to:plexShowSprite::@return
-plexShowSprite::@1: scope:[plexShowSprite]  from plexShowSprite::@7
+plexShowSprite::@1: scope:[plexShowSprite]  from plexShowSprite::@4
   [59] *((const byte*) SPRITES_XMSB#0) ← *((const byte*) SPRITES_XMSB#0) | (byte) plex_sprite_msb#44
   to:plexShowSprite::@2
-plexSort: scope:[plexSort]  from loop::@10
+plexSort: scope:[plexSort]  from loop::@5
   [60] phi()
   to:plexSort::@1
 plexSort::@1: scope:[plexSort]  from plexSort plexSort::@2
@@ -137,17 +137,17 @@ plexSort::@1: scope:[plexSort]  from plexSort plexSort::@2
   [62] (byte) plexSort::nxt_idx#0 ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) plexSort::m#2)
   [63] (byte) plexSort::nxt_y#0 ← *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) plexSort::nxt_idx#0)
   [64] if((byte) plexSort::nxt_y#0>=*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::m#2))) goto plexSort::@2
-  to:plexSort::@11
-plexSort::@11: scope:[plexSort]  from plexSort::@1
+  to:plexSort::@6
+plexSort::@6: scope:[plexSort]  from plexSort::@1
   [65] (byte~) plexSort::s#6 ← (byte) plexSort::m#2
   to:plexSort::@3
-plexSort::@3: scope:[plexSort]  from plexSort::@11 plexSort::@8
-  [66] (byte) plexSort::s#3 ← phi( plexSort::@8/(byte) plexSort::s#1 plexSort::@11/(byte~) plexSort::s#6 )
+plexSort::@3: scope:[plexSort]  from plexSort::@5 plexSort::@6
+  [66] (byte) plexSort::s#3 ← phi( plexSort::@5/(byte) plexSort::s#1 plexSort::@6/(byte~) plexSort::s#6 )
   [67] *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) plexSort::s#3) ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#3)
   [68] (byte) plexSort::s#1 ← -- (byte) plexSort::s#3
-  [69] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@8
+  [69] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@5
   to:plexSort::@4
-plexSort::@4: scope:[plexSort]  from plexSort::@3 plexSort::@8
+plexSort::@4: scope:[plexSort]  from plexSort::@3 plexSort::@5
   [70] (byte) plexSort::s#2 ← ++ (byte) plexSort::s#1
   [71] *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#2) ← (byte) plexSort::nxt_idx#0
   to:plexSort::@2
@@ -167,7 +167,7 @@ plexSort::plexFreePrepare1_@1: scope:[plexSort]  from plexSort::plexFreePrepare1
 plexSort::@return: scope:[plexSort]  from plexSort::plexFreePrepare1_@1
   [79] return 
   to:@return
-plexSort::@8: scope:[plexSort]  from plexSort::@3
+plexSort::@5: scope:[plexSort]  from plexSort::@3
   [80] if((byte) plexSort::nxt_y#0<*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#1))) goto plexSort::@3
   to:plexSort::@4
 init: scope:[init]  from main
diff --git a/src/test/ref/examples/multiplexer/simple-multiplexer.log b/src/test/ref/examples/multiplexer/simple-multiplexer.log
index 613dd425e..996af2178 100644
--- a/src/test/ref/examples/multiplexer/simple-multiplexer.log
+++ b/src/test/ref/examples/multiplexer/simple-multiplexer.log
@@ -1864,12 +1864,30 @@ Culled Empty Block (label) plexSort::@10
 Culled Empty Block (label) init::@7
 Culled Empty Block (label) init::@6
 Culled Empty Block (label) plexInit::@4
+Renumbering block @12 to @1
+Renumbering block @15 to @2
+Renumbering block plexSort::@8 to plexSort::@5
+Renumbering block plexSort::@11 to plexSort::@6
+Renumbering block plexShowSprite::@4 to plexShowSprite::@3
+Renumbering block plexShowSprite::@7 to plexShowSprite::@4
+Renumbering block plexShowSprite::@8 to plexShowSprite::@5
+Renumbering block loop::@6 to loop::@2
+Renumbering block loop::@8 to loop::@3
+Renumbering block loop::@9 to loop::@4
+Renumbering block loop::@10 to loop::@5
+Renumbering block loop::@11 to loop::@6
+Renumbering block loop::@14 to loop::@7
+Renumbering block loop::@15 to loop::@8
+Renumbering block loop::@17 to loop::@9
+Renumbering block loop::@21 to loop::@10
+Renumbering block loop::@30 to loop::@11
+Renumbering block loop::@31 to loop::@12
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @15
+Adding NOP phi() at start of @2
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of loop
-Adding NOP phi() at start of plexShowSprite::@8
+Adding NOP phi() at start of plexShowSprite::@5
 Adding NOP phi() at start of plexSort
 Adding NOP phi() at start of plexSort::plexFreePrepare1
 Adding NOP phi() at start of plexInit
@@ -1878,8 +1896,8 @@ Adding NOP phi() at start of plexInit::plexSetScreen1
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@12
-@12: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) YSIN#0) {{ .var min = 50
     .var max = 250-21
     .var ampl = max-min;
@@ -1891,14 +1909,14 @@ FINAL CONTROL FLOW GRAPH
         .for (var x=0;x<3; x++)
             .byte pic.getSinglecolorByte(x,y)
  }}
-  to:@15
-@15: scope:[]  from @12
+  to:@2
+@2: scope:[]  from @1
   [3] phi()
   [4] call main 
   to:@end
-@end: scope:[]  from @15
+@end: scope:[]  from @2
   [5] phi()
-main: scope:[main]  from @15
+main: scope:[main]  from @2
   asm { sei  }
   [7] call init 
   to:main::@1
@@ -1912,62 +1930,62 @@ main::@return: scope:[main]  from main::@1
 loop: scope:[loop]  from main::@1
   [11] phi()
   to:loop::@1
-loop::@1: scope:[loop]  from loop loop::@21
-  [12] (byte) loop::sin_idx#6 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@21/(byte) loop::sin_idx#1 )
-  to:loop::@6
-loop::@6: scope:[loop]  from loop::@1 loop::@6
-  [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6
-  to:loop::@8
-loop::@8: scope:[loop]  from loop::@6
+loop::@1: scope:[loop]  from loop loop::@10
+  [12] (byte) loop::sin_idx#6 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@10/(byte) loop::sin_idx#1 )
+  to:loop::@2
+loop::@2: scope:[loop]  from loop::@1 loop::@2
+  [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2
+  to:loop::@3
+loop::@3: scope:[loop]  from loop::@2
   [14] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [15] (byte~) loop::y_idx#3 ← (byte) loop::sin_idx#6
-  to:loop::@9
-loop::@9: scope:[loop]  from loop::@8 loop::@9
-  [16] (byte) loop::sy#2 ← phi( loop::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@9/(byte) loop::sy#1 )
-  [16] (byte) loop::y_idx#2 ← phi( loop::@8/(byte~) loop::y_idx#3 loop::@9/(byte) loop::y_idx#1 )
+  to:loop::@4
+loop::@4: scope:[loop]  from loop::@3 loop::@4
+  [16] (byte) loop::sy#2 ← phi( loop::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@4/(byte) loop::sy#1 )
+  [16] (byte) loop::y_idx#2 ← phi( loop::@3/(byte~) loop::y_idx#3 loop::@4/(byte) loop::y_idx#1 )
   [17] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2)
   [18] (byte) loop::y_idx#1 ← (byte) loop::y_idx#2 + (byte/signed byte/word/signed word/dword/signed dword) 8
   [19] (byte) loop::sy#1 ← ++ (byte) loop::sy#2
-  [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@9
-  to:loop::@10
-loop::@10: scope:[loop]  from loop::@9
+  [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@4
+  to:loop::@5
+loop::@5: scope:[loop]  from loop::@4
   [21] (byte) loop::sin_idx#1 ← (byte) loop::sin_idx#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [22] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [23] call plexSort 
-  to:loop::@30
-loop::@30: scope:[loop]  from loop::@10
-  [24] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0
   to:loop::@11
-loop::@11: scope:[loop]  from loop::@11 loop::@30
+loop::@11: scope:[loop]  from loop::@5
+  [24] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0
+  to:loop::@6
+loop::@6: scope:[loop]  from loop::@11 loop::@6
   [25] (byte~) loop::$4 ← *((const byte*) D011#0) & (const byte) VIC_RST8#0
-  [26] if((byte~) loop::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto loop::@11
-  to:loop::@14
-loop::@14: scope:[loop]  from loop::@11 loop::@31
-  [27] (byte) loop::ss#6 ← phi( loop::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@31/(byte) loop::ss#1 )
-  [27] (byte) plex_sprite_msb#44 ← phi( loop::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 loop::@31/(byte) plex_sprite_msb#16 )
-  [27] (byte) plex_show_idx#44 ← phi( loop::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@31/(byte) plex_show_idx#15 )
-  [27] (byte) plex_sprite_idx#44 ← phi( loop::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@31/(byte) plex_sprite_idx#15 )
-  [27] (byte) plex_free_next#17 ← phi( loop::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@31/(byte) plex_free_next#13 )
+  [26] if((byte~) loop::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto loop::@6
+  to:loop::@7
+loop::@7: scope:[loop]  from loop::@12 loop::@6
+  [27] (byte) loop::ss#6 ← phi( loop::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@12/(byte) loop::ss#1 )
+  [27] (byte) plex_sprite_msb#44 ← phi( loop::@6/(byte/signed byte/word/signed word/dword/signed dword) 1 loop::@12/(byte) plex_sprite_msb#16 )
+  [27] (byte) plex_show_idx#44 ← phi( loop::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@12/(byte) plex_show_idx#15 )
+  [27] (byte) plex_sprite_idx#44 ← phi( loop::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@12/(byte) plex_sprite_idx#15 )
+  [27] (byte) plex_free_next#17 ← phi( loop::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@12/(byte) plex_free_next#13 )
   [28] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0
   to:loop::plexFreeNextYpos1
-loop::plexFreeNextYpos1: scope:[loop]  from loop::@14
+loop::plexFreeNextYpos1: scope:[loop]  from loop::@7
   [29] (byte) loop::plexFreeNextYpos1_return#0 ← *((const byte[8]) PLEX_FREE_YPOS#0 + (byte) plex_free_next#17)
-  to:loop::@15
-loop::@15: scope:[loop]  from loop::@15 loop::plexFreeNextYpos1
-  [30] if(*((const byte*) RASTER#0)<(byte) loop::plexFreeNextYpos1_return#0) goto loop::@15
-  to:loop::@17
-loop::@17: scope:[loop]  from loop::@15
+  to:loop::@8
+loop::@8: scope:[loop]  from loop::@8 loop::plexFreeNextYpos1
+  [30] if(*((const byte*) RASTER#0)<(byte) loop::plexFreeNextYpos1_return#0) goto loop::@8
+  to:loop::@9
+loop::@9: scope:[loop]  from loop::@8
   [31] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [32] call plexShowSprite 
-  to:loop::@31
-loop::@31: scope:[loop]  from loop::@17
+  to:loop::@12
+loop::@12: scope:[loop]  from loop::@9
   [33] (byte) loop::ss#1 ← ++ (byte) loop::ss#6
-  [34] if((byte) loop::ss#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@14
-  to:loop::@21
-loop::@21: scope:[loop]  from loop::@31
+  [34] if((byte) loop::ss#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@7
+  to:loop::@10
+loop::@10: scope:[loop]  from loop::@12
   [35] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0
   to:loop::@1
-plexShowSprite: scope:[plexShowSprite]  from loop::@17
+plexShowSprite: scope:[plexShowSprite]  from loop::@9
   [36] (byte) plexShowSprite::plex_sprite_idx2#0 ← (byte) plex_sprite_idx#44 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [37] (byte) plexShowSprite::plexFreeAdd1_ypos#0 ← *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#44))
   [38] *((const byte*) SPRITES_YPOS#0 + (byte) plexShowSprite::plex_sprite_idx2#0) ← (byte) plexShowSprite::plexFreeAdd1_ypos#0
@@ -1977,37 +1995,37 @@ plexShowSprite::plexFreeAdd1: scope:[plexShowSprite]  from plexShowSprite
   [40] *((const byte[8]) PLEX_FREE_YPOS#0 + (byte) plex_free_next#17) ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$0#0
   [41] (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 ← (byte) plex_free_next#17 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [42] (byte) plex_free_next#13 ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  to:plexShowSprite::@7
-plexShowSprite::@7: scope:[plexShowSprite]  from plexShowSprite::plexFreeAdd1
+  to:plexShowSprite::@4
+plexShowSprite::@4: scope:[plexShowSprite]  from plexShowSprite::plexFreeAdd1
   [43] *((const byte*) PLEX_SCREEN_PTR#1 + (byte) plex_sprite_idx#44) ← *((const byte[PLEX_COUNT#0]) PLEX_PTR#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#44))
   [44] (byte) plexShowSprite::xpos_idx#0 ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#44) << (byte/signed byte/word/signed word/dword/signed dword) 1
   [45] (byte~) plexShowSprite::$3 ← < *((const word[PLEX_COUNT#0]) PLEX_XPOS#0 + (byte) plexShowSprite::xpos_idx#0)
   [46] *((const byte*) SPRITES_XPOS#0 + (byte) plexShowSprite::plex_sprite_idx2#0) ← (byte~) plexShowSprite::$3
   [47] (byte~) plexShowSprite::$4 ← > *((const word[PLEX_COUNT#0]) PLEX_XPOS#0 + (byte) plexShowSprite::xpos_idx#0)
   [48] if((byte~) plexShowSprite::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@1
-  to:plexShowSprite::@4
-plexShowSprite::@4: scope:[plexShowSprite]  from plexShowSprite::@7
+  to:plexShowSprite::@3
+plexShowSprite::@3: scope:[plexShowSprite]  from plexShowSprite::@4
   [49] (byte/word/dword~) plexShowSprite::$10 ← (byte/word/signed word/dword/signed dword) $ff ^ (byte) plex_sprite_msb#44
   [50] *((const byte*) SPRITES_XMSB#0) ← *((const byte*) SPRITES_XMSB#0) & (byte/word/dword~) plexShowSprite::$10
   to:plexShowSprite::@2
-plexShowSprite::@2: scope:[plexShowSprite]  from plexShowSprite::@1 plexShowSprite::@4
+plexShowSprite::@2: scope:[plexShowSprite]  from plexShowSprite::@1 plexShowSprite::@3
   [51] (byte/signed word/word/dword/signed dword~) plexShowSprite::$6 ← (byte) plex_sprite_idx#44 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [52] (byte) plex_sprite_idx#15 ← (byte/signed word/word/dword/signed dword~) plexShowSprite::$6 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [53] (byte) plex_show_idx#15 ← ++ (byte) plex_show_idx#44
   [54] (byte) plex_sprite_msb#25 ← (byte) plex_sprite_msb#44 << (byte/signed byte/word/signed word/dword/signed dword) 1
-  [55] if((byte) plex_sprite_msb#25!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@8
+  [55] if((byte) plex_sprite_msb#25!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@5
   to:plexShowSprite::@return
-plexShowSprite::@return: scope:[plexShowSprite]  from plexShowSprite::@2 plexShowSprite::@8
-  [56] (byte) plex_sprite_msb#16 ← phi( plexShowSprite::@8/(byte) plex_sprite_msb#25 plexShowSprite::@2/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+plexShowSprite::@return: scope:[plexShowSprite]  from plexShowSprite::@2 plexShowSprite::@5
+  [56] (byte) plex_sprite_msb#16 ← phi( plexShowSprite::@5/(byte) plex_sprite_msb#25 plexShowSprite::@2/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [57] return 
   to:@return
-plexShowSprite::@8: scope:[plexShowSprite]  from plexShowSprite::@2
+plexShowSprite::@5: scope:[plexShowSprite]  from plexShowSprite::@2
   [58] phi()
   to:plexShowSprite::@return
-plexShowSprite::@1: scope:[plexShowSprite]  from plexShowSprite::@7
+plexShowSprite::@1: scope:[plexShowSprite]  from plexShowSprite::@4
   [59] *((const byte*) SPRITES_XMSB#0) ← *((const byte*) SPRITES_XMSB#0) | (byte) plex_sprite_msb#44
   to:plexShowSprite::@2
-plexSort: scope:[plexSort]  from loop::@10
+plexSort: scope:[plexSort]  from loop::@5
   [60] phi()
   to:plexSort::@1
 plexSort::@1: scope:[plexSort]  from plexSort plexSort::@2
@@ -2015,17 +2033,17 @@ plexSort::@1: scope:[plexSort]  from plexSort plexSort::@2
   [62] (byte) plexSort::nxt_idx#0 ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) plexSort::m#2)
   [63] (byte) plexSort::nxt_y#0 ← *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) plexSort::nxt_idx#0)
   [64] if((byte) plexSort::nxt_y#0>=*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::m#2))) goto plexSort::@2
-  to:plexSort::@11
-plexSort::@11: scope:[plexSort]  from plexSort::@1
+  to:plexSort::@6
+plexSort::@6: scope:[plexSort]  from plexSort::@1
   [65] (byte~) plexSort::s#6 ← (byte) plexSort::m#2
   to:plexSort::@3
-plexSort::@3: scope:[plexSort]  from plexSort::@11 plexSort::@8
-  [66] (byte) plexSort::s#3 ← phi( plexSort::@8/(byte) plexSort::s#1 plexSort::@11/(byte~) plexSort::s#6 )
+plexSort::@3: scope:[plexSort]  from plexSort::@5 plexSort::@6
+  [66] (byte) plexSort::s#3 ← phi( plexSort::@5/(byte) plexSort::s#1 plexSort::@6/(byte~) plexSort::s#6 )
   [67] *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) plexSort::s#3) ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#3)
   [68] (byte) plexSort::s#1 ← -- (byte) plexSort::s#3
-  [69] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@8
+  [69] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@5
   to:plexSort::@4
-plexSort::@4: scope:[plexSort]  from plexSort::@3 plexSort::@8
+plexSort::@4: scope:[plexSort]  from plexSort::@3 plexSort::@5
   [70] (byte) plexSort::s#2 ← ++ (byte) plexSort::s#1
   [71] *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#2) ← (byte) plexSort::nxt_idx#0
   to:plexSort::@2
@@ -2045,7 +2063,7 @@ plexSort::plexFreePrepare1_@1: scope:[plexSort]  from plexSort::plexFreePrepare1
 plexSort::@return: scope:[plexSort]  from plexSort::plexFreePrepare1_@1
   [79] return 
   to:@return
-plexSort::@8: scope:[plexSort]  from plexSort::@3
+plexSort::@5: scope:[plexSort]  from plexSort::@3
   [80] if((byte) plexSort::nxt_y#0<*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#1))) goto plexSort::@3
   to:plexSort::@4
 init: scope:[init]  from main
@@ -2394,20 +2412,20 @@ INITIAL ASM
   .label plex_sprite_msb = 8
 //SEG3 @begin
 bbegin:
-  jmp b12
-//SEG4 @12
-b12:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) YSIN#0) {{ .var min = 50     .var max = 250-21     .var ampl = max-min;     .for(var i=0;i<256;i++)         .byte round(min+(ampl/2)+(ampl/2)*sin(toRadians(360*i/256)))  }}
 //SEG6 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
-//SEG7 [3] phi from @12 to @15 [phi:@12->@15]
-b15_from_b12:
-  jmp b15
-//SEG8 @15
-b15:
+//SEG7 [3] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG8 @2
+b2:
 //SEG9 [4] call main 
   jsr main
-//SEG10 [5] phi from @15 to @end [phi:@15->@end]
-bend_from_b15:
+//SEG10 [5] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG11 @end
 bend:
@@ -2449,35 +2467,35 @@ loop: {
     jmp b1
   //SEG24 loop::@1
   b1:
-    jmp b6
-  //SEG25 loop::@6
-  b6:
-  //SEG26 [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG25 loop::@2
+  b2:
+  //SEG26 [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b8
-  //SEG27 loop::@8
-  b8:
+    bne b2
+    jmp b3
+  //SEG27 loop::@3
+  b3:
   //SEG28 [14] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG29 [15] (byte~) loop::y_idx#3 ← (byte) loop::sin_idx#6 -- vbuz1=vbuz2 
     lda sin_idx
     sta y_idx
-  //SEG30 [16] phi from loop::@8 to loop::@9 [phi:loop::@8->loop::@9]
-  b9_from_b8:
-  //SEG31 [16] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@8->loop::@9#0] -- vbuz1=vbuc1 
+  //SEG30 [16] phi from loop::@3 to loop::@4 [phi:loop::@3->loop::@4]
+  b4_from_b3:
+  //SEG31 [16] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@3->loop::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta sy
-  //SEG32 [16] phi (byte) loop::y_idx#2 = (byte~) loop::y_idx#3 [phi:loop::@8->loop::@9#1] -- register_copy 
-    jmp b9
-  //SEG33 [16] phi from loop::@9 to loop::@9 [phi:loop::@9->loop::@9]
-  b9_from_b9:
-  //SEG34 [16] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@9->loop::@9#0] -- register_copy 
-  //SEG35 [16] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@9->loop::@9#1] -- register_copy 
-    jmp b9
-  //SEG36 loop::@9
-  b9:
+  //SEG32 [16] phi (byte) loop::y_idx#2 = (byte~) loop::y_idx#3 [phi:loop::@3->loop::@4#1] -- register_copy 
+    jmp b4
+  //SEG33 [16] phi from loop::@4 to loop::@4 [phi:loop::@4->loop::@4]
+  b4_from_b4:
+  //SEG34 [16] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@4->loop::@4#0] -- register_copy 
+  //SEG35 [16] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@4->loop::@4#1] -- register_copy 
+    jmp b4
+  //SEG36 loop::@4
+  b4:
   //SEG37 [17] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz2 
     ldy y_idx
     lda YSIN,y
@@ -2489,67 +2507,67 @@ loop: {
     stx y_idx
   //SEG39 [19] (byte) loop::sy#1 ← ++ (byte) loop::sy#2 -- vbuz1=_inc_vbuz1 
     inc sy
-  //SEG40 [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@9 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG40 [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #PLEX_COUNT-1+1
     cmp sy
-    bne b9_from_b9
-    jmp b10
-  //SEG41 loop::@10
-  b10:
+    bne b4_from_b4
+    jmp b5
+  //SEG41 loop::@5
+  b5:
   //SEG42 [21] (byte) loop::sin_idx#1 ← (byte) loop::sin_idx#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_plus_1 
     inc sin_idx
   //SEG43 [22] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG44 [23] call plexSort 
-  //SEG45 [60] phi from loop::@10 to plexSort [phi:loop::@10->plexSort]
-  plexSort_from_b10:
+  //SEG45 [60] phi from loop::@5 to plexSort [phi:loop::@5->plexSort]
+  plexSort_from_b5:
     jsr plexSort
-    jmp b30
-  //SEG46 loop::@30
-  b30:
+    jmp b11
+  //SEG46 loop::@11
+  b11:
   //SEG47 [24] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0 -- _deref_pbuc1=vbuc2 
     lda #BLACK
     sta BORDERCOL
-    jmp b11
-  //SEG48 loop::@11
-  b11:
+    jmp b6
+  //SEG48 loop::@6
+  b6:
   //SEG49 [25] (byte~) loop::$4 ← *((const byte*) D011#0) & (const byte) VIC_RST8#0 -- vbuz1=_deref_pbuc1_band_vbuc2 
     lda #VIC_RST8
     and D011
     sta _4
-  //SEG50 [26] if((byte~) loop::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto loop::@11 -- vbuz1_neq_0_then_la1 
+  //SEG50 [26] if((byte~) loop::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto loop::@6 -- vbuz1_neq_0_then_la1 
     lda _4
     cmp #0
-    bne b11
-  //SEG51 [27] phi from loop::@11 to loop::@14 [phi:loop::@11->loop::@14]
-  b14_from_b11:
-  //SEG52 [27] phi (byte) loop::ss#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#0] -- vbuz1=vbuc1 
+    bne b6
+  //SEG51 [27] phi from loop::@6 to loop::@7 [phi:loop::@6->loop::@7]
+  b7_from_b6:
+  //SEG52 [27] phi (byte) loop::ss#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#0] -- vbuz1=vbuc1 
     lda #0
     sta ss
-  //SEG53 [27] phi (byte) plex_sprite_msb#44 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:loop::@11->loop::@14#1] -- vbuz1=vbuc1 
+  //SEG53 [27] phi (byte) plex_sprite_msb#44 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:loop::@6->loop::@7#1] -- vbuz1=vbuc1 
     lda #1
     sta plex_sprite_msb
-  //SEG54 [27] phi (byte) plex_show_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#2] -- vbuz1=vbuc1 
+  //SEG54 [27] phi (byte) plex_show_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#2] -- vbuz1=vbuc1 
     lda #0
     sta plex_show_idx
-  //SEG55 [27] phi (byte) plex_sprite_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#3] -- vbuz1=vbuc1 
+  //SEG55 [27] phi (byte) plex_sprite_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#3] -- vbuz1=vbuc1 
     lda #0
     sta plex_sprite_idx
-  //SEG56 [27] phi (byte) plex_free_next#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#4] -- vbuz1=vbuc1 
+  //SEG56 [27] phi (byte) plex_free_next#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#4] -- vbuz1=vbuc1 
     lda #0
     sta plex_free_next
-    jmp b14
+    jmp b7
   // Show the sprites
-  //SEG57 [27] phi from loop::@31 to loop::@14 [phi:loop::@31->loop::@14]
-  b14_from_b31:
-  //SEG58 [27] phi (byte) loop::ss#6 = (byte) loop::ss#1 [phi:loop::@31->loop::@14#0] -- register_copy 
-  //SEG59 [27] phi (byte) plex_sprite_msb#44 = (byte) plex_sprite_msb#16 [phi:loop::@31->loop::@14#1] -- register_copy 
-  //SEG60 [27] phi (byte) plex_show_idx#44 = (byte) plex_show_idx#15 [phi:loop::@31->loop::@14#2] -- register_copy 
-  //SEG61 [27] phi (byte) plex_sprite_idx#44 = (byte) plex_sprite_idx#15 [phi:loop::@31->loop::@14#3] -- register_copy 
-  //SEG62 [27] phi (byte) plex_free_next#17 = (byte) plex_free_next#13 [phi:loop::@31->loop::@14#4] -- register_copy 
-    jmp b14
-  //SEG63 loop::@14
-  b14:
+  //SEG57 [27] phi from loop::@12 to loop::@7 [phi:loop::@12->loop::@7]
+  b7_from_b12:
+  //SEG58 [27] phi (byte) loop::ss#6 = (byte) loop::ss#1 [phi:loop::@12->loop::@7#0] -- register_copy 
+  //SEG59 [27] phi (byte) plex_sprite_msb#44 = (byte) plex_sprite_msb#16 [phi:loop::@12->loop::@7#1] -- register_copy 
+  //SEG60 [27] phi (byte) plex_show_idx#44 = (byte) plex_show_idx#15 [phi:loop::@12->loop::@7#2] -- register_copy 
+  //SEG61 [27] phi (byte) plex_sprite_idx#44 = (byte) plex_sprite_idx#15 [phi:loop::@12->loop::@7#3] -- register_copy 
+  //SEG62 [27] phi (byte) plex_free_next#17 = (byte) plex_free_next#13 [phi:loop::@12->loop::@7#4] -- register_copy 
+    jmp b7
+  //SEG63 loop::@7
+  b7:
   //SEG64 [28] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0 -- _deref_pbuc1=vbuc2 
     lda #BLACK
     sta BORDERCOL
@@ -2560,38 +2578,38 @@ loop: {
     ldy plex_free_next
     lda PLEX_FREE_YPOS,y
     sta plexFreeNextYpos1_return
-    jmp b15
-  //SEG67 loop::@15
-  b15:
-  //SEG68 [30] if(*((const byte*) RASTER#0)<(byte) loop::plexFreeNextYpos1_return#0) goto loop::@15 -- _deref_pbuc1_lt_vbuz1_then_la1 
+    jmp b8
+  //SEG67 loop::@8
+  b8:
+  //SEG68 [30] if(*((const byte*) RASTER#0)<(byte) loop::plexFreeNextYpos1_return#0) goto loop::@8 -- _deref_pbuc1_lt_vbuz1_then_la1 
     lda RASTER
     cmp plexFreeNextYpos1_return
-    bcc b15
-    jmp b17
-  //SEG69 loop::@17
-  b17:
+    bcc b8
+    jmp b9
+  //SEG69 loop::@9
+  b9:
   //SEG70 [31] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG71 [32] call plexShowSprite 
     jsr plexShowSprite
-    jmp b31
-  //SEG72 loop::@31
-  b31:
+    jmp b12
+  //SEG72 loop::@12
+  b12:
   //SEG73 [33] (byte) loop::ss#1 ← ++ (byte) loop::ss#6 -- vbuz1=_inc_vbuz1 
     inc ss
-  //SEG74 [34] if((byte) loop::ss#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@14 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG74 [34] if((byte) loop::ss#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #PLEX_COUNT-1+1
     cmp ss
-    bne b14_from_b31
-    jmp b21
-  //SEG75 loop::@21
-  b21:
+    bne b7_from_b12
+    jmp b10
+  //SEG75 loop::@10
+  b10:
   //SEG76 [35] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0 -- _deref_pbuc1=vbuc2 
     lda #BLACK
     sta BORDERCOL
-  //SEG77 [12] phi from loop::@21 to loop::@1 [phi:loop::@21->loop::@1]
-  b1_from_b21:
-  //SEG78 [12] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#1 [phi:loop::@21->loop::@1#0] -- register_copy 
+  //SEG77 [12] phi from loop::@10 to loop::@1 [phi:loop::@10->loop::@1]
+  b1_from_b10:
+  //SEG78 [12] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#1 [phi:loop::@10->loop::@1#0] -- register_copy 
     jmp b1
 }
 //SEG79 plexShowSprite
@@ -2639,9 +2657,9 @@ plexShowSprite: {
     lda #7
     and plexFreeAdd1__1
     sta plex_free_next
-    jmp b7
-  //SEG88 plexShowSprite::@7
-  b7:
+    jmp b4
+  //SEG88 plexShowSprite::@4
+  b4:
   //SEG89 [43] *((const byte*) PLEX_SCREEN_PTR#1 + (byte) plex_sprite_idx#44) ← *((const byte[PLEX_COUNT#0]) PLEX_PTR#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#44)) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_pbuc3_derefidx_vbuz2 
     ldx plex_show_idx
     ldy PLEX_SORTED_IDX,x
@@ -2669,9 +2687,9 @@ plexShowSprite: {
     lda _4
     cmp #0
     bne b1
-    jmp b4
-  //SEG95 plexShowSprite::@4
-  b4:
+    jmp b3
+  //SEG95 plexShowSprite::@3
+  b3:
   //SEG96 [49] (byte/word/dword~) plexShowSprite::$10 ← (byte/word/signed word/dword/signed dword) $ff ^ (byte) plex_sprite_msb#44 -- vbuz1=vbuc1_bxor_vbuz2 
     lda plex_sprite_msb
     eor #$ff
@@ -2695,10 +2713,10 @@ plexShowSprite: {
     inc plex_show_idx
   //SEG102 [54] (byte) plex_sprite_msb#25 ← (byte) plex_sprite_msb#44 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_rol_1 
     asl plex_sprite_msb
-  //SEG103 [55] if((byte) plex_sprite_msb#25!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@8 -- vbuz1_neq_0_then_la1 
+  //SEG103 [55] if((byte) plex_sprite_msb#25!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@5 -- vbuz1_neq_0_then_la1 
     lda plex_sprite_msb
     cmp #0
-    bne b8_from_b2
+    bne b5_from_b2
   //SEG104 [56] phi from plexShowSprite::@2 to plexShowSprite::@return [phi:plexShowSprite::@2->plexShowSprite::@return]
   breturn_from_b2:
   //SEG105 [56] phi (byte) plex_sprite_msb#16 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:plexShowSprite::@2->plexShowSprite::@return#0] -- vbuz1=vbuc1 
@@ -2709,14 +2727,14 @@ plexShowSprite: {
   breturn:
   //SEG107 [57] return 
     rts
-  //SEG108 [58] phi from plexShowSprite::@2 to plexShowSprite::@8 [phi:plexShowSprite::@2->plexShowSprite::@8]
-  b8_from_b2:
-    jmp b8
-  //SEG109 plexShowSprite::@8
-  b8:
-  //SEG110 [56] phi from plexShowSprite::@8 to plexShowSprite::@return [phi:plexShowSprite::@8->plexShowSprite::@return]
-  breturn_from_b8:
-  //SEG111 [56] phi (byte) plex_sprite_msb#16 = (byte) plex_sprite_msb#25 [phi:plexShowSprite::@8->plexShowSprite::@return#0] -- register_copy 
+  //SEG108 [58] phi from plexShowSprite::@2 to plexShowSprite::@5 [phi:plexShowSprite::@2->plexShowSprite::@5]
+  b5_from_b2:
+    jmp b5
+  //SEG109 plexShowSprite::@5
+  b5:
+  //SEG110 [56] phi from plexShowSprite::@5 to plexShowSprite::@return [phi:plexShowSprite::@5->plexShowSprite::@return]
+  breturn_from_b5:
+  //SEG111 [56] phi (byte) plex_sprite_msb#16 = (byte) plex_sprite_msb#25 [phi:plexShowSprite::@5->plexShowSprite::@return#0] -- register_copy 
     jmp breturn
   //SEG112 plexShowSprite::@1
   b1:
@@ -2769,16 +2787,16 @@ plexSort: {
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
     bcs b2
-    jmp b11
-  //SEG123 plexSort::@11
-  b11:
+    jmp b6
+  //SEG123 plexSort::@6
+  b6:
   //SEG124 [65] (byte~) plexSort::s#6 ← (byte) plexSort::m#2 -- vbuz1=vbuz2 
     lda m
     sta s
-  //SEG125 [66] phi from plexSort::@11 plexSort::@8 to plexSort::@3 [phi:plexSort::@11/plexSort::@8->plexSort::@3]
-  b3_from_b11:
-  b3_from_b8:
-  //SEG126 [66] phi (byte) plexSort::s#3 = (byte~) plexSort::s#6 [phi:plexSort::@11/plexSort::@8->plexSort::@3#0] -- register_copy 
+  //SEG125 [66] phi from plexSort::@5 plexSort::@6 to plexSort::@3 [phi:plexSort::@5/plexSort::@6->plexSort::@3]
+  b3_from_b5:
+  b3_from_b6:
+  //SEG126 [66] phi (byte) plexSort::s#3 = (byte) plexSort::s#1 [phi:plexSort::@5/plexSort::@6->plexSort::@3#0] -- register_copy 
     jmp b3
   //SEG127 plexSort::@3
   b3:
@@ -2788,10 +2806,10 @@ plexSort: {
     sta PLEX_SORTED_IDX+1,y
   //SEG129 [68] (byte) plexSort::s#1 ← -- (byte) plexSort::s#3 -- vbuz1=_dec_vbuz1 
     dec s
-  //SEG130 [69] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG130 [69] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #$ff
     cmp s
-    bne b8
+    bne b5
     jmp b4
   //SEG131 plexSort::@4
   b4:
@@ -2844,14 +2862,14 @@ plexSort: {
   breturn:
   //SEG148 [79] return 
     rts
-  //SEG149 plexSort::@8
-  b8:
+  //SEG149 plexSort::@5
+  b5:
   //SEG150 [80] if((byte) plexSort::nxt_y#0<*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#1))) goto plexSort::@3 -- vbuz1_lt_pbuc1_derefidx_pbuc2_derefidx_vbuz2_then_la1 
     lda nxt_y
     ldx s
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
-    bcc b3_from_b8
+    bcc b3_from_b5
     jmp b4
 }
 //SEG151 init
@@ -3011,7 +3029,7 @@ plexInit: {
 
 
 REGISTER UPLIFT POTENTIAL REGISTERS
-Statement [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 [ loop::sin_idx#6 ] ( main:4::loop:9 [ loop::sin_idx#6 ] ) always clobbers reg byte a 
+Statement [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 [ loop::sin_idx#6 ] ( main:4::loop:9 [ loop::sin_idx#6 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ loop::sin_idx#6 loop::sin_idx#1 ]
 Statement [17] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2) [ loop::sin_idx#6 loop::y_idx#2 loop::sy#2 ] ( main:4::loop:9 [ loop::sin_idx#6 loop::y_idx#2 loop::sy#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:3 [ loop::y_idx#2 loop::y_idx#3 loop::y_idx#1 ]
@@ -3054,7 +3072,7 @@ Statement [87] (word) init::xp#1 ← (word) init::xp#2 + (byte/signed byte/word/
 Statement [90] *((const byte*) SPRITES_ENABLE#0) ← (byte/word/signed word/dword/signed dword) $ff [ ] ( main:4::init:7 [ ] ) always clobbers reg byte a 
 Statement [92] *((const byte*) SPRITES_COLS#0 + (byte) init::ss#2) ← (const byte) GREEN#0 [ init::ss#2 ] ( main:4::init:7 [ init::ss#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:16 [ init::ss#2 init::ss#1 ]
-Statement [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 [ loop::sin_idx#6 ] ( main:4::loop:9 [ loop::sin_idx#6 ] ) always clobbers reg byte a 
+Statement [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 [ loop::sin_idx#6 ] ( main:4::loop:9 [ loop::sin_idx#6 ] ) always clobbers reg byte a 
 Statement [17] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2) [ loop::sin_idx#6 loop::y_idx#2 loop::sy#2 ] ( main:4::loop:9 [ loop::sin_idx#6 loop::y_idx#2 loop::sy#2 ] ) always clobbers reg byte a 
 Statement [18] (byte) loop::y_idx#1 ← (byte) loop::y_idx#2 + (byte/signed byte/word/signed word/dword/signed dword) 8 [ loop::sin_idx#6 loop::sy#2 loop::y_idx#1 ] ( main:4::loop:9 [ loop::sin_idx#6 loop::sy#2 loop::y_idx#1 ] ) always clobbers reg byte a 
 Statement [24] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0 [ loop::sin_idx#1 ] ( main:4::loop:9 [ loop::sin_idx#1 ] ) always clobbers reg byte a 
@@ -3222,20 +3240,20 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label plex_sprite_msb = 6
 //SEG3 @begin
 bbegin:
-  jmp b12
-//SEG4 @12
-b12:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) YSIN#0) {{ .var min = 50     .var max = 250-21     .var ampl = max-min;     .for(var i=0;i<256;i++)         .byte round(min+(ampl/2)+(ampl/2)*sin(toRadians(360*i/256)))  }}
 //SEG6 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
-//SEG7 [3] phi from @12 to @15 [phi:@12->@15]
-b15_from_b12:
-  jmp b15
-//SEG8 @15
-b15:
+//SEG7 [3] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG8 @2
+b2:
 //SEG9 [4] call main 
   jsr main
-//SEG10 [5] phi from @15 to @end [phi:@15->@end]
-bend_from_b15:
+//SEG10 [5] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG11 @end
 bend:
@@ -3274,33 +3292,33 @@ loop: {
     jmp b1
   //SEG24 loop::@1
   b1:
-    jmp b6
-  //SEG25 loop::@6
-  b6:
-  //SEG26 [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG25 loop::@2
+  b2:
+  //SEG26 [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b8
-  //SEG27 loop::@8
-  b8:
+    bne b2
+    jmp b3
+  //SEG27 loop::@3
+  b3:
   //SEG28 [14] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG29 [15] (byte~) loop::y_idx#3 ← (byte) loop::sin_idx#6 -- vbuxx=vbuz1 
     ldx sin_idx
-  //SEG30 [16] phi from loop::@8 to loop::@9 [phi:loop::@8->loop::@9]
-  b9_from_b8:
-  //SEG31 [16] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@8->loop::@9#0] -- vbuyy=vbuc1 
+  //SEG30 [16] phi from loop::@3 to loop::@4 [phi:loop::@3->loop::@4]
+  b4_from_b3:
+  //SEG31 [16] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@3->loop::@4#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG32 [16] phi (byte) loop::y_idx#2 = (byte~) loop::y_idx#3 [phi:loop::@8->loop::@9#1] -- register_copy 
-    jmp b9
-  //SEG33 [16] phi from loop::@9 to loop::@9 [phi:loop::@9->loop::@9]
-  b9_from_b9:
-  //SEG34 [16] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@9->loop::@9#0] -- register_copy 
-  //SEG35 [16] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@9->loop::@9#1] -- register_copy 
-    jmp b9
-  //SEG36 loop::@9
-  b9:
+  //SEG32 [16] phi (byte) loop::y_idx#2 = (byte~) loop::y_idx#3 [phi:loop::@3->loop::@4#1] -- register_copy 
+    jmp b4
+  //SEG33 [16] phi from loop::@4 to loop::@4 [phi:loop::@4->loop::@4]
+  b4_from_b4:
+  //SEG34 [16] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@4->loop::@4#0] -- register_copy 
+  //SEG35 [16] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@4->loop::@4#1] -- register_copy 
+    jmp b4
+  //SEG36 loop::@4
+  b4:
   //SEG37 [17] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2) -- pbuc1_derefidx_vbuyy=pbuc2_derefidx_vbuxx 
     lda YSIN,x
     sta PLEX_YPOS,y
@@ -3309,64 +3327,64 @@ loop: {
     axs #-[8]
   //SEG39 [19] (byte) loop::sy#1 ← ++ (byte) loop::sy#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG40 [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@9 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG40 [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@4 -- vbuyy_neq_vbuc1_then_la1 
     cpy #PLEX_COUNT-1+1
-    bne b9_from_b9
-    jmp b10
-  //SEG41 loop::@10
-  b10:
+    bne b4_from_b4
+    jmp b5
+  //SEG41 loop::@5
+  b5:
   //SEG42 [21] (byte) loop::sin_idx#1 ← (byte) loop::sin_idx#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_plus_1 
     inc sin_idx
   //SEG43 [22] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG44 [23] call plexSort 
-  //SEG45 [60] phi from loop::@10 to plexSort [phi:loop::@10->plexSort]
-  plexSort_from_b10:
+  //SEG45 [60] phi from loop::@5 to plexSort [phi:loop::@5->plexSort]
+  plexSort_from_b5:
     jsr plexSort
-    jmp b30
-  //SEG46 loop::@30
-  b30:
+    jmp b11
+  //SEG46 loop::@11
+  b11:
   //SEG47 [24] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0 -- _deref_pbuc1=vbuc2 
     lda #BLACK
     sta BORDERCOL
-    jmp b11
-  //SEG48 loop::@11
-  b11:
+    jmp b6
+  //SEG48 loop::@6
+  b6:
   //SEG49 [25] (byte~) loop::$4 ← *((const byte*) D011#0) & (const byte) VIC_RST8#0 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #VIC_RST8
     and D011
-  //SEG50 [26] if((byte~) loop::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto loop::@11 -- vbuaa_neq_0_then_la1 
+  //SEG50 [26] if((byte~) loop::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto loop::@6 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b11
-  //SEG51 [27] phi from loop::@11 to loop::@14 [phi:loop::@11->loop::@14]
-  b14_from_b11:
-  //SEG52 [27] phi (byte) loop::ss#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#0] -- vbuz1=vbuc1 
+    bne b6
+  //SEG51 [27] phi from loop::@6 to loop::@7 [phi:loop::@6->loop::@7]
+  b7_from_b6:
+  //SEG52 [27] phi (byte) loop::ss#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#0] -- vbuz1=vbuc1 
     lda #0
     sta ss
-  //SEG53 [27] phi (byte) plex_sprite_msb#44 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:loop::@11->loop::@14#1] -- vbuz1=vbuc1 
+  //SEG53 [27] phi (byte) plex_sprite_msb#44 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:loop::@6->loop::@7#1] -- vbuz1=vbuc1 
     lda #1
     sta plex_sprite_msb
-  //SEG54 [27] phi (byte) plex_show_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#2] -- vbuz1=vbuc1 
+  //SEG54 [27] phi (byte) plex_show_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#2] -- vbuz1=vbuc1 
     lda #0
     sta plex_show_idx
-  //SEG55 [27] phi (byte) plex_sprite_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#3] -- vbuz1=vbuc1 
+  //SEG55 [27] phi (byte) plex_sprite_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#3] -- vbuz1=vbuc1 
     lda #0
     sta plex_sprite_idx
-  //SEG56 [27] phi (byte) plex_free_next#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#4] -- vbuz1=vbuc1 
+  //SEG56 [27] phi (byte) plex_free_next#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#4] -- vbuz1=vbuc1 
     lda #0
     sta plex_free_next
-    jmp b14
+    jmp b7
   // Show the sprites
-  //SEG57 [27] phi from loop::@31 to loop::@14 [phi:loop::@31->loop::@14]
-  b14_from_b31:
-  //SEG58 [27] phi (byte) loop::ss#6 = (byte) loop::ss#1 [phi:loop::@31->loop::@14#0] -- register_copy 
-  //SEG59 [27] phi (byte) plex_sprite_msb#44 = (byte) plex_sprite_msb#16 [phi:loop::@31->loop::@14#1] -- register_copy 
-  //SEG60 [27] phi (byte) plex_show_idx#44 = (byte) plex_show_idx#15 [phi:loop::@31->loop::@14#2] -- register_copy 
-  //SEG61 [27] phi (byte) plex_sprite_idx#44 = (byte) plex_sprite_idx#15 [phi:loop::@31->loop::@14#3] -- register_copy 
-  //SEG62 [27] phi (byte) plex_free_next#17 = (byte) plex_free_next#13 [phi:loop::@31->loop::@14#4] -- register_copy 
-    jmp b14
-  //SEG63 loop::@14
-  b14:
+  //SEG57 [27] phi from loop::@12 to loop::@7 [phi:loop::@12->loop::@7]
+  b7_from_b12:
+  //SEG58 [27] phi (byte) loop::ss#6 = (byte) loop::ss#1 [phi:loop::@12->loop::@7#0] -- register_copy 
+  //SEG59 [27] phi (byte) plex_sprite_msb#44 = (byte) plex_sprite_msb#16 [phi:loop::@12->loop::@7#1] -- register_copy 
+  //SEG60 [27] phi (byte) plex_show_idx#44 = (byte) plex_show_idx#15 [phi:loop::@12->loop::@7#2] -- register_copy 
+  //SEG61 [27] phi (byte) plex_sprite_idx#44 = (byte) plex_sprite_idx#15 [phi:loop::@12->loop::@7#3] -- register_copy 
+  //SEG62 [27] phi (byte) plex_free_next#17 = (byte) plex_free_next#13 [phi:loop::@12->loop::@7#4] -- register_copy 
+    jmp b7
+  //SEG63 loop::@7
+  b7:
   //SEG64 [28] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0 -- _deref_pbuc1=vbuc2 
     lda #BLACK
     sta BORDERCOL
@@ -3377,38 +3395,38 @@ loop: {
     ldy plex_free_next
     lda PLEX_FREE_YPOS,y
     sta plexFreeNextYpos1_return
-    jmp b15
-  //SEG67 loop::@15
-  b15:
-  //SEG68 [30] if(*((const byte*) RASTER#0)<(byte) loop::plexFreeNextYpos1_return#0) goto loop::@15 -- _deref_pbuc1_lt_vbuz1_then_la1 
+    jmp b8
+  //SEG67 loop::@8
+  b8:
+  //SEG68 [30] if(*((const byte*) RASTER#0)<(byte) loop::plexFreeNextYpos1_return#0) goto loop::@8 -- _deref_pbuc1_lt_vbuz1_then_la1 
     lda RASTER
     cmp plexFreeNextYpos1_return
-    bcc b15
-    jmp b17
-  //SEG69 loop::@17
-  b17:
+    bcc b8
+    jmp b9
+  //SEG69 loop::@9
+  b9:
   //SEG70 [31] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG71 [32] call plexShowSprite 
     jsr plexShowSprite
-    jmp b31
-  //SEG72 loop::@31
-  b31:
+    jmp b12
+  //SEG72 loop::@12
+  b12:
   //SEG73 [33] (byte) loop::ss#1 ← ++ (byte) loop::ss#6 -- vbuz1=_inc_vbuz1 
     inc ss
-  //SEG74 [34] if((byte) loop::ss#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@14 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG74 [34] if((byte) loop::ss#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #PLEX_COUNT-1+1
     cmp ss
-    bne b14_from_b31
-    jmp b21
-  //SEG75 loop::@21
-  b21:
+    bne b7_from_b12
+    jmp b10
+  //SEG75 loop::@10
+  b10:
   //SEG76 [35] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0 -- _deref_pbuc1=vbuc2 
     lda #BLACK
     sta BORDERCOL
-  //SEG77 [12] phi from loop::@21 to loop::@1 [phi:loop::@21->loop::@1]
-  b1_from_b21:
-  //SEG78 [12] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#1 [phi:loop::@21->loop::@1#0] -- register_copy 
+  //SEG77 [12] phi from loop::@10 to loop::@1 [phi:loop::@10->loop::@1]
+  b1_from_b10:
+  //SEG78 [12] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#1 [phi:loop::@10->loop::@1#0] -- register_copy 
     jmp b1
 }
 //SEG79 plexShowSprite
@@ -3442,9 +3460,9 @@ plexShowSprite: {
   //SEG87 [42] (byte) plex_free_next#13 ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax plex_free_next
-    jmp b7
-  //SEG88 plexShowSprite::@7
-  b7:
+    jmp b4
+  //SEG88 plexShowSprite::@4
+  b4:
   //SEG89 [43] *((const byte*) PLEX_SCREEN_PTR#1 + (byte) plex_sprite_idx#44) ← *((const byte[PLEX_COUNT#0]) PLEX_PTR#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#44)) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_pbuc3_derefidx_vbuz2 
     ldx plex_show_idx
     ldy PLEX_SORTED_IDX,x
@@ -3466,9 +3484,9 @@ plexShowSprite: {
   //SEG94 [48] if((byte~) plexShowSprite::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@1 -- vbuaa_neq_0_then_la1 
     cmp #0
     bne b1
-    jmp b4
-  //SEG95 plexShowSprite::@4
-  b4:
+    jmp b3
+  //SEG95 plexShowSprite::@3
+  b3:
   //SEG96 [49] (byte/word/dword~) plexShowSprite::$10 ← (byte/word/signed word/dword/signed dword) $ff ^ (byte) plex_sprite_msb#44 -- vbuaa=vbuc1_bxor_vbuz1 
     lda plex_sprite_msb
     eor #$ff
@@ -3488,10 +3506,10 @@ plexShowSprite: {
     inc plex_show_idx
   //SEG102 [54] (byte) plex_sprite_msb#25 ← (byte) plex_sprite_msb#44 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_rol_1 
     asl plex_sprite_msb
-  //SEG103 [55] if((byte) plex_sprite_msb#25!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@8 -- vbuz1_neq_0_then_la1 
+  //SEG103 [55] if((byte) plex_sprite_msb#25!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@5 -- vbuz1_neq_0_then_la1 
     lda plex_sprite_msb
     cmp #0
-    bne b8_from_b2
+    bne b5_from_b2
   //SEG104 [56] phi from plexShowSprite::@2 to plexShowSprite::@return [phi:plexShowSprite::@2->plexShowSprite::@return]
   breturn_from_b2:
   //SEG105 [56] phi (byte) plex_sprite_msb#16 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:plexShowSprite::@2->plexShowSprite::@return#0] -- vbuz1=vbuc1 
@@ -3502,14 +3520,14 @@ plexShowSprite: {
   breturn:
   //SEG107 [57] return 
     rts
-  //SEG108 [58] phi from plexShowSprite::@2 to plexShowSprite::@8 [phi:plexShowSprite::@2->plexShowSprite::@8]
-  b8_from_b2:
-    jmp b8
-  //SEG109 plexShowSprite::@8
-  b8:
-  //SEG110 [56] phi from plexShowSprite::@8 to plexShowSprite::@return [phi:plexShowSprite::@8->plexShowSprite::@return]
-  breturn_from_b8:
-  //SEG111 [56] phi (byte) plex_sprite_msb#16 = (byte) plex_sprite_msb#25 [phi:plexShowSprite::@8->plexShowSprite::@return#0] -- register_copy 
+  //SEG108 [58] phi from plexShowSprite::@2 to plexShowSprite::@5 [phi:plexShowSprite::@2->plexShowSprite::@5]
+  b5_from_b2:
+    jmp b5
+  //SEG109 plexShowSprite::@5
+  b5:
+  //SEG110 [56] phi from plexShowSprite::@5 to plexShowSprite::@return [phi:plexShowSprite::@5->plexShowSprite::@return]
+  breturn_from_b5:
+  //SEG111 [56] phi (byte) plex_sprite_msb#16 = (byte) plex_sprite_msb#25 [phi:plexShowSprite::@5->plexShowSprite::@return#0] -- register_copy 
     jmp breturn
   //SEG112 plexShowSprite::@1
   b1:
@@ -3559,15 +3577,15 @@ plexSort: {
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
     bcs b2
-    jmp b11
-  //SEG123 plexSort::@11
-  b11:
+    jmp b6
+  //SEG123 plexSort::@6
+  b6:
   //SEG124 [65] (byte~) plexSort::s#6 ← (byte) plexSort::m#2 -- vbuxx=vbuz1 
     ldx m
-  //SEG125 [66] phi from plexSort::@11 plexSort::@8 to plexSort::@3 [phi:plexSort::@11/plexSort::@8->plexSort::@3]
-  b3_from_b11:
-  b3_from_b8:
-  //SEG126 [66] phi (byte) plexSort::s#3 = (byte~) plexSort::s#6 [phi:plexSort::@11/plexSort::@8->plexSort::@3#0] -- register_copy 
+  //SEG125 [66] phi from plexSort::@5 plexSort::@6 to plexSort::@3 [phi:plexSort::@5/plexSort::@6->plexSort::@3]
+  b3_from_b5:
+  b3_from_b6:
+  //SEG126 [66] phi (byte) plexSort::s#3 = (byte) plexSort::s#1 [phi:plexSort::@5/plexSort::@6->plexSort::@3#0] -- register_copy 
     jmp b3
   //SEG127 plexSort::@3
   b3:
@@ -3576,9 +3594,9 @@ plexSort: {
     sta PLEX_SORTED_IDX+1,x
   //SEG129 [68] (byte) plexSort::s#1 ← -- (byte) plexSort::s#3 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG130 [69] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG130 [69] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@5 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$ff
-    bne b8
+    bne b5
     jmp b4
   //SEG131 plexSort::@4
   b4:
@@ -3625,13 +3643,13 @@ plexSort: {
   breturn:
   //SEG148 [79] return 
     rts
-  //SEG149 plexSort::@8
-  b8:
+  //SEG149 plexSort::@5
+  b5:
   //SEG150 [80] if((byte) plexSort::nxt_y#0<*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#1))) goto plexSort::@3 -- vbuz1_lt_pbuc1_derefidx_pbuc2_derefidx_vbuxx_then_la1 
     lda nxt_y
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
-    bcc b3_from_b8
+    bcc b3_from_b5
     jmp b4
 }
 //SEG151 init
@@ -3777,32 +3795,32 @@ plexInit: {
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b12
-Removing instruction jmp b15
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b11
 Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp plexFreeNextYpos1
 Removing instruction jmp b8
 Removing instruction jmp b9
+Removing instruction jmp b12
 Removing instruction jmp b10
-Removing instruction jmp b30
-Removing instruction jmp b11
-Removing instruction jmp b14
-Removing instruction jmp plexFreeNextYpos1
-Removing instruction jmp b15
-Removing instruction jmp b17
-Removing instruction jmp b31
-Removing instruction jmp b21
 Removing instruction jmp plexFreeAdd1
-Removing instruction jmp b7
 Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp breturn
-Removing instruction jmp b8
+Removing instruction jmp b5
 Removing instruction jmp b1
-Removing instruction jmp b11
+Removing instruction jmp b6
 Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b2
@@ -3823,30 +3841,30 @@ Replacing instruction ldy nxt_idx with TAY
 Removing instruction lda nxt_y
 Replacing instruction ldx #0 with TAX
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b9_from_b9 with b9
-Replacing label b14_from_b31 with b14
-Replacing label b1 with b6
-Replacing label b8_from_b2 with b8
+Replacing label b4_from_b4 with b4
+Replacing label b7_from_b12 with b7
+Replacing label b1 with b2
+Replacing label b5_from_b2 with b5
 Replacing label b1_from_b2 with b1
 Replacing label plexFreePrepare1_b1_from_plexFreePrepare1_b1 with plexFreePrepare1_b1
-Replacing label b3_from_b8 with b3
+Replacing label b3_from_b5 with b3
 Replacing label b1_from_b1 with b1
 Replacing label b3_from_b3 with b3
 Replacing label b1_from_b1 with b1
-Removing instruction b12:
-Removing instruction b15_from_b12:
-Removing instruction b15:
-Removing instruction bend_from_b15:
+Removing instruction b1:
+Removing instruction b2_from_b1:
+Removing instruction b2:
+Removing instruction bend_from_b2:
 Removing instruction b1_from_main:
 Removing instruction loop_from_b1:
 Removing instruction b1:
-Removing instruction b9_from_b9:
-Removing instruction b14_from_b31:
-Removing instruction b8_from_b2:
-Removing instruction breturn_from_b8:
+Removing instruction b4_from_b4:
+Removing instruction b7_from_b12:
+Removing instruction b5_from_b2:
+Removing instruction breturn_from_b5:
 Removing instruction b1_from_b2:
-Removing instruction b3_from_b11:
-Removing instruction b3_from_b8:
+Removing instruction b3_from_b5:
+Removing instruction b3_from_b6:
 Removing instruction plexFreePrepare1_from_b2:
 Removing instruction plexFreePrepare1_b1_from_plexFreePrepare1:
 Removing instruction plexFreePrepare1_b1_from_plexFreePrepare1_b1:
@@ -3860,23 +3878,23 @@ Removing instruction bend:
 Removing instruction b1:
 Removing instruction breturn:
 Removing instruction b1_from_loop:
-Removing instruction b8:
-Removing instruction b9_from_b8:
-Removing instruction b10:
-Removing instruction plexSort_from_b10:
-Removing instruction b30:
-Removing instruction b14_from_b11:
+Removing instruction b3:
+Removing instruction b4_from_b3:
+Removing instruction b5:
+Removing instruction plexSort_from_b5:
+Removing instruction b11:
+Removing instruction b7_from_b6:
 Removing instruction plexFreeNextYpos1:
-Removing instruction b17:
-Removing instruction b31:
-Removing instruction b21:
-Removing instruction b1_from_b21:
+Removing instruction b9:
+Removing instruction b12:
+Removing instruction b10:
+Removing instruction b1_from_b10:
 Removing instruction plexFreeAdd1:
-Removing instruction b7:
 Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn_from_b2:
 Removing instruction b1_from_plexSort:
-Removing instruction b11:
+Removing instruction b6:
 Removing instruction plexFreePrepare1:
 Removing instruction breturn:
 Removing instruction plexInit_from_init:
@@ -3890,10 +3908,10 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to breturn in bne b8
+Skipping double jump to breturn in bne b5
 Succesful ASM optimization Pass5DoubleJumpElimination
-Removing instruction jmp b9
-Removing instruction jmp b14
+Removing instruction jmp b4
+Removing instruction jmp b7
 Removing instruction jmp b1
 Removing instruction jmp plexFreePrepare1_b1
 Removing instruction jmp b1
@@ -3903,14 +3921,14 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction ldx m
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
-Removing instruction b8:
+Removing instruction b5:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp breturn
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @12
-(label) @15
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -4045,13 +4063,13 @@ FINAL SYMBOL TABLE
 (label) loop::@1
 (label) loop::@10
 (label) loop::@11
-(label) loop::@14
-(label) loop::@15
-(label) loop::@17
-(label) loop::@21
-(label) loop::@30
-(label) loop::@31
+(label) loop::@12
+(label) loop::@2
+(label) loop::@3
+(label) loop::@4
+(label) loop::@5
 (label) loop::@6
+(label) loop::@7
 (label) loop::@8
 (label) loop::@9
 (label) loop::plexFreeNextYpos1
@@ -4091,9 +4109,9 @@ FINAL SYMBOL TABLE
 (byte/signed word/word/dword/signed dword~) plexShowSprite::$6 reg byte x 4.0
 (label) plexShowSprite::@1
 (label) plexShowSprite::@2
+(label) plexShowSprite::@3
 (label) plexShowSprite::@4
-(label) plexShowSprite::@7
-(label) plexShowSprite::@8
+(label) plexShowSprite::@5
 (label) plexShowSprite::@return
 (label) plexShowSprite::plexFreeAdd1
 (byte/signed word/word/dword/signed dword~) plexShowSprite::plexFreeAdd1_$0
@@ -4110,11 +4128,11 @@ FINAL SYMBOL TABLE
 (byte) plexShowSprite::ypos
 (void()) plexSort()
 (label) plexSort::@1
-(label) plexSort::@11
 (label) plexSort::@2
 (label) plexSort::@3
 (label) plexSort::@4
-(label) plexSort::@8
+(label) plexSort::@5
+(label) plexSort::@6
 (label) plexSort::@return
 (byte) plexSort::m
 (byte) plexSort::m#1 m zp ZP_BYTE:3 151.5
@@ -4212,13 +4230,13 @@ Score: 63150
   .label plex_show_idx = 5
   .label plex_sprite_msb = 6
 //SEG3 @begin
-//SEG4 @12
+//SEG4 @1
 //SEG5 kickasm(location (const byte*) YSIN#0) {{ .var min = 50     .var max = 250-21     .var ampl = max-min;     .for(var i=0;i<256;i++)         .byte round(min+(ampl/2)+(ampl/2)*sin(toRadians(360*i/256)))  }}
 //SEG6 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
-//SEG7 [3] phi from @12 to @15 [phi:@12->@15]
-//SEG8 @15
+//SEG7 [3] phi from @1 to @2 [phi:@1->@2]
+//SEG8 @2
 //SEG9 [4] call main 
-//SEG10 [5] phi from @15 to @end [phi:@15->@end]
+//SEG10 [5] phi from @2 to @end [phi:@2->@end]
 //SEG11 @end
 //SEG12 main
 main: {
@@ -4246,26 +4264,26 @@ loop: {
     lda #0
     sta sin_idx
   //SEG24 loop::@1
-  //SEG25 loop::@6
-  b6:
-  //SEG26 [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG25 loop::@2
+  b2:
+  //SEG26 [13] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG27 loop::@8
+    bne b2
+  //SEG27 loop::@3
   //SEG28 [14] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG29 [15] (byte~) loop::y_idx#3 ← (byte) loop::sin_idx#6 -- vbuxx=vbuz1 
     ldx sin_idx
-  //SEG30 [16] phi from loop::@8 to loop::@9 [phi:loop::@8->loop::@9]
-  //SEG31 [16] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@8->loop::@9#0] -- vbuyy=vbuc1 
+  //SEG30 [16] phi from loop::@3 to loop::@4 [phi:loop::@3->loop::@4]
+  //SEG31 [16] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@3->loop::@4#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG32 [16] phi (byte) loop::y_idx#2 = (byte~) loop::y_idx#3 [phi:loop::@8->loop::@9#1] -- register_copy 
-  //SEG33 [16] phi from loop::@9 to loop::@9 [phi:loop::@9->loop::@9]
-  //SEG34 [16] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@9->loop::@9#0] -- register_copy 
-  //SEG35 [16] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@9->loop::@9#1] -- register_copy 
-  //SEG36 loop::@9
-  b9:
+  //SEG32 [16] phi (byte) loop::y_idx#2 = (byte~) loop::y_idx#3 [phi:loop::@3->loop::@4#1] -- register_copy 
+  //SEG33 [16] phi from loop::@4 to loop::@4 [phi:loop::@4->loop::@4]
+  //SEG34 [16] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@4->loop::@4#0] -- register_copy 
+  //SEG35 [16] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@4->loop::@4#1] -- register_copy 
+  //SEG36 loop::@4
+  b4:
   //SEG37 [17] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2) -- pbuc1_derefidx_vbuyy=pbuc2_derefidx_vbuxx 
     lda YSIN,x
     sta PLEX_YPOS,y
@@ -4274,52 +4292,52 @@ loop: {
     axs #-[8]
   //SEG39 [19] (byte) loop::sy#1 ← ++ (byte) loop::sy#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG40 [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@9 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG40 [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@4 -- vbuyy_neq_vbuc1_then_la1 
     cpy #PLEX_COUNT-1+1
-    bne b9
-  //SEG41 loop::@10
+    bne b4
+  //SEG41 loop::@5
   //SEG42 [21] (byte) loop::sin_idx#1 ← (byte) loop::sin_idx#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_plus_1 
     inc sin_idx
   //SEG43 [22] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG44 [23] call plexSort 
-  //SEG45 [60] phi from loop::@10 to plexSort [phi:loop::@10->plexSort]
+  //SEG45 [60] phi from loop::@5 to plexSort [phi:loop::@5->plexSort]
     jsr plexSort
-  //SEG46 loop::@30
+  //SEG46 loop::@11
   //SEG47 [24] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0 -- _deref_pbuc1=vbuc2 
     lda #BLACK
     sta BORDERCOL
-  //SEG48 loop::@11
-  b11:
+  //SEG48 loop::@6
+  b6:
   //SEG49 [25] (byte~) loop::$4 ← *((const byte*) D011#0) & (const byte) VIC_RST8#0 -- vbuaa=_deref_pbuc1_band_vbuc2 
     lda #VIC_RST8
     and D011
-  //SEG50 [26] if((byte~) loop::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto loop::@11 -- vbuaa_neq_0_then_la1 
+  //SEG50 [26] if((byte~) loop::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto loop::@6 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b11
-  //SEG51 [27] phi from loop::@11 to loop::@14 [phi:loop::@11->loop::@14]
-  //SEG52 [27] phi (byte) loop::ss#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#0] -- vbuz1=vbuc1 
+    bne b6
+  //SEG51 [27] phi from loop::@6 to loop::@7 [phi:loop::@6->loop::@7]
+  //SEG52 [27] phi (byte) loop::ss#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#0] -- vbuz1=vbuc1 
     lda #0
     sta ss
-  //SEG53 [27] phi (byte) plex_sprite_msb#44 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:loop::@11->loop::@14#1] -- vbuz1=vbuc1 
+  //SEG53 [27] phi (byte) plex_sprite_msb#44 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:loop::@6->loop::@7#1] -- vbuz1=vbuc1 
     lda #1
     sta plex_sprite_msb
-  //SEG54 [27] phi (byte) plex_show_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#2] -- vbuz1=vbuc1 
+  //SEG54 [27] phi (byte) plex_show_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#2] -- vbuz1=vbuc1 
     lda #0
     sta plex_show_idx
-  //SEG55 [27] phi (byte) plex_sprite_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#3] -- vbuz1=vbuc1 
+  //SEG55 [27] phi (byte) plex_sprite_idx#44 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#3] -- vbuz1=vbuc1 
     sta plex_sprite_idx
-  //SEG56 [27] phi (byte) plex_free_next#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@11->loop::@14#4] -- vbuz1=vbuc1 
+  //SEG56 [27] phi (byte) plex_free_next#17 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@6->loop::@7#4] -- vbuz1=vbuc1 
     sta plex_free_next
   // Show the sprites
-  //SEG57 [27] phi from loop::@31 to loop::@14 [phi:loop::@31->loop::@14]
-  //SEG58 [27] phi (byte) loop::ss#6 = (byte) loop::ss#1 [phi:loop::@31->loop::@14#0] -- register_copy 
-  //SEG59 [27] phi (byte) plex_sprite_msb#44 = (byte) plex_sprite_msb#16 [phi:loop::@31->loop::@14#1] -- register_copy 
-  //SEG60 [27] phi (byte) plex_show_idx#44 = (byte) plex_show_idx#15 [phi:loop::@31->loop::@14#2] -- register_copy 
-  //SEG61 [27] phi (byte) plex_sprite_idx#44 = (byte) plex_sprite_idx#15 [phi:loop::@31->loop::@14#3] -- register_copy 
-  //SEG62 [27] phi (byte) plex_free_next#17 = (byte) plex_free_next#13 [phi:loop::@31->loop::@14#4] -- register_copy 
-  //SEG63 loop::@14
-  b14:
+  //SEG57 [27] phi from loop::@12 to loop::@7 [phi:loop::@12->loop::@7]
+  //SEG58 [27] phi (byte) loop::ss#6 = (byte) loop::ss#1 [phi:loop::@12->loop::@7#0] -- register_copy 
+  //SEG59 [27] phi (byte) plex_sprite_msb#44 = (byte) plex_sprite_msb#16 [phi:loop::@12->loop::@7#1] -- register_copy 
+  //SEG60 [27] phi (byte) plex_show_idx#44 = (byte) plex_show_idx#15 [phi:loop::@12->loop::@7#2] -- register_copy 
+  //SEG61 [27] phi (byte) plex_sprite_idx#44 = (byte) plex_sprite_idx#15 [phi:loop::@12->loop::@7#3] -- register_copy 
+  //SEG62 [27] phi (byte) plex_free_next#17 = (byte) plex_free_next#13 [phi:loop::@12->loop::@7#4] -- register_copy 
+  //SEG63 loop::@7
+  b7:
   //SEG64 [28] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0 -- _deref_pbuc1=vbuc2 
     lda #BLACK
     sta BORDERCOL
@@ -4328,31 +4346,31 @@ loop: {
     ldy plex_free_next
     lda PLEX_FREE_YPOS,y
     sta plexFreeNextYpos1_return
-  //SEG67 loop::@15
-  b15:
-  //SEG68 [30] if(*((const byte*) RASTER#0)<(byte) loop::plexFreeNextYpos1_return#0) goto loop::@15 -- _deref_pbuc1_lt_vbuz1_then_la1 
+  //SEG67 loop::@8
+  b8:
+  //SEG68 [30] if(*((const byte*) RASTER#0)<(byte) loop::plexFreeNextYpos1_return#0) goto loop::@8 -- _deref_pbuc1_lt_vbuz1_then_la1 
     lda RASTER
     cmp plexFreeNextYpos1_return
-    bcc b15
-  //SEG69 loop::@17
+    bcc b8
+  //SEG69 loop::@9
   //SEG70 [31] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG71 [32] call plexShowSprite 
     jsr plexShowSprite
-  //SEG72 loop::@31
+  //SEG72 loop::@12
   //SEG73 [33] (byte) loop::ss#1 ← ++ (byte) loop::ss#6 -- vbuz1=_inc_vbuz1 
     inc ss
-  //SEG74 [34] if((byte) loop::ss#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@14 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG74 [34] if((byte) loop::ss#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #PLEX_COUNT-1+1
     cmp ss
-    bne b14
-  //SEG75 loop::@21
+    bne b7
+  //SEG75 loop::@10
   //SEG76 [35] *((const byte*) BORDERCOL#0) ← (const byte) BLACK#0 -- _deref_pbuc1=vbuc2 
     lda #BLACK
     sta BORDERCOL
-  //SEG77 [12] phi from loop::@21 to loop::@1 [phi:loop::@21->loop::@1]
-  //SEG78 [12] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#1 [phi:loop::@21->loop::@1#0] -- register_copy 
-    jmp b6
+  //SEG77 [12] phi from loop::@10 to loop::@1 [phi:loop::@10->loop::@1]
+  //SEG78 [12] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#1 [phi:loop::@10->loop::@1#0] -- register_copy 
+    jmp b2
 }
 //SEG79 plexShowSprite
 // Show the next sprite.
@@ -4383,7 +4401,7 @@ plexShowSprite: {
   //SEG87 [42] (byte) plex_free_next#13 ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax plex_free_next
-  //SEG88 plexShowSprite::@7
+  //SEG88 plexShowSprite::@4
   //SEG89 [43] *((const byte*) PLEX_SCREEN_PTR#1 + (byte) plex_sprite_idx#44) ← *((const byte[PLEX_COUNT#0]) PLEX_PTR#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#44)) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_pbuc3_derefidx_vbuz2 
     ldx plex_show_idx
     ldy PLEX_SORTED_IDX,x
@@ -4405,7 +4423,7 @@ plexShowSprite: {
   //SEG94 [48] if((byte~) plexShowSprite::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@1 -- vbuaa_neq_0_then_la1 
     cmp #0
     bne b1
-  //SEG95 plexShowSprite::@4
+  //SEG95 plexShowSprite::@3
   //SEG96 [49] (byte/word/dword~) plexShowSprite::$10 ← (byte/word/signed word/dword/signed dword) $ff ^ (byte) plex_sprite_msb#44 -- vbuaa=vbuc1_bxor_vbuz1 
     lda plex_sprite_msb
     eor #$ff
@@ -4424,7 +4442,7 @@ plexShowSprite: {
     inc plex_show_idx
   //SEG102 [54] (byte) plex_sprite_msb#25 ← (byte) plex_sprite_msb#44 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_rol_1 
     asl plex_sprite_msb
-  //SEG103 [55] if((byte) plex_sprite_msb#25!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@8 -- vbuz1_neq_0_then_la1 
+  //SEG103 [55] if((byte) plex_sprite_msb#25!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@5 -- vbuz1_neq_0_then_la1 
     lda plex_sprite_msb
     cmp #0
     bne breturn
@@ -4436,10 +4454,10 @@ plexShowSprite: {
   breturn:
   //SEG107 [57] return 
     rts
-  //SEG108 [58] phi from plexShowSprite::@2 to plexShowSprite::@8 [phi:plexShowSprite::@2->plexShowSprite::@8]
-  //SEG109 plexShowSprite::@8
-  //SEG110 [56] phi from plexShowSprite::@8 to plexShowSprite::@return [phi:plexShowSprite::@8->plexShowSprite::@return]
-  //SEG111 [56] phi (byte) plex_sprite_msb#16 = (byte) plex_sprite_msb#25 [phi:plexShowSprite::@8->plexShowSprite::@return#0] -- register_copy 
+  //SEG108 [58] phi from plexShowSprite::@2 to plexShowSprite::@5 [phi:plexShowSprite::@2->plexShowSprite::@5]
+  //SEG109 plexShowSprite::@5
+  //SEG110 [56] phi from plexShowSprite::@5 to plexShowSprite::@return [phi:plexShowSprite::@5->plexShowSprite::@return]
+  //SEG111 [56] phi (byte) plex_sprite_msb#16 = (byte) plex_sprite_msb#25 [phi:plexShowSprite::@5->plexShowSprite::@return#0] -- register_copy 
   //SEG112 plexShowSprite::@1
   b1:
   //SEG113 [59] *((const byte*) SPRITES_XMSB#0) ← *((const byte*) SPRITES_XMSB#0) | (byte) plex_sprite_msb#44 -- _deref_pbuc1=_deref_pbuc1_bor_vbuz1 
@@ -4483,10 +4501,10 @@ plexSort: {
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
     bcs b2
-  //SEG123 plexSort::@11
+  //SEG123 plexSort::@6
   //SEG124 [65] (byte~) plexSort::s#6 ← (byte) plexSort::m#2 -- vbuxx=vbuz1 
-  //SEG125 [66] phi from plexSort::@11 plexSort::@8 to plexSort::@3 [phi:plexSort::@11/plexSort::@8->plexSort::@3]
-  //SEG126 [66] phi (byte) plexSort::s#3 = (byte~) plexSort::s#6 [phi:plexSort::@11/plexSort::@8->plexSort::@3#0] -- register_copy 
+  //SEG125 [66] phi from plexSort::@5 plexSort::@6 to plexSort::@3 [phi:plexSort::@5/plexSort::@6->plexSort::@3]
+  //SEG126 [66] phi (byte) plexSort::s#3 = (byte) plexSort::s#1 [phi:plexSort::@5/plexSort::@6->plexSort::@3#0] -- register_copy 
   //SEG127 plexSort::@3
   b3:
   //SEG128 [67] *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) plexSort::s#3) ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#3) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
@@ -4494,9 +4512,9 @@ plexSort: {
     sta PLEX_SORTED_IDX+1,x
   //SEG129 [68] (byte) plexSort::s#1 ← -- (byte) plexSort::s#3 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG130 [69] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG130 [69] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@5 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$ff
-    bne b8
+    bne b5
   //SEG131 plexSort::@4
   b4:
   //SEG132 [70] (byte) plexSort::s#2 ← ++ (byte) plexSort::s#1 -- vbuxx=_inc_vbuxx 
@@ -4532,8 +4550,8 @@ plexSort: {
   //SEG147 plexSort::@return
   //SEG148 [79] return 
     rts
-  //SEG149 plexSort::@8
-  b8:
+  //SEG149 plexSort::@5
+  b5:
   //SEG150 [80] if((byte) plexSort::nxt_y#0<*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#1))) goto plexSort::@3 -- vbuz1_lt_pbuc1_derefidx_pbuc2_derefidx_vbuxx_then_la1 
     lda nxt_y
     ldy PLEX_SORTED_IDX,x
diff --git a/src/test/ref/examples/multiplexer/simple-multiplexer.sym b/src/test/ref/examples/multiplexer/simple-multiplexer.sym
index c7b63ab54..0da191b6f 100644
--- a/src/test/ref/examples/multiplexer/simple-multiplexer.sym
+++ b/src/test/ref/examples/multiplexer/simple-multiplexer.sym
@@ -1,5 +1,5 @@
-(label) @12
-(label) @15
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -134,13 +134,13 @@
 (label) loop::@1
 (label) loop::@10
 (label) loop::@11
-(label) loop::@14
-(label) loop::@15
-(label) loop::@17
-(label) loop::@21
-(label) loop::@30
-(label) loop::@31
+(label) loop::@12
+(label) loop::@2
+(label) loop::@3
+(label) loop::@4
+(label) loop::@5
 (label) loop::@6
+(label) loop::@7
 (label) loop::@8
 (label) loop::@9
 (label) loop::plexFreeNextYpos1
@@ -180,9 +180,9 @@
 (byte/signed word/word/dword/signed dword~) plexShowSprite::$6 reg byte x 4.0
 (label) plexShowSprite::@1
 (label) plexShowSprite::@2
+(label) plexShowSprite::@3
 (label) plexShowSprite::@4
-(label) plexShowSprite::@7
-(label) plexShowSprite::@8
+(label) plexShowSprite::@5
 (label) plexShowSprite::@return
 (label) plexShowSprite::plexFreeAdd1
 (byte/signed word/word/dword/signed dword~) plexShowSprite::plexFreeAdd1_$0
@@ -199,11 +199,11 @@
 (byte) plexShowSprite::ypos
 (void()) plexSort()
 (label) plexSort::@1
-(label) plexSort::@11
 (label) plexSort::@2
 (label) plexSort::@3
 (label) plexSort::@4
-(label) plexSort::@8
+(label) plexSort::@5
+(label) plexSort::@6
 (label) plexSort::@return
 (byte) plexSort::m
 (byte) plexSort::m#1 m zp ZP_BYTE:3 151.5
diff --git a/src/test/ref/examples/music/music.asm b/src/test/ref/examples/music/music.asm
index 7aefd3d52..1446b720e 100644
--- a/src/test/ref/examples/music/music.asm
+++ b/src/test/ref/examples/music/music.asm
@@ -14,15 +14,15 @@ main: {
     // Initialize the music
     jsr music.init
   // Wait for the RASTER
-  b2:
+  b1:
     lda #$fd
     cmp RASTER
-    bne b2
+    bne b1
     inc BORDERCOL
     // Play the music
     jsr music.play
     dec BORDERCOL
-    jmp b2
+    jmp b1
 }
 .pc = MUSIC "MUSIC"
   .fill music.size, music.getData(i)
diff --git a/src/test/ref/examples/music/music.cfg b/src/test/ref/examples/music/music.cfg
index b43e00506..b525bc517 100644
--- a/src/test/ref/examples/music/music.cfg
+++ b/src/test/ref/examples/music/music.cfg
@@ -1,26 +1,26 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm() {{ .const music = LoadSid("toiletrensdyr.sid")
  }}
   kickasm(location (const byte*) MUSIC#0) {{ .fill music.size, music.getData(i)
  }}
-  to:@5
-@5: scope:[]  from @4
+  to:@2
+@2: scope:[]  from @1
   [3] phi()
   [4] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @2
   [5] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @2
   asm { jsrmusic.init  }
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@2
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@3
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@2
-  to:main::@3
-main::@3: scope:[main]  from main::@2
+main::@2: scope:[main]  from main::@1
   [8] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   asm { jsrmusic.play  }
   [10] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0)
-  to:main::@2
+  to:main::@1
diff --git a/src/test/ref/examples/music/music.log b/src/test/ref/examples/music/music.log
index 6ff6b567f..835048377 100644
--- a/src/test/ref/examples/music/music.log
+++ b/src/test/ref/examples/music/music.log
@@ -386,37 +386,41 @@ Calls in [] to main:4
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @4 to @1
+Renumbering block @5 to @2
+Renumbering block main::@2 to main::@1
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @5
+Adding NOP phi() at start of @2
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm() {{ .const music = LoadSid("toiletrensdyr.sid")
  }}
   kickasm(location (const byte*) MUSIC#0) {{ .fill music.size, music.getData(i)
  }}
-  to:@5
-@5: scope:[]  from @4
+  to:@2
+@2: scope:[]  from @1
   [3] phi()
   [4] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @2
   [5] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @2
   asm { jsrmusic.init  }
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@2
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@3
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@2
-  to:main::@3
-main::@3: scope:[main]  from main::@2
+main::@2: scope:[main]  from main::@1
   [8] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   asm { jsrmusic.play  }
   [10] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0)
-  to:main::@2
+  to:main::@1
 
 
 VARIABLE REGISTER WEIGHTS
@@ -518,24 +522,24 @@ INITIAL ASM
   .label MUSIC = $1000
 //SEG3 @begin
 bbegin:
-  jmp b4
-//SEG4 @4
-b4:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm() {{ .const music = LoadSid("toiletrensdyr.sid")  }}
   // Load the SID
   .const music = LoadSid("toiletrensdyr.sid")
 
 //SEG6 kickasm(location (const byte*) MUSIC#0) {{ .fill music.size, music.getData(i)  }}
 // Place the SID into memory
-//SEG7 [3] phi from @4 to @5 [phi:@4->@5]
-b5_from_b4:
-  jmp b5
-//SEG8 @5
-b5:
+//SEG7 [3] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG8 @2
+b2:
 //SEG9 [4] call main 
   jsr main
-//SEG10 [5] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG10 [5] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG11 @end
 bend:
@@ -545,17 +549,17 @@ main: {
   //SEG13 asm { jsrmusic.init  }
     // Initialize the music
     jsr music.init
-    jmp b2
+    jmp b1
   // Wait for the RASTER
-  //SEG14 main::@2
-  b2:
-  //SEG15 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG14 main::@1
+  b1:
+  //SEG15 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fd
     cmp RASTER
-    bne b2
-    jmp b3
-  //SEG16 main::@3
-  b3:
+    bne b1
+    jmp b2
+  //SEG16 main::@2
+  b2:
   //SEG17 [8] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG18 asm { jsrmusic.play  }
@@ -563,7 +567,7 @@ main: {
     jsr music.play
   //SEG19 [10] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BORDERCOL
-    jmp b2
+    jmp b1
 }
 .pc = MUSIC "MUSIC"
   .fill music.size, music.getData(i)
@@ -571,7 +575,7 @@ main: {
 
 REGISTER UPLIFT POTENTIAL REGISTERS
 Statement asm { jsrmusic.init  } always clobbers reg byte a reg byte x reg byte y 
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@2 [ ] ( main:4 [ ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@1 [ ] ( main:4 [ ] ) always clobbers reg byte a 
 Statement asm { jsrmusic.play  } always clobbers reg byte a reg byte x reg byte y 
 
 REGISTER UPLIFT SCOPES
@@ -594,24 +598,24 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label MUSIC = $1000
 //SEG3 @begin
 bbegin:
-  jmp b4
-//SEG4 @4
-b4:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm() {{ .const music = LoadSid("toiletrensdyr.sid")  }}
   // Load the SID
   .const music = LoadSid("toiletrensdyr.sid")
 
 //SEG6 kickasm(location (const byte*) MUSIC#0) {{ .fill music.size, music.getData(i)  }}
 // Place the SID into memory
-//SEG7 [3] phi from @4 to @5 [phi:@4->@5]
-b5_from_b4:
-  jmp b5
-//SEG8 @5
-b5:
+//SEG7 [3] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG8 @2
+b2:
 //SEG9 [4] call main 
   jsr main
-//SEG10 [5] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG10 [5] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG11 @end
 bend:
@@ -621,17 +625,17 @@ main: {
   //SEG13 asm { jsrmusic.init  }
     // Initialize the music
     jsr music.init
-    jmp b2
+    jmp b1
   // Wait for the RASTER
-  //SEG14 main::@2
-  b2:
-  //SEG15 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG14 main::@1
+  b1:
+  //SEG15 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fd
     cmp RASTER
-    bne b2
-    jmp b3
-  //SEG16 main::@3
-  b3:
+    bne b1
+    jmp b2
+  //SEG16 main::@2
+  b2:
   //SEG17 [8] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG18 asm { jsrmusic.play  }
@@ -639,26 +643,26 @@ main: {
     jsr music.play
   //SEG19 [10] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BORDERCOL
-    jmp b2
+    jmp b1
 }
 .pc = MUSIC "MUSIC"
   .fill music.size, music.getData(i)
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp bend
+Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b3
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b4:
-Removing instruction b5_from_b4:
-Removing instruction bend_from_b5:
+Removing instruction b1:
+Removing instruction b2_from_b1:
+Removing instruction bend_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b5:
+Removing instruction b2:
 Removing instruction bend:
-Removing instruction b3:
+Removing instruction b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
@@ -667,8 +671,8 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @4
-(label) @5
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -755,8 +759,8 @@ FINAL SYMBOL TABLE
 (byte) WHITE
 (byte) YELLOW
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@3
 
 
 
@@ -774,17 +778,17 @@ Score: 3882
   .label BORDERCOL = $d020
   .label MUSIC = $1000
 //SEG3 @begin
-//SEG4 @4
+//SEG4 @1
 //SEG5 kickasm() {{ .const music = LoadSid("toiletrensdyr.sid")  }}
   // Load the SID
   .const music = LoadSid("toiletrensdyr.sid")
 
 //SEG6 kickasm(location (const byte*) MUSIC#0) {{ .fill music.size, music.getData(i)  }}
 // Place the SID into memory
-//SEG7 [3] phi from @4 to @5 [phi:@4->@5]
-//SEG8 @5
+//SEG7 [3] phi from @1 to @2 [phi:@1->@2]
+//SEG8 @2
 //SEG9 [4] call main 
-//SEG10 [5] phi from @5 to @end [phi:@5->@end]
+//SEG10 [5] phi from @2 to @end [phi:@2->@end]
 //SEG11 @end
 //SEG12 main
 // Play the music 
@@ -793,13 +797,13 @@ main: {
     // Initialize the music
     jsr music.init
   // Wait for the RASTER
-  //SEG14 main::@2
-  b2:
-  //SEG15 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG14 main::@1
+  b1:
+  //SEG15 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fd) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fd
     cmp RASTER
-    bne b2
-  //SEG16 main::@3
+    bne b1
+  //SEG16 main::@2
   //SEG17 [8] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG18 asm { jsrmusic.play  }
@@ -807,7 +811,7 @@ main: {
     jsr music.play
   //SEG19 [10] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BORDERCOL
-    jmp b2
+    jmp b1
 }
 .pc = MUSIC "MUSIC"
   .fill music.size, music.getData(i)
diff --git a/src/test/ref/examples/music/music.sym b/src/test/ref/examples/music/music.sym
index 78db248ac..e8cfc00c3 100644
--- a/src/test/ref/examples/music/music.sym
+++ b/src/test/ref/examples/music/music.sym
@@ -1,5 +1,5 @@
-(label) @4
-(label) @5
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -86,6 +86,6 @@
 (byte) WHITE
 (byte) YELLOW
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@3
 
diff --git a/src/test/ref/examples/music/music_irq.cfg b/src/test/ref/examples/music/music_irq.cfg
index 4418af607..0b4e01e2a 100644
--- a/src/test/ref/examples/music/music_irq.cfg
+++ b/src/test/ref/examples/music/music_irq.cfg
@@ -1,19 +1,19 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm() {{ .const music = LoadSid("toiletrensdyr.sid")
  }}
   kickasm(location (const byte*) MUSIC#0) {{ .fill music.size, music.getData(i)
  }}
-  to:@6
-@6: scope:[]  from @4
+  to:@2
+@2: scope:[]  from @1
   [3] phi()
   [4] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @2
   [5] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @2
   asm { sei jsrmusic.init  }
   [7] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
   [8] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
diff --git a/src/test/ref/examples/music/music_irq.log b/src/test/ref/examples/music/music_irq.log
index a30e66151..40df6c8f2 100644
--- a/src/test/ref/examples/music/music_irq.log
+++ b/src/test/ref/examples/music/music_irq.log
@@ -386,27 +386,29 @@ Calls in [] to main:4
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @4 to @1
+Renumbering block @6 to @2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @6
+Adding NOP phi() at start of @2
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm() {{ .const music = LoadSid("toiletrensdyr.sid")
  }}
   kickasm(location (const byte*) MUSIC#0) {{ .fill music.size, music.getData(i)
  }}
-  to:@6
-@6: scope:[]  from @4
+  to:@2
+@2: scope:[]  from @1
   [3] phi()
   [4] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @2
   [5] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @2
   asm { sei jsrmusic.init  }
   [7] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
   [8] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
@@ -542,24 +544,24 @@ INITIAL ASM
   .label MUSIC = $1000
 //SEG3 @begin
 bbegin:
-  jmp b4
-//SEG4 @4
-b4:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm() {{ .const music = LoadSid("toiletrensdyr.sid")  }}
   // Load the SID
   .const music = LoadSid("toiletrensdyr.sid")
 
 //SEG6 kickasm(location (const byte*) MUSIC#0) {{ .fill music.size, music.getData(i)  }}
 // Place the SID into memory
-//SEG7 [3] phi from @4 to @6 [phi:@4->@6]
-b6_from_b4:
-  jmp b6
-//SEG8 @6
-b6:
+//SEG7 [3] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG8 @2
+b2:
 //SEG9 [4] call main 
   jsr main
-//SEG10 [5] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG10 [5] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG11 @end
 bend:
@@ -669,24 +671,24 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label MUSIC = $1000
 //SEG3 @begin
 bbegin:
-  jmp b4
-//SEG4 @4
-b4:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm() {{ .const music = LoadSid("toiletrensdyr.sid")  }}
   // Load the SID
   .const music = LoadSid("toiletrensdyr.sid")
 
 //SEG6 kickasm(location (const byte*) MUSIC#0) {{ .fill music.size, music.getData(i)  }}
 // Place the SID into memory
-//SEG7 [3] phi from @4 to @6 [phi:@4->@6]
-b6_from_b4:
-  jmp b6
-//SEG8 @6
-b6:
+//SEG7 [3] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG8 @2
+b2:
 //SEG9 [4] call main 
   jsr main
-//SEG10 [5] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG10 [5] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG11 @end
 bend:
@@ -752,17 +754,17 @@ irq_play: {
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b4
-Removing instruction jmp b6
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b4:
-Removing instruction b6_from_b4:
-Removing instruction bend_from_b6:
+Removing instruction b1:
+Removing instruction b2_from_b1:
+Removing instruction bend_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b6:
+Removing instruction b2:
 Removing instruction bend:
 Removing instruction breturn:
 Removing instruction breturn:
@@ -774,8 +776,8 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @4
-(label) @6
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -902,17 +904,17 @@ Score: 595
   .label KERNEL_IRQ = $314
   .label MUSIC = $1000
 //SEG3 @begin
-//SEG4 @4
+//SEG4 @1
 //SEG5 kickasm() {{ .const music = LoadSid("toiletrensdyr.sid")  }}
   // Load the SID
   .const music = LoadSid("toiletrensdyr.sid")
 
 //SEG6 kickasm(location (const byte*) MUSIC#0) {{ .fill music.size, music.getData(i)  }}
 // Place the SID into memory
-//SEG7 [3] phi from @4 to @6 [phi:@4->@6]
-//SEG8 @6
+//SEG7 [3] phi from @1 to @2 [phi:@1->@2]
+//SEG8 @2
 //SEG9 [4] call main 
-//SEG10 [5] phi from @6 to @end [phi:@6->@end]
+//SEG10 [5] phi from @2 to @end [phi:@2->@end]
 //SEG11 @end
 //SEG12 main
 // Setup Raster IRQ and initialize SID player
diff --git a/src/test/ref/examples/music/music_irq.sym b/src/test/ref/examples/music/music_irq.sym
index 01b8de07f..c03ece99a 100644
--- a/src/test/ref/examples/music/music_irq.sym
+++ b/src/test/ref/examples/music/music_irq.sym
@@ -1,5 +1,5 @@
-(label) @4
-(label) @6
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
diff --git a/src/test/ref/examples/rasterbars/raster-bars.asm b/src/test/ref/examples/rasterbars/raster-bars.asm
index d34e20011..dc2cc4534 100644
--- a/src/test/ref/examples/rasterbars/raster-bars.asm
+++ b/src/test/ref/examples/rasterbars/raster-bars.asm
@@ -6,16 +6,16 @@
   .label BGCOL = $d021
 main: {
     sei
-  b2:
+  b1:
     lda #$a
     cmp RASTER
-    bne b2
-  b4:
+    bne b1
+  b2:
     lda #$b
     cmp RASTER
-    bne b4
+    bne b2
     jsr raster
-    jmp b2
+    jmp b1
 }
 raster: {
     nop
diff --git a/src/test/ref/examples/rasterbars/raster-bars.cfg b/src/test/ref/examples/rasterbars/raster-bars.cfg
index ac197771b..3c1cdd449 100644
--- a/src/test/ref/examples/rasterbars/raster-bars.cfg
+++ b/src/test/ref/examples/rasterbars/raster-bars.cfg
@@ -1,26 +1,26 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   asm { sei  }
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@3
+  [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@5
-  [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@2
-  to:main::@4
-main::@4: scope:[main]  from main::@2 main::@4
-  [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@4
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+main::@2: scope:[main]  from main::@1 main::@2
+  [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [7] phi()
   [8] call raster 
-  to:main::@2
-raster: scope:[raster]  from main::@5
+  to:main::@1
+raster: scope:[raster]  from main::@3
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
   [10] (byte) raster::col#0 ← *((const byte[]) rastercols#0)
   to:raster::@1
diff --git a/src/test/ref/examples/rasterbars/raster-bars.log b/src/test/ref/examples/rasterbars/raster-bars.log
index 3bf387c1e..5c5c6b775 100644
--- a/src/test/ref/examples/rasterbars/raster-bars.log
+++ b/src/test/ref/examples/rasterbars/raster-bars.log
@@ -439,35 +439,39 @@ Coalesced [20] raster::col#4 ← raster::col#1
 Coalesced [21] raster::i#3 ← raster::i#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) raster::@3
+Renumbering block @6 to @1
+Renumbering block main::@2 to main::@1
+Renumbering block main::@4 to main::@2
+Renumbering block main::@5 to main::@3
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @6
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
-Adding NOP phi() at start of main::@5
+Adding NOP phi() at start of main::@3
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   asm { sei  }
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@3
+  [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@5
-  [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@2
-  to:main::@4
-main::@4: scope:[main]  from main::@2 main::@4
-  [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@4
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+main::@2: scope:[main]  from main::@1 main::@2
+  [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [7] phi()
   [8] call raster 
-  to:main::@2
-raster: scope:[raster]  from main::@5
+  to:main::@1
+raster: scope:[raster]  from main::@3
   asm { nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop nop  }
   [10] (byte) raster::col#0 ← *((const byte[]) rastercols#0)
   to:raster::@1
@@ -598,15 +602,15 @@ INITIAL ASM
   .label BGCOL = $d021
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -614,28 +618,28 @@ bend:
 main: {
   //SEG10 asm { sei  }
     sei
-    jmp b2
-  //SEG11 main::@2
-  b2:
-  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG11 main::@1
+  b1:
+  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$a
     cmp RASTER
-    bne b2
-    jmp b4
-  //SEG13 main::@4
-  b4:
-  //SEG14 [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1
+    jmp b2
+  //SEG13 main::@2
+  b2:
+  //SEG14 [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$b
     cmp RASTER
-    bne b4
-  //SEG15 [7] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
-  b5_from_b4:
-    jmp b5
-  //SEG16 main::@5
-  b5:
+    bne b2
+  //SEG15 [7] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG16 main::@3
+  b3:
   //SEG17 [8] call raster 
     jsr raster
-    jmp b2
+    jmp b1
 }
 //SEG18 raster
 raster: {
@@ -726,8 +730,8 @@ raster: {
   rastercols: .byte $b, 0, $b, $b, $c, $b, $c, $c, $f, $c, $f, $f, 1, $f, 1, 1, $f, 1, $f, $f, $c, $f, $c, $c, $b, $c, $b, $b, 0, $b, 0, $ff
 
 REGISTER UPLIFT POTENTIAL REGISTERS
-Statement [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@2 [ ] ( main:2 [ ] ) always clobbers reg byte a 
-Statement [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@4 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@1 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Potential registers zp ZP_BYTE:2 [ raster::col#2 raster::col#0 raster::col#1 ] : zp ZP_BYTE:2 , reg byte a , reg byte x , reg byte y , 
 Potential registers zp ZP_BYTE:3 [ raster::i#2 raster::i#1 ] : zp ZP_BYTE:3 , reg byte a , reg byte x , reg byte y , 
 
@@ -752,15 +756,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label BGCOL = $d021
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -768,28 +772,28 @@ bend:
 main: {
   //SEG10 asm { sei  }
     sei
-    jmp b2
-  //SEG11 main::@2
-  b2:
-  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG11 main::@1
+  b1:
+  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$a
     cmp RASTER
-    bne b2
-    jmp b4
-  //SEG13 main::@4
-  b4:
-  //SEG14 [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1
+    jmp b2
+  //SEG13 main::@2
+  b2:
+  //SEG14 [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$b
     cmp RASTER
-    bne b4
-  //SEG15 [7] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
-  b5_from_b4:
-    jmp b5
-  //SEG16 main::@5
-  b5:
+    bne b2
+  //SEG15 [7] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG16 main::@3
+  b3:
   //SEG17 [8] call raster 
     jsr raster
-    jmp b2
+    jmp b1
 }
 //SEG18 raster
 raster: {
@@ -871,23 +875,23 @@ raster: {
   rastercols: .byte $b, 0, $b, $b, $c, $b, $c, $c, $f, $c, $f, $f, 1, $f, 1, 1, $f, 1, $f, $f, $c, $f, $c, $c, $b, $c, $b, $b, 0, $b, 0, $ff
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b6
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b4
-Removing instruction jmp b5
+Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
-Removing instruction b6_from_bbegin:
-Removing instruction b6:
-Removing instruction bend_from_b6:
-Removing instruction b5_from_b4:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction b3_from_b2:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b5:
+Removing instruction b3:
 Removing instruction b1_from_raster:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -900,7 +904,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -986,9 +990,9 @@ FINAL SYMBOL TABLE
 (byte) WHITE
 (byte) YELLOW
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@4
-(label) main::@5
+(label) main::@3
 (void()) raster()
 (label) raster::@1
 (label) raster::@return
@@ -1019,32 +1023,32 @@ Score: 8340
   .label BORDERCOL = $d020
   .label BGCOL = $d021
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-//SEG5 @6
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
   //SEG10 asm { sei  }
     sei
-  //SEG11 main::@2
-  b2:
-  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG11 main::@1
+  b1:
+  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$a
     cmp RASTER
-    bne b2
-  //SEG13 main::@4
-  b4:
-  //SEG14 [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1
+  //SEG13 main::@2
+  b2:
+  //SEG14 [6] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$b
     cmp RASTER
-    bne b4
-  //SEG15 [7] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
-  //SEG16 main::@5
+    bne b2
+  //SEG15 [7] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  //SEG16 main::@3
   //SEG17 [8] call raster 
     jsr raster
-    jmp b2
+    jmp b1
 }
 //SEG18 raster
 raster: {
diff --git a/src/test/ref/examples/rasterbars/raster-bars.sym b/src/test/ref/examples/rasterbars/raster-bars.sym
index 5eadcf38c..e50ba8233 100644
--- a/src/test/ref/examples/rasterbars/raster-bars.sym
+++ b/src/test/ref/examples/rasterbars/raster-bars.sym
@@ -1,4 +1,4 @@
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -84,9 +84,9 @@
 (byte) WHITE
 (byte) YELLOW
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@4
-(label) main::@5
+(label) main::@3
 (void()) raster()
 (label) raster::@1
 (label) raster::@return
diff --git a/src/test/ref/examples/rotate/rotate.asm b/src/test/ref/examples/rotate/rotate.asm
index 025d6d74c..265fc105c 100644
--- a/src/test/ref/examples/rotate/rotate.asm
+++ b/src/test/ref/examples/rotate/rotate.asm
@@ -43,15 +43,15 @@ anim: {
     .label angle = 2
     lda #0
     sta angle
-  b6:
+  b2:
     lda #$ff
     cmp RASTER
-    bne b6
+    bne b2
     inc BORDERCOL
     lda #0
     sta sprite_msb
     sta i
-  b9:
+  b4:
     ldy i
     lda xs,y
     sta x
@@ -119,11 +119,11 @@ anim: {
     sta xpos+1
     lsr sprite_msb
     cmp #0
-    beq b10
+    beq b5
     lda #$80
     ora sprite_msb
     sta sprite_msb
-  b10:
+  b5:
     lda yr+1
     clc
     adc #$59+$33
@@ -138,15 +138,15 @@ anim: {
     inc i
     lda #8
     cmp i
-    beq !b9+
-    jmp b9
-  !b9:
+    beq !b4+
+    jmp b4
+  !b4:
     lda sprite_msb
     sta SPRITES_XMSB
     inc angle
     lda #LIGHT_BLUE
     sta BORDERCOL
-    jmp b6
+    jmp b2
 }
 // Calculate fast multiply with a prepared unsigned byte to a word result
 // The prepared number is set by calling mulf8s_prepare(byte a)
@@ -299,7 +299,7 @@ mulf_init: {
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
     ldx #-1
-  b5:
+  b4:
     lda mulf_sqr1_lo,x
     ldy #0
     sta (sqr2_lo),y
@@ -314,20 +314,20 @@ mulf_init: {
     adc dir
     tax
     cpx #0
-    bne b6
+    bne b5
     lda #1
     sta dir
-  b6:
+  b5:
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
     sta mulf_sqr2_lo+$1ff
diff --git a/src/test/ref/examples/rotate/rotate.cfg b/src/test/ref/examples/rotate/rotate.cfg
index db2dbb09d..4664e7205 100644
--- a/src/test/ref/examples/rotate/rotate.cfg
+++ b/src/test/ref/examples/rotate/rotate.cfg
@@ -1,7 +1,7 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@13
-@13: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) COS#0) {{ {
     .var min = -$7fff
     .var max = $7fff
@@ -12,8 +12,8 @@
     }
     }
  }}
-  to:@16
-@16: scope:[]  from @13
+  to:@2
+@2: scope:[]  from @1
   kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))
     .for (var y=0; y<21; y++)
         .for (var x=0;x<3; x++)
@@ -21,9 +21,9 @@
  }}
   [3] call main 
   to:@end
-@end: scope:[]  from @16
+@end: scope:[]  from @2
   [4] phi()
-main: scope:[main]  from @16
+main: scope:[main]  from @2
   asm { sei  }
   [6] call init 
   to:main::@1
@@ -37,59 +37,59 @@ main::@return: scope:[main]  from main::@1
 anim: scope:[anim]  from main::@1
   [10] phi()
   to:anim::@1
-anim::@1: scope:[anim]  from anim anim::@12
-  [11] (byte) anim::angle#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@12/(byte) anim::angle#1 )
-  to:anim::@6
-anim::@6: scope:[anim]  from anim::@1 anim::@6
-  [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6
-  to:anim::@8
-anim::@8: scope:[anim]  from anim::@6
+anim::@1: scope:[anim]  from anim anim::@7
+  [11] (byte) anim::angle#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@7/(byte) anim::angle#1 )
+  to:anim::@2
+anim::@2: scope:[anim]  from anim::@1 anim::@2
+  [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2
+  to:anim::@3
+anim::@3: scope:[anim]  from anim::@2
   [13] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
-  to:anim::@9
-anim::@9: scope:[anim]  from anim::@10 anim::@8
-  [14] (byte) anim::sprite_msb#10 ← phi( anim::@10/(byte) anim::sprite_msb#5 anim::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [14] (byte) anim::i#10 ← phi( anim::@10/(byte) anim::i#1 anim::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:anim::@4
+anim::@4: scope:[anim]  from anim::@3 anim::@5
+  [14] (byte) anim::sprite_msb#10 ← phi( anim::@5/(byte) anim::sprite_msb#5 anim::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [14] (byte) anim::i#10 ← phi( anim::@5/(byte) anim::i#1 anim::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [15] (signed byte) anim::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#10)
   [16] (signed byte) anim::y#0 ← *((const signed byte[8]) ys#0 + (byte) anim::i#10)
   to:anim::mulf8s_prepare1
-anim::mulf8s_prepare1: scope:[anim]  from anim::@9
+anim::mulf8s_prepare1: scope:[anim]  from anim::@4
   [17] (byte~) mulf8u_prepare::a#3 ← (byte)(signed byte)*((const byte*) COS#0 + (byte) anim::angle#10)
   [18] call mulf8u_prepare 
-  to:anim::@17
-anim::@17: scope:[anim]  from anim::mulf8s_prepare1
+  to:anim::@8
+anim::@8: scope:[anim]  from anim::mulf8s_prepare1
   [19] (signed byte) mulf8s_prepared::b#0 ← (signed byte) anim::x#0
   [20] call mulf8s_prepared 
   [21] (signed word) mulf8s_prepared::return#2 ← (signed word)(word) mulf8s_prepared::m#4
-  to:anim::@20
-anim::@20: scope:[anim]  from anim::@17
+  to:anim::@10
+anim::@10: scope:[anim]  from anim::@8
   [22] (signed word~) anim::$4 ← (signed word) mulf8s_prepared::return#2
   [23] (signed word) anim::xr#0 ← (signed word~) anim::$4 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [24] (signed byte) mulf8s_prepared::b#1 ← (signed byte) anim::y#0
   [25] call mulf8s_prepared 
   [26] (signed word) mulf8s_prepared::return#3 ← (signed word)(word) mulf8s_prepared::m#4
-  to:anim::@21
-anim::@21: scope:[anim]  from anim::@20
+  to:anim::@11
+anim::@11: scope:[anim]  from anim::@10
   [27] (signed word~) anim::$6 ← (signed word) mulf8s_prepared::return#3
   [28] (signed word) anim::yr#0 ← (signed word~) anim::$6 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:anim::mulf8s_prepare2
-anim::mulf8s_prepare2: scope:[anim]  from anim::@21
+anim::mulf8s_prepare2: scope:[anim]  from anim::@11
   [29] (byte~) mulf8u_prepare::a#4 ← (byte)(signed byte)*((const byte*) SIN#0 + (byte) anim::angle#10)
   [30] call mulf8u_prepare 
-  to:anim::@18
-anim::@18: scope:[anim]  from anim::mulf8s_prepare2
+  to:anim::@9
+anim::@9: scope:[anim]  from anim::mulf8s_prepare2
   [31] (signed byte) mulf8s_prepared::b#2 ← (signed byte) anim::y#0
   [32] call mulf8s_prepared 
   [33] (signed word) mulf8s_prepared::return#4 ← (signed word)(word) mulf8s_prepared::m#4
-  to:anim::@23
-anim::@23: scope:[anim]  from anim::@18
+  to:anim::@12
+anim::@12: scope:[anim]  from anim::@9
   [34] (signed word~) anim::$9 ← (signed word) mulf8s_prepared::return#4
   [35] (signed word~) anim::$10 ← (signed word~) anim::$9 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [36] (signed word) anim::xr#1 ← (signed word) anim::xr#0 - (signed word~) anim::$10
   [37] (signed byte) mulf8s_prepared::b#3 ← (signed byte) anim::x#0
   [38] call mulf8s_prepared 
   [39] (signed word) mulf8s_prepared::return#10 ← (signed word)(word) mulf8s_prepared::m#4
-  to:anim::@24
-anim::@24: scope:[anim]  from anim::@23
+  to:anim::@13
+anim::@13: scope:[anim]  from anim::@12
   [40] (signed word~) anim::$11 ← (signed word) mulf8s_prepared::return#10
   [41] (signed word~) anim::$12 ← (signed word~) anim::$11 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [42] (signed word) anim::yr#1 ← (signed word) anim::yr#0 + (signed word~) anim::$12
@@ -98,13 +98,13 @@ anim::@24: scope:[anim]  from anim::@23
   [45] (signed word) anim::xpos#0 ← (signed byte~) anim::$15 + (byte/signed byte/word/signed word/dword/signed dword) $18+(byte/word/signed word/dword/signed dword) $95
   [46] (byte) anim::sprite_msb#1 ← (byte) anim::sprite_msb#10 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [47] (byte~) anim::$18 ← > (signed word) anim::xpos#0
-  [48] if((byte~) anim::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@10
-  to:anim::@11
-anim::@11: scope:[anim]  from anim::@24
+  [48] if((byte~) anim::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@5
+  to:anim::@6
+anim::@6: scope:[anim]  from anim::@13
   [49] (byte) anim::sprite_msb#2 ← (byte) anim::sprite_msb#1 | (byte/word/signed word/dword/signed dword) $80
-  to:anim::@10
-anim::@10: scope:[anim]  from anim::@11 anim::@24
-  [50] (byte) anim::sprite_msb#5 ← phi( anim::@11/(byte) anim::sprite_msb#2 anim::@24/(byte) anim::sprite_msb#1 )
+  to:anim::@5
+anim::@5: scope:[anim]  from anim::@13 anim::@6
+  [50] (byte) anim::sprite_msb#5 ← phi( anim::@6/(byte) anim::sprite_msb#2 anim::@13/(byte) anim::sprite_msb#1 )
   [51] (byte~) anim::$22 ← > (signed word) anim::yr#1
   [52] (byte) anim::ypos#0 ← (byte~) anim::$22 + (byte/signed byte/word/signed word/dword/signed dword) $59+(byte/signed byte/word/signed word/dword/signed dword) $33
   [53] (byte) anim::i2#0 ← (byte) anim::i#10 << (byte/signed byte/word/signed word/dword/signed dword) 1
@@ -112,29 +112,29 @@ anim::@10: scope:[anim]  from anim::@11 anim::@24
   [55] *((const byte*) SPRITES_XPOS#0 + (byte) anim::i2#0) ← (byte~) anim::$25
   [56] *((const byte*) SPRITES_YPOS#0 + (byte) anim::i2#0) ← (byte) anim::ypos#0
   [57] (byte) anim::i#1 ← ++ (byte) anim::i#10
-  [58] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@9
-  to:anim::@12
-anim::@12: scope:[anim]  from anim::@10
+  [58] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@4
+  to:anim::@7
+anim::@7: scope:[anim]  from anim::@5
   [59] *((const byte*) SPRITES_XMSB#0) ← (byte) anim::sprite_msb#5
   [60] (byte) anim::angle#1 ← ++ (byte) anim::angle#10
   [61] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0
   to:anim::@1
-mulf8s_prepared: scope:[mulf8s_prepared]  from anim::@17 anim::@18 anim::@20 anim::@23
-  [62] (signed byte) mulf8s_prepared::b#4 ← phi( anim::@17/(signed byte) mulf8s_prepared::b#0 anim::@18/(signed byte) mulf8s_prepared::b#2 anim::@20/(signed byte) mulf8s_prepared::b#1 anim::@23/(signed byte) mulf8s_prepared::b#3 )
+mulf8s_prepared: scope:[mulf8s_prepared]  from anim::@10 anim::@12 anim::@8 anim::@9
+  [62] (signed byte) mulf8s_prepared::b#4 ← phi( anim::@8/(signed byte) mulf8s_prepared::b#0 anim::@9/(signed byte) mulf8s_prepared::b#2 anim::@10/(signed byte) mulf8s_prepared::b#1 anim::@12/(signed byte) mulf8s_prepared::b#3 )
   [63] call mulf8u_prepared 
   [64] (word) mulf8u_prepared::return#2 ← (word) mulf8u_prepared::return#0
-  to:mulf8s_prepared::@6
-mulf8s_prepared::@6: scope:[mulf8s_prepared]  from mulf8s_prepared
+  to:mulf8s_prepared::@5
+mulf8s_prepared::@5: scope:[mulf8s_prepared]  from mulf8s_prepared
   [65] (word) mulf8s_prepared::m#0 ← (word) mulf8u_prepared::return#2
   [66] if(*((const signed byte*) mulf8s_prepared::memA#0)>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@1
   to:mulf8s_prepared::@3
-mulf8s_prepared::@3: scope:[mulf8s_prepared]  from mulf8s_prepared::@6
+mulf8s_prepared::@3: scope:[mulf8s_prepared]  from mulf8s_prepared::@5
   [67] (byte~) mulf8s_prepared::$8 ← > (word) mulf8s_prepared::m#0
   [68] (byte~) mulf8s_prepared::$15 ← (byte~) mulf8s_prepared::$8 - (byte)(signed byte) mulf8s_prepared::b#4
   [69] (word) mulf8s_prepared::m#1 ← (word) mulf8s_prepared::m#0 hi= (byte~) mulf8s_prepared::$15
   to:mulf8s_prepared::@1
-mulf8s_prepared::@1: scope:[mulf8s_prepared]  from mulf8s_prepared::@3 mulf8s_prepared::@6
-  [70] (word) mulf8s_prepared::m#5 ← phi( mulf8s_prepared::@3/(word) mulf8s_prepared::m#1 mulf8s_prepared::@6/(word) mulf8s_prepared::m#0 )
+mulf8s_prepared::@1: scope:[mulf8s_prepared]  from mulf8s_prepared::@3 mulf8s_prepared::@5
+  [70] (word) mulf8s_prepared::m#5 ← phi( mulf8s_prepared::@3/(word) mulf8s_prepared::m#1 mulf8s_prepared::@5/(word) mulf8s_prepared::m#0 )
   [71] if((signed byte) mulf8s_prepared::b#4>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@2
   to:mulf8s_prepared::@4
 mulf8s_prepared::@4: scope:[mulf8s_prepared]  from mulf8s_prepared::@1
@@ -167,12 +167,12 @@ mulf8u_prepare::@return: scope:[mulf8u_prepare]  from mulf8u_prepare
 init: scope:[init]  from main
   [85] phi()
   [86] call mulf_init 
-  to:init::@3
-init::@3: scope:[init]  from init
+  to:init::@2
+init::@2: scope:[init]  from init
   [87] *((const byte*) SPRITES_ENABLE#0) ← (byte/word/signed word/dword/signed dword) $ff
   to:init::@1
-init::@1: scope:[init]  from init::@1 init::@3
-  [88] (byte) init::i#2 ← phi( init::@1/(byte) init::i#1 init::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+init::@1: scope:[init]  from init::@1 init::@2
+  [88] (byte) init::i#2 ← phi( init::@1/(byte) init::i#1 init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [89] *((const byte*) init::sprites_ptr#0 + (byte) init::i#2) ← ((byte))(const byte*) SPRITE#0/(byte/signed byte/word/signed word/dword/signed dword) $40
   [90] *((const byte*) SPRITES_COLS#0 + (byte) init::i#2) ← (const byte) GREEN#0
   [91] (byte) init::i#1 ← ++ (byte) init::i#2
@@ -209,30 +209,30 @@ mulf_init::@2: scope:[mulf_init]  from mulf_init::@1 mulf_init::@3
   [107] (word) mulf_init::sqr#1 ← (word) mulf_init::sqr#3 + (byte) mulf_init::x_2#2
   [108] (byte*) mulf_init::sqr1_lo#1 ← ++ (byte*) mulf_init::sqr1_lo#2
   [109] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $200) goto mulf_init::@1
-  to:mulf_init::@5
-mulf_init::@5: scope:[mulf_init]  from mulf_init::@2 mulf_init::@6
-  [110] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@6/(byte) mulf_init::dir#3 )
-  [110] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@6/(byte*) mulf_init::sqr2_hi#1 )
-  [110] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@6/(byte*) mulf_init::sqr2_lo#1 )
-  [110] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@6/(byte) mulf_init::x_255#1 )
+  to:mulf_init::@4
+mulf_init::@4: scope:[mulf_init]  from mulf_init::@2 mulf_init::@5
+  [110] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@5/(byte) mulf_init::dir#3 )
+  [110] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@5/(byte*) mulf_init::sqr2_hi#1 )
+  [110] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@5/(byte*) mulf_init::sqr2_lo#1 )
+  [110] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@5/(byte) mulf_init::x_255#1 )
   [111] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2)
   [112] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2)
   [113] (byte*) mulf_init::sqr2_hi#1 ← ++ (byte*) mulf_init::sqr2_hi#2
   [114] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2
-  [115] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12
-  to:mulf_init::@6
-mulf_init::@6: scope:[mulf_init]  from mulf_init::@12 mulf_init::@5
-  [116] (byte) mulf_init::dir#3 ← phi( mulf_init::@12/(byte) mulf_init::dir#2 mulf_init::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [115] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7
+  to:mulf_init::@5
+mulf_init::@5: scope:[mulf_init]  from mulf_init::@4 mulf_init::@7
+  [116] (byte) mulf_init::dir#3 ← phi( mulf_init::@7/(byte) mulf_init::dir#2 mulf_init::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [117] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2
-  [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5
-  to:mulf_init::@8
-mulf_init::@8: scope:[mulf_init]  from mulf_init::@6
+  [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4
+  to:mulf_init::@6
+mulf_init::@6: scope:[mulf_init]  from mulf_init::@5
   [119] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100)
   [120] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100)
   to:mulf_init::@return
-mulf_init::@return: scope:[mulf_init]  from mulf_init::@8
+mulf_init::@return: scope:[mulf_init]  from mulf_init::@6
   [121] return 
   to:@return
-mulf_init::@12: scope:[mulf_init]  from mulf_init::@5
+mulf_init::@7: scope:[mulf_init]  from mulf_init::@4
   [122] phi()
-  to:mulf_init::@6
+  to:mulf_init::@5
diff --git a/src/test/ref/examples/rotate/rotate.log b/src/test/ref/examples/rotate/rotate.log
index 3bb1ab10b..e3d9830df 100644
--- a/src/test/ref/examples/rotate/rotate.log
+++ b/src/test/ref/examples/rotate/rotate.log
@@ -1559,19 +1559,39 @@ Culled Empty Block (label) mulf_init::@7
 Culled Empty Block (label) mulf_init::@11
 Culled Empty Block (label) mulf_init::@9
 Culled Empty Block (label) mulf_init::@10
+Renumbering block @13 to @1
+Renumbering block @16 to @2
+Renumbering block mulf_init::@5 to mulf_init::@4
+Renumbering block mulf_init::@6 to mulf_init::@5
+Renumbering block mulf_init::@8 to mulf_init::@6
+Renumbering block mulf_init::@12 to mulf_init::@7
+Renumbering block mulf8s_prepared::@6 to mulf8s_prepared::@5
+Renumbering block init::@3 to init::@2
+Renumbering block anim::@6 to anim::@2
+Renumbering block anim::@8 to anim::@3
+Renumbering block anim::@9 to anim::@4
+Renumbering block anim::@10 to anim::@5
+Renumbering block anim::@11 to anim::@6
+Renumbering block anim::@12 to anim::@7
+Renumbering block anim::@17 to anim::@8
+Renumbering block anim::@18 to anim::@9
+Renumbering block anim::@20 to anim::@10
+Renumbering block anim::@21 to anim::@11
+Renumbering block anim::@23 to anim::@12
+Renumbering block anim::@24 to anim::@13
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of anim
 Adding NOP phi() at start of init
 Adding NOP phi() at start of mulf_init
-Adding NOP phi() at start of mulf_init::@12
+Adding NOP phi() at start of mulf_init::@7
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@13
-@13: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) COS#0) {{ {
     .var min = -$7fff
     .var max = $7fff
@@ -1582,8 +1602,8 @@ FINAL CONTROL FLOW GRAPH
     }
     }
  }}
-  to:@16
-@16: scope:[]  from @13
+  to:@2
+@2: scope:[]  from @1
   kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))
     .for (var y=0; y<21; y++)
         .for (var x=0;x<3; x++)
@@ -1591,9 +1611,9 @@ FINAL CONTROL FLOW GRAPH
  }}
   [3] call main 
   to:@end
-@end: scope:[]  from @16
+@end: scope:[]  from @2
   [4] phi()
-main: scope:[main]  from @16
+main: scope:[main]  from @2
   asm { sei  }
   [6] call init 
   to:main::@1
@@ -1607,59 +1627,59 @@ main::@return: scope:[main]  from main::@1
 anim: scope:[anim]  from main::@1
   [10] phi()
   to:anim::@1
-anim::@1: scope:[anim]  from anim anim::@12
-  [11] (byte) anim::angle#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@12/(byte) anim::angle#1 )
-  to:anim::@6
-anim::@6: scope:[anim]  from anim::@1 anim::@6
-  [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6
-  to:anim::@8
-anim::@8: scope:[anim]  from anim::@6
+anim::@1: scope:[anim]  from anim anim::@7
+  [11] (byte) anim::angle#10 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@7/(byte) anim::angle#1 )
+  to:anim::@2
+anim::@2: scope:[anim]  from anim::@1 anim::@2
+  [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2
+  to:anim::@3
+anim::@3: scope:[anim]  from anim::@2
   [13] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
-  to:anim::@9
-anim::@9: scope:[anim]  from anim::@10 anim::@8
-  [14] (byte) anim::sprite_msb#10 ← phi( anim::@10/(byte) anim::sprite_msb#5 anim::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [14] (byte) anim::i#10 ← phi( anim::@10/(byte) anim::i#1 anim::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:anim::@4
+anim::@4: scope:[anim]  from anim::@3 anim::@5
+  [14] (byte) anim::sprite_msb#10 ← phi( anim::@5/(byte) anim::sprite_msb#5 anim::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [14] (byte) anim::i#10 ← phi( anim::@5/(byte) anim::i#1 anim::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [15] (signed byte) anim::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#10)
   [16] (signed byte) anim::y#0 ← *((const signed byte[8]) ys#0 + (byte) anim::i#10)
   to:anim::mulf8s_prepare1
-anim::mulf8s_prepare1: scope:[anim]  from anim::@9
+anim::mulf8s_prepare1: scope:[anim]  from anim::@4
   [17] (byte~) mulf8u_prepare::a#3 ← (byte)(signed byte)*((const byte*) COS#0 + (byte) anim::angle#10)
   [18] call mulf8u_prepare 
-  to:anim::@17
-anim::@17: scope:[anim]  from anim::mulf8s_prepare1
+  to:anim::@8
+anim::@8: scope:[anim]  from anim::mulf8s_prepare1
   [19] (signed byte) mulf8s_prepared::b#0 ← (signed byte) anim::x#0
   [20] call mulf8s_prepared 
   [21] (signed word) mulf8s_prepared::return#2 ← (signed word)(word) mulf8s_prepared::m#4
-  to:anim::@20
-anim::@20: scope:[anim]  from anim::@17
+  to:anim::@10
+anim::@10: scope:[anim]  from anim::@8
   [22] (signed word~) anim::$4 ← (signed word) mulf8s_prepared::return#2
   [23] (signed word) anim::xr#0 ← (signed word~) anim::$4 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [24] (signed byte) mulf8s_prepared::b#1 ← (signed byte) anim::y#0
   [25] call mulf8s_prepared 
   [26] (signed word) mulf8s_prepared::return#3 ← (signed word)(word) mulf8s_prepared::m#4
-  to:anim::@21
-anim::@21: scope:[anim]  from anim::@20
+  to:anim::@11
+anim::@11: scope:[anim]  from anim::@10
   [27] (signed word~) anim::$6 ← (signed word) mulf8s_prepared::return#3
   [28] (signed word) anim::yr#0 ← (signed word~) anim::$6 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:anim::mulf8s_prepare2
-anim::mulf8s_prepare2: scope:[anim]  from anim::@21
+anim::mulf8s_prepare2: scope:[anim]  from anim::@11
   [29] (byte~) mulf8u_prepare::a#4 ← (byte)(signed byte)*((const byte*) SIN#0 + (byte) anim::angle#10)
   [30] call mulf8u_prepare 
-  to:anim::@18
-anim::@18: scope:[anim]  from anim::mulf8s_prepare2
+  to:anim::@9
+anim::@9: scope:[anim]  from anim::mulf8s_prepare2
   [31] (signed byte) mulf8s_prepared::b#2 ← (signed byte) anim::y#0
   [32] call mulf8s_prepared 
   [33] (signed word) mulf8s_prepared::return#4 ← (signed word)(word) mulf8s_prepared::m#4
-  to:anim::@23
-anim::@23: scope:[anim]  from anim::@18
+  to:anim::@12
+anim::@12: scope:[anim]  from anim::@9
   [34] (signed word~) anim::$9 ← (signed word) mulf8s_prepared::return#4
   [35] (signed word~) anim::$10 ← (signed word~) anim::$9 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [36] (signed word) anim::xr#1 ← (signed word) anim::xr#0 - (signed word~) anim::$10
   [37] (signed byte) mulf8s_prepared::b#3 ← (signed byte) anim::x#0
   [38] call mulf8s_prepared 
   [39] (signed word) mulf8s_prepared::return#10 ← (signed word)(word) mulf8s_prepared::m#4
-  to:anim::@24
-anim::@24: scope:[anim]  from anim::@23
+  to:anim::@13
+anim::@13: scope:[anim]  from anim::@12
   [40] (signed word~) anim::$11 ← (signed word) mulf8s_prepared::return#10
   [41] (signed word~) anim::$12 ← (signed word~) anim::$11 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [42] (signed word) anim::yr#1 ← (signed word) anim::yr#0 + (signed word~) anim::$12
@@ -1668,13 +1688,13 @@ anim::@24: scope:[anim]  from anim::@23
   [45] (signed word) anim::xpos#0 ← (signed byte~) anim::$15 + (byte/signed byte/word/signed word/dword/signed dword) $18+(byte/word/signed word/dword/signed dword) $95
   [46] (byte) anim::sprite_msb#1 ← (byte) anim::sprite_msb#10 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [47] (byte~) anim::$18 ← > (signed word) anim::xpos#0
-  [48] if((byte~) anim::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@10
-  to:anim::@11
-anim::@11: scope:[anim]  from anim::@24
+  [48] if((byte~) anim::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@5
+  to:anim::@6
+anim::@6: scope:[anim]  from anim::@13
   [49] (byte) anim::sprite_msb#2 ← (byte) anim::sprite_msb#1 | (byte/word/signed word/dword/signed dword) $80
-  to:anim::@10
-anim::@10: scope:[anim]  from anim::@11 anim::@24
-  [50] (byte) anim::sprite_msb#5 ← phi( anim::@11/(byte) anim::sprite_msb#2 anim::@24/(byte) anim::sprite_msb#1 )
+  to:anim::@5
+anim::@5: scope:[anim]  from anim::@13 anim::@6
+  [50] (byte) anim::sprite_msb#5 ← phi( anim::@6/(byte) anim::sprite_msb#2 anim::@13/(byte) anim::sprite_msb#1 )
   [51] (byte~) anim::$22 ← > (signed word) anim::yr#1
   [52] (byte) anim::ypos#0 ← (byte~) anim::$22 + (byte/signed byte/word/signed word/dword/signed dword) $59+(byte/signed byte/word/signed word/dword/signed dword) $33
   [53] (byte) anim::i2#0 ← (byte) anim::i#10 << (byte/signed byte/word/signed word/dword/signed dword) 1
@@ -1682,29 +1702,29 @@ anim::@10: scope:[anim]  from anim::@11 anim::@24
   [55] *((const byte*) SPRITES_XPOS#0 + (byte) anim::i2#0) ← (byte~) anim::$25
   [56] *((const byte*) SPRITES_YPOS#0 + (byte) anim::i2#0) ← (byte) anim::ypos#0
   [57] (byte) anim::i#1 ← ++ (byte) anim::i#10
-  [58] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@9
-  to:anim::@12
-anim::@12: scope:[anim]  from anim::@10
+  [58] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@4
+  to:anim::@7
+anim::@7: scope:[anim]  from anim::@5
   [59] *((const byte*) SPRITES_XMSB#0) ← (byte) anim::sprite_msb#5
   [60] (byte) anim::angle#1 ← ++ (byte) anim::angle#10
   [61] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0
   to:anim::@1
-mulf8s_prepared: scope:[mulf8s_prepared]  from anim::@17 anim::@18 anim::@20 anim::@23
-  [62] (signed byte) mulf8s_prepared::b#4 ← phi( anim::@17/(signed byte) mulf8s_prepared::b#0 anim::@18/(signed byte) mulf8s_prepared::b#2 anim::@20/(signed byte) mulf8s_prepared::b#1 anim::@23/(signed byte) mulf8s_prepared::b#3 )
+mulf8s_prepared: scope:[mulf8s_prepared]  from anim::@10 anim::@12 anim::@8 anim::@9
+  [62] (signed byte) mulf8s_prepared::b#4 ← phi( anim::@8/(signed byte) mulf8s_prepared::b#0 anim::@9/(signed byte) mulf8s_prepared::b#2 anim::@10/(signed byte) mulf8s_prepared::b#1 anim::@12/(signed byte) mulf8s_prepared::b#3 )
   [63] call mulf8u_prepared 
   [64] (word) mulf8u_prepared::return#2 ← (word) mulf8u_prepared::return#0
-  to:mulf8s_prepared::@6
-mulf8s_prepared::@6: scope:[mulf8s_prepared]  from mulf8s_prepared
+  to:mulf8s_prepared::@5
+mulf8s_prepared::@5: scope:[mulf8s_prepared]  from mulf8s_prepared
   [65] (word) mulf8s_prepared::m#0 ← (word) mulf8u_prepared::return#2
   [66] if(*((const signed byte*) mulf8s_prepared::memA#0)>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@1
   to:mulf8s_prepared::@3
-mulf8s_prepared::@3: scope:[mulf8s_prepared]  from mulf8s_prepared::@6
+mulf8s_prepared::@3: scope:[mulf8s_prepared]  from mulf8s_prepared::@5
   [67] (byte~) mulf8s_prepared::$8 ← > (word) mulf8s_prepared::m#0
   [68] (byte~) mulf8s_prepared::$15 ← (byte~) mulf8s_prepared::$8 - (byte)(signed byte) mulf8s_prepared::b#4
   [69] (word) mulf8s_prepared::m#1 ← (word) mulf8s_prepared::m#0 hi= (byte~) mulf8s_prepared::$15
   to:mulf8s_prepared::@1
-mulf8s_prepared::@1: scope:[mulf8s_prepared]  from mulf8s_prepared::@3 mulf8s_prepared::@6
-  [70] (word) mulf8s_prepared::m#5 ← phi( mulf8s_prepared::@3/(word) mulf8s_prepared::m#1 mulf8s_prepared::@6/(word) mulf8s_prepared::m#0 )
+mulf8s_prepared::@1: scope:[mulf8s_prepared]  from mulf8s_prepared::@3 mulf8s_prepared::@5
+  [70] (word) mulf8s_prepared::m#5 ← phi( mulf8s_prepared::@3/(word) mulf8s_prepared::m#1 mulf8s_prepared::@5/(word) mulf8s_prepared::m#0 )
   [71] if((signed byte) mulf8s_prepared::b#4>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@2
   to:mulf8s_prepared::@4
 mulf8s_prepared::@4: scope:[mulf8s_prepared]  from mulf8s_prepared::@1
@@ -1737,12 +1757,12 @@ mulf8u_prepare::@return: scope:[mulf8u_prepare]  from mulf8u_prepare
 init: scope:[init]  from main
   [85] phi()
   [86] call mulf_init 
-  to:init::@3
-init::@3: scope:[init]  from init
+  to:init::@2
+init::@2: scope:[init]  from init
   [87] *((const byte*) SPRITES_ENABLE#0) ← (byte/word/signed word/dword/signed dword) $ff
   to:init::@1
-init::@1: scope:[init]  from init::@1 init::@3
-  [88] (byte) init::i#2 ← phi( init::@1/(byte) init::i#1 init::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+init::@1: scope:[init]  from init::@1 init::@2
+  [88] (byte) init::i#2 ← phi( init::@1/(byte) init::i#1 init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [89] *((const byte*) init::sprites_ptr#0 + (byte) init::i#2) ← ((byte))(const byte*) SPRITE#0/(byte/signed byte/word/signed word/dword/signed dword) $40
   [90] *((const byte*) SPRITES_COLS#0 + (byte) init::i#2) ← (const byte) GREEN#0
   [91] (byte) init::i#1 ← ++ (byte) init::i#2
@@ -1779,33 +1799,33 @@ mulf_init::@2: scope:[mulf_init]  from mulf_init::@1 mulf_init::@3
   [107] (word) mulf_init::sqr#1 ← (word) mulf_init::sqr#3 + (byte) mulf_init::x_2#2
   [108] (byte*) mulf_init::sqr1_lo#1 ← ++ (byte*) mulf_init::sqr1_lo#2
   [109] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $200) goto mulf_init::@1
-  to:mulf_init::@5
-mulf_init::@5: scope:[mulf_init]  from mulf_init::@2 mulf_init::@6
-  [110] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@6/(byte) mulf_init::dir#3 )
-  [110] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@6/(byte*) mulf_init::sqr2_hi#1 )
-  [110] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@6/(byte*) mulf_init::sqr2_lo#1 )
-  [110] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@6/(byte) mulf_init::x_255#1 )
+  to:mulf_init::@4
+mulf_init::@4: scope:[mulf_init]  from mulf_init::@2 mulf_init::@5
+  [110] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@5/(byte) mulf_init::dir#3 )
+  [110] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@5/(byte*) mulf_init::sqr2_hi#1 )
+  [110] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@5/(byte*) mulf_init::sqr2_lo#1 )
+  [110] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@5/(byte) mulf_init::x_255#1 )
   [111] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2)
   [112] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2)
   [113] (byte*) mulf_init::sqr2_hi#1 ← ++ (byte*) mulf_init::sqr2_hi#2
   [114] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2
-  [115] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12
-  to:mulf_init::@6
-mulf_init::@6: scope:[mulf_init]  from mulf_init::@12 mulf_init::@5
-  [116] (byte) mulf_init::dir#3 ← phi( mulf_init::@12/(byte) mulf_init::dir#2 mulf_init::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [115] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7
+  to:mulf_init::@5
+mulf_init::@5: scope:[mulf_init]  from mulf_init::@4 mulf_init::@7
+  [116] (byte) mulf_init::dir#3 ← phi( mulf_init::@7/(byte) mulf_init::dir#2 mulf_init::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [117] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2
-  [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5
-  to:mulf_init::@8
-mulf_init::@8: scope:[mulf_init]  from mulf_init::@6
+  [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4
+  to:mulf_init::@6
+mulf_init::@6: scope:[mulf_init]  from mulf_init::@5
   [119] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100)
   [120] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100)
   to:mulf_init::@return
-mulf_init::@return: scope:[mulf_init]  from mulf_init::@8
+mulf_init::@return: scope:[mulf_init]  from mulf_init::@6
   [121] return 
   to:@return
-mulf_init::@12: scope:[mulf_init]  from mulf_init::@5
+mulf_init::@7: scope:[mulf_init]  from mulf_init::@4
   [122] phi()
-  to:mulf_init::@6
+  to:mulf_init::@5
 
 
 VARIABLE REGISTER WEIGHTS
@@ -2197,19 +2217,19 @@ INITIAL ASM
   .label SIN = COS+$40
 //SEG3 @begin
 bbegin:
-  jmp b13
-//SEG4 @13
-b13:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) COS#0) {{ {     .var min = -$7fff     .var max = $7fff     .var ampl = max-min;     .for(var i=0;i<$140;i++) {         .var rad = i*2*PI/256;         .byte >round(min+(ampl/2)+(ampl/2)*cos(rad))     }     }  }}
   // sin(x) = cos(x+PI/2)
-  jmp b16
-//SEG6 @16
-b16:
+  jmp b2
+//SEG6 @2
+b2:
 //SEG7 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @16 to @end [phi:@16->@end]
-bend_from_b16:
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG10 @end
 bend:
@@ -2269,34 +2289,34 @@ anim: {
     jmp b1
   //SEG24 anim::@1
   b1:
-    jmp b6
-  //SEG25 anim::@6
-  b6:
-  //SEG26 [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG25 anim::@2
+  b2:
+  //SEG26 [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b8
-  //SEG27 anim::@8
-  b8:
+    bne b2
+    jmp b3
+  //SEG27 anim::@3
+  b3:
   //SEG28 [13] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-  //SEG29 [14] phi from anim::@8 to anim::@9 [phi:anim::@8->anim::@9]
-  b9_from_b8:
-  //SEG30 [14] phi (byte) anim::sprite_msb#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@9#0] -- vbuz1=vbuc1 
+  //SEG29 [14] phi from anim::@3 to anim::@4 [phi:anim::@3->anim::@4]
+  b4_from_b3:
+  //SEG30 [14] phi (byte) anim::sprite_msb#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta sprite_msb
-  //SEG31 [14] phi (byte) anim::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@9#1] -- vbuz1=vbuc1 
+  //SEG31 [14] phi (byte) anim::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@4#1] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b9
-  //SEG32 [14] phi from anim::@10 to anim::@9 [phi:anim::@10->anim::@9]
-  b9_from_b10:
-  //SEG33 [14] phi (byte) anim::sprite_msb#10 = (byte) anim::sprite_msb#5 [phi:anim::@10->anim::@9#0] -- register_copy 
-  //SEG34 [14] phi (byte) anim::i#10 = (byte) anim::i#1 [phi:anim::@10->anim::@9#1] -- register_copy 
-    jmp b9
-  //SEG35 anim::@9
-  b9:
+    jmp b4
+  //SEG32 [14] phi from anim::@5 to anim::@4 [phi:anim::@5->anim::@4]
+  b4_from_b5:
+  //SEG33 [14] phi (byte) anim::sprite_msb#10 = (byte) anim::sprite_msb#5 [phi:anim::@5->anim::@4#0] -- register_copy 
+  //SEG34 [14] phi (byte) anim::i#10 = (byte) anim::i#1 [phi:anim::@5->anim::@4#1] -- register_copy 
+    jmp b4
+  //SEG35 anim::@4
+  b4:
   //SEG36 [15] (signed byte) anim::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#10) -- vbsz1=pbsc1_derefidx_vbuz2 
     ldy i
     lda xs,y
@@ -2318,25 +2338,25 @@ anim: {
   mulf8u_prepare_from_mulf8s_prepare1:
   //SEG42 [81] phi (byte) mulf8u_prepare::a#2 = (byte~) mulf8u_prepare::a#3 [phi:anim::mulf8s_prepare1->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-    jmp b17
-  //SEG43 anim::@17
-  b17:
+    jmp b8
+  //SEG43 anim::@8
+  b8:
   //SEG44 [19] (signed byte) mulf8s_prepared::b#0 ← (signed byte) anim::x#0 -- vbsz1=vbsz2 
     lda x
     sta mulf8s_prepared.b
   //SEG45 [20] call mulf8s_prepared 
-  //SEG46 [62] phi from anim::@17 to mulf8s_prepared [phi:anim::@17->mulf8s_prepared]
-  mulf8s_prepared_from_b17:
-  //SEG47 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#0 [phi:anim::@17->mulf8s_prepared#0] -- register_copy 
+  //SEG46 [62] phi from anim::@8 to mulf8s_prepared [phi:anim::@8->mulf8s_prepared]
+  mulf8s_prepared_from_b8:
+  //SEG47 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#0 [phi:anim::@8->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG48 [21] (signed word) mulf8s_prepared::return#2 ← (signed word)(word) mulf8s_prepared::m#4 -- vwsz1=vwsz2 
     lda mulf8s_prepared.m
     sta mulf8s_prepared.return
     lda mulf8s_prepared.m+1
     sta mulf8s_prepared.return+1
-    jmp b20
-  //SEG49 anim::@20
-  b20:
+    jmp b10
+  //SEG49 anim::@10
+  b10:
   //SEG50 [22] (signed word~) anim::$4 ← (signed word) mulf8s_prepared::return#2 -- vwsz1=vwsz2 
     lda mulf8s_prepared.return
     sta _4
@@ -2353,18 +2373,18 @@ anim: {
     lda y
     sta mulf8s_prepared.b
   //SEG53 [25] call mulf8s_prepared 
-  //SEG54 [62] phi from anim::@20 to mulf8s_prepared [phi:anim::@20->mulf8s_prepared]
-  mulf8s_prepared_from_b20:
-  //SEG55 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#1 [phi:anim::@20->mulf8s_prepared#0] -- register_copy 
+  //SEG54 [62] phi from anim::@10 to mulf8s_prepared [phi:anim::@10->mulf8s_prepared]
+  mulf8s_prepared_from_b10:
+  //SEG55 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#1 [phi:anim::@10->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG56 [26] (signed word) mulf8s_prepared::return#3 ← (signed word)(word) mulf8s_prepared::m#4 -- vwsz1=vwsz2 
     lda mulf8s_prepared.m
     sta mulf8s_prepared.return_3
     lda mulf8s_prepared.m+1
     sta mulf8s_prepared.return_3+1
-    jmp b21
-  //SEG57 anim::@21
-  b21:
+    jmp b11
+  //SEG57 anim::@11
+  b11:
   //SEG58 [27] (signed word~) anim::$6 ← (signed word) mulf8s_prepared::return#3 -- vwsz1=vwsz2 
     lda mulf8s_prepared.return_3
     sta _6
@@ -2389,25 +2409,25 @@ anim: {
   mulf8u_prepare_from_mulf8s_prepare2:
   //SEG64 [81] phi (byte) mulf8u_prepare::a#2 = (byte~) mulf8u_prepare::a#4 [phi:anim::mulf8s_prepare2->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-    jmp b18
-  //SEG65 anim::@18
-  b18:
+    jmp b9
+  //SEG65 anim::@9
+  b9:
   //SEG66 [31] (signed byte) mulf8s_prepared::b#2 ← (signed byte) anim::y#0 -- vbsz1=vbsz2 
     lda y
     sta mulf8s_prepared.b
   //SEG67 [32] call mulf8s_prepared 
-  //SEG68 [62] phi from anim::@18 to mulf8s_prepared [phi:anim::@18->mulf8s_prepared]
-  mulf8s_prepared_from_b18:
-  //SEG69 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#2 [phi:anim::@18->mulf8s_prepared#0] -- register_copy 
+  //SEG68 [62] phi from anim::@9 to mulf8s_prepared [phi:anim::@9->mulf8s_prepared]
+  mulf8s_prepared_from_b9:
+  //SEG69 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#2 [phi:anim::@9->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG70 [33] (signed word) mulf8s_prepared::return#4 ← (signed word)(word) mulf8s_prepared::m#4 -- vwsz1=vwsz2 
     lda mulf8s_prepared.m
     sta mulf8s_prepared.return_4
     lda mulf8s_prepared.m+1
     sta mulf8s_prepared.return_4+1
-    jmp b23
-  //SEG71 anim::@23
-  b23:
+    jmp b12
+  //SEG71 anim::@12
+  b12:
   //SEG72 [34] (signed word~) anim::$9 ← (signed word) mulf8s_prepared::return#4 -- vwsz1=vwsz2 
     lda mulf8s_prepared.return_4
     sta _9
@@ -2432,18 +2452,18 @@ anim: {
     lda x
     sta mulf8s_prepared.b
   //SEG76 [38] call mulf8s_prepared 
-  //SEG77 [62] phi from anim::@23 to mulf8s_prepared [phi:anim::@23->mulf8s_prepared]
-  mulf8s_prepared_from_b23:
-  //SEG78 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#3 [phi:anim::@23->mulf8s_prepared#0] -- register_copy 
+  //SEG77 [62] phi from anim::@12 to mulf8s_prepared [phi:anim::@12->mulf8s_prepared]
+  mulf8s_prepared_from_b12:
+  //SEG78 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#3 [phi:anim::@12->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG79 [39] (signed word) mulf8s_prepared::return#10 ← (signed word)(word) mulf8s_prepared::m#4 -- vwsz1=vwsz2 
     lda mulf8s_prepared.m
     sta mulf8s_prepared.return_10
     lda mulf8s_prepared.m+1
     sta mulf8s_prepared.return_10+1
-    jmp b24
-  //SEG80 anim::@24
-  b24:
+    jmp b13
+  //SEG80 anim::@13
+  b13:
   //SEG81 [40] (signed word~) anim::$11 ← (signed word) mulf8s_prepared::return#10 -- vwsz1=vwsz2 
     lda mulf8s_prepared.return_10
     sta _11
@@ -2491,24 +2511,24 @@ anim: {
   //SEG88 [47] (byte~) anim::$18 ← > (signed word) anim::xpos#0 -- vbuz1=_hi_vwsz2 
     lda xpos+1
     sta _18
-  //SEG89 [48] if((byte~) anim::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@10 -- vbuz1_eq_0_then_la1 
+  //SEG89 [48] if((byte~) anim::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@5 -- vbuz1_eq_0_then_la1 
     lda _18
     cmp #0
-    beq b10_from_b24
-    jmp b11
-  //SEG90 anim::@11
-  b11:
+    beq b5_from_b13
+    jmp b6
+  //SEG90 anim::@6
+  b6:
   //SEG91 [49] (byte) anim::sprite_msb#2 ← (byte) anim::sprite_msb#1 | (byte/word/signed word/dword/signed dword) $80 -- vbuz1=vbuz1_bor_vbuc1 
     lda #$80
     ora sprite_msb
     sta sprite_msb
-  //SEG92 [50] phi from anim::@11 anim::@24 to anim::@10 [phi:anim::@11/anim::@24->anim::@10]
-  b10_from_b11:
-  b10_from_b24:
-  //SEG93 [50] phi (byte) anim::sprite_msb#5 = (byte) anim::sprite_msb#2 [phi:anim::@11/anim::@24->anim::@10#0] -- register_copy 
-    jmp b10
-  //SEG94 anim::@10
-  b10:
+  //SEG92 [50] phi from anim::@13 anim::@6 to anim::@5 [phi:anim::@13/anim::@6->anim::@5]
+  b5_from_b13:
+  b5_from_b6:
+  //SEG93 [50] phi (byte) anim::sprite_msb#5 = (byte) anim::sprite_msb#1 [phi:anim::@13/anim::@6->anim::@5#0] -- register_copy 
+    jmp b5
+  //SEG94 anim::@5
+  b5:
   //SEG95 [51] (byte~) anim::$22 ← > (signed word) anim::yr#1 -- vbuz1=_hi_vwsz2 
     lda yr_1+1
     sta _22
@@ -2533,13 +2553,13 @@ anim: {
     sta SPRITES_YPOS,y
   //SEG101 [57] (byte) anim::i#1 ← ++ (byte) anim::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG102 [58] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@9 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG102 [58] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    bne b9_from_b10
-    jmp b12
-  //SEG103 anim::@12
-  b12:
+    bne b4_from_b5
+    jmp b7
+  //SEG103 anim::@7
+  b7:
   //SEG104 [59] *((const byte*) SPRITES_XMSB#0) ← (byte) anim::sprite_msb#5 -- _deref_pbuc1=vbuz1 
     lda sprite_msb
     sta SPRITES_XMSB
@@ -2548,9 +2568,9 @@ anim: {
   //SEG106 [61] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0 -- _deref_pbuc1=vbuc2 
     lda #LIGHT_BLUE
     sta BORDERCOL
-  //SEG107 [11] phi from anim::@12 to anim::@1 [phi:anim::@12->anim::@1]
-  b1_from_b12:
-  //SEG108 [11] phi (byte) anim::angle#10 = (byte) anim::angle#1 [phi:anim::@12->anim::@1#0] -- register_copy 
+  //SEG107 [11] phi from anim::@7 to anim::@1 [phi:anim::@7->anim::@1]
+  b1_from_b7:
+  //SEG108 [11] phi (byte) anim::angle#10 = (byte) anim::angle#1 [phi:anim::@7->anim::@1#0] -- register_copy 
     jmp b1
 }
 //SEG109 mulf8s_prepared
@@ -2576,9 +2596,9 @@ mulf8s_prepared: {
     sta mulf8u_prepared.return_2
     lda mulf8u_prepared.return+1
     sta mulf8u_prepared.return_2+1
-    jmp b6
-  //SEG112 mulf8s_prepared::@6
-  b6:
+    jmp b5
+  //SEG112 mulf8s_prepared::@5
+  b5:
   //SEG113 [65] (word) mulf8s_prepared::m#0 ← (word) mulf8u_prepared::return#2 -- vwuz1=vwuz2 
     lda mulf8u_prepared.return_2
     sta m
@@ -2587,7 +2607,7 @@ mulf8s_prepared: {
   //SEG114 [66] if(*((const signed byte*) mulf8s_prepared::memA#0)>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@1 -- _deref_pbsc1_ge_0_then_la1 
     lda memA
     cmp #0
-    bpl b1_from_b6
+    bpl b1_from_b5
     jmp b3
   //SEG115 mulf8s_prepared::@3
   b3:
@@ -2602,10 +2622,10 @@ mulf8s_prepared: {
   //SEG118 [69] (word) mulf8s_prepared::m#1 ← (word) mulf8s_prepared::m#0 hi= (byte~) mulf8s_prepared::$15 -- vwuz1=vwuz1_sethi_vbuz2 
     lda _15
     sta m+1
-  //SEG119 [70] phi from mulf8s_prepared::@3 mulf8s_prepared::@6 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1]
+  //SEG119 [70] phi from mulf8s_prepared::@3 mulf8s_prepared::@5 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG120 [70] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1#0] -- register_copy 
+  b1_from_b5:
+  //SEG120 [70] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1#0] -- register_copy 
     jmp b1
   //SEG121 mulf8s_prepared::@1
   b1:
@@ -2705,15 +2725,15 @@ init: {
   //SEG145 [94] phi from init to mulf_init [phi:init->mulf_init]
   mulf_init_from_init:
     jsr mulf_init
-    jmp b3
-  //SEG146 init::@3
-  b3:
+    jmp b2
+  //SEG146 init::@2
+  b2:
   //SEG147 [87] *((const byte*) SPRITES_ENABLE#0) ← (byte/word/signed word/dword/signed dword) $ff -- _deref_pbuc1=vbuc2 
     lda #$ff
     sta SPRITES_ENABLE
-  //SEG148 [88] phi from init::@3 to init::@1 [phi:init::@3->init::@1]
-  b1_from_b3:
-  //SEG149 [88] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@3->init::@1#0] -- vbuz1=vbuc1 
+  //SEG148 [88] phi from init::@2 to init::@1 [phi:init::@2->init::@1]
+  b1_from_b2:
+  //SEG149 [88] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@2->init::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
     jmp b1
@@ -2859,34 +2879,34 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1_from_b2
-  //SEG191 [110] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  b5_from_b2:
-  //SEG192 [110] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG191 [110] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  b4_from_b2:
+  //SEG192 [110] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG193 [110] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG193 [110] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG194 [110] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG194 [110] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG195 [110] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuz1=vbuc1 
+  //SEG195 [110] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuz1=vbuc1 
     lda #-1
     sta x_255
-    jmp b5
-  //SEG196 [110] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  b5_from_b6:
-  //SEG197 [110] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG198 [110] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG199 [110] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG200 [110] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-    jmp b5
-  //SEG201 mulf_init::@5
-  b5:
+    jmp b4
+  //SEG196 [110] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  b4_from_b5:
+  //SEG197 [110] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG198 [110] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG199 [110] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG200 [110] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+    jmp b4
+  //SEG201 mulf_init::@4
+  b4:
   //SEG202 [111] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuz2 
     ldy x_255
     lda mulf_sqr1_lo,y
@@ -2907,33 +2927,33 @@ mulf_init: {
     clc
     adc dir
     sta x_255
-  //SEG206 [115] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuz1_neq_0_then_la1 
+  //SEG206 [115] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuz1_neq_0_then_la1 
     lda x_255
     cmp #0
-    bne b12_from_b5
-  //SEG207 [116] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  b6_from_b5:
-  //SEG208 [116] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b7_from_b4
+  //SEG207 [116] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  b5_from_b4:
+  //SEG208 [116] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-    jmp b6
-  //SEG209 mulf_init::@6
-  b6:
+    jmp b5
+  //SEG209 mulf_init::@5
+  b5:
   //SEG210 [117] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG211 [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG211 [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5_from_b6
+    bne b4_from_b5
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5_from_b6
-    jmp b8
-  //SEG212 mulf_init::@8
-  b8:
+    bne b4_from_b5
+    jmp b6
+  //SEG212 mulf_init::@6
+  b6:
   //SEG213 [119] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -2946,15 +2966,15 @@ mulf_init: {
   breturn:
   //SEG216 [121] return 
     rts
-  //SEG217 [122] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  b12_from_b5:
-    jmp b12
-  //SEG218 mulf_init::@12
-  b12:
-  //SEG219 [116] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  b6_from_b12:
-  //SEG220 [116] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
-    jmp b6
+  //SEG217 [122] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  b7_from_b4:
+    jmp b7
+  //SEG218 mulf_init::@7
+  b7:
+  //SEG219 [116] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  b5_from_b7:
+  //SEG220 [116] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
+    jmp b5
 }
   // mulf_sqr tables will contain f(x)=int(x*x/4) and g(x) = f(x-255).
   // <f(x) = <(( x * x )/4)
@@ -2992,7 +3012,7 @@ mulf_init: {
 
 REGISTER UPLIFT POTENTIAL REGISTERS
 Equivalence Class zp ZP_BYTE:59 [ anim::$22 ] has ALU potential.
-Statement [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6 [ anim::angle#10 ] ( main:3::anim:8 [ anim::angle#10 ] ) always clobbers reg byte a 
+Statement [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2 [ anim::angle#10 ] ( main:3::anim:8 [ anim::angle#10 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ anim::angle#10 anim::angle#1 ]
 Statement [17] (byte~) mulf8u_prepare::a#3 ← (byte)(signed byte)*((const byte*) COS#0 + (byte) anim::angle#10) [ anim::angle#10 anim::i#10 anim::sprite_msb#10 anim::x#0 anim::y#0 mulf8u_prepare::a#3 ] ( main:3::anim:8 [ anim::angle#10 anim::i#10 anim::sprite_msb#10 anim::x#0 anim::y#0 mulf8u_prepare::a#3 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:3 [ anim::i#10 anim::i#1 ]
@@ -3062,10 +3082,10 @@ Removing always clobbered register reg byte a as potential for zp ZP_BYTE:23 [ m
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:23 [ mulf_init::dir#2 mulf_init::dir#3 ]
 Statement [112] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:3::init:6::mulf_init:86 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [114] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ( main:3::init:6::mulf_init:86 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ) always clobbers reg byte a 
-Statement [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:3::init:6::mulf_init:86 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
+Statement [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:3::init:6::mulf_init:86 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
 Statement [119] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) [ ] ( main:3::init:6::mulf_init:86 [ ] ) always clobbers reg byte a 
 Statement [120] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100) [ ] ( main:3::init:6::mulf_init:86 [ ] ) always clobbers reg byte a 
-Statement [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6 [ anim::angle#10 ] ( main:3::anim:8 [ anim::angle#10 ] ) always clobbers reg byte a 
+Statement [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2 [ anim::angle#10 ] ( main:3::anim:8 [ anim::angle#10 ] ) always clobbers reg byte a 
 Statement [17] (byte~) mulf8u_prepare::a#3 ← (byte)(signed byte)*((const byte*) COS#0 + (byte) anim::angle#10) [ anim::angle#10 anim::i#10 anim::sprite_msb#10 anim::x#0 anim::y#0 mulf8u_prepare::a#3 ] ( main:3::anim:8 [ anim::angle#10 anim::i#10 anim::sprite_msb#10 anim::x#0 anim::y#0 mulf8u_prepare::a#3 ] ) always clobbers reg byte a 
 Statement [21] (signed word) mulf8s_prepared::return#2 ← (signed word)(word) mulf8s_prepared::m#4 [ anim::angle#10 anim::i#10 anim::sprite_msb#10 anim::x#0 anim::y#0 mulf8s_prepared::return#2 ] ( main:3::anim:8 [ anim::angle#10 anim::i#10 anim::sprite_msb#10 anim::x#0 anim::y#0 mulf8s_prepared::return#2 ] ) always clobbers reg byte a 
 Statement [22] (signed word~) anim::$4 ← (signed word) mulf8s_prepared::return#2 [ anim::angle#10 anim::i#10 anim::sprite_msb#10 anim::x#0 anim::y#0 anim::$4 ] ( main:3::anim:8 [ anim::angle#10 anim::i#10 anim::sprite_msb#10 anim::x#0 anim::y#0 anim::$4 ] ) always clobbers reg byte a 
@@ -3113,7 +3133,7 @@ Statement [109] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo
 Statement [111] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:3::init:6::mulf_init:86 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [112] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:3::init:6::mulf_init:86 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [114] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ( main:3::init:6::mulf_init:86 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ) always clobbers reg byte a 
-Statement [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:3::init:6::mulf_init:86 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
+Statement [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:3::init:6::mulf_init:86 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
 Statement [119] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) [ ] ( main:3::init:6::mulf_init:86 [ ] ) always clobbers reg byte a 
 Statement [120] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100) [ ] ( main:3::init:6::mulf_init:86 [ ] ) always clobbers reg byte a 
 Potential registers zp ZP_BYTE:2 [ anim::angle#10 anim::angle#1 ] : zp ZP_BYTE:2 , reg byte y , 
@@ -3268,19 +3288,19 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SIN = COS+$40
 //SEG3 @begin
 bbegin:
-  jmp b13
-//SEG4 @13
-b13:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) COS#0) {{ {     .var min = -$7fff     .var max = $7fff     .var ampl = max-min;     .for(var i=0;i<$140;i++) {         .var rad = i*2*PI/256;         .byte >round(min+(ampl/2)+(ampl/2)*cos(rad))     }     }  }}
   // sin(x) = cos(x+PI/2)
-  jmp b16
-//SEG6 @16
-b16:
+  jmp b2
+//SEG6 @2
+b2:
 //SEG7 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @16 to @end [phi:@16->@end]
-bend_from_b16:
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG10 @end
 bend:
@@ -3331,34 +3351,34 @@ anim: {
     jmp b1
   //SEG24 anim::@1
   b1:
-    jmp b6
-  //SEG25 anim::@6
-  b6:
-  //SEG26 [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG25 anim::@2
+  b2:
+  //SEG26 [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b8
-  //SEG27 anim::@8
-  b8:
+    bne b2
+    jmp b3
+  //SEG27 anim::@3
+  b3:
   //SEG28 [13] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-  //SEG29 [14] phi from anim::@8 to anim::@9 [phi:anim::@8->anim::@9]
-  b9_from_b8:
-  //SEG30 [14] phi (byte) anim::sprite_msb#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@9#0] -- vbuz1=vbuc1 
+  //SEG29 [14] phi from anim::@3 to anim::@4 [phi:anim::@3->anim::@4]
+  b4_from_b3:
+  //SEG30 [14] phi (byte) anim::sprite_msb#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta sprite_msb
-  //SEG31 [14] phi (byte) anim::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@9#1] -- vbuz1=vbuc1 
+  //SEG31 [14] phi (byte) anim::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@4#1] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b9
-  //SEG32 [14] phi from anim::@10 to anim::@9 [phi:anim::@10->anim::@9]
-  b9_from_b10:
-  //SEG33 [14] phi (byte) anim::sprite_msb#10 = (byte) anim::sprite_msb#5 [phi:anim::@10->anim::@9#0] -- register_copy 
-  //SEG34 [14] phi (byte) anim::i#10 = (byte) anim::i#1 [phi:anim::@10->anim::@9#1] -- register_copy 
-    jmp b9
-  //SEG35 anim::@9
-  b9:
+    jmp b4
+  //SEG32 [14] phi from anim::@5 to anim::@4 [phi:anim::@5->anim::@4]
+  b4_from_b5:
+  //SEG33 [14] phi (byte) anim::sprite_msb#10 = (byte) anim::sprite_msb#5 [phi:anim::@5->anim::@4#0] -- register_copy 
+  //SEG34 [14] phi (byte) anim::i#10 = (byte) anim::i#1 [phi:anim::@5->anim::@4#1] -- register_copy 
+    jmp b4
+  //SEG35 anim::@4
+  b4:
   //SEG36 [15] (signed byte) anim::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#10) -- vbsz1=pbsc1_derefidx_vbuz2 
     ldy i
     lda xs,y
@@ -3379,20 +3399,20 @@ anim: {
   mulf8u_prepare_from_mulf8s_prepare1:
   //SEG42 [81] phi (byte) mulf8u_prepare::a#2 = (byte~) mulf8u_prepare::a#3 [phi:anim::mulf8s_prepare1->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-    jmp b17
-  //SEG43 anim::@17
-  b17:
+    jmp b8
+  //SEG43 anim::@8
+  b8:
   //SEG44 [19] (signed byte) mulf8s_prepared::b#0 ← (signed byte) anim::x#0 -- vbsyy=vbsz1 
     ldy x
   //SEG45 [20] call mulf8s_prepared 
-  //SEG46 [62] phi from anim::@17 to mulf8s_prepared [phi:anim::@17->mulf8s_prepared]
-  mulf8s_prepared_from_b17:
-  //SEG47 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#0 [phi:anim::@17->mulf8s_prepared#0] -- register_copy 
+  //SEG46 [62] phi from anim::@8 to mulf8s_prepared [phi:anim::@8->mulf8s_prepared]
+  mulf8s_prepared_from_b8:
+  //SEG47 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#0 [phi:anim::@8->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG48 [21] (signed word) mulf8s_prepared::return#2 ← (signed word)(word) mulf8s_prepared::m#4
-    jmp b20
-  //SEG49 anim::@20
-  b20:
+    jmp b10
+  //SEG49 anim::@10
+  b10:
   //SEG50 [22] (signed word~) anim::$4 ← (signed word) mulf8s_prepared::return#2 -- vwsz1=vwsz2 
     lda mulf8s_prepared.return
     sta _4
@@ -3404,14 +3424,14 @@ anim: {
   //SEG52 [24] (signed byte) mulf8s_prepared::b#1 ← (signed byte) anim::y#0 -- vbsyy=vbsz1 
     ldy y
   //SEG53 [25] call mulf8s_prepared 
-  //SEG54 [62] phi from anim::@20 to mulf8s_prepared [phi:anim::@20->mulf8s_prepared]
-  mulf8s_prepared_from_b20:
-  //SEG55 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#1 [phi:anim::@20->mulf8s_prepared#0] -- register_copy 
+  //SEG54 [62] phi from anim::@10 to mulf8s_prepared [phi:anim::@10->mulf8s_prepared]
+  mulf8s_prepared_from_b10:
+  //SEG55 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#1 [phi:anim::@10->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG56 [26] (signed word) mulf8s_prepared::return#3 ← (signed word)(word) mulf8s_prepared::m#4
-    jmp b21
-  //SEG57 anim::@21
-  b21:
+    jmp b11
+  //SEG57 anim::@11
+  b11:
   //SEG58 [27] (signed word~) anim::$6 ← (signed word) mulf8s_prepared::return#3 -- vwsz1=vwsz2 
     lda mulf8s_prepared.return
     sta _6
@@ -3431,20 +3451,20 @@ anim: {
   mulf8u_prepare_from_mulf8s_prepare2:
   //SEG64 [81] phi (byte) mulf8u_prepare::a#2 = (byte~) mulf8u_prepare::a#4 [phi:anim::mulf8s_prepare2->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-    jmp b18
-  //SEG65 anim::@18
-  b18:
+    jmp b9
+  //SEG65 anim::@9
+  b9:
   //SEG66 [31] (signed byte) mulf8s_prepared::b#2 ← (signed byte) anim::y#0 -- vbsyy=vbsz1 
     ldy y
   //SEG67 [32] call mulf8s_prepared 
-  //SEG68 [62] phi from anim::@18 to mulf8s_prepared [phi:anim::@18->mulf8s_prepared]
-  mulf8s_prepared_from_b18:
-  //SEG69 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#2 [phi:anim::@18->mulf8s_prepared#0] -- register_copy 
+  //SEG68 [62] phi from anim::@9 to mulf8s_prepared [phi:anim::@9->mulf8s_prepared]
+  mulf8s_prepared_from_b9:
+  //SEG69 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#2 [phi:anim::@9->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG70 [33] (signed word) mulf8s_prepared::return#4 ← (signed word)(word) mulf8s_prepared::m#4
-    jmp b23
-  //SEG71 anim::@23
-  b23:
+    jmp b12
+  //SEG71 anim::@12
+  b12:
   //SEG72 [34] (signed word~) anim::$9 ← (signed word) mulf8s_prepared::return#4
   //SEG73 [35] (signed word~) anim::$10 ← (signed word~) anim::$9 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwsz1=vwsz1_rol_1 
     asl _10
@@ -3460,14 +3480,14 @@ anim: {
   //SEG75 [37] (signed byte) mulf8s_prepared::b#3 ← (signed byte) anim::x#0 -- vbsyy=vbsz1 
     ldy x
   //SEG76 [38] call mulf8s_prepared 
-  //SEG77 [62] phi from anim::@23 to mulf8s_prepared [phi:anim::@23->mulf8s_prepared]
-  mulf8s_prepared_from_b23:
-  //SEG78 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#3 [phi:anim::@23->mulf8s_prepared#0] -- register_copy 
+  //SEG77 [62] phi from anim::@12 to mulf8s_prepared [phi:anim::@12->mulf8s_prepared]
+  mulf8s_prepared_from_b12:
+  //SEG78 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#3 [phi:anim::@12->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG79 [39] (signed word) mulf8s_prepared::return#10 ← (signed word)(word) mulf8s_prepared::m#4
-    jmp b24
-  //SEG80 anim::@24
-  b24:
+    jmp b13
+  //SEG80 anim::@13
+  b13:
   //SEG81 [40] (signed word~) anim::$11 ← (signed word) mulf8s_prepared::return#10
   //SEG82 [41] (signed word~) anim::$12 ← (signed word~) anim::$11 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwsz1=vwsz1_rol_1 
     asl _12
@@ -3502,23 +3522,23 @@ anim: {
     lsr sprite_msb
   //SEG88 [47] (byte~) anim::$18 ← > (signed word) anim::xpos#0 -- vbuaa=_hi_vwsz1 
     lda xpos+1
-  //SEG89 [48] if((byte~) anim::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@10 -- vbuaa_eq_0_then_la1 
+  //SEG89 [48] if((byte~) anim::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@5 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b10_from_b24
-    jmp b11
-  //SEG90 anim::@11
-  b11:
+    beq b5_from_b13
+    jmp b6
+  //SEG90 anim::@6
+  b6:
   //SEG91 [49] (byte) anim::sprite_msb#2 ← (byte) anim::sprite_msb#1 | (byte/word/signed word/dword/signed dword) $80 -- vbuz1=vbuz1_bor_vbuc1 
     lda #$80
     ora sprite_msb
     sta sprite_msb
-  //SEG92 [50] phi from anim::@11 anim::@24 to anim::@10 [phi:anim::@11/anim::@24->anim::@10]
-  b10_from_b11:
-  b10_from_b24:
-  //SEG93 [50] phi (byte) anim::sprite_msb#5 = (byte) anim::sprite_msb#2 [phi:anim::@11/anim::@24->anim::@10#0] -- register_copy 
-    jmp b10
-  //SEG94 anim::@10
-  b10:
+  //SEG92 [50] phi from anim::@13 anim::@6 to anim::@5 [phi:anim::@13/anim::@6->anim::@5]
+  b5_from_b13:
+  b5_from_b6:
+  //SEG93 [50] phi (byte) anim::sprite_msb#5 = (byte) anim::sprite_msb#1 [phi:anim::@13/anim::@6->anim::@5#0] -- register_copy 
+    jmp b5
+  //SEG94 anim::@5
+  b5:
   //SEG95 [51] (byte~) anim::$22 ← > (signed word) anim::yr#1 -- vbuaa=_hi_vwsz1 
     lda yr+1
   //SEG96 [52] (byte) anim::ypos#0 ← (byte~) anim::$22 + (byte/signed byte/word/signed word/dword/signed dword) $59+(byte/signed byte/word/signed word/dword/signed dword) $33 -- vbuyy=vbuaa_plus_vbuc1 
@@ -3538,13 +3558,13 @@ anim: {
     sta SPRITES_YPOS,x
   //SEG101 [57] (byte) anim::i#1 ← ++ (byte) anim::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG102 [58] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@9 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG102 [58] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    bne b9_from_b10
-    jmp b12
-  //SEG103 anim::@12
-  b12:
+    bne b4_from_b5
+    jmp b7
+  //SEG103 anim::@7
+  b7:
   //SEG104 [59] *((const byte*) SPRITES_XMSB#0) ← (byte) anim::sprite_msb#5 -- _deref_pbuc1=vbuz1 
     lda sprite_msb
     sta SPRITES_XMSB
@@ -3553,9 +3573,9 @@ anim: {
   //SEG106 [61] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0 -- _deref_pbuc1=vbuc2 
     lda #LIGHT_BLUE
     sta BORDERCOL
-  //SEG107 [11] phi from anim::@12 to anim::@1 [phi:anim::@12->anim::@1]
-  b1_from_b12:
-  //SEG108 [11] phi (byte) anim::angle#10 = (byte) anim::angle#1 [phi:anim::@12->anim::@1#0] -- register_copy 
+  //SEG107 [11] phi from anim::@7 to anim::@1 [phi:anim::@7->anim::@1]
+  b1_from_b7:
+  //SEG108 [11] phi (byte) anim::angle#10 = (byte) anim::angle#1 [phi:anim::@7->anim::@1#0] -- register_copy 
     jmp b1
 }
 //SEG109 mulf8s_prepared
@@ -3569,14 +3589,14 @@ mulf8s_prepared: {
   //SEG110 [63] call mulf8u_prepared 
     jsr mulf8u_prepared
   //SEG111 [64] (word) mulf8u_prepared::return#2 ← (word) mulf8u_prepared::return#0
-    jmp b6
-  //SEG112 mulf8s_prepared::@6
-  b6:
+    jmp b5
+  //SEG112 mulf8s_prepared::@5
+  b5:
   //SEG113 [65] (word) mulf8s_prepared::m#0 ← (word) mulf8u_prepared::return#2
   //SEG114 [66] if(*((const signed byte*) mulf8s_prepared::memA#0)>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@1 -- _deref_pbsc1_ge_0_then_la1 
     lda memA
     cmp #0
-    bpl b1_from_b6
+    bpl b1_from_b5
     jmp b3
   //SEG115 mulf8s_prepared::@3
   b3:
@@ -3588,10 +3608,10 @@ mulf8s_prepared: {
     sbc $ff
   //SEG118 [69] (word) mulf8s_prepared::m#1 ← (word) mulf8s_prepared::m#0 hi= (byte~) mulf8s_prepared::$15 -- vwuz1=vwuz1_sethi_vbuaa 
     sta m+1
-  //SEG119 [70] phi from mulf8s_prepared::@3 mulf8s_prepared::@6 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1]
+  //SEG119 [70] phi from mulf8s_prepared::@3 mulf8s_prepared::@5 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG120 [70] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1#0] -- register_copy 
+  b1_from_b5:
+  //SEG120 [70] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1#0] -- register_copy 
     jmp b1
   //SEG121 mulf8s_prepared::@1
   b1:
@@ -3681,15 +3701,15 @@ init: {
   //SEG145 [94] phi from init to mulf_init [phi:init->mulf_init]
   mulf_init_from_init:
     jsr mulf_init
-    jmp b3
-  //SEG146 init::@3
-  b3:
+    jmp b2
+  //SEG146 init::@2
+  b2:
   //SEG147 [87] *((const byte*) SPRITES_ENABLE#0) ← (byte/word/signed word/dword/signed dword) $ff -- _deref_pbuc1=vbuc2 
     lda #$ff
     sta SPRITES_ENABLE
-  //SEG148 [88] phi from init::@3 to init::@1 [phi:init::@3->init::@1]
-  b1_from_b3:
-  //SEG149 [88] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@3->init::@1#0] -- vbuxx=vbuc1 
+  //SEG148 [88] phi from init::@2 to init::@1 [phi:init::@2->init::@1]
+  b1_from_b2:
+  //SEG149 [88] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@2->init::@1#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
   //SEG150 [88] phi from init::@1 to init::@1 [phi:init::@1->init::@1]
@@ -3819,33 +3839,33 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1_from_b2
-  //SEG191 [110] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  b5_from_b2:
-  //SEG192 [110] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG191 [110] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  b4_from_b2:
+  //SEG192 [110] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG193 [110] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG193 [110] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG194 [110] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG194 [110] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG195 [110] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuxx=vbuc1 
+  //SEG195 [110] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuxx=vbuc1 
     ldx #-1
-    jmp b5
-  //SEG196 [110] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  b5_from_b6:
-  //SEG197 [110] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG198 [110] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG199 [110] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG200 [110] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-    jmp b5
-  //SEG201 mulf_init::@5
-  b5:
+    jmp b4
+  //SEG196 [110] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  b4_from_b5:
+  //SEG197 [110] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG198 [110] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG199 [110] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG200 [110] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+    jmp b4
+  //SEG201 mulf_init::@4
+  b4:
   //SEG202 [111] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuxx 
     lda mulf_sqr1_lo,x
     ldy #0
@@ -3864,32 +3884,32 @@ mulf_init: {
     clc
     adc dir
     tax
-  //SEG206 [115] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuxx_neq_0_then_la1 
+  //SEG206 [115] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b12_from_b5
-  //SEG207 [116] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  b6_from_b5:
-  //SEG208 [116] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b7_from_b4
+  //SEG207 [116] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  b5_from_b4:
+  //SEG208 [116] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-    jmp b6
-  //SEG209 mulf_init::@6
-  b6:
+    jmp b5
+  //SEG209 mulf_init::@5
+  b5:
   //SEG210 [117] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG211 [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG211 [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5_from_b6
+    bne b4_from_b5
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5_from_b6
-    jmp b8
-  //SEG212 mulf_init::@8
-  b8:
+    bne b4_from_b5
+    jmp b6
+  //SEG212 mulf_init::@6
+  b6:
   //SEG213 [119] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -3902,15 +3922,15 @@ mulf_init: {
   breturn:
   //SEG216 [121] return 
     rts
-  //SEG217 [122] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  b12_from_b5:
-    jmp b12
-  //SEG218 mulf_init::@12
-  b12:
-  //SEG219 [116] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  b6_from_b12:
-  //SEG220 [116] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
-    jmp b6
+  //SEG217 [122] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  b7_from_b4:
+    jmp b7
+  //SEG218 mulf_init::@7
+  b7:
+  //SEG219 [116] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  b5_from_b7:
+  //SEG220 [116] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
+    jmp b5
 }
   // mulf_sqr tables will contain f(x)=int(x*x/4) and g(x) = f(x-255).
   // <f(x) = <(( x * x )/4)
@@ -3947,27 +3967,27 @@ mulf_init: {
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b13
-Removing instruction jmp b16
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b9
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp mulf8s_prepare1
-Removing instruction jmp b17
-Removing instruction jmp b20
-Removing instruction jmp b21
-Removing instruction jmp mulf8s_prepare2
-Removing instruction jmp b18
-Removing instruction jmp b23
-Removing instruction jmp b24
-Removing instruction jmp b11
+Removing instruction jmp b8
 Removing instruction jmp b10
+Removing instruction jmp b11
+Removing instruction jmp mulf8s_prepare2
+Removing instruction jmp b9
 Removing instruction jmp b12
+Removing instruction jmp b13
 Removing instruction jmp b6
+Removing instruction jmp b5
+Removing instruction jmp b7
+Removing instruction jmp b5
 Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -3975,17 +3995,17 @@ Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b3
 Removing instruction jmp b2
+Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp b6
-Removing instruction jmp b8
 Removing instruction jmp breturn
-Removing instruction jmp b12
+Removing instruction jmp b7
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Removing instruction ldy i
@@ -3996,28 +4016,28 @@ Replacing instruction ldx #0 with TAX
 Removing instruction ldy #0
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b10_from_b24 with b10
-Replacing label b9_from_b10 with b9
-Replacing label b1 with b6
-Replacing label b1_from_b6 with b1
+Replacing label b5_from_b13 with b5
+Replacing label b4_from_b5 with b4
+Replacing label b1 with b2
+Replacing label b1_from_b5 with b1
 Replacing label b2_from_b1 with b2
 Replacing label b1_from_b1 with b1
 Replacing label b2_from_b1 with b2
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b2 with b1
-Replacing label b12_from_b5 with b12
-Replacing label b5_from_b6 with b5
-Replacing label b5_from_b6 with b5
-Removing instruction b13:
-Removing instruction bend_from_b16:
+Replacing label b7_from_b4 with b7
+Replacing label b4_from_b5 with b4
+Replacing label b4_from_b5 with b4
+Removing instruction b1:
+Removing instruction bend_from_b2:
 Removing instruction b1_from_main:
 Removing instruction anim_from_b1:
 Removing instruction b1:
-Removing instruction b9_from_b10:
-Removing instruction b10_from_b11:
-Removing instruction b10_from_b24:
+Removing instruction b4_from_b5:
+Removing instruction b5_from_b13:
+Removing instruction b5_from_b6:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b6:
+Removing instruction b1_from_b5:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
 Removing instruction breturn:
@@ -4025,71 +4045,71 @@ Removing instruction b1_from_b1:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b3:
-Removing instruction b5_from_b6:
-Removing instruction b12_from_b5:
-Removing instruction b6_from_b12:
+Removing instruction b4_from_b5:
+Removing instruction b7_from_b4:
+Removing instruction b5_from_b7:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b16:
+Removing instruction b2:
 Removing instruction bend:
 Removing instruction init_from_main:
 Removing instruction b1:
 Removing instruction breturn:
 Removing instruction b1_from_anim:
-Removing instruction b8:
-Removing instruction b9_from_b8:
+Removing instruction b3:
+Removing instruction b4_from_b3:
 Removing instruction mulf8s_prepare1:
 Removing instruction mulf8u_prepare_from_mulf8s_prepare1:
-Removing instruction b17:
-Removing instruction mulf8s_prepared_from_b17:
-Removing instruction b20:
-Removing instruction mulf8s_prepared_from_b20:
-Removing instruction b21:
+Removing instruction b8:
+Removing instruction mulf8s_prepared_from_b8:
+Removing instruction b10:
+Removing instruction mulf8s_prepared_from_b10:
+Removing instruction b11:
 Removing instruction mulf8s_prepare2:
 Removing instruction mulf8u_prepare_from_mulf8s_prepare2:
-Removing instruction b18:
-Removing instruction mulf8s_prepared_from_b18:
-Removing instruction b23:
-Removing instruction mulf8s_prepared_from_b23:
-Removing instruction b24:
-Removing instruction b11:
+Removing instruction b9:
+Removing instruction mulf8s_prepared_from_b9:
 Removing instruction b12:
-Removing instruction b1_from_b12:
+Removing instruction mulf8s_prepared_from_b12:
+Removing instruction b13:
 Removing instruction b6:
+Removing instruction b7:
+Removing instruction b1_from_b7:
+Removing instruction b5:
 Removing instruction b3:
 Removing instruction b4:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction mulf_init_from_init:
-Removing instruction b3:
-Removing instruction b1_from_b3:
+Removing instruction b2:
+Removing instruction b1_from_b2:
 Removing instruction breturn:
 Removing instruction b1_from_mulf_init:
 Removing instruction b3:
-Removing instruction b5_from_b2:
-Removing instruction b6_from_b5:
-Removing instruction b8:
+Removing instruction b4_from_b2:
+Removing instruction b5_from_b4:
+Removing instruction b6:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b6 in bne b12
+Skipping double jump to b5 in bne b7
 Succesful ASM optimization Pass5DoubleJumpElimination
-Removing instruction jmp b9
+Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b4
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
-Removing instruction b12:
+Removing instruction b7:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing unreachable instruction jmp b6
+Removing unreachable instruction jmp b5
 Succesful ASM optimization Pass5UnreachableCodeElimination
-Fixing long branch [140] bne b9 to beq
+Fixing long branch [140] bne b4 to beq
 
 FINAL SYMBOL TABLE
-(label) @13
-(label) @16
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -4204,13 +4224,13 @@ FINAL SYMBOL TABLE
 (label) anim::@10
 (label) anim::@11
 (label) anim::@12
-(label) anim::@17
-(label) anim::@18
-(label) anim::@20
-(label) anim::@21
-(label) anim::@23
-(label) anim::@24
+(label) anim::@13
+(label) anim::@2
+(label) anim::@3
+(label) anim::@4
+(label) anim::@5
 (label) anim::@6
+(label) anim::@7
 (label) anim::@8
 (label) anim::@9
 (byte) anim::angle
@@ -4250,7 +4270,7 @@ FINAL SYMBOL TABLE
 (signed word) anim::yr#1 yr zp ZP_WORD:9 22.444444444444443
 (void()) init()
 (label) init::@1
-(label) init::@3
+(label) init::@2
 (label) init::@return
 (byte) init::i
 (byte) init::i#1 reg byte x 16.5
@@ -4269,7 +4289,7 @@ FINAL SYMBOL TABLE
 (label) mulf8s_prepared::@2
 (label) mulf8s_prepared::@3
 (label) mulf8s_prepared::@4
-(label) mulf8s_prepared::@6
+(label) mulf8s_prepared::@5
 (label) mulf8s_prepared::@return
 (signed byte) mulf8s_prepared::b
 (signed byte) mulf8s_prepared::b#0 reg byte y 202.0
@@ -4313,12 +4333,12 @@ FINAL SYMBOL TABLE
 (byte~) mulf_init::$12 reg byte a 22.0
 (byte~) mulf_init::$8 reg byte a 22.0
 (label) mulf_init::@1
-(label) mulf_init::@12
 (label) mulf_init::@2
 (label) mulf_init::@3
+(label) mulf_init::@4
 (label) mulf_init::@5
 (label) mulf_init::@6
-(label) mulf_init::@8
+(label) mulf_init::@7
 (label) mulf_init::@return
 (byte) mulf_init::c
 (byte) mulf_init::c#1 reg byte x 2.357142857142857
@@ -4420,13 +4440,13 @@ Score: 34695
   .label SPRITE = $3000
   .label SIN = COS+$40
 //SEG3 @begin
-//SEG4 @13
+//SEG4 @1
 //SEG5 kickasm(location (const byte*) COS#0) {{ {     .var min = -$7fff     .var max = $7fff     .var ampl = max-min;     .for(var i=0;i<$140;i++) {         .var rad = i*2*PI/256;         .byte >round(min+(ampl/2)+(ampl/2)*cos(rad))     }     }  }}
 // sin(x) = cos(x+PI/2)
-//SEG6 @16
+//SEG6 @2
 //SEG7 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
 //SEG8 [3] call main 
-//SEG9 [4] phi from @16 to @end [phi:@16->@end]
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
 //SEG10 @end
 //SEG11 main
 main: {
@@ -4465,26 +4485,26 @@ anim: {
     lda #0
     sta angle
   //SEG24 anim::@1
-  //SEG25 anim::@6
-  b6:
-  //SEG26 [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG25 anim::@2
+  b2:
+  //SEG26 [12] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto anim::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG27 anim::@8
+    bne b2
+  //SEG27 anim::@3
   //SEG28 [13] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-  //SEG29 [14] phi from anim::@8 to anim::@9 [phi:anim::@8->anim::@9]
-  //SEG30 [14] phi (byte) anim::sprite_msb#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@9#0] -- vbuz1=vbuc1 
+  //SEG29 [14] phi from anim::@3 to anim::@4 [phi:anim::@3->anim::@4]
+  //SEG30 [14] phi (byte) anim::sprite_msb#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta sprite_msb
-  //SEG31 [14] phi (byte) anim::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@9#1] -- vbuz1=vbuc1 
+  //SEG31 [14] phi (byte) anim::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@4#1] -- vbuz1=vbuc1 
     sta i
-  //SEG32 [14] phi from anim::@10 to anim::@9 [phi:anim::@10->anim::@9]
-  //SEG33 [14] phi (byte) anim::sprite_msb#10 = (byte) anim::sprite_msb#5 [phi:anim::@10->anim::@9#0] -- register_copy 
-  //SEG34 [14] phi (byte) anim::i#10 = (byte) anim::i#1 [phi:anim::@10->anim::@9#1] -- register_copy 
-  //SEG35 anim::@9
-  b9:
+  //SEG32 [14] phi from anim::@5 to anim::@4 [phi:anim::@5->anim::@4]
+  //SEG33 [14] phi (byte) anim::sprite_msb#10 = (byte) anim::sprite_msb#5 [phi:anim::@5->anim::@4#0] -- register_copy 
+  //SEG34 [14] phi (byte) anim::i#10 = (byte) anim::i#1 [phi:anim::@5->anim::@4#1] -- register_copy 
+  //SEG35 anim::@4
+  b4:
   //SEG36 [15] (signed byte) anim::x#0 ← *((const signed byte[8]) xs#0 + (byte) anim::i#10) -- vbsz1=pbsc1_derefidx_vbuz2 
     ldy i
     lda xs,y
@@ -4501,15 +4521,15 @@ anim: {
   //SEG41 [81] phi from anim::mulf8s_prepare1 to mulf8u_prepare [phi:anim::mulf8s_prepare1->mulf8u_prepare]
   //SEG42 [81] phi (byte) mulf8u_prepare::a#2 = (byte~) mulf8u_prepare::a#3 [phi:anim::mulf8s_prepare1->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-  //SEG43 anim::@17
+  //SEG43 anim::@8
   //SEG44 [19] (signed byte) mulf8s_prepared::b#0 ← (signed byte) anim::x#0 -- vbsyy=vbsz1 
     ldy x
   //SEG45 [20] call mulf8s_prepared 
-  //SEG46 [62] phi from anim::@17 to mulf8s_prepared [phi:anim::@17->mulf8s_prepared]
-  //SEG47 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#0 [phi:anim::@17->mulf8s_prepared#0] -- register_copy 
+  //SEG46 [62] phi from anim::@8 to mulf8s_prepared [phi:anim::@8->mulf8s_prepared]
+  //SEG47 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#0 [phi:anim::@8->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG48 [21] (signed word) mulf8s_prepared::return#2 ← (signed word)(word) mulf8s_prepared::m#4
-  //SEG49 anim::@20
+  //SEG49 anim::@10
   //SEG50 [22] (signed word~) anim::$4 ← (signed word) mulf8s_prepared::return#2 -- vwsz1=vwsz2 
     lda mulf8s_prepared.return
     sta _4
@@ -4521,11 +4541,11 @@ anim: {
   //SEG52 [24] (signed byte) mulf8s_prepared::b#1 ← (signed byte) anim::y#0 -- vbsyy=vbsz1 
     ldy y
   //SEG53 [25] call mulf8s_prepared 
-  //SEG54 [62] phi from anim::@20 to mulf8s_prepared [phi:anim::@20->mulf8s_prepared]
-  //SEG55 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#1 [phi:anim::@20->mulf8s_prepared#0] -- register_copy 
+  //SEG54 [62] phi from anim::@10 to mulf8s_prepared [phi:anim::@10->mulf8s_prepared]
+  //SEG55 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#1 [phi:anim::@10->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG56 [26] (signed word) mulf8s_prepared::return#3 ← (signed word)(word) mulf8s_prepared::m#4
-  //SEG57 anim::@21
+  //SEG57 anim::@11
   //SEG58 [27] (signed word~) anim::$6 ← (signed word) mulf8s_prepared::return#3 -- vwsz1=vwsz2 
     lda mulf8s_prepared.return
     sta _6
@@ -4542,15 +4562,15 @@ anim: {
   //SEG63 [81] phi from anim::mulf8s_prepare2 to mulf8u_prepare [phi:anim::mulf8s_prepare2->mulf8u_prepare]
   //SEG64 [81] phi (byte) mulf8u_prepare::a#2 = (byte~) mulf8u_prepare::a#4 [phi:anim::mulf8s_prepare2->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-  //SEG65 anim::@18
+  //SEG65 anim::@9
   //SEG66 [31] (signed byte) mulf8s_prepared::b#2 ← (signed byte) anim::y#0 -- vbsyy=vbsz1 
     ldy y
   //SEG67 [32] call mulf8s_prepared 
-  //SEG68 [62] phi from anim::@18 to mulf8s_prepared [phi:anim::@18->mulf8s_prepared]
-  //SEG69 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#2 [phi:anim::@18->mulf8s_prepared#0] -- register_copy 
+  //SEG68 [62] phi from anim::@9 to mulf8s_prepared [phi:anim::@9->mulf8s_prepared]
+  //SEG69 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#2 [phi:anim::@9->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG70 [33] (signed word) mulf8s_prepared::return#4 ← (signed word)(word) mulf8s_prepared::m#4
-  //SEG71 anim::@23
+  //SEG71 anim::@12
   //SEG72 [34] (signed word~) anim::$9 ← (signed word) mulf8s_prepared::return#4
   //SEG73 [35] (signed word~) anim::$10 ← (signed word~) anim::$9 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwsz1=vwsz1_rol_1 
     asl _10
@@ -4566,11 +4586,11 @@ anim: {
   //SEG75 [37] (signed byte) mulf8s_prepared::b#3 ← (signed byte) anim::x#0 -- vbsyy=vbsz1 
     ldy x
   //SEG76 [38] call mulf8s_prepared 
-  //SEG77 [62] phi from anim::@23 to mulf8s_prepared [phi:anim::@23->mulf8s_prepared]
-  //SEG78 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#3 [phi:anim::@23->mulf8s_prepared#0] -- register_copy 
+  //SEG77 [62] phi from anim::@12 to mulf8s_prepared [phi:anim::@12->mulf8s_prepared]
+  //SEG78 [62] phi (signed byte) mulf8s_prepared::b#4 = (signed byte) mulf8s_prepared::b#3 [phi:anim::@12->mulf8s_prepared#0] -- register_copy 
     jsr mulf8s_prepared
   //SEG79 [39] (signed word) mulf8s_prepared::return#10 ← (signed word)(word) mulf8s_prepared::m#4
-  //SEG80 anim::@24
+  //SEG80 anim::@13
   //SEG81 [40] (signed word~) anim::$11 ← (signed word) mulf8s_prepared::return#10
   //SEG82 [41] (signed word~) anim::$12 ← (signed word~) anim::$11 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwsz1=vwsz1_rol_1 
     asl _12
@@ -4604,18 +4624,18 @@ anim: {
   //SEG87 [46] (byte) anim::sprite_msb#1 ← (byte) anim::sprite_msb#10 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr sprite_msb
   //SEG88 [47] (byte~) anim::$18 ← > (signed word) anim::xpos#0 -- vbuaa=_hi_vwsz1 
-  //SEG89 [48] if((byte~) anim::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@10 -- vbuaa_eq_0_then_la1 
+  //SEG89 [48] if((byte~) anim::$18==(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@5 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b10
-  //SEG90 anim::@11
+    beq b5
+  //SEG90 anim::@6
   //SEG91 [49] (byte) anim::sprite_msb#2 ← (byte) anim::sprite_msb#1 | (byte/word/signed word/dword/signed dword) $80 -- vbuz1=vbuz1_bor_vbuc1 
     lda #$80
     ora sprite_msb
     sta sprite_msb
-  //SEG92 [50] phi from anim::@11 anim::@24 to anim::@10 [phi:anim::@11/anim::@24->anim::@10]
-  //SEG93 [50] phi (byte) anim::sprite_msb#5 = (byte) anim::sprite_msb#2 [phi:anim::@11/anim::@24->anim::@10#0] -- register_copy 
-  //SEG94 anim::@10
-  b10:
+  //SEG92 [50] phi from anim::@13 anim::@6 to anim::@5 [phi:anim::@13/anim::@6->anim::@5]
+  //SEG93 [50] phi (byte) anim::sprite_msb#5 = (byte) anim::sprite_msb#1 [phi:anim::@13/anim::@6->anim::@5#0] -- register_copy 
+  //SEG94 anim::@5
+  b5:
   //SEG95 [51] (byte~) anim::$22 ← > (signed word) anim::yr#1 -- vbuaa=_hi_vwsz1 
     lda yr+1
   //SEG96 [52] (byte) anim::ypos#0 ← (byte~) anim::$22 + (byte/signed byte/word/signed word/dword/signed dword) $59+(byte/signed byte/word/signed word/dword/signed dword) $33 -- vbuyy=vbuaa_plus_vbuc1 
@@ -4635,13 +4655,13 @@ anim: {
     sta SPRITES_YPOS,x
   //SEG101 [57] (byte) anim::i#1 ← ++ (byte) anim::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG102 [58] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@9 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG102 [58] if((byte) anim::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto anim::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    beq !b9+
-    jmp b9
-  !b9:
-  //SEG103 anim::@12
+    beq !b4+
+    jmp b4
+  !b4:
+  //SEG103 anim::@7
   //SEG104 [59] *((const byte*) SPRITES_XMSB#0) ← (byte) anim::sprite_msb#5 -- _deref_pbuc1=vbuz1 
     lda sprite_msb
     sta SPRITES_XMSB
@@ -4650,9 +4670,9 @@ anim: {
   //SEG106 [61] *((const byte*) BORDERCOL#0) ← (const byte) LIGHT_BLUE#0 -- _deref_pbuc1=vbuc2 
     lda #LIGHT_BLUE
     sta BORDERCOL
-  //SEG107 [11] phi from anim::@12 to anim::@1 [phi:anim::@12->anim::@1]
-  //SEG108 [11] phi (byte) anim::angle#10 = (byte) anim::angle#1 [phi:anim::@12->anim::@1#0] -- register_copy 
-    jmp b6
+  //SEG107 [11] phi from anim::@7 to anim::@1 [phi:anim::@7->anim::@1]
+  //SEG108 [11] phi (byte) anim::angle#10 = (byte) anim::angle#1 [phi:anim::@7->anim::@1#0] -- register_copy 
+    jmp b2
 }
 //SEG109 mulf8s_prepared
 // Calculate fast multiply with a prepared unsigned byte to a word result
@@ -4665,7 +4685,7 @@ mulf8s_prepared: {
   //SEG110 [63] call mulf8u_prepared 
     jsr mulf8u_prepared
   //SEG111 [64] (word) mulf8u_prepared::return#2 ← (word) mulf8u_prepared::return#0
-  //SEG112 mulf8s_prepared::@6
+  //SEG112 mulf8s_prepared::@5
   //SEG113 [65] (word) mulf8s_prepared::m#0 ← (word) mulf8u_prepared::return#2
   //SEG114 [66] if(*((const signed byte*) mulf8s_prepared::memA#0)>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@1 -- _deref_pbsc1_ge_0_then_la1 
     lda memA
@@ -4680,8 +4700,8 @@ mulf8s_prepared: {
     sbc $ff
   //SEG118 [69] (word) mulf8s_prepared::m#1 ← (word) mulf8s_prepared::m#0 hi= (byte~) mulf8s_prepared::$15 -- vwuz1=vwuz1_sethi_vbuaa 
     sta m+1
-  //SEG119 [70] phi from mulf8s_prepared::@3 mulf8s_prepared::@6 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1]
-  //SEG120 [70] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1#0] -- register_copy 
+  //SEG119 [70] phi from mulf8s_prepared::@3 mulf8s_prepared::@5 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1]
+  //SEG120 [70] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1#0] -- register_copy 
   //SEG121 mulf8s_prepared::@1
   b1:
   //SEG122 [71] if((signed byte) mulf8s_prepared::b#4>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@2 -- vbsyy_ge_0_then_la1 
@@ -4757,12 +4777,12 @@ init: {
   //SEG144 [86] call mulf_init 
   //SEG145 [94] phi from init to mulf_init [phi:init->mulf_init]
     jsr mulf_init
-  //SEG146 init::@3
+  //SEG146 init::@2
   //SEG147 [87] *((const byte*) SPRITES_ENABLE#0) ← (byte/word/signed word/dword/signed dword) $ff -- _deref_pbuc1=vbuc2 
     lda #$ff
     sta SPRITES_ENABLE
-  //SEG148 [88] phi from init::@3 to init::@1 [phi:init::@3->init::@1]
-  //SEG149 [88] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@3->init::@1#0] -- vbuxx=vbuc1 
+  //SEG148 [88] phi from init::@2 to init::@1 [phi:init::@2->init::@1]
+  //SEG149 [88] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@2->init::@1#0] -- vbuxx=vbuc1 
     ldx #0
   //SEG150 [88] phi from init::@1 to init::@1 [phi:init::@1->init::@1]
   //SEG151 [88] phi (byte) init::i#2 = (byte) init::i#1 [phi:init::@1->init::@1#0] -- register_copy 
@@ -4876,29 +4896,29 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1
-  //SEG191 [110] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  //SEG192 [110] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG191 [110] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  //SEG192 [110] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG193 [110] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG193 [110] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG194 [110] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG194 [110] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG195 [110] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuxx=vbuc1 
+  //SEG195 [110] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuxx=vbuc1 
     ldx #-1
-  //SEG196 [110] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  //SEG197 [110] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG198 [110] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG199 [110] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG200 [110] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-  //SEG201 mulf_init::@5
-  b5:
+  //SEG196 [110] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  //SEG197 [110] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG198 [110] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG199 [110] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG200 [110] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+  //SEG201 mulf_init::@4
+  b4:
   //SEG202 [111] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuxx 
     lda mulf_sqr1_lo,x
     ldy #0
@@ -4916,28 +4936,28 @@ mulf_init: {
     clc
     adc dir
     tax
-  //SEG206 [115] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuxx_neq_0_then_la1 
+  //SEG206 [115] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b6
-  //SEG207 [116] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  //SEG208 [116] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b5
+  //SEG207 [116] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  //SEG208 [116] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-  //SEG209 mulf_init::@6
-  b6:
+  //SEG209 mulf_init::@5
+  b5:
   //SEG210 [117] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG211 [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG211 [118] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5
-  //SEG212 mulf_init::@8
+    bne b4
+  //SEG212 mulf_init::@6
   //SEG213 [119] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -4948,10 +4968,10 @@ mulf_init: {
   //SEG215 mulf_init::@return
   //SEG216 [121] return 
     rts
-  //SEG217 [122] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  //SEG218 mulf_init::@12
-  //SEG219 [116] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  //SEG220 [116] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
+  //SEG217 [122] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  //SEG218 mulf_init::@7
+  //SEG219 [116] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  //SEG220 [116] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
 }
   // mulf_sqr tables will contain f(x)=int(x*x/4) and g(x) = f(x-255).
   // <f(x) = <(( x * x )/4)
diff --git a/src/test/ref/examples/rotate/rotate.sym b/src/test/ref/examples/rotate/rotate.sym
index 0cb538f6d..6b1610bf7 100644
--- a/src/test/ref/examples/rotate/rotate.sym
+++ b/src/test/ref/examples/rotate/rotate.sym
@@ -1,5 +1,5 @@
-(label) @13
-(label) @16
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -114,13 +114,13 @@
 (label) anim::@10
 (label) anim::@11
 (label) anim::@12
-(label) anim::@17
-(label) anim::@18
-(label) anim::@20
-(label) anim::@21
-(label) anim::@23
-(label) anim::@24
+(label) anim::@13
+(label) anim::@2
+(label) anim::@3
+(label) anim::@4
+(label) anim::@5
 (label) anim::@6
+(label) anim::@7
 (label) anim::@8
 (label) anim::@9
 (byte) anim::angle
@@ -160,7 +160,7 @@
 (signed word) anim::yr#1 yr zp ZP_WORD:9 22.444444444444443
 (void()) init()
 (label) init::@1
-(label) init::@3
+(label) init::@2
 (label) init::@return
 (byte) init::i
 (byte) init::i#1 reg byte x 16.5
@@ -179,7 +179,7 @@
 (label) mulf8s_prepared::@2
 (label) mulf8s_prepared::@3
 (label) mulf8s_prepared::@4
-(label) mulf8s_prepared::@6
+(label) mulf8s_prepared::@5
 (label) mulf8s_prepared::@return
 (signed byte) mulf8s_prepared::b
 (signed byte) mulf8s_prepared::b#0 reg byte y 202.0
@@ -223,12 +223,12 @@
 (byte~) mulf_init::$12 reg byte a 22.0
 (byte~) mulf_init::$8 reg byte a 22.0
 (label) mulf_init::@1
-(label) mulf_init::@12
 (label) mulf_init::@2
 (label) mulf_init::@3
+(label) mulf_init::@4
 (label) mulf_init::@5
 (label) mulf_init::@6
-(label) mulf_init::@8
+(label) mulf_init::@7
 (label) mulf_init::@return
 (byte) mulf_init::c
 (byte) mulf_init::c#1 reg byte x 2.357142857142857
diff --git a/src/test/ref/examples/scroll/scroll.asm b/src/test/ref/examples/scroll/scroll.asm
index 412f9bdb9..8745670e2 100644
--- a/src/test/ref/examples/scroll/scroll.asm
+++ b/src/test/ref/examples/scroll/scroll.asm
@@ -15,48 +15,48 @@ main: {
     sta nxt+1
     ldx #7
   // Wait for raster
-  b2:
+  b1:
     lda #$fe
     cmp RASTER
-    bne b2
-  b4:
+    bne b1
+  b2:
     lda #$ff
     cmp RASTER
-    bne b4
+    bne b2
     inc BGCOL
     dex
     cpx #$ff
-    bne b7
+    bne b4
     ldx #0
   // Hard scroll
-  b8:
+  b5:
     lda line+1,x
     sta line,x
     inx
     cpx #$27
-    bne b8
+    bne b5
     // Render next char
     ldy #0
     lda (nxt),y
     tax
     cpx #'@'
-    bne b11
+    bne b8
     ldx TEXT
     lda #<TEXT
     sta nxt
     lda #>TEXT
     sta nxt+1
-  b11:
+  b8:
     stx line+$27
     inc nxt
     bne !+
     inc nxt+1
   !:
     ldx #7
-  b7:
+  b4:
     stx SCROLL
     dec BGCOL
-    jmp b2
+    jmp b1
 }
 fillscreen: {
     .const fill = $20
diff --git a/src/test/ref/examples/scroll/scroll.cfg b/src/test/ref/examples/scroll/scroll.cfg
index 7c829e393..581a5689b 100644
--- a/src/test/ref/examples/scroll/scroll.cfg
+++ b/src/test/ref/examples/scroll/scroll.cfg
@@ -1,54 +1,54 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call fillscreen 
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@4
+  [6] (byte*) main::nxt#9 ← phi( main::@4/(byte*) main::nxt#10 main/(const byte*) TEXT#0 )
+  [6] (byte) main::scroll#7 ← phi( main::@4/(byte) main::scroll#10 main/(byte/signed byte/word/signed word/dword/signed dword) 7 )
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@7
-  [6] (byte*) main::nxt#9 ← phi( main::@7/(byte*) main::nxt#10 main/(const byte*) TEXT#0 )
-  [6] (byte) main::scroll#7 ← phi( main::@7/(byte) main::scroll#10 main/(byte/signed byte/word/signed word/dword/signed dword) 7 )
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2
-  to:main::@4
-main::@4: scope:[main]  from main::@2 main::@4
-  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+main::@2: scope:[main]  from main::@1 main::@2
+  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [9] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   [10] (byte) main::scroll#1 ← -- (byte) main::scroll#7
-  [11] if((byte) main::scroll#1!=(byte/word/signed word/dword/signed dword) $ff) goto main::@7
-  to:main::@8
-main::@8: scope:[main]  from main::@5 main::@8
-  [12] (byte) main::i#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::i#1 )
+  [11] if((byte) main::scroll#1!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4
+  to:main::@5
+main::@5: scope:[main]  from main::@3 main::@5
+  [12] (byte) main::i#2 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::i#1 )
   [13] *((const byte[]) main::line#0 + (byte) main::i#2) ← *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) main::i#2)
   [14] (byte) main::i#1 ← ++ (byte) main::i#2
-  [15] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $27) goto main::@8
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  [15] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $27) goto main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [16] (byte) main::c#0 ← *((byte*) main::nxt#9)
-  [17] if((byte) main::c#0!=(byte) '@') goto main::@11
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  [17] if((byte) main::c#0!=(byte) '@') goto main::@8
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [18] (byte) main::c#1 ← *((const byte*) TEXT#0)
-  to:main::@11
-main::@11: scope:[main]  from main::@10 main::@9
-  [19] (byte*) main::nxt#4 ← phi( main::@10/(const byte*) TEXT#0 main::@9/(byte*) main::nxt#9 )
-  [19] (byte) main::c#2 ← phi( main::@10/(byte) main::c#1 main::@9/(byte) main::c#0 )
+  to:main::@8
+main::@8: scope:[main]  from main::@6 main::@7
+  [19] (byte*) main::nxt#4 ← phi( main::@7/(const byte*) TEXT#0 main::@6/(byte*) main::nxt#9 )
+  [19] (byte) main::c#2 ← phi( main::@7/(byte) main::c#1 main::@6/(byte) main::c#0 )
   [20] *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) $27) ← (byte) main::c#2
   [21] (byte*) main::nxt#1 ← ++ (byte*) main::nxt#4
-  to:main::@7
-main::@7: scope:[main]  from main::@11 main::@5
-  [22] (byte*) main::nxt#10 ← phi( main::@11/(byte*) main::nxt#1 main::@5/(byte*) main::nxt#9 )
-  [22] (byte) main::scroll#10 ← phi( main::@11/(byte/signed byte/word/signed word/dword/signed dword) 7 main::@5/(byte) main::scroll#1 )
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@8
+  [22] (byte*) main::nxt#10 ← phi( main::@8/(byte*) main::nxt#1 main::@3/(byte*) main::nxt#9 )
+  [22] (byte) main::scroll#10 ← phi( main::@8/(byte/signed byte/word/signed word/dword/signed dword) 7 main::@3/(byte) main::scroll#1 )
   [23] *((const byte*) SCROLL#0) ← (byte) main::scroll#10
   [24] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0)
-  to:main::@2
+  to:main::@1
 fillscreen: scope:[fillscreen]  from main
   [25] phi()
   to:fillscreen::@1
diff --git a/src/test/ref/examples/scroll/scroll.log b/src/test/ref/examples/scroll/scroll.log
index 80079d799..344a0af5d 100644
--- a/src/test/ref/examples/scroll/scroll.log
+++ b/src/test/ref/examples/scroll/scroll.log
@@ -325,8 +325,17 @@ Culled Empty Block (label) main::@15
 Culled Empty Block (label) main::@14
 Culled Empty Block (label) main::@16
 Culled Empty Block (label) fillscreen::@3
+Renumbering block @2 to @1
+Renumbering block main::@2 to main::@1
+Renumbering block main::@4 to main::@2
+Renumbering block main::@5 to main::@3
+Renumbering block main::@7 to main::@4
+Renumbering block main::@8 to main::@5
+Renumbering block main::@9 to main::@6
+Renumbering block main::@10 to main::@7
+Renumbering block main::@11 to main::@8
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of fillscreen
@@ -334,55 +343,55 @@ Adding NOP phi() at start of fillscreen
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call fillscreen 
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@4
+  [6] (byte*) main::nxt#9 ← phi( main::@4/(byte*) main::nxt#10 main/(const byte*) TEXT#0 )
+  [6] (byte) main::scroll#7 ← phi( main::@4/(byte) main::scroll#10 main/(byte/signed byte/word/signed word/dword/signed dword) 7 )
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@7
-  [6] (byte*) main::nxt#9 ← phi( main::@7/(byte*) main::nxt#10 main/(const byte*) TEXT#0 )
-  [6] (byte) main::scroll#7 ← phi( main::@7/(byte) main::scroll#10 main/(byte/signed byte/word/signed word/dword/signed dword) 7 )
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2
-  to:main::@4
-main::@4: scope:[main]  from main::@2 main::@4
-  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+main::@2: scope:[main]  from main::@1 main::@2
+  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [9] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   [10] (byte) main::scroll#1 ← -- (byte) main::scroll#7
-  [11] if((byte) main::scroll#1!=(byte/word/signed word/dword/signed dword) $ff) goto main::@7
-  to:main::@8
-main::@8: scope:[main]  from main::@5 main::@8
-  [12] (byte) main::i#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::i#1 )
+  [11] if((byte) main::scroll#1!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4
+  to:main::@5
+main::@5: scope:[main]  from main::@3 main::@5
+  [12] (byte) main::i#2 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::i#1 )
   [13] *((const byte[]) main::line#0 + (byte) main::i#2) ← *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) main::i#2)
   [14] (byte) main::i#1 ← ++ (byte) main::i#2
-  [15] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $27) goto main::@8
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  [15] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $27) goto main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [16] (byte) main::c#0 ← *((byte*) main::nxt#9)
-  [17] if((byte) main::c#0!=(byte) '@') goto main::@11
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  [17] if((byte) main::c#0!=(byte) '@') goto main::@8
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [18] (byte) main::c#1 ← *((const byte*) TEXT#0)
-  to:main::@11
-main::@11: scope:[main]  from main::@10 main::@9
-  [19] (byte*) main::nxt#4 ← phi( main::@10/(const byte*) TEXT#0 main::@9/(byte*) main::nxt#9 )
-  [19] (byte) main::c#2 ← phi( main::@10/(byte) main::c#1 main::@9/(byte) main::c#0 )
+  to:main::@8
+main::@8: scope:[main]  from main::@6 main::@7
+  [19] (byte*) main::nxt#4 ← phi( main::@7/(const byte*) TEXT#0 main::@6/(byte*) main::nxt#9 )
+  [19] (byte) main::c#2 ← phi( main::@7/(byte) main::c#1 main::@6/(byte) main::c#0 )
   [20] *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) $27) ← (byte) main::c#2
   [21] (byte*) main::nxt#1 ← ++ (byte*) main::nxt#4
-  to:main::@7
-main::@7: scope:[main]  from main::@11 main::@5
-  [22] (byte*) main::nxt#10 ← phi( main::@11/(byte*) main::nxt#1 main::@5/(byte*) main::nxt#9 )
-  [22] (byte) main::scroll#10 ← phi( main::@11/(byte/signed byte/word/signed word/dword/signed dword) 7 main::@5/(byte) main::scroll#1 )
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@8
+  [22] (byte*) main::nxt#10 ← phi( main::@8/(byte*) main::nxt#1 main::@3/(byte*) main::nxt#9 )
+  [22] (byte) main::scroll#10 ← phi( main::@8/(byte/signed byte/word/signed word/dword/signed dword) 7 main::@3/(byte) main::scroll#1 )
   [23] *((const byte*) SCROLL#0) ← (byte) main::scroll#10
   [24] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0)
-  to:main::@2
+  to:main::@1
 fillscreen: scope:[fillscreen]  from main
   [25] phi()
   to:fillscreen::@1
@@ -459,17 +468,17 @@ INITIAL ASM
   .label SCROLL = $d016
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -484,102 +493,102 @@ main: {
   //SEG12 [25] phi from main to fillscreen [phi:main->fillscreen]
   fillscreen_from_main:
     jsr fillscreen
-  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
-  b2_from_main:
-  //SEG14 [6] phi (byte*) main::nxt#9 = (const byte*) TEXT#0 [phi:main->main::@2#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG14 [6] phi (byte*) main::nxt#9 = (const byte*) TEXT#0 [phi:main->main::@1#0] -- pbuz1=pbuc1 
     lda #<TEXT
     sta nxt
     lda #>TEXT
     sta nxt+1
-  //SEG15 [6] phi (byte) main::scroll#7 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@2#1] -- vbuz1=vbuc1 
+  //SEG15 [6] phi (byte) main::scroll#7 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@1#1] -- vbuz1=vbuc1 
     lda #7
     sta scroll
-    jmp b2
+    jmp b1
   // Wait for raster
-  //SEG16 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  b2_from_b2:
-    jmp b2
-  //SEG17 main::@2
-  b2:
-  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG16 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG17 main::@1
+  b1:
+  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b2_from_b2
-    jmp b4
-  //SEG19 main::@4
-  b4:
-  //SEG20 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1_from_b1
+    jmp b2
+  //SEG19 main::@2
+  b2:
+  //SEG20 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b4
-    jmp b5
-  //SEG21 main::@5
-  b5:
+    bne b2
+    jmp b3
+  //SEG21 main::@3
+  b3:
   //SEG22 [9] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
   //SEG23 [10] (byte) main::scroll#1 ← -- (byte) main::scroll#7 -- vbuz1=_dec_vbuz1 
     dec scroll
-  //SEG24 [11] if((byte) main::scroll#1!=(byte/word/signed word/dword/signed dword) $ff) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG24 [11] if((byte) main::scroll#1!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #$ff
     cmp scroll
-    bne b7_from_b5
-  //SEG25 [12] phi from main::@5 to main::@8 [phi:main::@5->main::@8]
-  b8_from_b5:
-  //SEG26 [12] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@8#0] -- vbuz1=vbuc1 
+    bne b4_from_b3
+  //SEG25 [12] phi from main::@3 to main::@5 [phi:main::@3->main::@5]
+  b5_from_b3:
+  //SEG26 [12] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b8
+    jmp b5
   // Hard scroll
-  //SEG27 [12] phi from main::@8 to main::@8 [phi:main::@8->main::@8]
-  b8_from_b8:
-  //SEG28 [12] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@8#0] -- register_copy 
-    jmp b8
-  //SEG29 main::@8
-  b8:
+  //SEG27 [12] phi from main::@5 to main::@5 [phi:main::@5->main::@5]
+  b5_from_b5:
+  //SEG28 [12] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@5#0] -- register_copy 
+    jmp b5
+  //SEG29 main::@5
+  b5:
   //SEG30 [13] *((const byte[]) main::line#0 + (byte) main::i#2) ← *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) main::i#2) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz1 
     ldy i
     lda line+1,y
     sta line,y
   //SEG31 [14] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG32 [15] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $27) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG32 [15] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $27) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #$27
     cmp i
-    bne b8_from_b8
-    jmp b9
-  //SEG33 main::@9
-  b9:
+    bne b5_from_b5
+    jmp b6
+  //SEG33 main::@6
+  b6:
   //SEG34 [16] (byte) main::c#0 ← *((byte*) main::nxt#9) -- vbuz1=_deref_pbuz2 
     // Render next char
     ldy #0
     lda (nxt),y
     sta c
-  //SEG35 [17] if((byte) main::c#0!=(byte) '@') goto main::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG35 [17] if((byte) main::c#0!=(byte) '@') goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
     lda #'@'
     cmp c
-    bne b11_from_b9
-    jmp b10
-  //SEG36 main::@10
-  b10:
+    bne b8_from_b6
+    jmp b7
+  //SEG36 main::@7
+  b7:
   //SEG37 [18] (byte) main::c#1 ← *((const byte*) TEXT#0) -- vbuz1=_deref_pbuc1 
     lda TEXT
     sta c
-  //SEG38 [19] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
-  b11_from_b10:
-  //SEG39 [19] phi (byte*) main::nxt#4 = (const byte*) TEXT#0 [phi:main::@10->main::@11#0] -- pbuz1=pbuc1 
+  //SEG38 [19] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
+  b8_from_b7:
+  //SEG39 [19] phi (byte*) main::nxt#4 = (const byte*) TEXT#0 [phi:main::@7->main::@8#0] -- pbuz1=pbuc1 
     lda #<TEXT
     sta nxt
     lda #>TEXT
     sta nxt+1
-  //SEG40 [19] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@10->main::@11#1] -- register_copy 
-    jmp b11
-  //SEG41 [19] phi from main::@9 to main::@11 [phi:main::@9->main::@11]
-  b11_from_b9:
-  //SEG42 [19] phi (byte*) main::nxt#4 = (byte*) main::nxt#9 [phi:main::@9->main::@11#0] -- register_copy 
-  //SEG43 [19] phi (byte) main::c#2 = (byte) main::c#0 [phi:main::@9->main::@11#1] -- register_copy 
-    jmp b11
-  //SEG44 main::@11
-  b11:
+  //SEG40 [19] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@7->main::@8#1] -- register_copy 
+    jmp b8
+  //SEG41 [19] phi from main::@6 to main::@8 [phi:main::@6->main::@8]
+  b8_from_b6:
+  //SEG42 [19] phi (byte*) main::nxt#4 = (byte*) main::nxt#9 [phi:main::@6->main::@8#0] -- register_copy 
+  //SEG43 [19] phi (byte) main::c#2 = (byte) main::c#0 [phi:main::@6->main::@8#1] -- register_copy 
+    jmp b8
+  //SEG44 main::@8
+  b8:
   //SEG45 [20] *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) $27) ← (byte) main::c#2 -- _deref_pbuc1=vbuz1 
     lda c
     sta line+$27
@@ -588,30 +597,30 @@ main: {
     bne !+
     inc nxt+1
   !:
-  //SEG47 [22] phi from main::@11 to main::@7 [phi:main::@11->main::@7]
-  b7_from_b11:
-  //SEG48 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#1 [phi:main::@11->main::@7#0] -- register_copy 
-  //SEG49 [22] phi (byte) main::scroll#10 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main::@11->main::@7#1] -- vbuz1=vbuc1 
+  //SEG47 [22] phi from main::@8 to main::@4 [phi:main::@8->main::@4]
+  b4_from_b8:
+  //SEG48 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#1 [phi:main::@8->main::@4#0] -- register_copy 
+  //SEG49 [22] phi (byte) main::scroll#10 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main::@8->main::@4#1] -- vbuz1=vbuc1 
     lda #7
     sta scroll
-    jmp b7
-  //SEG50 [22] phi from main::@5 to main::@7 [phi:main::@5->main::@7]
-  b7_from_b5:
-  //SEG51 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#9 [phi:main::@5->main::@7#0] -- register_copy 
-  //SEG52 [22] phi (byte) main::scroll#10 = (byte) main::scroll#1 [phi:main::@5->main::@7#1] -- register_copy 
-    jmp b7
-  //SEG53 main::@7
-  b7:
+    jmp b4
+  //SEG50 [22] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG51 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#9 [phi:main::@3->main::@4#0] -- register_copy 
+  //SEG52 [22] phi (byte) main::scroll#10 = (byte) main::scroll#1 [phi:main::@3->main::@4#1] -- register_copy 
+    jmp b4
+  //SEG53 main::@4
+  b4:
   //SEG54 [23] *((const byte*) SCROLL#0) ← (byte) main::scroll#10 -- _deref_pbuc1=vbuz1 
     lda scroll
     sta SCROLL
   //SEG55 [24] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BGCOL
-  //SEG56 [6] phi from main::@7 to main::@2 [phi:main::@7->main::@2]
-  b2_from_b7:
-  //SEG57 [6] phi (byte*) main::nxt#9 = (byte*) main::nxt#10 [phi:main::@7->main::@2#0] -- register_copy 
-  //SEG58 [6] phi (byte) main::scroll#7 = (byte) main::scroll#10 [phi:main::@7->main::@2#1] -- register_copy 
-    jmp b2
+  //SEG56 [6] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG57 [6] phi (byte*) main::nxt#9 = (byte*) main::nxt#10 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG58 [6] phi (byte) main::scroll#7 = (byte) main::scroll#10 [phi:main::@4->main::@1#1] -- register_copy 
+    jmp b1
 }
 //SEG59 fillscreen
 fillscreen: {
@@ -658,16 +667,16 @@ fillscreen: {
   TEXT: .text "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =-     @"
 
 REGISTER UPLIFT POTENTIAL REGISTERS
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2 [ main::scroll#7 main::nxt#9 ] ( main:2 [ main::scroll#7 main::nxt#9 ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 [ main::scroll#7 main::nxt#9 ] ( main:2 [ main::scroll#7 main::nxt#9 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ main::scroll#7 main::scroll#10 main::scroll#1 ]
-Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 [ main::scroll#7 main::nxt#9 ] ( main:2 [ main::scroll#7 main::nxt#9 ] ) always clobbers reg byte a 
+Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ main::scroll#7 main::nxt#9 ] ( main:2 [ main::scroll#7 main::nxt#9 ] ) always clobbers reg byte a 
 Statement [13] *((const byte[]) main::line#0 + (byte) main::i#2) ← *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) main::i#2) [ main::nxt#9 main::i#2 ] ( main:2 [ main::nxt#9 main::i#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:3 [ main::i#2 main::i#1 ]
 Statement [16] (byte) main::c#0 ← *((byte*) main::nxt#9) [ main::nxt#9 main::c#0 ] ( main:2 [ main::nxt#9 main::c#0 ] ) always clobbers reg byte a reg byte y 
 Statement [27] *((byte*) fillscreen::cursor#2) ← (const byte) fillscreen::fill#0 [ fillscreen::cursor#2 ] ( main:2::fillscreen:5 [ fillscreen::cursor#2 ] ) always clobbers reg byte a reg byte y 
 Statement [29] if((byte*) fillscreen::cursor#1<(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e8) goto fillscreen::@1 [ fillscreen::cursor#1 ] ( main:2::fillscreen:5 [ fillscreen::cursor#1 ] ) always clobbers reg byte a 
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2 [ main::scroll#7 main::nxt#9 ] ( main:2 [ main::scroll#7 main::nxt#9 ] ) always clobbers reg byte a 
-Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 [ main::scroll#7 main::nxt#9 ] ( main:2 [ main::scroll#7 main::nxt#9 ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 [ main::scroll#7 main::nxt#9 ] ( main:2 [ main::scroll#7 main::nxt#9 ] ) always clobbers reg byte a 
+Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ main::scroll#7 main::nxt#9 ] ( main:2 [ main::scroll#7 main::nxt#9 ] ) always clobbers reg byte a 
 Statement [13] *((const byte[]) main::line#0 + (byte) main::i#2) ← *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) main::i#2) [ main::nxt#9 main::i#2 ] ( main:2 [ main::nxt#9 main::i#2 ] ) always clobbers reg byte a 
 Statement [16] (byte) main::c#0 ← *((byte*) main::nxt#9) [ main::nxt#9 main::c#0 ] ( main:2 [ main::nxt#9 main::c#0 ] ) always clobbers reg byte a reg byte y 
 Statement [27] *((byte*) fillscreen::cursor#2) ← (const byte) fillscreen::fill#0 [ fillscreen::cursor#2 ] ( main:2::fillscreen:5 [ fillscreen::cursor#2 ] ) always clobbers reg byte a reg byte y 
@@ -702,17 +711,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCROLL = $d016
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -724,95 +733,95 @@ main: {
   //SEG12 [25] phi from main to fillscreen [phi:main->fillscreen]
   fillscreen_from_main:
     jsr fillscreen
-  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
-  b2_from_main:
-  //SEG14 [6] phi (byte*) main::nxt#9 = (const byte*) TEXT#0 [phi:main->main::@2#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG14 [6] phi (byte*) main::nxt#9 = (const byte*) TEXT#0 [phi:main->main::@1#0] -- pbuz1=pbuc1 
     lda #<TEXT
     sta nxt
     lda #>TEXT
     sta nxt+1
-  //SEG15 [6] phi (byte) main::scroll#7 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@2#1] -- vbuxx=vbuc1 
+  //SEG15 [6] phi (byte) main::scroll#7 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@1#1] -- vbuxx=vbuc1 
     ldx #7
-    jmp b2
+    jmp b1
   // Wait for raster
-  //SEG16 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  b2_from_b2:
-    jmp b2
-  //SEG17 main::@2
-  b2:
-  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG16 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG17 main::@1
+  b1:
+  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b2_from_b2
-    jmp b4
-  //SEG19 main::@4
-  b4:
-  //SEG20 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1_from_b1
+    jmp b2
+  //SEG19 main::@2
+  b2:
+  //SEG20 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b4
-    jmp b5
-  //SEG21 main::@5
-  b5:
+    bne b2
+    jmp b3
+  //SEG21 main::@3
+  b3:
   //SEG22 [9] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
   //SEG23 [10] (byte) main::scroll#1 ← -- (byte) main::scroll#7 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG24 [11] if((byte) main::scroll#1!=(byte/word/signed word/dword/signed dword) $ff) goto main::@7 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG24 [11] if((byte) main::scroll#1!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$ff
-    bne b7_from_b5
-  //SEG25 [12] phi from main::@5 to main::@8 [phi:main::@5->main::@8]
-  b8_from_b5:
-  //SEG26 [12] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@8#0] -- vbuxx=vbuc1 
+    bne b4_from_b3
+  //SEG25 [12] phi from main::@3 to main::@5 [phi:main::@3->main::@5]
+  b5_from_b3:
+  //SEG26 [12] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@5#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b8
+    jmp b5
   // Hard scroll
-  //SEG27 [12] phi from main::@8 to main::@8 [phi:main::@8->main::@8]
-  b8_from_b8:
-  //SEG28 [12] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@8#0] -- register_copy 
-    jmp b8
-  //SEG29 main::@8
-  b8:
+  //SEG27 [12] phi from main::@5 to main::@5 [phi:main::@5->main::@5]
+  b5_from_b5:
+  //SEG28 [12] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@5#0] -- register_copy 
+    jmp b5
+  //SEG29 main::@5
+  b5:
   //SEG30 [13] *((const byte[]) main::line#0 + (byte) main::i#2) ← *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) main::i#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda line+1,x
     sta line,x
   //SEG31 [14] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG32 [15] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $27) goto main::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG32 [15] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $27) goto main::@5 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$27
-    bne b8_from_b8
-    jmp b9
-  //SEG33 main::@9
-  b9:
+    bne b5_from_b5
+    jmp b6
+  //SEG33 main::@6
+  b6:
   //SEG34 [16] (byte) main::c#0 ← *((byte*) main::nxt#9) -- vbuxx=_deref_pbuz1 
     // Render next char
     ldy #0
     lda (nxt),y
     tax
-  //SEG35 [17] if((byte) main::c#0!=(byte) '@') goto main::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG35 [17] if((byte) main::c#0!=(byte) '@') goto main::@8 -- vbuxx_neq_vbuc1_then_la1 
     cpx #'@'
-    bne b11_from_b9
-    jmp b10
-  //SEG36 main::@10
-  b10:
+    bne b8_from_b6
+    jmp b7
+  //SEG36 main::@7
+  b7:
   //SEG37 [18] (byte) main::c#1 ← *((const byte*) TEXT#0) -- vbuxx=_deref_pbuc1 
     ldx TEXT
-  //SEG38 [19] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
-  b11_from_b10:
-  //SEG39 [19] phi (byte*) main::nxt#4 = (const byte*) TEXT#0 [phi:main::@10->main::@11#0] -- pbuz1=pbuc1 
+  //SEG38 [19] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
+  b8_from_b7:
+  //SEG39 [19] phi (byte*) main::nxt#4 = (const byte*) TEXT#0 [phi:main::@7->main::@8#0] -- pbuz1=pbuc1 
     lda #<TEXT
     sta nxt
     lda #>TEXT
     sta nxt+1
-  //SEG40 [19] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@10->main::@11#1] -- register_copy 
-    jmp b11
-  //SEG41 [19] phi from main::@9 to main::@11 [phi:main::@9->main::@11]
-  b11_from_b9:
-  //SEG42 [19] phi (byte*) main::nxt#4 = (byte*) main::nxt#9 [phi:main::@9->main::@11#0] -- register_copy 
-  //SEG43 [19] phi (byte) main::c#2 = (byte) main::c#0 [phi:main::@9->main::@11#1] -- register_copy 
-    jmp b11
-  //SEG44 main::@11
-  b11:
+  //SEG40 [19] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@7->main::@8#1] -- register_copy 
+    jmp b8
+  //SEG41 [19] phi from main::@6 to main::@8 [phi:main::@6->main::@8]
+  b8_from_b6:
+  //SEG42 [19] phi (byte*) main::nxt#4 = (byte*) main::nxt#9 [phi:main::@6->main::@8#0] -- register_copy 
+  //SEG43 [19] phi (byte) main::c#2 = (byte) main::c#0 [phi:main::@6->main::@8#1] -- register_copy 
+    jmp b8
+  //SEG44 main::@8
+  b8:
   //SEG45 [20] *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) $27) ← (byte) main::c#2 -- _deref_pbuc1=vbuxx 
     stx line+$27
   //SEG46 [21] (byte*) main::nxt#1 ← ++ (byte*) main::nxt#4 -- pbuz1=_inc_pbuz1 
@@ -820,28 +829,28 @@ main: {
     bne !+
     inc nxt+1
   !:
-  //SEG47 [22] phi from main::@11 to main::@7 [phi:main::@11->main::@7]
-  b7_from_b11:
-  //SEG48 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#1 [phi:main::@11->main::@7#0] -- register_copy 
-  //SEG49 [22] phi (byte) main::scroll#10 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main::@11->main::@7#1] -- vbuxx=vbuc1 
+  //SEG47 [22] phi from main::@8 to main::@4 [phi:main::@8->main::@4]
+  b4_from_b8:
+  //SEG48 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#1 [phi:main::@8->main::@4#0] -- register_copy 
+  //SEG49 [22] phi (byte) main::scroll#10 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main::@8->main::@4#1] -- vbuxx=vbuc1 
     ldx #7
-    jmp b7
-  //SEG50 [22] phi from main::@5 to main::@7 [phi:main::@5->main::@7]
-  b7_from_b5:
-  //SEG51 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#9 [phi:main::@5->main::@7#0] -- register_copy 
-  //SEG52 [22] phi (byte) main::scroll#10 = (byte) main::scroll#1 [phi:main::@5->main::@7#1] -- register_copy 
-    jmp b7
-  //SEG53 main::@7
-  b7:
+    jmp b4
+  //SEG50 [22] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG51 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#9 [phi:main::@3->main::@4#0] -- register_copy 
+  //SEG52 [22] phi (byte) main::scroll#10 = (byte) main::scroll#1 [phi:main::@3->main::@4#1] -- register_copy 
+    jmp b4
+  //SEG53 main::@4
+  b4:
   //SEG54 [23] *((const byte*) SCROLL#0) ← (byte) main::scroll#10 -- _deref_pbuc1=vbuxx 
     stx SCROLL
   //SEG55 [24] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BGCOL
-  //SEG56 [6] phi from main::@7 to main::@2 [phi:main::@7->main::@2]
-  b2_from_b7:
-  //SEG57 [6] phi (byte*) main::nxt#9 = (byte*) main::nxt#10 [phi:main::@7->main::@2#0] -- register_copy 
-  //SEG58 [6] phi (byte) main::scroll#7 = (byte) main::scroll#10 [phi:main::@7->main::@2#1] -- register_copy 
-    jmp b2
+  //SEG56 [6] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG57 [6] phi (byte*) main::nxt#9 = (byte*) main::nxt#10 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG58 [6] phi (byte) main::scroll#7 = (byte) main::scroll#10 [phi:main::@4->main::@1#1] -- register_copy 
+    jmp b1
 }
 //SEG59 fillscreen
 fillscreen: {
@@ -888,62 +897,62 @@ fillscreen: {
   TEXT: .text "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =-     @"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp b5
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b10
-Removing instruction jmp b11
+Removing instruction jmp b6
 Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b2_from_b2 with b2
-Replacing label b7_from_b5 with b7
-Replacing label b8_from_b8 with b8
-Replacing label b11_from_b9 with b11
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b3 with b4
+Replacing label b5_from_b5 with b5
+Replacing label b8_from_b6 with b8
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
-Removing instruction b2_from_b2:
-Removing instruction b8_from_b8:
-Removing instruction b11_from_b9:
-Removing instruction b7_from_b5:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b1:
+Removing instruction b5_from_b5:
+Removing instruction b8_from_b6:
+Removing instruction b4_from_b3:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction fillscreen_from_main:
-Removing instruction b2_from_main:
-Removing instruction b5:
-Removing instruction b8_from_b5:
-Removing instruction b9:
-Removing instruction b10:
-Removing instruction b11_from_b10:
-Removing instruction b7_from_b11:
-Removing instruction b2_from_b7:
+Removing instruction b1_from_main:
+Removing instruction b3:
+Removing instruction b5_from_b3:
+Removing instruction b6:
+Removing instruction b7:
+Removing instruction b8_from_b7:
+Removing instruction b4_from_b8:
+Removing instruction b1_from_b4:
 Removing instruction b1_from_fillscreen:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp b5
 Removing instruction jmp b8
-Removing instruction jmp b11
-Removing instruction jmp b7
+Removing instruction jmp b4
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -966,14 +975,14 @@ FINAL SYMBOL TABLE
 (const byte) fillscreen::fill#0 fill = (byte/signed byte/word/signed word/dword/signed dword) $20
 (byte*) fillscreen::screen
 (void()) main()
-(label) main::@10
-(label) main::@11
+(label) main::@1
 (label) main::@2
+(label) main::@3
 (label) main::@4
 (label) main::@5
+(label) main::@6
 (label) main::@7
 (label) main::@8
-(label) main::@9
 (byte) main::c
 (byte) main::c#0 reg byte x 16.5
 (byte) main::c#1 reg byte x 22.0
@@ -1013,11 +1022,11 @@ Score: 6202
   .label BGCOL = $d020
   .label SCROLL = $d016
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -1026,76 +1035,76 @@ main: {
   //SEG11 [5] call fillscreen 
   //SEG12 [25] phi from main to fillscreen [phi:main->fillscreen]
     jsr fillscreen
-  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
-  //SEG14 [6] phi (byte*) main::nxt#9 = (const byte*) TEXT#0 [phi:main->main::@2#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@1 [phi:main->main::@1]
+  //SEG14 [6] phi (byte*) main::nxt#9 = (const byte*) TEXT#0 [phi:main->main::@1#0] -- pbuz1=pbuc1 
     lda #<TEXT
     sta nxt
     lda #>TEXT
     sta nxt+1
-  //SEG15 [6] phi (byte) main::scroll#7 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@2#1] -- vbuxx=vbuc1 
+  //SEG15 [6] phi (byte) main::scroll#7 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@1#1] -- vbuxx=vbuc1 
     ldx #7
   // Wait for raster
-  //SEG16 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  //SEG17 main::@2
-  b2:
-  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG16 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  //SEG17 main::@1
+  b1:
+  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b2
-  //SEG19 main::@4
-  b4:
-  //SEG20 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1
+  //SEG19 main::@2
+  b2:
+  //SEG20 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b4
-  //SEG21 main::@5
+    bne b2
+  //SEG21 main::@3
   //SEG22 [9] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
   //SEG23 [10] (byte) main::scroll#1 ← -- (byte) main::scroll#7 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG24 [11] if((byte) main::scroll#1!=(byte/word/signed word/dword/signed dword) $ff) goto main::@7 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG24 [11] if((byte) main::scroll#1!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$ff
-    bne b7
-  //SEG25 [12] phi from main::@5 to main::@8 [phi:main::@5->main::@8]
-  //SEG26 [12] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@8#0] -- vbuxx=vbuc1 
+    bne b4
+  //SEG25 [12] phi from main::@3 to main::@5 [phi:main::@3->main::@5]
+  //SEG26 [12] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@5#0] -- vbuxx=vbuc1 
     ldx #0
   // Hard scroll
-  //SEG27 [12] phi from main::@8 to main::@8 [phi:main::@8->main::@8]
-  //SEG28 [12] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@8#0] -- register_copy 
-  //SEG29 main::@8
-  b8:
+  //SEG27 [12] phi from main::@5 to main::@5 [phi:main::@5->main::@5]
+  //SEG28 [12] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@5#0] -- register_copy 
+  //SEG29 main::@5
+  b5:
   //SEG30 [13] *((const byte[]) main::line#0 + (byte) main::i#2) ← *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) main::i#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda line+1,x
     sta line,x
   //SEG31 [14] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG32 [15] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $27) goto main::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG32 [15] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $27) goto main::@5 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$27
-    bne b8
-  //SEG33 main::@9
+    bne b5
+  //SEG33 main::@6
   //SEG34 [16] (byte) main::c#0 ← *((byte*) main::nxt#9) -- vbuxx=_deref_pbuz1 
     // Render next char
     ldy #0
     lda (nxt),y
     tax
-  //SEG35 [17] if((byte) main::c#0!=(byte) '@') goto main::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG35 [17] if((byte) main::c#0!=(byte) '@') goto main::@8 -- vbuxx_neq_vbuc1_then_la1 
     cpx #'@'
-    bne b11
-  //SEG36 main::@10
+    bne b8
+  //SEG36 main::@7
   //SEG37 [18] (byte) main::c#1 ← *((const byte*) TEXT#0) -- vbuxx=_deref_pbuc1 
     ldx TEXT
-  //SEG38 [19] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
-  //SEG39 [19] phi (byte*) main::nxt#4 = (const byte*) TEXT#0 [phi:main::@10->main::@11#0] -- pbuz1=pbuc1 
+  //SEG38 [19] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
+  //SEG39 [19] phi (byte*) main::nxt#4 = (const byte*) TEXT#0 [phi:main::@7->main::@8#0] -- pbuz1=pbuc1 
     lda #<TEXT
     sta nxt
     lda #>TEXT
     sta nxt+1
-  //SEG40 [19] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@10->main::@11#1] -- register_copy 
-  //SEG41 [19] phi from main::@9 to main::@11 [phi:main::@9->main::@11]
-  //SEG42 [19] phi (byte*) main::nxt#4 = (byte*) main::nxt#9 [phi:main::@9->main::@11#0] -- register_copy 
-  //SEG43 [19] phi (byte) main::c#2 = (byte) main::c#0 [phi:main::@9->main::@11#1] -- register_copy 
-  //SEG44 main::@11
-  b11:
+  //SEG40 [19] phi (byte) main::c#2 = (byte) main::c#1 [phi:main::@7->main::@8#1] -- register_copy 
+  //SEG41 [19] phi from main::@6 to main::@8 [phi:main::@6->main::@8]
+  //SEG42 [19] phi (byte*) main::nxt#4 = (byte*) main::nxt#9 [phi:main::@6->main::@8#0] -- register_copy 
+  //SEG43 [19] phi (byte) main::c#2 = (byte) main::c#0 [phi:main::@6->main::@8#1] -- register_copy 
+  //SEG44 main::@8
+  b8:
   //SEG45 [20] *((const byte[]) main::line#0+(byte/signed byte/word/signed word/dword/signed dword) $27) ← (byte) main::c#2 -- _deref_pbuc1=vbuxx 
     stx line+$27
   //SEG46 [21] (byte*) main::nxt#1 ← ++ (byte*) main::nxt#4 -- pbuz1=_inc_pbuz1 
@@ -1103,23 +1112,23 @@ main: {
     bne !+
     inc nxt+1
   !:
-  //SEG47 [22] phi from main::@11 to main::@7 [phi:main::@11->main::@7]
-  //SEG48 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#1 [phi:main::@11->main::@7#0] -- register_copy 
-  //SEG49 [22] phi (byte) main::scroll#10 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main::@11->main::@7#1] -- vbuxx=vbuc1 
+  //SEG47 [22] phi from main::@8 to main::@4 [phi:main::@8->main::@4]
+  //SEG48 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#1 [phi:main::@8->main::@4#0] -- register_copy 
+  //SEG49 [22] phi (byte) main::scroll#10 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main::@8->main::@4#1] -- vbuxx=vbuc1 
     ldx #7
-  //SEG50 [22] phi from main::@5 to main::@7 [phi:main::@5->main::@7]
-  //SEG51 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#9 [phi:main::@5->main::@7#0] -- register_copy 
-  //SEG52 [22] phi (byte) main::scroll#10 = (byte) main::scroll#1 [phi:main::@5->main::@7#1] -- register_copy 
-  //SEG53 main::@7
-  b7:
+  //SEG50 [22] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG51 [22] phi (byte*) main::nxt#10 = (byte*) main::nxt#9 [phi:main::@3->main::@4#0] -- register_copy 
+  //SEG52 [22] phi (byte) main::scroll#10 = (byte) main::scroll#1 [phi:main::@3->main::@4#1] -- register_copy 
+  //SEG53 main::@4
+  b4:
   //SEG54 [23] *((const byte*) SCROLL#0) ← (byte) main::scroll#10 -- _deref_pbuc1=vbuxx 
     stx SCROLL
   //SEG55 [24] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BGCOL
-  //SEG56 [6] phi from main::@7 to main::@2 [phi:main::@7->main::@2]
-  //SEG57 [6] phi (byte*) main::nxt#9 = (byte*) main::nxt#10 [phi:main::@7->main::@2#0] -- register_copy 
-  //SEG58 [6] phi (byte) main::scroll#7 = (byte) main::scroll#10 [phi:main::@7->main::@2#1] -- register_copy 
-    jmp b2
+  //SEG56 [6] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  //SEG57 [6] phi (byte*) main::nxt#9 = (byte*) main::nxt#10 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG58 [6] phi (byte) main::scroll#7 = (byte) main::scroll#10 [phi:main::@4->main::@1#1] -- register_copy 
+    jmp b1
 }
 //SEG59 fillscreen
 fillscreen: {
diff --git a/src/test/ref/examples/scroll/scroll.sym b/src/test/ref/examples/scroll/scroll.sym
index cf291947a..f5150aefd 100644
--- a/src/test/ref/examples/scroll/scroll.sym
+++ b/src/test/ref/examples/scroll/scroll.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -21,14 +21,14 @@
 (const byte) fillscreen::fill#0 fill = (byte/signed byte/word/signed word/dword/signed dword) $20
 (byte*) fillscreen::screen
 (void()) main()
-(label) main::@10
-(label) main::@11
+(label) main::@1
 (label) main::@2
+(label) main::@3
 (label) main::@4
 (label) main::@5
+(label) main::@6
 (label) main::@7
 (label) main::@8
-(label) main::@9
 (byte) main::c
 (byte) main::c#0 reg byte x 16.5
 (byte) main::c#1 reg byte x 22.0
diff --git a/src/test/ref/examples/scrollbig/scrollbig.asm b/src/test/ref/examples/scrollbig/scrollbig.asm
index 8f9f3dd42..2319d7d84 100644
--- a/src/test/ref/examples/scrollbig/scrollbig.asm
+++ b/src/test/ref/examples/scrollbig/scrollbig.asm
@@ -25,18 +25,18 @@ main: {
     sta current_bit
     ldx #7
   // Wait for raster
-  b2:
+  b1:
     lda #$fe
     cmp RASTER
-    bne b2
-  b4:
+    bne b1
+  b2:
     lda #$ff
     cmp RASTER
-    bne b4
+    bne b2
     inc BGCOL
     jsr scroll_soft
     dec BGCOL
-    jmp b2
+    jmp b1
 }
 scroll_soft: {
     dex
diff --git a/src/test/ref/examples/scrollbig/scrollbig.cfg b/src/test/ref/examples/scrollbig/scrollbig.cfg
index 0fe874437..d0425e2c5 100644
--- a/src/test/ref/examples/scrollbig/scrollbig.cfg
+++ b/src/test/ref/examples/scrollbig/scrollbig.cfg
@@ -1,34 +1,34 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   [4] phi()
   [5] call fillscreen 
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@4
+  [6] (byte*) current_chargen#27 ← phi( main::@4/(byte*) current_chargen#11 main/(const byte*) CHARGEN#0 )
+  [6] (byte*) nxt#31 ← phi( main::@4/(byte*) nxt#14 main/(const byte*) TEXT#0 )
+  [6] (byte) current_bit#29 ← phi( main::@4/(byte) current_bit#12 main/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [6] (byte) scroll#18 ← phi( main::@4/(byte) scroll#10 main/(byte/signed byte/word/signed word/dword/signed dword) 7 )
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@8
-  [6] (byte*) current_chargen#27 ← phi( main::@8/(byte*) current_chargen#11 main/(const byte*) CHARGEN#0 )
-  [6] (byte*) nxt#31 ← phi( main::@8/(byte*) nxt#14 main/(const byte*) TEXT#0 )
-  [6] (byte) current_bit#29 ← phi( main::@8/(byte) current_bit#12 main/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [6] (byte) scroll#18 ← phi( main::@8/(byte) scroll#10 main/(byte/signed byte/word/signed word/dword/signed dword) 7 )
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2
-  to:main::@4
-main::@4: scope:[main]  from main::@2 main::@4
-  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+main::@2: scope:[main]  from main::@1 main::@2
+  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [9] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   [10] call scroll_soft 
-  to:main::@8
-main::@8: scope:[main]  from main::@5
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [11] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0)
-  to:main::@2
-scroll_soft: scope:[scroll_soft]  from main::@5
+  to:main::@1
+scroll_soft: scope:[scroll_soft]  from main::@3
   [12] (byte) scroll#3 ← -- (byte) scroll#18
   [13] if((byte) scroll#3!=(byte/word/signed word/dword/signed dword) $ff) goto scroll_soft::@1
   to:scroll_soft::@2
diff --git a/src/test/ref/examples/scrollbig/scrollbig.log b/src/test/ref/examples/scrollbig/scrollbig.log
index 091bab4e0..c583354de 100644
--- a/src/test/ref/examples/scrollbig/scrollbig.log
+++ b/src/test/ref/examples/scrollbig/scrollbig.log
@@ -982,8 +982,13 @@ Culled Empty Block (label) scroll_bit::@9
 Culled Empty Block (label) scroll_hard::@3
 Culled Empty Block (label) next_char::@4
 Culled Empty Block (label) fillscreen::@3
+Renumbering block @6 to @1
+Renumbering block main::@2 to main::@1
+Renumbering block main::@4 to main::@2
+Renumbering block main::@5 to main::@3
+Renumbering block main::@8 to main::@4
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @6
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of scroll_soft::@2
@@ -995,35 +1000,35 @@ Adding NOP phi() at start of fillscreen
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   [4] phi()
   [5] call fillscreen 
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@4
+  [6] (byte*) current_chargen#27 ← phi( main::@4/(byte*) current_chargen#11 main/(const byte*) CHARGEN#0 )
+  [6] (byte*) nxt#31 ← phi( main::@4/(byte*) nxt#14 main/(const byte*) TEXT#0 )
+  [6] (byte) current_bit#29 ← phi( main::@4/(byte) current_bit#12 main/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [6] (byte) scroll#18 ← phi( main::@4/(byte) scroll#10 main/(byte/signed byte/word/signed word/dword/signed dword) 7 )
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@8
-  [6] (byte*) current_chargen#27 ← phi( main::@8/(byte*) current_chargen#11 main/(const byte*) CHARGEN#0 )
-  [6] (byte*) nxt#31 ← phi( main::@8/(byte*) nxt#14 main/(const byte*) TEXT#0 )
-  [6] (byte) current_bit#29 ← phi( main::@8/(byte) current_bit#12 main/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [6] (byte) scroll#18 ← phi( main::@8/(byte) scroll#10 main/(byte/signed byte/word/signed word/dword/signed dword) 7 )
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2
-  to:main::@4
-main::@4: scope:[main]  from main::@2 main::@4
-  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+main::@2: scope:[main]  from main::@1 main::@2
+  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [9] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   [10] call scroll_soft 
-  to:main::@8
-main::@8: scope:[main]  from main::@5
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [11] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0)
-  to:main::@2
-scroll_soft: scope:[scroll_soft]  from main::@5
+  to:main::@1
+scroll_soft: scope:[scroll_soft]  from main::@3
   [12] (byte) scroll#3 ← -- (byte) scroll#18
   [13] if((byte) scroll#3!=(byte/word/signed word/dword/signed dword) $ff) goto scroll_soft::@1
   to:scroll_soft::@2
@@ -1273,17 +1278,17 @@ INITIAL ASM
   .label nxt = $b
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @6 to main [phi:@6->main]
-main_from_b6:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1293,61 +1298,61 @@ main: {
   //SEG12 [64] phi from main to fillscreen [phi:main->fillscreen]
   fillscreen_from_main:
     jsr fillscreen
-  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
-  b2_from_main:
-  //SEG14 [6] phi (byte*) current_chargen#27 = (const byte*) CHARGEN#0 [phi:main->main::@2#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG14 [6] phi (byte*) current_chargen#27 = (const byte*) CHARGEN#0 [phi:main->main::@1#0] -- pbuz1=pbuc1 
     lda #<CHARGEN
     sta current_chargen
     lda #>CHARGEN
     sta current_chargen+1
-  //SEG15 [6] phi (byte*) nxt#31 = (const byte*) TEXT#0 [phi:main->main::@2#1] -- pbuz1=pbuc1 
+  //SEG15 [6] phi (byte*) nxt#31 = (const byte*) TEXT#0 [phi:main->main::@1#1] -- pbuz1=pbuc1 
     lda #<TEXT
     sta nxt
     lda #>TEXT
     sta nxt+1
-  //SEG16 [6] phi (byte) current_bit#29 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main->main::@2#2] -- vbuz1=vbuc1 
+  //SEG16 [6] phi (byte) current_bit#29 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main->main::@1#2] -- vbuz1=vbuc1 
     lda #1
     sta current_bit
-  //SEG17 [6] phi (byte) scroll#18 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@2#3] -- vbuz1=vbuc1 
+  //SEG17 [6] phi (byte) scroll#18 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@1#3] -- vbuz1=vbuc1 
     lda #7
     sta scroll
-    jmp b2
+    jmp b1
   // Wait for raster
-  //SEG18 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  b2_from_b2:
-    jmp b2
-  //SEG19 main::@2
-  b2:
-  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG18 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG19 main::@1
+  b1:
+  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b2_from_b2
-    jmp b4
-  //SEG21 main::@4
-  b4:
-  //SEG22 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1_from_b1
+    jmp b2
+  //SEG21 main::@2
+  b2:
+  //SEG22 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b4
-    jmp b5
-  //SEG23 main::@5
-  b5:
+    bne b2
+    jmp b3
+  //SEG23 main::@3
+  b3:
   //SEG24 [9] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
   //SEG25 [10] call scroll_soft 
     jsr scroll_soft
-    jmp b8
-  //SEG26 main::@8
-  b8:
+    jmp b4
+  //SEG26 main::@4
+  b4:
   //SEG27 [11] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BGCOL
-  //SEG28 [6] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
-  b2_from_b8:
-  //SEG29 [6] phi (byte*) current_chargen#27 = (byte*) current_chargen#11 [phi:main::@8->main::@2#0] -- register_copy 
-  //SEG30 [6] phi (byte*) nxt#31 = (byte*) nxt#14 [phi:main::@8->main::@2#1] -- register_copy 
-  //SEG31 [6] phi (byte) current_bit#29 = (byte) current_bit#12 [phi:main::@8->main::@2#2] -- register_copy 
-  //SEG32 [6] phi (byte) scroll#18 = (byte) scroll#10 [phi:main::@8->main::@2#3] -- register_copy 
-    jmp b2
+  //SEG28 [6] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG29 [6] phi (byte*) current_chargen#27 = (byte*) current_chargen#11 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG30 [6] phi (byte*) nxt#31 = (byte*) nxt#14 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG31 [6] phi (byte) current_bit#29 = (byte) current_bit#12 [phi:main::@4->main::@1#2] -- register_copy 
+  //SEG32 [6] phi (byte) scroll#18 = (byte) scroll#10 [phi:main::@4->main::@1#3] -- register_copy 
+    jmp b1
 }
 //SEG33 scroll_soft
 scroll_soft: {
@@ -1709,10 +1714,10 @@ fillscreen: {
   TEXT: .text "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =-     @"
 
 REGISTER UPLIFT POTENTIAL REGISTERS
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ( main:2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ( main:2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ scroll#18 scroll#10 scroll#3 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:3 [ current_bit#29 current_bit#12 current_bit#21 current_bit#5 ]
-Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ( main:2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ) always clobbers reg byte a 
+Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ( main:2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ) always clobbers reg byte a 
 Statement [25] (word) scroll_bit::c#0 ← ((word)) (byte~) scroll_bit::$6 [ scroll_bit::c#0 nxt#19 ] ( main:2::scroll_soft:10::scroll_bit:15 [ scroll_bit::c#0 nxt#19 ] ) always clobbers reg byte a 
 Statement [26] (word~) scroll_bit::$7 ← (word) scroll_bit::c#0 << (byte/signed byte/word/signed word/dword/signed dword) 3 [ scroll_bit::$7 nxt#19 ] ( main:2::scroll_soft:10::scroll_bit:15 [ scroll_bit::$7 nxt#19 ] ) always clobbers reg byte a 
 Statement [27] (byte*) current_chargen#5 ← (const byte*) CHARGEN#0 + (word~) scroll_bit::$7 [ current_chargen#5 nxt#19 ] ( main:2::scroll_soft:10::scroll_bit:15 [ current_chargen#5 nxt#19 ] ) always clobbers reg byte a 
@@ -1736,8 +1741,8 @@ Statement [54] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword
 Statement [58] (byte) next_char::c#0 ← *((byte*) nxt#31) [ nxt#31 next_char::c#0 ] ( main:2::scroll_soft:10::scroll_bit:15::next_char:22 [ nxt#31 next_char::c#0 ] ) always clobbers reg byte a reg byte y 
 Statement [66] *((byte*) fillscreen::cursor#2) ← (const byte) fillscreen::fill#0 [ fillscreen::cursor#2 ] ( main:2::fillscreen:5 [ fillscreen::cursor#2 ] ) always clobbers reg byte a reg byte y 
 Statement [68] if((byte*) fillscreen::cursor#1<(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e8) goto fillscreen::@1 [ fillscreen::cursor#1 ] ( main:2::fillscreen:5 [ fillscreen::cursor#1 ] ) always clobbers reg byte a 
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ( main:2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ) always clobbers reg byte a 
-Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ( main:2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ( main:2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ) always clobbers reg byte a 
+Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ( main:2 [ scroll#18 current_bit#29 nxt#31 current_chargen#27 ] ) always clobbers reg byte a 
 Statement [25] (word) scroll_bit::c#0 ← ((word)) (byte~) scroll_bit::$6 [ scroll_bit::c#0 nxt#19 ] ( main:2::scroll_soft:10::scroll_bit:15 [ scroll_bit::c#0 nxt#19 ] ) always clobbers reg byte a 
 Statement [26] (word~) scroll_bit::$7 ← (word) scroll_bit::c#0 << (byte/signed byte/word/signed word/dword/signed dword) 3 [ scroll_bit::$7 nxt#19 ] ( main:2::scroll_soft:10::scroll_bit:15 [ scroll_bit::$7 nxt#19 ] ) always clobbers reg byte a 
 Statement [27] (byte*) current_chargen#5 ← (const byte*) CHARGEN#0 + (word~) scroll_bit::$7 [ current_chargen#5 nxt#19 ] ( main:2::scroll_soft:10::scroll_bit:15 [ current_chargen#5 nxt#19 ] ) always clobbers reg byte a 
@@ -1822,17 +1827,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label nxt = 7
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @6 to main [phi:@6->main]
-main_from_b6:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1842,60 +1847,60 @@ main: {
   //SEG12 [64] phi from main to fillscreen [phi:main->fillscreen]
   fillscreen_from_main:
     jsr fillscreen
-  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
-  b2_from_main:
-  //SEG14 [6] phi (byte*) current_chargen#27 = (const byte*) CHARGEN#0 [phi:main->main::@2#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG14 [6] phi (byte*) current_chargen#27 = (const byte*) CHARGEN#0 [phi:main->main::@1#0] -- pbuz1=pbuc1 
     lda #<CHARGEN
     sta current_chargen
     lda #>CHARGEN
     sta current_chargen+1
-  //SEG15 [6] phi (byte*) nxt#31 = (const byte*) TEXT#0 [phi:main->main::@2#1] -- pbuz1=pbuc1 
+  //SEG15 [6] phi (byte*) nxt#31 = (const byte*) TEXT#0 [phi:main->main::@1#1] -- pbuz1=pbuc1 
     lda #<TEXT
     sta nxt
     lda #>TEXT
     sta nxt+1
-  //SEG16 [6] phi (byte) current_bit#29 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main->main::@2#2] -- vbuz1=vbuc1 
+  //SEG16 [6] phi (byte) current_bit#29 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main->main::@1#2] -- vbuz1=vbuc1 
     lda #1
     sta current_bit
-  //SEG17 [6] phi (byte) scroll#18 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@2#3] -- vbuxx=vbuc1 
+  //SEG17 [6] phi (byte) scroll#18 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@1#3] -- vbuxx=vbuc1 
     ldx #7
-    jmp b2
+    jmp b1
   // Wait for raster
-  //SEG18 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  b2_from_b2:
-    jmp b2
-  //SEG19 main::@2
-  b2:
-  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG18 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG19 main::@1
+  b1:
+  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b2_from_b2
-    jmp b4
-  //SEG21 main::@4
-  b4:
-  //SEG22 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1_from_b1
+    jmp b2
+  //SEG21 main::@2
+  b2:
+  //SEG22 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b4
-    jmp b5
-  //SEG23 main::@5
-  b5:
+    bne b2
+    jmp b3
+  //SEG23 main::@3
+  b3:
   //SEG24 [9] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
   //SEG25 [10] call scroll_soft 
     jsr scroll_soft
-    jmp b8
-  //SEG26 main::@8
-  b8:
+    jmp b4
+  //SEG26 main::@4
+  b4:
   //SEG27 [11] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BGCOL
-  //SEG28 [6] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
-  b2_from_b8:
-  //SEG29 [6] phi (byte*) current_chargen#27 = (byte*) current_chargen#11 [phi:main::@8->main::@2#0] -- register_copy 
-  //SEG30 [6] phi (byte*) nxt#31 = (byte*) nxt#14 [phi:main::@8->main::@2#1] -- register_copy 
-  //SEG31 [6] phi (byte) current_bit#29 = (byte) current_bit#12 [phi:main::@8->main::@2#2] -- register_copy 
-  //SEG32 [6] phi (byte) scroll#18 = (byte) scroll#10 [phi:main::@8->main::@2#3] -- register_copy 
-    jmp b2
+  //SEG28 [6] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG29 [6] phi (byte*) current_chargen#27 = (byte*) current_chargen#11 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG30 [6] phi (byte*) nxt#31 = (byte*) nxt#14 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG31 [6] phi (byte) current_bit#29 = (byte) current_bit#12 [phi:main::@4->main::@1#2] -- register_copy 
+  //SEG32 [6] phi (byte) scroll#18 = (byte) scroll#10 [phi:main::@4->main::@1#3] -- register_copy 
+    jmp b1
 }
 //SEG33 scroll_soft
 scroll_soft: {
@@ -2217,12 +2222,12 @@ fillscreen: {
   TEXT: .text "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =-     @"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b6
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b1
 Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b8
 Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -2243,7 +2248,7 @@ Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b2_from_b2 with b2
+Replacing label b1_from_b1 with b1
 Replacing label b1_from_scroll_soft with b1
 Replacing label b1_from_scroll_bit with b1
 Replacing label b3_from_b4 with b3
@@ -2251,11 +2256,11 @@ Replacing label b1_from_b1 with b1
 Replacing label b1_from_next_char with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b6_from_bbegin:
-Removing instruction b6:
-Removing instruction main_from_b6:
-Removing instruction bend_from_b6:
-Removing instruction b2_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b1:
 Removing instruction b2_from_scroll_soft:
 Removing instruction b1_from_scroll_soft:
 Removing instruction b2_from_scroll_bit:
@@ -2270,10 +2275,10 @@ Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction fillscreen_from_main:
-Removing instruction b2_from_main:
-Removing instruction b5:
-Removing instruction b8:
-Removing instruction b2_from_b8:
+Removing instruction b1_from_main:
+Removing instruction b3:
+Removing instruction b4:
+Removing instruction b1_from_b4:
 Removing instruction b2:
 Removing instruction b1_from_b2:
 Removing instruction breturn:
@@ -2298,7 +2303,7 @@ Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Relabelling long label b4_from_b3 to b2
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b3
@@ -2310,7 +2315,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -2347,10 +2352,10 @@ FINAL SYMBOL TABLE
 (const byte) fillscreen::fill#0 fill = (byte/signed byte/word/signed word/dword/signed dword) $20
 (byte*) fillscreen::screen
 (void()) main()
+(label) main::@1
 (label) main::@2
+(label) main::@3
 (label) main::@4
-(label) main::@5
-(label) main::@8
 (byte()) next_char()
 (label) next_char::@1
 (label) next_char::@2
@@ -2442,61 +2447,61 @@ Score: 20826
   .label current_chargen = 3
   .label nxt = 7
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-//SEG5 @6
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @6 to main [phi:@6->main]
-//SEG8 [3] phi from @6 to @end [phi:@6->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] call fillscreen 
   //SEG12 [64] phi from main to fillscreen [phi:main->fillscreen]
     jsr fillscreen
-  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
-  //SEG14 [6] phi (byte*) current_chargen#27 = (const byte*) CHARGEN#0 [phi:main->main::@2#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@1 [phi:main->main::@1]
+  //SEG14 [6] phi (byte*) current_chargen#27 = (const byte*) CHARGEN#0 [phi:main->main::@1#0] -- pbuz1=pbuc1 
     lda #<CHARGEN
     sta current_chargen
     lda #>CHARGEN
     sta current_chargen+1
-  //SEG15 [6] phi (byte*) nxt#31 = (const byte*) TEXT#0 [phi:main->main::@2#1] -- pbuz1=pbuc1 
+  //SEG15 [6] phi (byte*) nxt#31 = (const byte*) TEXT#0 [phi:main->main::@1#1] -- pbuz1=pbuc1 
     lda #<TEXT
     sta nxt
     lda #>TEXT
     sta nxt+1
-  //SEG16 [6] phi (byte) current_bit#29 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main->main::@2#2] -- vbuz1=vbuc1 
+  //SEG16 [6] phi (byte) current_bit#29 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main->main::@1#2] -- vbuz1=vbuc1 
     lda #1
     sta current_bit
-  //SEG17 [6] phi (byte) scroll#18 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@2#3] -- vbuxx=vbuc1 
+  //SEG17 [6] phi (byte) scroll#18 = (byte/signed byte/word/signed word/dword/signed dword) 7 [phi:main->main::@1#3] -- vbuxx=vbuc1 
     ldx #7
   // Wait for raster
-  //SEG18 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  //SEG19 main::@2
-  b2:
-  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG18 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  //SEG19 main::@1
+  b1:
+  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b2
-  //SEG21 main::@4
-  b4:
-  //SEG22 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@4 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1
+  //SEG21 main::@2
+  b2:
+  //SEG22 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b4
-  //SEG23 main::@5
+    bne b2
+  //SEG23 main::@3
   //SEG24 [9] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
   //SEG25 [10] call scroll_soft 
     jsr scroll_soft
-  //SEG26 main::@8
+  //SEG26 main::@4
   //SEG27 [11] *((const byte*) BGCOL#0) ← -- *((const byte*) BGCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BGCOL
-  //SEG28 [6] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
-  //SEG29 [6] phi (byte*) current_chargen#27 = (byte*) current_chargen#11 [phi:main::@8->main::@2#0] -- register_copy 
-  //SEG30 [6] phi (byte*) nxt#31 = (byte*) nxt#14 [phi:main::@8->main::@2#1] -- register_copy 
-  //SEG31 [6] phi (byte) current_bit#29 = (byte) current_bit#12 [phi:main::@8->main::@2#2] -- register_copy 
-  //SEG32 [6] phi (byte) scroll#18 = (byte) scroll#10 [phi:main::@8->main::@2#3] -- register_copy 
-    jmp b2
+  //SEG28 [6] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  //SEG29 [6] phi (byte*) current_chargen#27 = (byte*) current_chargen#11 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG30 [6] phi (byte*) nxt#31 = (byte*) nxt#14 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG31 [6] phi (byte) current_bit#29 = (byte) current_bit#12 [phi:main::@4->main::@1#2] -- register_copy 
+  //SEG32 [6] phi (byte) scroll#18 = (byte) scroll#10 [phi:main::@4->main::@1#3] -- register_copy 
+    jmp b1
 }
 //SEG33 scroll_soft
 scroll_soft: {
diff --git a/src/test/ref/examples/scrollbig/scrollbig.sym b/src/test/ref/examples/scrollbig/scrollbig.sym
index 44c898ac9..7b1bfa71e 100644
--- a/src/test/ref/examples/scrollbig/scrollbig.sym
+++ b/src/test/ref/examples/scrollbig/scrollbig.sym
@@ -1,4 +1,4 @@
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -35,10 +35,10 @@
 (const byte) fillscreen::fill#0 fill = (byte/signed byte/word/signed word/dword/signed dword) $20
 (byte*) fillscreen::screen
 (void()) main()
+(label) main::@1
 (label) main::@2
+(label) main::@3
 (label) main::@4
-(label) main::@5
-(label) main::@8
 (byte()) next_char()
 (label) next_char::@1
 (label) next_char::@2
diff --git a/src/test/ref/examples/scrolllogo/scrolllogo.asm b/src/test/ref/examples/scrolllogo/scrolllogo.asm
index 8e267073e..5c95a12e4 100644
--- a/src/test/ref/examples/scrolllogo/scrolllogo.asm
+++ b/src/test/ref/examples/scrolllogo/scrolllogo.asm
@@ -71,10 +71,10 @@ loop: {
     sta xsin_idx+1
   b1:
   // Wait for the raster to reach the bottom of the screen
-  b6:
+  b2:
     lda #$ff
     cmp RASTER
-    bne b6
+    bne b2
     inc BORDERCOL
     lda xsin_idx
     clc
@@ -100,14 +100,14 @@ loop: {
   !:
     lda xsin_idx+1
     cmp #>XSIN_SIZE*2
-    bne b9
+    bne b4
     lda xsin_idx
     cmp #<XSIN_SIZE*2
-    bne b9
+    bne b4
     lda #0
     sta xsin_idx
     sta xsin_idx+1
-  b9:
+  b4:
     dec BORDERCOL
     jmp b1
 }
@@ -141,17 +141,17 @@ render_logo: {
     lda xpos+1
     bmi b1
     ldy #0
-  b4:
+  b2:
     cpy x_char
-    bne b7
+    bne b3
     lda #0
     sta logo_idx
-  b10:
+  b5:
     cpy #$28
-    bne b13
+    bne b6
   breturn:
     rts
-  b13:
+  b6:
     lda logo_idx
     sta SCREEN,y
     lda #$28*1
@@ -176,8 +176,8 @@ render_logo: {
     sta SCREEN+$28*5,y
     iny
     inc logo_idx
-    jmp b10
-  b7:
+    jmp b5
+  b3:
     lda #0
     sta SCREEN,y
     sta SCREEN+$28*1,y
@@ -186,7 +186,7 @@ render_logo: {
     sta SCREEN+$28*4,y
     sta SCREEN+$28*5,y
     iny
-    jmp b4
+    jmp b2
   b1:
     lda x_char
     eor #$ff
@@ -194,15 +194,15 @@ render_logo: {
     adc #1
     sta logo_idx
     ldy #0
-  b21:
+  b8:
     lda #$28
     cmp logo_idx
-    bne b24
-  b27:
+    bne b9
+  b11:
     cpy #$28
-    bne b30
+    bne b12
     jmp breturn
-  b30:
+  b12:
     lda #0
     sta SCREEN,y
     sta SCREEN+$28*1,y
@@ -211,8 +211,8 @@ render_logo: {
     sta SCREEN+$28*4,y
     sta SCREEN+$28*5,y
     iny
-    jmp b27
-  b24:
+    jmp b11
+  b9:
     lda logo_idx
     sta SCREEN,y
     lda #$28*1
@@ -237,7 +237,7 @@ render_logo: {
     sta SCREEN+$28*5,y
     iny
     inc logo_idx
-    jmp b21
+    jmp b8
 }
 // Generate signed word sinus table - with values in the range min-max.
 // sintab - the table to generate into
@@ -398,7 +398,7 @@ mul16u: {
     lda a
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -412,7 +412,7 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  b8:
+  b4:
     clc
     ror a+1
     ror a
diff --git a/src/test/ref/examples/scrolllogo/scrolllogo.cfg b/src/test/ref/examples/scrolllogo/scrolllogo.cfg
index 2dc10550b..7174120be 100644
--- a/src/test/ref/examples/scrolllogo/scrolllogo.cfg
+++ b/src/test/ref/examples/scrolllogo/scrolllogo.cfg
@@ -1,21 +1,21 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@25
-@25: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) LOGO#0) {{ .var logoPic = LoadPicture("logo.png", List().add($444444, $808080, $000000, $ffffff))
     .for (var y=0; y<6	; y++)
         .for (var x=0;x<40; x++)
             .for(var cp=0; cp<8; cp++)
                 .byte logoPic.getMulticolorByte(x,cp+y*8)
  }}
-  to:@28
-@28: scope:[]  from @25
+  to:@2
+@2: scope:[]  from @1
   [2] phi()
   [3] call main 
   to:@end
-@end: scope:[]  from @28
+@end: scope:[]  from @2
   [4] phi()
-main: scope:[main]  from @28
+main: scope:[main]  from @2
   asm { sei  }
   [6] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0
   [7] *((const byte*) BGCOL2#0) ← (const byte) DARK_GREY#0
@@ -43,42 +43,42 @@ main::@1: scope:[main]  from main::@1 main::@4
 main::@2: scope:[main]  from main::@1
   [20] phi()
   [21] call sin16s_gen2 
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@2
   [22] phi()
   [23] call loop 
   to:main::@return
-main::@return: scope:[main]  from main::@6
+main::@return: scope:[main]  from main::@5
   [24] return 
   to:@return
-loop: scope:[loop]  from main::@6
+loop: scope:[loop]  from main::@5
   [25] phi()
   to:loop::@1
-loop::@1: scope:[loop]  from loop loop::@9
-  [26] (word) xsin_idx#11 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@9/(word) xsin_idx#19 )
-  to:loop::@6
-loop::@6: scope:[loop]  from loop::@1 loop::@6
-  [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6
-  to:loop::@8
-loop::@8: scope:[loop]  from loop::@6
+loop::@1: scope:[loop]  from loop loop::@4
+  [26] (word) xsin_idx#11 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@4/(word) xsin_idx#19 )
+  to:loop::@2
+loop::@2: scope:[loop]  from loop::@1 loop::@2
+  [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2
+  to:loop::@3
+loop::@3: scope:[loop]  from loop::@2
   [28] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [29] (signed word*~) loop::$1 ← (const signed word[XSIN_SIZE#0]) xsin#0 + (word) xsin_idx#11
   [30] (signed word) loop::xpos#0 ← *((signed word*~) loop::$1)
   [31] (signed word) render_logo::xpos#0 ← (signed word) loop::xpos#0
   [32] call render_logo 
-  to:loop::@15
-loop::@15: scope:[loop]  from loop::@8
+  to:loop::@5
+loop::@5: scope:[loop]  from loop::@3
   [33] (word) xsin_idx#3 ← (word) xsin_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 2
-  [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@16
-  to:loop::@9
-loop::@9: scope:[loop]  from loop::@15 loop::@16
-  [35] (word) xsin_idx#19 ← phi( loop::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@16/(word) xsin_idx#3 )
+  [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@6
+  to:loop::@4
+loop::@4: scope:[loop]  from loop::@5 loop::@6
+  [35] (word) xsin_idx#19 ← phi( loop::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@6/(word) xsin_idx#3 )
   [36] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0)
   to:loop::@1
-loop::@16: scope:[loop]  from loop::@15
+loop::@6: scope:[loop]  from loop::@5
   [37] phi()
-  to:loop::@9
-render_logo: scope:[render_logo]  from loop::@8
+  to:loop::@4
+render_logo: scope:[render_logo]  from loop::@3
   [38] (byte~) render_logo::$0 ← ((byte)) (signed word) render_logo::xpos#0
   [39] (byte~) render_logo::$1 ← (byte~) render_logo::$0 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [40] (byte~) render_logo::$2 ← (const byte) VIC_MCM#0 | (byte~) render_logo::$1
@@ -86,24 +86,24 @@ render_logo: scope:[render_logo]  from loop::@8
   [42] (signed word~) render_logo::$3 ← (signed word) render_logo::xpos#0 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [43] (signed byte) render_logo::x_char#0 ← ((signed byte)) (signed word~) render_logo::$3
   [44] if((signed word) render_logo::xpos#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_logo::@1
-  to:render_logo::@4
-render_logo::@4: scope:[render_logo]  from render_logo render_logo::@8
-  [45] (byte) render_logo::screen_idx#18 ← phi( render_logo/(byte/signed byte/word/signed word/dword/signed dword) 0 render_logo::@8/(byte) render_logo::screen_idx#3 )
-  [46] if((byte) render_logo::screen_idx#18!=(byte)(signed byte) render_logo::x_char#0) goto render_logo::@7
-  to:render_logo::@10
-render_logo::@10: scope:[render_logo]  from render_logo::@14 render_logo::@4
-  [47] (byte) render_logo::logo_idx#10 ← phi( render_logo::@14/(byte) render_logo::logo_idx#3 render_logo::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [47] (byte) render_logo::screen_idx#10 ← phi( render_logo::@14/(byte) render_logo::screen_idx#4 render_logo::@4/(byte) render_logo::screen_idx#18 )
-  [48] if((byte) render_logo::screen_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@13
+  to:render_logo::@2
+render_logo::@2: scope:[render_logo]  from render_logo render_logo::@4
+  [45] (byte) render_logo::screen_idx#18 ← phi( render_logo/(byte/signed byte/word/signed word/dword/signed dword) 0 render_logo::@4/(byte) render_logo::screen_idx#3 )
+  [46] if((byte) render_logo::screen_idx#18!=(byte)(signed byte) render_logo::x_char#0) goto render_logo::@3
+  to:render_logo::@5
+render_logo::@5: scope:[render_logo]  from render_logo::@2 render_logo::@7
+  [47] (byte) render_logo::logo_idx#10 ← phi( render_logo::@7/(byte) render_logo::logo_idx#3 render_logo::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [47] (byte) render_logo::screen_idx#10 ← phi( render_logo::@7/(byte) render_logo::screen_idx#4 render_logo::@2/(byte) render_logo::screen_idx#18 )
+  [48] if((byte) render_logo::screen_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@6
   to:render_logo::@return
-render_logo::@return: scope:[render_logo]  from render_logo::@10 render_logo::@27
+render_logo::@return: scope:[render_logo]  from render_logo::@11 render_logo::@5
   [49] return 
   to:@return
-render_logo::@13: scope:[render_logo]  from render_logo::@10
+render_logo::@6: scope:[render_logo]  from render_logo::@5
   [50] (byte/signed word/word/dword/signed dword~) render_logo::$15 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) 0
   [51] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$15
   to:render_logo::@13_1
-render_logo::@13_1: scope:[render_logo]  from render_logo::@13
+render_logo::@13_1: scope:[render_logo]  from render_logo::@6
   [52] (byte/signed word/word/dword/signed dword~) render_logo::$34 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1
   [53] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$34
   to:render_logo::@13_2
@@ -122,15 +122,15 @@ render_logo::@13_4: scope:[render_logo]  from render_logo::@13_3
 render_logo::@13_5: scope:[render_logo]  from render_logo::@13_4
   [60] (byte/signed word/word/dword/signed dword~) render_logo::$50 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5
   [61] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$50
-  to:render_logo::@14
-render_logo::@14: scope:[render_logo]  from render_logo::@13_5
+  to:render_logo::@7
+render_logo::@7: scope:[render_logo]  from render_logo::@13_5
   [62] (byte) render_logo::screen_idx#4 ← ++ (byte) render_logo::screen_idx#10
   [63] (byte) render_logo::logo_idx#3 ← ++ (byte) render_logo::logo_idx#10
-  to:render_logo::@10
-render_logo::@7: scope:[render_logo]  from render_logo::@4
+  to:render_logo::@5
+render_logo::@3: scope:[render_logo]  from render_logo::@2
   [64] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#18) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:render_logo::@7_1
-render_logo::@7_1: scope:[render_logo]  from render_logo::@7
+render_logo::@7_1: scope:[render_logo]  from render_logo::@3
   [65] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) render_logo::screen_idx#18) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:render_logo::@7_2
 render_logo::@7_2: scope:[render_logo]  from render_logo::@7_1
@@ -144,27 +144,27 @@ render_logo::@7_4: scope:[render_logo]  from render_logo::@7_3
   to:render_logo::@7_5
 render_logo::@7_5: scope:[render_logo]  from render_logo::@7_4
   [69] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#18) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:render_logo::@8
-render_logo::@8: scope:[render_logo]  from render_logo::@7_5
-  [70] (byte) render_logo::screen_idx#3 ← ++ (byte) render_logo::screen_idx#18
   to:render_logo::@4
+render_logo::@4: scope:[render_logo]  from render_logo::@7_5
+  [70] (byte) render_logo::screen_idx#3 ← ++ (byte) render_logo::screen_idx#18
+  to:render_logo::@2
 render_logo::@1: scope:[render_logo]  from render_logo
   [71] (signed byte~) render_logo::$17 ← - (signed byte) render_logo::x_char#0
   [72] (byte~) render_logo::logo_idx#14 ← (byte)(signed byte~) render_logo::$17
-  to:render_logo::@21
-render_logo::@21: scope:[render_logo]  from render_logo::@1 render_logo::@25
-  [73] (byte) render_logo::screen_idx#21 ← phi( render_logo::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render_logo::@25/(byte) render_logo::screen_idx#5 )
-  [73] (byte) render_logo::logo_idx#11 ← phi( render_logo::@1/(byte~) render_logo::logo_idx#14 render_logo::@25/(byte) render_logo::logo_idx#4 )
-  [74] if((byte) render_logo::logo_idx#11!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@24
-  to:render_logo::@27
-render_logo::@27: scope:[render_logo]  from render_logo::@21 render_logo::@31
-  [75] (byte) render_logo::screen_idx#15 ← phi( render_logo::@21/(byte) render_logo::screen_idx#21 render_logo::@31/(byte) render_logo::screen_idx#6 )
-  [76] if((byte) render_logo::screen_idx#15!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@30
+  to:render_logo::@8
+render_logo::@8: scope:[render_logo]  from render_logo::@1 render_logo::@10
+  [73] (byte) render_logo::screen_idx#21 ← phi( render_logo::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render_logo::@10/(byte) render_logo::screen_idx#5 )
+  [73] (byte) render_logo::logo_idx#11 ← phi( render_logo::@1/(byte~) render_logo::logo_idx#14 render_logo::@10/(byte) render_logo::logo_idx#4 )
+  [74] if((byte) render_logo::logo_idx#11!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@9
+  to:render_logo::@11
+render_logo::@11: scope:[render_logo]  from render_logo::@13 render_logo::@8
+  [75] (byte) render_logo::screen_idx#15 ← phi( render_logo::@8/(byte) render_logo::screen_idx#21 render_logo::@13/(byte) render_logo::screen_idx#6 )
+  [76] if((byte) render_logo::screen_idx#15!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@12
   to:render_logo::@return
-render_logo::@30: scope:[render_logo]  from render_logo::@27
+render_logo::@12: scope:[render_logo]  from render_logo::@11
   [77] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#15) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:render_logo::@30_1
-render_logo::@30_1: scope:[render_logo]  from render_logo::@30
+render_logo::@30_1: scope:[render_logo]  from render_logo::@12
   [78] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) render_logo::screen_idx#15) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:render_logo::@30_2
 render_logo::@30_2: scope:[render_logo]  from render_logo::@30_1
@@ -178,15 +178,15 @@ render_logo::@30_4: scope:[render_logo]  from render_logo::@30_3
   to:render_logo::@30_5
 render_logo::@30_5: scope:[render_logo]  from render_logo::@30_4
   [82] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#15) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:render_logo::@31
-render_logo::@31: scope:[render_logo]  from render_logo::@30_5
+  to:render_logo::@13
+render_logo::@13: scope:[render_logo]  from render_logo::@30_5
   [83] (byte) render_logo::screen_idx#6 ← ++ (byte) render_logo::screen_idx#15
-  to:render_logo::@27
-render_logo::@24: scope:[render_logo]  from render_logo::@21
+  to:render_logo::@11
+render_logo::@9: scope:[render_logo]  from render_logo::@8
   [84] (byte/signed word/word/dword/signed dword~) render_logo::$23 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 0
   [85] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$23
   to:render_logo::@24_1
-render_logo::@24_1: scope:[render_logo]  from render_logo::@24
+render_logo::@24_1: scope:[render_logo]  from render_logo::@9
   [86] (byte/signed word/word/dword/signed dword~) render_logo::$80 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1
   [87] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$80
   to:render_logo::@24_2
@@ -205,33 +205,33 @@ render_logo::@24_4: scope:[render_logo]  from render_logo::@24_3
 render_logo::@24_5: scope:[render_logo]  from render_logo::@24_4
   [94] (byte/signed word/word/dword/signed dword~) render_logo::$96 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5
   [95] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$96
-  to:render_logo::@25
-render_logo::@25: scope:[render_logo]  from render_logo::@24_5
+  to:render_logo::@10
+render_logo::@10: scope:[render_logo]  from render_logo::@24_5
   [96] (byte) render_logo::screen_idx#5 ← ++ (byte) render_logo::screen_idx#21
   [97] (byte) render_logo::logo_idx#4 ← ++ (byte) render_logo::logo_idx#11
-  to:render_logo::@21
+  to:render_logo::@8
 sin16s_gen2: scope:[sin16s_gen2]  from main::@2
   [98] phi()
   [99] call div32u16u 
   [100] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  to:sin16s_gen2::@3
-sin16s_gen2::@3: scope:[sin16s_gen2]  from sin16s_gen2
+  to:sin16s_gen2::@2
+sin16s_gen2::@2: scope:[sin16s_gen2]  from sin16s_gen2
   [101] (dword) sin16s_gen2::step#0 ← (dword) div32u16u::return#2
   to:sin16s_gen2::@1
-sin16s_gen2::@1: scope:[sin16s_gen2]  from sin16s_gen2::@3 sin16s_gen2::@5
-  [102] (word) sin16s_gen2::i#2 ← phi( sin16s_gen2::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@5/(word) sin16s_gen2::i#1 )
-  [102] (signed word*) sin16s_gen2::sintab#2 ← phi( sin16s_gen2::@3/(const signed word[XSIN_SIZE#0]) xsin#0 sin16s_gen2::@5/(signed word*) sin16s_gen2::sintab#0 )
-  [102] (dword) sin16s_gen2::x#2 ← phi( sin16s_gen2::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@5/(dword) sin16s_gen2::x#1 )
+sin16s_gen2::@1: scope:[sin16s_gen2]  from sin16s_gen2::@2 sin16s_gen2::@4
+  [102] (word) sin16s_gen2::i#2 ← phi( sin16s_gen2::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@4/(word) sin16s_gen2::i#1 )
+  [102] (signed word*) sin16s_gen2::sintab#2 ← phi( sin16s_gen2::@2/(const signed word[XSIN_SIZE#0]) xsin#0 sin16s_gen2::@4/(signed word*) sin16s_gen2::sintab#0 )
+  [102] (dword) sin16s_gen2::x#2 ← phi( sin16s_gen2::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@4/(dword) sin16s_gen2::x#1 )
   [103] (dword) sin16s::x#0 ← (dword) sin16s_gen2::x#2
   [104] call sin16s 
   [105] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  to:sin16s_gen2::@4
-sin16s_gen2::@4: scope:[sin16s_gen2]  from sin16s_gen2::@1
+  to:sin16s_gen2::@3
+sin16s_gen2::@3: scope:[sin16s_gen2]  from sin16s_gen2::@1
   [106] (signed word) mul16s::a#0 ← (signed word) sin16s::return#0
   [107] call mul16s 
   [108] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-  to:sin16s_gen2::@5
-sin16s_gen2::@5: scope:[sin16s_gen2]  from sin16s_gen2::@4
+  to:sin16s_gen2::@4
+sin16s_gen2::@4: scope:[sin16s_gen2]  from sin16s_gen2::@3
   [109] (signed dword~) sin16s_gen2::$5 ← (signed dword) mul16s::return#2
   [110] (word~) sin16s_gen2::$6 ← > (signed dword~) sin16s_gen2::$5
   [111] (signed word~) sin16s_gen2::$8 ← (const signed word) sin16s_gen2::offs#0 + (signed word)(word~) sin16s_gen2::$6
@@ -241,25 +241,25 @@ sin16s_gen2::@5: scope:[sin16s_gen2]  from sin16s_gen2::@4
   [115] (word) sin16s_gen2::i#1 ← ++ (word) sin16s_gen2::i#2
   [116] if((word) sin16s_gen2::i#1<(const word) XSIN_SIZE#0) goto sin16s_gen2::@1
   to:sin16s_gen2::@return
-sin16s_gen2::@return: scope:[sin16s_gen2]  from sin16s_gen2::@5
+sin16s_gen2::@return: scope:[sin16s_gen2]  from sin16s_gen2::@4
   [117] return 
   to:@return
-mul16s: scope:[mul16s]  from sin16s_gen2::@4
+mul16s: scope:[mul16s]  from sin16s_gen2::@3
   [118] (word~) mul16u::a#8 ← (word)(signed word) mul16s::a#0
   [119] call mul16u 
   [120] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mul16s::@6
-mul16s::@6: scope:[mul16s]  from mul16s
+  to:mul16s::@4
+mul16s::@4: scope:[mul16s]  from mul16s
   [121] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   [122] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1
   to:mul16s::@3
-mul16s::@3: scope:[mul16s]  from mul16s::@6
+mul16s::@3: scope:[mul16s]  from mul16s::@4
   [123] (word~) mul16s::$9 ← > (dword) mul16s::m#0
   [124] (word~) mul16s::$16 ← (word~) mul16s::$9 - ((word))(const signed word) sin16s_gen2::ampl#0
   [125] (dword) mul16s::m#1 ← (dword) mul16s::m#0 hi= (word~) mul16s::$16
   to:mul16s::@1
-mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@6
-  [126] (dword) mul16s::m#4 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@6/(dword) mul16s::m#0 )
+mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@4
+  [126] (dword) mul16s::m#4 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@4/(dword) mul16s::m#0 )
   to:mul16s::@2
 mul16s::@2: scope:[mul16s]  from mul16s::@1
   [127] (signed dword) mul16s::return#0 ← ((signed dword)) (dword) mul16s::m#4
@@ -272,10 +272,10 @@ mul16u: scope:[mul16u]  from mul16s mulu16_sel
   [129] (word) mul16u::b#2 ← phi( mul16s/((word))(const signed word) sin16s_gen2::ampl#0 mulu16_sel/(word) mul16u::b#1 )
   [130] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#2
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [131] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [131] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [131] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [131] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [131] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [131] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@4/(word) mul16u::a#0 )
   [132] if((word) mul16u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -283,13 +283,13 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [134] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [135] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [135] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [136] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [137] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [137] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [138] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [139] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
@@ -315,91 +315,91 @@ sin16s::@2: scope:[sin16s]  from sin16s::@1 sin16s::@5
   [149] (word) mulu16_sel::v2#0 ← (word) sin16s::x1#0
   [150] call mulu16_sel 
   [151] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  to:sin16s::@8
-sin16s::@8: scope:[sin16s]  from sin16s::@2
+  to:sin16s::@7
+sin16s::@7: scope:[sin16s]  from sin16s::@2
   [152] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   [153] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   [154] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0
   [155] call mulu16_sel 
   [156] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12
-  to:sin16s::@9
-sin16s::@9: scope:[sin16s]  from sin16s::@8
+  to:sin16s::@8
+sin16s::@8: scope:[sin16s]  from sin16s::@7
   [157] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   [158] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   [159] call mulu16_sel 
   [160] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  to:sin16s::@10
-sin16s::@10: scope:[sin16s]  from sin16s::@9
+  to:sin16s::@9
+sin16s::@9: scope:[sin16s]  from sin16s::@8
   [161] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   [162] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0
   [163] (word) mulu16_sel::v1#3 ← (word) sin16s::x3#0
   [164] (word) mulu16_sel::v2#3 ← (word) sin16s::x1#0
   [165] call mulu16_sel 
   [166] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12
-  to:sin16s::@11
-sin16s::@11: scope:[sin16s]  from sin16s::@10
+  to:sin16s::@10
+sin16s::@10: scope:[sin16s]  from sin16s::@9
   [167] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   [168] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   [169] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0
   [170] call mulu16_sel 
   [171] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  to:sin16s::@12
-sin16s::@12: scope:[sin16s]  from sin16s::@11
+  to:sin16s::@11
+sin16s::@11: scope:[sin16s]  from sin16s::@10
   [172] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   [173] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [174] (word) sin16s::usinx#1 ← (word) sin16s::usinx#0 + (word) sin16s::x5_128#0
-  [175] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15
+  [175] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12
   to:sin16s::@6
-sin16s::@6: scope:[sin16s]  from sin16s::@12
+sin16s::@6: scope:[sin16s]  from sin16s::@11
   [176] (signed word) sin16s::sinx#1 ← - (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-sin16s::@3: scope:[sin16s]  from sin16s::@15 sin16s::@6
-  [177] (signed word) sin16s::return#1 ← phi( sin16s::@15/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
+sin16s::@3: scope:[sin16s]  from sin16s::@12 sin16s::@6
+  [177] (signed word) sin16s::return#1 ← phi( sin16s::@12/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
   to:sin16s::@return
 sin16s::@return: scope:[sin16s]  from sin16s::@3
   [178] return 
   to:@return
-sin16s::@15: scope:[sin16s]  from sin16s::@12
+sin16s::@12: scope:[sin16s]  from sin16s::@11
   [179] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@11 sin16s::@2 sin16s::@8 sin16s::@9
-  [180] (byte) mulu16_sel::select#5 ← phi( sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [180] (word) mulu16_sel::v2#5 ← phi( sin16s::@10/(word) mulu16_sel::v2#3 sin16s::@11/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@8/(word) mulu16_sel::v2#1 sin16s::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
-  [180] (word) mulu16_sel::v1#5 ← phi( sin16s::@10/(word) mulu16_sel::v1#3 sin16s::@11/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@8/(word) mulu16_sel::v1#1 sin16s::@9/(word) mulu16_sel::v1#2 )
+mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@2 sin16s::@7 sin16s::@8 sin16s::@9
+  [180] (byte) mulu16_sel::select#5 ← phi( sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [180] (word) mulu16_sel::v2#5 ← phi( sin16s::@9/(word) mulu16_sel::v2#3 sin16s::@10/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@7/(word) mulu16_sel::v2#1 sin16s::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
+  [180] (word) mulu16_sel::v1#5 ← phi( sin16s::@9/(word) mulu16_sel::v1#3 sin16s::@10/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@7/(word) mulu16_sel::v1#1 sin16s::@8/(word) mulu16_sel::v1#2 )
   [181] (word) mul16u::a#2 ← (word) mulu16_sel::v1#5
   [182] (word) mul16u::b#1 ← (word) mulu16_sel::v2#5
   [183] call mul16u 
   [184] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-  to:mulu16_sel::@2
-mulu16_sel::@2: scope:[mulu16_sel]  from mulu16_sel
+  to:mulu16_sel::@1
+mulu16_sel::@1: scope:[mulu16_sel]  from mulu16_sel
   [185] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#3
   [186] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5
   [187] (word) mulu16_sel::return#12 ← > (dword~) mulu16_sel::$1
   to:mulu16_sel::@return
-mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@2
+mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@1
   [188] return 
   to:@return
 div32u16u: scope:[div32u16u]  from sin16s_gen2
   [189] phi()
   [190] call divr16u 
   [191] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div32u16u::@2
-div32u16u::@2: scope:[div32u16u]  from div32u16u
+  to:div32u16u::@1
+div32u16u::@1: scope:[div32u16u]  from div32u16u
   [192] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2
   [193] (word) divr16u::rem#4 ← (word) rem16u#1
   [194] call divr16u 
   [195] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:div32u16u::@3
-div32u16u::@3: scope:[div32u16u]  from div32u16u::@2
+  to:div32u16u::@2
+div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   [196] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   [197] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0
   to:div32u16u::@return
-div32u16u::@return: scope:[div32u16u]  from div32u16u::@3
+div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
   [198] return 
   to:@return
-divr16u: scope:[divr16u]  from div32u16u div32u16u::@2
-  [199] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@2/<(const dword) PI2_u4f28#0 )
-  [199] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@2/(word) divr16u::rem#4 )
+divr16u: scope:[divr16u]  from div32u16u div32u16u::@1
+  [199] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@1/<(const dword) PI2_u4f28#0 )
+  [199] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@1/(word) divr16u::rem#4 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [200] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
diff --git a/src/test/ref/examples/scrolllogo/scrolllogo.log b/src/test/ref/examples/scrolllogo/scrolllogo.log
index 4457b91ff..4342136a8 100644
--- a/src/test/ref/examples/scrolllogo/scrolllogo.log
+++ b/src/test/ref/examples/scrolllogo/scrolllogo.log
@@ -2909,37 +2909,72 @@ Culled Empty Block (label) divr16u::@8
 Culled Empty Block (label) divr16u::@10
 Culled Empty Block (label) divr16u::@9
 Culled Empty Block (label) fill::@3
+Renumbering block @25 to @1
+Renumbering block @28 to @2
+Renumbering block div32u16u::@2 to div32u16u::@1
+Renumbering block div32u16u::@3 to div32u16u::@2
+Renumbering block mul16u::@6 to mul16u::@3
+Renumbering block mul16u::@8 to mul16u::@4
+Renumbering block mul16s::@6 to mul16s::@4
+Renumbering block sin16s_gen2::@3 to sin16s_gen2::@2
+Renumbering block sin16s_gen2::@4 to sin16s_gen2::@3
+Renumbering block sin16s_gen2::@5 to sin16s_gen2::@4
+Renumbering block sin16s::@8 to sin16s::@7
+Renumbering block sin16s::@9 to sin16s::@8
+Renumbering block sin16s::@10 to sin16s::@9
+Renumbering block sin16s::@11 to sin16s::@10
+Renumbering block sin16s::@12 to sin16s::@11
+Renumbering block sin16s::@15 to sin16s::@12
+Renumbering block mulu16_sel::@2 to mulu16_sel::@1
+Renumbering block main::@6 to main::@5
+Renumbering block loop::@6 to loop::@2
+Renumbering block loop::@8 to loop::@3
+Renumbering block loop::@9 to loop::@4
+Renumbering block loop::@15 to loop::@5
+Renumbering block loop::@16 to loop::@6
+Renumbering block render_logo::@4 to render_logo::@2
+Renumbering block render_logo::@7 to render_logo::@3
+Renumbering block render_logo::@8 to render_logo::@4
+Renumbering block render_logo::@10 to render_logo::@5
+Renumbering block render_logo::@13 to render_logo::@6
+Renumbering block render_logo::@14 to render_logo::@7
+Renumbering block render_logo::@21 to render_logo::@8
+Renumbering block render_logo::@24 to render_logo::@9
+Renumbering block render_logo::@25 to render_logo::@10
+Renumbering block render_logo::@27 to render_logo::@11
+Renumbering block render_logo::@30 to render_logo::@12
+Renumbering block render_logo::@31 to render_logo::@13
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @28
+Adding NOP phi() at start of @2
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::toD0181
 Adding NOP phi() at start of main::@4
 Adding NOP phi() at start of main::@2
-Adding NOP phi() at start of main::@6
+Adding NOP phi() at start of main::@5
 Adding NOP phi() at start of loop
-Adding NOP phi() at start of loop::@16
+Adding NOP phi() at start of loop::@6
 Adding NOP phi() at start of sin16s_gen2
 Adding NOP phi() at start of div32u16u
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@25
-@25: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) LOGO#0) {{ .var logoPic = LoadPicture("logo.png", List().add($444444, $808080, $000000, $ffffff))
     .for (var y=0; y<6	; y++)
         .for (var x=0;x<40; x++)
             .for(var cp=0; cp<8; cp++)
                 .byte logoPic.getMulticolorByte(x,cp+y*8)
  }}
-  to:@28
-@28: scope:[]  from @25
+  to:@2
+@2: scope:[]  from @1
   [2] phi()
   [3] call main 
   to:@end
-@end: scope:[]  from @28
+@end: scope:[]  from @2
   [4] phi()
-main: scope:[main]  from @28
+main: scope:[main]  from @2
   asm { sei  }
   [6] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0
   [7] *((const byte*) BGCOL2#0) ← (const byte) DARK_GREY#0
@@ -2967,42 +3002,42 @@ main::@1: scope:[main]  from main::@1 main::@4
 main::@2: scope:[main]  from main::@1
   [20] phi()
   [21] call sin16s_gen2 
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@2
   [22] phi()
   [23] call loop 
   to:main::@return
-main::@return: scope:[main]  from main::@6
+main::@return: scope:[main]  from main::@5
   [24] return 
   to:@return
-loop: scope:[loop]  from main::@6
+loop: scope:[loop]  from main::@5
   [25] phi()
   to:loop::@1
-loop::@1: scope:[loop]  from loop loop::@9
-  [26] (word) xsin_idx#11 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@9/(word) xsin_idx#19 )
-  to:loop::@6
-loop::@6: scope:[loop]  from loop::@1 loop::@6
-  [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6
-  to:loop::@8
-loop::@8: scope:[loop]  from loop::@6
+loop::@1: scope:[loop]  from loop loop::@4
+  [26] (word) xsin_idx#11 ← phi( loop/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@4/(word) xsin_idx#19 )
+  to:loop::@2
+loop::@2: scope:[loop]  from loop::@1 loop::@2
+  [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2
+  to:loop::@3
+loop::@3: scope:[loop]  from loop::@2
   [28] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [29] (signed word*~) loop::$1 ← (const signed word[XSIN_SIZE#0]) xsin#0 + (word) xsin_idx#11
   [30] (signed word) loop::xpos#0 ← *((signed word*~) loop::$1)
   [31] (signed word) render_logo::xpos#0 ← (signed word) loop::xpos#0
   [32] call render_logo 
-  to:loop::@15
-loop::@15: scope:[loop]  from loop::@8
+  to:loop::@5
+loop::@5: scope:[loop]  from loop::@3
   [33] (word) xsin_idx#3 ← (word) xsin_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 2
-  [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@16
-  to:loop::@9
-loop::@9: scope:[loop]  from loop::@15 loop::@16
-  [35] (word) xsin_idx#19 ← phi( loop::@15/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@16/(word) xsin_idx#3 )
+  [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@6
+  to:loop::@4
+loop::@4: scope:[loop]  from loop::@5 loop::@6
+  [35] (word) xsin_idx#19 ← phi( loop::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@6/(word) xsin_idx#3 )
   [36] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0)
   to:loop::@1
-loop::@16: scope:[loop]  from loop::@15
+loop::@6: scope:[loop]  from loop::@5
   [37] phi()
-  to:loop::@9
-render_logo: scope:[render_logo]  from loop::@8
+  to:loop::@4
+render_logo: scope:[render_logo]  from loop::@3
   [38] (byte~) render_logo::$0 ← ((byte)) (signed word) render_logo::xpos#0
   [39] (byte~) render_logo::$1 ← (byte~) render_logo::$0 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [40] (byte~) render_logo::$2 ← (const byte) VIC_MCM#0 | (byte~) render_logo::$1
@@ -3010,24 +3045,24 @@ render_logo: scope:[render_logo]  from loop::@8
   [42] (signed word~) render_logo::$3 ← (signed word) render_logo::xpos#0 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [43] (signed byte) render_logo::x_char#0 ← ((signed byte)) (signed word~) render_logo::$3
   [44] if((signed word) render_logo::xpos#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_logo::@1
-  to:render_logo::@4
-render_logo::@4: scope:[render_logo]  from render_logo render_logo::@8
-  [45] (byte) render_logo::screen_idx#18 ← phi( render_logo/(byte/signed byte/word/signed word/dword/signed dword) 0 render_logo::@8/(byte) render_logo::screen_idx#3 )
-  [46] if((byte) render_logo::screen_idx#18!=(byte)(signed byte) render_logo::x_char#0) goto render_logo::@7
-  to:render_logo::@10
-render_logo::@10: scope:[render_logo]  from render_logo::@14 render_logo::@4
-  [47] (byte) render_logo::logo_idx#10 ← phi( render_logo::@14/(byte) render_logo::logo_idx#3 render_logo::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [47] (byte) render_logo::screen_idx#10 ← phi( render_logo::@14/(byte) render_logo::screen_idx#4 render_logo::@4/(byte) render_logo::screen_idx#18 )
-  [48] if((byte) render_logo::screen_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@13
+  to:render_logo::@2
+render_logo::@2: scope:[render_logo]  from render_logo render_logo::@4
+  [45] (byte) render_logo::screen_idx#18 ← phi( render_logo/(byte/signed byte/word/signed word/dword/signed dword) 0 render_logo::@4/(byte) render_logo::screen_idx#3 )
+  [46] if((byte) render_logo::screen_idx#18!=(byte)(signed byte) render_logo::x_char#0) goto render_logo::@3
+  to:render_logo::@5
+render_logo::@5: scope:[render_logo]  from render_logo::@2 render_logo::@7
+  [47] (byte) render_logo::logo_idx#10 ← phi( render_logo::@7/(byte) render_logo::logo_idx#3 render_logo::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [47] (byte) render_logo::screen_idx#10 ← phi( render_logo::@7/(byte) render_logo::screen_idx#4 render_logo::@2/(byte) render_logo::screen_idx#18 )
+  [48] if((byte) render_logo::screen_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@6
   to:render_logo::@return
-render_logo::@return: scope:[render_logo]  from render_logo::@10 render_logo::@27
+render_logo::@return: scope:[render_logo]  from render_logo::@11 render_logo::@5
   [49] return 
   to:@return
-render_logo::@13: scope:[render_logo]  from render_logo::@10
+render_logo::@6: scope:[render_logo]  from render_logo::@5
   [50] (byte/signed word/word/dword/signed dword~) render_logo::$15 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) 0
   [51] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$15
   to:render_logo::@13_1
-render_logo::@13_1: scope:[render_logo]  from render_logo::@13
+render_logo::@13_1: scope:[render_logo]  from render_logo::@6
   [52] (byte/signed word/word/dword/signed dword~) render_logo::$34 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1
   [53] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$34
   to:render_logo::@13_2
@@ -3046,15 +3081,15 @@ render_logo::@13_4: scope:[render_logo]  from render_logo::@13_3
 render_logo::@13_5: scope:[render_logo]  from render_logo::@13_4
   [60] (byte/signed word/word/dword/signed dword~) render_logo::$50 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5
   [61] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$50
-  to:render_logo::@14
-render_logo::@14: scope:[render_logo]  from render_logo::@13_5
+  to:render_logo::@7
+render_logo::@7: scope:[render_logo]  from render_logo::@13_5
   [62] (byte) render_logo::screen_idx#4 ← ++ (byte) render_logo::screen_idx#10
   [63] (byte) render_logo::logo_idx#3 ← ++ (byte) render_logo::logo_idx#10
-  to:render_logo::@10
-render_logo::@7: scope:[render_logo]  from render_logo::@4
+  to:render_logo::@5
+render_logo::@3: scope:[render_logo]  from render_logo::@2
   [64] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#18) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:render_logo::@7_1
-render_logo::@7_1: scope:[render_logo]  from render_logo::@7
+render_logo::@7_1: scope:[render_logo]  from render_logo::@3
   [65] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) render_logo::screen_idx#18) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:render_logo::@7_2
 render_logo::@7_2: scope:[render_logo]  from render_logo::@7_1
@@ -3068,27 +3103,27 @@ render_logo::@7_4: scope:[render_logo]  from render_logo::@7_3
   to:render_logo::@7_5
 render_logo::@7_5: scope:[render_logo]  from render_logo::@7_4
   [69] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#18) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:render_logo::@8
-render_logo::@8: scope:[render_logo]  from render_logo::@7_5
-  [70] (byte) render_logo::screen_idx#3 ← ++ (byte) render_logo::screen_idx#18
   to:render_logo::@4
+render_logo::@4: scope:[render_logo]  from render_logo::@7_5
+  [70] (byte) render_logo::screen_idx#3 ← ++ (byte) render_logo::screen_idx#18
+  to:render_logo::@2
 render_logo::@1: scope:[render_logo]  from render_logo
   [71] (signed byte~) render_logo::$17 ← - (signed byte) render_logo::x_char#0
   [72] (byte~) render_logo::logo_idx#14 ← (byte)(signed byte~) render_logo::$17
-  to:render_logo::@21
-render_logo::@21: scope:[render_logo]  from render_logo::@1 render_logo::@25
-  [73] (byte) render_logo::screen_idx#21 ← phi( render_logo::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render_logo::@25/(byte) render_logo::screen_idx#5 )
-  [73] (byte) render_logo::logo_idx#11 ← phi( render_logo::@1/(byte~) render_logo::logo_idx#14 render_logo::@25/(byte) render_logo::logo_idx#4 )
-  [74] if((byte) render_logo::logo_idx#11!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@24
-  to:render_logo::@27
-render_logo::@27: scope:[render_logo]  from render_logo::@21 render_logo::@31
-  [75] (byte) render_logo::screen_idx#15 ← phi( render_logo::@21/(byte) render_logo::screen_idx#21 render_logo::@31/(byte) render_logo::screen_idx#6 )
-  [76] if((byte) render_logo::screen_idx#15!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@30
+  to:render_logo::@8
+render_logo::@8: scope:[render_logo]  from render_logo::@1 render_logo::@10
+  [73] (byte) render_logo::screen_idx#21 ← phi( render_logo::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render_logo::@10/(byte) render_logo::screen_idx#5 )
+  [73] (byte) render_logo::logo_idx#11 ← phi( render_logo::@1/(byte~) render_logo::logo_idx#14 render_logo::@10/(byte) render_logo::logo_idx#4 )
+  [74] if((byte) render_logo::logo_idx#11!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@9
+  to:render_logo::@11
+render_logo::@11: scope:[render_logo]  from render_logo::@13 render_logo::@8
+  [75] (byte) render_logo::screen_idx#15 ← phi( render_logo::@8/(byte) render_logo::screen_idx#21 render_logo::@13/(byte) render_logo::screen_idx#6 )
+  [76] if((byte) render_logo::screen_idx#15!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@12
   to:render_logo::@return
-render_logo::@30: scope:[render_logo]  from render_logo::@27
+render_logo::@12: scope:[render_logo]  from render_logo::@11
   [77] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#15) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:render_logo::@30_1
-render_logo::@30_1: scope:[render_logo]  from render_logo::@30
+render_logo::@30_1: scope:[render_logo]  from render_logo::@12
   [78] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) render_logo::screen_idx#15) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:render_logo::@30_2
 render_logo::@30_2: scope:[render_logo]  from render_logo::@30_1
@@ -3102,15 +3137,15 @@ render_logo::@30_4: scope:[render_logo]  from render_logo::@30_3
   to:render_logo::@30_5
 render_logo::@30_5: scope:[render_logo]  from render_logo::@30_4
   [82] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#15) ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:render_logo::@31
-render_logo::@31: scope:[render_logo]  from render_logo::@30_5
+  to:render_logo::@13
+render_logo::@13: scope:[render_logo]  from render_logo::@30_5
   [83] (byte) render_logo::screen_idx#6 ← ++ (byte) render_logo::screen_idx#15
-  to:render_logo::@27
-render_logo::@24: scope:[render_logo]  from render_logo::@21
+  to:render_logo::@11
+render_logo::@9: scope:[render_logo]  from render_logo::@8
   [84] (byte/signed word/word/dword/signed dword~) render_logo::$23 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 0
   [85] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$23
   to:render_logo::@24_1
-render_logo::@24_1: scope:[render_logo]  from render_logo::@24
+render_logo::@24_1: scope:[render_logo]  from render_logo::@9
   [86] (byte/signed word/word/dword/signed dword~) render_logo::$80 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1
   [87] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$80
   to:render_logo::@24_2
@@ -3129,33 +3164,33 @@ render_logo::@24_4: scope:[render_logo]  from render_logo::@24_3
 render_logo::@24_5: scope:[render_logo]  from render_logo::@24_4
   [94] (byte/signed word/word/dword/signed dword~) render_logo::$96 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5
   [95] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$96
-  to:render_logo::@25
-render_logo::@25: scope:[render_logo]  from render_logo::@24_5
+  to:render_logo::@10
+render_logo::@10: scope:[render_logo]  from render_logo::@24_5
   [96] (byte) render_logo::screen_idx#5 ← ++ (byte) render_logo::screen_idx#21
   [97] (byte) render_logo::logo_idx#4 ← ++ (byte) render_logo::logo_idx#11
-  to:render_logo::@21
+  to:render_logo::@8
 sin16s_gen2: scope:[sin16s_gen2]  from main::@2
   [98] phi()
   [99] call div32u16u 
   [100] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  to:sin16s_gen2::@3
-sin16s_gen2::@3: scope:[sin16s_gen2]  from sin16s_gen2
+  to:sin16s_gen2::@2
+sin16s_gen2::@2: scope:[sin16s_gen2]  from sin16s_gen2
   [101] (dword) sin16s_gen2::step#0 ← (dword) div32u16u::return#2
   to:sin16s_gen2::@1
-sin16s_gen2::@1: scope:[sin16s_gen2]  from sin16s_gen2::@3 sin16s_gen2::@5
-  [102] (word) sin16s_gen2::i#2 ← phi( sin16s_gen2::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@5/(word) sin16s_gen2::i#1 )
-  [102] (signed word*) sin16s_gen2::sintab#2 ← phi( sin16s_gen2::@3/(const signed word[XSIN_SIZE#0]) xsin#0 sin16s_gen2::@5/(signed word*) sin16s_gen2::sintab#0 )
-  [102] (dword) sin16s_gen2::x#2 ← phi( sin16s_gen2::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@5/(dword) sin16s_gen2::x#1 )
+sin16s_gen2::@1: scope:[sin16s_gen2]  from sin16s_gen2::@2 sin16s_gen2::@4
+  [102] (word) sin16s_gen2::i#2 ← phi( sin16s_gen2::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@4/(word) sin16s_gen2::i#1 )
+  [102] (signed word*) sin16s_gen2::sintab#2 ← phi( sin16s_gen2::@2/(const signed word[XSIN_SIZE#0]) xsin#0 sin16s_gen2::@4/(signed word*) sin16s_gen2::sintab#0 )
+  [102] (dword) sin16s_gen2::x#2 ← phi( sin16s_gen2::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@4/(dword) sin16s_gen2::x#1 )
   [103] (dword) sin16s::x#0 ← (dword) sin16s_gen2::x#2
   [104] call sin16s 
   [105] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  to:sin16s_gen2::@4
-sin16s_gen2::@4: scope:[sin16s_gen2]  from sin16s_gen2::@1
+  to:sin16s_gen2::@3
+sin16s_gen2::@3: scope:[sin16s_gen2]  from sin16s_gen2::@1
   [106] (signed word) mul16s::a#0 ← (signed word) sin16s::return#0
   [107] call mul16s 
   [108] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-  to:sin16s_gen2::@5
-sin16s_gen2::@5: scope:[sin16s_gen2]  from sin16s_gen2::@4
+  to:sin16s_gen2::@4
+sin16s_gen2::@4: scope:[sin16s_gen2]  from sin16s_gen2::@3
   [109] (signed dword~) sin16s_gen2::$5 ← (signed dword) mul16s::return#2
   [110] (word~) sin16s_gen2::$6 ← > (signed dword~) sin16s_gen2::$5
   [111] (signed word~) sin16s_gen2::$8 ← (const signed word) sin16s_gen2::offs#0 + (signed word)(word~) sin16s_gen2::$6
@@ -3165,25 +3200,25 @@ sin16s_gen2::@5: scope:[sin16s_gen2]  from sin16s_gen2::@4
   [115] (word) sin16s_gen2::i#1 ← ++ (word) sin16s_gen2::i#2
   [116] if((word) sin16s_gen2::i#1<(const word) XSIN_SIZE#0) goto sin16s_gen2::@1
   to:sin16s_gen2::@return
-sin16s_gen2::@return: scope:[sin16s_gen2]  from sin16s_gen2::@5
+sin16s_gen2::@return: scope:[sin16s_gen2]  from sin16s_gen2::@4
   [117] return 
   to:@return
-mul16s: scope:[mul16s]  from sin16s_gen2::@4
+mul16s: scope:[mul16s]  from sin16s_gen2::@3
   [118] (word~) mul16u::a#8 ← (word)(signed word) mul16s::a#0
   [119] call mul16u 
   [120] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mul16s::@6
-mul16s::@6: scope:[mul16s]  from mul16s
+  to:mul16s::@4
+mul16s::@4: scope:[mul16s]  from mul16s
   [121] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   [122] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1
   to:mul16s::@3
-mul16s::@3: scope:[mul16s]  from mul16s::@6
+mul16s::@3: scope:[mul16s]  from mul16s::@4
   [123] (word~) mul16s::$9 ← > (dword) mul16s::m#0
   [124] (word~) mul16s::$16 ← (word~) mul16s::$9 - ((word))(const signed word) sin16s_gen2::ampl#0
   [125] (dword) mul16s::m#1 ← (dword) mul16s::m#0 hi= (word~) mul16s::$16
   to:mul16s::@1
-mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@6
-  [126] (dword) mul16s::m#4 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@6/(dword) mul16s::m#0 )
+mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@4
+  [126] (dword) mul16s::m#4 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@4/(dword) mul16s::m#0 )
   to:mul16s::@2
 mul16s::@2: scope:[mul16s]  from mul16s::@1
   [127] (signed dword) mul16s::return#0 ← ((signed dword)) (dword) mul16s::m#4
@@ -3196,10 +3231,10 @@ mul16u: scope:[mul16u]  from mul16s mulu16_sel
   [129] (word) mul16u::b#2 ← phi( mul16s/((word))(const signed word) sin16s_gen2::ampl#0 mulu16_sel/(word) mul16u::b#1 )
   [130] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#2
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [131] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [131] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [131] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [131] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [131] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [131] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@4/(word) mul16u::a#0 )
   [132] if((word) mul16u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -3207,13 +3242,13 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [134] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [135] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [135] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [136] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [137] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [137] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [138] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [139] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
@@ -3239,91 +3274,91 @@ sin16s::@2: scope:[sin16s]  from sin16s::@1 sin16s::@5
   [149] (word) mulu16_sel::v2#0 ← (word) sin16s::x1#0
   [150] call mulu16_sel 
   [151] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  to:sin16s::@8
-sin16s::@8: scope:[sin16s]  from sin16s::@2
+  to:sin16s::@7
+sin16s::@7: scope:[sin16s]  from sin16s::@2
   [152] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   [153] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   [154] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0
   [155] call mulu16_sel 
   [156] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12
-  to:sin16s::@9
-sin16s::@9: scope:[sin16s]  from sin16s::@8
+  to:sin16s::@8
+sin16s::@8: scope:[sin16s]  from sin16s::@7
   [157] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   [158] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   [159] call mulu16_sel 
   [160] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  to:sin16s::@10
-sin16s::@10: scope:[sin16s]  from sin16s::@9
+  to:sin16s::@9
+sin16s::@9: scope:[sin16s]  from sin16s::@8
   [161] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   [162] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0
   [163] (word) mulu16_sel::v1#3 ← (word) sin16s::x3#0
   [164] (word) mulu16_sel::v2#3 ← (word) sin16s::x1#0
   [165] call mulu16_sel 
   [166] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12
-  to:sin16s::@11
-sin16s::@11: scope:[sin16s]  from sin16s::@10
+  to:sin16s::@10
+sin16s::@10: scope:[sin16s]  from sin16s::@9
   [167] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   [168] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   [169] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0
   [170] call mulu16_sel 
   [171] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  to:sin16s::@12
-sin16s::@12: scope:[sin16s]  from sin16s::@11
+  to:sin16s::@11
+sin16s::@11: scope:[sin16s]  from sin16s::@10
   [172] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   [173] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [174] (word) sin16s::usinx#1 ← (word) sin16s::usinx#0 + (word) sin16s::x5_128#0
-  [175] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15
+  [175] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12
   to:sin16s::@6
-sin16s::@6: scope:[sin16s]  from sin16s::@12
+sin16s::@6: scope:[sin16s]  from sin16s::@11
   [176] (signed word) sin16s::sinx#1 ← - (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-sin16s::@3: scope:[sin16s]  from sin16s::@15 sin16s::@6
-  [177] (signed word) sin16s::return#1 ← phi( sin16s::@15/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
+sin16s::@3: scope:[sin16s]  from sin16s::@12 sin16s::@6
+  [177] (signed word) sin16s::return#1 ← phi( sin16s::@12/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
   to:sin16s::@return
 sin16s::@return: scope:[sin16s]  from sin16s::@3
   [178] return 
   to:@return
-sin16s::@15: scope:[sin16s]  from sin16s::@12
+sin16s::@12: scope:[sin16s]  from sin16s::@11
   [179] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@11 sin16s::@2 sin16s::@8 sin16s::@9
-  [180] (byte) mulu16_sel::select#5 ← phi( sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [180] (word) mulu16_sel::v2#5 ← phi( sin16s::@10/(word) mulu16_sel::v2#3 sin16s::@11/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@8/(word) mulu16_sel::v2#1 sin16s::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
-  [180] (word) mulu16_sel::v1#5 ← phi( sin16s::@10/(word) mulu16_sel::v1#3 sin16s::@11/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@8/(word) mulu16_sel::v1#1 sin16s::@9/(word) mulu16_sel::v1#2 )
+mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@2 sin16s::@7 sin16s::@8 sin16s::@9
+  [180] (byte) mulu16_sel::select#5 ← phi( sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [180] (word) mulu16_sel::v2#5 ← phi( sin16s::@9/(word) mulu16_sel::v2#3 sin16s::@10/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@7/(word) mulu16_sel::v2#1 sin16s::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
+  [180] (word) mulu16_sel::v1#5 ← phi( sin16s::@9/(word) mulu16_sel::v1#3 sin16s::@10/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@7/(word) mulu16_sel::v1#1 sin16s::@8/(word) mulu16_sel::v1#2 )
   [181] (word) mul16u::a#2 ← (word) mulu16_sel::v1#5
   [182] (word) mul16u::b#1 ← (word) mulu16_sel::v2#5
   [183] call mul16u 
   [184] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-  to:mulu16_sel::@2
-mulu16_sel::@2: scope:[mulu16_sel]  from mulu16_sel
+  to:mulu16_sel::@1
+mulu16_sel::@1: scope:[mulu16_sel]  from mulu16_sel
   [185] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#3
   [186] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5
   [187] (word) mulu16_sel::return#12 ← > (dword~) mulu16_sel::$1
   to:mulu16_sel::@return
-mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@2
+mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@1
   [188] return 
   to:@return
 div32u16u: scope:[div32u16u]  from sin16s_gen2
   [189] phi()
   [190] call divr16u 
   [191] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div32u16u::@2
-div32u16u::@2: scope:[div32u16u]  from div32u16u
+  to:div32u16u::@1
+div32u16u::@1: scope:[div32u16u]  from div32u16u
   [192] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2
   [193] (word) divr16u::rem#4 ← (word) rem16u#1
   [194] call divr16u 
   [195] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:div32u16u::@3
-div32u16u::@3: scope:[div32u16u]  from div32u16u::@2
+  to:div32u16u::@2
+div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   [196] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   [197] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0
   to:div32u16u::@return
-div32u16u::@return: scope:[div32u16u]  from div32u16u::@3
+div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
   [198] return 
   to:@return
-divr16u: scope:[divr16u]  from div32u16u div32u16u::@2
-  [199] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@2/<(const dword) PI2_u4f28#0 )
-  [199] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@2/(word) divr16u::rem#4 )
+divr16u: scope:[divr16u]  from div32u16u div32u16u::@1
+  [199] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@1/<(const dword) PI2_u4f28#0 )
+  [199] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@1/(word) divr16u::rem#4 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [200] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
@@ -3999,19 +4034,19 @@ INITIAL ASM
   .label xsin_idx = 3
 //SEG3 @begin
 bbegin:
-  jmp b25
-//SEG4 @25
-b25:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) LOGO#0) {{ .var logoPic = LoadPicture("logo.png", List().add($444444, $808080, $000000, $ffffff))     .for (var y=0; y<6	; y++)         .for (var x=0;x<40; x++)             .for(var cp=0; cp<8; cp++)                 .byte logoPic.getMulticolorByte(x,cp+y*8)  }}
-//SEG6 [2] phi from @25 to @28 [phi:@25->@28]
-b28_from_b25:
-  jmp b28
-//SEG7 @28
-b28:
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG7 @2
+b2:
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @28 to @end [phi:@28->@end]
-bend_from_b28:
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG10 @end
 bend:
@@ -4107,14 +4142,14 @@ main: {
   //SEG43 [98] phi from main::@2 to sin16s_gen2 [phi:main::@2->sin16s_gen2]
   sin16s_gen2_from_b2:
     jsr sin16s_gen2
-  //SEG44 [22] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
-  b6_from_b2:
-    jmp b6
-  //SEG45 main::@6
-  b6:
+  //SEG44 [22] phi from main::@2 to main::@5 [phi:main::@2->main::@5]
+  b5_from_b2:
+    jmp b5
+  //SEG45 main::@5
+  b5:
   //SEG46 [23] call loop 
-  //SEG47 [25] phi from main::@6 to loop [phi:main::@6->loop]
-  loop_from_b6:
+  //SEG47 [25] phi from main::@5 to loop [phi:main::@5->loop]
+  loop_from_b5:
     jsr loop
     jmp breturn
   //SEG48 main::@return
@@ -4136,17 +4171,17 @@ loop: {
     jmp b1
   //SEG53 loop::@1
   b1:
-    jmp b6
+    jmp b2
   // Wait for the raster to reach the bottom of the screen
-  //SEG54 loop::@6
-  b6:
-  //SEG55 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG54 loop::@2
+  b2:
+  //SEG55 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b8
-  //SEG56 loop::@8
-  b8:
+    bne b2
+    jmp b3
+  //SEG56 loop::@3
+  b3:
   //SEG57 [28] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG58 [29] (signed word*~) loop::$1 ← (const signed word[XSIN_SIZE#0]) xsin#0 + (word) xsin_idx#11 -- pwsz1=pwsc1_plus_vwuz2 
@@ -4171,9 +4206,9 @@ loop: {
     sta render_logo.xpos+1
   //SEG61 [32] call render_logo 
     jsr render_logo
-    jmp b15
-  //SEG62 loop::@15
-  b15:
+    jmp b5
+  //SEG62 loop::@5
+  b5:
   //SEG63 [33] (word) xsin_idx#3 ← (word) xsin_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vwuz1=vwuz1_plus_2 
     lda xsin_idx
     clc
@@ -4182,38 +4217,38 @@ loop: {
     bcc !+
     inc xsin_idx+1
   !:
-  //SEG64 [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@16 -- vwuz1_neq_vwuc1_then_la1 
+  //SEG64 [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@6 -- vwuz1_neq_vwuc1_then_la1 
     lda xsin_idx+1
     cmp #>XSIN_SIZE*2
-    bne b16_from_b15
+    bne b6_from_b5
     lda xsin_idx
     cmp #<XSIN_SIZE*2
-    bne b16_from_b15
-  //SEG65 [35] phi from loop::@15 to loop::@9 [phi:loop::@15->loop::@9]
-  b9_from_b15:
-  //SEG66 [35] phi (word) xsin_idx#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@15->loop::@9#0] -- vwuz1=vbuc1 
+    bne b6_from_b5
+  //SEG65 [35] phi from loop::@5 to loop::@4 [phi:loop::@5->loop::@4]
+  b4_from_b5:
+  //SEG66 [35] phi (word) xsin_idx#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@5->loop::@4#0] -- vwuz1=vbuc1 
     lda #0
     sta xsin_idx
     lda #0
     sta xsin_idx+1
-    jmp b9
-  //SEG67 loop::@9
-  b9:
+    jmp b4
+  //SEG67 loop::@4
+  b4:
   //SEG68 [36] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BORDERCOL
-  //SEG69 [26] phi from loop::@9 to loop::@1 [phi:loop::@9->loop::@1]
-  b1_from_b9:
-  //SEG70 [26] phi (word) xsin_idx#11 = (word) xsin_idx#19 [phi:loop::@9->loop::@1#0] -- register_copy 
+  //SEG69 [26] phi from loop::@4 to loop::@1 [phi:loop::@4->loop::@1]
+  b1_from_b4:
+  //SEG70 [26] phi (word) xsin_idx#11 = (word) xsin_idx#19 [phi:loop::@4->loop::@1#0] -- register_copy 
     jmp b1
-  //SEG71 [37] phi from loop::@15 to loop::@16 [phi:loop::@15->loop::@16]
-  b16_from_b15:
-    jmp b16
-  //SEG72 loop::@16
-  b16:
-  //SEG73 [35] phi from loop::@16 to loop::@9 [phi:loop::@16->loop::@9]
-  b9_from_b16:
-  //SEG74 [35] phi (word) xsin_idx#19 = (word) xsin_idx#3 [phi:loop::@16->loop::@9#0] -- register_copy 
-    jmp b9
+  //SEG71 [37] phi from loop::@5 to loop::@6 [phi:loop::@5->loop::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG72 loop::@6
+  b6:
+  //SEG73 [35] phi from loop::@6 to loop::@4 [phi:loop::@6->loop::@4]
+  b4_from_b6:
+  //SEG74 [35] phi (word) xsin_idx#19 = (word) xsin_idx#3 [phi:loop::@6->loop::@4#0] -- register_copy 
+    jmp b4
 }
 //SEG75 render_logo
 // render_logo(signed word zeropage($3b) xpos)
@@ -4282,38 +4317,38 @@ render_logo: {
   //SEG82 [44] if((signed word) render_logo::xpos#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_logo::@1 -- vwsz1_lt_0_then_la1 
     lda xpos+1
     bmi b1
-  //SEG83 [45] phi from render_logo to render_logo::@4 [phi:render_logo->render_logo::@4]
-  b4_from_render_logo:
-  //SEG84 [45] phi (byte) render_logo::screen_idx#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo->render_logo::@4#0] -- vbuz1=vbuc1 
+  //SEG83 [45] phi from render_logo to render_logo::@2 [phi:render_logo->render_logo::@2]
+  b2_from_render_logo:
+  //SEG84 [45] phi (byte) render_logo::screen_idx#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo->render_logo::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta screen_idx
-    jmp b4
-  //SEG85 render_logo::@4
-  b4:
-  //SEG86 [46] if((byte) render_logo::screen_idx#18!=(byte)(signed byte) render_logo::x_char#0) goto render_logo::@7 -- vbuz1_neq_vbuz2_then_la1 
+    jmp b2
+  //SEG85 render_logo::@2
+  b2:
+  //SEG86 [46] if((byte) render_logo::screen_idx#18!=(byte)(signed byte) render_logo::x_char#0) goto render_logo::@3 -- vbuz1_neq_vbuz2_then_la1 
     lda screen_idx
     cmp x_char
-    bne b7
-  //SEG87 [47] phi from render_logo::@4 to render_logo::@10 [phi:render_logo::@4->render_logo::@10]
-  b10_from_b4:
-  //SEG88 [47] phi (byte) render_logo::logo_idx#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@4->render_logo::@10#0] -- vbuz1=vbuc1 
+    bne b3
+  //SEG87 [47] phi from render_logo::@2 to render_logo::@5 [phi:render_logo::@2->render_logo::@5]
+  b5_from_b2:
+  //SEG88 [47] phi (byte) render_logo::logo_idx#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@2->render_logo::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta logo_idx
-  //SEG89 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#18 [phi:render_logo::@4->render_logo::@10#1] -- register_copy 
-    jmp b10
-  //SEG90 render_logo::@10
-  b10:
-  //SEG91 [48] if((byte) render_logo::screen_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@13 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG89 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#18 [phi:render_logo::@2->render_logo::@5#1] -- register_copy 
+    jmp b5
+  //SEG90 render_logo::@5
+  b5:
+  //SEG91 [48] if((byte) render_logo::screen_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp screen_idx
-    bne b13
+    bne b6
     jmp breturn
   //SEG92 render_logo::@return
   breturn:
   //SEG93 [49] return 
     rts
-  //SEG94 render_logo::@13
-  b13:
+  //SEG94 render_logo::@6
+  b6:
   //SEG95 [50] (byte/signed word/word/dword/signed dword~) render_logo::$15 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuz2_plus_0 
     lda logo_idx
     sta _15
@@ -4376,20 +4411,20 @@ render_logo: {
     lda _50
     ldy screen_idx
     sta SCREEN+$28*5,y
-    jmp b14
-  //SEG112 render_logo::@14
-  b14:
+    jmp b7
+  //SEG112 render_logo::@7
+  b7:
   //SEG113 [62] (byte) render_logo::screen_idx#4 ← ++ (byte) render_logo::screen_idx#10 -- vbuz1=_inc_vbuz1 
     inc screen_idx
   //SEG114 [63] (byte) render_logo::logo_idx#3 ← ++ (byte) render_logo::logo_idx#10 -- vbuz1=_inc_vbuz1 
     inc logo_idx
-  //SEG115 [47] phi from render_logo::@14 to render_logo::@10 [phi:render_logo::@14->render_logo::@10]
-  b10_from_b14:
-  //SEG116 [47] phi (byte) render_logo::logo_idx#10 = (byte) render_logo::logo_idx#3 [phi:render_logo::@14->render_logo::@10#0] -- register_copy 
-  //SEG117 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#4 [phi:render_logo::@14->render_logo::@10#1] -- register_copy 
-    jmp b10
-  //SEG118 render_logo::@7
-  b7:
+  //SEG115 [47] phi from render_logo::@7 to render_logo::@5 [phi:render_logo::@7->render_logo::@5]
+  b5_from_b7:
+  //SEG116 [47] phi (byte) render_logo::logo_idx#10 = (byte) render_logo::logo_idx#3 [phi:render_logo::@7->render_logo::@5#0] -- register_copy 
+  //SEG117 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#4 [phi:render_logo::@7->render_logo::@5#1] -- register_copy 
+    jmp b5
+  //SEG118 render_logo::@3
+  b3:
   //SEG119 [64] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#18) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuz1=vbuc2 
     lda #0
     ldy screen_idx
@@ -4429,15 +4464,15 @@ render_logo: {
     lda #0
     ldy screen_idx
     sta SCREEN+$28*5,y
-    jmp b8
-  //SEG130 render_logo::@8
-  b8:
+    jmp b4
+  //SEG130 render_logo::@4
+  b4:
   //SEG131 [70] (byte) render_logo::screen_idx#3 ← ++ (byte) render_logo::screen_idx#18 -- vbuz1=_inc_vbuz1 
     inc screen_idx
-  //SEG132 [45] phi from render_logo::@8 to render_logo::@4 [phi:render_logo::@8->render_logo::@4]
-  b4_from_b8:
-  //SEG133 [45] phi (byte) render_logo::screen_idx#18 = (byte) render_logo::screen_idx#3 [phi:render_logo::@8->render_logo::@4#0] -- register_copy 
-    jmp b4
+  //SEG132 [45] phi from render_logo::@4 to render_logo::@2 [phi:render_logo::@4->render_logo::@2]
+  b2_from_b4:
+  //SEG133 [45] phi (byte) render_logo::screen_idx#18 = (byte) render_logo::screen_idx#3 [phi:render_logo::@4->render_logo::@2#0] -- register_copy 
+    jmp b2
   //SEG134 render_logo::@1
   b1:
   //SEG135 [71] (signed byte~) render_logo::$17 ← - (signed byte) render_logo::x_char#0 -- vbsz1=_neg_vbsz2 
@@ -4449,33 +4484,33 @@ render_logo: {
   //SEG136 [72] (byte~) render_logo::logo_idx#14 ← (byte)(signed byte~) render_logo::$17 -- vbuz1=vbuz2 
     lda _17
     sta logo_idx_14
-  //SEG137 [73] phi from render_logo::@1 to render_logo::@21 [phi:render_logo::@1->render_logo::@21]
-  b21_from_b1:
-  //SEG138 [73] phi (byte) render_logo::screen_idx#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@1->render_logo::@21#0] -- vbuz1=vbuc1 
+  //SEG137 [73] phi from render_logo::@1 to render_logo::@8 [phi:render_logo::@1->render_logo::@8]
+  b8_from_b1:
+  //SEG138 [73] phi (byte) render_logo::screen_idx#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@1->render_logo::@8#0] -- vbuz1=vbuc1 
     lda #0
     sta screen_idx_21
-  //SEG139 [73] phi (byte) render_logo::logo_idx#11 = (byte~) render_logo::logo_idx#14 [phi:render_logo::@1->render_logo::@21#1] -- register_copy 
-    jmp b21
-  //SEG140 render_logo::@21
-  b21:
-  //SEG141 [74] if((byte) render_logo::logo_idx#11!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@24 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG139 [73] phi (byte) render_logo::logo_idx#11 = (byte~) render_logo::logo_idx#14 [phi:render_logo::@1->render_logo::@8#1] -- register_copy 
+    jmp b8
+  //SEG140 render_logo::@8
+  b8:
+  //SEG141 [74] if((byte) render_logo::logo_idx#11!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp logo_idx_11
-    bne b24
-  //SEG142 [75] phi from render_logo::@21 render_logo::@31 to render_logo::@27 [phi:render_logo::@21/render_logo::@31->render_logo::@27]
-  b27_from_b21:
-  b27_from_b31:
-  //SEG143 [75] phi (byte) render_logo::screen_idx#15 = (byte) render_logo::screen_idx#21 [phi:render_logo::@21/render_logo::@31->render_logo::@27#0] -- register_copy 
-    jmp b27
-  //SEG144 render_logo::@27
-  b27:
-  //SEG145 [76] if((byte) render_logo::screen_idx#15!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@30 -- vbuz1_neq_vbuc1_then_la1 
+    bne b9
+  //SEG142 [75] phi from render_logo::@13 render_logo::@8 to render_logo::@11 [phi:render_logo::@13/render_logo::@8->render_logo::@11]
+  b11_from_b13:
+  b11_from_b8:
+  //SEG143 [75] phi (byte) render_logo::screen_idx#15 = (byte) render_logo::screen_idx#6 [phi:render_logo::@13/render_logo::@8->render_logo::@11#0] -- register_copy 
+    jmp b11
+  //SEG144 render_logo::@11
+  b11:
+  //SEG145 [76] if((byte) render_logo::screen_idx#15!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@12 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp screen_idx_15
-    bne b30
+    bne b12
     jmp breturn
-  //SEG146 render_logo::@30
-  b30:
+  //SEG146 render_logo::@12
+  b12:
   //SEG147 [77] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#15) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuz1=vbuc2 
     lda #0
     ldy screen_idx_15
@@ -4515,14 +4550,14 @@ render_logo: {
     lda #0
     ldy screen_idx_15
     sta SCREEN+$28*5,y
-    jmp b31
-  //SEG158 render_logo::@31
-  b31:
+    jmp b13
+  //SEG158 render_logo::@13
+  b13:
   //SEG159 [83] (byte) render_logo::screen_idx#6 ← ++ (byte) render_logo::screen_idx#15 -- vbuz1=_inc_vbuz1 
     inc screen_idx_6
-    jmp b27_from_b31
-  //SEG160 render_logo::@24
-  b24:
+    jmp b11_from_b13
+  //SEG160 render_logo::@9
+  b9:
   //SEG161 [84] (byte/signed word/word/dword/signed dword~) render_logo::$23 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuz2_plus_0 
     lda logo_idx_11
     sta _23
@@ -4585,18 +4620,18 @@ render_logo: {
     lda _96
     ldy screen_idx_21
     sta SCREEN+$28*5,y
-    jmp b25
-  //SEG178 render_logo::@25
-  b25:
+    jmp b10
+  //SEG178 render_logo::@10
+  b10:
   //SEG179 [96] (byte) render_logo::screen_idx#5 ← ++ (byte) render_logo::screen_idx#21 -- vbuz1=_inc_vbuz1 
     inc screen_idx_5
   //SEG180 [97] (byte) render_logo::logo_idx#4 ← ++ (byte) render_logo::logo_idx#11 -- vbuz1=_inc_vbuz1 
     inc logo_idx_4
-  //SEG181 [73] phi from render_logo::@25 to render_logo::@21 [phi:render_logo::@25->render_logo::@21]
-  b21_from_b25:
-  //SEG182 [73] phi (byte) render_logo::screen_idx#21 = (byte) render_logo::screen_idx#5 [phi:render_logo::@25->render_logo::@21#0] -- register_copy 
-  //SEG183 [73] phi (byte) render_logo::logo_idx#11 = (byte) render_logo::logo_idx#4 [phi:render_logo::@25->render_logo::@21#1] -- register_copy 
-    jmp b21
+  //SEG181 [73] phi from render_logo::@10 to render_logo::@8 [phi:render_logo::@10->render_logo::@8]
+  b8_from_b10:
+  //SEG182 [73] phi (byte) render_logo::screen_idx#21 = (byte) render_logo::screen_idx#5 [phi:render_logo::@10->render_logo::@8#0] -- register_copy 
+  //SEG183 [73] phi (byte) render_logo::logo_idx#11 = (byte) render_logo::logo_idx#4 [phi:render_logo::@10->render_logo::@8#1] -- register_copy 
+    jmp b8
 }
 //SEG184 sin16s_gen2
 // Generate signed word sinus table - with values in the range min-max.
@@ -4628,9 +4663,9 @@ sin16s_gen2: {
     sta div32u16u.return_2+2
     lda div32u16u.return+3
     sta div32u16u.return_2+3
-    jmp b3
-  //SEG188 sin16s_gen2::@3
-  b3:
+    jmp b2
+  //SEG188 sin16s_gen2::@2
+  b2:
   //SEG189 [101] (dword) sin16s_gen2::step#0 ← (dword) div32u16u::return#2 -- vduz1=vduz2 
     lda div32u16u.return_2
     sta step
@@ -4640,19 +4675,19 @@ sin16s_gen2: {
     sta step+2
     lda div32u16u.return_2+3
     sta step+3
-  //SEG190 [102] phi from sin16s_gen2::@3 to sin16s_gen2::@1 [phi:sin16s_gen2::@3->sin16s_gen2::@1]
-  b1_from_b3:
-  //SEG191 [102] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
+  //SEG190 [102] phi from sin16s_gen2::@2 to sin16s_gen2::@1 [phi:sin16s_gen2::@2->sin16s_gen2::@1]
+  b1_from_b2:
+  //SEG191 [102] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG192 [102] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[XSIN_SIZE#0]) xsin#0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
+  //SEG192 [102] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[XSIN_SIZE#0]) xsin#0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
     lda #<xsin
     sta sintab
     lda #>xsin
     sta sintab+1
-  //SEG193 [102] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#2] -- vduz1=vbuc1 
+  //SEG193 [102] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -4661,11 +4696,11 @@ sin16s_gen2: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG194 [102] phi from sin16s_gen2::@5 to sin16s_gen2::@1 [phi:sin16s_gen2::@5->sin16s_gen2::@1]
-  b1_from_b5:
-  //SEG195 [102] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#0] -- register_copy 
-  //SEG196 [102] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@5->sin16s_gen2::@1#1] -- register_copy 
-  //SEG197 [102] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#2] -- register_copy 
+  //SEG194 [102] phi from sin16s_gen2::@4 to sin16s_gen2::@1 [phi:sin16s_gen2::@4->sin16s_gen2::@1]
+  b1_from_b4:
+  //SEG195 [102] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#0] -- register_copy 
+  //SEG196 [102] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@4->sin16s_gen2::@1#1] -- register_copy 
+  //SEG197 [102] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#2] -- register_copy 
     jmp b1
   //SEG198 sin16s_gen2::@1
   b1:
@@ -4685,9 +4720,9 @@ sin16s_gen2: {
     sta sin16s.return
     lda sin16s.return_1+1
     sta sin16s.return+1
-    jmp b4
-  //SEG202 sin16s_gen2::@4
-  b4:
+    jmp b3
+  //SEG202 sin16s_gen2::@3
+  b3:
   //SEG203 [106] (signed word) mul16s::a#0 ← (signed word) sin16s::return#0 -- vwsz1=vwsz2 
     lda sin16s.return
     sta mul16s.a
@@ -4704,9 +4739,9 @@ sin16s_gen2: {
     sta mul16s.return_2+2
     lda mul16s.return+3
     sta mul16s.return_2+3
-    jmp b5
-  //SEG206 sin16s_gen2::@5
-  b5:
+    jmp b4
+  //SEG206 sin16s_gen2::@4
+  b4:
   //SEG207 [109] (signed dword~) sin16s_gen2::$5 ← (signed dword) mul16s::return#2 -- vdsz1=vdsz2 
     lda mul16s.return_2
     sta _5
@@ -4766,11 +4801,11 @@ sin16s_gen2: {
   //SEG214 [116] if((word) sin16s_gen2::i#1<(const word) XSIN_SIZE#0) goto sin16s_gen2::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>XSIN_SIZE
-    bcc b1_from_b5
+    bcc b1_from_b4
     bne !+
     lda i
     cmp #<XSIN_SIZE
-    bcc b1_from_b5
+    bcc b1_from_b4
   !:
     jmp breturn
   //SEG215 sin16s_gen2::@return
@@ -4813,9 +4848,9 @@ mul16s: {
     sta mul16u.return+2
     lda mul16u.res+3
     sta mul16u.return+3
-    jmp b6
-  //SEG224 mul16s::@6
-  b6:
+    jmp b4
+  //SEG224 mul16s::@4
+  b4:
   //SEG225 [121] (dword) mul16s::m#0 ← (dword) mul16u::return#2 -- vduz1=vduz2 
     lda mul16u.return
     sta m
@@ -4827,7 +4862,7 @@ mul16s: {
     sta m+3
   //SEG226 [122] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
-    bpl b1_from_b6
+    bpl b1_from_b4
     jmp b3
   //SEG227 mul16s::@3
   b3:
@@ -4849,10 +4884,10 @@ mul16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG231 [126] phi from mul16s::@3 mul16s::@6 to mul16s::@1 [phi:mul16s::@3/mul16s::@6->mul16s::@1]
+  //SEG231 [126] phi from mul16s::@3 mul16s::@4 to mul16s::@1 [phi:mul16s::@3/mul16s::@4->mul16s::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG232 [126] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@6->mul16s::@1#0] -- register_copy 
+  b1_from_b4:
+  //SEG232 [126] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@4->mul16s::@1#0] -- register_copy 
     jmp b1
   //SEG233 mul16s::@1
   b1:
@@ -4923,13 +4958,13 @@ mul16u: {
     lda a
     and #1
     sta _1
-  //SEG250 [135] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG250 [135] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG251 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG251 mul16u::@3
+  b3:
   //SEG252 [136] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -4944,13 +4979,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG253 [137] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG254 [137] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG255 mul16u::@8
-  b8:
+  //SEG253 [137] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG254 [137] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG255 mul16u::@4
+  b4:
   //SEG256 [138] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -4960,11 +4995,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG258 [131] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG259 [131] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG260 [131] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG261 [131] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG258 [131] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG259 [131] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG260 [131] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG261 [131] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG262 sin16s
@@ -5126,9 +5161,9 @@ sin16s: {
     sta mulu16_sel.return
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return+1
-    jmp b8
-  //SEG289 sin16s::@8
-  b8:
+    jmp b7
+  //SEG289 sin16s::@7
+  b7:
   //SEG290 [152] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -5145,22 +5180,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG293 [155] call mulu16_sel 
-  //SEG294 [180] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG295 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG294 [180] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG295 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG296 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG297 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG296 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG297 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG298 [156] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_1
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_1+1
-    jmp b9
-  //SEG299 sin16s::@9
-  b9:
+    jmp b8
+  //SEG299 sin16s::@8
+  b8:
   //SEG300 [157] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1 -- vwuz1=vwuz2 
     lda mulu16_sel.return_1
     sta x3
@@ -5172,26 +5207,26 @@ sin16s: {
     lda x3+1
     sta mulu16_sel.v1+1
   //SEG302 [159] call mulu16_sel 
-  //SEG303 [180] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG304 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG303 [180] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG304 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG305 [180] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG305 [180] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG306 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG306 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG307 [160] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_2
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_2+1
-    jmp b10
-  //SEG308 sin16s::@10
-  b10:
+    jmp b9
+  //SEG308 sin16s::@9
+  b9:
   //SEG309 [161] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2 -- vwuz1=vwuz2 
     lda mulu16_sel.return_2
     sta x3_6
@@ -5216,22 +5251,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG313 [165] call mulu16_sel 
-  //SEG314 [180] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG315 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG314 [180] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG315 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG316 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG317 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG316 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG317 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG318 [166] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_10
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_10+1
-    jmp b11
-  //SEG319 sin16s::@11
-  b11:
+    jmp b10
+  //SEG319 sin16s::@10
+  b10:
   //SEG320 [167] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10 -- vwuz1=vwuz2 
     lda mulu16_sel.return_10
     sta x4
@@ -5248,22 +5283,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG323 [170] call mulu16_sel 
-  //SEG324 [180] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG325 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG324 [180] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG325 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG326 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG327 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG326 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG327 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG328 [171] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_11
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_11+1
-    jmp b12
-  //SEG329 sin16s::@12
-  b12:
+    jmp b11
+  //SEG329 sin16s::@11
+  b11:
   //SEG330 [172] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11 -- vwuz1=vwuz2 
     lda mulu16_sel.return_11
     sta x5
@@ -5288,10 +5323,10 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx_1+1
-  //SEG333 [175] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG333 [175] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG334 sin16s::@6
   b6:
@@ -5305,10 +5340,10 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG336 [177] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  b3_from_b15:
+  //SEG336 [177] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG337 [177] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG337 [177] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
     jmp b3
   //SEG338 sin16s::@3
   b3:
@@ -5317,14 +5352,14 @@ sin16s: {
   breturn:
   //SEG340 [178] return 
     rts
-  //SEG341 sin16s::@15
-  b15:
+  //SEG341 sin16s::@12
+  b12:
   //SEG342 [179] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1 -- vwsz1=vwsz2 
     lda usinx_1
     sta return_5
     lda usinx_1+1
     sta return_5+1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
 //SEG343 mulu16_sel
 // Calculate val*val for two unsigned word values - the result is 16 selected bits of the 32-bit result.
@@ -5367,9 +5402,9 @@ mulu16_sel: {
     sta mul16u.return_3+2
     lda mul16u.res+3
     sta mul16u.return_3+3
-    jmp b2
-  //SEG351 mulu16_sel::@2
-  b2:
+    jmp b1
+  //SEG351 mulu16_sel::@1
+  b1:
   //SEG352 [185] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#3 -- vduz1=vduz2 
     lda mul16u.return_3
     sta _0
@@ -5436,9 +5471,9 @@ div32u16u: {
     sta divr16u.return_2
     lda divr16u.return+1
     sta divr16u.return_2+1
-    jmp b2
-  //SEG363 div32u16u::@2
-  b2:
+    jmp b1
+  //SEG363 div32u16u::@1
+  b1:
   //SEG364 [192] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return_2
     sta quotient_hi
@@ -5450,23 +5485,23 @@ div32u16u: {
     lda rem16u+1
     sta divr16u.rem+1
   //SEG366 [194] call divr16u 
-  //SEG367 [199] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  divr16u_from_b2:
-  //SEG368 [199] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG367 [199] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  divr16u_from_b1:
+  //SEG368 [199] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG369 [199] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG369 [199] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG370 [195] (word) divr16u::return#3 ← (word) divr16u::return#0 -- vwuz1=vwuz2 
     lda divr16u.return
     sta divr16u.return_3
     lda divr16u.return+1
     sta divr16u.return_3+1
-    jmp b3
-  //SEG371 div32u16u::@3
-  b3:
+    jmp b2
+  //SEG371 div32u16u::@2
+  b2:
   //SEG372 [196] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3 -- vwuz1=vwuz2 
     lda divr16u.return_3
     sta quotient_lo
@@ -5673,12 +5708,12 @@ Statement [8] *((const byte*) BGCOL#0) ← *((const byte*) BGCOL2#0) [ ] ( main:
 Statement [9] *((const byte*) BGCOL3#0) ← (const byte) BLACK#0 [ ] ( main:3 [ ] ) always clobbers reg byte a 
 Statement [11] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 [ ] ( main:3 [ ] ) always clobbers reg byte a 
 Statement [12] *((const byte*) D016#0) ← (const byte) VIC_MCM#0 [ ] ( main:3 [ ] ) always clobbers reg byte a 
-Statement [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 [ xsin_idx#11 ] ( main:3::loop:23 [ xsin_idx#11 ] ) always clobbers reg byte a 
+Statement [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 [ xsin_idx#11 ] ( main:3::loop:23 [ xsin_idx#11 ] ) always clobbers reg byte a 
 Statement [29] (signed word*~) loop::$1 ← (const signed word[XSIN_SIZE#0]) xsin#0 + (word) xsin_idx#11 [ xsin_idx#11 loop::$1 ] ( main:3::loop:23 [ xsin_idx#11 loop::$1 ] ) always clobbers reg byte a 
 Statement [30] (signed word) loop::xpos#0 ← *((signed word*~) loop::$1) [ xsin_idx#11 loop::xpos#0 ] ( main:3::loop:23 [ xsin_idx#11 loop::xpos#0 ] ) always clobbers reg byte a reg byte y 
 Statement [31] (signed word) render_logo::xpos#0 ← (signed word) loop::xpos#0 [ xsin_idx#11 render_logo::xpos#0 ] ( main:3::loop:23 [ xsin_idx#11 render_logo::xpos#0 ] ) always clobbers reg byte a 
 Statement [33] (word) xsin_idx#3 ← (word) xsin_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 2 [ xsin_idx#3 ] ( main:3::loop:23 [ xsin_idx#3 ] ) always clobbers reg byte a 
-Statement [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@16 [ xsin_idx#3 ] ( main:3::loop:23 [ xsin_idx#3 ] ) always clobbers reg byte a 
+Statement [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@6 [ xsin_idx#3 ] ( main:3::loop:23 [ xsin_idx#3 ] ) always clobbers reg byte a 
 Statement [38] (byte~) render_logo::$0 ← ((byte)) (signed word) render_logo::xpos#0 [ render_logo::xpos#0 render_logo::$0 ] ( main:3::loop:23::render_logo:32 [ xsin_idx#11 render_logo::xpos#0 render_logo::$0 ] ) always clobbers reg byte a 
 Statement [40] (byte~) render_logo::$2 ← (const byte) VIC_MCM#0 | (byte~) render_logo::$1 [ render_logo::xpos#0 render_logo::$2 ] ( main:3::loop:23::render_logo:32 [ xsin_idx#11 render_logo::xpos#0 render_logo::$2 ] ) always clobbers reg byte a 
 Statement [42] (signed word~) render_logo::$3 ← (signed word) render_logo::xpos#0 >> (byte/signed byte/word/signed word/dword/signed dword) 3 [ render_logo::xpos#0 render_logo::$3 ] ( main:3::loop:23::render_logo:32 [ xsin_idx#11 render_logo::xpos#0 render_logo::$3 ] ) always clobbers reg byte a 
@@ -5787,12 +5822,12 @@ Statement [8] *((const byte*) BGCOL#0) ← *((const byte*) BGCOL2#0) [ ] ( main:
 Statement [9] *((const byte*) BGCOL3#0) ← (const byte) BLACK#0 [ ] ( main:3 [ ] ) always clobbers reg byte a 
 Statement [11] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 [ ] ( main:3 [ ] ) always clobbers reg byte a 
 Statement [12] *((const byte*) D016#0) ← (const byte) VIC_MCM#0 [ ] ( main:3 [ ] ) always clobbers reg byte a 
-Statement [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 [ xsin_idx#11 ] ( main:3::loop:23 [ xsin_idx#11 ] ) always clobbers reg byte a 
+Statement [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 [ xsin_idx#11 ] ( main:3::loop:23 [ xsin_idx#11 ] ) always clobbers reg byte a 
 Statement [29] (signed word*~) loop::$1 ← (const signed word[XSIN_SIZE#0]) xsin#0 + (word) xsin_idx#11 [ xsin_idx#11 loop::$1 ] ( main:3::loop:23 [ xsin_idx#11 loop::$1 ] ) always clobbers reg byte a 
 Statement [30] (signed word) loop::xpos#0 ← *((signed word*~) loop::$1) [ xsin_idx#11 loop::xpos#0 ] ( main:3::loop:23 [ xsin_idx#11 loop::xpos#0 ] ) always clobbers reg byte a reg byte y 
 Statement [31] (signed word) render_logo::xpos#0 ← (signed word) loop::xpos#0 [ xsin_idx#11 render_logo::xpos#0 ] ( main:3::loop:23 [ xsin_idx#11 render_logo::xpos#0 ] ) always clobbers reg byte a 
 Statement [33] (word) xsin_idx#3 ← (word) xsin_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 2 [ xsin_idx#3 ] ( main:3::loop:23 [ xsin_idx#3 ] ) always clobbers reg byte a 
-Statement [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@16 [ xsin_idx#3 ] ( main:3::loop:23 [ xsin_idx#3 ] ) always clobbers reg byte a 
+Statement [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@6 [ xsin_idx#3 ] ( main:3::loop:23 [ xsin_idx#3 ] ) always clobbers reg byte a 
 Statement [38] (byte~) render_logo::$0 ← ((byte)) (signed word) render_logo::xpos#0 [ render_logo::xpos#0 render_logo::$0 ] ( main:3::loop:23::render_logo:32 [ xsin_idx#11 render_logo::xpos#0 render_logo::$0 ] ) always clobbers reg byte a 
 Statement [40] (byte~) render_logo::$2 ← (const byte) VIC_MCM#0 | (byte~) render_logo::$1 [ render_logo::xpos#0 render_logo::$2 ] ( main:3::loop:23::render_logo:32 [ xsin_idx#11 render_logo::xpos#0 render_logo::$2 ] ) always clobbers reg byte a 
 Statement [42] (signed word~) render_logo::$3 ← (signed word) render_logo::xpos#0 >> (byte/signed byte/word/signed word/dword/signed dword) 3 [ render_logo::xpos#0 render_logo::$3 ] ( main:3::loop:23::render_logo:32 [ xsin_idx#11 render_logo::xpos#0 render_logo::$3 ] ) always clobbers reg byte a 
@@ -6142,19 +6177,19 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label xsin_idx = 2
 //SEG3 @begin
 bbegin:
-  jmp b25
-//SEG4 @25
-b25:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) LOGO#0) {{ .var logoPic = LoadPicture("logo.png", List().add($444444, $808080, $000000, $ffffff))     .for (var y=0; y<6	; y++)         .for (var x=0;x<40; x++)             .for(var cp=0; cp<8; cp++)                 .byte logoPic.getMulticolorByte(x,cp+y*8)  }}
-//SEG6 [2] phi from @25 to @28 [phi:@25->@28]
-b28_from_b25:
-  jmp b28
-//SEG7 @28
-b28:
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG7 @2
+b2:
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @28 to @end [phi:@28->@end]
-bend_from_b28:
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG10 @end
 bend:
@@ -6244,14 +6279,14 @@ main: {
   //SEG43 [98] phi from main::@2 to sin16s_gen2 [phi:main::@2->sin16s_gen2]
   sin16s_gen2_from_b2:
     jsr sin16s_gen2
-  //SEG44 [22] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
-  b6_from_b2:
-    jmp b6
-  //SEG45 main::@6
-  b6:
+  //SEG44 [22] phi from main::@2 to main::@5 [phi:main::@2->main::@5]
+  b5_from_b2:
+    jmp b5
+  //SEG45 main::@5
+  b5:
   //SEG46 [23] call loop 
-  //SEG47 [25] phi from main::@6 to loop [phi:main::@6->loop]
-  loop_from_b6:
+  //SEG47 [25] phi from main::@5 to loop [phi:main::@5->loop]
+  loop_from_b5:
     jsr loop
     jmp breturn
   //SEG48 main::@return
@@ -6273,17 +6308,17 @@ loop: {
     jmp b1
   //SEG53 loop::@1
   b1:
-    jmp b6
+    jmp b2
   // Wait for the raster to reach the bottom of the screen
-  //SEG54 loop::@6
-  b6:
-  //SEG55 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG54 loop::@2
+  b2:
+  //SEG55 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b8
-  //SEG56 loop::@8
-  b8:
+    bne b2
+    jmp b3
+  //SEG56 loop::@3
+  b3:
   //SEG57 [28] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG58 [29] (signed word*~) loop::$1 ← (const signed word[XSIN_SIZE#0]) xsin#0 + (word) xsin_idx#11 -- pwsz1=pwsc1_plus_vwuz2 
@@ -6305,9 +6340,9 @@ loop: {
   //SEG60 [31] (signed word) render_logo::xpos#0 ← (signed word) loop::xpos#0
   //SEG61 [32] call render_logo 
     jsr render_logo
-    jmp b15
-  //SEG62 loop::@15
-  b15:
+    jmp b5
+  //SEG62 loop::@5
+  b5:
   //SEG63 [33] (word) xsin_idx#3 ← (word) xsin_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vwuz1=vwuz1_plus_2 
     lda xsin_idx
     clc
@@ -6316,38 +6351,38 @@ loop: {
     bcc !+
     inc xsin_idx+1
   !:
-  //SEG64 [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@16 -- vwuz1_neq_vwuc1_then_la1 
+  //SEG64 [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@6 -- vwuz1_neq_vwuc1_then_la1 
     lda xsin_idx+1
     cmp #>XSIN_SIZE*2
-    bne b16_from_b15
+    bne b6_from_b5
     lda xsin_idx
     cmp #<XSIN_SIZE*2
-    bne b16_from_b15
-  //SEG65 [35] phi from loop::@15 to loop::@9 [phi:loop::@15->loop::@9]
-  b9_from_b15:
-  //SEG66 [35] phi (word) xsin_idx#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@15->loop::@9#0] -- vwuz1=vbuc1 
+    bne b6_from_b5
+  //SEG65 [35] phi from loop::@5 to loop::@4 [phi:loop::@5->loop::@4]
+  b4_from_b5:
+  //SEG66 [35] phi (word) xsin_idx#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@5->loop::@4#0] -- vwuz1=vbuc1 
     lda #0
     sta xsin_idx
     lda #0
     sta xsin_idx+1
-    jmp b9
-  //SEG67 loop::@9
-  b9:
+    jmp b4
+  //SEG67 loop::@4
+  b4:
   //SEG68 [36] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BORDERCOL
-  //SEG69 [26] phi from loop::@9 to loop::@1 [phi:loop::@9->loop::@1]
-  b1_from_b9:
-  //SEG70 [26] phi (word) xsin_idx#11 = (word) xsin_idx#19 [phi:loop::@9->loop::@1#0] -- register_copy 
+  //SEG69 [26] phi from loop::@4 to loop::@1 [phi:loop::@4->loop::@1]
+  b1_from_b4:
+  //SEG70 [26] phi (word) xsin_idx#11 = (word) xsin_idx#19 [phi:loop::@4->loop::@1#0] -- register_copy 
     jmp b1
-  //SEG71 [37] phi from loop::@15 to loop::@16 [phi:loop::@15->loop::@16]
-  b16_from_b15:
-    jmp b16
-  //SEG72 loop::@16
-  b16:
-  //SEG73 [35] phi from loop::@16 to loop::@9 [phi:loop::@16->loop::@9]
-  b9_from_b16:
-  //SEG74 [35] phi (word) xsin_idx#19 = (word) xsin_idx#3 [phi:loop::@16->loop::@9#0] -- register_copy 
-    jmp b9
+  //SEG71 [37] phi from loop::@5 to loop::@6 [phi:loop::@5->loop::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG72 loop::@6
+  b6:
+  //SEG73 [35] phi from loop::@6 to loop::@4 [phi:loop::@6->loop::@4]
+  b4_from_b6:
+  //SEG74 [35] phi (word) xsin_idx#19 = (word) xsin_idx#3 [phi:loop::@6->loop::@4#0] -- register_copy 
+    jmp b4
 }
 //SEG75 render_logo
 // render_logo(signed word zeropage(9) xpos)
@@ -6386,35 +6421,35 @@ render_logo: {
   //SEG82 [44] if((signed word) render_logo::xpos#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_logo::@1 -- vwsz1_lt_0_then_la1 
     lda xpos+1
     bmi b1
-  //SEG83 [45] phi from render_logo to render_logo::@4 [phi:render_logo->render_logo::@4]
-  b4_from_render_logo:
-  //SEG84 [45] phi (byte) render_logo::screen_idx#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo->render_logo::@4#0] -- vbuyy=vbuc1 
+  //SEG83 [45] phi from render_logo to render_logo::@2 [phi:render_logo->render_logo::@2]
+  b2_from_render_logo:
+  //SEG84 [45] phi (byte) render_logo::screen_idx#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo->render_logo::@2#0] -- vbuyy=vbuc1 
     ldy #0
-    jmp b4
-  //SEG85 render_logo::@4
-  b4:
-  //SEG86 [46] if((byte) render_logo::screen_idx#18!=(byte)(signed byte) render_logo::x_char#0) goto render_logo::@7 -- vbuyy_neq_vbuz1_then_la1 
+    jmp b2
+  //SEG85 render_logo::@2
+  b2:
+  //SEG86 [46] if((byte) render_logo::screen_idx#18!=(byte)(signed byte) render_logo::x_char#0) goto render_logo::@3 -- vbuyy_neq_vbuz1_then_la1 
     cpy x_char
-    bne b7
-  //SEG87 [47] phi from render_logo::@4 to render_logo::@10 [phi:render_logo::@4->render_logo::@10]
-  b10_from_b4:
-  //SEG88 [47] phi (byte) render_logo::logo_idx#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@4->render_logo::@10#0] -- vbuz1=vbuc1 
+    bne b3
+  //SEG87 [47] phi from render_logo::@2 to render_logo::@5 [phi:render_logo::@2->render_logo::@5]
+  b5_from_b2:
+  //SEG88 [47] phi (byte) render_logo::logo_idx#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@2->render_logo::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta logo_idx
-  //SEG89 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#18 [phi:render_logo::@4->render_logo::@10#1] -- register_copy 
-    jmp b10
-  //SEG90 render_logo::@10
-  b10:
-  //SEG91 [48] if((byte) render_logo::screen_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@13 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG89 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#18 [phi:render_logo::@2->render_logo::@5#1] -- register_copy 
+    jmp b5
+  //SEG90 render_logo::@5
+  b5:
+  //SEG91 [48] if((byte) render_logo::screen_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@6 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$28
-    bne b13
+    bne b6
     jmp breturn
   //SEG92 render_logo::@return
   breturn:
   //SEG93 [49] return 
     rts
-  //SEG94 render_logo::@13
-  b13:
+  //SEG94 render_logo::@6
+  b6:
   //SEG95 [50] (byte/signed word/word/dword/signed dword~) render_logo::$15 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuaa=vbuz1_plus_0 
     lda logo_idx
   //SEG96 [51] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$15 -- pbuc1_derefidx_vbuyy=vbuaa 
@@ -6464,20 +6499,20 @@ render_logo: {
     adc logo_idx
   //SEG111 [61] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$50 -- pbuc1_derefidx_vbuyy=vbuaa 
     sta SCREEN+$28*5,y
-    jmp b14
-  //SEG112 render_logo::@14
-  b14:
+    jmp b7
+  //SEG112 render_logo::@7
+  b7:
   //SEG113 [62] (byte) render_logo::screen_idx#4 ← ++ (byte) render_logo::screen_idx#10 -- vbuyy=_inc_vbuyy 
     iny
   //SEG114 [63] (byte) render_logo::logo_idx#3 ← ++ (byte) render_logo::logo_idx#10 -- vbuz1=_inc_vbuz1 
     inc logo_idx
-  //SEG115 [47] phi from render_logo::@14 to render_logo::@10 [phi:render_logo::@14->render_logo::@10]
-  b10_from_b14:
-  //SEG116 [47] phi (byte) render_logo::logo_idx#10 = (byte) render_logo::logo_idx#3 [phi:render_logo::@14->render_logo::@10#0] -- register_copy 
-  //SEG117 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#4 [phi:render_logo::@14->render_logo::@10#1] -- register_copy 
-    jmp b10
-  //SEG118 render_logo::@7
-  b7:
+  //SEG115 [47] phi from render_logo::@7 to render_logo::@5 [phi:render_logo::@7->render_logo::@5]
+  b5_from_b7:
+  //SEG116 [47] phi (byte) render_logo::logo_idx#10 = (byte) render_logo::logo_idx#3 [phi:render_logo::@7->render_logo::@5#0] -- register_copy 
+  //SEG117 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#4 [phi:render_logo::@7->render_logo::@5#1] -- register_copy 
+    jmp b5
+  //SEG118 render_logo::@3
+  b3:
   //SEG119 [64] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#18) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuyy=vbuc2 
     lda #0
     sta SCREEN,y
@@ -6511,15 +6546,15 @@ render_logo: {
   //SEG129 [69] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#18) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuyy=vbuc2 
     lda #0
     sta SCREEN+$28*5,y
-    jmp b8
-  //SEG130 render_logo::@8
-  b8:
+    jmp b4
+  //SEG130 render_logo::@4
+  b4:
   //SEG131 [70] (byte) render_logo::screen_idx#3 ← ++ (byte) render_logo::screen_idx#18 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG132 [45] phi from render_logo::@8 to render_logo::@4 [phi:render_logo::@8->render_logo::@4]
-  b4_from_b8:
-  //SEG133 [45] phi (byte) render_logo::screen_idx#18 = (byte) render_logo::screen_idx#3 [phi:render_logo::@8->render_logo::@4#0] -- register_copy 
-    jmp b4
+  //SEG132 [45] phi from render_logo::@4 to render_logo::@2 [phi:render_logo::@4->render_logo::@2]
+  b2_from_b4:
+  //SEG133 [45] phi (byte) render_logo::screen_idx#18 = (byte) render_logo::screen_idx#3 [phi:render_logo::@4->render_logo::@2#0] -- register_copy 
+    jmp b2
   //SEG134 render_logo::@1
   b1:
   //SEG135 [71] (signed byte~) render_logo::$17 ← - (signed byte) render_logo::x_char#0 -- vbsaa=_neg_vbsz1 
@@ -6529,31 +6564,31 @@ render_logo: {
     adc #1
   //SEG136 [72] (byte~) render_logo::logo_idx#14 ← (byte)(signed byte~) render_logo::$17 -- vbuz1=vbuaa 
     sta logo_idx
-  //SEG137 [73] phi from render_logo::@1 to render_logo::@21 [phi:render_logo::@1->render_logo::@21]
-  b21_from_b1:
-  //SEG138 [73] phi (byte) render_logo::screen_idx#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@1->render_logo::@21#0] -- vbuyy=vbuc1 
+  //SEG137 [73] phi from render_logo::@1 to render_logo::@8 [phi:render_logo::@1->render_logo::@8]
+  b8_from_b1:
+  //SEG138 [73] phi (byte) render_logo::screen_idx#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@1->render_logo::@8#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG139 [73] phi (byte) render_logo::logo_idx#11 = (byte~) render_logo::logo_idx#14 [phi:render_logo::@1->render_logo::@21#1] -- register_copy 
-    jmp b21
-  //SEG140 render_logo::@21
-  b21:
-  //SEG141 [74] if((byte) render_logo::logo_idx#11!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@24 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG139 [73] phi (byte) render_logo::logo_idx#11 = (byte~) render_logo::logo_idx#14 [phi:render_logo::@1->render_logo::@8#1] -- register_copy 
+    jmp b8
+  //SEG140 render_logo::@8
+  b8:
+  //SEG141 [74] if((byte) render_logo::logo_idx#11!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp logo_idx
-    bne b24
-  //SEG142 [75] phi from render_logo::@21 render_logo::@31 to render_logo::@27 [phi:render_logo::@21/render_logo::@31->render_logo::@27]
-  b27_from_b21:
-  b27_from_b31:
-  //SEG143 [75] phi (byte) render_logo::screen_idx#15 = (byte) render_logo::screen_idx#21 [phi:render_logo::@21/render_logo::@31->render_logo::@27#0] -- register_copy 
-    jmp b27
-  //SEG144 render_logo::@27
-  b27:
-  //SEG145 [76] if((byte) render_logo::screen_idx#15!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@30 -- vbuyy_neq_vbuc1_then_la1 
+    bne b9
+  //SEG142 [75] phi from render_logo::@13 render_logo::@8 to render_logo::@11 [phi:render_logo::@13/render_logo::@8->render_logo::@11]
+  b11_from_b13:
+  b11_from_b8:
+  //SEG143 [75] phi (byte) render_logo::screen_idx#15 = (byte) render_logo::screen_idx#6 [phi:render_logo::@13/render_logo::@8->render_logo::@11#0] -- register_copy 
+    jmp b11
+  //SEG144 render_logo::@11
+  b11:
+  //SEG145 [76] if((byte) render_logo::screen_idx#15!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@12 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$28
-    bne b30
+    bne b12
     jmp breturn
-  //SEG146 render_logo::@30
-  b30:
+  //SEG146 render_logo::@12
+  b12:
   //SEG147 [77] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#15) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuyy=vbuc2 
     lda #0
     sta SCREEN,y
@@ -6587,14 +6622,14 @@ render_logo: {
   //SEG157 [82] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#15) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuyy=vbuc2 
     lda #0
     sta SCREEN+$28*5,y
-    jmp b31
-  //SEG158 render_logo::@31
-  b31:
+    jmp b13
+  //SEG158 render_logo::@13
+  b13:
   //SEG159 [83] (byte) render_logo::screen_idx#6 ← ++ (byte) render_logo::screen_idx#15 -- vbuyy=_inc_vbuyy 
     iny
-    jmp b27_from_b31
-  //SEG160 render_logo::@24
-  b24:
+    jmp b11_from_b13
+  //SEG160 render_logo::@9
+  b9:
   //SEG161 [84] (byte/signed word/word/dword/signed dword~) render_logo::$23 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuaa=vbuz1_plus_0 
     lda logo_idx
   //SEG162 [85] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$23 -- pbuc1_derefidx_vbuyy=vbuaa 
@@ -6644,18 +6679,18 @@ render_logo: {
     adc logo_idx
   //SEG177 [95] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$96 -- pbuc1_derefidx_vbuyy=vbuaa 
     sta SCREEN+$28*5,y
-    jmp b25
-  //SEG178 render_logo::@25
-  b25:
+    jmp b10
+  //SEG178 render_logo::@10
+  b10:
   //SEG179 [96] (byte) render_logo::screen_idx#5 ← ++ (byte) render_logo::screen_idx#21 -- vbuyy=_inc_vbuyy 
     iny
   //SEG180 [97] (byte) render_logo::logo_idx#4 ← ++ (byte) render_logo::logo_idx#11 -- vbuz1=_inc_vbuz1 
     inc logo_idx
-  //SEG181 [73] phi from render_logo::@25 to render_logo::@21 [phi:render_logo::@25->render_logo::@21]
-  b21_from_b25:
-  //SEG182 [73] phi (byte) render_logo::screen_idx#21 = (byte) render_logo::screen_idx#5 [phi:render_logo::@25->render_logo::@21#0] -- register_copy 
-  //SEG183 [73] phi (byte) render_logo::logo_idx#11 = (byte) render_logo::logo_idx#4 [phi:render_logo::@25->render_logo::@21#1] -- register_copy 
-    jmp b21
+  //SEG181 [73] phi from render_logo::@10 to render_logo::@8 [phi:render_logo::@10->render_logo::@8]
+  b8_from_b10:
+  //SEG182 [73] phi (byte) render_logo::screen_idx#21 = (byte) render_logo::screen_idx#5 [phi:render_logo::@10->render_logo::@8#0] -- register_copy 
+  //SEG183 [73] phi (byte) render_logo::logo_idx#11 = (byte) render_logo::logo_idx#4 [phi:render_logo::@10->render_logo::@8#1] -- register_copy 
+    jmp b8
 }
 //SEG184 sin16s_gen2
 // Generate signed word sinus table - with values in the range min-max.
@@ -6679,23 +6714,23 @@ sin16s_gen2: {
   div32u16u_from_sin16s_gen2:
     jsr div32u16u
   //SEG187 [100] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-    jmp b3
-  //SEG188 sin16s_gen2::@3
-  b3:
+    jmp b2
+  //SEG188 sin16s_gen2::@2
+  b2:
   //SEG189 [101] (dword) sin16s_gen2::step#0 ← (dword) div32u16u::return#2
-  //SEG190 [102] phi from sin16s_gen2::@3 to sin16s_gen2::@1 [phi:sin16s_gen2::@3->sin16s_gen2::@1]
-  b1_from_b3:
-  //SEG191 [102] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
+  //SEG190 [102] phi from sin16s_gen2::@2 to sin16s_gen2::@1 [phi:sin16s_gen2::@2->sin16s_gen2::@1]
+  b1_from_b2:
+  //SEG191 [102] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG192 [102] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[XSIN_SIZE#0]) xsin#0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
+  //SEG192 [102] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[XSIN_SIZE#0]) xsin#0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
     lda #<xsin
     sta sintab
     lda #>xsin
     sta sintab+1
-  //SEG193 [102] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#2] -- vduz1=vbuc1 
+  //SEG193 [102] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -6704,11 +6739,11 @@ sin16s_gen2: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG194 [102] phi from sin16s_gen2::@5 to sin16s_gen2::@1 [phi:sin16s_gen2::@5->sin16s_gen2::@1]
-  b1_from_b5:
-  //SEG195 [102] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#0] -- register_copy 
-  //SEG196 [102] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@5->sin16s_gen2::@1#1] -- register_copy 
-  //SEG197 [102] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#2] -- register_copy 
+  //SEG194 [102] phi from sin16s_gen2::@4 to sin16s_gen2::@1 [phi:sin16s_gen2::@4->sin16s_gen2::@1]
+  b1_from_b4:
+  //SEG195 [102] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#0] -- register_copy 
+  //SEG196 [102] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@4->sin16s_gen2::@1#1] -- register_copy 
+  //SEG197 [102] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#2] -- register_copy 
     jmp b1
   //SEG198 sin16s_gen2::@1
   b1:
@@ -6724,16 +6759,16 @@ sin16s_gen2: {
   //SEG200 [104] call sin16s 
     jsr sin16s
   //SEG201 [105] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-    jmp b4
-  //SEG202 sin16s_gen2::@4
-  b4:
+    jmp b3
+  //SEG202 sin16s_gen2::@3
+  b3:
   //SEG203 [106] (signed word) mul16s::a#0 ← (signed word) sin16s::return#0
   //SEG204 [107] call mul16s 
     jsr mul16s
   //SEG205 [108] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-    jmp b5
-  //SEG206 sin16s_gen2::@5
-  b5:
+    jmp b4
+  //SEG206 sin16s_gen2::@4
+  b4:
   //SEG207 [109] (signed dword~) sin16s_gen2::$5 ← (signed dword) mul16s::return#2
   //SEG208 [110] (word~) sin16s_gen2::$6 ← > (signed dword~) sin16s_gen2::$5 -- vwuz1=_hi_vdsz2 
     lda _5+2
@@ -6785,11 +6820,11 @@ sin16s_gen2: {
   //SEG214 [116] if((word) sin16s_gen2::i#1<(const word) XSIN_SIZE#0) goto sin16s_gen2::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>XSIN_SIZE
-    bcc b1_from_b5
+    bcc b1_from_b4
     bne !+
     lda i
     cmp #<XSIN_SIZE
-    bcc b1_from_b5
+    bcc b1_from_b4
   !:
     jmp breturn
   //SEG215 sin16s_gen2::@return
@@ -6823,13 +6858,13 @@ mul16s: {
     sta mul16u.b+1
     jsr mul16u
   //SEG223 [120] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-    jmp b6
-  //SEG224 mul16s::@6
-  b6:
+    jmp b4
+  //SEG224 mul16s::@4
+  b4:
   //SEG225 [121] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   //SEG226 [122] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
-    bpl b1_from_b6
+    bpl b1_from_b4
     jmp b3
   //SEG227 mul16s::@3
   b3:
@@ -6851,10 +6886,10 @@ mul16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG231 [126] phi from mul16s::@3 mul16s::@6 to mul16s::@1 [phi:mul16s::@3/mul16s::@6->mul16s::@1]
+  //SEG231 [126] phi from mul16s::@3 mul16s::@4 to mul16s::@1 [phi:mul16s::@3/mul16s::@4->mul16s::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG232 [126] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@6->mul16s::@1#0] -- register_copy 
+  b1_from_b4:
+  //SEG232 [126] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@4->mul16s::@1#0] -- register_copy 
     jmp b1
   //SEG233 mul16s::@1
   b1:
@@ -6914,12 +6949,12 @@ mul16u: {
   //SEG249 [134] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG250 [135] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG250 [135] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG251 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG251 mul16u::@3
+  b3:
   //SEG252 [136] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -6934,13 +6969,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG253 [137] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG254 [137] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG255 mul16u::@8
-  b8:
+  //SEG253 [137] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG254 [137] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG255 mul16u::@4
+  b4:
   //SEG256 [138] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -6950,11 +6985,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG258 [131] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG259 [131] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG260 [131] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG261 [131] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG258 [131] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG259 [131] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG260 [131] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG261 [131] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG262 sin16s
@@ -7100,9 +7135,9 @@ sin16s: {
   //SEG287 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG288 [151] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-    jmp b8
-  //SEG289 sin16s::@8
-  b8:
+    jmp b7
+  //SEG289 sin16s::@7
+  b7:
   //SEG290 [152] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -7115,39 +7150,39 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG293 [155] call mulu16_sel 
-  //SEG294 [180] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG295 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG294 [180] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG295 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG296 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG297 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG296 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG297 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG298 [156] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_1
     lda mulu16_sel.return+1
     sta mulu16_sel.return_1+1
-    jmp b9
-  //SEG299 sin16s::@9
-  b9:
+    jmp b8
+  //SEG299 sin16s::@8
+  b8:
   //SEG300 [157] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   //SEG301 [158] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   //SEG302 [159] call mulu16_sel 
-  //SEG303 [180] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG304 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG303 [180] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG304 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG305 [180] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG305 [180] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG306 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG306 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG307 [160] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-    jmp b10
-  //SEG308 sin16s::@10
-  b10:
+    jmp b9
+  //SEG308 sin16s::@9
+  b9:
   //SEG309 [161] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   //SEG310 [162] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -7164,21 +7199,21 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG313 [165] call mulu16_sel 
-  //SEG314 [180] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG315 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG314 [180] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG315 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG316 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG317 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG316 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG317 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG318 [166] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_10
     lda mulu16_sel.return+1
     sta mulu16_sel.return_10+1
-    jmp b11
-  //SEG319 sin16s::@11
-  b11:
+    jmp b10
+  //SEG319 sin16s::@10
+  b10:
   //SEG320 [167] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   //SEG321 [168] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   //SEG322 [169] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -7187,17 +7222,17 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG323 [170] call mulu16_sel 
-  //SEG324 [180] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG325 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG324 [180] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG325 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG326 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG327 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG326 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG327 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG328 [171] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-    jmp b12
-  //SEG329 sin16s::@12
-  b12:
+    jmp b11
+  //SEG329 sin16s::@11
+  b11:
   //SEG330 [172] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   //SEG331 [173] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -7214,10 +7249,10 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG333 [175] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG333 [175] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG334 sin16s::@6
   b6:
@@ -7231,10 +7266,10 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG336 [177] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  b3_from_b15:
+  //SEG336 [177] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG337 [177] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG337 [177] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
     jmp b3
   //SEG338 sin16s::@3
   b3:
@@ -7243,10 +7278,10 @@ sin16s: {
   breturn:
   //SEG340 [178] return 
     rts
-  //SEG341 sin16s::@15
-  b15:
+  //SEG341 sin16s::@12
+  b12:
   //SEG342 [179] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
 //SEG343 mulu16_sel
 // Calculate val*val for two unsigned word values - the result is 16 selected bits of the 32-bit result.
@@ -7273,9 +7308,9 @@ mulu16_sel: {
   //SEG349 [129] phi (word) mul16u::b#2 = (word) mul16u::b#1 [phi:mulu16_sel->mul16u#1] -- register_copy 
     jsr mul16u
   //SEG350 [184] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-    jmp b2
-  //SEG351 mulu16_sel::@2
-  b2:
+    jmp b1
+  //SEG351 mulu16_sel::@1
+  b1:
   //SEG352 [185] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#3
   //SEG353 [186] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5 -- vduz1=vduz1_rol_vbuxx 
     cpx #0
@@ -7321,9 +7356,9 @@ div32u16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG362 [191] (word) divr16u::return#2 ← (word) divr16u::return#0
-    jmp b2
-  //SEG363 div32u16u::@2
-  b2:
+    jmp b1
+  //SEG363 div32u16u::@1
+  b1:
   //SEG364 [192] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return
     sta quotient_hi
@@ -7331,19 +7366,19 @@ div32u16u: {
     sta quotient_hi+1
   //SEG365 [193] (word) divr16u::rem#4 ← (word) rem16u#1
   //SEG366 [194] call divr16u 
-  //SEG367 [199] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  divr16u_from_b2:
-  //SEG368 [199] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG367 [199] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  divr16u_from_b1:
+  //SEG368 [199] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG369 [199] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG369 [199] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG370 [195] (word) divr16u::return#3 ← (word) divr16u::return#0
-    jmp b3
-  //SEG371 div32u16u::@3
-  b3:
+    jmp b2
+  //SEG371 div32u16u::@2
+  b2:
   //SEG372 [196] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   //SEG373 [197] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda quotient_hi
@@ -7524,81 +7559,81 @@ fill: {
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b25
-Removing instruction jmp b28
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp bend
 Removing instruction jmp toD0181
 Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b6
+Removing instruction jmp b5
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b15
-Removing instruction jmp b9
-Removing instruction jmp b16
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b5
 Removing instruction jmp b4
-Removing instruction jmp b10
+Removing instruction jmp b6
+Removing instruction jmp b2
+Removing instruction jmp b5
 Removing instruction jmp breturn
 Removing instruction jmp b13_1
 Removing instruction jmp b13_2
 Removing instruction jmp b13_3
 Removing instruction jmp b13_4
 Removing instruction jmp b13_5
-Removing instruction jmp b14
+Removing instruction jmp b7
 Removing instruction jmp b7_1
 Removing instruction jmp b7_2
 Removing instruction jmp b7_3
 Removing instruction jmp b7_4
 Removing instruction jmp b7_5
+Removing instruction jmp b4
 Removing instruction jmp b8
-Removing instruction jmp b21
-Removing instruction jmp b27
+Removing instruction jmp b11
 Removing instruction jmp b30_1
 Removing instruction jmp b30_2
 Removing instruction jmp b30_3
 Removing instruction jmp b30_4
 Removing instruction jmp b30_5
-Removing instruction jmp b31
+Removing instruction jmp b13
 Removing instruction jmp b24_1
 Removing instruction jmp b24_2
 Removing instruction jmp b24_3
 Removing instruction jmp b24_4
 Removing instruction jmp b24_5
-Removing instruction jmp b25
-Removing instruction jmp b3
+Removing instruction jmp b10
+Removing instruction jmp b2
 Removing instruction jmp b1
+Removing instruction jmp b3
 Removing instruction jmp b4
-Removing instruction jmp b5
 Removing instruction jmp breturn
-Removing instruction jmp b6
+Removing instruction jmp b4
 Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b5
 Removing instruction jmp b2
+Removing instruction jmp b7
 Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
-Removing instruction jmp b12
 Removing instruction jmp b6
 Removing instruction jmp b3
 Removing instruction jmp breturn
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
+Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -7621,28 +7656,28 @@ Replacing instruction lda #0 with TXA
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b1_from_b1 with b1
-Replacing label b16_from_b15 with b16
-Replacing label b16_from_b15 with b16
-Replacing label b27_from_b31 with b27
-Replacing label b1_from_b5 with b1
-Replacing label b1_from_b5 with b1
-Replacing label b1_from_b6 with b2
-Replacing label b8_from_b2 with b8
+Replacing label b6_from_b5 with b6
+Replacing label b6_from_b5 with b6
+Replacing label b11_from_b13 with b11
+Replacing label b1_from_b4 with b1
+Replacing label b1_from_b4 with b1
+Replacing label b1_from_b4 with b2
+Replacing label b4_from_b2 with b4
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
-Replacing label b3_from_b15 with b3
+Replacing label b3_from_b12 with b3
 Replacing label b2_from_b1 with b2
 Replacing label b3_from_b2 with b3
 Replacing label b3_from_b2 with b3
 Replacing label b1_from_b3 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b25:
-Removing instruction b28_from_b25:
-Removing instruction b28:
-Removing instruction bend_from_b28:
+Removing instruction b1:
+Removing instruction b2_from_b1:
+Removing instruction b2:
+Removing instruction bend_from_b2:
 Removing instruction toD0181_from_main:
 Removing instruction toD0181:
 Removing instruction b4_from_b3:
@@ -7650,24 +7685,24 @@ Removing instruction fill_from_b4:
 Removing instruction b1_from_b1:
 Removing instruction b2_from_b1:
 Removing instruction sin16s_gen2_from_b2:
-Removing instruction b6_from_b2:
-Removing instruction loop_from_b6:
-Removing instruction b16_from_b15:
-Removing instruction b9_from_b16:
-Removing instruction b27_from_b21:
-Removing instruction b27_from_b31:
+Removing instruction b5_from_b2:
+Removing instruction loop_from_b5:
+Removing instruction b6_from_b5:
+Removing instruction b4_from_b6:
+Removing instruction b11_from_b13:
+Removing instruction b11_from_b8:
+Removing instruction b1_from_b2:
+Removing instruction b1_from_b4:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b5:
-Removing instruction b1_from_b3:
-Removing instruction b1_from_b6:
+Removing instruction b1_from_b4:
 Removing instruction b1:
 Removing instruction breturn:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b5:
-Removing instruction mulu16_sel_from_b9:
-Removing instruction b3_from_b15:
+Removing instruction mulu16_sel_from_b8:
+Removing instruction b3_from_b12:
 Removing instruction b3_from_b6:
 Removing instruction breturn:
 Removing instruction b1_from_b3:
@@ -7685,75 +7720,75 @@ Removing instruction fill_from_b3:
 Removing instruction b4:
 Removing instruction b1_from_b4:
 Removing instruction b2:
-Removing instruction b6:
+Removing instruction b5:
 Removing instruction breturn:
 Removing instruction b1_from_loop:
-Removing instruction b8:
-Removing instruction b15:
-Removing instruction b9_from_b15:
-Removing instruction b1_from_b9:
-Removing instruction b4_from_render_logo:
-Removing instruction b10_from_b4:
+Removing instruction b3:
+Removing instruction b5:
+Removing instruction b4_from_b5:
+Removing instruction b1_from_b4:
+Removing instruction b2_from_render_logo:
+Removing instruction b5_from_b2:
 Removing instruction b13_1:
 Removing instruction b13_2:
 Removing instruction b13_3:
 Removing instruction b13_4:
 Removing instruction b13_5:
-Removing instruction b14:
-Removing instruction b10_from_b14:
+Removing instruction b7:
+Removing instruction b5_from_b7:
 Removing instruction b7_1:
 Removing instruction b7_2:
 Removing instruction b7_3:
 Removing instruction b7_4:
 Removing instruction b7_5:
-Removing instruction b8:
-Removing instruction b4_from_b8:
-Removing instruction b21_from_b1:
+Removing instruction b4:
+Removing instruction b2_from_b4:
+Removing instruction b8_from_b1:
 Removing instruction b30_1:
 Removing instruction b30_2:
 Removing instruction b30_3:
 Removing instruction b30_4:
 Removing instruction b30_5:
-Removing instruction b31:
+Removing instruction b13:
 Removing instruction b24_1:
 Removing instruction b24_2:
 Removing instruction b24_3:
 Removing instruction b24_4:
 Removing instruction b24_5:
-Removing instruction b25:
-Removing instruction b21_from_b25:
+Removing instruction b10:
+Removing instruction b8_from_b10:
 Removing instruction div32u16u_from_sin16s_gen2:
+Removing instruction b2:
 Removing instruction b3:
 Removing instruction b4:
-Removing instruction b5:
 Removing instruction breturn:
 Removing instruction mul16u_from_mul16s:
-Removing instruction b6:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction b1_from_mul16u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
+Removing instruction b3:
+Removing instruction b1_from_b4:
 Removing instruction b4:
 Removing instruction b1_from_b4:
 Removing instruction b5:
 Removing instruction mulu16_sel_from_b2:
+Removing instruction b7:
+Removing instruction mulu16_sel_from_b7:
 Removing instruction b8:
-Removing instruction mulu16_sel_from_b8:
 Removing instruction b9:
+Removing instruction mulu16_sel_from_b9:
 Removing instruction b10:
 Removing instruction mulu16_sel_from_b10:
 Removing instruction b11:
-Removing instruction mulu16_sel_from_b11:
-Removing instruction b12:
 Removing instruction b6:
 Removing instruction mul16u_from_mulu16_sel:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction divr16u_from_div32u16u:
+Removing instruction b1:
+Removing instruction divr16u_from_b1:
 Removing instruction b2:
-Removing instruction divr16u_from_b2:
-Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_divr16u:
 Removing instruction b4:
@@ -7764,9 +7799,9 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b9 in bne b16
-Skipping double jump to b9 in bne b16
-Skipping double jump to b3 in beq b15
+Skipping double jump to b4 in bne b6
+Skipping double jump to b4 in bne b6
+Skipping double jump to b3 in beq b12
 Succesful ASM optimization Pass5DoubleJumpElimination
 Relabelling long label b1_from_sin16s to b4
 Succesful ASM optimization Pass5RelabelLongLabels
@@ -7787,16 +7822,16 @@ Removing instruction lda #0
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
-Removing instruction b16:
-Removing instruction b15:
+Removing instruction b6:
+Removing instruction b12:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing unreachable instruction jmp b9
+Removing unreachable instruction jmp b4
 Removing unreachable instruction jmp b3
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @25
-(label) @28
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -7906,8 +7941,8 @@ FINAL SYMBOL TABLE
 (const word) XSIN_SIZE#0 XSIN_SIZE = (word/signed word/dword/signed dword) $200
 (byte) YELLOW
 (dword()) div32u16u((dword) div32u16u::dividend , (word) div32u16u::divisor)
+(label) div32u16u::@1
 (label) div32u16u::@2
-(label) div32u16u::@3
 (label) div32u16u::@return
 (dword) div32u16u::dividend
 (word) div32u16u::divisor
@@ -7970,11 +8005,11 @@ FINAL SYMBOL TABLE
 (void()) loop()
 (signed word*~) loop::$1 $1 zp ZP_WORD:9 22.0
 (label) loop::@1
-(label) loop::@15
-(label) loop::@16
+(label) loop::@2
+(label) loop::@3
+(label) loop::@4
+(label) loop::@5
 (label) loop::@6
-(label) loop::@8
-(label) loop::@9
 (signed word) loop::xpos
 (signed word) loop::xpos#0 xpos zp ZP_WORD:9 22.0
 (void()) main()
@@ -7982,7 +8017,7 @@ FINAL SYMBOL TABLE
 (label) main::@2
 (label) main::@3
 (label) main::@4
-(label) main::@6
+(label) main::@5
 (label) main::@return
 (byte) main::ch
 (byte) main::ch#1 reg byte x 16.5
@@ -8007,7 +8042,7 @@ FINAL SYMBOL TABLE
 (label) mul16s::@1
 (label) mul16s::@2
 (label) mul16s::@3
-(label) mul16s::@6
+(label) mul16s::@4
 (label) mul16s::@return
 (signed word) mul16s::a
 (signed word) mul16s::a#0 a zp ZP_WORD:23 2.6
@@ -8023,8 +8058,8 @@ FINAL SYMBOL TABLE
 (byte/word~) mul16u::$1 reg byte a 202.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:17 101.0
@@ -8049,7 +8084,7 @@ FINAL SYMBOL TABLE
 (word()) mulu16_sel((word) mulu16_sel::v1 , (word) mulu16_sel::v2 , (byte) mulu16_sel::select)
 (dword~) mulu16_sel::$0 $0 zp ZP_DWORD:11 4.0
 (dword~) mulu16_sel::$1 $1 zp ZP_DWORD:11 4.0
-(label) mulu16_sel::@2
+(label) mulu16_sel::@1
 (label) mulu16_sel::@return
 (word) mulu16_sel::return
 (word) mulu16_sel::return#0 return zp ZP_WORD:15 4.0
@@ -8098,30 +8133,29 @@ FINAL SYMBOL TABLE
 (byte/signed word/word/dword/signed dword~) render_logo::$96 reg byte a 202.0
 (label) render_logo::@1
 (label) render_logo::@10
+(label) render_logo::@11
+(label) render_logo::@12
 (label) render_logo::@13
 (label) render_logo::@13_1
 (label) render_logo::@13_2
 (label) render_logo::@13_3
 (label) render_logo::@13_4
 (label) render_logo::@13_5
-(label) render_logo::@14
-(label) render_logo::@21
-(label) render_logo::@24
+(label) render_logo::@2
 (label) render_logo::@24_1
 (label) render_logo::@24_2
 (label) render_logo::@24_3
 (label) render_logo::@24_4
 (label) render_logo::@24_5
-(label) render_logo::@25
-(label) render_logo::@27
-(label) render_logo::@30
+(label) render_logo::@3
 (label) render_logo::@30_1
 (label) render_logo::@30_2
 (label) render_logo::@30_3
 (label) render_logo::@30_4
 (label) render_logo::@30_5
-(label) render_logo::@31
 (label) render_logo::@4
+(label) render_logo::@5
+(label) render_logo::@6
 (label) render_logo::@7
 (label) render_logo::@7_1
 (label) render_logo::@7_2
@@ -8129,6 +8163,7 @@ FINAL SYMBOL TABLE
 (label) render_logo::@7_4
 (label) render_logo::@7_5
 (label) render_logo::@8
+(label) render_logo::@9
 (label) render_logo::@return
 (byte) render_logo::line
 (byte) render_logo::logo_idx
@@ -8157,12 +8192,12 @@ FINAL SYMBOL TABLE
 (label) sin16s::@10
 (label) sin16s::@11
 (label) sin16s::@12
-(label) sin16s::@15
 (label) sin16s::@2
 (label) sin16s::@3
 (label) sin16s::@4
 (label) sin16s::@5
 (label) sin16s::@6
+(label) sin16s::@7
 (label) sin16s::@8
 (label) sin16s::@9
 (label) sin16s::@return
@@ -8202,9 +8237,9 @@ FINAL SYMBOL TABLE
 (word~) sin16s_gen2::$6 $6 zp ZP_WORD:15 11.0
 (signed word~) sin16s_gen2::$8 $8 zp ZP_WORD:15 22.0
 (label) sin16s_gen2::@1
+(label) sin16s_gen2::@2
 (label) sin16s_gen2::@3
 (label) sin16s_gen2::@4
-(label) sin16s_gen2::@5
 (label) sin16s_gen2::@return
 (signed word) sin16s_gen2::ampl
 (const signed word) sin16s_gen2::ampl#0 ampl = (const signed word) sin16s_gen2::max#0-(const signed word) sin16s_gen2::min#0
@@ -8307,12 +8342,12 @@ Score: 43790
   .label rem16u = 2
   .label xsin_idx = 2
 //SEG3 @begin
-//SEG4 @25
+//SEG4 @1
 //SEG5 kickasm(location (const byte*) LOGO#0) {{ .var logoPic = LoadPicture("logo.png", List().add($444444, $808080, $000000, $ffffff))     .for (var y=0; y<6	; y++)         .for (var x=0;x<40; x++)             .for(var cp=0; cp<8; cp++)                 .byte logoPic.getMulticolorByte(x,cp+y*8)  }}
-//SEG6 [2] phi from @25 to @28 [phi:@25->@28]
-//SEG7 @28
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+//SEG7 @2
 //SEG8 [3] call main 
-//SEG9 [4] phi from @28 to @end [phi:@28->@end]
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
 //SEG10 @end
 //SEG11 main
 main: {
@@ -8381,10 +8416,10 @@ main: {
   //SEG42 [21] call sin16s_gen2 
   //SEG43 [98] phi from main::@2 to sin16s_gen2 [phi:main::@2->sin16s_gen2]
     jsr sin16s_gen2
-  //SEG44 [22] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
-  //SEG45 main::@6
+  //SEG44 [22] phi from main::@2 to main::@5 [phi:main::@2->main::@5]
+  //SEG45 main::@5
   //SEG46 [23] call loop 
-  //SEG47 [25] phi from main::@6 to loop [phi:main::@6->loop]
+  //SEG47 [25] phi from main::@5 to loop [phi:main::@5->loop]
     jsr loop
   //SEG48 main::@return
   //SEG49 [24] return 
@@ -8402,13 +8437,13 @@ loop: {
   //SEG53 loop::@1
   b1:
   // Wait for the raster to reach the bottom of the screen
-  //SEG54 loop::@6
-  b6:
-  //SEG55 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG54 loop::@2
+  b2:
+  //SEG55 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto loop::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG56 loop::@8
+    bne b2
+  //SEG56 loop::@3
   //SEG57 [28] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG58 [29] (signed word*~) loop::$1 ← (const signed word[XSIN_SIZE#0]) xsin#0 + (word) xsin_idx#11 -- pwsz1=pwsc1_plus_vwuz2 
@@ -8430,7 +8465,7 @@ loop: {
   //SEG60 [31] (signed word) render_logo::xpos#0 ← (signed word) loop::xpos#0
   //SEG61 [32] call render_logo 
     jsr render_logo
-  //SEG62 loop::@15
+  //SEG62 loop::@5
   //SEG63 [33] (word) xsin_idx#3 ← (word) xsin_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vwuz1=vwuz1_plus_2 
     lda xsin_idx
     clc
@@ -8439,29 +8474,29 @@ loop: {
     bcc !+
     inc xsin_idx+1
   !:
-  //SEG64 [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@16 -- vwuz1_neq_vwuc1_then_la1 
+  //SEG64 [34] if((word) xsin_idx#3!=(const word) XSIN_SIZE#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto loop::@6 -- vwuz1_neq_vwuc1_then_la1 
     lda xsin_idx+1
     cmp #>XSIN_SIZE*2
-    bne b9
+    bne b4
     lda xsin_idx
     cmp #<XSIN_SIZE*2
-    bne b9
-  //SEG65 [35] phi from loop::@15 to loop::@9 [phi:loop::@15->loop::@9]
-  //SEG66 [35] phi (word) xsin_idx#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@15->loop::@9#0] -- vwuz1=vbuc1 
+    bne b4
+  //SEG65 [35] phi from loop::@5 to loop::@4 [phi:loop::@5->loop::@4]
+  //SEG66 [35] phi (word) xsin_idx#19 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@5->loop::@4#0] -- vwuz1=vbuc1 
     lda #0
     sta xsin_idx
     sta xsin_idx+1
-  //SEG67 loop::@9
-  b9:
+  //SEG67 loop::@4
+  b4:
   //SEG68 [36] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BORDERCOL
-  //SEG69 [26] phi from loop::@9 to loop::@1 [phi:loop::@9->loop::@1]
-  //SEG70 [26] phi (word) xsin_idx#11 = (word) xsin_idx#19 [phi:loop::@9->loop::@1#0] -- register_copy 
+  //SEG69 [26] phi from loop::@4 to loop::@1 [phi:loop::@4->loop::@1]
+  //SEG70 [26] phi (word) xsin_idx#11 = (word) xsin_idx#19 [phi:loop::@4->loop::@1#0] -- register_copy 
     jmp b1
-  //SEG71 [37] phi from loop::@15 to loop::@16 [phi:loop::@15->loop::@16]
-  //SEG72 loop::@16
-  //SEG73 [35] phi from loop::@16 to loop::@9 [phi:loop::@16->loop::@9]
-  //SEG74 [35] phi (word) xsin_idx#19 = (word) xsin_idx#3 [phi:loop::@16->loop::@9#0] -- register_copy 
+  //SEG71 [37] phi from loop::@5 to loop::@6 [phi:loop::@5->loop::@6]
+  //SEG72 loop::@6
+  //SEG73 [35] phi from loop::@6 to loop::@4 [phi:loop::@6->loop::@4]
+  //SEG74 [35] phi (word) xsin_idx#19 = (word) xsin_idx#3 [phi:loop::@6->loop::@4#0] -- register_copy 
 }
 //SEG75 render_logo
 // render_logo(signed word zeropage(9) xpos)
@@ -8500,30 +8535,30 @@ render_logo: {
   //SEG82 [44] if((signed word) render_logo::xpos#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto render_logo::@1 -- vwsz1_lt_0_then_la1 
     lda xpos+1
     bmi b1
-  //SEG83 [45] phi from render_logo to render_logo::@4 [phi:render_logo->render_logo::@4]
-  //SEG84 [45] phi (byte) render_logo::screen_idx#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo->render_logo::@4#0] -- vbuyy=vbuc1 
+  //SEG83 [45] phi from render_logo to render_logo::@2 [phi:render_logo->render_logo::@2]
+  //SEG84 [45] phi (byte) render_logo::screen_idx#18 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo->render_logo::@2#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG85 render_logo::@4
-  b4:
-  //SEG86 [46] if((byte) render_logo::screen_idx#18!=(byte)(signed byte) render_logo::x_char#0) goto render_logo::@7 -- vbuyy_neq_vbuz1_then_la1 
+  //SEG85 render_logo::@2
+  b2:
+  //SEG86 [46] if((byte) render_logo::screen_idx#18!=(byte)(signed byte) render_logo::x_char#0) goto render_logo::@3 -- vbuyy_neq_vbuz1_then_la1 
     cpy x_char
-    bne b7
-  //SEG87 [47] phi from render_logo::@4 to render_logo::@10 [phi:render_logo::@4->render_logo::@10]
-  //SEG88 [47] phi (byte) render_logo::logo_idx#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@4->render_logo::@10#0] -- vbuz1=vbuc1 
+    bne b3
+  //SEG87 [47] phi from render_logo::@2 to render_logo::@5 [phi:render_logo::@2->render_logo::@5]
+  //SEG88 [47] phi (byte) render_logo::logo_idx#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@2->render_logo::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta logo_idx
-  //SEG89 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#18 [phi:render_logo::@4->render_logo::@10#1] -- register_copy 
-  //SEG90 render_logo::@10
-  b10:
-  //SEG91 [48] if((byte) render_logo::screen_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@13 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG89 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#18 [phi:render_logo::@2->render_logo::@5#1] -- register_copy 
+  //SEG90 render_logo::@5
+  b5:
+  //SEG91 [48] if((byte) render_logo::screen_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@6 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$28
-    bne b13
+    bne b6
   //SEG92 render_logo::@return
   breturn:
   //SEG93 [49] return 
     rts
-  //SEG94 render_logo::@13
-  b13:
+  //SEG94 render_logo::@6
+  b6:
   //SEG95 [50] (byte/signed word/word/dword/signed dword~) render_logo::$15 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuaa=vbuz1_plus_0 
     lda logo_idx
   //SEG96 [51] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$15 -- pbuc1_derefidx_vbuyy=vbuaa 
@@ -8563,17 +8598,17 @@ render_logo: {
     adc logo_idx
   //SEG111 [61] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$50 -- pbuc1_derefidx_vbuyy=vbuaa 
     sta SCREEN+$28*5,y
-  //SEG112 render_logo::@14
+  //SEG112 render_logo::@7
   //SEG113 [62] (byte) render_logo::screen_idx#4 ← ++ (byte) render_logo::screen_idx#10 -- vbuyy=_inc_vbuyy 
     iny
   //SEG114 [63] (byte) render_logo::logo_idx#3 ← ++ (byte) render_logo::logo_idx#10 -- vbuz1=_inc_vbuz1 
     inc logo_idx
-  //SEG115 [47] phi from render_logo::@14 to render_logo::@10 [phi:render_logo::@14->render_logo::@10]
-  //SEG116 [47] phi (byte) render_logo::logo_idx#10 = (byte) render_logo::logo_idx#3 [phi:render_logo::@14->render_logo::@10#0] -- register_copy 
-  //SEG117 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#4 [phi:render_logo::@14->render_logo::@10#1] -- register_copy 
-    jmp b10
-  //SEG118 render_logo::@7
-  b7:
+  //SEG115 [47] phi from render_logo::@7 to render_logo::@5 [phi:render_logo::@7->render_logo::@5]
+  //SEG116 [47] phi (byte) render_logo::logo_idx#10 = (byte) render_logo::logo_idx#3 [phi:render_logo::@7->render_logo::@5#0] -- register_copy 
+  //SEG117 [47] phi (byte) render_logo::screen_idx#10 = (byte) render_logo::screen_idx#4 [phi:render_logo::@7->render_logo::@5#1] -- register_copy 
+    jmp b5
+  //SEG118 render_logo::@3
+  b3:
   //SEG119 [64] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#18) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuyy=vbuc2 
     lda #0
     sta SCREEN,y
@@ -8592,12 +8627,12 @@ render_logo: {
   //SEG128 render_logo::@7_5
   //SEG129 [69] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#18) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuyy=vbuc2 
     sta SCREEN+$28*5,y
-  //SEG130 render_logo::@8
+  //SEG130 render_logo::@4
   //SEG131 [70] (byte) render_logo::screen_idx#3 ← ++ (byte) render_logo::screen_idx#18 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG132 [45] phi from render_logo::@8 to render_logo::@4 [phi:render_logo::@8->render_logo::@4]
-  //SEG133 [45] phi (byte) render_logo::screen_idx#18 = (byte) render_logo::screen_idx#3 [phi:render_logo::@8->render_logo::@4#0] -- register_copy 
-    jmp b4
+  //SEG132 [45] phi from render_logo::@4 to render_logo::@2 [phi:render_logo::@4->render_logo::@2]
+  //SEG133 [45] phi (byte) render_logo::screen_idx#18 = (byte) render_logo::screen_idx#3 [phi:render_logo::@4->render_logo::@2#0] -- register_copy 
+    jmp b2
   //SEG134 render_logo::@1
   b1:
   //SEG135 [71] (signed byte~) render_logo::$17 ← - (signed byte) render_logo::x_char#0 -- vbsaa=_neg_vbsz1 
@@ -8607,26 +8642,26 @@ render_logo: {
     adc #1
   //SEG136 [72] (byte~) render_logo::logo_idx#14 ← (byte)(signed byte~) render_logo::$17 -- vbuz1=vbuaa 
     sta logo_idx
-  //SEG137 [73] phi from render_logo::@1 to render_logo::@21 [phi:render_logo::@1->render_logo::@21]
-  //SEG138 [73] phi (byte) render_logo::screen_idx#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@1->render_logo::@21#0] -- vbuyy=vbuc1 
+  //SEG137 [73] phi from render_logo::@1 to render_logo::@8 [phi:render_logo::@1->render_logo::@8]
+  //SEG138 [73] phi (byte) render_logo::screen_idx#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_logo::@1->render_logo::@8#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG139 [73] phi (byte) render_logo::logo_idx#11 = (byte~) render_logo::logo_idx#14 [phi:render_logo::@1->render_logo::@21#1] -- register_copy 
-  //SEG140 render_logo::@21
-  b21:
-  //SEG141 [74] if((byte) render_logo::logo_idx#11!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@24 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG139 [73] phi (byte) render_logo::logo_idx#11 = (byte~) render_logo::logo_idx#14 [phi:render_logo::@1->render_logo::@8#1] -- register_copy 
+  //SEG140 render_logo::@8
+  b8:
+  //SEG141 [74] if((byte) render_logo::logo_idx#11!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp logo_idx
-    bne b24
-  //SEG142 [75] phi from render_logo::@21 render_logo::@31 to render_logo::@27 [phi:render_logo::@21/render_logo::@31->render_logo::@27]
-  //SEG143 [75] phi (byte) render_logo::screen_idx#15 = (byte) render_logo::screen_idx#21 [phi:render_logo::@21/render_logo::@31->render_logo::@27#0] -- register_copy 
-  //SEG144 render_logo::@27
-  b27:
-  //SEG145 [76] if((byte) render_logo::screen_idx#15!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@30 -- vbuyy_neq_vbuc1_then_la1 
+    bne b9
+  //SEG142 [75] phi from render_logo::@13 render_logo::@8 to render_logo::@11 [phi:render_logo::@13/render_logo::@8->render_logo::@11]
+  //SEG143 [75] phi (byte) render_logo::screen_idx#15 = (byte) render_logo::screen_idx#6 [phi:render_logo::@13/render_logo::@8->render_logo::@11#0] -- register_copy 
+  //SEG144 render_logo::@11
+  b11:
+  //SEG145 [76] if((byte) render_logo::screen_idx#15!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render_logo::@12 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$28
-    bne b30
+    bne b12
     jmp breturn
-  //SEG146 render_logo::@30
-  b30:
+  //SEG146 render_logo::@12
+  b12:
   //SEG147 [77] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#15) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuyy=vbuc2 
     lda #0
     sta SCREEN,y
@@ -8645,12 +8680,12 @@ render_logo: {
   //SEG156 render_logo::@30_5
   //SEG157 [82] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#15) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- pbuc1_derefidx_vbuyy=vbuc2 
     sta SCREEN+$28*5,y
-  //SEG158 render_logo::@31
+  //SEG158 render_logo::@13
   //SEG159 [83] (byte) render_logo::screen_idx#6 ← ++ (byte) render_logo::screen_idx#15 -- vbuyy=_inc_vbuyy 
     iny
-    jmp b27
-  //SEG160 render_logo::@24
-  b24:
+    jmp b11
+  //SEG160 render_logo::@9
+  b9:
   //SEG161 [84] (byte/signed word/word/dword/signed dword~) render_logo::$23 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuaa=vbuz1_plus_0 
     lda logo_idx
   //SEG162 [85] *((const byte*) SCREEN#0 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$23 -- pbuc1_derefidx_vbuyy=vbuaa 
@@ -8690,15 +8725,15 @@ render_logo: {
     adc logo_idx
   //SEG177 [95] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$96 -- pbuc1_derefidx_vbuyy=vbuaa 
     sta SCREEN+$28*5,y
-  //SEG178 render_logo::@25
+  //SEG178 render_logo::@10
   //SEG179 [96] (byte) render_logo::screen_idx#5 ← ++ (byte) render_logo::screen_idx#21 -- vbuyy=_inc_vbuyy 
     iny
   //SEG180 [97] (byte) render_logo::logo_idx#4 ← ++ (byte) render_logo::logo_idx#11 -- vbuz1=_inc_vbuz1 
     inc logo_idx
-  //SEG181 [73] phi from render_logo::@25 to render_logo::@21 [phi:render_logo::@25->render_logo::@21]
-  //SEG182 [73] phi (byte) render_logo::screen_idx#21 = (byte) render_logo::screen_idx#5 [phi:render_logo::@25->render_logo::@21#0] -- register_copy 
-  //SEG183 [73] phi (byte) render_logo::logo_idx#11 = (byte) render_logo::logo_idx#4 [phi:render_logo::@25->render_logo::@21#1] -- register_copy 
-    jmp b21
+  //SEG181 [73] phi from render_logo::@10 to render_logo::@8 [phi:render_logo::@10->render_logo::@8]
+  //SEG182 [73] phi (byte) render_logo::screen_idx#21 = (byte) render_logo::screen_idx#5 [phi:render_logo::@10->render_logo::@8#0] -- register_copy 
+  //SEG183 [73] phi (byte) render_logo::logo_idx#11 = (byte) render_logo::logo_idx#4 [phi:render_logo::@10->render_logo::@8#1] -- register_copy 
+    jmp b8
 }
 //SEG184 sin16s_gen2
 // Generate signed word sinus table - with values in the range min-max.
@@ -8721,29 +8756,29 @@ sin16s_gen2: {
   //SEG186 [189] phi from sin16s_gen2 to div32u16u [phi:sin16s_gen2->div32u16u]
     jsr div32u16u
   //SEG187 [100] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  //SEG188 sin16s_gen2::@3
+  //SEG188 sin16s_gen2::@2
   //SEG189 [101] (dword) sin16s_gen2::step#0 ← (dword) div32u16u::return#2
-  //SEG190 [102] phi from sin16s_gen2::@3 to sin16s_gen2::@1 [phi:sin16s_gen2::@3->sin16s_gen2::@1]
-  //SEG191 [102] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
+  //SEG190 [102] phi from sin16s_gen2::@2 to sin16s_gen2::@1 [phi:sin16s_gen2::@2->sin16s_gen2::@1]
+  //SEG191 [102] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG192 [102] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[XSIN_SIZE#0]) xsin#0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
+  //SEG192 [102] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[XSIN_SIZE#0]) xsin#0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
     lda #<xsin
     sta sintab
     lda #>xsin
     sta sintab+1
-  //SEG193 [102] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#2] -- vduz1=vbuc1 
+  //SEG193 [102] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     sta x+1
     sta x+2
     sta x+3
   // u[4.28]
-  //SEG194 [102] phi from sin16s_gen2::@5 to sin16s_gen2::@1 [phi:sin16s_gen2::@5->sin16s_gen2::@1]
-  //SEG195 [102] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#0] -- register_copy 
-  //SEG196 [102] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@5->sin16s_gen2::@1#1] -- register_copy 
-  //SEG197 [102] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#2] -- register_copy 
+  //SEG194 [102] phi from sin16s_gen2::@4 to sin16s_gen2::@1 [phi:sin16s_gen2::@4->sin16s_gen2::@1]
+  //SEG195 [102] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#0] -- register_copy 
+  //SEG196 [102] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@4->sin16s_gen2::@1#1] -- register_copy 
+  //SEG197 [102] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#2] -- register_copy 
   //SEG198 sin16s_gen2::@1
   b1:
   //SEG199 [103] (dword) sin16s::x#0 ← (dword) sin16s_gen2::x#2 -- vduz1=vduz2 
@@ -8758,12 +8793,12 @@ sin16s_gen2: {
   //SEG200 [104] call sin16s 
     jsr sin16s
   //SEG201 [105] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  //SEG202 sin16s_gen2::@4
+  //SEG202 sin16s_gen2::@3
   //SEG203 [106] (signed word) mul16s::a#0 ← (signed word) sin16s::return#0
   //SEG204 [107] call mul16s 
     jsr mul16s
   //SEG205 [108] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-  //SEG206 sin16s_gen2::@5
+  //SEG206 sin16s_gen2::@4
   //SEG207 [109] (signed dword~) sin16s_gen2::$5 ← (signed dword) mul16s::return#2
   //SEG208 [110] (word~) sin16s_gen2::$6 ← > (signed dword~) sin16s_gen2::$5 -- vwuz1=_hi_vdsz2 
     lda _5+2
@@ -8850,7 +8885,7 @@ mul16s: {
     sta mul16u.b+1
     jsr mul16u
   //SEG223 [120] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  //SEG224 mul16s::@6
+  //SEG224 mul16s::@4
   //SEG225 [121] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   //SEG226 [122] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
@@ -8874,8 +8909,8 @@ mul16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG231 [126] phi from mul16s::@3 mul16s::@6 to mul16s::@1 [phi:mul16s::@3/mul16s::@6->mul16s::@1]
-  //SEG232 [126] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@6->mul16s::@1#0] -- register_copy 
+  //SEG231 [126] phi from mul16s::@3 mul16s::@4 to mul16s::@1 [phi:mul16s::@3/mul16s::@4->mul16s::@1]
+  //SEG232 [126] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@4->mul16s::@1#0] -- register_copy 
   //SEG233 mul16s::@1
   //SEG234 mul16s::@2
   b2:
@@ -8924,10 +8959,10 @@ mul16u: {
   //SEG249 [134] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG250 [135] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG250 [135] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG251 mul16u::@6
+    beq b4
+  //SEG251 mul16u::@3
   //SEG252 [136] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -8942,10 +8977,10 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG253 [137] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  //SEG254 [137] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-  //SEG255 mul16u::@8
-  b8:
+  //SEG253 [137] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  //SEG254 [137] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+  //SEG255 mul16u::@4
+  b4:
   //SEG256 [138] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -8955,10 +8990,10 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG258 [131] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  //SEG259 [131] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG260 [131] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG261 [131] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG258 [131] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  //SEG259 [131] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG260 [131] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG261 [131] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG262 sin16s
@@ -9094,7 +9129,7 @@ sin16s: {
   //SEG287 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG288 [151] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  //SEG289 sin16s::@8
+  //SEG289 sin16s::@7
   //SEG290 [152] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -9107,33 +9142,33 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG293 [155] call mulu16_sel 
-  //SEG294 [180] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  //SEG295 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG294 [180] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  //SEG295 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG296 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG297 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG296 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG297 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG298 [156] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_1
     lda mulu16_sel.return+1
     sta mulu16_sel.return_1+1
-  //SEG299 sin16s::@9
+  //SEG299 sin16s::@8
   //SEG300 [157] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   //SEG301 [158] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   //SEG302 [159] call mulu16_sel 
-  //SEG303 [180] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  //SEG304 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG303 [180] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  //SEG304 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG305 [180] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG305 [180] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG306 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG306 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG307 [160] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  //SEG308 sin16s::@10
+  //SEG308 sin16s::@9
   //SEG309 [161] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   //SEG310 [162] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -9150,18 +9185,18 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG313 [165] call mulu16_sel 
-  //SEG314 [180] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  //SEG315 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG314 [180] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  //SEG315 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG316 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG317 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG316 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG317 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG318 [166] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_10
     lda mulu16_sel.return+1
     sta mulu16_sel.return_10+1
-  //SEG319 sin16s::@11
+  //SEG319 sin16s::@10
   //SEG320 [167] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   //SEG321 [168] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   //SEG322 [169] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -9170,14 +9205,14 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG323 [170] call mulu16_sel 
-  //SEG324 [180] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  //SEG325 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG324 [180] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  //SEG325 [180] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG326 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG327 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG326 [180] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG327 [180] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG328 [171] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  //SEG329 sin16s::@12
+  //SEG329 sin16s::@11
   //SEG330 [172] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   //SEG331 [173] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -9194,7 +9229,7 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG333 [175] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG333 [175] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
     beq b3
@@ -9209,14 +9244,14 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG336 [177] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  //SEG337 [177] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG336 [177] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  //SEG337 [177] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
   //SEG338 sin16s::@3
   b3:
   //SEG339 sin16s::@return
   //SEG340 [178] return 
     rts
-  //SEG341 sin16s::@15
+  //SEG341 sin16s::@12
   //SEG342 [179] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
 }
 //SEG343 mulu16_sel
@@ -9243,7 +9278,7 @@ mulu16_sel: {
   //SEG349 [129] phi (word) mul16u::b#2 = (word) mul16u::b#1 [phi:mulu16_sel->mul16u#1] -- register_copy 
     jsr mul16u
   //SEG350 [184] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-  //SEG351 mulu16_sel::@2
+  //SEG351 mulu16_sel::@1
   //SEG352 [185] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#3
   //SEG353 [186] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5 -- vduz1=vduz1_rol_vbuxx 
     cpx #0
@@ -9285,7 +9320,7 @@ div32u16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG362 [191] (word) divr16u::return#2 ← (word) divr16u::return#0
-  //SEG363 div32u16u::@2
+  //SEG363 div32u16u::@1
   //SEG364 [192] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return
     sta quotient_hi
@@ -9293,16 +9328,16 @@ div32u16u: {
     sta quotient_hi+1
   //SEG365 [193] (word) divr16u::rem#4 ← (word) rem16u#1
   //SEG366 [194] call divr16u 
-  //SEG367 [199] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  //SEG368 [199] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG367 [199] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  //SEG368 [199] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG369 [199] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG369 [199] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG370 [195] (word) divr16u::return#3 ← (word) divr16u::return#0
-  //SEG371 div32u16u::@3
+  //SEG371 div32u16u::@2
   //SEG372 [196] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   //SEG373 [197] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda quotient_hi
diff --git a/src/test/ref/examples/scrolllogo/scrolllogo.sym b/src/test/ref/examples/scrolllogo/scrolllogo.sym
index 520884aae..b4e39000b 100644
--- a/src/test/ref/examples/scrolllogo/scrolllogo.sym
+++ b/src/test/ref/examples/scrolllogo/scrolllogo.sym
@@ -1,5 +1,5 @@
-(label) @25
-(label) @28
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -109,8 +109,8 @@
 (const word) XSIN_SIZE#0 XSIN_SIZE = (word/signed word/dword/signed dword) $200
 (byte) YELLOW
 (dword()) div32u16u((dword) div32u16u::dividend , (word) div32u16u::divisor)
+(label) div32u16u::@1
 (label) div32u16u::@2
-(label) div32u16u::@3
 (label) div32u16u::@return
 (dword) div32u16u::dividend
 (word) div32u16u::divisor
@@ -173,11 +173,11 @@
 (void()) loop()
 (signed word*~) loop::$1 $1 zp ZP_WORD:9 22.0
 (label) loop::@1
-(label) loop::@15
-(label) loop::@16
+(label) loop::@2
+(label) loop::@3
+(label) loop::@4
+(label) loop::@5
 (label) loop::@6
-(label) loop::@8
-(label) loop::@9
 (signed word) loop::xpos
 (signed word) loop::xpos#0 xpos zp ZP_WORD:9 22.0
 (void()) main()
@@ -185,7 +185,7 @@
 (label) main::@2
 (label) main::@3
 (label) main::@4
-(label) main::@6
+(label) main::@5
 (label) main::@return
 (byte) main::ch
 (byte) main::ch#1 reg byte x 16.5
@@ -210,7 +210,7 @@
 (label) mul16s::@1
 (label) mul16s::@2
 (label) mul16s::@3
-(label) mul16s::@6
+(label) mul16s::@4
 (label) mul16s::@return
 (signed word) mul16s::a
 (signed word) mul16s::a#0 a zp ZP_WORD:23 2.6
@@ -226,8 +226,8 @@
 (byte/word~) mul16u::$1 reg byte a 202.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:17 101.0
@@ -252,7 +252,7 @@
 (word()) mulu16_sel((word) mulu16_sel::v1 , (word) mulu16_sel::v2 , (byte) mulu16_sel::select)
 (dword~) mulu16_sel::$0 $0 zp ZP_DWORD:11 4.0
 (dword~) mulu16_sel::$1 $1 zp ZP_DWORD:11 4.0
-(label) mulu16_sel::@2
+(label) mulu16_sel::@1
 (label) mulu16_sel::@return
 (word) mulu16_sel::return
 (word) mulu16_sel::return#0 return zp ZP_WORD:15 4.0
@@ -301,30 +301,29 @@
 (byte/signed word/word/dword/signed dword~) render_logo::$96 reg byte a 202.0
 (label) render_logo::@1
 (label) render_logo::@10
+(label) render_logo::@11
+(label) render_logo::@12
 (label) render_logo::@13
 (label) render_logo::@13_1
 (label) render_logo::@13_2
 (label) render_logo::@13_3
 (label) render_logo::@13_4
 (label) render_logo::@13_5
-(label) render_logo::@14
-(label) render_logo::@21
-(label) render_logo::@24
+(label) render_logo::@2
 (label) render_logo::@24_1
 (label) render_logo::@24_2
 (label) render_logo::@24_3
 (label) render_logo::@24_4
 (label) render_logo::@24_5
-(label) render_logo::@25
-(label) render_logo::@27
-(label) render_logo::@30
+(label) render_logo::@3
 (label) render_logo::@30_1
 (label) render_logo::@30_2
 (label) render_logo::@30_3
 (label) render_logo::@30_4
 (label) render_logo::@30_5
-(label) render_logo::@31
 (label) render_logo::@4
+(label) render_logo::@5
+(label) render_logo::@6
 (label) render_logo::@7
 (label) render_logo::@7_1
 (label) render_logo::@7_2
@@ -332,6 +331,7 @@
 (label) render_logo::@7_4
 (label) render_logo::@7_5
 (label) render_logo::@8
+(label) render_logo::@9
 (label) render_logo::@return
 (byte) render_logo::line
 (byte) render_logo::logo_idx
@@ -360,12 +360,12 @@
 (label) sin16s::@10
 (label) sin16s::@11
 (label) sin16s::@12
-(label) sin16s::@15
 (label) sin16s::@2
 (label) sin16s::@3
 (label) sin16s::@4
 (label) sin16s::@5
 (label) sin16s::@6
+(label) sin16s::@7
 (label) sin16s::@8
 (label) sin16s::@9
 (label) sin16s::@return
@@ -405,9 +405,9 @@
 (word~) sin16s_gen2::$6 $6 zp ZP_WORD:15 11.0
 (signed word~) sin16s_gen2::$8 $8 zp ZP_WORD:15 22.0
 (label) sin16s_gen2::@1
+(label) sin16s_gen2::@2
 (label) sin16s_gen2::@3
 (label) sin16s_gen2::@4
-(label) sin16s_gen2::@5
 (label) sin16s_gen2::@return
 (signed word) sin16s_gen2::ampl
 (const signed word) sin16s_gen2::ampl#0 ampl = (const signed word) sin16s_gen2::max#0-(const signed word) sin16s_gen2::min#0
diff --git a/src/test/ref/examples/showlogo/showlogo.asm b/src/test/ref/examples/showlogo/showlogo.asm
index f934e8327..18e0c2005 100644
--- a/src/test/ref/examples/showlogo/showlogo.asm
+++ b/src/test/ref/examples/showlogo/showlogo.asm
@@ -51,16 +51,16 @@ main: {
     sta fill.addr+1
     jsr fill
     ldx #0
-  b7:
+  b2:
     txa
     sta SCREEN,x
     inx
     cpx #$f0
-    bne b7
-  b2:
+    bne b2
+  b1:
     inc SCREEN+$3e7
     inc $d020 
-    jmp b2
+    jmp b1
 }
 // Fill some memory with a value
 // fill(word zeropage(2) size, byte register(X) val)
diff --git a/src/test/ref/examples/showlogo/showlogo.cfg b/src/test/ref/examples/showlogo/showlogo.cfg
index 5be7b0111..57295f1bb 100644
--- a/src/test/ref/examples/showlogo/showlogo.cfg
+++ b/src/test/ref/examples/showlogo/showlogo.cfg
@@ -1,21 +1,21 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) LOGO#0) {{ .var logoPic = LoadPicture("logo.png", List().add($444444, $808080, $000000, $ffffff))
     .for (var y=0; y<6	; y++)
         .for (var x=0;x<40; x++)
             .for(var cp=0; cp<8; cp++)
                 .byte logoPic.getMulticolorByte(x,cp+y*8)
  }}
-  to:@6
-@6: scope:[]  from @4
+  to:@2
+@2: scope:[]  from @1
   [2] phi()
   [3] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @2
   [4] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @2
   [5] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0
   [6] *((const byte*) BGCOL2#0) ← (const byte) DARK_GREY#0
   [7] *((const byte*) BGCOL#0) ← *((const byte*) BGCOL2#0)
@@ -23,30 +23,30 @@ main: scope:[main]  from @6
   to:main::toD0181
 main::toD0181: scope:[main]  from main
   [9] phi()
-  to:main::@9
-main::@9: scope:[main]  from main::toD0181
+  to:main::@3
+main::@3: scope:[main]  from main::toD0181
   [10] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0
   [11] *((const byte*) D016#0) ← (const byte) VIC_MCM#0|(const byte) VIC_CSEL#0
   [12] call fill 
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [13] phi()
   [14] call fill 
-  to:main::@7
-main::@7: scope:[main]  from main::@10 main::@7
-  [15] (byte) main::ch#2 ← phi( main::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::ch#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@2 main::@4
+  [15] (byte) main::ch#2 ← phi( main::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::ch#1 )
   [16] *((const byte*) SCREEN#0 + (byte) main::ch#2) ← (byte) main::ch#2
   [17] (byte) main::ch#1 ← ++ (byte) main::ch#2
-  [18] if((byte) main::ch#1!=(byte/word/signed word/dword/signed dword) $f0) goto main::@7
-  to:main::@2
-main::@2: scope:[main]  from main::@2 main::@7
+  [18] if((byte) main::ch#1!=(byte/word/signed word/dword/signed dword) $f0) goto main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@1 main::@2
   [19] *((const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e7) ← ++ *((const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e7)
   kickasm() {{ inc $d020  }}
-  to:main::@2
-fill: scope:[fill]  from main::@10 main::@9
-  [21] (byte) fill::val#3 ← phi( main::@10/(const byte) WHITE#0|(byte/signed byte/word/signed word/dword/signed dword) 8 main::@9/(const byte) BLACK#0 )
-  [21] (word) fill::size#2 ← phi( main::@10/(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 main::@9/(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 )
-  [21] (byte*) fill::addr#0 ← phi( main::@10/(const byte*) COLS#0 main::@9/(const byte*) SCREEN#0 )
+  to:main::@1
+fill: scope:[fill]  from main::@3 main::@4
+  [21] (byte) fill::val#3 ← phi( main::@4/(const byte) WHITE#0|(byte/signed byte/word/signed word/dword/signed dword) 8 main::@3/(const byte) BLACK#0 )
+  [21] (word) fill::size#2 ← phi( main::@4/(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 main::@3/(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 )
+  [21] (byte*) fill::addr#0 ← phi( main::@4/(const byte*) COLS#0 main::@3/(const byte*) SCREEN#0 )
   [22] (byte*) fill::end#0 ← (byte*) fill::addr#0 + (word) fill::size#2
   to:fill::@1
 fill::@1: scope:[fill]  from fill fill::@1
diff --git a/src/test/ref/examples/showlogo/showlogo.log b/src/test/ref/examples/showlogo/showlogo.log
index a7b0867a1..2c9caa52d 100644
--- a/src/test/ref/examples/showlogo/showlogo.log
+++ b/src/test/ref/examples/showlogo/showlogo.log
@@ -629,31 +629,37 @@ Coalesced [30] fill::addr#4 ← fill::addr#1
 Coalesced down to 4 phi equivalence classes
 Culled Empty Block (label) main::@12
 Culled Empty Block (label) fill::@3
+Renumbering block @4 to @1
+Renumbering block @6 to @2
+Renumbering block main::@2 to main::@1
+Renumbering block main::@7 to main::@2
+Renumbering block main::@9 to main::@3
+Renumbering block main::@10 to main::@4
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @6
+Adding NOP phi() at start of @2
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::toD0181
-Adding NOP phi() at start of main::@10
+Adding NOP phi() at start of main::@4
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const byte*) LOGO#0) {{ .var logoPic = LoadPicture("logo.png", List().add($444444, $808080, $000000, $ffffff))
     .for (var y=0; y<6	; y++)
         .for (var x=0;x<40; x++)
             .for(var cp=0; cp<8; cp++)
                 .byte logoPic.getMulticolorByte(x,cp+y*8)
  }}
-  to:@6
-@6: scope:[]  from @4
+  to:@2
+@2: scope:[]  from @1
   [2] phi()
   [3] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @2
   [4] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @2
   [5] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0
   [6] *((const byte*) BGCOL2#0) ← (const byte) DARK_GREY#0
   [7] *((const byte*) BGCOL#0) ← *((const byte*) BGCOL2#0)
@@ -661,30 +667,30 @@ main: scope:[main]  from @6
   to:main::toD0181
 main::toD0181: scope:[main]  from main
   [9] phi()
-  to:main::@9
-main::@9: scope:[main]  from main::toD0181
+  to:main::@3
+main::@3: scope:[main]  from main::toD0181
   [10] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0
   [11] *((const byte*) D016#0) ← (const byte) VIC_MCM#0|(const byte) VIC_CSEL#0
   [12] call fill 
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [13] phi()
   [14] call fill 
-  to:main::@7
-main::@7: scope:[main]  from main::@10 main::@7
-  [15] (byte) main::ch#2 ← phi( main::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::ch#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@2 main::@4
+  [15] (byte) main::ch#2 ← phi( main::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::ch#1 )
   [16] *((const byte*) SCREEN#0 + (byte) main::ch#2) ← (byte) main::ch#2
   [17] (byte) main::ch#1 ← ++ (byte) main::ch#2
-  [18] if((byte) main::ch#1!=(byte/word/signed word/dword/signed dword) $f0) goto main::@7
-  to:main::@2
-main::@2: scope:[main]  from main::@2 main::@7
+  [18] if((byte) main::ch#1!=(byte/word/signed word/dword/signed dword) $f0) goto main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@1 main::@2
   [19] *((const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e7) ← ++ *((const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e7)
   kickasm() {{ inc $d020  }}
-  to:main::@2
-fill: scope:[fill]  from main::@10 main::@9
-  [21] (byte) fill::val#3 ← phi( main::@10/(const byte) WHITE#0|(byte/signed byte/word/signed word/dword/signed dword) 8 main::@9/(const byte) BLACK#0 )
-  [21] (word) fill::size#2 ← phi( main::@10/(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 main::@9/(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 )
-  [21] (byte*) fill::addr#0 ← phi( main::@10/(const byte*) COLS#0 main::@9/(const byte*) SCREEN#0 )
+  to:main::@1
+fill: scope:[fill]  from main::@3 main::@4
+  [21] (byte) fill::val#3 ← phi( main::@4/(const byte) WHITE#0|(byte/signed byte/word/signed word/dword/signed dword) 8 main::@3/(const byte) BLACK#0 )
+  [21] (word) fill::size#2 ← phi( main::@4/(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 main::@3/(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 )
+  [21] (byte*) fill::addr#0 ← phi( main::@4/(const byte*) COLS#0 main::@3/(const byte*) SCREEN#0 )
   [22] (byte*) fill::end#0 ← (byte*) fill::addr#0 + (word) fill::size#2
   to:fill::@1
 fill::@1: scope:[fill]  from fill fill::@1
@@ -852,19 +858,19 @@ INITIAL ASM
   .label LOGO = $2000
 //SEG3 @begin
 bbegin:
-  jmp b4
-//SEG4 @4
-b4:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) LOGO#0) {{ .var logoPic = LoadPicture("logo.png", List().add($444444, $808080, $000000, $ffffff))     .for (var y=0; y<6	; y++)         .for (var x=0;x<40; x++)             .for(var cp=0; cp<8; cp++)                 .byte logoPic.getMulticolorByte(x,cp+y*8)  }}
-//SEG6 [2] phi from @4 to @6 [phi:@4->@6]
-b6_from_b4:
-  jmp b6
-//SEG7 @6
-b6:
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG7 @2
+b2:
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG10 @end
 bend:
@@ -889,9 +895,9 @@ main: {
     jmp toD0181
   //SEG17 main::toD0181
   toD0181:
-    jmp b9
-  //SEG18 main::@9
-  b9:
+    jmp b3
+  //SEG18 main::@3
+  b3:
   //SEG19 [10] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
@@ -899,74 +905,74 @@ main: {
     lda #VIC_MCM|VIC_CSEL
     sta D016
   //SEG21 [12] call fill 
-  //SEG22 [21] phi from main::@9 to fill [phi:main::@9->fill]
-  fill_from_b9:
-  //SEG23 [21] phi (byte) fill::val#3 = (const byte) BLACK#0 [phi:main::@9->fill#0] -- vbuz1=vbuc1 
+  //SEG22 [21] phi from main::@3 to fill [phi:main::@3->fill]
+  fill_from_b3:
+  //SEG23 [21] phi (byte) fill::val#3 = (const byte) BLACK#0 [phi:main::@3->fill#0] -- vbuz1=vbuc1 
     lda #BLACK
     sta fill.val
-  //SEG24 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@9->fill#1] -- vwuz1=vwuc1 
+  //SEG24 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@3->fill#1] -- vwuz1=vwuc1 
     lda #<$28*$19
     sta fill.size
     lda #>$28*$19
     sta fill.size+1
-  //SEG25 [21] phi (byte*) fill::addr#0 = (const byte*) SCREEN#0 [phi:main::@9->fill#2] -- pbuz1=pbuc1 
+  //SEG25 [21] phi (byte*) fill::addr#0 = (const byte*) SCREEN#0 [phi:main::@3->fill#2] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta fill.addr
     lda #>SCREEN
     sta fill.addr+1
     jsr fill
-  //SEG26 [13] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG27 main::@10
-  b10:
+  //SEG26 [13] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG27 main::@4
+  b4:
   //SEG28 [14] call fill 
-  //SEG29 [21] phi from main::@10 to fill [phi:main::@10->fill]
-  fill_from_b10:
-  //SEG30 [21] phi (byte) fill::val#3 = (const byte) WHITE#0|(byte/signed byte/word/signed word/dword/signed dword) 8 [phi:main::@10->fill#0] -- vbuz1=vbuc1 
+  //SEG29 [21] phi from main::@4 to fill [phi:main::@4->fill]
+  fill_from_b4:
+  //SEG30 [21] phi (byte) fill::val#3 = (const byte) WHITE#0|(byte/signed byte/word/signed word/dword/signed dword) 8 [phi:main::@4->fill#0] -- vbuz1=vbuc1 
     lda #WHITE|8
     sta fill.val
-  //SEG31 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@10->fill#1] -- vwuz1=vwuc1 
+  //SEG31 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@4->fill#1] -- vwuz1=vwuc1 
     lda #<$28*$19
     sta fill.size
     lda #>$28*$19
     sta fill.size+1
-  //SEG32 [21] phi (byte*) fill::addr#0 = (const byte*) COLS#0 [phi:main::@10->fill#2] -- pbuz1=pbuc1 
+  //SEG32 [21] phi (byte*) fill::addr#0 = (const byte*) COLS#0 [phi:main::@4->fill#2] -- pbuz1=pbuc1 
     lda #<COLS
     sta fill.addr
     lda #>COLS
     sta fill.addr+1
     jsr fill
-  //SEG33 [15] phi from main::@10 to main::@7 [phi:main::@10->main::@7]
-  b7_from_b10:
-  //SEG34 [15] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@10->main::@7#0] -- vbuz1=vbuc1 
+  //SEG33 [15] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG34 [15] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta ch
-    jmp b7
-  //SEG35 [15] phi from main::@7 to main::@7 [phi:main::@7->main::@7]
-  b7_from_b7:
-  //SEG36 [15] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@7->main::@7#0] -- register_copy 
-    jmp b7
-  //SEG37 main::@7
-  b7:
+    jmp b2
+  //SEG35 [15] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG36 [15] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG37 main::@2
+  b2:
   //SEG38 [16] *((const byte*) SCREEN#0 + (byte) main::ch#2) ← (byte) main::ch#2 -- pbuc1_derefidx_vbuz1=vbuz1 
     ldy ch
     tya
     sta SCREEN,y
   //SEG39 [17] (byte) main::ch#1 ← ++ (byte) main::ch#2 -- vbuz1=_inc_vbuz1 
     inc ch
-  //SEG40 [18] if((byte) main::ch#1!=(byte/word/signed word/dword/signed dword) $f0) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG40 [18] if((byte) main::ch#1!=(byte/word/signed word/dword/signed dword) $f0) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$f0
     cmp ch
-    bne b7_from_b7
-    jmp b2
-  //SEG41 main::@2
-  b2:
+    bne b2_from_b2
+    jmp b1
+  //SEG41 main::@1
+  b1:
   //SEG42 [19] *((const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e7) ← ++ *((const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e7) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc SCREEN+$3e7
   //SEG43 kickasm() {{ inc $d020  }}
     inc $d020 
-    jmp b2
+    jmp b1
 }
 //SEG44 fill
 // Fill some memory with a value
@@ -1085,19 +1091,19 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label LOGO = $2000
 //SEG3 @begin
 bbegin:
-  jmp b4
-//SEG4 @4
-b4:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const byte*) LOGO#0) {{ .var logoPic = LoadPicture("logo.png", List().add($444444, $808080, $000000, $ffffff))     .for (var y=0; y<6	; y++)         .for (var x=0;x<40; x++)             .for(var cp=0; cp<8; cp++)                 .byte logoPic.getMulticolorByte(x,cp+y*8)  }}
-//SEG6 [2] phi from @4 to @6 [phi:@4->@6]
-b6_from_b4:
-  jmp b6
-//SEG7 @6
-b6:
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG7 @2
+b2:
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG10 @end
 bend:
@@ -1121,9 +1127,9 @@ main: {
     jmp toD0181
   //SEG17 main::toD0181
   toD0181:
-    jmp b9
-  //SEG18 main::@9
-  b9:
+    jmp b3
+  //SEG18 main::@3
+  b3:
   //SEG19 [10] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
@@ -1131,69 +1137,69 @@ main: {
     lda #VIC_MCM|VIC_CSEL
     sta D016
   //SEG21 [12] call fill 
-  //SEG22 [21] phi from main::@9 to fill [phi:main::@9->fill]
-  fill_from_b9:
-  //SEG23 [21] phi (byte) fill::val#3 = (const byte) BLACK#0 [phi:main::@9->fill#0] -- vbuxx=vbuc1 
+  //SEG22 [21] phi from main::@3 to fill [phi:main::@3->fill]
+  fill_from_b3:
+  //SEG23 [21] phi (byte) fill::val#3 = (const byte) BLACK#0 [phi:main::@3->fill#0] -- vbuxx=vbuc1 
     ldx #BLACK
-  //SEG24 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@9->fill#1] -- vwuz1=vwuc1 
+  //SEG24 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@3->fill#1] -- vwuz1=vwuc1 
     lda #<$28*$19
     sta fill.size
     lda #>$28*$19
     sta fill.size+1
-  //SEG25 [21] phi (byte*) fill::addr#0 = (const byte*) SCREEN#0 [phi:main::@9->fill#2] -- pbuz1=pbuc1 
+  //SEG25 [21] phi (byte*) fill::addr#0 = (const byte*) SCREEN#0 [phi:main::@3->fill#2] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta fill.addr
     lda #>SCREEN
     sta fill.addr+1
     jsr fill
-  //SEG26 [13] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG27 main::@10
-  b10:
+  //SEG26 [13] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG27 main::@4
+  b4:
   //SEG28 [14] call fill 
-  //SEG29 [21] phi from main::@10 to fill [phi:main::@10->fill]
-  fill_from_b10:
-  //SEG30 [21] phi (byte) fill::val#3 = (const byte) WHITE#0|(byte/signed byte/word/signed word/dword/signed dword) 8 [phi:main::@10->fill#0] -- vbuxx=vbuc1 
+  //SEG29 [21] phi from main::@4 to fill [phi:main::@4->fill]
+  fill_from_b4:
+  //SEG30 [21] phi (byte) fill::val#3 = (const byte) WHITE#0|(byte/signed byte/word/signed word/dword/signed dword) 8 [phi:main::@4->fill#0] -- vbuxx=vbuc1 
     ldx #WHITE|8
-  //SEG31 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@10->fill#1] -- vwuz1=vwuc1 
+  //SEG31 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@4->fill#1] -- vwuz1=vwuc1 
     lda #<$28*$19
     sta fill.size
     lda #>$28*$19
     sta fill.size+1
-  //SEG32 [21] phi (byte*) fill::addr#0 = (const byte*) COLS#0 [phi:main::@10->fill#2] -- pbuz1=pbuc1 
+  //SEG32 [21] phi (byte*) fill::addr#0 = (const byte*) COLS#0 [phi:main::@4->fill#2] -- pbuz1=pbuc1 
     lda #<COLS
     sta fill.addr
     lda #>COLS
     sta fill.addr+1
     jsr fill
-  //SEG33 [15] phi from main::@10 to main::@7 [phi:main::@10->main::@7]
-  b7_from_b10:
-  //SEG34 [15] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@10->main::@7#0] -- vbuxx=vbuc1 
+  //SEG33 [15] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG34 [15] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@2#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b7
-  //SEG35 [15] phi from main::@7 to main::@7 [phi:main::@7->main::@7]
-  b7_from_b7:
-  //SEG36 [15] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@7->main::@7#0] -- register_copy 
-    jmp b7
-  //SEG37 main::@7
-  b7:
+    jmp b2
+  //SEG35 [15] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG36 [15] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG37 main::@2
+  b2:
   //SEG38 [16] *((const byte*) SCREEN#0 + (byte) main::ch#2) ← (byte) main::ch#2 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta SCREEN,x
   //SEG39 [17] (byte) main::ch#1 ← ++ (byte) main::ch#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG40 [18] if((byte) main::ch#1!=(byte/word/signed word/dword/signed dword) $f0) goto main::@7 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG40 [18] if((byte) main::ch#1!=(byte/word/signed word/dword/signed dword) $f0) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$f0
-    bne b7_from_b7
-    jmp b2
-  //SEG41 main::@2
-  b2:
+    bne b2_from_b2
+    jmp b1
+  //SEG41 main::@1
+  b1:
   //SEG42 [19] *((const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e7) ← ++ *((const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e7) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc SCREEN+$3e7
   //SEG43 kickasm() {{ inc $d020  }}
     inc $d020 
-    jmp b2
+    jmp b1
 }
 //SEG44 fill
 // Fill some memory with a value
@@ -1248,52 +1254,52 @@ fill: {
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b4
-Removing instruction jmp b6
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp bend
 Removing instruction jmp toD0181
-Removing instruction jmp b9
-Removing instruction jmp b10
-Removing instruction jmp b7
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp b2
 Removing instruction jmp b1
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda BGCOL2
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b7_from_b7 with b7
+Replacing label b2_from_b2 with b2
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b4:
-Removing instruction b6_from_b4:
-Removing instruction b6:
-Removing instruction bend_from_b6:
+Removing instruction b1:
+Removing instruction b2_from_b1:
+Removing instruction b2:
+Removing instruction bend_from_b2:
 Removing instruction toD0181_from_main:
 Removing instruction toD0181:
-Removing instruction b10_from_b9:
-Removing instruction fill_from_b10:
-Removing instruction b7_from_b7:
+Removing instruction b4_from_b3:
+Removing instruction fill_from_b4:
+Removing instruction b2_from_b2:
 Removing instruction b1_from_fill:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b9:
-Removing instruction fill_from_b9:
-Removing instruction b10:
-Removing instruction b7_from_b10:
+Removing instruction b3:
+Removing instruction fill_from_b3:
+Removing instruction b4:
+Removing instruction b2_from_b4:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Removing instruction jmp b7
+Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @4
-(label) @6
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -1406,10 +1412,10 @@ FINAL SYMBOL TABLE
 (byte) fill::val
 (byte) fill::val#3 reg byte x 1.8333333333333333
 (void()) main()
-(label) main::@10
+(label) main::@1
 (label) main::@2
-(label) main::@7
-(label) main::@9
+(label) main::@3
+(label) main::@4
 (byte) main::ch
 (byte) main::ch#1 reg byte x 16.5
 (byte) main::ch#2 reg byte x 22.0
@@ -1460,12 +1466,12 @@ Score: 3572
   .label SCREEN = $400
   .label LOGO = $2000
 //SEG3 @begin
-//SEG4 @4
+//SEG4 @1
 //SEG5 kickasm(location (const byte*) LOGO#0) {{ .var logoPic = LoadPicture("logo.png", List().add($444444, $808080, $000000, $ffffff))     .for (var y=0; y<6	; y++)         .for (var x=0;x<40; x++)             .for(var cp=0; cp<8; cp++)                 .byte logoPic.getMulticolorByte(x,cp+y*8)  }}
-//SEG6 [2] phi from @4 to @6 [phi:@4->@6]
-//SEG7 @6
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+//SEG7 @2
 //SEG8 [3] call main 
-//SEG9 [4] phi from @6 to @end [phi:@6->@end]
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
 //SEG10 @end
 //SEG11 main
 main: {
@@ -1483,7 +1489,7 @@ main: {
     sta BGCOL3
   //SEG16 [9] phi from main to main::toD0181 [phi:main->main::toD0181]
   //SEG17 main::toD0181
-  //SEG18 main::@9
+  //SEG18 main::@3
   //SEG19 [10] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
@@ -1491,59 +1497,59 @@ main: {
     lda #VIC_MCM|VIC_CSEL
     sta D016
   //SEG21 [12] call fill 
-  //SEG22 [21] phi from main::@9 to fill [phi:main::@9->fill]
-  //SEG23 [21] phi (byte) fill::val#3 = (const byte) BLACK#0 [phi:main::@9->fill#0] -- vbuxx=vbuc1 
+  //SEG22 [21] phi from main::@3 to fill [phi:main::@3->fill]
+  //SEG23 [21] phi (byte) fill::val#3 = (const byte) BLACK#0 [phi:main::@3->fill#0] -- vbuxx=vbuc1 
     ldx #BLACK
-  //SEG24 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@9->fill#1] -- vwuz1=vwuc1 
+  //SEG24 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@3->fill#1] -- vwuz1=vwuc1 
     lda #<$28*$19
     sta fill.size
     lda #>$28*$19
     sta fill.size+1
-  //SEG25 [21] phi (byte*) fill::addr#0 = (const byte*) SCREEN#0 [phi:main::@9->fill#2] -- pbuz1=pbuc1 
+  //SEG25 [21] phi (byte*) fill::addr#0 = (const byte*) SCREEN#0 [phi:main::@3->fill#2] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta fill.addr
     lda #>SCREEN
     sta fill.addr+1
     jsr fill
-  //SEG26 [13] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  //SEG27 main::@10
+  //SEG26 [13] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG27 main::@4
   //SEG28 [14] call fill 
-  //SEG29 [21] phi from main::@10 to fill [phi:main::@10->fill]
-  //SEG30 [21] phi (byte) fill::val#3 = (const byte) WHITE#0|(byte/signed byte/word/signed word/dword/signed dword) 8 [phi:main::@10->fill#0] -- vbuxx=vbuc1 
+  //SEG29 [21] phi from main::@4 to fill [phi:main::@4->fill]
+  //SEG30 [21] phi (byte) fill::val#3 = (const byte) WHITE#0|(byte/signed byte/word/signed word/dword/signed dword) 8 [phi:main::@4->fill#0] -- vbuxx=vbuc1 
     ldx #WHITE|8
-  //SEG31 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@10->fill#1] -- vwuz1=vwuc1 
+  //SEG31 [21] phi (word) fill::size#2 = (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@4->fill#1] -- vwuz1=vwuc1 
     lda #<$28*$19
     sta fill.size
     lda #>$28*$19
     sta fill.size+1
-  //SEG32 [21] phi (byte*) fill::addr#0 = (const byte*) COLS#0 [phi:main::@10->fill#2] -- pbuz1=pbuc1 
+  //SEG32 [21] phi (byte*) fill::addr#0 = (const byte*) COLS#0 [phi:main::@4->fill#2] -- pbuz1=pbuc1 
     lda #<COLS
     sta fill.addr
     lda #>COLS
     sta fill.addr+1
     jsr fill
-  //SEG33 [15] phi from main::@10 to main::@7 [phi:main::@10->main::@7]
-  //SEG34 [15] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@10->main::@7#0] -- vbuxx=vbuc1 
+  //SEG33 [15] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  //SEG34 [15] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@2#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG35 [15] phi from main::@7 to main::@7 [phi:main::@7->main::@7]
-  //SEG36 [15] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@7->main::@7#0] -- register_copy 
-  //SEG37 main::@7
-  b7:
+  //SEG35 [15] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  //SEG36 [15] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@2->main::@2#0] -- register_copy 
+  //SEG37 main::@2
+  b2:
   //SEG38 [16] *((const byte*) SCREEN#0 + (byte) main::ch#2) ← (byte) main::ch#2 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta SCREEN,x
   //SEG39 [17] (byte) main::ch#1 ← ++ (byte) main::ch#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG40 [18] if((byte) main::ch#1!=(byte/word/signed word/dword/signed dword) $f0) goto main::@7 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG40 [18] if((byte) main::ch#1!=(byte/word/signed word/dword/signed dword) $f0) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$f0
-    bne b7
-  //SEG41 main::@2
-  b2:
+    bne b2
+  //SEG41 main::@1
+  b1:
   //SEG42 [19] *((const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e7) ← ++ *((const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e7) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc SCREEN+$3e7
   //SEG43 kickasm() {{ inc $d020  }}
     inc $d020 
-    jmp b2
+    jmp b1
 }
 //SEG44 fill
 // Fill some memory with a value
diff --git a/src/test/ref/examples/showlogo/showlogo.sym b/src/test/ref/examples/showlogo/showlogo.sym
index 8e857109d..7d34aa76c 100644
--- a/src/test/ref/examples/showlogo/showlogo.sym
+++ b/src/test/ref/examples/showlogo/showlogo.sym
@@ -1,5 +1,5 @@
-(label) @4
-(label) @6
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -112,10 +112,10 @@
 (byte) fill::val
 (byte) fill::val#3 reg byte x 1.8333333333333333
 (void()) main()
-(label) main::@10
+(label) main::@1
 (label) main::@2
-(label) main::@7
-(label) main::@9
+(label) main::@3
+(label) main::@4
 (byte) main::ch
 (byte) main::ch#1 reg byte x 16.5
 (byte) main::ch#2 reg byte x 22.0
diff --git a/src/test/ref/examples/sinplotter/sine-plotter.asm b/src/test/ref/examples/sinplotter/sine-plotter.asm
index edbfd3ec6..f64b97b56 100644
--- a/src/test/ref/examples/sinplotter/sine-plotter.asm
+++ b/src/test/ref/examples/sinplotter/sine-plotter.asm
@@ -59,9 +59,9 @@ main: {
     jsr bitmap_clear
     jsr sin16s_gen2
     jsr render_sine
-  b2:
+  b1:
     inc BGCOL
-    jmp b2
+    jmp b1
 }
 render_sine: {
     .label _0 = 6
@@ -214,12 +214,12 @@ wrap_y: {
     eor #$80
   !:
     bpl b2
-  b4:
+  b3:
     lda y+1
-    bmi b5
+    bmi b4
     lda y
     rts
-  b5:
+  b4:
     clc
     lda y
     adc #<$c8
@@ -227,7 +227,7 @@ wrap_y: {
     lda y+1
     adc #>$c8
     sta y+1
-    jmp b4
+    jmp b3
   b2:
     sec
     lda y
@@ -397,7 +397,7 @@ mul16u: {
     lda a
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -411,7 +411,7 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  b8:
+  b4:
     clc
     ror a+1
     ror a
@@ -768,7 +768,7 @@ bitmap_init: {
     lda #>BITMAP
     sta yoffs+1
     ldx #0
-  b5:
+  b3:
     lda #7
     sax _3
     lda yoffs
@@ -779,7 +779,7 @@ bitmap_init: {
     txa
     and #7
     cmp #7
-    bne b6
+    bne b4
     clc
     lda yoffs
     adc #<$28*8
@@ -787,10 +787,10 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  b6:
+  b4:
     inx
     cpx #0
-    bne b5
+    bne b3
     rts
 }
 // Fill some memory with a value
diff --git a/src/test/ref/examples/sinplotter/sine-plotter.cfg b/src/test/ref/examples/sinplotter/sine-plotter.cfg
index 8c101abf2..1e1fafb22 100644
--- a/src/test/ref/examples/sinplotter/sine-plotter.cfg
+++ b/src/test/ref/examples/sinplotter/sine-plotter.cfg
@@ -1,19 +1,19 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@29
-@29: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const signed word*) sin2#0) {{ .for(var i=0; i<512; i++) {
   	  .word sin(toRadians([i*360]/512))*320
     }
  }}
-  to:@32
-@32: scope:[]  from @29
+  to:@2
+@2: scope:[]  from @1
   [2] phi()
   [3] call main 
   to:@end
-@end: scope:[]  from @32
+@end: scope:[]  from @2
   [4] phi()
-main: scope:[main]  from @32
+main: scope:[main]  from @2
   asm { sei  }
   [6] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [7] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
@@ -27,37 +27,37 @@ main::vicSelectGfxBank1_toDd001: scope:[main]  from main::vicSelectGfxBank1
   to:main::vicSelectGfxBank1_@1
 main::vicSelectGfxBank1_@1: scope:[main]  from main::vicSelectGfxBank1_toDd001
   [11] *((const byte*) CIA2_PORT_A#0) ← (const byte) main::vicSelectGfxBank1_toDd001_return#0
-  to:main::@7
-main::@7: scope:[main]  from main::vicSelectGfxBank1_@1
+  to:main::@2
+main::@2: scope:[main]  from main::vicSelectGfxBank1_@1
   [12] *((const byte*) D016#0) ← (const byte) VIC_CSEL#0
   to:main::toD0181
-main::toD0181: scope:[main]  from main::@7
+main::toD0181: scope:[main]  from main::@2
   [13] phi()
-  to:main::@8
-main::@8: scope:[main]  from main::toD0181
+  to:main::@3
+main::@3: scope:[main]  from main::toD0181
   [14] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0
   [15] call fill 
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [16] phi()
   [17] call bitmap_init 
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [18] phi()
   [19] call bitmap_clear 
-  to:main::@11
-main::@11: scope:[main]  from main::@10
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [20] phi()
   [21] call sin16s_gen2 
-  to:main::@12
-main::@12: scope:[main]  from main::@11
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [22] phi()
   [23] call render_sine 
-  to:main::@2
-main::@2: scope:[main]  from main::@12 main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@1 main::@7
   [24] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
-  to:main::@2
-render_sine: scope:[render_sine]  from main::@12
+  to:main::@1
+render_sine: scope:[render_sine]  from main::@7
   [25] phi()
   to:render_sine::@1
 render_sine::@1: scope:[render_sine]  from render_sine render_sine::@2
@@ -69,45 +69,45 @@ render_sine::@1: scope:[render_sine]  from render_sine render_sine::@2
   [30] (signed word) wrap_y::y#0 ← (signed word) render_sine::sin_val#0
   [31] call wrap_y 
   [32] (byte) wrap_y::return#0 ← (byte) wrap_y::return#2
-  to:render_sine::@5
-render_sine::@5: scope:[render_sine]  from render_sine::@1
+  to:render_sine::@3
+render_sine::@3: scope:[render_sine]  from render_sine::@1
   [33] (byte) render_sine::ypos#0 ← (byte) wrap_y::return#0
   [34] (word) bitmap_plot::x#0 ← (word) render_sine::xpos#3
   [35] (byte) bitmap_plot::y#0 ← (byte) render_sine::ypos#0
   [36] call bitmap_plot 
-  to:render_sine::@6
-render_sine::@6: scope:[render_sine]  from render_sine::@5
+  to:render_sine::@4
+render_sine::@4: scope:[render_sine]  from render_sine::@3
   [37] (word~) render_sine::$4 ← (word) render_sine::sin_idx#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [38] (signed word*~) render_sine::$5 ← (const signed word*) sin2#0 + (word~) render_sine::$4
   [39] (signed word) render_sine::sin2_val#0 ← *((signed word*~) render_sine::$5)
   [40] (signed word) wrap_y::y#1 ← (signed word) render_sine::sin2_val#0 + (byte/signed byte/word/signed word/dword/signed dword) $a
   [41] call wrap_y 
   [42] (byte) wrap_y::return#1 ← (byte) wrap_y::return#2
-  to:render_sine::@7
-render_sine::@7: scope:[render_sine]  from render_sine::@6
+  to:render_sine::@5
+render_sine::@5: scope:[render_sine]  from render_sine::@4
   [43] (byte) render_sine::ypos2#0 ← (byte) wrap_y::return#1
   [44] (word) bitmap_plot::x#1 ← (word) render_sine::xpos#3
   [45] (byte) bitmap_plot::y#1 ← (byte) render_sine::ypos2#0
   [46] call bitmap_plot 
-  to:render_sine::@8
-render_sine::@8: scope:[render_sine]  from render_sine::@7
+  to:render_sine::@6
+render_sine::@6: scope:[render_sine]  from render_sine::@5
   [47] (word) render_sine::xpos#1 ← ++ (word) render_sine::xpos#3
-  [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@10
+  [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@7
   to:render_sine::@2
-render_sine::@2: scope:[render_sine]  from render_sine::@10 render_sine::@8
-  [49] (word) render_sine::xpos#8 ← phi( render_sine::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 render_sine::@10/(word) render_sine::xpos#1 )
+render_sine::@2: scope:[render_sine]  from render_sine::@6 render_sine::@7
+  [49] (word) render_sine::xpos#8 ← phi( render_sine::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 render_sine::@7/(word) render_sine::xpos#1 )
   [50] (word) render_sine::sin_idx#1 ← ++ (word) render_sine::sin_idx#2
   [51] if((word) render_sine::sin_idx#1<(const word) SIN_SIZE#0) goto render_sine::@1
   to:render_sine::@return
 render_sine::@return: scope:[render_sine]  from render_sine::@2
   [52] return 
   to:@return
-render_sine::@10: scope:[render_sine]  from render_sine::@8
+render_sine::@7: scope:[render_sine]  from render_sine::@6
   [53] phi()
   to:render_sine::@2
-bitmap_plot: scope:[bitmap_plot]  from render_sine::@5 render_sine::@7
-  [54] (word) bitmap_plot::x#2 ← phi( render_sine::@5/(word) bitmap_plot::x#0 render_sine::@7/(word) bitmap_plot::x#1 )
-  [54] (byte) bitmap_plot::y#2 ← phi( render_sine::@5/(byte) bitmap_plot::y#0 render_sine::@7/(byte) bitmap_plot::y#1 )
+bitmap_plot: scope:[bitmap_plot]  from render_sine::@3 render_sine::@5
+  [54] (word) bitmap_plot::x#2 ← phi( render_sine::@3/(word) bitmap_plot::x#0 render_sine::@5/(word) bitmap_plot::x#1 )
+  [54] (byte) bitmap_plot::y#2 ← phi( render_sine::@3/(byte) bitmap_plot::y#0 render_sine::@5/(byte) bitmap_plot::y#1 )
   [55] (word~) bitmap_plot::$3 ← *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_plot::y#2) w= *((const byte[$100]) bitmap_plot_ylo#0 + (byte) bitmap_plot::y#2)
   [56] (word~) bitmap_plot::$1 ← (word) bitmap_plot::x#2 & (word/dword/signed dword) $fff8
   [57] (byte*) bitmap_plot::plotter#1 ← (byte*)(word~) bitmap_plot::$3 + (word~) bitmap_plot::$1
@@ -117,51 +117,51 @@ bitmap_plot: scope:[bitmap_plot]  from render_sine::@5 render_sine::@7
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [60] return 
   to:@return
-wrap_y: scope:[wrap_y]  from render_sine::@1 render_sine::@6
-  [61] (signed word) wrap_y::y#9 ← phi( render_sine::@1/(signed word) wrap_y::y#0 render_sine::@6/(signed word) wrap_y::y#1 )
+wrap_y: scope:[wrap_y]  from render_sine::@1 render_sine::@4
+  [61] (signed word) wrap_y::y#9 ← phi( render_sine::@1/(signed word) wrap_y::y#0 render_sine::@4/(signed word) wrap_y::y#1 )
   to:wrap_y::@1
 wrap_y::@1: scope:[wrap_y]  from wrap_y wrap_y::@2
   [62] (signed word) wrap_y::y#4 ← phi( wrap_y/(signed word) wrap_y::y#9 wrap_y::@2/(signed word) wrap_y::y#2 )
   [63] if((signed word) wrap_y::y#4>=(byte/word/signed word/dword/signed dword) $c8) goto wrap_y::@2
-  to:wrap_y::@4
-wrap_y::@4: scope:[wrap_y]  from wrap_y::@1 wrap_y::@5
-  [64] (signed word) wrap_y::y#6 ← phi( wrap_y::@1/(signed word) wrap_y::y#4 wrap_y::@5/(signed word) wrap_y::y#3 )
-  [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@5
-  to:wrap_y::@6
-wrap_y::@6: scope:[wrap_y]  from wrap_y::@4
+  to:wrap_y::@3
+wrap_y::@3: scope:[wrap_y]  from wrap_y::@1 wrap_y::@4
+  [64] (signed word) wrap_y::y#6 ← phi( wrap_y::@1/(signed word) wrap_y::y#4 wrap_y::@4/(signed word) wrap_y::y#3 )
+  [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@4
+  to:wrap_y::@5
+wrap_y::@5: scope:[wrap_y]  from wrap_y::@3
   [66] (byte) wrap_y::return#2 ← ((byte)) (signed word) wrap_y::y#6
   to:wrap_y::@return
-wrap_y::@return: scope:[wrap_y]  from wrap_y::@6
+wrap_y::@return: scope:[wrap_y]  from wrap_y::@5
   [67] return 
   to:@return
-wrap_y::@5: scope:[wrap_y]  from wrap_y::@4
+wrap_y::@4: scope:[wrap_y]  from wrap_y::@3
   [68] (signed word) wrap_y::y#3 ← (signed word) wrap_y::y#6 + (byte/word/signed word/dword/signed dword) $c8
-  to:wrap_y::@4
+  to:wrap_y::@3
 wrap_y::@2: scope:[wrap_y]  from wrap_y::@1
   [69] (signed word) wrap_y::y#2 ← (signed word) wrap_y::y#4 - (byte/word/signed word/dword/signed dword) $c8
   to:wrap_y::@1
-sin16s_gen2: scope:[sin16s_gen2]  from main::@11
+sin16s_gen2: scope:[sin16s_gen2]  from main::@6
   [70] phi()
   [71] call div32u16u 
   [72] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  to:sin16s_gen2::@3
-sin16s_gen2::@3: scope:[sin16s_gen2]  from sin16s_gen2
+  to:sin16s_gen2::@2
+sin16s_gen2::@2: scope:[sin16s_gen2]  from sin16s_gen2
   [73] (dword) sin16s_gen2::step#0 ← (dword) div32u16u::return#2
   to:sin16s_gen2::@1
-sin16s_gen2::@1: scope:[sin16s_gen2]  from sin16s_gen2::@3 sin16s_gen2::@5
-  [74] (word) sin16s_gen2::i#2 ← phi( sin16s_gen2::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@5/(word) sin16s_gen2::i#1 )
-  [74] (signed word*) sin16s_gen2::sintab#2 ← phi( sin16s_gen2::@3/(const signed word[$200]) sin#0 sin16s_gen2::@5/(signed word*) sin16s_gen2::sintab#0 )
-  [74] (dword) sin16s_gen2::x#2 ← phi( sin16s_gen2::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@5/(dword) sin16s_gen2::x#1 )
+sin16s_gen2::@1: scope:[sin16s_gen2]  from sin16s_gen2::@2 sin16s_gen2::@4
+  [74] (word) sin16s_gen2::i#2 ← phi( sin16s_gen2::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@4/(word) sin16s_gen2::i#1 )
+  [74] (signed word*) sin16s_gen2::sintab#2 ← phi( sin16s_gen2::@2/(const signed word[$200]) sin#0 sin16s_gen2::@4/(signed word*) sin16s_gen2::sintab#0 )
+  [74] (dword) sin16s_gen2::x#2 ← phi( sin16s_gen2::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@4/(dword) sin16s_gen2::x#1 )
   [75] (dword) sin16s::x#0 ← (dword) sin16s_gen2::x#2
   [76] call sin16s 
   [77] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  to:sin16s_gen2::@4
-sin16s_gen2::@4: scope:[sin16s_gen2]  from sin16s_gen2::@1
+  to:sin16s_gen2::@3
+sin16s_gen2::@3: scope:[sin16s_gen2]  from sin16s_gen2::@1
   [78] (signed word) mul16s::a#0 ← (signed word) sin16s::return#0
   [79] call mul16s 
   [80] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-  to:sin16s_gen2::@5
-sin16s_gen2::@5: scope:[sin16s_gen2]  from sin16s_gen2::@4
+  to:sin16s_gen2::@4
+sin16s_gen2::@4: scope:[sin16s_gen2]  from sin16s_gen2::@3
   [81] (signed dword~) sin16s_gen2::$5 ← (signed dword) mul16s::return#2
   [82] (word~) sin16s_gen2::$6 ← > (signed dword~) sin16s_gen2::$5
   [83] (signed word~) sin16s_gen2::$8 ← (const signed word) sin16s_gen2::offs#0 + (signed word)(word~) sin16s_gen2::$6
@@ -171,25 +171,25 @@ sin16s_gen2::@5: scope:[sin16s_gen2]  from sin16s_gen2::@4
   [87] (word) sin16s_gen2::i#1 ← ++ (word) sin16s_gen2::i#2
   [88] if((word) sin16s_gen2::i#1<(const word) SIN_SIZE#0) goto sin16s_gen2::@1
   to:sin16s_gen2::@return
-sin16s_gen2::@return: scope:[sin16s_gen2]  from sin16s_gen2::@5
+sin16s_gen2::@return: scope:[sin16s_gen2]  from sin16s_gen2::@4
   [89] return 
   to:@return
-mul16s: scope:[mul16s]  from sin16s_gen2::@4
+mul16s: scope:[mul16s]  from sin16s_gen2::@3
   [90] (word~) mul16u::a#8 ← (word)(signed word) mul16s::a#0
   [91] call mul16u 
   [92] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mul16s::@6
-mul16s::@6: scope:[mul16s]  from mul16s
+  to:mul16s::@4
+mul16s::@4: scope:[mul16s]  from mul16s
   [93] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   [94] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1
   to:mul16s::@3
-mul16s::@3: scope:[mul16s]  from mul16s::@6
+mul16s::@3: scope:[mul16s]  from mul16s::@4
   [95] (word~) mul16s::$9 ← > (dword) mul16s::m#0
   [96] (word~) mul16s::$16 ← (word~) mul16s::$9 - ((word))(const signed word) sin16s_gen2::ampl#0
   [97] (dword) mul16s::m#1 ← (dword) mul16s::m#0 hi= (word~) mul16s::$16
   to:mul16s::@1
-mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@6
-  [98] (dword) mul16s::m#4 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@6/(dword) mul16s::m#0 )
+mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@4
+  [98] (dword) mul16s::m#4 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@4/(dword) mul16s::m#0 )
   to:mul16s::@2
 mul16s::@2: scope:[mul16s]  from mul16s::@1
   [99] (signed dword) mul16s::return#0 ← ((signed dword)) (dword) mul16s::m#4
@@ -202,10 +202,10 @@ mul16u: scope:[mul16u]  from mul16s mulu16_sel
   [101] (word) mul16u::b#2 ← phi( mul16s/((word))(const signed word) sin16s_gen2::ampl#0 mulu16_sel/(word) mul16u::b#1 )
   [102] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#2
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [103] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [103] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [103] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [103] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [103] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [103] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@4/(word) mul16u::a#0 )
   [104] if((word) mul16u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -213,13 +213,13 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [106] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [107] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [107] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [108] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [109] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [109] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [110] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [111] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
@@ -245,91 +245,91 @@ sin16s::@2: scope:[sin16s]  from sin16s::@1 sin16s::@5
   [121] (word) mulu16_sel::v2#0 ← (word) sin16s::x1#0
   [122] call mulu16_sel 
   [123] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  to:sin16s::@8
-sin16s::@8: scope:[sin16s]  from sin16s::@2
+  to:sin16s::@7
+sin16s::@7: scope:[sin16s]  from sin16s::@2
   [124] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   [125] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   [126] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0
   [127] call mulu16_sel 
   [128] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12
-  to:sin16s::@9
-sin16s::@9: scope:[sin16s]  from sin16s::@8
+  to:sin16s::@8
+sin16s::@8: scope:[sin16s]  from sin16s::@7
   [129] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   [130] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   [131] call mulu16_sel 
   [132] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  to:sin16s::@10
-sin16s::@10: scope:[sin16s]  from sin16s::@9
+  to:sin16s::@9
+sin16s::@9: scope:[sin16s]  from sin16s::@8
   [133] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   [134] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0
   [135] (word) mulu16_sel::v1#3 ← (word) sin16s::x3#0
   [136] (word) mulu16_sel::v2#3 ← (word) sin16s::x1#0
   [137] call mulu16_sel 
   [138] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12
-  to:sin16s::@11
-sin16s::@11: scope:[sin16s]  from sin16s::@10
+  to:sin16s::@10
+sin16s::@10: scope:[sin16s]  from sin16s::@9
   [139] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   [140] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   [141] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0
   [142] call mulu16_sel 
   [143] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  to:sin16s::@12
-sin16s::@12: scope:[sin16s]  from sin16s::@11
+  to:sin16s::@11
+sin16s::@11: scope:[sin16s]  from sin16s::@10
   [144] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   [145] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [146] (word) sin16s::usinx#1 ← (word) sin16s::usinx#0 + (word) sin16s::x5_128#0
-  [147] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15
+  [147] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12
   to:sin16s::@6
-sin16s::@6: scope:[sin16s]  from sin16s::@12
+sin16s::@6: scope:[sin16s]  from sin16s::@11
   [148] (signed word) sin16s::sinx#1 ← - (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-sin16s::@3: scope:[sin16s]  from sin16s::@15 sin16s::@6
-  [149] (signed word) sin16s::return#1 ← phi( sin16s::@15/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
+sin16s::@3: scope:[sin16s]  from sin16s::@12 sin16s::@6
+  [149] (signed word) sin16s::return#1 ← phi( sin16s::@12/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
   to:sin16s::@return
 sin16s::@return: scope:[sin16s]  from sin16s::@3
   [150] return 
   to:@return
-sin16s::@15: scope:[sin16s]  from sin16s::@12
+sin16s::@12: scope:[sin16s]  from sin16s::@11
   [151] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@11 sin16s::@2 sin16s::@8 sin16s::@9
-  [152] (byte) mulu16_sel::select#5 ← phi( sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [152] (word) mulu16_sel::v2#5 ← phi( sin16s::@10/(word) mulu16_sel::v2#3 sin16s::@11/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@8/(word) mulu16_sel::v2#1 sin16s::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
-  [152] (word) mulu16_sel::v1#5 ← phi( sin16s::@10/(word) mulu16_sel::v1#3 sin16s::@11/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@8/(word) mulu16_sel::v1#1 sin16s::@9/(word) mulu16_sel::v1#2 )
+mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@2 sin16s::@7 sin16s::@8 sin16s::@9
+  [152] (byte) mulu16_sel::select#5 ← phi( sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [152] (word) mulu16_sel::v2#5 ← phi( sin16s::@9/(word) mulu16_sel::v2#3 sin16s::@10/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@7/(word) mulu16_sel::v2#1 sin16s::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
+  [152] (word) mulu16_sel::v1#5 ← phi( sin16s::@9/(word) mulu16_sel::v1#3 sin16s::@10/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@7/(word) mulu16_sel::v1#1 sin16s::@8/(word) mulu16_sel::v1#2 )
   [153] (word) mul16u::a#2 ← (word) mulu16_sel::v1#5
   [154] (word) mul16u::b#1 ← (word) mulu16_sel::v2#5
   [155] call mul16u 
   [156] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-  to:mulu16_sel::@2
-mulu16_sel::@2: scope:[mulu16_sel]  from mulu16_sel
+  to:mulu16_sel::@1
+mulu16_sel::@1: scope:[mulu16_sel]  from mulu16_sel
   [157] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#3
   [158] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5
   [159] (word) mulu16_sel::return#12 ← > (dword~) mulu16_sel::$1
   to:mulu16_sel::@return
-mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@2
+mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@1
   [160] return 
   to:@return
 div32u16u: scope:[div32u16u]  from sin16s_gen2
   [161] phi()
   [162] call divr16u 
   [163] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div32u16u::@2
-div32u16u::@2: scope:[div32u16u]  from div32u16u
+  to:div32u16u::@1
+div32u16u::@1: scope:[div32u16u]  from div32u16u
   [164] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2
   [165] (word) divr16u::rem#4 ← (word) rem16u#1
   [166] call divr16u 
   [167] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:div32u16u::@3
-div32u16u::@3: scope:[div32u16u]  from div32u16u::@2
+  to:div32u16u::@2
+div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   [168] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   [169] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0
   to:div32u16u::@return
-div32u16u::@return: scope:[div32u16u]  from div32u16u::@3
+div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
   [170] return 
   to:@return
-divr16u: scope:[divr16u]  from div32u16u div32u16u::@2
-  [171] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@2/<(const dword) PI2_u4f28#0 )
-  [171] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@2/(word) divr16u::rem#4 )
+divr16u: scope:[divr16u]  from div32u16u div32u16u::@1
+  [171] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@1/<(const dword) PI2_u4f28#0 )
+  [171] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@1/(word) divr16u::rem#4 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [172] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
@@ -366,7 +366,7 @@ divr16u::@6: scope:[divr16u]  from divr16u::@3
 divr16u::@return: scope:[divr16u]  from divr16u::@6
   [188] return 
   to:@return
-bitmap_clear: scope:[bitmap_clear]  from main::@10
+bitmap_clear: scope:[bitmap_clear]  from main::@5
   [189] (word~) bitmap_clear::$3 ← *((const byte[$100]) bitmap_plot_yhi#0) w= *((const byte[$100]) bitmap_plot_ylo#0)
   [190] (byte*~) bitmap_clear::bitmap#5 ← (byte*)(word~) bitmap_clear::$3
   to:bitmap_clear::@1
@@ -389,7 +389,7 @@ bitmap_clear::@3: scope:[bitmap_clear]  from bitmap_clear::@2
 bitmap_clear::@return: scope:[bitmap_clear]  from bitmap_clear::@3
   [199] return 
   to:@return
-bitmap_init: scope:[bitmap_init]  from main::@9
+bitmap_init: scope:[bitmap_init]  from main::@4
   [200] phi()
   to:bitmap_init::@1
 bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
@@ -397,16 +397,16 @@ bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
   [201] (byte) bitmap_init::bits#3 ← phi( bitmap_init/(byte/word/signed word/dword/signed dword) $80 bitmap_init::@2/(byte) bitmap_init::bits#4 )
   [202] *((const byte[$100]) bitmap_plot_bit#0 + (byte) bitmap_init::x#2) ← (byte) bitmap_init::bits#3
   [203] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [204] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10
+  [204] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6
   to:bitmap_init::@2
-bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@10
-  [205] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@10/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
+bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@6
+  [205] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@6/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
   [206] (byte) bitmap_init::x#1 ← ++ (byte) bitmap_init::x#2
   [207] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1
-  to:bitmap_init::@5
-bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
-  [208] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/(const byte*) BITMAP#0 bitmap_init::@6/(byte*) bitmap_init::yoffs#4 )
-  [208] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte) bitmap_init::y#1 )
+  to:bitmap_init::@3
+bitmap_init::@3: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@4
+  [208] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/(const byte*) BITMAP#0 bitmap_init::@4/(byte*) bitmap_init::yoffs#4 )
+  [208] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte) bitmap_init::y#1 )
   [209] (byte~) bitmap_init::$3 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [210] (byte~) bitmap_init::$4 ← < (byte*) bitmap_init::yoffs#2
   [211] (byte~) bitmap_init::$5 ← (byte~) bitmap_init::$3 | (byte~) bitmap_init::$4
@@ -414,23 +414,23 @@ bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
   [213] (byte~) bitmap_init::$6 ← > (byte*) bitmap_init::yoffs#2
   [214] *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_init::y#2) ← (byte~) bitmap_init::$6
   [215] (byte~) bitmap_init::$7 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [216] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6
-  to:bitmap_init::@7
-bitmap_init::@7: scope:[bitmap_init]  from bitmap_init::@5
+  [216] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4
+  to:bitmap_init::@5
+bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@3
   [217] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:bitmap_init::@6
-bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@5 bitmap_init::@7
-  [218] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@5/(byte*) bitmap_init::yoffs#2 bitmap_init::@7/(byte*) bitmap_init::yoffs#1 )
+  to:bitmap_init::@4
+bitmap_init::@4: scope:[bitmap_init]  from bitmap_init::@3 bitmap_init::@5
+  [218] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@3/(byte*) bitmap_init::yoffs#2 bitmap_init::@5/(byte*) bitmap_init::yoffs#1 )
   [219] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2
-  [220] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5
+  [220] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3
   to:bitmap_init::@return
-bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@6
+bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@4
   [221] return 
   to:@return
-bitmap_init::@10: scope:[bitmap_init]  from bitmap_init::@1
+bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@1
   [222] phi()
   to:bitmap_init::@2
-fill: scope:[fill]  from main::@8
+fill: scope:[fill]  from main::@3
   [223] phi()
   to:fill::@1
 fill::@1: scope:[fill]  from fill fill::@1
diff --git a/src/test/ref/examples/sinplotter/sine-plotter.log b/src/test/ref/examples/sinplotter/sine-plotter.log
index 35613ce4e..6b091a289 100644
--- a/src/test/ref/examples/sinplotter/sine-plotter.log
+++ b/src/test/ref/examples/sinplotter/sine-plotter.log
@@ -2514,40 +2514,76 @@ Culled Empty Block (label) bitmap_init::@11
 Culled Empty Block (label) bitmap_init::@12
 Culled Empty Block (label) bitmap_init::@9
 Culled Empty Block (label) fill::@3
+Renumbering block @29 to @1
+Renumbering block @32 to @2
+Renumbering block div32u16u::@2 to div32u16u::@1
+Renumbering block div32u16u::@3 to div32u16u::@2
+Renumbering block mul16u::@6 to mul16u::@3
+Renumbering block mul16u::@8 to mul16u::@4
+Renumbering block mul16s::@6 to mul16s::@4
+Renumbering block sin16s_gen2::@3 to sin16s_gen2::@2
+Renumbering block sin16s_gen2::@4 to sin16s_gen2::@3
+Renumbering block sin16s_gen2::@5 to sin16s_gen2::@4
+Renumbering block sin16s::@8 to sin16s::@7
+Renumbering block sin16s::@9 to sin16s::@8
+Renumbering block sin16s::@10 to sin16s::@9
+Renumbering block sin16s::@11 to sin16s::@10
+Renumbering block sin16s::@12 to sin16s::@11
+Renumbering block sin16s::@15 to sin16s::@12
+Renumbering block mulu16_sel::@2 to mulu16_sel::@1
+Renumbering block bitmap_init::@5 to bitmap_init::@3
+Renumbering block bitmap_init::@6 to bitmap_init::@4
+Renumbering block bitmap_init::@7 to bitmap_init::@5
+Renumbering block bitmap_init::@10 to bitmap_init::@6
+Renumbering block main::@2 to main::@1
+Renumbering block main::@7 to main::@2
+Renumbering block main::@8 to main::@3
+Renumbering block main::@9 to main::@4
+Renumbering block main::@10 to main::@5
+Renumbering block main::@11 to main::@6
+Renumbering block main::@12 to main::@7
+Renumbering block render_sine::@5 to render_sine::@3
+Renumbering block render_sine::@6 to render_sine::@4
+Renumbering block render_sine::@7 to render_sine::@5
+Renumbering block render_sine::@8 to render_sine::@6
+Renumbering block render_sine::@10 to render_sine::@7
+Renumbering block wrap_y::@4 to wrap_y::@3
+Renumbering block wrap_y::@5 to wrap_y::@4
+Renumbering block wrap_y::@6 to wrap_y::@5
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @32
+Adding NOP phi() at start of @2
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::vicSelectGfxBank1_toDd001
 Adding NOP phi() at start of main::toD0181
-Adding NOP phi() at start of main::@9
-Adding NOP phi() at start of main::@10
-Adding NOP phi() at start of main::@11
-Adding NOP phi() at start of main::@12
+Adding NOP phi() at start of main::@4
+Adding NOP phi() at start of main::@5
+Adding NOP phi() at start of main::@6
+Adding NOP phi() at start of main::@7
 Adding NOP phi() at start of render_sine
-Adding NOP phi() at start of render_sine::@10
+Adding NOP phi() at start of render_sine::@7
 Adding NOP phi() at start of sin16s_gen2
 Adding NOP phi() at start of div32u16u
 Adding NOP phi() at start of bitmap_init
-Adding NOP phi() at start of bitmap_init::@10
+Adding NOP phi() at start of bitmap_init::@6
 Adding NOP phi() at start of fill
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@29
-@29: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   kickasm(location (const signed word*) sin2#0) {{ .for(var i=0; i<512; i++) {
   	  .word sin(toRadians([i*360]/512))*320
     }
  }}
-  to:@32
-@32: scope:[]  from @29
+  to:@2
+@2: scope:[]  from @1
   [2] phi()
   [3] call main 
   to:@end
-@end: scope:[]  from @32
+@end: scope:[]  from @2
   [4] phi()
-main: scope:[main]  from @32
+main: scope:[main]  from @2
   asm { sei  }
   [6] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [7] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
@@ -2561,37 +2597,37 @@ main::vicSelectGfxBank1_toDd001: scope:[main]  from main::vicSelectGfxBank1
   to:main::vicSelectGfxBank1_@1
 main::vicSelectGfxBank1_@1: scope:[main]  from main::vicSelectGfxBank1_toDd001
   [11] *((const byte*) CIA2_PORT_A#0) ← (const byte) main::vicSelectGfxBank1_toDd001_return#0
-  to:main::@7
-main::@7: scope:[main]  from main::vicSelectGfxBank1_@1
+  to:main::@2
+main::@2: scope:[main]  from main::vicSelectGfxBank1_@1
   [12] *((const byte*) D016#0) ← (const byte) VIC_CSEL#0
   to:main::toD0181
-main::toD0181: scope:[main]  from main::@7
+main::toD0181: scope:[main]  from main::@2
   [13] phi()
-  to:main::@8
-main::@8: scope:[main]  from main::toD0181
+  to:main::@3
+main::@3: scope:[main]  from main::toD0181
   [14] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0
   [15] call fill 
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [16] phi()
   [17] call bitmap_init 
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [18] phi()
   [19] call bitmap_clear 
-  to:main::@11
-main::@11: scope:[main]  from main::@10
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [20] phi()
   [21] call sin16s_gen2 
-  to:main::@12
-main::@12: scope:[main]  from main::@11
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [22] phi()
   [23] call render_sine 
-  to:main::@2
-main::@2: scope:[main]  from main::@12 main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@1 main::@7
   [24] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
-  to:main::@2
-render_sine: scope:[render_sine]  from main::@12
+  to:main::@1
+render_sine: scope:[render_sine]  from main::@7
   [25] phi()
   to:render_sine::@1
 render_sine::@1: scope:[render_sine]  from render_sine render_sine::@2
@@ -2603,45 +2639,45 @@ render_sine::@1: scope:[render_sine]  from render_sine render_sine::@2
   [30] (signed word) wrap_y::y#0 ← (signed word) render_sine::sin_val#0
   [31] call wrap_y 
   [32] (byte) wrap_y::return#0 ← (byte) wrap_y::return#2
-  to:render_sine::@5
-render_sine::@5: scope:[render_sine]  from render_sine::@1
+  to:render_sine::@3
+render_sine::@3: scope:[render_sine]  from render_sine::@1
   [33] (byte) render_sine::ypos#0 ← (byte) wrap_y::return#0
   [34] (word) bitmap_plot::x#0 ← (word) render_sine::xpos#3
   [35] (byte) bitmap_plot::y#0 ← (byte) render_sine::ypos#0
   [36] call bitmap_plot 
-  to:render_sine::@6
-render_sine::@6: scope:[render_sine]  from render_sine::@5
+  to:render_sine::@4
+render_sine::@4: scope:[render_sine]  from render_sine::@3
   [37] (word~) render_sine::$4 ← (word) render_sine::sin_idx#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [38] (signed word*~) render_sine::$5 ← (const signed word*) sin2#0 + (word~) render_sine::$4
   [39] (signed word) render_sine::sin2_val#0 ← *((signed word*~) render_sine::$5)
   [40] (signed word) wrap_y::y#1 ← (signed word) render_sine::sin2_val#0 + (byte/signed byte/word/signed word/dword/signed dword) $a
   [41] call wrap_y 
   [42] (byte) wrap_y::return#1 ← (byte) wrap_y::return#2
-  to:render_sine::@7
-render_sine::@7: scope:[render_sine]  from render_sine::@6
+  to:render_sine::@5
+render_sine::@5: scope:[render_sine]  from render_sine::@4
   [43] (byte) render_sine::ypos2#0 ← (byte) wrap_y::return#1
   [44] (word) bitmap_plot::x#1 ← (word) render_sine::xpos#3
   [45] (byte) bitmap_plot::y#1 ← (byte) render_sine::ypos2#0
   [46] call bitmap_plot 
-  to:render_sine::@8
-render_sine::@8: scope:[render_sine]  from render_sine::@7
+  to:render_sine::@6
+render_sine::@6: scope:[render_sine]  from render_sine::@5
   [47] (word) render_sine::xpos#1 ← ++ (word) render_sine::xpos#3
-  [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@10
+  [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@7
   to:render_sine::@2
-render_sine::@2: scope:[render_sine]  from render_sine::@10 render_sine::@8
-  [49] (word) render_sine::xpos#8 ← phi( render_sine::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 render_sine::@10/(word) render_sine::xpos#1 )
+render_sine::@2: scope:[render_sine]  from render_sine::@6 render_sine::@7
+  [49] (word) render_sine::xpos#8 ← phi( render_sine::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 render_sine::@7/(word) render_sine::xpos#1 )
   [50] (word) render_sine::sin_idx#1 ← ++ (word) render_sine::sin_idx#2
   [51] if((word) render_sine::sin_idx#1<(const word) SIN_SIZE#0) goto render_sine::@1
   to:render_sine::@return
 render_sine::@return: scope:[render_sine]  from render_sine::@2
   [52] return 
   to:@return
-render_sine::@10: scope:[render_sine]  from render_sine::@8
+render_sine::@7: scope:[render_sine]  from render_sine::@6
   [53] phi()
   to:render_sine::@2
-bitmap_plot: scope:[bitmap_plot]  from render_sine::@5 render_sine::@7
-  [54] (word) bitmap_plot::x#2 ← phi( render_sine::@5/(word) bitmap_plot::x#0 render_sine::@7/(word) bitmap_plot::x#1 )
-  [54] (byte) bitmap_plot::y#2 ← phi( render_sine::@5/(byte) bitmap_plot::y#0 render_sine::@7/(byte) bitmap_plot::y#1 )
+bitmap_plot: scope:[bitmap_plot]  from render_sine::@3 render_sine::@5
+  [54] (word) bitmap_plot::x#2 ← phi( render_sine::@3/(word) bitmap_plot::x#0 render_sine::@5/(word) bitmap_plot::x#1 )
+  [54] (byte) bitmap_plot::y#2 ← phi( render_sine::@3/(byte) bitmap_plot::y#0 render_sine::@5/(byte) bitmap_plot::y#1 )
   [55] (word~) bitmap_plot::$3 ← *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_plot::y#2) w= *((const byte[$100]) bitmap_plot_ylo#0 + (byte) bitmap_plot::y#2)
   [56] (word~) bitmap_plot::$1 ← (word) bitmap_plot::x#2 & (word/dword/signed dword) $fff8
   [57] (byte*) bitmap_plot::plotter#1 ← (byte*)(word~) bitmap_plot::$3 + (word~) bitmap_plot::$1
@@ -2651,51 +2687,51 @@ bitmap_plot: scope:[bitmap_plot]  from render_sine::@5 render_sine::@7
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [60] return 
   to:@return
-wrap_y: scope:[wrap_y]  from render_sine::@1 render_sine::@6
-  [61] (signed word) wrap_y::y#9 ← phi( render_sine::@1/(signed word) wrap_y::y#0 render_sine::@6/(signed word) wrap_y::y#1 )
+wrap_y: scope:[wrap_y]  from render_sine::@1 render_sine::@4
+  [61] (signed word) wrap_y::y#9 ← phi( render_sine::@1/(signed word) wrap_y::y#0 render_sine::@4/(signed word) wrap_y::y#1 )
   to:wrap_y::@1
 wrap_y::@1: scope:[wrap_y]  from wrap_y wrap_y::@2
   [62] (signed word) wrap_y::y#4 ← phi( wrap_y/(signed word) wrap_y::y#9 wrap_y::@2/(signed word) wrap_y::y#2 )
   [63] if((signed word) wrap_y::y#4>=(byte/word/signed word/dword/signed dword) $c8) goto wrap_y::@2
-  to:wrap_y::@4
-wrap_y::@4: scope:[wrap_y]  from wrap_y::@1 wrap_y::@5
-  [64] (signed word) wrap_y::y#6 ← phi( wrap_y::@1/(signed word) wrap_y::y#4 wrap_y::@5/(signed word) wrap_y::y#3 )
-  [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@5
-  to:wrap_y::@6
-wrap_y::@6: scope:[wrap_y]  from wrap_y::@4
+  to:wrap_y::@3
+wrap_y::@3: scope:[wrap_y]  from wrap_y::@1 wrap_y::@4
+  [64] (signed word) wrap_y::y#6 ← phi( wrap_y::@1/(signed word) wrap_y::y#4 wrap_y::@4/(signed word) wrap_y::y#3 )
+  [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@4
+  to:wrap_y::@5
+wrap_y::@5: scope:[wrap_y]  from wrap_y::@3
   [66] (byte) wrap_y::return#2 ← ((byte)) (signed word) wrap_y::y#6
   to:wrap_y::@return
-wrap_y::@return: scope:[wrap_y]  from wrap_y::@6
+wrap_y::@return: scope:[wrap_y]  from wrap_y::@5
   [67] return 
   to:@return
-wrap_y::@5: scope:[wrap_y]  from wrap_y::@4
+wrap_y::@4: scope:[wrap_y]  from wrap_y::@3
   [68] (signed word) wrap_y::y#3 ← (signed word) wrap_y::y#6 + (byte/word/signed word/dword/signed dword) $c8
-  to:wrap_y::@4
+  to:wrap_y::@3
 wrap_y::@2: scope:[wrap_y]  from wrap_y::@1
   [69] (signed word) wrap_y::y#2 ← (signed word) wrap_y::y#4 - (byte/word/signed word/dword/signed dword) $c8
   to:wrap_y::@1
-sin16s_gen2: scope:[sin16s_gen2]  from main::@11
+sin16s_gen2: scope:[sin16s_gen2]  from main::@6
   [70] phi()
   [71] call div32u16u 
   [72] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  to:sin16s_gen2::@3
-sin16s_gen2::@3: scope:[sin16s_gen2]  from sin16s_gen2
+  to:sin16s_gen2::@2
+sin16s_gen2::@2: scope:[sin16s_gen2]  from sin16s_gen2
   [73] (dword) sin16s_gen2::step#0 ← (dword) div32u16u::return#2
   to:sin16s_gen2::@1
-sin16s_gen2::@1: scope:[sin16s_gen2]  from sin16s_gen2::@3 sin16s_gen2::@5
-  [74] (word) sin16s_gen2::i#2 ← phi( sin16s_gen2::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@5/(word) sin16s_gen2::i#1 )
-  [74] (signed word*) sin16s_gen2::sintab#2 ← phi( sin16s_gen2::@3/(const signed word[$200]) sin#0 sin16s_gen2::@5/(signed word*) sin16s_gen2::sintab#0 )
-  [74] (dword) sin16s_gen2::x#2 ← phi( sin16s_gen2::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@5/(dword) sin16s_gen2::x#1 )
+sin16s_gen2::@1: scope:[sin16s_gen2]  from sin16s_gen2::@2 sin16s_gen2::@4
+  [74] (word) sin16s_gen2::i#2 ← phi( sin16s_gen2::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@4/(word) sin16s_gen2::i#1 )
+  [74] (signed word*) sin16s_gen2::sintab#2 ← phi( sin16s_gen2::@2/(const signed word[$200]) sin#0 sin16s_gen2::@4/(signed word*) sin16s_gen2::sintab#0 )
+  [74] (dword) sin16s_gen2::x#2 ← phi( sin16s_gen2::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen2::@4/(dword) sin16s_gen2::x#1 )
   [75] (dword) sin16s::x#0 ← (dword) sin16s_gen2::x#2
   [76] call sin16s 
   [77] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  to:sin16s_gen2::@4
-sin16s_gen2::@4: scope:[sin16s_gen2]  from sin16s_gen2::@1
+  to:sin16s_gen2::@3
+sin16s_gen2::@3: scope:[sin16s_gen2]  from sin16s_gen2::@1
   [78] (signed word) mul16s::a#0 ← (signed word) sin16s::return#0
   [79] call mul16s 
   [80] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-  to:sin16s_gen2::@5
-sin16s_gen2::@5: scope:[sin16s_gen2]  from sin16s_gen2::@4
+  to:sin16s_gen2::@4
+sin16s_gen2::@4: scope:[sin16s_gen2]  from sin16s_gen2::@3
   [81] (signed dword~) sin16s_gen2::$5 ← (signed dword) mul16s::return#2
   [82] (word~) sin16s_gen2::$6 ← > (signed dword~) sin16s_gen2::$5
   [83] (signed word~) sin16s_gen2::$8 ← (const signed word) sin16s_gen2::offs#0 + (signed word)(word~) sin16s_gen2::$6
@@ -2705,25 +2741,25 @@ sin16s_gen2::@5: scope:[sin16s_gen2]  from sin16s_gen2::@4
   [87] (word) sin16s_gen2::i#1 ← ++ (word) sin16s_gen2::i#2
   [88] if((word) sin16s_gen2::i#1<(const word) SIN_SIZE#0) goto sin16s_gen2::@1
   to:sin16s_gen2::@return
-sin16s_gen2::@return: scope:[sin16s_gen2]  from sin16s_gen2::@5
+sin16s_gen2::@return: scope:[sin16s_gen2]  from sin16s_gen2::@4
   [89] return 
   to:@return
-mul16s: scope:[mul16s]  from sin16s_gen2::@4
+mul16s: scope:[mul16s]  from sin16s_gen2::@3
   [90] (word~) mul16u::a#8 ← (word)(signed word) mul16s::a#0
   [91] call mul16u 
   [92] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mul16s::@6
-mul16s::@6: scope:[mul16s]  from mul16s
+  to:mul16s::@4
+mul16s::@4: scope:[mul16s]  from mul16s
   [93] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   [94] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1
   to:mul16s::@3
-mul16s::@3: scope:[mul16s]  from mul16s::@6
+mul16s::@3: scope:[mul16s]  from mul16s::@4
   [95] (word~) mul16s::$9 ← > (dword) mul16s::m#0
   [96] (word~) mul16s::$16 ← (word~) mul16s::$9 - ((word))(const signed word) sin16s_gen2::ampl#0
   [97] (dword) mul16s::m#1 ← (dword) mul16s::m#0 hi= (word~) mul16s::$16
   to:mul16s::@1
-mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@6
-  [98] (dword) mul16s::m#4 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@6/(dword) mul16s::m#0 )
+mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@4
+  [98] (dword) mul16s::m#4 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@4/(dword) mul16s::m#0 )
   to:mul16s::@2
 mul16s::@2: scope:[mul16s]  from mul16s::@1
   [99] (signed dword) mul16s::return#0 ← ((signed dword)) (dword) mul16s::m#4
@@ -2736,10 +2772,10 @@ mul16u: scope:[mul16u]  from mul16s mulu16_sel
   [101] (word) mul16u::b#2 ← phi( mul16s/((word))(const signed word) sin16s_gen2::ampl#0 mulu16_sel/(word) mul16u::b#1 )
   [102] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#2
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [103] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [103] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [103] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [103] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [103] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [103] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@4/(word) mul16u::a#0 )
   [104] if((word) mul16u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -2747,13 +2783,13 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [106] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [107] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [107] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [108] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [109] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [109] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [110] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [111] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
@@ -2779,91 +2815,91 @@ sin16s::@2: scope:[sin16s]  from sin16s::@1 sin16s::@5
   [121] (word) mulu16_sel::v2#0 ← (word) sin16s::x1#0
   [122] call mulu16_sel 
   [123] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  to:sin16s::@8
-sin16s::@8: scope:[sin16s]  from sin16s::@2
+  to:sin16s::@7
+sin16s::@7: scope:[sin16s]  from sin16s::@2
   [124] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   [125] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   [126] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0
   [127] call mulu16_sel 
   [128] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12
-  to:sin16s::@9
-sin16s::@9: scope:[sin16s]  from sin16s::@8
+  to:sin16s::@8
+sin16s::@8: scope:[sin16s]  from sin16s::@7
   [129] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   [130] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   [131] call mulu16_sel 
   [132] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  to:sin16s::@10
-sin16s::@10: scope:[sin16s]  from sin16s::@9
+  to:sin16s::@9
+sin16s::@9: scope:[sin16s]  from sin16s::@8
   [133] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   [134] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0
   [135] (word) mulu16_sel::v1#3 ← (word) sin16s::x3#0
   [136] (word) mulu16_sel::v2#3 ← (word) sin16s::x1#0
   [137] call mulu16_sel 
   [138] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12
-  to:sin16s::@11
-sin16s::@11: scope:[sin16s]  from sin16s::@10
+  to:sin16s::@10
+sin16s::@10: scope:[sin16s]  from sin16s::@9
   [139] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   [140] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   [141] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0
   [142] call mulu16_sel 
   [143] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  to:sin16s::@12
-sin16s::@12: scope:[sin16s]  from sin16s::@11
+  to:sin16s::@11
+sin16s::@11: scope:[sin16s]  from sin16s::@10
   [144] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   [145] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [146] (word) sin16s::usinx#1 ← (word) sin16s::usinx#0 + (word) sin16s::x5_128#0
-  [147] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15
+  [147] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12
   to:sin16s::@6
-sin16s::@6: scope:[sin16s]  from sin16s::@12
+sin16s::@6: scope:[sin16s]  from sin16s::@11
   [148] (signed word) sin16s::sinx#1 ← - (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-sin16s::@3: scope:[sin16s]  from sin16s::@15 sin16s::@6
-  [149] (signed word) sin16s::return#1 ← phi( sin16s::@15/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
+sin16s::@3: scope:[sin16s]  from sin16s::@12 sin16s::@6
+  [149] (signed word) sin16s::return#1 ← phi( sin16s::@12/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
   to:sin16s::@return
 sin16s::@return: scope:[sin16s]  from sin16s::@3
   [150] return 
   to:@return
-sin16s::@15: scope:[sin16s]  from sin16s::@12
+sin16s::@12: scope:[sin16s]  from sin16s::@11
   [151] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@11 sin16s::@2 sin16s::@8 sin16s::@9
-  [152] (byte) mulu16_sel::select#5 ← phi( sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [152] (word) mulu16_sel::v2#5 ← phi( sin16s::@10/(word) mulu16_sel::v2#3 sin16s::@11/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@8/(word) mulu16_sel::v2#1 sin16s::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
-  [152] (word) mulu16_sel::v1#5 ← phi( sin16s::@10/(word) mulu16_sel::v1#3 sin16s::@11/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@8/(word) mulu16_sel::v1#1 sin16s::@9/(word) mulu16_sel::v1#2 )
+mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@2 sin16s::@7 sin16s::@8 sin16s::@9
+  [152] (byte) mulu16_sel::select#5 ← phi( sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [152] (word) mulu16_sel::v2#5 ← phi( sin16s::@9/(word) mulu16_sel::v2#3 sin16s::@10/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@7/(word) mulu16_sel::v2#1 sin16s::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
+  [152] (word) mulu16_sel::v1#5 ← phi( sin16s::@9/(word) mulu16_sel::v1#3 sin16s::@10/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@7/(word) mulu16_sel::v1#1 sin16s::@8/(word) mulu16_sel::v1#2 )
   [153] (word) mul16u::a#2 ← (word) mulu16_sel::v1#5
   [154] (word) mul16u::b#1 ← (word) mulu16_sel::v2#5
   [155] call mul16u 
   [156] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-  to:mulu16_sel::@2
-mulu16_sel::@2: scope:[mulu16_sel]  from mulu16_sel
+  to:mulu16_sel::@1
+mulu16_sel::@1: scope:[mulu16_sel]  from mulu16_sel
   [157] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#3
   [158] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5
   [159] (word) mulu16_sel::return#12 ← > (dword~) mulu16_sel::$1
   to:mulu16_sel::@return
-mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@2
+mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@1
   [160] return 
   to:@return
 div32u16u: scope:[div32u16u]  from sin16s_gen2
   [161] phi()
   [162] call divr16u 
   [163] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div32u16u::@2
-div32u16u::@2: scope:[div32u16u]  from div32u16u
+  to:div32u16u::@1
+div32u16u::@1: scope:[div32u16u]  from div32u16u
   [164] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2
   [165] (word) divr16u::rem#4 ← (word) rem16u#1
   [166] call divr16u 
   [167] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:div32u16u::@3
-div32u16u::@3: scope:[div32u16u]  from div32u16u::@2
+  to:div32u16u::@2
+div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   [168] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   [169] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0
   to:div32u16u::@return
-div32u16u::@return: scope:[div32u16u]  from div32u16u::@3
+div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
   [170] return 
   to:@return
-divr16u: scope:[divr16u]  from div32u16u div32u16u::@2
-  [171] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@2/<(const dword) PI2_u4f28#0 )
-  [171] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@2/(word) divr16u::rem#4 )
+divr16u: scope:[divr16u]  from div32u16u div32u16u::@1
+  [171] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@1/<(const dword) PI2_u4f28#0 )
+  [171] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@1/(word) divr16u::rem#4 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [172] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
@@ -2900,7 +2936,7 @@ divr16u::@6: scope:[divr16u]  from divr16u::@3
 divr16u::@return: scope:[divr16u]  from divr16u::@6
   [188] return 
   to:@return
-bitmap_clear: scope:[bitmap_clear]  from main::@10
+bitmap_clear: scope:[bitmap_clear]  from main::@5
   [189] (word~) bitmap_clear::$3 ← *((const byte[$100]) bitmap_plot_yhi#0) w= *((const byte[$100]) bitmap_plot_ylo#0)
   [190] (byte*~) bitmap_clear::bitmap#5 ← (byte*)(word~) bitmap_clear::$3
   to:bitmap_clear::@1
@@ -2923,7 +2959,7 @@ bitmap_clear::@3: scope:[bitmap_clear]  from bitmap_clear::@2
 bitmap_clear::@return: scope:[bitmap_clear]  from bitmap_clear::@3
   [199] return 
   to:@return
-bitmap_init: scope:[bitmap_init]  from main::@9
+bitmap_init: scope:[bitmap_init]  from main::@4
   [200] phi()
   to:bitmap_init::@1
 bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
@@ -2931,16 +2967,16 @@ bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
   [201] (byte) bitmap_init::bits#3 ← phi( bitmap_init/(byte/word/signed word/dword/signed dword) $80 bitmap_init::@2/(byte) bitmap_init::bits#4 )
   [202] *((const byte[$100]) bitmap_plot_bit#0 + (byte) bitmap_init::x#2) ← (byte) bitmap_init::bits#3
   [203] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [204] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10
+  [204] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6
   to:bitmap_init::@2
-bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@10
-  [205] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@10/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
+bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@6
+  [205] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@6/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
   [206] (byte) bitmap_init::x#1 ← ++ (byte) bitmap_init::x#2
   [207] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1
-  to:bitmap_init::@5
-bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
-  [208] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/(const byte*) BITMAP#0 bitmap_init::@6/(byte*) bitmap_init::yoffs#4 )
-  [208] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte) bitmap_init::y#1 )
+  to:bitmap_init::@3
+bitmap_init::@3: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@4
+  [208] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/(const byte*) BITMAP#0 bitmap_init::@4/(byte*) bitmap_init::yoffs#4 )
+  [208] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte) bitmap_init::y#1 )
   [209] (byte~) bitmap_init::$3 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [210] (byte~) bitmap_init::$4 ← < (byte*) bitmap_init::yoffs#2
   [211] (byte~) bitmap_init::$5 ← (byte~) bitmap_init::$3 | (byte~) bitmap_init::$4
@@ -2948,23 +2984,23 @@ bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
   [213] (byte~) bitmap_init::$6 ← > (byte*) bitmap_init::yoffs#2
   [214] *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_init::y#2) ← (byte~) bitmap_init::$6
   [215] (byte~) bitmap_init::$7 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [216] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6
-  to:bitmap_init::@7
-bitmap_init::@7: scope:[bitmap_init]  from bitmap_init::@5
+  [216] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4
+  to:bitmap_init::@5
+bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@3
   [217] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:bitmap_init::@6
-bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@5 bitmap_init::@7
-  [218] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@5/(byte*) bitmap_init::yoffs#2 bitmap_init::@7/(byte*) bitmap_init::yoffs#1 )
+  to:bitmap_init::@4
+bitmap_init::@4: scope:[bitmap_init]  from bitmap_init::@3 bitmap_init::@5
+  [218] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@3/(byte*) bitmap_init::yoffs#2 bitmap_init::@5/(byte*) bitmap_init::yoffs#1 )
   [219] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2
-  [220] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5
+  [220] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3
   to:bitmap_init::@return
-bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@6
+bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@4
   [221] return 
   to:@return
-bitmap_init::@10: scope:[bitmap_init]  from bitmap_init::@1
+bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@1
   [222] phi()
   to:bitmap_init::@2
-fill: scope:[fill]  from main::@8
+fill: scope:[fill]  from main::@3
   [223] phi()
   to:fill::@1
 fill::@1: scope:[fill]  from fill fill::@1
@@ -3661,19 +3697,19 @@ INITIAL ASM
   .label rem16u = $ba
 //SEG3 @begin
 bbegin:
-  jmp b29
-//SEG4 @29
-b29:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const signed word*) sin2#0) {{ .for(var i=0; i<512; i++) {   	  .word sin(toRadians([i*360]/512))*320     }  }}
-//SEG6 [2] phi from @29 to @32 [phi:@29->@32]
-b32_from_b29:
-  jmp b32
-//SEG7 @32
-b32:
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG7 @2
+b2:
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @32 to @end [phi:@32->@end]
-bend_from_b32:
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG10 @end
 bend:
@@ -3711,67 +3747,67 @@ main: {
   //SEG21 [11] *((const byte*) CIA2_PORT_A#0) ← (const byte) main::vicSelectGfxBank1_toDd001_return#0 -- _deref_pbuc1=vbuc2 
     lda #vicSelectGfxBank1_toDd001_return
     sta CIA2_PORT_A
-    jmp b7
-  //SEG22 main::@7
-  b7:
+    jmp b2
+  //SEG22 main::@2
+  b2:
   //SEG23 [12] *((const byte*) D016#0) ← (const byte) VIC_CSEL#0 -- _deref_pbuc1=vbuc2 
     lda #VIC_CSEL
     sta D016
-  //SEG24 [13] phi from main::@7 to main::toD0181 [phi:main::@7->main::toD0181]
-  toD0181_from_b7:
+  //SEG24 [13] phi from main::@2 to main::toD0181 [phi:main::@2->main::toD0181]
+  toD0181_from_b2:
     jmp toD0181
   //SEG25 main::toD0181
   toD0181:
-    jmp b8
-  //SEG26 main::@8
-  b8:
+    jmp b3
+  //SEG26 main::@3
+  b3:
   //SEG27 [14] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG28 [15] call fill 
-  //SEG29 [223] phi from main::@8 to fill [phi:main::@8->fill]
-  fill_from_b8:
+  //SEG29 [223] phi from main::@3 to fill [phi:main::@3->fill]
+  fill_from_b3:
     jsr fill
-  //SEG30 [16] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG31 main::@9
-  b9:
+  //SEG30 [16] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG31 main::@4
+  b4:
   //SEG32 [17] call bitmap_init 
-  //SEG33 [200] phi from main::@9 to bitmap_init [phi:main::@9->bitmap_init]
-  bitmap_init_from_b9:
+  //SEG33 [200] phi from main::@4 to bitmap_init [phi:main::@4->bitmap_init]
+  bitmap_init_from_b4:
     jsr bitmap_init
-  //SEG34 [18] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG35 main::@10
-  b10:
+  //SEG34 [18] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG35 main::@5
+  b5:
   //SEG36 [19] call bitmap_clear 
     jsr bitmap_clear
-  //SEG37 [20] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG38 main::@11
-  b11:
+  //SEG37 [20] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG38 main::@6
+  b6:
   //SEG39 [21] call sin16s_gen2 
-  //SEG40 [70] phi from main::@11 to sin16s_gen2 [phi:main::@11->sin16s_gen2]
-  sin16s_gen2_from_b11:
+  //SEG40 [70] phi from main::@6 to sin16s_gen2 [phi:main::@6->sin16s_gen2]
+  sin16s_gen2_from_b6:
     jsr sin16s_gen2
-  //SEG41 [22] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG42 main::@12
-  b12:
+  //SEG41 [22] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG42 main::@7
+  b7:
   //SEG43 [23] call render_sine 
-  //SEG44 [25] phi from main::@12 to render_sine [phi:main::@12->render_sine]
-  render_sine_from_b12:
+  //SEG44 [25] phi from main::@7 to render_sine [phi:main::@7->render_sine]
+  render_sine_from_b7:
     jsr render_sine
-    jmp b2
-  //SEG45 main::@2
-  b2:
+    jmp b1
+  //SEG45 main::@1
+  b1:
   //SEG46 [24] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
-    jmp b2
+    jmp b1
 }
 //SEG47 render_sine
 render_sine: {
@@ -3840,9 +3876,9 @@ render_sine: {
   //SEG62 [32] (byte) wrap_y::return#0 ← (byte) wrap_y::return#2 -- vbuz1=vbuz2 
     lda wrap_y.return_2
     sta wrap_y.return
-    jmp b5
-  //SEG63 render_sine::@5
-  b5:
+    jmp b3
+  //SEG63 render_sine::@3
+  b3:
   //SEG64 [33] (byte) render_sine::ypos#0 ← (byte) wrap_y::return#0 -- vbuz1=vbuz2 
     lda wrap_y.return
     sta ypos
@@ -3855,14 +3891,14 @@ render_sine: {
     lda ypos
     sta bitmap_plot.y
   //SEG67 [36] call bitmap_plot 
-  //SEG68 [54] phi from render_sine::@5 to bitmap_plot [phi:render_sine::@5->bitmap_plot]
-  bitmap_plot_from_b5:
-  //SEG69 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#0 [phi:render_sine::@5->bitmap_plot#0] -- register_copy 
-  //SEG70 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#0 [phi:render_sine::@5->bitmap_plot#1] -- register_copy 
+  //SEG68 [54] phi from render_sine::@3 to bitmap_plot [phi:render_sine::@3->bitmap_plot]
+  bitmap_plot_from_b3:
+  //SEG69 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#0 [phi:render_sine::@3->bitmap_plot#0] -- register_copy 
+  //SEG70 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#0 [phi:render_sine::@3->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b6
-  //SEG71 render_sine::@6
-  b6:
+    jmp b4
+  //SEG71 render_sine::@4
+  b4:
   //SEG72 [37] (word~) render_sine::$4 ← (word) render_sine::sin_idx#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz2_rol_1 
     lda sin_idx
     asl
@@ -3901,16 +3937,16 @@ render_sine: {
     adc $ff
     sta wrap_y.y+1
   //SEG76 [41] call wrap_y 
-  //SEG77 [61] phi from render_sine::@6 to wrap_y [phi:render_sine::@6->wrap_y]
-  wrap_y_from_b6:
-  //SEG78 [61] phi (signed word) wrap_y::y#9 = (signed word) wrap_y::y#1 [phi:render_sine::@6->wrap_y#0] -- register_copy 
+  //SEG77 [61] phi from render_sine::@4 to wrap_y [phi:render_sine::@4->wrap_y]
+  wrap_y_from_b4:
+  //SEG78 [61] phi (signed word) wrap_y::y#9 = (signed word) wrap_y::y#1 [phi:render_sine::@4->wrap_y#0] -- register_copy 
     jsr wrap_y
   //SEG79 [42] (byte) wrap_y::return#1 ← (byte) wrap_y::return#2 -- vbuz1=vbuz2 
     lda wrap_y.return_2
     sta wrap_y.return_1
-    jmp b7
-  //SEG80 render_sine::@7
-  b7:
+    jmp b5
+  //SEG80 render_sine::@5
+  b5:
   //SEG81 [43] (byte) render_sine::ypos2#0 ← (byte) wrap_y::return#1 -- vbuz1=vbuz2 
     lda wrap_y.return_1
     sta ypos2
@@ -3923,29 +3959,29 @@ render_sine: {
     lda ypos2
     sta bitmap_plot.y
   //SEG84 [46] call bitmap_plot 
-  //SEG85 [54] phi from render_sine::@7 to bitmap_plot [phi:render_sine::@7->bitmap_plot]
-  bitmap_plot_from_b7:
-  //SEG86 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#1 [phi:render_sine::@7->bitmap_plot#0] -- register_copy 
-  //SEG87 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#1 [phi:render_sine::@7->bitmap_plot#1] -- register_copy 
+  //SEG85 [54] phi from render_sine::@5 to bitmap_plot [phi:render_sine::@5->bitmap_plot]
+  bitmap_plot_from_b5:
+  //SEG86 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#1 [phi:render_sine::@5->bitmap_plot#0] -- register_copy 
+  //SEG87 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#1 [phi:render_sine::@5->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b8
-  //SEG88 render_sine::@8
-  b8:
+    jmp b6
+  //SEG88 render_sine::@6
+  b6:
   //SEG89 [47] (word) render_sine::xpos#1 ← ++ (word) render_sine::xpos#3 -- vwuz1=_inc_vwuz1 
     inc xpos
     bne !+
     inc xpos+1
   !:
-  //SEG90 [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@10 -- vwuz1_neq_vwuc1_then_la1 
+  //SEG90 [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@7 -- vwuz1_neq_vwuc1_then_la1 
     lda xpos+1
     cmp #>$140
-    bne b10_from_b8
+    bne b7_from_b6
     lda xpos
     cmp #<$140
-    bne b10_from_b8
-  //SEG91 [49] phi from render_sine::@8 to render_sine::@2 [phi:render_sine::@8->render_sine::@2]
-  b2_from_b8:
-  //SEG92 [49] phi (word) render_sine::xpos#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_sine::@8->render_sine::@2#0] -- vwuz1=vbuc1 
+    bne b7_from_b6
+  //SEG91 [49] phi from render_sine::@6 to render_sine::@2 [phi:render_sine::@6->render_sine::@2]
+  b2_from_b6:
+  //SEG92 [49] phi (word) render_sine::xpos#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_sine::@6->render_sine::@2#0] -- vwuz1=vbuc1 
     lda #0
     sta xpos
     lda #0
@@ -3972,14 +4008,14 @@ render_sine: {
   breturn:
   //SEG97 [52] return 
     rts
-  //SEG98 [53] phi from render_sine::@8 to render_sine::@10 [phi:render_sine::@8->render_sine::@10]
-  b10_from_b8:
-    jmp b10
-  //SEG99 render_sine::@10
-  b10:
-  //SEG100 [49] phi from render_sine::@10 to render_sine::@2 [phi:render_sine::@10->render_sine::@2]
-  b2_from_b10:
-  //SEG101 [49] phi (word) render_sine::xpos#8 = (word) render_sine::xpos#1 [phi:render_sine::@10->render_sine::@2#0] -- register_copy 
+  //SEG98 [53] phi from render_sine::@6 to render_sine::@7 [phi:render_sine::@6->render_sine::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG99 render_sine::@7
+  b7:
+  //SEG100 [49] phi from render_sine::@7 to render_sine::@2 [phi:render_sine::@7->render_sine::@2]
+  b2_from_b7:
+  //SEG101 [49] phi (word) render_sine::xpos#8 = (word) render_sine::xpos#1 [phi:render_sine::@7->render_sine::@2#0] -- register_copy 
     jmp b2
 }
 //SEG102 bitmap_plot
@@ -4052,19 +4088,19 @@ wrap_y: {
     eor #$80
   !:
     bpl b2
-  //SEG115 [64] phi from wrap_y::@1 wrap_y::@5 to wrap_y::@4 [phi:wrap_y::@1/wrap_y::@5->wrap_y::@4]
-  b4_from_b1:
-  b4_from_b5:
-  //SEG116 [64] phi (signed word) wrap_y::y#6 = (signed word) wrap_y::y#4 [phi:wrap_y::@1/wrap_y::@5->wrap_y::@4#0] -- register_copy 
-    jmp b4
-  //SEG117 wrap_y::@4
-  b4:
-  //SEG118 [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@5 -- vwsz1_lt_0_then_la1 
+  //SEG115 [64] phi from wrap_y::@1 wrap_y::@4 to wrap_y::@3 [phi:wrap_y::@1/wrap_y::@4->wrap_y::@3]
+  b3_from_b1:
+  b3_from_b4:
+  //SEG116 [64] phi (signed word) wrap_y::y#6 = (signed word) wrap_y::y#4 [phi:wrap_y::@1/wrap_y::@4->wrap_y::@3#0] -- register_copy 
+    jmp b3
+  //SEG117 wrap_y::@3
+  b3:
+  //SEG118 [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@4 -- vwsz1_lt_0_then_la1 
     lda y+1
-    bmi b5
-    jmp b6
-  //SEG119 wrap_y::@6
-  b6:
+    bmi b4
+    jmp b5
+  //SEG119 wrap_y::@5
+  b5:
   //SEG120 [66] (byte) wrap_y::return#2 ← ((byte)) (signed word) wrap_y::y#6 -- vbuz1=_byte_vwsz2 
     lda y
     sta return_2
@@ -4073,8 +4109,8 @@ wrap_y: {
   breturn:
   //SEG122 [67] return 
     rts
-  //SEG123 wrap_y::@5
-  b5:
+  //SEG123 wrap_y::@4
+  b4:
   //SEG124 [68] (signed word) wrap_y::y#3 ← (signed word) wrap_y::y#6 + (byte/word/signed word/dword/signed dword) $c8 -- vwsz1=vwsz1_plus_vwuc1 
     clc
     lda y
@@ -4083,7 +4119,7 @@ wrap_y: {
     lda y+1
     adc #>$c8
     sta y+1
-    jmp b4_from_b5
+    jmp b3_from_b4
   //SEG125 wrap_y::@2
   b2:
   //SEG126 [69] (signed word) wrap_y::y#2 ← (signed word) wrap_y::y#4 - (byte/word/signed word/dword/signed dword) $c8 -- vwsz1=vwsz1_minus_vbuc1 
@@ -4126,9 +4162,9 @@ sin16s_gen2: {
     sta div32u16u.return_2+2
     lda div32u16u.return+3
     sta div32u16u.return_2+3
-    jmp b3
-  //SEG131 sin16s_gen2::@3
-  b3:
+    jmp b2
+  //SEG131 sin16s_gen2::@2
+  b2:
   //SEG132 [73] (dword) sin16s_gen2::step#0 ← (dword) div32u16u::return#2 -- vduz1=vduz2 
     lda div32u16u.return_2
     sta step
@@ -4138,19 +4174,19 @@ sin16s_gen2: {
     sta step+2
     lda div32u16u.return_2+3
     sta step+3
-  //SEG133 [74] phi from sin16s_gen2::@3 to sin16s_gen2::@1 [phi:sin16s_gen2::@3->sin16s_gen2::@1]
-  b1_from_b3:
-  //SEG134 [74] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
+  //SEG133 [74] phi from sin16s_gen2::@2 to sin16s_gen2::@1 [phi:sin16s_gen2::@2->sin16s_gen2::@1]
+  b1_from_b2:
+  //SEG134 [74] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG135 [74] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[$200]) sin#0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
+  //SEG135 [74] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[$200]) sin#0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
     lda #<sin
     sta sintab
     lda #>sin
     sta sintab+1
-  //SEG136 [74] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#2] -- vduz1=vbuc1 
+  //SEG136 [74] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -4159,11 +4195,11 @@ sin16s_gen2: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG137 [74] phi from sin16s_gen2::@5 to sin16s_gen2::@1 [phi:sin16s_gen2::@5->sin16s_gen2::@1]
-  b1_from_b5:
-  //SEG138 [74] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#0] -- register_copy 
-  //SEG139 [74] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@5->sin16s_gen2::@1#1] -- register_copy 
-  //SEG140 [74] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#2] -- register_copy 
+  //SEG137 [74] phi from sin16s_gen2::@4 to sin16s_gen2::@1 [phi:sin16s_gen2::@4->sin16s_gen2::@1]
+  b1_from_b4:
+  //SEG138 [74] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#0] -- register_copy 
+  //SEG139 [74] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@4->sin16s_gen2::@1#1] -- register_copy 
+  //SEG140 [74] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#2] -- register_copy 
     jmp b1
   //SEG141 sin16s_gen2::@1
   b1:
@@ -4183,9 +4219,9 @@ sin16s_gen2: {
     sta sin16s.return
     lda sin16s.return_1+1
     sta sin16s.return+1
-    jmp b4
-  //SEG145 sin16s_gen2::@4
-  b4:
+    jmp b3
+  //SEG145 sin16s_gen2::@3
+  b3:
   //SEG146 [78] (signed word) mul16s::a#0 ← (signed word) sin16s::return#0 -- vwsz1=vwsz2 
     lda sin16s.return
     sta mul16s.a
@@ -4202,9 +4238,9 @@ sin16s_gen2: {
     sta mul16s.return_2+2
     lda mul16s.return+3
     sta mul16s.return_2+3
-    jmp b5
-  //SEG149 sin16s_gen2::@5
-  b5:
+    jmp b4
+  //SEG149 sin16s_gen2::@4
+  b4:
   //SEG150 [81] (signed dword~) sin16s_gen2::$5 ← (signed dword) mul16s::return#2 -- vdsz1=vdsz2 
     lda mul16s.return_2
     sta _5
@@ -4264,11 +4300,11 @@ sin16s_gen2: {
   //SEG157 [88] if((word) sin16s_gen2::i#1<(const word) SIN_SIZE#0) goto sin16s_gen2::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>SIN_SIZE
-    bcc b1_from_b5
+    bcc b1_from_b4
     bne !+
     lda i
     cmp #<SIN_SIZE
-    bcc b1_from_b5
+    bcc b1_from_b4
   !:
     jmp breturn
   //SEG158 sin16s_gen2::@return
@@ -4311,9 +4347,9 @@ mul16s: {
     sta mul16u.return+2
     lda mul16u.res+3
     sta mul16u.return+3
-    jmp b6
-  //SEG167 mul16s::@6
-  b6:
+    jmp b4
+  //SEG167 mul16s::@4
+  b4:
   //SEG168 [93] (dword) mul16s::m#0 ← (dword) mul16u::return#2 -- vduz1=vduz2 
     lda mul16u.return
     sta m
@@ -4325,7 +4361,7 @@ mul16s: {
     sta m+3
   //SEG169 [94] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
-    bpl b1_from_b6
+    bpl b1_from_b4
     jmp b3
   //SEG170 mul16s::@3
   b3:
@@ -4347,10 +4383,10 @@ mul16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG174 [98] phi from mul16s::@3 mul16s::@6 to mul16s::@1 [phi:mul16s::@3/mul16s::@6->mul16s::@1]
+  //SEG174 [98] phi from mul16s::@3 mul16s::@4 to mul16s::@1 [phi:mul16s::@3/mul16s::@4->mul16s::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG175 [98] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@6->mul16s::@1#0] -- register_copy 
+  b1_from_b4:
+  //SEG175 [98] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@4->mul16s::@1#0] -- register_copy 
     jmp b1
   //SEG176 mul16s::@1
   b1:
@@ -4421,13 +4457,13 @@ mul16u: {
     lda a
     and #1
     sta _1
-  //SEG193 [107] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG193 [107] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG194 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG194 mul16u::@3
+  b3:
   //SEG195 [108] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -4442,13 +4478,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG196 [109] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG197 [109] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG198 mul16u::@8
-  b8:
+  //SEG196 [109] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG197 [109] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG198 mul16u::@4
+  b4:
   //SEG199 [110] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -4458,11 +4494,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG201 [103] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG202 [103] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG203 [103] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG204 [103] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG201 [103] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG202 [103] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG203 [103] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG204 [103] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG205 sin16s
@@ -4624,9 +4660,9 @@ sin16s: {
     sta mulu16_sel.return
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return+1
-    jmp b8
-  //SEG232 sin16s::@8
-  b8:
+    jmp b7
+  //SEG232 sin16s::@7
+  b7:
   //SEG233 [124] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -4643,22 +4679,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG236 [127] call mulu16_sel 
-  //SEG237 [152] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG238 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG237 [152] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG238 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG239 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG240 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG239 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG240 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG241 [128] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_1
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_1+1
-    jmp b9
-  //SEG242 sin16s::@9
-  b9:
+    jmp b8
+  //SEG242 sin16s::@8
+  b8:
   //SEG243 [129] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1 -- vwuz1=vwuz2 
     lda mulu16_sel.return_1
     sta x3
@@ -4670,26 +4706,26 @@ sin16s: {
     lda x3+1
     sta mulu16_sel.v1+1
   //SEG245 [131] call mulu16_sel 
-  //SEG246 [152] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG247 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG246 [152] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG247 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG248 [152] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG248 [152] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG249 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG249 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG250 [132] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_2
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_2+1
-    jmp b10
-  //SEG251 sin16s::@10
-  b10:
+    jmp b9
+  //SEG251 sin16s::@9
+  b9:
   //SEG252 [133] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2 -- vwuz1=vwuz2 
     lda mulu16_sel.return_2
     sta x3_6
@@ -4714,22 +4750,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG256 [137] call mulu16_sel 
-  //SEG257 [152] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG258 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG257 [152] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG258 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG259 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG260 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG259 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG260 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG261 [138] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_10
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_10+1
-    jmp b11
-  //SEG262 sin16s::@11
-  b11:
+    jmp b10
+  //SEG262 sin16s::@10
+  b10:
   //SEG263 [139] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10 -- vwuz1=vwuz2 
     lda mulu16_sel.return_10
     sta x4
@@ -4746,22 +4782,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG266 [142] call mulu16_sel 
-  //SEG267 [152] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG268 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG267 [152] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG268 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG269 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG270 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG269 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG270 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG271 [143] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_11
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_11+1
-    jmp b12
-  //SEG272 sin16s::@12
-  b12:
+    jmp b11
+  //SEG272 sin16s::@11
+  b11:
   //SEG273 [144] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11 -- vwuz1=vwuz2 
     lda mulu16_sel.return_11
     sta x5
@@ -4786,10 +4822,10 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx_1+1
-  //SEG276 [147] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG276 [147] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG277 sin16s::@6
   b6:
@@ -4803,10 +4839,10 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG279 [149] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  b3_from_b15:
+  //SEG279 [149] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG280 [149] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG280 [149] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
     jmp b3
   //SEG281 sin16s::@3
   b3:
@@ -4815,14 +4851,14 @@ sin16s: {
   breturn:
   //SEG283 [150] return 
     rts
-  //SEG284 sin16s::@15
-  b15:
+  //SEG284 sin16s::@12
+  b12:
   //SEG285 [151] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1 -- vwsz1=vwsz2 
     lda usinx_1
     sta return_5
     lda usinx_1+1
     sta return_5+1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
 //SEG286 mulu16_sel
 // Calculate val*val for two unsigned word values - the result is 16 selected bits of the 32-bit result.
@@ -4865,9 +4901,9 @@ mulu16_sel: {
     sta mul16u.return_3+2
     lda mul16u.res+3
     sta mul16u.return_3+3
-    jmp b2
-  //SEG294 mulu16_sel::@2
-  b2:
+    jmp b1
+  //SEG294 mulu16_sel::@1
+  b1:
   //SEG295 [157] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#3 -- vduz1=vduz2 
     lda mul16u.return_3
     sta _0
@@ -4934,9 +4970,9 @@ div32u16u: {
     sta divr16u.return_2
     lda divr16u.return+1
     sta divr16u.return_2+1
-    jmp b2
-  //SEG306 div32u16u::@2
-  b2:
+    jmp b1
+  //SEG306 div32u16u::@1
+  b1:
   //SEG307 [164] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return_2
     sta quotient_hi
@@ -4948,23 +4984,23 @@ div32u16u: {
     lda rem16u+1
     sta divr16u.rem+1
   //SEG309 [166] call divr16u 
-  //SEG310 [171] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  divr16u_from_b2:
-  //SEG311 [171] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG310 [171] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  divr16u_from_b1:
+  //SEG311 [171] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG312 [171] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG312 [171] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG313 [167] (word) divr16u::return#3 ← (word) divr16u::return#0 -- vwuz1=vwuz2 
     lda divr16u.return
     sta divr16u.return_3
     lda divr16u.return+1
     sta divr16u.return_3+1
-    jmp b3
-  //SEG314 div32u16u::@3
-  b3:
+    jmp b2
+  //SEG314 div32u16u::@2
+  b2:
   //SEG315 [168] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3 -- vwuz1=vwuz2 
     lda divr16u.return_3
     sta quotient_lo
@@ -5219,10 +5255,10 @@ bitmap_init: {
     sta bitmap_plot_bit,y
   //SEG391 [203] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr bits
-  //SEG392 [204] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuz1_neq_0_then_la1 
+  //SEG392 [204] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuz1_neq_0_then_la1 
     lda bits
     cmp #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG393 [205] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
   b2_from_b1:
   //SEG394 [205] phi (byte) bitmap_init::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:bitmap_init::@1->bitmap_init::@2#0] -- vbuz1=vbuc1 
@@ -5237,24 +5273,24 @@ bitmap_init: {
     lda x
     cmp #0
     bne b1_from_b2
-  //SEG398 [208] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  b5_from_b2:
-  //SEG399 [208] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG398 [208] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  b3_from_b2:
+  //SEG399 [208] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<BITMAP
     sta yoffs
     lda #>BITMAP
     sta yoffs+1
-  //SEG400 [208] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuz1=vbuc1 
+  //SEG400 [208] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuz1=vbuc1 
     lda #0
     sta y
-    jmp b5
-  //SEG401 [208] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  b5_from_b6:
-  //SEG402 [208] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG403 [208] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-    jmp b5
-  //SEG404 bitmap_init::@5
-  b5:
+    jmp b3
+  //SEG401 [208] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  b3_from_b4:
+  //SEG402 [208] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG403 [208] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+    jmp b3
+  //SEG404 bitmap_init::@3
+  b3:
   //SEG405 [209] (byte~) bitmap_init::$3 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuz2_band_vbuc1 
     lda #7
     and y
@@ -5281,13 +5317,13 @@ bitmap_init: {
     lda #7
     and y
     sta _7
-  //SEG412 [216] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG412 [216] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp _7
-    bne b6_from_b5
-    jmp b7
-  //SEG413 bitmap_init::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG413 bitmap_init::@5
+  b5:
   //SEG414 [217] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -5296,32 +5332,32 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG415 [218] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG416 [218] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-    jmp b6
-  //SEG417 bitmap_init::@6
-  b6:
+  //SEG415 [218] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG416 [218] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+    jmp b4
+  //SEG417 bitmap_init::@4
+  b4:
   //SEG418 [219] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG419 [220] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuz1_neq_0_then_la1 
+  //SEG419 [220] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuz1_neq_0_then_la1 
     lda y
     cmp #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG420 bitmap_init::@return
   breturn:
   //SEG421 [221] return 
     rts
-  //SEG422 [222] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG423 bitmap_init::@10
-  b10:
-  //SEG424 [205] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  b2_from_b10:
-  //SEG425 [205] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG422 [222] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG423 bitmap_init::@6
+  b6:
+  //SEG424 [205] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  b2_from_b6:
+  //SEG425 [205] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
     jmp b2
 }
 //SEG426 fill
@@ -5399,7 +5435,7 @@ Statement [39] (signed word) render_sine::sin2_val#0 ← *((signed word*~) rende
 Statement [40] (signed word) wrap_y::y#1 ← (signed word) render_sine::sin2_val#0 + (byte/signed byte/word/signed word/dword/signed dword) $a [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#1 ] ( main:3::render_sine:23 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#1 ] ) always clobbers reg byte a 
 Statement [44] (word) bitmap_plot::x#1 ← (word) render_sine::xpos#3 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::ypos2#0 bitmap_plot::x#1 ] ( main:3::render_sine:23 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::ypos2#0 bitmap_plot::x#1 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:80 [ render_sine::ypos2#0 ]
-Statement [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@10 [ render_sine::sin_idx#2 render_sine::xpos#1 ] ( main:3::render_sine:23 [ render_sine::sin_idx#2 render_sine::xpos#1 ] ) always clobbers reg byte a 
+Statement [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@7 [ render_sine::sin_idx#2 render_sine::xpos#1 ] ( main:3::render_sine:23 [ render_sine::sin_idx#2 render_sine::xpos#1 ] ) always clobbers reg byte a 
 Statement [51] if((word) render_sine::sin_idx#1<(const word) SIN_SIZE#0) goto render_sine::@1 [ render_sine::sin_idx#1 render_sine::xpos#8 ] ( main:3::render_sine:23 [ render_sine::sin_idx#1 render_sine::xpos#8 ] ) always clobbers reg byte a 
 Statement [55] (word~) bitmap_plot::$3 ← *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_plot::y#2) w= *((const byte[$100]) bitmap_plot_ylo#0 + (byte) bitmap_plot::y#2) [ bitmap_plot::x#2 bitmap_plot::$3 ] ( main:3::render_sine:23::bitmap_plot:36 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::$3 ] main:3::render_sine:23::bitmap_plot:46 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::$3 ] ) always clobbers reg byte a 
 Statement [56] (word~) bitmap_plot::$1 ← (word) bitmap_plot::x#2 & (word/dword/signed dword) $fff8 [ bitmap_plot::x#2 bitmap_plot::$3 bitmap_plot::$1 ] ( main:3::render_sine:23::bitmap_plot:36 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::$3 bitmap_plot::$1 ] main:3::render_sine:23::bitmap_plot:46 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::$3 bitmap_plot::$1 ] ) always clobbers reg byte a 
@@ -5407,7 +5443,7 @@ Statement [57] (byte*) bitmap_plot::plotter#1 ← (byte*)(word~) bitmap_plot::$3
 Statement [58] (byte~) bitmap_plot::$2 ← < (word) bitmap_plot::x#2 [ bitmap_plot::plotter#1 bitmap_plot::$2 ] ( main:3::render_sine:23::bitmap_plot:36 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::plotter#1 bitmap_plot::$2 ] main:3::render_sine:23::bitmap_plot:46 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::plotter#1 bitmap_plot::$2 ] ) always clobbers reg byte a 
 Statement [59] *((byte*) bitmap_plot::plotter#1) ← *((byte*) bitmap_plot::plotter#1) | *((const byte[$100]) bitmap_plot_bit#0 + (byte~) bitmap_plot::$2) [ ] ( main:3::render_sine:23::bitmap_plot:36 [ render_sine::sin_idx#2 render_sine::xpos#3 ] main:3::render_sine:23::bitmap_plot:46 [ render_sine::sin_idx#2 render_sine::xpos#3 ] ) always clobbers reg byte a reg byte y 
 Statement [63] if((signed word) wrap_y::y#4>=(byte/word/signed word/dword/signed dword) $c8) goto wrap_y::@2 [ wrap_y::y#4 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#4 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#4 ] ) always clobbers reg byte a 
-Statement [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@5 [ wrap_y::y#6 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#6 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#6 ] ) always clobbers reg byte a 
+Statement [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@4 [ wrap_y::y#6 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#6 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#6 ] ) always clobbers reg byte a 
 Statement [66] (byte) wrap_y::return#2 ← ((byte)) (signed word) wrap_y::y#6 [ wrap_y::return#2 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::return#2 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::return#2 ] ) always clobbers reg byte a 
 Statement [68] (signed word) wrap_y::y#3 ← (signed word) wrap_y::y#6 + (byte/word/signed word/dword/signed dword) $c8 [ wrap_y::y#3 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#3 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#3 ] ) always clobbers reg byte a 
 Statement [69] (signed word) wrap_y::y#2 ← (signed word) wrap_y::y#4 - (byte/word/signed word/dword/signed dword) $c8 [ wrap_y::y#2 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#2 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#2 ] ) always clobbers reg byte a 
@@ -5515,7 +5551,7 @@ Statement [38] (signed word*~) render_sine::$5 ← (const signed word*) sin2#0 +
 Statement [39] (signed word) render_sine::sin2_val#0 ← *((signed word*~) render_sine::$5) [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::sin2_val#0 ] ( main:3::render_sine:23 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::sin2_val#0 ] ) always clobbers reg byte a reg byte y 
 Statement [40] (signed word) wrap_y::y#1 ← (signed word) render_sine::sin2_val#0 + (byte/signed byte/word/signed word/dword/signed dword) $a [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#1 ] ( main:3::render_sine:23 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#1 ] ) always clobbers reg byte a 
 Statement [44] (word) bitmap_plot::x#1 ← (word) render_sine::xpos#3 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::ypos2#0 bitmap_plot::x#1 ] ( main:3::render_sine:23 [ render_sine::sin_idx#2 render_sine::xpos#3 render_sine::ypos2#0 bitmap_plot::x#1 ] ) always clobbers reg byte a 
-Statement [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@10 [ render_sine::sin_idx#2 render_sine::xpos#1 ] ( main:3::render_sine:23 [ render_sine::sin_idx#2 render_sine::xpos#1 ] ) always clobbers reg byte a 
+Statement [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@7 [ render_sine::sin_idx#2 render_sine::xpos#1 ] ( main:3::render_sine:23 [ render_sine::sin_idx#2 render_sine::xpos#1 ] ) always clobbers reg byte a 
 Statement [51] if((word) render_sine::sin_idx#1<(const word) SIN_SIZE#0) goto render_sine::@1 [ render_sine::sin_idx#1 render_sine::xpos#8 ] ( main:3::render_sine:23 [ render_sine::sin_idx#1 render_sine::xpos#8 ] ) always clobbers reg byte a 
 Statement [55] (word~) bitmap_plot::$3 ← *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_plot::y#2) w= *((const byte[$100]) bitmap_plot_ylo#0 + (byte) bitmap_plot::y#2) [ bitmap_plot::x#2 bitmap_plot::$3 ] ( main:3::render_sine:23::bitmap_plot:36 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::$3 ] main:3::render_sine:23::bitmap_plot:46 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::$3 ] ) always clobbers reg byte a 
 Statement [56] (word~) bitmap_plot::$1 ← (word) bitmap_plot::x#2 & (word/dword/signed dword) $fff8 [ bitmap_plot::x#2 bitmap_plot::$3 bitmap_plot::$1 ] ( main:3::render_sine:23::bitmap_plot:36 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::$3 bitmap_plot::$1 ] main:3::render_sine:23::bitmap_plot:46 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::x#2 bitmap_plot::$3 bitmap_plot::$1 ] ) always clobbers reg byte a 
@@ -5523,7 +5559,7 @@ Statement [57] (byte*) bitmap_plot::plotter#1 ← (byte*)(word~) bitmap_plot::$3
 Statement [58] (byte~) bitmap_plot::$2 ← < (word) bitmap_plot::x#2 [ bitmap_plot::plotter#1 bitmap_plot::$2 ] ( main:3::render_sine:23::bitmap_plot:36 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::plotter#1 bitmap_plot::$2 ] main:3::render_sine:23::bitmap_plot:46 [ render_sine::sin_idx#2 render_sine::xpos#3 bitmap_plot::plotter#1 bitmap_plot::$2 ] ) always clobbers reg byte a 
 Statement [59] *((byte*) bitmap_plot::plotter#1) ← *((byte*) bitmap_plot::plotter#1) | *((const byte[$100]) bitmap_plot_bit#0 + (byte~) bitmap_plot::$2) [ ] ( main:3::render_sine:23::bitmap_plot:36 [ render_sine::sin_idx#2 render_sine::xpos#3 ] main:3::render_sine:23::bitmap_plot:46 [ render_sine::sin_idx#2 render_sine::xpos#3 ] ) always clobbers reg byte a reg byte y 
 Statement [63] if((signed word) wrap_y::y#4>=(byte/word/signed word/dword/signed dword) $c8) goto wrap_y::@2 [ wrap_y::y#4 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#4 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#4 ] ) always clobbers reg byte a 
-Statement [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@5 [ wrap_y::y#6 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#6 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#6 ] ) always clobbers reg byte a 
+Statement [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@4 [ wrap_y::y#6 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#6 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#6 ] ) always clobbers reg byte a 
 Statement [66] (byte) wrap_y::return#2 ← ((byte)) (signed word) wrap_y::y#6 [ wrap_y::return#2 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::return#2 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::return#2 ] ) always clobbers reg byte a 
 Statement [68] (signed word) wrap_y::y#3 ← (signed word) wrap_y::y#6 + (byte/word/signed word/dword/signed dword) $c8 [ wrap_y::y#3 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#3 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#3 ] ) always clobbers reg byte a 
 Statement [69] (signed word) wrap_y::y#2 ← (signed word) wrap_y::y#4 - (byte/word/signed word/dword/signed dword) $c8 [ wrap_y::y#2 ] ( main:3::render_sine:23::wrap_y:31 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#2 ] main:3::render_sine:23::wrap_y:41 [ render_sine::sin_idx#2 render_sine::xpos#3 wrap_y::y#2 ] ) always clobbers reg byte a 
@@ -5858,19 +5894,19 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label rem16u = 2
 //SEG3 @begin
 bbegin:
-  jmp b29
-//SEG4 @29
-b29:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 kickasm(location (const signed word*) sin2#0) {{ .for(var i=0; i<512; i++) {   	  .word sin(toRadians([i*360]/512))*320     }  }}
-//SEG6 [2] phi from @29 to @32 [phi:@29->@32]
-b32_from_b29:
-  jmp b32
-//SEG7 @32
-b32:
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG7 @2
+b2:
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @32 to @end [phi:@32->@end]
-bend_from_b32:
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG10 @end
 bend:
@@ -5908,67 +5944,67 @@ main: {
   //SEG21 [11] *((const byte*) CIA2_PORT_A#0) ← (const byte) main::vicSelectGfxBank1_toDd001_return#0 -- _deref_pbuc1=vbuc2 
     lda #vicSelectGfxBank1_toDd001_return
     sta CIA2_PORT_A
-    jmp b7
-  //SEG22 main::@7
-  b7:
+    jmp b2
+  //SEG22 main::@2
+  b2:
   //SEG23 [12] *((const byte*) D016#0) ← (const byte) VIC_CSEL#0 -- _deref_pbuc1=vbuc2 
     lda #VIC_CSEL
     sta D016
-  //SEG24 [13] phi from main::@7 to main::toD0181 [phi:main::@7->main::toD0181]
-  toD0181_from_b7:
+  //SEG24 [13] phi from main::@2 to main::toD0181 [phi:main::@2->main::toD0181]
+  toD0181_from_b2:
     jmp toD0181
   //SEG25 main::toD0181
   toD0181:
-    jmp b8
-  //SEG26 main::@8
-  b8:
+    jmp b3
+  //SEG26 main::@3
+  b3:
   //SEG27 [14] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG28 [15] call fill 
-  //SEG29 [223] phi from main::@8 to fill [phi:main::@8->fill]
-  fill_from_b8:
+  //SEG29 [223] phi from main::@3 to fill [phi:main::@3->fill]
+  fill_from_b3:
     jsr fill
-  //SEG30 [16] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG31 main::@9
-  b9:
+  //SEG30 [16] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG31 main::@4
+  b4:
   //SEG32 [17] call bitmap_init 
-  //SEG33 [200] phi from main::@9 to bitmap_init [phi:main::@9->bitmap_init]
-  bitmap_init_from_b9:
+  //SEG33 [200] phi from main::@4 to bitmap_init [phi:main::@4->bitmap_init]
+  bitmap_init_from_b4:
     jsr bitmap_init
-  //SEG34 [18] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG35 main::@10
-  b10:
+  //SEG34 [18] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG35 main::@5
+  b5:
   //SEG36 [19] call bitmap_clear 
     jsr bitmap_clear
-  //SEG37 [20] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG38 main::@11
-  b11:
+  //SEG37 [20] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG38 main::@6
+  b6:
   //SEG39 [21] call sin16s_gen2 
-  //SEG40 [70] phi from main::@11 to sin16s_gen2 [phi:main::@11->sin16s_gen2]
-  sin16s_gen2_from_b11:
+  //SEG40 [70] phi from main::@6 to sin16s_gen2 [phi:main::@6->sin16s_gen2]
+  sin16s_gen2_from_b6:
     jsr sin16s_gen2
-  //SEG41 [22] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG42 main::@12
-  b12:
+  //SEG41 [22] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG42 main::@7
+  b7:
   //SEG43 [23] call render_sine 
-  //SEG44 [25] phi from main::@12 to render_sine [phi:main::@12->render_sine]
-  render_sine_from_b12:
+  //SEG44 [25] phi from main::@7 to render_sine [phi:main::@7->render_sine]
+  render_sine_from_b7:
     jsr render_sine
-    jmp b2
-  //SEG45 main::@2
-  b2:
+    jmp b1
+  //SEG45 main::@1
+  b1:
   //SEG46 [24] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
-    jmp b2
+    jmp b1
 }
 //SEG47 render_sine
 render_sine: {
@@ -6030,22 +6066,22 @@ render_sine: {
   //SEG61 [61] phi (signed word) wrap_y::y#9 = (signed word) wrap_y::y#0 [phi:render_sine::@1->wrap_y#0] -- register_copy 
     jsr wrap_y
   //SEG62 [32] (byte) wrap_y::return#0 ← (byte) wrap_y::return#2
-    jmp b5
-  //SEG63 render_sine::@5
-  b5:
+    jmp b3
+  //SEG63 render_sine::@3
+  b3:
   //SEG64 [33] (byte) render_sine::ypos#0 ← (byte) wrap_y::return#0 -- vbuxx=vbuaa 
     tax
   //SEG65 [34] (word) bitmap_plot::x#0 ← (word) render_sine::xpos#3
   //SEG66 [35] (byte) bitmap_plot::y#0 ← (byte) render_sine::ypos#0
   //SEG67 [36] call bitmap_plot 
-  //SEG68 [54] phi from render_sine::@5 to bitmap_plot [phi:render_sine::@5->bitmap_plot]
-  bitmap_plot_from_b5:
-  //SEG69 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#0 [phi:render_sine::@5->bitmap_plot#0] -- register_copy 
-  //SEG70 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#0 [phi:render_sine::@5->bitmap_plot#1] -- register_copy 
+  //SEG68 [54] phi from render_sine::@3 to bitmap_plot [phi:render_sine::@3->bitmap_plot]
+  bitmap_plot_from_b3:
+  //SEG69 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#0 [phi:render_sine::@3->bitmap_plot#0] -- register_copy 
+  //SEG70 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#0 [phi:render_sine::@3->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b6
-  //SEG71 render_sine::@6
-  b6:
+    jmp b4
+  //SEG71 render_sine::@4
+  b4:
   //SEG72 [37] (word~) render_sine::$4 ← (word) render_sine::sin_idx#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz2_rol_1 
     lda sin_idx
     asl
@@ -6085,42 +6121,42 @@ render_sine: {
     adc $ff
     sta wrap_y.y+1
   //SEG76 [41] call wrap_y 
-  //SEG77 [61] phi from render_sine::@6 to wrap_y [phi:render_sine::@6->wrap_y]
-  wrap_y_from_b6:
-  //SEG78 [61] phi (signed word) wrap_y::y#9 = (signed word) wrap_y::y#1 [phi:render_sine::@6->wrap_y#0] -- register_copy 
+  //SEG77 [61] phi from render_sine::@4 to wrap_y [phi:render_sine::@4->wrap_y]
+  wrap_y_from_b4:
+  //SEG78 [61] phi (signed word) wrap_y::y#9 = (signed word) wrap_y::y#1 [phi:render_sine::@4->wrap_y#0] -- register_copy 
     jsr wrap_y
   //SEG79 [42] (byte) wrap_y::return#1 ← (byte) wrap_y::return#2
-    jmp b7
-  //SEG80 render_sine::@7
-  b7:
+    jmp b5
+  //SEG80 render_sine::@5
+  b5:
   //SEG81 [43] (byte) render_sine::ypos2#0 ← (byte) wrap_y::return#1 -- vbuxx=vbuaa 
     tax
   //SEG82 [44] (word) bitmap_plot::x#1 ← (word) render_sine::xpos#3
   //SEG83 [45] (byte) bitmap_plot::y#1 ← (byte) render_sine::ypos2#0
   //SEG84 [46] call bitmap_plot 
-  //SEG85 [54] phi from render_sine::@7 to bitmap_plot [phi:render_sine::@7->bitmap_plot]
-  bitmap_plot_from_b7:
-  //SEG86 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#1 [phi:render_sine::@7->bitmap_plot#0] -- register_copy 
-  //SEG87 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#1 [phi:render_sine::@7->bitmap_plot#1] -- register_copy 
+  //SEG85 [54] phi from render_sine::@5 to bitmap_plot [phi:render_sine::@5->bitmap_plot]
+  bitmap_plot_from_b5:
+  //SEG86 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#1 [phi:render_sine::@5->bitmap_plot#0] -- register_copy 
+  //SEG87 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#1 [phi:render_sine::@5->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-    jmp b8
-  //SEG88 render_sine::@8
-  b8:
+    jmp b6
+  //SEG88 render_sine::@6
+  b6:
   //SEG89 [47] (word) render_sine::xpos#1 ← ++ (word) render_sine::xpos#3 -- vwuz1=_inc_vwuz1 
     inc xpos
     bne !+
     inc xpos+1
   !:
-  //SEG90 [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@10 -- vwuz1_neq_vwuc1_then_la1 
+  //SEG90 [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@7 -- vwuz1_neq_vwuc1_then_la1 
     lda xpos+1
     cmp #>$140
-    bne b10_from_b8
+    bne b7_from_b6
     lda xpos
     cmp #<$140
-    bne b10_from_b8
-  //SEG91 [49] phi from render_sine::@8 to render_sine::@2 [phi:render_sine::@8->render_sine::@2]
-  b2_from_b8:
-  //SEG92 [49] phi (word) render_sine::xpos#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_sine::@8->render_sine::@2#0] -- vwuz1=vbuc1 
+    bne b7_from_b6
+  //SEG91 [49] phi from render_sine::@6 to render_sine::@2 [phi:render_sine::@6->render_sine::@2]
+  b2_from_b6:
+  //SEG92 [49] phi (word) render_sine::xpos#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_sine::@6->render_sine::@2#0] -- vwuz1=vbuc1 
     lda #0
     sta xpos
     lda #0
@@ -6147,14 +6183,14 @@ render_sine: {
   breturn:
   //SEG97 [52] return 
     rts
-  //SEG98 [53] phi from render_sine::@8 to render_sine::@10 [phi:render_sine::@8->render_sine::@10]
-  b10_from_b8:
-    jmp b10
-  //SEG99 render_sine::@10
-  b10:
-  //SEG100 [49] phi from render_sine::@10 to render_sine::@2 [phi:render_sine::@10->render_sine::@2]
-  b2_from_b10:
-  //SEG101 [49] phi (word) render_sine::xpos#8 = (word) render_sine::xpos#1 [phi:render_sine::@10->render_sine::@2#0] -- register_copy 
+  //SEG98 [53] phi from render_sine::@6 to render_sine::@7 [phi:render_sine::@6->render_sine::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG99 render_sine::@7
+  b7:
+  //SEG100 [49] phi from render_sine::@7 to render_sine::@2 [phi:render_sine::@7->render_sine::@2]
+  b2_from_b7:
+  //SEG101 [49] phi (word) render_sine::xpos#8 = (word) render_sine::xpos#1 [phi:render_sine::@7->render_sine::@2#0] -- register_copy 
     jmp b2
 }
 //SEG102 bitmap_plot
@@ -6220,19 +6256,19 @@ wrap_y: {
     eor #$80
   !:
     bpl b2
-  //SEG115 [64] phi from wrap_y::@1 wrap_y::@5 to wrap_y::@4 [phi:wrap_y::@1/wrap_y::@5->wrap_y::@4]
-  b4_from_b1:
-  b4_from_b5:
-  //SEG116 [64] phi (signed word) wrap_y::y#6 = (signed word) wrap_y::y#4 [phi:wrap_y::@1/wrap_y::@5->wrap_y::@4#0] -- register_copy 
-    jmp b4
-  //SEG117 wrap_y::@4
-  b4:
-  //SEG118 [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@5 -- vwsz1_lt_0_then_la1 
+  //SEG115 [64] phi from wrap_y::@1 wrap_y::@4 to wrap_y::@3 [phi:wrap_y::@1/wrap_y::@4->wrap_y::@3]
+  b3_from_b1:
+  b3_from_b4:
+  //SEG116 [64] phi (signed word) wrap_y::y#6 = (signed word) wrap_y::y#4 [phi:wrap_y::@1/wrap_y::@4->wrap_y::@3#0] -- register_copy 
+    jmp b3
+  //SEG117 wrap_y::@3
+  b3:
+  //SEG118 [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@4 -- vwsz1_lt_0_then_la1 
     lda y+1
-    bmi b5
-    jmp b6
-  //SEG119 wrap_y::@6
-  b6:
+    bmi b4
+    jmp b5
+  //SEG119 wrap_y::@5
+  b5:
   //SEG120 [66] (byte) wrap_y::return#2 ← ((byte)) (signed word) wrap_y::y#6 -- vbuaa=_byte_vwsz1 
     lda y
     jmp breturn
@@ -6240,8 +6276,8 @@ wrap_y: {
   breturn:
   //SEG122 [67] return 
     rts
-  //SEG123 wrap_y::@5
-  b5:
+  //SEG123 wrap_y::@4
+  b4:
   //SEG124 [68] (signed word) wrap_y::y#3 ← (signed word) wrap_y::y#6 + (byte/word/signed word/dword/signed dword) $c8 -- vwsz1=vwsz1_plus_vwuc1 
     clc
     lda y
@@ -6250,7 +6286,7 @@ wrap_y: {
     lda y+1
     adc #>$c8
     sta y+1
-    jmp b4_from_b5
+    jmp b3_from_b4
   //SEG125 wrap_y::@2
   b2:
   //SEG126 [69] (signed word) wrap_y::y#2 ← (signed word) wrap_y::y#4 - (byte/word/signed word/dword/signed dword) $c8 -- vwsz1=vwsz1_minus_vbuc1 
@@ -6285,23 +6321,23 @@ sin16s_gen2: {
   div32u16u_from_sin16s_gen2:
     jsr div32u16u
   //SEG130 [72] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-    jmp b3
-  //SEG131 sin16s_gen2::@3
-  b3:
+    jmp b2
+  //SEG131 sin16s_gen2::@2
+  b2:
   //SEG132 [73] (dword) sin16s_gen2::step#0 ← (dword) div32u16u::return#2
-  //SEG133 [74] phi from sin16s_gen2::@3 to sin16s_gen2::@1 [phi:sin16s_gen2::@3->sin16s_gen2::@1]
-  b1_from_b3:
-  //SEG134 [74] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
+  //SEG133 [74] phi from sin16s_gen2::@2 to sin16s_gen2::@1 [phi:sin16s_gen2::@2->sin16s_gen2::@1]
+  b1_from_b2:
+  //SEG134 [74] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG135 [74] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[$200]) sin#0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
+  //SEG135 [74] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[$200]) sin#0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
     lda #<sin
     sta sintab
     lda #>sin
     sta sintab+1
-  //SEG136 [74] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#2] -- vduz1=vbuc1 
+  //SEG136 [74] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -6310,11 +6346,11 @@ sin16s_gen2: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG137 [74] phi from sin16s_gen2::@5 to sin16s_gen2::@1 [phi:sin16s_gen2::@5->sin16s_gen2::@1]
-  b1_from_b5:
-  //SEG138 [74] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#0] -- register_copy 
-  //SEG139 [74] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@5->sin16s_gen2::@1#1] -- register_copy 
-  //SEG140 [74] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#2] -- register_copy 
+  //SEG137 [74] phi from sin16s_gen2::@4 to sin16s_gen2::@1 [phi:sin16s_gen2::@4->sin16s_gen2::@1]
+  b1_from_b4:
+  //SEG138 [74] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#0] -- register_copy 
+  //SEG139 [74] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@4->sin16s_gen2::@1#1] -- register_copy 
+  //SEG140 [74] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#2] -- register_copy 
     jmp b1
   //SEG141 sin16s_gen2::@1
   b1:
@@ -6330,16 +6366,16 @@ sin16s_gen2: {
   //SEG143 [76] call sin16s 
     jsr sin16s
   //SEG144 [77] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-    jmp b4
-  //SEG145 sin16s_gen2::@4
-  b4:
+    jmp b3
+  //SEG145 sin16s_gen2::@3
+  b3:
   //SEG146 [78] (signed word) mul16s::a#0 ← (signed word) sin16s::return#0
   //SEG147 [79] call mul16s 
     jsr mul16s
   //SEG148 [80] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-    jmp b5
-  //SEG149 sin16s_gen2::@5
-  b5:
+    jmp b4
+  //SEG149 sin16s_gen2::@4
+  b4:
   //SEG150 [81] (signed dword~) sin16s_gen2::$5 ← (signed dword) mul16s::return#2
   //SEG151 [82] (word~) sin16s_gen2::$6 ← > (signed dword~) sin16s_gen2::$5 -- vwuz1=_hi_vdsz2 
     lda _5+2
@@ -6391,11 +6427,11 @@ sin16s_gen2: {
   //SEG157 [88] if((word) sin16s_gen2::i#1<(const word) SIN_SIZE#0) goto sin16s_gen2::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>SIN_SIZE
-    bcc b1_from_b5
+    bcc b1_from_b4
     bne !+
     lda i
     cmp #<SIN_SIZE
-    bcc b1_from_b5
+    bcc b1_from_b4
   !:
     jmp breturn
   //SEG158 sin16s_gen2::@return
@@ -6429,13 +6465,13 @@ mul16s: {
     sta mul16u.b+1
     jsr mul16u
   //SEG166 [92] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-    jmp b6
-  //SEG167 mul16s::@6
-  b6:
+    jmp b4
+  //SEG167 mul16s::@4
+  b4:
   //SEG168 [93] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   //SEG169 [94] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
-    bpl b1_from_b6
+    bpl b1_from_b4
     jmp b3
   //SEG170 mul16s::@3
   b3:
@@ -6457,10 +6493,10 @@ mul16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG174 [98] phi from mul16s::@3 mul16s::@6 to mul16s::@1 [phi:mul16s::@3/mul16s::@6->mul16s::@1]
+  //SEG174 [98] phi from mul16s::@3 mul16s::@4 to mul16s::@1 [phi:mul16s::@3/mul16s::@4->mul16s::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG175 [98] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@6->mul16s::@1#0] -- register_copy 
+  b1_from_b4:
+  //SEG175 [98] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@4->mul16s::@1#0] -- register_copy 
     jmp b1
   //SEG176 mul16s::@1
   b1:
@@ -6520,12 +6556,12 @@ mul16u: {
   //SEG192 [106] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG193 [107] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG193 [107] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG194 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG194 mul16u::@3
+  b3:
   //SEG195 [108] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -6540,13 +6576,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG196 [109] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG197 [109] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG198 mul16u::@8
-  b8:
+  //SEG196 [109] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG197 [109] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG198 mul16u::@4
+  b4:
   //SEG199 [110] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -6556,11 +6592,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG201 [103] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG202 [103] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG203 [103] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG204 [103] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG201 [103] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG202 [103] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG203 [103] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG204 [103] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG205 sin16s
@@ -6706,9 +6742,9 @@ sin16s: {
   //SEG230 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG231 [123] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-    jmp b8
-  //SEG232 sin16s::@8
-  b8:
+    jmp b7
+  //SEG232 sin16s::@7
+  b7:
   //SEG233 [124] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -6721,39 +6757,39 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG236 [127] call mulu16_sel 
-  //SEG237 [152] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG238 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG237 [152] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG238 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG239 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG240 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG239 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG240 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG241 [128] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_1
     lda mulu16_sel.return+1
     sta mulu16_sel.return_1+1
-    jmp b9
-  //SEG242 sin16s::@9
-  b9:
+    jmp b8
+  //SEG242 sin16s::@8
+  b8:
   //SEG243 [129] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   //SEG244 [130] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   //SEG245 [131] call mulu16_sel 
-  //SEG246 [152] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG247 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG246 [152] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG247 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG248 [152] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG248 [152] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG249 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG249 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG250 [132] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-    jmp b10
-  //SEG251 sin16s::@10
-  b10:
+    jmp b9
+  //SEG251 sin16s::@9
+  b9:
   //SEG252 [133] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   //SEG253 [134] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -6770,21 +6806,21 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG256 [137] call mulu16_sel 
-  //SEG257 [152] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG258 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG257 [152] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG258 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG259 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG260 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG259 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG260 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG261 [138] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_10
     lda mulu16_sel.return+1
     sta mulu16_sel.return_10+1
-    jmp b11
-  //SEG262 sin16s::@11
-  b11:
+    jmp b10
+  //SEG262 sin16s::@10
+  b10:
   //SEG263 [139] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   //SEG264 [140] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   //SEG265 [141] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -6793,17 +6829,17 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG266 [142] call mulu16_sel 
-  //SEG267 [152] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG268 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG267 [152] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG268 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG269 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG270 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG269 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG270 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG271 [143] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-    jmp b12
-  //SEG272 sin16s::@12
-  b12:
+    jmp b11
+  //SEG272 sin16s::@11
+  b11:
   //SEG273 [144] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   //SEG274 [145] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -6820,10 +6856,10 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG276 [147] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG276 [147] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG277 sin16s::@6
   b6:
@@ -6837,10 +6873,10 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG279 [149] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  b3_from_b15:
+  //SEG279 [149] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG280 [149] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG280 [149] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
     jmp b3
   //SEG281 sin16s::@3
   b3:
@@ -6849,10 +6885,10 @@ sin16s: {
   breturn:
   //SEG283 [150] return 
     rts
-  //SEG284 sin16s::@15
-  b15:
+  //SEG284 sin16s::@12
+  b12:
   //SEG285 [151] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
 //SEG286 mulu16_sel
 // Calculate val*val for two unsigned word values - the result is 16 selected bits of the 32-bit result.
@@ -6879,9 +6915,9 @@ mulu16_sel: {
   //SEG292 [101] phi (word) mul16u::b#2 = (word) mul16u::b#1 [phi:mulu16_sel->mul16u#1] -- register_copy 
     jsr mul16u
   //SEG293 [156] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-    jmp b2
-  //SEG294 mulu16_sel::@2
-  b2:
+    jmp b1
+  //SEG294 mulu16_sel::@1
+  b1:
   //SEG295 [157] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#3
   //SEG296 [158] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5 -- vduz1=vduz1_rol_vbuxx 
     cpx #0
@@ -6927,9 +6963,9 @@ div32u16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG305 [163] (word) divr16u::return#2 ← (word) divr16u::return#0
-    jmp b2
-  //SEG306 div32u16u::@2
-  b2:
+    jmp b1
+  //SEG306 div32u16u::@1
+  b1:
   //SEG307 [164] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return
     sta quotient_hi
@@ -6937,19 +6973,19 @@ div32u16u: {
     sta quotient_hi+1
   //SEG308 [165] (word) divr16u::rem#4 ← (word) rem16u#1
   //SEG309 [166] call divr16u 
-  //SEG310 [171] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  divr16u_from_b2:
-  //SEG311 [171] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG310 [171] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  divr16u_from_b1:
+  //SEG311 [171] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG312 [171] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG312 [171] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG313 [167] (word) divr16u::return#3 ← (word) divr16u::return#0
-    jmp b3
-  //SEG314 div32u16u::@3
-  b3:
+    jmp b2
+  //SEG314 div32u16u::@2
+  b2:
   //SEG315 [168] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   //SEG316 [169] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda quotient_hi
@@ -7167,9 +7203,9 @@ bitmap_init: {
     sta bitmap_plot_bit,x
   //SEG391 [203] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuaa_ror_1 
     lsr
-  //SEG392 [204] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuaa_neq_0_then_la1 
+  //SEG392 [204] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG393 [205] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
   b2_from_b1:
   //SEG394 [205] phi (byte) bitmap_init::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:bitmap_init::@1->bitmap_init::@2#0] -- vbuaa=vbuc1 
@@ -7182,23 +7218,23 @@ bitmap_init: {
   //SEG397 [207] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1_from_b2
-  //SEG398 [208] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  b5_from_b2:
-  //SEG399 [208] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG398 [208] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  b3_from_b2:
+  //SEG399 [208] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<BITMAP
     sta yoffs
     lda #>BITMAP
     sta yoffs+1
-  //SEG400 [208] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuxx=vbuc1 
+  //SEG400 [208] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuxx=vbuc1 
     ldx #0
-    jmp b5
-  //SEG401 [208] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  b5_from_b6:
-  //SEG402 [208] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG403 [208] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-    jmp b5
-  //SEG404 bitmap_init::@5
-  b5:
+    jmp b3
+  //SEG401 [208] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  b3_from_b4:
+  //SEG402 [208] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG403 [208] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+    jmp b3
+  //SEG404 bitmap_init::@3
+  b3:
   //SEG405 [209] (byte~) bitmap_init::$3 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _3
@@ -7215,12 +7251,12 @@ bitmap_init: {
   //SEG411 [215] (byte~) bitmap_init::$7 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG412 [216] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG412 [216] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6_from_b5
-    jmp b7
-  //SEG413 bitmap_init::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG413 bitmap_init::@5
+  b5:
   //SEG414 [217] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -7229,31 +7265,31 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG415 [218] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG416 [218] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-    jmp b6
-  //SEG417 bitmap_init::@6
-  b6:
+  //SEG415 [218] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG416 [218] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+    jmp b4
+  //SEG417 bitmap_init::@4
+  b4:
   //SEG418 [219] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG419 [220] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuxx_neq_0_then_la1 
+  //SEG419 [220] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG420 bitmap_init::@return
   breturn:
   //SEG421 [221] return 
     rts
-  //SEG422 [222] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG423 bitmap_init::@10
-  b10:
-  //SEG424 [205] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  b2_from_b10:
-  //SEG425 [205] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG422 [222] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG423 bitmap_init::@6
+  b6:
+  //SEG424 [205] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  b2_from_b6:
+  //SEG425 [205] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
     jmp b2
 }
 //SEG426 fill
@@ -7311,63 +7347,63 @@ fill: {
 
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b29
-Removing instruction jmp b32
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp bend
 Removing instruction jmp vicSelectGfxBank1
 Removing instruction jmp vicSelectGfxBank1_toDd001
 Removing instruction jmp vicSelectGfxBank1_b1
-Removing instruction jmp b7
+Removing instruction jmp b2
 Removing instruction jmp toD0181
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b1
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b7
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp b5
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp breturn
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b4
+Removing instruction jmp b1
+Removing instruction jmp b5
+Removing instruction jmp b2
+Removing instruction jmp b7
 Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
-Removing instruction jmp b12
-Removing instruction jmp b2
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b10
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b4
-Removing instruction jmp b6
-Removing instruction jmp breturn
-Removing instruction jmp b3
-Removing instruction jmp b1
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b3
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b4
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b2
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b10
-Removing instruction jmp b11
-Removing instruction jmp b12
 Removing instruction jmp b6
 Removing instruction jmp b3
 Removing instruction jmp breturn
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
+Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -7382,11 +7418,11 @@ Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp b5
-Removing instruction jmp b7
-Removing instruction jmp b6
+Removing instruction jmp b4
 Removing instruction jmp breturn
-Removing instruction jmp b10
+Removing instruction jmp b6
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
@@ -7403,67 +7439,67 @@ Replacing instruction lda #0 with TXA
 Removing instruction lda #0
 Replacing instruction ldy #0 with TAY
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b10_from_b8 with b10
-Replacing label b10_from_b8 with b10
+Replacing label b7_from_b6 with b7
+Replacing label b7_from_b6 with b7
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b2 with b1
-Replacing label b4_from_b5 with b4
+Replacing label b3_from_b4 with b3
 Replacing label b1_from_b2 with b1
-Replacing label b1_from_b5 with b1
-Replacing label b1_from_b5 with b1
-Replacing label b1_from_b6 with b2
-Replacing label b8_from_b2 with b8
+Replacing label b1_from_b4 with b1
+Replacing label b1_from_b4 with b1
+Replacing label b1_from_b4 with b2
+Replacing label b4_from_b2 with b4
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
-Replacing label b3_from_b15 with b3
+Replacing label b3_from_b12 with b3
 Replacing label b2_from_b1 with b2
 Replacing label b3_from_b2 with b3
 Replacing label b3_from_b2 with b3
 Replacing label b1_from_b3 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
-Replacing label b10_from_b1 with b10
+Replacing label b6_from_b1 with b6
 Replacing label b1_from_b2 with b1
-Replacing label b6_from_b5 with b6
-Replacing label b5_from_b6 with b5
+Replacing label b4_from_b3 with b4
+Replacing label b3_from_b4 with b3
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b29:
-Removing instruction b32_from_b29:
-Removing instruction b32:
-Removing instruction bend_from_b32:
+Removing instruction b1:
+Removing instruction b2_from_b1:
+Removing instruction b2:
+Removing instruction bend_from_b2:
 Removing instruction vicSelectGfxBank1_toDd001_from_vicSelectGfxBank1:
 Removing instruction vicSelectGfxBank1_toDd001:
-Removing instruction toD0181_from_b7:
+Removing instruction toD0181_from_b2:
 Removing instruction toD0181:
-Removing instruction b9_from_b8:
-Removing instruction bitmap_init_from_b9:
-Removing instruction b10_from_b9:
-Removing instruction b11_from_b10:
-Removing instruction sin16s_gen2_from_b11:
-Removing instruction b12_from_b11:
-Removing instruction render_sine_from_b12:
+Removing instruction b4_from_b3:
+Removing instruction bitmap_init_from_b4:
+Removing instruction b5_from_b4:
+Removing instruction b6_from_b5:
+Removing instruction sin16s_gen2_from_b6:
+Removing instruction b7_from_b6:
+Removing instruction render_sine_from_b7:
 Removing instruction b1_from_b2:
-Removing instruction b10_from_b8:
-Removing instruction b2_from_b10:
+Removing instruction b7_from_b6:
+Removing instruction b2_from_b7:
 Removing instruction b1_from_wrap_y:
 Removing instruction b1_from_b2:
-Removing instruction b4_from_b1:
-Removing instruction b4_from_b5:
+Removing instruction b3_from_b1:
+Removing instruction b3_from_b4:
+Removing instruction b1_from_b2:
+Removing instruction b1_from_b4:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b5:
-Removing instruction b1_from_b3:
-Removing instruction b1_from_b6:
+Removing instruction b1_from_b4:
 Removing instruction b1:
 Removing instruction breturn:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b5:
-Removing instruction mulu16_sel_from_b9:
-Removing instruction b3_from_b15:
+Removing instruction mulu16_sel_from_b8:
+Removing instruction b3_from_b12:
 Removing instruction b3_from_b6:
 Removing instruction breturn:
 Removing instruction b1_from_b3:
@@ -7476,69 +7512,69 @@ Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
 Removing instruction b1_from_b2:
-Removing instruction b5_from_b6:
-Removing instruction b6_from_b5:
-Removing instruction b6_from_b7:
-Removing instruction b10_from_b1:
-Removing instruction b2_from_b10:
+Removing instruction b3_from_b4:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b5:
+Removing instruction b6_from_b1:
+Removing instruction b2_from_b6:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction vicSelectGfxBank1:
 Removing instruction vicSelectGfxBank1_b1:
+Removing instruction b2:
+Removing instruction b3:
+Removing instruction fill_from_b3:
+Removing instruction b4:
+Removing instruction b5:
+Removing instruction b6:
 Removing instruction b7:
-Removing instruction b8:
-Removing instruction fill_from_b8:
-Removing instruction b9:
-Removing instruction b10:
-Removing instruction b11:
-Removing instruction b12:
 Removing instruction b1_from_render_sine:
 Removing instruction wrap_y_from_b1:
+Removing instruction b3:
+Removing instruction bitmap_plot_from_b3:
+Removing instruction b4:
+Removing instruction wrap_y_from_b4:
 Removing instruction b5:
 Removing instruction bitmap_plot_from_b5:
 Removing instruction b6:
-Removing instruction wrap_y_from_b6:
-Removing instruction b7:
-Removing instruction bitmap_plot_from_b7:
-Removing instruction b8:
-Removing instruction b2_from_b8:
+Removing instruction b2_from_b6:
 Removing instruction breturn:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction breturn:
-Removing instruction div32u16u_from_sin16s_gen2:
-Removing instruction b3:
-Removing instruction b4:
 Removing instruction b5:
 Removing instruction breturn:
+Removing instruction div32u16u_from_sin16s_gen2:
+Removing instruction b2:
+Removing instruction b3:
+Removing instruction b4:
+Removing instruction breturn:
 Removing instruction mul16u_from_mul16s:
-Removing instruction b6:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction b1_from_mul16u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
+Removing instruction b3:
+Removing instruction b1_from_b4:
 Removing instruction b4:
 Removing instruction b1_from_b4:
 Removing instruction b5:
 Removing instruction mulu16_sel_from_b2:
+Removing instruction b7:
+Removing instruction mulu16_sel_from_b7:
 Removing instruction b8:
-Removing instruction mulu16_sel_from_b8:
 Removing instruction b9:
+Removing instruction mulu16_sel_from_b9:
 Removing instruction b10:
 Removing instruction mulu16_sel_from_b10:
 Removing instruction b11:
-Removing instruction mulu16_sel_from_b11:
-Removing instruction b12:
 Removing instruction b6:
 Removing instruction mul16u_from_mulu16_sel:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction divr16u_from_div32u16u:
+Removing instruction b1:
+Removing instruction divr16u_from_b1:
 Removing instruction b2:
-Removing instruction divr16u_from_b2:
-Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_divr16u:
 Removing instruction b4:
@@ -7549,8 +7585,8 @@ Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_bitmap_init:
 Removing instruction b2_from_b1:
-Removing instruction b5_from_b2:
-Removing instruction b7:
+Removing instruction b3_from_b2:
+Removing instruction b5:
 Removing instruction breturn:
 Removing instruction b1_from_fill:
 Removing instruction breturn:
@@ -7558,10 +7594,10 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b2 in bne b10
-Skipping double jump to b2 in bne b10
-Skipping double jump to b3 in beq b15
-Skipping double jump to b2 in bne b10
+Skipping double jump to b2 in bne b7
+Skipping double jump to b2 in bne b7
+Skipping double jump to b3 in beq b12
+Skipping double jump to b2 in bne b6
 Succesful ASM optimization Pass5DoubleJumpElimination
 Relabelling long label b1_from_sin16s to b4
 Succesful ASM optimization Pass5RelabelLongLabels
@@ -7571,15 +7607,15 @@ Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b3
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
-Removing instruction b10:
-Removing instruction b15:
-Removing instruction b10:
+Removing instruction b7:
+Removing instruction b12:
+Removing instruction b6:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b2
 Removing unreachable instruction jmp b3
@@ -7589,8 +7625,8 @@ Fixing long branch [160] bcc b1 to bcs
 Fixing long branch [166] bcc b1 to bcs
 
 FINAL SYMBOL TABLE
-(label) @29
-(label) @32
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -7726,11 +7762,11 @@ FINAL SYMBOL TABLE
 (byte~) bitmap_init::$6 reg byte a 22.0
 (byte~) bitmap_init::$7 reg byte a 22.0
 (label) bitmap_init::@1
-(label) bitmap_init::@10
 (label) bitmap_init::@2
+(label) bitmap_init::@3
+(label) bitmap_init::@4
 (label) bitmap_init::@5
 (label) bitmap_init::@6
-(label) bitmap_init::@7
 (label) bitmap_init::@return
 (byte*) bitmap_init::bitmap
 (byte) bitmap_init::bits
@@ -7769,8 +7805,8 @@ FINAL SYMBOL TABLE
 (byte[$100]) bitmap_plot_ylo
 (const byte[$100]) bitmap_plot_ylo#0 bitmap_plot_ylo = { fill( $100, 0) }
 (dword()) div32u16u((dword) div32u16u::dividend , (word) div32u16u::divisor)
+(label) div32u16u::@1
 (label) div32u16u::@2
-(label) div32u16u::@3
 (label) div32u16u::@return
 (dword) div32u16u::dividend
 (word) div32u16u::divisor
@@ -7830,13 +7866,13 @@ FINAL SYMBOL TABLE
 (byte*) fill::start
 (byte) fill::val
 (void()) main()
-(label) main::@10
-(label) main::@11
-(label) main::@12
+(label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
+(label) main::@6
 (label) main::@7
-(label) main::@8
-(label) main::@9
 (label) main::toD0181
 (word~) main::toD0181_$0
 (word~) main::toD0181_$1
@@ -7869,7 +7905,7 @@ FINAL SYMBOL TABLE
 (label) mul16s::@1
 (label) mul16s::@2
 (label) mul16s::@3
-(label) mul16s::@6
+(label) mul16s::@4
 (label) mul16s::@return
 (signed word) mul16s::a
 (signed word) mul16s::a#0 a zp ZP_WORD:23 2.6
@@ -7885,8 +7921,8 @@ FINAL SYMBOL TABLE
 (byte/word~) mul16u::$1 reg byte a 202.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:16 101.0
@@ -7911,7 +7947,7 @@ FINAL SYMBOL TABLE
 (word()) mulu16_sel((word) mulu16_sel::v1 , (word) mulu16_sel::v2 , (byte) mulu16_sel::select)
 (dword~) mulu16_sel::$0 $0 zp ZP_DWORD:12 4.0
 (dword~) mulu16_sel::$1 $1 zp ZP_DWORD:12 4.0
-(label) mulu16_sel::@2
+(label) mulu16_sel::@1
 (label) mulu16_sel::@return
 (word) mulu16_sel::return
 (word) mulu16_sel::return#0 return zp ZP_WORD:6 4.0
@@ -7946,12 +7982,12 @@ FINAL SYMBOL TABLE
 (word~) render_sine::$4 $4 zp ZP_WORD:6 22.0
 (signed word*~) render_sine::$5 $5 zp ZP_WORD:6 22.0
 (label) render_sine::@1
-(label) render_sine::@10
 (label) render_sine::@2
+(label) render_sine::@3
+(label) render_sine::@4
 (label) render_sine::@5
 (label) render_sine::@6
 (label) render_sine::@7
-(label) render_sine::@8
 (label) render_sine::@return
 (signed word) render_sine::sin2_val
 (signed word) render_sine::sin2_val#0 sin2_val zp ZP_WORD:6 22.0
@@ -7976,12 +8012,12 @@ FINAL SYMBOL TABLE
 (label) sin16s::@10
 (label) sin16s::@11
 (label) sin16s::@12
-(label) sin16s::@15
 (label) sin16s::@2
 (label) sin16s::@3
 (label) sin16s::@4
 (label) sin16s::@5
 (label) sin16s::@6
+(label) sin16s::@7
 (label) sin16s::@8
 (label) sin16s::@9
 (label) sin16s::@return
@@ -8021,9 +8057,9 @@ FINAL SYMBOL TABLE
 (word~) sin16s_gen2::$6 $6 zp ZP_WORD:6 11.0
 (signed word~) sin16s_gen2::$8 $8 zp ZP_WORD:6 22.0
 (label) sin16s_gen2::@1
+(label) sin16s_gen2::@2
 (label) sin16s_gen2::@3
 (label) sin16s_gen2::@4
-(label) sin16s_gen2::@5
 (label) sin16s_gen2::@return
 (signed word) sin16s_gen2::ampl
 (const signed word) sin16s_gen2::ampl#0 ampl = (const signed word) sin16s_gen2::max#0-(const signed word) sin16s_gen2::min#0
@@ -8050,9 +8086,9 @@ FINAL SYMBOL TABLE
 (byte()) wrap_y((signed word) wrap_y::y)
 (label) wrap_y::@1
 (label) wrap_y::@2
+(label) wrap_y::@3
 (label) wrap_y::@4
 (label) wrap_y::@5
-(label) wrap_y::@6
 (label) wrap_y::@return
 (byte) wrap_y::return
 (byte) wrap_y::return#0 reg byte a 22.0
@@ -8144,12 +8180,12 @@ Score: 28458
   .label sin2 = $1400
   .label rem16u = 2
 //SEG3 @begin
-//SEG4 @29
+//SEG4 @1
 //SEG5 kickasm(location (const signed word*) sin2#0) {{ .for(var i=0; i<512; i++) {   	  .word sin(toRadians([i*360]/512))*320     }  }}
-//SEG6 [2] phi from @29 to @32 [phi:@29->@32]
-//SEG7 @32
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+//SEG7 @2
 //SEG8 [3] call main 
-//SEG9 [4] phi from @32 to @end [phi:@32->@end]
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
 //SEG10 @end
 //SEG11 main
 main: {
@@ -8178,43 +8214,43 @@ main: {
   //SEG21 [11] *((const byte*) CIA2_PORT_A#0) ← (const byte) main::vicSelectGfxBank1_toDd001_return#0 -- _deref_pbuc1=vbuc2 
     lda #vicSelectGfxBank1_toDd001_return
     sta CIA2_PORT_A
-  //SEG22 main::@7
+  //SEG22 main::@2
   //SEG23 [12] *((const byte*) D016#0) ← (const byte) VIC_CSEL#0 -- _deref_pbuc1=vbuc2 
     lda #VIC_CSEL
     sta D016
-  //SEG24 [13] phi from main::@7 to main::toD0181 [phi:main::@7->main::toD0181]
+  //SEG24 [13] phi from main::@2 to main::toD0181 [phi:main::@2->main::toD0181]
   //SEG25 main::toD0181
-  //SEG26 main::@8
+  //SEG26 main::@3
   //SEG27 [14] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG28 [15] call fill 
-  //SEG29 [223] phi from main::@8 to fill [phi:main::@8->fill]
+  //SEG29 [223] phi from main::@3 to fill [phi:main::@3->fill]
     jsr fill
-  //SEG30 [16] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  //SEG31 main::@9
+  //SEG30 [16] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG31 main::@4
   //SEG32 [17] call bitmap_init 
-  //SEG33 [200] phi from main::@9 to bitmap_init [phi:main::@9->bitmap_init]
+  //SEG33 [200] phi from main::@4 to bitmap_init [phi:main::@4->bitmap_init]
     jsr bitmap_init
-  //SEG34 [18] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  //SEG35 main::@10
+  //SEG34 [18] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  //SEG35 main::@5
   //SEG36 [19] call bitmap_clear 
     jsr bitmap_clear
-  //SEG37 [20] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
-  //SEG38 main::@11
+  //SEG37 [20] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  //SEG38 main::@6
   //SEG39 [21] call sin16s_gen2 
-  //SEG40 [70] phi from main::@11 to sin16s_gen2 [phi:main::@11->sin16s_gen2]
+  //SEG40 [70] phi from main::@6 to sin16s_gen2 [phi:main::@6->sin16s_gen2]
     jsr sin16s_gen2
-  //SEG41 [22] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  //SEG42 main::@12
+  //SEG41 [22] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
+  //SEG42 main::@7
   //SEG43 [23] call render_sine 
-  //SEG44 [25] phi from main::@12 to render_sine [phi:main::@12->render_sine]
+  //SEG44 [25] phi from main::@7 to render_sine [phi:main::@7->render_sine]
     jsr render_sine
-  //SEG45 main::@2
-  b2:
+  //SEG45 main::@1
+  b1:
   //SEG46 [24] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
-    jmp b2
+    jmp b1
 }
 //SEG47 render_sine
 render_sine: {
@@ -8268,17 +8304,17 @@ render_sine: {
   //SEG61 [61] phi (signed word) wrap_y::y#9 = (signed word) wrap_y::y#0 [phi:render_sine::@1->wrap_y#0] -- register_copy 
     jsr wrap_y
   //SEG62 [32] (byte) wrap_y::return#0 ← (byte) wrap_y::return#2
-  //SEG63 render_sine::@5
+  //SEG63 render_sine::@3
   //SEG64 [33] (byte) render_sine::ypos#0 ← (byte) wrap_y::return#0 -- vbuxx=vbuaa 
     tax
   //SEG65 [34] (word) bitmap_plot::x#0 ← (word) render_sine::xpos#3
   //SEG66 [35] (byte) bitmap_plot::y#0 ← (byte) render_sine::ypos#0
   //SEG67 [36] call bitmap_plot 
-  //SEG68 [54] phi from render_sine::@5 to bitmap_plot [phi:render_sine::@5->bitmap_plot]
-  //SEG69 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#0 [phi:render_sine::@5->bitmap_plot#0] -- register_copy 
-  //SEG70 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#0 [phi:render_sine::@5->bitmap_plot#1] -- register_copy 
+  //SEG68 [54] phi from render_sine::@3 to bitmap_plot [phi:render_sine::@3->bitmap_plot]
+  //SEG69 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#0 [phi:render_sine::@3->bitmap_plot#0] -- register_copy 
+  //SEG70 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#0 [phi:render_sine::@3->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG71 render_sine::@6
+  //SEG71 render_sine::@4
   //SEG72 [37] (word~) render_sine::$4 ← (word) render_sine::sin_idx#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz2_rol_1 
     lda sin_idx
     asl
@@ -8318,35 +8354,35 @@ render_sine: {
     adc $ff
     sta wrap_y.y+1
   //SEG76 [41] call wrap_y 
-  //SEG77 [61] phi from render_sine::@6 to wrap_y [phi:render_sine::@6->wrap_y]
-  //SEG78 [61] phi (signed word) wrap_y::y#9 = (signed word) wrap_y::y#1 [phi:render_sine::@6->wrap_y#0] -- register_copy 
+  //SEG77 [61] phi from render_sine::@4 to wrap_y [phi:render_sine::@4->wrap_y]
+  //SEG78 [61] phi (signed word) wrap_y::y#9 = (signed word) wrap_y::y#1 [phi:render_sine::@4->wrap_y#0] -- register_copy 
     jsr wrap_y
   //SEG79 [42] (byte) wrap_y::return#1 ← (byte) wrap_y::return#2
-  //SEG80 render_sine::@7
+  //SEG80 render_sine::@5
   //SEG81 [43] (byte) render_sine::ypos2#0 ← (byte) wrap_y::return#1 -- vbuxx=vbuaa 
     tax
   //SEG82 [44] (word) bitmap_plot::x#1 ← (word) render_sine::xpos#3
   //SEG83 [45] (byte) bitmap_plot::y#1 ← (byte) render_sine::ypos2#0
   //SEG84 [46] call bitmap_plot 
-  //SEG85 [54] phi from render_sine::@7 to bitmap_plot [phi:render_sine::@7->bitmap_plot]
-  //SEG86 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#1 [phi:render_sine::@7->bitmap_plot#0] -- register_copy 
-  //SEG87 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#1 [phi:render_sine::@7->bitmap_plot#1] -- register_copy 
+  //SEG85 [54] phi from render_sine::@5 to bitmap_plot [phi:render_sine::@5->bitmap_plot]
+  //SEG86 [54] phi (word) bitmap_plot::x#2 = (word) bitmap_plot::x#1 [phi:render_sine::@5->bitmap_plot#0] -- register_copy 
+  //SEG87 [54] phi (byte) bitmap_plot::y#2 = (byte) bitmap_plot::y#1 [phi:render_sine::@5->bitmap_plot#1] -- register_copy 
     jsr bitmap_plot
-  //SEG88 render_sine::@8
+  //SEG88 render_sine::@6
   //SEG89 [47] (word) render_sine::xpos#1 ← ++ (word) render_sine::xpos#3 -- vwuz1=_inc_vwuz1 
     inc xpos
     bne !+
     inc xpos+1
   !:
-  //SEG90 [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@10 -- vwuz1_neq_vwuc1_then_la1 
+  //SEG90 [48] if((word) render_sine::xpos#1!=(word/signed word/dword/signed dword) $140) goto render_sine::@7 -- vwuz1_neq_vwuc1_then_la1 
     lda xpos+1
     cmp #>$140
     bne b2
     lda xpos
     cmp #<$140
     bne b2
-  //SEG91 [49] phi from render_sine::@8 to render_sine::@2 [phi:render_sine::@8->render_sine::@2]
-  //SEG92 [49] phi (word) render_sine::xpos#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_sine::@8->render_sine::@2#0] -- vwuz1=vbuc1 
+  //SEG91 [49] phi from render_sine::@6 to render_sine::@2 [phi:render_sine::@6->render_sine::@2]
+  //SEG92 [49] phi (word) render_sine::xpos#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render_sine::@6->render_sine::@2#0] -- vwuz1=vbuc1 
     lda #0
     sta xpos
     sta xpos+1
@@ -8373,10 +8409,10 @@ render_sine: {
   //SEG96 render_sine::@return
   //SEG97 [52] return 
     rts
-  //SEG98 [53] phi from render_sine::@8 to render_sine::@10 [phi:render_sine::@8->render_sine::@10]
-  //SEG99 render_sine::@10
-  //SEG100 [49] phi from render_sine::@10 to render_sine::@2 [phi:render_sine::@10->render_sine::@2]
-  //SEG101 [49] phi (word) render_sine::xpos#8 = (word) render_sine::xpos#1 [phi:render_sine::@10->render_sine::@2#0] -- register_copy 
+  //SEG98 [53] phi from render_sine::@6 to render_sine::@7 [phi:render_sine::@6->render_sine::@7]
+  //SEG99 render_sine::@7
+  //SEG100 [49] phi from render_sine::@7 to render_sine::@2 [phi:render_sine::@7->render_sine::@2]
+  //SEG101 [49] phi (word) render_sine::xpos#8 = (word) render_sine::xpos#1 [phi:render_sine::@7->render_sine::@2#0] -- register_copy 
 }
 //SEG102 bitmap_plot
 // Plot a single dot in the bitmap
@@ -8435,21 +8471,21 @@ wrap_y: {
     eor #$80
   !:
     bpl b2
-  //SEG115 [64] phi from wrap_y::@1 wrap_y::@5 to wrap_y::@4 [phi:wrap_y::@1/wrap_y::@5->wrap_y::@4]
-  //SEG116 [64] phi (signed word) wrap_y::y#6 = (signed word) wrap_y::y#4 [phi:wrap_y::@1/wrap_y::@5->wrap_y::@4#0] -- register_copy 
-  //SEG117 wrap_y::@4
-  b4:
-  //SEG118 [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@5 -- vwsz1_lt_0_then_la1 
+  //SEG115 [64] phi from wrap_y::@1 wrap_y::@4 to wrap_y::@3 [phi:wrap_y::@1/wrap_y::@4->wrap_y::@3]
+  //SEG116 [64] phi (signed word) wrap_y::y#6 = (signed word) wrap_y::y#4 [phi:wrap_y::@1/wrap_y::@4->wrap_y::@3#0] -- register_copy 
+  //SEG117 wrap_y::@3
+  b3:
+  //SEG118 [65] if((signed word) wrap_y::y#6<(byte/signed byte/word/signed word/dword/signed dword) 0) goto wrap_y::@4 -- vwsz1_lt_0_then_la1 
     lda y+1
-    bmi b5
-  //SEG119 wrap_y::@6
+    bmi b4
+  //SEG119 wrap_y::@5
   //SEG120 [66] (byte) wrap_y::return#2 ← ((byte)) (signed word) wrap_y::y#6 -- vbuaa=_byte_vwsz1 
     lda y
   //SEG121 wrap_y::@return
   //SEG122 [67] return 
     rts
-  //SEG123 wrap_y::@5
-  b5:
+  //SEG123 wrap_y::@4
+  b4:
   //SEG124 [68] (signed word) wrap_y::y#3 ← (signed word) wrap_y::y#6 + (byte/word/signed word/dword/signed dword) $c8 -- vwsz1=vwsz1_plus_vwuc1 
     clc
     lda y
@@ -8458,7 +8494,7 @@ wrap_y: {
     lda y+1
     adc #>$c8
     sta y+1
-    jmp b4
+    jmp b3
   //SEG125 wrap_y::@2
   b2:
   //SEG126 [69] (signed word) wrap_y::y#2 ← (signed word) wrap_y::y#4 - (byte/word/signed word/dword/signed dword) $c8 -- vwsz1=vwsz1_minus_vbuc1 
@@ -8492,29 +8528,29 @@ sin16s_gen2: {
   //SEG129 [161] phi from sin16s_gen2 to div32u16u [phi:sin16s_gen2->div32u16u]
     jsr div32u16u
   //SEG130 [72] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  //SEG131 sin16s_gen2::@3
+  //SEG131 sin16s_gen2::@2
   //SEG132 [73] (dword) sin16s_gen2::step#0 ← (dword) div32u16u::return#2
-  //SEG133 [74] phi from sin16s_gen2::@3 to sin16s_gen2::@1 [phi:sin16s_gen2::@3->sin16s_gen2::@1]
-  //SEG134 [74] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
+  //SEG133 [74] phi from sin16s_gen2::@2 to sin16s_gen2::@1 [phi:sin16s_gen2::@2->sin16s_gen2::@1]
+  //SEG134 [74] phi (word) sin16s_gen2::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG135 [74] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[$200]) sin#0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
+  //SEG135 [74] phi (signed word*) sin16s_gen2::sintab#2 = (const signed word[$200]) sin#0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#1] -- pwsz1=pwsc1 
     lda #<sin
     sta sintab
     lda #>sin
     sta sintab+1
-  //SEG136 [74] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@3->sin16s_gen2::@1#2] -- vduz1=vbuc1 
+  //SEG136 [74] phi (dword) sin16s_gen2::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen2::@2->sin16s_gen2::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     sta x+1
     sta x+2
     sta x+3
   // u[4.28]
-  //SEG137 [74] phi from sin16s_gen2::@5 to sin16s_gen2::@1 [phi:sin16s_gen2::@5->sin16s_gen2::@1]
-  //SEG138 [74] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#0] -- register_copy 
-  //SEG139 [74] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@5->sin16s_gen2::@1#1] -- register_copy 
-  //SEG140 [74] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@5->sin16s_gen2::@1#2] -- register_copy 
+  //SEG137 [74] phi from sin16s_gen2::@4 to sin16s_gen2::@1 [phi:sin16s_gen2::@4->sin16s_gen2::@1]
+  //SEG138 [74] phi (word) sin16s_gen2::i#2 = (word) sin16s_gen2::i#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#0] -- register_copy 
+  //SEG139 [74] phi (signed word*) sin16s_gen2::sintab#2 = (signed word*) sin16s_gen2::sintab#0 [phi:sin16s_gen2::@4->sin16s_gen2::@1#1] -- register_copy 
+  //SEG140 [74] phi (dword) sin16s_gen2::x#2 = (dword) sin16s_gen2::x#1 [phi:sin16s_gen2::@4->sin16s_gen2::@1#2] -- register_copy 
   //SEG141 sin16s_gen2::@1
   b1:
   //SEG142 [75] (dword) sin16s::x#0 ← (dword) sin16s_gen2::x#2 -- vduz1=vduz2 
@@ -8529,12 +8565,12 @@ sin16s_gen2: {
   //SEG143 [76] call sin16s 
     jsr sin16s
   //SEG144 [77] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  //SEG145 sin16s_gen2::@4
+  //SEG145 sin16s_gen2::@3
   //SEG146 [78] (signed word) mul16s::a#0 ← (signed word) sin16s::return#0
   //SEG147 [79] call mul16s 
     jsr mul16s
   //SEG148 [80] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-  //SEG149 sin16s_gen2::@5
+  //SEG149 sin16s_gen2::@4
   //SEG150 [81] (signed dword~) sin16s_gen2::$5 ← (signed dword) mul16s::return#2
   //SEG151 [82] (word~) sin16s_gen2::$6 ← > (signed dword~) sin16s_gen2::$5 -- vwuz1=_hi_vdsz2 
     lda _5+2
@@ -8621,7 +8657,7 @@ mul16s: {
     sta mul16u.b+1
     jsr mul16u
   //SEG166 [92] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  //SEG167 mul16s::@6
+  //SEG167 mul16s::@4
   //SEG168 [93] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   //SEG169 [94] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
@@ -8645,8 +8681,8 @@ mul16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG174 [98] phi from mul16s::@3 mul16s::@6 to mul16s::@1 [phi:mul16s::@3/mul16s::@6->mul16s::@1]
-  //SEG175 [98] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@6->mul16s::@1#0] -- register_copy 
+  //SEG174 [98] phi from mul16s::@3 mul16s::@4 to mul16s::@1 [phi:mul16s::@3/mul16s::@4->mul16s::@1]
+  //SEG175 [98] phi (dword) mul16s::m#4 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@4->mul16s::@1#0] -- register_copy 
   //SEG176 mul16s::@1
   //SEG177 mul16s::@2
   b2:
@@ -8695,10 +8731,10 @@ mul16u: {
   //SEG192 [106] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG193 [107] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG193 [107] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG194 mul16u::@6
+    beq b4
+  //SEG194 mul16u::@3
   //SEG195 [108] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -8713,10 +8749,10 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG196 [109] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  //SEG197 [109] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-  //SEG198 mul16u::@8
-  b8:
+  //SEG196 [109] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  //SEG197 [109] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+  //SEG198 mul16u::@4
+  b4:
   //SEG199 [110] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -8726,10 +8762,10 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG201 [103] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  //SEG202 [103] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG203 [103] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG204 [103] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG201 [103] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  //SEG202 [103] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG203 [103] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG204 [103] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG205 sin16s
@@ -8865,7 +8901,7 @@ sin16s: {
   //SEG230 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG231 [123] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  //SEG232 sin16s::@8
+  //SEG232 sin16s::@7
   //SEG233 [124] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -8878,33 +8914,33 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG236 [127] call mulu16_sel 
-  //SEG237 [152] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  //SEG238 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG237 [152] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  //SEG238 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG239 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG240 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG239 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG240 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG241 [128] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_1
     lda mulu16_sel.return+1
     sta mulu16_sel.return_1+1
-  //SEG242 sin16s::@9
+  //SEG242 sin16s::@8
   //SEG243 [129] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   //SEG244 [130] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   //SEG245 [131] call mulu16_sel 
-  //SEG246 [152] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  //SEG247 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG246 [152] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  //SEG247 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG248 [152] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG248 [152] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG249 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG249 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG250 [132] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  //SEG251 sin16s::@10
+  //SEG251 sin16s::@9
   //SEG252 [133] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   //SEG253 [134] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -8921,18 +8957,18 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG256 [137] call mulu16_sel 
-  //SEG257 [152] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  //SEG258 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG257 [152] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  //SEG258 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG259 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG260 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG259 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG260 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG261 [138] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_10
     lda mulu16_sel.return+1
     sta mulu16_sel.return_10+1
-  //SEG262 sin16s::@11
+  //SEG262 sin16s::@10
   //SEG263 [139] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   //SEG264 [140] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   //SEG265 [141] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -8941,14 +8977,14 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG266 [142] call mulu16_sel 
-  //SEG267 [152] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  //SEG268 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG267 [152] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  //SEG268 [152] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG269 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG270 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG269 [152] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG270 [152] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG271 [143] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  //SEG272 sin16s::@12
+  //SEG272 sin16s::@11
   //SEG273 [144] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   //SEG274 [145] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -8965,7 +9001,7 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG276 [147] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG276 [147] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
     beq b3
@@ -8980,14 +9016,14 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG279 [149] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  //SEG280 [149] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG279 [149] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  //SEG280 [149] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
   //SEG281 sin16s::@3
   b3:
   //SEG282 sin16s::@return
   //SEG283 [150] return 
     rts
-  //SEG284 sin16s::@15
+  //SEG284 sin16s::@12
   //SEG285 [151] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
 }
 //SEG286 mulu16_sel
@@ -9014,7 +9050,7 @@ mulu16_sel: {
   //SEG292 [101] phi (word) mul16u::b#2 = (word) mul16u::b#1 [phi:mulu16_sel->mul16u#1] -- register_copy 
     jsr mul16u
   //SEG293 [156] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-  //SEG294 mulu16_sel::@2
+  //SEG294 mulu16_sel::@1
   //SEG295 [157] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#3
   //SEG296 [158] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5 -- vduz1=vduz1_rol_vbuxx 
     cpx #0
@@ -9056,7 +9092,7 @@ div32u16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG305 [163] (word) divr16u::return#2 ← (word) divr16u::return#0
-  //SEG306 div32u16u::@2
+  //SEG306 div32u16u::@1
   //SEG307 [164] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return
     sta quotient_hi
@@ -9064,16 +9100,16 @@ div32u16u: {
     sta quotient_hi+1
   //SEG308 [165] (word) divr16u::rem#4 ← (word) rem16u#1
   //SEG309 [166] call divr16u 
-  //SEG310 [171] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  //SEG311 [171] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG310 [171] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  //SEG311 [171] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG312 [171] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG312 [171] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG313 [167] (word) divr16u::return#3 ← (word) divr16u::return#0
-  //SEG314 div32u16u::@3
+  //SEG314 div32u16u::@2
   //SEG315 [168] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   //SEG316 [169] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda quotient_hi
@@ -9254,7 +9290,7 @@ bitmap_init: {
     sta bitmap_plot_bit,x
   //SEG391 [203] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuaa_ror_1 
     lsr
-  //SEG392 [204] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuaa_neq_0_then_la1 
+  //SEG392 [204] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuaa_neq_0_then_la1 
     cmp #0
     bne b2
   //SEG393 [205] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
@@ -9267,19 +9303,19 @@ bitmap_init: {
   //SEG397 [207] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1
-  //SEG398 [208] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  //SEG399 [208] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG398 [208] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  //SEG399 [208] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<BITMAP
     sta yoffs
     lda #>BITMAP
     sta yoffs+1
-  //SEG400 [208] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuxx=vbuc1 
+  //SEG400 [208] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuxx=vbuc1 
     ldx #0
-  //SEG401 [208] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  //SEG402 [208] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG403 [208] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-  //SEG404 bitmap_init::@5
-  b5:
+  //SEG401 [208] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  //SEG402 [208] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG403 [208] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+  //SEG404 bitmap_init::@3
+  b3:
   //SEG405 [209] (byte~) bitmap_init::$3 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _3
@@ -9296,10 +9332,10 @@ bitmap_init: {
   //SEG411 [215] (byte~) bitmap_init::$7 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG412 [216] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG412 [216] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6
-  //SEG413 bitmap_init::@7
+    bne b4
+  //SEG413 bitmap_init::@5
   //SEG414 [217] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -9308,22 +9344,22 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG415 [218] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  //SEG416 [218] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-  //SEG417 bitmap_init::@6
-  b6:
+  //SEG415 [218] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  //SEG416 [218] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+  //SEG417 bitmap_init::@4
+  b4:
   //SEG418 [219] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG419 [220] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuxx_neq_0_then_la1 
+  //SEG419 [220] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5
+    bne b3
   //SEG420 bitmap_init::@return
   //SEG421 [221] return 
     rts
-  //SEG422 [222] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  //SEG423 bitmap_init::@10
-  //SEG424 [205] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  //SEG425 [205] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG422 [222] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  //SEG423 bitmap_init::@6
+  //SEG424 [205] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  //SEG425 [205] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
 }
 //SEG426 fill
 // Fill some memory with a value
diff --git a/src/test/ref/examples/sinplotter/sine-plotter.sym b/src/test/ref/examples/sinplotter/sine-plotter.sym
index b843003c8..af805d7d2 100644
--- a/src/test/ref/examples/sinplotter/sine-plotter.sym
+++ b/src/test/ref/examples/sinplotter/sine-plotter.sym
@@ -1,5 +1,5 @@
-(label) @29
-(label) @32
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -135,11 +135,11 @@
 (byte~) bitmap_init::$6 reg byte a 22.0
 (byte~) bitmap_init::$7 reg byte a 22.0
 (label) bitmap_init::@1
-(label) bitmap_init::@10
 (label) bitmap_init::@2
+(label) bitmap_init::@3
+(label) bitmap_init::@4
 (label) bitmap_init::@5
 (label) bitmap_init::@6
-(label) bitmap_init::@7
 (label) bitmap_init::@return
 (byte*) bitmap_init::bitmap
 (byte) bitmap_init::bits
@@ -178,8 +178,8 @@
 (byte[$100]) bitmap_plot_ylo
 (const byte[$100]) bitmap_plot_ylo#0 bitmap_plot_ylo = { fill( $100, 0) }
 (dword()) div32u16u((dword) div32u16u::dividend , (word) div32u16u::divisor)
+(label) div32u16u::@1
 (label) div32u16u::@2
-(label) div32u16u::@3
 (label) div32u16u::@return
 (dword) div32u16u::dividend
 (word) div32u16u::divisor
@@ -239,13 +239,13 @@
 (byte*) fill::start
 (byte) fill::val
 (void()) main()
-(label) main::@10
-(label) main::@11
-(label) main::@12
+(label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
+(label) main::@6
 (label) main::@7
-(label) main::@8
-(label) main::@9
 (label) main::toD0181
 (word~) main::toD0181_$0
 (word~) main::toD0181_$1
@@ -278,7 +278,7 @@
 (label) mul16s::@1
 (label) mul16s::@2
 (label) mul16s::@3
-(label) mul16s::@6
+(label) mul16s::@4
 (label) mul16s::@return
 (signed word) mul16s::a
 (signed word) mul16s::a#0 a zp ZP_WORD:23 2.6
@@ -294,8 +294,8 @@
 (byte/word~) mul16u::$1 reg byte a 202.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:16 101.0
@@ -320,7 +320,7 @@
 (word()) mulu16_sel((word) mulu16_sel::v1 , (word) mulu16_sel::v2 , (byte) mulu16_sel::select)
 (dword~) mulu16_sel::$0 $0 zp ZP_DWORD:12 4.0
 (dword~) mulu16_sel::$1 $1 zp ZP_DWORD:12 4.0
-(label) mulu16_sel::@2
+(label) mulu16_sel::@1
 (label) mulu16_sel::@return
 (word) mulu16_sel::return
 (word) mulu16_sel::return#0 return zp ZP_WORD:6 4.0
@@ -355,12 +355,12 @@
 (word~) render_sine::$4 $4 zp ZP_WORD:6 22.0
 (signed word*~) render_sine::$5 $5 zp ZP_WORD:6 22.0
 (label) render_sine::@1
-(label) render_sine::@10
 (label) render_sine::@2
+(label) render_sine::@3
+(label) render_sine::@4
 (label) render_sine::@5
 (label) render_sine::@6
 (label) render_sine::@7
-(label) render_sine::@8
 (label) render_sine::@return
 (signed word) render_sine::sin2_val
 (signed word) render_sine::sin2_val#0 sin2_val zp ZP_WORD:6 22.0
@@ -385,12 +385,12 @@
 (label) sin16s::@10
 (label) sin16s::@11
 (label) sin16s::@12
-(label) sin16s::@15
 (label) sin16s::@2
 (label) sin16s::@3
 (label) sin16s::@4
 (label) sin16s::@5
 (label) sin16s::@6
+(label) sin16s::@7
 (label) sin16s::@8
 (label) sin16s::@9
 (label) sin16s::@return
@@ -430,9 +430,9 @@
 (word~) sin16s_gen2::$6 $6 zp ZP_WORD:6 11.0
 (signed word~) sin16s_gen2::$8 $8 zp ZP_WORD:6 22.0
 (label) sin16s_gen2::@1
+(label) sin16s_gen2::@2
 (label) sin16s_gen2::@3
 (label) sin16s_gen2::@4
-(label) sin16s_gen2::@5
 (label) sin16s_gen2::@return
 (signed word) sin16s_gen2::ampl
 (const signed word) sin16s_gen2::ampl#0 ampl = (const signed word) sin16s_gen2::max#0-(const signed word) sin16s_gen2::min#0
@@ -459,9 +459,9 @@
 (byte()) wrap_y((signed word) wrap_y::y)
 (label) wrap_y::@1
 (label) wrap_y::@2
+(label) wrap_y::@3
 (label) wrap_y::@4
 (label) wrap_y::@5
-(label) wrap_y::@6
 (label) wrap_y::@return
 (byte) wrap_y::return
 (byte) wrap_y::return#0 reg byte a 22.0
diff --git a/src/test/ref/examples/sinsprites/sinus-sprites.asm b/src/test/ref/examples/sinsprites/sinus-sprites.asm
index 15bd7193a..8584d7095 100644
--- a/src/test/ref/examples/sinsprites/sinus-sprites.asm
+++ b/src/test/ref/examples/sinsprites/sinus-sprites.asm
@@ -32,12 +32,12 @@ main: {
     lda #0
     sta sin_idx_y
     sta sin_idx_x
-  b2:
+  b1:
     lda #$ff
     cmp RASTER
-    bne b2
+    bne b1
     jsr anim
-    jmp b2
+    jmp b1
 }
 anim: {
     .label _6 = 5
@@ -58,7 +58,7 @@ anim: {
     sta j2
     lda #0
     sta x_msb
-  b4:
+  b3:
     ldy xidx
     lda sintab_x,y
     clc
@@ -82,27 +82,27 @@ anim: {
     stx xidx
     txa
     cmp #sinlen_x
-    bcc b5
+    bcc b4
     lax xidx
     axs #sinlen_x
     stx xidx
-  b5:
+  b4:
     lax yidx
     axs #-[8]
     stx yidx
     txa
     cmp #sinlen_y
-    bcc b6
+    bcc b5
     lax yidx
     axs #sinlen_y
     stx yidx
-  b6:
+  b5:
     dec j2
     dec j2
     inc j
     lda #7
     cmp j
-    bne b4
+    bne b3
     lda x_msb
     sta SPRITES_XMSB
     inc sin_idx_x
diff --git a/src/test/ref/examples/sinsprites/sinus-sprites.cfg b/src/test/ref/examples/sinsprites/sinus-sprites.cfg
index 4ad40c42f..d94e11572 100644
--- a/src/test/ref/examples/sinsprites/sinus-sprites.cfg
+++ b/src/test/ref/examples/sinsprites/sinus-sprites.cfg
@@ -1,36 +1,36 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@60
-@60: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @60
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @60
+main: scope:[main]  from @1
   [4] phi()
   [5] call init 
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@2
+  [6] (byte) sin_idx_y#13 ← phi( main::@2/(byte) sin_idx_y#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] (byte) sin_idx_x#13 ← phi( main::@2/(byte) sin_idx_x#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@3
-  [6] (byte) sin_idx_y#13 ← phi( main::@3/(byte) sin_idx_y#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [6] (byte) sin_idx_x#13 ← phi( main::@3/(byte) sin_idx_x#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
-  to:main::@3
-main::@3: scope:[main]  from main::@2
+main::@2: scope:[main]  from main::@1
   [8] phi()
   [9] call anim 
-  to:main::@2
-anim: scope:[anim]  from main::@3
+  to:main::@1
+anim: scope:[anim]  from main::@2
   [10] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [11] (byte) anim::xidx#0 ← (byte) sin_idx_x#13
   [12] (byte) anim::yidx#0 ← (byte) sin_idx_y#13
-  to:anim::@4
-anim::@4: scope:[anim]  from anim anim::@6
-  [13] (byte) anim::j#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@6/(byte) anim::j#1 )
-  [13] (byte) anim::yidx#3 ← phi( anim/(byte) anim::yidx#0 anim::@6/(byte) anim::yidx#6 )
-  [13] (byte) anim::j2#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) $c anim::@6/(byte) anim::j2#1 )
-  [13] (byte) anim::x_msb#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@6/(byte) anim::x_msb#1 )
-  [13] (byte) anim::xidx#3 ← phi( anim/(byte) anim::xidx#0 anim::@6/(byte) anim::xidx#5 )
+  to:anim::@3
+anim::@3: scope:[anim]  from anim anim::@5
+  [13] (byte) anim::j#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@5/(byte) anim::j#1 )
+  [13] (byte) anim::yidx#3 ← phi( anim/(byte) anim::yidx#0 anim::@5/(byte) anim::yidx#6 )
+  [13] (byte) anim::j2#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) $c anim::@5/(byte) anim::j2#1 )
+  [13] (byte) anim::x_msb#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@5/(byte) anim::x_msb#1 )
+  [13] (byte) anim::xidx#3 ← phi( anim/(byte) anim::xidx#0 anim::@5/(byte) anim::xidx#5 )
   [14] (word) anim::x#0 ← ((word))(byte/signed byte/word/signed word/dword/signed dword) $1e + *((const byte[$dd]) sintab_x#0 + (byte) anim::xidx#3)
   [15] (byte~) anim::$6 ← (byte) anim::x_msb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [16] (byte~) anim::$7 ← > (word) anim::x#0
@@ -39,46 +39,46 @@ anim::@4: scope:[anim]  from anim anim::@6
   [19] *((const byte*) SPRITES_XPOS#0 + (byte) anim::j2#2) ← (byte~) anim::$9
   [20] *((const byte*) SPRITES_YPOS#0 + (byte) anim::j2#2) ← *((const byte[$c5]) sintab_y#0 + (byte) anim::yidx#3)
   [21] (byte) anim::xidx#1 ← (byte) anim::xidx#3 + (byte/signed byte/word/signed word/dword/signed dword) $a
-  [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@5
+  [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@4
+  to:anim::@6
+anim::@6: scope:[anim]  from anim::@3
+  [23] (byte) anim::xidx#2 ← (byte) anim::xidx#1 - (const byte) sinlen_x#0
+  to:anim::@4
+anim::@4: scope:[anim]  from anim::@3 anim::@6
+  [24] (byte) anim::xidx#5 ← phi( anim::@3/(byte) anim::xidx#1 anim::@6/(byte) anim::xidx#2 )
+  [25] (byte) anim::yidx#1 ← (byte) anim::yidx#3 + (byte/signed byte/word/signed word/dword/signed dword) 8
+  [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@5
   to:anim::@7
 anim::@7: scope:[anim]  from anim::@4
-  [23] (byte) anim::xidx#2 ← (byte) anim::xidx#1 - (const byte) sinlen_x#0
+  [27] (byte) anim::yidx#2 ← (byte) anim::yidx#1 - (const byte) sinlen_y#0
   to:anim::@5
 anim::@5: scope:[anim]  from anim::@4 anim::@7
-  [24] (byte) anim::xidx#5 ← phi( anim::@4/(byte) anim::xidx#1 anim::@7/(byte) anim::xidx#2 )
-  [25] (byte) anim::yidx#1 ← (byte) anim::yidx#3 + (byte/signed byte/word/signed word/dword/signed dword) 8
-  [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@6
-  to:anim::@8
-anim::@8: scope:[anim]  from anim::@5
-  [27] (byte) anim::yidx#2 ← (byte) anim::yidx#1 - (const byte) sinlen_y#0
-  to:anim::@6
-anim::@6: scope:[anim]  from anim::@5 anim::@8
-  [28] (byte) anim::yidx#6 ← phi( anim::@5/(byte) anim::yidx#1 anim::@8/(byte) anim::yidx#2 )
+  [28] (byte) anim::yidx#6 ← phi( anim::@4/(byte) anim::yidx#1 anim::@7/(byte) anim::yidx#2 )
   [29] (byte) anim::j2#1 ← (byte) anim::j2#2 - (byte/signed byte/word/signed word/dword/signed dword) 2
   [30] (byte) anim::j#1 ← ++ (byte) anim::j#2
-  [31] if((byte) anim::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto anim::@4
-  to:anim::@9
-anim::@9: scope:[anim]  from anim::@6
+  [31] if((byte) anim::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto anim::@3
+  to:anim::@8
+anim::@8: scope:[anim]  from anim::@5
   [32] *((const byte*) SPRITES_XMSB#0) ← (byte) anim::x_msb#1
   [33] (byte) sin_idx_x#3 ← ++ (byte) sin_idx_x#13
-  [34] if((byte) sin_idx_x#3<(const byte) sinlen_x#0) goto anim::@14
+  [34] if((byte) sin_idx_x#3<(const byte) sinlen_x#0) goto anim::@9
   to:anim::@1
-anim::@1: scope:[anim]  from anim::@14 anim::@9
-  [35] (byte) sin_idx_x#11 ← phi( anim::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@14/(byte) sin_idx_x#3 )
+anim::@1: scope:[anim]  from anim::@8 anim::@9
+  [35] (byte) sin_idx_x#11 ← phi( anim::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@9/(byte) sin_idx_x#3 )
   [36] (byte) sin_idx_y#3 ← ++ (byte) sin_idx_y#13
-  [37] if((byte) sin_idx_y#3<(const byte) sinlen_y#0) goto anim::@15
+  [37] if((byte) sin_idx_y#3<(const byte) sinlen_y#0) goto anim::@10
   to:anim::@2
-anim::@2: scope:[anim]  from anim::@1 anim::@15
-  [38] (byte) sin_idx_y#11 ← phi( anim::@15/(byte) sin_idx_y#3 anim::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+anim::@2: scope:[anim]  from anim::@1 anim::@10
+  [38] (byte) sin_idx_y#11 ← phi( anim::@10/(byte) sin_idx_y#3 anim::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [39] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0)
   to:anim::@return
 anim::@return: scope:[anim]  from anim::@2
   [40] return 
   to:@return
-anim::@15: scope:[anim]  from anim::@1
+anim::@10: scope:[anim]  from anim::@1
   [41] phi()
   to:anim::@2
-anim::@14: scope:[anim]  from anim::@9
+anim::@9: scope:[anim]  from anim::@8
   [42] phi()
   to:anim::@1
 init: scope:[init]  from main
@@ -95,35 +95,35 @@ init::@1: scope:[init]  from init init::@1
 init::@2: scope:[init]  from init::@1
   [50] phi()
   [51] call place_sprites 
-  to:init::@4
-init::@4: scope:[init]  from init::@2
+  to:init::@3
+init::@3: scope:[init]  from init::@2
   [52] phi()
   [53] call gen_sprites 
-  to:init::@5
-init::@5: scope:[init]  from init::@4
+  to:init::@4
+init::@4: scope:[init]  from init::@3
   [54] phi()
   [55] call progress_init 
-  to:init::@6
-init::@6: scope:[init]  from init::@5
+  to:init::@5
+init::@5: scope:[init]  from init::@4
   [56] phi()
   [57] call gen_sintab 
-  to:init::@7
-init::@7: scope:[init]  from init::@6
+  to:init::@6
+init::@6: scope:[init]  from init::@5
   [58] phi()
   [59] call progress_init 
-  to:init::@8
-init::@8: scope:[init]  from init::@7
+  to:init::@7
+init::@7: scope:[init]  from init::@6
   [60] phi()
   [61] call gen_sintab 
-  to:init::@9
-init::@9: scope:[init]  from init::@8
+  to:init::@8
+init::@8: scope:[init]  from init::@7
   [62] phi()
   [63] call clear_screen 
   to:init::@return
-init::@return: scope:[init]  from init::@9
+init::@return: scope:[init]  from init::@8
   [64] return 
   to:@return
-clear_screen: scope:[clear_screen]  from init init::@9
+clear_screen: scope:[clear_screen]  from init init::@8
   [65] phi()
   to:clear_screen::@1
 clear_screen::@1: scope:[clear_screen]  from clear_screen clear_screen::@1
@@ -135,108 +135,108 @@ clear_screen::@1: scope:[clear_screen]  from clear_screen clear_screen::@1
 clear_screen::@return: scope:[clear_screen]  from clear_screen::@1
   [70] return 
   to:@return
-gen_sintab: scope:[gen_sintab]  from init::@6 init::@8
-  [71] (byte*) gen_sintab::sintab#12 ← phi( init::@6/(const byte[$dd]) sintab_x#0 init::@8/(const byte[$c5]) sintab_y#0 )
-  [71] (byte) gen_sintab::length#10 ← phi( init::@6/(const byte) sinlen_x#0 init::@8/(const byte) sinlen_y#0 )
-  [71] (byte) gen_sintab::min#2 ← phi( init::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 init::@8/(byte/signed byte/word/signed word/dword/signed dword) $32 )
-  [71] (byte) gen_sintab::max#2 ← phi( init::@6/(byte/word/signed word/dword/signed dword) $ff init::@8/(byte/word/signed word/dword/signed dword) $d0 )
+gen_sintab: scope:[gen_sintab]  from init::@5 init::@7
+  [71] (byte*) gen_sintab::sintab#12 ← phi( init::@5/(const byte[$dd]) sintab_x#0 init::@7/(const byte[$c5]) sintab_y#0 )
+  [71] (byte) gen_sintab::length#10 ← phi( init::@5/(const byte) sinlen_x#0 init::@7/(const byte) sinlen_y#0 )
+  [71] (byte) gen_sintab::min#2 ← phi( init::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 init::@7/(byte/signed byte/word/signed word/dword/signed dword) $32 )
+  [71] (byte) gen_sintab::max#2 ← phi( init::@5/(byte/word/signed word/dword/signed dword) $ff init::@7/(byte/word/signed word/dword/signed dword) $d0 )
   [72] (word) setFAC::w#0 ← ((word)) (byte) gen_sintab::max#2
   [73] call setFAC 
-  to:gen_sintab::@3
-gen_sintab::@3: scope:[gen_sintab]  from gen_sintab
+  to:gen_sintab::@2
+gen_sintab::@2: scope:[gen_sintab]  from gen_sintab
   [74] phi()
   [75] call setARGtoFAC 
-  to:gen_sintab::@4
-gen_sintab::@4: scope:[gen_sintab]  from gen_sintab::@3
+  to:gen_sintab::@3
+gen_sintab::@3: scope:[gen_sintab]  from gen_sintab::@2
   [76] (word) setFAC::w#1 ← ((word)) (byte) gen_sintab::min#2
   [77] call setFAC 
-  to:gen_sintab::@5
-gen_sintab::@5: scope:[gen_sintab]  from gen_sintab::@4
+  to:gen_sintab::@4
+gen_sintab::@4: scope:[gen_sintab]  from gen_sintab::@3
   [78] phi()
   [79] call setMEMtoFAC 
-  to:gen_sintab::@6
-gen_sintab::@6: scope:[gen_sintab]  from gen_sintab::@5
+  to:gen_sintab::@5
+gen_sintab::@5: scope:[gen_sintab]  from gen_sintab::@4
   [80] phi()
   [81] call subFACfromARG 
-  to:gen_sintab::@7
-gen_sintab::@7: scope:[gen_sintab]  from gen_sintab::@6
+  to:gen_sintab::@6
+gen_sintab::@6: scope:[gen_sintab]  from gen_sintab::@5
   [82] phi()
   [83] call setMEMtoFAC 
-  to:gen_sintab::@8
-gen_sintab::@8: scope:[gen_sintab]  from gen_sintab::@7
+  to:gen_sintab::@7
+gen_sintab::@7: scope:[gen_sintab]  from gen_sintab::@6
   [84] phi()
   [85] call setFAC 
-  to:gen_sintab::@9
-gen_sintab::@9: scope:[gen_sintab]  from gen_sintab::@8
+  to:gen_sintab::@8
+gen_sintab::@8: scope:[gen_sintab]  from gen_sintab::@7
   [86] phi()
   [87] call divMEMbyFAC 
-  to:gen_sintab::@10
-gen_sintab::@10: scope:[gen_sintab]  from gen_sintab::@9
+  to:gen_sintab::@9
+gen_sintab::@9: scope:[gen_sintab]  from gen_sintab::@8
   [88] phi()
   [89] call setMEMtoFAC 
-  to:gen_sintab::@11
-gen_sintab::@11: scope:[gen_sintab]  from gen_sintab::@10
+  to:gen_sintab::@10
+gen_sintab::@10: scope:[gen_sintab]  from gen_sintab::@9
   [90] phi()
   [91] call addMEMtoFAC 
-  to:gen_sintab::@12
-gen_sintab::@12: scope:[gen_sintab]  from gen_sintab::@11
+  to:gen_sintab::@11
+gen_sintab::@11: scope:[gen_sintab]  from gen_sintab::@10
   [92] phi()
   [93] call setMEMtoFAC 
   to:gen_sintab::@1
-gen_sintab::@1: scope:[gen_sintab]  from gen_sintab::@12 gen_sintab::@23
-  [94] (byte*) progress_cursor#34 ← phi( gen_sintab::@12/(byte*) progress_init::line#2 gen_sintab::@23/(byte*) progress_cursor#11 )
-  [94] (byte) progress_idx#34 ← phi( gen_sintab::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sintab::@23/(byte) progress_idx#12 )
-  [94] (byte) gen_sintab::i#10 ← phi( gen_sintab::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sintab::@23/(byte) gen_sintab::i#1 )
+gen_sintab::@1: scope:[gen_sintab]  from gen_sintab::@11 gen_sintab::@21
+  [94] (byte*) progress_cursor#34 ← phi( gen_sintab::@11/(byte*) progress_init::line#2 gen_sintab::@21/(byte*) progress_cursor#11 )
+  [94] (byte) progress_idx#34 ← phi( gen_sintab::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sintab::@21/(byte) progress_idx#12 )
+  [94] (byte) gen_sintab::i#10 ← phi( gen_sintab::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sintab::@21/(byte) gen_sintab::i#1 )
   [95] (word) setFAC::w#3 ← ((word)) (byte) gen_sintab::i#10
   [96] call setFAC 
-  to:gen_sintab::@14
-gen_sintab::@14: scope:[gen_sintab]  from gen_sintab::@1
+  to:gen_sintab::@12
+gen_sintab::@12: scope:[gen_sintab]  from gen_sintab::@1
   [97] phi()
   [98] call mulFACbyMEM 
-  to:gen_sintab::@15
-gen_sintab::@15: scope:[gen_sintab]  from gen_sintab::@14
+  to:gen_sintab::@13
+gen_sintab::@13: scope:[gen_sintab]  from gen_sintab::@12
   [99] phi()
   [100] call setMEMtoFAC 
-  to:gen_sintab::@16
-gen_sintab::@16: scope:[gen_sintab]  from gen_sintab::@15
+  to:gen_sintab::@14
+gen_sintab::@14: scope:[gen_sintab]  from gen_sintab::@13
   [101] (word) setFAC::w#4 ← ((word)) (byte) gen_sintab::length#10
   [102] call setFAC 
-  to:gen_sintab::@17
-gen_sintab::@17: scope:[gen_sintab]  from gen_sintab::@16
+  to:gen_sintab::@15
+gen_sintab::@15: scope:[gen_sintab]  from gen_sintab::@14
   [103] phi()
   [104] call divMEMbyFAC 
-  to:gen_sintab::@18
-gen_sintab::@18: scope:[gen_sintab]  from gen_sintab::@17
+  to:gen_sintab::@16
+gen_sintab::@16: scope:[gen_sintab]  from gen_sintab::@15
   [105] phi()
   [106] call sinFAC 
-  to:gen_sintab::@19
-gen_sintab::@19: scope:[gen_sintab]  from gen_sintab::@18
+  to:gen_sintab::@17
+gen_sintab::@17: scope:[gen_sintab]  from gen_sintab::@16
   [107] phi()
   [108] call mulFACbyMEM 
-  to:gen_sintab::@20
-gen_sintab::@20: scope:[gen_sintab]  from gen_sintab::@19
+  to:gen_sintab::@18
+gen_sintab::@18: scope:[gen_sintab]  from gen_sintab::@17
   [109] phi()
   [110] call addMEMtoFAC 
-  to:gen_sintab::@21
-gen_sintab::@21: scope:[gen_sintab]  from gen_sintab::@20
+  to:gen_sintab::@19
+gen_sintab::@19: scope:[gen_sintab]  from gen_sintab::@18
   [111] phi()
   [112] call getFAC 
   [113] (word) getFAC::return#2 ← (word) getFAC::return#0
-  to:gen_sintab::@22
-gen_sintab::@22: scope:[gen_sintab]  from gen_sintab::@21
+  to:gen_sintab::@20
+gen_sintab::@20: scope:[gen_sintab]  from gen_sintab::@19
   [114] (word~) gen_sintab::$23 ← (word) getFAC::return#2
   [115] (byte~) gen_sintab::$24 ← ((byte)) (word~) gen_sintab::$23
   [116] *((byte*) gen_sintab::sintab#12 + (byte) gen_sintab::i#10) ← (byte~) gen_sintab::$24
   [117] call progress_inc 
-  to:gen_sintab::@23
-gen_sintab::@23: scope:[gen_sintab]  from gen_sintab::@22
+  to:gen_sintab::@21
+gen_sintab::@21: scope:[gen_sintab]  from gen_sintab::@20
   [118] (byte) gen_sintab::i#1 ← ++ (byte) gen_sintab::i#10
   [119] if((byte) gen_sintab::i#1<(byte) gen_sintab::length#10) goto gen_sintab::@1
   to:gen_sintab::@return
-gen_sintab::@return: scope:[gen_sintab]  from gen_sintab::@23
+gen_sintab::@return: scope:[gen_sintab]  from gen_sintab::@21
   [120] return 
   to:@return
-progress_inc: scope:[progress_inc]  from gen_sintab::@22
+progress_inc: scope:[progress_inc]  from gen_sintab::@20
   [121] (byte) progress_idx#10 ← ++ (byte) progress_idx#34
   [122] if((byte) progress_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto progress_inc::@1
   to:progress_inc::@2
@@ -252,14 +252,14 @@ progress_inc::@1: scope:[progress_inc]  from progress_inc progress_inc::@2
 progress_inc::@return: scope:[progress_inc]  from progress_inc::@1
   [127] return 
   to:@return
-getFAC: scope:[getFAC]  from gen_sintab::@21
+getFAC: scope:[getFAC]  from gen_sintab::@19
   asm { jsr$b1aa sty$fe sta$ff  }
   [129] (word) getFAC::return#0 ← *((const byte*) memHi#0) w= *((const byte*) memLo#0)
   to:getFAC::@return
 getFAC::@return: scope:[getFAC]  from getFAC
   [130] return 
   to:@return
-addMEMtoFAC: scope:[addMEMtoFAC]  from gen_sintab::@11 gen_sintab::@20
+addMEMtoFAC: scope:[addMEMtoFAC]  from gen_sintab::@10 gen_sintab::@18
   [131] phi()
   [132] call prepareMEM 
   to:addMEMtoFAC::@1
@@ -279,8 +279,8 @@ prepareMEM: scope:[prepareMEM]  from addMEMtoFAC divMEMbyFAC mulFACbyMEM setFAC
 prepareMEM::@return: scope:[prepareMEM]  from prepareMEM
   [140] return 
   to:@return
-mulFACbyMEM: scope:[mulFACbyMEM]  from gen_sintab::@14 gen_sintab::@19
-  [141] (byte*) mulFACbyMEM::mem#2 ← phi( gen_sintab::@14/(const byte*) gen_sintab::f_2pi#0 gen_sintab::@19/(const byte[]) gen_sintab::f_amp#0 )
+mulFACbyMEM: scope:[mulFACbyMEM]  from gen_sintab::@12 gen_sintab::@17
+  [141] (byte*) mulFACbyMEM::mem#2 ← phi( gen_sintab::@12/(const byte*) gen_sintab::f_2pi#0 gen_sintab::@17/(const byte[]) gen_sintab::f_amp#0 )
   [142] (byte*) prepareMEM::mem#4 ← (byte*) mulFACbyMEM::mem#2
   [143] call prepareMEM 
   to:mulFACbyMEM::@1
@@ -290,14 +290,14 @@ mulFACbyMEM::@1: scope:[mulFACbyMEM]  from mulFACbyMEM
 mulFACbyMEM::@return: scope:[mulFACbyMEM]  from mulFACbyMEM::@1
   [145] return 
   to:@return
-sinFAC: scope:[sinFAC]  from gen_sintab::@18
+sinFAC: scope:[sinFAC]  from gen_sintab::@16
   asm { jsr$e26b  }
   to:sinFAC::@return
 sinFAC::@return: scope:[sinFAC]  from sinFAC
   [147] return 
   to:@return
-divMEMbyFAC: scope:[divMEMbyFAC]  from gen_sintab::@17 gen_sintab::@9
-  [148] (byte*) divMEMbyFAC::mem#2 ← phi( gen_sintab::@17/(const byte[]) gen_sintab::f_i#0 gen_sintab::@9/(const byte[]) gen_sintab::f_amp#0 )
+divMEMbyFAC: scope:[divMEMbyFAC]  from gen_sintab::@15 gen_sintab::@8
+  [148] (byte*) divMEMbyFAC::mem#2 ← phi( gen_sintab::@15/(const byte[]) gen_sintab::f_i#0 gen_sintab::@8/(const byte[]) gen_sintab::f_amp#0 )
   [149] (byte*) prepareMEM::mem#3 ← (byte*) divMEMbyFAC::mem#2
   [150] call prepareMEM 
   to:divMEMbyFAC::@1
@@ -307,8 +307,8 @@ divMEMbyFAC::@1: scope:[divMEMbyFAC]  from divMEMbyFAC
 divMEMbyFAC::@return: scope:[divMEMbyFAC]  from divMEMbyFAC::@1
   [152] return 
   to:@return
-setFAC: scope:[setFAC]  from gen_sintab gen_sintab::@1 gen_sintab::@16 gen_sintab::@4 gen_sintab::@8
-  [153] (word) setFAC::w#5 ← phi( gen_sintab/(word) setFAC::w#0 gen_sintab::@1/(word) setFAC::w#3 gen_sintab::@16/(word) setFAC::w#4 gen_sintab::@4/(word) setFAC::w#1 gen_sintab::@8/(byte/signed byte/word/signed word/dword/signed dword) 2 )
+setFAC: scope:[setFAC]  from gen_sintab gen_sintab::@1 gen_sintab::@14 gen_sintab::@3 gen_sintab::@7
+  [153] (word) setFAC::w#5 ← phi( gen_sintab/(word) setFAC::w#0 gen_sintab::@1/(word) setFAC::w#3 gen_sintab::@14/(word) setFAC::w#4 gen_sintab::@3/(word) setFAC::w#1 gen_sintab::@7/(byte/signed byte/word/signed word/dword/signed dword) 2 )
   [154] (byte*~) prepareMEM::mem#8 ← (byte*)(word) setFAC::w#5
   [155] call prepareMEM 
   to:setFAC::@1
@@ -318,8 +318,8 @@ setFAC::@1: scope:[setFAC]  from setFAC
 setFAC::@return: scope:[setFAC]  from setFAC::@1
   [157] return 
   to:@return
-setMEMtoFAC: scope:[setMEMtoFAC]  from gen_sintab::@10 gen_sintab::@12 gen_sintab::@15 gen_sintab::@5 gen_sintab::@7
-  [158] (byte*) setMEMtoFAC::mem#5 ← phi( gen_sintab::@10/(const byte[]) gen_sintab::f_amp#0 gen_sintab::@12/(const byte[]) gen_sintab::f_min#0 gen_sintab::@15/(const byte[]) gen_sintab::f_i#0 gen_sintab::@5/(const byte[]) gen_sintab::f_min#0 gen_sintab::@7/(const byte[]) gen_sintab::f_amp#0 )
+setMEMtoFAC: scope:[setMEMtoFAC]  from gen_sintab::@11 gen_sintab::@13 gen_sintab::@4 gen_sintab::@6 gen_sintab::@9
+  [158] (byte*) setMEMtoFAC::mem#5 ← phi( gen_sintab::@9/(const byte[]) gen_sintab::f_amp#0 gen_sintab::@11/(const byte[]) gen_sintab::f_min#0 gen_sintab::@13/(const byte[]) gen_sintab::f_i#0 gen_sintab::@4/(const byte[]) gen_sintab::f_min#0 gen_sintab::@6/(const byte[]) gen_sintab::f_amp#0 )
   [159] (byte*) prepareMEM::mem#1 ← (byte*) setMEMtoFAC::mem#5
   [160] call prepareMEM 
   to:setMEMtoFAC::@1
@@ -329,40 +329,40 @@ setMEMtoFAC::@1: scope:[setMEMtoFAC]  from setMEMtoFAC
 setMEMtoFAC::@return: scope:[setMEMtoFAC]  from setMEMtoFAC::@1
   [162] return 
   to:@return
-subFACfromARG: scope:[subFACfromARG]  from gen_sintab::@6
+subFACfromARG: scope:[subFACfromARG]  from gen_sintab::@5
   asm { jsr$b853  }
   to:subFACfromARG::@return
 subFACfromARG::@return: scope:[subFACfromARG]  from subFACfromARG
   [164] return 
   to:@return
-setARGtoFAC: scope:[setARGtoFAC]  from gen_sintab::@3
+setARGtoFAC: scope:[setARGtoFAC]  from gen_sintab::@2
   asm { jsr$bc0f  }
   to:setARGtoFAC::@return
 setARGtoFAC::@return: scope:[setARGtoFAC]  from setARGtoFAC
   [166] return 
   to:@return
-progress_init: scope:[progress_init]  from init::@5 init::@7
-  [167] (byte*) progress_init::line#2 ← phi( init::@5/(const byte*) SCREEN#0 init::@7/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 )
+progress_init: scope:[progress_init]  from init::@4 init::@6
+  [167] (byte*) progress_init::line#2 ← phi( init::@4/(const byte*) SCREEN#0 init::@6/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 )
   to:progress_init::@return
 progress_init::@return: scope:[progress_init]  from progress_init
   [168] return 
   to:@return
-gen_sprites: scope:[gen_sprites]  from init::@4
+gen_sprites: scope:[gen_sprites]  from init::@3
   [169] phi()
   to:gen_sprites::@1
-gen_sprites::@1: scope:[gen_sprites]  from gen_sprites gen_sprites::@3
-  [170] (byte*) gen_sprites::spr#2 ← phi( gen_sprites/(const byte*) sprites#0 gen_sprites::@3/(byte*) gen_sprites::spr#1 )
-  [170] (byte) gen_sprites::i#2 ← phi( gen_sprites/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sprites::@3/(byte) gen_sprites::i#1 )
+gen_sprites::@1: scope:[gen_sprites]  from gen_sprites gen_sprites::@2
+  [170] (byte*) gen_sprites::spr#2 ← phi( gen_sprites/(const byte*) sprites#0 gen_sprites::@2/(byte*) gen_sprites::spr#1 )
+  [170] (byte) gen_sprites::i#2 ← phi( gen_sprites/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sprites::@2/(byte) gen_sprites::i#1 )
   [171] (byte) gen_chargen_sprite::ch#0 ← *((const byte[]) gen_sprites::cml#0 + (byte) gen_sprites::i#2)
   [172] (byte*) gen_chargen_sprite::sprite#0 ← (byte*) gen_sprites::spr#2
   [173] call gen_chargen_sprite 
-  to:gen_sprites::@3
-gen_sprites::@3: scope:[gen_sprites]  from gen_sprites::@1
+  to:gen_sprites::@2
+gen_sprites::@2: scope:[gen_sprites]  from gen_sprites::@1
   [174] (byte*) gen_sprites::spr#1 ← (byte*) gen_sprites::spr#2 + (byte/signed byte/word/signed word/dword/signed dword) $40
   [175] (byte) gen_sprites::i#1 ← ++ (byte) gen_sprites::i#2
   [176] if((byte) gen_sprites::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto gen_sprites::@1
   to:gen_sprites::@return
-gen_sprites::@return: scope:[gen_sprites]  from gen_sprites::@3
+gen_sprites::@return: scope:[gen_sprites]  from gen_sprites::@2
   [177] return 
   to:@return
 gen_chargen_sprite: scope:[gen_chargen_sprite]  from gen_sprites::@1
diff --git a/src/test/ref/examples/sinsprites/sinus-sprites.log b/src/test/ref/examples/sinsprites/sinus-sprites.log
index 5245ac794..0231f4b1a 100644
--- a/src/test/ref/examples/sinsprites/sinus-sprites.log
+++ b/src/test/ref/examples/sinsprites/sinus-sprites.log
@@ -2516,23 +2516,62 @@ Culled Empty Block (label) gen_chargen_sprite::@12
 Culled Empty Block (label) gen_chargen_sprite::@13
 Culled Empty Block (label) gen_chargen_sprite::@14
 Culled Empty Block (label) place_sprites::@3
+Renumbering block @60 to @1
+Renumbering block main::@2 to main::@1
+Renumbering block main::@3 to main::@2
+Renumbering block init::@4 to init::@3
+Renumbering block init::@5 to init::@4
+Renumbering block init::@6 to init::@5
+Renumbering block init::@7 to init::@6
+Renumbering block init::@8 to init::@7
+Renumbering block init::@9 to init::@8
+Renumbering block anim::@4 to anim::@3
+Renumbering block anim::@5 to anim::@4
+Renumbering block anim::@6 to anim::@5
+Renumbering block anim::@7 to anim::@6
+Renumbering block anim::@8 to anim::@7
+Renumbering block anim::@9 to anim::@8
+Renumbering block anim::@14 to anim::@9
+Renumbering block anim::@15 to anim::@10
+Renumbering block gen_sprites::@3 to gen_sprites::@2
+Renumbering block gen_sintab::@3 to gen_sintab::@2
+Renumbering block gen_sintab::@4 to gen_sintab::@3
+Renumbering block gen_sintab::@5 to gen_sintab::@4
+Renumbering block gen_sintab::@6 to gen_sintab::@5
+Renumbering block gen_sintab::@7 to gen_sintab::@6
+Renumbering block gen_sintab::@8 to gen_sintab::@7
+Renumbering block gen_sintab::@9 to gen_sintab::@8
+Renumbering block gen_sintab::@10 to gen_sintab::@9
+Renumbering block gen_sintab::@11 to gen_sintab::@10
+Renumbering block gen_sintab::@12 to gen_sintab::@11
+Renumbering block gen_sintab::@14 to gen_sintab::@12
+Renumbering block gen_sintab::@15 to gen_sintab::@13
+Renumbering block gen_sintab::@16 to gen_sintab::@14
+Renumbering block gen_sintab::@17 to gen_sintab::@15
+Renumbering block gen_sintab::@18 to gen_sintab::@16
+Renumbering block gen_sintab::@19 to gen_sintab::@17
+Renumbering block gen_sintab::@20 to gen_sintab::@18
+Renumbering block gen_sintab::@21 to gen_sintab::@19
+Renumbering block gen_sintab::@22 to gen_sintab::@20
+Renumbering block gen_sintab::@23 to gen_sintab::@21
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @60
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@3
-Adding NOP phi() at start of anim::@15
-Adding NOP phi() at start of anim::@14
+Adding NOP phi() at start of main::@2
+Adding NOP phi() at start of anim::@10
+Adding NOP phi() at start of anim::@9
 Adding NOP phi() at start of init
 Adding NOP phi() at start of init::@2
+Adding NOP phi() at start of init::@3
 Adding NOP phi() at start of init::@4
 Adding NOP phi() at start of init::@5
 Adding NOP phi() at start of init::@6
 Adding NOP phi() at start of init::@7
 Adding NOP phi() at start of init::@8
-Adding NOP phi() at start of init::@9
 Adding NOP phi() at start of clear_screen
-Adding NOP phi() at start of gen_sintab::@3
+Adding NOP phi() at start of gen_sintab::@2
+Adding NOP phi() at start of gen_sintab::@4
 Adding NOP phi() at start of gen_sintab::@5
 Adding NOP phi() at start of gen_sintab::@6
 Adding NOP phi() at start of gen_sintab::@7
@@ -2541,13 +2580,12 @@ Adding NOP phi() at start of gen_sintab::@9
 Adding NOP phi() at start of gen_sintab::@10
 Adding NOP phi() at start of gen_sintab::@11
 Adding NOP phi() at start of gen_sintab::@12
-Adding NOP phi() at start of gen_sintab::@14
+Adding NOP phi() at start of gen_sintab::@13
 Adding NOP phi() at start of gen_sintab::@15
+Adding NOP phi() at start of gen_sintab::@16
 Adding NOP phi() at start of gen_sintab::@17
 Adding NOP phi() at start of gen_sintab::@18
 Adding NOP phi() at start of gen_sintab::@19
-Adding NOP phi() at start of gen_sintab::@20
-Adding NOP phi() at start of gen_sintab::@21
 Adding NOP phi() at start of addMEMtoFAC
 Adding NOP phi() at start of gen_sprites
 Adding NOP phi() at start of gen_chargen_sprite::@10
@@ -2555,37 +2593,37 @@ Adding NOP phi() at start of gen_chargen_sprite::@10
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@60
-@60: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @60
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @60
+main: scope:[main]  from @1
   [4] phi()
   [5] call init 
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@2
+  [6] (byte) sin_idx_y#13 ← phi( main::@2/(byte) sin_idx_y#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] (byte) sin_idx_x#13 ← phi( main::@2/(byte) sin_idx_x#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@3
-  [6] (byte) sin_idx_y#13 ← phi( main::@3/(byte) sin_idx_y#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [6] (byte) sin_idx_x#13 ← phi( main::@3/(byte) sin_idx_x#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
-  to:main::@3
-main::@3: scope:[main]  from main::@2
+main::@2: scope:[main]  from main::@1
   [8] phi()
   [9] call anim 
-  to:main::@2
-anim: scope:[anim]  from main::@3
+  to:main::@1
+anim: scope:[anim]  from main::@2
   [10] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [11] (byte) anim::xidx#0 ← (byte) sin_idx_x#13
   [12] (byte) anim::yidx#0 ← (byte) sin_idx_y#13
-  to:anim::@4
-anim::@4: scope:[anim]  from anim anim::@6
-  [13] (byte) anim::j#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@6/(byte) anim::j#1 )
-  [13] (byte) anim::yidx#3 ← phi( anim/(byte) anim::yidx#0 anim::@6/(byte) anim::yidx#6 )
-  [13] (byte) anim::j2#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) $c anim::@6/(byte) anim::j2#1 )
-  [13] (byte) anim::x_msb#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@6/(byte) anim::x_msb#1 )
-  [13] (byte) anim::xidx#3 ← phi( anim/(byte) anim::xidx#0 anim::@6/(byte) anim::xidx#5 )
+  to:anim::@3
+anim::@3: scope:[anim]  from anim anim::@5
+  [13] (byte) anim::j#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@5/(byte) anim::j#1 )
+  [13] (byte) anim::yidx#3 ← phi( anim/(byte) anim::yidx#0 anim::@5/(byte) anim::yidx#6 )
+  [13] (byte) anim::j2#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) $c anim::@5/(byte) anim::j2#1 )
+  [13] (byte) anim::x_msb#2 ← phi( anim/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@5/(byte) anim::x_msb#1 )
+  [13] (byte) anim::xidx#3 ← phi( anim/(byte) anim::xidx#0 anim::@5/(byte) anim::xidx#5 )
   [14] (word) anim::x#0 ← ((word))(byte/signed byte/word/signed word/dword/signed dword) $1e + *((const byte[$dd]) sintab_x#0 + (byte) anim::xidx#3)
   [15] (byte~) anim::$6 ← (byte) anim::x_msb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [16] (byte~) anim::$7 ← > (word) anim::x#0
@@ -2594,46 +2632,46 @@ anim::@4: scope:[anim]  from anim anim::@6
   [19] *((const byte*) SPRITES_XPOS#0 + (byte) anim::j2#2) ← (byte~) anim::$9
   [20] *((const byte*) SPRITES_YPOS#0 + (byte) anim::j2#2) ← *((const byte[$c5]) sintab_y#0 + (byte) anim::yidx#3)
   [21] (byte) anim::xidx#1 ← (byte) anim::xidx#3 + (byte/signed byte/word/signed word/dword/signed dword) $a
-  [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@5
+  [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@4
+  to:anim::@6
+anim::@6: scope:[anim]  from anim::@3
+  [23] (byte) anim::xidx#2 ← (byte) anim::xidx#1 - (const byte) sinlen_x#0
+  to:anim::@4
+anim::@4: scope:[anim]  from anim::@3 anim::@6
+  [24] (byte) anim::xidx#5 ← phi( anim::@3/(byte) anim::xidx#1 anim::@6/(byte) anim::xidx#2 )
+  [25] (byte) anim::yidx#1 ← (byte) anim::yidx#3 + (byte/signed byte/word/signed word/dword/signed dword) 8
+  [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@5
   to:anim::@7
 anim::@7: scope:[anim]  from anim::@4
-  [23] (byte) anim::xidx#2 ← (byte) anim::xidx#1 - (const byte) sinlen_x#0
+  [27] (byte) anim::yidx#2 ← (byte) anim::yidx#1 - (const byte) sinlen_y#0
   to:anim::@5
 anim::@5: scope:[anim]  from anim::@4 anim::@7
-  [24] (byte) anim::xidx#5 ← phi( anim::@4/(byte) anim::xidx#1 anim::@7/(byte) anim::xidx#2 )
-  [25] (byte) anim::yidx#1 ← (byte) anim::yidx#3 + (byte/signed byte/word/signed word/dword/signed dword) 8
-  [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@6
-  to:anim::@8
-anim::@8: scope:[anim]  from anim::@5
-  [27] (byte) anim::yidx#2 ← (byte) anim::yidx#1 - (const byte) sinlen_y#0
-  to:anim::@6
-anim::@6: scope:[anim]  from anim::@5 anim::@8
-  [28] (byte) anim::yidx#6 ← phi( anim::@5/(byte) anim::yidx#1 anim::@8/(byte) anim::yidx#2 )
+  [28] (byte) anim::yidx#6 ← phi( anim::@4/(byte) anim::yidx#1 anim::@7/(byte) anim::yidx#2 )
   [29] (byte) anim::j2#1 ← (byte) anim::j2#2 - (byte/signed byte/word/signed word/dword/signed dword) 2
   [30] (byte) anim::j#1 ← ++ (byte) anim::j#2
-  [31] if((byte) anim::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto anim::@4
-  to:anim::@9
-anim::@9: scope:[anim]  from anim::@6
+  [31] if((byte) anim::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto anim::@3
+  to:anim::@8
+anim::@8: scope:[anim]  from anim::@5
   [32] *((const byte*) SPRITES_XMSB#0) ← (byte) anim::x_msb#1
   [33] (byte) sin_idx_x#3 ← ++ (byte) sin_idx_x#13
-  [34] if((byte) sin_idx_x#3<(const byte) sinlen_x#0) goto anim::@14
+  [34] if((byte) sin_idx_x#3<(const byte) sinlen_x#0) goto anim::@9
   to:anim::@1
-anim::@1: scope:[anim]  from anim::@14 anim::@9
-  [35] (byte) sin_idx_x#11 ← phi( anim::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@14/(byte) sin_idx_x#3 )
+anim::@1: scope:[anim]  from anim::@8 anim::@9
+  [35] (byte) sin_idx_x#11 ← phi( anim::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 anim::@9/(byte) sin_idx_x#3 )
   [36] (byte) sin_idx_y#3 ← ++ (byte) sin_idx_y#13
-  [37] if((byte) sin_idx_y#3<(const byte) sinlen_y#0) goto anim::@15
+  [37] if((byte) sin_idx_y#3<(const byte) sinlen_y#0) goto anim::@10
   to:anim::@2
-anim::@2: scope:[anim]  from anim::@1 anim::@15
-  [38] (byte) sin_idx_y#11 ← phi( anim::@15/(byte) sin_idx_y#3 anim::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+anim::@2: scope:[anim]  from anim::@1 anim::@10
+  [38] (byte) sin_idx_y#11 ← phi( anim::@10/(byte) sin_idx_y#3 anim::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [39] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0)
   to:anim::@return
 anim::@return: scope:[anim]  from anim::@2
   [40] return 
   to:@return
-anim::@15: scope:[anim]  from anim::@1
+anim::@10: scope:[anim]  from anim::@1
   [41] phi()
   to:anim::@2
-anim::@14: scope:[anim]  from anim::@9
+anim::@9: scope:[anim]  from anim::@8
   [42] phi()
   to:anim::@1
 init: scope:[init]  from main
@@ -2650,35 +2688,35 @@ init::@1: scope:[init]  from init init::@1
 init::@2: scope:[init]  from init::@1
   [50] phi()
   [51] call place_sprites 
-  to:init::@4
-init::@4: scope:[init]  from init::@2
+  to:init::@3
+init::@3: scope:[init]  from init::@2
   [52] phi()
   [53] call gen_sprites 
-  to:init::@5
-init::@5: scope:[init]  from init::@4
+  to:init::@4
+init::@4: scope:[init]  from init::@3
   [54] phi()
   [55] call progress_init 
-  to:init::@6
-init::@6: scope:[init]  from init::@5
+  to:init::@5
+init::@5: scope:[init]  from init::@4
   [56] phi()
   [57] call gen_sintab 
-  to:init::@7
-init::@7: scope:[init]  from init::@6
+  to:init::@6
+init::@6: scope:[init]  from init::@5
   [58] phi()
   [59] call progress_init 
-  to:init::@8
-init::@8: scope:[init]  from init::@7
+  to:init::@7
+init::@7: scope:[init]  from init::@6
   [60] phi()
   [61] call gen_sintab 
-  to:init::@9
-init::@9: scope:[init]  from init::@8
+  to:init::@8
+init::@8: scope:[init]  from init::@7
   [62] phi()
   [63] call clear_screen 
   to:init::@return
-init::@return: scope:[init]  from init::@9
+init::@return: scope:[init]  from init::@8
   [64] return 
   to:@return
-clear_screen: scope:[clear_screen]  from init init::@9
+clear_screen: scope:[clear_screen]  from init init::@8
   [65] phi()
   to:clear_screen::@1
 clear_screen::@1: scope:[clear_screen]  from clear_screen clear_screen::@1
@@ -2690,108 +2728,108 @@ clear_screen::@1: scope:[clear_screen]  from clear_screen clear_screen::@1
 clear_screen::@return: scope:[clear_screen]  from clear_screen::@1
   [70] return 
   to:@return
-gen_sintab: scope:[gen_sintab]  from init::@6 init::@8
-  [71] (byte*) gen_sintab::sintab#12 ← phi( init::@6/(const byte[$dd]) sintab_x#0 init::@8/(const byte[$c5]) sintab_y#0 )
-  [71] (byte) gen_sintab::length#10 ← phi( init::@6/(const byte) sinlen_x#0 init::@8/(const byte) sinlen_y#0 )
-  [71] (byte) gen_sintab::min#2 ← phi( init::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 init::@8/(byte/signed byte/word/signed word/dword/signed dword) $32 )
-  [71] (byte) gen_sintab::max#2 ← phi( init::@6/(byte/word/signed word/dword/signed dword) $ff init::@8/(byte/word/signed word/dword/signed dword) $d0 )
+gen_sintab: scope:[gen_sintab]  from init::@5 init::@7
+  [71] (byte*) gen_sintab::sintab#12 ← phi( init::@5/(const byte[$dd]) sintab_x#0 init::@7/(const byte[$c5]) sintab_y#0 )
+  [71] (byte) gen_sintab::length#10 ← phi( init::@5/(const byte) sinlen_x#0 init::@7/(const byte) sinlen_y#0 )
+  [71] (byte) gen_sintab::min#2 ← phi( init::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 init::@7/(byte/signed byte/word/signed word/dword/signed dword) $32 )
+  [71] (byte) gen_sintab::max#2 ← phi( init::@5/(byte/word/signed word/dword/signed dword) $ff init::@7/(byte/word/signed word/dword/signed dword) $d0 )
   [72] (word) setFAC::w#0 ← ((word)) (byte) gen_sintab::max#2
   [73] call setFAC 
-  to:gen_sintab::@3
-gen_sintab::@3: scope:[gen_sintab]  from gen_sintab
+  to:gen_sintab::@2
+gen_sintab::@2: scope:[gen_sintab]  from gen_sintab
   [74] phi()
   [75] call setARGtoFAC 
-  to:gen_sintab::@4
-gen_sintab::@4: scope:[gen_sintab]  from gen_sintab::@3
+  to:gen_sintab::@3
+gen_sintab::@3: scope:[gen_sintab]  from gen_sintab::@2
   [76] (word) setFAC::w#1 ← ((word)) (byte) gen_sintab::min#2
   [77] call setFAC 
-  to:gen_sintab::@5
-gen_sintab::@5: scope:[gen_sintab]  from gen_sintab::@4
+  to:gen_sintab::@4
+gen_sintab::@4: scope:[gen_sintab]  from gen_sintab::@3
   [78] phi()
   [79] call setMEMtoFAC 
-  to:gen_sintab::@6
-gen_sintab::@6: scope:[gen_sintab]  from gen_sintab::@5
+  to:gen_sintab::@5
+gen_sintab::@5: scope:[gen_sintab]  from gen_sintab::@4
   [80] phi()
   [81] call subFACfromARG 
-  to:gen_sintab::@7
-gen_sintab::@7: scope:[gen_sintab]  from gen_sintab::@6
+  to:gen_sintab::@6
+gen_sintab::@6: scope:[gen_sintab]  from gen_sintab::@5
   [82] phi()
   [83] call setMEMtoFAC 
-  to:gen_sintab::@8
-gen_sintab::@8: scope:[gen_sintab]  from gen_sintab::@7
+  to:gen_sintab::@7
+gen_sintab::@7: scope:[gen_sintab]  from gen_sintab::@6
   [84] phi()
   [85] call setFAC 
-  to:gen_sintab::@9
-gen_sintab::@9: scope:[gen_sintab]  from gen_sintab::@8
+  to:gen_sintab::@8
+gen_sintab::@8: scope:[gen_sintab]  from gen_sintab::@7
   [86] phi()
   [87] call divMEMbyFAC 
-  to:gen_sintab::@10
-gen_sintab::@10: scope:[gen_sintab]  from gen_sintab::@9
+  to:gen_sintab::@9
+gen_sintab::@9: scope:[gen_sintab]  from gen_sintab::@8
   [88] phi()
   [89] call setMEMtoFAC 
-  to:gen_sintab::@11
-gen_sintab::@11: scope:[gen_sintab]  from gen_sintab::@10
+  to:gen_sintab::@10
+gen_sintab::@10: scope:[gen_sintab]  from gen_sintab::@9
   [90] phi()
   [91] call addMEMtoFAC 
-  to:gen_sintab::@12
-gen_sintab::@12: scope:[gen_sintab]  from gen_sintab::@11
+  to:gen_sintab::@11
+gen_sintab::@11: scope:[gen_sintab]  from gen_sintab::@10
   [92] phi()
   [93] call setMEMtoFAC 
   to:gen_sintab::@1
-gen_sintab::@1: scope:[gen_sintab]  from gen_sintab::@12 gen_sintab::@23
-  [94] (byte*) progress_cursor#34 ← phi( gen_sintab::@12/(byte*) progress_init::line#2 gen_sintab::@23/(byte*) progress_cursor#11 )
-  [94] (byte) progress_idx#34 ← phi( gen_sintab::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sintab::@23/(byte) progress_idx#12 )
-  [94] (byte) gen_sintab::i#10 ← phi( gen_sintab::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sintab::@23/(byte) gen_sintab::i#1 )
+gen_sintab::@1: scope:[gen_sintab]  from gen_sintab::@11 gen_sintab::@21
+  [94] (byte*) progress_cursor#34 ← phi( gen_sintab::@11/(byte*) progress_init::line#2 gen_sintab::@21/(byte*) progress_cursor#11 )
+  [94] (byte) progress_idx#34 ← phi( gen_sintab::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sintab::@21/(byte) progress_idx#12 )
+  [94] (byte) gen_sintab::i#10 ← phi( gen_sintab::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sintab::@21/(byte) gen_sintab::i#1 )
   [95] (word) setFAC::w#3 ← ((word)) (byte) gen_sintab::i#10
   [96] call setFAC 
-  to:gen_sintab::@14
-gen_sintab::@14: scope:[gen_sintab]  from gen_sintab::@1
+  to:gen_sintab::@12
+gen_sintab::@12: scope:[gen_sintab]  from gen_sintab::@1
   [97] phi()
   [98] call mulFACbyMEM 
-  to:gen_sintab::@15
-gen_sintab::@15: scope:[gen_sintab]  from gen_sintab::@14
+  to:gen_sintab::@13
+gen_sintab::@13: scope:[gen_sintab]  from gen_sintab::@12
   [99] phi()
   [100] call setMEMtoFAC 
-  to:gen_sintab::@16
-gen_sintab::@16: scope:[gen_sintab]  from gen_sintab::@15
+  to:gen_sintab::@14
+gen_sintab::@14: scope:[gen_sintab]  from gen_sintab::@13
   [101] (word) setFAC::w#4 ← ((word)) (byte) gen_sintab::length#10
   [102] call setFAC 
-  to:gen_sintab::@17
-gen_sintab::@17: scope:[gen_sintab]  from gen_sintab::@16
+  to:gen_sintab::@15
+gen_sintab::@15: scope:[gen_sintab]  from gen_sintab::@14
   [103] phi()
   [104] call divMEMbyFAC 
-  to:gen_sintab::@18
-gen_sintab::@18: scope:[gen_sintab]  from gen_sintab::@17
+  to:gen_sintab::@16
+gen_sintab::@16: scope:[gen_sintab]  from gen_sintab::@15
   [105] phi()
   [106] call sinFAC 
-  to:gen_sintab::@19
-gen_sintab::@19: scope:[gen_sintab]  from gen_sintab::@18
+  to:gen_sintab::@17
+gen_sintab::@17: scope:[gen_sintab]  from gen_sintab::@16
   [107] phi()
   [108] call mulFACbyMEM 
-  to:gen_sintab::@20
-gen_sintab::@20: scope:[gen_sintab]  from gen_sintab::@19
+  to:gen_sintab::@18
+gen_sintab::@18: scope:[gen_sintab]  from gen_sintab::@17
   [109] phi()
   [110] call addMEMtoFAC 
-  to:gen_sintab::@21
-gen_sintab::@21: scope:[gen_sintab]  from gen_sintab::@20
+  to:gen_sintab::@19
+gen_sintab::@19: scope:[gen_sintab]  from gen_sintab::@18
   [111] phi()
   [112] call getFAC 
   [113] (word) getFAC::return#2 ← (word) getFAC::return#0
-  to:gen_sintab::@22
-gen_sintab::@22: scope:[gen_sintab]  from gen_sintab::@21
+  to:gen_sintab::@20
+gen_sintab::@20: scope:[gen_sintab]  from gen_sintab::@19
   [114] (word~) gen_sintab::$23 ← (word) getFAC::return#2
   [115] (byte~) gen_sintab::$24 ← ((byte)) (word~) gen_sintab::$23
   [116] *((byte*) gen_sintab::sintab#12 + (byte) gen_sintab::i#10) ← (byte~) gen_sintab::$24
   [117] call progress_inc 
-  to:gen_sintab::@23
-gen_sintab::@23: scope:[gen_sintab]  from gen_sintab::@22
+  to:gen_sintab::@21
+gen_sintab::@21: scope:[gen_sintab]  from gen_sintab::@20
   [118] (byte) gen_sintab::i#1 ← ++ (byte) gen_sintab::i#10
   [119] if((byte) gen_sintab::i#1<(byte) gen_sintab::length#10) goto gen_sintab::@1
   to:gen_sintab::@return
-gen_sintab::@return: scope:[gen_sintab]  from gen_sintab::@23
+gen_sintab::@return: scope:[gen_sintab]  from gen_sintab::@21
   [120] return 
   to:@return
-progress_inc: scope:[progress_inc]  from gen_sintab::@22
+progress_inc: scope:[progress_inc]  from gen_sintab::@20
   [121] (byte) progress_idx#10 ← ++ (byte) progress_idx#34
   [122] if((byte) progress_idx#10!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto progress_inc::@1
   to:progress_inc::@2
@@ -2807,14 +2845,14 @@ progress_inc::@1: scope:[progress_inc]  from progress_inc progress_inc::@2
 progress_inc::@return: scope:[progress_inc]  from progress_inc::@1
   [127] return 
   to:@return
-getFAC: scope:[getFAC]  from gen_sintab::@21
+getFAC: scope:[getFAC]  from gen_sintab::@19
   asm { jsr$b1aa sty$fe sta$ff  }
   [129] (word) getFAC::return#0 ← *((const byte*) memHi#0) w= *((const byte*) memLo#0)
   to:getFAC::@return
 getFAC::@return: scope:[getFAC]  from getFAC
   [130] return 
   to:@return
-addMEMtoFAC: scope:[addMEMtoFAC]  from gen_sintab::@11 gen_sintab::@20
+addMEMtoFAC: scope:[addMEMtoFAC]  from gen_sintab::@10 gen_sintab::@18
   [131] phi()
   [132] call prepareMEM 
   to:addMEMtoFAC::@1
@@ -2834,8 +2872,8 @@ prepareMEM: scope:[prepareMEM]  from addMEMtoFAC divMEMbyFAC mulFACbyMEM setFAC
 prepareMEM::@return: scope:[prepareMEM]  from prepareMEM
   [140] return 
   to:@return
-mulFACbyMEM: scope:[mulFACbyMEM]  from gen_sintab::@14 gen_sintab::@19
-  [141] (byte*) mulFACbyMEM::mem#2 ← phi( gen_sintab::@14/(const byte*) gen_sintab::f_2pi#0 gen_sintab::@19/(const byte[]) gen_sintab::f_amp#0 )
+mulFACbyMEM: scope:[mulFACbyMEM]  from gen_sintab::@12 gen_sintab::@17
+  [141] (byte*) mulFACbyMEM::mem#2 ← phi( gen_sintab::@12/(const byte*) gen_sintab::f_2pi#0 gen_sintab::@17/(const byte[]) gen_sintab::f_amp#0 )
   [142] (byte*) prepareMEM::mem#4 ← (byte*) mulFACbyMEM::mem#2
   [143] call prepareMEM 
   to:mulFACbyMEM::@1
@@ -2845,14 +2883,14 @@ mulFACbyMEM::@1: scope:[mulFACbyMEM]  from mulFACbyMEM
 mulFACbyMEM::@return: scope:[mulFACbyMEM]  from mulFACbyMEM::@1
   [145] return 
   to:@return
-sinFAC: scope:[sinFAC]  from gen_sintab::@18
+sinFAC: scope:[sinFAC]  from gen_sintab::@16
   asm { jsr$e26b  }
   to:sinFAC::@return
 sinFAC::@return: scope:[sinFAC]  from sinFAC
   [147] return 
   to:@return
-divMEMbyFAC: scope:[divMEMbyFAC]  from gen_sintab::@17 gen_sintab::@9
-  [148] (byte*) divMEMbyFAC::mem#2 ← phi( gen_sintab::@17/(const byte[]) gen_sintab::f_i#0 gen_sintab::@9/(const byte[]) gen_sintab::f_amp#0 )
+divMEMbyFAC: scope:[divMEMbyFAC]  from gen_sintab::@15 gen_sintab::@8
+  [148] (byte*) divMEMbyFAC::mem#2 ← phi( gen_sintab::@15/(const byte[]) gen_sintab::f_i#0 gen_sintab::@8/(const byte[]) gen_sintab::f_amp#0 )
   [149] (byte*) prepareMEM::mem#3 ← (byte*) divMEMbyFAC::mem#2
   [150] call prepareMEM 
   to:divMEMbyFAC::@1
@@ -2862,8 +2900,8 @@ divMEMbyFAC::@1: scope:[divMEMbyFAC]  from divMEMbyFAC
 divMEMbyFAC::@return: scope:[divMEMbyFAC]  from divMEMbyFAC::@1
   [152] return 
   to:@return
-setFAC: scope:[setFAC]  from gen_sintab gen_sintab::@1 gen_sintab::@16 gen_sintab::@4 gen_sintab::@8
-  [153] (word) setFAC::w#5 ← phi( gen_sintab/(word) setFAC::w#0 gen_sintab::@1/(word) setFAC::w#3 gen_sintab::@16/(word) setFAC::w#4 gen_sintab::@4/(word) setFAC::w#1 gen_sintab::@8/(byte/signed byte/word/signed word/dword/signed dword) 2 )
+setFAC: scope:[setFAC]  from gen_sintab gen_sintab::@1 gen_sintab::@14 gen_sintab::@3 gen_sintab::@7
+  [153] (word) setFAC::w#5 ← phi( gen_sintab/(word) setFAC::w#0 gen_sintab::@1/(word) setFAC::w#3 gen_sintab::@14/(word) setFAC::w#4 gen_sintab::@3/(word) setFAC::w#1 gen_sintab::@7/(byte/signed byte/word/signed word/dword/signed dword) 2 )
   [154] (byte*~) prepareMEM::mem#8 ← (byte*)(word) setFAC::w#5
   [155] call prepareMEM 
   to:setFAC::@1
@@ -2873,8 +2911,8 @@ setFAC::@1: scope:[setFAC]  from setFAC
 setFAC::@return: scope:[setFAC]  from setFAC::@1
   [157] return 
   to:@return
-setMEMtoFAC: scope:[setMEMtoFAC]  from gen_sintab::@10 gen_sintab::@12 gen_sintab::@15 gen_sintab::@5 gen_sintab::@7
-  [158] (byte*) setMEMtoFAC::mem#5 ← phi( gen_sintab::@10/(const byte[]) gen_sintab::f_amp#0 gen_sintab::@12/(const byte[]) gen_sintab::f_min#0 gen_sintab::@15/(const byte[]) gen_sintab::f_i#0 gen_sintab::@5/(const byte[]) gen_sintab::f_min#0 gen_sintab::@7/(const byte[]) gen_sintab::f_amp#0 )
+setMEMtoFAC: scope:[setMEMtoFAC]  from gen_sintab::@11 gen_sintab::@13 gen_sintab::@4 gen_sintab::@6 gen_sintab::@9
+  [158] (byte*) setMEMtoFAC::mem#5 ← phi( gen_sintab::@9/(const byte[]) gen_sintab::f_amp#0 gen_sintab::@11/(const byte[]) gen_sintab::f_min#0 gen_sintab::@13/(const byte[]) gen_sintab::f_i#0 gen_sintab::@4/(const byte[]) gen_sintab::f_min#0 gen_sintab::@6/(const byte[]) gen_sintab::f_amp#0 )
   [159] (byte*) prepareMEM::mem#1 ← (byte*) setMEMtoFAC::mem#5
   [160] call prepareMEM 
   to:setMEMtoFAC::@1
@@ -2884,40 +2922,40 @@ setMEMtoFAC::@1: scope:[setMEMtoFAC]  from setMEMtoFAC
 setMEMtoFAC::@return: scope:[setMEMtoFAC]  from setMEMtoFAC::@1
   [162] return 
   to:@return
-subFACfromARG: scope:[subFACfromARG]  from gen_sintab::@6
+subFACfromARG: scope:[subFACfromARG]  from gen_sintab::@5
   asm { jsr$b853  }
   to:subFACfromARG::@return
 subFACfromARG::@return: scope:[subFACfromARG]  from subFACfromARG
   [164] return 
   to:@return
-setARGtoFAC: scope:[setARGtoFAC]  from gen_sintab::@3
+setARGtoFAC: scope:[setARGtoFAC]  from gen_sintab::@2
   asm { jsr$bc0f  }
   to:setARGtoFAC::@return
 setARGtoFAC::@return: scope:[setARGtoFAC]  from setARGtoFAC
   [166] return 
   to:@return
-progress_init: scope:[progress_init]  from init::@5 init::@7
-  [167] (byte*) progress_init::line#2 ← phi( init::@5/(const byte*) SCREEN#0 init::@7/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 )
+progress_init: scope:[progress_init]  from init::@4 init::@6
+  [167] (byte*) progress_init::line#2 ← phi( init::@4/(const byte*) SCREEN#0 init::@6/(const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 )
   to:progress_init::@return
 progress_init::@return: scope:[progress_init]  from progress_init
   [168] return 
   to:@return
-gen_sprites: scope:[gen_sprites]  from init::@4
+gen_sprites: scope:[gen_sprites]  from init::@3
   [169] phi()
   to:gen_sprites::@1
-gen_sprites::@1: scope:[gen_sprites]  from gen_sprites gen_sprites::@3
-  [170] (byte*) gen_sprites::spr#2 ← phi( gen_sprites/(const byte*) sprites#0 gen_sprites::@3/(byte*) gen_sprites::spr#1 )
-  [170] (byte) gen_sprites::i#2 ← phi( gen_sprites/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sprites::@3/(byte) gen_sprites::i#1 )
+gen_sprites::@1: scope:[gen_sprites]  from gen_sprites gen_sprites::@2
+  [170] (byte*) gen_sprites::spr#2 ← phi( gen_sprites/(const byte*) sprites#0 gen_sprites::@2/(byte*) gen_sprites::spr#1 )
+  [170] (byte) gen_sprites::i#2 ← phi( gen_sprites/(byte/signed byte/word/signed word/dword/signed dword) 0 gen_sprites::@2/(byte) gen_sprites::i#1 )
   [171] (byte) gen_chargen_sprite::ch#0 ← *((const byte[]) gen_sprites::cml#0 + (byte) gen_sprites::i#2)
   [172] (byte*) gen_chargen_sprite::sprite#0 ← (byte*) gen_sprites::spr#2
   [173] call gen_chargen_sprite 
-  to:gen_sprites::@3
-gen_sprites::@3: scope:[gen_sprites]  from gen_sprites::@1
+  to:gen_sprites::@2
+gen_sprites::@2: scope:[gen_sprites]  from gen_sprites::@1
   [174] (byte*) gen_sprites::spr#1 ← (byte*) gen_sprites::spr#2 + (byte/signed byte/word/signed word/dword/signed dword) $40
   [175] (byte) gen_sprites::i#1 ← ++ (byte) gen_sprites::i#2
   [176] if((byte) gen_sprites::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto gen_sprites::@1
   to:gen_sprites::@return
-gen_sprites::@return: scope:[gen_sprites]  from gen_sprites::@3
+gen_sprites::@return: scope:[gen_sprites]  from gen_sprites::@2
   [177] return 
   to:@return
 gen_chargen_sprite: scope:[gen_chargen_sprite]  from gen_sprites::@1
@@ -3483,17 +3521,17 @@ INITIAL ASM
   .label sin_idx_y = 3
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @60 [phi:@begin->@60]
-b60_from_bbegin:
-  jmp b60
-//SEG5 @60
-b60:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @60 to main [phi:@60->main]
-main_from_b60:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @60 to @end [phi:@60->@end]
-bend_from_b60:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3503,36 +3541,36 @@ main: {
   //SEG12 [43] phi from main to init [phi:main->init]
   init_from_main:
     jsr init
-  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
-  b2_from_main:
-  //SEG14 [6] phi (byte) sin_idx_y#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#0] -- vbuz1=vbuc1 
+  //SEG13 [6] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG14 [6] phi (byte) sin_idx_y#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta sin_idx_y
-  //SEG15 [6] phi (byte) sin_idx_x#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#1] -- vbuz1=vbuc1 
+  //SEG15 [6] phi (byte) sin_idx_x#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta sin_idx_x
-    jmp b2
-  //SEG16 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  b2_from_b2:
-    jmp b2
-  //SEG17 main::@2
-  b2:
-  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG16 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG17 main::@1
+  b1:
+  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b2_from_b2
-  //SEG19 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
-  b3_from_b2:
-    jmp b3
-  //SEG20 main::@3
-  b3:
+    bne b1_from_b1
+  //SEG19 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG20 main::@2
+  b2:
   //SEG21 [9] call anim 
     jsr anim
-  //SEG22 [6] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
-  b2_from_b3:
-  //SEG23 [6] phi (byte) sin_idx_y#13 = (byte) sin_idx_y#11 [phi:main::@3->main::@2#0] -- register_copy 
-  //SEG24 [6] phi (byte) sin_idx_x#13 = (byte) sin_idx_x#11 [phi:main::@3->main::@2#1] -- register_copy 
-    jmp b2
+  //SEG22 [6] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG23 [6] phi (byte) sin_idx_y#13 = (byte) sin_idx_y#11 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG24 [6] phi (byte) sin_idx_x#13 = (byte) sin_idx_x#11 [phi:main::@2->main::@1#1] -- register_copy 
+    jmp b1
 }
 //SEG25 anim
 anim: {
@@ -3553,30 +3591,30 @@ anim: {
   //SEG28 [12] (byte) anim::yidx#0 ← (byte) sin_idx_y#13 -- vbuz1=vbuz2 
     lda sin_idx_y
     sta yidx
-  //SEG29 [13] phi from anim to anim::@4 [phi:anim->anim::@4]
-  b4_from_anim:
-  //SEG30 [13] phi (byte) anim::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@4#0] -- vbuz1=vbuc1 
+  //SEG29 [13] phi from anim to anim::@3 [phi:anim->anim::@3]
+  b3_from_anim:
+  //SEG30 [13] phi (byte) anim::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-  //SEG31 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#0 [phi:anim->anim::@4#1] -- register_copy 
-  //SEG32 [13] phi (byte) anim::j2#2 = (byte/signed byte/word/signed word/dword/signed dword) $c [phi:anim->anim::@4#2] -- vbuz1=vbuc1 
+  //SEG31 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#0 [phi:anim->anim::@3#1] -- register_copy 
+  //SEG32 [13] phi (byte) anim::j2#2 = (byte/signed byte/word/signed word/dword/signed dword) $c [phi:anim->anim::@3#2] -- vbuz1=vbuc1 
     lda #$c
     sta j2
-  //SEG33 [13] phi (byte) anim::x_msb#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@4#3] -- vbuz1=vbuc1 
+  //SEG33 [13] phi (byte) anim::x_msb#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@3#3] -- vbuz1=vbuc1 
     lda #0
     sta x_msb
-  //SEG34 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#0 [phi:anim->anim::@4#4] -- register_copy 
-    jmp b4
-  //SEG35 [13] phi from anim::@6 to anim::@4 [phi:anim::@6->anim::@4]
-  b4_from_b6:
-  //SEG36 [13] phi (byte) anim::j#2 = (byte) anim::j#1 [phi:anim::@6->anim::@4#0] -- register_copy 
-  //SEG37 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#6 [phi:anim::@6->anim::@4#1] -- register_copy 
-  //SEG38 [13] phi (byte) anim::j2#2 = (byte) anim::j2#1 [phi:anim::@6->anim::@4#2] -- register_copy 
-  //SEG39 [13] phi (byte) anim::x_msb#2 = (byte) anim::x_msb#1 [phi:anim::@6->anim::@4#3] -- register_copy 
-  //SEG40 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#5 [phi:anim::@6->anim::@4#4] -- register_copy 
-    jmp b4
-  //SEG41 anim::@4
-  b4:
+  //SEG34 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#0 [phi:anim->anim::@3#4] -- register_copy 
+    jmp b3
+  //SEG35 [13] phi from anim::@5 to anim::@3 [phi:anim::@5->anim::@3]
+  b3_from_b5:
+  //SEG36 [13] phi (byte) anim::j#2 = (byte) anim::j#1 [phi:anim::@5->anim::@3#0] -- register_copy 
+  //SEG37 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#6 [phi:anim::@5->anim::@3#1] -- register_copy 
+  //SEG38 [13] phi (byte) anim::j2#2 = (byte) anim::j2#1 [phi:anim::@5->anim::@3#2] -- register_copy 
+  //SEG39 [13] phi (byte) anim::x_msb#2 = (byte) anim::x_msb#1 [phi:anim::@5->anim::@3#3] -- register_copy 
+  //SEG40 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#5 [phi:anim::@5->anim::@3#4] -- register_copy 
+    jmp b3
+  //SEG41 anim::@3
+  b3:
   //SEG42 [14] (word) anim::x#0 ← ((word))(byte/signed byte/word/signed word/dword/signed dword) $1e + *((const byte[$dd]) sintab_x#0 + (byte) anim::xidx#3) -- vwuz1=vwuc1_plus_pbuc2_derefidx_vbuz2 
     ldy xidx
     lda sintab_x,y
@@ -3613,70 +3651,70 @@ anim: {
     lax xidx
     axs #-[$a]
     stx xidx
-  //SEG50 [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@5 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG50 [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@4 -- vbuz1_lt_vbuc1_then_la1 
     lda xidx
     cmp #sinlen_x
-    bcc b5_from_b4
-    jmp b7
-  //SEG51 anim::@7
-  b7:
+    bcc b4_from_b3
+    jmp b6
+  //SEG51 anim::@6
+  b6:
   //SEG52 [23] (byte) anim::xidx#2 ← (byte) anim::xidx#1 - (const byte) sinlen_x#0 -- vbuz1=vbuz1_minus_vbuc1 
     lax xidx
     axs #sinlen_x
     stx xidx
-  //SEG53 [24] phi from anim::@4 anim::@7 to anim::@5 [phi:anim::@4/anim::@7->anim::@5]
-  b5_from_b4:
-  b5_from_b7:
-  //SEG54 [24] phi (byte) anim::xidx#5 = (byte) anim::xidx#1 [phi:anim::@4/anim::@7->anim::@5#0] -- register_copy 
-    jmp b5
-  //SEG55 anim::@5
-  b5:
+  //SEG53 [24] phi from anim::@3 anim::@6 to anim::@4 [phi:anim::@3/anim::@6->anim::@4]
+  b4_from_b3:
+  b4_from_b6:
+  //SEG54 [24] phi (byte) anim::xidx#5 = (byte) anim::xidx#1 [phi:anim::@3/anim::@6->anim::@4#0] -- register_copy 
+    jmp b4
+  //SEG55 anim::@4
+  b4:
   //SEG56 [25] (byte) anim::yidx#1 ← (byte) anim::yidx#3 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax yidx
     axs #-[8]
     stx yidx
-  //SEG57 [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@6 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG57 [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@5 -- vbuz1_lt_vbuc1_then_la1 
     lda yidx
     cmp #sinlen_y
-    bcc b6_from_b5
-    jmp b8
-  //SEG58 anim::@8
-  b8:
+    bcc b5_from_b4
+    jmp b7
+  //SEG58 anim::@7
+  b7:
   //SEG59 [27] (byte) anim::yidx#2 ← (byte) anim::yidx#1 - (const byte) sinlen_y#0 -- vbuz1=vbuz1_minus_vbuc1 
     lax yidx
     axs #sinlen_y
     stx yidx
-  //SEG60 [28] phi from anim::@5 anim::@8 to anim::@6 [phi:anim::@5/anim::@8->anim::@6]
-  b6_from_b5:
-  b6_from_b8:
-  //SEG61 [28] phi (byte) anim::yidx#6 = (byte) anim::yidx#1 [phi:anim::@5/anim::@8->anim::@6#0] -- register_copy 
-    jmp b6
-  //SEG62 anim::@6
-  b6:
+  //SEG60 [28] phi from anim::@4 anim::@7 to anim::@5 [phi:anim::@4/anim::@7->anim::@5]
+  b5_from_b4:
+  b5_from_b7:
+  //SEG61 [28] phi (byte) anim::yidx#6 = (byte) anim::yidx#1 [phi:anim::@4/anim::@7->anim::@5#0] -- register_copy 
+    jmp b5
+  //SEG62 anim::@5
+  b5:
   //SEG63 [29] (byte) anim::j2#1 ← (byte) anim::j2#2 - (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_minus_2 
     dec j2
     dec j2
   //SEG64 [30] (byte) anim::j#1 ← ++ (byte) anim::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG65 [31] if((byte) anim::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto anim::@4 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG65 [31] if((byte) anim::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto anim::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp j
-    bne b4_from_b6
-    jmp b9
-  //SEG66 anim::@9
-  b9:
+    bne b3_from_b5
+    jmp b8
+  //SEG66 anim::@8
+  b8:
   //SEG67 [32] *((const byte*) SPRITES_XMSB#0) ← (byte) anim::x_msb#1 -- _deref_pbuc1=vbuz1 
     lda x_msb
     sta SPRITES_XMSB
   //SEG68 [33] (byte) sin_idx_x#3 ← ++ (byte) sin_idx_x#13 -- vbuz1=_inc_vbuz1 
     inc sin_idx_x
-  //SEG69 [34] if((byte) sin_idx_x#3<(const byte) sinlen_x#0) goto anim::@14 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG69 [34] if((byte) sin_idx_x#3<(const byte) sinlen_x#0) goto anim::@9 -- vbuz1_lt_vbuc1_then_la1 
     lda sin_idx_x
     cmp #sinlen_x
-    bcc b14_from_b9
-  //SEG70 [35] phi from anim::@9 to anim::@1 [phi:anim::@9->anim::@1]
-  b1_from_b9:
-  //SEG71 [35] phi (byte) sin_idx_x#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@9->anim::@1#0] -- vbuz1=vbuc1 
+    bcc b9_from_b8
+  //SEG70 [35] phi from anim::@8 to anim::@1 [phi:anim::@8->anim::@1]
+  b1_from_b8:
+  //SEG71 [35] phi (byte) sin_idx_x#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta sin_idx_x
     jmp b1
@@ -3684,10 +3722,10 @@ anim: {
   b1:
   //SEG73 [36] (byte) sin_idx_y#3 ← ++ (byte) sin_idx_y#13 -- vbuz1=_inc_vbuz1 
     inc sin_idx_y
-  //SEG74 [37] if((byte) sin_idx_y#3<(const byte) sinlen_y#0) goto anim::@15 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG74 [37] if((byte) sin_idx_y#3<(const byte) sinlen_y#0) goto anim::@10 -- vbuz1_lt_vbuc1_then_la1 
     lda sin_idx_y
     cmp #sinlen_y
-    bcc b15_from_b1
+    bcc b10_from_b1
   //SEG75 [38] phi from anim::@1 to anim::@2 [phi:anim::@1->anim::@2]
   b2_from_b1:
   //SEG76 [38] phi (byte) sin_idx_y#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@1->anim::@2#0] -- vbuz1=vbuc1 
@@ -3703,23 +3741,23 @@ anim: {
   breturn:
   //SEG80 [40] return 
     rts
-  //SEG81 [41] phi from anim::@1 to anim::@15 [phi:anim::@1->anim::@15]
-  b15_from_b1:
-    jmp b15
-  //SEG82 anim::@15
-  b15:
-  //SEG83 [38] phi from anim::@15 to anim::@2 [phi:anim::@15->anim::@2]
-  b2_from_b15:
-  //SEG84 [38] phi (byte) sin_idx_y#11 = (byte) sin_idx_y#3 [phi:anim::@15->anim::@2#0] -- register_copy 
+  //SEG81 [41] phi from anim::@1 to anim::@10 [phi:anim::@1->anim::@10]
+  b10_from_b1:
+    jmp b10
+  //SEG82 anim::@10
+  b10:
+  //SEG83 [38] phi from anim::@10 to anim::@2 [phi:anim::@10->anim::@2]
+  b2_from_b10:
+  //SEG84 [38] phi (byte) sin_idx_y#11 = (byte) sin_idx_y#3 [phi:anim::@10->anim::@2#0] -- register_copy 
     jmp b2
-  //SEG85 [42] phi from anim::@9 to anim::@14 [phi:anim::@9->anim::@14]
-  b14_from_b9:
-    jmp b14
-  //SEG86 anim::@14
-  b14:
-  //SEG87 [35] phi from anim::@14 to anim::@1 [phi:anim::@14->anim::@1]
-  b1_from_b14:
-  //SEG88 [35] phi (byte) sin_idx_x#11 = (byte) sin_idx_x#3 [phi:anim::@14->anim::@1#0] -- register_copy 
+  //SEG85 [42] phi from anim::@8 to anim::@9 [phi:anim::@8->anim::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG86 anim::@9
+  b9:
+  //SEG87 [35] phi from anim::@9 to anim::@1 [phi:anim::@9->anim::@1]
+  b1_from_b9:
+  //SEG88 [35] phi (byte) sin_idx_x#11 = (byte) sin_idx_x#3 [phi:anim::@9->anim::@1#0] -- register_copy 
     jmp b1
 }
 //SEG89 init
@@ -3762,97 +3800,97 @@ init: {
   b2:
   //SEG103 [51] call place_sprites 
     jsr place_sprites
-  //SEG104 [52] phi from init::@2 to init::@4 [phi:init::@2->init::@4]
-  b4_from_b2:
-    jmp b4
-  //SEG105 init::@4
-  b4:
+  //SEG104 [52] phi from init::@2 to init::@3 [phi:init::@2->init::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG105 init::@3
+  b3:
   //SEG106 [53] call gen_sprites 
-  //SEG107 [169] phi from init::@4 to gen_sprites [phi:init::@4->gen_sprites]
-  gen_sprites_from_b4:
+  //SEG107 [169] phi from init::@3 to gen_sprites [phi:init::@3->gen_sprites]
+  gen_sprites_from_b3:
     jsr gen_sprites
-  //SEG108 [54] phi from init::@4 to init::@5 [phi:init::@4->init::@5]
-  b5_from_b4:
-    jmp b5
-  //SEG109 init::@5
-  b5:
+  //SEG108 [54] phi from init::@3 to init::@4 [phi:init::@3->init::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG109 init::@4
+  b4:
   //SEG110 [55] call progress_init 
-  //SEG111 [167] phi from init::@5 to progress_init [phi:init::@5->progress_init]
-  progress_init_from_b5:
-  //SEG112 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0 [phi:init::@5->progress_init#0] -- pbuz1=pbuc1 
+  //SEG111 [167] phi from init::@4 to progress_init [phi:init::@4->progress_init]
+  progress_init_from_b4:
+  //SEG112 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0 [phi:init::@4->progress_init#0] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta progress_init.line
     lda #>SCREEN
     sta progress_init.line+1
     jsr progress_init
-  //SEG113 [56] phi from init::@5 to init::@6 [phi:init::@5->init::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG114 init::@6
-  b6:
+  //SEG113 [56] phi from init::@4 to init::@5 [phi:init::@4->init::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG114 init::@5
+  b5:
   //SEG115 [57] call gen_sintab 
-  //SEG116 [71] phi from init::@6 to gen_sintab [phi:init::@6->gen_sintab]
-  gen_sintab_from_b6:
-  //SEG117 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$dd]) sintab_x#0 [phi:init::@6->gen_sintab#0] -- pbuz1=pbuc1 
+  //SEG116 [71] phi from init::@5 to gen_sintab [phi:init::@5->gen_sintab]
+  gen_sintab_from_b5:
+  //SEG117 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$dd]) sintab_x#0 [phi:init::@5->gen_sintab#0] -- pbuz1=pbuc1 
     lda #<sintab_x
     sta gen_sintab.sintab
     lda #>sintab_x
     sta gen_sintab.sintab+1
-  //SEG118 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_x#0 [phi:init::@6->gen_sintab#1] -- vbuz1=vbuc1 
+  //SEG118 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_x#0 [phi:init::@5->gen_sintab#1] -- vbuz1=vbuc1 
     lda #sinlen_x
     sta gen_sintab.length
-  //SEG119 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@6->gen_sintab#2] -- vbuz1=vbuc1 
+  //SEG119 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@5->gen_sintab#2] -- vbuz1=vbuc1 
     lda #0
     sta gen_sintab.min
-  //SEG120 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $ff [phi:init::@6->gen_sintab#3] -- vbuz1=vbuc1 
+  //SEG120 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $ff [phi:init::@5->gen_sintab#3] -- vbuz1=vbuc1 
     lda #$ff
     sta gen_sintab.max
     jsr gen_sintab
-  //SEG121 [58] phi from init::@6 to init::@7 [phi:init::@6->init::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG122 init::@7
-  b7:
+  //SEG121 [58] phi from init::@5 to init::@6 [phi:init::@5->init::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG122 init::@6
+  b6:
   //SEG123 [59] call progress_init 
-  //SEG124 [167] phi from init::@7 to progress_init [phi:init::@7->progress_init]
-  progress_init_from_b7:
-  //SEG125 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 [phi:init::@7->progress_init#0] -- pbuz1=pbuc1 
+  //SEG124 [167] phi from init::@6 to progress_init [phi:init::@6->progress_init]
+  progress_init_from_b6:
+  //SEG125 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 [phi:init::@6->progress_init#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28
     sta progress_init.line
     lda #>SCREEN+$28
     sta progress_init.line+1
     jsr progress_init
-  //SEG126 [60] phi from init::@7 to init::@8 [phi:init::@7->init::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG127 init::@8
-  b8:
+  //SEG126 [60] phi from init::@6 to init::@7 [phi:init::@6->init::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG127 init::@7
+  b7:
   //SEG128 [61] call gen_sintab 
-  //SEG129 [71] phi from init::@8 to gen_sintab [phi:init::@8->gen_sintab]
-  gen_sintab_from_b8:
-  //SEG130 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$c5]) sintab_y#0 [phi:init::@8->gen_sintab#0] -- pbuz1=pbuc1 
+  //SEG129 [71] phi from init::@7 to gen_sintab [phi:init::@7->gen_sintab]
+  gen_sintab_from_b7:
+  //SEG130 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$c5]) sintab_y#0 [phi:init::@7->gen_sintab#0] -- pbuz1=pbuc1 
     lda #<sintab_y
     sta gen_sintab.sintab
     lda #>sintab_y
     sta gen_sintab.sintab+1
-  //SEG131 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_y#0 [phi:init::@8->gen_sintab#1] -- vbuz1=vbuc1 
+  //SEG131 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_y#0 [phi:init::@7->gen_sintab#1] -- vbuz1=vbuc1 
     lda #sinlen_y
     sta gen_sintab.length
-  //SEG132 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:init::@8->gen_sintab#2] -- vbuz1=vbuc1 
+  //SEG132 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:init::@7->gen_sintab#2] -- vbuz1=vbuc1 
     lda #$32
     sta gen_sintab.min
-  //SEG133 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $d0 [phi:init::@8->gen_sintab#3] -- vbuz1=vbuc1 
+  //SEG133 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $d0 [phi:init::@7->gen_sintab#3] -- vbuz1=vbuc1 
     lda #$d0
     sta gen_sintab.max
     jsr gen_sintab
-  //SEG134 [62] phi from init::@8 to init::@9 [phi:init::@8->init::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG135 init::@9
-  b9:
+  //SEG134 [62] phi from init::@7 to init::@8 [phi:init::@7->init::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG135 init::@8
+  b8:
   //SEG136 [63] call clear_screen 
-  //SEG137 [65] phi from init::@9 to clear_screen [phi:init::@9->clear_screen]
-  clear_screen_from_b9:
+  //SEG137 [65] phi from init::@8 to clear_screen [phi:init::@8->clear_screen]
+  clear_screen_from_b8:
     jsr clear_screen
     jmp breturn
   //SEG138 init::@return
@@ -3928,142 +3966,142 @@ gen_sintab: {
   setFAC_from_gen_sintab:
   //SEG155 [153] phi (word) setFAC::w#5 = (word) setFAC::w#0 [phi:gen_sintab->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG156 [74] phi from gen_sintab to gen_sintab::@3 [phi:gen_sintab->gen_sintab::@3]
-  b3_from_gen_sintab:
-    jmp b3
-  //SEG157 gen_sintab::@3
-  b3:
+  //SEG156 [74] phi from gen_sintab to gen_sintab::@2 [phi:gen_sintab->gen_sintab::@2]
+  b2_from_gen_sintab:
+    jmp b2
+  //SEG157 gen_sintab::@2
+  b2:
   //SEG158 [75] call setARGtoFAC 
     jsr setARGtoFAC
-    jmp b4
-  //SEG159 gen_sintab::@4
-  b4:
+    jmp b3
+  //SEG159 gen_sintab::@3
+  b3:
   //SEG160 [76] (word) setFAC::w#1 ← ((word)) (byte) gen_sintab::min#2 -- vwuz1=_word_vbuz2 
     lda min
     sta setFAC.w
     lda #0
     sta setFAC.w+1
   //SEG161 [77] call setFAC 
-  //SEG162 [153] phi from gen_sintab::@4 to setFAC [phi:gen_sintab::@4->setFAC]
-  setFAC_from_b4:
-  //SEG163 [153] phi (word) setFAC::w#5 = (word) setFAC::w#1 [phi:gen_sintab::@4->setFAC#0] -- register_copy 
+  //SEG162 [153] phi from gen_sintab::@3 to setFAC [phi:gen_sintab::@3->setFAC]
+  setFAC_from_b3:
+  //SEG163 [153] phi (word) setFAC::w#5 = (word) setFAC::w#1 [phi:gen_sintab::@3->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG164 [78] phi from gen_sintab::@4 to gen_sintab::@5 [phi:gen_sintab::@4->gen_sintab::@5]
-  b5_from_b4:
-    jmp b5
-  //SEG165 gen_sintab::@5
-  b5:
+  //SEG164 [78] phi from gen_sintab::@3 to gen_sintab::@4 [phi:gen_sintab::@3->gen_sintab::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG165 gen_sintab::@4
+  b4:
   //SEG166 [79] call setMEMtoFAC 
-  //SEG167 [158] phi from gen_sintab::@5 to setMEMtoFAC [phi:gen_sintab::@5->setMEMtoFAC]
-  setMEMtoFAC_from_b5:
-  //SEG168 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@5->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG167 [158] phi from gen_sintab::@4 to setMEMtoFAC [phi:gen_sintab::@4->setMEMtoFAC]
+  setMEMtoFAC_from_b4:
+  //SEG168 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@4->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_min
     sta setMEMtoFAC.mem
     lda #>f_min
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG169 [80] phi from gen_sintab::@5 to gen_sintab::@6 [phi:gen_sintab::@5->gen_sintab::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG170 gen_sintab::@6
-  b6:
+  //SEG169 [80] phi from gen_sintab::@4 to gen_sintab::@5 [phi:gen_sintab::@4->gen_sintab::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG170 gen_sintab::@5
+  b5:
   //SEG171 [81] call subFACfromARG 
     jsr subFACfromARG
-  //SEG172 [82] phi from gen_sintab::@6 to gen_sintab::@7 [phi:gen_sintab::@6->gen_sintab::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG173 gen_sintab::@7
-  b7:
+  //SEG172 [82] phi from gen_sintab::@5 to gen_sintab::@6 [phi:gen_sintab::@5->gen_sintab::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG173 gen_sintab::@6
+  b6:
   //SEG174 [83] call setMEMtoFAC 
-  //SEG175 [158] phi from gen_sintab::@7 to setMEMtoFAC [phi:gen_sintab::@7->setMEMtoFAC]
-  setMEMtoFAC_from_b7:
-  //SEG176 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@7->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG175 [158] phi from gen_sintab::@6 to setMEMtoFAC [phi:gen_sintab::@6->setMEMtoFAC]
+  setMEMtoFAC_from_b6:
+  //SEG176 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@6->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta setMEMtoFAC.mem
     lda #>f_amp
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG177 [84] phi from gen_sintab::@7 to gen_sintab::@8 [phi:gen_sintab::@7->gen_sintab::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG178 gen_sintab::@8
-  b8:
+  //SEG177 [84] phi from gen_sintab::@6 to gen_sintab::@7 [phi:gen_sintab::@6->gen_sintab::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG178 gen_sintab::@7
+  b7:
   //SEG179 [85] call setFAC 
-  //SEG180 [153] phi from gen_sintab::@8 to setFAC [phi:gen_sintab::@8->setFAC]
-  setFAC_from_b8:
-  //SEG181 [153] phi (word) setFAC::w#5 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:gen_sintab::@8->setFAC#0] -- vwuz1=vbuc1 
+  //SEG180 [153] phi from gen_sintab::@7 to setFAC [phi:gen_sintab::@7->setFAC]
+  setFAC_from_b7:
+  //SEG181 [153] phi (word) setFAC::w#5 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:gen_sintab::@7->setFAC#0] -- vwuz1=vbuc1 
     lda #2
     sta setFAC.w
     lda #0
     sta setFAC.w+1
     jsr setFAC
-  //SEG182 [86] phi from gen_sintab::@8 to gen_sintab::@9 [phi:gen_sintab::@8->gen_sintab::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG183 gen_sintab::@9
-  b9:
+  //SEG182 [86] phi from gen_sintab::@7 to gen_sintab::@8 [phi:gen_sintab::@7->gen_sintab::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG183 gen_sintab::@8
+  b8:
   //SEG184 [87] call divMEMbyFAC 
-  //SEG185 [148] phi from gen_sintab::@9 to divMEMbyFAC [phi:gen_sintab::@9->divMEMbyFAC]
-  divMEMbyFAC_from_b9:
-  //SEG186 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@9->divMEMbyFAC#0] -- pbuz1=pbuc1 
+  //SEG185 [148] phi from gen_sintab::@8 to divMEMbyFAC [phi:gen_sintab::@8->divMEMbyFAC]
+  divMEMbyFAC_from_b8:
+  //SEG186 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@8->divMEMbyFAC#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta divMEMbyFAC.mem
     lda #>f_amp
     sta divMEMbyFAC.mem+1
     jsr divMEMbyFAC
-  //SEG187 [88] phi from gen_sintab::@9 to gen_sintab::@10 [phi:gen_sintab::@9->gen_sintab::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG188 gen_sintab::@10
-  b10:
+  //SEG187 [88] phi from gen_sintab::@8 to gen_sintab::@9 [phi:gen_sintab::@8->gen_sintab::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG188 gen_sintab::@9
+  b9:
   //SEG189 [89] call setMEMtoFAC 
-  //SEG190 [158] phi from gen_sintab::@10 to setMEMtoFAC [phi:gen_sintab::@10->setMEMtoFAC]
-  setMEMtoFAC_from_b10:
-  //SEG191 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@10->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG190 [158] phi from gen_sintab::@9 to setMEMtoFAC [phi:gen_sintab::@9->setMEMtoFAC]
+  setMEMtoFAC_from_b9:
+  //SEG191 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@9->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta setMEMtoFAC.mem
     lda #>f_amp
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG192 [90] phi from gen_sintab::@10 to gen_sintab::@11 [phi:gen_sintab::@10->gen_sintab::@11]
+  //SEG192 [90] phi from gen_sintab::@9 to gen_sintab::@10 [phi:gen_sintab::@9->gen_sintab::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG193 gen_sintab::@10
+  b10:
+  //SEG194 [91] call addMEMtoFAC 
+  //SEG195 [131] phi from gen_sintab::@10 to addMEMtoFAC [phi:gen_sintab::@10->addMEMtoFAC]
+  addMEMtoFAC_from_b10:
+    jsr addMEMtoFAC
+  //SEG196 [92] phi from gen_sintab::@10 to gen_sintab::@11 [phi:gen_sintab::@10->gen_sintab::@11]
   b11_from_b10:
     jmp b11
-  //SEG193 gen_sintab::@11
+  //SEG197 gen_sintab::@11
   b11:
-  //SEG194 [91] call addMEMtoFAC 
-  //SEG195 [131] phi from gen_sintab::@11 to addMEMtoFAC [phi:gen_sintab::@11->addMEMtoFAC]
-  addMEMtoFAC_from_b11:
-    jsr addMEMtoFAC
-  //SEG196 [92] phi from gen_sintab::@11 to gen_sintab::@12 [phi:gen_sintab::@11->gen_sintab::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG197 gen_sintab::@12
-  b12:
   //SEG198 [93] call setMEMtoFAC 
-  //SEG199 [158] phi from gen_sintab::@12 to setMEMtoFAC [phi:gen_sintab::@12->setMEMtoFAC]
-  setMEMtoFAC_from_b12:
-  //SEG200 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@12->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG199 [158] phi from gen_sintab::@11 to setMEMtoFAC [phi:gen_sintab::@11->setMEMtoFAC]
+  setMEMtoFAC_from_b11:
+  //SEG200 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@11->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_min
     sta setMEMtoFAC.mem
     lda #>f_min
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG201 [94] phi from gen_sintab::@12 to gen_sintab::@1 [phi:gen_sintab::@12->gen_sintab::@1]
-  b1_from_b12:
-  //SEG202 [94] phi (byte*) progress_cursor#34 = (byte*) progress_init::line#2 [phi:gen_sintab::@12->gen_sintab::@1#0] -- register_copy 
-  //SEG203 [94] phi (byte) progress_idx#34 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@12->gen_sintab::@1#1] -- vbuz1=vbuc1 
+  //SEG201 [94] phi from gen_sintab::@11 to gen_sintab::@1 [phi:gen_sintab::@11->gen_sintab::@1]
+  b1_from_b11:
+  //SEG202 [94] phi (byte*) progress_cursor#34 = (byte*) progress_init::line#2 [phi:gen_sintab::@11->gen_sintab::@1#0] -- register_copy 
+  //SEG203 [94] phi (byte) progress_idx#34 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@11->gen_sintab::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta progress_idx
-  //SEG204 [94] phi (byte) gen_sintab::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@12->gen_sintab::@1#2] -- vbuz1=vbuc1 
+  //SEG204 [94] phi (byte) gen_sintab::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@11->gen_sintab::@1#2] -- vbuz1=vbuc1 
     lda #0
     sta i
     jmp b1
   // f_min = min + (max - min) / 2
-  //SEG205 [94] phi from gen_sintab::@23 to gen_sintab::@1 [phi:gen_sintab::@23->gen_sintab::@1]
-  b1_from_b23:
-  //SEG206 [94] phi (byte*) progress_cursor#34 = (byte*) progress_cursor#11 [phi:gen_sintab::@23->gen_sintab::@1#0] -- register_copy 
-  //SEG207 [94] phi (byte) progress_idx#34 = (byte) progress_idx#12 [phi:gen_sintab::@23->gen_sintab::@1#1] -- register_copy 
-  //SEG208 [94] phi (byte) gen_sintab::i#10 = (byte) gen_sintab::i#1 [phi:gen_sintab::@23->gen_sintab::@1#2] -- register_copy 
+  //SEG205 [94] phi from gen_sintab::@21 to gen_sintab::@1 [phi:gen_sintab::@21->gen_sintab::@1]
+  b1_from_b21:
+  //SEG206 [94] phi (byte*) progress_cursor#34 = (byte*) progress_cursor#11 [phi:gen_sintab::@21->gen_sintab::@1#0] -- register_copy 
+  //SEG207 [94] phi (byte) progress_idx#34 = (byte) progress_idx#12 [phi:gen_sintab::@21->gen_sintab::@1#1] -- register_copy 
+  //SEG208 [94] phi (byte) gen_sintab::i#10 = (byte) gen_sintab::i#1 [phi:gen_sintab::@21->gen_sintab::@1#2] -- register_copy 
     jmp b1
   //SEG209 gen_sintab::@1
   b1:
@@ -4077,96 +4115,96 @@ gen_sintab: {
   setFAC_from_b1:
   //SEG213 [153] phi (word) setFAC::w#5 = (word) setFAC::w#3 [phi:gen_sintab::@1->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG214 [97] phi from gen_sintab::@1 to gen_sintab::@14 [phi:gen_sintab::@1->gen_sintab::@14]
-  b14_from_b1:
-    jmp b14
-  //SEG215 gen_sintab::@14
-  b14:
+  //SEG214 [97] phi from gen_sintab::@1 to gen_sintab::@12 [phi:gen_sintab::@1->gen_sintab::@12]
+  b12_from_b1:
+    jmp b12
+  //SEG215 gen_sintab::@12
+  b12:
   //SEG216 [98] call mulFACbyMEM 
-  //SEG217 [141] phi from gen_sintab::@14 to mulFACbyMEM [phi:gen_sintab::@14->mulFACbyMEM]
-  mulFACbyMEM_from_b14:
-  //SEG218 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) gen_sintab::f_2pi#0 [phi:gen_sintab::@14->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG217 [141] phi from gen_sintab::@12 to mulFACbyMEM [phi:gen_sintab::@12->mulFACbyMEM]
+  mulFACbyMEM_from_b12:
+  //SEG218 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) gen_sintab::f_2pi#0 [phi:gen_sintab::@12->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_2pi
     sta mulFACbyMEM.mem
     lda #>f_2pi
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG219 [99] phi from gen_sintab::@14 to gen_sintab::@15 [phi:gen_sintab::@14->gen_sintab::@15]
-  b15_from_b14:
-    jmp b15
-  //SEG220 gen_sintab::@15
-  b15:
+  //SEG219 [99] phi from gen_sintab::@12 to gen_sintab::@13 [phi:gen_sintab::@12->gen_sintab::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG220 gen_sintab::@13
+  b13:
   //SEG221 [100] call setMEMtoFAC 
-  //SEG222 [158] phi from gen_sintab::@15 to setMEMtoFAC [phi:gen_sintab::@15->setMEMtoFAC]
-  setMEMtoFAC_from_b15:
-  //SEG223 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@15->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG222 [158] phi from gen_sintab::@13 to setMEMtoFAC [phi:gen_sintab::@13->setMEMtoFAC]
+  setMEMtoFAC_from_b13:
+  //SEG223 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@13->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_i
     sta setMEMtoFAC.mem
     lda #>f_i
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-    jmp b16
-  //SEG224 gen_sintab::@16
-  b16:
+    jmp b14
+  //SEG224 gen_sintab::@14
+  b14:
   //SEG225 [101] (word) setFAC::w#4 ← ((word)) (byte) gen_sintab::length#10 -- vwuz1=_word_vbuz2 
     lda length
     sta setFAC.w
     lda #0
     sta setFAC.w+1
   //SEG226 [102] call setFAC 
-  //SEG227 [153] phi from gen_sintab::@16 to setFAC [phi:gen_sintab::@16->setFAC]
-  setFAC_from_b16:
-  //SEG228 [153] phi (word) setFAC::w#5 = (word) setFAC::w#4 [phi:gen_sintab::@16->setFAC#0] -- register_copy 
+  //SEG227 [153] phi from gen_sintab::@14 to setFAC [phi:gen_sintab::@14->setFAC]
+  setFAC_from_b14:
+  //SEG228 [153] phi (word) setFAC::w#5 = (word) setFAC::w#4 [phi:gen_sintab::@14->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG229 [103] phi from gen_sintab::@16 to gen_sintab::@17 [phi:gen_sintab::@16->gen_sintab::@17]
-  b17_from_b16:
-    jmp b17
-  //SEG230 gen_sintab::@17
-  b17:
+  //SEG229 [103] phi from gen_sintab::@14 to gen_sintab::@15 [phi:gen_sintab::@14->gen_sintab::@15]
+  b15_from_b14:
+    jmp b15
+  //SEG230 gen_sintab::@15
+  b15:
   //SEG231 [104] call divMEMbyFAC 
-  //SEG232 [148] phi from gen_sintab::@17 to divMEMbyFAC [phi:gen_sintab::@17->divMEMbyFAC]
-  divMEMbyFAC_from_b17:
-  //SEG233 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@17->divMEMbyFAC#0] -- pbuz1=pbuc1 
+  //SEG232 [148] phi from gen_sintab::@15 to divMEMbyFAC [phi:gen_sintab::@15->divMEMbyFAC]
+  divMEMbyFAC_from_b15:
+  //SEG233 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@15->divMEMbyFAC#0] -- pbuz1=pbuc1 
     lda #<f_i
     sta divMEMbyFAC.mem
     lda #>f_i
     sta divMEMbyFAC.mem+1
     jsr divMEMbyFAC
-  //SEG234 [105] phi from gen_sintab::@17 to gen_sintab::@18 [phi:gen_sintab::@17->gen_sintab::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG235 gen_sintab::@18
-  b18:
+  //SEG234 [105] phi from gen_sintab::@15 to gen_sintab::@16 [phi:gen_sintab::@15->gen_sintab::@16]
+  b16_from_b15:
+    jmp b16
+  //SEG235 gen_sintab::@16
+  b16:
   //SEG236 [106] call sinFAC 
     jsr sinFAC
-  //SEG237 [107] phi from gen_sintab::@18 to gen_sintab::@19 [phi:gen_sintab::@18->gen_sintab::@19]
-  b19_from_b18:
-    jmp b19
-  //SEG238 gen_sintab::@19
-  b19:
+  //SEG237 [107] phi from gen_sintab::@16 to gen_sintab::@17 [phi:gen_sintab::@16->gen_sintab::@17]
+  b17_from_b16:
+    jmp b17
+  //SEG238 gen_sintab::@17
+  b17:
   //SEG239 [108] call mulFACbyMEM 
-  //SEG240 [141] phi from gen_sintab::@19 to mulFACbyMEM [phi:gen_sintab::@19->mulFACbyMEM]
-  mulFACbyMEM_from_b19:
-  //SEG241 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@19->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG240 [141] phi from gen_sintab::@17 to mulFACbyMEM [phi:gen_sintab::@17->mulFACbyMEM]
+  mulFACbyMEM_from_b17:
+  //SEG241 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@17->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta mulFACbyMEM.mem
     lda #>f_amp
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG242 [109] phi from gen_sintab::@19 to gen_sintab::@20 [phi:gen_sintab::@19->gen_sintab::@20]
-  b20_from_b19:
-    jmp b20
-  //SEG243 gen_sintab::@20
-  b20:
+  //SEG242 [109] phi from gen_sintab::@17 to gen_sintab::@18 [phi:gen_sintab::@17->gen_sintab::@18]
+  b18_from_b17:
+    jmp b18
+  //SEG243 gen_sintab::@18
+  b18:
   //SEG244 [110] call addMEMtoFAC 
-  //SEG245 [131] phi from gen_sintab::@20 to addMEMtoFAC [phi:gen_sintab::@20->addMEMtoFAC]
-  addMEMtoFAC_from_b20:
+  //SEG245 [131] phi from gen_sintab::@18 to addMEMtoFAC [phi:gen_sintab::@18->addMEMtoFAC]
+  addMEMtoFAC_from_b18:
     jsr addMEMtoFAC
-  //SEG246 [111] phi from gen_sintab::@20 to gen_sintab::@21 [phi:gen_sintab::@20->gen_sintab::@21]
-  b21_from_b20:
-    jmp b21
-  //SEG247 gen_sintab::@21
-  b21:
+  //SEG246 [111] phi from gen_sintab::@18 to gen_sintab::@19 [phi:gen_sintab::@18->gen_sintab::@19]
+  b19_from_b18:
+    jmp b19
+  //SEG247 gen_sintab::@19
+  b19:
   //SEG248 [112] call getFAC 
     jsr getFAC
   //SEG249 [113] (word) getFAC::return#2 ← (word) getFAC::return#0 -- vwuz1=vwuz2 
@@ -4174,9 +4212,9 @@ gen_sintab: {
     sta getFAC.return_2
     lda getFAC.return+1
     sta getFAC.return_2+1
-    jmp b22
-  //SEG250 gen_sintab::@22
-  b22:
+    jmp b20
+  //SEG250 gen_sintab::@20
+  b20:
   //SEG251 [114] (word~) gen_sintab::$23 ← (word) getFAC::return#2 -- vwuz1=vwuz2 
     lda getFAC.return_2
     sta _23
@@ -4192,15 +4230,15 @@ gen_sintab: {
     sta (sintab),y
   //SEG254 [117] call progress_inc 
     jsr progress_inc
-    jmp b23
-  //SEG255 gen_sintab::@23
-  b23:
+    jmp b21
+  //SEG255 gen_sintab::@21
+  b21:
   //SEG256 [118] (byte) gen_sintab::i#1 ← ++ (byte) gen_sintab::i#10 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG257 [119] if((byte) gen_sintab::i#1<(byte) gen_sintab::length#10) goto gen_sintab::@1 -- vbuz1_lt_vbuz2_then_la1 
     lda i
     cmp length
-    bcc b1_from_b23
+    bcc b1_from_b21
     jmp breturn
   //SEG258 gen_sintab::@return
   breturn:
@@ -4519,10 +4557,10 @@ gen_sprites: {
     lda #0
     sta i
     jmp b1
-  //SEG351 [170] phi from gen_sprites::@3 to gen_sprites::@1 [phi:gen_sprites::@3->gen_sprites::@1]
-  b1_from_b3:
-  //SEG352 [170] phi (byte*) gen_sprites::spr#2 = (byte*) gen_sprites::spr#1 [phi:gen_sprites::@3->gen_sprites::@1#0] -- register_copy 
-  //SEG353 [170] phi (byte) gen_sprites::i#2 = (byte) gen_sprites::i#1 [phi:gen_sprites::@3->gen_sprites::@1#1] -- register_copy 
+  //SEG351 [170] phi from gen_sprites::@2 to gen_sprites::@1 [phi:gen_sprites::@2->gen_sprites::@1]
+  b1_from_b2:
+  //SEG352 [170] phi (byte*) gen_sprites::spr#2 = (byte*) gen_sprites::spr#1 [phi:gen_sprites::@2->gen_sprites::@1#0] -- register_copy 
+  //SEG353 [170] phi (byte) gen_sprites::i#2 = (byte) gen_sprites::i#1 [phi:gen_sprites::@2->gen_sprites::@1#1] -- register_copy 
     jmp b1
   //SEG354 gen_sprites::@1
   b1:
@@ -4537,9 +4575,9 @@ gen_sprites: {
     sta gen_chargen_sprite.sprite+1
   //SEG357 [173] call gen_chargen_sprite 
     jsr gen_chargen_sprite
-    jmp b3
-  //SEG358 gen_sprites::@3
-  b3:
+    jmp b2
+  //SEG358 gen_sprites::@2
+  b2:
   //SEG359 [174] (byte*) gen_sprites::spr#1 ← (byte*) gen_sprites::spr#2 + (byte/signed byte/word/signed word/dword/signed dword) $40 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$40
     clc
@@ -4553,7 +4591,7 @@ gen_sprites: {
   //SEG361 [176] if((byte) gen_sprites::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto gen_sprites::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp i
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG362 gen_sprites::@return
   breturn:
@@ -4898,7 +4936,7 @@ place_sprites: {
 
 REGISTER UPLIFT POTENTIAL REGISTERS
 Equivalence Class zp ZP_BYTE:51 [ anim::$7 ] has ALU potential.
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ sin_idx_x#13 sin_idx_y#13 ] ( main:2 [ sin_idx_x#13 sin_idx_y#13 ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 [ sin_idx_x#13 sin_idx_y#13 ] ( main:2 [ sin_idx_x#13 sin_idx_y#13 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ sin_idx_x#13 sin_idx_x#11 sin_idx_x#3 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:3 [ sin_idx_y#13 sin_idx_y#11 sin_idx_y#3 ]
 Statement [14] (word) anim::x#0 ← ((word))(byte/signed byte/word/signed word/dword/signed dword) $1e + *((const byte[$dd]) sintab_x#0 + (byte) anim::xidx#3) [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::x_msb#2 anim::j2#2 anim::yidx#3 anim::j#2 anim::x#0 ] ( main:2::anim:9 [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::x_msb#2 anim::j2#2 anim::yidx#3 anim::j#2 anim::x#0 ] ) always clobbers reg byte a 
@@ -4994,7 +5032,7 @@ Removing always clobbered register reg byte a as potential for zp ZP_BYTE:43 [ p
 Statement [219] *((const byte*) SPRITES_COLS#0 + (byte) place_sprites::j#2) ← (byte) place_sprites::col#2 [ place_sprites::j#2 place_sprites::spr_x#2 place_sprites::j2#3 place_sprites::col#2 place_sprites::spr_id#1 ] ( main:2::init:5::place_sprites:51 [ place_sprites::j#2 place_sprites::spr_x#2 place_sprites::j2#3 place_sprites::col#2 place_sprites::spr_id#1 ] ) always clobbers reg byte a 
 Statement [220] (byte) place_sprites::spr_x#1 ← (byte) place_sprites::spr_x#2 + (byte/signed byte/word/signed word/dword/signed dword) $20 [ place_sprites::j#2 place_sprites::j2#3 place_sprites::col#2 place_sprites::spr_id#1 place_sprites::spr_x#1 ] ( main:2::init:5::place_sprites:51 [ place_sprites::j#2 place_sprites::j2#3 place_sprites::col#2 place_sprites::spr_id#1 place_sprites::spr_x#1 ] ) always clobbers reg byte a 
 Statement [221] (byte) place_sprites::col#1 ← (byte) place_sprites::col#2 ^ (byte/signed byte/word/signed word/dword/signed dword) 7^(byte/signed byte/word/signed word/dword/signed dword) 5 [ place_sprites::j#2 place_sprites::j2#3 place_sprites::spr_id#1 place_sprites::spr_x#1 place_sprites::col#1 ] ( main:2::init:5::place_sprites:51 [ place_sprites::j#2 place_sprites::j2#3 place_sprites::spr_id#1 place_sprites::spr_x#1 place_sprites::col#1 ] ) always clobbers reg byte a 
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ sin_idx_x#13 sin_idx_y#13 ] ( main:2 [ sin_idx_x#13 sin_idx_y#13 ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 [ sin_idx_x#13 sin_idx_y#13 ] ( main:2 [ sin_idx_x#13 sin_idx_y#13 ] ) always clobbers reg byte a 
 Statement [14] (word) anim::x#0 ← ((word))(byte/signed byte/word/signed word/dword/signed dword) $1e + *((const byte[$dd]) sintab_x#0 + (byte) anim::xidx#3) [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::x_msb#2 anim::j2#2 anim::yidx#3 anim::j#2 anim::x#0 ] ( main:2::anim:9 [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::x_msb#2 anim::j2#2 anim::yidx#3 anim::j#2 anim::x#0 ] ) always clobbers reg byte a 
 Statement [15] (byte~) anim::$6 ← (byte) anim::x_msb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::j2#2 anim::yidx#3 anim::j#2 anim::x#0 anim::$6 ] ( main:2::anim:9 [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::j2#2 anim::yidx#3 anim::j#2 anim::x#0 anim::$6 ] ) always clobbers reg byte a 
 Statement [18] (byte~) anim::$9 ← < (word) anim::x#0 [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::j2#2 anim::yidx#3 anim::j#2 anim::x_msb#1 anim::$9 ] ( main:2::anim:9 [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::j2#2 anim::yidx#3 anim::j#2 anim::x_msb#1 anim::$9 ] ) always clobbers reg byte a 
@@ -5057,7 +5095,7 @@ Statement [218] *((const byte*) SPRITES_YPOS#0 + (byte) place_sprites::j2#3) ←
 Statement [219] *((const byte*) SPRITES_COLS#0 + (byte) place_sprites::j#2) ← (byte) place_sprites::col#2 [ place_sprites::j#2 place_sprites::spr_x#2 place_sprites::j2#3 place_sprites::col#2 place_sprites::spr_id#1 ] ( main:2::init:5::place_sprites:51 [ place_sprites::j#2 place_sprites::spr_x#2 place_sprites::j2#3 place_sprites::col#2 place_sprites::spr_id#1 ] ) always clobbers reg byte a 
 Statement [220] (byte) place_sprites::spr_x#1 ← (byte) place_sprites::spr_x#2 + (byte/signed byte/word/signed word/dword/signed dword) $20 [ place_sprites::j#2 place_sprites::j2#3 place_sprites::col#2 place_sprites::spr_id#1 place_sprites::spr_x#1 ] ( main:2::init:5::place_sprites:51 [ place_sprites::j#2 place_sprites::j2#3 place_sprites::col#2 place_sprites::spr_id#1 place_sprites::spr_x#1 ] ) always clobbers reg byte a 
 Statement [221] (byte) place_sprites::col#1 ← (byte) place_sprites::col#2 ^ (byte/signed byte/word/signed word/dword/signed dword) 7^(byte/signed byte/word/signed word/dword/signed dword) 5 [ place_sprites::j#2 place_sprites::j2#3 place_sprites::spr_id#1 place_sprites::spr_x#1 place_sprites::col#1 ] ( main:2::init:5::place_sprites:51 [ place_sprites::j#2 place_sprites::j2#3 place_sprites::spr_id#1 place_sprites::spr_x#1 place_sprites::col#1 ] ) always clobbers reg byte a 
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ sin_idx_x#13 sin_idx_y#13 ] ( main:2 [ sin_idx_x#13 sin_idx_y#13 ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 [ sin_idx_x#13 sin_idx_y#13 ] ( main:2 [ sin_idx_x#13 sin_idx_y#13 ] ) always clobbers reg byte a 
 Statement [14] (word) anim::x#0 ← ((word))(byte/signed byte/word/signed word/dword/signed dword) $1e + *((const byte[$dd]) sintab_x#0 + (byte) anim::xidx#3) [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::x_msb#2 anim::j2#2 anim::yidx#3 anim::j#2 anim::x#0 ] ( main:2::anim:9 [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::x_msb#2 anim::j2#2 anim::yidx#3 anim::j#2 anim::x#0 ] ) always clobbers reg byte a 
 Statement [15] (byte~) anim::$6 ← (byte) anim::x_msb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::j2#2 anim::yidx#3 anim::j#2 anim::x#0 anim::$6 ] ( main:2::anim:9 [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::j2#2 anim::yidx#3 anim::j#2 anim::x#0 anim::$6 ] ) always clobbers reg byte a 
 Statement [18] (byte~) anim::$9 ← < (word) anim::x#0 [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::j2#2 anim::yidx#3 anim::j#2 anim::x_msb#1 anim::$9 ] ( main:2::anim:9 [ sin_idx_x#13 sin_idx_y#13 anim::xidx#3 anim::j2#2 anim::yidx#3 anim::j#2 anim::x_msb#1 anim::$9 ] ) always clobbers reg byte a 
@@ -5337,17 +5375,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label sin_idx_y = 3
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @60 [phi:@begin->@60]
-b60_from_bbegin:
-  jmp b60
-//SEG5 @60
-b60:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @60 to main [phi:@60->main]
-main_from_b60:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @60 to @end [phi:@60->@end]
-bend_from_b60:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -5357,36 +5395,36 @@ main: {
   //SEG12 [43] phi from main to init [phi:main->init]
   init_from_main:
     jsr init
-  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
-  b2_from_main:
-  //SEG14 [6] phi (byte) sin_idx_y#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#0] -- vbuz1=vbuc1 
+  //SEG13 [6] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG14 [6] phi (byte) sin_idx_y#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta sin_idx_y
-  //SEG15 [6] phi (byte) sin_idx_x#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#1] -- vbuz1=vbuc1 
+  //SEG15 [6] phi (byte) sin_idx_x#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta sin_idx_x
-    jmp b2
-  //SEG16 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  b2_from_b2:
-    jmp b2
-  //SEG17 main::@2
-  b2:
-  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG16 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG17 main::@1
+  b1:
+  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b2_from_b2
-  //SEG19 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
-  b3_from_b2:
-    jmp b3
-  //SEG20 main::@3
-  b3:
+    bne b1_from_b1
+  //SEG19 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG20 main::@2
+  b2:
   //SEG21 [9] call anim 
     jsr anim
-  //SEG22 [6] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
-  b2_from_b3:
-  //SEG23 [6] phi (byte) sin_idx_y#13 = (byte) sin_idx_y#11 [phi:main::@3->main::@2#0] -- register_copy 
-  //SEG24 [6] phi (byte) sin_idx_x#13 = (byte) sin_idx_x#11 [phi:main::@3->main::@2#1] -- register_copy 
-    jmp b2
+  //SEG22 [6] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG23 [6] phi (byte) sin_idx_y#13 = (byte) sin_idx_y#11 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG24 [6] phi (byte) sin_idx_x#13 = (byte) sin_idx_x#11 [phi:main::@2->main::@1#1] -- register_copy 
+    jmp b1
 }
 //SEG25 anim
 anim: {
@@ -5405,30 +5443,30 @@ anim: {
   //SEG28 [12] (byte) anim::yidx#0 ← (byte) sin_idx_y#13 -- vbuz1=vbuz2 
     lda sin_idx_y
     sta yidx
-  //SEG29 [13] phi from anim to anim::@4 [phi:anim->anim::@4]
-  b4_from_anim:
-  //SEG30 [13] phi (byte) anim::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@4#0] -- vbuz1=vbuc1 
+  //SEG29 [13] phi from anim to anim::@3 [phi:anim->anim::@3]
+  b3_from_anim:
+  //SEG30 [13] phi (byte) anim::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-  //SEG31 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#0 [phi:anim->anim::@4#1] -- register_copy 
-  //SEG32 [13] phi (byte) anim::j2#2 = (byte/signed byte/word/signed word/dword/signed dword) $c [phi:anim->anim::@4#2] -- vbuz1=vbuc1 
+  //SEG31 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#0 [phi:anim->anim::@3#1] -- register_copy 
+  //SEG32 [13] phi (byte) anim::j2#2 = (byte/signed byte/word/signed word/dword/signed dword) $c [phi:anim->anim::@3#2] -- vbuz1=vbuc1 
     lda #$c
     sta j2
-  //SEG33 [13] phi (byte) anim::x_msb#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@4#3] -- vbuz1=vbuc1 
+  //SEG33 [13] phi (byte) anim::x_msb#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@3#3] -- vbuz1=vbuc1 
     lda #0
     sta x_msb
-  //SEG34 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#0 [phi:anim->anim::@4#4] -- register_copy 
-    jmp b4
-  //SEG35 [13] phi from anim::@6 to anim::@4 [phi:anim::@6->anim::@4]
-  b4_from_b6:
-  //SEG36 [13] phi (byte) anim::j#2 = (byte) anim::j#1 [phi:anim::@6->anim::@4#0] -- register_copy 
-  //SEG37 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#6 [phi:anim::@6->anim::@4#1] -- register_copy 
-  //SEG38 [13] phi (byte) anim::j2#2 = (byte) anim::j2#1 [phi:anim::@6->anim::@4#2] -- register_copy 
-  //SEG39 [13] phi (byte) anim::x_msb#2 = (byte) anim::x_msb#1 [phi:anim::@6->anim::@4#3] -- register_copy 
-  //SEG40 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#5 [phi:anim::@6->anim::@4#4] -- register_copy 
-    jmp b4
-  //SEG41 anim::@4
-  b4:
+  //SEG34 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#0 [phi:anim->anim::@3#4] -- register_copy 
+    jmp b3
+  //SEG35 [13] phi from anim::@5 to anim::@3 [phi:anim::@5->anim::@3]
+  b3_from_b5:
+  //SEG36 [13] phi (byte) anim::j#2 = (byte) anim::j#1 [phi:anim::@5->anim::@3#0] -- register_copy 
+  //SEG37 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#6 [phi:anim::@5->anim::@3#1] -- register_copy 
+  //SEG38 [13] phi (byte) anim::j2#2 = (byte) anim::j2#1 [phi:anim::@5->anim::@3#2] -- register_copy 
+  //SEG39 [13] phi (byte) anim::x_msb#2 = (byte) anim::x_msb#1 [phi:anim::@5->anim::@3#3] -- register_copy 
+  //SEG40 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#5 [phi:anim::@5->anim::@3#4] -- register_copy 
+    jmp b3
+  //SEG41 anim::@3
+  b3:
   //SEG42 [14] (word) anim::x#0 ← ((word))(byte/signed byte/word/signed word/dword/signed dword) $1e + *((const byte[$dd]) sintab_x#0 + (byte) anim::xidx#3) -- vwuz1=vwuc1_plus_pbuc2_derefidx_vbuz2 
     ldy xidx
     lda sintab_x,y
@@ -5459,70 +5497,70 @@ anim: {
     lax xidx
     axs #-[$a]
     stx xidx
-  //SEG50 [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@5 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG50 [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@4 -- vbuz1_lt_vbuc1_then_la1 
     lda xidx
     cmp #sinlen_x
-    bcc b5_from_b4
-    jmp b7
-  //SEG51 anim::@7
-  b7:
+    bcc b4_from_b3
+    jmp b6
+  //SEG51 anim::@6
+  b6:
   //SEG52 [23] (byte) anim::xidx#2 ← (byte) anim::xidx#1 - (const byte) sinlen_x#0 -- vbuz1=vbuz1_minus_vbuc1 
     lax xidx
     axs #sinlen_x
     stx xidx
-  //SEG53 [24] phi from anim::@4 anim::@7 to anim::@5 [phi:anim::@4/anim::@7->anim::@5]
-  b5_from_b4:
-  b5_from_b7:
-  //SEG54 [24] phi (byte) anim::xidx#5 = (byte) anim::xidx#1 [phi:anim::@4/anim::@7->anim::@5#0] -- register_copy 
-    jmp b5
-  //SEG55 anim::@5
-  b5:
+  //SEG53 [24] phi from anim::@3 anim::@6 to anim::@4 [phi:anim::@3/anim::@6->anim::@4]
+  b4_from_b3:
+  b4_from_b6:
+  //SEG54 [24] phi (byte) anim::xidx#5 = (byte) anim::xidx#1 [phi:anim::@3/anim::@6->anim::@4#0] -- register_copy 
+    jmp b4
+  //SEG55 anim::@4
+  b4:
   //SEG56 [25] (byte) anim::yidx#1 ← (byte) anim::yidx#3 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax yidx
     axs #-[8]
     stx yidx
-  //SEG57 [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@6 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG57 [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@5 -- vbuz1_lt_vbuc1_then_la1 
     lda yidx
     cmp #sinlen_y
-    bcc b6_from_b5
-    jmp b8
-  //SEG58 anim::@8
-  b8:
+    bcc b5_from_b4
+    jmp b7
+  //SEG58 anim::@7
+  b7:
   //SEG59 [27] (byte) anim::yidx#2 ← (byte) anim::yidx#1 - (const byte) sinlen_y#0 -- vbuz1=vbuz1_minus_vbuc1 
     lax yidx
     axs #sinlen_y
     stx yidx
-  //SEG60 [28] phi from anim::@5 anim::@8 to anim::@6 [phi:anim::@5/anim::@8->anim::@6]
-  b6_from_b5:
-  b6_from_b8:
-  //SEG61 [28] phi (byte) anim::yidx#6 = (byte) anim::yidx#1 [phi:anim::@5/anim::@8->anim::@6#0] -- register_copy 
-    jmp b6
-  //SEG62 anim::@6
-  b6:
+  //SEG60 [28] phi from anim::@4 anim::@7 to anim::@5 [phi:anim::@4/anim::@7->anim::@5]
+  b5_from_b4:
+  b5_from_b7:
+  //SEG61 [28] phi (byte) anim::yidx#6 = (byte) anim::yidx#1 [phi:anim::@4/anim::@7->anim::@5#0] -- register_copy 
+    jmp b5
+  //SEG62 anim::@5
+  b5:
   //SEG63 [29] (byte) anim::j2#1 ← (byte) anim::j2#2 - (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_minus_2 
     dec j2
     dec j2
   //SEG64 [30] (byte) anim::j#1 ← ++ (byte) anim::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG65 [31] if((byte) anim::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto anim::@4 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG65 [31] if((byte) anim::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto anim::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp j
-    bne b4_from_b6
-    jmp b9
-  //SEG66 anim::@9
-  b9:
+    bne b3_from_b5
+    jmp b8
+  //SEG66 anim::@8
+  b8:
   //SEG67 [32] *((const byte*) SPRITES_XMSB#0) ← (byte) anim::x_msb#1 -- _deref_pbuc1=vbuz1 
     lda x_msb
     sta SPRITES_XMSB
   //SEG68 [33] (byte) sin_idx_x#3 ← ++ (byte) sin_idx_x#13 -- vbuz1=_inc_vbuz1 
     inc sin_idx_x
-  //SEG69 [34] if((byte) sin_idx_x#3<(const byte) sinlen_x#0) goto anim::@14 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG69 [34] if((byte) sin_idx_x#3<(const byte) sinlen_x#0) goto anim::@9 -- vbuz1_lt_vbuc1_then_la1 
     lda sin_idx_x
     cmp #sinlen_x
-    bcc b14_from_b9
-  //SEG70 [35] phi from anim::@9 to anim::@1 [phi:anim::@9->anim::@1]
-  b1_from_b9:
-  //SEG71 [35] phi (byte) sin_idx_x#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@9->anim::@1#0] -- vbuz1=vbuc1 
+    bcc b9_from_b8
+  //SEG70 [35] phi from anim::@8 to anim::@1 [phi:anim::@8->anim::@1]
+  b1_from_b8:
+  //SEG71 [35] phi (byte) sin_idx_x#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta sin_idx_x
     jmp b1
@@ -5530,10 +5568,10 @@ anim: {
   b1:
   //SEG73 [36] (byte) sin_idx_y#3 ← ++ (byte) sin_idx_y#13 -- vbuz1=_inc_vbuz1 
     inc sin_idx_y
-  //SEG74 [37] if((byte) sin_idx_y#3<(const byte) sinlen_y#0) goto anim::@15 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG74 [37] if((byte) sin_idx_y#3<(const byte) sinlen_y#0) goto anim::@10 -- vbuz1_lt_vbuc1_then_la1 
     lda sin_idx_y
     cmp #sinlen_y
-    bcc b15_from_b1
+    bcc b10_from_b1
   //SEG75 [38] phi from anim::@1 to anim::@2 [phi:anim::@1->anim::@2]
   b2_from_b1:
   //SEG76 [38] phi (byte) sin_idx_y#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@1->anim::@2#0] -- vbuz1=vbuc1 
@@ -5549,23 +5587,23 @@ anim: {
   breturn:
   //SEG80 [40] return 
     rts
-  //SEG81 [41] phi from anim::@1 to anim::@15 [phi:anim::@1->anim::@15]
-  b15_from_b1:
-    jmp b15
-  //SEG82 anim::@15
-  b15:
-  //SEG83 [38] phi from anim::@15 to anim::@2 [phi:anim::@15->anim::@2]
-  b2_from_b15:
-  //SEG84 [38] phi (byte) sin_idx_y#11 = (byte) sin_idx_y#3 [phi:anim::@15->anim::@2#0] -- register_copy 
+  //SEG81 [41] phi from anim::@1 to anim::@10 [phi:anim::@1->anim::@10]
+  b10_from_b1:
+    jmp b10
+  //SEG82 anim::@10
+  b10:
+  //SEG83 [38] phi from anim::@10 to anim::@2 [phi:anim::@10->anim::@2]
+  b2_from_b10:
+  //SEG84 [38] phi (byte) sin_idx_y#11 = (byte) sin_idx_y#3 [phi:anim::@10->anim::@2#0] -- register_copy 
     jmp b2
-  //SEG85 [42] phi from anim::@9 to anim::@14 [phi:anim::@9->anim::@14]
-  b14_from_b9:
-    jmp b14
-  //SEG86 anim::@14
-  b14:
-  //SEG87 [35] phi from anim::@14 to anim::@1 [phi:anim::@14->anim::@1]
-  b1_from_b14:
-  //SEG88 [35] phi (byte) sin_idx_x#11 = (byte) sin_idx_x#3 [phi:anim::@14->anim::@1#0] -- register_copy 
+  //SEG85 [42] phi from anim::@8 to anim::@9 [phi:anim::@8->anim::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG86 anim::@9
+  b9:
+  //SEG87 [35] phi from anim::@9 to anim::@1 [phi:anim::@9->anim::@1]
+  b1_from_b9:
+  //SEG88 [35] phi (byte) sin_idx_x#11 = (byte) sin_idx_x#3 [phi:anim::@9->anim::@1#0] -- register_copy 
     jmp b1
 }
 //SEG89 init
@@ -5603,95 +5641,95 @@ init: {
   b2:
   //SEG103 [51] call place_sprites 
     jsr place_sprites
-  //SEG104 [52] phi from init::@2 to init::@4 [phi:init::@2->init::@4]
-  b4_from_b2:
-    jmp b4
-  //SEG105 init::@4
-  b4:
+  //SEG104 [52] phi from init::@2 to init::@3 [phi:init::@2->init::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG105 init::@3
+  b3:
   //SEG106 [53] call gen_sprites 
-  //SEG107 [169] phi from init::@4 to gen_sprites [phi:init::@4->gen_sprites]
-  gen_sprites_from_b4:
+  //SEG107 [169] phi from init::@3 to gen_sprites [phi:init::@3->gen_sprites]
+  gen_sprites_from_b3:
     jsr gen_sprites
-  //SEG108 [54] phi from init::@4 to init::@5 [phi:init::@4->init::@5]
-  b5_from_b4:
-    jmp b5
-  //SEG109 init::@5
-  b5:
+  //SEG108 [54] phi from init::@3 to init::@4 [phi:init::@3->init::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG109 init::@4
+  b4:
   //SEG110 [55] call progress_init 
-  //SEG111 [167] phi from init::@5 to progress_init [phi:init::@5->progress_init]
-  progress_init_from_b5:
-  //SEG112 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0 [phi:init::@5->progress_init#0] -- pbuz1=pbuc1 
+  //SEG111 [167] phi from init::@4 to progress_init [phi:init::@4->progress_init]
+  progress_init_from_b4:
+  //SEG112 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0 [phi:init::@4->progress_init#0] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta progress_init.line
     lda #>SCREEN
     sta progress_init.line+1
     jsr progress_init
-  //SEG113 [56] phi from init::@5 to init::@6 [phi:init::@5->init::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG114 init::@6
-  b6:
+  //SEG113 [56] phi from init::@4 to init::@5 [phi:init::@4->init::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG114 init::@5
+  b5:
   //SEG115 [57] call gen_sintab 
-  //SEG116 [71] phi from init::@6 to gen_sintab [phi:init::@6->gen_sintab]
-  gen_sintab_from_b6:
-  //SEG117 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$dd]) sintab_x#0 [phi:init::@6->gen_sintab#0] -- pbuz1=pbuc1 
+  //SEG116 [71] phi from init::@5 to gen_sintab [phi:init::@5->gen_sintab]
+  gen_sintab_from_b5:
+  //SEG117 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$dd]) sintab_x#0 [phi:init::@5->gen_sintab#0] -- pbuz1=pbuc1 
     lda #<sintab_x
     sta gen_sintab.sintab
     lda #>sintab_x
     sta gen_sintab.sintab+1
-  //SEG118 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_x#0 [phi:init::@6->gen_sintab#1] -- vbuz1=vbuc1 
+  //SEG118 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_x#0 [phi:init::@5->gen_sintab#1] -- vbuz1=vbuc1 
     lda #sinlen_x
     sta gen_sintab.length
-  //SEG119 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@6->gen_sintab#2] -- vbuz1=vbuc1 
+  //SEG119 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@5->gen_sintab#2] -- vbuz1=vbuc1 
     lda #0
     sta gen_sintab.min
-  //SEG120 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $ff [phi:init::@6->gen_sintab#3] -- vbuxx=vbuc1 
+  //SEG120 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $ff [phi:init::@5->gen_sintab#3] -- vbuxx=vbuc1 
     ldx #$ff
     jsr gen_sintab
-  //SEG121 [58] phi from init::@6 to init::@7 [phi:init::@6->init::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG122 init::@7
-  b7:
+  //SEG121 [58] phi from init::@5 to init::@6 [phi:init::@5->init::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG122 init::@6
+  b6:
   //SEG123 [59] call progress_init 
-  //SEG124 [167] phi from init::@7 to progress_init [phi:init::@7->progress_init]
-  progress_init_from_b7:
-  //SEG125 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 [phi:init::@7->progress_init#0] -- pbuz1=pbuc1 
+  //SEG124 [167] phi from init::@6 to progress_init [phi:init::@6->progress_init]
+  progress_init_from_b6:
+  //SEG125 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 [phi:init::@6->progress_init#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28
     sta progress_init.line
     lda #>SCREEN+$28
     sta progress_init.line+1
     jsr progress_init
-  //SEG126 [60] phi from init::@7 to init::@8 [phi:init::@7->init::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG127 init::@8
-  b8:
+  //SEG126 [60] phi from init::@6 to init::@7 [phi:init::@6->init::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG127 init::@7
+  b7:
   //SEG128 [61] call gen_sintab 
-  //SEG129 [71] phi from init::@8 to gen_sintab [phi:init::@8->gen_sintab]
-  gen_sintab_from_b8:
-  //SEG130 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$c5]) sintab_y#0 [phi:init::@8->gen_sintab#0] -- pbuz1=pbuc1 
+  //SEG129 [71] phi from init::@7 to gen_sintab [phi:init::@7->gen_sintab]
+  gen_sintab_from_b7:
+  //SEG130 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$c5]) sintab_y#0 [phi:init::@7->gen_sintab#0] -- pbuz1=pbuc1 
     lda #<sintab_y
     sta gen_sintab.sintab
     lda #>sintab_y
     sta gen_sintab.sintab+1
-  //SEG131 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_y#0 [phi:init::@8->gen_sintab#1] -- vbuz1=vbuc1 
+  //SEG131 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_y#0 [phi:init::@7->gen_sintab#1] -- vbuz1=vbuc1 
     lda #sinlen_y
     sta gen_sintab.length
-  //SEG132 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:init::@8->gen_sintab#2] -- vbuz1=vbuc1 
+  //SEG132 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:init::@7->gen_sintab#2] -- vbuz1=vbuc1 
     lda #$32
     sta gen_sintab.min
-  //SEG133 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $d0 [phi:init::@8->gen_sintab#3] -- vbuxx=vbuc1 
+  //SEG133 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $d0 [phi:init::@7->gen_sintab#3] -- vbuxx=vbuc1 
     ldx #$d0
     jsr gen_sintab
-  //SEG134 [62] phi from init::@8 to init::@9 [phi:init::@8->init::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG135 init::@9
-  b9:
+  //SEG134 [62] phi from init::@7 to init::@8 [phi:init::@7->init::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG135 init::@8
+  b8:
   //SEG136 [63] call clear_screen 
-  //SEG137 [65] phi from init::@9 to clear_screen [phi:init::@9->clear_screen]
-  clear_screen_from_b9:
+  //SEG137 [65] phi from init::@8 to clear_screen [phi:init::@8->clear_screen]
+  clear_screen_from_b8:
     jsr clear_screen
     jmp breturn
   //SEG138 init::@return
@@ -5765,142 +5803,142 @@ gen_sintab: {
   setFAC_from_gen_sintab:
   //SEG155 [153] phi (word) setFAC::w#5 = (word) setFAC::w#0 [phi:gen_sintab->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG156 [74] phi from gen_sintab to gen_sintab::@3 [phi:gen_sintab->gen_sintab::@3]
-  b3_from_gen_sintab:
-    jmp b3
-  //SEG157 gen_sintab::@3
-  b3:
+  //SEG156 [74] phi from gen_sintab to gen_sintab::@2 [phi:gen_sintab->gen_sintab::@2]
+  b2_from_gen_sintab:
+    jmp b2
+  //SEG157 gen_sintab::@2
+  b2:
   //SEG158 [75] call setARGtoFAC 
     jsr setARGtoFAC
-    jmp b4
-  //SEG159 gen_sintab::@4
-  b4:
+    jmp b3
+  //SEG159 gen_sintab::@3
+  b3:
   //SEG160 [76] (word) setFAC::w#1 ← ((word)) (byte) gen_sintab::min#2 -- vwuz1=_word_vbuz2 
     lda min
     sta setFAC.w
     lda #0
     sta setFAC.w+1
   //SEG161 [77] call setFAC 
-  //SEG162 [153] phi from gen_sintab::@4 to setFAC [phi:gen_sintab::@4->setFAC]
-  setFAC_from_b4:
-  //SEG163 [153] phi (word) setFAC::w#5 = (word) setFAC::w#1 [phi:gen_sintab::@4->setFAC#0] -- register_copy 
+  //SEG162 [153] phi from gen_sintab::@3 to setFAC [phi:gen_sintab::@3->setFAC]
+  setFAC_from_b3:
+  //SEG163 [153] phi (word) setFAC::w#5 = (word) setFAC::w#1 [phi:gen_sintab::@3->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG164 [78] phi from gen_sintab::@4 to gen_sintab::@5 [phi:gen_sintab::@4->gen_sintab::@5]
-  b5_from_b4:
-    jmp b5
-  //SEG165 gen_sintab::@5
-  b5:
+  //SEG164 [78] phi from gen_sintab::@3 to gen_sintab::@4 [phi:gen_sintab::@3->gen_sintab::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG165 gen_sintab::@4
+  b4:
   //SEG166 [79] call setMEMtoFAC 
-  //SEG167 [158] phi from gen_sintab::@5 to setMEMtoFAC [phi:gen_sintab::@5->setMEMtoFAC]
-  setMEMtoFAC_from_b5:
-  //SEG168 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@5->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG167 [158] phi from gen_sintab::@4 to setMEMtoFAC [phi:gen_sintab::@4->setMEMtoFAC]
+  setMEMtoFAC_from_b4:
+  //SEG168 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@4->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_min
     sta setMEMtoFAC.mem
     lda #>f_min
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG169 [80] phi from gen_sintab::@5 to gen_sintab::@6 [phi:gen_sintab::@5->gen_sintab::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG170 gen_sintab::@6
-  b6:
+  //SEG169 [80] phi from gen_sintab::@4 to gen_sintab::@5 [phi:gen_sintab::@4->gen_sintab::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG170 gen_sintab::@5
+  b5:
   //SEG171 [81] call subFACfromARG 
     jsr subFACfromARG
-  //SEG172 [82] phi from gen_sintab::@6 to gen_sintab::@7 [phi:gen_sintab::@6->gen_sintab::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG173 gen_sintab::@7
-  b7:
+  //SEG172 [82] phi from gen_sintab::@5 to gen_sintab::@6 [phi:gen_sintab::@5->gen_sintab::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG173 gen_sintab::@6
+  b6:
   //SEG174 [83] call setMEMtoFAC 
-  //SEG175 [158] phi from gen_sintab::@7 to setMEMtoFAC [phi:gen_sintab::@7->setMEMtoFAC]
-  setMEMtoFAC_from_b7:
-  //SEG176 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@7->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG175 [158] phi from gen_sintab::@6 to setMEMtoFAC [phi:gen_sintab::@6->setMEMtoFAC]
+  setMEMtoFAC_from_b6:
+  //SEG176 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@6->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta setMEMtoFAC.mem
     lda #>f_amp
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG177 [84] phi from gen_sintab::@7 to gen_sintab::@8 [phi:gen_sintab::@7->gen_sintab::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG178 gen_sintab::@8
-  b8:
+  //SEG177 [84] phi from gen_sintab::@6 to gen_sintab::@7 [phi:gen_sintab::@6->gen_sintab::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG178 gen_sintab::@7
+  b7:
   //SEG179 [85] call setFAC 
-  //SEG180 [153] phi from gen_sintab::@8 to setFAC [phi:gen_sintab::@8->setFAC]
-  setFAC_from_b8:
-  //SEG181 [153] phi (word) setFAC::w#5 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:gen_sintab::@8->setFAC#0] -- vwuz1=vbuc1 
+  //SEG180 [153] phi from gen_sintab::@7 to setFAC [phi:gen_sintab::@7->setFAC]
+  setFAC_from_b7:
+  //SEG181 [153] phi (word) setFAC::w#5 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:gen_sintab::@7->setFAC#0] -- vwuz1=vbuc1 
     lda #2
     sta setFAC.w
     lda #0
     sta setFAC.w+1
     jsr setFAC
-  //SEG182 [86] phi from gen_sintab::@8 to gen_sintab::@9 [phi:gen_sintab::@8->gen_sintab::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG183 gen_sintab::@9
-  b9:
+  //SEG182 [86] phi from gen_sintab::@7 to gen_sintab::@8 [phi:gen_sintab::@7->gen_sintab::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG183 gen_sintab::@8
+  b8:
   //SEG184 [87] call divMEMbyFAC 
-  //SEG185 [148] phi from gen_sintab::@9 to divMEMbyFAC [phi:gen_sintab::@9->divMEMbyFAC]
-  divMEMbyFAC_from_b9:
-  //SEG186 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@9->divMEMbyFAC#0] -- pbuz1=pbuc1 
+  //SEG185 [148] phi from gen_sintab::@8 to divMEMbyFAC [phi:gen_sintab::@8->divMEMbyFAC]
+  divMEMbyFAC_from_b8:
+  //SEG186 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@8->divMEMbyFAC#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta divMEMbyFAC.mem
     lda #>f_amp
     sta divMEMbyFAC.mem+1
     jsr divMEMbyFAC
-  //SEG187 [88] phi from gen_sintab::@9 to gen_sintab::@10 [phi:gen_sintab::@9->gen_sintab::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG188 gen_sintab::@10
-  b10:
+  //SEG187 [88] phi from gen_sintab::@8 to gen_sintab::@9 [phi:gen_sintab::@8->gen_sintab::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG188 gen_sintab::@9
+  b9:
   //SEG189 [89] call setMEMtoFAC 
-  //SEG190 [158] phi from gen_sintab::@10 to setMEMtoFAC [phi:gen_sintab::@10->setMEMtoFAC]
-  setMEMtoFAC_from_b10:
-  //SEG191 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@10->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG190 [158] phi from gen_sintab::@9 to setMEMtoFAC [phi:gen_sintab::@9->setMEMtoFAC]
+  setMEMtoFAC_from_b9:
+  //SEG191 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@9->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta setMEMtoFAC.mem
     lda #>f_amp
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG192 [90] phi from gen_sintab::@10 to gen_sintab::@11 [phi:gen_sintab::@10->gen_sintab::@11]
+  //SEG192 [90] phi from gen_sintab::@9 to gen_sintab::@10 [phi:gen_sintab::@9->gen_sintab::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG193 gen_sintab::@10
+  b10:
+  //SEG194 [91] call addMEMtoFAC 
+  //SEG195 [131] phi from gen_sintab::@10 to addMEMtoFAC [phi:gen_sintab::@10->addMEMtoFAC]
+  addMEMtoFAC_from_b10:
+    jsr addMEMtoFAC
+  //SEG196 [92] phi from gen_sintab::@10 to gen_sintab::@11 [phi:gen_sintab::@10->gen_sintab::@11]
   b11_from_b10:
     jmp b11
-  //SEG193 gen_sintab::@11
+  //SEG197 gen_sintab::@11
   b11:
-  //SEG194 [91] call addMEMtoFAC 
-  //SEG195 [131] phi from gen_sintab::@11 to addMEMtoFAC [phi:gen_sintab::@11->addMEMtoFAC]
-  addMEMtoFAC_from_b11:
-    jsr addMEMtoFAC
-  //SEG196 [92] phi from gen_sintab::@11 to gen_sintab::@12 [phi:gen_sintab::@11->gen_sintab::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG197 gen_sintab::@12
-  b12:
   //SEG198 [93] call setMEMtoFAC 
-  //SEG199 [158] phi from gen_sintab::@12 to setMEMtoFAC [phi:gen_sintab::@12->setMEMtoFAC]
-  setMEMtoFAC_from_b12:
-  //SEG200 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@12->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG199 [158] phi from gen_sintab::@11 to setMEMtoFAC [phi:gen_sintab::@11->setMEMtoFAC]
+  setMEMtoFAC_from_b11:
+  //SEG200 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@11->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_min
     sta setMEMtoFAC.mem
     lda #>f_min
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG201 [94] phi from gen_sintab::@12 to gen_sintab::@1 [phi:gen_sintab::@12->gen_sintab::@1]
-  b1_from_b12:
-  //SEG202 [94] phi (byte*) progress_cursor#34 = (byte*) progress_init::line#2 [phi:gen_sintab::@12->gen_sintab::@1#0] -- register_copy 
-  //SEG203 [94] phi (byte) progress_idx#34 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@12->gen_sintab::@1#1] -- vbuz1=vbuc1 
+  //SEG201 [94] phi from gen_sintab::@11 to gen_sintab::@1 [phi:gen_sintab::@11->gen_sintab::@1]
+  b1_from_b11:
+  //SEG202 [94] phi (byte*) progress_cursor#34 = (byte*) progress_init::line#2 [phi:gen_sintab::@11->gen_sintab::@1#0] -- register_copy 
+  //SEG203 [94] phi (byte) progress_idx#34 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@11->gen_sintab::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta progress_idx
-  //SEG204 [94] phi (byte) gen_sintab::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@12->gen_sintab::@1#2] -- vbuz1=vbuc1 
+  //SEG204 [94] phi (byte) gen_sintab::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@11->gen_sintab::@1#2] -- vbuz1=vbuc1 
     lda #0
     sta i
     jmp b1
   // f_min = min + (max - min) / 2
-  //SEG205 [94] phi from gen_sintab::@23 to gen_sintab::@1 [phi:gen_sintab::@23->gen_sintab::@1]
-  b1_from_b23:
-  //SEG206 [94] phi (byte*) progress_cursor#34 = (byte*) progress_cursor#11 [phi:gen_sintab::@23->gen_sintab::@1#0] -- register_copy 
-  //SEG207 [94] phi (byte) progress_idx#34 = (byte) progress_idx#12 [phi:gen_sintab::@23->gen_sintab::@1#1] -- register_copy 
-  //SEG208 [94] phi (byte) gen_sintab::i#10 = (byte) gen_sintab::i#1 [phi:gen_sintab::@23->gen_sintab::@1#2] -- register_copy 
+  //SEG205 [94] phi from gen_sintab::@21 to gen_sintab::@1 [phi:gen_sintab::@21->gen_sintab::@1]
+  b1_from_b21:
+  //SEG206 [94] phi (byte*) progress_cursor#34 = (byte*) progress_cursor#11 [phi:gen_sintab::@21->gen_sintab::@1#0] -- register_copy 
+  //SEG207 [94] phi (byte) progress_idx#34 = (byte) progress_idx#12 [phi:gen_sintab::@21->gen_sintab::@1#1] -- register_copy 
+  //SEG208 [94] phi (byte) gen_sintab::i#10 = (byte) gen_sintab::i#1 [phi:gen_sintab::@21->gen_sintab::@1#2] -- register_copy 
     jmp b1
   //SEG209 gen_sintab::@1
   b1:
@@ -5914,102 +5952,102 @@ gen_sintab: {
   setFAC_from_b1:
   //SEG213 [153] phi (word) setFAC::w#5 = (word) setFAC::w#3 [phi:gen_sintab::@1->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG214 [97] phi from gen_sintab::@1 to gen_sintab::@14 [phi:gen_sintab::@1->gen_sintab::@14]
-  b14_from_b1:
-    jmp b14
-  //SEG215 gen_sintab::@14
-  b14:
+  //SEG214 [97] phi from gen_sintab::@1 to gen_sintab::@12 [phi:gen_sintab::@1->gen_sintab::@12]
+  b12_from_b1:
+    jmp b12
+  //SEG215 gen_sintab::@12
+  b12:
   //SEG216 [98] call mulFACbyMEM 
-  //SEG217 [141] phi from gen_sintab::@14 to mulFACbyMEM [phi:gen_sintab::@14->mulFACbyMEM]
-  mulFACbyMEM_from_b14:
-  //SEG218 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) gen_sintab::f_2pi#0 [phi:gen_sintab::@14->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG217 [141] phi from gen_sintab::@12 to mulFACbyMEM [phi:gen_sintab::@12->mulFACbyMEM]
+  mulFACbyMEM_from_b12:
+  //SEG218 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) gen_sintab::f_2pi#0 [phi:gen_sintab::@12->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_2pi
     sta mulFACbyMEM.mem
     lda #>f_2pi
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG219 [99] phi from gen_sintab::@14 to gen_sintab::@15 [phi:gen_sintab::@14->gen_sintab::@15]
-  b15_from_b14:
-    jmp b15
-  //SEG220 gen_sintab::@15
-  b15:
+  //SEG219 [99] phi from gen_sintab::@12 to gen_sintab::@13 [phi:gen_sintab::@12->gen_sintab::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG220 gen_sintab::@13
+  b13:
   //SEG221 [100] call setMEMtoFAC 
-  //SEG222 [158] phi from gen_sintab::@15 to setMEMtoFAC [phi:gen_sintab::@15->setMEMtoFAC]
-  setMEMtoFAC_from_b15:
-  //SEG223 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@15->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG222 [158] phi from gen_sintab::@13 to setMEMtoFAC [phi:gen_sintab::@13->setMEMtoFAC]
+  setMEMtoFAC_from_b13:
+  //SEG223 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@13->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_i
     sta setMEMtoFAC.mem
     lda #>f_i
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-    jmp b16
-  //SEG224 gen_sintab::@16
-  b16:
+    jmp b14
+  //SEG224 gen_sintab::@14
+  b14:
   //SEG225 [101] (word) setFAC::w#4 ← ((word)) (byte) gen_sintab::length#10 -- vwuz1=_word_vbuz2 
     lda length
     sta setFAC.w
     lda #0
     sta setFAC.w+1
   //SEG226 [102] call setFAC 
-  //SEG227 [153] phi from gen_sintab::@16 to setFAC [phi:gen_sintab::@16->setFAC]
-  setFAC_from_b16:
-  //SEG228 [153] phi (word) setFAC::w#5 = (word) setFAC::w#4 [phi:gen_sintab::@16->setFAC#0] -- register_copy 
+  //SEG227 [153] phi from gen_sintab::@14 to setFAC [phi:gen_sintab::@14->setFAC]
+  setFAC_from_b14:
+  //SEG228 [153] phi (word) setFAC::w#5 = (word) setFAC::w#4 [phi:gen_sintab::@14->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG229 [103] phi from gen_sintab::@16 to gen_sintab::@17 [phi:gen_sintab::@16->gen_sintab::@17]
-  b17_from_b16:
-    jmp b17
-  //SEG230 gen_sintab::@17
-  b17:
+  //SEG229 [103] phi from gen_sintab::@14 to gen_sintab::@15 [phi:gen_sintab::@14->gen_sintab::@15]
+  b15_from_b14:
+    jmp b15
+  //SEG230 gen_sintab::@15
+  b15:
   //SEG231 [104] call divMEMbyFAC 
-  //SEG232 [148] phi from gen_sintab::@17 to divMEMbyFAC [phi:gen_sintab::@17->divMEMbyFAC]
-  divMEMbyFAC_from_b17:
-  //SEG233 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@17->divMEMbyFAC#0] -- pbuz1=pbuc1 
+  //SEG232 [148] phi from gen_sintab::@15 to divMEMbyFAC [phi:gen_sintab::@15->divMEMbyFAC]
+  divMEMbyFAC_from_b15:
+  //SEG233 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@15->divMEMbyFAC#0] -- pbuz1=pbuc1 
     lda #<f_i
     sta divMEMbyFAC.mem
     lda #>f_i
     sta divMEMbyFAC.mem+1
     jsr divMEMbyFAC
-  //SEG234 [105] phi from gen_sintab::@17 to gen_sintab::@18 [phi:gen_sintab::@17->gen_sintab::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG235 gen_sintab::@18
-  b18:
+  //SEG234 [105] phi from gen_sintab::@15 to gen_sintab::@16 [phi:gen_sintab::@15->gen_sintab::@16]
+  b16_from_b15:
+    jmp b16
+  //SEG235 gen_sintab::@16
+  b16:
   //SEG236 [106] call sinFAC 
     jsr sinFAC
-  //SEG237 [107] phi from gen_sintab::@18 to gen_sintab::@19 [phi:gen_sintab::@18->gen_sintab::@19]
-  b19_from_b18:
-    jmp b19
-  //SEG238 gen_sintab::@19
-  b19:
+  //SEG237 [107] phi from gen_sintab::@16 to gen_sintab::@17 [phi:gen_sintab::@16->gen_sintab::@17]
+  b17_from_b16:
+    jmp b17
+  //SEG238 gen_sintab::@17
+  b17:
   //SEG239 [108] call mulFACbyMEM 
-  //SEG240 [141] phi from gen_sintab::@19 to mulFACbyMEM [phi:gen_sintab::@19->mulFACbyMEM]
-  mulFACbyMEM_from_b19:
-  //SEG241 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@19->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG240 [141] phi from gen_sintab::@17 to mulFACbyMEM [phi:gen_sintab::@17->mulFACbyMEM]
+  mulFACbyMEM_from_b17:
+  //SEG241 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@17->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta mulFACbyMEM.mem
     lda #>f_amp
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG242 [109] phi from gen_sintab::@19 to gen_sintab::@20 [phi:gen_sintab::@19->gen_sintab::@20]
-  b20_from_b19:
-    jmp b20
-  //SEG243 gen_sintab::@20
-  b20:
+  //SEG242 [109] phi from gen_sintab::@17 to gen_sintab::@18 [phi:gen_sintab::@17->gen_sintab::@18]
+  b18_from_b17:
+    jmp b18
+  //SEG243 gen_sintab::@18
+  b18:
   //SEG244 [110] call addMEMtoFAC 
-  //SEG245 [131] phi from gen_sintab::@20 to addMEMtoFAC [phi:gen_sintab::@20->addMEMtoFAC]
-  addMEMtoFAC_from_b20:
+  //SEG245 [131] phi from gen_sintab::@18 to addMEMtoFAC [phi:gen_sintab::@18->addMEMtoFAC]
+  addMEMtoFAC_from_b18:
     jsr addMEMtoFAC
-  //SEG246 [111] phi from gen_sintab::@20 to gen_sintab::@21 [phi:gen_sintab::@20->gen_sintab::@21]
-  b21_from_b20:
-    jmp b21
-  //SEG247 gen_sintab::@21
-  b21:
+  //SEG246 [111] phi from gen_sintab::@18 to gen_sintab::@19 [phi:gen_sintab::@18->gen_sintab::@19]
+  b19_from_b18:
+    jmp b19
+  //SEG247 gen_sintab::@19
+  b19:
   //SEG248 [112] call getFAC 
     jsr getFAC
   //SEG249 [113] (word) getFAC::return#2 ← (word) getFAC::return#0
-    jmp b22
-  //SEG250 gen_sintab::@22
-  b22:
+    jmp b20
+  //SEG250 gen_sintab::@20
+  b20:
   //SEG251 [114] (word~) gen_sintab::$23 ← (word) getFAC::return#2
   //SEG252 [115] (byte~) gen_sintab::$24 ← ((byte)) (word~) gen_sintab::$23 -- vbuaa=_byte_vwuz1 
     lda _23
@@ -6019,15 +6057,15 @@ gen_sintab: {
     sta (sintab),y
   //SEG254 [117] call progress_inc 
     jsr progress_inc
-    jmp b23
-  //SEG255 gen_sintab::@23
-  b23:
+    jmp b21
+  //SEG255 gen_sintab::@21
+  b21:
   //SEG256 [118] (byte) gen_sintab::i#1 ← ++ (byte) gen_sintab::i#10 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG257 [119] if((byte) gen_sintab::i#1<(byte) gen_sintab::length#10) goto gen_sintab::@1 -- vbuz1_lt_vbuz2_then_la1 
     lda i
     cmp length
-    bcc b1_from_b23
+    bcc b1_from_b21
     jmp breturn
   //SEG258 gen_sintab::@return
   breturn:
@@ -6323,10 +6361,10 @@ gen_sprites: {
     lda #0
     sta i
     jmp b1
-  //SEG351 [170] phi from gen_sprites::@3 to gen_sprites::@1 [phi:gen_sprites::@3->gen_sprites::@1]
-  b1_from_b3:
-  //SEG352 [170] phi (byte*) gen_sprites::spr#2 = (byte*) gen_sprites::spr#1 [phi:gen_sprites::@3->gen_sprites::@1#0] -- register_copy 
-  //SEG353 [170] phi (byte) gen_sprites::i#2 = (byte) gen_sprites::i#1 [phi:gen_sprites::@3->gen_sprites::@1#1] -- register_copy 
+  //SEG351 [170] phi from gen_sprites::@2 to gen_sprites::@1 [phi:gen_sprites::@2->gen_sprites::@1]
+  b1_from_b2:
+  //SEG352 [170] phi (byte*) gen_sprites::spr#2 = (byte*) gen_sprites::spr#1 [phi:gen_sprites::@2->gen_sprites::@1#0] -- register_copy 
+  //SEG353 [170] phi (byte) gen_sprites::i#2 = (byte) gen_sprites::i#1 [phi:gen_sprites::@2->gen_sprites::@1#1] -- register_copy 
     jmp b1
   //SEG354 gen_sprites::@1
   b1:
@@ -6340,9 +6378,9 @@ gen_sprites: {
     sta gen_chargen_sprite.sprite+1
   //SEG357 [173] call gen_chargen_sprite 
     jsr gen_chargen_sprite
-    jmp b3
-  //SEG358 gen_sprites::@3
-  b3:
+    jmp b2
+  //SEG358 gen_sprites::@2
+  b2:
   //SEG359 [174] (byte*) gen_sprites::spr#1 ← (byte*) gen_sprites::spr#2 + (byte/signed byte/word/signed word/dword/signed dword) $40 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$40
     clc
@@ -6356,7 +6394,7 @@ gen_sprites: {
   //SEG361 [176] if((byte) gen_sprites::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto gen_sprites::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp i
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG362 gen_sprites::@return
   breturn:
@@ -6678,32 +6716,33 @@ place_sprites: {
   sintab_y: .fill $c5, 0
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b60
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b6
+Removing instruction jmp b4
+Removing instruction jmp b7
+Removing instruction jmp b5
+Removing instruction jmp b8
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b10
+Removing instruction jmp b9
+Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
-Removing instruction jmp b7
-Removing instruction jmp b5
-Removing instruction jmp b8
-Removing instruction jmp b6
-Removing instruction jmp b9
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b15
-Removing instruction jmp b14
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp b6
 Removing instruction jmp b7
 Removing instruction jmp b8
-Removing instruction jmp b9
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
+Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b5
@@ -6713,8 +6752,9 @@ Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
-Removing instruction jmp b12
 Removing instruction jmp b1
+Removing instruction jmp b12
+Removing instruction jmp b13
 Removing instruction jmp b14
 Removing instruction jmp b15
 Removing instruction jmp b16
@@ -6723,8 +6763,6 @@ Removing instruction jmp b18
 Removing instruction jmp b19
 Removing instruction jmp b20
 Removing instruction jmp b21
-Removing instruction jmp b22
-Removing instruction jmp b23
 Removing instruction jmp breturn
 Removing instruction jmp b2
 Removing instruction jmp b1
@@ -6746,7 +6784,7 @@ Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -6776,84 +6814,84 @@ Removing instruction lda #$7f
 Removing instruction lda #$7f
 Removing instruction ldy j2
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b2_from_b2 with b2
+Replacing label b1_from_b1 with b1
+Replacing label b4_from_b3 with b4
 Replacing label b5_from_b4 with b5
-Replacing label b6_from_b5 with b6
-Replacing label b4_from_b6 with b4
-Replacing label b14_from_b9 with b14
-Replacing label b15_from_b1 with b15
+Replacing label b3_from_b5 with b3
+Replacing label b9_from_b8 with b9
+Replacing label b10_from_b1 with b10
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Replacing label b1_from_b23 with b1
+Replacing label b1_from_b21 with b1
 Replacing label b1_from_progress_inc with b1
-Replacing label b1_from_b3 with b1
+Replacing label b1_from_b2 with b1
 Replacing label b5_from_b4 with b5
 Replacing label b4_from_b5 with b4
 Replacing label b2_from_b7 with b2
 Replacing label b1_from_b8 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b60_from_bbegin:
-Removing instruction b60:
-Removing instruction main_from_b60:
-Removing instruction bend_from_b60:
-Removing instruction b2_from_b2:
-Removing instruction b3_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b1:
+Removing instruction b2_from_b1:
+Removing instruction b3_from_b5:
+Removing instruction b4_from_b3:
 Removing instruction b4_from_b6:
 Removing instruction b5_from_b4:
 Removing instruction b5_from_b7:
-Removing instruction b6_from_b5:
-Removing instruction b6_from_b8:
-Removing instruction b15_from_b1:
-Removing instruction b2_from_b15:
-Removing instruction b14_from_b9:
-Removing instruction b1_from_b14:
+Removing instruction b10_from_b1:
+Removing instruction b2_from_b10:
+Removing instruction b9_from_b8:
+Removing instruction b1_from_b9:
 Removing instruction b1_from_b1:
 Removing instruction b2_from_b1:
-Removing instruction b4_from_b2:
-Removing instruction gen_sprites_from_b4:
+Removing instruction b3_from_b2:
+Removing instruction gen_sprites_from_b3:
+Removing instruction b4_from_b3:
+Removing instruction progress_init_from_b4:
 Removing instruction b5_from_b4:
-Removing instruction progress_init_from_b5:
+Removing instruction gen_sintab_from_b5:
 Removing instruction b6_from_b5:
-Removing instruction gen_sintab_from_b6:
+Removing instruction progress_init_from_b6:
 Removing instruction b7_from_b6:
-Removing instruction progress_init_from_b7:
+Removing instruction gen_sintab_from_b7:
 Removing instruction b8_from_b7:
-Removing instruction gen_sintab_from_b8:
-Removing instruction b9_from_b8:
-Removing instruction clear_screen_from_b9:
+Removing instruction clear_screen_from_b8:
 Removing instruction b1_from_b1:
-Removing instruction b3_from_gen_sintab:
+Removing instruction b2_from_gen_sintab:
+Removing instruction b4_from_b3:
+Removing instruction setMEMtoFAC_from_b4:
 Removing instruction b5_from_b4:
-Removing instruction setMEMtoFAC_from_b5:
 Removing instruction b6_from_b5:
+Removing instruction setMEMtoFAC_from_b6:
 Removing instruction b7_from_b6:
-Removing instruction setMEMtoFAC_from_b7:
+Removing instruction setFAC_from_b7:
 Removing instruction b8_from_b7:
-Removing instruction setFAC_from_b8:
+Removing instruction divMEMbyFAC_from_b8:
 Removing instruction b9_from_b8:
-Removing instruction divMEMbyFAC_from_b9:
+Removing instruction setMEMtoFAC_from_b9:
 Removing instruction b10_from_b9:
-Removing instruction setMEMtoFAC_from_b10:
+Removing instruction addMEMtoFAC_from_b10:
 Removing instruction b11_from_b10:
-Removing instruction addMEMtoFAC_from_b11:
-Removing instruction b12_from_b11:
-Removing instruction setMEMtoFAC_from_b12:
-Removing instruction b1_from_b23:
-Removing instruction b14_from_b1:
-Removing instruction mulFACbyMEM_from_b14:
+Removing instruction setMEMtoFAC_from_b11:
+Removing instruction b1_from_b21:
+Removing instruction b12_from_b1:
+Removing instruction mulFACbyMEM_from_b12:
+Removing instruction b13_from_b12:
+Removing instruction setMEMtoFAC_from_b13:
 Removing instruction b15_from_b14:
-Removing instruction setMEMtoFAC_from_b15:
+Removing instruction divMEMbyFAC_from_b15:
+Removing instruction b16_from_b15:
 Removing instruction b17_from_b16:
-Removing instruction divMEMbyFAC_from_b17:
+Removing instruction mulFACbyMEM_from_b17:
 Removing instruction b18_from_b17:
+Removing instruction addMEMtoFAC_from_b18:
 Removing instruction b19_from_b18:
-Removing instruction mulFACbyMEM_from_b19:
-Removing instruction b20_from_b19:
-Removing instruction addMEMtoFAC_from_b20:
-Removing instruction b21_from_b20:
 Removing instruction b1_from_progress_inc:
-Removing instruction b1_from_b3:
+Removing instruction b1_from_b2:
 Removing instruction b1_from_b8:
 Removing instruction b2_from_b7:
 Removing instruction b10_from_b2:
@@ -6865,32 +6903,33 @@ Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction init_from_main:
-Removing instruction b2_from_main:
-Removing instruction b3:
-Removing instruction b2_from_b3:
-Removing instruction b4_from_anim:
+Removing instruction b1_from_main:
+Removing instruction b2:
+Removing instruction b1_from_b2:
+Removing instruction b3_from_anim:
+Removing instruction b6:
 Removing instruction b7:
 Removing instruction b8:
-Removing instruction b9:
-Removing instruction b1_from_b9:
+Removing instruction b1_from_b8:
 Removing instruction b2_from_b1:
 Removing instruction breturn:
 Removing instruction clear_screen_from_init:
 Removing instruction b1_from_init:
 Removing instruction b2:
+Removing instruction b3:
 Removing instruction b4:
 Removing instruction b5:
 Removing instruction b6:
 Removing instruction b7:
 Removing instruction b8:
-Removing instruction b9:
 Removing instruction breturn:
 Removing instruction b1_from_clear_screen:
 Removing instruction breturn:
 Removing instruction setFAC_from_gen_sintab:
+Removing instruction b2:
 Removing instruction b3:
+Removing instruction setFAC_from_b3:
 Removing instruction b4:
-Removing instruction setFAC_from_b4:
 Removing instruction b5:
 Removing instruction b6:
 Removing instruction b7:
@@ -6898,20 +6937,19 @@ Removing instruction b8:
 Removing instruction b9:
 Removing instruction b10:
 Removing instruction b11:
-Removing instruction b12:
-Removing instruction b1_from_b12:
+Removing instruction b1_from_b11:
 Removing instruction setFAC_from_b1:
+Removing instruction b12:
+Removing instruction b13:
 Removing instruction b14:
+Removing instruction setFAC_from_b14:
 Removing instruction b15:
 Removing instruction b16:
-Removing instruction setFAC_from_b16:
 Removing instruction b17:
 Removing instruction b18:
 Removing instruction b19:
 Removing instruction b20:
 Removing instruction b21:
-Removing instruction b22:
-Removing instruction b23:
 Removing instruction breturn:
 Removing instruction b2:
 Removing instruction b1_from_b2:
@@ -6938,7 +6976,7 @@ Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b1_from_gen_sprites:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction b1_from_gen_chargen_sprite:
 Removing instruction b2_from_b1:
@@ -6955,13 +6993,13 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b1 in bcc b14
-Skipping double jump to b2 in bcc b15
+Skipping double jump to b1 in bcc b9
+Skipping double jump to b2 in bcc b10
 Succesful ASM optimization Pass5DoubleJumpElimination
 Relabelling long label b3_from_b2 to b6
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b2
-Removing instruction jmp b4
+Removing instruction jmp b1
+Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b1
@@ -6976,15 +7014,15 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda s_gen
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
-Removing instruction b15:
-Removing instruction b14:
+Removing instruction b10:
+Removing instruction b9:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b2
 Removing unreachable instruction jmp b1
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @60
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -7089,9 +7127,9 @@ FINAL SYMBOL TABLE
 (byte~) anim::$7 reg byte a 202.0
 (byte~) anim::$9 reg byte a 202.0
 (label) anim::@1
-(label) anim::@14
-(label) anim::@15
+(label) anim::@10
 (label) anim::@2
+(label) anim::@3
 (label) anim::@4
 (label) anim::@5
 (label) anim::@6
@@ -7193,16 +7231,16 @@ FINAL SYMBOL TABLE
 (label) gen_sintab::@10
 (label) gen_sintab::@11
 (label) gen_sintab::@12
+(label) gen_sintab::@13
 (label) gen_sintab::@14
 (label) gen_sintab::@15
 (label) gen_sintab::@16
 (label) gen_sintab::@17
 (label) gen_sintab::@18
 (label) gen_sintab::@19
+(label) gen_sintab::@2
 (label) gen_sintab::@20
 (label) gen_sintab::@21
-(label) gen_sintab::@22
-(label) gen_sintab::@23
 (label) gen_sintab::@3
 (label) gen_sintab::@4
 (label) gen_sintab::@5
@@ -7232,7 +7270,7 @@ FINAL SYMBOL TABLE
 (byte*) gen_sintab::sintab#12 sintab zp ZP_WORD:9 0.22448979591836735
 (void()) gen_sprites()
 (label) gen_sprites::@1
-(label) gen_sprites::@3
+(label) gen_sprites::@2
 (label) gen_sprites::@return
 (byte[]) gen_sprites::cml
 (const byte[]) gen_sprites::cml#0 cml = (string) "camelot"
@@ -7251,19 +7289,19 @@ FINAL SYMBOL TABLE
 (void()) init()
 (label) init::@1
 (label) init::@2
+(label) init::@3
 (label) init::@4
 (label) init::@5
 (label) init::@6
 (label) init::@7
 (label) init::@8
-(label) init::@9
 (label) init::@return
 (byte) init::i
 (byte) init::i#1 reg byte x 16.5
 (byte) init::i#2 reg byte x 14.666666666666666
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@3
 (byte*) memHi
 (const byte*) memHi#0 memHi = ((byte*))(byte/word/signed word/dword/signed dword) $ff
 (byte*) memLo
@@ -7426,38 +7464,38 @@ Score: 769888
   .label sin_idx_x = 2
   .label sin_idx_y = 3
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @60 [phi:@begin->@60]
-//SEG5 @60
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @60 to main [phi:@60->main]
-//SEG8 [3] phi from @60 to @end [phi:@60->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] call init 
   //SEG12 [43] phi from main to init [phi:main->init]
     jsr init
-  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
-  //SEG14 [6] phi (byte) sin_idx_y#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#0] -- vbuz1=vbuc1 
+  //SEG13 [6] phi from main to main::@1 [phi:main->main::@1]
+  //SEG14 [6] phi (byte) sin_idx_y#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta sin_idx_y
-  //SEG15 [6] phi (byte) sin_idx_x#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#1] -- vbuz1=vbuc1 
+  //SEG15 [6] phi (byte) sin_idx_x#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#1] -- vbuz1=vbuc1 
     sta sin_idx_x
-  //SEG16 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  //SEG17 main::@2
-  b2:
-  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG16 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  //SEG17 main::@1
+  b1:
+  //SEG18 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b2
-  //SEG19 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
-  //SEG20 main::@3
+    bne b1
+  //SEG19 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG20 main::@2
   //SEG21 [9] call anim 
     jsr anim
-  //SEG22 [6] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
-  //SEG23 [6] phi (byte) sin_idx_y#13 = (byte) sin_idx_y#11 [phi:main::@3->main::@2#0] -- register_copy 
-  //SEG24 [6] phi (byte) sin_idx_x#13 = (byte) sin_idx_x#11 [phi:main::@3->main::@2#1] -- register_copy 
-    jmp b2
+  //SEG22 [6] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  //SEG23 [6] phi (byte) sin_idx_y#13 = (byte) sin_idx_y#11 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG24 [6] phi (byte) sin_idx_x#13 = (byte) sin_idx_x#11 [phi:main::@2->main::@1#1] -- register_copy 
+    jmp b1
 }
 //SEG25 anim
 anim: {
@@ -7476,26 +7514,26 @@ anim: {
   //SEG28 [12] (byte) anim::yidx#0 ← (byte) sin_idx_y#13 -- vbuz1=vbuz2 
     lda sin_idx_y
     sta yidx
-  //SEG29 [13] phi from anim to anim::@4 [phi:anim->anim::@4]
-  //SEG30 [13] phi (byte) anim::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@4#0] -- vbuz1=vbuc1 
+  //SEG29 [13] phi from anim to anim::@3 [phi:anim->anim::@3]
+  //SEG30 [13] phi (byte) anim::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-  //SEG31 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#0 [phi:anim->anim::@4#1] -- register_copy 
-  //SEG32 [13] phi (byte) anim::j2#2 = (byte/signed byte/word/signed word/dword/signed dword) $c [phi:anim->anim::@4#2] -- vbuz1=vbuc1 
+  //SEG31 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#0 [phi:anim->anim::@3#1] -- register_copy 
+  //SEG32 [13] phi (byte) anim::j2#2 = (byte/signed byte/word/signed word/dword/signed dword) $c [phi:anim->anim::@3#2] -- vbuz1=vbuc1 
     lda #$c
     sta j2
-  //SEG33 [13] phi (byte) anim::x_msb#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@4#3] -- vbuz1=vbuc1 
+  //SEG33 [13] phi (byte) anim::x_msb#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim->anim::@3#3] -- vbuz1=vbuc1 
     lda #0
     sta x_msb
-  //SEG34 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#0 [phi:anim->anim::@4#4] -- register_copy 
-  //SEG35 [13] phi from anim::@6 to anim::@4 [phi:anim::@6->anim::@4]
-  //SEG36 [13] phi (byte) anim::j#2 = (byte) anim::j#1 [phi:anim::@6->anim::@4#0] -- register_copy 
-  //SEG37 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#6 [phi:anim::@6->anim::@4#1] -- register_copy 
-  //SEG38 [13] phi (byte) anim::j2#2 = (byte) anim::j2#1 [phi:anim::@6->anim::@4#2] -- register_copy 
-  //SEG39 [13] phi (byte) anim::x_msb#2 = (byte) anim::x_msb#1 [phi:anim::@6->anim::@4#3] -- register_copy 
-  //SEG40 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#5 [phi:anim::@6->anim::@4#4] -- register_copy 
-  //SEG41 anim::@4
-  b4:
+  //SEG34 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#0 [phi:anim->anim::@3#4] -- register_copy 
+  //SEG35 [13] phi from anim::@5 to anim::@3 [phi:anim::@5->anim::@3]
+  //SEG36 [13] phi (byte) anim::j#2 = (byte) anim::j#1 [phi:anim::@5->anim::@3#0] -- register_copy 
+  //SEG37 [13] phi (byte) anim::yidx#3 = (byte) anim::yidx#6 [phi:anim::@5->anim::@3#1] -- register_copy 
+  //SEG38 [13] phi (byte) anim::j2#2 = (byte) anim::j2#1 [phi:anim::@5->anim::@3#2] -- register_copy 
+  //SEG39 [13] phi (byte) anim::x_msb#2 = (byte) anim::x_msb#1 [phi:anim::@5->anim::@3#3] -- register_copy 
+  //SEG40 [13] phi (byte) anim::xidx#3 = (byte) anim::xidx#5 [phi:anim::@5->anim::@3#4] -- register_copy 
+  //SEG41 anim::@3
+  b3:
   //SEG42 [14] (word) anim::x#0 ← ((word))(byte/signed byte/word/signed word/dword/signed dword) $1e + *((const byte[$dd]) sintab_x#0 + (byte) anim::xidx#3) -- vwuz1=vwuc1_plus_pbuc2_derefidx_vbuz2 
     ldy xidx
     lda sintab_x,y
@@ -7525,64 +7563,64 @@ anim: {
     lax xidx
     axs #-[$a]
     stx xidx
-  //SEG50 [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@5 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG50 [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@4 -- vbuz1_lt_vbuc1_then_la1 
     txa
     cmp #sinlen_x
-    bcc b5
-  //SEG51 anim::@7
+    bcc b4
+  //SEG51 anim::@6
   //SEG52 [23] (byte) anim::xidx#2 ← (byte) anim::xidx#1 - (const byte) sinlen_x#0 -- vbuz1=vbuz1_minus_vbuc1 
     lax xidx
     axs #sinlen_x
     stx xidx
-  //SEG53 [24] phi from anim::@4 anim::@7 to anim::@5 [phi:anim::@4/anim::@7->anim::@5]
-  //SEG54 [24] phi (byte) anim::xidx#5 = (byte) anim::xidx#1 [phi:anim::@4/anim::@7->anim::@5#0] -- register_copy 
-  //SEG55 anim::@5
-  b5:
+  //SEG53 [24] phi from anim::@3 anim::@6 to anim::@4 [phi:anim::@3/anim::@6->anim::@4]
+  //SEG54 [24] phi (byte) anim::xidx#5 = (byte) anim::xidx#1 [phi:anim::@3/anim::@6->anim::@4#0] -- register_copy 
+  //SEG55 anim::@4
+  b4:
   //SEG56 [25] (byte) anim::yidx#1 ← (byte) anim::yidx#3 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax yidx
     axs #-[8]
     stx yidx
-  //SEG57 [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@6 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG57 [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@5 -- vbuz1_lt_vbuc1_then_la1 
     txa
     cmp #sinlen_y
-    bcc b6
-  //SEG58 anim::@8
+    bcc b5
+  //SEG58 anim::@7
   //SEG59 [27] (byte) anim::yidx#2 ← (byte) anim::yidx#1 - (const byte) sinlen_y#0 -- vbuz1=vbuz1_minus_vbuc1 
     lax yidx
     axs #sinlen_y
     stx yidx
-  //SEG60 [28] phi from anim::@5 anim::@8 to anim::@6 [phi:anim::@5/anim::@8->anim::@6]
-  //SEG61 [28] phi (byte) anim::yidx#6 = (byte) anim::yidx#1 [phi:anim::@5/anim::@8->anim::@6#0] -- register_copy 
-  //SEG62 anim::@6
-  b6:
+  //SEG60 [28] phi from anim::@4 anim::@7 to anim::@5 [phi:anim::@4/anim::@7->anim::@5]
+  //SEG61 [28] phi (byte) anim::yidx#6 = (byte) anim::yidx#1 [phi:anim::@4/anim::@7->anim::@5#0] -- register_copy 
+  //SEG62 anim::@5
+  b5:
   //SEG63 [29] (byte) anim::j2#1 ← (byte) anim::j2#2 - (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_minus_2 
     dec j2
     dec j2
   //SEG64 [30] (byte) anim::j#1 ← ++ (byte) anim::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG65 [31] if((byte) anim::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto anim::@4 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG65 [31] if((byte) anim::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto anim::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp j
-    bne b4
-  //SEG66 anim::@9
+    bne b3
+  //SEG66 anim::@8
   //SEG67 [32] *((const byte*) SPRITES_XMSB#0) ← (byte) anim::x_msb#1 -- _deref_pbuc1=vbuz1 
     lda x_msb
     sta SPRITES_XMSB
   //SEG68 [33] (byte) sin_idx_x#3 ← ++ (byte) sin_idx_x#13 -- vbuz1=_inc_vbuz1 
     inc sin_idx_x
-  //SEG69 [34] if((byte) sin_idx_x#3<(const byte) sinlen_x#0) goto anim::@14 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG69 [34] if((byte) sin_idx_x#3<(const byte) sinlen_x#0) goto anim::@9 -- vbuz1_lt_vbuc1_then_la1 
     lda sin_idx_x
     cmp #sinlen_x
     bcc b1
-  //SEG70 [35] phi from anim::@9 to anim::@1 [phi:anim::@9->anim::@1]
-  //SEG71 [35] phi (byte) sin_idx_x#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@9->anim::@1#0] -- vbuz1=vbuc1 
+  //SEG70 [35] phi from anim::@8 to anim::@1 [phi:anim::@8->anim::@1]
+  //SEG71 [35] phi (byte) sin_idx_x#11 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@8->anim::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta sin_idx_x
   //SEG72 anim::@1
   b1:
   //SEG73 [36] (byte) sin_idx_y#3 ← ++ (byte) sin_idx_y#13 -- vbuz1=_inc_vbuz1 
     inc sin_idx_y
-  //SEG74 [37] if((byte) sin_idx_y#3<(const byte) sinlen_y#0) goto anim::@15 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG74 [37] if((byte) sin_idx_y#3<(const byte) sinlen_y#0) goto anim::@10 -- vbuz1_lt_vbuc1_then_la1 
     lda sin_idx_y
     cmp #sinlen_y
     bcc b2
@@ -7597,14 +7635,14 @@ anim: {
   //SEG79 anim::@return
   //SEG80 [40] return 
     rts
-  //SEG81 [41] phi from anim::@1 to anim::@15 [phi:anim::@1->anim::@15]
-  //SEG82 anim::@15
-  //SEG83 [38] phi from anim::@15 to anim::@2 [phi:anim::@15->anim::@2]
-  //SEG84 [38] phi (byte) sin_idx_y#11 = (byte) sin_idx_y#3 [phi:anim::@15->anim::@2#0] -- register_copy 
-  //SEG85 [42] phi from anim::@9 to anim::@14 [phi:anim::@9->anim::@14]
-  //SEG86 anim::@14
-  //SEG87 [35] phi from anim::@14 to anim::@1 [phi:anim::@14->anim::@1]
-  //SEG88 [35] phi (byte) sin_idx_x#11 = (byte) sin_idx_x#3 [phi:anim::@14->anim::@1#0] -- register_copy 
+  //SEG81 [41] phi from anim::@1 to anim::@10 [phi:anim::@1->anim::@10]
+  //SEG82 anim::@10
+  //SEG83 [38] phi from anim::@10 to anim::@2 [phi:anim::@10->anim::@2]
+  //SEG84 [38] phi (byte) sin_idx_y#11 = (byte) sin_idx_y#3 [phi:anim::@10->anim::@2#0] -- register_copy 
+  //SEG85 [42] phi from anim::@8 to anim::@9 [phi:anim::@8->anim::@9]
+  //SEG86 anim::@9
+  //SEG87 [35] phi from anim::@9 to anim::@1 [phi:anim::@9->anim::@1]
+  //SEG88 [35] phi (byte) sin_idx_x#11 = (byte) sin_idx_x#3 [phi:anim::@9->anim::@1#0] -- register_copy 
 }
 //SEG89 init
 init: {
@@ -7633,71 +7671,71 @@ init: {
   //SEG102 init::@2
   //SEG103 [51] call place_sprites 
     jsr place_sprites
-  //SEG104 [52] phi from init::@2 to init::@4 [phi:init::@2->init::@4]
-  //SEG105 init::@4
+  //SEG104 [52] phi from init::@2 to init::@3 [phi:init::@2->init::@3]
+  //SEG105 init::@3
   //SEG106 [53] call gen_sprites 
-  //SEG107 [169] phi from init::@4 to gen_sprites [phi:init::@4->gen_sprites]
+  //SEG107 [169] phi from init::@3 to gen_sprites [phi:init::@3->gen_sprites]
     jsr gen_sprites
-  //SEG108 [54] phi from init::@4 to init::@5 [phi:init::@4->init::@5]
-  //SEG109 init::@5
+  //SEG108 [54] phi from init::@3 to init::@4 [phi:init::@3->init::@4]
+  //SEG109 init::@4
   //SEG110 [55] call progress_init 
-  //SEG111 [167] phi from init::@5 to progress_init [phi:init::@5->progress_init]
-  //SEG112 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0 [phi:init::@5->progress_init#0] -- pbuz1=pbuc1 
+  //SEG111 [167] phi from init::@4 to progress_init [phi:init::@4->progress_init]
+  //SEG112 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0 [phi:init::@4->progress_init#0] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta progress_init.line
     lda #>SCREEN
     sta progress_init.line+1
     jsr progress_init
-  //SEG113 [56] phi from init::@5 to init::@6 [phi:init::@5->init::@6]
-  //SEG114 init::@6
+  //SEG113 [56] phi from init::@4 to init::@5 [phi:init::@4->init::@5]
+  //SEG114 init::@5
   //SEG115 [57] call gen_sintab 
-  //SEG116 [71] phi from init::@6 to gen_sintab [phi:init::@6->gen_sintab]
-  //SEG117 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$dd]) sintab_x#0 [phi:init::@6->gen_sintab#0] -- pbuz1=pbuc1 
+  //SEG116 [71] phi from init::@5 to gen_sintab [phi:init::@5->gen_sintab]
+  //SEG117 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$dd]) sintab_x#0 [phi:init::@5->gen_sintab#0] -- pbuz1=pbuc1 
     lda #<sintab_x
     sta gen_sintab.sintab
     lda #>sintab_x
     sta gen_sintab.sintab+1
-  //SEG118 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_x#0 [phi:init::@6->gen_sintab#1] -- vbuz1=vbuc1 
+  //SEG118 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_x#0 [phi:init::@5->gen_sintab#1] -- vbuz1=vbuc1 
     lda #sinlen_x
     sta gen_sintab.length
-  //SEG119 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@6->gen_sintab#2] -- vbuz1=vbuc1 
+  //SEG119 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@5->gen_sintab#2] -- vbuz1=vbuc1 
     lda #0
     sta gen_sintab.min
-  //SEG120 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $ff [phi:init::@6->gen_sintab#3] -- vbuxx=vbuc1 
+  //SEG120 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $ff [phi:init::@5->gen_sintab#3] -- vbuxx=vbuc1 
     ldx #$ff
     jsr gen_sintab
-  //SEG121 [58] phi from init::@6 to init::@7 [phi:init::@6->init::@7]
-  //SEG122 init::@7
+  //SEG121 [58] phi from init::@5 to init::@6 [phi:init::@5->init::@6]
+  //SEG122 init::@6
   //SEG123 [59] call progress_init 
-  //SEG124 [167] phi from init::@7 to progress_init [phi:init::@7->progress_init]
-  //SEG125 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 [phi:init::@7->progress_init#0] -- pbuz1=pbuc1 
+  //SEG124 [167] phi from init::@6 to progress_init [phi:init::@6->progress_init]
+  //SEG125 [167] phi (byte*) progress_init::line#2 = (const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 [phi:init::@6->progress_init#0] -- pbuz1=pbuc1 
     lda #<SCREEN+$28
     sta progress_init.line
     lda #>SCREEN+$28
     sta progress_init.line+1
     jsr progress_init
-  //SEG126 [60] phi from init::@7 to init::@8 [phi:init::@7->init::@8]
-  //SEG127 init::@8
+  //SEG126 [60] phi from init::@6 to init::@7 [phi:init::@6->init::@7]
+  //SEG127 init::@7
   //SEG128 [61] call gen_sintab 
-  //SEG129 [71] phi from init::@8 to gen_sintab [phi:init::@8->gen_sintab]
-  //SEG130 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$c5]) sintab_y#0 [phi:init::@8->gen_sintab#0] -- pbuz1=pbuc1 
+  //SEG129 [71] phi from init::@7 to gen_sintab [phi:init::@7->gen_sintab]
+  //SEG130 [71] phi (byte*) gen_sintab::sintab#12 = (const byte[$c5]) sintab_y#0 [phi:init::@7->gen_sintab#0] -- pbuz1=pbuc1 
     lda #<sintab_y
     sta gen_sintab.sintab
     lda #>sintab_y
     sta gen_sintab.sintab+1
-  //SEG131 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_y#0 [phi:init::@8->gen_sintab#1] -- vbuz1=vbuc1 
+  //SEG131 [71] phi (byte) gen_sintab::length#10 = (const byte) sinlen_y#0 [phi:init::@7->gen_sintab#1] -- vbuz1=vbuc1 
     lda #sinlen_y
     sta gen_sintab.length
-  //SEG132 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:init::@8->gen_sintab#2] -- vbuz1=vbuc1 
+  //SEG132 [71] phi (byte) gen_sintab::min#2 = (byte/signed byte/word/signed word/dword/signed dword) $32 [phi:init::@7->gen_sintab#2] -- vbuz1=vbuc1 
     lda #$32
     sta gen_sintab.min
-  //SEG133 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $d0 [phi:init::@8->gen_sintab#3] -- vbuxx=vbuc1 
+  //SEG133 [71] phi (byte) gen_sintab::max#2 = (byte/word/signed word/dword/signed dword) $d0 [phi:init::@7->gen_sintab#3] -- vbuxx=vbuc1 
     ldx #$d0
     jsr gen_sintab
-  //SEG134 [62] phi from init::@8 to init::@9 [phi:init::@8->init::@9]
-  //SEG135 init::@9
+  //SEG134 [62] phi from init::@7 to init::@8 [phi:init::@7->init::@8]
+  //SEG135 init::@8
   //SEG136 [63] call clear_screen 
-  //SEG137 [65] phi from init::@9 to clear_screen [phi:init::@9->clear_screen]
+  //SEG137 [65] phi from init::@8 to clear_screen [phi:init::@8->clear_screen]
     jsr clear_screen
   //SEG138 init::@return
   //SEG139 [64] return 
@@ -7762,101 +7800,101 @@ gen_sintab: {
   //SEG154 [153] phi from gen_sintab to setFAC [phi:gen_sintab->setFAC]
   //SEG155 [153] phi (word) setFAC::w#5 = (word) setFAC::w#0 [phi:gen_sintab->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG156 [74] phi from gen_sintab to gen_sintab::@3 [phi:gen_sintab->gen_sintab::@3]
-  //SEG157 gen_sintab::@3
+  //SEG156 [74] phi from gen_sintab to gen_sintab::@2 [phi:gen_sintab->gen_sintab::@2]
+  //SEG157 gen_sintab::@2
   //SEG158 [75] call setARGtoFAC 
     jsr setARGtoFAC
-  //SEG159 gen_sintab::@4
+  //SEG159 gen_sintab::@3
   //SEG160 [76] (word) setFAC::w#1 ← ((word)) (byte) gen_sintab::min#2 -- vwuz1=_word_vbuz2 
     lda min
     sta setFAC.w
     lda #0
     sta setFAC.w+1
   //SEG161 [77] call setFAC 
-  //SEG162 [153] phi from gen_sintab::@4 to setFAC [phi:gen_sintab::@4->setFAC]
-  //SEG163 [153] phi (word) setFAC::w#5 = (word) setFAC::w#1 [phi:gen_sintab::@4->setFAC#0] -- register_copy 
+  //SEG162 [153] phi from gen_sintab::@3 to setFAC [phi:gen_sintab::@3->setFAC]
+  //SEG163 [153] phi (word) setFAC::w#5 = (word) setFAC::w#1 [phi:gen_sintab::@3->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG164 [78] phi from gen_sintab::@4 to gen_sintab::@5 [phi:gen_sintab::@4->gen_sintab::@5]
-  //SEG165 gen_sintab::@5
+  //SEG164 [78] phi from gen_sintab::@3 to gen_sintab::@4 [phi:gen_sintab::@3->gen_sintab::@4]
+  //SEG165 gen_sintab::@4
   //SEG166 [79] call setMEMtoFAC 
-  //SEG167 [158] phi from gen_sintab::@5 to setMEMtoFAC [phi:gen_sintab::@5->setMEMtoFAC]
-  //SEG168 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@5->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG167 [158] phi from gen_sintab::@4 to setMEMtoFAC [phi:gen_sintab::@4->setMEMtoFAC]
+  //SEG168 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@4->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_min
     sta setMEMtoFAC.mem
     lda #>f_min
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG169 [80] phi from gen_sintab::@5 to gen_sintab::@6 [phi:gen_sintab::@5->gen_sintab::@6]
-  //SEG170 gen_sintab::@6
+  //SEG169 [80] phi from gen_sintab::@4 to gen_sintab::@5 [phi:gen_sintab::@4->gen_sintab::@5]
+  //SEG170 gen_sintab::@5
   //SEG171 [81] call subFACfromARG 
     jsr subFACfromARG
-  //SEG172 [82] phi from gen_sintab::@6 to gen_sintab::@7 [phi:gen_sintab::@6->gen_sintab::@7]
-  //SEG173 gen_sintab::@7
+  //SEG172 [82] phi from gen_sintab::@5 to gen_sintab::@6 [phi:gen_sintab::@5->gen_sintab::@6]
+  //SEG173 gen_sintab::@6
   //SEG174 [83] call setMEMtoFAC 
-  //SEG175 [158] phi from gen_sintab::@7 to setMEMtoFAC [phi:gen_sintab::@7->setMEMtoFAC]
-  //SEG176 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@7->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG175 [158] phi from gen_sintab::@6 to setMEMtoFAC [phi:gen_sintab::@6->setMEMtoFAC]
+  //SEG176 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@6->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta setMEMtoFAC.mem
     lda #>f_amp
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG177 [84] phi from gen_sintab::@7 to gen_sintab::@8 [phi:gen_sintab::@7->gen_sintab::@8]
-  //SEG178 gen_sintab::@8
+  //SEG177 [84] phi from gen_sintab::@6 to gen_sintab::@7 [phi:gen_sintab::@6->gen_sintab::@7]
+  //SEG178 gen_sintab::@7
   //SEG179 [85] call setFAC 
-  //SEG180 [153] phi from gen_sintab::@8 to setFAC [phi:gen_sintab::@8->setFAC]
-  //SEG181 [153] phi (word) setFAC::w#5 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:gen_sintab::@8->setFAC#0] -- vwuz1=vbuc1 
+  //SEG180 [153] phi from gen_sintab::@7 to setFAC [phi:gen_sintab::@7->setFAC]
+  //SEG181 [153] phi (word) setFAC::w#5 = (byte/signed byte/word/signed word/dword/signed dword) 2 [phi:gen_sintab::@7->setFAC#0] -- vwuz1=vbuc1 
     lda #2
     sta setFAC.w
     lda #0
     sta setFAC.w+1
     jsr setFAC
-  //SEG182 [86] phi from gen_sintab::@8 to gen_sintab::@9 [phi:gen_sintab::@8->gen_sintab::@9]
-  //SEG183 gen_sintab::@9
+  //SEG182 [86] phi from gen_sintab::@7 to gen_sintab::@8 [phi:gen_sintab::@7->gen_sintab::@8]
+  //SEG183 gen_sintab::@8
   //SEG184 [87] call divMEMbyFAC 
-  //SEG185 [148] phi from gen_sintab::@9 to divMEMbyFAC [phi:gen_sintab::@9->divMEMbyFAC]
-  //SEG186 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@9->divMEMbyFAC#0] -- pbuz1=pbuc1 
+  //SEG185 [148] phi from gen_sintab::@8 to divMEMbyFAC [phi:gen_sintab::@8->divMEMbyFAC]
+  //SEG186 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@8->divMEMbyFAC#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta divMEMbyFAC.mem
     lda #>f_amp
     sta divMEMbyFAC.mem+1
     jsr divMEMbyFAC
-  //SEG187 [88] phi from gen_sintab::@9 to gen_sintab::@10 [phi:gen_sintab::@9->gen_sintab::@10]
-  //SEG188 gen_sintab::@10
+  //SEG187 [88] phi from gen_sintab::@8 to gen_sintab::@9 [phi:gen_sintab::@8->gen_sintab::@9]
+  //SEG188 gen_sintab::@9
   //SEG189 [89] call setMEMtoFAC 
-  //SEG190 [158] phi from gen_sintab::@10 to setMEMtoFAC [phi:gen_sintab::@10->setMEMtoFAC]
-  //SEG191 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@10->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG190 [158] phi from gen_sintab::@9 to setMEMtoFAC [phi:gen_sintab::@9->setMEMtoFAC]
+  //SEG191 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@9->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta setMEMtoFAC.mem
     lda #>f_amp
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG192 [90] phi from gen_sintab::@10 to gen_sintab::@11 [phi:gen_sintab::@10->gen_sintab::@11]
-  //SEG193 gen_sintab::@11
+  //SEG192 [90] phi from gen_sintab::@9 to gen_sintab::@10 [phi:gen_sintab::@9->gen_sintab::@10]
+  //SEG193 gen_sintab::@10
   //SEG194 [91] call addMEMtoFAC 
-  //SEG195 [131] phi from gen_sintab::@11 to addMEMtoFAC [phi:gen_sintab::@11->addMEMtoFAC]
+  //SEG195 [131] phi from gen_sintab::@10 to addMEMtoFAC [phi:gen_sintab::@10->addMEMtoFAC]
     jsr addMEMtoFAC
-  //SEG196 [92] phi from gen_sintab::@11 to gen_sintab::@12 [phi:gen_sintab::@11->gen_sintab::@12]
-  //SEG197 gen_sintab::@12
+  //SEG196 [92] phi from gen_sintab::@10 to gen_sintab::@11 [phi:gen_sintab::@10->gen_sintab::@11]
+  //SEG197 gen_sintab::@11
   //SEG198 [93] call setMEMtoFAC 
-  //SEG199 [158] phi from gen_sintab::@12 to setMEMtoFAC [phi:gen_sintab::@12->setMEMtoFAC]
-  //SEG200 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@12->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG199 [158] phi from gen_sintab::@11 to setMEMtoFAC [phi:gen_sintab::@11->setMEMtoFAC]
+  //SEG200 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_min#0 [phi:gen_sintab::@11->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_min
     sta setMEMtoFAC.mem
     lda #>f_min
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG201 [94] phi from gen_sintab::@12 to gen_sintab::@1 [phi:gen_sintab::@12->gen_sintab::@1]
-  //SEG202 [94] phi (byte*) progress_cursor#34 = (byte*) progress_init::line#2 [phi:gen_sintab::@12->gen_sintab::@1#0] -- register_copy 
-  //SEG203 [94] phi (byte) progress_idx#34 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@12->gen_sintab::@1#1] -- vbuz1=vbuc1 
+  //SEG201 [94] phi from gen_sintab::@11 to gen_sintab::@1 [phi:gen_sintab::@11->gen_sintab::@1]
+  //SEG202 [94] phi (byte*) progress_cursor#34 = (byte*) progress_init::line#2 [phi:gen_sintab::@11->gen_sintab::@1#0] -- register_copy 
+  //SEG203 [94] phi (byte) progress_idx#34 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@11->gen_sintab::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta progress_idx
-  //SEG204 [94] phi (byte) gen_sintab::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@12->gen_sintab::@1#2] -- vbuz1=vbuc1 
+  //SEG204 [94] phi (byte) gen_sintab::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sintab::@11->gen_sintab::@1#2] -- vbuz1=vbuc1 
     sta i
   // f_min = min + (max - min) / 2
-  //SEG205 [94] phi from gen_sintab::@23 to gen_sintab::@1 [phi:gen_sintab::@23->gen_sintab::@1]
-  //SEG206 [94] phi (byte*) progress_cursor#34 = (byte*) progress_cursor#11 [phi:gen_sintab::@23->gen_sintab::@1#0] -- register_copy 
-  //SEG207 [94] phi (byte) progress_idx#34 = (byte) progress_idx#12 [phi:gen_sintab::@23->gen_sintab::@1#1] -- register_copy 
-  //SEG208 [94] phi (byte) gen_sintab::i#10 = (byte) gen_sintab::i#1 [phi:gen_sintab::@23->gen_sintab::@1#2] -- register_copy 
+  //SEG205 [94] phi from gen_sintab::@21 to gen_sintab::@1 [phi:gen_sintab::@21->gen_sintab::@1]
+  //SEG206 [94] phi (byte*) progress_cursor#34 = (byte*) progress_cursor#11 [phi:gen_sintab::@21->gen_sintab::@1#0] -- register_copy 
+  //SEG207 [94] phi (byte) progress_idx#34 = (byte) progress_idx#12 [phi:gen_sintab::@21->gen_sintab::@1#1] -- register_copy 
+  //SEG208 [94] phi (byte) gen_sintab::i#10 = (byte) gen_sintab::i#1 [phi:gen_sintab::@21->gen_sintab::@1#2] -- register_copy 
   //SEG209 gen_sintab::@1
   b1:
   //SEG210 [95] (word) setFAC::w#3 ← ((word)) (byte) gen_sintab::i#10 -- vwuz1=_word_vbuz2 
@@ -7868,71 +7906,71 @@ gen_sintab: {
   //SEG212 [153] phi from gen_sintab::@1 to setFAC [phi:gen_sintab::@1->setFAC]
   //SEG213 [153] phi (word) setFAC::w#5 = (word) setFAC::w#3 [phi:gen_sintab::@1->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG214 [97] phi from gen_sintab::@1 to gen_sintab::@14 [phi:gen_sintab::@1->gen_sintab::@14]
-  //SEG215 gen_sintab::@14
+  //SEG214 [97] phi from gen_sintab::@1 to gen_sintab::@12 [phi:gen_sintab::@1->gen_sintab::@12]
+  //SEG215 gen_sintab::@12
   //SEG216 [98] call mulFACbyMEM 
-  //SEG217 [141] phi from gen_sintab::@14 to mulFACbyMEM [phi:gen_sintab::@14->mulFACbyMEM]
-  //SEG218 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) gen_sintab::f_2pi#0 [phi:gen_sintab::@14->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG217 [141] phi from gen_sintab::@12 to mulFACbyMEM [phi:gen_sintab::@12->mulFACbyMEM]
+  //SEG218 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) gen_sintab::f_2pi#0 [phi:gen_sintab::@12->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_2pi
     sta mulFACbyMEM.mem
     lda #>f_2pi
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG219 [99] phi from gen_sintab::@14 to gen_sintab::@15 [phi:gen_sintab::@14->gen_sintab::@15]
-  //SEG220 gen_sintab::@15
+  //SEG219 [99] phi from gen_sintab::@12 to gen_sintab::@13 [phi:gen_sintab::@12->gen_sintab::@13]
+  //SEG220 gen_sintab::@13
   //SEG221 [100] call setMEMtoFAC 
-  //SEG222 [158] phi from gen_sintab::@15 to setMEMtoFAC [phi:gen_sintab::@15->setMEMtoFAC]
-  //SEG223 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@15->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG222 [158] phi from gen_sintab::@13 to setMEMtoFAC [phi:gen_sintab::@13->setMEMtoFAC]
+  //SEG223 [158] phi (byte*) setMEMtoFAC::mem#5 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@13->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_i
     sta setMEMtoFAC.mem
     lda #>f_i
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG224 gen_sintab::@16
+  //SEG224 gen_sintab::@14
   //SEG225 [101] (word) setFAC::w#4 ← ((word)) (byte) gen_sintab::length#10 -- vwuz1=_word_vbuz2 
     lda length
     sta setFAC.w
     lda #0
     sta setFAC.w+1
   //SEG226 [102] call setFAC 
-  //SEG227 [153] phi from gen_sintab::@16 to setFAC [phi:gen_sintab::@16->setFAC]
-  //SEG228 [153] phi (word) setFAC::w#5 = (word) setFAC::w#4 [phi:gen_sintab::@16->setFAC#0] -- register_copy 
+  //SEG227 [153] phi from gen_sintab::@14 to setFAC [phi:gen_sintab::@14->setFAC]
+  //SEG228 [153] phi (word) setFAC::w#5 = (word) setFAC::w#4 [phi:gen_sintab::@14->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG229 [103] phi from gen_sintab::@16 to gen_sintab::@17 [phi:gen_sintab::@16->gen_sintab::@17]
-  //SEG230 gen_sintab::@17
+  //SEG229 [103] phi from gen_sintab::@14 to gen_sintab::@15 [phi:gen_sintab::@14->gen_sintab::@15]
+  //SEG230 gen_sintab::@15
   //SEG231 [104] call divMEMbyFAC 
-  //SEG232 [148] phi from gen_sintab::@17 to divMEMbyFAC [phi:gen_sintab::@17->divMEMbyFAC]
-  //SEG233 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@17->divMEMbyFAC#0] -- pbuz1=pbuc1 
+  //SEG232 [148] phi from gen_sintab::@15 to divMEMbyFAC [phi:gen_sintab::@15->divMEMbyFAC]
+  //SEG233 [148] phi (byte*) divMEMbyFAC::mem#2 = (const byte[]) gen_sintab::f_i#0 [phi:gen_sintab::@15->divMEMbyFAC#0] -- pbuz1=pbuc1 
     lda #<f_i
     sta divMEMbyFAC.mem
     lda #>f_i
     sta divMEMbyFAC.mem+1
     jsr divMEMbyFAC
-  //SEG234 [105] phi from gen_sintab::@17 to gen_sintab::@18 [phi:gen_sintab::@17->gen_sintab::@18]
-  //SEG235 gen_sintab::@18
+  //SEG234 [105] phi from gen_sintab::@15 to gen_sintab::@16 [phi:gen_sintab::@15->gen_sintab::@16]
+  //SEG235 gen_sintab::@16
   //SEG236 [106] call sinFAC 
     jsr sinFAC
-  //SEG237 [107] phi from gen_sintab::@18 to gen_sintab::@19 [phi:gen_sintab::@18->gen_sintab::@19]
-  //SEG238 gen_sintab::@19
+  //SEG237 [107] phi from gen_sintab::@16 to gen_sintab::@17 [phi:gen_sintab::@16->gen_sintab::@17]
+  //SEG238 gen_sintab::@17
   //SEG239 [108] call mulFACbyMEM 
-  //SEG240 [141] phi from gen_sintab::@19 to mulFACbyMEM [phi:gen_sintab::@19->mulFACbyMEM]
-  //SEG241 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@19->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG240 [141] phi from gen_sintab::@17 to mulFACbyMEM [phi:gen_sintab::@17->mulFACbyMEM]
+  //SEG241 [141] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) gen_sintab::f_amp#0 [phi:gen_sintab::@17->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_amp
     sta mulFACbyMEM.mem
     lda #>f_amp
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG242 [109] phi from gen_sintab::@19 to gen_sintab::@20 [phi:gen_sintab::@19->gen_sintab::@20]
-  //SEG243 gen_sintab::@20
+  //SEG242 [109] phi from gen_sintab::@17 to gen_sintab::@18 [phi:gen_sintab::@17->gen_sintab::@18]
+  //SEG243 gen_sintab::@18
   //SEG244 [110] call addMEMtoFAC 
-  //SEG245 [131] phi from gen_sintab::@20 to addMEMtoFAC [phi:gen_sintab::@20->addMEMtoFAC]
+  //SEG245 [131] phi from gen_sintab::@18 to addMEMtoFAC [phi:gen_sintab::@18->addMEMtoFAC]
     jsr addMEMtoFAC
-  //SEG246 [111] phi from gen_sintab::@20 to gen_sintab::@21 [phi:gen_sintab::@20->gen_sintab::@21]
-  //SEG247 gen_sintab::@21
+  //SEG246 [111] phi from gen_sintab::@18 to gen_sintab::@19 [phi:gen_sintab::@18->gen_sintab::@19]
+  //SEG247 gen_sintab::@19
   //SEG248 [112] call getFAC 
     jsr getFAC
   //SEG249 [113] (word) getFAC::return#2 ← (word) getFAC::return#0
-  //SEG250 gen_sintab::@22
+  //SEG250 gen_sintab::@20
   //SEG251 [114] (word~) gen_sintab::$23 ← (word) getFAC::return#2
   //SEG252 [115] (byte~) gen_sintab::$24 ← ((byte)) (word~) gen_sintab::$23 -- vbuaa=_byte_vwuz1 
     lda _23
@@ -7942,7 +7980,7 @@ gen_sintab: {
     sta (sintab),y
   //SEG254 [117] call progress_inc 
     jsr progress_inc
-  //SEG255 gen_sintab::@23
+  //SEG255 gen_sintab::@21
   //SEG256 [118] (byte) gen_sintab::i#1 ← ++ (byte) gen_sintab::i#10 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG257 [119] if((byte) gen_sintab::i#1<(byte) gen_sintab::length#10) goto gen_sintab::@1 -- vbuz1_lt_vbuz2_then_la1 
@@ -8195,9 +8233,9 @@ gen_sprites: {
   //SEG350 [170] phi (byte) gen_sprites::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:gen_sprites->gen_sprites::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG351 [170] phi from gen_sprites::@3 to gen_sprites::@1 [phi:gen_sprites::@3->gen_sprites::@1]
-  //SEG352 [170] phi (byte*) gen_sprites::spr#2 = (byte*) gen_sprites::spr#1 [phi:gen_sprites::@3->gen_sprites::@1#0] -- register_copy 
-  //SEG353 [170] phi (byte) gen_sprites::i#2 = (byte) gen_sprites::i#1 [phi:gen_sprites::@3->gen_sprites::@1#1] -- register_copy 
+  //SEG351 [170] phi from gen_sprites::@2 to gen_sprites::@1 [phi:gen_sprites::@2->gen_sprites::@1]
+  //SEG352 [170] phi (byte*) gen_sprites::spr#2 = (byte*) gen_sprites::spr#1 [phi:gen_sprites::@2->gen_sprites::@1#0] -- register_copy 
+  //SEG353 [170] phi (byte) gen_sprites::i#2 = (byte) gen_sprites::i#1 [phi:gen_sprites::@2->gen_sprites::@1#1] -- register_copy 
   //SEG354 gen_sprites::@1
   b1:
   //SEG355 [171] (byte) gen_chargen_sprite::ch#0 ← *((const byte[]) gen_sprites::cml#0 + (byte) gen_sprites::i#2) -- vbuxx=pbuc1_derefidx_vbuz1 
@@ -8210,7 +8248,7 @@ gen_sprites: {
     sta gen_chargen_sprite.sprite+1
   //SEG357 [173] call gen_chargen_sprite 
     jsr gen_chargen_sprite
-  //SEG358 gen_sprites::@3
+  //SEG358 gen_sprites::@2
   //SEG359 [174] (byte*) gen_sprites::spr#1 ← (byte*) gen_sprites::spr#2 + (byte/signed byte/word/signed word/dword/signed dword) $40 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$40
     clc
diff --git a/src/test/ref/examples/sinsprites/sinus-sprites.sym b/src/test/ref/examples/sinsprites/sinus-sprites.sym
index 5f1e7ee58..6cf1451f4 100644
--- a/src/test/ref/examples/sinsprites/sinus-sprites.sym
+++ b/src/test/ref/examples/sinsprites/sinus-sprites.sym
@@ -1,4 +1,4 @@
-(label) @60
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -103,9 +103,9 @@
 (byte~) anim::$7 reg byte a 202.0
 (byte~) anim::$9 reg byte a 202.0
 (label) anim::@1
-(label) anim::@14
-(label) anim::@15
+(label) anim::@10
 (label) anim::@2
+(label) anim::@3
 (label) anim::@4
 (label) anim::@5
 (label) anim::@6
@@ -207,16 +207,16 @@
 (label) gen_sintab::@10
 (label) gen_sintab::@11
 (label) gen_sintab::@12
+(label) gen_sintab::@13
 (label) gen_sintab::@14
 (label) gen_sintab::@15
 (label) gen_sintab::@16
 (label) gen_sintab::@17
 (label) gen_sintab::@18
 (label) gen_sintab::@19
+(label) gen_sintab::@2
 (label) gen_sintab::@20
 (label) gen_sintab::@21
-(label) gen_sintab::@22
-(label) gen_sintab::@23
 (label) gen_sintab::@3
 (label) gen_sintab::@4
 (label) gen_sintab::@5
@@ -246,7 +246,7 @@
 (byte*) gen_sintab::sintab#12 sintab zp ZP_WORD:9 0.22448979591836735
 (void()) gen_sprites()
 (label) gen_sprites::@1
-(label) gen_sprites::@3
+(label) gen_sprites::@2
 (label) gen_sprites::@return
 (byte[]) gen_sprites::cml
 (const byte[]) gen_sprites::cml#0 cml = (string) "camelot"
@@ -265,19 +265,19 @@
 (void()) init()
 (label) init::@1
 (label) init::@2
+(label) init::@3
 (label) init::@4
 (label) init::@5
 (label) init::@6
 (label) init::@7
 (label) init::@8
-(label) init::@9
 (label) init::@return
 (byte) init::i
 (byte) init::i#1 reg byte x 16.5
 (byte) init::i#2 reg byte x 14.666666666666666
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@3
 (byte*) memHi
 (const byte*) memHi#0 memHi = ((byte*))(byte/word/signed word/dword/signed dword) $ff
 (byte*) memLo
diff --git a/src/test/ref/fillscreen.cfg b/src/test/ref/fillscreen.cfg
index 8a85583e3..b71ab06ea 100644
--- a/src/test/ref/fillscreen.cfg
+++ b/src/test/ref/fillscreen.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] (byte) main::c#0 ← *((const byte*) SCREEN#0)
   [5] (byte) fillscreen::c#0 ← (byte) main::c#0
   [6] call fillscreen 
diff --git a/src/test/ref/fillscreen.log b/src/test/ref/fillscreen.log
index dbf9cf5a7..e3c6edbb7 100644
--- a/src/test/ref/fillscreen.log
+++ b/src/test/ref/fillscreen.log
@@ -118,22 +118,23 @@ Created 1 initial phi equivalence classes
 Coalesced [17] fillscreen::j#3 ← fillscreen::j#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) fillscreen::@3
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of fillscreen
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] (byte) main::c#0 ← *((const byte*) SCREEN#0)
   [5] (byte) fillscreen::c#0 ← (byte) main::c#0
   [6] call fillscreen 
@@ -195,15 +196,15 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -299,15 +300,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -364,16 +365,16 @@ fillscreen: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
@@ -391,7 +392,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -431,10 +432,10 @@ Score: 307
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
diff --git a/src/test/ref/fillscreen.sym b/src/test/ref/fillscreen.sym
index 73668d23f..ea866108b 100644
--- a/src/test/ref/fillscreen.sym
+++ b/src/test/ref/fillscreen.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
diff --git a/src/test/ref/flipper-rex2.asm b/src/test/ref/flipper-rex2.asm
index 904c31d53..90df020a4 100644
--- a/src/test/ref/flipper-rex2.asm
+++ b/src/test/ref/flipper-rex2.asm
@@ -5,22 +5,22 @@
   .label SCREEN = $400
 main: {
     jsr prepare
-  b1:
-    ldx #$19
   b3:
+    ldx #$19
+  b1:
     lda #$fe
     cmp RASTER
-    bne b3
-  b5:
+    bne b1
+  b2:
     lda #$ff
     cmp RASTER
-    bne b5
+    bne b2
     dex
     cpx #0
-    bne b3
+    bne b1
     jsr flip
     jsr plot
-    jmp b1
+    jmp b3
 }
 // Plot buffer on screen
 plot: {
@@ -82,12 +82,12 @@ flip: {
     cmp #0
     bne b1
     ldx #0
-  b5:
+  b4:
     lda buffer2,x
     sta buffer1,x
     inx
     cpx #0
-    bne b5
+    bne b4
     rts
 }
 // Prepare buffer
diff --git a/src/test/ref/flipper-rex2.cfg b/src/test/ref/flipper-rex2.cfg
index 531f0a117..a98615870 100644
--- a/src/test/ref/flipper-rex2.cfg
+++ b/src/test/ref/flipper-rex2.cfg
@@ -1,36 +1,36 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @4
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @4
+main: scope:[main]  from @1
   [4] phi()
   [5] call prepare 
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@3 main::@5
+  [6] (byte) main::c#4 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $19 main::@3/(byte) main::c#1 main::@5/(byte/signed byte/word/signed word/dword/signed dword) $19 )
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
   to:main::@3
-main::@3: scope:[main]  from main main::@10 main::@3 main::@6
-  [6] (byte) main::c#4 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $19 main::@6/(byte) main::c#1 main::@10/(byte/signed byte/word/signed word/dword/signed dword) $19 )
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@3
-  to:main::@5
-main::@5: scope:[main]  from main::@3 main::@5
-  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@5
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+main::@3: scope:[main]  from main::@2
   [9] (byte) main::c#1 ← -- (byte) main::c#4
-  [10] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  [10] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [11] phi()
   [12] call flip 
-  to:main::@10
-main::@10: scope:[main]  from main::@7
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [13] phi()
   [14] call plot 
-  to:main::@3
-plot: scope:[plot]  from main::@10
+  to:main::@1
+plot: scope:[plot]  from main::@5
   [15] phi()
   to:plot::@1
 plot::@1: scope:[plot]  from plot plot::@3
@@ -54,7 +54,7 @@ plot::@3: scope:[plot]  from plot::@2
 plot::@return: scope:[plot]  from plot::@3
   [25] return 
   to:@return
-flip: scope:[flip]  from main::@7
+flip: scope:[flip]  from main::@4
   [26] phi()
   to:flip::@1
 flip::@1: scope:[flip]  from flip flip::@3
@@ -76,14 +76,14 @@ flip::@3: scope:[flip]  from flip::@2
   [34] (byte) flip::dstIdx#2 ← -- (byte) flip::dstIdx#1
   [35] (byte) flip::r#1 ← -- (byte) flip::r#4
   [36] if((byte) flip::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@1
-  to:flip::@5
-flip::@5: scope:[flip]  from flip::@3 flip::@5
-  [37] (byte) flip::i#2 ← phi( flip::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 flip::@5/(byte) flip::i#1 )
+  to:flip::@4
+flip::@4: scope:[flip]  from flip::@3 flip::@4
+  [37] (byte) flip::i#2 ← phi( flip::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 flip::@4/(byte) flip::i#1 )
   [38] *((const byte[$10*$10]) buffer1#0 + (byte) flip::i#2) ← *((const byte[$10*$10]) buffer2#0 + (byte) flip::i#2)
   [39] (byte) flip::i#1 ← ++ (byte) flip::i#2
-  [40] if((byte) flip::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@5
+  [40] if((byte) flip::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@4
   to:flip::@return
-flip::@return: scope:[flip]  from flip::@5
+flip::@return: scope:[flip]  from flip::@4
   [41] return 
   to:@return
 prepare: scope:[prepare]  from main
diff --git a/src/test/ref/flipper-rex2.log b/src/test/ref/flipper-rex2.log
index bc06368aa..6e7ef0725 100644
--- a/src/test/ref/flipper-rex2.log
+++ b/src/test/ref/flipper-rex2.log
@@ -420,12 +420,19 @@ Culled Empty Block (label) flip::@9
 Culled Empty Block (label) flip::@7
 Culled Empty Block (label) flip::@8
 Culled Empty Block (label) prepare::@3
+Renumbering block @4 to @1
+Renumbering block main::@3 to main::@1
+Renumbering block main::@5 to main::@2
+Renumbering block main::@6 to main::@3
+Renumbering block main::@7 to main::@4
+Renumbering block main::@10 to main::@5
+Renumbering block flip::@5 to flip::@4
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @4
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@7
-Adding NOP phi() at start of main::@10
+Adding NOP phi() at start of main::@4
+Adding NOP phi() at start of main::@5
 Adding NOP phi() at start of plot
 Adding NOP phi() at start of flip
 Adding NOP phi() at start of prepare
@@ -433,37 +440,37 @@ Adding NOP phi() at start of prepare
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @4
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @4
+main: scope:[main]  from @1
   [4] phi()
   [5] call prepare 
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@3 main::@5
+  [6] (byte) main::c#4 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $19 main::@3/(byte) main::c#1 main::@5/(byte/signed byte/word/signed word/dword/signed dword) $19 )
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
   to:main::@3
-main::@3: scope:[main]  from main main::@10 main::@3 main::@6
-  [6] (byte) main::c#4 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $19 main::@6/(byte) main::c#1 main::@10/(byte/signed byte/word/signed word/dword/signed dword) $19 )
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@3
-  to:main::@5
-main::@5: scope:[main]  from main::@3 main::@5
-  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@5
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+main::@3: scope:[main]  from main::@2
   [9] (byte) main::c#1 ← -- (byte) main::c#4
-  [10] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  [10] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [11] phi()
   [12] call flip 
-  to:main::@10
-main::@10: scope:[main]  from main::@7
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [13] phi()
   [14] call plot 
-  to:main::@3
-plot: scope:[plot]  from main::@10
+  to:main::@1
+plot: scope:[plot]  from main::@5
   [15] phi()
   to:plot::@1
 plot::@1: scope:[plot]  from plot plot::@3
@@ -487,7 +494,7 @@ plot::@3: scope:[plot]  from plot::@2
 plot::@return: scope:[plot]  from plot::@3
   [25] return 
   to:@return
-flip: scope:[flip]  from main::@7
+flip: scope:[flip]  from main::@4
   [26] phi()
   to:flip::@1
 flip::@1: scope:[flip]  from flip flip::@3
@@ -509,14 +516,14 @@ flip::@3: scope:[flip]  from flip::@2
   [34] (byte) flip::dstIdx#2 ← -- (byte) flip::dstIdx#1
   [35] (byte) flip::r#1 ← -- (byte) flip::r#4
   [36] if((byte) flip::r#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@1
-  to:flip::@5
-flip::@5: scope:[flip]  from flip::@3 flip::@5
-  [37] (byte) flip::i#2 ← phi( flip::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 flip::@5/(byte) flip::i#1 )
+  to:flip::@4
+flip::@4: scope:[flip]  from flip::@3 flip::@4
+  [37] (byte) flip::i#2 ← phi( flip::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 flip::@4/(byte) flip::i#1 )
   [38] *((const byte[$10*$10]) buffer1#0 + (byte) flip::i#2) ← *((const byte[$10*$10]) buffer2#0 + (byte) flip::i#2)
   [39] (byte) flip::i#1 ← ++ (byte) flip::i#2
-  [40] if((byte) flip::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@5
+  [40] if((byte) flip::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@4
   to:flip::@return
-flip::@return: scope:[flip]  from flip::@5
+flip::@return: scope:[flip]  from flip::@4
   [41] return 
   to:@return
 prepare: scope:[prepare]  from main
@@ -627,17 +634,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-b4_from_bbegin:
-  jmp b4
-//SEG5 @4
-b4:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @4 to main [phi:@4->main]
-main_from_b4:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @4 to @end [phi:@4->@end]
-bend_from_b4:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -648,61 +655,61 @@ main: {
   //SEG12 [42] phi from main to prepare [phi:main->prepare]
   prepare_from_main:
     jsr prepare
-  //SEG13 [6] phi from main main::@10 to main::@3 [phi:main/main::@10->main::@3]
-  b3_from_main:
-  b3_from_b10:
-  //SEG14 [6] phi (byte) main::c#4 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main/main::@10->main::@3#0] -- vbuz1=vbuc1 
+  //SEG13 [6] phi from main main::@5 to main::@1 [phi:main/main::@5->main::@1]
+  b1_from_main:
+  b1_from_b5:
+  //SEG14 [6] phi (byte) main::c#4 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main/main::@5->main::@1#0] -- vbuz1=vbuc1 
     lda #$19
     sta c
-    jmp b3
-  //SEG15 [6] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  b3_from_b3:
-    jmp b3
-  //SEG16 [6] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
-  b3_from_b6:
-  //SEG17 [6] phi (byte) main::c#4 = (byte) main::c#1 [phi:main::@6->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG18 main::@3
-  b3:
-  //SEG19 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG15 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG16 [6] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG17 [6] phi (byte) main::c#4 = (byte) main::c#1 [phi:main::@3->main::@1#0] -- register_copy 
+    jmp b1
+  //SEG18 main::@1
+  b1:
+  //SEG19 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b3_from_b3
-    jmp b5
-  //SEG20 main::@5
-  b5:
-  //SEG21 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@5 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1_from_b1
+    jmp b2
+  //SEG20 main::@2
+  b2:
+  //SEG21 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b5
-    jmp b6
-  //SEG22 main::@6
-  b6:
+    bne b2
+    jmp b3
+  //SEG22 main::@3
+  b3:
   //SEG23 [9] (byte) main::c#1 ← -- (byte) main::c#4 -- vbuz1=_dec_vbuz1 
     dec c
-  //SEG24 [10] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuz1_neq_0_then_la1 
+  //SEG24 [10] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuz1_neq_0_then_la1 
     lda c
     cmp #0
-    bne b3_from_b6
-  //SEG25 [11] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG26 main::@7
-  b7:
+    bne b1_from_b3
+  //SEG25 [11] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG26 main::@4
+  b4:
   //SEG27 [12] call flip 
-  //SEG28 [26] phi from main::@7 to flip [phi:main::@7->flip]
-  flip_from_b7:
+  //SEG28 [26] phi from main::@4 to flip [phi:main::@4->flip]
+  flip_from_b4:
     jsr flip
-  //SEG29 [13] phi from main::@7 to main::@10 [phi:main::@7->main::@10]
-  b10_from_b7:
-    jmp b10
-  //SEG30 main::@10
-  b10:
+  //SEG29 [13] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG30 main::@5
+  b5:
   //SEG31 [14] call plot 
-  //SEG32 [15] phi from main::@10 to plot [phi:main::@10->plot]
-  plot_from_b10:
+  //SEG32 [15] phi from main::@5 to plot [phi:main::@5->plot]
+  plot_from_b5:
     jsr plot
-    jmp b3_from_b10
+    jmp b1_from_b5
 }
 //SEG33 plot
 // Plot buffer on screen
@@ -855,28 +862,28 @@ flip: {
     lda r
     cmp #0
     bne b1_from_b3
-  //SEG88 [37] phi from flip::@3 to flip::@5 [phi:flip::@3->flip::@5]
-  b5_from_b3:
-  //SEG89 [37] phi (byte) flip::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:flip::@3->flip::@5#0] -- vbuz1=vbuc1 
+  //SEG88 [37] phi from flip::@3 to flip::@4 [phi:flip::@3->flip::@4]
+  b4_from_b3:
+  //SEG89 [37] phi (byte) flip::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:flip::@3->flip::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b5
-  //SEG90 [37] phi from flip::@5 to flip::@5 [phi:flip::@5->flip::@5]
-  b5_from_b5:
-  //SEG91 [37] phi (byte) flip::i#2 = (byte) flip::i#1 [phi:flip::@5->flip::@5#0] -- register_copy 
-    jmp b5
-  //SEG92 flip::@5
-  b5:
+    jmp b4
+  //SEG90 [37] phi from flip::@4 to flip::@4 [phi:flip::@4->flip::@4]
+  b4_from_b4:
+  //SEG91 [37] phi (byte) flip::i#2 = (byte) flip::i#1 [phi:flip::@4->flip::@4#0] -- register_copy 
+    jmp b4
+  //SEG92 flip::@4
+  b4:
   //SEG93 [38] *((const byte[$10*$10]) buffer1#0 + (byte) flip::i#2) ← *((const byte[$10*$10]) buffer2#0 + (byte) flip::i#2) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz1 
     ldy i
     lda buffer2,y
     sta buffer1,y
   //SEG94 [39] (byte) flip::i#1 ← ++ (byte) flip::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG95 [40] if((byte) flip::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@5 -- vbuz1_neq_0_then_la1 
+  //SEG95 [40] if((byte) flip::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@4 -- vbuz1_neq_0_then_la1 
     lda i
     cmp #0
-    bne b5_from_b5
+    bne b4_from_b4
     jmp breturn
   //SEG96 flip::@return
   breturn:
@@ -919,9 +926,9 @@ prepare: {
   buffer2: .fill $10*$10, 0
 
 REGISTER UPLIFT POTENTIAL REGISTERS
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@3 [ main::c#4 ] ( main:2 [ main::c#4 ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 [ main::c#4 ] ( main:2 [ main::c#4 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ main::c#4 main::c#1 ]
-Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@5 [ main::c#4 ] ( main:2 [ main::c#4 ] ) always clobbers reg byte a 
+Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ main::c#4 ] ( main:2 [ main::c#4 ] ) always clobbers reg byte a 
 Statement [18] *((byte*) plot::line#4 + (byte) plot::x#2) ← *((const byte[$10*$10]) buffer1#0 + (byte) plot::i#2) [ plot::line#4 plot::y#4 plot::i#2 plot::x#2 ] ( main:2::plot:14 [ plot::line#4 plot::y#4 plot::i#2 plot::x#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:5 [ plot::y#4 plot::y#1 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:6 [ plot::i#2 plot::i#3 plot::i#1 ]
@@ -935,8 +942,8 @@ Removing always clobbered register reg byte a as potential for zp ZP_BYTE:11 [ f
 Statement [31] (byte) flip::dstIdx#1 ← (byte) flip::dstIdx#3 + (byte/signed byte/word/signed word/dword/signed dword) $10 [ flip::r#4 flip::srcIdx#1 flip::c#2 flip::dstIdx#1 ] ( main:2::flip:12 [ flip::r#4 flip::srcIdx#1 flip::c#2 flip::dstIdx#1 ] ) always clobbers reg byte a 
 Statement [38] *((const byte[$10*$10]) buffer1#0 + (byte) flip::i#2) ← *((const byte[$10*$10]) buffer2#0 + (byte) flip::i#2) [ flip::i#2 ] ( main:2::flip:12 [ flip::i#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:12 [ flip::i#2 flip::i#1 ]
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@3 [ main::c#4 ] ( main:2 [ main::c#4 ] ) always clobbers reg byte a 
-Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@5 [ main::c#4 ] ( main:2 [ main::c#4 ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 [ main::c#4 ] ( main:2 [ main::c#4 ] ) always clobbers reg byte a 
+Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ main::c#4 ] ( main:2 [ main::c#4 ] ) always clobbers reg byte a 
 Statement [18] *((byte*) plot::line#4 + (byte) plot::x#2) ← *((const byte[$10*$10]) buffer1#0 + (byte) plot::i#2) [ plot::line#4 plot::y#4 plot::i#2 plot::x#2 ] ( main:2::plot:14 [ plot::line#4 plot::y#4 plot::i#2 plot::x#2 ] ) always clobbers reg byte a 
 Statement [22] (byte*) plot::line#1 ← (byte*) plot::line#4 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ plot::y#4 plot::i#1 plot::line#1 ] ( main:2::plot:14 [ plot::y#4 plot::i#1 plot::line#1 ] ) always clobbers reg byte a 
 Statement [29] *((const byte[$10*$10]) buffer2#0 + (byte) flip::dstIdx#3) ← *((const byte[$10*$10]) buffer1#0 + (byte) flip::srcIdx#2) [ flip::r#4 flip::srcIdx#2 flip::dstIdx#3 flip::c#2 ] ( main:2::flip:12 [ flip::r#4 flip::srcIdx#2 flip::dstIdx#3 flip::c#2 ] ) always clobbers reg byte a 
@@ -989,17 +996,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-b4_from_bbegin:
-  jmp b4
-//SEG5 @4
-b4:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @4 to main [phi:@4->main]
-main_from_b4:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @4 to @end [phi:@4->@end]
-bend_from_b4:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1009,59 +1016,59 @@ main: {
   //SEG12 [42] phi from main to prepare [phi:main->prepare]
   prepare_from_main:
     jsr prepare
-  //SEG13 [6] phi from main main::@10 to main::@3 [phi:main/main::@10->main::@3]
-  b3_from_main:
-  b3_from_b10:
-  //SEG14 [6] phi (byte) main::c#4 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main/main::@10->main::@3#0] -- vbuxx=vbuc1 
+  //SEG13 [6] phi from main main::@5 to main::@1 [phi:main/main::@5->main::@1]
+  b1_from_main:
+  b1_from_b5:
+  //SEG14 [6] phi (byte) main::c#4 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main/main::@5->main::@1#0] -- vbuxx=vbuc1 
     ldx #$19
-    jmp b3
-  //SEG15 [6] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  b3_from_b3:
-    jmp b3
-  //SEG16 [6] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
-  b3_from_b6:
-  //SEG17 [6] phi (byte) main::c#4 = (byte) main::c#1 [phi:main::@6->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG18 main::@3
-  b3:
-  //SEG19 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG15 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG16 [6] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG17 [6] phi (byte) main::c#4 = (byte) main::c#1 [phi:main::@3->main::@1#0] -- register_copy 
+    jmp b1
+  //SEG18 main::@1
+  b1:
+  //SEG19 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b3_from_b3
-    jmp b5
-  //SEG20 main::@5
-  b5:
-  //SEG21 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@5 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1_from_b1
+    jmp b2
+  //SEG20 main::@2
+  b2:
+  //SEG21 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b5
-    jmp b6
-  //SEG22 main::@6
-  b6:
+    bne b2
+    jmp b3
+  //SEG22 main::@3
+  b3:
   //SEG23 [9] (byte) main::c#1 ← -- (byte) main::c#4 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG24 [10] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuxx_neq_0_then_la1 
+  //SEG24 [10] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b3_from_b6
-  //SEG25 [11] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG26 main::@7
-  b7:
+    bne b1_from_b3
+  //SEG25 [11] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG26 main::@4
+  b4:
   //SEG27 [12] call flip 
-  //SEG28 [26] phi from main::@7 to flip [phi:main::@7->flip]
-  flip_from_b7:
+  //SEG28 [26] phi from main::@4 to flip [phi:main::@4->flip]
+  flip_from_b4:
     jsr flip
-  //SEG29 [13] phi from main::@7 to main::@10 [phi:main::@7->main::@10]
-  b10_from_b7:
-    jmp b10
-  //SEG30 main::@10
-  b10:
+  //SEG29 [13] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG30 main::@5
+  b5:
   //SEG31 [14] call plot 
-  //SEG32 [15] phi from main::@10 to plot [phi:main::@10->plot]
-  plot_from_b10:
+  //SEG32 [15] phi from main::@5 to plot [phi:main::@5->plot]
+  plot_from_b5:
     jsr plot
-    jmp b3_from_b10
+    jmp b1_from_b5
 }
 //SEG33 plot
 // Plot buffer on screen
@@ -1199,25 +1206,25 @@ flip: {
     lda r
     cmp #0
     bne b1_from_b3
-  //SEG88 [37] phi from flip::@3 to flip::@5 [phi:flip::@3->flip::@5]
-  b5_from_b3:
-  //SEG89 [37] phi (byte) flip::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:flip::@3->flip::@5#0] -- vbuxx=vbuc1 
+  //SEG88 [37] phi from flip::@3 to flip::@4 [phi:flip::@3->flip::@4]
+  b4_from_b3:
+  //SEG89 [37] phi (byte) flip::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:flip::@3->flip::@4#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b5
-  //SEG90 [37] phi from flip::@5 to flip::@5 [phi:flip::@5->flip::@5]
-  b5_from_b5:
-  //SEG91 [37] phi (byte) flip::i#2 = (byte) flip::i#1 [phi:flip::@5->flip::@5#0] -- register_copy 
-    jmp b5
-  //SEG92 flip::@5
-  b5:
+    jmp b4
+  //SEG90 [37] phi from flip::@4 to flip::@4 [phi:flip::@4->flip::@4]
+  b4_from_b4:
+  //SEG91 [37] phi (byte) flip::i#2 = (byte) flip::i#1 [phi:flip::@4->flip::@4#0] -- register_copy 
+    jmp b4
+  //SEG92 flip::@4
+  b4:
   //SEG93 [38] *((const byte[$10*$10]) buffer1#0 + (byte) flip::i#2) ← *((const byte[$10*$10]) buffer2#0 + (byte) flip::i#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda buffer2,x
     sta buffer1,x
   //SEG94 [39] (byte) flip::i#1 ← ++ (byte) flip::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG95 [40] if((byte) flip::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@5 -- vbuxx_neq_0_then_la1 
+  //SEG95 [40] if((byte) flip::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@4 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5_from_b5
+    bne b4_from_b4
     jmp breturn
   //SEG96 flip::@return
   breturn:
@@ -1256,13 +1263,13 @@ prepare: {
   buffer2: .fill $10*$10, 0
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b4
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b10
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
@@ -1270,48 +1277,48 @@ Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b3_from_b6 with b3
+Replacing label b1_from_b3 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
-Replacing label b5_from_b5 with b5
+Replacing label b4_from_b4 with b4
 Replacing label b1_from_b1 with b1
-Removing instruction b4_from_bbegin:
-Removing instruction b4:
-Removing instruction main_from_b4:
-Removing instruction bend_from_b4:
-Removing instruction b3_from_main:
-Removing instruction b3_from_b6:
-Removing instruction b7_from_b6:
-Removing instruction flip_from_b7:
-Removing instruction b10_from_b7:
-Removing instruction plot_from_b10:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_main:
+Removing instruction b1_from_b3:
+Removing instruction b4_from_b3:
+Removing instruction flip_from_b4:
+Removing instruction b5_from_b4:
+Removing instruction plot_from_b5:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
-Removing instruction b5_from_b5:
+Removing instruction b4_from_b4:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction prepare_from_main:
-Removing instruction b6:
-Removing instruction b7:
-Removing instruction b10:
+Removing instruction b3:
+Removing instruction b4:
+Removing instruction b5:
 Removing instruction b1_from_plot:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_flip:
 Removing instruction b3:
-Removing instruction b5_from_b3:
+Removing instruction b4_from_b3:
 Removing instruction breturn:
 Removing instruction b1_from_prepare:
 Removing instruction breturn:
@@ -1319,28 +1326,28 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b3 in bne b3_from_b3
+Skipping double jump to b1 in bne b1_from_b1
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b3_from_b10 to b1
-Relabelling long label b3_from_b3 to b2
+Relabelling long label b1_from_b5 to b3
+Relabelling long label b1_from_b1 to b4
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2:
+Removing instruction b4:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing instruction jmp b3
+Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 
 FINAL SYMBOL TABLE
-(label) @4
+(label) @1
 (label) @begin
 (label) @end
 (byte*) RASTER
@@ -1355,7 +1362,7 @@ FINAL SYMBOL TABLE
 (label) flip::@1
 (label) flip::@2
 (label) flip::@3
-(label) flip::@5
+(label) flip::@4
 (label) flip::@return
 (byte) flip::c
 (byte) flip::c#1 c zp ZP_BYTE:5 1501.5
@@ -1376,11 +1383,11 @@ FINAL SYMBOL TABLE
 (byte) flip::srcIdx#2 reg byte y 1552.0
 (byte) flip::srcIdx#3 reg byte y 202.0
 (void()) main()
-(label) main::@10
+(label) main::@1
+(label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@6
-(label) main::@7
 (byte) main::c
 (byte) main::c#1 reg byte x 151.5
 (byte) main::c#4 reg byte x 67.33333333333333
@@ -1433,53 +1440,53 @@ Score: 82694
   .label RASTER = $d012
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-//SEG5 @4
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @4 to main [phi:@4->main]
-//SEG8 [3] phi from @4 to @end [phi:@4->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] call prepare 
   //SEG12 [42] phi from main to prepare [phi:main->prepare]
     jsr prepare
-  //SEG13 [6] phi from main main::@10 to main::@3 [phi:main/main::@10->main::@3]
-  b1:
-  //SEG14 [6] phi (byte) main::c#4 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main/main::@10->main::@3#0] -- vbuxx=vbuc1 
-    ldx #$19
-  //SEG15 [6] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  //SEG16 [6] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
-  //SEG17 [6] phi (byte) main::c#4 = (byte) main::c#1 [phi:main::@6->main::@3#0] -- register_copy 
-  //SEG18 main::@3
+  //SEG13 [6] phi from main main::@5 to main::@1 [phi:main/main::@5->main::@1]
   b3:
-  //SEG19 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG14 [6] phi (byte) main::c#4 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main/main::@5->main::@1#0] -- vbuxx=vbuc1 
+    ldx #$19
+  //SEG15 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  //SEG16 [6] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  //SEG17 [6] phi (byte) main::c#4 = (byte) main::c#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG18 main::@1
+  b1:
+  //SEG19 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $fe) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$fe
     cmp RASTER
-    bne b3
-  //SEG20 main::@5
-  b5:
-  //SEG21 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@5 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1
+  //SEG20 main::@2
+  b2:
+  //SEG21 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b5
-  //SEG22 main::@6
+    bne b2
+  //SEG22 main::@3
   //SEG23 [9] (byte) main::c#1 ← -- (byte) main::c#4 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG24 [10] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuxx_neq_0_then_la1 
+  //SEG24 [10] if((byte) main::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b3
-  //SEG25 [11] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  //SEG26 main::@7
+    bne b1
+  //SEG25 [11] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG26 main::@4
   //SEG27 [12] call flip 
-  //SEG28 [26] phi from main::@7 to flip [phi:main::@7->flip]
+  //SEG28 [26] phi from main::@4 to flip [phi:main::@4->flip]
     jsr flip
-  //SEG29 [13] phi from main::@7 to main::@10 [phi:main::@7->main::@10]
-  //SEG30 main::@10
+  //SEG29 [13] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  //SEG30 main::@5
   //SEG31 [14] call plot 
-  //SEG32 [15] phi from main::@10 to plot [phi:main::@10->plot]
+  //SEG32 [15] phi from main::@5 to plot [phi:main::@5->plot]
     jsr plot
-    jmp b1
+    jmp b3
 }
 //SEG33 plot
 // Plot buffer on screen
@@ -1595,21 +1602,21 @@ flip: {
     lda r
     cmp #0
     bne b1
-  //SEG88 [37] phi from flip::@3 to flip::@5 [phi:flip::@3->flip::@5]
-  //SEG89 [37] phi (byte) flip::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:flip::@3->flip::@5#0] -- vbuxx=vbuc1 
+  //SEG88 [37] phi from flip::@3 to flip::@4 [phi:flip::@3->flip::@4]
+  //SEG89 [37] phi (byte) flip::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:flip::@3->flip::@4#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG90 [37] phi from flip::@5 to flip::@5 [phi:flip::@5->flip::@5]
-  //SEG91 [37] phi (byte) flip::i#2 = (byte) flip::i#1 [phi:flip::@5->flip::@5#0] -- register_copy 
-  //SEG92 flip::@5
-  b5:
+  //SEG90 [37] phi from flip::@4 to flip::@4 [phi:flip::@4->flip::@4]
+  //SEG91 [37] phi (byte) flip::i#2 = (byte) flip::i#1 [phi:flip::@4->flip::@4#0] -- register_copy 
+  //SEG92 flip::@4
+  b4:
   //SEG93 [38] *((const byte[$10*$10]) buffer1#0 + (byte) flip::i#2) ← *((const byte[$10*$10]) buffer2#0 + (byte) flip::i#2) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
     lda buffer2,x
     sta buffer1,x
   //SEG94 [39] (byte) flip::i#1 ← ++ (byte) flip::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG95 [40] if((byte) flip::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@5 -- vbuxx_neq_0_then_la1 
+  //SEG95 [40] if((byte) flip::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@4 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5
+    bne b4
   //SEG96 flip::@return
   //SEG97 [41] return 
     rts
diff --git a/src/test/ref/flipper-rex2.sym b/src/test/ref/flipper-rex2.sym
index 0e6edf6c1..8a522a18e 100644
--- a/src/test/ref/flipper-rex2.sym
+++ b/src/test/ref/flipper-rex2.sym
@@ -1,4 +1,4 @@
-(label) @4
+(label) @1
 (label) @begin
 (label) @end
 (byte*) RASTER
@@ -13,7 +13,7 @@
 (label) flip::@1
 (label) flip::@2
 (label) flip::@3
-(label) flip::@5
+(label) flip::@4
 (label) flip::@return
 (byte) flip::c
 (byte) flip::c#1 c zp ZP_BYTE:5 1501.5
@@ -34,11 +34,11 @@
 (byte) flip::srcIdx#2 reg byte y 1552.0
 (byte) flip::srcIdx#3 reg byte y 202.0
 (void()) main()
-(label) main::@10
+(label) main::@1
+(label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@6
-(label) main::@7
 (byte) main::c
 (byte) main::c#1 reg byte x 151.5
 (byte) main::c#4 reg byte x 67.33333333333333
diff --git a/src/test/ref/forrangedwords.asm b/src/test/ref/forrangedwords.asm
index 167916b11..8716f7084 100644
--- a/src/test/ref/forrangedwords.asm
+++ b/src/test/ref/forrangedwords.asm
@@ -25,7 +25,7 @@ main: {
     sta sw
     lda #>-$7fff
     sta sw+1
-  b3:
+  b2:
     lda sw
     sta SCREEN+3
     lda sw+1
@@ -36,9 +36,9 @@ main: {
   !:
     lda sw+1
     cmp #>$7fff
-    bne b3
+    bne b2
     lda sw
     cmp #<$7fff
-    bne b3
+    bne b2
     rts
 }
diff --git a/src/test/ref/forrangedwords.cfg b/src/test/ref/forrangedwords.cfg
index da57574cc..03404b8fc 100644
--- a/src/test/ref/forrangedwords.cfg
+++ b/src/test/ref/forrangedwords.cfg
@@ -18,16 +18,16 @@ main::@1: scope:[main]  from main main::@1
   [9] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte~) main::$1
   [10] (word) main::w#1 ← ++ (word) main::w#2
   [11] if((word) main::w#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@1 main::@3
-  [12] (signed word) main::sw#2 ← phi( main::@1/-(word/signed word/dword/signed dword) $7fff main::@3/(signed word) main::sw#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [12] (signed word) main::sw#2 ← phi( main::@1/-(word/signed word/dword/signed dword) $7fff main::@2/(signed word) main::sw#1 )
   [13] (byte~) main::$4 ← < (signed word) main::sw#2
   [14] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte~) main::$4
   [15] (byte~) main::$5 ← > (signed word) main::sw#2
   [16] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 4) ← (byte~) main::$5
   [17] (signed word) main::sw#1 ← ++ (signed word) main::sw#2
-  [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@3
+  [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [19] return 
   to:@return
diff --git a/src/test/ref/forrangedwords.log b/src/test/ref/forrangedwords.log
index 3b8742306..6d4abf0cf 100644
--- a/src/test/ref/forrangedwords.log
+++ b/src/test/ref/forrangedwords.log
@@ -112,6 +112,7 @@ Coalesced [21] main::w#3 ← main::w#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@6
 Culled Empty Block (label) main::@5
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -138,17 +139,17 @@ main::@1: scope:[main]  from main main::@1
   [9] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte~) main::$1
   [10] (word) main::w#1 ← ++ (word) main::w#2
   [11] if((word) main::w#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@1 main::@3
-  [12] (signed word) main::sw#2 ← phi( main::@1/-(word/signed word/dword/signed dword) $7fff main::@3/(signed word) main::sw#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [12] (signed word) main::sw#2 ← phi( main::@1/-(word/signed word/dword/signed dword) $7fff main::@2/(signed word) main::sw#1 )
   [13] (byte~) main::$4 ← < (signed word) main::sw#2
   [14] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte~) main::$4
   [15] (byte~) main::$5 ← > (signed word) main::sw#2
   [16] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 4) ← (byte~) main::$5
   [17] (signed word) main::sw#1 ← ++ (signed word) main::sw#2
-  [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@3
+  [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [19] return 
   to:@return
 
@@ -256,20 +257,20 @@ main: {
     bne b1_from_b1
     lda w+1
     bne b1_from_b1
-  //SEG22 [12] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
-  b3_from_b1:
-  //SEG23 [12] phi (signed word) main::sw#2 = -(word/signed word/dword/signed dword) $7fff [phi:main::@1->main::@3#0] -- vwsz1=vwsc1 
+  //SEG22 [12] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG23 [12] phi (signed word) main::sw#2 = -(word/signed word/dword/signed dword) $7fff [phi:main::@1->main::@2#0] -- vwsz1=vwsc1 
     lda #<-$7fff
     sta sw
     lda #>-$7fff
     sta sw+1
-    jmp b3
-  //SEG24 [12] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  b3_from_b3:
-  //SEG25 [12] phi (signed word) main::sw#2 = (signed word) main::sw#1 [phi:main::@3->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG26 main::@3
-  b3:
+    jmp b2
+  //SEG24 [12] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG25 [12] phi (signed word) main::sw#2 = (signed word) main::sw#1 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG26 main::@2
+  b2:
   //SEG27 [13] (byte~) main::$4 ← < (signed word) main::sw#2 -- vbuz1=_lo_vwsz2 
     lda sw
     sta _4
@@ -287,13 +288,13 @@ main: {
     bne !+
     inc sw+1
   !:
-  //SEG32 [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@3 -- vwsz1_neq_vwuc1_then_la1 
+  //SEG32 [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@2 -- vwsz1_neq_vwuc1_then_la1 
     lda sw+1
     cmp #>$7fff
-    bne b3_from_b3
+    bne b2_from_b2
     lda sw
     cmp #<$7fff
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG33 main::@return
   breturn:
@@ -307,7 +308,7 @@ Statement [8] (byte~) main::$1 ← > (word) main::w#2 [ main::w#2 main::$1 ] ( m
 Statement [11] if((word) main::w#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 [ main::w#1 ] ( main:2 [ main::w#1 ] ) always clobbers reg byte a 
 Statement [13] (byte~) main::$4 ← < (signed word) main::sw#2 [ main::sw#2 main::$4 ] ( main:2 [ main::sw#2 main::$4 ] ) always clobbers reg byte a 
 Statement [15] (byte~) main::$5 ← > (signed word) main::sw#2 [ main::sw#2 main::$5 ] ( main:2 [ main::sw#2 main::$5 ] ) always clobbers reg byte a 
-Statement [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@3 [ main::sw#1 ] ( main:2 [ main::sw#1 ] ) always clobbers reg byte a 
+Statement [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@2 [ main::sw#1 ] ( main:2 [ main::sw#1 ] ) always clobbers reg byte a 
 Potential registers zp ZP_WORD:2 [ main::w#2 main::w#1 ] : zp ZP_WORD:2 , 
 Potential registers zp ZP_WORD:4 [ main::sw#2 main::sw#1 ] : zp ZP_WORD:4 , 
 Potential registers zp ZP_BYTE:6 [ main::$0 ] : zp ZP_BYTE:6 , reg byte a , reg byte x , reg byte y , 
@@ -384,20 +385,20 @@ main: {
     bne b1_from_b1
     lda w+1
     bne b1_from_b1
-  //SEG22 [12] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
-  b3_from_b1:
-  //SEG23 [12] phi (signed word) main::sw#2 = -(word/signed word/dword/signed dword) $7fff [phi:main::@1->main::@3#0] -- vwsz1=vwsc1 
+  //SEG22 [12] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG23 [12] phi (signed word) main::sw#2 = -(word/signed word/dword/signed dword) $7fff [phi:main::@1->main::@2#0] -- vwsz1=vwsc1 
     lda #<-$7fff
     sta sw
     lda #>-$7fff
     sta sw+1
-    jmp b3
-  //SEG24 [12] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  b3_from_b3:
-  //SEG25 [12] phi (signed word) main::sw#2 = (signed word) main::sw#1 [phi:main::@3->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG26 main::@3
-  b3:
+    jmp b2
+  //SEG24 [12] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG25 [12] phi (signed word) main::sw#2 = (signed word) main::sw#1 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG26 main::@2
+  b2:
   //SEG27 [13] (byte~) main::$4 ← < (signed word) main::sw#2 -- vbuaa=_lo_vwsz1 
     lda sw
   //SEG28 [14] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte~) main::$4 -- _deref_pbuc1=vbuaa 
@@ -411,13 +412,13 @@ main: {
     bne !+
     inc sw+1
   !:
-  //SEG32 [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@3 -- vwsz1_neq_vwuc1_then_la1 
+  //SEG32 [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@2 -- vwsz1_neq_vwuc1_then_la1 
     lda sw+1
     cmp #>$7fff
-    bne b3_from_b3
+    bne b2_from_b2
     lda sw
     cmp #<$7fff
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG33 main::@return
   breturn:
@@ -429,32 +430,32 @@ ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Replacing label b3_from_b3 with b3
-Replacing label b3_from_b3 with b3
+Replacing label b2_from_b2 with b2
+Replacing label b2_from_b2 with b2
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
 Removing instruction b1_from_b1:
-Removing instruction b3_from_b3:
+Removing instruction b2_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b3_from_b1:
+Removing instruction b2_from_b1:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -469,7 +470,7 @@ FINAL SYMBOL TABLE
 (byte~) main::$4 reg byte a 22.0
 (byte~) main::$5 reg byte a 22.0
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte*) main::SCREEN
 (const byte*) main::SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
@@ -535,16 +536,16 @@ main: {
     bne b1
     lda w+1
     bne b1
-  //SEG22 [12] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
-  //SEG23 [12] phi (signed word) main::sw#2 = -(word/signed word/dword/signed dword) $7fff [phi:main::@1->main::@3#0] -- vwsz1=vwsc1 
+  //SEG22 [12] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG23 [12] phi (signed word) main::sw#2 = -(word/signed word/dword/signed dword) $7fff [phi:main::@1->main::@2#0] -- vwsz1=vwsc1 
     lda #<-$7fff
     sta sw
     lda #>-$7fff
     sta sw+1
-  //SEG24 [12] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  //SEG25 [12] phi (signed word) main::sw#2 = (signed word) main::sw#1 [phi:main::@3->main::@3#0] -- register_copy 
-  //SEG26 main::@3
-  b3:
+  //SEG24 [12] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  //SEG25 [12] phi (signed word) main::sw#2 = (signed word) main::sw#1 [phi:main::@2->main::@2#0] -- register_copy 
+  //SEG26 main::@2
+  b2:
   //SEG27 [13] (byte~) main::$4 ← < (signed word) main::sw#2 -- vbuaa=_lo_vwsz1 
     lda sw
   //SEG28 [14] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte~) main::$4 -- _deref_pbuc1=vbuaa 
@@ -558,13 +559,13 @@ main: {
     bne !+
     inc sw+1
   !:
-  //SEG32 [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@3 -- vwsz1_neq_vwuc1_then_la1 
+  //SEG32 [18] if((signed word) main::sw#1!=(word/signed word/dword/signed dword) $7fff) goto main::@2 -- vwsz1_neq_vwuc1_then_la1 
     lda sw+1
     cmp #>$7fff
-    bne b3
+    bne b2
     lda sw
     cmp #<$7fff
-    bne b3
+    bne b2
   //SEG33 main::@return
   //SEG34 [19] return 
     rts
diff --git a/src/test/ref/forrangedwords.sym b/src/test/ref/forrangedwords.sym
index 727034dc6..60c6cd9ab 100644
--- a/src/test/ref/forrangedwords.sym
+++ b/src/test/ref/forrangedwords.sym
@@ -7,7 +7,7 @@
 (byte~) main::$4 reg byte a 22.0
 (byte~) main::$5 reg byte a 22.0
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte*) main::SCREEN
 (const byte*) main::SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
diff --git a/src/test/ref/forrangemin.asm b/src/test/ref/forrangemin.asm
index c21bb0d97..b75516303 100644
--- a/src/test/ref/forrangemin.asm
+++ b/src/test/ref/forrangemin.asm
@@ -13,11 +13,11 @@ main: {
     cpx #0
     bne b1
     ldx #$64
-  b3:
+  b2:
     txa
     sta SCREEN2,x
     dex
     cpx #$ff
-    bne b3
+    bne b2
     rts
 }
diff --git a/src/test/ref/forrangemin.cfg b/src/test/ref/forrangemin.cfg
index 6ddebab41..9df3855dd 100644
--- a/src/test/ref/forrangemin.cfg
+++ b/src/test/ref/forrangemin.cfg
@@ -15,13 +15,13 @@ main::@1: scope:[main]  from main main::@1
   [6] *((const byte*) SCREEN1#0 + (byte) main::i#2) ← (byte) main::i#2
   [7] (byte) main::i#1 ← ++ (byte) main::i#2
   [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@1 main::@3
-  [9] (byte) main::j#3 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@3/(byte) main::j#2 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [9] (byte) main::j#3 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@2/(byte) main::j#2 )
   [10] *((const byte*) SCREEN2#0 + (byte) main::j#3) ← (byte) main::j#3
   [11] (byte) main::j#2 ← -- (byte) main::j#3
-  [12] if((byte) main::j#2!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3
+  [12] if((byte) main::j#2!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [13] return 
   to:@return
diff --git a/src/test/ref/forrangemin.log b/src/test/ref/forrangemin.log
index 817988fb4..ccd32e1b5 100644
--- a/src/test/ref/forrangemin.log
+++ b/src/test/ref/forrangemin.log
@@ -101,6 +101,7 @@ Coalesced [15] main::i#3 ← main::i#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@6
 Culled Empty Block (label) main::@5
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -124,14 +125,14 @@ main::@1: scope:[main]  from main main::@1
   [6] *((const byte*) SCREEN1#0 + (byte) main::i#2) ← (byte) main::i#2
   [7] (byte) main::i#1 ← ++ (byte) main::i#2
   [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@1 main::@3
-  [9] (byte) main::j#3 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@3/(byte) main::j#2 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [9] (byte) main::j#3 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@2/(byte) main::j#2 )
   [10] *((const byte*) SCREEN2#0 + (byte) main::j#3) ← (byte) main::j#3
   [11] (byte) main::j#2 ← -- (byte) main::j#3
-  [12] if((byte) main::j#2!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3
+  [12] if((byte) main::j#2!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [13] return 
   to:@return
 
@@ -208,28 +209,28 @@ main: {
     lda i
     cmp #0
     bne b1_from_b1
-  //SEG19 [9] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
-  b3_from_b1:
-  //SEG20 [9] phi (byte) main::j#3 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main::@1->main::@3#0] -- vbuz1=vbuc1 
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG20 [9] phi (byte) main::j#3 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
     lda #$64
     sta j
-    jmp b3
-  //SEG21 [9] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  b3_from_b3:
-  //SEG22 [9] phi (byte) main::j#3 = (byte) main::j#2 [phi:main::@3->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG23 main::@3
-  b3:
+    jmp b2
+  //SEG21 [9] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG22 [9] phi (byte) main::j#3 = (byte) main::j#2 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG23 main::@2
+  b2:
   //SEG24 [10] *((const byte*) SCREEN2#0 + (byte) main::j#3) ← (byte) main::j#3 -- pbuc1_derefidx_vbuz1=vbuz1 
     ldy j
     tya
     sta SCREEN2,y
   //SEG25 [11] (byte) main::j#2 ← -- (byte) main::j#3 -- vbuz1=_dec_vbuz1 
     dec j
-  //SEG26 [12] if((byte) main::j#2!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG26 [12] if((byte) main::j#2!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$ff
     cmp j
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG27 main::@return
   breturn:
@@ -295,25 +296,25 @@ main: {
   //SEG18 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1_from_b1
-  //SEG19 [9] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
-  b3_from_b1:
-  //SEG20 [9] phi (byte) main::j#3 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main::@1->main::@3#0] -- vbuxx=vbuc1 
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG20 [9] phi (byte) main::j#3 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main::@1->main::@2#0] -- vbuxx=vbuc1 
     ldx #$64
-    jmp b3
-  //SEG21 [9] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  b3_from_b3:
-  //SEG22 [9] phi (byte) main::j#3 = (byte) main::j#2 [phi:main::@3->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG23 main::@3
-  b3:
+    jmp b2
+  //SEG21 [9] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG22 [9] phi (byte) main::j#3 = (byte) main::j#2 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG23 main::@2
+  b2:
   //SEG24 [10] *((const byte*) SCREEN2#0 + (byte) main::j#3) ← (byte) main::j#3 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta SCREEN2,x
   //SEG25 [11] (byte) main::j#2 ← -- (byte) main::j#3 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG26 [12] if((byte) main::j#2!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG26 [12] if((byte) main::j#2!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$ff
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG27 main::@return
   breturn:
@@ -325,28 +326,28 @@ ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
-Replacing label b3_from_b3 with b3
+Replacing label b2_from_b2 with b2
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
 Removing instruction b1_from_b1:
-Removing instruction b3_from_b3:
+Removing instruction b2_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b3_from_b1:
+Removing instruction b2_from_b1:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -361,7 +362,7 @@ FINAL SYMBOL TABLE
 (const byte*) SCREEN2#0 SCREEN2 = ((byte*))(word/signed word/dword/signed dword) $500
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
@@ -410,21 +411,21 @@ main: {
   //SEG18 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1
-  //SEG19 [9] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
-  //SEG20 [9] phi (byte) main::j#3 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main::@1->main::@3#0] -- vbuxx=vbuc1 
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG20 [9] phi (byte) main::j#3 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main::@1->main::@2#0] -- vbuxx=vbuc1 
     ldx #$64
-  //SEG21 [9] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  //SEG22 [9] phi (byte) main::j#3 = (byte) main::j#2 [phi:main::@3->main::@3#0] -- register_copy 
-  //SEG23 main::@3
-  b3:
+  //SEG21 [9] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  //SEG22 [9] phi (byte) main::j#3 = (byte) main::j#2 [phi:main::@2->main::@2#0] -- register_copy 
+  //SEG23 main::@2
+  b2:
   //SEG24 [10] *((const byte*) SCREEN2#0 + (byte) main::j#3) ← (byte) main::j#3 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta SCREEN2,x
   //SEG25 [11] (byte) main::j#2 ← -- (byte) main::j#3 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG26 [12] if((byte) main::j#2!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG26 [12] if((byte) main::j#2!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$ff
-    bne b3
+    bne b2
   //SEG27 main::@return
   //SEG28 [13] return 
     rts
diff --git a/src/test/ref/forrangemin.sym b/src/test/ref/forrangemin.sym
index 96cf562cb..c75ee15eb 100644
--- a/src/test/ref/forrangemin.sym
+++ b/src/test/ref/forrangemin.sym
@@ -7,7 +7,7 @@
 (const byte*) SCREEN2#0 SCREEN2 = ((byte*))(word/signed word/dword/signed dword) $500
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
diff --git a/src/test/ref/fragment-synth.cfg b/src/test/ref/fragment-synth.cfg
index 4d0fd4faa..51f558edd 100644
--- a/src/test/ref/fragment-synth.cfg
+++ b/src/test/ref/fragment-synth.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *(((byte*))(word/signed word/dword/signed dword) $450+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte/word/signed word/dword/signed dword) $f0
   [5] *(((byte*))(word/signed word/dword/signed dword) $450+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed byte/word/signed word/dword/signed dword) $f
   [6] call fct 
diff --git a/src/test/ref/fragment-synth.log b/src/test/ref/fragment-synth.log
index e16e432b3..1a39a5419 100644
--- a/src/test/ref/fragment-synth.log
+++ b/src/test/ref/fragment-synth.log
@@ -154,21 +154,22 @@ Calls in [main] to fct:6 fct:10
 
 Created 2 initial phi equivalence classes
 Coalesced down to 2 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *(((byte*))(word/signed word/dword/signed dword) $450+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte/word/signed word/dword/signed dword) $f0
   [5] *(((byte*))(word/signed word/dword/signed dword) $450+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed byte/word/signed word/dword/signed dword) $f
   [6] call fct 
@@ -251,15 +252,15 @@ INITIAL ASM
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -377,15 +378,15 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -456,16 +457,16 @@ fct: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction fct_from_main:
@@ -482,7 +483,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte()) fct((byte) fct::x , (byte*) fct::z)
@@ -530,10 +531,10 @@ Score: 77
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
diff --git a/src/test/ref/fragment-synth.sym b/src/test/ref/fragment-synth.sym
index f72045951..6a998730d 100644
--- a/src/test/ref/fragment-synth.sym
+++ b/src/test/ref/fragment-synth.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte()) fct((byte) fct::x , (byte*) fct::z)
diff --git a/src/test/ref/helloworld2-inline.cfg b/src/test/ref/helloworld2-inline.cfg
index d643f8199..3a73c4312 100644
--- a/src/test/ref/helloworld2-inline.cfg
+++ b/src/test/ref/helloworld2-inline.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::print21
 main::print21: scope:[main]  from main
diff --git a/src/test/ref/helloworld2-inline.log b/src/test/ref/helloworld2-inline.log
index 1d3eae1b1..d030d4204 100644
--- a/src/test/ref/helloworld2-inline.log
+++ b/src/test/ref/helloworld2-inline.log
@@ -177,8 +177,9 @@ Coalesced [21] main::print21_j#3 ← main::print21_j#1
 Coalesced down to 4 phi equivalence classes
 Culled Empty Block (label) main::@4
 Culled Empty Block (label) main::@3
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::print21
@@ -187,14 +188,14 @@ Adding NOP phi() at start of main::print22
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::print21
 main::print21: scope:[main]  from main
@@ -272,17 +273,17 @@ INITIAL ASM
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -412,17 +413,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -500,7 +501,7 @@ main: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp print21
 Removing instruction jmp print21_b1
@@ -510,10 +511,10 @@ Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label print21_b1_from_print21_b1 with print21_b1
 Replacing label print22_b1_from_print22_b1 with print22_b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction print21_from_main:
 Removing instruction print21_b1_from_print21:
 Removing instruction print21_b1_from_print21_b1:
@@ -536,7 +537,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -586,11 +587,11 @@ Score: 576
 //SEG2 Global Constants & labels
   .label screen = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/helloworld2-inline.sym b/src/test/ref/helloworld2-inline.sym
index f586a85a2..7000bcc9b 100644
--- a/src/test/ref/helloworld2-inline.sym
+++ b/src/test/ref/helloworld2-inline.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/helloworld2.cfg b/src/test/ref/helloworld2.cfg
index d056d0c62..486573d95 100644
--- a/src/test/ref/helloworld2.cfg
+++ b/src/test/ref/helloworld2.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call print2 
   to:main::@1
diff --git a/src/test/ref/helloworld2.log b/src/test/ref/helloworld2.log
index 21f6a0dcb..82173beb9 100644
--- a/src/test/ref/helloworld2.log
+++ b/src/test/ref/helloworld2.log
@@ -141,8 +141,9 @@ Coalesced [16] print2::i#3 ← print2::i#1
 Coalesced [17] print2::j#3 ← print2::j#1
 Coalesced down to 3 phi equivalence classes
 Culled Empty Block (label) print2::@3
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -150,14 +151,14 @@ Adding NOP phi() at start of main::@1
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call print2 
   to:main::@1
@@ -221,17 +222,17 @@ INITIAL ASM
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -343,17 +344,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -427,7 +428,7 @@ print2: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -435,10 +436,10 @@ Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction print2_from_b1:
 Removing instruction b1_from_b1:
@@ -459,7 +460,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -498,11 +499,11 @@ Score: 339
 //SEG2 Global Constants & labels
   .label screen = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/helloworld2.sym b/src/test/ref/helloworld2.sym
index 1a82247f3..2ef32dfe5 100644
--- a/src/test/ref/helloworld2.sym
+++ b/src/test/ref/helloworld2.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/incrementinarray.asm b/src/test/ref/incrementinarray.asm
index 05d6208f0..8900c3d2f 100644
--- a/src/test/ref/incrementinarray.asm
+++ b/src/test/ref/incrementinarray.asm
@@ -23,9 +23,9 @@ main: {
     sta txt+1
     inx
     cpx #$b
-    bne b6
+    bne b4
     rts
-  b6:
+  b4:
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
diff --git a/src/test/ref/incrementinarray.cfg b/src/test/ref/incrementinarray.cfg
index 575ffea99..bb129048b 100644
--- a/src/test/ref/incrementinarray.cfg
+++ b/src/test/ref/incrementinarray.cfg
@@ -1,38 +1,38 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main main::@6
-  [6] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::i#1 )
-  [6] (byte*) print_line_cursor#19 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(byte*) print_line_cursor#1 )
-  [6] (byte*) print_char_cursor#25 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(byte*~) print_char_cursor#30 )
+main::@1: scope:[main]  from main main::@4
+  [6] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::i#1 )
+  [6] (byte*) print_line_cursor#19 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@4/(byte*) print_line_cursor#1 )
+  [6] (byte*) print_char_cursor#25 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@4/(byte*~) print_char_cursor#30 )
   [7] call print_str 
-  to:main::@4
-main::@4: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] phi()
   [9] call print_ln 
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [10] *((const byte[]) txt#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← ++ *((const byte[]) txt#0+(byte/signed byte/word/signed word/dword/signed dword) 1)
   [11] (byte) main::i#1 ← ++ (byte) main::i#2
-  [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6
+  [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@4
   to:main::@return
-main::@return: scope:[main]  from main::@5
+main::@return: scope:[main]  from main::@3
   [13] return 
   to:@return
-main::@6: scope:[main]  from main::@5
+main::@4: scope:[main]  from main::@3
   [14] (byte*~) print_char_cursor#30 ← (byte*) print_line_cursor#1
   to:main::@1
-print_ln: scope:[print_ln]  from main::@4
+print_ln: scope:[print_ln]  from main::@2
   [15] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
diff --git a/src/test/ref/incrementinarray.log b/src/test/ref/incrementinarray.log
index ec9acb6a5..e772e5a9a 100644
--- a/src/test/ref/incrementinarray.log
+++ b/src/test/ref/incrementinarray.log
@@ -366,11 +366,15 @@ Coalesced [38] print_cls::sc#3 ← print_cls::sc#1
 Coalesced down to 5 phi equivalence classes
 Culled Empty Block (label) print_ln::@3
 Culled Empty Block (label) print_cls::@3
+Renumbering block @20 to @1
+Renumbering block main::@4 to main::@2
+Renumbering block main::@5 to main::@3
+Renumbering block main::@6 to main::@4
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @20
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@4
+Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of print_ln
 Adding NOP phi() at start of print_str
 Adding NOP phi() at start of print_cls
@@ -378,39 +382,39 @@ Adding NOP phi() at start of print_cls
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main main::@6
-  [6] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::i#1 )
-  [6] (byte*) print_line_cursor#19 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(byte*) print_line_cursor#1 )
-  [6] (byte*) print_char_cursor#25 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(byte*~) print_char_cursor#30 )
+main::@1: scope:[main]  from main main::@4
+  [6] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::i#1 )
+  [6] (byte*) print_line_cursor#19 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@4/(byte*) print_line_cursor#1 )
+  [6] (byte*) print_char_cursor#25 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@4/(byte*~) print_char_cursor#30 )
   [7] call print_str 
-  to:main::@4
-main::@4: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] phi()
   [9] call print_ln 
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [10] *((const byte[]) txt#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← ++ *((const byte[]) txt#0+(byte/signed byte/word/signed word/dword/signed dword) 1)
   [11] (byte) main::i#1 ← ++ (byte) main::i#2
-  [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6
+  [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@4
   to:main::@return
-main::@return: scope:[main]  from main::@5
+main::@return: scope:[main]  from main::@3
   [13] return 
   to:@return
-main::@6: scope:[main]  from main::@5
+main::@4: scope:[main]  from main::@3
   [14] (byte*~) print_char_cursor#30 ← (byte*) print_line_cursor#1
   to:main::@1
-print_ln: scope:[print_ln]  from main::@4
+print_ln: scope:[print_ln]  from main::@2
   [15] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -507,17 +511,17 @@ INITIAL ASM
   .label print_line_cursor = 3
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -550,18 +554,18 @@ main: {
   //SEG19 [20] phi from main::@1 to print_str [phi:main::@1->print_str]
   print_str_from_b1:
     jsr print_str
-  //SEG20 [8] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  b4_from_b1:
-    jmp b4
-  //SEG21 main::@4
-  b4:
+  //SEG20 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [9] call print_ln 
-  //SEG23 [15] phi from main::@4 to print_ln [phi:main::@4->print_ln]
-  print_ln_from_b4:
+  //SEG23 [15] phi from main::@2 to print_ln [phi:main::@2->print_ln]
+  print_ln_from_b2:
     jsr print_ln
-    jmp b5
-  //SEG24 main::@5
-  b5:
+    jmp b3
+  //SEG24 main::@3
+  b3:
   //SEG25 [10] *((const byte[]) txt#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← ++ *((const byte[]) txt#0+(byte/signed byte/word/signed word/dword/signed dword) 1) -- _deref_pbuc1=_inc__deref_pbuc2 
     lda txt+1
     clc
@@ -569,27 +573,27 @@ main: {
     sta txt+1
   //SEG26 [11] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG27 [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG27 [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp i
-    bne b6
+    bne b4
     jmp breturn
   //SEG28 main::@return
   breturn:
   //SEG29 [13] return 
     rts
-  //SEG30 main::@6
-  b6:
+  //SEG30 main::@4
+  b4:
   //SEG31 [14] (byte*~) print_char_cursor#30 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG32 [6] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  b1_from_b6:
-  //SEG33 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#0] -- register_copy 
-  //SEG34 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@6->main::@1#1] -- register_copy 
-  //SEG35 [6] phi (byte*) print_char_cursor#25 = (byte*~) print_char_cursor#30 [phi:main::@6->main::@1#2] -- register_copy 
+  //SEG32 [6] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG33 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG34 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG35 [6] phi (byte*) print_char_cursor#25 = (byte*~) print_char_cursor#30 [phi:main::@4->main::@1#2] -- register_copy 
     jmp b1
 }
 //SEG36 print_ln
@@ -769,17 +773,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -810,18 +814,18 @@ main: {
   //SEG19 [20] phi from main::@1 to print_str [phi:main::@1->print_str]
   print_str_from_b1:
     jsr print_str
-  //SEG20 [8] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  b4_from_b1:
-    jmp b4
-  //SEG21 main::@4
-  b4:
+  //SEG20 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [9] call print_ln 
-  //SEG23 [15] phi from main::@4 to print_ln [phi:main::@4->print_ln]
-  print_ln_from_b4:
+  //SEG23 [15] phi from main::@2 to print_ln [phi:main::@2->print_ln]
+  print_ln_from_b2:
     jsr print_ln
-    jmp b5
-  //SEG24 main::@5
-  b5:
+    jmp b3
+  //SEG24 main::@3
+  b3:
   //SEG25 [10] *((const byte[]) txt#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← ++ *((const byte[]) txt#0+(byte/signed byte/word/signed word/dword/signed dword) 1) -- _deref_pbuc1=_inc__deref_pbuc2 
     lda txt+1
     clc
@@ -829,26 +833,26 @@ main: {
     sta txt+1
   //SEG26 [11] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG27 [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG27 [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b6
+    bne b4
     jmp breturn
   //SEG28 main::@return
   breturn:
   //SEG29 [13] return 
     rts
-  //SEG30 main::@6
-  b6:
+  //SEG30 main::@4
+  b4:
   //SEG31 [14] (byte*~) print_char_cursor#30 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG32 [6] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  b1_from_b6:
-  //SEG33 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#0] -- register_copy 
-  //SEG34 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@6->main::@1#1] -- register_copy 
-  //SEG35 [6] phi (byte*) print_char_cursor#25 = (byte*~) print_char_cursor#30 [phi:main::@6->main::@1#2] -- register_copy 
+  //SEG32 [6] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG33 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG34 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG35 [6] phi (byte*) print_char_cursor#25 = (byte*~) print_char_cursor#30 [phi:main::@4->main::@1#2] -- register_copy 
     jmp b1
 }
 //SEG36 print_ln
@@ -976,11 +980,11 @@ print_cls: {
   txt: .text "camelot@"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b20
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b4
-Removing instruction jmp b5
+Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -995,13 +999,13 @@ Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b20_from_bbegin:
-Removing instruction b20:
-Removing instruction main_from_b20:
-Removing instruction bend_from_b20:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction print_str_from_b1:
-Removing instruction b4_from_b1:
-Removing instruction print_ln_from_b4:
+Removing instruction b2_from_b1:
+Removing instruction print_ln_from_b2:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction b1_from_b1:
@@ -1009,10 +1013,10 @@ Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction print_cls_from_main:
 Removing instruction b1_from_main:
-Removing instruction b4:
-Removing instruction b5:
+Removing instruction b2:
+Removing instruction b3:
 Removing instruction breturn:
-Removing instruction b1_from_b6:
+Removing instruction b1_from_b4:
 Removing instruction breturn:
 Removing instruction b1_from_print_str:
 Removing instruction breturn:
@@ -1029,14 +1033,14 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
 (label) main::@1
+(label) main::@2
+(label) main::@3
 (label) main::@4
-(label) main::@5
-(label) main::@6
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 11.0
@@ -1089,11 +1093,11 @@ Score: 11122
   .label print_char_cursor = 6
   .label print_line_cursor = 2
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-//SEG5 @20
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -1118,12 +1122,12 @@ main: {
   //SEG18 [7] call print_str 
   //SEG19 [20] phi from main::@1 to print_str [phi:main::@1->print_str]
     jsr print_str
-  //SEG20 [8] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  //SEG21 main::@4
+  //SEG20 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG21 main::@2
   //SEG22 [9] call print_ln 
-  //SEG23 [15] phi from main::@4 to print_ln [phi:main::@4->print_ln]
+  //SEG23 [15] phi from main::@2 to print_ln [phi:main::@2->print_ln]
     jsr print_ln
-  //SEG24 main::@5
+  //SEG24 main::@3
   //SEG25 [10] *((const byte[]) txt#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← ++ *((const byte[]) txt#0+(byte/signed byte/word/signed word/dword/signed dword) 1) -- _deref_pbuc1=_inc__deref_pbuc2 
     lda txt+1
     clc
@@ -1131,23 +1135,23 @@ main: {
     sta txt+1
   //SEG26 [11] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG27 [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG27 [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b6
+    bne b4
   //SEG28 main::@return
   //SEG29 [13] return 
     rts
-  //SEG30 main::@6
-  b6:
+  //SEG30 main::@4
+  b4:
   //SEG31 [14] (byte*~) print_char_cursor#30 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG32 [6] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  //SEG33 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#0] -- register_copy 
-  //SEG34 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@6->main::@1#1] -- register_copy 
-  //SEG35 [6] phi (byte*) print_char_cursor#25 = (byte*~) print_char_cursor#30 [phi:main::@6->main::@1#2] -- register_copy 
+  //SEG32 [6] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  //SEG33 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG34 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@4->main::@1#1] -- register_copy 
+  //SEG35 [6] phi (byte*) print_char_cursor#25 = (byte*~) print_char_cursor#30 [phi:main::@4->main::@1#2] -- register_copy 
     jmp b1
 }
 //SEG36 print_ln
diff --git a/src/test/ref/incrementinarray.sym b/src/test/ref/incrementinarray.sym
index a8943f334..6eee4bc4a 100644
--- a/src/test/ref/incrementinarray.sym
+++ b/src/test/ref/incrementinarray.sym
@@ -1,11 +1,11 @@
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
 (label) main::@1
+(label) main::@2
+(label) main::@3
 (label) main::@4
-(label) main::@5
-(label) main::@6
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 11.0
diff --git a/src/test/ref/infloop-error.asm b/src/test/ref/infloop-error.asm
index 5b953bed7..e7258b9c4 100644
--- a/src/test/ref/infloop-error.asm
+++ b/src/test/ref/infloop-error.asm
@@ -12,14 +12,14 @@ main: {
     adc #1
     stx $ff
     cmp $ff
-    bcs b7
+    bcs b4
     tax
-  b7:
+  b4:
     sta $ff
     cpy $ff
-    bcs b8
+    bcs b5
     tay
-  b8:
+  b5:
     stx SCREEN
     sty SCREEN+1
     sta SCREEN+2
diff --git a/src/test/ref/infloop-error.cfg b/src/test/ref/infloop-error.cfg
index 7ae1c4cbf..5a3ed96c9 100644
--- a/src/test/ref/infloop-error.cfg
+++ b/src/test/ref/infloop-error.cfg
@@ -10,27 +10,27 @@
 main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@8
-  [5] (byte) main::max#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::max#3 )
-  [5] (byte) main::min#2 ← phi( main/(byte/word/signed word/dword/signed dword) $ff main::@8/(byte) main::min#3 )
-  [5] (byte) main::pos#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::pos#1 )
+main::@1: scope:[main]  from main main::@5
+  [5] (byte) main::max#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::max#3 )
+  [5] (byte) main::min#2 ← phi( main/(byte/word/signed word/dword/signed dword) $ff main::@5/(byte) main::min#3 )
+  [5] (byte) main::pos#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::pos#1 )
   to:main::@2
 main::@2: scope:[main]  from main::@1
   [6] (byte) main::pos#1 ← ++ (byte) main::pos#2
-  [7] if((byte) main::pos#1>=(byte) main::min#2) goto main::@7
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+  [7] if((byte) main::pos#1>=(byte) main::min#2) goto main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [8] (byte~) main::min#9 ← (byte) main::pos#1
-  to:main::@7
-main::@7: scope:[main]  from main::@2 main::@6
-  [9] (byte) main::min#3 ← phi( main::@2/(byte) main::min#2 main::@6/(byte~) main::min#9 )
-  [10] if((byte) main::pos#1<=(byte) main::max#2) goto main::@8
-  to:main::@9
-main::@9: scope:[main]  from main::@7
+  to:main::@4
+main::@4: scope:[main]  from main::@2 main::@3
+  [9] (byte) main::min#3 ← phi( main::@2/(byte) main::min#2 main::@3/(byte~) main::min#9 )
+  [10] if((byte) main::pos#1<=(byte) main::max#2) goto main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@4
   [11] (byte~) main::max#9 ← (byte) main::pos#1
-  to:main::@8
-main::@8: scope:[main]  from main::@7 main::@9
-  [12] (byte) main::max#3 ← phi( main::@7/(byte) main::max#2 main::@9/(byte~) main::max#9 )
+  to:main::@5
+main::@5: scope:[main]  from main::@4 main::@6
+  [12] (byte) main::max#3 ← phi( main::@4/(byte) main::max#2 main::@6/(byte~) main::max#9 )
   [13] *((const byte*) SCREEN#0) ← (byte) main::min#3
   [14] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) main::max#3
   [15] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte) main::pos#1
diff --git a/src/test/ref/infloop-error.log b/src/test/ref/infloop-error.log
index c4f92e597..43892ff56 100644
--- a/src/test/ref/infloop-error.log
+++ b/src/test/ref/infloop-error.log
@@ -170,6 +170,10 @@ Coalesced (already) [20] main::min#8 ← main::min#2
 Coalesced down to 3 phi equivalence classes
 Culled Empty Block (label) main::@12
 Culled Empty Block (label) main::@11
+Renumbering block main::@6 to main::@3
+Renumbering block main::@7 to main::@4
+Renumbering block main::@8 to main::@5
+Renumbering block main::@9 to main::@6
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -188,27 +192,27 @@ FINAL CONTROL FLOW GRAPH
 main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@8
-  [5] (byte) main::max#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::max#3 )
-  [5] (byte) main::min#2 ← phi( main/(byte/word/signed word/dword/signed dword) $ff main::@8/(byte) main::min#3 )
-  [5] (byte) main::pos#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::pos#1 )
+main::@1: scope:[main]  from main main::@5
+  [5] (byte) main::max#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::max#3 )
+  [5] (byte) main::min#2 ← phi( main/(byte/word/signed word/dword/signed dword) $ff main::@5/(byte) main::min#3 )
+  [5] (byte) main::pos#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::pos#1 )
   to:main::@2
 main::@2: scope:[main]  from main::@1
   [6] (byte) main::pos#1 ← ++ (byte) main::pos#2
-  [7] if((byte) main::pos#1>=(byte) main::min#2) goto main::@7
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+  [7] if((byte) main::pos#1>=(byte) main::min#2) goto main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [8] (byte~) main::min#9 ← (byte) main::pos#1
-  to:main::@7
-main::@7: scope:[main]  from main::@2 main::@6
-  [9] (byte) main::min#3 ← phi( main::@2/(byte) main::min#2 main::@6/(byte~) main::min#9 )
-  [10] if((byte) main::pos#1<=(byte) main::max#2) goto main::@8
-  to:main::@9
-main::@9: scope:[main]  from main::@7
+  to:main::@4
+main::@4: scope:[main]  from main::@2 main::@3
+  [9] (byte) main::min#3 ← phi( main::@2/(byte) main::min#2 main::@3/(byte~) main::min#9 )
+  [10] if((byte) main::pos#1<=(byte) main::max#2) goto main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@4
   [11] (byte~) main::max#9 ← (byte) main::pos#1
-  to:main::@8
-main::@8: scope:[main]  from main::@7 main::@9
-  [12] (byte) main::max#3 ← phi( main::@7/(byte) main::max#2 main::@9/(byte~) main::max#9 )
+  to:main::@5
+main::@5: scope:[main]  from main::@4 main::@6
+  [12] (byte) main::max#3 ← phi( main::@4/(byte) main::max#2 main::@6/(byte~) main::max#9 )
   [13] *((const byte*) SCREEN#0) ← (byte) main::min#3
   [14] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) main::max#3
   [15] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte) main::pos#1
@@ -291,40 +295,40 @@ main: {
   b2:
   //SEG17 [6] (byte) main::pos#1 ← ++ (byte) main::pos#2 -- vbuz1=_inc_vbuz1 
     inc pos
-  //SEG18 [7] if((byte) main::pos#1>=(byte) main::min#2) goto main::@7 -- vbuz1_ge_vbuz2_then_la1 
+  //SEG18 [7] if((byte) main::pos#1>=(byte) main::min#2) goto main::@4 -- vbuz1_ge_vbuz2_then_la1 
     lda pos
     cmp min
-    bcs b7_from_b2
-    jmp b6
-  //SEG19 main::@6
-  b6:
+    bcs b4_from_b2
+    jmp b3
+  //SEG19 main::@3
+  b3:
   //SEG20 [8] (byte~) main::min#9 ← (byte) main::pos#1 -- vbuz1=vbuz2 
     lda pos
     sta min
-  //SEG21 [9] phi from main::@2 main::@6 to main::@7 [phi:main::@2/main::@6->main::@7]
-  b7_from_b2:
-  b7_from_b6:
-  //SEG22 [9] phi (byte) main::min#3 = (byte) main::min#2 [phi:main::@2/main::@6->main::@7#0] -- register_copy 
-    jmp b7
-  //SEG23 main::@7
-  b7:
-  //SEG24 [10] if((byte) main::pos#1<=(byte) main::max#2) goto main::@8 -- vbuz1_le_vbuz2_then_la1 
+  //SEG21 [9] phi from main::@2 main::@3 to main::@4 [phi:main::@2/main::@3->main::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG22 [9] phi (byte) main::min#3 = (byte) main::min#2 [phi:main::@2/main::@3->main::@4#0] -- register_copy 
+    jmp b4
+  //SEG23 main::@4
+  b4:
+  //SEG24 [10] if((byte) main::pos#1<=(byte) main::max#2) goto main::@5 -- vbuz1_le_vbuz2_then_la1 
     lda max
     cmp pos
-    bcs b8_from_b7
-    jmp b9
-  //SEG25 main::@9
-  b9:
+    bcs b5_from_b4
+    jmp b6
+  //SEG25 main::@6
+  b6:
   //SEG26 [11] (byte~) main::max#9 ← (byte) main::pos#1 -- vbuz1=vbuz2 
     lda pos
     sta max
-  //SEG27 [12] phi from main::@7 main::@9 to main::@8 [phi:main::@7/main::@9->main::@8]
-  b8_from_b7:
-  b8_from_b9:
-  //SEG28 [12] phi (byte) main::max#3 = (byte) main::max#2 [phi:main::@7/main::@9->main::@8#0] -- register_copy 
-    jmp b8
-  //SEG29 main::@8
-  b8:
+  //SEG27 [12] phi from main::@4 main::@6 to main::@5 [phi:main::@4/main::@6->main::@5]
+  b5_from_b4:
+  b5_from_b6:
+  //SEG28 [12] phi (byte) main::max#3 = (byte) main::max#2 [phi:main::@4/main::@6->main::@5#0] -- register_copy 
+    jmp b5
+  //SEG29 main::@5
+  b5:
   //SEG30 [13] *((const byte*) SCREEN#0) ← (byte) main::min#3 -- _deref_pbuc1=vbuz1 
     lda min
     sta SCREEN
@@ -334,11 +338,11 @@ main: {
   //SEG32 [15] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte) main::pos#1 -- _deref_pbuc1=vbuz1 
     lda pos
     sta SCREEN+2
-  //SEG33 [5] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  b1_from_b8:
-  //SEG34 [5] phi (byte) main::max#2 = (byte) main::max#3 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG35 [5] phi (byte) main::min#2 = (byte) main::min#3 [phi:main::@8->main::@1#1] -- register_copy 
-  //SEG36 [5] phi (byte) main::pos#2 = (byte) main::pos#1 [phi:main::@8->main::@1#2] -- register_copy 
+  //SEG33 [5] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG34 [5] phi (byte) main::max#2 = (byte) main::max#3 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG35 [5] phi (byte) main::min#2 = (byte) main::min#3 [phi:main::@5->main::@1#1] -- register_copy 
+  //SEG36 [5] phi (byte) main::pos#2 = (byte) main::pos#1 [phi:main::@5->main::@1#2] -- register_copy 
     jmp b1
 }
 
@@ -398,49 +402,49 @@ main: {
   //SEG17 [6] (byte) main::pos#1 ← ++ (byte) main::pos#2 -- vbuaa=_inc_vbuaa 
     clc
     adc #1
-  //SEG18 [7] if((byte) main::pos#1>=(byte) main::min#2) goto main::@7 -- vbuaa_ge_vbuxx_then_la1 
+  //SEG18 [7] if((byte) main::pos#1>=(byte) main::min#2) goto main::@4 -- vbuaa_ge_vbuxx_then_la1 
     stx $ff
     cmp $ff
-    bcs b7_from_b2
-    jmp b6
-  //SEG19 main::@6
-  b6:
+    bcs b4_from_b2
+    jmp b3
+  //SEG19 main::@3
+  b3:
   //SEG20 [8] (byte~) main::min#9 ← (byte) main::pos#1 -- vbuxx=vbuaa 
     tax
-  //SEG21 [9] phi from main::@2 main::@6 to main::@7 [phi:main::@2/main::@6->main::@7]
-  b7_from_b2:
-  b7_from_b6:
-  //SEG22 [9] phi (byte) main::min#3 = (byte) main::min#2 [phi:main::@2/main::@6->main::@7#0] -- register_copy 
-    jmp b7
-  //SEG23 main::@7
-  b7:
-  //SEG24 [10] if((byte) main::pos#1<=(byte) main::max#2) goto main::@8 -- vbuaa_le_vbuyy_then_la1 
+  //SEG21 [9] phi from main::@2 main::@3 to main::@4 [phi:main::@2/main::@3->main::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG22 [9] phi (byte) main::min#3 = (byte) main::min#2 [phi:main::@2/main::@3->main::@4#0] -- register_copy 
+    jmp b4
+  //SEG23 main::@4
+  b4:
+  //SEG24 [10] if((byte) main::pos#1<=(byte) main::max#2) goto main::@5 -- vbuaa_le_vbuyy_then_la1 
     sta $ff
     cpy $ff
-    bcs b8_from_b7
-    jmp b9
-  //SEG25 main::@9
-  b9:
+    bcs b5_from_b4
+    jmp b6
+  //SEG25 main::@6
+  b6:
   //SEG26 [11] (byte~) main::max#9 ← (byte) main::pos#1 -- vbuyy=vbuaa 
     tay
-  //SEG27 [12] phi from main::@7 main::@9 to main::@8 [phi:main::@7/main::@9->main::@8]
-  b8_from_b7:
-  b8_from_b9:
-  //SEG28 [12] phi (byte) main::max#3 = (byte) main::max#2 [phi:main::@7/main::@9->main::@8#0] -- register_copy 
-    jmp b8
-  //SEG29 main::@8
-  b8:
+  //SEG27 [12] phi from main::@4 main::@6 to main::@5 [phi:main::@4/main::@6->main::@5]
+  b5_from_b4:
+  b5_from_b6:
+  //SEG28 [12] phi (byte) main::max#3 = (byte) main::max#2 [phi:main::@4/main::@6->main::@5#0] -- register_copy 
+    jmp b5
+  //SEG29 main::@5
+  b5:
   //SEG30 [13] *((const byte*) SCREEN#0) ← (byte) main::min#3 -- _deref_pbuc1=vbuxx 
     stx SCREEN
   //SEG31 [14] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) main::max#3 -- _deref_pbuc1=vbuyy 
     sty SCREEN+1
   //SEG32 [15] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte) main::pos#1 -- _deref_pbuc1=vbuaa 
     sta SCREEN+2
-  //SEG33 [5] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  b1_from_b8:
-  //SEG34 [5] phi (byte) main::max#2 = (byte) main::max#3 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG35 [5] phi (byte) main::min#2 = (byte) main::min#3 [phi:main::@8->main::@1#1] -- register_copy 
-  //SEG36 [5] phi (byte) main::pos#2 = (byte) main::pos#1 [phi:main::@8->main::@1#2] -- register_copy 
+  //SEG33 [5] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG34 [5] phi (byte) main::max#2 = (byte) main::max#3 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG35 [5] phi (byte) main::min#2 = (byte) main::min#3 [phi:main::@5->main::@1#1] -- register_copy 
+  //SEG36 [5] phi (byte) main::pos#2 = (byte) main::pos#1 [phi:main::@5->main::@1#2] -- register_copy 
     jmp b1
 }
 
@@ -449,30 +453,30 @@ Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b9
-Removing instruction jmp b8
+Removing instruction jmp b5
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing instruction lda #0 with TYA
-Replacing label b7_from_b2 with b7
-Replacing label b8_from_b7 with b8
+Replacing label b4_from_b2 with b4
+Replacing label b5_from_b4 with b5
 Replacing label b1 with b2
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
 Removing instruction b1:
-Removing instruction b7_from_b2:
-Removing instruction b7_from_b6:
-Removing instruction b8_from_b7:
-Removing instruction b8_from_b9:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
+Removing instruction b5_from_b4:
+Removing instruction b5_from_b6:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
+Removing instruction b3:
 Removing instruction b6:
-Removing instruction b9:
-Removing instruction b1_from_b8:
+Removing instruction b1_from_b5:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
@@ -489,10 +493,10 @@ FINAL SYMBOL TABLE
 (void()) main()
 (label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
-(label) main::@7
-(label) main::@8
-(label) main::@9
 (byte) main::max
 (byte) main::max#2 reg byte y 5.5
 (byte) main::max#3 reg byte y 11.0
@@ -543,38 +547,38 @@ main: {
   //SEG17 [6] (byte) main::pos#1 ← ++ (byte) main::pos#2 -- vbuaa=_inc_vbuaa 
     clc
     adc #1
-  //SEG18 [7] if((byte) main::pos#1>=(byte) main::min#2) goto main::@7 -- vbuaa_ge_vbuxx_then_la1 
+  //SEG18 [7] if((byte) main::pos#1>=(byte) main::min#2) goto main::@4 -- vbuaa_ge_vbuxx_then_la1 
     stx $ff
     cmp $ff
-    bcs b7
-  //SEG19 main::@6
+    bcs b4
+  //SEG19 main::@3
   //SEG20 [8] (byte~) main::min#9 ← (byte) main::pos#1 -- vbuxx=vbuaa 
     tax
-  //SEG21 [9] phi from main::@2 main::@6 to main::@7 [phi:main::@2/main::@6->main::@7]
-  //SEG22 [9] phi (byte) main::min#3 = (byte) main::min#2 [phi:main::@2/main::@6->main::@7#0] -- register_copy 
-  //SEG23 main::@7
-  b7:
-  //SEG24 [10] if((byte) main::pos#1<=(byte) main::max#2) goto main::@8 -- vbuaa_le_vbuyy_then_la1 
+  //SEG21 [9] phi from main::@2 main::@3 to main::@4 [phi:main::@2/main::@3->main::@4]
+  //SEG22 [9] phi (byte) main::min#3 = (byte) main::min#2 [phi:main::@2/main::@3->main::@4#0] -- register_copy 
+  //SEG23 main::@4
+  b4:
+  //SEG24 [10] if((byte) main::pos#1<=(byte) main::max#2) goto main::@5 -- vbuaa_le_vbuyy_then_la1 
     sta $ff
     cpy $ff
-    bcs b8
-  //SEG25 main::@9
+    bcs b5
+  //SEG25 main::@6
   //SEG26 [11] (byte~) main::max#9 ← (byte) main::pos#1 -- vbuyy=vbuaa 
     tay
-  //SEG27 [12] phi from main::@7 main::@9 to main::@8 [phi:main::@7/main::@9->main::@8]
-  //SEG28 [12] phi (byte) main::max#3 = (byte) main::max#2 [phi:main::@7/main::@9->main::@8#0] -- register_copy 
-  //SEG29 main::@8
-  b8:
+  //SEG27 [12] phi from main::@4 main::@6 to main::@5 [phi:main::@4/main::@6->main::@5]
+  //SEG28 [12] phi (byte) main::max#3 = (byte) main::max#2 [phi:main::@4/main::@6->main::@5#0] -- register_copy 
+  //SEG29 main::@5
+  b5:
   //SEG30 [13] *((const byte*) SCREEN#0) ← (byte) main::min#3 -- _deref_pbuc1=vbuxx 
     stx SCREEN
   //SEG31 [14] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte) main::max#3 -- _deref_pbuc1=vbuyy 
     sty SCREEN+1
   //SEG32 [15] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte) main::pos#1 -- _deref_pbuc1=vbuaa 
     sta SCREEN+2
-  //SEG33 [5] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  //SEG34 [5] phi (byte) main::max#2 = (byte) main::max#3 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG35 [5] phi (byte) main::min#2 = (byte) main::min#3 [phi:main::@8->main::@1#1] -- register_copy 
-  //SEG36 [5] phi (byte) main::pos#2 = (byte) main::pos#1 [phi:main::@8->main::@1#2] -- register_copy 
+  //SEG33 [5] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  //SEG34 [5] phi (byte) main::max#2 = (byte) main::max#3 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG35 [5] phi (byte) main::min#2 = (byte) main::min#3 [phi:main::@5->main::@1#1] -- register_copy 
+  //SEG36 [5] phi (byte) main::pos#2 = (byte) main::pos#1 [phi:main::@5->main::@1#2] -- register_copy 
     jmp b2
 }
 
diff --git a/src/test/ref/infloop-error.sym b/src/test/ref/infloop-error.sym
index fe70aa25f..92f6f4bc0 100644
--- a/src/test/ref/infloop-error.sym
+++ b/src/test/ref/infloop-error.sym
@@ -6,10 +6,10 @@
 (void()) main()
 (label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
-(label) main::@7
-(label) main::@8
-(label) main::@9
 (byte) main::max
 (byte) main::max#2 reg byte y 5.5
 (byte) main::max#3 reg byte y 11.0
diff --git a/src/test/ref/init-volatiles.cfg b/src/test/ref/init-volatiles.cfg
index 6118e05f5..18e7ae9ac 100644
--- a/src/test/ref/init-volatiles.cfg
+++ b/src/test/ref/init-volatiles.cfg
@@ -14,10 +14,10 @@ main::@1: scope:[main]  from main main::@1
   [5] (byte) x#5 ← phi( main/(byte) x#0 main::@1/(byte) x#1 )
   [6] (byte) x#1 ← ++ (byte) x#5
   [7] if((byte) x#1<(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] (byte) x#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [9] return 
   to:@return
diff --git a/src/test/ref/init-volatiles.log b/src/test/ref/init-volatiles.log
index db7c37b4d..f24c75c21 100644
--- a/src/test/ref/init-volatiles.log
+++ b/src/test/ref/init-volatiles.log
@@ -81,6 +81,7 @@ Coalesced [4] x#11 ← x#0
 Coalesced [10] x#12 ← x#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) main::@7
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
@@ -102,11 +103,11 @@ main::@1: scope:[main]  from main main::@1
   [5] (byte) x#5 ← phi( main/(byte) x#0 main::@1/(byte) x#1 )
   [6] (byte) x#1 ← ++ (byte) x#5
   [7] if((byte) x#1<(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] (byte) x#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [9] return 
   to:@return
 
@@ -172,9 +173,9 @@ main: {
     lda x
     cmp #$32
     bcc b1_from_b1
-    jmp b3
-  //SEG17 main::@3
-  b3:
+    jmp b2
+  //SEG17 main::@2
+  b2:
   //SEG18 [8] (byte) x#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta x_2
@@ -247,9 +248,9 @@ main: {
     lda x
     cmp #$32
     bcc b1_from_b1
-    jmp b3
-  //SEG17 main::@3
-  b3:
+    jmp b2
+  //SEG17 main::@2
+  b2:
   //SEG18 [8] (byte) x#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta x
@@ -264,7 +265,7 @@ ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
@@ -276,7 +277,7 @@ Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction b1:
 Removing instruction bend:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
@@ -286,7 +287,7 @@ FINAL SYMBOL TABLE
 (label) @end
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) x
 (byte) x#0 x zp ZP_BYTE:2 1.3333333333333333
@@ -332,7 +333,7 @@ main: {
     lda x
     cmp #$32
     bcc b1
-  //SEG17 main::@3
+  //SEG17 main::@2
   //SEG18 [8] (byte) x#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta x
diff --git a/src/test/ref/init-volatiles.sym b/src/test/ref/init-volatiles.sym
index debb64d69..86974fb51 100644
--- a/src/test/ref/init-volatiles.sym
+++ b/src/test/ref/init-volatiles.sym
@@ -3,7 +3,7 @@
 (label) @end
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) x
 (byte) x#0 x zp ZP_BYTE:2 1.3333333333333333
diff --git a/src/test/ref/inline-asm-clobber.asm b/src/test/ref/inline-asm-clobber.asm
index 25dc88f54..b6d763f49 100644
--- a/src/test/ref/inline-asm-clobber.asm
+++ b/src/test/ref/inline-asm-clobber.asm
@@ -20,10 +20,10 @@ main: {
     bne b1
     ldy #0
   // Then loop with clobbering A&X
-  b5:
+  b4:
     lda #0
     sta l
-  b6:
+  b5:
     eor #$55
     tax
     lda l
@@ -31,9 +31,9 @@ main: {
     inc l
     lda #$65
     cmp l
-    bne b6
+    bne b5
     iny
     cpy #$65
-    bne b5
+    bne b4
     rts
 }
diff --git a/src/test/ref/inline-asm-clobber.cfg b/src/test/ref/inline-asm-clobber.cfg
index 023857aaa..245cbe2f9 100644
--- a/src/test/ref/inline-asm-clobber.cfg
+++ b/src/test/ref/inline-asm-clobber.cfg
@@ -22,21 +22,21 @@ main::@2: scope:[main]  from main::@1 main::@2
 main::@3: scope:[main]  from main::@2
   [10] (byte) main::i#1 ← ++ (byte) main::i#4
   [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@6
+  [12] (byte) main::k#4 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::k#1 )
   to:main::@5
-main::@5: scope:[main]  from main::@3 main::@7
-  [12] (byte) main::k#4 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::k#1 )
-  to:main::@6
-main::@6: scope:[main]  from main::@5 main::@6
-  [13] (byte) main::l#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::l#1 )
+main::@5: scope:[main]  from main::@4 main::@5
+  [13] (byte) main::l#2 ← phi( main::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::l#1 )
   asm { eor#$55 tax  }
   [15] *((const byte*) SCREEN#0 + (byte) main::k#4) ← (byte) main::l#2
   [16] (byte) main::l#1 ← ++ (byte) main::l#2
-  [17] if((byte) main::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@6
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  [17] if((byte) main::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [18] (byte) main::k#1 ← ++ (byte) main::k#4
-  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@5
+  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@4
   to:main::@return
-main::@return: scope:[main]  from main::@7
+main::@return: scope:[main]  from main::@6
   [20] return 
   to:@return
diff --git a/src/test/ref/inline-asm-clobber.log b/src/test/ref/inline-asm-clobber.log
index 1b1ab8a62..29a6a6e5a 100644
--- a/src/test/ref/inline-asm-clobber.log
+++ b/src/test/ref/inline-asm-clobber.log
@@ -160,6 +160,9 @@ Culled Empty Block (label) main::@11
 Culled Empty Block (label) main::@12
 Culled Empty Block (label) main::@9
 Culled Empty Block (label) main::@10
+Renumbering block main::@5 to main::@4
+Renumbering block main::@6 to main::@5
+Renumbering block main::@7 to main::@6
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -190,22 +193,22 @@ main::@2: scope:[main]  from main::@1 main::@2
 main::@3: scope:[main]  from main::@2
   [10] (byte) main::i#1 ← ++ (byte) main::i#4
   [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@6
+  [12] (byte) main::k#4 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::k#1 )
   to:main::@5
-main::@5: scope:[main]  from main::@3 main::@7
-  [12] (byte) main::k#4 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::k#1 )
-  to:main::@6
-main::@6: scope:[main]  from main::@5 main::@6
-  [13] (byte) main::l#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::l#1 )
+main::@5: scope:[main]  from main::@4 main::@5
+  [13] (byte) main::l#2 ← phi( main::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::l#1 )
   asm { eor#$55 tax  }
   [15] *((const byte*) SCREEN#0 + (byte) main::k#4) ← (byte) main::l#2
   [16] (byte) main::l#1 ← ++ (byte) main::l#2
-  [17] if((byte) main::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@6
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  [17] if((byte) main::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [18] (byte) main::k#1 ← ++ (byte) main::k#4
-  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@5
+  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@4
   to:main::@return
-main::@return: scope:[main]  from main::@7
+main::@return: scope:[main]  from main::@6
   [20] return 
   to:@return
 
@@ -316,31 +319,31 @@ main: {
     lda #$65
     cmp i
     bne b1_from_b3
-  //SEG27 [12] phi from main::@3 to main::@5 [phi:main::@3->main::@5]
-  b5_from_b3:
-  //SEG28 [12] phi (byte) main::k#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@5#0] -- vbuz1=vbuc1 
+  //SEG27 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG28 [12] phi (byte) main::k#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta k
-    jmp b5
+    jmp b4
   // Then loop with clobbering A&X
-  //SEG29 [12] phi from main::@7 to main::@5 [phi:main::@7->main::@5]
-  b5_from_b7:
-  //SEG30 [12] phi (byte) main::k#4 = (byte) main::k#1 [phi:main::@7->main::@5#0] -- register_copy 
-    jmp b5
-  //SEG31 main::@5
-  b5:
-  //SEG32 [13] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  b6_from_b5:
-  //SEG33 [13] phi (byte) main::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@6#0] -- vbuz1=vbuc1 
+  //SEG29 [12] phi from main::@6 to main::@4 [phi:main::@6->main::@4]
+  b4_from_b6:
+  //SEG30 [12] phi (byte) main::k#4 = (byte) main::k#1 [phi:main::@6->main::@4#0] -- register_copy 
+    jmp b4
+  //SEG31 main::@4
+  b4:
+  //SEG32 [13] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+  //SEG33 [13] phi (byte) main::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta l
-    jmp b6
-  //SEG34 [13] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  b6_from_b6:
-  //SEG35 [13] phi (byte) main::l#2 = (byte) main::l#1 [phi:main::@6->main::@6#0] -- register_copy 
-    jmp b6
-  //SEG36 main::@6
-  b6:
+    jmp b5
+  //SEG34 [13] phi from main::@5 to main::@5 [phi:main::@5->main::@5]
+  b5_from_b5:
+  //SEG35 [13] phi (byte) main::l#2 = (byte) main::l#1 [phi:main::@5->main::@5#0] -- register_copy 
+    jmp b5
+  //SEG36 main::@5
+  b5:
   //SEG37 asm { eor#$55 tax  }
     eor #$55
     tax
@@ -350,19 +353,19 @@ main: {
     sta SCREEN,y
   //SEG39 [16] (byte) main::l#1 ← ++ (byte) main::l#2 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG40 [17] if((byte) main::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG40 [17] if((byte) main::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #$65
     cmp l
-    bne b6_from_b6
-    jmp b7
-  //SEG41 main::@7
-  b7:
+    bne b5_from_b5
+    jmp b6
+  //SEG41 main::@6
+  b6:
   //SEG42 [18] (byte) main::k#1 ← ++ (byte) main::k#4 -- vbuz1=_inc_vbuz1 
     inc k
-  //SEG43 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG43 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #$65
     cmp k
-    bne b5_from_b7
+    bne b4_from_b6
     jmp breturn
   //SEG44 main::@return
   breturn:
@@ -461,30 +464,30 @@ main: {
   //SEG26 [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$65
     bne b1_from_b3
-  //SEG27 [12] phi from main::@3 to main::@5 [phi:main::@3->main::@5]
-  b5_from_b3:
-  //SEG28 [12] phi (byte) main::k#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@5#0] -- vbuyy=vbuc1 
+  //SEG27 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG28 [12] phi (byte) main::k#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuyy=vbuc1 
     ldy #0
-    jmp b5
+    jmp b4
   // Then loop with clobbering A&X
-  //SEG29 [12] phi from main::@7 to main::@5 [phi:main::@7->main::@5]
-  b5_from_b7:
-  //SEG30 [12] phi (byte) main::k#4 = (byte) main::k#1 [phi:main::@7->main::@5#0] -- register_copy 
-    jmp b5
-  //SEG31 main::@5
-  b5:
-  //SEG32 [13] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  b6_from_b5:
-  //SEG33 [13] phi (byte) main::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@6#0] -- vbuz1=vbuc1 
+  //SEG29 [12] phi from main::@6 to main::@4 [phi:main::@6->main::@4]
+  b4_from_b6:
+  //SEG30 [12] phi (byte) main::k#4 = (byte) main::k#1 [phi:main::@6->main::@4#0] -- register_copy 
+    jmp b4
+  //SEG31 main::@4
+  b4:
+  //SEG32 [13] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+  //SEG33 [13] phi (byte) main::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta l
-    jmp b6
-  //SEG34 [13] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  b6_from_b6:
-  //SEG35 [13] phi (byte) main::l#2 = (byte) main::l#1 [phi:main::@6->main::@6#0] -- register_copy 
-    jmp b6
-  //SEG36 main::@6
-  b6:
+    jmp b5
+  //SEG34 [13] phi from main::@5 to main::@5 [phi:main::@5->main::@5]
+  b5_from_b5:
+  //SEG35 [13] phi (byte) main::l#2 = (byte) main::l#1 [phi:main::@5->main::@5#0] -- register_copy 
+    jmp b5
+  //SEG36 main::@5
+  b5:
   //SEG37 asm { eor#$55 tax  }
     eor #$55
     tax
@@ -493,18 +496,18 @@ main: {
     sta SCREEN,y
   //SEG39 [16] (byte) main::l#1 ← ++ (byte) main::l#2 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG40 [17] if((byte) main::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG40 [17] if((byte) main::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #$65
     cmp l
-    bne b6_from_b6
-    jmp b7
-  //SEG41 main::@7
-  b7:
+    bne b5_from_b5
+    jmp b6
+  //SEG41 main::@6
+  b6:
   //SEG42 [18] (byte) main::k#1 ← ++ (byte) main::k#4 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG43 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@5 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG43 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@4 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$65
-    bne b5_from_b7
+    bne b4_from_b6
     jmp breturn
   //SEG44 main::@return
   breturn:
@@ -518,15 +521,15 @@ Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp b6
-Removing instruction jmp b7
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
-Replacing label b6_from_b6 with b6
-Replacing label b5_from_b7 with b5
+Replacing label b5_from_b5 with b5
+Replacing label b4_from_b6 with b4
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
@@ -534,15 +537,15 @@ Removing instruction bend_from_b1:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
-Removing instruction b5_from_b7:
-Removing instruction b6_from_b5:
-Removing instruction b6_from_b6:
+Removing instruction b4_from_b6:
+Removing instruction b5_from_b4:
+Removing instruction b5_from_b5:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
 Removing instruction b3:
-Removing instruction b5_from_b3:
-Removing instruction b7:
+Removing instruction b4_from_b3:
+Removing instruction b6:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
@@ -550,8 +553,8 @@ Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Removing instruction jmp b1
 Removing instruction jmp b2
+Removing instruction jmp b4
 Removing instruction jmp b5
-Removing instruction jmp b6
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -566,9 +569,9 @@ FINAL SYMBOL TABLE
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
 (label) main::@6
-(label) main::@7
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
@@ -639,22 +642,22 @@ main: {
   //SEG26 [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$65
     bne b1
-  //SEG27 [12] phi from main::@3 to main::@5 [phi:main::@3->main::@5]
-  //SEG28 [12] phi (byte) main::k#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@5#0] -- vbuyy=vbuc1 
+  //SEG27 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG28 [12] phi (byte) main::k#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuyy=vbuc1 
     ldy #0
   // Then loop with clobbering A&X
-  //SEG29 [12] phi from main::@7 to main::@5 [phi:main::@7->main::@5]
-  //SEG30 [12] phi (byte) main::k#4 = (byte) main::k#1 [phi:main::@7->main::@5#0] -- register_copy 
-  //SEG31 main::@5
-  b5:
-  //SEG32 [13] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  //SEG33 [13] phi (byte) main::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@6#0] -- vbuz1=vbuc1 
+  //SEG29 [12] phi from main::@6 to main::@4 [phi:main::@6->main::@4]
+  //SEG30 [12] phi (byte) main::k#4 = (byte) main::k#1 [phi:main::@6->main::@4#0] -- register_copy 
+  //SEG31 main::@4
+  b4:
+  //SEG32 [13] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  //SEG33 [13] phi (byte) main::l#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta l
-  //SEG34 [13] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  //SEG35 [13] phi (byte) main::l#2 = (byte) main::l#1 [phi:main::@6->main::@6#0] -- register_copy 
-  //SEG36 main::@6
-  b6:
+  //SEG34 [13] phi from main::@5 to main::@5 [phi:main::@5->main::@5]
+  //SEG35 [13] phi (byte) main::l#2 = (byte) main::l#1 [phi:main::@5->main::@5#0] -- register_copy 
+  //SEG36 main::@5
+  b5:
   //SEG37 asm { eor#$55 tax  }
     eor #$55
     tax
@@ -663,16 +666,16 @@ main: {
     sta SCREEN,y
   //SEG39 [16] (byte) main::l#1 ← ++ (byte) main::l#2 -- vbuz1=_inc_vbuz1 
     inc l
-  //SEG40 [17] if((byte) main::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG40 [17] if((byte) main::l#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #$65
     cmp l
-    bne b6
-  //SEG41 main::@7
+    bne b5
+  //SEG41 main::@6
   //SEG42 [18] (byte) main::k#1 ← ++ (byte) main::k#4 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG43 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@5 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG43 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@4 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$65
-    bne b5
+    bne b4
   //SEG44 main::@return
   //SEG45 [20] return 
     rts
diff --git a/src/test/ref/inline-asm-clobber.sym b/src/test/ref/inline-asm-clobber.sym
index 3d834abc7..353c429f5 100644
--- a/src/test/ref/inline-asm-clobber.sym
+++ b/src/test/ref/inline-asm-clobber.sym
@@ -7,9 +7,9 @@
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
 (label) main::@6
-(label) main::@7
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
diff --git a/src/test/ref/inline-asm-ref-scoped.cfg b/src/test/ref/inline-asm-ref-scoped.cfg
index d33d0cb6e..427210930 100644
--- a/src/test/ref/inline-asm-ref-scoped.cfg
+++ b/src/test/ref/inline-asm-ref-scoped.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { lda#'c' stasub.ll+1  }
   [5] call sub 
   to:main::@return
diff --git a/src/test/ref/inline-asm-ref-scoped.log b/src/test/ref/inline-asm-ref-scoped.log
index 12265bd26..d94fe45e6 100644
--- a/src/test/ref/inline-asm-ref-scoped.log
+++ b/src/test/ref/inline-asm-ref-scoped.log
@@ -47,21 +47,22 @@ Calls in [main] to sub:5
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { lda#'c' stasub.ll+1  }
   [5] call sub 
   to:main::@return
@@ -93,15 +94,15 @@ INITIAL ASM
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -154,15 +155,15 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -193,14 +194,14 @@ sub: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction breturn:
@@ -213,7 +214,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -234,10 +235,10 @@ Score: 30
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
diff --git a/src/test/ref/inline-asm-ref-scoped.sym b/src/test/ref/inline-asm-ref-scoped.sym
index 7ba189bb0..24ed4f685 100644
--- a/src/test/ref/inline-asm-ref-scoped.sym
+++ b/src/test/ref/inline-asm-ref-scoped.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/inline-function-if.cfg b/src/test/ref/inline-function-if.cfg
index 616c7df28..b09d9c480 100644
--- a/src/test/ref/inline-function-if.cfg
+++ b/src/test/ref/inline-function-if.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::toUpper1
 main::toUpper1: scope:[main]  from main
diff --git a/src/test/ref/inline-function-if.log b/src/test/ref/inline-function-if.log
index 3cfbaa3c4..becd34620 100644
--- a/src/test/ref/inline-function-if.log
+++ b/src/test/ref/inline-function-if.log
@@ -184,8 +184,9 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::toUpper1
@@ -194,14 +195,14 @@ Adding NOP phi() at start of main::toUpper2
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::toUpper1
 main::toUpper1: scope:[main]  from main
@@ -249,17 +250,17 @@ INITIAL ASM
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -319,17 +320,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -368,7 +369,7 @@ main: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp toUpper1
 Removing instruction jmp b1
@@ -376,10 +377,10 @@ Removing instruction jmp toUpper2
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction toUpper1_from_main:
 Removing instruction toUpper1:
 Removing instruction toUpper2_from_b1:
@@ -397,7 +398,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -436,11 +437,11 @@ Score: 18
 //SEG2 Global Constants & labels
   .label screen = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/inline-function-if.sym b/src/test/ref/inline-function-if.sym
index 882ad1369..bf3634bd6 100644
--- a/src/test/ref/inline-function-if.sym
+++ b/src/test/ref/inline-function-if.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/inline-function-level2.cfg b/src/test/ref/inline-function-level2.cfg
index 7a51a978c..b9e696f2e 100644
--- a/src/test/ref/inline-function-level2.cfg
+++ b/src/test/ref/inline-function-level2.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@1
@@ -19,41 +19,41 @@ main::@1: scope:[main]  from main main::@1
 main::line1: scope:[main]  from main::@1
   [9] phi()
   to:main::line1_@1
-main::line1_@1: scope:[main]  from main::@4 main::line1
-  [10] (byte) main::line1_i#2 ← phi( main::@4/(byte) main::line1_i#1 main::line1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [10] (byte*) cur_line#13 ← phi( main::@4/(byte*) cur_line#1 main::line1/((byte*))(word/signed word/dword/signed dword) $400 )
-  [10] (word) main::line1_pos#2 ← phi( main::@4/(word) main::line1_pos#1 main::line1/(const byte) main::line1_xpos#0*(word/signed word/dword/signed dword) $100 )
+main::line1_@1: scope:[main]  from main::@2 main::line1
+  [10] (byte) main::line1_i#2 ← phi( main::@2/(byte) main::line1_i#1 main::line1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [10] (byte*) cur_line#13 ← phi( main::@2/(byte*) cur_line#1 main::line1/((byte*))(word/signed word/dword/signed dword) $400 )
+  [10] (word) main::line1_pos#2 ← phi( main::@2/(word) main::line1_pos#1 main::line1/(const byte) main::line1_xpos#0*(word/signed word/dword/signed dword) $100 )
   [11] (byte) main::plot1_xpos#0 ← > (word) main::line1_pos#2
   to:main::plot1
 main::plot1: scope:[main]  from main::line1_@1
   [12] (byte*) main::plot1_$0#0 ← (byte*) cur_line#13 + (byte) main::plot1_xpos#0
   [13] *((byte*) main::plot1_$0#0) ← (const byte) main::line1_ch#0
-  to:main::@4
-main::@4: scope:[main]  from main::plot1
+  to:main::@2
+main::@2: scope:[main]  from main::plot1
   [14] (word) main::line1_pos#1 ← (word) main::line1_pos#2 + (const byte) main::line1_xadd#0
   [15] (byte*) cur_line#1 ← (byte*) cur_line#13 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [16] (byte) main::line1_i#1 ← ++ (byte) main::line1_i#2
   [17] if((byte) main::line1_i#1<(const byte) main::line1_ysize#0) goto main::line1_@1
   to:main::line2
-main::line2: scope:[main]  from main::@4
+main::line2: scope:[main]  from main::@2
   [18] phi()
   to:main::line2_@1
-main::line2_@1: scope:[main]  from main::@6 main::line2
-  [19] (byte) main::line2_i#2 ← phi( main::@6/(byte) main::line2_i#1 main::line2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [19] (byte*) cur_line#10 ← phi( main::@6/(byte*) cur_line#11 main::line2/((byte*))(word/signed word/dword/signed dword) $400 )
-  [19] (word) main::line2_pos#2 ← phi( main::@6/(word) main::line2_pos#1 main::line2/(const byte) main::line2_xpos#0*(word/signed word/dword/signed dword) $100 )
+main::line2_@1: scope:[main]  from main::@3 main::line2
+  [19] (byte) main::line2_i#2 ← phi( main::@3/(byte) main::line2_i#1 main::line2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [19] (byte*) cur_line#10 ← phi( main::@3/(byte*) cur_line#11 main::line2/((byte*))(word/signed word/dword/signed dword) $400 )
+  [19] (word) main::line2_pos#2 ← phi( main::@3/(word) main::line2_pos#1 main::line2/(const byte) main::line2_xpos#0*(word/signed word/dword/signed dword) $100 )
   [20] (byte) main::plot2_xpos#0 ← > (word) main::line2_pos#2
   to:main::plot2
 main::plot2: scope:[main]  from main::line2_@1
   [21] (byte*) main::plot2_$0#0 ← (byte*) cur_line#10 + (byte) main::plot2_xpos#0
   [22] *((byte*) main::plot2_$0#0) ← (const byte) main::line2_ch#0
-  to:main::@6
-main::@6: scope:[main]  from main::plot2
+  to:main::@3
+main::@3: scope:[main]  from main::plot2
   [23] (word) main::line2_pos#1 ← (word) main::line2_pos#2 + (const byte) main::line2_xadd#0
   [24] (byte*) cur_line#11 ← (byte*) cur_line#10 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [25] (byte) main::line2_i#1 ← ++ (byte) main::line2_i#2
   [26] if((byte) main::line2_i#1<(const byte) main::line2_ysize#0) goto main::line2_@1
   to:main::@return
-main::@return: scope:[main]  from main::@6
+main::@return: scope:[main]  from main::@3
   [27] return 
   to:@return
diff --git a/src/test/ref/inline-function-level2.log b/src/test/ref/inline-function-level2.log
index 0a805c29a..a00688fac 100644
--- a/src/test/ref/inline-function-level2.log
+++ b/src/test/ref/inline-function-level2.log
@@ -391,8 +391,11 @@ Coalesced down to 7 phi equivalence classes
 Culled Empty Block (label) main::@9
 Culled Empty Block (label) main::@8
 Culled Empty Block (label) main::@7
+Renumbering block @3 to @1
+Renumbering block main::@4 to main::@2
+Renumbering block main::@6 to main::@3
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::line1
@@ -401,14 +404,14 @@ Adding NOP phi() at start of main::line2
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@1
@@ -420,42 +423,42 @@ main::@1: scope:[main]  from main main::@1
 main::line1: scope:[main]  from main::@1
   [9] phi()
   to:main::line1_@1
-main::line1_@1: scope:[main]  from main::@4 main::line1
-  [10] (byte) main::line1_i#2 ← phi( main::@4/(byte) main::line1_i#1 main::line1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [10] (byte*) cur_line#13 ← phi( main::@4/(byte*) cur_line#1 main::line1/((byte*))(word/signed word/dword/signed dword) $400 )
-  [10] (word) main::line1_pos#2 ← phi( main::@4/(word) main::line1_pos#1 main::line1/(const byte) main::line1_xpos#0*(word/signed word/dword/signed dword) $100 )
+main::line1_@1: scope:[main]  from main::@2 main::line1
+  [10] (byte) main::line1_i#2 ← phi( main::@2/(byte) main::line1_i#1 main::line1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [10] (byte*) cur_line#13 ← phi( main::@2/(byte*) cur_line#1 main::line1/((byte*))(word/signed word/dword/signed dword) $400 )
+  [10] (word) main::line1_pos#2 ← phi( main::@2/(word) main::line1_pos#1 main::line1/(const byte) main::line1_xpos#0*(word/signed word/dword/signed dword) $100 )
   [11] (byte) main::plot1_xpos#0 ← > (word) main::line1_pos#2
   to:main::plot1
 main::plot1: scope:[main]  from main::line1_@1
   [12] (byte*) main::plot1_$0#0 ← (byte*) cur_line#13 + (byte) main::plot1_xpos#0
   [13] *((byte*) main::plot1_$0#0) ← (const byte) main::line1_ch#0
-  to:main::@4
-main::@4: scope:[main]  from main::plot1
+  to:main::@2
+main::@2: scope:[main]  from main::plot1
   [14] (word) main::line1_pos#1 ← (word) main::line1_pos#2 + (const byte) main::line1_xadd#0
   [15] (byte*) cur_line#1 ← (byte*) cur_line#13 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [16] (byte) main::line1_i#1 ← ++ (byte) main::line1_i#2
   [17] if((byte) main::line1_i#1<(const byte) main::line1_ysize#0) goto main::line1_@1
   to:main::line2
-main::line2: scope:[main]  from main::@4
+main::line2: scope:[main]  from main::@2
   [18] phi()
   to:main::line2_@1
-main::line2_@1: scope:[main]  from main::@6 main::line2
-  [19] (byte) main::line2_i#2 ← phi( main::@6/(byte) main::line2_i#1 main::line2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [19] (byte*) cur_line#10 ← phi( main::@6/(byte*) cur_line#11 main::line2/((byte*))(word/signed word/dword/signed dword) $400 )
-  [19] (word) main::line2_pos#2 ← phi( main::@6/(word) main::line2_pos#1 main::line2/(const byte) main::line2_xpos#0*(word/signed word/dword/signed dword) $100 )
+main::line2_@1: scope:[main]  from main::@3 main::line2
+  [19] (byte) main::line2_i#2 ← phi( main::@3/(byte) main::line2_i#1 main::line2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [19] (byte*) cur_line#10 ← phi( main::@3/(byte*) cur_line#11 main::line2/((byte*))(word/signed word/dword/signed dword) $400 )
+  [19] (word) main::line2_pos#2 ← phi( main::@3/(word) main::line2_pos#1 main::line2/(const byte) main::line2_xpos#0*(word/signed word/dword/signed dword) $100 )
   [20] (byte) main::plot2_xpos#0 ← > (word) main::line2_pos#2
   to:main::plot2
 main::plot2: scope:[main]  from main::line2_@1
   [21] (byte*) main::plot2_$0#0 ← (byte*) cur_line#10 + (byte) main::plot2_xpos#0
   [22] *((byte*) main::plot2_$0#0) ← (const byte) main::line2_ch#0
-  to:main::@6
-main::@6: scope:[main]  from main::plot2
+  to:main::@3
+main::@3: scope:[main]  from main::plot2
   [23] (word) main::line2_pos#1 ← (word) main::line2_pos#2 + (const byte) main::line2_xadd#0
   [24] (byte*) cur_line#11 ← (byte*) cur_line#10 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [25] (byte) main::line2_i#1 ← ++ (byte) main::line2_i#2
   [26] if((byte) main::line2_i#1<(const byte) main::line2_ysize#0) goto main::line2_@1
   to:main::@return
-main::@return: scope:[main]  from main::@6
+main::@return: scope:[main]  from main::@3
   [27] return 
   to:@return
 
@@ -554,17 +557,17 @@ INITIAL ASM
   .label cur_line_11 = $b
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -640,11 +643,11 @@ main: {
     lda #>line1_xpos*$100
     sta line1_pos+1
     jmp line1_b1
-  //SEG25 [10] phi from main::@4 to main::line1_@1 [phi:main::@4->main::line1_@1]
-  line1_b1_from_b4:
-  //SEG26 [10] phi (byte) main::line1_i#2 = (byte) main::line1_i#1 [phi:main::@4->main::line1_@1#0] -- register_copy 
-  //SEG27 [10] phi (byte*) cur_line#13 = (byte*) cur_line#1 [phi:main::@4->main::line1_@1#1] -- register_copy 
-  //SEG28 [10] phi (word) main::line1_pos#2 = (word) main::line1_pos#1 [phi:main::@4->main::line1_@1#2] -- register_copy 
+  //SEG25 [10] phi from main::@2 to main::line1_@1 [phi:main::@2->main::line1_@1]
+  line1_b1_from_b2:
+  //SEG26 [10] phi (byte) main::line1_i#2 = (byte) main::line1_i#1 [phi:main::@2->main::line1_@1#0] -- register_copy 
+  //SEG27 [10] phi (byte*) cur_line#13 = (byte*) cur_line#1 [phi:main::@2->main::line1_@1#1] -- register_copy 
+  //SEG28 [10] phi (word) main::line1_pos#2 = (word) main::line1_pos#1 [phi:main::@2->main::line1_@1#2] -- register_copy 
     jmp line1_b1
   //SEG29 main::line1_@1
   line1_b1:
@@ -666,9 +669,9 @@ main: {
     lda #line1_ch
     ldy #0
     sta (plot1__0),y
-    jmp b4
-  //SEG34 main::@4
-  b4:
+    jmp b2
+  //SEG34 main::@2
+  b2:
   //SEG35 [14] (word) main::line1_pos#1 ← (word) main::line1_pos#2 + (const byte) main::line1_xadd#0 -- vwuz1=vwuz1_plus_vbuc1 
     lda #line1_xadd
     clc
@@ -690,9 +693,9 @@ main: {
   //SEG38 [17] if((byte) main::line1_i#1<(const byte) main::line1_ysize#0) goto main::line1_@1 -- vbuz1_lt_vbuc1_then_la1 
     lda line1_i
     cmp #line1_ysize
-    bcc line1_b1_from_b4
-  //SEG39 [18] phi from main::@4 to main::line2 [phi:main::@4->main::line2]
-  line2_from_b4:
+    bcc line1_b1_from_b2
+  //SEG39 [18] phi from main::@2 to main::line2 [phi:main::@2->main::line2]
+  line2_from_b2:
     jmp line2
   //SEG40 main::line2
   line2:
@@ -712,11 +715,11 @@ main: {
     lda #>line2_xpos*$100
     sta line2_pos+1
     jmp line2_b1
-  //SEG45 [19] phi from main::@6 to main::line2_@1 [phi:main::@6->main::line2_@1]
-  line2_b1_from_b6:
-  //SEG46 [19] phi (byte) main::line2_i#2 = (byte) main::line2_i#1 [phi:main::@6->main::line2_@1#0] -- register_copy 
-  //SEG47 [19] phi (byte*) cur_line#10 = (byte*) cur_line#11 [phi:main::@6->main::line2_@1#1] -- register_copy 
-  //SEG48 [19] phi (word) main::line2_pos#2 = (word) main::line2_pos#1 [phi:main::@6->main::line2_@1#2] -- register_copy 
+  //SEG45 [19] phi from main::@3 to main::line2_@1 [phi:main::@3->main::line2_@1]
+  line2_b1_from_b3:
+  //SEG46 [19] phi (byte) main::line2_i#2 = (byte) main::line2_i#1 [phi:main::@3->main::line2_@1#0] -- register_copy 
+  //SEG47 [19] phi (byte*) cur_line#10 = (byte*) cur_line#11 [phi:main::@3->main::line2_@1#1] -- register_copy 
+  //SEG48 [19] phi (word) main::line2_pos#2 = (word) main::line2_pos#1 [phi:main::@3->main::line2_@1#2] -- register_copy 
     jmp line2_b1
   //SEG49 main::line2_@1
   line2_b1:
@@ -738,9 +741,9 @@ main: {
     lda #line2_ch
     ldy #0
     sta (plot2__0),y
-    jmp b6
-  //SEG54 main::@6
-  b6:
+    jmp b3
+  //SEG54 main::@3
+  b3:
   //SEG55 [23] (word) main::line2_pos#1 ← (word) main::line2_pos#2 + (const byte) main::line2_xadd#0 -- vwuz1=vwuz1_plus_vbuc1 
     lda #line2_xadd
     clc
@@ -762,7 +765,7 @@ main: {
   //SEG58 [26] if((byte) main::line2_i#1<(const byte) main::line2_ysize#0) goto main::line2_@1 -- vbuz1_lt_vbuc1_then_la1 
     lda line2_i
     cmp #line2_ysize
-    bcc line2_b1_from_b6
+    bcc line2_b1_from_b3
     jmp breturn
   //SEG59 main::@return
   breturn:
@@ -835,17 +838,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label cur_line = 4
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -916,11 +919,11 @@ main: {
     lda #>line1_xpos*$100
     sta line1_pos+1
     jmp line1_b1
-  //SEG25 [10] phi from main::@4 to main::line1_@1 [phi:main::@4->main::line1_@1]
-  line1_b1_from_b4:
-  //SEG26 [10] phi (byte) main::line1_i#2 = (byte) main::line1_i#1 [phi:main::@4->main::line1_@1#0] -- register_copy 
-  //SEG27 [10] phi (byte*) cur_line#13 = (byte*) cur_line#1 [phi:main::@4->main::line1_@1#1] -- register_copy 
-  //SEG28 [10] phi (word) main::line1_pos#2 = (word) main::line1_pos#1 [phi:main::@4->main::line1_@1#2] -- register_copy 
+  //SEG25 [10] phi from main::@2 to main::line1_@1 [phi:main::@2->main::line1_@1]
+  line1_b1_from_b2:
+  //SEG26 [10] phi (byte) main::line1_i#2 = (byte) main::line1_i#1 [phi:main::@2->main::line1_@1#0] -- register_copy 
+  //SEG27 [10] phi (byte*) cur_line#13 = (byte*) cur_line#1 [phi:main::@2->main::line1_@1#1] -- register_copy 
+  //SEG28 [10] phi (word) main::line1_pos#2 = (word) main::line1_pos#1 [phi:main::@2->main::line1_@1#2] -- register_copy 
     jmp line1_b1
   //SEG29 main::line1_@1
   line1_b1:
@@ -940,9 +943,9 @@ main: {
     lda #line1_ch
     ldy #0
     sta (plot1__0),y
-    jmp b4
-  //SEG34 main::@4
-  b4:
+    jmp b2
+  //SEG34 main::@2
+  b2:
   //SEG35 [14] (word) main::line1_pos#1 ← (word) main::line1_pos#2 + (const byte) main::line1_xadd#0 -- vwuz1=vwuz1_plus_vbuc1 
     lda #line1_xadd
     clc
@@ -963,9 +966,9 @@ main: {
     inx
   //SEG38 [17] if((byte) main::line1_i#1<(const byte) main::line1_ysize#0) goto main::line1_@1 -- vbuxx_lt_vbuc1_then_la1 
     cpx #line1_ysize
-    bcc line1_b1_from_b4
-  //SEG39 [18] phi from main::@4 to main::line2 [phi:main::@4->main::line2]
-  line2_from_b4:
+    bcc line1_b1_from_b2
+  //SEG39 [18] phi from main::@2 to main::line2 [phi:main::@2->main::line2]
+  line2_from_b2:
     jmp line2
   //SEG40 main::line2
   line2:
@@ -984,11 +987,11 @@ main: {
     lda #>line2_xpos*$100
     sta line2_pos+1
     jmp line2_b1
-  //SEG45 [19] phi from main::@6 to main::line2_@1 [phi:main::@6->main::line2_@1]
-  line2_b1_from_b6:
-  //SEG46 [19] phi (byte) main::line2_i#2 = (byte) main::line2_i#1 [phi:main::@6->main::line2_@1#0] -- register_copy 
-  //SEG47 [19] phi (byte*) cur_line#10 = (byte*) cur_line#11 [phi:main::@6->main::line2_@1#1] -- register_copy 
-  //SEG48 [19] phi (word) main::line2_pos#2 = (word) main::line2_pos#1 [phi:main::@6->main::line2_@1#2] -- register_copy 
+  //SEG45 [19] phi from main::@3 to main::line2_@1 [phi:main::@3->main::line2_@1]
+  line2_b1_from_b3:
+  //SEG46 [19] phi (byte) main::line2_i#2 = (byte) main::line2_i#1 [phi:main::@3->main::line2_@1#0] -- register_copy 
+  //SEG47 [19] phi (byte*) cur_line#10 = (byte*) cur_line#11 [phi:main::@3->main::line2_@1#1] -- register_copy 
+  //SEG48 [19] phi (word) main::line2_pos#2 = (word) main::line2_pos#1 [phi:main::@3->main::line2_@1#2] -- register_copy 
     jmp line2_b1
   //SEG49 main::line2_@1
   line2_b1:
@@ -1008,9 +1011,9 @@ main: {
     lda #line2_ch
     ldy #0
     sta (plot2__0),y
-    jmp b6
-  //SEG54 main::@6
-  b6:
+    jmp b3
+  //SEG54 main::@3
+  b3:
   //SEG55 [23] (word) main::line2_pos#1 ← (word) main::line2_pos#2 + (const byte) main::line2_xadd#0 -- vwuz1=vwuz1_plus_vbuc1 
     lda #line2_xadd
     clc
@@ -1031,7 +1034,7 @@ main: {
     inx
   //SEG58 [26] if((byte) main::line2_i#1<(const byte) main::line2_ysize#0) goto main::line2_@1 -- vbuxx_lt_vbuc1_then_la1 
     cpx #line2_ysize
-    bcc line2_b1_from_b6
+    bcc line2_b1_from_b3
     jmp breturn
   //SEG59 main::@return
   breturn:
@@ -1040,43 +1043,43 @@ main: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp line1
 Removing instruction jmp line1_b1
 Removing instruction jmp plot1
-Removing instruction jmp b4
+Removing instruction jmp b2
 Removing instruction jmp line2
 Removing instruction jmp line2_b1
 Removing instruction jmp plot2
-Removing instruction jmp b6
+Removing instruction jmp b3
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Replacing label line1_b1_from_b4 with line1_b1
-Replacing label line2_b1_from_b6 with line2_b1
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
+Replacing label line1_b1_from_b2 with line1_b1
+Replacing label line2_b1_from_b3 with line2_b1
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b1:
 Removing instruction line1_from_b1:
 Removing instruction line1_b1_from_line1:
-Removing instruction line1_b1_from_b4:
-Removing instruction line2_from_b4:
+Removing instruction line1_b1_from_b2:
+Removing instruction line2_from_b2:
 Removing instruction line2_b1_from_line2:
-Removing instruction line2_b1_from_b6:
+Removing instruction line2_b1_from_b3:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
 Removing instruction line1:
 Removing instruction plot1:
-Removing instruction b4:
+Removing instruction b2:
 Removing instruction line2:
 Removing instruction plot2:
-Removing instruction b6:
+Removing instruction b3:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
@@ -1090,7 +1093,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) cur_line
@@ -1100,8 +1103,8 @@ FINAL SYMBOL TABLE
 (byte*) cur_line#13 cur_line zp ZP_WORD:4 6.6000000000000005
 (void()) main()
 (label) main::@1
-(label) main::@4
-(label) main::@6
+(label) main::@2
+(label) main::@3
 (label) main::@return
 (label) main::line1
 (byte~) main::line1_$0
@@ -1176,11 +1179,11 @@ Score: 2356
 //SEG2 Global Constants & labels
   .label cur_line = 4
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -1240,10 +1243,10 @@ main: {
     sta line1_pos
     lda #>line1_xpos*$100
     sta line1_pos+1
-  //SEG25 [10] phi from main::@4 to main::line1_@1 [phi:main::@4->main::line1_@1]
-  //SEG26 [10] phi (byte) main::line1_i#2 = (byte) main::line1_i#1 [phi:main::@4->main::line1_@1#0] -- register_copy 
-  //SEG27 [10] phi (byte*) cur_line#13 = (byte*) cur_line#1 [phi:main::@4->main::line1_@1#1] -- register_copy 
-  //SEG28 [10] phi (word) main::line1_pos#2 = (word) main::line1_pos#1 [phi:main::@4->main::line1_@1#2] -- register_copy 
+  //SEG25 [10] phi from main::@2 to main::line1_@1 [phi:main::@2->main::line1_@1]
+  //SEG26 [10] phi (byte) main::line1_i#2 = (byte) main::line1_i#1 [phi:main::@2->main::line1_@1#0] -- register_copy 
+  //SEG27 [10] phi (byte*) cur_line#13 = (byte*) cur_line#1 [phi:main::@2->main::line1_@1#1] -- register_copy 
+  //SEG28 [10] phi (word) main::line1_pos#2 = (word) main::line1_pos#1 [phi:main::@2->main::line1_@1#2] -- register_copy 
   //SEG29 main::line1_@1
   line1_b1:
   //SEG30 [11] (byte) main::plot1_xpos#0 ← > (word) main::line1_pos#2 -- vbuaa=_hi_vwuz1 
@@ -1260,7 +1263,7 @@ main: {
     lda #line1_ch
     ldy #0
     sta (plot1__0),y
-  //SEG34 main::@4
+  //SEG34 main::@2
   //SEG35 [14] (word) main::line1_pos#1 ← (word) main::line1_pos#2 + (const byte) main::line1_xadd#0 -- vwuz1=vwuz1_plus_vbuc1 
     lda #line1_xadd
     clc
@@ -1282,7 +1285,7 @@ main: {
   //SEG38 [17] if((byte) main::line1_i#1<(const byte) main::line1_ysize#0) goto main::line1_@1 -- vbuxx_lt_vbuc1_then_la1 
     cpx #line1_ysize
     bcc line1_b1
-  //SEG39 [18] phi from main::@4 to main::line2 [phi:main::@4->main::line2]
+  //SEG39 [18] phi from main::@2 to main::line2 [phi:main::@2->main::line2]
   //SEG40 main::line2
   //SEG41 [19] phi from main::line2 to main::line2_@1 [phi:main::line2->main::line2_@1]
   //SEG42 [19] phi (byte) main::line2_i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::line2->main::line2_@1#0] -- vbuxx=vbuc1 
@@ -1297,10 +1300,10 @@ main: {
     sta line2_pos
     lda #>line2_xpos*$100
     sta line2_pos+1
-  //SEG45 [19] phi from main::@6 to main::line2_@1 [phi:main::@6->main::line2_@1]
-  //SEG46 [19] phi (byte) main::line2_i#2 = (byte) main::line2_i#1 [phi:main::@6->main::line2_@1#0] -- register_copy 
-  //SEG47 [19] phi (byte*) cur_line#10 = (byte*) cur_line#11 [phi:main::@6->main::line2_@1#1] -- register_copy 
-  //SEG48 [19] phi (word) main::line2_pos#2 = (word) main::line2_pos#1 [phi:main::@6->main::line2_@1#2] -- register_copy 
+  //SEG45 [19] phi from main::@3 to main::line2_@1 [phi:main::@3->main::line2_@1]
+  //SEG46 [19] phi (byte) main::line2_i#2 = (byte) main::line2_i#1 [phi:main::@3->main::line2_@1#0] -- register_copy 
+  //SEG47 [19] phi (byte*) cur_line#10 = (byte*) cur_line#11 [phi:main::@3->main::line2_@1#1] -- register_copy 
+  //SEG48 [19] phi (word) main::line2_pos#2 = (word) main::line2_pos#1 [phi:main::@3->main::line2_@1#2] -- register_copy 
   //SEG49 main::line2_@1
   line2_b1:
   //SEG50 [20] (byte) main::plot2_xpos#0 ← > (word) main::line2_pos#2 -- vbuaa=_hi_vwuz1 
@@ -1317,7 +1320,7 @@ main: {
     lda #line2_ch
     ldy #0
     sta (plot2__0),y
-  //SEG54 main::@6
+  //SEG54 main::@3
   //SEG55 [23] (word) main::line2_pos#1 ← (word) main::line2_pos#2 + (const byte) main::line2_xadd#0 -- vwuz1=vwuz1_plus_vbuc1 
     lda #line2_xadd
     clc
diff --git a/src/test/ref/inline-function-level2.sym b/src/test/ref/inline-function-level2.sym
index 472a98ece..6e89ff948 100644
--- a/src/test/ref/inline-function-level2.sym
+++ b/src/test/ref/inline-function-level2.sym
@@ -1,4 +1,4 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) cur_line
@@ -8,8 +8,8 @@
 (byte*) cur_line#13 cur_line zp ZP_WORD:4 6.6000000000000005
 (void()) main()
 (label) main::@1
-(label) main::@4
-(label) main::@6
+(label) main::@2
+(label) main::@3
 (label) main::@return
 (label) main::line1
 (byte~) main::line1_$0
diff --git a/src/test/ref/inline-function-min.cfg b/src/test/ref/inline-function-min.cfg
index c69695a03..c4318cbff 100644
--- a/src/test/ref/inline-function-min.cfg
+++ b/src/test/ref/inline-function-min.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::sum1
 main::sum1: scope:[main]  from main
diff --git a/src/test/ref/inline-function-min.log b/src/test/ref/inline-function-min.log
index 1f64a81c3..a75469899 100644
--- a/src/test/ref/inline-function-min.log
+++ b/src/test/ref/inline-function-min.log
@@ -176,8 +176,9 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::sum1
@@ -187,14 +188,14 @@ Adding NOP phi() at start of main::sum3
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::sum1
 main::sum1: scope:[main]  from main
@@ -250,17 +251,17 @@ INITIAL ASM
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -338,17 +339,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -404,7 +405,7 @@ main: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp sum1
 Removing instruction jmp b1
@@ -414,10 +415,10 @@ Removing instruction jmp sum3
 Removing instruction jmp b3
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction sum1_from_main:
 Removing instruction sum1:
 Removing instruction sum2_from_b1:
@@ -438,7 +439,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -487,11 +488,11 @@ Score: 24
 //SEG2 Global Constants & labels
   .label screen = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/inline-function-min.sym b/src/test/ref/inline-function-min.sym
index be60af651..560026332 100644
--- a/src/test/ref/inline-function-min.sym
+++ b/src/test/ref/inline-function-min.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/inline-function-print.cfg b/src/test/ref/inline-function-print.cfg
index 2cee9e636..104c1d0ce 100644
--- a/src/test/ref/inline-function-print.cfg
+++ b/src/test/ref/inline-function-print.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::print1
 main::print1: scope:[main]  from main
diff --git a/src/test/ref/inline-function-print.log b/src/test/ref/inline-function-print.log
index 8a1f6090b..dd4c841d7 100644
--- a/src/test/ref/inline-function-print.log
+++ b/src/test/ref/inline-function-print.log
@@ -181,8 +181,9 @@ Coalesced [21] main::print1_j#3 ← main::print1_j#1
 Coalesced down to 4 phi equivalence classes
 Culled Empty Block (label) main::@4
 Culled Empty Block (label) main::@3
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::print1
@@ -191,14 +192,14 @@ Adding NOP phi() at start of main::print2
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::print1
 main::print1: scope:[main]  from main
@@ -277,17 +278,17 @@ INITIAL ASM
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -418,17 +419,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -506,7 +507,7 @@ main: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp print1
 Removing instruction jmp print1_b1
@@ -516,10 +517,10 @@ Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label print1_b1_from_print1_b1 with print1_b1
 Replacing label print2_b1_from_print2_b1 with print2_b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction print1_from_main:
 Removing instruction print1_b1_from_print1:
 Removing instruction print1_b1_from_print1_b1:
@@ -542,7 +543,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -593,11 +594,11 @@ Score: 576
 //SEG2 Global Constants & labels
   .label screen = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/inline-function-print.sym b/src/test/ref/inline-function-print.sym
index 98fa2fca4..0ddbf8646 100644
--- a/src/test/ref/inline-function-print.sym
+++ b/src/test/ref/inline-function-print.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/inline-function.asm b/src/test/ref/inline-function.asm
index f7a695c28..071669632 100644
--- a/src/test/ref/inline-function.asm
+++ b/src/test/ref/inline-function.asm
@@ -13,21 +13,21 @@ main: {
     .const toD0181_return = screen/$40|charset1/$400
     .const toD0182_return = screen/$40|charset2/$400
     sei
-  b6:
+  b1:
     lda #$ff
     cmp RASTER
-    bne b6
+    bne b1
     lda #toD0181_return
     sta D018
     lda #6
     sta BGCOL
-  b9:
+  b2:
     lda #$62
     cmp RASTER
-    bne b9
+    bne b2
     lda #toD0182_return
     sta D018
     lda #$b
     sta BGCOL
-    jmp b6
+    jmp b1
 }
diff --git a/src/test/ref/inline-function.cfg b/src/test/ref/inline-function.cfg
index 2064364c1..8e79234ad 100644
--- a/src/test/ref/inline-function.cfg
+++ b/src/test/ref/inline-function.cfg
@@ -1,32 +1,32 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { sei  }
-  to:main::@6
-main::@6: scope:[main]  from main main::@20 main::@6
-  [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@4
+  [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1
   to:main::toD0181
-main::toD0181: scope:[main]  from main::@6
+main::toD0181: scope:[main]  from main::@1
   [6] phi()
-  to:main::@19
-main::@19: scope:[main]  from main::toD0181
+  to:main::@3
+main::@3: scope:[main]  from main::toD0181
   [7] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0
   [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 6
-  to:main::@9
-main::@9: scope:[main]  from main::@19 main::@9
-  [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@9
+  to:main::@2
+main::@2: scope:[main]  from main::@2 main::@3
+  [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@2
   to:main::toD0182
-main::toD0182: scope:[main]  from main::@9
+main::toD0182: scope:[main]  from main::@2
   [10] phi()
-  to:main::@20
-main::@20: scope:[main]  from main::toD0182
+  to:main::@4
+main::@4: scope:[main]  from main::toD0182
   [11] *((const byte*) D018#0) ← (const byte) main::toD0182_return#0
   [12] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) $b
-  to:main::@6
+  to:main::@1
diff --git a/src/test/ref/inline-function.log b/src/test/ref/inline-function.log
index 8567e625d..ad95b18e2 100644
--- a/src/test/ref/inline-function.log
+++ b/src/test/ref/inline-function.log
@@ -258,8 +258,13 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
+Renumbering block main::@6 to main::@1
+Renumbering block main::@9 to main::@2
+Renumbering block main::@19 to main::@3
+Renumbering block main::@20 to main::@4
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::toD0181
 Adding NOP phi() at start of main::toD0182
@@ -267,36 +272,36 @@ Adding NOP phi() at start of main::toD0182
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { sei  }
-  to:main::@6
-main::@6: scope:[main]  from main main::@20 main::@6
-  [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@4
+  [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1
   to:main::toD0181
-main::toD0181: scope:[main]  from main::@6
+main::toD0181: scope:[main]  from main::@1
   [6] phi()
-  to:main::@19
-main::@19: scope:[main]  from main::toD0181
+  to:main::@3
+main::@3: scope:[main]  from main::toD0181
   [7] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0
   [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 6
-  to:main::@9
-main::@9: scope:[main]  from main::@19 main::@9
-  [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@9
+  to:main::@2
+main::@2: scope:[main]  from main::@2 main::@3
+  [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@2
   to:main::toD0182
-main::toD0182: scope:[main]  from main::@9
+main::toD0182: scope:[main]  from main::@2
   [10] phi()
-  to:main::@20
-main::@20: scope:[main]  from main::toD0182
+  to:main::@4
+main::@4: scope:[main]  from main::toD0182
   [11] *((const byte*) D018#0) ← (const byte) main::toD0182_return#0
   [12] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) $b
-  to:main::@6
+  to:main::@1
 
 
 VARIABLE REGISTER WEIGHTS
@@ -346,15 +351,15 @@ INITIAL ASM
   .label charset2 = $1800
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -364,56 +369,56 @@ main: {
     .const toD0182_return = screen/$40|charset2/$400
   //SEG10 asm { sei  }
     sei
-    jmp b6
-  //SEG11 main::@6
-  b6:
-  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG11 main::@1
+  b1:
+  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG13 [6] phi from main::@6 to main::toD0181 [phi:main::@6->main::toD0181]
-  toD0181_from_b6:
+    bne b1
+  //SEG13 [6] phi from main::@1 to main::toD0181 [phi:main::@1->main::toD0181]
+  toD0181_from_b1:
     jmp toD0181
   //SEG14 main::toD0181
   toD0181:
-    jmp b19
-  //SEG15 main::@19
-  b19:
+    jmp b3
+  //SEG15 main::@3
+  b3:
   //SEG16 [7] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG17 [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 6 -- _deref_pbuc1=vbuc2 
     lda #6
     sta BGCOL
-    jmp b9
-  //SEG18 main::@9
-  b9:
-  //SEG19 [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@9 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG18 main::@2
+  b2:
+  //SEG19 [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$62
     cmp RASTER
-    bne b9
-  //SEG20 [10] phi from main::@9 to main::toD0182 [phi:main::@9->main::toD0182]
-  toD0182_from_b9:
+    bne b2
+  //SEG20 [10] phi from main::@2 to main::toD0182 [phi:main::@2->main::toD0182]
+  toD0182_from_b2:
     jmp toD0182
   //SEG21 main::toD0182
   toD0182:
-    jmp b20
-  //SEG22 main::@20
-  b20:
+    jmp b4
+  //SEG22 main::@4
+  b4:
   //SEG23 [11] *((const byte*) D018#0) ← (const byte) main::toD0182_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0182_return
     sta D018
   //SEG24 [12] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) $b -- _deref_pbuc1=vbuc2 
     lda #$b
     sta BGCOL
-    jmp b6
+    jmp b1
 }
 
 REGISTER UPLIFT POTENTIAL REGISTERS
-Statement [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [7] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 6 [ ] ( main:2 [ ] ) always clobbers reg byte a 
-Statement [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@9 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@2 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [11] *((const byte*) D018#0) ← (const byte) main::toD0182_return#0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [12] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) $b [ ] ( main:2 [ ] ) always clobbers reg byte a 
 
@@ -441,15 +446,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label charset2 = $1800
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -459,72 +464,72 @@ main: {
     .const toD0182_return = screen/$40|charset2/$400
   //SEG10 asm { sei  }
     sei
-    jmp b6
-  //SEG11 main::@6
-  b6:
-  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG11 main::@1
+  b1:
+  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG13 [6] phi from main::@6 to main::toD0181 [phi:main::@6->main::toD0181]
-  toD0181_from_b6:
+    bne b1
+  //SEG13 [6] phi from main::@1 to main::toD0181 [phi:main::@1->main::toD0181]
+  toD0181_from_b1:
     jmp toD0181
   //SEG14 main::toD0181
   toD0181:
-    jmp b19
-  //SEG15 main::@19
-  b19:
+    jmp b3
+  //SEG15 main::@3
+  b3:
   //SEG16 [7] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG17 [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 6 -- _deref_pbuc1=vbuc2 
     lda #6
     sta BGCOL
-    jmp b9
-  //SEG18 main::@9
-  b9:
-  //SEG19 [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@9 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG18 main::@2
+  b2:
+  //SEG19 [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$62
     cmp RASTER
-    bne b9
-  //SEG20 [10] phi from main::@9 to main::toD0182 [phi:main::@9->main::toD0182]
-  toD0182_from_b9:
+    bne b2
+  //SEG20 [10] phi from main::@2 to main::toD0182 [phi:main::@2->main::toD0182]
+  toD0182_from_b2:
     jmp toD0182
   //SEG21 main::toD0182
   toD0182:
-    jmp b20
-  //SEG22 main::@20
-  b20:
+    jmp b4
+  //SEG22 main::@4
+  b4:
   //SEG23 [11] *((const byte*) D018#0) ← (const byte) main::toD0182_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0182_return
     sta D018
   //SEG24 [12] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) $b -- _deref_pbuc1=vbuc2 
     lda #$b
     sta BGCOL
-    jmp b6
+    jmp b1
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b6
+Removing instruction jmp b1
 Removing instruction jmp toD0181
-Removing instruction jmp b19
-Removing instruction jmp b9
+Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp toD0182
-Removing instruction jmp b20
+Removing instruction jmp b4
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
-Removing instruction toD0181_from_b6:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction toD0181_from_b1:
 Removing instruction toD0181:
-Removing instruction toD0182_from_b9:
+Removing instruction toD0182_from_b2:
 Removing instruction toD0182:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b19:
-Removing instruction b20:
+Removing instruction b3:
+Removing instruction b4:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
@@ -533,7 +538,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -547,10 +552,10 @@ FINAL SYMBOL TABLE
 (byte*) charset2
 (const byte*) charset2#0 charset2 = ((byte*))(word/signed word/dword/signed dword) $1800
 (void()) main()
-(label) main::@19
-(label) main::@20
-(label) main::@6
-(label) main::@9
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
 (label) main::toD0181
 (word~) main::toD0181_$0
 (word/signed dword/dword~) main::toD0181_$1
@@ -596,10 +601,10 @@ Score: 1972
   .label charset1 = $1000
   .label charset2 = $1800
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -607,36 +612,36 @@ main: {
     .const toD0182_return = screen/$40|charset2/$400
   //SEG10 asm { sei  }
     sei
-  //SEG11 main::@6
-  b6:
-  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG11 main::@1
+  b1:
+  //SEG12 [5] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG13 [6] phi from main::@6 to main::toD0181 [phi:main::@6->main::toD0181]
+    bne b1
+  //SEG13 [6] phi from main::@1 to main::toD0181 [phi:main::@1->main::toD0181]
   //SEG14 main::toD0181
-  //SEG15 main::@19
+  //SEG15 main::@3
   //SEG16 [7] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG17 [8] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 6 -- _deref_pbuc1=vbuc2 
     lda #6
     sta BGCOL
-  //SEG18 main::@9
-  b9:
-  //SEG19 [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@9 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG18 main::@2
+  b2:
+  //SEG19 [9] if(*((const byte*) RASTER#0)!=(byte/signed byte/word/signed word/dword/signed dword) $62) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$62
     cmp RASTER
-    bne b9
-  //SEG20 [10] phi from main::@9 to main::toD0182 [phi:main::@9->main::toD0182]
+    bne b2
+  //SEG20 [10] phi from main::@2 to main::toD0182 [phi:main::@2->main::toD0182]
   //SEG21 main::toD0182
-  //SEG22 main::@20
+  //SEG22 main::@4
   //SEG23 [11] *((const byte*) D018#0) ← (const byte) main::toD0182_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0182_return
     sta D018
   //SEG24 [12] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) $b -- _deref_pbuc1=vbuc2 
     lda #$b
     sta BGCOL
-    jmp b6
+    jmp b1
 }
 
diff --git a/src/test/ref/inline-function.sym b/src/test/ref/inline-function.sym
index ff5085318..a1595b778 100644
--- a/src/test/ref/inline-function.sym
+++ b/src/test/ref/inline-function.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -12,10 +12,10 @@
 (byte*) charset2
 (const byte*) charset2#0 charset2 = ((byte*))(word/signed word/dword/signed dword) $1800
 (void()) main()
-(label) main::@19
-(label) main::@20
-(label) main::@6
-(label) main::@9
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
 (label) main::toD0181
 (word~) main::toD0181_$0
 (word/signed dword/dword~) main::toD0181_$1
diff --git a/src/test/ref/inline-string-2.asm b/src/test/ref/inline-string-2.asm
index 0bbdcd2b0..9f5927b68 100644
--- a/src/test/ref/inline-string-2.asm
+++ b/src/test/ref/inline-string-2.asm
@@ -18,18 +18,18 @@ main: {
 print_msg: {
     .label msg = 4
     cpx #1
-    beq b1
+    beq b2
     lda #<msg_2
     sta msg
     lda #>msg_2
     sta msg+1
-    jmp b2
-  b1:
+    jmp b1
+  b2:
     lda #<msg_1
     sta msg
     lda #>msg_1
     sta msg+1
-  b2:
+  b1:
     jsr print
     rts
     msg_1: .text "Hello @"
diff --git a/src/test/ref/inline-string-2.cfg b/src/test/ref/inline-string-2.cfg
index 7d1548eb5..b5d974e79 100644
--- a/src/test/ref/inline-string-2.cfg
+++ b/src/test/ref/inline-string-2.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_msg 
   to:main::@1
@@ -21,20 +21,20 @@ main::@return: scope:[main]  from main::@1
 print_msg: scope:[print_msg]  from main main::@1
   [9] (byte*) screen#18 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@1/(byte*) screen#14 )
   [9] (byte) print_msg::idx#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 2 )
-  [10] if((byte) print_msg::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto print_msg::@2
-  to:print_msg::@3
-print_msg::@3: scope:[print_msg]  from print_msg
-  [11] phi()
+  [10] if((byte) print_msg::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto print_msg::@1
   to:print_msg::@2
-print_msg::@2: scope:[print_msg]  from print_msg print_msg::@3
-  [12] (byte*) print_msg::msg#3 ← phi( print_msg/(const byte*) print_msg::msg#1 print_msg::@3/(const byte*) print_msg::msg#2 )
+print_msg::@2: scope:[print_msg]  from print_msg
+  [11] phi()
+  to:print_msg::@1
+print_msg::@1: scope:[print_msg]  from print_msg print_msg::@2
+  [12] (byte*) print_msg::msg#3 ← phi( print_msg/(const byte*) print_msg::msg#1 print_msg::@2/(const byte*) print_msg::msg#2 )
   [13] (byte*) print::msg#0 ← (byte*) print_msg::msg#3
   [14] call print 
   to:print_msg::@return
-print_msg::@return: scope:[print_msg]  from print_msg::@2
+print_msg::@return: scope:[print_msg]  from print_msg::@1
   [15] return 
   to:@return
-print: scope:[print]  from print_msg::@2
+print: scope:[print]  from print_msg::@1
   [16] phi()
   to:print::@1
 print::@1: scope:[print]  from print print::@2
diff --git a/src/test/ref/inline-string-2.log b/src/test/ref/inline-string-2.log
index 6ba6bb684..c48dea863 100644
--- a/src/test/ref/inline-string-2.log
+++ b/src/test/ref/inline-string-2.log
@@ -221,25 +221,28 @@ Coalesced (already) [17] screen#26 ← screen#18
 Coalesced [24] print::msg#6 ← print::msg#1
 Coalesced [25] screen#27 ← screen#6
 Coalesced down to 4 phi equivalence classes
+Renumbering block @3 to @1
+Renumbering block print_msg::@2 to print_msg::@1
+Renumbering block print_msg::@3 to print_msg::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
-Adding NOP phi() at start of print_msg::@3
+Adding NOP phi() at start of print_msg::@2
 Adding NOP phi() at start of print
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_msg 
   to:main::@1
@@ -253,20 +256,20 @@ main::@return: scope:[main]  from main::@1
 print_msg: scope:[print_msg]  from main main::@1
   [9] (byte*) screen#18 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@1/(byte*) screen#14 )
   [9] (byte) print_msg::idx#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 2 )
-  [10] if((byte) print_msg::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto print_msg::@2
-  to:print_msg::@3
-print_msg::@3: scope:[print_msg]  from print_msg
-  [11] phi()
+  [10] if((byte) print_msg::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto print_msg::@1
   to:print_msg::@2
-print_msg::@2: scope:[print_msg]  from print_msg print_msg::@3
-  [12] (byte*) print_msg::msg#3 ← phi( print_msg/(const byte*) print_msg::msg#1 print_msg::@3/(const byte*) print_msg::msg#2 )
+print_msg::@2: scope:[print_msg]  from print_msg
+  [11] phi()
+  to:print_msg::@1
+print_msg::@1: scope:[print_msg]  from print_msg print_msg::@2
+  [12] (byte*) print_msg::msg#3 ← phi( print_msg/(const byte*) print_msg::msg#1 print_msg::@2/(const byte*) print_msg::msg#2 )
   [13] (byte*) print::msg#0 ← (byte*) print_msg::msg#3
   [14] call print 
   to:print_msg::@return
-print_msg::@return: scope:[print_msg]  from print_msg::@2
+print_msg::@return: scope:[print_msg]  from print_msg::@1
   [15] return 
   to:@return
-print: scope:[print]  from print_msg::@2
+print: scope:[print]  from print_msg::@1
   [16] phi()
   to:print::@1
 print::@1: scope:[print]  from print print::@2
@@ -327,17 +330,17 @@ INITIAL ASM
   .label screen = 3
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -379,41 +382,41 @@ main: {
 print_msg: {
     .label idx = 2
     .label msg = 5
-  //SEG24 [10] if((byte) print_msg::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto print_msg::@2 -- vbuz1_eq_vbuc1_then_la1 
+  //SEG24 [10] if((byte) print_msg::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto print_msg::@1 -- vbuz1_eq_vbuc1_then_la1 
     lda #1
     cmp idx
-    beq b2_from_print_msg
-  //SEG25 [11] phi from print_msg to print_msg::@3 [phi:print_msg->print_msg::@3]
-  b3_from_print_msg:
-    jmp b3
-  //SEG26 print_msg::@3
-  b3:
-  //SEG27 [12] phi from print_msg::@3 to print_msg::@2 [phi:print_msg::@3->print_msg::@2]
-  b2_from_b3:
-  //SEG28 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#2 [phi:print_msg::@3->print_msg::@2#0] -- pbuz1=pbuc1 
+    beq b1_from_print_msg
+  //SEG25 [11] phi from print_msg to print_msg::@2 [phi:print_msg->print_msg::@2]
+  b2_from_print_msg:
+    jmp b2
+  //SEG26 print_msg::@2
+  b2:
+  //SEG27 [12] phi from print_msg::@2 to print_msg::@1 [phi:print_msg::@2->print_msg::@1]
+  b1_from_b2:
+  //SEG28 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#2 [phi:print_msg::@2->print_msg::@1#0] -- pbuz1=pbuc1 
     lda #<msg_2
     sta msg
     lda #>msg_2
     sta msg+1
-    jmp b2
-  //SEG29 [12] phi from print_msg to print_msg::@2 [phi:print_msg->print_msg::@2]
-  b2_from_print_msg:
-  //SEG30 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#1 [phi:print_msg->print_msg::@2#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG29 [12] phi from print_msg to print_msg::@1 [phi:print_msg->print_msg::@1]
+  b1_from_print_msg:
+  //SEG30 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#1 [phi:print_msg->print_msg::@1#0] -- pbuz1=pbuc1 
     lda #<msg_1
     sta msg
     lda #>msg_1
     sta msg+1
-    jmp b2
-  //SEG31 print_msg::@2
-  b2:
+    jmp b1
+  //SEG31 print_msg::@1
+  b1:
   //SEG32 [13] (byte*) print::msg#0 ← (byte*) print_msg::msg#3 -- pbuz1=pbuz2 
     lda msg
     sta print.msg
     lda msg+1
     sta print.msg+1
   //SEG33 [14] call print 
-  //SEG34 [16] phi from print_msg::@2 to print [phi:print_msg::@2->print]
-  print_from_b2:
+  //SEG34 [16] phi from print_msg::@1 to print [phi:print_msg::@1->print]
+  print_from_b1:
     jsr print
     jmp breturn
   //SEG35 print_msg::@return
@@ -499,17 +502,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -548,36 +551,36 @@ main: {
 // print_msg(byte register(X) idx)
 print_msg: {
     .label msg = 4
-  //SEG24 [10] if((byte) print_msg::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto print_msg::@2 -- vbuxx_eq_vbuc1_then_la1 
+  //SEG24 [10] if((byte) print_msg::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto print_msg::@1 -- vbuxx_eq_vbuc1_then_la1 
     cpx #1
-    beq b2_from_print_msg
-  //SEG25 [11] phi from print_msg to print_msg::@3 [phi:print_msg->print_msg::@3]
-  b3_from_print_msg:
-    jmp b3
-  //SEG26 print_msg::@3
-  b3:
-  //SEG27 [12] phi from print_msg::@3 to print_msg::@2 [phi:print_msg::@3->print_msg::@2]
-  b2_from_b3:
-  //SEG28 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#2 [phi:print_msg::@3->print_msg::@2#0] -- pbuz1=pbuc1 
+    beq b1_from_print_msg
+  //SEG25 [11] phi from print_msg to print_msg::@2 [phi:print_msg->print_msg::@2]
+  b2_from_print_msg:
+    jmp b2
+  //SEG26 print_msg::@2
+  b2:
+  //SEG27 [12] phi from print_msg::@2 to print_msg::@1 [phi:print_msg::@2->print_msg::@1]
+  b1_from_b2:
+  //SEG28 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#2 [phi:print_msg::@2->print_msg::@1#0] -- pbuz1=pbuc1 
     lda #<msg_2
     sta msg
     lda #>msg_2
     sta msg+1
-    jmp b2
-  //SEG29 [12] phi from print_msg to print_msg::@2 [phi:print_msg->print_msg::@2]
-  b2_from_print_msg:
-  //SEG30 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#1 [phi:print_msg->print_msg::@2#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG29 [12] phi from print_msg to print_msg::@1 [phi:print_msg->print_msg::@1]
+  b1_from_print_msg:
+  //SEG30 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#1 [phi:print_msg->print_msg::@1#0] -- pbuz1=pbuc1 
     lda #<msg_1
     sta msg
     lda #>msg_1
     sta msg+1
-    jmp b2
-  //SEG31 print_msg::@2
-  b2:
+    jmp b1
+  //SEG31 print_msg::@1
+  b1:
   //SEG32 [13] (byte*) print::msg#0 ← (byte*) print_msg::msg#3
   //SEG33 [14] call print 
-  //SEG34 [16] phi from print_msg::@2 to print [phi:print_msg::@2->print]
-  print_from_b2:
+  //SEG34 [16] phi from print_msg::@1 to print [phi:print_msg::@1->print]
+  print_from_b1:
     jsr print
     jmp breturn
   //SEG35 print_msg::@return
@@ -630,12 +633,12 @@ print: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b3
 Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -643,15 +646,15 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b1_from_b2 with b1
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction print_msg_from_b1:
-Removing instruction b3_from_print_msg:
-Removing instruction b2_from_b3:
-Removing instruction print_from_b2:
+Removing instruction b2_from_print_msg:
+Removing instruction b1_from_b2:
+Removing instruction print_from_b1:
 Removing instruction b1_from_print:
 Removing instruction b1_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
@@ -659,20 +662,20 @@ Removing instruction bend:
 Removing instruction print_msg_from_main:
 Removing instruction b1:
 Removing instruction breturn:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Relabelling long label b2_from_print_msg to b1
+Relabelling long label b1_from_print_msg to b2
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -687,8 +690,8 @@ FINAL SYMBOL TABLE
 (byte*) print::msg#1 msg zp ZP_WORD:4 22.0
 (byte*) print::msg#2 msg zp ZP_WORD:4 11.5
 (void()) print_msg((byte) print_msg::idx)
+(label) print_msg::@1
 (label) print_msg::@2
-(label) print_msg::@3
 (label) print_msg::@return
 (byte) print_msg::idx
 (byte) print_msg::idx#2 reg byte x 2.0
@@ -718,11 +721,11 @@ Score: 612
 //SEG2 Global Constants & labels
   .label screen = 2
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -752,30 +755,30 @@ main: {
 // print_msg(byte register(X) idx)
 print_msg: {
     .label msg = 4
-  //SEG24 [10] if((byte) print_msg::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto print_msg::@2 -- vbuxx_eq_vbuc1_then_la1 
+  //SEG24 [10] if((byte) print_msg::idx#2==(byte/signed byte/word/signed word/dword/signed dword) 1) goto print_msg::@1 -- vbuxx_eq_vbuc1_then_la1 
     cpx #1
-    beq b1
-  //SEG25 [11] phi from print_msg to print_msg::@3 [phi:print_msg->print_msg::@3]
-  //SEG26 print_msg::@3
-  //SEG27 [12] phi from print_msg::@3 to print_msg::@2 [phi:print_msg::@3->print_msg::@2]
-  //SEG28 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#2 [phi:print_msg::@3->print_msg::@2#0] -- pbuz1=pbuc1 
+    beq b2
+  //SEG25 [11] phi from print_msg to print_msg::@2 [phi:print_msg->print_msg::@2]
+  //SEG26 print_msg::@2
+  //SEG27 [12] phi from print_msg::@2 to print_msg::@1 [phi:print_msg::@2->print_msg::@1]
+  //SEG28 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#2 [phi:print_msg::@2->print_msg::@1#0] -- pbuz1=pbuc1 
     lda #<msg_2
     sta msg
     lda #>msg_2
     sta msg+1
-    jmp b2
-  //SEG29 [12] phi from print_msg to print_msg::@2 [phi:print_msg->print_msg::@2]
-  b1:
-  //SEG30 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#1 [phi:print_msg->print_msg::@2#0] -- pbuz1=pbuc1 
+    jmp b1
+  //SEG29 [12] phi from print_msg to print_msg::@1 [phi:print_msg->print_msg::@1]
+  b2:
+  //SEG30 [12] phi (byte*) print_msg::msg#3 = (const byte*) print_msg::msg#1 [phi:print_msg->print_msg::@1#0] -- pbuz1=pbuc1 
     lda #<msg_1
     sta msg
     lda #>msg_1
     sta msg+1
-  //SEG31 print_msg::@2
-  b2:
+  //SEG31 print_msg::@1
+  b1:
   //SEG32 [13] (byte*) print::msg#0 ← (byte*) print_msg::msg#3
   //SEG33 [14] call print 
-  //SEG34 [16] phi from print_msg::@2 to print [phi:print_msg::@2->print]
+  //SEG34 [16] phi from print_msg::@1 to print [phi:print_msg::@1->print]
     jsr print
   //SEG35 print_msg::@return
   //SEG36 [15] return 
diff --git a/src/test/ref/inline-string-2.sym b/src/test/ref/inline-string-2.sym
index 6e7047762..30442c22b 100644
--- a/src/test/ref/inline-string-2.sym
+++ b/src/test/ref/inline-string-2.sym
@@ -1,4 +1,4 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -13,8 +13,8 @@
 (byte*) print::msg#1 msg zp ZP_WORD:4 22.0
 (byte*) print::msg#2 msg zp ZP_WORD:4 11.5
 (void()) print_msg((byte) print_msg::idx)
+(label) print_msg::@1
 (label) print_msg::@2
-(label) print_msg::@3
 (label) print_msg::@return
 (byte) print_msg::idx
 (byte) print_msg::idx#2 reg byte x 2.0
diff --git a/src/test/ref/inline-string.cfg b/src/test/ref/inline-string.cfg
index 629c756c9..3ff0a0447 100644
--- a/src/test/ref/inline-string.cfg
+++ b/src/test/ref/inline-string.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call print 
   to:main::@1
diff --git a/src/test/ref/inline-string.log b/src/test/ref/inline-string.log
index a08a8c60c..fb9829239 100644
--- a/src/test/ref/inline-string.log
+++ b/src/test/ref/inline-string.log
@@ -172,8 +172,9 @@ Coalesced (already) [13] screen#21 ← screen#18
 Coalesced [20] print::msg#8 ← print::msg#3
 Coalesced [21] screen#22 ← screen#5
 Coalesced down to 2 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -182,14 +183,14 @@ Adding NOP phi() at start of main::@2
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call print 
   to:main::@1
@@ -257,17 +258,17 @@ INITIAL ASM
   .label screen = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -394,17 +395,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -506,7 +507,7 @@ print: {
   msg1: .text "message 1 @"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -517,10 +518,10 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b1_from_b2 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction print_from_b1:
 Removing instruction b2_from_b1:
@@ -542,7 +543,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -583,11 +584,11 @@ Score: 605
 //SEG2 Global Constants & labels
   .label screen = 2
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/inline-string.sym b/src/test/ref/inline-string.sym
index 445cf80f9..8b97e96f1 100644
--- a/src/test/ref/inline-string.sym
+++ b/src/test/ref/inline-string.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/inmem-const-array.cfg b/src/test/ref/inmem-const-array.cfg
index 614792ce3..ccb63d877 100644
--- a/src/test/ref/inmem-const-array.cfg
+++ b/src/test/ref/inmem-const-array.cfg
@@ -16,16 +16,16 @@ main::@1: scope:[main]  from main main::@2
   [6] *((const byte*) main::screen#0 + (byte) main::i#2) ← (byte) '*'
   [7] *((const byte*) main::cols#0 + (byte) main::i#2) ← *((const byte[]) main::colseq#0 + (byte) main::j#3)
   [8] (byte) main::j#1 ← ++ (byte) main::j#3
-  [9] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@6
+  [9] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@6
-  [10] (byte) main::j#4 ← phi( main::@6/(byte) main::j#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+main::@2: scope:[main]  from main::@1 main::@3
+  [10] (byte) main::j#4 ← phi( main::@3/(byte) main::j#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [11] (byte) main::i#1 ← ++ (byte) main::i#2
   [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@1
   to:main::@return
 main::@return: scope:[main]  from main::@2
   [13] return 
   to:@return
-main::@6: scope:[main]  from main::@1
+main::@3: scope:[main]  from main::@1
   [14] phi()
   to:main::@2
diff --git a/src/test/ref/inmem-const-array.log b/src/test/ref/inmem-const-array.log
index 072ae6f29..1b85e1612 100644
--- a/src/test/ref/inmem-const-array.log
+++ b/src/test/ref/inmem-const-array.log
@@ -134,11 +134,12 @@ Coalesced [17] main::j#6 ← main::j#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@3
 Culled Empty Block (label) main::@5
+Renumbering block main::@6 to main::@3
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@6
+Adding NOP phi() at start of main::@3
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
@@ -159,17 +160,17 @@ main::@1: scope:[main]  from main main::@2
   [6] *((const byte*) main::screen#0 + (byte) main::i#2) ← (byte) '*'
   [7] *((const byte*) main::cols#0 + (byte) main::i#2) ← *((const byte[]) main::colseq#0 + (byte) main::j#3)
   [8] (byte) main::j#1 ← ++ (byte) main::j#3
-  [9] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@6
+  [9] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@6
-  [10] (byte) main::j#4 ← phi( main::@6/(byte) main::j#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+main::@2: scope:[main]  from main::@1 main::@3
+  [10] (byte) main::j#4 ← phi( main::@3/(byte) main::j#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [11] (byte) main::i#1 ← ++ (byte) main::i#2
   [12] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@1
   to:main::@return
 main::@return: scope:[main]  from main::@2
   [13] return 
   to:@return
-main::@6: scope:[main]  from main::@1
+main::@3: scope:[main]  from main::@1
   [14] phi()
   to:main::@2
 
@@ -258,10 +259,10 @@ main: {
     sta cols,y
   //SEG20 [8] (byte) main::j#1 ← ++ (byte) main::j#3 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG21 [9] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG21 [9] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp j
-    bne b6_from_b1
+    bne b3_from_b1
   //SEG22 [10] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
   b2_from_b1:
   //SEG23 [10] phi (byte) main::j#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
@@ -281,14 +282,14 @@ main: {
   breturn:
   //SEG28 [13] return 
     rts
-  //SEG29 [14] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  b6_from_b1:
-    jmp b6
-  //SEG30 main::@6
-  b6:
-  //SEG31 [10] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
-  b2_from_b6:
-  //SEG32 [10] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@6->main::@2#0] -- register_copy 
+  //SEG29 [14] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
+  b3_from_b1:
+    jmp b3
+  //SEG30 main::@3
+  b3:
+  //SEG31 [10] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  b2_from_b3:
+  //SEG32 [10] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@3->main::@2#0] -- register_copy 
     jmp b2
     colseq: .byte WHITE, RED, GREEN
 }
@@ -362,9 +363,9 @@ main: {
     sta cols,x
   //SEG20 [8] (byte) main::j#1 ← ++ (byte) main::j#3 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG21 [9] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@6 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG21 [9] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3 -- vbuyy_neq_vbuc1_then_la1 
     cpy #3
-    bne b6_from_b1
+    bne b3_from_b1
   //SEG22 [10] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
   b2_from_b1:
   //SEG23 [10] phi (byte) main::j#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuyy=vbuc1 
@@ -382,14 +383,14 @@ main: {
   breturn:
   //SEG28 [13] return 
     rts
-  //SEG29 [14] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  b6_from_b1:
-    jmp b6
-  //SEG30 main::@6
-  b6:
-  //SEG31 [10] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
-  b2_from_b6:
-  //SEG32 [10] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@6->main::@2#0] -- register_copy 
+  //SEG29 [14] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
+  b3_from_b1:
+    jmp b3
+  //SEG30 main::@3
+  b3:
+  //SEG31 [10] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  b2_from_b3:
+  //SEG32 [10] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@3->main::@2#0] -- register_copy 
     jmp b2
     colseq: .byte WHITE, RED, GREEN
 }
@@ -400,17 +401,17 @@ Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp breturn
-Removing instruction jmp b6
+Removing instruction jmp b3
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b6_from_b1 with b6
+Replacing label b3_from_b1 with b3
 Replacing label b1_from_b2 with b1
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
 Removing instruction b1_from_b2:
-Removing instruction b6_from_b1:
-Removing instruction b2_from_b6:
+Removing instruction b3_from_b1:
+Removing instruction b2_from_b3:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
@@ -420,12 +421,12 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b2 in bne b6
+Skipping double jump to b2 in bne b3
 Succesful ASM optimization Pass5DoubleJumpElimination
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
-Removing instruction b6:
+Removing instruction b3:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b2
 Succesful ASM optimization Pass5UnreachableCodeElimination
@@ -443,7 +444,7 @@ FINAL SYMBOL TABLE
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
+(label) main::@3
 (label) main::@return
 (byte*) main::cols
 (const byte*) main::cols#0 cols = ((byte*))(word/dword/signed dword) $d800
@@ -504,7 +505,7 @@ main: {
     sta cols,x
   //SEG20 [8] (byte) main::j#1 ← ++ (byte) main::j#3 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG21 [9] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@6 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG21 [9] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3 -- vbuyy_neq_vbuc1_then_la1 
     cpy #3
     bne b2
   //SEG22 [10] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -520,10 +521,10 @@ main: {
   //SEG27 main::@return
   //SEG28 [13] return 
     rts
-  //SEG29 [14] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  //SEG30 main::@6
-  //SEG31 [10] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
-  //SEG32 [10] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@6->main::@2#0] -- register_copy 
+  //SEG29 [14] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
+  //SEG30 main::@3
+  //SEG31 [10] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  //SEG32 [10] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@3->main::@2#0] -- register_copy 
     colseq: .byte WHITE, RED, GREEN
 }
 
diff --git a/src/test/ref/inmem-const-array.sym b/src/test/ref/inmem-const-array.sym
index 944c47578..674aa3b44 100644
--- a/src/test/ref/inmem-const-array.sym
+++ b/src/test/ref/inmem-const-array.sym
@@ -10,7 +10,7 @@
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
+(label) main::@3
 (label) main::@return
 (byte*) main::cols
 (const byte*) main::cols#0 cols = ((byte*))(word/dword/signed dword) $d800
diff --git a/src/test/ref/inmemarray.cfg b/src/test/ref/inmemarray.cfg
index 29943b206..8ef118a0f 100644
--- a/src/test/ref/inmemarray.cfg
+++ b/src/test/ref/inmemarray.cfg
@@ -15,16 +15,16 @@ main::@1: scope:[main]  from main main::@2
   [5] (byte) main::j#3 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::j#4 )
   [6] *((const byte*) SCREEN#0 + (byte) main::i#2) ← *((const byte[]) TXT#0 + (byte) main::j#3)
   [7] (byte) main::j#1 ← ++ (byte) main::j#3
-  [8] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6
+  [8] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@3
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@6
-  [9] (byte) main::j#4 ← phi( main::@6/(byte) main::j#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+main::@2: scope:[main]  from main::@1 main::@3
+  [9] (byte) main::j#4 ← phi( main::@3/(byte) main::j#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [10] (byte) main::i#1 ← ++ (byte) main::i#2
   [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@1
   to:main::@return
 main::@return: scope:[main]  from main::@2
   [12] return 
   to:@return
-main::@6: scope:[main]  from main::@1
+main::@3: scope:[main]  from main::@1
   [13] phi()
   to:main::@2
diff --git a/src/test/ref/inmemarray.log b/src/test/ref/inmemarray.log
index bdd4d2e84..09834fda4 100644
--- a/src/test/ref/inmemarray.log
+++ b/src/test/ref/inmemarray.log
@@ -112,11 +112,12 @@ Coalesced [16] main::j#6 ← main::j#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@3
 Culled Empty Block (label) main::@5
+Renumbering block main::@6 to main::@3
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@6
+Adding NOP phi() at start of main::@3
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
@@ -136,17 +137,17 @@ main::@1: scope:[main]  from main main::@2
   [5] (byte) main::j#3 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::j#4 )
   [6] *((const byte*) SCREEN#0 + (byte) main::i#2) ← *((const byte[]) TXT#0 + (byte) main::j#3)
   [7] (byte) main::j#1 ← ++ (byte) main::j#3
-  [8] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6
+  [8] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@3
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@6
-  [9] (byte) main::j#4 ← phi( main::@6/(byte) main::j#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+main::@2: scope:[main]  from main::@1 main::@3
+  [9] (byte) main::j#4 ← phi( main::@3/(byte) main::j#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [10] (byte) main::i#1 ← ++ (byte) main::i#2
   [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@1
   to:main::@return
 main::@return: scope:[main]  from main::@2
   [12] return 
   to:@return
-main::@6: scope:[main]  from main::@1
+main::@3: scope:[main]  from main::@1
   [13] phi()
   to:main::@2
 
@@ -223,10 +224,10 @@ main: {
     sta SCREEN,y
   //SEG19 [7] (byte) main::j#1 ← ++ (byte) main::j#3 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG20 [8] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG20 [8] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp j
-    bne b6_from_b1
+    bne b3_from_b1
   //SEG21 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
   b2_from_b1:
   //SEG22 [9] phi (byte) main::j#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
@@ -246,14 +247,14 @@ main: {
   breturn:
   //SEG27 [12] return 
     rts
-  //SEG28 [13] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  b6_from_b1:
-    jmp b6
-  //SEG29 main::@6
-  b6:
-  //SEG30 [9] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
-  b2_from_b6:
-  //SEG31 [9] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@6->main::@2#0] -- register_copy 
+  //SEG28 [13] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
+  b3_from_b1:
+    jmp b3
+  //SEG29 main::@3
+  b3:
+  //SEG30 [9] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  b2_from_b3:
+  //SEG31 [9] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@3->main::@2#0] -- register_copy 
     jmp b2
 }
   TXT: .byte 3, 1, $d, 5, $c, $f, $14, $20
@@ -318,9 +319,9 @@ main: {
     sta SCREEN,x
   //SEG19 [7] (byte) main::j#1 ← ++ (byte) main::j#3 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG20 [8] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG20 [8] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@3 -- vbuyy_neq_vbuc1_then_la1 
     cpy #8
-    bne b6_from_b1
+    bne b3_from_b1
   //SEG21 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
   b2_from_b1:
   //SEG22 [9] phi (byte) main::j#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuyy=vbuc1 
@@ -338,14 +339,14 @@ main: {
   breturn:
   //SEG27 [12] return 
     rts
-  //SEG28 [13] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  b6_from_b1:
-    jmp b6
-  //SEG29 main::@6
-  b6:
-  //SEG30 [9] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
-  b2_from_b6:
-  //SEG31 [9] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@6->main::@2#0] -- register_copy 
+  //SEG28 [13] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
+  b3_from_b1:
+    jmp b3
+  //SEG29 main::@3
+  b3:
+  //SEG30 [9] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  b2_from_b3:
+  //SEG31 [9] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@3->main::@2#0] -- register_copy 
     jmp b2
 }
   TXT: .byte 3, 1, $d, 5, $c, $f, $14, $20
@@ -356,17 +357,17 @@ Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp breturn
-Removing instruction jmp b6
+Removing instruction jmp b3
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b6_from_b1 with b6
+Replacing label b3_from_b1 with b3
 Replacing label b1_from_b2 with b1
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
 Removing instruction b1_from_b2:
-Removing instruction b6_from_b1:
-Removing instruction b2_from_b6:
+Removing instruction b3_from_b1:
+Removing instruction b2_from_b3:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
@@ -376,12 +377,12 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b2 in bne b6
+Skipping double jump to b2 in bne b3
 Succesful ASM optimization Pass5DoubleJumpElimination
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
-Removing instruction b6:
+Removing instruction b3:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b2
 Succesful ASM optimization Pass5UnreachableCodeElimination
@@ -397,7 +398,7 @@ FINAL SYMBOL TABLE
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
+(label) main::@3
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
@@ -445,7 +446,7 @@ main: {
     sta SCREEN,x
   //SEG19 [7] (byte) main::j#1 ← ++ (byte) main::j#3 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG20 [8] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG20 [8] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@3 -- vbuyy_neq_vbuc1_then_la1 
     cpy #8
     bne b2
   //SEG21 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -461,10 +462,10 @@ main: {
   //SEG26 main::@return
   //SEG27 [12] return 
     rts
-  //SEG28 [13] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  //SEG29 main::@6
-  //SEG30 [9] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
-  //SEG31 [9] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@6->main::@2#0] -- register_copy 
+  //SEG28 [13] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
+  //SEG29 main::@3
+  //SEG30 [9] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  //SEG31 [9] phi (byte) main::j#4 = (byte) main::j#1 [phi:main::@3->main::@2#0] -- register_copy 
 }
   TXT: .byte 3, 1, $d, 5, $c, $f, $14, $20
 
diff --git a/src/test/ref/inmemarray.sym b/src/test/ref/inmemarray.sym
index c273de2f4..33eca78a9 100644
--- a/src/test/ref/inmemarray.sym
+++ b/src/test/ref/inmemarray.sym
@@ -8,7 +8,7 @@
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
+(label) main::@3
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
diff --git a/src/test/ref/inmemstring.cfg b/src/test/ref/inmemstring.cfg
index 883e3e36e..b84db9631 100644
--- a/src/test/ref/inmemstring.cfg
+++ b/src/test/ref/inmemstring.cfg
@@ -15,16 +15,16 @@ main::@1: scope:[main]  from main main::@2
   [5] (byte) main::i#3 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#4 )
   [6] *((byte*) main::cursor#2) ← *((const byte[]) TEXT#0 + (byte) main::i#3)
   [7] (byte) main::i#1 ← ++ (byte) main::i#3
-  [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6
+  [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@3
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@6
-  [9] (byte) main::i#4 ← phi( main::@6/(byte) main::i#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+main::@2: scope:[main]  from main::@1 main::@3
+  [9] (byte) main::i#4 ← phi( main::@3/(byte) main::i#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [10] (byte*) main::cursor#1 ← ++ (byte*) main::cursor#2
   [11] if((byte*) main::cursor#1<(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e8) goto main::@1
   to:main::@return
 main::@return: scope:[main]  from main::@2
   [12] return 
   to:@return
-main::@6: scope:[main]  from main::@1
+main::@3: scope:[main]  from main::@1
   [13] phi()
   to:main::@2
diff --git a/src/test/ref/inmemstring.log b/src/test/ref/inmemstring.log
index f55a03cfa..3bf206447 100644
--- a/src/test/ref/inmemstring.log
+++ b/src/test/ref/inmemstring.log
@@ -117,11 +117,12 @@ Coalesced [16] main::i#6 ← main::i#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@3
 Culled Empty Block (label) main::@5
+Renumbering block main::@6 to main::@3
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@6
+Adding NOP phi() at start of main::@3
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
@@ -141,17 +142,17 @@ main::@1: scope:[main]  from main main::@2
   [5] (byte) main::i#3 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#4 )
   [6] *((byte*) main::cursor#2) ← *((const byte[]) TEXT#0 + (byte) main::i#3)
   [7] (byte) main::i#1 ← ++ (byte) main::i#3
-  [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6
+  [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@3
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@6
-  [9] (byte) main::i#4 ← phi( main::@6/(byte) main::i#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+main::@2: scope:[main]  from main::@1 main::@3
+  [9] (byte) main::i#4 ← phi( main::@3/(byte) main::i#1 main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [10] (byte*) main::cursor#1 ← ++ (byte*) main::cursor#2
   [11] if((byte*) main::cursor#1<(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e8) goto main::@1
   to:main::@return
 main::@return: scope:[main]  from main::@2
   [12] return 
   to:@return
-main::@6: scope:[main]  from main::@1
+main::@3: scope:[main]  from main::@1
   [13] phi()
   to:main::@2
 
@@ -230,10 +231,10 @@ main: {
     sta (cursor),y
   //SEG19 [7] (byte) main::i#1 ← ++ (byte) main::i#3 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG20 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG20 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    bne b6_from_b1
+    bne b3_from_b1
   //SEG21 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
   b2_from_b1:
   //SEG22 [9] phi (byte) main::i#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
@@ -261,14 +262,14 @@ main: {
   breturn:
   //SEG27 [12] return 
     rts
-  //SEG28 [13] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  b6_from_b1:
-    jmp b6
-  //SEG29 main::@6
-  b6:
-  //SEG30 [9] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
-  b2_from_b6:
-  //SEG31 [9] phi (byte) main::i#4 = (byte) main::i#1 [phi:main::@6->main::@2#0] -- register_copy 
+  //SEG28 [13] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
+  b3_from_b1:
+    jmp b3
+  //SEG29 main::@3
+  b3:
+  //SEG30 [9] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  b2_from_b3:
+  //SEG31 [9] phi (byte) main::i#4 = (byte) main::i#1 [phi:main::@3->main::@2#0] -- register_copy 
     jmp b2
 }
   TEXT: .text "camelot "
@@ -341,9 +342,9 @@ main: {
     sta (cursor),y
   //SEG19 [7] (byte) main::i#1 ← ++ (byte) main::i#3 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG20 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG20 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@3 -- vbuxx_neq_vbuc1_then_la1 
     cpx #8
-    bne b6_from_b1
+    bne b3_from_b1
   //SEG21 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
   b2_from_b1:
   //SEG22 [9] phi (byte) main::i#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuxx=vbuc1 
@@ -370,14 +371,14 @@ main: {
   breturn:
   //SEG27 [12] return 
     rts
-  //SEG28 [13] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  b6_from_b1:
-    jmp b6
-  //SEG29 main::@6
-  b6:
-  //SEG30 [9] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
-  b2_from_b6:
-  //SEG31 [9] phi (byte) main::i#4 = (byte) main::i#1 [phi:main::@6->main::@2#0] -- register_copy 
+  //SEG28 [13] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
+  b3_from_b1:
+    jmp b3
+  //SEG29 main::@3
+  b3:
+  //SEG30 [9] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  b2_from_b3:
+  //SEG31 [9] phi (byte) main::i#4 = (byte) main::i#1 [phi:main::@3->main::@2#0] -- register_copy 
     jmp b2
 }
   TEXT: .text "camelot "
@@ -388,9 +389,9 @@ Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp breturn
-Removing instruction jmp b6
+Removing instruction jmp b3
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b6_from_b1 with b6
+Replacing label b3_from_b1 with b3
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b2 with b1
 Removing instruction b1_from_bbegin:
@@ -398,8 +399,8 @@ Removing instruction b1:
 Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
 Removing instruction b1_from_b2:
-Removing instruction b6_from_b1:
-Removing instruction b2_from_b6:
+Removing instruction b3_from_b1:
+Removing instruction b2_from_b3:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
@@ -409,12 +410,12 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b2 in bne b6
+Skipping double jump to b2 in bne b3
 Succesful ASM optimization Pass5DoubleJumpElimination
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
-Removing instruction b6:
+Removing instruction b3:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b2
 Succesful ASM optimization Pass5UnreachableCodeElimination
@@ -430,7 +431,7 @@ FINAL SYMBOL TABLE
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
+(label) main::@3
 (label) main::@return
 (byte*) main::cursor
 (byte*) main::cursor#1 cursor zp ZP_WORD:2 16.5
@@ -483,7 +484,7 @@ main: {
     sta (cursor),y
   //SEG19 [7] (byte) main::i#1 ← ++ (byte) main::i#3 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG20 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG20 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@3 -- vbuxx_neq_vbuc1_then_la1 
     cpx #8
     bne b2
   //SEG21 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
@@ -508,10 +509,10 @@ main: {
   //SEG26 main::@return
   //SEG27 [12] return 
     rts
-  //SEG28 [13] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  //SEG29 main::@6
-  //SEG30 [9] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
-  //SEG31 [9] phi (byte) main::i#4 = (byte) main::i#1 [phi:main::@6->main::@2#0] -- register_copy 
+  //SEG28 [13] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
+  //SEG29 main::@3
+  //SEG30 [9] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  //SEG31 [9] phi (byte) main::i#4 = (byte) main::i#1 [phi:main::@3->main::@2#0] -- register_copy 
 }
   TEXT: .text "camelot "
 
diff --git a/src/test/ref/inmemstring.sym b/src/test/ref/inmemstring.sym
index ee970b4df..8d6030413 100644
--- a/src/test/ref/inmemstring.sym
+++ b/src/test/ref/inmemstring.sym
@@ -8,7 +8,7 @@
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
+(label) main::@3
 (label) main::@return
 (byte*) main::cursor
 (byte*) main::cursor#1 cursor zp ZP_WORD:2 16.5
diff --git a/src/test/ref/interrupt-volatile-reuse-problem1.cfg b/src/test/ref/interrupt-volatile-reuse-problem1.cfg
index d6d4d005f..1adaee63b 100644
--- a/src/test/ref/interrupt-volatile-reuse-problem1.cfg
+++ b/src/test/ref/interrupt-volatile-reuse-problem1.cfg
@@ -1,14 +1,14 @@
 @begin: scope:[]  from
   [0] (byte) col1#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [1] (byte) col2#0 ← (byte/signed byte/word/signed word/dword/signed dword) 8
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [2] phi()
   [3] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [4] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [5] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   to:main::@return
 main::@return: scope:[main]  from main
diff --git a/src/test/ref/interrupt-volatile-reuse-problem1.log b/src/test/ref/interrupt-volatile-reuse-problem1.log
index b662da3c6..30bd4387f 100644
--- a/src/test/ref/interrupt-volatile-reuse-problem1.log
+++ b/src/test/ref/interrupt-volatile-reuse-problem1.log
@@ -93,21 +93,22 @@ Calls in [] to main:3
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
-Adding NOP phi() at start of @2
+Renumbering block @2 to @1
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] (byte) col1#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [1] (byte) col2#0 ← (byte/signed byte/word/signed word/dword/signed dword) 8
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [2] phi()
   [3] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [4] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [5] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   to:main::@return
 main::@return: scope:[main]  from main
@@ -173,15 +174,15 @@ bbegin:
 //SEG5 [1] (byte) col2#0 ← (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuc1 
   lda #8
   sta col2
-//SEG6 [2] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG7 @2
-b2:
+//SEG6 [2] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG7 @1
+b1:
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG9 [4] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG10 @end
 bend:
@@ -274,15 +275,15 @@ bbegin:
 //SEG5 [1] (byte) col2#0 ← (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuc1 
   lda #8
   sta col2
-//SEG6 [2] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG7 @2
-b2:
+//SEG6 [2] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG7 @1
+b1:
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG9 [4] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG10 @end
 bend:
@@ -320,22 +321,22 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction bend:
 Removing instruction breturn:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()**) KERNEL_IRQ
@@ -379,11 +380,11 @@ bbegin:
 //SEG5 [1] (byte) col2#0 ← (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuc1 
   lda #8
   sta col2
-//SEG6 [2] phi from @begin to @2 [phi:@begin->@2]
-//SEG7 @2
+//SEG6 [2] phi from @begin to @1 [phi:@begin->@1]
+//SEG7 @1
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @2 to @end [phi:@2->@end]
+//SEG9 [4] phi from @1 to @end [phi:@1->@end]
 //SEG10 @end
 //SEG11 main
 main: {
diff --git a/src/test/ref/interrupt-volatile-reuse-problem1.sym b/src/test/ref/interrupt-volatile-reuse-problem1.sym
index 2ed44c2ab..db0456377 100644
--- a/src/test/ref/interrupt-volatile-reuse-problem1.sym
+++ b/src/test/ref/interrupt-volatile-reuse-problem1.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()**) KERNEL_IRQ
diff --git a/src/test/ref/interrupt-volatile-reuse-problem2.asm b/src/test/ref/interrupt-volatile-reuse-problem2.asm
index b3b618afc..993b8c537 100644
--- a/src/test/ref/interrupt-volatile-reuse-problem2.asm
+++ b/src/test/ref/interrupt-volatile-reuse-problem2.asm
@@ -16,29 +16,29 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  b1:
+  b4:
     ldx #0
-  b6:
+  b1:
     lda #0
     sta y
-  b7:
+  b2:
     ldy #0
-  b8:
+  b3:
     tya
     clc
     adc y
     sta SCREEN,x
     iny
     cpy #$b
-    bne b8
+    bne b3
     inc y
     lda #$b
     cmp y
-    bne b7
+    bne b2
     inx
     cpx #$b
-    bne b6
-    jmp b1
+    bne b1
+    jmp b4
 }
 irq: {
     // Acknowledge the IRQ
diff --git a/src/test/ref/interrupt-volatile-reuse-problem2.cfg b/src/test/ref/interrupt-volatile-reuse-problem2.cfg
index c2044ec95..f0b71e2a4 100644
--- a/src/test/ref/interrupt-volatile-reuse-problem2.cfg
+++ b/src/test/ref/interrupt-volatile-reuse-problem2.cfg
@@ -1,39 +1,39 @@
 @begin: scope:[]  from
   [0] (byte) col1#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
-  to:main::@6
-main::@6: scope:[main]  from main main::@10 main::@13
-  [5] (byte) main::x#6 ← phi( main::@13/(byte) main::x#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  to:main::@7
-main::@7: scope:[main]  from main::@6 main::@9
-  [6] (byte) main::y#4 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@9/(byte) main::y#1 )
-  to:main::@8
-main::@8: scope:[main]  from main::@7 main::@8
-  [7] (byte) main::a#2 ← phi( main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::a#1 )
+  to:main::@1
+main::@1: scope:[main]  from main main::@5 main::@6
+  [5] (byte) main::x#6 ← phi( main::@6/(byte) main::x#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@4
+  [6] (byte) main::y#4 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::y#1 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@3
+  [7] (byte) main::a#2 ← phi( main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::a#1 )
   [8] (byte~) main::$1 ← (byte) main::a#2 + (byte) main::y#4
   [9] *((const byte*) SCREEN#0 + (byte) main::x#6) ← (byte~) main::$1
   [10] (byte) main::a#1 ← ++ (byte) main::a#2
-  [11] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  [11] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [12] (byte) main::y#1 ← ++ (byte) main::y#4
-  [13] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  [13] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [14] (byte) main::x#1 ← ++ (byte) main::x#6
-  [15] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@13
-  to:main::@6
-main::@13: scope:[main]  from main::@10
+  [15] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6
+  to:main::@1
+main::@6: scope:[main]  from main::@5
   [16] phi()
-  to:main::@6
+  to:main::@1
 irq: scope:[irq]  from
   [17] *((const byte*) IRQ_STATUS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 1
   asm { lda$dc0d  }
diff --git a/src/test/ref/interrupt-volatile-reuse-problem2.log b/src/test/ref/interrupt-volatile-reuse-problem2.log
index 5c3cc69f1..544ba58fa 100644
--- a/src/test/ref/interrupt-volatile-reuse-problem2.log
+++ b/src/test/ref/interrupt-volatile-reuse-problem2.log
@@ -199,47 +199,54 @@ Coalesced down to 3 phi equivalence classes
 Culled Empty Block (label) main::@2
 Culled Empty Block (label) main::@14
 Culled Empty Block (label) main::@15
-Adding NOP phi() at start of @2
+Renumbering block @2 to @1
+Renumbering block main::@6 to main::@1
+Renumbering block main::@7 to main::@2
+Renumbering block main::@8 to main::@3
+Renumbering block main::@9 to main::@4
+Renumbering block main::@10 to main::@5
+Renumbering block main::@13 to main::@6
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
-Adding NOP phi() at start of main::@13
+Adding NOP phi() at start of main::@6
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] (byte) col1#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
-  to:main::@6
-main::@6: scope:[main]  from main main::@10 main::@13
-  [5] (byte) main::x#6 ← phi( main::@13/(byte) main::x#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  to:main::@7
-main::@7: scope:[main]  from main::@6 main::@9
-  [6] (byte) main::y#4 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@9/(byte) main::y#1 )
-  to:main::@8
-main::@8: scope:[main]  from main::@7 main::@8
-  [7] (byte) main::a#2 ← phi( main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::a#1 )
+  to:main::@1
+main::@1: scope:[main]  from main main::@5 main::@6
+  [5] (byte) main::x#6 ← phi( main::@6/(byte) main::x#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@4
+  [6] (byte) main::y#4 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::y#1 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@3
+  [7] (byte) main::a#2 ← phi( main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::a#1 )
   [8] (byte~) main::$1 ← (byte) main::a#2 + (byte) main::y#4
   [9] *((const byte*) SCREEN#0 + (byte) main::x#6) ← (byte~) main::$1
   [10] (byte) main::a#1 ← ++ (byte) main::a#2
-  [11] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  [11] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [12] (byte) main::y#1 ← ++ (byte) main::y#4
-  [13] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  [13] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [14] (byte) main::x#1 ← ++ (byte) main::x#6
-  [15] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@13
-  to:main::@6
-main::@13: scope:[main]  from main::@10
+  [15] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6
+  to:main::@1
+main::@6: scope:[main]  from main::@5
   [16] phi()
-  to:main::@6
+  to:main::@1
 irq: scope:[irq]  from
   [17] *((const byte*) IRQ_STATUS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 1
   asm { lda$dc0d  }
@@ -311,15 +318,15 @@ bbegin:
 //SEG4 [0] (byte) col1#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col1
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG6 @2
-b2:
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG6 @1
+b1:
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -334,39 +341,39 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  //SEG12 [5] phi from main main::@10 to main::@6 [phi:main/main::@10->main::@6]
-  b6_from_main:
-  b6_from_b10:
-  //SEG13 [5] phi (byte) main::x#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@10->main::@6#0] -- vbuz1=vbuc1 
+  //SEG12 [5] phi from main main::@5 to main::@1 [phi:main/main::@5->main::@1]
+  b1_from_main:
+  b1_from_b5:
+  //SEG13 [5] phi (byte) main::x#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@5->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta x
-    jmp b6
-  //SEG14 main::@6
-  b6:
-  //SEG15 [6] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-  //SEG16 [6] phi (byte) main::y#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@7#0] -- vbuz1=vbuc1 
+    jmp b1
+  //SEG14 main::@1
+  b1:
+  //SEG15 [6] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG16 [6] phi (byte) main::y#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta y
-    jmp b7
-  //SEG17 [6] phi from main::@9 to main::@7 [phi:main::@9->main::@7]
-  b7_from_b9:
-  //SEG18 [6] phi (byte) main::y#4 = (byte) main::y#1 [phi:main::@9->main::@7#0] -- register_copy 
-    jmp b7
-  //SEG19 main::@7
-  b7:
-  //SEG20 [7] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-  //SEG21 [7] phi (byte) main::a#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#0] -- vbuz1=vbuc1 
+    jmp b2
+  //SEG17 [6] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG18 [6] phi (byte) main::y#4 = (byte) main::y#1 [phi:main::@4->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG19 main::@2
+  b2:
+  //SEG20 [7] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG21 [7] phi (byte) main::a#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta a
-    jmp b8
-  //SEG22 [7] phi from main::@8 to main::@8 [phi:main::@8->main::@8]
-  b8_from_b8:
-  //SEG23 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@8->main::@8#0] -- register_copy 
-    jmp b8
-  //SEG24 main::@8
-  b8:
+    jmp b3
+  //SEG22 [7] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
+  b3_from_b3:
+  //SEG23 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@3->main::@3#0] -- register_copy 
+    jmp b3
+  //SEG24 main::@3
+  b3:
   //SEG25 [8] (byte~) main::$1 ← (byte) main::a#2 + (byte) main::y#4 -- vbuz1=vbuz2_plus_vbuz3 
     lda a
     clc
@@ -378,38 +385,38 @@ main: {
     sta SCREEN,y
   //SEG27 [10] (byte) main::a#1 ← ++ (byte) main::a#2 -- vbuz1=_inc_vbuz1 
     inc a
-  //SEG28 [11] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG28 [11] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp a
-    bne b8_from_b8
-    jmp b9
-  //SEG29 main::@9
-  b9:
+    bne b3_from_b3
+    jmp b4
+  //SEG29 main::@4
+  b4:
   //SEG30 [12] (byte) main::y#1 ← ++ (byte) main::y#4 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG31 [13] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG31 [13] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp y
-    bne b7_from_b9
-    jmp b10
-  //SEG32 main::@10
-  b10:
+    bne b2_from_b4
+    jmp b5
+  //SEG32 main::@5
+  b5:
   //SEG33 [14] (byte) main::x#1 ← ++ (byte) main::x#6 -- vbuz1=_inc_vbuz1 
     inc x
-  //SEG34 [15] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@13 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG34 [15] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp x
-    bne b13_from_b10
-    jmp b6_from_b10
-  //SEG35 [16] phi from main::@10 to main::@13 [phi:main::@10->main::@13]
-  b13_from_b10:
-    jmp b13
-  //SEG36 main::@13
-  b13:
-  //SEG37 [5] phi from main::@13 to main::@6 [phi:main::@13->main::@6]
-  b6_from_b13:
-  //SEG38 [5] phi (byte) main::x#6 = (byte) main::x#1 [phi:main::@13->main::@6#0] -- register_copy 
+    bne b6_from_b5
+    jmp b1_from_b5
+  //SEG35 [16] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
     jmp b6
+  //SEG36 main::@6
+  b6:
+  //SEG37 [5] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG38 [5] phi (byte) main::x#6 = (byte) main::x#1 [phi:main::@6->main::@1#0] -- register_copy 
+    jmp b1
 }
 //SEG39 irq
 irq: {
@@ -495,15 +502,15 @@ bbegin:
 //SEG4 [0] (byte) col1#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col1
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG6 @2
-b2:
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG6 @1
+b1:
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -515,37 +522,37 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  //SEG12 [5] phi from main main::@10 to main::@6 [phi:main/main::@10->main::@6]
-  b6_from_main:
-  b6_from_b10:
-  //SEG13 [5] phi (byte) main::x#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@10->main::@6#0] -- vbuxx=vbuc1 
+  //SEG12 [5] phi from main main::@5 to main::@1 [phi:main/main::@5->main::@1]
+  b1_from_main:
+  b1_from_b5:
+  //SEG13 [5] phi (byte) main::x#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@5->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b6
-  //SEG14 main::@6
-  b6:
-  //SEG15 [6] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-  //SEG16 [6] phi (byte) main::y#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@7#0] -- vbuz1=vbuc1 
+    jmp b1
+  //SEG14 main::@1
+  b1:
+  //SEG15 [6] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG16 [6] phi (byte) main::y#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta y
-    jmp b7
-  //SEG17 [6] phi from main::@9 to main::@7 [phi:main::@9->main::@7]
-  b7_from_b9:
-  //SEG18 [6] phi (byte) main::y#4 = (byte) main::y#1 [phi:main::@9->main::@7#0] -- register_copy 
-    jmp b7
-  //SEG19 main::@7
-  b7:
-  //SEG20 [7] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-  //SEG21 [7] phi (byte) main::a#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#0] -- vbuyy=vbuc1 
+    jmp b2
+  //SEG17 [6] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG18 [6] phi (byte) main::y#4 = (byte) main::y#1 [phi:main::@4->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG19 main::@2
+  b2:
+  //SEG20 [7] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG21 [7] phi (byte) main::a#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuyy=vbuc1 
     ldy #0
-    jmp b8
-  //SEG22 [7] phi from main::@8 to main::@8 [phi:main::@8->main::@8]
-  b8_from_b8:
-  //SEG23 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@8->main::@8#0] -- register_copy 
-    jmp b8
-  //SEG24 main::@8
-  b8:
+    jmp b3
+  //SEG22 [7] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
+  b3_from_b3:
+  //SEG23 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@3->main::@3#0] -- register_copy 
+    jmp b3
+  //SEG24 main::@3
+  b3:
   //SEG25 [8] (byte~) main::$1 ← (byte) main::a#2 + (byte) main::y#4 -- vbuaa=vbuyy_plus_vbuz1 
     tya
     clc
@@ -554,36 +561,36 @@ main: {
     sta SCREEN,x
   //SEG27 [10] (byte) main::a#1 ← ++ (byte) main::a#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG28 [11] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG28 [11] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$b
-    bne b8_from_b8
-    jmp b9
-  //SEG29 main::@9
-  b9:
+    bne b3_from_b3
+    jmp b4
+  //SEG29 main::@4
+  b4:
   //SEG30 [12] (byte) main::y#1 ← ++ (byte) main::y#4 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG31 [13] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG31 [13] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp y
-    bne b7_from_b9
-    jmp b10
-  //SEG32 main::@10
-  b10:
+    bne b2_from_b4
+    jmp b5
+  //SEG32 main::@5
+  b5:
   //SEG33 [14] (byte) main::x#1 ← ++ (byte) main::x#6 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG34 [15] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@13 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG34 [15] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b13_from_b10
-    jmp b6_from_b10
-  //SEG35 [16] phi from main::@10 to main::@13 [phi:main::@10->main::@13]
-  b13_from_b10:
-    jmp b13
-  //SEG36 main::@13
-  b13:
-  //SEG37 [5] phi from main::@13 to main::@6 [phi:main::@13->main::@6]
-  b6_from_b13:
-  //SEG38 [5] phi (byte) main::x#6 = (byte) main::x#1 [phi:main::@13->main::@6#0] -- register_copy 
+    bne b6_from_b5
+    jmp b1_from_b5
+  //SEG35 [16] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
     jmp b6
+  //SEG36 main::@6
+  b6:
+  //SEG37 [5] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG38 [5] phi (byte) main::x#6 = (byte) main::x#1 [phi:main::@6->main::@1#0] -- register_copy 
+    jmp b1
 }
 //SEG39 irq
 irq: {
@@ -607,49 +614,49 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
 Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b10
-Removing instruction jmp b13
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b8_from_b8 with b8
-Replacing label b7_from_b9 with b7
-Replacing label b13_from_b10 with b13
-Removing instruction b2_from_bbegin:
-Removing instruction bend_from_b2:
-Removing instruction b6_from_main:
-Removing instruction b7_from_b6:
-Removing instruction b7_from_b9:
-Removing instruction b8_from_b7:
-Removing instruction b8_from_b8:
-Removing instruction b13_from_b10:
-Removing instruction b6_from_b13:
+Replacing label b3_from_b3 with b3
+Replacing label b2_from_b4 with b2
+Replacing label b6_from_b5 with b6
+Removing instruction b1_from_bbegin:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_main:
+Removing instruction b2_from_b1:
+Removing instruction b2_from_b4:
+Removing instruction b3_from_b2:
+Removing instruction b3_from_b3:
+Removing instruction b6_from_b5:
+Removing instruction b1_from_b6:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction bend:
-Removing instruction b9:
-Removing instruction b10:
+Removing instruction b4:
+Removing instruction b5:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Skipping double jump to b6 in bne b13
+Skipping double jump to b1 in bne b6
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b6_from_b10 to b1
+Relabelling long label b1_from_b5 to b4
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b7
-Removing instruction jmp b8
+Removing instruction jmp b2
+Removing instruction jmp b3
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b13:
+Removing instruction b6:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing unreachable instruction jmp b6
+Removing unreachable instruction jmp b1
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) CIA1_INTERRUPT
@@ -666,12 +673,12 @@ interrupt(KERNEL_MIN)(void()) irq()
 (label) irq::@return
 (void()) main()
 (byte~) main::$1 reg byte a 20002.0
-(label) main::@10
-(label) main::@13
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
-(label) main::@7
-(label) main::@8
-(label) main::@9
 (byte) main::a
 (byte) main::a#1 reg byte y 15001.5
 (byte) main::a#2 reg byte y 10001.0
@@ -708,11 +715,11 @@ bbegin:
 //SEG4 [0] (byte) col1#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col1
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG6 @2
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG6 @1
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -722,27 +729,27 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  //SEG12 [5] phi from main main::@10 to main::@6 [phi:main/main::@10->main::@6]
-  b1:
-  //SEG13 [5] phi (byte) main::x#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@10->main::@6#0] -- vbuxx=vbuc1 
+  //SEG12 [5] phi from main main::@5 to main::@1 [phi:main/main::@5->main::@1]
+  b4:
+  //SEG13 [5] phi (byte) main::x#6 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@5->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG14 main::@6
-  b6:
-  //SEG15 [6] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  //SEG16 [6] phi (byte) main::y#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@7#0] -- vbuz1=vbuc1 
+  //SEG14 main::@1
+  b1:
+  //SEG15 [6] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG16 [6] phi (byte) main::y#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta y
-  //SEG17 [6] phi from main::@9 to main::@7 [phi:main::@9->main::@7]
-  //SEG18 [6] phi (byte) main::y#4 = (byte) main::y#1 [phi:main::@9->main::@7#0] -- register_copy 
-  //SEG19 main::@7
-  b7:
-  //SEG20 [7] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  //SEG21 [7] phi (byte) main::a#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#0] -- vbuyy=vbuc1 
+  //SEG17 [6] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  //SEG18 [6] phi (byte) main::y#4 = (byte) main::y#1 [phi:main::@4->main::@2#0] -- register_copy 
+  //SEG19 main::@2
+  b2:
+  //SEG20 [7] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  //SEG21 [7] phi (byte) main::a#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG22 [7] phi from main::@8 to main::@8 [phi:main::@8->main::@8]
-  //SEG23 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@8->main::@8#0] -- register_copy 
-  //SEG24 main::@8
-  b8:
+  //SEG22 [7] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
+  //SEG23 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@3->main::@3#0] -- register_copy 
+  //SEG24 main::@3
+  b3:
   //SEG25 [8] (byte~) main::$1 ← (byte) main::a#2 + (byte) main::y#4 -- vbuaa=vbuyy_plus_vbuz1 
     tya
     clc
@@ -751,27 +758,27 @@ main: {
     sta SCREEN,x
   //SEG27 [10] (byte) main::a#1 ← ++ (byte) main::a#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG28 [11] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG28 [11] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$b
-    bne b8
-  //SEG29 main::@9
+    bne b3
+  //SEG29 main::@4
   //SEG30 [12] (byte) main::y#1 ← ++ (byte) main::y#4 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG31 [13] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG31 [13] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp y
-    bne b7
-  //SEG32 main::@10
+    bne b2
+  //SEG32 main::@5
   //SEG33 [14] (byte) main::x#1 ← ++ (byte) main::x#6 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG34 [15] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@13 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG34 [15] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b6
-    jmp b1
-  //SEG35 [16] phi from main::@10 to main::@13 [phi:main::@10->main::@13]
-  //SEG36 main::@13
-  //SEG37 [5] phi from main::@13 to main::@6 [phi:main::@13->main::@6]
-  //SEG38 [5] phi (byte) main::x#6 = (byte) main::x#1 [phi:main::@13->main::@6#0] -- register_copy 
+    bne b1
+    jmp b4
+  //SEG35 [16] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  //SEG36 main::@6
+  //SEG37 [5] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  //SEG38 [5] phi (byte) main::x#6 = (byte) main::x#1 [phi:main::@6->main::@1#0] -- register_copy 
 }
 //SEG39 irq
 irq: {
diff --git a/src/test/ref/interrupt-volatile-reuse-problem2.sym b/src/test/ref/interrupt-volatile-reuse-problem2.sym
index 2cd53f33b..51eac79f1 100644
--- a/src/test/ref/interrupt-volatile-reuse-problem2.sym
+++ b/src/test/ref/interrupt-volatile-reuse-problem2.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) CIA1_INTERRUPT
@@ -15,12 +15,12 @@ interrupt(KERNEL_MIN)(void()) irq()
 (label) irq::@return
 (void()) main()
 (byte~) main::$1 reg byte a 20002.0
-(label) main::@10
-(label) main::@13
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
-(label) main::@7
-(label) main::@8
-(label) main::@9
 (byte) main::a
 (byte) main::a#1 reg byte y 15001.5
 (byte) main::a#2 reg byte y 10001.0
diff --git a/src/test/ref/irq-hardware-clobber-jsr.asm b/src/test/ref/irq-hardware-clobber-jsr.asm
index 7dbe92d6f..9f899ba89 100644
--- a/src/test/ref/irq-hardware-clobber-jsr.asm
+++ b/src/test/ref/irq-hardware-clobber-jsr.asm
@@ -54,9 +54,9 @@ main: {
     lda #>irq
     sta HARDWARE_IRQ+1
     cli
-  b2:
+  b1:
     inc BORDERCOL
-    jmp b2
+    jmp b1
 }
 // Interrupt Routine
 irq: {
diff --git a/src/test/ref/irq-hardware-clobber-jsr.cfg b/src/test/ref/irq-hardware-clobber-jsr.cfg
index b684674ed..a82bf0aff 100644
--- a/src/test/ref/irq-hardware-clobber-jsr.cfg
+++ b/src/test/ref/irq-hardware-clobber-jsr.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@7
-@7: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @7
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @7
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
@@ -17,10 +17,10 @@ main: scope:[main]  from @7
   [10] *((const byte*) IRQ_ENABLE#0) ← (const byte) IRQ_RASTER#0
   [11] *((const void()**) HARDWARE_IRQ#0) ← &interrupt(HARDWARE_CLOBBER)(void()) irq()
   asm { cli  }
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [13] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [14] phi()
   [15] call do_irq 
diff --git a/src/test/ref/irq-hardware-clobber-jsr.log b/src/test/ref/irq-hardware-clobber-jsr.log
index 6d20ef537..94ee60b75 100644
--- a/src/test/ref/irq-hardware-clobber-jsr.log
+++ b/src/test/ref/irq-hardware-clobber-jsr.log
@@ -404,22 +404,24 @@ Calls in [irq] to do_irq:15
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @7 to @1
+Renumbering block main::@2 to main::@1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @7
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of irq
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@7
-@7: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @7
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @7
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
@@ -429,10 +431,10 @@ main: scope:[main]  from @7
   [10] *((const byte*) IRQ_ENABLE#0) ← (const byte) IRQ_RASTER#0
   [11] *((const void()**) HARDWARE_IRQ#0) ← &interrupt(HARDWARE_CLOBBER)(void()) irq()
   asm { cli  }
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [13] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [14] phi()
   [15] call do_irq 
@@ -574,15 +576,15 @@ INITIAL ASM
   .const WHITE = 1
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-b7_from_bbegin:
-  jmp b7
-//SEG5 @7
-b7:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @7 to @end [phi:@7->@end]
-bend_from_b7:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -621,12 +623,12 @@ main: {
     sta HARDWARE_IRQ+1
   //SEG18 asm { cli  }
     cli
-    jmp b2
-  //SEG19 main::@2
-  b2:
+    jmp b1
+  //SEG19 main::@1
+  b1:
   //SEG20 [13] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-    jmp b2
+    jmp b1
 }
 //SEG21 irq
 // Interrupt Routine
@@ -736,15 +738,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const WHITE = 1
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-b7_from_bbegin:
-  jmp b7
-//SEG5 @7
-b7:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @7 to @end [phi:@7->@end]
-bend_from_b7:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -783,12 +785,12 @@ main: {
     sta HARDWARE_IRQ+1
   //SEG18 asm { cli  }
     cli
-    jmp b2
-  //SEG19 main::@2
-  b2:
+    jmp b1
+  //SEG19 main::@1
+  b1:
   //SEG20 [13] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-    jmp b2
+    jmp b1
 }
 //SEG21 irq
 // Interrupt Routine
@@ -825,15 +827,15 @@ do_irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b7
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b7_from_bbegin:
-Removing instruction b7:
-Removing instruction bend_from_b7:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Removing instruction breturn:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
@@ -846,7 +848,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @7
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -949,7 +951,7 @@ FINAL SYMBOL TABLE
 interrupt(HARDWARE_CLOBBER)(void()) irq()
 (label) irq::@return
 (void()) main()
-(label) main::@2
+(label) main::@1
 
 
 
@@ -991,10 +993,10 @@ Score: 224
   .const BLACK = 0
   .const WHITE = 1
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-//SEG5 @7
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @7 to @end [phi:@7->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -1031,11 +1033,11 @@ main: {
     sta HARDWARE_IRQ+1
   //SEG18 asm { cli  }
     cli
-  //SEG19 main::@2
-  b2:
+  //SEG19 main::@1
+  b1:
   //SEG20 [13] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-    jmp b2
+    jmp b1
 }
 //SEG21 irq
 // Interrupt Routine
diff --git a/src/test/ref/irq-hardware-clobber-jsr.sym b/src/test/ref/irq-hardware-clobber-jsr.sym
index 5b5b15315..074f7aaf1 100644
--- a/src/test/ref/irq-hardware-clobber-jsr.sym
+++ b/src/test/ref/irq-hardware-clobber-jsr.sym
@@ -1,4 +1,4 @@
-(label) @7
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -101,5 +101,5 @@
 interrupt(HARDWARE_CLOBBER)(void()) irq()
 (label) irq::@return
 (void()) main()
-(label) main::@2
+(label) main::@1
 
diff --git a/src/test/ref/irq-hardware-clobber.asm b/src/test/ref/irq-hardware-clobber.asm
index 548a6bc1f..11c740d1c 100644
--- a/src/test/ref/irq-hardware-clobber.asm
+++ b/src/test/ref/irq-hardware-clobber.asm
@@ -48,9 +48,9 @@ main: {
     lda #>irq
     sta HARDWARE_IRQ+1
     cli
-  b2:
+  b1:
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 // Interrupt Routine
 irq: {
diff --git a/src/test/ref/irq-hardware-clobber.cfg b/src/test/ref/irq-hardware-clobber.cfg
index e79885038..c089a6983 100644
--- a/src/test/ref/irq-hardware-clobber.cfg
+++ b/src/test/ref/irq-hardware-clobber.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
@@ -17,10 +17,10 @@ main: scope:[main]  from @2
   [10] *((const byte*) IRQ_ENABLE#0) ← (const byte) IRQ_RASTER#0
   [11] *((const void()**) HARDWARE_IRQ#0) ← &interrupt(HARDWARE_CLOBBER)(void()) irq()
   asm { cli  }
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [13] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0)
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [14] *((const byte*) BGCOL#0) ← (const byte) WHITE#0
   [15] *((const byte*) BGCOL#0) ← (const byte) BLACK#0
diff --git a/src/test/ref/irq-hardware-clobber.log b/src/test/ref/irq-hardware-clobber.log
index 2855987b8..cdd04fdcc 100644
--- a/src/test/ref/irq-hardware-clobber.log
+++ b/src/test/ref/irq-hardware-clobber.log
@@ -153,21 +153,23 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
+Renumbering block main::@2 to main::@1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
@@ -177,10 +179,10 @@ main: scope:[main]  from @2
   [10] *((const byte*) IRQ_ENABLE#0) ← (const byte) IRQ_RASTER#0
   [11] *((const void()**) HARDWARE_IRQ#0) ← &interrupt(HARDWARE_CLOBBER)(void()) irq()
   asm { cli  }
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [13] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0)
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [14] *((const byte*) BGCOL#0) ← (const byte) WHITE#0
   [15] *((const byte*) BGCOL#0) ← (const byte) BLACK#0
@@ -248,15 +250,15 @@ INITIAL ASM
   .const PROCPORT_RAM_IO = $35
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -296,12 +298,12 @@ main: {
     sta HARDWARE_IRQ+1
   //SEG18 asm { cli  }
     cli
-    jmp b2
-  //SEG19 main::@2
-  b2:
+    jmp b1
+  //SEG19 main::@1
+  b1:
   //SEG20 [13] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG21 irq
 // Interrupt Routine
@@ -392,15 +394,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const PROCPORT_RAM_IO = $35
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -440,12 +442,12 @@ main: {
     sta HARDWARE_IRQ+1
   //SEG18 asm { cli  }
     cli
-    jmp b2
-  //SEG19 main::@2
-  b2:
+    jmp b1
+  //SEG19 main::@1
+  b1:
   //SEG20 [13] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG21 irq
 // Interrupt Routine
@@ -472,14 +474,14 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Removing instruction breturn:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
@@ -491,7 +493,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -533,7 +535,7 @@ FINAL SYMBOL TABLE
 interrupt(HARDWARE_CLOBBER)(void()) irq()
 (label) irq::@return
 (void()) main()
-(label) main::@2
+(label) main::@1
 
 
 
@@ -568,10 +570,10 @@ Score: 212
   // RAM in $A000, $E000 I/O in $D000
   .const PROCPORT_RAM_IO = $35
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 // RAM in $A000, $E000 CHAR ROM in $D000
@@ -609,11 +611,11 @@ main: {
     sta HARDWARE_IRQ+1
   //SEG18 asm { cli  }
     cli
-  //SEG19 main::@2
-  b2:
+  //SEG19 main::@1
+  b1:
   //SEG20 [13] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG21 irq
 // Interrupt Routine
diff --git a/src/test/ref/irq-hardware-clobber.sym b/src/test/ref/irq-hardware-clobber.sym
index e1ad26d8e..e0d3d1181 100644
--- a/src/test/ref/irq-hardware-clobber.sym
+++ b/src/test/ref/irq-hardware-clobber.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -40,5 +40,5 @@
 interrupt(HARDWARE_CLOBBER)(void()) irq()
 (label) irq::@return
 (void()) main()
-(label) main::@2
+(label) main::@1
 
diff --git a/src/test/ref/irq-hardware.asm b/src/test/ref/irq-hardware.asm
index 57ae92680..61d983071 100644
--- a/src/test/ref/irq-hardware.asm
+++ b/src/test/ref/irq-hardware.asm
@@ -48,9 +48,9 @@ main: {
     lda #>irq
     sta HARDWARE_IRQ+1
     cli
-  b2:
+  b1:
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 // Interrupt Routine
 irq: {
diff --git a/src/test/ref/irq-hardware.cfg b/src/test/ref/irq-hardware.cfg
index 194711b65..b4c2d6bb7 100644
--- a/src/test/ref/irq-hardware.cfg
+++ b/src/test/ref/irq-hardware.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
@@ -17,10 +17,10 @@ main: scope:[main]  from @2
   [10] *((const byte*) IRQ_ENABLE#0) ← (const byte) IRQ_RASTER#0
   [11] *((const void()**) HARDWARE_IRQ#0) ← &interrupt(HARDWARE_ALL)(void()) irq()
   asm { cli  }
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [13] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0)
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [14] *((const byte*) BGCOL#0) ← (const byte) WHITE#0
   [15] *((const byte*) BGCOL#0) ← (const byte) BLACK#0
diff --git a/src/test/ref/irq-hardware.log b/src/test/ref/irq-hardware.log
index 114f92c4c..ad42230e6 100644
--- a/src/test/ref/irq-hardware.log
+++ b/src/test/ref/irq-hardware.log
@@ -153,21 +153,23 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
+Renumbering block main::@2 to main::@1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
@@ -177,10 +179,10 @@ main: scope:[main]  from @2
   [10] *((const byte*) IRQ_ENABLE#0) ← (const byte) IRQ_RASTER#0
   [11] *((const void()**) HARDWARE_IRQ#0) ← &interrupt(HARDWARE_ALL)(void()) irq()
   asm { cli  }
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [13] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0)
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [14] *((const byte*) BGCOL#0) ← (const byte) WHITE#0
   [15] *((const byte*) BGCOL#0) ← (const byte) BLACK#0
@@ -248,15 +250,15 @@ INITIAL ASM
   .const PROCPORT_RAM_IO = $35
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -296,12 +298,12 @@ main: {
     sta HARDWARE_IRQ+1
   //SEG18 asm { cli  }
     cli
-    jmp b2
-  //SEG19 main::@2
-  b2:
+    jmp b1
+  //SEG19 main::@1
+  b1:
   //SEG20 [13] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG21 irq
 // Interrupt Routine
@@ -385,15 +387,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const PROCPORT_RAM_IO = $35
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -433,12 +435,12 @@ main: {
     sta HARDWARE_IRQ+1
   //SEG18 asm { cli  }
     cli
-    jmp b2
-  //SEG19 main::@2
-  b2:
+    jmp b1
+  //SEG19 main::@1
+  b1:
   //SEG20 [13] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG21 irq
 // Interrupt Routine
@@ -471,14 +473,14 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Removing instruction breturn:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
@@ -490,7 +492,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -532,7 +534,7 @@ FINAL SYMBOL TABLE
 interrupt(HARDWARE_ALL)(void()) irq()
 (label) irq::@return
 (void()) main()
-(label) main::@2
+(label) main::@1
 
 
 
@@ -567,10 +569,10 @@ Score: 296
   // RAM in $A000, $E000 I/O in $D000
   .const PROCPORT_RAM_IO = $35
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 // RAM in $A000, $E000 CHAR ROM in $D000
@@ -608,11 +610,11 @@ main: {
     sta HARDWARE_IRQ+1
   //SEG18 asm { cli  }
     cli
-  //SEG19 main::@2
-  b2:
+  //SEG19 main::@1
+  b1:
   //SEG20 [13] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG21 irq
 // Interrupt Routine
diff --git a/src/test/ref/irq-hardware.sym b/src/test/ref/irq-hardware.sym
index 9e2266705..908a59fbf 100644
--- a/src/test/ref/irq-hardware.sym
+++ b/src/test/ref/irq-hardware.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -40,5 +40,5 @@
 interrupt(HARDWARE_ALL)(void()) irq()
 (label) irq::@return
 (void()) main()
-(label) main::@2
+(label) main::@1
 
diff --git a/src/test/ref/irq-idx-problem.cfg b/src/test/ref/irq-idx-problem.cfg
index 30ac2b231..db561bf41 100644
--- a/src/test/ref/irq-idx-problem.cfg
+++ b/src/test/ref/irq-idx-problem.cfg
@@ -1,16 +1,16 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] (byte) irq_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@6
-@6: scope:[]  from @5
+  to:@2
+@2: scope:[]  from @1
   [2] phi()
   [3] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @2
   [4] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @2
   asm { sei  }
   [6] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
   [7] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
@@ -32,22 +32,22 @@ table_driven_irq::@1: scope:[table_driven_irq]  from table_driven_irq table_driv
   [17] (byte) table_driven_irq::val#0 ← *((const byte[]) IRQ_CHANGE_VAL#0 + (byte) irq_idx#4)
   [18] (byte) irq_idx#1 ← ++ (byte) irq_idx#4
   [19] if((byte) table_driven_irq::idx#0<(const byte) VIC_SIZE#0) goto table_driven_irq::@2
-  to:table_driven_irq::@9
-table_driven_irq::@9: scope:[table_driven_irq]  from table_driven_irq::@1
+  to:table_driven_irq::@4
+table_driven_irq::@4: scope:[table_driven_irq]  from table_driven_irq::@1
   [20] if((byte) table_driven_irq::idx#0<(const byte) VIC_SIZE#0+(byte/signed byte/word/signed word/dword/signed dword) 8) goto table_driven_irq::@3
-  to:table_driven_irq::@10
-table_driven_irq::@10: scope:[table_driven_irq]  from table_driven_irq::@9
+  to:table_driven_irq::@5
+table_driven_irq::@5: scope:[table_driven_irq]  from table_driven_irq::@4
   [21] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
   [22] *((const byte*) RASTER#0) ← (byte) table_driven_irq::val#0
   [23] if((byte) table_driven_irq::val#0>=*((const byte*) RASTER#0)) goto table_driven_irq::@return
-  to:table_driven_irq::@11
-table_driven_irq::@11: scope:[table_driven_irq]  from table_driven_irq::@10
+  to:table_driven_irq::@6
+table_driven_irq::@6: scope:[table_driven_irq]  from table_driven_irq::@5
   [24] (byte) irq_idx#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:table_driven_irq::@return
-table_driven_irq::@return: scope:[table_driven_irq]  from table_driven_irq::@10 table_driven_irq::@11
+table_driven_irq::@return: scope:[table_driven_irq]  from table_driven_irq::@5 table_driven_irq::@6
   [25] return 
   to:@return
-table_driven_irq::@3: scope:[table_driven_irq]  from table_driven_irq::@9
+table_driven_irq::@3: scope:[table_driven_irq]  from table_driven_irq::@4
   [26] *((const byte*) SCREEN#0+-(const byte) VIC_SIZE#0+(word/signed word/dword/signed dword) $3f8 + (byte) table_driven_irq::idx#0) ← (byte) table_driven_irq::val#0
   to:table_driven_irq::@1
 table_driven_irq::@2: scope:[table_driven_irq]  from table_driven_irq::@1
diff --git a/src/test/ref/irq-idx-problem.log b/src/test/ref/irq-idx-problem.log
index 6c6d49bdb..7e8e654f4 100644
--- a/src/test/ref/irq-idx-problem.log
+++ b/src/test/ref/irq-idx-problem.log
@@ -535,25 +535,30 @@ Coalesced [14] irq_idx#14 ← irq_idx#0
 Coalesced [27] irq_idx#16 ← irq_idx#1
 Coalesced (already) [29] irq_idx#15 ← irq_idx#1
 Coalesced down to 1 phi equivalence classes
+Renumbering block @5 to @1
+Renumbering block @6 to @2
+Renumbering block table_driven_irq::@9 to table_driven_irq::@4
+Renumbering block table_driven_irq::@10 to table_driven_irq::@5
+Renumbering block table_driven_irq::@11 to table_driven_irq::@6
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @6
+Adding NOP phi() at start of @2
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of table_driven_irq
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] (byte) irq_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@6
-@6: scope:[]  from @5
+  to:@2
+@2: scope:[]  from @1
   [2] phi()
   [3] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @2
   [4] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @2
   asm { sei  }
   [6] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
   [7] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
@@ -575,22 +580,22 @@ table_driven_irq::@1: scope:[table_driven_irq]  from table_driven_irq table_driv
   [17] (byte) table_driven_irq::val#0 ← *((const byte[]) IRQ_CHANGE_VAL#0 + (byte) irq_idx#4)
   [18] (byte) irq_idx#1 ← ++ (byte) irq_idx#4
   [19] if((byte) table_driven_irq::idx#0<(const byte) VIC_SIZE#0) goto table_driven_irq::@2
-  to:table_driven_irq::@9
-table_driven_irq::@9: scope:[table_driven_irq]  from table_driven_irq::@1
+  to:table_driven_irq::@4
+table_driven_irq::@4: scope:[table_driven_irq]  from table_driven_irq::@1
   [20] if((byte) table_driven_irq::idx#0<(const byte) VIC_SIZE#0+(byte/signed byte/word/signed word/dword/signed dword) 8) goto table_driven_irq::@3
-  to:table_driven_irq::@10
-table_driven_irq::@10: scope:[table_driven_irq]  from table_driven_irq::@9
+  to:table_driven_irq::@5
+table_driven_irq::@5: scope:[table_driven_irq]  from table_driven_irq::@4
   [21] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
   [22] *((const byte*) RASTER#0) ← (byte) table_driven_irq::val#0
   [23] if((byte) table_driven_irq::val#0>=*((const byte*) RASTER#0)) goto table_driven_irq::@return
-  to:table_driven_irq::@11
-table_driven_irq::@11: scope:[table_driven_irq]  from table_driven_irq::@10
+  to:table_driven_irq::@6
+table_driven_irq::@6: scope:[table_driven_irq]  from table_driven_irq::@5
   [24] (byte) irq_idx#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:table_driven_irq::@return
-table_driven_irq::@return: scope:[table_driven_irq]  from table_driven_irq::@10 table_driven_irq::@11
+table_driven_irq::@return: scope:[table_driven_irq]  from table_driven_irq::@5 table_driven_irq::@6
   [25] return 
   to:@return
-table_driven_irq::@3: scope:[table_driven_irq]  from table_driven_irq::@9
+table_driven_irq::@3: scope:[table_driven_irq]  from table_driven_irq::@4
   [26] *((const byte*) SCREEN#0+-(const byte) VIC_SIZE#0+(word/signed word/dword/signed dword) $3f8 + (byte) table_driven_irq::idx#0) ← (byte) table_driven_irq::val#0
   to:table_driven_irq::@1
 table_driven_irq::@2: scope:[table_driven_irq]  from table_driven_irq::@1
@@ -741,21 +746,21 @@ INITIAL ASM
   .label irq_idx_2 = 5
 //SEG3 @begin
 bbegin:
-  jmp b5
-//SEG4 @5
-b5:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 [1] (byte) irq_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta irq_idx
-//SEG6 [2] phi from @5 to @6 [phi:@5->@6]
-b6_from_b5:
-  jmp b6
-//SEG7 @6
-b6:
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG7 @2
+b2:
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG10 @end
 bend:
@@ -824,16 +829,16 @@ table_driven_irq: {
     lda idx
     cmp #VIC_SIZE
     bcc b2
-    jmp b9
-  //SEG31 table_driven_irq::@9
-  b9:
+    jmp b4
+  //SEG31 table_driven_irq::@4
+  b4:
   //SEG32 [20] if((byte) table_driven_irq::idx#0<(const byte) VIC_SIZE#0+(byte/signed byte/word/signed word/dword/signed dword) 8) goto table_driven_irq::@3 -- vbuz1_lt_vbuc1_then_la1 
     lda idx
     cmp #VIC_SIZE+8
     bcc b3
-    jmp b10
-  //SEG33 table_driven_irq::@10
-  b10:
+    jmp b5
+  //SEG33 table_driven_irq::@5
+  b5:
   //SEG34 [21] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0 -- _deref_pbuc1=vbuc2 
     lda #IRQ_RASTER
     sta IRQ_STATUS
@@ -846,9 +851,9 @@ table_driven_irq: {
     sta $ff
     cpy $ff
     bcs breturn
-    jmp b11
-  //SEG37 table_driven_irq::@11
-  b11:
+    jmp b6
+  //SEG37 table_driven_irq::@6
+  b6:
   //SEG38 [24] (byte) irq_idx#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta irq_idx_2
@@ -952,21 +957,21 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label irq_idx = 2
 //SEG3 @begin
 bbegin:
-  jmp b5
-//SEG4 @5
-b5:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 [1] (byte) irq_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta irq_idx
-//SEG6 [2] phi from @5 to @6 [phi:@5->@6]
-b6_from_b5:
-  jmp b6
-//SEG7 @6
-b6:
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+b2_from_b1:
+  jmp b2
+//SEG7 @2
+b2:
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
+bend_from_b2:
   jmp bend
 //SEG10 @end
 bend:
@@ -1030,15 +1035,15 @@ table_driven_irq: {
   //SEG30 [19] if((byte) table_driven_irq::idx#0<(const byte) VIC_SIZE#0) goto table_driven_irq::@2 -- vbuaa_lt_vbuc1_then_la1 
     cmp #VIC_SIZE
     bcc b2
-    jmp b9
-  //SEG31 table_driven_irq::@9
-  b9:
+    jmp b4
+  //SEG31 table_driven_irq::@4
+  b4:
   //SEG32 [20] if((byte) table_driven_irq::idx#0<(const byte) VIC_SIZE#0+(byte/signed byte/word/signed word/dword/signed dword) 8) goto table_driven_irq::@3 -- vbuaa_lt_vbuc1_then_la1 
     cmp #VIC_SIZE+8
     bcc b3
-    jmp b10
-  //SEG33 table_driven_irq::@10
-  b10:
+    jmp b5
+  //SEG33 table_driven_irq::@5
+  b5:
   //SEG34 [21] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0 -- _deref_pbuc1=vbuc2 
     lda #IRQ_RASTER
     sta IRQ_STATUS
@@ -1049,9 +1054,9 @@ table_driven_irq: {
     sty $ff
     cpx $ff
     bcs breturn
-    jmp b11
-  //SEG37 table_driven_irq::@11
-  b11:
+    jmp b6
+  //SEG37 table_driven_irq::@6
+  b6:
   //SEG38 [24] (byte) irq_idx#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta irq_idx
@@ -1079,14 +1084,14 @@ table_driven_irq: {
   IRQ_CHANGE_IDX: .byte $20, $21, IRQ_CHANGE_NEXT, $20, $21, IRQ_CHANGE_NEXT, $20, $21, IRQ_CHANGE_NEXT, $20, $21, IRQ_CHANGE_NEXT
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b5
-Removing instruction jmp b6
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b9
-Removing instruction jmp b10
-Removing instruction jmp b11
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #IRQ_RASTER
@@ -1094,19 +1099,19 @@ Removing instruction ldy irq_idx
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b1_from_b3 with b1
 Replacing label b1_from_b2 with b1
-Removing instruction b5:
-Removing instruction b6_from_b5:
-Removing instruction bend_from_b6:
+Removing instruction b1:
+Removing instruction b2_from_b1:
+Removing instruction bend_from_b2:
 Removing instruction b1_from_table_driven_irq:
 Removing instruction b1_from_b2:
 Removing instruction b1_from_b3:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b6:
+Removing instruction b2:
 Removing instruction bend:
 Removing instruction breturn:
-Removing instruction b9:
-Removing instruction b10:
-Removing instruction b11:
+Removing instruction b4:
+Removing instruction b5:
+Removing instruction b6:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Skipping double jump to $ea81 in bcs breturn
 Succesful ASM optimization Pass5DoubleJumpElimination
@@ -1115,8 +1120,8 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Fixing long branch [67] bcs $ea81 to bcc
 
 FINAL SYMBOL TABLE
-(label) @5
-(label) @6
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -1227,11 +1232,11 @@ FINAL SYMBOL TABLE
 (label) main::@return
 interrupt(KERNEL_MIN)(void()) table_driven_irq()
 (label) table_driven_irq::@1
-(label) table_driven_irq::@10
-(label) table_driven_irq::@11
 (label) table_driven_irq::@2
 (label) table_driven_irq::@3
-(label) table_driven_irq::@9
+(label) table_driven_irq::@4
+(label) table_driven_irq::@5
+(label) table_driven_irq::@6
 (label) table_driven_irq::@return
 (byte) table_driven_irq::idx
 (byte) table_driven_irq::idx#0 reg byte a 11.0
@@ -1274,15 +1279,15 @@ Score: 598
   .label irq_idx = 2
 //SEG3 @begin
 bbegin:
-//SEG4 @5
+//SEG4 @1
 //SEG5 [1] (byte) irq_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta irq_idx
-//SEG6 [2] phi from @5 to @6 [phi:@5->@6]
-//SEG7 @6
+//SEG6 [2] phi from @1 to @2 [phi:@1->@2]
+//SEG7 @2
 //SEG8 [3] call main 
   jsr main
-//SEG9 [4] phi from @6 to @end [phi:@6->@end]
+//SEG9 [4] phi from @2 to @end [phi:@2->@end]
 //SEG10 @end
 //SEG11 main
 main: {
@@ -1336,11 +1341,11 @@ table_driven_irq: {
   //SEG30 [19] if((byte) table_driven_irq::idx#0<(const byte) VIC_SIZE#0) goto table_driven_irq::@2 -- vbuaa_lt_vbuc1_then_la1 
     cmp #VIC_SIZE
     bcc b2
-  //SEG31 table_driven_irq::@9
+  //SEG31 table_driven_irq::@4
   //SEG32 [20] if((byte) table_driven_irq::idx#0<(const byte) VIC_SIZE#0+(byte/signed byte/word/signed word/dword/signed dword) 8) goto table_driven_irq::@3 -- vbuaa_lt_vbuc1_then_la1 
     cmp #VIC_SIZE+8
     bcc b3
-  //SEG33 table_driven_irq::@10
+  //SEG33 table_driven_irq::@5
   //SEG34 [21] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0 -- _deref_pbuc1=vbuc2 
     lda #IRQ_RASTER
     sta IRQ_STATUS
@@ -1353,7 +1358,7 @@ table_driven_irq: {
     bcc !_ea81+
     jmp $ea81
   !_ea81:
-  //SEG37 table_driven_irq::@11
+  //SEG37 table_driven_irq::@6
   //SEG38 [24] (byte) irq_idx#2 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta irq_idx
diff --git a/src/test/ref/irq-idx-problem.sym b/src/test/ref/irq-idx-problem.sym
index 0cc035220..27677b862 100644
--- a/src/test/ref/irq-idx-problem.sym
+++ b/src/test/ref/irq-idx-problem.sym
@@ -1,5 +1,5 @@
-(label) @5
-(label) @6
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -110,11 +110,11 @@
 (label) main::@return
 interrupt(KERNEL_MIN)(void()) table_driven_irq()
 (label) table_driven_irq::@1
-(label) table_driven_irq::@10
-(label) table_driven_irq::@11
 (label) table_driven_irq::@2
 (label) table_driven_irq::@3
-(label) table_driven_irq::@9
+(label) table_driven_irq::@4
+(label) table_driven_irq::@5
+(label) table_driven_irq::@6
 (label) table_driven_irq::@return
 (byte) table_driven_irq::idx
 (byte) table_driven_irq::idx#0 reg byte a 11.0
diff --git a/src/test/ref/irq-kernel-minimal.cfg b/src/test/ref/irq-kernel-minimal.cfg
index 08ea82c63..b221dd488 100644
--- a/src/test/ref/irq-kernel-minimal.cfg
+++ b/src/test/ref/irq-kernel-minimal.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_KEYBOARD)(void()) irq()
   asm { cli  }
diff --git a/src/test/ref/irq-kernel-minimal.log b/src/test/ref/irq-kernel-minimal.log
index b9561475a..0f79a5d67 100644
--- a/src/test/ref/irq-kernel-minimal.log
+++ b/src/test/ref/irq-kernel-minimal.log
@@ -369,21 +369,22 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @6 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @6
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_KEYBOARD)(void()) irq()
   asm { cli  }
@@ -502,15 +503,15 @@ INITIAL ASM
   .const WHITE = 1
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -579,15 +580,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const WHITE = 1
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -627,14 +628,14 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b6
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b6_from_bbegin:
-Removing instruction b6:
-Removing instruction bend_from_b6:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction breturn:
@@ -647,7 +648,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -757,10 +758,10 @@ Score: 37
   .const BLACK = 0
   .const WHITE = 1
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-//SEG5 @6
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @6 to @end [phi:@6->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 // Setup the IRQ routine
diff --git a/src/test/ref/irq-kernel-minimal.sym b/src/test/ref/irq-kernel-minimal.sym
index 245f71ac7..4a8fdaec8 100644
--- a/src/test/ref/irq-kernel-minimal.sym
+++ b/src/test/ref/irq-kernel-minimal.sym
@@ -1,4 +1,4 @@
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
diff --git a/src/test/ref/irq-kernel.cfg b/src/test/ref/irq-kernel.cfg
index efbd1cfc3..ae7ec2d9d 100644
--- a/src/test/ref/irq-kernel.cfg
+++ b/src/test/ref/irq-kernel.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
   [6] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) | (byte/word/signed word/dword/signed dword) $80
diff --git a/src/test/ref/irq-kernel.log b/src/test/ref/irq-kernel.log
index 0cae776b9..51c46fa94 100644
--- a/src/test/ref/irq-kernel.log
+++ b/src/test/ref/irq-kernel.log
@@ -113,21 +113,22 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
   [6] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) | (byte/word/signed word/dword/signed dword) $80
@@ -191,15 +192,15 @@ INITIAL ASM
   .const CIA_INTERRUPT_CLEAR = $7f
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -298,15 +299,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const CIA_INTERRUPT_CLEAR = $7f
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -366,14 +367,14 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction breturn:
@@ -386,7 +387,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -443,10 +444,10 @@ Score: 71
   .label CIA1_INTERRUPT = $dc0d
   .const CIA_INTERRUPT_CLEAR = $7f
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
diff --git a/src/test/ref/irq-kernel.sym b/src/test/ref/irq-kernel.sym
index 8e6c1b3e5..bfcc2aa81 100644
--- a/src/test/ref/irq-kernel.sym
+++ b/src/test/ref/irq-kernel.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
diff --git a/src/test/ref/irq-local-var-overlap-problem.asm b/src/test/ref/irq-local-var-overlap-problem.asm
index c7bd36a2c..e9502f9f2 100644
--- a/src/test/ref/irq-local-var-overlap-problem.asm
+++ b/src/test/ref/irq-local-var-overlap-problem.asm
@@ -35,16 +35,16 @@ main: {
     lda #>irq
     sta KERNEL_IRQ+1
     cli
-  b1:
+  b4:
     lda #0
     sta i
-  b6:
+  b1:
     lda #0
     sta j
-  b7:
+  b2:
     lda #0
     sta k
-  b8:
+  b3:
     lda i
     clc
     adc j
@@ -55,14 +55,14 @@ main: {
     inc k
     lda #$b
     cmp k
-    bne b8
+    bne b3
     inc j
     cmp j
-    bne b7
+    bne b2
     inc i
     cmp i
-    bne b6
-    jmp b1
+    bne b1
+    jmp b4
 }
 sub_main: {
     .label i = 5
diff --git a/src/test/ref/irq-local-var-overlap-problem.cfg b/src/test/ref/irq-local-var-overlap-problem.cfg
index c0a8343a9..c6287f117 100644
--- a/src/test/ref/irq-local-var-overlap-problem.cfg
+++ b/src/test/ref/irq-local-var-overlap-problem.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @4
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @4
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
   [6] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
@@ -15,36 +15,36 @@ main: scope:[main]  from @4
   [8] *((const byte*) IRQ_ENABLE#0) ← (const byte) IRQ_RASTER#0
   [9] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   asm { cli  }
-  to:main::@6
-main::@6: scope:[main]  from main main::@10 main::@14
-  [11] (byte) main::i#7 ← phi( main::@14/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  to:main::@7
-main::@7: scope:[main]  from main::@6 main::@9
-  [12] (byte) main::j#5 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@9/(byte) main::j#1 )
-  to:main::@8
-main::@8: scope:[main]  from main::@13 main::@7
-  [13] (byte) main::k#2 ← phi( main::@13/(byte) main::k#1 main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@1
+main::@1: scope:[main]  from main main::@5 main::@7
+  [11] (byte) main::i#7 ← phi( main::@7/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@4
+  [12] (byte) main::j#5 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::j#1 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@6
+  [13] (byte) main::k#2 ← phi( main::@6/(byte) main::k#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [14] (byte~) main::$1 ← (byte) main::i#7 + (byte) main::j#5
   [15] (byte~) main::$2 ← (byte~) main::$1 + (byte) main::k#2
   [16] *((const byte*) FGCOL#0) ← (byte~) main::$2
   [17] call sub_main 
-  to:main::@13
-main::@13: scope:[main]  from main::@8
+  to:main::@6
+main::@6: scope:[main]  from main::@3
   [18] (byte) main::k#1 ← ++ (byte) main::k#2
-  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8
-  to:main::@9
-main::@9: scope:[main]  from main::@13
+  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@6
   [20] (byte) main::j#1 ← ++ (byte) main::j#5
-  [21] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  [21] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [22] (byte) main::i#1 ← ++ (byte) main::i#7
-  [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@14
-  to:main::@6
-main::@14: scope:[main]  from main::@10
+  [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7
+  to:main::@1
+main::@7: scope:[main]  from main::@5
   [24] phi()
-  to:main::@6
-sub_main: scope:[sub_main]  from main::@8
+  to:main::@1
+sub_main: scope:[sub_main]  from main::@3
   [25] phi()
   to:sub_main::@1
 sub_main::@1: scope:[sub_main]  from sub_main sub_main::@5
diff --git a/src/test/ref/irq-local-var-overlap-problem.log b/src/test/ref/irq-local-var-overlap-problem.log
index 7939cbadf..2256bbedd 100644
--- a/src/test/ref/irq-local-var-overlap-problem.log
+++ b/src/test/ref/irq-local-var-overlap-problem.log
@@ -547,24 +547,32 @@ Culled Empty Block (label) irq::@10
 Culled Empty Block (label) sub_irq::@7
 Culled Empty Block (label) sub_irq::@8
 Culled Empty Block (label) sub_irq::@9
+Renumbering block @4 to @1
+Renumbering block main::@6 to main::@1
+Renumbering block main::@7 to main::@2
+Renumbering block main::@8 to main::@3
+Renumbering block main::@9 to main::@4
+Renumbering block main::@10 to main::@5
+Renumbering block main::@13 to main::@6
+Renumbering block main::@14 to main::@7
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @4
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
-Adding NOP phi() at start of main::@14
+Adding NOP phi() at start of main::@7
 Adding NOP phi() at start of sub_main
 Adding NOP phi() at start of sub_irq
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @4
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @4
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
   [6] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
@@ -572,36 +580,36 @@ main: scope:[main]  from @4
   [8] *((const byte*) IRQ_ENABLE#0) ← (const byte) IRQ_RASTER#0
   [9] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   asm { cli  }
-  to:main::@6
-main::@6: scope:[main]  from main main::@10 main::@14
-  [11] (byte) main::i#7 ← phi( main::@14/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  to:main::@7
-main::@7: scope:[main]  from main::@6 main::@9
-  [12] (byte) main::j#5 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@9/(byte) main::j#1 )
-  to:main::@8
-main::@8: scope:[main]  from main::@13 main::@7
-  [13] (byte) main::k#2 ← phi( main::@13/(byte) main::k#1 main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@1
+main::@1: scope:[main]  from main main::@5 main::@7
+  [11] (byte) main::i#7 ← phi( main::@7/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@4
+  [12] (byte) main::j#5 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::j#1 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@6
+  [13] (byte) main::k#2 ← phi( main::@6/(byte) main::k#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [14] (byte~) main::$1 ← (byte) main::i#7 + (byte) main::j#5
   [15] (byte~) main::$2 ← (byte~) main::$1 + (byte) main::k#2
   [16] *((const byte*) FGCOL#0) ← (byte~) main::$2
   [17] call sub_main 
-  to:main::@13
-main::@13: scope:[main]  from main::@8
+  to:main::@6
+main::@6: scope:[main]  from main::@3
   [18] (byte) main::k#1 ← ++ (byte) main::k#2
-  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8
-  to:main::@9
-main::@9: scope:[main]  from main::@13
+  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@6
   [20] (byte) main::j#1 ← ++ (byte) main::j#5
-  [21] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  [21] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [22] (byte) main::i#1 ← ++ (byte) main::i#7
-  [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@14
-  to:main::@6
-main::@14: scope:[main]  from main::@10
+  [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7
+  to:main::@1
+main::@7: scope:[main]  from main::@5
   [24] phi()
-  to:main::@6
-sub_main: scope:[sub_main]  from main::@8
+  to:main::@1
+sub_main: scope:[sub_main]  from main::@3
   [25] phi()
   to:sub_main::@1
 sub_main::@1: scope:[sub_main]  from sub_main sub_main::@5
@@ -837,15 +845,15 @@ INITIAL ASM
   .const CIA_INTERRUPT_CLEAR = $7f
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-b4_from_bbegin:
-  jmp b4
-//SEG5 @4
-b4:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @4 to @end [phi:@4->@end]
-bend_from_b4:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -882,39 +890,39 @@ main: {
     sta KERNEL_IRQ+1
   //SEG16 asm { cli  }
     cli
-  //SEG17 [11] phi from main main::@10 to main::@6 [phi:main/main::@10->main::@6]
-  b6_from_main:
-  b6_from_b10:
-  //SEG18 [11] phi (byte) main::i#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@10->main::@6#0] -- vbuz1=vbuc1 
+  //SEG17 [11] phi from main main::@5 to main::@1 [phi:main/main::@5->main::@1]
+  b1_from_main:
+  b1_from_b5:
+  //SEG18 [11] phi (byte) main::i#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@5->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b6
-  //SEG19 main::@6
-  b6:
-  //SEG20 [12] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-  //SEG21 [12] phi (byte) main::j#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@7#0] -- vbuz1=vbuc1 
+    jmp b1
+  //SEG19 main::@1
+  b1:
+  //SEG20 [12] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG21 [12] phi (byte) main::j#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-    jmp b7
-  //SEG22 [12] phi from main::@9 to main::@7 [phi:main::@9->main::@7]
-  b7_from_b9:
-  //SEG23 [12] phi (byte) main::j#5 = (byte) main::j#1 [phi:main::@9->main::@7#0] -- register_copy 
-    jmp b7
-  //SEG24 main::@7
-  b7:
-  //SEG25 [13] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-  //SEG26 [13] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#0] -- vbuz1=vbuc1 
+    jmp b2
+  //SEG22 [12] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG23 [12] phi (byte) main::j#5 = (byte) main::j#1 [phi:main::@4->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG24 main::@2
+  b2:
+  //SEG25 [13] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG26 [13] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta k
-    jmp b8
-  //SEG27 [13] phi from main::@13 to main::@8 [phi:main::@13->main::@8]
-  b8_from_b13:
-  //SEG28 [13] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@13->main::@8#0] -- register_copy 
-    jmp b8
-  //SEG29 main::@8
-  b8:
+    jmp b3
+  //SEG27 [13] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
+  b3_from_b6:
+  //SEG28 [13] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@6->main::@3#0] -- register_copy 
+    jmp b3
+  //SEG29 main::@3
+  b3:
   //SEG30 [14] (byte~) main::$1 ← (byte) main::i#7 + (byte) main::j#5 -- vbuz1=vbuz2_plus_vbuz3 
     lda i
     clc
@@ -929,46 +937,46 @@ main: {
     lda _2
     sta FGCOL
   //SEG33 [17] call sub_main 
-  //SEG34 [25] phi from main::@8 to sub_main [phi:main::@8->sub_main]
-  sub_main_from_b8:
+  //SEG34 [25] phi from main::@3 to sub_main [phi:main::@3->sub_main]
+  sub_main_from_b3:
     jsr sub_main
-    jmp b13
-  //SEG35 main::@13
-  b13:
+    jmp b6
+  //SEG35 main::@6
+  b6:
   //SEG36 [18] (byte) main::k#1 ← ++ (byte) main::k#2 -- vbuz1=_inc_vbuz1 
     inc k
-  //SEG37 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG37 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp k
-    bne b8_from_b13
-    jmp b9
-  //SEG38 main::@9
-  b9:
+    bne b3_from_b6
+    jmp b4
+  //SEG38 main::@4
+  b4:
   //SEG39 [20] (byte) main::j#1 ← ++ (byte) main::j#5 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG40 [21] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG40 [21] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp j
-    bne b7_from_b9
-    jmp b10
-  //SEG41 main::@10
-  b10:
+    bne b2_from_b4
+    jmp b5
+  //SEG41 main::@5
+  b5:
   //SEG42 [22] (byte) main::i#1 ← ++ (byte) main::i#7 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG43 [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@14 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG43 [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp i
-    bne b14_from_b10
-    jmp b6_from_b10
-  //SEG44 [24] phi from main::@10 to main::@14 [phi:main::@10->main::@14]
-  b14_from_b10:
-    jmp b14
-  //SEG45 main::@14
-  b14:
-  //SEG46 [11] phi from main::@14 to main::@6 [phi:main::@14->main::@6]
-  b6_from_b14:
-  //SEG47 [11] phi (byte) main::i#7 = (byte) main::i#1 [phi:main::@14->main::@6#0] -- register_copy 
-    jmp b6
+    bne b7_from_b5
+    jmp b1_from_b5
+  //SEG44 [24] phi from main::@5 to main::@7 [phi:main::@5->main::@7]
+  b7_from_b5:
+    jmp b7
+  //SEG45 main::@7
+  b7:
+  //SEG46 [11] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
+  b1_from_b7:
+  //SEG47 [11] phi (byte) main::i#7 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
+    jmp b1
 }
 //SEG48 sub_main
 sub_main: {
@@ -1366,15 +1374,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const CIA_INTERRUPT_CLEAR = $7f
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-b4_from_bbegin:
-  jmp b4
-//SEG5 @4
-b4:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @4 to @end [phi:@4->@end]
-bend_from_b4:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -1409,39 +1417,39 @@ main: {
     sta KERNEL_IRQ+1
   //SEG16 asm { cli  }
     cli
-  //SEG17 [11] phi from main main::@10 to main::@6 [phi:main/main::@10->main::@6]
-  b6_from_main:
-  b6_from_b10:
-  //SEG18 [11] phi (byte) main::i#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@10->main::@6#0] -- vbuz1=vbuc1 
+  //SEG17 [11] phi from main main::@5 to main::@1 [phi:main/main::@5->main::@1]
+  b1_from_main:
+  b1_from_b5:
+  //SEG18 [11] phi (byte) main::i#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@5->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b6
-  //SEG19 main::@6
-  b6:
-  //SEG20 [12] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-  //SEG21 [12] phi (byte) main::j#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@7#0] -- vbuz1=vbuc1 
+    jmp b1
+  //SEG19 main::@1
+  b1:
+  //SEG20 [12] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG21 [12] phi (byte) main::j#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-    jmp b7
-  //SEG22 [12] phi from main::@9 to main::@7 [phi:main::@9->main::@7]
-  b7_from_b9:
-  //SEG23 [12] phi (byte) main::j#5 = (byte) main::j#1 [phi:main::@9->main::@7#0] -- register_copy 
-    jmp b7
-  //SEG24 main::@7
-  b7:
-  //SEG25 [13] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-  //SEG26 [13] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#0] -- vbuz1=vbuc1 
+    jmp b2
+  //SEG22 [12] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG23 [12] phi (byte) main::j#5 = (byte) main::j#1 [phi:main::@4->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG24 main::@2
+  b2:
+  //SEG25 [13] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG26 [13] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta k
-    jmp b8
-  //SEG27 [13] phi from main::@13 to main::@8 [phi:main::@13->main::@8]
-  b8_from_b13:
-  //SEG28 [13] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@13->main::@8#0] -- register_copy 
-    jmp b8
-  //SEG29 main::@8
-  b8:
+    jmp b3
+  //SEG27 [13] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
+  b3_from_b6:
+  //SEG28 [13] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@6->main::@3#0] -- register_copy 
+    jmp b3
+  //SEG29 main::@3
+  b3:
   //SEG30 [14] (byte~) main::$1 ← (byte) main::i#7 + (byte) main::j#5 -- vbuaa=vbuz1_plus_vbuz2 
     lda i
     clc
@@ -1452,46 +1460,46 @@ main: {
   //SEG32 [16] *((const byte*) FGCOL#0) ← (byte~) main::$2 -- _deref_pbuc1=vbuaa 
     sta FGCOL
   //SEG33 [17] call sub_main 
-  //SEG34 [25] phi from main::@8 to sub_main [phi:main::@8->sub_main]
-  sub_main_from_b8:
+  //SEG34 [25] phi from main::@3 to sub_main [phi:main::@3->sub_main]
+  sub_main_from_b3:
     jsr sub_main
-    jmp b13
-  //SEG35 main::@13
-  b13:
+    jmp b6
+  //SEG35 main::@6
+  b6:
   //SEG36 [18] (byte) main::k#1 ← ++ (byte) main::k#2 -- vbuz1=_inc_vbuz1 
     inc k
-  //SEG37 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG37 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp k
-    bne b8_from_b13
-    jmp b9
-  //SEG38 main::@9
-  b9:
+    bne b3_from_b6
+    jmp b4
+  //SEG38 main::@4
+  b4:
   //SEG39 [20] (byte) main::j#1 ← ++ (byte) main::j#5 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG40 [21] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG40 [21] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp j
-    bne b7_from_b9
-    jmp b10
-  //SEG41 main::@10
-  b10:
+    bne b2_from_b4
+    jmp b5
+  //SEG41 main::@5
+  b5:
   //SEG42 [22] (byte) main::i#1 ← ++ (byte) main::i#7 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG43 [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@14 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG43 [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp i
-    bne b14_from_b10
-    jmp b6_from_b10
-  //SEG44 [24] phi from main::@10 to main::@14 [phi:main::@10->main::@14]
-  b14_from_b10:
-    jmp b14
-  //SEG45 main::@14
-  b14:
-  //SEG46 [11] phi from main::@14 to main::@6 [phi:main::@14->main::@6]
-  b6_from_b14:
-  //SEG47 [11] phi (byte) main::i#7 = (byte) main::i#1 [phi:main::@14->main::@6#0] -- register_copy 
-    jmp b6
+    bne b7_from_b5
+    jmp b1_from_b5
+  //SEG44 [24] phi from main::@5 to main::@7 [phi:main::@5->main::@7]
+  b7_from_b5:
+    jmp b7
+  //SEG45 main::@7
+  b7:
+  //SEG46 [11] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
+  b1_from_b7:
+  //SEG47 [11] phi (byte) main::i#7 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
+    jmp b1
 }
 //SEG48 sub_main
 sub_main: {
@@ -1743,15 +1751,15 @@ sub_irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b4
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp b6
+Removing instruction jmp b4
+Removing instruction jmp b5
 Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b13
-Removing instruction jmp b9
-Removing instruction jmp b10
-Removing instruction jmp b14
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
@@ -1773,9 +1781,9 @@ Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b8_from_b13 with b8
-Replacing label b7_from_b9 with b7
-Replacing label b14_from_b10 with b14
+Replacing label b3_from_b6 with b3
+Replacing label b2_from_b4 with b2
+Replacing label b7_from_b5 with b7
 Replacing label b3_from_b3 with b3
 Replacing label b2_from_b4 with b2
 Replacing label b1_from_b5 with b1
@@ -1785,16 +1793,16 @@ Replacing label b1_from_b5 with b1
 Replacing label b3_from_b3 with b3
 Replacing label b2_from_b4 with b2
 Replacing label b1_from_b5 with b1
-Removing instruction b4_from_bbegin:
-Removing instruction b4:
-Removing instruction bend_from_b4:
-Removing instruction b6_from_main:
-Removing instruction b7_from_b6:
-Removing instruction b7_from_b9:
-Removing instruction b8_from_b7:
-Removing instruction b8_from_b13:
-Removing instruction b14_from_b10:
-Removing instruction b6_from_b14:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_main:
+Removing instruction b2_from_b1:
+Removing instruction b2_from_b4:
+Removing instruction b3_from_b2:
+Removing instruction b3_from_b6:
+Removing instruction b7_from_b5:
+Removing instruction b1_from_b7:
 Removing instruction b1_from_b5:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
@@ -1812,10 +1820,10 @@ Removing instruction b3_from_b2:
 Removing instruction b3_from_b3:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction sub_main_from_b8:
-Removing instruction b13:
-Removing instruction b9:
-Removing instruction b10:
+Removing instruction sub_main_from_b3:
+Removing instruction b6:
+Removing instruction b4:
+Removing instruction b5:
 Removing instruction b1_from_sub_main:
 Removing instruction b4:
 Removing instruction b5:
@@ -1835,12 +1843,12 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b6 in bne b14
+Skipping double jump to b1 in bne b7
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b6_from_b10 to b1
+Relabelling long label b1_from_b5 to b4
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b7
-Removing instruction jmp b8
+Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
@@ -1857,13 +1865,13 @@ Removing instruction lda #$b
 Removing instruction lda #$b
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
-Removing instruction b14:
+Removing instruction b7:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing unreachable instruction jmp b6
+Removing unreachable instruction jmp b1
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @4
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -1909,13 +1917,13 @@ interrupt(KERNEL_MIN)(void()) irq()
 (void()) main()
 (byte~) main::$1 reg byte a 20002.0
 (byte~) main::$2 reg byte a 20002.0
-(label) main::@10
-(label) main::@13
-(label) main::@14
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
 (label) main::@7
-(label) main::@8
-(label) main::@9
 (byte) main::i
 (byte) main::i#1 i zp ZP_BYTE:2 71.0
 (byte) main::i#7 i zp ZP_BYTE:2 919.3636363636363
@@ -2001,10 +2009,10 @@ Score: 314173644
   .label CIA1_INTERRUPT = $dc0d
   .const CIA_INTERRUPT_CLEAR = $7f
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-//SEG5 @4
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @4 to @end [phi:@4->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -2037,29 +2045,29 @@ main: {
     sta KERNEL_IRQ+1
   //SEG16 asm { cli  }
     cli
-  //SEG17 [11] phi from main main::@10 to main::@6 [phi:main/main::@10->main::@6]
-  b1:
-  //SEG18 [11] phi (byte) main::i#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@10->main::@6#0] -- vbuz1=vbuc1 
+  //SEG17 [11] phi from main main::@5 to main::@1 [phi:main/main::@5->main::@1]
+  b4:
+  //SEG18 [11] phi (byte) main::i#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main/main::@5->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG19 main::@6
-  b6:
-  //SEG20 [12] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  //SEG21 [12] phi (byte) main::j#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@7#0] -- vbuz1=vbuc1 
+  //SEG19 main::@1
+  b1:
+  //SEG20 [12] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG21 [12] phi (byte) main::j#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-  //SEG22 [12] phi from main::@9 to main::@7 [phi:main::@9->main::@7]
-  //SEG23 [12] phi (byte) main::j#5 = (byte) main::j#1 [phi:main::@9->main::@7#0] -- register_copy 
-  //SEG24 main::@7
-  b7:
-  //SEG25 [13] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  //SEG26 [13] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#0] -- vbuz1=vbuc1 
+  //SEG22 [12] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  //SEG23 [12] phi (byte) main::j#5 = (byte) main::j#1 [phi:main::@4->main::@2#0] -- register_copy 
+  //SEG24 main::@2
+  b2:
+  //SEG25 [13] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  //SEG26 [13] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta k
-  //SEG27 [13] phi from main::@13 to main::@8 [phi:main::@13->main::@8]
-  //SEG28 [13] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@13->main::@8#0] -- register_copy 
-  //SEG29 main::@8
-  b8:
+  //SEG27 [13] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
+  //SEG28 [13] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@6->main::@3#0] -- register_copy 
+  //SEG29 main::@3
+  b3:
   //SEG30 [14] (byte~) main::$1 ← (byte) main::i#7 + (byte) main::j#5 -- vbuaa=vbuz1_plus_vbuz2 
     lda i
     clc
@@ -2070,32 +2078,32 @@ main: {
   //SEG32 [16] *((const byte*) FGCOL#0) ← (byte~) main::$2 -- _deref_pbuc1=vbuaa 
     sta FGCOL
   //SEG33 [17] call sub_main 
-  //SEG34 [25] phi from main::@8 to sub_main [phi:main::@8->sub_main]
+  //SEG34 [25] phi from main::@3 to sub_main [phi:main::@3->sub_main]
     jsr sub_main
-  //SEG35 main::@13
+  //SEG35 main::@6
   //SEG36 [18] (byte) main::k#1 ← ++ (byte) main::k#2 -- vbuz1=_inc_vbuz1 
     inc k
-  //SEG37 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG37 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp k
-    bne b8
-  //SEG38 main::@9
+    bne b3
+  //SEG38 main::@4
   //SEG39 [20] (byte) main::j#1 ← ++ (byte) main::j#5 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG40 [21] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG40 [21] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     cmp j
-    bne b7
-  //SEG41 main::@10
+    bne b2
+  //SEG41 main::@5
   //SEG42 [22] (byte) main::i#1 ← ++ (byte) main::i#7 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG43 [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@14 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG43 [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
     cmp i
-    bne b6
-    jmp b1
-  //SEG44 [24] phi from main::@10 to main::@14 [phi:main::@10->main::@14]
-  //SEG45 main::@14
-  //SEG46 [11] phi from main::@14 to main::@6 [phi:main::@14->main::@6]
-  //SEG47 [11] phi (byte) main::i#7 = (byte) main::i#1 [phi:main::@14->main::@6#0] -- register_copy 
+    bne b1
+    jmp b4
+  //SEG44 [24] phi from main::@5 to main::@7 [phi:main::@5->main::@7]
+  //SEG45 main::@7
+  //SEG46 [11] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
+  //SEG47 [11] phi (byte) main::i#7 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
 }
 //SEG48 sub_main
 sub_main: {
diff --git a/src/test/ref/irq-local-var-overlap-problem.sym b/src/test/ref/irq-local-var-overlap-problem.sym
index a8052763e..12c304370 100644
--- a/src/test/ref/irq-local-var-overlap-problem.sym
+++ b/src/test/ref/irq-local-var-overlap-problem.sym
@@ -1,4 +1,4 @@
-(label) @4
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -44,13 +44,13 @@ interrupt(KERNEL_MIN)(void()) irq()
 (void()) main()
 (byte~) main::$1 reg byte a 20002.0
 (byte~) main::$2 reg byte a 20002.0
-(label) main::@10
-(label) main::@13
-(label) main::@14
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
 (label) main::@7
-(label) main::@8
-(label) main::@9
 (byte) main::i
 (byte) main::i#1 i zp ZP_BYTE:2 71.0
 (byte) main::i#7 i zp ZP_BYTE:2 919.3636363636363
diff --git a/src/test/ref/irq-raster.cfg b/src/test/ref/irq-raster.cfg
index 68b634448..48be3ba9f 100644
--- a/src/test/ref/irq-raster.cfg
+++ b/src/test/ref/irq-raster.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
   [6] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) | (byte/word/signed word/dword/signed dword) $80
diff --git a/src/test/ref/irq-raster.log b/src/test/ref/irq-raster.log
index 6d4353b20..d90be1680 100644
--- a/src/test/ref/irq-raster.log
+++ b/src/test/ref/irq-raster.log
@@ -113,21 +113,22 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) CIA1_INTERRUPT#0) ← (const byte) CIA_INTERRUPT_CLEAR#0
   [6] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) | (byte/word/signed word/dword/signed dword) $80
@@ -191,15 +192,15 @@ INITIAL ASM
   .const CIA_INTERRUPT_CLEAR = $7f
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -298,15 +299,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const CIA_INTERRUPT_CLEAR = $7f
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -366,14 +367,14 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction breturn:
@@ -386,7 +387,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -443,10 +444,10 @@ Score: 71
   .label CIA1_INTERRUPT = $dc0d
   .const CIA_INTERRUPT_CLEAR = $7f
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
diff --git a/src/test/ref/irq-raster.sym b/src/test/ref/irq-raster.sym
index 6826084f0..7392f9bdd 100644
--- a/src/test/ref/irq-raster.sym
+++ b/src/test/ref/irq-raster.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
diff --git a/src/test/ref/irq-volatile-bool-problem.asm b/src/test/ref/irq-volatile-bool-problem.asm
index c6f0ce16e..8c9388e8a 100644
--- a/src/test/ref/irq-volatile-bool-problem.asm
+++ b/src/test/ref/irq-volatile-bool-problem.asm
@@ -37,13 +37,13 @@ main: {
     lda #>irq
     sta KERNEL_IRQ+1
     cli
-  b2:
+  b1:
     lda RASTER
     cmp #$14
-    bcs b2
+    bcs b1
     lda #1
     sta framedone
-    jmp b2
+    jmp b1
 }
 irq: {
     inc BGCOL
diff --git a/src/test/ref/irq-volatile-bool-problem.cfg b/src/test/ref/irq-volatile-bool-problem.cfg
index 042737a76..4dc27e341 100644
--- a/src/test/ref/irq-volatile-bool-problem.cfg
+++ b/src/test/ref/irq-volatile-bool-problem.cfg
@@ -18,13 +18,13 @@ main: scope:[main]  from @2
   [9] *((const byte*) IRQ_ENABLE#0) ← (const byte) IRQ_RASTER#0
   [10] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   asm { cli  }
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@2
+  [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@6
-  [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@2
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+main::@2: scope:[main]  from main::@1
   [13] (bool) framedone#0 ← true
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [14] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   [15] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
diff --git a/src/test/ref/irq-volatile-bool-problem.log b/src/test/ref/irq-volatile-bool-problem.log
index d534f0a5d..2d8278fc8 100644
--- a/src/test/ref/irq-volatile-bool-problem.log
+++ b/src/test/ref/irq-volatile-bool-problem.log
@@ -183,6 +183,8 @@ Calls in [] to main:3
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block main::@2 to main::@1
+Renumbering block main::@6 to main::@2
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @2
 Adding NOP phi() at start of @end
@@ -208,13 +210,13 @@ main: scope:[main]  from @2
   [9] *((const byte*) IRQ_ENABLE#0) ← (const byte) IRQ_RASTER#0
   [10] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   asm { cli  }
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@2
+  [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@6
-  [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@2
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+main::@2: scope:[main]  from main::@1
   [13] (bool) framedone#0 ← true
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [14] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   [15] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
@@ -329,20 +331,20 @@ main: {
     sta KERNEL_IRQ+1
   //SEG18 asm { cli  }
     cli
-    jmp b2
-  //SEG19 main::@2
-  b2:
-  //SEG20 [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@2 -- _deref_pbuc1_ge_vbuc2_then_la1 
+    jmp b1
+  //SEG19 main::@1
+  b1:
+  //SEG20 [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@1 -- _deref_pbuc1_ge_vbuc2_then_la1 
     lda RASTER
     cmp #$14
-    bcs b2
-    jmp b6
-  //SEG21 main::@6
-  b6:
+    bcs b1
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [13] (bool) framedone#0 ← true -- vboz1=vboc1 
     lda #1
     sta framedone
-    jmp b2
+    jmp b1
 }
 //SEG23 irq
 irq: {
@@ -382,7 +384,7 @@ Statement [7] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0)
 Statement [8] *((const byte*) RASTER#0) ← (byte/word/signed word/dword/signed dword) $fd [ ] ( main:3 [ ] ) always clobbers reg byte a 
 Statement [9] *((const byte*) IRQ_ENABLE#0) ← (const byte) IRQ_RASTER#0 [ ] ( main:3 [ ] ) always clobbers reg byte a 
 Statement [10] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq() [ ] ( main:3 [ ] ) always clobbers reg byte a 
-Statement [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@2 [ ] ( main:3 [ ] ) always clobbers reg byte a 
+Statement [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@1 [ ] ( main:3 [ ] ) always clobbers reg byte a 
 Statement [13] (bool) framedone#0 ← true [ ] ( main:3 [ ] ) always clobbers reg byte a 
 Statement [15] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0 [ ] (  [ ] ) always clobbers reg byte a 
 Statement [16] if(*((const byte*) RASTER#0)<=(byte/signed byte/word/signed word/dword/signed dword) $32) goto irq::@1 [ ] (  [ ] ) always clobbers reg byte a 
@@ -469,20 +471,20 @@ main: {
     sta KERNEL_IRQ+1
   //SEG18 asm { cli  }
     cli
-    jmp b2
-  //SEG19 main::@2
-  b2:
-  //SEG20 [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@2 -- _deref_pbuc1_ge_vbuc2_then_la1 
+    jmp b1
+  //SEG19 main::@1
+  b1:
+  //SEG20 [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@1 -- _deref_pbuc1_ge_vbuc2_then_la1 
     lda RASTER
     cmp #$14
-    bcs b2
-    jmp b6
-  //SEG21 main::@6
-  b6:
+    bcs b1
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [13] (bool) framedone#0 ← true -- vboz1=vboc1 
     lda #1
     sta framedone
-    jmp b2
+    jmp b1
 }
 //SEG23 irq
 irq: {
@@ -519,8 +521,8 @@ ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp bend
+Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b6
 Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -531,7 +533,7 @@ Removing instruction bend_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction b2:
 Removing instruction bend:
-Removing instruction b6:
+Removing instruction b2:
 Removing instruction b2:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -568,8 +570,8 @@ interrupt(KERNEL_MIN)(void()) irq()
 (label) irq::@2
 (label) irq::@return
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@6
 
 zp ZP_BOOL:2 [ framedone#11 framedone#0 framedone#3 ]
 
@@ -635,17 +637,17 @@ main: {
     sta KERNEL_IRQ+1
   //SEG18 asm { cli  }
     cli
-  //SEG19 main::@2
-  b2:
-  //SEG20 [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@2 -- _deref_pbuc1_ge_vbuc2_then_la1 
+  //SEG19 main::@1
+  b1:
+  //SEG20 [12] if(*((const byte*) RASTER#0)>=(byte/signed byte/word/signed word/dword/signed dword) $14) goto main::@1 -- _deref_pbuc1_ge_vbuc2_then_la1 
     lda RASTER
     cmp #$14
-    bcs b2
-  //SEG21 main::@6
+    bcs b1
+  //SEG21 main::@2
   //SEG22 [13] (bool) framedone#0 ← true -- vboz1=vboc1 
     lda #1
     sta framedone
-    jmp b2
+    jmp b1
 }
 //SEG23 irq
 irq: {
diff --git a/src/test/ref/irq-volatile-bool-problem.sym b/src/test/ref/irq-volatile-bool-problem.sym
index 28953f96e..fb61da46c 100644
--- a/src/test/ref/irq-volatile-bool-problem.sym
+++ b/src/test/ref/irq-volatile-bool-problem.sym
@@ -29,7 +29,7 @@ interrupt(KERNEL_MIN)(void()) irq()
 (label) irq::@2
 (label) irq::@return
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@6
 
 zp ZP_BOOL:2 [ framedone#11 framedone#0 framedone#3 ]
diff --git a/src/test/ref/keyboard-glitch.asm b/src/test/ref/keyboard-glitch.asm
index 0865b6d1f..09889061a 100644
--- a/src/test/ref/keyboard-glitch.asm
+++ b/src/test/ref/keyboard-glitch.asm
@@ -24,40 +24,40 @@
 main: {
     lda #GREEN
     sta BORDERCOL
-  b2:
+  b1:
     jsr menu
-    jmp b2
+    jmp b1
 }
 menu: {
-  b2:
+  b1:
     ldx #KEY_C
     jsr keyboard_key_pressed
     cmp #0
-    beq b8
+    beq b3
     jsr pressed
   breturn:
     rts
-  b8:
+  b3:
     ldx #KEY_I
     jsr keyboard_key_pressed
     cmp #0
-    beq b9
+    beq b4
     lda #RED
     sta BORDERCOL
     sei
     jmp breturn
-  b9:
+  b4:
     ldx #KEY_E
     jsr keyboard_key_pressed
     cmp #0
-    beq b10
+    beq b5
     lda #GREEN
     sta BORDERCOL
     cli
     jmp breturn
-  b10:
+  b5:
     inc SCREEN
-    jmp b2
+    jmp b1
 }
 // Determines whether a specific key is currently pressed by accessing the matrix directly
 // The key is a keyboard code defined from the keyboard matrix by %00rrrccc, where rrr is the row ID (0-7) and ccc is the column ID (0-7)
@@ -92,11 +92,11 @@ keyboard_matrix_read: {
 }
 pressed: {
     inc BGCOL
-  b2:
+  b1:
     ldx #KEY_SPACE
     jsr keyboard_key_pressed
     cmp #0
-    beq b2
+    beq b1
     rts
 }
   // Keyboard row bitmask as expected by CIA#1 Port A when reading a specific keyboard matrix row (rows are numbered 0-7)
diff --git a/src/test/ref/keyboard-glitch.cfg b/src/test/ref/keyboard-glitch.cfg
index 8bc4298f8..904fb9013 100644
--- a/src/test/ref/keyboard-glitch.cfg
+++ b/src/test/ref/keyboard-glitch.cfg
@@ -1,80 +1,80 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@14
-@14: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @14
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @14
+main: scope:[main]  from @1
   [4] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [5] phi()
   [6] call menu 
-  to:main::@2
-menu: scope:[menu]  from main::@2
+  to:main::@1
+menu: scope:[menu]  from main::@1
   [7] phi()
-  to:menu::@2
-menu::@2: scope:[menu]  from menu menu::@10
+  to:menu::@1
+menu::@1: scope:[menu]  from menu menu::@5
   [8] phi()
   [9] call keyboard_key_pressed 
   [10] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@16
-menu::@16: scope:[menu]  from menu::@2
+  to:menu::@8
+menu::@8: scope:[menu]  from menu::@1
   [11] (byte~) menu::$0 ← (byte) keyboard_key_pressed::return#2
-  [12] if((byte~) menu::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@8
-  to:menu::@6
-menu::@6: scope:[menu]  from menu::@16
+  [12] if((byte~) menu::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@3
+  to:menu::@2
+menu::@2: scope:[menu]  from menu::@8
   [13] phi()
   [14] call pressed 
   to:menu::@return
-menu::@return: scope:[menu]  from menu::@11 menu::@13 menu::@6
+menu::@return: scope:[menu]  from menu::@2 menu::@6 menu::@7
   [15] return 
   to:@return
-menu::@8: scope:[menu]  from menu::@16
+menu::@3: scope:[menu]  from menu::@8
   [16] phi()
   [17] call keyboard_key_pressed 
   [18] (byte) keyboard_key_pressed::return#3 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@17
-menu::@17: scope:[menu]  from menu::@8
+  to:menu::@9
+menu::@9: scope:[menu]  from menu::@3
   [19] (byte~) menu::$4 ← (byte) keyboard_key_pressed::return#3
-  [20] if((byte~) menu::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@9
-  to:menu::@11
-menu::@11: scope:[menu]  from menu::@17
+  [20] if((byte~) menu::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@4
+  to:menu::@6
+menu::@6: scope:[menu]  from menu::@9
   [21] *((const byte*) BORDERCOL#0) ← (const byte) RED#0
   asm { sei  }
   to:menu::@return
-menu::@9: scope:[menu]  from menu::@17
+menu::@4: scope:[menu]  from menu::@9
   [23] phi()
   [24] call keyboard_key_pressed 
   [25] (byte) keyboard_key_pressed::return#4 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@19
-menu::@19: scope:[menu]  from menu::@9
+  to:menu::@10
+menu::@10: scope:[menu]  from menu::@4
   [26] (byte~) menu::$7 ← (byte) keyboard_key_pressed::return#4
-  [27] if((byte~) menu::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@10
-  to:menu::@13
-menu::@13: scope:[menu]  from menu::@19
+  [27] if((byte~) menu::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@5
+  to:menu::@7
+menu::@7: scope:[menu]  from menu::@10
   [28] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0
   asm { cli  }
   to:menu::@return
-menu::@10: scope:[menu]  from menu::@19
+menu::@5: scope:[menu]  from menu::@10
   [30] *((const byte*) SCREEN#0) ← ++ *((const byte*) SCREEN#0)
-  to:menu::@2
-keyboard_key_pressed: scope:[keyboard_key_pressed]  from menu::@2 menu::@8 menu::@9 pressed::@2
-  [31] (byte) keyboard_key_pressed::key#4 ← phi( menu::@2/(const byte) KEY_C#0 menu::@8/(const byte) KEY_I#0 menu::@9/(const byte) KEY_E#0 pressed::@2/(const byte) KEY_SPACE#0 )
+  to:menu::@1
+keyboard_key_pressed: scope:[keyboard_key_pressed]  from menu::@1 menu::@3 menu::@4 pressed::@1
+  [31] (byte) keyboard_key_pressed::key#4 ← phi( menu::@1/(const byte) KEY_C#0 menu::@3/(const byte) KEY_I#0 menu::@4/(const byte) KEY_E#0 pressed::@1/(const byte) KEY_SPACE#0 )
   [32] (byte) keyboard_key_pressed::colidx#0 ← (byte) keyboard_key_pressed::key#4 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [33] (byte) keyboard_key_pressed::rowidx#0 ← (byte) keyboard_key_pressed::key#4 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [34] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_key_pressed::rowidx#0
   [35] call keyboard_matrix_read 
   [36] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_key_pressed::@2
-keyboard_key_pressed::@2: scope:[keyboard_key_pressed]  from keyboard_key_pressed
+  to:keyboard_key_pressed::@1
+keyboard_key_pressed::@1: scope:[keyboard_key_pressed]  from keyboard_key_pressed
   [37] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   [38] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0)
   to:keyboard_key_pressed::@return
-keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@2
+keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@1
   [39] return 
   to:@return
 keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
@@ -84,18 +84,18 @@ keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
 keyboard_matrix_read::@return: scope:[keyboard_matrix_read]  from keyboard_matrix_read
   [42] return 
   to:@return
-pressed: scope:[pressed]  from menu::@6
+pressed: scope:[pressed]  from menu::@2
   [43] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
-  to:pressed::@2
-pressed::@2: scope:[pressed]  from pressed pressed::@10
+  to:pressed::@1
+pressed::@1: scope:[pressed]  from pressed pressed::@2
   [44] phi()
   [45] call keyboard_key_pressed 
   [46] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-  to:pressed::@10
-pressed::@10: scope:[pressed]  from pressed::@2
+  to:pressed::@2
+pressed::@2: scope:[pressed]  from pressed::@1
   [47] (byte~) pressed::$0 ← (byte) keyboard_key_pressed::return#10
-  [48] if((byte~) pressed::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto pressed::@2
+  [48] if((byte~) pressed::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto pressed::@1
   to:pressed::@return
-pressed::@return: scope:[pressed]  from pressed::@10
+pressed::@return: scope:[pressed]  from pressed::@2
   [49] return 
   to:@return
diff --git a/src/test/ref/keyboard-glitch.log b/src/test/ref/keyboard-glitch.log
index 3c2c83ff5..f0f9910d0 100644
--- a/src/test/ref/keyboard-glitch.log
+++ b/src/test/ref/keyboard-glitch.log
@@ -941,95 +941,110 @@ Calls in [pressed] to keyboard_key_pressed:45
 
 Created 1 initial phi equivalence classes
 Coalesced down to 1 phi equivalence classes
+Renumbering block @14 to @1
+Renumbering block keyboard_key_pressed::@2 to keyboard_key_pressed::@1
+Renumbering block main::@2 to main::@1
+Renumbering block menu::@2 to menu::@1
+Renumbering block menu::@6 to menu::@2
+Renumbering block menu::@8 to menu::@3
+Renumbering block menu::@9 to menu::@4
+Renumbering block menu::@10 to menu::@5
+Renumbering block menu::@11 to menu::@6
+Renumbering block menu::@13 to menu::@7
+Renumbering block menu::@16 to menu::@8
+Renumbering block menu::@17 to menu::@9
+Renumbering block menu::@19 to menu::@10
+Renumbering block pressed::@2 to pressed::@1
+Renumbering block pressed::@10 to pressed::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @14
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
-Adding NOP phi() at start of main::@2
+Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of menu
+Adding NOP phi() at start of menu::@1
 Adding NOP phi() at start of menu::@2
-Adding NOP phi() at start of menu::@6
-Adding NOP phi() at start of menu::@8
-Adding NOP phi() at start of menu::@9
-Adding NOP phi() at start of pressed::@2
+Adding NOP phi() at start of menu::@3
+Adding NOP phi() at start of menu::@4
+Adding NOP phi() at start of pressed::@1
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@14
-@14: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @14
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @14
+main: scope:[main]  from @1
   [4] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [5] phi()
   [6] call menu 
-  to:main::@2
-menu: scope:[menu]  from main::@2
+  to:main::@1
+menu: scope:[menu]  from main::@1
   [7] phi()
-  to:menu::@2
-menu::@2: scope:[menu]  from menu menu::@10
+  to:menu::@1
+menu::@1: scope:[menu]  from menu menu::@5
   [8] phi()
   [9] call keyboard_key_pressed 
   [10] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@16
-menu::@16: scope:[menu]  from menu::@2
+  to:menu::@8
+menu::@8: scope:[menu]  from menu::@1
   [11] (byte~) menu::$0 ← (byte) keyboard_key_pressed::return#2
-  [12] if((byte~) menu::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@8
-  to:menu::@6
-menu::@6: scope:[menu]  from menu::@16
+  [12] if((byte~) menu::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@3
+  to:menu::@2
+menu::@2: scope:[menu]  from menu::@8
   [13] phi()
   [14] call pressed 
   to:menu::@return
-menu::@return: scope:[menu]  from menu::@11 menu::@13 menu::@6
+menu::@return: scope:[menu]  from menu::@2 menu::@6 menu::@7
   [15] return 
   to:@return
-menu::@8: scope:[menu]  from menu::@16
+menu::@3: scope:[menu]  from menu::@8
   [16] phi()
   [17] call keyboard_key_pressed 
   [18] (byte) keyboard_key_pressed::return#3 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@17
-menu::@17: scope:[menu]  from menu::@8
+  to:menu::@9
+menu::@9: scope:[menu]  from menu::@3
   [19] (byte~) menu::$4 ← (byte) keyboard_key_pressed::return#3
-  [20] if((byte~) menu::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@9
-  to:menu::@11
-menu::@11: scope:[menu]  from menu::@17
+  [20] if((byte~) menu::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@4
+  to:menu::@6
+menu::@6: scope:[menu]  from menu::@9
   [21] *((const byte*) BORDERCOL#0) ← (const byte) RED#0
   asm { sei  }
   to:menu::@return
-menu::@9: scope:[menu]  from menu::@17
+menu::@4: scope:[menu]  from menu::@9
   [23] phi()
   [24] call keyboard_key_pressed 
   [25] (byte) keyboard_key_pressed::return#4 ← (byte) keyboard_key_pressed::return#0
-  to:menu::@19
-menu::@19: scope:[menu]  from menu::@9
+  to:menu::@10
+menu::@10: scope:[menu]  from menu::@4
   [26] (byte~) menu::$7 ← (byte) keyboard_key_pressed::return#4
-  [27] if((byte~) menu::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@10
-  to:menu::@13
-menu::@13: scope:[menu]  from menu::@19
+  [27] if((byte~) menu::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@5
+  to:menu::@7
+menu::@7: scope:[menu]  from menu::@10
   [28] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0
   asm { cli  }
   to:menu::@return
-menu::@10: scope:[menu]  from menu::@19
+menu::@5: scope:[menu]  from menu::@10
   [30] *((const byte*) SCREEN#0) ← ++ *((const byte*) SCREEN#0)
-  to:menu::@2
-keyboard_key_pressed: scope:[keyboard_key_pressed]  from menu::@2 menu::@8 menu::@9 pressed::@2
-  [31] (byte) keyboard_key_pressed::key#4 ← phi( menu::@2/(const byte) KEY_C#0 menu::@8/(const byte) KEY_I#0 menu::@9/(const byte) KEY_E#0 pressed::@2/(const byte) KEY_SPACE#0 )
+  to:menu::@1
+keyboard_key_pressed: scope:[keyboard_key_pressed]  from menu::@1 menu::@3 menu::@4 pressed::@1
+  [31] (byte) keyboard_key_pressed::key#4 ← phi( menu::@1/(const byte) KEY_C#0 menu::@3/(const byte) KEY_I#0 menu::@4/(const byte) KEY_E#0 pressed::@1/(const byte) KEY_SPACE#0 )
   [32] (byte) keyboard_key_pressed::colidx#0 ← (byte) keyboard_key_pressed::key#4 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [33] (byte) keyboard_key_pressed::rowidx#0 ← (byte) keyboard_key_pressed::key#4 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [34] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_key_pressed::rowidx#0
   [35] call keyboard_matrix_read 
   [36] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_key_pressed::@2
-keyboard_key_pressed::@2: scope:[keyboard_key_pressed]  from keyboard_key_pressed
+  to:keyboard_key_pressed::@1
+keyboard_key_pressed::@1: scope:[keyboard_key_pressed]  from keyboard_key_pressed
   [37] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   [38] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0)
   to:keyboard_key_pressed::@return
-keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@2
+keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@1
   [39] return 
   to:@return
 keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
@@ -1039,23 +1054,23 @@ keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
 keyboard_matrix_read::@return: scope:[keyboard_matrix_read]  from keyboard_matrix_read
   [42] return 
   to:@return
-pressed: scope:[pressed]  from menu::@6
+pressed: scope:[pressed]  from menu::@2
   [43] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
-  to:pressed::@2
-pressed::@2: scope:[pressed]  from pressed pressed::@10
+  to:pressed::@1
+pressed::@1: scope:[pressed]  from pressed pressed::@2
   [44] phi()
   [45] call keyboard_key_pressed 
   [46] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-  to:pressed::@10
-pressed::@10: scope:[pressed]  from pressed::@2
+  to:pressed::@2
+pressed::@2: scope:[pressed]  from pressed::@1
   [47] (byte~) pressed::$0 ← (byte) keyboard_key_pressed::return#10
-  [48] if((byte~) pressed::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto pressed::@2
+  [48] if((byte~) pressed::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto pressed::@1
   to:pressed::@return
-pressed::@return: scope:[pressed]  from pressed::@10
+pressed::@return: scope:[pressed]  from pressed::@2
   [49] return 
   to:@return
 
-null depth in calling loop Loop head: pressed::@2 tails: pressed::@10 blocks: pressed::@10 pressed::@2  in scope keyboard_key_pressed
+null depth in calling loop Loop head: pressed::@1 tails: pressed::@2 blocks: pressed::@2 pressed::@1  in scope keyboard_key_pressed
 
 VARIABLE REGISTER WEIGHTS
 (byte*) BGCOL
@@ -1323,15 +1338,15 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @14 [phi:@begin->@14]
-b14_from_bbegin:
-  jmp b14
-//SEG5 @14
-b14:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @14 to @end [phi:@14->@end]
-bend_from_b14:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -1340,54 +1355,54 @@ main: {
   //SEG10 [4] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BORDERCOL
-  //SEG11 [5] phi from main main::@2 to main::@2 [phi:main/main::@2->main::@2]
-  b2_from_main:
-  b2_from_b2:
-    jmp b2
-  //SEG12 main::@2
-  b2:
+  //SEG11 [5] phi from main main::@1 to main::@1 [phi:main/main::@1->main::@1]
+  b1_from_main:
+  b1_from_b1:
+    jmp b1
+  //SEG12 main::@1
+  b1:
   //SEG13 [6] call menu 
-  //SEG14 [7] phi from main::@2 to menu [phi:main::@2->menu]
-  menu_from_b2:
+  //SEG14 [7] phi from main::@1 to menu [phi:main::@1->menu]
+  menu_from_b1:
     jsr menu
-    jmp b2_from_b2
+    jmp b1_from_b1
 }
 //SEG15 menu
 menu: {
     .label _0 = 4
     .label _4 = 6
     .label _7 = 8
-  //SEG16 [8] phi from menu menu::@10 to menu::@2 [phi:menu/menu::@10->menu::@2]
-  b2_from_menu:
-  b2_from_b10:
-    jmp b2
-  //SEG17 menu::@2
-  b2:
+  //SEG16 [8] phi from menu menu::@5 to menu::@1 [phi:menu/menu::@5->menu::@1]
+  b1_from_menu:
+  b1_from_b5:
+    jmp b1
+  //SEG17 menu::@1
+  b1:
   //SEG18 [9] call keyboard_key_pressed 
-  //SEG19 [31] phi from menu::@2 to keyboard_key_pressed [phi:menu::@2->keyboard_key_pressed]
-  keyboard_key_pressed_from_b2:
-  //SEG20 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_C#0 [phi:menu::@2->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG19 [31] phi from menu::@1 to keyboard_key_pressed [phi:menu::@1->keyboard_key_pressed]
+  keyboard_key_pressed_from_b1:
+  //SEG20 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_C#0 [phi:menu::@1->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_C
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG21 [10] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_2
-    jmp b16
-  //SEG22 menu::@16
-  b16:
+    jmp b8
+  //SEG22 menu::@8
+  b8:
   //SEG23 [11] (byte~) menu::$0 ← (byte) keyboard_key_pressed::return#2 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_2
     sta _0
-  //SEG24 [12] if((byte~) menu::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@8 -- vbuz1_eq_0_then_la1 
+  //SEG24 [12] if((byte~) menu::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@3 -- vbuz1_eq_0_then_la1 
     lda _0
     cmp #0
-    beq b8_from_b16
-  //SEG25 [13] phi from menu::@16 to menu::@6 [phi:menu::@16->menu::@6]
-  b6_from_b16:
-    jmp b6
-  //SEG26 menu::@6
-  b6:
+    beq b3_from_b8
+  //SEG25 [13] phi from menu::@8 to menu::@2 [phi:menu::@8->menu::@2]
+  b2_from_b8:
+    jmp b2
+  //SEG26 menu::@2
+  b2:
   //SEG27 [14] call pressed 
     jsr pressed
     jmp breturn
@@ -1395,79 +1410,79 @@ menu: {
   breturn:
   //SEG29 [15] return 
     rts
-  //SEG30 [16] phi from menu::@16 to menu::@8 [phi:menu::@16->menu::@8]
-  b8_from_b16:
-    jmp b8
-  //SEG31 menu::@8
-  b8:
+  //SEG30 [16] phi from menu::@8 to menu::@3 [phi:menu::@8->menu::@3]
+  b3_from_b8:
+    jmp b3
+  //SEG31 menu::@3
+  b3:
   //SEG32 [17] call keyboard_key_pressed 
-  //SEG33 [31] phi from menu::@8 to keyboard_key_pressed [phi:menu::@8->keyboard_key_pressed]
-  keyboard_key_pressed_from_b8:
-  //SEG34 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_I#0 [phi:menu::@8->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG33 [31] phi from menu::@3 to keyboard_key_pressed [phi:menu::@3->keyboard_key_pressed]
+  keyboard_key_pressed_from_b3:
+  //SEG34 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_I#0 [phi:menu::@3->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_I
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG35 [18] (byte) keyboard_key_pressed::return#3 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_3
-    jmp b17
-  //SEG36 menu::@17
-  b17:
+    jmp b9
+  //SEG36 menu::@9
+  b9:
   //SEG37 [19] (byte~) menu::$4 ← (byte) keyboard_key_pressed::return#3 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_3
     sta _4
-  //SEG38 [20] if((byte~) menu::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@9 -- vbuz1_eq_0_then_la1 
+  //SEG38 [20] if((byte~) menu::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@4 -- vbuz1_eq_0_then_la1 
     lda _4
     cmp #0
-    beq b9_from_b17
-    jmp b11
-  //SEG39 menu::@11
-  b11:
+    beq b4_from_b9
+    jmp b6
+  //SEG39 menu::@6
+  b6:
   //SEG40 [21] *((const byte*) BORDERCOL#0) ← (const byte) RED#0 -- _deref_pbuc1=vbuc2 
     lda #RED
     sta BORDERCOL
   //SEG41 asm { sei  }
     sei
     jmp breturn
-  //SEG42 [23] phi from menu::@17 to menu::@9 [phi:menu::@17->menu::@9]
-  b9_from_b17:
-    jmp b9
-  //SEG43 menu::@9
-  b9:
+  //SEG42 [23] phi from menu::@9 to menu::@4 [phi:menu::@9->menu::@4]
+  b4_from_b9:
+    jmp b4
+  //SEG43 menu::@4
+  b4:
   //SEG44 [24] call keyboard_key_pressed 
-  //SEG45 [31] phi from menu::@9 to keyboard_key_pressed [phi:menu::@9->keyboard_key_pressed]
-  keyboard_key_pressed_from_b9:
-  //SEG46 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_E#0 [phi:menu::@9->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG45 [31] phi from menu::@4 to keyboard_key_pressed [phi:menu::@4->keyboard_key_pressed]
+  keyboard_key_pressed_from_b4:
+  //SEG46 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_E#0 [phi:menu::@4->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_E
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG47 [25] (byte) keyboard_key_pressed::return#4 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_4
-    jmp b19
-  //SEG48 menu::@19
-  b19:
+    jmp b10
+  //SEG48 menu::@10
+  b10:
   //SEG49 [26] (byte~) menu::$7 ← (byte) keyboard_key_pressed::return#4 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_4
     sta _7
-  //SEG50 [27] if((byte~) menu::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@10 -- vbuz1_eq_0_then_la1 
+  //SEG50 [27] if((byte~) menu::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@5 -- vbuz1_eq_0_then_la1 
     lda _7
     cmp #0
-    beq b10
-    jmp b13
-  //SEG51 menu::@13
-  b13:
+    beq b5
+    jmp b7
+  //SEG51 menu::@7
+  b7:
   //SEG52 [28] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BORDERCOL
   //SEG53 asm { cli  }
     cli
     jmp breturn
-  //SEG54 menu::@10
-  b10:
+  //SEG54 menu::@5
+  b5:
   //SEG55 [30] *((const byte*) SCREEN#0) ← ++ *((const byte*) SCREEN#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc SCREEN
-    jmp b2_from_b10
+    jmp b1_from_b5
 }
 //SEG56 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -1503,9 +1518,9 @@ keyboard_key_pressed: {
   //SEG61 [36] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return
     sta keyboard_matrix_read.return_2
-    jmp b2
-  //SEG62 keyboard_key_pressed::@2
-  b2:
+    jmp b1
+  //SEG62 keyboard_key_pressed::@1
+  b1:
   //SEG63 [37] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return_2
     sta _2
@@ -1550,32 +1565,32 @@ pressed: {
     .label _0 = $11
   //SEG73 [43] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
-  //SEG74 [44] phi from pressed pressed::@10 to pressed::@2 [phi:pressed/pressed::@10->pressed::@2]
-  b2_from_pressed:
-  b2_from_b10:
-    jmp b2
-  //SEG75 pressed::@2
-  b2:
+  //SEG74 [44] phi from pressed pressed::@2 to pressed::@1 [phi:pressed/pressed::@2->pressed::@1]
+  b1_from_pressed:
+  b1_from_b2:
+    jmp b1
+  //SEG75 pressed::@1
+  b1:
   //SEG76 [45] call keyboard_key_pressed 
-  //SEG77 [31] phi from pressed::@2 to keyboard_key_pressed [phi:pressed::@2->keyboard_key_pressed]
-  keyboard_key_pressed_from_b2:
-  //SEG78 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_SPACE#0 [phi:pressed::@2->keyboard_key_pressed#0] -- vbuz1=vbuc1 
+  //SEG77 [31] phi from pressed::@1 to keyboard_key_pressed [phi:pressed::@1->keyboard_key_pressed]
+  keyboard_key_pressed_from_b1:
+  //SEG78 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_SPACE#0 [phi:pressed::@1->keyboard_key_pressed#0] -- vbuz1=vbuc1 
     lda #KEY_SPACE
     sta keyboard_key_pressed.key
     jsr keyboard_key_pressed
   //SEG79 [46] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_10
-    jmp b10
-  //SEG80 pressed::@10
-  b10:
+    jmp b2
+  //SEG80 pressed::@2
+  b2:
   //SEG81 [47] (byte~) pressed::$0 ← (byte) keyboard_key_pressed::return#10 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_10
     sta _0
-  //SEG82 [48] if((byte~) pressed::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto pressed::@2 -- vbuz1_eq_0_then_la1 
+  //SEG82 [48] if((byte~) pressed::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto pressed::@1 -- vbuz1_eq_0_then_la1 
     lda _0
     cmp #0
-    beq b2_from_b10
+    beq b1_from_b2
     jmp breturn
   //SEG83 pressed::@return
   breturn:
@@ -1673,15 +1688,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @14 [phi:@begin->@14]
-b14_from_bbegin:
-  jmp b14
-//SEG5 @14
-b14:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @14 to @end [phi:@14->@end]
-bend_from_b14:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -1690,45 +1705,45 @@ main: {
   //SEG10 [4] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BORDERCOL
-  //SEG11 [5] phi from main main::@2 to main::@2 [phi:main/main::@2->main::@2]
-  b2_from_main:
-  b2_from_b2:
-    jmp b2
-  //SEG12 main::@2
-  b2:
+  //SEG11 [5] phi from main main::@1 to main::@1 [phi:main/main::@1->main::@1]
+  b1_from_main:
+  b1_from_b1:
+    jmp b1
+  //SEG12 main::@1
+  b1:
   //SEG13 [6] call menu 
-  //SEG14 [7] phi from main::@2 to menu [phi:main::@2->menu]
-  menu_from_b2:
+  //SEG14 [7] phi from main::@1 to menu [phi:main::@1->menu]
+  menu_from_b1:
     jsr menu
-    jmp b2_from_b2
+    jmp b1_from_b1
 }
 //SEG15 menu
 menu: {
-  //SEG16 [8] phi from menu menu::@10 to menu::@2 [phi:menu/menu::@10->menu::@2]
-  b2_from_menu:
-  b2_from_b10:
-    jmp b2
-  //SEG17 menu::@2
-  b2:
+  //SEG16 [8] phi from menu menu::@5 to menu::@1 [phi:menu/menu::@5->menu::@1]
+  b1_from_menu:
+  b1_from_b5:
+    jmp b1
+  //SEG17 menu::@1
+  b1:
   //SEG18 [9] call keyboard_key_pressed 
-  //SEG19 [31] phi from menu::@2 to keyboard_key_pressed [phi:menu::@2->keyboard_key_pressed]
-  keyboard_key_pressed_from_b2:
-  //SEG20 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_C#0 [phi:menu::@2->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG19 [31] phi from menu::@1 to keyboard_key_pressed [phi:menu::@1->keyboard_key_pressed]
+  keyboard_key_pressed_from_b1:
+  //SEG20 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_C#0 [phi:menu::@1->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_C
     jsr keyboard_key_pressed
   //SEG21 [10] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-    jmp b16
-  //SEG22 menu::@16
-  b16:
+    jmp b8
+  //SEG22 menu::@8
+  b8:
   //SEG23 [11] (byte~) menu::$0 ← (byte) keyboard_key_pressed::return#2
-  //SEG24 [12] if((byte~) menu::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@8 -- vbuaa_eq_0_then_la1 
+  //SEG24 [12] if((byte~) menu::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@3 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b16
-  //SEG25 [13] phi from menu::@16 to menu::@6 [phi:menu::@16->menu::@6]
-  b6_from_b16:
-    jmp b6
-  //SEG26 menu::@6
-  b6:
+    beq b3_from_b8
+  //SEG25 [13] phi from menu::@8 to menu::@2 [phi:menu::@8->menu::@2]
+  b2_from_b8:
+    jmp b2
+  //SEG26 menu::@2
+  b2:
   //SEG27 [14] call pressed 
     jsr pressed
     jmp breturn
@@ -1736,67 +1751,67 @@ menu: {
   breturn:
   //SEG29 [15] return 
     rts
-  //SEG30 [16] phi from menu::@16 to menu::@8 [phi:menu::@16->menu::@8]
-  b8_from_b16:
-    jmp b8
-  //SEG31 menu::@8
-  b8:
+  //SEG30 [16] phi from menu::@8 to menu::@3 [phi:menu::@8->menu::@3]
+  b3_from_b8:
+    jmp b3
+  //SEG31 menu::@3
+  b3:
   //SEG32 [17] call keyboard_key_pressed 
-  //SEG33 [31] phi from menu::@8 to keyboard_key_pressed [phi:menu::@8->keyboard_key_pressed]
-  keyboard_key_pressed_from_b8:
-  //SEG34 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_I#0 [phi:menu::@8->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG33 [31] phi from menu::@3 to keyboard_key_pressed [phi:menu::@3->keyboard_key_pressed]
+  keyboard_key_pressed_from_b3:
+  //SEG34 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_I#0 [phi:menu::@3->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_I
     jsr keyboard_key_pressed
   //SEG35 [18] (byte) keyboard_key_pressed::return#3 ← (byte) keyboard_key_pressed::return#0
-    jmp b17
-  //SEG36 menu::@17
-  b17:
+    jmp b9
+  //SEG36 menu::@9
+  b9:
   //SEG37 [19] (byte~) menu::$4 ← (byte) keyboard_key_pressed::return#3
-  //SEG38 [20] if((byte~) menu::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@9 -- vbuaa_eq_0_then_la1 
+  //SEG38 [20] if((byte~) menu::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b9_from_b17
-    jmp b11
-  //SEG39 menu::@11
-  b11:
+    beq b4_from_b9
+    jmp b6
+  //SEG39 menu::@6
+  b6:
   //SEG40 [21] *((const byte*) BORDERCOL#0) ← (const byte) RED#0 -- _deref_pbuc1=vbuc2 
     lda #RED
     sta BORDERCOL
   //SEG41 asm { sei  }
     sei
     jmp breturn
-  //SEG42 [23] phi from menu::@17 to menu::@9 [phi:menu::@17->menu::@9]
-  b9_from_b17:
-    jmp b9
-  //SEG43 menu::@9
-  b9:
+  //SEG42 [23] phi from menu::@9 to menu::@4 [phi:menu::@9->menu::@4]
+  b4_from_b9:
+    jmp b4
+  //SEG43 menu::@4
+  b4:
   //SEG44 [24] call keyboard_key_pressed 
-  //SEG45 [31] phi from menu::@9 to keyboard_key_pressed [phi:menu::@9->keyboard_key_pressed]
-  keyboard_key_pressed_from_b9:
-  //SEG46 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_E#0 [phi:menu::@9->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG45 [31] phi from menu::@4 to keyboard_key_pressed [phi:menu::@4->keyboard_key_pressed]
+  keyboard_key_pressed_from_b4:
+  //SEG46 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_E#0 [phi:menu::@4->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_E
     jsr keyboard_key_pressed
   //SEG47 [25] (byte) keyboard_key_pressed::return#4 ← (byte) keyboard_key_pressed::return#0
-    jmp b19
-  //SEG48 menu::@19
-  b19:
+    jmp b10
+  //SEG48 menu::@10
+  b10:
   //SEG49 [26] (byte~) menu::$7 ← (byte) keyboard_key_pressed::return#4
-  //SEG50 [27] if((byte~) menu::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@10 -- vbuaa_eq_0_then_la1 
+  //SEG50 [27] if((byte~) menu::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@5 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b10
-    jmp b13
-  //SEG51 menu::@13
-  b13:
+    beq b5
+    jmp b7
+  //SEG51 menu::@7
+  b7:
   //SEG52 [28] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BORDERCOL
   //SEG53 asm { cli  }
     cli
     jmp breturn
-  //SEG54 menu::@10
-  b10:
+  //SEG54 menu::@5
+  b5:
   //SEG55 [30] *((const byte*) SCREEN#0) ← ++ *((const byte*) SCREEN#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc SCREEN
-    jmp b2_from_b10
+    jmp b1_from_b5
 }
 //SEG56 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -1819,9 +1834,9 @@ keyboard_key_pressed: {
   //SEG60 [35] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG61 [36] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-    jmp b2
-  //SEG62 keyboard_key_pressed::@2
-  b2:
+    jmp b1
+  //SEG62 keyboard_key_pressed::@1
+  b1:
   //SEG63 [37] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   //SEG64 [38] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuyy 
     and keyboard_matrix_col_bitmask,y
@@ -1855,26 +1870,26 @@ keyboard_matrix_read: {
 pressed: {
   //SEG73 [43] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
-  //SEG74 [44] phi from pressed pressed::@10 to pressed::@2 [phi:pressed/pressed::@10->pressed::@2]
-  b2_from_pressed:
-  b2_from_b10:
-    jmp b2
-  //SEG75 pressed::@2
-  b2:
+  //SEG74 [44] phi from pressed pressed::@2 to pressed::@1 [phi:pressed/pressed::@2->pressed::@1]
+  b1_from_pressed:
+  b1_from_b2:
+    jmp b1
+  //SEG75 pressed::@1
+  b1:
   //SEG76 [45] call keyboard_key_pressed 
-  //SEG77 [31] phi from pressed::@2 to keyboard_key_pressed [phi:pressed::@2->keyboard_key_pressed]
-  keyboard_key_pressed_from_b2:
-  //SEG78 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_SPACE#0 [phi:pressed::@2->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG77 [31] phi from pressed::@1 to keyboard_key_pressed [phi:pressed::@1->keyboard_key_pressed]
+  keyboard_key_pressed_from_b1:
+  //SEG78 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_SPACE#0 [phi:pressed::@1->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_SPACE
     jsr keyboard_key_pressed
   //SEG79 [46] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-    jmp b10
-  //SEG80 pressed::@10
-  b10:
+    jmp b2
+  //SEG80 pressed::@2
+  b2:
   //SEG81 [47] (byte~) pressed::$0 ← (byte) keyboard_key_pressed::return#10
-  //SEG82 [48] if((byte~) pressed::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto pressed::@2 -- vbuaa_eq_0_then_la1 
+  //SEG82 [48] if((byte~) pressed::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto pressed::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b2_from_b10
+    beq b1_from_b2
     jmp breturn
   //SEG83 pressed::@return
   breturn:
@@ -1887,60 +1902,60 @@ pressed: {
   keyboard_matrix_col_bitmask: .byte 1, 2, 4, 8, $10, $20, $40, $80
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b14
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b2
-Removing instruction jmp b2
-Removing instruction jmp b16
-Removing instruction jmp b6
-Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b1
 Removing instruction jmp b8
-Removing instruction jmp b17
-Removing instruction jmp b11
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b3
 Removing instruction jmp b9
-Removing instruction jmp b19
-Removing instruction jmp b13
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp b2
+Removing instruction jmp b6
+Removing instruction jmp b4
 Removing instruction jmp b10
+Removing instruction jmp b7
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b2_from_b2 with b2
-Replacing label b8_from_b16 with b8
-Replacing label b9_from_b17 with b9
-Replacing label b2_from_b10 with b2
-Replacing label b2_from_b10 with b2
-Removing instruction b14_from_bbegin:
-Removing instruction b14:
-Removing instruction bend_from_b14:
-Removing instruction b2_from_main:
-Removing instruction b2_from_b2:
-Removing instruction menu_from_b2:
-Removing instruction b2_from_menu:
-Removing instruction b2_from_b10:
-Removing instruction keyboard_key_pressed_from_b2:
-Removing instruction b6_from_b16:
-Removing instruction b8_from_b16:
-Removing instruction keyboard_key_pressed_from_b8:
-Removing instruction b9_from_b17:
-Removing instruction keyboard_key_pressed_from_b9:
-Removing instruction b2_from_pressed:
-Removing instruction b2_from_b10:
-Removing instruction keyboard_key_pressed_from_b2:
+Replacing label b1_from_b1 with b1
+Replacing label b3_from_b8 with b3
+Replacing label b4_from_b9 with b4
+Replacing label b1_from_b5 with b1
+Replacing label b1_from_b2 with b1
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_main:
+Removing instruction b1_from_b1:
+Removing instruction menu_from_b1:
+Removing instruction b1_from_menu:
+Removing instruction b1_from_b5:
+Removing instruction keyboard_key_pressed_from_b1:
+Removing instruction b2_from_b8:
+Removing instruction b3_from_b8:
+Removing instruction keyboard_key_pressed_from_b3:
+Removing instruction b4_from_b9:
+Removing instruction keyboard_key_pressed_from_b4:
+Removing instruction b1_from_pressed:
+Removing instruction b1_from_b2:
+Removing instruction keyboard_key_pressed_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b16:
-Removing instruction b6:
-Removing instruction b17:
-Removing instruction b11:
-Removing instruction b19:
-Removing instruction b13:
+Removing instruction b8:
 Removing instruction b2:
-Removing instruction breturn:
-Removing instruction breturn:
+Removing instruction b9:
+Removing instruction b6:
 Removing instruction b10:
+Removing instruction b7:
+Removing instruction b1:
+Removing instruction breturn:
+Removing instruction breturn:
+Removing instruction b2:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
@@ -1950,7 +1965,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @14
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -2118,7 +2133,7 @@ FINAL SYMBOL TABLE
 (byte) keyboard_events_size
 (byte()) keyboard_key_pressed((byte) keyboard_key_pressed::key)
 (byte~) keyboard_key_pressed::$2 reg byte a 4.0
-(label) keyboard_key_pressed::@2
+(label) keyboard_key_pressed::@1
 (label) keyboard_key_pressed::@return
 (byte) keyboard_key_pressed::colidx
 (byte) keyboard_key_pressed::colidx#0 reg byte y 0.6666666666666666
@@ -2147,25 +2162,25 @@ FINAL SYMBOL TABLE
 (byte) keyboard_modifiers
 (byte[8]) keyboard_scan_values
 (void()) main()
-(label) main::@2
+(label) main::@1
 (void()) menu()
 (byte~) menu::$0 reg byte a 202.0
 (byte~) menu::$4 reg byte a 202.0
 (byte~) menu::$7 reg byte a 202.0
+(label) menu::@1
 (label) menu::@10
-(label) menu::@11
-(label) menu::@13
-(label) menu::@16
-(label) menu::@17
-(label) menu::@19
 (label) menu::@2
+(label) menu::@3
+(label) menu::@4
+(label) menu::@5
 (label) menu::@6
+(label) menu::@7
 (label) menu::@8
 (label) menu::@9
 (label) menu::@return
 (void()) pressed()
 (byte~) pressed::$0 reg byte a 202.0
-(label) pressed::@10
+(label) pressed::@1
 (label) pressed::@2
 (label) pressed::@return
 
@@ -2217,95 +2232,95 @@ Score: 2845
   .const KEY_SPACE = $3c
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @14 [phi:@begin->@14]
-//SEG5 @14
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @14 to @end [phi:@14->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
   //SEG10 [4] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BORDERCOL
-  //SEG11 [5] phi from main main::@2 to main::@2 [phi:main/main::@2->main::@2]
-  //SEG12 main::@2
-  b2:
+  //SEG11 [5] phi from main main::@1 to main::@1 [phi:main/main::@1->main::@1]
+  //SEG12 main::@1
+  b1:
   //SEG13 [6] call menu 
-  //SEG14 [7] phi from main::@2 to menu [phi:main::@2->menu]
+  //SEG14 [7] phi from main::@1 to menu [phi:main::@1->menu]
     jsr menu
-    jmp b2
+    jmp b1
 }
 //SEG15 menu
 menu: {
-  //SEG16 [8] phi from menu menu::@10 to menu::@2 [phi:menu/menu::@10->menu::@2]
-  //SEG17 menu::@2
-  b2:
+  //SEG16 [8] phi from menu menu::@5 to menu::@1 [phi:menu/menu::@5->menu::@1]
+  //SEG17 menu::@1
+  b1:
   //SEG18 [9] call keyboard_key_pressed 
-  //SEG19 [31] phi from menu::@2 to keyboard_key_pressed [phi:menu::@2->keyboard_key_pressed]
-  //SEG20 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_C#0 [phi:menu::@2->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG19 [31] phi from menu::@1 to keyboard_key_pressed [phi:menu::@1->keyboard_key_pressed]
+  //SEG20 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_C#0 [phi:menu::@1->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_C
     jsr keyboard_key_pressed
   //SEG21 [10] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  //SEG22 menu::@16
+  //SEG22 menu::@8
   //SEG23 [11] (byte~) menu::$0 ← (byte) keyboard_key_pressed::return#2
-  //SEG24 [12] if((byte~) menu::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@8 -- vbuaa_eq_0_then_la1 
+  //SEG24 [12] if((byte~) menu::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@3 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG25 [13] phi from menu::@16 to menu::@6 [phi:menu::@16->menu::@6]
-  //SEG26 menu::@6
+    beq b3
+  //SEG25 [13] phi from menu::@8 to menu::@2 [phi:menu::@8->menu::@2]
+  //SEG26 menu::@2
   //SEG27 [14] call pressed 
     jsr pressed
   //SEG28 menu::@return
   breturn:
   //SEG29 [15] return 
     rts
-  //SEG30 [16] phi from menu::@16 to menu::@8 [phi:menu::@16->menu::@8]
-  //SEG31 menu::@8
-  b8:
+  //SEG30 [16] phi from menu::@8 to menu::@3 [phi:menu::@8->menu::@3]
+  //SEG31 menu::@3
+  b3:
   //SEG32 [17] call keyboard_key_pressed 
-  //SEG33 [31] phi from menu::@8 to keyboard_key_pressed [phi:menu::@8->keyboard_key_pressed]
-  //SEG34 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_I#0 [phi:menu::@8->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG33 [31] phi from menu::@3 to keyboard_key_pressed [phi:menu::@3->keyboard_key_pressed]
+  //SEG34 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_I#0 [phi:menu::@3->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_I
     jsr keyboard_key_pressed
   //SEG35 [18] (byte) keyboard_key_pressed::return#3 ← (byte) keyboard_key_pressed::return#0
-  //SEG36 menu::@17
+  //SEG36 menu::@9
   //SEG37 [19] (byte~) menu::$4 ← (byte) keyboard_key_pressed::return#3
-  //SEG38 [20] if((byte~) menu::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@9 -- vbuaa_eq_0_then_la1 
+  //SEG38 [20] if((byte~) menu::$4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b9
-  //SEG39 menu::@11
+    beq b4
+  //SEG39 menu::@6
   //SEG40 [21] *((const byte*) BORDERCOL#0) ← (const byte) RED#0 -- _deref_pbuc1=vbuc2 
     lda #RED
     sta BORDERCOL
   //SEG41 asm { sei  }
     sei
     jmp breturn
-  //SEG42 [23] phi from menu::@17 to menu::@9 [phi:menu::@17->menu::@9]
-  //SEG43 menu::@9
-  b9:
+  //SEG42 [23] phi from menu::@9 to menu::@4 [phi:menu::@9->menu::@4]
+  //SEG43 menu::@4
+  b4:
   //SEG44 [24] call keyboard_key_pressed 
-  //SEG45 [31] phi from menu::@9 to keyboard_key_pressed [phi:menu::@9->keyboard_key_pressed]
-  //SEG46 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_E#0 [phi:menu::@9->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG45 [31] phi from menu::@4 to keyboard_key_pressed [phi:menu::@4->keyboard_key_pressed]
+  //SEG46 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_E#0 [phi:menu::@4->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_E
     jsr keyboard_key_pressed
   //SEG47 [25] (byte) keyboard_key_pressed::return#4 ← (byte) keyboard_key_pressed::return#0
-  //SEG48 menu::@19
+  //SEG48 menu::@10
   //SEG49 [26] (byte~) menu::$7 ← (byte) keyboard_key_pressed::return#4
-  //SEG50 [27] if((byte~) menu::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@10 -- vbuaa_eq_0_then_la1 
+  //SEG50 [27] if((byte~) menu::$7==(byte/signed byte/word/signed word/dword/signed dword) 0) goto menu::@5 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b10
-  //SEG51 menu::@13
+    beq b5
+  //SEG51 menu::@7
   //SEG52 [28] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BORDERCOL
   //SEG53 asm { cli  }
     cli
     jmp breturn
-  //SEG54 menu::@10
-  b10:
+  //SEG54 menu::@5
+  b5:
   //SEG55 [30] *((const byte*) SCREEN#0) ← ++ *((const byte*) SCREEN#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc SCREEN
-    jmp b2
+    jmp b1
 }
 //SEG56 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -2328,7 +2343,7 @@ keyboard_key_pressed: {
   //SEG60 [35] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG61 [36] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  //SEG62 keyboard_key_pressed::@2
+  //SEG62 keyboard_key_pressed::@1
   //SEG63 [37] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   //SEG64 [38] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuyy 
     and keyboard_matrix_col_bitmask,y
@@ -2358,20 +2373,20 @@ keyboard_matrix_read: {
 pressed: {
   //SEG73 [43] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BGCOL
-  //SEG74 [44] phi from pressed pressed::@10 to pressed::@2 [phi:pressed/pressed::@10->pressed::@2]
-  //SEG75 pressed::@2
-  b2:
+  //SEG74 [44] phi from pressed pressed::@2 to pressed::@1 [phi:pressed/pressed::@2->pressed::@1]
+  //SEG75 pressed::@1
+  b1:
   //SEG76 [45] call keyboard_key_pressed 
-  //SEG77 [31] phi from pressed::@2 to keyboard_key_pressed [phi:pressed::@2->keyboard_key_pressed]
-  //SEG78 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_SPACE#0 [phi:pressed::@2->keyboard_key_pressed#0] -- vbuxx=vbuc1 
+  //SEG77 [31] phi from pressed::@1 to keyboard_key_pressed [phi:pressed::@1->keyboard_key_pressed]
+  //SEG78 [31] phi (byte) keyboard_key_pressed::key#4 = (const byte) KEY_SPACE#0 [phi:pressed::@1->keyboard_key_pressed#0] -- vbuxx=vbuc1 
     ldx #KEY_SPACE
     jsr keyboard_key_pressed
   //SEG79 [46] (byte) keyboard_key_pressed::return#10 ← (byte) keyboard_key_pressed::return#0
-  //SEG80 pressed::@10
+  //SEG80 pressed::@2
   //SEG81 [47] (byte~) pressed::$0 ← (byte) keyboard_key_pressed::return#10
-  //SEG82 [48] if((byte~) pressed::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto pressed::@2 -- vbuaa_eq_0_then_la1 
+  //SEG82 [48] if((byte~) pressed::$0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto pressed::@1 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b2
+    beq b1
   //SEG83 pressed::@return
   //SEG84 [49] return 
     rts
diff --git a/src/test/ref/keyboard-glitch.sym b/src/test/ref/keyboard-glitch.sym
index 7b791aafe..65d6157b2 100644
--- a/src/test/ref/keyboard-glitch.sym
+++ b/src/test/ref/keyboard-glitch.sym
@@ -1,4 +1,4 @@
-(label) @14
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -166,7 +166,7 @@
 (byte) keyboard_events_size
 (byte()) keyboard_key_pressed((byte) keyboard_key_pressed::key)
 (byte~) keyboard_key_pressed::$2 reg byte a 4.0
-(label) keyboard_key_pressed::@2
+(label) keyboard_key_pressed::@1
 (label) keyboard_key_pressed::@return
 (byte) keyboard_key_pressed::colidx
 (byte) keyboard_key_pressed::colidx#0 reg byte y 0.6666666666666666
@@ -195,25 +195,25 @@
 (byte) keyboard_modifiers
 (byte[8]) keyboard_scan_values
 (void()) main()
-(label) main::@2
+(label) main::@1
 (void()) menu()
 (byte~) menu::$0 reg byte a 202.0
 (byte~) menu::$4 reg byte a 202.0
 (byte~) menu::$7 reg byte a 202.0
+(label) menu::@1
 (label) menu::@10
-(label) menu::@11
-(label) menu::@13
-(label) menu::@16
-(label) menu::@17
-(label) menu::@19
 (label) menu::@2
+(label) menu::@3
+(label) menu::@4
+(label) menu::@5
 (label) menu::@6
+(label) menu::@7
 (label) menu::@8
 (label) menu::@9
 (label) menu::@return
 (void()) pressed()
 (byte~) pressed::$0 reg byte a 202.0
-(label) pressed::@10
+(label) pressed::@1
 (label) pressed::@2
 (label) pressed::@return
 
diff --git a/src/test/ref/line-anim.asm b/src/test/ref/line-anim.asm
index 3ce828f3e..3d56fcacd 100644
--- a/src/test/ref/line-anim.asm
+++ b/src/test/ref/line-anim.asm
@@ -55,7 +55,7 @@ main: {
     sta rem16u
     sta rem16u+1
     sta i
-  b6:
+  b1:
     jsr point_init
     lda i
     lsr
@@ -73,13 +73,13 @@ main: {
     sta i
     lda #8
     cmp i
-    bne b6
-  b8:
+    bne b1
+  b2:
     lda #$ff
     cmp RASTER
-    bne b8
+    bne b2
     inc BORDERCOL
-    jmp b8
+    jmp b2
 }
 // Plot a single dot in the bitmap
 // bitmap_plot(word zeropage(5) x, byte register(Y) y)
@@ -174,7 +174,7 @@ point_init: {
     sta abs16s2_return
     lda y_diff+1
     sta abs16s2_return+1
-  b10:
+  b6:
     lda abs16s2_return+1
     cmp abs16s1_return+1
     bcc b1
@@ -226,12 +226,12 @@ point_init: {
   b1:
     // X is driver - abs(y/x) is < 1
     lda x_diff+1
-    bmi b7
+    bmi b4
     // x add = 1.0
     ldy point_idx
     lda #$10
     sta x_add,y
-  b8:
+  b5:
     lda y_diff
     sta divr16s.rem
     lda y_diff+1
@@ -245,12 +245,12 @@ point_init: {
     ldy point_idx1
     sta y_add,y
     jmp b2
-  b7:
+  b4:
     // x add = -1.0
     lda #-$10
     ldy point_idx
     sta x_add,y
-    jmp b8
+    jmp b5
   abs16s2_b1:
     sec
     lda y_diff
@@ -261,7 +261,7 @@ point_init: {
     eor #$ff
     adc #0
     sta abs16s2__2+1
-    jmp b10
+    jmp b6
   abs16s1_b1:
     sec
     lda x_diff
@@ -304,7 +304,7 @@ divr16s: {
   b4:
     jsr divr16u
     cpy #0
-    beq b19
+    beq b10
     sec
     lda divr16u.rem
     eor #$ff
@@ -325,7 +325,7 @@ divr16s: {
     sta return+1
   breturn:
     rts
-  b19:
+  b10:
     lda divr16u.rem
     sta rem16s
     lda divr16u.rem+1
@@ -498,7 +498,7 @@ bitmap_init: {
     lda #>BITMAP
     sta yoffs+1
     ldx #0
-  b5:
+  b3:
     lda #7
     sax _3
     lda yoffs
@@ -509,7 +509,7 @@ bitmap_init: {
     txa
     and #7
     cmp #7
-    bne b6
+    bne b4
     clc
     lda yoffs
     adc #<$28*8
@@ -517,10 +517,10 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  b6:
+  b4:
     inx
     cpx #0
-    bne b5
+    bne b3
     rts
 }
   // The coordinates of the lines to animate
diff --git a/src/test/ref/line-anim.cfg b/src/test/ref/line-anim.cfg
index b8528c7cd..e48d76ae5 100644
--- a/src/test/ref/line-anim.cfg
+++ b/src/test/ref/line-anim.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@19
-@19: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @19
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @19
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
@@ -24,43 +24,43 @@ main::vicSelectGfxBank1_@1: scope:[main]  from main::vicSelectGfxBank1_toDd001
   to:main::toD0181
 main::toD0181: scope:[main]  from main::vicSelectGfxBank1_@1
   [11] phi()
-  to:main::@16
-main::@16: scope:[main]  from main::toD0181
+  to:main::@4
+main::@4: scope:[main]  from main::toD0181
   [12] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0
   [13] call bitmap_init 
-  to:main::@17
-main::@17: scope:[main]  from main::@16
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [14] phi()
   [15] call bitmap_clear 
-  to:main::@18
-main::@18: scope:[main]  from main::@17
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [16] phi()
   [17] call screen_fill 
-  to:main::@6
-main::@6: scope:[main]  from main::@18 main::@21
-  [18] (signed word) rem16s#15 ← phi( main::@18/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@21/(signed word) rem16s#13 )
-  [18] (word) rem16u#21 ← phi( main::@18/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@21/(word) rem16u#18 )
-  [18] (byte) main::i#2 ← phi( main::@18/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@21/(byte) main::i#1 )
+  to:main::@1
+main::@1: scope:[main]  from main::@6 main::@8
+  [18] (signed word) rem16s#15 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(signed word) rem16s#13 )
+  [18] (word) rem16u#21 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(word) rem16u#18 )
+  [18] (byte) main::i#2 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::i#1 )
   [19] (byte) point_init::point_idx#0 ← (byte) main::i#2
   [20] call point_init 
-  to:main::@20
-main::@20: scope:[main]  from main::@6
+  to:main::@7
+main::@7: scope:[main]  from main::@1
   [21] (byte~) main::$9 ← (byte) main::i#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [22] (word) bitmap_plot::x#0 ← *((const word[4]) x_start#0 + (byte) main::i#2)
   [23] (byte) bitmap_plot::y#0 ← *((const byte[4]) y_start#0 + (byte~) main::$9)
   [24] call bitmap_plot 
-  to:main::@21
-main::@21: scope:[main]  from main::@20
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [25] (byte) main::i#1 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
-  [26] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6
-  to:main::@8
-main::@8: scope:[main]  from main::@10 main::@21 main::@8
-  [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8
-  to:main::@10
-main::@10: scope:[main]  from main::@8
+  [26] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@2 main::@3 main::@8
+  [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [28] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
-  to:main::@8
-bitmap_plot: scope:[bitmap_plot]  from main::@20
+  to:main::@2
+bitmap_plot: scope:[bitmap_plot]  from main::@7
   [29] (word~) bitmap_plot::$3 ← *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_plot::y#0) w= *((const byte[$100]) bitmap_plot_ylo#0 + (byte) bitmap_plot::y#0)
   [30] (word~) bitmap_plot::$1 ← (word) bitmap_plot::x#0 & (word/dword/signed dword) $fff8
   [31] (byte*) bitmap_plot::plotter#1 ← (byte*)(word~) bitmap_plot::$3 + (word~) bitmap_plot::$1
@@ -70,7 +70,7 @@ bitmap_plot: scope:[bitmap_plot]  from main::@20
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [34] return 
   to:@return
-point_init: scope:[point_init]  from main::@6
+point_init: scope:[point_init]  from main::@1
   [35] (byte) point_init::point_idx1#0 ← (byte) point_init::point_idx#0 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [36] (signed word) point_init::x_diff#1 ← (signed word)*((const word[4]) x_end#0 + (byte) point_init::point_idx#0) - (signed word)*((const word[4]) x_start#0 + (byte) point_init::point_idx#0)
   [37] (signed word~) point_init::$4 ← ((signed word)) *((const byte[4]) y_end#0 + (byte) point_init::point_idx1#0)
@@ -79,28 +79,28 @@ point_init: scope:[point_init]  from main::@6
   to:point_init::abs16s1
 point_init::abs16s1: scope:[point_init]  from point_init
   [40] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::abs16s1_@1
-  to:point_init::@12
-point_init::@12: scope:[point_init]  from point_init::abs16s1
+  to:point_init::@8
+point_init::@8: scope:[point_init]  from point_init::abs16s1
   [41] (word~) point_init::abs16s1_return#6 ← (word)(signed word) point_init::x_diff#1
   to:point_init::abs16s1_@return
-point_init::abs16s1_@return: scope:[point_init]  from point_init::@12 point_init::abs16s1_@1
-  [42] (word) point_init::abs16s1_return#2 ← phi( point_init::abs16s1_@1/(word~) point_init::abs16s1_return#5 point_init::@12/(word~) point_init::abs16s1_return#6 )
+point_init::abs16s1_@return: scope:[point_init]  from point_init::@8 point_init::abs16s1_@1
+  [42] (word) point_init::abs16s1_return#2 ← phi( point_init::abs16s1_@1/(word~) point_init::abs16s1_return#5 point_init::@8/(word~) point_init::abs16s1_return#6 )
   to:point_init::abs16s2
 point_init::abs16s2: scope:[point_init]  from point_init::abs16s1_@return
   [43] if((signed word) point_init::y_diff#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::abs16s2_@1
-  to:point_init::@13
-point_init::@13: scope:[point_init]  from point_init::abs16s2
+  to:point_init::@9
+point_init::@9: scope:[point_init]  from point_init::abs16s2
   [44] (word~) point_init::abs16s2_return#6 ← (word)(signed word) point_init::y_diff#0
   to:point_init::abs16s2_@return
-point_init::abs16s2_@return: scope:[point_init]  from point_init::@13 point_init::abs16s2_@1
-  [45] (word) point_init::abs16s2_return#2 ← phi( point_init::abs16s2_@1/(word~) point_init::abs16s2_return#5 point_init::@13/(word~) point_init::abs16s2_return#6 )
-  to:point_init::@10
-point_init::@10: scope:[point_init]  from point_init::abs16s2_@return
+point_init::abs16s2_@return: scope:[point_init]  from point_init::@9 point_init::abs16s2_@1
+  [45] (word) point_init::abs16s2_return#2 ← phi( point_init::abs16s2_@1/(word~) point_init::abs16s2_return#5 point_init::@9/(word~) point_init::abs16s2_return#6 )
+  to:point_init::@6
+point_init::@6: scope:[point_init]  from point_init::abs16s2_@return
   [46] if((word) point_init::abs16s1_return#2>(word) point_init::abs16s2_return#2) goto point_init::@1
   to:point_init::@2
-point_init::@2: scope:[point_init]  from point_init::@10 point_init::@11
-  [47] (signed word) rem16s#13 ← phi( point_init::@10/(signed word) rem16s#15 point_init::@11/(signed word) rem16s#3 )
-  [47] (word) rem16u#18 ← phi( point_init::@10/(word) rem16u#21 point_init::@11/(word) divr16u::rem#10 )
+point_init::@2: scope:[point_init]  from point_init::@6 point_init::@7
+  [47] (signed word) rem16s#13 ← phi( point_init::@6/(signed word) rem16s#15 point_init::@7/(signed word) rem16s#3 )
+  [47] (word) rem16u#18 ← phi( point_init::@6/(word) rem16u#21 point_init::@7/(word) divr16u::rem#10 )
   [48] (word~) point_init::$10 ← *((const word[4]) x_start#0 + (byte) point_init::point_idx#0) << (byte/signed byte/word/signed word/dword/signed dword) 4
   [49] *((const word[4]) x_cur#0 + (byte) point_init::point_idx#0) ← (word~) point_init::$10
   [50] (word~) point_init::$11 ← ((word)) *((const byte[4]) y_start#0 + (byte) point_init::point_idx1#0)
@@ -111,27 +111,27 @@ point_init::@2: scope:[point_init]  from point_init::@10 point_init::@11
 point_init::@return: scope:[point_init]  from point_init::@2
   [54] return 
   to:@return
-point_init::@1: scope:[point_init]  from point_init::@10
-  [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@7
-  to:point_init::@5
-point_init::@5: scope:[point_init]  from point_init::@1
+point_init::@1: scope:[point_init]  from point_init::@6
+  [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@4
+  to:point_init::@3
+point_init::@3: scope:[point_init]  from point_init::@1
   [56] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← (byte/signed byte/word/signed word/dword/signed dword) $10
-  to:point_init::@8
-point_init::@8: scope:[point_init]  from point_init::@5 point_init::@7
+  to:point_init::@5
+point_init::@5: scope:[point_init]  from point_init::@3 point_init::@4
   [57] (signed word) divr16s::divisor#0 ← (signed word) point_init::x_diff#1
   [58] (signed word) divr16s::rem#0 ← (signed word) point_init::y_diff#0
   [59] call divr16s 
   [60] (signed word) divr16s::return#3 ← (signed word) divr16s::return#2
-  to:point_init::@11
-point_init::@11: scope:[point_init]  from point_init::@8
+  to:point_init::@7
+point_init::@7: scope:[point_init]  from point_init::@5
   [61] (signed word) point_init::x_stepf#0 ← (signed word) divr16s::return#3
   [62] (byte~) point_init::$16 ← > (signed word) point_init::x_stepf#0
   [63] (byte~) point_init::$17 ← (byte~) point_init::$16 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [64] *((const signed byte[4]) y_add#0 + (byte) point_init::point_idx1#0) ← (signed byte)(byte~) point_init::$17
   to:point_init::@2
-point_init::@7: scope:[point_init]  from point_init::@1
+point_init::@4: scope:[point_init]  from point_init::@1
   [65] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← -(byte/signed byte/word/signed word/dword/signed dword) $10
-  to:point_init::@8
+  to:point_init::@5
 point_init::abs16s2_@1: scope:[point_init]  from point_init::abs16s2
   [66] (signed word) point_init::abs16s2_$2#0 ← - (signed word) point_init::y_diff#0
   [67] (word~) point_init::abs16s2_return#5 ← (word)(signed word) point_init::abs16s2_$2#0
@@ -140,47 +140,47 @@ point_init::abs16s1_@1: scope:[point_init]  from point_init::abs16s1
   [68] (signed word) point_init::abs16s1_$2#0 ← - (signed word) point_init::x_diff#1
   [69] (word~) point_init::abs16s1_return#5 ← (word)(signed word) point_init::abs16s1_$2#0
   to:point_init::abs16s1_@return
-divr16s: scope:[divr16s]  from point_init::@8
+divr16s: scope:[divr16s]  from point_init::@5
   [70] phi()
-  to:divr16s::@16
-divr16s::@16: scope:[divr16s]  from divr16s
+  to:divr16s::@7
+divr16s::@7: scope:[divr16s]  from divr16s
   [71] if((signed word) divr16s::rem#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@1
-  to:divr16s::@17
-divr16s::@17: scope:[divr16s]  from divr16s::@16
+  to:divr16s::@8
+divr16s::@8: scope:[divr16s]  from divr16s::@7
   [72] (word~) divr16s::remu#8 ← (word)(signed word) divr16s::rem#0
   to:divr16s::@2
-divr16s::@2: scope:[divr16s]  from divr16s::@1 divr16s::@17
-  [73] (word) divr16s::remu#3 ← phi( divr16s::@1/(word~) divr16s::remu#7 divr16s::@17/(word~) divr16s::remu#8 )
-  [73] (word) divr16s::dividendu#3 ← phi( divr16s::@1/((word))-(const signed word) divr16s::dividend#0 divr16s::@17/((word))(const signed word) divr16s::dividend#0 )
-  [73] (byte) divr16s::neg#3 ← phi( divr16s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 divr16s::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+divr16s::@2: scope:[divr16s]  from divr16s::@1 divr16s::@8
+  [73] (word) divr16s::remu#3 ← phi( divr16s::@1/(word~) divr16s::remu#7 divr16s::@8/(word~) divr16s::remu#8 )
+  [73] (word) divr16s::dividendu#3 ← phi( divr16s::@1/((word))-(const signed word) divr16s::dividend#0 divr16s::@8/((word))(const signed word) divr16s::dividend#0 )
+  [73] (byte) divr16s::neg#3 ← phi( divr16s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 divr16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [74] if((signed word) divr16s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@3
-  to:divr16s::@18
-divr16s::@18: scope:[divr16s]  from divr16s::@2
+  to:divr16s::@9
+divr16s::@9: scope:[divr16s]  from divr16s::@2
   [75] (word~) divr16s::divisoru#5 ← (word)(signed word) divr16s::divisor#0
   to:divr16s::@4
-divr16s::@4: scope:[divr16s]  from divr16s::@18 divr16s::@3
-  [76] (byte) divr16s::neg#4 ← phi( divr16s::@3/(byte) divr16s::neg#2 divr16s::@18/(byte) divr16s::neg#3 )
-  [76] (word) divr16s::divisoru#3 ← phi( divr16s::@3/(word~) divr16s::divisoru#4 divr16s::@18/(word~) divr16s::divisoru#5 )
+divr16s::@4: scope:[divr16s]  from divr16s::@3 divr16s::@9
+  [76] (byte) divr16s::neg#4 ← phi( divr16s::@3/(byte) divr16s::neg#2 divr16s::@9/(byte) divr16s::neg#3 )
+  [76] (word) divr16s::divisoru#3 ← phi( divr16s::@3/(word~) divr16s::divisoru#4 divr16s::@9/(word~) divr16s::divisoru#5 )
   [77] (word) divr16u::dividend#1 ← (word) divr16s::dividendu#3
   [78] (word) divr16u::divisor#0 ← (word) divr16s::divisoru#3
   [79] (word) divr16u::rem#3 ← (word) divr16s::remu#3
   [80] call divr16u 
   [81] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:divr16s::@15
-divr16s::@15: scope:[divr16s]  from divr16s::@4
+  to:divr16s::@6
+divr16s::@6: scope:[divr16s]  from divr16s::@4
   [82] (word) divr16s::resultu#0 ← (word) divr16u::return#2
-  [83] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@19
-  to:divr16s::@11
-divr16s::@11: scope:[divr16s]  from divr16s::@15
+  [83] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@10
+  to:divr16s::@5
+divr16s::@5: scope:[divr16s]  from divr16s::@6
   [84] (signed word) rem16s#2 ← - (signed word)(word) divr16u::rem#10
   [85] (signed word) divr16s::return#1 ← - (signed word)(word) divr16s::resultu#0
   to:divr16s::@return
-divr16s::@return: scope:[divr16s]  from divr16s::@11 divr16s::@19
-  [86] (signed word) rem16s#3 ← phi( divr16s::@11/(signed word) rem16s#2 divr16s::@19/(signed word~) rem16s#57 )
-  [86] (signed word) divr16s::return#2 ← phi( divr16s::@11/(signed word) divr16s::return#1 divr16s::@19/(signed word~) divr16s::return#7 )
+divr16s::@return: scope:[divr16s]  from divr16s::@10 divr16s::@5
+  [86] (signed word) rem16s#3 ← phi( divr16s::@5/(signed word) rem16s#2 divr16s::@10/(signed word~) rem16s#57 )
+  [86] (signed word) divr16s::return#2 ← phi( divr16s::@5/(signed word) divr16s::return#1 divr16s::@10/(signed word~) divr16s::return#7 )
   [87] return 
   to:@return
-divr16s::@19: scope:[divr16s]  from divr16s::@15
+divr16s::@10: scope:[divr16s]  from divr16s::@6
   [88] (signed word~) divr16s::return#7 ← (signed word)(word) divr16s::resultu#0
   [89] (signed word~) rem16s#57 ← (signed word)(word) divr16u::rem#10
   to:divr16s::@return
@@ -189,7 +189,7 @@ divr16s::@3: scope:[divr16s]  from divr16s::@2
   [91] (byte) divr16s::neg#2 ← (byte) divr16s::neg#3 ^ (byte/signed byte/word/signed word/dword/signed dword) 1
   [92] (word~) divr16s::divisoru#4 ← (word)(signed word~) divr16s::$13
   to:divr16s::@4
-divr16s::@1: scope:[divr16s]  from divr16s::@16
+divr16s::@1: scope:[divr16s]  from divr16s::@7
   [93] (signed word~) divr16s::$10 ← - (signed word) divr16s::rem#0
   [94] (word~) divr16s::remu#7 ← (word)(signed word~) divr16s::$10
   to:divr16s::@2
@@ -228,7 +228,7 @@ divr16u::@3: scope:[divr16u]  from divr16u::@2 divr16u::@5
 divr16u::@return: scope:[divr16u]  from divr16u::@3
   [111] return 
   to:@return
-screen_fill: scope:[screen_fill]  from main::@18
+screen_fill: scope:[screen_fill]  from main::@6
   [112] phi()
   to:screen_fill::@1
 screen_fill::@1: scope:[screen_fill]  from screen_fill screen_fill::@3
@@ -250,7 +250,7 @@ screen_fill::@3: scope:[screen_fill]  from screen_fill::@2
 screen_fill::@return: scope:[screen_fill]  from screen_fill::@3
   [121] return 
   to:@return
-bitmap_clear: scope:[bitmap_clear]  from main::@17
+bitmap_clear: scope:[bitmap_clear]  from main::@5
   [122] (word~) bitmap_clear::$3 ← *((const byte[$100]) bitmap_plot_yhi#0) w= *((const byte[$100]) bitmap_plot_ylo#0)
   [123] (byte*~) bitmap_clear::bitmap#5 ← (byte*)(word~) bitmap_clear::$3
   to:bitmap_clear::@1
@@ -273,7 +273,7 @@ bitmap_clear::@3: scope:[bitmap_clear]  from bitmap_clear::@2
 bitmap_clear::@return: scope:[bitmap_clear]  from bitmap_clear::@3
   [132] return 
   to:@return
-bitmap_init: scope:[bitmap_init]  from main::@16
+bitmap_init: scope:[bitmap_init]  from main::@4
   [133] phi()
   to:bitmap_init::@1
 bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
@@ -281,16 +281,16 @@ bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
   [134] (byte) bitmap_init::bits#3 ← phi( bitmap_init/(byte/word/signed word/dword/signed dword) $80 bitmap_init::@2/(byte) bitmap_init::bits#4 )
   [135] *((const byte[$100]) bitmap_plot_bit#0 + (byte) bitmap_init::x#2) ← (byte) bitmap_init::bits#3
   [136] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [137] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10
+  [137] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6
   to:bitmap_init::@2
-bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@10
-  [138] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@10/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
+bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@6
+  [138] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@6/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
   [139] (byte) bitmap_init::x#1 ← ++ (byte) bitmap_init::x#2
   [140] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1
-  to:bitmap_init::@5
-bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
-  [141] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/(const byte*) BITMAP#0 bitmap_init::@6/(byte*) bitmap_init::yoffs#4 )
-  [141] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte) bitmap_init::y#1 )
+  to:bitmap_init::@3
+bitmap_init::@3: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@4
+  [141] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/(const byte*) BITMAP#0 bitmap_init::@4/(byte*) bitmap_init::yoffs#4 )
+  [141] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte) bitmap_init::y#1 )
   [142] (byte~) bitmap_init::$3 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [143] (byte~) bitmap_init::$4 ← < (byte*) bitmap_init::yoffs#2
   [144] (byte~) bitmap_init::$5 ← (byte~) bitmap_init::$3 | (byte~) bitmap_init::$4
@@ -298,19 +298,19 @@ bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
   [146] (byte~) bitmap_init::$6 ← > (byte*) bitmap_init::yoffs#2
   [147] *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_init::y#2) ← (byte~) bitmap_init::$6
   [148] (byte~) bitmap_init::$7 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [149] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6
-  to:bitmap_init::@7
-bitmap_init::@7: scope:[bitmap_init]  from bitmap_init::@5
+  [149] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4
+  to:bitmap_init::@5
+bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@3
   [150] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:bitmap_init::@6
-bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@5 bitmap_init::@7
-  [151] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@5/(byte*) bitmap_init::yoffs#2 bitmap_init::@7/(byte*) bitmap_init::yoffs#1 )
+  to:bitmap_init::@4
+bitmap_init::@4: scope:[bitmap_init]  from bitmap_init::@3 bitmap_init::@5
+  [151] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@3/(byte*) bitmap_init::yoffs#2 bitmap_init::@5/(byte*) bitmap_init::yoffs#1 )
   [152] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2
-  [153] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5
+  [153] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3
   to:bitmap_init::@return
-bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@6
+bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@4
   [154] return 
   to:@return
-bitmap_init::@10: scope:[bitmap_init]  from bitmap_init::@1
+bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@1
   [155] phi()
   to:bitmap_init::@2
diff --git a/src/test/ref/line-anim.log b/src/test/ref/line-anim.log
index 3429992d2..959a780ba 100644
--- a/src/test/ref/line-anim.log
+++ b/src/test/ref/line-anim.log
@@ -2253,30 +2253,56 @@ Culled Empty Block (label) bitmap_init::@3
 Culled Empty Block (label) bitmap_init::@11
 Culled Empty Block (label) bitmap_init::@12
 Culled Empty Block (label) bitmap_init::@9
+Renumbering block @19 to @1
+Renumbering block divr16s::@11 to divr16s::@5
+Renumbering block divr16s::@15 to divr16s::@6
+Renumbering block divr16s::@16 to divr16s::@7
+Renumbering block divr16s::@17 to divr16s::@8
+Renumbering block divr16s::@18 to divr16s::@9
+Renumbering block divr16s::@19 to divr16s::@10
+Renumbering block main::@6 to main::@1
+Renumbering block main::@8 to main::@2
+Renumbering block main::@10 to main::@3
+Renumbering block main::@16 to main::@4
+Renumbering block main::@17 to main::@5
+Renumbering block main::@18 to main::@6
+Renumbering block main::@20 to main::@7
+Renumbering block main::@21 to main::@8
+Renumbering block point_init::@5 to point_init::@3
+Renumbering block point_init::@7 to point_init::@4
+Renumbering block point_init::@8 to point_init::@5
+Renumbering block point_init::@10 to point_init::@6
+Renumbering block point_init::@11 to point_init::@7
+Renumbering block point_init::@12 to point_init::@8
+Renumbering block point_init::@13 to point_init::@9
+Renumbering block bitmap_init::@5 to bitmap_init::@3
+Renumbering block bitmap_init::@6 to bitmap_init::@4
+Renumbering block bitmap_init::@7 to bitmap_init::@5
+Renumbering block bitmap_init::@10 to bitmap_init::@6
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @19
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::vicSelectGfxBank1_toDd001
 Adding NOP phi() at start of main::toD0181
-Adding NOP phi() at start of main::@17
-Adding NOP phi() at start of main::@18
+Adding NOP phi() at start of main::@5
+Adding NOP phi() at start of main::@6
 Adding NOP phi() at start of divr16s
 Adding NOP phi() at start of divr16u
 Adding NOP phi() at start of screen_fill
 Adding NOP phi() at start of bitmap_init
-Adding NOP phi() at start of bitmap_init::@10
+Adding NOP phi() at start of bitmap_init::@6
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@19
-@19: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @19
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @19
+main: scope:[main]  from @1
   asm { sei  }
   [5] *((const byte*) PROCPORT_DDR#0) ← (const byte) PROCPORT_DDR_MEMORY_MASK#0
   [6] *((const byte*) PROCPORT#0) ← (const byte) PROCPORT_RAM_IO#0
@@ -2293,43 +2319,43 @@ main::vicSelectGfxBank1_@1: scope:[main]  from main::vicSelectGfxBank1_toDd001
   to:main::toD0181
 main::toD0181: scope:[main]  from main::vicSelectGfxBank1_@1
   [11] phi()
-  to:main::@16
-main::@16: scope:[main]  from main::toD0181
+  to:main::@4
+main::@4: scope:[main]  from main::toD0181
   [12] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0
   [13] call bitmap_init 
-  to:main::@17
-main::@17: scope:[main]  from main::@16
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [14] phi()
   [15] call bitmap_clear 
-  to:main::@18
-main::@18: scope:[main]  from main::@17
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [16] phi()
   [17] call screen_fill 
-  to:main::@6
-main::@6: scope:[main]  from main::@18 main::@21
-  [18] (signed word) rem16s#15 ← phi( main::@18/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@21/(signed word) rem16s#13 )
-  [18] (word) rem16u#21 ← phi( main::@18/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@21/(word) rem16u#18 )
-  [18] (byte) main::i#2 ← phi( main::@18/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@21/(byte) main::i#1 )
+  to:main::@1
+main::@1: scope:[main]  from main::@6 main::@8
+  [18] (signed word) rem16s#15 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(signed word) rem16s#13 )
+  [18] (word) rem16u#21 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(word) rem16u#18 )
+  [18] (byte) main::i#2 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::i#1 )
   [19] (byte) point_init::point_idx#0 ← (byte) main::i#2
   [20] call point_init 
-  to:main::@20
-main::@20: scope:[main]  from main::@6
+  to:main::@7
+main::@7: scope:[main]  from main::@1
   [21] (byte~) main::$9 ← (byte) main::i#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [22] (word) bitmap_plot::x#0 ← *((const word[4]) x_start#0 + (byte) main::i#2)
   [23] (byte) bitmap_plot::y#0 ← *((const byte[4]) y_start#0 + (byte~) main::$9)
   [24] call bitmap_plot 
-  to:main::@21
-main::@21: scope:[main]  from main::@20
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [25] (byte) main::i#1 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
-  [26] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6
-  to:main::@8
-main::@8: scope:[main]  from main::@10 main::@21 main::@8
-  [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8
-  to:main::@10
-main::@10: scope:[main]  from main::@8
+  [26] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@2 main::@3 main::@8
+  [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [28] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
-  to:main::@8
-bitmap_plot: scope:[bitmap_plot]  from main::@20
+  to:main::@2
+bitmap_plot: scope:[bitmap_plot]  from main::@7
   [29] (word~) bitmap_plot::$3 ← *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_plot::y#0) w= *((const byte[$100]) bitmap_plot_ylo#0 + (byte) bitmap_plot::y#0)
   [30] (word~) bitmap_plot::$1 ← (word) bitmap_plot::x#0 & (word/dword/signed dword) $fff8
   [31] (byte*) bitmap_plot::plotter#1 ← (byte*)(word~) bitmap_plot::$3 + (word~) bitmap_plot::$1
@@ -2339,7 +2365,7 @@ bitmap_plot: scope:[bitmap_plot]  from main::@20
 bitmap_plot::@return: scope:[bitmap_plot]  from bitmap_plot
   [34] return 
   to:@return
-point_init: scope:[point_init]  from main::@6
+point_init: scope:[point_init]  from main::@1
   [35] (byte) point_init::point_idx1#0 ← (byte) point_init::point_idx#0 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [36] (signed word) point_init::x_diff#1 ← (signed word)*((const word[4]) x_end#0 + (byte) point_init::point_idx#0) - (signed word)*((const word[4]) x_start#0 + (byte) point_init::point_idx#0)
   [37] (signed word~) point_init::$4 ← ((signed word)) *((const byte[4]) y_end#0 + (byte) point_init::point_idx1#0)
@@ -2348,28 +2374,28 @@ point_init: scope:[point_init]  from main::@6
   to:point_init::abs16s1
 point_init::abs16s1: scope:[point_init]  from point_init
   [40] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::abs16s1_@1
-  to:point_init::@12
-point_init::@12: scope:[point_init]  from point_init::abs16s1
+  to:point_init::@8
+point_init::@8: scope:[point_init]  from point_init::abs16s1
   [41] (word~) point_init::abs16s1_return#6 ← (word)(signed word) point_init::x_diff#1
   to:point_init::abs16s1_@return
-point_init::abs16s1_@return: scope:[point_init]  from point_init::@12 point_init::abs16s1_@1
-  [42] (word) point_init::abs16s1_return#2 ← phi( point_init::abs16s1_@1/(word~) point_init::abs16s1_return#5 point_init::@12/(word~) point_init::abs16s1_return#6 )
+point_init::abs16s1_@return: scope:[point_init]  from point_init::@8 point_init::abs16s1_@1
+  [42] (word) point_init::abs16s1_return#2 ← phi( point_init::abs16s1_@1/(word~) point_init::abs16s1_return#5 point_init::@8/(word~) point_init::abs16s1_return#6 )
   to:point_init::abs16s2
 point_init::abs16s2: scope:[point_init]  from point_init::abs16s1_@return
   [43] if((signed word) point_init::y_diff#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::abs16s2_@1
-  to:point_init::@13
-point_init::@13: scope:[point_init]  from point_init::abs16s2
+  to:point_init::@9
+point_init::@9: scope:[point_init]  from point_init::abs16s2
   [44] (word~) point_init::abs16s2_return#6 ← (word)(signed word) point_init::y_diff#0
   to:point_init::abs16s2_@return
-point_init::abs16s2_@return: scope:[point_init]  from point_init::@13 point_init::abs16s2_@1
-  [45] (word) point_init::abs16s2_return#2 ← phi( point_init::abs16s2_@1/(word~) point_init::abs16s2_return#5 point_init::@13/(word~) point_init::abs16s2_return#6 )
-  to:point_init::@10
-point_init::@10: scope:[point_init]  from point_init::abs16s2_@return
+point_init::abs16s2_@return: scope:[point_init]  from point_init::@9 point_init::abs16s2_@1
+  [45] (word) point_init::abs16s2_return#2 ← phi( point_init::abs16s2_@1/(word~) point_init::abs16s2_return#5 point_init::@9/(word~) point_init::abs16s2_return#6 )
+  to:point_init::@6
+point_init::@6: scope:[point_init]  from point_init::abs16s2_@return
   [46] if((word) point_init::abs16s1_return#2>(word) point_init::abs16s2_return#2) goto point_init::@1
   to:point_init::@2
-point_init::@2: scope:[point_init]  from point_init::@10 point_init::@11
-  [47] (signed word) rem16s#13 ← phi( point_init::@10/(signed word) rem16s#15 point_init::@11/(signed word) rem16s#3 )
-  [47] (word) rem16u#18 ← phi( point_init::@10/(word) rem16u#21 point_init::@11/(word) divr16u::rem#10 )
+point_init::@2: scope:[point_init]  from point_init::@6 point_init::@7
+  [47] (signed word) rem16s#13 ← phi( point_init::@6/(signed word) rem16s#15 point_init::@7/(signed word) rem16s#3 )
+  [47] (word) rem16u#18 ← phi( point_init::@6/(word) rem16u#21 point_init::@7/(word) divr16u::rem#10 )
   [48] (word~) point_init::$10 ← *((const word[4]) x_start#0 + (byte) point_init::point_idx#0) << (byte/signed byte/word/signed word/dword/signed dword) 4
   [49] *((const word[4]) x_cur#0 + (byte) point_init::point_idx#0) ← (word~) point_init::$10
   [50] (word~) point_init::$11 ← ((word)) *((const byte[4]) y_start#0 + (byte) point_init::point_idx1#0)
@@ -2380,27 +2406,27 @@ point_init::@2: scope:[point_init]  from point_init::@10 point_init::@11
 point_init::@return: scope:[point_init]  from point_init::@2
   [54] return 
   to:@return
-point_init::@1: scope:[point_init]  from point_init::@10
-  [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@7
-  to:point_init::@5
-point_init::@5: scope:[point_init]  from point_init::@1
+point_init::@1: scope:[point_init]  from point_init::@6
+  [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@4
+  to:point_init::@3
+point_init::@3: scope:[point_init]  from point_init::@1
   [56] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← (byte/signed byte/word/signed word/dword/signed dword) $10
-  to:point_init::@8
-point_init::@8: scope:[point_init]  from point_init::@5 point_init::@7
+  to:point_init::@5
+point_init::@5: scope:[point_init]  from point_init::@3 point_init::@4
   [57] (signed word) divr16s::divisor#0 ← (signed word) point_init::x_diff#1
   [58] (signed word) divr16s::rem#0 ← (signed word) point_init::y_diff#0
   [59] call divr16s 
   [60] (signed word) divr16s::return#3 ← (signed word) divr16s::return#2
-  to:point_init::@11
-point_init::@11: scope:[point_init]  from point_init::@8
+  to:point_init::@7
+point_init::@7: scope:[point_init]  from point_init::@5
   [61] (signed word) point_init::x_stepf#0 ← (signed word) divr16s::return#3
   [62] (byte~) point_init::$16 ← > (signed word) point_init::x_stepf#0
   [63] (byte~) point_init::$17 ← (byte~) point_init::$16 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [64] *((const signed byte[4]) y_add#0 + (byte) point_init::point_idx1#0) ← (signed byte)(byte~) point_init::$17
   to:point_init::@2
-point_init::@7: scope:[point_init]  from point_init::@1
+point_init::@4: scope:[point_init]  from point_init::@1
   [65] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← -(byte/signed byte/word/signed word/dword/signed dword) $10
-  to:point_init::@8
+  to:point_init::@5
 point_init::abs16s2_@1: scope:[point_init]  from point_init::abs16s2
   [66] (signed word) point_init::abs16s2_$2#0 ← - (signed word) point_init::y_diff#0
   [67] (word~) point_init::abs16s2_return#5 ← (word)(signed word) point_init::abs16s2_$2#0
@@ -2409,47 +2435,47 @@ point_init::abs16s1_@1: scope:[point_init]  from point_init::abs16s1
   [68] (signed word) point_init::abs16s1_$2#0 ← - (signed word) point_init::x_diff#1
   [69] (word~) point_init::abs16s1_return#5 ← (word)(signed word) point_init::abs16s1_$2#0
   to:point_init::abs16s1_@return
-divr16s: scope:[divr16s]  from point_init::@8
+divr16s: scope:[divr16s]  from point_init::@5
   [70] phi()
-  to:divr16s::@16
-divr16s::@16: scope:[divr16s]  from divr16s
+  to:divr16s::@7
+divr16s::@7: scope:[divr16s]  from divr16s
   [71] if((signed word) divr16s::rem#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@1
-  to:divr16s::@17
-divr16s::@17: scope:[divr16s]  from divr16s::@16
+  to:divr16s::@8
+divr16s::@8: scope:[divr16s]  from divr16s::@7
   [72] (word~) divr16s::remu#8 ← (word)(signed word) divr16s::rem#0
   to:divr16s::@2
-divr16s::@2: scope:[divr16s]  from divr16s::@1 divr16s::@17
-  [73] (word) divr16s::remu#3 ← phi( divr16s::@1/(word~) divr16s::remu#7 divr16s::@17/(word~) divr16s::remu#8 )
-  [73] (word) divr16s::dividendu#3 ← phi( divr16s::@1/((word))-(const signed word) divr16s::dividend#0 divr16s::@17/((word))(const signed word) divr16s::dividend#0 )
-  [73] (byte) divr16s::neg#3 ← phi( divr16s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 divr16s::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+divr16s::@2: scope:[divr16s]  from divr16s::@1 divr16s::@8
+  [73] (word) divr16s::remu#3 ← phi( divr16s::@1/(word~) divr16s::remu#7 divr16s::@8/(word~) divr16s::remu#8 )
+  [73] (word) divr16s::dividendu#3 ← phi( divr16s::@1/((word))-(const signed word) divr16s::dividend#0 divr16s::@8/((word))(const signed word) divr16s::dividend#0 )
+  [73] (byte) divr16s::neg#3 ← phi( divr16s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 divr16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [74] if((signed word) divr16s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@3
-  to:divr16s::@18
-divr16s::@18: scope:[divr16s]  from divr16s::@2
+  to:divr16s::@9
+divr16s::@9: scope:[divr16s]  from divr16s::@2
   [75] (word~) divr16s::divisoru#5 ← (word)(signed word) divr16s::divisor#0
   to:divr16s::@4
-divr16s::@4: scope:[divr16s]  from divr16s::@18 divr16s::@3
-  [76] (byte) divr16s::neg#4 ← phi( divr16s::@3/(byte) divr16s::neg#2 divr16s::@18/(byte) divr16s::neg#3 )
-  [76] (word) divr16s::divisoru#3 ← phi( divr16s::@3/(word~) divr16s::divisoru#4 divr16s::@18/(word~) divr16s::divisoru#5 )
+divr16s::@4: scope:[divr16s]  from divr16s::@3 divr16s::@9
+  [76] (byte) divr16s::neg#4 ← phi( divr16s::@3/(byte) divr16s::neg#2 divr16s::@9/(byte) divr16s::neg#3 )
+  [76] (word) divr16s::divisoru#3 ← phi( divr16s::@3/(word~) divr16s::divisoru#4 divr16s::@9/(word~) divr16s::divisoru#5 )
   [77] (word) divr16u::dividend#1 ← (word) divr16s::dividendu#3
   [78] (word) divr16u::divisor#0 ← (word) divr16s::divisoru#3
   [79] (word) divr16u::rem#3 ← (word) divr16s::remu#3
   [80] call divr16u 
   [81] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:divr16s::@15
-divr16s::@15: scope:[divr16s]  from divr16s::@4
+  to:divr16s::@6
+divr16s::@6: scope:[divr16s]  from divr16s::@4
   [82] (word) divr16s::resultu#0 ← (word) divr16u::return#2
-  [83] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@19
-  to:divr16s::@11
-divr16s::@11: scope:[divr16s]  from divr16s::@15
+  [83] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@10
+  to:divr16s::@5
+divr16s::@5: scope:[divr16s]  from divr16s::@6
   [84] (signed word) rem16s#2 ← - (signed word)(word) divr16u::rem#10
   [85] (signed word) divr16s::return#1 ← - (signed word)(word) divr16s::resultu#0
   to:divr16s::@return
-divr16s::@return: scope:[divr16s]  from divr16s::@11 divr16s::@19
-  [86] (signed word) rem16s#3 ← phi( divr16s::@11/(signed word) rem16s#2 divr16s::@19/(signed word~) rem16s#57 )
-  [86] (signed word) divr16s::return#2 ← phi( divr16s::@11/(signed word) divr16s::return#1 divr16s::@19/(signed word~) divr16s::return#7 )
+divr16s::@return: scope:[divr16s]  from divr16s::@10 divr16s::@5
+  [86] (signed word) rem16s#3 ← phi( divr16s::@5/(signed word) rem16s#2 divr16s::@10/(signed word~) rem16s#57 )
+  [86] (signed word) divr16s::return#2 ← phi( divr16s::@5/(signed word) divr16s::return#1 divr16s::@10/(signed word~) divr16s::return#7 )
   [87] return 
   to:@return
-divr16s::@19: scope:[divr16s]  from divr16s::@15
+divr16s::@10: scope:[divr16s]  from divr16s::@6
   [88] (signed word~) divr16s::return#7 ← (signed word)(word) divr16s::resultu#0
   [89] (signed word~) rem16s#57 ← (signed word)(word) divr16u::rem#10
   to:divr16s::@return
@@ -2458,7 +2484,7 @@ divr16s::@3: scope:[divr16s]  from divr16s::@2
   [91] (byte) divr16s::neg#2 ← (byte) divr16s::neg#3 ^ (byte/signed byte/word/signed word/dword/signed dword) 1
   [92] (word~) divr16s::divisoru#4 ← (word)(signed word~) divr16s::$13
   to:divr16s::@4
-divr16s::@1: scope:[divr16s]  from divr16s::@16
+divr16s::@1: scope:[divr16s]  from divr16s::@7
   [93] (signed word~) divr16s::$10 ← - (signed word) divr16s::rem#0
   [94] (word~) divr16s::remu#7 ← (word)(signed word~) divr16s::$10
   to:divr16s::@2
@@ -2497,7 +2523,7 @@ divr16u::@3: scope:[divr16u]  from divr16u::@2 divr16u::@5
 divr16u::@return: scope:[divr16u]  from divr16u::@3
   [111] return 
   to:@return
-screen_fill: scope:[screen_fill]  from main::@18
+screen_fill: scope:[screen_fill]  from main::@6
   [112] phi()
   to:screen_fill::@1
 screen_fill::@1: scope:[screen_fill]  from screen_fill screen_fill::@3
@@ -2519,7 +2545,7 @@ screen_fill::@3: scope:[screen_fill]  from screen_fill::@2
 screen_fill::@return: scope:[screen_fill]  from screen_fill::@3
   [121] return 
   to:@return
-bitmap_clear: scope:[bitmap_clear]  from main::@17
+bitmap_clear: scope:[bitmap_clear]  from main::@5
   [122] (word~) bitmap_clear::$3 ← *((const byte[$100]) bitmap_plot_yhi#0) w= *((const byte[$100]) bitmap_plot_ylo#0)
   [123] (byte*~) bitmap_clear::bitmap#5 ← (byte*)(word~) bitmap_clear::$3
   to:bitmap_clear::@1
@@ -2542,7 +2568,7 @@ bitmap_clear::@3: scope:[bitmap_clear]  from bitmap_clear::@2
 bitmap_clear::@return: scope:[bitmap_clear]  from bitmap_clear::@3
   [132] return 
   to:@return
-bitmap_init: scope:[bitmap_init]  from main::@16
+bitmap_init: scope:[bitmap_init]  from main::@4
   [133] phi()
   to:bitmap_init::@1
 bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
@@ -2550,16 +2576,16 @@ bitmap_init::@1: scope:[bitmap_init]  from bitmap_init bitmap_init::@2
   [134] (byte) bitmap_init::bits#3 ← phi( bitmap_init/(byte/word/signed word/dword/signed dword) $80 bitmap_init::@2/(byte) bitmap_init::bits#4 )
   [135] *((const byte[$100]) bitmap_plot_bit#0 + (byte) bitmap_init::x#2) ← (byte) bitmap_init::bits#3
   [136] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
-  [137] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10
+  [137] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6
   to:bitmap_init::@2
-bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@10
-  [138] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@10/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
+bitmap_init::@2: scope:[bitmap_init]  from bitmap_init::@1 bitmap_init::@6
+  [138] (byte) bitmap_init::bits#4 ← phi( bitmap_init::@6/(byte) bitmap_init::bits#1 bitmap_init::@1/(byte/word/signed word/dword/signed dword) $80 )
   [139] (byte) bitmap_init::x#1 ← ++ (byte) bitmap_init::x#2
   [140] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1
-  to:bitmap_init::@5
-bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
-  [141] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/(const byte*) BITMAP#0 bitmap_init::@6/(byte*) bitmap_init::yoffs#4 )
-  [141] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@6/(byte) bitmap_init::y#1 )
+  to:bitmap_init::@3
+bitmap_init::@3: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@4
+  [141] (byte*) bitmap_init::yoffs#2 ← phi( bitmap_init::@2/(const byte*) BITMAP#0 bitmap_init::@4/(byte*) bitmap_init::yoffs#4 )
+  [141] (byte) bitmap_init::y#2 ← phi( bitmap_init::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 bitmap_init::@4/(byte) bitmap_init::y#1 )
   [142] (byte~) bitmap_init::$3 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [143] (byte~) bitmap_init::$4 ← < (byte*) bitmap_init::yoffs#2
   [144] (byte~) bitmap_init::$5 ← (byte~) bitmap_init::$3 | (byte~) bitmap_init::$4
@@ -2567,20 +2593,20 @@ bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@2 bitmap_init::@6
   [146] (byte~) bitmap_init::$6 ← > (byte*) bitmap_init::yoffs#2
   [147] *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_init::y#2) ← (byte~) bitmap_init::$6
   [148] (byte~) bitmap_init::$7 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  [149] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6
-  to:bitmap_init::@7
-bitmap_init::@7: scope:[bitmap_init]  from bitmap_init::@5
+  [149] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4
+  to:bitmap_init::@5
+bitmap_init::@5: scope:[bitmap_init]  from bitmap_init::@3
   [150] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8
-  to:bitmap_init::@6
-bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@5 bitmap_init::@7
-  [151] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@5/(byte*) bitmap_init::yoffs#2 bitmap_init::@7/(byte*) bitmap_init::yoffs#1 )
+  to:bitmap_init::@4
+bitmap_init::@4: scope:[bitmap_init]  from bitmap_init::@3 bitmap_init::@5
+  [151] (byte*) bitmap_init::yoffs#4 ← phi( bitmap_init::@3/(byte*) bitmap_init::yoffs#2 bitmap_init::@5/(byte*) bitmap_init::yoffs#1 )
   [152] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2
-  [153] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5
+  [153] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3
   to:bitmap_init::@return
-bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@6
+bitmap_init::@return: scope:[bitmap_init]  from bitmap_init::@4
   [154] return 
   to:@return
-bitmap_init::@10: scope:[bitmap_init]  from bitmap_init::@1
+bitmap_init::@6: scope:[bitmap_init]  from bitmap_init::@1
   [155] phi()
   to:bitmap_init::@2
 
@@ -3087,15 +3113,15 @@ INITIAL ASM
   .label rem16u = $12
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @19 [phi:@begin->@19]
-b19_from_bbegin:
-  jmp b19
-//SEG5 @19
-b19:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @19 to @end [phi:@19->@end]
-bend_from_b19:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -3140,64 +3166,64 @@ main: {
     jmp toD0181
   //SEG21 main::toD0181
   toD0181:
-    jmp b16
-  //SEG22 main::@16
-  b16:
+    jmp b4
+  //SEG22 main::@4
+  b4:
   //SEG23 [12] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG24 [13] call bitmap_init 
-  //SEG25 [133] phi from main::@16 to bitmap_init [phi:main::@16->bitmap_init]
-  bitmap_init_from_b16:
+  //SEG25 [133] phi from main::@4 to bitmap_init [phi:main::@4->bitmap_init]
+  bitmap_init_from_b4:
     jsr bitmap_init
-  //SEG26 [14] phi from main::@16 to main::@17 [phi:main::@16->main::@17]
-  b17_from_b16:
-    jmp b17
-  //SEG27 main::@17
-  b17:
+  //SEG26 [14] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG27 main::@5
+  b5:
   //SEG28 [15] call bitmap_clear 
     jsr bitmap_clear
-  //SEG29 [16] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG30 main::@18
-  b18:
+  //SEG29 [16] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG30 main::@6
+  b6:
   //SEG31 [17] call screen_fill 
-  //SEG32 [112] phi from main::@18 to screen_fill [phi:main::@18->screen_fill]
-  screen_fill_from_b18:
+  //SEG32 [112] phi from main::@6 to screen_fill [phi:main::@6->screen_fill]
+  screen_fill_from_b6:
     jsr screen_fill
-  //SEG33 [18] phi from main::@18 to main::@6 [phi:main::@18->main::@6]
-  b6_from_b18:
-  //SEG34 [18] phi (signed word) rem16s#15 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@6#0] -- vwsz1=vbuc1 
+  //SEG33 [18] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG34 [18] phi (signed word) rem16s#15 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#0] -- vwsz1=vbuc1 
     lda #0
     sta rem16s
     lda #0
     sta rem16s+1
-  //SEG35 [18] phi (word) rem16u#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@6#1] -- vwuz1=vbuc1 
+  //SEG35 [18] phi (word) rem16u#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#1] -- vwuz1=vbuc1 
     lda #0
     sta rem16u
     lda #0
     sta rem16u+1
-  //SEG36 [18] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@6#2] -- vbuz1=vbuc1 
+  //SEG36 [18] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#2] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b6
-  //SEG37 [18] phi from main::@21 to main::@6 [phi:main::@21->main::@6]
-  b6_from_b21:
-  //SEG38 [18] phi (signed word) rem16s#15 = (signed word) rem16s#13 [phi:main::@21->main::@6#0] -- register_copy 
-  //SEG39 [18] phi (word) rem16u#21 = (word) rem16u#18 [phi:main::@21->main::@6#1] -- register_copy 
-  //SEG40 [18] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@21->main::@6#2] -- register_copy 
-    jmp b6
-  //SEG41 main::@6
-  b6:
+    jmp b1
+  //SEG37 [18] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
+  b1_from_b8:
+  //SEG38 [18] phi (signed word) rem16s#15 = (signed word) rem16s#13 [phi:main::@8->main::@1#0] -- register_copy 
+  //SEG39 [18] phi (word) rem16u#21 = (word) rem16u#18 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG40 [18] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@1#2] -- register_copy 
+    jmp b1
+  //SEG41 main::@1
+  b1:
   //SEG42 [19] (byte) point_init::point_idx#0 ← (byte) main::i#2 -- vbuz1=vbuz2 
     lda i
     sta point_init.point_idx
   //SEG43 [20] call point_init 
     jsr point_init
-    jmp b20
-  //SEG44 main::@20
-  b20:
+    jmp b7
+  //SEG44 main::@7
+  b7:
   //SEG45 [21] (byte~) main::$9 ← (byte) main::i#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_ror_1 
     lda i
     lsr
@@ -3214,31 +3240,31 @@ main: {
     sta bitmap_plot.y
   //SEG48 [24] call bitmap_plot 
     jsr bitmap_plot
-    jmp b21
-  //SEG49 main::@21
-  b21:
+    jmp b8
+  //SEG49 main::@8
+  b8:
   //SEG50 [25] (byte) main::i#1 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
     adc #2
     sta i
-  //SEG51 [26] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG51 [26] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    bne b6_from_b21
-    jmp b8
-  //SEG52 main::@8
-  b8:
-  //SEG53 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1_from_b8
+    jmp b2
+  //SEG52 main::@2
+  b2:
+  //SEG53 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b8
-    jmp b10
-  //SEG54 main::@10
-  b10:
+    bne b2
+    jmp b3
+  //SEG54 main::@3
+  b3:
   //SEG55 [28] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-    jmp b8
+    jmp b2
 }
 //SEG56 bitmap_plot
 // Plot a single dot in the bitmap
@@ -3346,18 +3372,18 @@ point_init: {
   //SEG71 [40] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::abs16s1_@1 -- vwsz1_lt_0_then_la1 
     lda x_diff+1
     bmi abs16s1_b1
-    jmp b12
-  //SEG72 point_init::@12
-  b12:
+    jmp b8
+  //SEG72 point_init::@8
+  b8:
   //SEG73 [41] (word~) point_init::abs16s1_return#6 ← (word)(signed word) point_init::x_diff#1 -- vwuz1=vwuz2 
     lda x_diff
     sta abs16s1_return
     lda x_diff+1
     sta abs16s1_return+1
-  //SEG74 [42] phi from point_init::@12 point_init::abs16s1_@1 to point_init::abs16s1_@return [phi:point_init::@12/point_init::abs16s1_@1->point_init::abs16s1_@return]
-  abs16s1_breturn_from_b12:
+  //SEG74 [42] phi from point_init::@8 point_init::abs16s1_@1 to point_init::abs16s1_@return [phi:point_init::@8/point_init::abs16s1_@1->point_init::abs16s1_@return]
+  abs16s1_breturn_from_b8:
   abs16s1_breturn_from_abs16s1_b1:
-  //SEG75 [42] phi (word) point_init::abs16s1_return#2 = (word~) point_init::abs16s1_return#6 [phi:point_init::@12/point_init::abs16s1_@1->point_init::abs16s1_@return#0] -- register_copy 
+  //SEG75 [42] phi (word) point_init::abs16s1_return#2 = (word~) point_init::abs16s1_return#6 [phi:point_init::@8/point_init::abs16s1_@1->point_init::abs16s1_@return#0] -- register_copy 
     jmp abs16s1_breturn
   //SEG76 point_init::abs16s1_@return
   abs16s1_breturn:
@@ -3367,24 +3393,24 @@ point_init: {
   //SEG78 [43] if((signed word) point_init::y_diff#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::abs16s2_@1 -- vwsz1_lt_0_then_la1 
     lda y_diff+1
     bmi abs16s2_b1
-    jmp b13
-  //SEG79 point_init::@13
-  b13:
+    jmp b9
+  //SEG79 point_init::@9
+  b9:
   //SEG80 [44] (word~) point_init::abs16s2_return#6 ← (word)(signed word) point_init::y_diff#0 -- vwuz1=vwuz2 
     lda y_diff
     sta abs16s2_return
     lda y_diff+1
     sta abs16s2_return+1
-  //SEG81 [45] phi from point_init::@13 point_init::abs16s2_@1 to point_init::abs16s2_@return [phi:point_init::@13/point_init::abs16s2_@1->point_init::abs16s2_@return]
-  abs16s2_breturn_from_b13:
+  //SEG81 [45] phi from point_init::@9 point_init::abs16s2_@1 to point_init::abs16s2_@return [phi:point_init::@9/point_init::abs16s2_@1->point_init::abs16s2_@return]
+  abs16s2_breturn_from_b9:
   abs16s2_breturn_from_abs16s2_b1:
-  //SEG82 [45] phi (word) point_init::abs16s2_return#2 = (word~) point_init::abs16s2_return#6 [phi:point_init::@13/point_init::abs16s2_@1->point_init::abs16s2_@return#0] -- register_copy 
+  //SEG82 [45] phi (word) point_init::abs16s2_return#2 = (word~) point_init::abs16s2_return#6 [phi:point_init::@9/point_init::abs16s2_@1->point_init::abs16s2_@return#0] -- register_copy 
     jmp abs16s2_breturn
   //SEG83 point_init::abs16s2_@return
   abs16s2_breturn:
-    jmp b10
-  //SEG84 point_init::@10
-  b10:
+    jmp b6
+  //SEG84 point_init::@6
+  b6:
   //SEG85 [46] if((word) point_init::abs16s1_return#2>(word) point_init::abs16s2_return#2) goto point_init::@1 -- vwuz1_gt_vwuz2_then_la1 
     lda abs16s2_return+1
     cmp abs16s1_return+1
@@ -3394,11 +3420,11 @@ point_init: {
     cmp abs16s1_return
     bcc b1
   !:
-  //SEG86 [47] phi from point_init::@10 point_init::@11 to point_init::@2 [phi:point_init::@10/point_init::@11->point_init::@2]
-  b2_from_b10:
-  b2_from_b11:
-  //SEG87 [47] phi (signed word) rem16s#13 = (signed word) rem16s#15 [phi:point_init::@10/point_init::@11->point_init::@2#0] -- register_copy 
-  //SEG88 [47] phi (word) rem16u#18 = (word) rem16u#21 [phi:point_init::@10/point_init::@11->point_init::@2#1] -- register_copy 
+  //SEG86 [47] phi from point_init::@6 point_init::@7 to point_init::@2 [phi:point_init::@6/point_init::@7->point_init::@2]
+  b2_from_b6:
+  b2_from_b7:
+  //SEG87 [47] phi (signed word) rem16s#13 = (signed word) rem16s#15 [phi:point_init::@6/point_init::@7->point_init::@2#0] -- register_copy 
+  //SEG88 [47] phi (word) rem16u#18 = (word) rem16u#21 [phi:point_init::@6/point_init::@7->point_init::@2#1] -- register_copy 
     jmp b2
   //SEG89 point_init::@2
   b2:
@@ -3458,21 +3484,21 @@ point_init: {
     rts
   //SEG98 point_init::@1
   b1:
-  //SEG99 [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@7 -- vwsz1_lt_0_then_la1 
+  //SEG99 [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@4 -- vwsz1_lt_0_then_la1 
     // X is driver - abs(y/x) is < 1
     lda x_diff+1
-    bmi b7
-    jmp b5
-  //SEG100 point_init::@5
-  b5:
+    bmi b4
+    jmp b3
+  //SEG100 point_init::@3
+  b3:
   //SEG101 [56] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← (byte/signed byte/word/signed word/dword/signed dword) $10 -- pbsc1_derefidx_vbuz1=vbuc2 
     // x add = 1.0
     ldy point_idx
     lda #$10
     sta x_add,y
-    jmp b8
-  //SEG102 point_init::@8
-  b8:
+    jmp b5
+  //SEG102 point_init::@5
+  b5:
   //SEG103 [57] (signed word) divr16s::divisor#0 ← (signed word) point_init::x_diff#1 -- vwsz1=vwsz2 
     lda x_diff
     sta divr16s.divisor
@@ -3484,17 +3510,17 @@ point_init: {
     lda y_diff+1
     sta divr16s.rem+1
   //SEG105 [59] call divr16s 
-  //SEG106 [70] phi from point_init::@8 to divr16s [phi:point_init::@8->divr16s]
-  divr16s_from_b8:
+  //SEG106 [70] phi from point_init::@5 to divr16s [phi:point_init::@5->divr16s]
+  divr16s_from_b5:
     jsr divr16s
   //SEG107 [60] (signed word) divr16s::return#3 ← (signed word) divr16s::return#2 -- vwsz1=vwsz2 
     lda divr16s.return
     sta divr16s.return_3
     lda divr16s.return+1
     sta divr16s.return_3+1
-    jmp b11
-  //SEG108 point_init::@11
-  b11:
+    jmp b7
+  //SEG108 point_init::@7
+  b7:
   //SEG109 [61] (signed word) point_init::x_stepf#0 ← (signed word) divr16s::return#3 -- vwsz1=vwsz2 
     lda divr16s.return_3
     sta x_stepf
@@ -3514,15 +3540,15 @@ point_init: {
     lda _17
     ldy point_idx1
     sta y_add,y
-    jmp b2_from_b11
-  //SEG113 point_init::@7
-  b7:
+    jmp b2_from_b7
+  //SEG113 point_init::@4
+  b4:
   //SEG114 [65] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← -(byte/signed byte/word/signed word/dword/signed dword) $10 -- pbsc1_derefidx_vbuz1=vbsc2 
     // x add = -1.0
     lda #-$10
     ldy point_idx
     sta x_add,y
-    jmp b8
+    jmp b5
   //SEG115 point_init::abs16s2_@1
   abs16s2_b1:
   //SEG116 [66] (signed word) point_init::abs16s2_$2#0 ← - (signed word) point_init::y_diff#0 -- vwsz1=_neg_vwsz2 
@@ -3580,29 +3606,29 @@ divr16s: {
     .label dividendu = 9
     .label divisoru = $d
     .label remu = $b
-    jmp b16
-  //SEG122 divr16s::@16
-  b16:
+    jmp b7
+  //SEG122 divr16s::@7
+  b7:
   //SEG123 [71] if((signed word) divr16s::rem#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@1 -- vwsz1_lt_0_then_la1 
     lda rem+1
     bmi b1
-    jmp b17
-  //SEG124 divr16s::@17
-  b17:
+    jmp b8
+  //SEG124 divr16s::@8
+  b8:
   //SEG125 [72] (word~) divr16s::remu#8 ← (word)(signed word) divr16s::rem#0 -- vwuz1=vwuz2 
     lda rem
     sta remu
     lda rem+1
     sta remu+1
-  //SEG126 [73] phi from divr16s::@17 to divr16s::@2 [phi:divr16s::@17->divr16s::@2]
-  b2_from_b17:
-  //SEG127 [73] phi (word) divr16s::remu#3 = (word~) divr16s::remu#8 [phi:divr16s::@17->divr16s::@2#0] -- register_copy 
-  //SEG128 [73] phi (word) divr16s::dividendu#3 = ((word))(const signed word) divr16s::dividend#0 [phi:divr16s::@17->divr16s::@2#1] -- vwuz1=vbuc1 
+  //SEG126 [73] phi from divr16s::@8 to divr16s::@2 [phi:divr16s::@8->divr16s::@2]
+  b2_from_b8:
+  //SEG127 [73] phi (word) divr16s::remu#3 = (word~) divr16s::remu#8 [phi:divr16s::@8->divr16s::@2#0] -- register_copy 
+  //SEG128 [73] phi (word) divr16s::dividendu#3 = ((word))(const signed word) divr16s::dividend#0 [phi:divr16s::@8->divr16s::@2#1] -- vwuz1=vbuc1 
     lda #dividend
     sta dividendu
     lda #0
     sta dividendu+1
-  //SEG129 [73] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@17->divr16s::@2#2] -- vbuz1=vbuc1 
+  //SEG129 [73] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@8->divr16s::@2#2] -- vbuz1=vbuc1 
     lda #0
     sta neg
     jmp b2
@@ -3611,19 +3637,19 @@ divr16s: {
   //SEG131 [74] if((signed word) divr16s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@3 -- vwsz1_lt_0_then_la1 
     lda divisor+1
     bmi b3
-    jmp b18
-  //SEG132 divr16s::@18
-  b18:
+    jmp b9
+  //SEG132 divr16s::@9
+  b9:
   //SEG133 [75] (word~) divr16s::divisoru#5 ← (word)(signed word) divr16s::divisor#0 -- vwuz1=vwuz2 
     lda divisor
     sta divisoru
     lda divisor+1
     sta divisoru+1
-  //SEG134 [76] phi from divr16s::@18 divr16s::@3 to divr16s::@4 [phi:divr16s::@18/divr16s::@3->divr16s::@4]
-  b4_from_b18:
+  //SEG134 [76] phi from divr16s::@3 divr16s::@9 to divr16s::@4 [phi:divr16s::@3/divr16s::@9->divr16s::@4]
   b4_from_b3:
-  //SEG135 [76] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#3 [phi:divr16s::@18/divr16s::@3->divr16s::@4#0] -- register_copy 
-  //SEG136 [76] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#5 [phi:divr16s::@18/divr16s::@3->divr16s::@4#1] -- register_copy 
+  b4_from_b9:
+  //SEG135 [76] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#2 [phi:divr16s::@3/divr16s::@9->divr16s::@4#0] -- register_copy 
+  //SEG136 [76] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#4 [phi:divr16s::@3/divr16s::@9->divr16s::@4#1] -- register_copy 
     jmp b4
   //SEG137 divr16s::@4
   b4:
@@ -3651,21 +3677,21 @@ divr16s: {
     sta divr16u.return_2
     lda divr16u.return+1
     sta divr16u.return_2+1
-    jmp b15
-  //SEG144 divr16s::@15
-  b15:
+    jmp b6
+  //SEG144 divr16s::@6
+  b6:
   //SEG145 [82] (word) divr16s::resultu#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return_2
     sta resultu
     lda divr16u.return_2+1
     sta resultu+1
-  //SEG146 [83] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@19 -- vbuz1_eq_0_then_la1 
+  //SEG146 [83] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@10 -- vbuz1_eq_0_then_la1 
     lda neg
     cmp #0
-    beq b19
-    jmp b11
-  //SEG147 divr16s::@11
-  b11:
+    beq b10
+    jmp b5
+  //SEG147 divr16s::@5
+  b5:
   //SEG148 [84] (signed word) rem16s#2 ← - (signed word)(word) divr16u::rem#10 -- vwsz1=_neg_vwsz2 
     sec
     lda divr16u.rem
@@ -3686,18 +3712,18 @@ divr16s: {
     eor #$ff
     adc #0
     sta return+1
-  //SEG150 [86] phi from divr16s::@11 divr16s::@19 to divr16s::@return [phi:divr16s::@11/divr16s::@19->divr16s::@return]
-  breturn_from_b11:
-  breturn_from_b19:
-  //SEG151 [86] phi (signed word) rem16s#3 = (signed word) rem16s#2 [phi:divr16s::@11/divr16s::@19->divr16s::@return#0] -- register_copy 
-  //SEG152 [86] phi (signed word) divr16s::return#2 = (signed word) divr16s::return#1 [phi:divr16s::@11/divr16s::@19->divr16s::@return#1] -- register_copy 
+  //SEG150 [86] phi from divr16s::@10 divr16s::@5 to divr16s::@return [phi:divr16s::@10/divr16s::@5->divr16s::@return]
+  breturn_from_b10:
+  breturn_from_b5:
+  //SEG151 [86] phi (signed word) rem16s#3 = (signed word~) rem16s#57 [phi:divr16s::@10/divr16s::@5->divr16s::@return#0] -- register_copy 
+  //SEG152 [86] phi (signed word) divr16s::return#2 = (signed word~) divr16s::return#7 [phi:divr16s::@10/divr16s::@5->divr16s::@return#1] -- register_copy 
     jmp breturn
   //SEG153 divr16s::@return
   breturn:
   //SEG154 [87] return 
     rts
-  //SEG155 divr16s::@19
-  b19:
+  //SEG155 divr16s::@10
+  b10:
   //SEG156 [88] (signed word~) divr16s::return#7 ← (signed word)(word) divr16s::resultu#0 -- vwsz1=vwsz2 
     lda resultu
     sta return
@@ -3708,7 +3734,7 @@ divr16s: {
     sta rem16s
     lda divr16u.rem+1
     sta rem16s+1
-    jmp breturn_from_b19
+    jmp breturn_from_b10
   //SEG158 divr16s::@3
   b3:
   //SEG159 [90] (signed word~) divr16s::$13 ← - (signed word) divr16s::divisor#0 -- vwsz1=_neg_vwsz2 
@@ -4056,10 +4082,10 @@ bitmap_init: {
     sta bitmap_plot_bit,y
   //SEG263 [136] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr bits
-  //SEG264 [137] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuz1_neq_0_then_la1 
+  //SEG264 [137] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuz1_neq_0_then_la1 
     lda bits
     cmp #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG265 [138] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
   b2_from_b1:
   //SEG266 [138] phi (byte) bitmap_init::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:bitmap_init::@1->bitmap_init::@2#0] -- vbuz1=vbuc1 
@@ -4074,24 +4100,24 @@ bitmap_init: {
     lda x
     cmp #0
     bne b1_from_b2
-  //SEG270 [141] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  b5_from_b2:
-  //SEG271 [141] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG270 [141] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  b3_from_b2:
+  //SEG271 [141] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<BITMAP
     sta yoffs
     lda #>BITMAP
     sta yoffs+1
-  //SEG272 [141] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuz1=vbuc1 
+  //SEG272 [141] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuz1=vbuc1 
     lda #0
     sta y
-    jmp b5
-  //SEG273 [141] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  b5_from_b6:
-  //SEG274 [141] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG275 [141] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-    jmp b5
-  //SEG276 bitmap_init::@5
-  b5:
+    jmp b3
+  //SEG273 [141] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  b3_from_b4:
+  //SEG274 [141] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG275 [141] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+    jmp b3
+  //SEG276 bitmap_init::@3
+  b3:
   //SEG277 [142] (byte~) bitmap_init::$3 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuz2_band_vbuc1 
     lda #7
     and y
@@ -4118,13 +4144,13 @@ bitmap_init: {
     lda #7
     and y
     sta _7
-  //SEG284 [149] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG284 [149] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp _7
-    bne b6_from_b5
-    jmp b7
-  //SEG285 bitmap_init::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG285 bitmap_init::@5
+  b5:
   //SEG286 [150] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -4133,32 +4159,32 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG287 [151] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG288 [151] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-    jmp b6
-  //SEG289 bitmap_init::@6
-  b6:
+  //SEG287 [151] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG288 [151] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+    jmp b4
+  //SEG289 bitmap_init::@4
+  b4:
   //SEG290 [152] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuz1=_inc_vbuz1 
     inc y
-  //SEG291 [153] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuz1_neq_0_then_la1 
+  //SEG291 [153] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuz1_neq_0_then_la1 
     lda y
     cmp #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG292 bitmap_init::@return
   breturn:
   //SEG293 [154] return 
     rts
-  //SEG294 [155] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG295 bitmap_init::@10
-  b10:
-  //SEG296 [138] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  b2_from_b10:
-  //SEG297 [138] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG294 [155] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG295 bitmap_init::@6
+  b6:
+  //SEG296 [138] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  b2_from_b6:
+  //SEG297 [138] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
     jmp b2
 }
   // The coordinates of the lines to animate
@@ -4193,7 +4219,7 @@ Statement [21] (byte~) main::$9 ← (byte) main::i#2 >> (byte/signed byte/word/s
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
 Statement [22] (word) bitmap_plot::x#0 ← *((const word[4]) x_start#0 + (byte) main::i#2) [ main::i#2 rem16u#18 rem16s#13 main::$9 bitmap_plot::x#0 ] ( main:2 [ main::i#2 rem16u#18 rem16s#13 main::$9 bitmap_plot::x#0 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:39 [ main::$9 ]
-Statement [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [29] (word~) bitmap_plot::$3 ← *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_plot::y#0) w= *((const byte[$100]) bitmap_plot_ylo#0 + (byte) bitmap_plot::y#0) [ bitmap_plot::x#0 bitmap_plot::$3 ] ( main:2::bitmap_plot:24 [ main::i#2 rem16u#18 rem16s#13 bitmap_plot::x#0 bitmap_plot::$3 ] ) always clobbers reg byte a 
 Statement [30] (word~) bitmap_plot::$1 ← (word) bitmap_plot::x#0 & (word/dword/signed dword) $fff8 [ bitmap_plot::x#0 bitmap_plot::$3 bitmap_plot::$1 ] ( main:2::bitmap_plot:24 [ main::i#2 rem16u#18 rem16s#13 bitmap_plot::x#0 bitmap_plot::$3 bitmap_plot::$1 ] ) always clobbers reg byte a 
 Statement [31] (byte*) bitmap_plot::plotter#1 ← (byte*)(word~) bitmap_plot::$3 + (word~) bitmap_plot::$1 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:2::bitmap_plot:24 [ main::i#2 rem16u#18 rem16s#13 bitmap_plot::x#0 bitmap_plot::plotter#1 ] ) always clobbers reg byte a 
@@ -4218,7 +4244,7 @@ Statement [50] (word~) point_init::$11 ← ((word)) *((const byte[4]) y_start#0
 Statement [51] (word~) point_init::$12 ← (word~) point_init::$11 << (byte/signed byte/word/signed word/dword/signed dword) 4 [ rem16u#18 rem16s#13 point_init::point_idx#0 point_init::point_idx1#0 point_init::$12 ] ( main:2::point_init:20 [ main::i#2 rem16u#18 rem16s#13 point_init::point_idx#0 point_init::point_idx1#0 point_init::$12 ] ) always clobbers reg byte a 
 Statement [52] *((const word[4]) y_cur#0 + (byte) point_init::point_idx#0) ← (word~) point_init::$12 [ rem16u#18 rem16s#13 point_init::point_idx1#0 ] ( main:2::point_init:20 [ main::i#2 rem16u#18 rem16s#13 point_init::point_idx1#0 ] ) always clobbers reg byte a 
 Statement [53] *((const byte[4]) delay#0 + (byte) point_init::point_idx1#0) ← (const byte) DELAY#0 [ rem16u#18 rem16s#13 ] ( main:2::point_init:20 [ main::i#2 rem16u#18 rem16s#13 ] ) always clobbers reg byte a 
-Statement [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@7 [ point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ( main:2::point_init:20 [ main::i#2 point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ) always clobbers reg byte a 
+Statement [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@4 [ point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ( main:2::point_init:20 [ main::i#2 point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ) always clobbers reg byte a 
 Statement [56] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← (byte/signed byte/word/signed word/dword/signed dword) $10 [ point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ( main:2::point_init:20 [ main::i#2 point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ) always clobbers reg byte a 
 Statement [57] (signed word) divr16s::divisor#0 ← (signed word) point_init::x_diff#1 [ point_init::point_idx#0 point_init::point_idx1#0 point_init::y_diff#0 divr16s::divisor#0 ] ( main:2::point_init:20 [ main::i#2 point_init::point_idx#0 point_init::point_idx1#0 point_init::y_diff#0 divr16s::divisor#0 ] ) always clobbers reg byte a 
 Statement [58] (signed word) divr16s::rem#0 ← (signed word) point_init::y_diff#0 [ point_init::point_idx#0 point_init::point_idx1#0 divr16s::divisor#0 divr16s::rem#0 ] ( main:2::point_init:20 [ main::i#2 point_init::point_idx#0 point_init::point_idx1#0 divr16s::divisor#0 divr16s::rem#0 ] ) always clobbers reg byte a 
@@ -4277,7 +4303,7 @@ Statement [10] *((const byte*) CIA2_PORT_A#0) ← (const byte) main::vicSelectGf
 Statement [12] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [21] (byte~) main::$9 ← (byte) main::i#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 [ main::i#2 rem16u#18 rem16s#13 main::$9 ] ( main:2 [ main::i#2 rem16u#18 rem16s#13 main::$9 ] ) always clobbers reg byte a 
 Statement [22] (word) bitmap_plot::x#0 ← *((const word[4]) x_start#0 + (byte) main::i#2) [ main::i#2 rem16u#18 rem16s#13 main::$9 bitmap_plot::x#0 ] ( main:2 [ main::i#2 rem16u#18 rem16s#13 main::$9 bitmap_plot::x#0 ] ) always clobbers reg byte a 
-Statement [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [29] (word~) bitmap_plot::$3 ← *((const byte[$100]) bitmap_plot_yhi#0 + (byte) bitmap_plot::y#0) w= *((const byte[$100]) bitmap_plot_ylo#0 + (byte) bitmap_plot::y#0) [ bitmap_plot::x#0 bitmap_plot::$3 ] ( main:2::bitmap_plot:24 [ main::i#2 rem16u#18 rem16s#13 bitmap_plot::x#0 bitmap_plot::$3 ] ) always clobbers reg byte a 
 Statement [30] (word~) bitmap_plot::$1 ← (word) bitmap_plot::x#0 & (word/dword/signed dword) $fff8 [ bitmap_plot::x#0 bitmap_plot::$3 bitmap_plot::$1 ] ( main:2::bitmap_plot:24 [ main::i#2 rem16u#18 rem16s#13 bitmap_plot::x#0 bitmap_plot::$3 bitmap_plot::$1 ] ) always clobbers reg byte a 
 Statement [31] (byte*) bitmap_plot::plotter#1 ← (byte*)(word~) bitmap_plot::$3 + (word~) bitmap_plot::$1 [ bitmap_plot::x#0 bitmap_plot::plotter#1 ] ( main:2::bitmap_plot:24 [ main::i#2 rem16u#18 rem16s#13 bitmap_plot::x#0 bitmap_plot::plotter#1 ] ) always clobbers reg byte a 
@@ -4299,7 +4325,7 @@ Statement [50] (word~) point_init::$11 ← ((word)) *((const byte[4]) y_start#0
 Statement [51] (word~) point_init::$12 ← (word~) point_init::$11 << (byte/signed byte/word/signed word/dword/signed dword) 4 [ rem16u#18 rem16s#13 point_init::point_idx#0 point_init::point_idx1#0 point_init::$12 ] ( main:2::point_init:20 [ main::i#2 rem16u#18 rem16s#13 point_init::point_idx#0 point_init::point_idx1#0 point_init::$12 ] ) always clobbers reg byte a 
 Statement [52] *((const word[4]) y_cur#0 + (byte) point_init::point_idx#0) ← (word~) point_init::$12 [ rem16u#18 rem16s#13 point_init::point_idx1#0 ] ( main:2::point_init:20 [ main::i#2 rem16u#18 rem16s#13 point_init::point_idx1#0 ] ) always clobbers reg byte a 
 Statement [53] *((const byte[4]) delay#0 + (byte) point_init::point_idx1#0) ← (const byte) DELAY#0 [ rem16u#18 rem16s#13 ] ( main:2::point_init:20 [ main::i#2 rem16u#18 rem16s#13 ] ) always clobbers reg byte a 
-Statement [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@7 [ point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ( main:2::point_init:20 [ main::i#2 point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ) always clobbers reg byte a 
+Statement [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@4 [ point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ( main:2::point_init:20 [ main::i#2 point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ) always clobbers reg byte a 
 Statement [56] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← (byte/signed byte/word/signed word/dword/signed dword) $10 [ point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ( main:2::point_init:20 [ main::i#2 point_init::point_idx#0 point_init::point_idx1#0 point_init::x_diff#1 point_init::y_diff#0 ] ) always clobbers reg byte a 
 Statement [57] (signed word) divr16s::divisor#0 ← (signed word) point_init::x_diff#1 [ point_init::point_idx#0 point_init::point_idx1#0 point_init::y_diff#0 divr16s::divisor#0 ] ( main:2::point_init:20 [ main::i#2 point_init::point_idx#0 point_init::point_idx1#0 point_init::y_diff#0 divr16s::divisor#0 ] ) always clobbers reg byte a 
 Statement [58] (signed word) divr16s::rem#0 ← (signed word) point_init::y_diff#0 [ point_init::point_idx#0 point_init::point_idx1#0 divr16s::divisor#0 divr16s::rem#0 ] ( main:2::point_init:20 [ main::i#2 point_init::point_idx#0 point_init::point_idx1#0 divr16s::divisor#0 divr16s::rem#0 ] ) always clobbers reg byte a 
@@ -4516,15 +4542,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label rem16u = 9
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @19 [phi:@begin->@19]
-b19_from_bbegin:
-  jmp b19
-//SEG5 @19
-b19:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @19 to @end [phi:@19->@end]
-bend_from_b19:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -4568,62 +4594,62 @@ main: {
     jmp toD0181
   //SEG21 main::toD0181
   toD0181:
-    jmp b16
-  //SEG22 main::@16
-  b16:
+    jmp b4
+  //SEG22 main::@4
+  b4:
   //SEG23 [12] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG24 [13] call bitmap_init 
-  //SEG25 [133] phi from main::@16 to bitmap_init [phi:main::@16->bitmap_init]
-  bitmap_init_from_b16:
+  //SEG25 [133] phi from main::@4 to bitmap_init [phi:main::@4->bitmap_init]
+  bitmap_init_from_b4:
     jsr bitmap_init
-  //SEG26 [14] phi from main::@16 to main::@17 [phi:main::@16->main::@17]
-  b17_from_b16:
-    jmp b17
-  //SEG27 main::@17
-  b17:
+  //SEG26 [14] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG27 main::@5
+  b5:
   //SEG28 [15] call bitmap_clear 
     jsr bitmap_clear
-  //SEG29 [16] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG30 main::@18
-  b18:
+  //SEG29 [16] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG30 main::@6
+  b6:
   //SEG31 [17] call screen_fill 
-  //SEG32 [112] phi from main::@18 to screen_fill [phi:main::@18->screen_fill]
-  screen_fill_from_b18:
+  //SEG32 [112] phi from main::@6 to screen_fill [phi:main::@6->screen_fill]
+  screen_fill_from_b6:
     jsr screen_fill
-  //SEG33 [18] phi from main::@18 to main::@6 [phi:main::@18->main::@6]
-  b6_from_b18:
-  //SEG34 [18] phi (signed word) rem16s#15 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@6#0] -- vwsz1=vbuc1 
+  //SEG33 [18] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG34 [18] phi (signed word) rem16s#15 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#0] -- vwsz1=vbuc1 
     lda #0
     sta rem16s
     lda #0
     sta rem16s+1
-  //SEG35 [18] phi (word) rem16u#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@6#1] -- vwuz1=vbuc1 
+  //SEG35 [18] phi (word) rem16u#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#1] -- vwuz1=vbuc1 
     lda #0
     sta rem16u
     lda #0
     sta rem16u+1
-  //SEG36 [18] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@6#2] -- vbuz1=vbuc1 
+  //SEG36 [18] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#2] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b6
-  //SEG37 [18] phi from main::@21 to main::@6 [phi:main::@21->main::@6]
-  b6_from_b21:
-  //SEG38 [18] phi (signed word) rem16s#15 = (signed word) rem16s#13 [phi:main::@21->main::@6#0] -- register_copy 
-  //SEG39 [18] phi (word) rem16u#21 = (word) rem16u#18 [phi:main::@21->main::@6#1] -- register_copy 
-  //SEG40 [18] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@21->main::@6#2] -- register_copy 
-    jmp b6
-  //SEG41 main::@6
-  b6:
+    jmp b1
+  //SEG37 [18] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
+  b1_from_b8:
+  //SEG38 [18] phi (signed word) rem16s#15 = (signed word) rem16s#13 [phi:main::@8->main::@1#0] -- register_copy 
+  //SEG39 [18] phi (word) rem16u#21 = (word) rem16u#18 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG40 [18] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@1#2] -- register_copy 
+    jmp b1
+  //SEG41 main::@1
+  b1:
   //SEG42 [19] (byte) point_init::point_idx#0 ← (byte) main::i#2
   //SEG43 [20] call point_init 
     jsr point_init
-    jmp b20
-  //SEG44 main::@20
-  b20:
+    jmp b7
+  //SEG44 main::@7
+  b7:
   //SEG45 [21] (byte~) main::$9 ← (byte) main::i#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuz1_ror_1 
     lda i
     lsr
@@ -4638,31 +4664,31 @@ main: {
     ldy y_start,x
   //SEG48 [24] call bitmap_plot 
     jsr bitmap_plot
-    jmp b21
-  //SEG49 main::@21
-  b21:
+    jmp b8
+  //SEG49 main::@8
+  b8:
   //SEG50 [25] (byte) main::i#1 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
     adc #2
     sta i
-  //SEG51 [26] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG51 [26] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    bne b6_from_b21
-    jmp b8
-  //SEG52 main::@8
-  b8:
-  //SEG53 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1_from_b8
+    jmp b2
+  //SEG52 main::@2
+  b2:
+  //SEG53 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b8
-    jmp b10
-  //SEG54 main::@10
-  b10:
+    bne b2
+    jmp b3
+  //SEG54 main::@3
+  b3:
   //SEG55 [28] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-    jmp b8
+    jmp b2
 }
 //SEG56 bitmap_plot
 // Plot a single dot in the bitmap
@@ -4764,18 +4790,18 @@ point_init: {
   //SEG71 [40] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::abs16s1_@1 -- vwsz1_lt_0_then_la1 
     lda x_diff+1
     bmi abs16s1_b1
-    jmp b12
-  //SEG72 point_init::@12
-  b12:
+    jmp b8
+  //SEG72 point_init::@8
+  b8:
   //SEG73 [41] (word~) point_init::abs16s1_return#6 ← (word)(signed word) point_init::x_diff#1 -- vwuz1=vwuz2 
     lda x_diff
     sta abs16s1_return
     lda x_diff+1
     sta abs16s1_return+1
-  //SEG74 [42] phi from point_init::@12 point_init::abs16s1_@1 to point_init::abs16s1_@return [phi:point_init::@12/point_init::abs16s1_@1->point_init::abs16s1_@return]
-  abs16s1_breturn_from_b12:
+  //SEG74 [42] phi from point_init::@8 point_init::abs16s1_@1 to point_init::abs16s1_@return [phi:point_init::@8/point_init::abs16s1_@1->point_init::abs16s1_@return]
+  abs16s1_breturn_from_b8:
   abs16s1_breturn_from_abs16s1_b1:
-  //SEG75 [42] phi (word) point_init::abs16s1_return#2 = (word~) point_init::abs16s1_return#6 [phi:point_init::@12/point_init::abs16s1_@1->point_init::abs16s1_@return#0] -- register_copy 
+  //SEG75 [42] phi (word) point_init::abs16s1_return#2 = (word~) point_init::abs16s1_return#6 [phi:point_init::@8/point_init::abs16s1_@1->point_init::abs16s1_@return#0] -- register_copy 
     jmp abs16s1_breturn
   //SEG76 point_init::abs16s1_@return
   abs16s1_breturn:
@@ -4785,24 +4811,24 @@ point_init: {
   //SEG78 [43] if((signed word) point_init::y_diff#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::abs16s2_@1 -- vwsz1_lt_0_then_la1 
     lda y_diff+1
     bmi abs16s2_b1
-    jmp b13
-  //SEG79 point_init::@13
-  b13:
+    jmp b9
+  //SEG79 point_init::@9
+  b9:
   //SEG80 [44] (word~) point_init::abs16s2_return#6 ← (word)(signed word) point_init::y_diff#0 -- vwuz1=vwuz2 
     lda y_diff
     sta abs16s2_return
     lda y_diff+1
     sta abs16s2_return+1
-  //SEG81 [45] phi from point_init::@13 point_init::abs16s2_@1 to point_init::abs16s2_@return [phi:point_init::@13/point_init::abs16s2_@1->point_init::abs16s2_@return]
-  abs16s2_breturn_from_b13:
+  //SEG81 [45] phi from point_init::@9 point_init::abs16s2_@1 to point_init::abs16s2_@return [phi:point_init::@9/point_init::abs16s2_@1->point_init::abs16s2_@return]
+  abs16s2_breturn_from_b9:
   abs16s2_breturn_from_abs16s2_b1:
-  //SEG82 [45] phi (word) point_init::abs16s2_return#2 = (word~) point_init::abs16s2_return#6 [phi:point_init::@13/point_init::abs16s2_@1->point_init::abs16s2_@return#0] -- register_copy 
+  //SEG82 [45] phi (word) point_init::abs16s2_return#2 = (word~) point_init::abs16s2_return#6 [phi:point_init::@9/point_init::abs16s2_@1->point_init::abs16s2_@return#0] -- register_copy 
     jmp abs16s2_breturn
   //SEG83 point_init::abs16s2_@return
   abs16s2_breturn:
-    jmp b10
-  //SEG84 point_init::@10
-  b10:
+    jmp b6
+  //SEG84 point_init::@6
+  b6:
   //SEG85 [46] if((word) point_init::abs16s1_return#2>(word) point_init::abs16s2_return#2) goto point_init::@1 -- vwuz1_gt_vwuz2_then_la1 
     lda abs16s2_return+1
     cmp abs16s1_return+1
@@ -4812,11 +4838,11 @@ point_init: {
     cmp abs16s1_return
     bcc b1
   !:
-  //SEG86 [47] phi from point_init::@10 point_init::@11 to point_init::@2 [phi:point_init::@10/point_init::@11->point_init::@2]
-  b2_from_b10:
-  b2_from_b11:
-  //SEG87 [47] phi (signed word) rem16s#13 = (signed word) rem16s#15 [phi:point_init::@10/point_init::@11->point_init::@2#0] -- register_copy 
-  //SEG88 [47] phi (word) rem16u#18 = (word) rem16u#21 [phi:point_init::@10/point_init::@11->point_init::@2#1] -- register_copy 
+  //SEG86 [47] phi from point_init::@6 point_init::@7 to point_init::@2 [phi:point_init::@6/point_init::@7->point_init::@2]
+  b2_from_b6:
+  b2_from_b7:
+  //SEG87 [47] phi (signed word) rem16s#13 = (signed word) rem16s#15 [phi:point_init::@6/point_init::@7->point_init::@2#0] -- register_copy 
+  //SEG88 [47] phi (word) rem16u#18 = (word) rem16u#21 [phi:point_init::@6/point_init::@7->point_init::@2#1] -- register_copy 
     jmp b2
   //SEG89 point_init::@2
   b2:
@@ -4872,21 +4898,21 @@ point_init: {
     rts
   //SEG98 point_init::@1
   b1:
-  //SEG99 [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@7 -- vwsz1_lt_0_then_la1 
+  //SEG99 [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@4 -- vwsz1_lt_0_then_la1 
     // X is driver - abs(y/x) is < 1
     lda x_diff+1
-    bmi b7
-    jmp b5
-  //SEG100 point_init::@5
-  b5:
+    bmi b4
+    jmp b3
+  //SEG100 point_init::@3
+  b3:
   //SEG101 [56] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← (byte/signed byte/word/signed word/dword/signed dword) $10 -- pbsc1_derefidx_vbuz1=vbuc2 
     // x add = 1.0
     ldy point_idx
     lda #$10
     sta x_add,y
-    jmp b8
-  //SEG102 point_init::@8
-  b8:
+    jmp b5
+  //SEG102 point_init::@5
+  b5:
   //SEG103 [57] (signed word) divr16s::divisor#0 ← (signed word) point_init::x_diff#1
   //SEG104 [58] (signed word) divr16s::rem#0 ← (signed word) point_init::y_diff#0 -- vwsz1=vwsz2 
     lda y_diff
@@ -4894,13 +4920,13 @@ point_init: {
     lda y_diff+1
     sta divr16s.rem+1
   //SEG105 [59] call divr16s 
-  //SEG106 [70] phi from point_init::@8 to divr16s [phi:point_init::@8->divr16s]
-  divr16s_from_b8:
+  //SEG106 [70] phi from point_init::@5 to divr16s [phi:point_init::@5->divr16s]
+  divr16s_from_b5:
     jsr divr16s
   //SEG107 [60] (signed word) divr16s::return#3 ← (signed word) divr16s::return#2
-    jmp b11
-  //SEG108 point_init::@11
-  b11:
+    jmp b7
+  //SEG108 point_init::@7
+  b7:
   //SEG109 [61] (signed word) point_init::x_stepf#0 ← (signed word) divr16s::return#3
   //SEG110 [62] (byte~) point_init::$16 ← > (signed word) point_init::x_stepf#0 -- vbuaa=_hi_vwsz1 
     lda x_stepf+1
@@ -4912,15 +4938,15 @@ point_init: {
   //SEG112 [64] *((const signed byte[4]) y_add#0 + (byte) point_init::point_idx1#0) ← (signed byte)(byte~) point_init::$17 -- pbsc1_derefidx_vbuz1=vbsaa 
     ldy point_idx1
     sta y_add,y
-    jmp b2_from_b11
-  //SEG113 point_init::@7
-  b7:
+    jmp b2_from_b7
+  //SEG113 point_init::@4
+  b4:
   //SEG114 [65] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← -(byte/signed byte/word/signed word/dword/signed dword) $10 -- pbsc1_derefidx_vbuz1=vbsc2 
     // x add = -1.0
     lda #-$10
     ldy point_idx
     sta x_add,y
-    jmp b8
+    jmp b5
   //SEG115 point_init::abs16s2_@1
   abs16s2_b1:
   //SEG116 [66] (signed word) point_init::abs16s2_$2#0 ← - (signed word) point_init::y_diff#0 -- vwsz1=_neg_vwsz2 
@@ -4968,25 +4994,25 @@ divr16s: {
     .label dividendu = 3
     .label divisoru = $b
     .label remu = 9
-    jmp b16
-  //SEG122 divr16s::@16
-  b16:
+    jmp b7
+  //SEG122 divr16s::@7
+  b7:
   //SEG123 [71] if((signed word) divr16s::rem#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@1 -- vwsz1_lt_0_then_la1 
     lda rem+1
     bmi b1
-    jmp b17
-  //SEG124 divr16s::@17
-  b17:
+    jmp b8
+  //SEG124 divr16s::@8
+  b8:
   //SEG125 [72] (word~) divr16s::remu#8 ← (word)(signed word) divr16s::rem#0
-  //SEG126 [73] phi from divr16s::@17 to divr16s::@2 [phi:divr16s::@17->divr16s::@2]
-  b2_from_b17:
-  //SEG127 [73] phi (word) divr16s::remu#3 = (word~) divr16s::remu#8 [phi:divr16s::@17->divr16s::@2#0] -- register_copy 
-  //SEG128 [73] phi (word) divr16s::dividendu#3 = ((word))(const signed word) divr16s::dividend#0 [phi:divr16s::@17->divr16s::@2#1] -- vwuz1=vbuc1 
+  //SEG126 [73] phi from divr16s::@8 to divr16s::@2 [phi:divr16s::@8->divr16s::@2]
+  b2_from_b8:
+  //SEG127 [73] phi (word) divr16s::remu#3 = (word~) divr16s::remu#8 [phi:divr16s::@8->divr16s::@2#0] -- register_copy 
+  //SEG128 [73] phi (word) divr16s::dividendu#3 = ((word))(const signed word) divr16s::dividend#0 [phi:divr16s::@8->divr16s::@2#1] -- vwuz1=vbuc1 
     lda #dividend
     sta dividendu
     lda #0
     sta dividendu+1
-  //SEG129 [73] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@17->divr16s::@2#2] -- vbuyy=vbuc1 
+  //SEG129 [73] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@8->divr16s::@2#2] -- vbuyy=vbuc1 
     ldy #0
     jmp b2
   //SEG130 divr16s::@2
@@ -4994,15 +5020,15 @@ divr16s: {
   //SEG131 [74] if((signed word) divr16s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@3 -- vwsz1_lt_0_then_la1 
     lda divisor+1
     bmi b3
-    jmp b18
-  //SEG132 divr16s::@18
-  b18:
+    jmp b9
+  //SEG132 divr16s::@9
+  b9:
   //SEG133 [75] (word~) divr16s::divisoru#5 ← (word)(signed word) divr16s::divisor#0
-  //SEG134 [76] phi from divr16s::@18 divr16s::@3 to divr16s::@4 [phi:divr16s::@18/divr16s::@3->divr16s::@4]
-  b4_from_b18:
+  //SEG134 [76] phi from divr16s::@3 divr16s::@9 to divr16s::@4 [phi:divr16s::@3/divr16s::@9->divr16s::@4]
   b4_from_b3:
-  //SEG135 [76] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#3 [phi:divr16s::@18/divr16s::@3->divr16s::@4#0] -- register_copy 
-  //SEG136 [76] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#5 [phi:divr16s::@18/divr16s::@3->divr16s::@4#1] -- register_copy 
+  b4_from_b9:
+  //SEG135 [76] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#2 [phi:divr16s::@3/divr16s::@9->divr16s::@4#0] -- register_copy 
+  //SEG136 [76] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#4 [phi:divr16s::@3/divr16s::@9->divr16s::@4#1] -- register_copy 
     jmp b4
   //SEG137 divr16s::@4
   b4:
@@ -5014,16 +5040,16 @@ divr16s: {
   divr16u_from_b4:
     jsr divr16u
   //SEG143 [81] (word) divr16u::return#2 ← (word) divr16u::return#0
-    jmp b15
-  //SEG144 divr16s::@15
-  b15:
+    jmp b6
+  //SEG144 divr16s::@6
+  b6:
   //SEG145 [82] (word) divr16s::resultu#0 ← (word) divr16u::return#2
-  //SEG146 [83] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@19 -- vbuyy_eq_0_then_la1 
+  //SEG146 [83] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@10 -- vbuyy_eq_0_then_la1 
     cpy #0
-    beq b19
-    jmp b11
-  //SEG147 divr16s::@11
-  b11:
+    beq b10
+    jmp b5
+  //SEG147 divr16s::@5
+  b5:
   //SEG148 [84] (signed word) rem16s#2 ← - (signed word)(word) divr16u::rem#10 -- vwsz1=_neg_vwsz2 
     sec
     lda divr16u.rem
@@ -5044,25 +5070,25 @@ divr16s: {
     eor #$ff
     adc #0
     sta return+1
-  //SEG150 [86] phi from divr16s::@11 divr16s::@19 to divr16s::@return [phi:divr16s::@11/divr16s::@19->divr16s::@return]
-  breturn_from_b11:
-  breturn_from_b19:
-  //SEG151 [86] phi (signed word) rem16s#3 = (signed word) rem16s#2 [phi:divr16s::@11/divr16s::@19->divr16s::@return#0] -- register_copy 
-  //SEG152 [86] phi (signed word) divr16s::return#2 = (signed word) divr16s::return#1 [phi:divr16s::@11/divr16s::@19->divr16s::@return#1] -- register_copy 
+  //SEG150 [86] phi from divr16s::@10 divr16s::@5 to divr16s::@return [phi:divr16s::@10/divr16s::@5->divr16s::@return]
+  breturn_from_b10:
+  breturn_from_b5:
+  //SEG151 [86] phi (signed word) rem16s#3 = (signed word~) rem16s#57 [phi:divr16s::@10/divr16s::@5->divr16s::@return#0] -- register_copy 
+  //SEG152 [86] phi (signed word) divr16s::return#2 = (signed word~) divr16s::return#7 [phi:divr16s::@10/divr16s::@5->divr16s::@return#1] -- register_copy 
     jmp breturn
   //SEG153 divr16s::@return
   breturn:
   //SEG154 [87] return 
     rts
-  //SEG155 divr16s::@19
-  b19:
+  //SEG155 divr16s::@10
+  b10:
   //SEG156 [88] (signed word~) divr16s::return#7 ← (signed word)(word) divr16s::resultu#0
   //SEG157 [89] (signed word~) rem16s#57 ← (signed word)(word) divr16u::rem#10 -- vwsz1=vwsz2 
     lda divr16u.rem
     sta rem16s
     lda divr16u.rem+1
     sta rem16s+1
-    jmp breturn_from_b19
+    jmp breturn_from_b10
   //SEG158 divr16s::@3
   b3:
   //SEG159 [90] (signed word~) divr16s::$13 ← - (signed word) divr16s::divisor#0 -- vwsz1=_neg_vwsz1 
@@ -5370,9 +5396,9 @@ bitmap_init: {
     sta bitmap_plot_bit,x
   //SEG263 [136] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuaa_ror_1 
     lsr
-  //SEG264 [137] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuaa_neq_0_then_la1 
+  //SEG264 [137] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b10_from_b1
+    bne b6_from_b1
   //SEG265 [138] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
   b2_from_b1:
   //SEG266 [138] phi (byte) bitmap_init::bits#4 = (byte/word/signed word/dword/signed dword) $80 [phi:bitmap_init::@1->bitmap_init::@2#0] -- vbuaa=vbuc1 
@@ -5385,23 +5411,23 @@ bitmap_init: {
   //SEG269 [140] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1_from_b2
-  //SEG270 [141] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  b5_from_b2:
-  //SEG271 [141] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG270 [141] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  b3_from_b2:
+  //SEG271 [141] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<BITMAP
     sta yoffs
     lda #>BITMAP
     sta yoffs+1
-  //SEG272 [141] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuxx=vbuc1 
+  //SEG272 [141] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuxx=vbuc1 
     ldx #0
-    jmp b5
-  //SEG273 [141] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  b5_from_b6:
-  //SEG274 [141] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG275 [141] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-    jmp b5
-  //SEG276 bitmap_init::@5
-  b5:
+    jmp b3
+  //SEG273 [141] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  b3_from_b4:
+  //SEG274 [141] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG275 [141] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+    jmp b3
+  //SEG276 bitmap_init::@3
+  b3:
   //SEG277 [142] (byte~) bitmap_init::$3 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _3
@@ -5418,12 +5444,12 @@ bitmap_init: {
   //SEG283 [148] (byte~) bitmap_init::$7 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG284 [149] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG284 [149] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6_from_b5
-    jmp b7
-  //SEG285 bitmap_init::@7
-  b7:
+    bne b4_from_b3
+    jmp b5
+  //SEG285 bitmap_init::@5
+  b5:
   //SEG286 [150] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -5432,31 +5458,31 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG287 [151] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  b6_from_b5:
-  b6_from_b7:
-  //SEG288 [151] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-    jmp b6
-  //SEG289 bitmap_init::@6
-  b6:
+  //SEG287 [151] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  b4_from_b3:
+  b4_from_b5:
+  //SEG288 [151] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+    jmp b4
+  //SEG289 bitmap_init::@4
+  b4:
   //SEG290 [152] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG291 [153] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuxx_neq_0_then_la1 
+  //SEG291 [153] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5_from_b6
+    bne b3_from_b4
     jmp breturn
   //SEG292 bitmap_init::@return
   breturn:
   //SEG293 [154] return 
     rts
-  //SEG294 [155] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  b10_from_b1:
-    jmp b10
-  //SEG295 bitmap_init::@10
-  b10:
-  //SEG296 [138] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  b2_from_b10:
-  //SEG297 [138] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG294 [155] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  b6_from_b1:
+    jmp b6
+  //SEG295 bitmap_init::@6
+  b6:
+  //SEG296 [138] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  b2_from_b6:
+  //SEG297 [138] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
     jmp b2
 }
   // The coordinates of the lines to animate
@@ -5480,62 +5506,62 @@ bitmap_init: {
   bitmap_plot_bit: .fill $100, 0
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b19
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp vicSelectGfxBank1
 Removing instruction jmp vicSelectGfxBank1_toDd001
 Removing instruction jmp vicSelectGfxBank1_b1
 Removing instruction jmp toD0181
-Removing instruction jmp b16
-Removing instruction jmp b17
-Removing instruction jmp b18
+Removing instruction jmp b4
+Removing instruction jmp b5
 Removing instruction jmp b6
-Removing instruction jmp b20
-Removing instruction jmp b21
+Removing instruction jmp b1
+Removing instruction jmp b7
 Removing instruction jmp b8
-Removing instruction jmp b10
+Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp abs16s1
-Removing instruction jmp b12
+Removing instruction jmp b8
 Removing instruction jmp abs16s1_breturn
 Removing instruction jmp abs16s2
-Removing instruction jmp b13
+Removing instruction jmp b9
 Removing instruction jmp abs16s2_breturn
-Removing instruction jmp b10
+Removing instruction jmp b6
 Removing instruction jmp b2
 Removing instruction jmp breturn
-Removing instruction jmp b5
-Removing instruction jmp b8
-Removing instruction jmp b11
-Removing instruction jmp b16
-Removing instruction jmp b17
-Removing instruction jmp b2
-Removing instruction jmp b18
-Removing instruction jmp b4
-Removing instruction jmp b15
-Removing instruction jmp b11
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b4
-Removing instruction jmp b2
-Removing instruction jmp b5
 Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
 Removing instruction jmp b5
 Removing instruction jmp b7
+Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b2
+Removing instruction jmp b9
+Removing instruction jmp b4
 Removing instruction jmp b6
+Removing instruction jmp b5
 Removing instruction jmp breturn
-Removing instruction jmp b10
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b2
+Removing instruction jmp b5
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b5
+Removing instruction jmp b4
+Removing instruction jmp breturn
+Removing instruction jmp b6
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Removing instruction lda #0
@@ -5549,11 +5575,11 @@ Replacing instruction lda #0 with TXA
 Removing instruction lda #0
 Replacing instruction ldy #0 with TAY
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b6_from_b21 with b6
-Replacing label b2_from_b11 with b2
-Replacing label abs16s2_breturn_from_abs16s2_b1 with b10
+Replacing label b1_from_b8 with b1
+Replacing label b2_from_b7 with b2
+Replacing label abs16s2_breturn_from_abs16s2_b1 with b6
 Replacing label abs16s1_breturn_from_abs16s1_b1 with abs16s2
-Replacing label breturn_from_b19 with breturn
+Replacing label breturn_from_b10 with breturn
 Replacing label b4_from_b3 with b4
 Replacing label b2_from_b1 with b2
 Replacing label b3_from_b2 with b3
@@ -5563,36 +5589,36 @@ Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
-Replacing label b10_from_b1 with b10
+Replacing label b6_from_b1 with b6
 Replacing label b1_from_b2 with b1
-Replacing label b6_from_b5 with b6
-Replacing label b5_from_b6 with b5
-Removing instruction b19_from_bbegin:
-Removing instruction b19:
-Removing instruction bend_from_b19:
+Replacing label b4_from_b3 with b4
+Replacing label b3_from_b4 with b3
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Removing instruction vicSelectGfxBank1_toDd001_from_vicSelectGfxBank1:
 Removing instruction vicSelectGfxBank1_toDd001:
 Removing instruction toD0181_from_vicSelectGfxBank1_b1:
 Removing instruction toD0181:
-Removing instruction b17_from_b16:
-Removing instruction b18_from_b17:
-Removing instruction screen_fill_from_b18:
-Removing instruction b6_from_b21:
-Removing instruction abs16s1_breturn_from_b12:
+Removing instruction b5_from_b4:
+Removing instruction b6_from_b5:
+Removing instruction screen_fill_from_b6:
+Removing instruction b1_from_b8:
+Removing instruction abs16s1_breturn_from_b8:
 Removing instruction abs16s1_breturn_from_abs16s1_b1:
 Removing instruction abs16s1_breturn:
-Removing instruction abs16s2_breturn_from_b13:
+Removing instruction abs16s2_breturn_from_b9:
 Removing instruction abs16s2_breturn_from_abs16s2_b1:
 Removing instruction abs16s2_breturn:
-Removing instruction b2_from_b10:
-Removing instruction b2_from_b11:
-Removing instruction b2_from_b17:
-Removing instruction b18:
-Removing instruction b4_from_b18:
+Removing instruction b2_from_b6:
+Removing instruction b2_from_b7:
+Removing instruction b2_from_b8:
+Removing instruction b9:
 Removing instruction b4_from_b3:
+Removing instruction b4_from_b9:
 Removing instruction divr16u_from_b4:
-Removing instruction breturn_from_b11:
-Removing instruction breturn_from_b19:
+Removing instruction breturn_from_b10:
+Removing instruction breturn_from_b5:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
@@ -5605,35 +5631,35 @@ Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
 Removing instruction b1_from_b2:
-Removing instruction b5_from_b6:
-Removing instruction b6_from_b5:
-Removing instruction b6_from_b7:
-Removing instruction b10_from_b1:
-Removing instruction b2_from_b10:
+Removing instruction b3_from_b4:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b5:
+Removing instruction b6_from_b1:
+Removing instruction b2_from_b6:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction vicSelectGfxBank1:
 Removing instruction vicSelectGfxBank1_b1:
-Removing instruction b16:
-Removing instruction bitmap_init_from_b16:
-Removing instruction b17:
-Removing instruction b18:
-Removing instruction b6_from_b18:
-Removing instruction b20:
-Removing instruction b21:
-Removing instruction b10:
+Removing instruction b4:
+Removing instruction bitmap_init_from_b4:
+Removing instruction b5:
+Removing instruction b6:
+Removing instruction b1_from_b6:
+Removing instruction b7:
+Removing instruction b8:
+Removing instruction b3:
 Removing instruction breturn:
 Removing instruction abs16s1:
-Removing instruction b12:
-Removing instruction b13:
+Removing instruction b8:
+Removing instruction b9:
 Removing instruction breturn:
+Removing instruction b3:
+Removing instruction divr16s_from_b5:
+Removing instruction b7:
+Removing instruction b7:
+Removing instruction b8:
+Removing instruction b6:
 Removing instruction b5:
-Removing instruction divr16s_from_b8:
-Removing instruction b11:
-Removing instruction b16:
-Removing instruction b17:
-Removing instruction b15:
-Removing instruction b11:
 Removing instruction b2_from_b1:
 Removing instruction b1_from_divr16u:
 Removing instruction b4:
@@ -5647,26 +5673,26 @@ Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_bitmap_init:
 Removing instruction b2_from_b1:
-Removing instruction b5_from_b2:
-Removing instruction b7:
+Removing instruction b3_from_b2:
+Removing instruction b5:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b2 in bne b10
+Skipping double jump to b2 in bne b6
 Succesful ASM optimization Pass5DoubleJumpElimination
-Removing instruction jmp b6
+Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b3
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
-Removing instruction b10:
+Removing instruction b6:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b2
 Succesful ASM optimization Pass5UnreachableCodeElimination
@@ -5674,7 +5700,7 @@ Fixing long branch [160] bmi abs16s1_b1 to bpl
 Fixing long branch [169] bmi abs16s2_b1 to bpl
 
 FINAL SYMBOL TABLE
-(label) @19
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -5800,11 +5826,11 @@ FINAL SYMBOL TABLE
 (byte~) bitmap_init::$6 reg byte a 22.0
 (byte~) bitmap_init::$7 reg byte a 22.0
 (label) bitmap_init::@1
-(label) bitmap_init::@10
 (label) bitmap_init::@2
+(label) bitmap_init::@3
+(label) bitmap_init::@4
 (label) bitmap_init::@5
 (label) bitmap_init::@6
-(label) bitmap_init::@7
 (label) bitmap_init::@return
 (byte*) bitmap_init::bitmap
 (byte) bitmap_init::bits
@@ -5844,15 +5870,15 @@ FINAL SYMBOL TABLE
 (signed word~) divr16s::$10 $10 zp ZP_WORD:9 2.0
 (signed word~) divr16s::$13 $13 zp ZP_WORD:11 1.0
 (label) divr16s::@1
-(label) divr16s::@11
-(label) divr16s::@15
-(label) divr16s::@16
-(label) divr16s::@17
-(label) divr16s::@18
-(label) divr16s::@19
+(label) divr16s::@10
 (label) divr16s::@2
 (label) divr16s::@3
 (label) divr16s::@4
+(label) divr16s::@5
+(label) divr16s::@6
+(label) divr16s::@7
+(label) divr16s::@8
+(label) divr16s::@9
 (label) divr16s::@return
 (signed word) divr16s::dividend
 (const signed word) divr16s::dividend#0 dividend = (byte/signed byte/word/signed word/dword/signed dword) 0
@@ -5917,13 +5943,13 @@ FINAL SYMBOL TABLE
 (byte[4]) frame
 (void()) main()
 (byte~) main::$9 reg byte x 11.0
-(label) main::@10
-(label) main::@16
-(label) main::@17
-(label) main::@18
-(label) main::@20
-(label) main::@21
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
+(label) main::@7
 (label) main::@8
 (byte) main::i
 (byte) main::i#1 i zp ZP_BYTE:2 16.5
@@ -5963,14 +5989,14 @@ FINAL SYMBOL TABLE
 (signed word~) point_init::$4 $4 zp ZP_WORD:14 2.0
 (signed word~) point_init::$5 $5 zp ZP_WORD:5 4.0
 (label) point_init::@1
-(label) point_init::@10
-(label) point_init::@11
-(label) point_init::@12
-(label) point_init::@13
 (label) point_init::@2
+(label) point_init::@3
+(label) point_init::@4
 (label) point_init::@5
+(label) point_init::@6
 (label) point_init::@7
 (label) point_init::@8
+(label) point_init::@9
 (label) point_init::@return
 (label) point_init::abs16s1
 (bool~) point_init::abs16s1_$0
@@ -6117,10 +6143,10 @@ Score: 21644
   .label rem16s = 3
   .label rem16u = 9
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @19 [phi:@begin->@19]
-//SEG5 @19
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @19 to @end [phi:@19->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -6152,42 +6178,42 @@ main: {
     sta CIA2_PORT_A
   //SEG20 [11] phi from main::vicSelectGfxBank1_@1 to main::toD0181 [phi:main::vicSelectGfxBank1_@1->main::toD0181]
   //SEG21 main::toD0181
-  //SEG22 main::@16
+  //SEG22 main::@4
   //SEG23 [12] *((const byte*) D018#0) ← (const byte) main::toD0181_return#0 -- _deref_pbuc1=vbuc2 
     lda #toD0181_return
     sta D018
   //SEG24 [13] call bitmap_init 
-  //SEG25 [133] phi from main::@16 to bitmap_init [phi:main::@16->bitmap_init]
+  //SEG25 [133] phi from main::@4 to bitmap_init [phi:main::@4->bitmap_init]
     jsr bitmap_init
-  //SEG26 [14] phi from main::@16 to main::@17 [phi:main::@16->main::@17]
-  //SEG27 main::@17
+  //SEG26 [14] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  //SEG27 main::@5
   //SEG28 [15] call bitmap_clear 
     jsr bitmap_clear
-  //SEG29 [16] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
-  //SEG30 main::@18
+  //SEG29 [16] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  //SEG30 main::@6
   //SEG31 [17] call screen_fill 
-  //SEG32 [112] phi from main::@18 to screen_fill [phi:main::@18->screen_fill]
+  //SEG32 [112] phi from main::@6 to screen_fill [phi:main::@6->screen_fill]
     jsr screen_fill
-  //SEG33 [18] phi from main::@18 to main::@6 [phi:main::@18->main::@6]
-  //SEG34 [18] phi (signed word) rem16s#15 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@6#0] -- vwsz1=vbuc1 
+  //SEG33 [18] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  //SEG34 [18] phi (signed word) rem16s#15 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#0] -- vwsz1=vbuc1 
     lda #0
     sta rem16s
     sta rem16s+1
-  //SEG35 [18] phi (word) rem16u#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@6#1] -- vwuz1=vbuc1 
+  //SEG35 [18] phi (word) rem16u#21 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#1] -- vwuz1=vbuc1 
     sta rem16u
     sta rem16u+1
-  //SEG36 [18] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@18->main::@6#2] -- vbuz1=vbuc1 
+  //SEG36 [18] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#2] -- vbuz1=vbuc1 
     sta i
-  //SEG37 [18] phi from main::@21 to main::@6 [phi:main::@21->main::@6]
-  //SEG38 [18] phi (signed word) rem16s#15 = (signed word) rem16s#13 [phi:main::@21->main::@6#0] -- register_copy 
-  //SEG39 [18] phi (word) rem16u#21 = (word) rem16u#18 [phi:main::@21->main::@6#1] -- register_copy 
-  //SEG40 [18] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@21->main::@6#2] -- register_copy 
-  //SEG41 main::@6
-  b6:
+  //SEG37 [18] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
+  //SEG38 [18] phi (signed word) rem16s#15 = (signed word) rem16s#13 [phi:main::@8->main::@1#0] -- register_copy 
+  //SEG39 [18] phi (word) rem16u#21 = (word) rem16u#18 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG40 [18] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@1#2] -- register_copy 
+  //SEG41 main::@1
+  b1:
   //SEG42 [19] (byte) point_init::point_idx#0 ← (byte) main::i#2
   //SEG43 [20] call point_init 
     jsr point_init
-  //SEG44 main::@20
+  //SEG44 main::@7
   //SEG45 [21] (byte~) main::$9 ← (byte) main::i#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuz1_ror_1 
     lda i
     lsr
@@ -6202,26 +6228,26 @@ main: {
     ldy y_start,x
   //SEG48 [24] call bitmap_plot 
     jsr bitmap_plot
-  //SEG49 main::@21
+  //SEG49 main::@8
   //SEG50 [25] (byte) main::i#1 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
     adc #2
     sta i
-  //SEG51 [26] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG51 [26] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp i
-    bne b6
-  //SEG52 main::@8
-  b8:
-  //SEG53 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    bne b1
+  //SEG52 main::@2
+  b2:
+  //SEG53 [27] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b8
-  //SEG54 main::@10
+    bne b2
+  //SEG54 main::@3
   //SEG55 [28] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
-    jmp b8
+    jmp b2
 }
 //SEG56 bitmap_plot
 // Plot a single dot in the bitmap
@@ -6319,14 +6345,14 @@ point_init: {
     bpl !abs16s1_b1+
     jmp abs16s1_b1
   !abs16s1_b1:
-  //SEG72 point_init::@12
+  //SEG72 point_init::@8
   //SEG73 [41] (word~) point_init::abs16s1_return#6 ← (word)(signed word) point_init::x_diff#1 -- vwuz1=vwuz2 
     lda x_diff
     sta abs16s1_return
     lda x_diff+1
     sta abs16s1_return+1
-  //SEG74 [42] phi from point_init::@12 point_init::abs16s1_@1 to point_init::abs16s1_@return [phi:point_init::@12/point_init::abs16s1_@1->point_init::abs16s1_@return]
-  //SEG75 [42] phi (word) point_init::abs16s1_return#2 = (word~) point_init::abs16s1_return#6 [phi:point_init::@12/point_init::abs16s1_@1->point_init::abs16s1_@return#0] -- register_copy 
+  //SEG74 [42] phi from point_init::@8 point_init::abs16s1_@1 to point_init::abs16s1_@return [phi:point_init::@8/point_init::abs16s1_@1->point_init::abs16s1_@return]
+  //SEG75 [42] phi (word) point_init::abs16s1_return#2 = (word~) point_init::abs16s1_return#6 [phi:point_init::@8/point_init::abs16s1_@1->point_init::abs16s1_@return#0] -- register_copy 
   //SEG76 point_init::abs16s1_@return
   //SEG77 point_init::abs16s2
   abs16s2:
@@ -6335,17 +6361,17 @@ point_init: {
     bpl !abs16s2_b1+
     jmp abs16s2_b1
   !abs16s2_b1:
-  //SEG79 point_init::@13
+  //SEG79 point_init::@9
   //SEG80 [44] (word~) point_init::abs16s2_return#6 ← (word)(signed word) point_init::y_diff#0 -- vwuz1=vwuz2 
     lda y_diff
     sta abs16s2_return
     lda y_diff+1
     sta abs16s2_return+1
-  //SEG81 [45] phi from point_init::@13 point_init::abs16s2_@1 to point_init::abs16s2_@return [phi:point_init::@13/point_init::abs16s2_@1->point_init::abs16s2_@return]
-  //SEG82 [45] phi (word) point_init::abs16s2_return#2 = (word~) point_init::abs16s2_return#6 [phi:point_init::@13/point_init::abs16s2_@1->point_init::abs16s2_@return#0] -- register_copy 
+  //SEG81 [45] phi from point_init::@9 point_init::abs16s2_@1 to point_init::abs16s2_@return [phi:point_init::@9/point_init::abs16s2_@1->point_init::abs16s2_@return]
+  //SEG82 [45] phi (word) point_init::abs16s2_return#2 = (word~) point_init::abs16s2_return#6 [phi:point_init::@9/point_init::abs16s2_@1->point_init::abs16s2_@return#0] -- register_copy 
   //SEG83 point_init::abs16s2_@return
-  //SEG84 point_init::@10
-  b10:
+  //SEG84 point_init::@6
+  b6:
   //SEG85 [46] if((word) point_init::abs16s1_return#2>(word) point_init::abs16s2_return#2) goto point_init::@1 -- vwuz1_gt_vwuz2_then_la1 
     lda abs16s2_return+1
     cmp abs16s1_return+1
@@ -6355,9 +6381,9 @@ point_init: {
     cmp abs16s1_return
     bcc b1
   !:
-  //SEG86 [47] phi from point_init::@10 point_init::@11 to point_init::@2 [phi:point_init::@10/point_init::@11->point_init::@2]
-  //SEG87 [47] phi (signed word) rem16s#13 = (signed word) rem16s#15 [phi:point_init::@10/point_init::@11->point_init::@2#0] -- register_copy 
-  //SEG88 [47] phi (word) rem16u#18 = (word) rem16u#21 [phi:point_init::@10/point_init::@11->point_init::@2#1] -- register_copy 
+  //SEG86 [47] phi from point_init::@6 point_init::@7 to point_init::@2 [phi:point_init::@6/point_init::@7->point_init::@2]
+  //SEG87 [47] phi (signed word) rem16s#13 = (signed word) rem16s#15 [phi:point_init::@6/point_init::@7->point_init::@2#0] -- register_copy 
+  //SEG88 [47] phi (word) rem16u#18 = (word) rem16u#21 [phi:point_init::@6/point_init::@7->point_init::@2#1] -- register_copy 
   //SEG89 point_init::@2
   b2:
   //SEG90 [48] (word~) point_init::$10 ← *((const word[4]) x_start#0 + (byte) point_init::point_idx#0) << (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=pwuc1_derefidx_vbuz2_rol_4 
@@ -6409,18 +6435,18 @@ point_init: {
     rts
   //SEG98 point_init::@1
   b1:
-  //SEG99 [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@7 -- vwsz1_lt_0_then_la1 
+  //SEG99 [55] if((signed word) point_init::x_diff#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto point_init::@4 -- vwsz1_lt_0_then_la1 
     // X is driver - abs(y/x) is < 1
     lda x_diff+1
-    bmi b7
-  //SEG100 point_init::@5
+    bmi b4
+  //SEG100 point_init::@3
   //SEG101 [56] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← (byte/signed byte/word/signed word/dword/signed dword) $10 -- pbsc1_derefidx_vbuz1=vbuc2 
     // x add = 1.0
     ldy point_idx
     lda #$10
     sta x_add,y
-  //SEG102 point_init::@8
-  b8:
+  //SEG102 point_init::@5
+  b5:
   //SEG103 [57] (signed word) divr16s::divisor#0 ← (signed word) point_init::x_diff#1
   //SEG104 [58] (signed word) divr16s::rem#0 ← (signed word) point_init::y_diff#0 -- vwsz1=vwsz2 
     lda y_diff
@@ -6428,10 +6454,10 @@ point_init: {
     lda y_diff+1
     sta divr16s.rem+1
   //SEG105 [59] call divr16s 
-  //SEG106 [70] phi from point_init::@8 to divr16s [phi:point_init::@8->divr16s]
+  //SEG106 [70] phi from point_init::@5 to divr16s [phi:point_init::@5->divr16s]
     jsr divr16s
   //SEG107 [60] (signed word) divr16s::return#3 ← (signed word) divr16s::return#2
-  //SEG108 point_init::@11
+  //SEG108 point_init::@7
   //SEG109 [61] (signed word) point_init::x_stepf#0 ← (signed word) divr16s::return#3
   //SEG110 [62] (byte~) point_init::$16 ← > (signed word) point_init::x_stepf#0 -- vbuaa=_hi_vwsz1 
     lda x_stepf+1
@@ -6444,14 +6470,14 @@ point_init: {
     ldy point_idx1
     sta y_add,y
     jmp b2
-  //SEG113 point_init::@7
-  b7:
+  //SEG113 point_init::@4
+  b4:
   //SEG114 [65] *((const signed byte[4]) x_add#0 + (byte) point_init::point_idx#0) ← -(byte/signed byte/word/signed word/dword/signed dword) $10 -- pbsc1_derefidx_vbuz1=vbsc2 
     // x add = -1.0
     lda #-$10
     ldy point_idx
     sta x_add,y
-    jmp b8
+    jmp b5
   //SEG115 point_init::abs16s2_@1
   abs16s2_b1:
   //SEG116 [66] (signed word) point_init::abs16s2_$2#0 ← - (signed word) point_init::y_diff#0 -- vwsz1=_neg_vwsz2 
@@ -6465,7 +6491,7 @@ point_init: {
     adc #0
     sta abs16s2__2+1
   //SEG117 [67] (word~) point_init::abs16s2_return#5 ← (word)(signed word) point_init::abs16s2_$2#0
-    jmp b10
+    jmp b6
   //SEG118 point_init::abs16s1_@1
   abs16s1_b1:
   //SEG119 [68] (signed word) point_init::abs16s1_$2#0 ← - (signed word) point_init::x_diff#1 -- vwsz1=_neg_vwsz2 
@@ -6499,31 +6525,31 @@ divr16s: {
     .label dividendu = 3
     .label divisoru = $b
     .label remu = 9
-  //SEG122 divr16s::@16
+  //SEG122 divr16s::@7
   //SEG123 [71] if((signed word) divr16s::rem#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@1 -- vwsz1_lt_0_then_la1 
     lda rem+1
     bmi b1
-  //SEG124 divr16s::@17
+  //SEG124 divr16s::@8
   //SEG125 [72] (word~) divr16s::remu#8 ← (word)(signed word) divr16s::rem#0
-  //SEG126 [73] phi from divr16s::@17 to divr16s::@2 [phi:divr16s::@17->divr16s::@2]
-  //SEG127 [73] phi (word) divr16s::remu#3 = (word~) divr16s::remu#8 [phi:divr16s::@17->divr16s::@2#0] -- register_copy 
-  //SEG128 [73] phi (word) divr16s::dividendu#3 = ((word))(const signed word) divr16s::dividend#0 [phi:divr16s::@17->divr16s::@2#1] -- vwuz1=vbuc1 
+  //SEG126 [73] phi from divr16s::@8 to divr16s::@2 [phi:divr16s::@8->divr16s::@2]
+  //SEG127 [73] phi (word) divr16s::remu#3 = (word~) divr16s::remu#8 [phi:divr16s::@8->divr16s::@2#0] -- register_copy 
+  //SEG128 [73] phi (word) divr16s::dividendu#3 = ((word))(const signed word) divr16s::dividend#0 [phi:divr16s::@8->divr16s::@2#1] -- vwuz1=vbuc1 
     lda #dividend
     sta dividendu
     lda #0
     sta dividendu+1
-  //SEG129 [73] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@17->divr16s::@2#2] -- vbuyy=vbuc1 
+  //SEG129 [73] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@8->divr16s::@2#2] -- vbuyy=vbuc1 
     tay
   //SEG130 divr16s::@2
   b2:
   //SEG131 [74] if((signed word) divr16s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@3 -- vwsz1_lt_0_then_la1 
     lda divisor+1
     bmi b3
-  //SEG132 divr16s::@18
+  //SEG132 divr16s::@9
   //SEG133 [75] (word~) divr16s::divisoru#5 ← (word)(signed word) divr16s::divisor#0
-  //SEG134 [76] phi from divr16s::@18 divr16s::@3 to divr16s::@4 [phi:divr16s::@18/divr16s::@3->divr16s::@4]
-  //SEG135 [76] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#3 [phi:divr16s::@18/divr16s::@3->divr16s::@4#0] -- register_copy 
-  //SEG136 [76] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#5 [phi:divr16s::@18/divr16s::@3->divr16s::@4#1] -- register_copy 
+  //SEG134 [76] phi from divr16s::@3 divr16s::@9 to divr16s::@4 [phi:divr16s::@3/divr16s::@9->divr16s::@4]
+  //SEG135 [76] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#2 [phi:divr16s::@3/divr16s::@9->divr16s::@4#0] -- register_copy 
+  //SEG136 [76] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#4 [phi:divr16s::@3/divr16s::@9->divr16s::@4#1] -- register_copy 
   //SEG137 divr16s::@4
   b4:
   //SEG138 [77] (word) divr16u::dividend#1 ← (word) divr16s::dividendu#3
@@ -6533,12 +6559,12 @@ divr16s: {
   //SEG142 [95] phi from divr16s::@4 to divr16u [phi:divr16s::@4->divr16u]
     jsr divr16u
   //SEG143 [81] (word) divr16u::return#2 ← (word) divr16u::return#0
-  //SEG144 divr16s::@15
+  //SEG144 divr16s::@6
   //SEG145 [82] (word) divr16s::resultu#0 ← (word) divr16u::return#2
-  //SEG146 [83] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@19 -- vbuyy_eq_0_then_la1 
+  //SEG146 [83] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@10 -- vbuyy_eq_0_then_la1 
     cpy #0
-    beq b19
-  //SEG147 divr16s::@11
+    beq b10
+  //SEG147 divr16s::@5
   //SEG148 [84] (signed word) rem16s#2 ← - (signed word)(word) divr16u::rem#10 -- vwsz1=_neg_vwsz2 
     sec
     lda divr16u.rem
@@ -6559,15 +6585,15 @@ divr16s: {
     eor #$ff
     adc #0
     sta return+1
-  //SEG150 [86] phi from divr16s::@11 divr16s::@19 to divr16s::@return [phi:divr16s::@11/divr16s::@19->divr16s::@return]
-  //SEG151 [86] phi (signed word) rem16s#3 = (signed word) rem16s#2 [phi:divr16s::@11/divr16s::@19->divr16s::@return#0] -- register_copy 
-  //SEG152 [86] phi (signed word) divr16s::return#2 = (signed word) divr16s::return#1 [phi:divr16s::@11/divr16s::@19->divr16s::@return#1] -- register_copy 
+  //SEG150 [86] phi from divr16s::@10 divr16s::@5 to divr16s::@return [phi:divr16s::@10/divr16s::@5->divr16s::@return]
+  //SEG151 [86] phi (signed word) rem16s#3 = (signed word~) rem16s#57 [phi:divr16s::@10/divr16s::@5->divr16s::@return#0] -- register_copy 
+  //SEG152 [86] phi (signed word) divr16s::return#2 = (signed word~) divr16s::return#7 [phi:divr16s::@10/divr16s::@5->divr16s::@return#1] -- register_copy 
   //SEG153 divr16s::@return
   breturn:
   //SEG154 [87] return 
     rts
-  //SEG155 divr16s::@19
-  b19:
+  //SEG155 divr16s::@10
+  b10:
   //SEG156 [88] (signed word~) divr16s::return#7 ← (signed word)(word) divr16s::resultu#0
   //SEG157 [89] (signed word~) rem16s#57 ← (signed word)(word) divr16u::rem#10 -- vwsz1=vwsz2 
     lda divr16u.rem
@@ -6836,7 +6862,7 @@ bitmap_init: {
     sta bitmap_plot_bit,x
   //SEG263 [136] (byte) bitmap_init::bits#1 ← (byte) bitmap_init::bits#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuaa_ror_1 
     lsr
-  //SEG264 [137] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@10 -- vbuaa_neq_0_then_la1 
+  //SEG264 [137] if((byte) bitmap_init::bits#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@6 -- vbuaa_neq_0_then_la1 
     cmp #0
     bne b2
   //SEG265 [138] phi from bitmap_init::@1 to bitmap_init::@2 [phi:bitmap_init::@1->bitmap_init::@2]
@@ -6849,19 +6875,19 @@ bitmap_init: {
   //SEG269 [140] if((byte) bitmap_init::x#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1
-  //SEG270 [141] phi from bitmap_init::@2 to bitmap_init::@5 [phi:bitmap_init::@2->bitmap_init::@5]
-  //SEG271 [141] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@5#0] -- pbuz1=pbuc1 
+  //SEG270 [141] phi from bitmap_init::@2 to bitmap_init::@3 [phi:bitmap_init::@2->bitmap_init::@3]
+  //SEG271 [141] phi (byte*) bitmap_init::yoffs#2 = (const byte*) BITMAP#0 [phi:bitmap_init::@2->bitmap_init::@3#0] -- pbuz1=pbuc1 
     lda #<BITMAP
     sta yoffs
     lda #>BITMAP
     sta yoffs+1
-  //SEG272 [141] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@5#1] -- vbuxx=vbuc1 
+  //SEG272 [141] phi (byte) bitmap_init::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:bitmap_init::@2->bitmap_init::@3#1] -- vbuxx=vbuc1 
     ldx #0
-  //SEG273 [141] phi from bitmap_init::@6 to bitmap_init::@5 [phi:bitmap_init::@6->bitmap_init::@5]
-  //SEG274 [141] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@6->bitmap_init::@5#0] -- register_copy 
-  //SEG275 [141] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@6->bitmap_init::@5#1] -- register_copy 
-  //SEG276 bitmap_init::@5
-  b5:
+  //SEG273 [141] phi from bitmap_init::@4 to bitmap_init::@3 [phi:bitmap_init::@4->bitmap_init::@3]
+  //SEG274 [141] phi (byte*) bitmap_init::yoffs#2 = (byte*) bitmap_init::yoffs#4 [phi:bitmap_init::@4->bitmap_init::@3#0] -- register_copy 
+  //SEG275 [141] phi (byte) bitmap_init::y#2 = (byte) bitmap_init::y#1 [phi:bitmap_init::@4->bitmap_init::@3#1] -- register_copy 
+  //SEG276 bitmap_init::@3
+  b3:
   //SEG277 [142] (byte~) bitmap_init::$3 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax _3
@@ -6878,10 +6904,10 @@ bitmap_init: {
   //SEG283 [148] (byte~) bitmap_init::$7 ← (byte) bitmap_init::y#2 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #7
-  //SEG284 [149] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@6 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG284 [149] if((byte~) bitmap_init::$7!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto bitmap_init::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
-    bne b6
-  //SEG285 bitmap_init::@7
+    bne b4
+  //SEG285 bitmap_init::@5
   //SEG286 [150] (byte*) bitmap_init::yoffs#1 ← (byte*) bitmap_init::yoffs#2 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 8 -- pbuz1=pbuz1_plus_vwuc1 
     clc
     lda yoffs
@@ -6890,22 +6916,22 @@ bitmap_init: {
     lda yoffs+1
     adc #>$28*8
     sta yoffs+1
-  //SEG287 [151] phi from bitmap_init::@5 bitmap_init::@7 to bitmap_init::@6 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6]
-  //SEG288 [151] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@5/bitmap_init::@7->bitmap_init::@6#0] -- register_copy 
-  //SEG289 bitmap_init::@6
-  b6:
+  //SEG287 [151] phi from bitmap_init::@3 bitmap_init::@5 to bitmap_init::@4 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4]
+  //SEG288 [151] phi (byte*) bitmap_init::yoffs#4 = (byte*) bitmap_init::yoffs#2 [phi:bitmap_init::@3/bitmap_init::@5->bitmap_init::@4#0] -- register_copy 
+  //SEG289 bitmap_init::@4
+  b4:
   //SEG290 [152] (byte) bitmap_init::y#1 ← ++ (byte) bitmap_init::y#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG291 [153] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@5 -- vbuxx_neq_0_then_la1 
+  //SEG291 [153] if((byte) bitmap_init::y#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto bitmap_init::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5
+    bne b3
   //SEG292 bitmap_init::@return
   //SEG293 [154] return 
     rts
-  //SEG294 [155] phi from bitmap_init::@1 to bitmap_init::@10 [phi:bitmap_init::@1->bitmap_init::@10]
-  //SEG295 bitmap_init::@10
-  //SEG296 [138] phi from bitmap_init::@10 to bitmap_init::@2 [phi:bitmap_init::@10->bitmap_init::@2]
-  //SEG297 [138] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@10->bitmap_init::@2#0] -- register_copy 
+  //SEG294 [155] phi from bitmap_init::@1 to bitmap_init::@6 [phi:bitmap_init::@1->bitmap_init::@6]
+  //SEG295 bitmap_init::@6
+  //SEG296 [138] phi from bitmap_init::@6 to bitmap_init::@2 [phi:bitmap_init::@6->bitmap_init::@2]
+  //SEG297 [138] phi (byte) bitmap_init::bits#4 = (byte) bitmap_init::bits#1 [phi:bitmap_init::@6->bitmap_init::@2#0] -- register_copy 
 }
   // The coordinates of the lines to animate
   x_start: .word $a, $14, $1e, $1e
diff --git a/src/test/ref/line-anim.sym b/src/test/ref/line-anim.sym
index ddc72ca05..4f3febd75 100644
--- a/src/test/ref/line-anim.sym
+++ b/src/test/ref/line-anim.sym
@@ -1,4 +1,4 @@
-(label) @19
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -124,11 +124,11 @@
 (byte~) bitmap_init::$6 reg byte a 22.0
 (byte~) bitmap_init::$7 reg byte a 22.0
 (label) bitmap_init::@1
-(label) bitmap_init::@10
 (label) bitmap_init::@2
+(label) bitmap_init::@3
+(label) bitmap_init::@4
 (label) bitmap_init::@5
 (label) bitmap_init::@6
-(label) bitmap_init::@7
 (label) bitmap_init::@return
 (byte*) bitmap_init::bitmap
 (byte) bitmap_init::bits
@@ -168,15 +168,15 @@
 (signed word~) divr16s::$10 $10 zp ZP_WORD:9 2.0
 (signed word~) divr16s::$13 $13 zp ZP_WORD:11 1.0
 (label) divr16s::@1
-(label) divr16s::@11
-(label) divr16s::@15
-(label) divr16s::@16
-(label) divr16s::@17
-(label) divr16s::@18
-(label) divr16s::@19
+(label) divr16s::@10
 (label) divr16s::@2
 (label) divr16s::@3
 (label) divr16s::@4
+(label) divr16s::@5
+(label) divr16s::@6
+(label) divr16s::@7
+(label) divr16s::@8
+(label) divr16s::@9
 (label) divr16s::@return
 (signed word) divr16s::dividend
 (const signed word) divr16s::dividend#0 dividend = (byte/signed byte/word/signed word/dword/signed dword) 0
@@ -241,13 +241,13 @@
 (byte[4]) frame
 (void()) main()
 (byte~) main::$9 reg byte x 11.0
-(label) main::@10
-(label) main::@16
-(label) main::@17
-(label) main::@18
-(label) main::@20
-(label) main::@21
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
+(label) main::@7
 (label) main::@8
 (byte) main::i
 (byte) main::i#1 i zp ZP_BYTE:2 16.5
@@ -287,14 +287,14 @@
 (signed word~) point_init::$4 $4 zp ZP_WORD:14 2.0
 (signed word~) point_init::$5 $5 zp ZP_WORD:5 4.0
 (label) point_init::@1
-(label) point_init::@10
-(label) point_init::@11
-(label) point_init::@12
-(label) point_init::@13
 (label) point_init::@2
+(label) point_init::@3
+(label) point_init::@4
 (label) point_init::@5
+(label) point_init::@6
 (label) point_init::@7
 (label) point_init::@8
+(label) point_init::@9
 (label) point_init::@return
 (label) point_init::abs16s1
 (bool~) point_init::abs16s1_$0
diff --git a/src/test/ref/linegen.cfg b/src/test/ref/linegen.cfg
index 13114694a..ffb34abd7 100644
--- a/src/test/ref/linegen.cfg
+++ b/src/test/ref/linegen.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@29
-@29: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @29
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @29
+main: scope:[main]  from @1
   [4] phi()
   [5] call lin16u_gen 
   to:main::@3
@@ -51,77 +51,77 @@ main::@12: scope:[main]  from main::@11
   [24] phi()
   [25] call print_ln 
   to:main::@1
-main::@1: scope:[main]  from main::@12 main::@21
-  [26] (byte) main::i#10 ← phi( main::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@21/(byte) main::i#1 )
+main::@1: scope:[main]  from main::@12 main::@20
+  [26] (byte) main::i#10 ← phi( main::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@20/(byte) main::i#1 )
   [27] (byte) print_byte::b#2 ← (byte) main::i#10
   [28] (byte*~) print_char_cursor#91 ← (byte*) print_line_cursor#1
   [29] call print_byte 
-  to:main::@14
-main::@14: scope:[main]  from main::@1
+  to:main::@13
+main::@13: scope:[main]  from main::@1
   [30] phi()
   [31] call print_str 
-  to:main::@15
-main::@15: scope:[main]  from main::@14
+  to:main::@14
+main::@14: scope:[main]  from main::@13
   [32] (word) print_word::w#3 ← *((const word[$14]) main::lintab1#0 + (byte) main::i#10)
   [33] call print_word 
-  to:main::@16
-main::@16: scope:[main]  from main::@15
+  to:main::@15
+main::@15: scope:[main]  from main::@14
   [34] phi()
   [35] call print_str 
-  to:main::@17
-main::@17: scope:[main]  from main::@16
+  to:main::@16
+main::@16: scope:[main]  from main::@15
   [36] (word) print_word::w#4 ← *((const word[$14]) main::lintab2#0 + (byte) main::i#10)
   [37] call print_word 
-  to:main::@18
-main::@18: scope:[main]  from main::@17
+  to:main::@17
+main::@17: scope:[main]  from main::@16
   [38] phi()
   [39] call print_str 
-  to:main::@19
-main::@19: scope:[main]  from main::@18
+  to:main::@18
+main::@18: scope:[main]  from main::@17
   [40] (word) print_word::w#5 ← *((const word[$14]) main::lintab3#0 + (byte) main::i#10)
   [41] call print_word 
-  to:main::@20
-main::@20: scope:[main]  from main::@19
+  to:main::@19
+main::@19: scope:[main]  from main::@18
   [42] phi()
   [43] call print_ln 
-  to:main::@21
-main::@21: scope:[main]  from main::@20
+  to:main::@20
+main::@20: scope:[main]  from main::@19
   [44] (byte) main::i#1 ← (byte) main::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [45] if((byte) main::i#1<(byte/signed byte/word/signed word/dword/signed dword) $14*(byte/signed byte/word/signed word/dword/signed dword) 2) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main::@21
+main::@2: scope:[main]  from main::@20
   [46] (byte*~) print_char_cursor#100 ← (byte*) print_line_cursor#1
   [47] call print_str 
-  to:main::@22
-main::@22: scope:[main]  from main::@2
+  to:main::@21
+main::@21: scope:[main]  from main::@2
   [48] phi()
   [49] call print_word 
-  to:main::@23
-main::@23: scope:[main]  from main::@22
+  to:main::@22
+main::@22: scope:[main]  from main::@21
   [50] phi()
   [51] call print_str 
-  to:main::@24
-main::@24: scope:[main]  from main::@23
+  to:main::@23
+main::@23: scope:[main]  from main::@22
   [52] phi()
   [53] call print_word 
-  to:main::@25
-main::@25: scope:[main]  from main::@24
+  to:main::@24
+main::@24: scope:[main]  from main::@23
   [54] phi()
   [55] call print_str 
-  to:main::@26
-main::@26: scope:[main]  from main::@25
+  to:main::@25
+main::@25: scope:[main]  from main::@24
   [56] phi()
   [57] call print_word 
-  to:main::@27
-main::@27: scope:[main]  from main::@26
+  to:main::@26
+main::@26: scope:[main]  from main::@25
   [58] phi()
   [59] call print_ln 
   to:main::@return
-main::@return: scope:[main]  from main::@27
+main::@return: scope:[main]  from main::@26
   [60] return 
   to:@return
-print_ln: scope:[print_ln]  from main::@12 main::@20 main::@27
-  [61] (byte*) print_line_cursor#21 ← phi( main::@12/((byte*))(word/signed word/dword/signed dword) $400 main::@20/(byte*) print_line_cursor#1 main::@27/(byte*) print_line_cursor#1 )
+print_ln: scope:[print_ln]  from main::@12 main::@19 main::@26
+  [61] (byte*) print_line_cursor#21 ← phi( main::@12/((byte*))(word/signed word/dword/signed dword) $400 main::@19/(byte*) print_line_cursor#1 main::@26/(byte*) print_line_cursor#1 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [62] (byte*) print_line_cursor#11 ← phi( print_ln/(byte*) print_line_cursor#21 print_ln::@1/(byte*) print_line_cursor#1 )
@@ -131,8 +131,8 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [65] return 
   to:@return
-print_word: scope:[print_word]  from main::@11 main::@15 main::@17 main::@19 main::@22 main::@24 main::@26 main::@7 main::@9
-  [66] (word) print_word::w#10 ← phi( main::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@15/(word) print_word::w#3 main::@17/(word) print_word::w#4 main::@19/(word) print_word::w#5 main::@22/(word/signed word/dword/signed dword) $7461 main::@24/(word/dword/signed dword) $f781 main::@26/(word/signed word/dword/signed dword) $6488 main::@7/(word/signed word/dword/signed dword) $22d main::@9/(word/signed word/dword/signed dword) $79cb )
+print_word: scope:[print_word]  from main::@11 main::@14 main::@16 main::@18 main::@21 main::@23 main::@25 main::@7 main::@9
+  [66] (word) print_word::w#10 ← phi( main::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@14/(word) print_word::w#3 main::@16/(word) print_word::w#4 main::@18/(word) print_word::w#5 main::@21/(word/signed word/dword/signed dword) $7461 main::@23/(word/dword/signed dword) $f781 main::@25/(word/signed word/dword/signed dword) $6488 main::@7/(word/signed word/dword/signed dword) $22d main::@9/(word/signed word/dword/signed dword) $79cb )
   [67] (byte) print_byte::b#0 ← > (word) print_word::w#10
   [68] call print_byte 
   to:print_word::@1
@@ -167,9 +167,9 @@ print_char: scope:[print_char]  from print_byte print_byte::@1
 print_char::@return: scope:[print_char]  from print_char
   [83] return 
   to:@return
-print_str: scope:[print_str]  from main::@10 main::@14 main::@16 main::@18 main::@2 main::@23 main::@25 main::@6 main::@8
-  [84] (byte*) print_char_cursor#86 ← phi( main::@10/(byte*) print_char_cursor#11 main::@14/(byte*) print_char_cursor#11 main::@16/(byte*) print_char_cursor#11 main::@18/(byte*) print_char_cursor#11 main::@2/(byte*~) print_char_cursor#100 main::@23/(byte*) print_char_cursor#11 main::@25/(byte*) print_char_cursor#11 main::@6/((byte*))(word/signed word/dword/signed dword) $400 main::@8/(byte*) print_char_cursor#11 )
-  [84] (byte*) print_str::str#12 ← phi( main::@10/(const string) main::str1 main::@14/(const string) main::str1 main::@16/(const string) main::str1 main::@18/(const string) main::str1 main::@2/(const string) main::str main::@23/(const string) main::str1 main::@25/(const string) main::str1 main::@6/(const string) main::str main::@8/(const string) main::str1 )
+print_str: scope:[print_str]  from main::@10 main::@13 main::@15 main::@17 main::@2 main::@22 main::@24 main::@6 main::@8
+  [84] (byte*) print_char_cursor#86 ← phi( main::@10/(byte*) print_char_cursor#11 main::@13/(byte*) print_char_cursor#11 main::@15/(byte*) print_char_cursor#11 main::@17/(byte*) print_char_cursor#11 main::@2/(byte*~) print_char_cursor#100 main::@22/(byte*) print_char_cursor#11 main::@24/(byte*) print_char_cursor#11 main::@6/((byte*))(word/signed word/dword/signed dword) $400 main::@8/(byte*) print_char_cursor#11 )
+  [84] (byte*) print_str::str#12 ← phi( main::@10/(const string) main::str1 main::@13/(const string) main::str1 main::@15/(const string) main::str1 main::@17/(const string) main::str1 main::@2/(const string) main::str main::@22/(const string) main::str1 main::@24/(const string) main::str1 main::@6/(const string) main::str main::@8/(const string) main::str1 )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [85] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#86 print_str::@2/(byte*) print_char_cursor#1 )
@@ -204,22 +204,22 @@ lin16u_gen: scope:[lin16u_gen]  from main main::@3 main::@4
   [99] (word) divr16u::dividend#1 ← (word) lin16u_gen::ampl#0
   [100] call divr16u 
   [101] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:lin16u_gen::@3
-lin16u_gen::@3: scope:[lin16u_gen]  from lin16u_gen
+  to:lin16u_gen::@2
+lin16u_gen::@2: scope:[lin16u_gen]  from lin16u_gen
   [102] (word) lin16u_gen::stepi#0 ← (word) divr16u::return#2
   [103] (word) divr16u::rem#4 ← (word) rem16u#1
   [104] call divr16u 
   [105] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:lin16u_gen::@4
-lin16u_gen::@4: scope:[lin16u_gen]  from lin16u_gen::@3
+  to:lin16u_gen::@3
+lin16u_gen::@3: scope:[lin16u_gen]  from lin16u_gen::@2
   [106] (word) lin16u_gen::stepf#0 ← (word) divr16u::return#3
   [107] (dword) lin16u_gen::step#0 ← (word) lin16u_gen::stepi#0 dw= (word) lin16u_gen::stepf#0
   [108] (dword) lin16u_gen::val#0 ← (word) lin16u_gen::min#3 dw= (byte/signed byte/word/signed word/dword/signed dword) 0
   to:lin16u_gen::@1
-lin16u_gen::@1: scope:[lin16u_gen]  from lin16u_gen::@1 lin16u_gen::@4
-  [109] (word) lin16u_gen::i#2 ← phi( lin16u_gen::@1/(word) lin16u_gen::i#1 lin16u_gen::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [109] (word*) lin16u_gen::lintab#4 ← phi( lin16u_gen::@1/(word*) lin16u_gen::lintab#3 lin16u_gen::@4/(word*) lin16u_gen::lintab#5 )
-  [109] (dword) lin16u_gen::val#2 ← phi( lin16u_gen::@1/(dword) lin16u_gen::val#1 lin16u_gen::@4/(dword) lin16u_gen::val#0 )
+lin16u_gen::@1: scope:[lin16u_gen]  from lin16u_gen::@1 lin16u_gen::@3
+  [109] (word) lin16u_gen::i#2 ← phi( lin16u_gen::@1/(word) lin16u_gen::i#1 lin16u_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [109] (word*) lin16u_gen::lintab#4 ← phi( lin16u_gen::@1/(word*) lin16u_gen::lintab#3 lin16u_gen::@3/(word*) lin16u_gen::lintab#5 )
+  [109] (dword) lin16u_gen::val#2 ← phi( lin16u_gen::@1/(dword) lin16u_gen::val#1 lin16u_gen::@3/(dword) lin16u_gen::val#0 )
   [110] (word~) lin16u_gen::$5 ← > (dword) lin16u_gen::val#2
   [111] *((word*) lin16u_gen::lintab#4) ← (word~) lin16u_gen::$5
   [112] (dword) lin16u_gen::val#1 ← (dword) lin16u_gen::val#2 + (dword) lin16u_gen::step#0
@@ -230,10 +230,10 @@ lin16u_gen::@1: scope:[lin16u_gen]  from lin16u_gen::@1 lin16u_gen::@4
 lin16u_gen::@return: scope:[lin16u_gen]  from lin16u_gen::@1
   [116] return 
   to:@return
-divr16u: scope:[divr16u]  from lin16u_gen lin16u_gen::@3
-  [117] (word) divr16u::divisor#6 ← phi( lin16u_gen/(byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 lin16u_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [117] (word) divr16u::dividend#5 ← phi( lin16u_gen/(word) divr16u::dividend#1 lin16u_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [117] (word) divr16u::rem#10 ← phi( lin16u_gen/(byte/signed byte/word/signed word/dword/signed dword) 0 lin16u_gen::@3/(word) divr16u::rem#4 )
+divr16u: scope:[divr16u]  from lin16u_gen lin16u_gen::@2
+  [117] (word) divr16u::divisor#6 ← phi( lin16u_gen/(byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 lin16u_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [117] (word) divr16u::dividend#5 ← phi( lin16u_gen/(word) divr16u::dividend#1 lin16u_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [117] (word) divr16u::rem#10 ← phi( lin16u_gen/(byte/signed byte/word/signed word/dword/signed dword) 0 lin16u_gen::@2/(word) divr16u::rem#4 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [118] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
diff --git a/src/test/ref/linegen.log b/src/test/ref/linegen.log
index d5ab48d12..ae7dbfd75 100644
--- a/src/test/ref/linegen.log
+++ b/src/test/ref/linegen.log
@@ -1497,8 +1497,25 @@ Culled Empty Block (label) lin16u_gen::@5
 Culled Empty Block (label) divr16u::@8
 Culled Empty Block (label) divr16u::@10
 Culled Empty Block (label) divr16u::@9
+Renumbering block @29 to @1
+Renumbering block main::@14 to main::@13
+Renumbering block main::@15 to main::@14
+Renumbering block main::@16 to main::@15
+Renumbering block main::@17 to main::@16
+Renumbering block main::@18 to main::@17
+Renumbering block main::@19 to main::@18
+Renumbering block main::@20 to main::@19
+Renumbering block main::@21 to main::@20
+Renumbering block main::@22 to main::@21
+Renumbering block main::@23 to main::@22
+Renumbering block main::@24 to main::@23
+Renumbering block main::@25 to main::@24
+Renumbering block main::@26 to main::@25
+Renumbering block main::@27 to main::@26
+Renumbering block lin16u_gen::@3 to lin16u_gen::@2
+Renumbering block lin16u_gen::@4 to lin16u_gen::@3
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @29
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@3
@@ -1511,29 +1528,29 @@ Adding NOP phi() at start of main::@9
 Adding NOP phi() at start of main::@10
 Adding NOP phi() at start of main::@11
 Adding NOP phi() at start of main::@12
-Adding NOP phi() at start of main::@14
-Adding NOP phi() at start of main::@16
-Adding NOP phi() at start of main::@18
-Adding NOP phi() at start of main::@20
+Adding NOP phi() at start of main::@13
+Adding NOP phi() at start of main::@15
+Adding NOP phi() at start of main::@17
+Adding NOP phi() at start of main::@19
+Adding NOP phi() at start of main::@21
 Adding NOP phi() at start of main::@22
 Adding NOP phi() at start of main::@23
 Adding NOP phi() at start of main::@24
 Adding NOP phi() at start of main::@25
 Adding NOP phi() at start of main::@26
-Adding NOP phi() at start of main::@27
 Adding NOP phi() at start of print_cls
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@29
-@29: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @29
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @29
+main: scope:[main]  from @1
   [4] phi()
   [5] call lin16u_gen 
   to:main::@3
@@ -1577,77 +1594,77 @@ main::@12: scope:[main]  from main::@11
   [24] phi()
   [25] call print_ln 
   to:main::@1
-main::@1: scope:[main]  from main::@12 main::@21
-  [26] (byte) main::i#10 ← phi( main::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@21/(byte) main::i#1 )
+main::@1: scope:[main]  from main::@12 main::@20
+  [26] (byte) main::i#10 ← phi( main::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@20/(byte) main::i#1 )
   [27] (byte) print_byte::b#2 ← (byte) main::i#10
   [28] (byte*~) print_char_cursor#91 ← (byte*) print_line_cursor#1
   [29] call print_byte 
-  to:main::@14
-main::@14: scope:[main]  from main::@1
+  to:main::@13
+main::@13: scope:[main]  from main::@1
   [30] phi()
   [31] call print_str 
-  to:main::@15
-main::@15: scope:[main]  from main::@14
+  to:main::@14
+main::@14: scope:[main]  from main::@13
   [32] (word) print_word::w#3 ← *((const word[$14]) main::lintab1#0 + (byte) main::i#10)
   [33] call print_word 
-  to:main::@16
-main::@16: scope:[main]  from main::@15
+  to:main::@15
+main::@15: scope:[main]  from main::@14
   [34] phi()
   [35] call print_str 
-  to:main::@17
-main::@17: scope:[main]  from main::@16
+  to:main::@16
+main::@16: scope:[main]  from main::@15
   [36] (word) print_word::w#4 ← *((const word[$14]) main::lintab2#0 + (byte) main::i#10)
   [37] call print_word 
-  to:main::@18
-main::@18: scope:[main]  from main::@17
+  to:main::@17
+main::@17: scope:[main]  from main::@16
   [38] phi()
   [39] call print_str 
-  to:main::@19
-main::@19: scope:[main]  from main::@18
+  to:main::@18
+main::@18: scope:[main]  from main::@17
   [40] (word) print_word::w#5 ← *((const word[$14]) main::lintab3#0 + (byte) main::i#10)
   [41] call print_word 
-  to:main::@20
-main::@20: scope:[main]  from main::@19
+  to:main::@19
+main::@19: scope:[main]  from main::@18
   [42] phi()
   [43] call print_ln 
-  to:main::@21
-main::@21: scope:[main]  from main::@20
+  to:main::@20
+main::@20: scope:[main]  from main::@19
   [44] (byte) main::i#1 ← (byte) main::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [45] if((byte) main::i#1<(byte/signed byte/word/signed word/dword/signed dword) $14*(byte/signed byte/word/signed word/dword/signed dword) 2) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main::@21
+main::@2: scope:[main]  from main::@20
   [46] (byte*~) print_char_cursor#100 ← (byte*) print_line_cursor#1
   [47] call print_str 
-  to:main::@22
-main::@22: scope:[main]  from main::@2
+  to:main::@21
+main::@21: scope:[main]  from main::@2
   [48] phi()
   [49] call print_word 
-  to:main::@23
-main::@23: scope:[main]  from main::@22
+  to:main::@22
+main::@22: scope:[main]  from main::@21
   [50] phi()
   [51] call print_str 
-  to:main::@24
-main::@24: scope:[main]  from main::@23
+  to:main::@23
+main::@23: scope:[main]  from main::@22
   [52] phi()
   [53] call print_word 
-  to:main::@25
-main::@25: scope:[main]  from main::@24
+  to:main::@24
+main::@24: scope:[main]  from main::@23
   [54] phi()
   [55] call print_str 
-  to:main::@26
-main::@26: scope:[main]  from main::@25
+  to:main::@25
+main::@25: scope:[main]  from main::@24
   [56] phi()
   [57] call print_word 
-  to:main::@27
-main::@27: scope:[main]  from main::@26
+  to:main::@26
+main::@26: scope:[main]  from main::@25
   [58] phi()
   [59] call print_ln 
   to:main::@return
-main::@return: scope:[main]  from main::@27
+main::@return: scope:[main]  from main::@26
   [60] return 
   to:@return
-print_ln: scope:[print_ln]  from main::@12 main::@20 main::@27
-  [61] (byte*) print_line_cursor#21 ← phi( main::@12/((byte*))(word/signed word/dword/signed dword) $400 main::@20/(byte*) print_line_cursor#1 main::@27/(byte*) print_line_cursor#1 )
+print_ln: scope:[print_ln]  from main::@12 main::@19 main::@26
+  [61] (byte*) print_line_cursor#21 ← phi( main::@12/((byte*))(word/signed word/dword/signed dword) $400 main::@19/(byte*) print_line_cursor#1 main::@26/(byte*) print_line_cursor#1 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [62] (byte*) print_line_cursor#11 ← phi( print_ln/(byte*) print_line_cursor#21 print_ln::@1/(byte*) print_line_cursor#1 )
@@ -1657,8 +1674,8 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [65] return 
   to:@return
-print_word: scope:[print_word]  from main::@11 main::@15 main::@17 main::@19 main::@22 main::@24 main::@26 main::@7 main::@9
-  [66] (word) print_word::w#10 ← phi( main::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@15/(word) print_word::w#3 main::@17/(word) print_word::w#4 main::@19/(word) print_word::w#5 main::@22/(word/signed word/dword/signed dword) $7461 main::@24/(word/dword/signed dword) $f781 main::@26/(word/signed word/dword/signed dword) $6488 main::@7/(word/signed word/dword/signed dword) $22d main::@9/(word/signed word/dword/signed dword) $79cb )
+print_word: scope:[print_word]  from main::@11 main::@14 main::@16 main::@18 main::@21 main::@23 main::@25 main::@7 main::@9
+  [66] (word) print_word::w#10 ← phi( main::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@14/(word) print_word::w#3 main::@16/(word) print_word::w#4 main::@18/(word) print_word::w#5 main::@21/(word/signed word/dword/signed dword) $7461 main::@23/(word/dword/signed dword) $f781 main::@25/(word/signed word/dword/signed dword) $6488 main::@7/(word/signed word/dword/signed dword) $22d main::@9/(word/signed word/dword/signed dword) $79cb )
   [67] (byte) print_byte::b#0 ← > (word) print_word::w#10
   [68] call print_byte 
   to:print_word::@1
@@ -1693,9 +1710,9 @@ print_char: scope:[print_char]  from print_byte print_byte::@1
 print_char::@return: scope:[print_char]  from print_char
   [83] return 
   to:@return
-print_str: scope:[print_str]  from main::@10 main::@14 main::@16 main::@18 main::@2 main::@23 main::@25 main::@6 main::@8
-  [84] (byte*) print_char_cursor#86 ← phi( main::@10/(byte*) print_char_cursor#11 main::@14/(byte*) print_char_cursor#11 main::@16/(byte*) print_char_cursor#11 main::@18/(byte*) print_char_cursor#11 main::@2/(byte*~) print_char_cursor#100 main::@23/(byte*) print_char_cursor#11 main::@25/(byte*) print_char_cursor#11 main::@6/((byte*))(word/signed word/dword/signed dword) $400 main::@8/(byte*) print_char_cursor#11 )
-  [84] (byte*) print_str::str#12 ← phi( main::@10/(const string) main::str1 main::@14/(const string) main::str1 main::@16/(const string) main::str1 main::@18/(const string) main::str1 main::@2/(const string) main::str main::@23/(const string) main::str1 main::@25/(const string) main::str1 main::@6/(const string) main::str main::@8/(const string) main::str1 )
+print_str: scope:[print_str]  from main::@10 main::@13 main::@15 main::@17 main::@2 main::@22 main::@24 main::@6 main::@8
+  [84] (byte*) print_char_cursor#86 ← phi( main::@10/(byte*) print_char_cursor#11 main::@13/(byte*) print_char_cursor#11 main::@15/(byte*) print_char_cursor#11 main::@17/(byte*) print_char_cursor#11 main::@2/(byte*~) print_char_cursor#100 main::@22/(byte*) print_char_cursor#11 main::@24/(byte*) print_char_cursor#11 main::@6/((byte*))(word/signed word/dword/signed dword) $400 main::@8/(byte*) print_char_cursor#11 )
+  [84] (byte*) print_str::str#12 ← phi( main::@10/(const string) main::str1 main::@13/(const string) main::str1 main::@15/(const string) main::str1 main::@17/(const string) main::str1 main::@2/(const string) main::str main::@22/(const string) main::str1 main::@24/(const string) main::str1 main::@6/(const string) main::str main::@8/(const string) main::str1 )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [85] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#86 print_str::@2/(byte*) print_char_cursor#1 )
@@ -1730,22 +1747,22 @@ lin16u_gen: scope:[lin16u_gen]  from main main::@3 main::@4
   [99] (word) divr16u::dividend#1 ← (word) lin16u_gen::ampl#0
   [100] call divr16u 
   [101] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:lin16u_gen::@3
-lin16u_gen::@3: scope:[lin16u_gen]  from lin16u_gen
+  to:lin16u_gen::@2
+lin16u_gen::@2: scope:[lin16u_gen]  from lin16u_gen
   [102] (word) lin16u_gen::stepi#0 ← (word) divr16u::return#2
   [103] (word) divr16u::rem#4 ← (word) rem16u#1
   [104] call divr16u 
   [105] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:lin16u_gen::@4
-lin16u_gen::@4: scope:[lin16u_gen]  from lin16u_gen::@3
+  to:lin16u_gen::@3
+lin16u_gen::@3: scope:[lin16u_gen]  from lin16u_gen::@2
   [106] (word) lin16u_gen::stepf#0 ← (word) divr16u::return#3
   [107] (dword) lin16u_gen::step#0 ← (word) lin16u_gen::stepi#0 dw= (word) lin16u_gen::stepf#0
   [108] (dword) lin16u_gen::val#0 ← (word) lin16u_gen::min#3 dw= (byte/signed byte/word/signed word/dword/signed dword) 0
   to:lin16u_gen::@1
-lin16u_gen::@1: scope:[lin16u_gen]  from lin16u_gen::@1 lin16u_gen::@4
-  [109] (word) lin16u_gen::i#2 ← phi( lin16u_gen::@1/(word) lin16u_gen::i#1 lin16u_gen::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [109] (word*) lin16u_gen::lintab#4 ← phi( lin16u_gen::@1/(word*) lin16u_gen::lintab#3 lin16u_gen::@4/(word*) lin16u_gen::lintab#5 )
-  [109] (dword) lin16u_gen::val#2 ← phi( lin16u_gen::@1/(dword) lin16u_gen::val#1 lin16u_gen::@4/(dword) lin16u_gen::val#0 )
+lin16u_gen::@1: scope:[lin16u_gen]  from lin16u_gen::@1 lin16u_gen::@3
+  [109] (word) lin16u_gen::i#2 ← phi( lin16u_gen::@1/(word) lin16u_gen::i#1 lin16u_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [109] (word*) lin16u_gen::lintab#4 ← phi( lin16u_gen::@1/(word*) lin16u_gen::lintab#3 lin16u_gen::@3/(word*) lin16u_gen::lintab#5 )
+  [109] (dword) lin16u_gen::val#2 ← phi( lin16u_gen::@1/(dword) lin16u_gen::val#1 lin16u_gen::@3/(dword) lin16u_gen::val#0 )
   [110] (word~) lin16u_gen::$5 ← > (dword) lin16u_gen::val#2
   [111] *((word*) lin16u_gen::lintab#4) ← (word~) lin16u_gen::$5
   [112] (dword) lin16u_gen::val#1 ← (dword) lin16u_gen::val#2 + (dword) lin16u_gen::step#0
@@ -1756,10 +1773,10 @@ lin16u_gen::@1: scope:[lin16u_gen]  from lin16u_gen::@1 lin16u_gen::@4
 lin16u_gen::@return: scope:[lin16u_gen]  from lin16u_gen::@1
   [116] return 
   to:@return
-divr16u: scope:[divr16u]  from lin16u_gen lin16u_gen::@3
-  [117] (word) divr16u::divisor#6 ← phi( lin16u_gen/(byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 lin16u_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [117] (word) divr16u::dividend#5 ← phi( lin16u_gen/(word) divr16u::dividend#1 lin16u_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [117] (word) divr16u::rem#10 ← phi( lin16u_gen/(byte/signed byte/word/signed word/dword/signed dword) 0 lin16u_gen::@3/(word) divr16u::rem#4 )
+divr16u: scope:[divr16u]  from lin16u_gen lin16u_gen::@2
+  [117] (word) divr16u::divisor#6 ← phi( lin16u_gen/(byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 lin16u_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [117] (word) divr16u::dividend#5 ← phi( lin16u_gen/(word) divr16u::dividend#1 lin16u_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [117] (word) divr16u::rem#10 ← phi( lin16u_gen/(byte/signed byte/word/signed word/dword/signed dword) 0 lin16u_gen::@2/(word) divr16u::rem#4 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [118] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
@@ -2019,17 +2036,17 @@ INITIAL ASM
   .label print_line_cursor = 3
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @29 [phi:@begin->@29]
-b29_from_bbegin:
-  jmp b29
-//SEG5 @29
-b29:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @29 to main [phi:@29->main]
-main_from_b29:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @29 to @end [phi:@29->@end]
-bend_from_b29:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -2223,9 +2240,9 @@ main: {
     lda #0
     sta i
     jmp b1
-  //SEG74 [26] phi from main::@21 to main::@1 [phi:main::@21->main::@1]
-  b1_from_b21:
-  //SEG75 [26] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@21->main::@1#0] -- register_copy 
+  //SEG74 [26] phi from main::@20 to main::@1 [phi:main::@20->main::@1]
+  b1_from_b20:
+  //SEG75 [26] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@20->main::@1#0] -- register_copy 
     jmp b1
   //SEG76 main::@1
   b1:
@@ -2243,24 +2260,24 @@ main: {
   //SEG81 [72] phi (byte*) print_char_cursor#81 = (byte*~) print_char_cursor#91 [phi:main::@1->print_byte#0] -- register_copy 
   //SEG82 [72] phi (byte) print_byte::b#3 = (byte) print_byte::b#2 [phi:main::@1->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG83 [30] phi from main::@1 to main::@14 [phi:main::@1->main::@14]
-  b14_from_b1:
-    jmp b14
-  //SEG84 main::@14
-  b14:
+  //SEG83 [30] phi from main::@1 to main::@13 [phi:main::@1->main::@13]
+  b13_from_b1:
+    jmp b13
+  //SEG84 main::@13
+  b13:
   //SEG85 [31] call print_str 
-  //SEG86 [84] phi from main::@14 to print_str [phi:main::@14->print_str]
-  print_str_from_b14:
-  //SEG87 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@14->print_str#0] -- register_copy 
-  //SEG88 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@14->print_str#1] -- pbuz1=pbuc1 
+  //SEG86 [84] phi from main::@13 to print_str [phi:main::@13->print_str]
+  print_str_from_b13:
+  //SEG87 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@13->print_str#0] -- register_copy 
+  //SEG88 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@13->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b15
-  //SEG89 main::@15
-  b15:
+    jmp b14
+  //SEG89 main::@14
+  b14:
   //SEG90 [32] (word) print_word::w#3 ← *((const word[$14]) main::lintab1#0 + (byte) main::i#10) -- vwuz1=pwuc1_derefidx_vbuz2 
     ldy i
     lda lintab1,y
@@ -2268,28 +2285,28 @@ main: {
     lda lintab1+1,y
     sta print_word.w+1
   //SEG91 [33] call print_word 
-  //SEG92 [66] phi from main::@15 to print_word [phi:main::@15->print_word]
-  print_word_from_b15:
-  //SEG93 [66] phi (word) print_word::w#10 = (word) print_word::w#3 [phi:main::@15->print_word#0] -- register_copy 
+  //SEG92 [66] phi from main::@14 to print_word [phi:main::@14->print_word]
+  print_word_from_b14:
+  //SEG93 [66] phi (word) print_word::w#10 = (word) print_word::w#3 [phi:main::@14->print_word#0] -- register_copy 
     jsr print_word
-  //SEG94 [34] phi from main::@15 to main::@16 [phi:main::@15->main::@16]
-  b16_from_b15:
-    jmp b16
-  //SEG95 main::@16
-  b16:
+  //SEG94 [34] phi from main::@14 to main::@15 [phi:main::@14->main::@15]
+  b15_from_b14:
+    jmp b15
+  //SEG95 main::@15
+  b15:
   //SEG96 [35] call print_str 
-  //SEG97 [84] phi from main::@16 to print_str [phi:main::@16->print_str]
-  print_str_from_b16:
-  //SEG98 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@16->print_str#0] -- register_copy 
-  //SEG99 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@16->print_str#1] -- pbuz1=pbuc1 
+  //SEG97 [84] phi from main::@15 to print_str [phi:main::@15->print_str]
+  print_str_from_b15:
+  //SEG98 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@15->print_str#0] -- register_copy 
+  //SEG99 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@15->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b17
-  //SEG100 main::@17
-  b17:
+    jmp b16
+  //SEG100 main::@16
+  b16:
   //SEG101 [36] (word) print_word::w#4 ← *((const word[$14]) main::lintab2#0 + (byte) main::i#10) -- vwuz1=pwuc1_derefidx_vbuz2 
     ldy i
     lda lintab2,y
@@ -2297,28 +2314,28 @@ main: {
     lda lintab2+1,y
     sta print_word.w+1
   //SEG102 [37] call print_word 
-  //SEG103 [66] phi from main::@17 to print_word [phi:main::@17->print_word]
-  print_word_from_b17:
-  //SEG104 [66] phi (word) print_word::w#10 = (word) print_word::w#4 [phi:main::@17->print_word#0] -- register_copy 
+  //SEG103 [66] phi from main::@16 to print_word [phi:main::@16->print_word]
+  print_word_from_b16:
+  //SEG104 [66] phi (word) print_word::w#10 = (word) print_word::w#4 [phi:main::@16->print_word#0] -- register_copy 
     jsr print_word
-  //SEG105 [38] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG106 main::@18
-  b18:
+  //SEG105 [38] phi from main::@16 to main::@17 [phi:main::@16->main::@17]
+  b17_from_b16:
+    jmp b17
+  //SEG106 main::@17
+  b17:
   //SEG107 [39] call print_str 
-  //SEG108 [84] phi from main::@18 to print_str [phi:main::@18->print_str]
-  print_str_from_b18:
-  //SEG109 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@18->print_str#0] -- register_copy 
-  //SEG110 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@18->print_str#1] -- pbuz1=pbuc1 
+  //SEG108 [84] phi from main::@17 to print_str [phi:main::@17->print_str]
+  print_str_from_b17:
+  //SEG109 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@17->print_str#0] -- register_copy 
+  //SEG110 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@17->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b19
-  //SEG111 main::@19
-  b19:
+    jmp b18
+  //SEG111 main::@18
+  b18:
   //SEG112 [40] (word) print_word::w#5 ← *((const word[$14]) main::lintab3#0 + (byte) main::i#10) -- vwuz1=pwuc1_derefidx_vbuz2 
     ldy i
     lda lintab3,y
@@ -2326,23 +2343,23 @@ main: {
     lda lintab3+1,y
     sta print_word.w+1
   //SEG113 [41] call print_word 
-  //SEG114 [66] phi from main::@19 to print_word [phi:main::@19->print_word]
-  print_word_from_b19:
-  //SEG115 [66] phi (word) print_word::w#10 = (word) print_word::w#5 [phi:main::@19->print_word#0] -- register_copy 
+  //SEG114 [66] phi from main::@18 to print_word [phi:main::@18->print_word]
+  print_word_from_b18:
+  //SEG115 [66] phi (word) print_word::w#10 = (word) print_word::w#5 [phi:main::@18->print_word#0] -- register_copy 
     jsr print_word
-  //SEG116 [42] phi from main::@19 to main::@20 [phi:main::@19->main::@20]
-  b20_from_b19:
-    jmp b20
-  //SEG117 main::@20
-  b20:
+  //SEG116 [42] phi from main::@18 to main::@19 [phi:main::@18->main::@19]
+  b19_from_b18:
+    jmp b19
+  //SEG117 main::@19
+  b19:
   //SEG118 [43] call print_ln 
-  //SEG119 [61] phi from main::@20 to print_ln [phi:main::@20->print_ln]
-  print_ln_from_b20:
-  //SEG120 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@20->print_ln#0] -- register_copy 
+  //SEG119 [61] phi from main::@19 to print_ln [phi:main::@19->print_ln]
+  print_ln_from_b19:
+  //SEG120 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@19->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b21
-  //SEG121 main::@21
-  b21:
+    jmp b20
+  //SEG121 main::@20
+  b20:
   //SEG122 [44] (byte) main::i#1 ← (byte) main::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
@@ -2351,7 +2368,7 @@ main: {
   //SEG123 [45] if((byte) main::i#1<(byte/signed byte/word/signed word/dword/signed dword) $14*(byte/signed byte/word/signed word/dword/signed dword) 2) goto main::@1 -- vbuz1_lt_vbuc1_then_la1 
     lda i
     cmp #$14*2
-    bcc b1_from_b21
+    bcc b1_from_b20
     jmp b2
   //SEG124 main::@2
   b2:
@@ -2370,87 +2387,87 @@ main: {
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG130 [48] phi from main::@2 to main::@22 [phi:main::@2->main::@22]
-  b22_from_b2:
-    jmp b22
-  //SEG131 main::@22
-  b22:
+  //SEG130 [48] phi from main::@2 to main::@21 [phi:main::@2->main::@21]
+  b21_from_b2:
+    jmp b21
+  //SEG131 main::@21
+  b21:
   //SEG132 [49] call print_word 
-  //SEG133 [66] phi from main::@22 to print_word [phi:main::@22->print_word]
-  print_word_from_b22:
-  //SEG134 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $7461 [phi:main::@22->print_word#0] -- vwuz1=vwuc1 
+  //SEG133 [66] phi from main::@21 to print_word [phi:main::@21->print_word]
+  print_word_from_b21:
+  //SEG134 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $7461 [phi:main::@21->print_word#0] -- vwuz1=vwuc1 
     lda #<$7461
     sta print_word.w
     lda #>$7461
     sta print_word.w+1
     jsr print_word
-  //SEG135 [50] phi from main::@22 to main::@23 [phi:main::@22->main::@23]
-  b23_from_b22:
-    jmp b23
-  //SEG136 main::@23
-  b23:
+  //SEG135 [50] phi from main::@21 to main::@22 [phi:main::@21->main::@22]
+  b22_from_b21:
+    jmp b22
+  //SEG136 main::@22
+  b22:
   //SEG137 [51] call print_str 
-  //SEG138 [84] phi from main::@23 to print_str [phi:main::@23->print_str]
-  print_str_from_b23:
-  //SEG139 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@23->print_str#0] -- register_copy 
-  //SEG140 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@23->print_str#1] -- pbuz1=pbuc1 
+  //SEG138 [84] phi from main::@22 to print_str [phi:main::@22->print_str]
+  print_str_from_b22:
+  //SEG139 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@22->print_str#0] -- register_copy 
+  //SEG140 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@22->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG141 [52] phi from main::@23 to main::@24 [phi:main::@23->main::@24]
-  b24_from_b23:
-    jmp b24
-  //SEG142 main::@24
-  b24:
+  //SEG141 [52] phi from main::@22 to main::@23 [phi:main::@22->main::@23]
+  b23_from_b22:
+    jmp b23
+  //SEG142 main::@23
+  b23:
   //SEG143 [53] call print_word 
-  //SEG144 [66] phi from main::@24 to print_word [phi:main::@24->print_word]
-  print_word_from_b24:
-  //SEG145 [66] phi (word) print_word::w#10 = (word/dword/signed dword) $f781 [phi:main::@24->print_word#0] -- vwuz1=vwuc1 
+  //SEG144 [66] phi from main::@23 to print_word [phi:main::@23->print_word]
+  print_word_from_b23:
+  //SEG145 [66] phi (word) print_word::w#10 = (word/dword/signed dword) $f781 [phi:main::@23->print_word#0] -- vwuz1=vwuc1 
     lda #<$f781
     sta print_word.w
     lda #>$f781
     sta print_word.w+1
     jsr print_word
-  //SEG146 [54] phi from main::@24 to main::@25 [phi:main::@24->main::@25]
-  b25_from_b24:
-    jmp b25
-  //SEG147 main::@25
-  b25:
+  //SEG146 [54] phi from main::@23 to main::@24 [phi:main::@23->main::@24]
+  b24_from_b23:
+    jmp b24
+  //SEG147 main::@24
+  b24:
   //SEG148 [55] call print_str 
-  //SEG149 [84] phi from main::@25 to print_str [phi:main::@25->print_str]
-  print_str_from_b25:
-  //SEG150 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@25->print_str#0] -- register_copy 
-  //SEG151 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@25->print_str#1] -- pbuz1=pbuc1 
+  //SEG149 [84] phi from main::@24 to print_str [phi:main::@24->print_str]
+  print_str_from_b24:
+  //SEG150 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@24->print_str#0] -- register_copy 
+  //SEG151 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@24->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG152 [56] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
-  b26_from_b25:
-    jmp b26
-  //SEG153 main::@26
-  b26:
+  //SEG152 [56] phi from main::@24 to main::@25 [phi:main::@24->main::@25]
+  b25_from_b24:
+    jmp b25
+  //SEG153 main::@25
+  b25:
   //SEG154 [57] call print_word 
-  //SEG155 [66] phi from main::@26 to print_word [phi:main::@26->print_word]
-  print_word_from_b26:
-  //SEG156 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $6488 [phi:main::@26->print_word#0] -- vwuz1=vwuc1 
+  //SEG155 [66] phi from main::@25 to print_word [phi:main::@25->print_word]
+  print_word_from_b25:
+  //SEG156 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $6488 [phi:main::@25->print_word#0] -- vwuz1=vwuc1 
     lda #<$6488
     sta print_word.w
     lda #>$6488
     sta print_word.w+1
     jsr print_word
-  //SEG157 [58] phi from main::@26 to main::@27 [phi:main::@26->main::@27]
-  b27_from_b26:
-    jmp b27
-  //SEG158 main::@27
-  b27:
+  //SEG157 [58] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
+  b26_from_b25:
+    jmp b26
+  //SEG158 main::@26
+  b26:
   //SEG159 [59] call print_ln 
-  //SEG160 [61] phi from main::@27 to print_ln [phi:main::@27->print_ln]
-  print_ln_from_b27:
-  //SEG161 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@27->print_ln#0] -- register_copy 
+  //SEG160 [61] phi from main::@26 to print_ln [phi:main::@26->print_ln]
+  print_ln_from_b26:
+  //SEG161 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@26->print_ln#0] -- register_copy 
     jsr print_ln
     jmp breturn
   //SEG162 main::@return
@@ -2726,9 +2743,9 @@ lin16u_gen: {
     sta divr16u.return_2
     lda divr16u.return+1
     sta divr16u.return_2+1
-    jmp b3
-  //SEG239 lin16u_gen::@3
-  b3:
+    jmp b2
+  //SEG239 lin16u_gen::@2
+  b2:
   //SEG240 [102] (word) lin16u_gen::stepi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return_2
     sta stepi
@@ -2740,28 +2757,28 @@ lin16u_gen: {
     lda rem16u+1
     sta divr16u.rem+1
   //SEG242 [104] call divr16u 
-  //SEG243 [117] phi from lin16u_gen::@3 to divr16u [phi:lin16u_gen::@3->divr16u]
-  divr16u_from_b3:
-  //SEG244 [117] phi (word) divr16u::divisor#6 = (byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:lin16u_gen::@3->divr16u#0] -- vwuz1=vbuc1 
+  //SEG243 [117] phi from lin16u_gen::@2 to divr16u [phi:lin16u_gen::@2->divr16u]
+  divr16u_from_b2:
+  //SEG244 [117] phi (word) divr16u::divisor#6 = (byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:lin16u_gen::@2->divr16u#0] -- vwuz1=vbuc1 
     lda #$14-1
     sta divr16u.divisor
     lda #0
     sta divr16u.divisor+1
-  //SEG245 [117] phi (word) divr16u::dividend#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@3->divr16u#1] -- vwuz1=vbuc1 
+  //SEG245 [117] phi (word) divr16u::dividend#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@2->divr16u#1] -- vwuz1=vbuc1 
     lda #0
     sta divr16u.dividend
     lda #0
     sta divr16u.dividend+1
-  //SEG246 [117] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:lin16u_gen::@3->divr16u#2] -- register_copy 
+  //SEG246 [117] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:lin16u_gen::@2->divr16u#2] -- register_copy 
     jsr divr16u
   //SEG247 [105] (word) divr16u::return#3 ← (word) divr16u::return#0 -- vwuz1=vwuz2 
     lda divr16u.return
     sta divr16u.return_3
     lda divr16u.return+1
     sta divr16u.return_3+1
-    jmp b4
-  //SEG248 lin16u_gen::@4
-  b4:
+    jmp b3
+  //SEG248 lin16u_gen::@3
+  b3:
   //SEG249 [106] (word) lin16u_gen::stepf#0 ← (word) divr16u::return#3 -- vwuz1=vwuz2 
     lda divr16u.return_3
     sta stepf
@@ -2785,15 +2802,15 @@ lin16u_gen: {
     sta val+2
     lda min+1
     sta val+3
-  //SEG252 [109] phi from lin16u_gen::@4 to lin16u_gen::@1 [phi:lin16u_gen::@4->lin16u_gen::@1]
-  b1_from_b4:
-  //SEG253 [109] phi (word) lin16u_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@4->lin16u_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG252 [109] phi from lin16u_gen::@3 to lin16u_gen::@1 [phi:lin16u_gen::@3->lin16u_gen::@1]
+  b1_from_b3:
+  //SEG253 [109] phi (word) lin16u_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@3->lin16u_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG254 [109] phi (word*) lin16u_gen::lintab#4 = (word*) lin16u_gen::lintab#5 [phi:lin16u_gen::@4->lin16u_gen::@1#1] -- register_copy 
-  //SEG255 [109] phi (dword) lin16u_gen::val#2 = (dword) lin16u_gen::val#0 [phi:lin16u_gen::@4->lin16u_gen::@1#2] -- register_copy 
+  //SEG254 [109] phi (word*) lin16u_gen::lintab#4 = (word*) lin16u_gen::lintab#5 [phi:lin16u_gen::@3->lin16u_gen::@1#1] -- register_copy 
+  //SEG255 [109] phi (dword) lin16u_gen::val#2 = (dword) lin16u_gen::val#0 [phi:lin16u_gen::@3->lin16u_gen::@1#2] -- register_copy 
     jmp b1
   //SEG256 [109] phi from lin16u_gen::@1 to lin16u_gen::@1 [phi:lin16u_gen::@1->lin16u_gen::@1]
   b1_from_b1:
@@ -3151,17 +3168,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 3
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @29 [phi:@begin->@29]
-b29_from_bbegin:
-  jmp b29
-//SEG5 @29
-b29:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @29 to main [phi:@29->main]
-main_from_b29:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @29 to @end [phi:@29->@end]
-bend_from_b29:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3355,9 +3372,9 @@ main: {
     lda #0
     sta i
     jmp b1
-  //SEG74 [26] phi from main::@21 to main::@1 [phi:main::@21->main::@1]
-  b1_from_b21:
-  //SEG75 [26] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@21->main::@1#0] -- register_copy 
+  //SEG74 [26] phi from main::@20 to main::@1 [phi:main::@20->main::@1]
+  b1_from_b20:
+  //SEG75 [26] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@20->main::@1#0] -- register_copy 
     jmp b1
   //SEG76 main::@1
   b1:
@@ -3374,24 +3391,24 @@ main: {
   //SEG81 [72] phi (byte*) print_char_cursor#81 = (byte*~) print_char_cursor#91 [phi:main::@1->print_byte#0] -- register_copy 
   //SEG82 [72] phi (byte) print_byte::b#3 = (byte) print_byte::b#2 [phi:main::@1->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG83 [30] phi from main::@1 to main::@14 [phi:main::@1->main::@14]
-  b14_from_b1:
-    jmp b14
-  //SEG84 main::@14
-  b14:
+  //SEG83 [30] phi from main::@1 to main::@13 [phi:main::@1->main::@13]
+  b13_from_b1:
+    jmp b13
+  //SEG84 main::@13
+  b13:
   //SEG85 [31] call print_str 
-  //SEG86 [84] phi from main::@14 to print_str [phi:main::@14->print_str]
-  print_str_from_b14:
-  //SEG87 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@14->print_str#0] -- register_copy 
-  //SEG88 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@14->print_str#1] -- pbuz1=pbuc1 
+  //SEG86 [84] phi from main::@13 to print_str [phi:main::@13->print_str]
+  print_str_from_b13:
+  //SEG87 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@13->print_str#0] -- register_copy 
+  //SEG88 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@13->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b15
-  //SEG89 main::@15
-  b15:
+    jmp b14
+  //SEG89 main::@14
+  b14:
   //SEG90 [32] (word) print_word::w#3 ← *((const word[$14]) main::lintab1#0 + (byte) main::i#10) -- vwuz1=pwuc1_derefidx_vbuz2 
     ldy i
     lda lintab1,y
@@ -3399,28 +3416,28 @@ main: {
     lda lintab1+1,y
     sta print_word.w+1
   //SEG91 [33] call print_word 
-  //SEG92 [66] phi from main::@15 to print_word [phi:main::@15->print_word]
-  print_word_from_b15:
-  //SEG93 [66] phi (word) print_word::w#10 = (word) print_word::w#3 [phi:main::@15->print_word#0] -- register_copy 
+  //SEG92 [66] phi from main::@14 to print_word [phi:main::@14->print_word]
+  print_word_from_b14:
+  //SEG93 [66] phi (word) print_word::w#10 = (word) print_word::w#3 [phi:main::@14->print_word#0] -- register_copy 
     jsr print_word
-  //SEG94 [34] phi from main::@15 to main::@16 [phi:main::@15->main::@16]
-  b16_from_b15:
-    jmp b16
-  //SEG95 main::@16
-  b16:
+  //SEG94 [34] phi from main::@14 to main::@15 [phi:main::@14->main::@15]
+  b15_from_b14:
+    jmp b15
+  //SEG95 main::@15
+  b15:
   //SEG96 [35] call print_str 
-  //SEG97 [84] phi from main::@16 to print_str [phi:main::@16->print_str]
-  print_str_from_b16:
-  //SEG98 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@16->print_str#0] -- register_copy 
-  //SEG99 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@16->print_str#1] -- pbuz1=pbuc1 
+  //SEG97 [84] phi from main::@15 to print_str [phi:main::@15->print_str]
+  print_str_from_b15:
+  //SEG98 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@15->print_str#0] -- register_copy 
+  //SEG99 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@15->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b17
-  //SEG100 main::@17
-  b17:
+    jmp b16
+  //SEG100 main::@16
+  b16:
   //SEG101 [36] (word) print_word::w#4 ← *((const word[$14]) main::lintab2#0 + (byte) main::i#10) -- vwuz1=pwuc1_derefidx_vbuz2 
     ldy i
     lda lintab2,y
@@ -3428,28 +3445,28 @@ main: {
     lda lintab2+1,y
     sta print_word.w+1
   //SEG102 [37] call print_word 
-  //SEG103 [66] phi from main::@17 to print_word [phi:main::@17->print_word]
-  print_word_from_b17:
-  //SEG104 [66] phi (word) print_word::w#10 = (word) print_word::w#4 [phi:main::@17->print_word#0] -- register_copy 
+  //SEG103 [66] phi from main::@16 to print_word [phi:main::@16->print_word]
+  print_word_from_b16:
+  //SEG104 [66] phi (word) print_word::w#10 = (word) print_word::w#4 [phi:main::@16->print_word#0] -- register_copy 
     jsr print_word
-  //SEG105 [38] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG106 main::@18
-  b18:
+  //SEG105 [38] phi from main::@16 to main::@17 [phi:main::@16->main::@17]
+  b17_from_b16:
+    jmp b17
+  //SEG106 main::@17
+  b17:
   //SEG107 [39] call print_str 
-  //SEG108 [84] phi from main::@18 to print_str [phi:main::@18->print_str]
-  print_str_from_b18:
-  //SEG109 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@18->print_str#0] -- register_copy 
-  //SEG110 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@18->print_str#1] -- pbuz1=pbuc1 
+  //SEG108 [84] phi from main::@17 to print_str [phi:main::@17->print_str]
+  print_str_from_b17:
+  //SEG109 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@17->print_str#0] -- register_copy 
+  //SEG110 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@17->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b19
-  //SEG111 main::@19
-  b19:
+    jmp b18
+  //SEG111 main::@18
+  b18:
   //SEG112 [40] (word) print_word::w#5 ← *((const word[$14]) main::lintab3#0 + (byte) main::i#10) -- vwuz1=pwuc1_derefidx_vbuz2 
     ldy i
     lda lintab3,y
@@ -3457,23 +3474,23 @@ main: {
     lda lintab3+1,y
     sta print_word.w+1
   //SEG113 [41] call print_word 
-  //SEG114 [66] phi from main::@19 to print_word [phi:main::@19->print_word]
-  print_word_from_b19:
-  //SEG115 [66] phi (word) print_word::w#10 = (word) print_word::w#5 [phi:main::@19->print_word#0] -- register_copy 
+  //SEG114 [66] phi from main::@18 to print_word [phi:main::@18->print_word]
+  print_word_from_b18:
+  //SEG115 [66] phi (word) print_word::w#10 = (word) print_word::w#5 [phi:main::@18->print_word#0] -- register_copy 
     jsr print_word
-  //SEG116 [42] phi from main::@19 to main::@20 [phi:main::@19->main::@20]
-  b20_from_b19:
-    jmp b20
-  //SEG117 main::@20
-  b20:
+  //SEG116 [42] phi from main::@18 to main::@19 [phi:main::@18->main::@19]
+  b19_from_b18:
+    jmp b19
+  //SEG117 main::@19
+  b19:
   //SEG118 [43] call print_ln 
-  //SEG119 [61] phi from main::@20 to print_ln [phi:main::@20->print_ln]
-  print_ln_from_b20:
-  //SEG120 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@20->print_ln#0] -- register_copy 
+  //SEG119 [61] phi from main::@19 to print_ln [phi:main::@19->print_ln]
+  print_ln_from_b19:
+  //SEG120 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@19->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b21
-  //SEG121 main::@21
-  b21:
+    jmp b20
+  //SEG121 main::@20
+  b20:
   //SEG122 [44] (byte) main::i#1 ← (byte) main::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
@@ -3482,7 +3499,7 @@ main: {
   //SEG123 [45] if((byte) main::i#1<(byte/signed byte/word/signed word/dword/signed dword) $14*(byte/signed byte/word/signed word/dword/signed dword) 2) goto main::@1 -- vbuz1_lt_vbuc1_then_la1 
     lda i
     cmp #$14*2
-    bcc b1_from_b21
+    bcc b1_from_b20
     jmp b2
   //SEG124 main::@2
   b2:
@@ -3501,87 +3518,87 @@ main: {
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG130 [48] phi from main::@2 to main::@22 [phi:main::@2->main::@22]
-  b22_from_b2:
-    jmp b22
-  //SEG131 main::@22
-  b22:
+  //SEG130 [48] phi from main::@2 to main::@21 [phi:main::@2->main::@21]
+  b21_from_b2:
+    jmp b21
+  //SEG131 main::@21
+  b21:
   //SEG132 [49] call print_word 
-  //SEG133 [66] phi from main::@22 to print_word [phi:main::@22->print_word]
-  print_word_from_b22:
-  //SEG134 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $7461 [phi:main::@22->print_word#0] -- vwuz1=vwuc1 
+  //SEG133 [66] phi from main::@21 to print_word [phi:main::@21->print_word]
+  print_word_from_b21:
+  //SEG134 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $7461 [phi:main::@21->print_word#0] -- vwuz1=vwuc1 
     lda #<$7461
     sta print_word.w
     lda #>$7461
     sta print_word.w+1
     jsr print_word
-  //SEG135 [50] phi from main::@22 to main::@23 [phi:main::@22->main::@23]
-  b23_from_b22:
-    jmp b23
-  //SEG136 main::@23
-  b23:
+  //SEG135 [50] phi from main::@21 to main::@22 [phi:main::@21->main::@22]
+  b22_from_b21:
+    jmp b22
+  //SEG136 main::@22
+  b22:
   //SEG137 [51] call print_str 
-  //SEG138 [84] phi from main::@23 to print_str [phi:main::@23->print_str]
-  print_str_from_b23:
-  //SEG139 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@23->print_str#0] -- register_copy 
-  //SEG140 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@23->print_str#1] -- pbuz1=pbuc1 
+  //SEG138 [84] phi from main::@22 to print_str [phi:main::@22->print_str]
+  print_str_from_b22:
+  //SEG139 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@22->print_str#0] -- register_copy 
+  //SEG140 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@22->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG141 [52] phi from main::@23 to main::@24 [phi:main::@23->main::@24]
-  b24_from_b23:
-    jmp b24
-  //SEG142 main::@24
-  b24:
+  //SEG141 [52] phi from main::@22 to main::@23 [phi:main::@22->main::@23]
+  b23_from_b22:
+    jmp b23
+  //SEG142 main::@23
+  b23:
   //SEG143 [53] call print_word 
-  //SEG144 [66] phi from main::@24 to print_word [phi:main::@24->print_word]
-  print_word_from_b24:
-  //SEG145 [66] phi (word) print_word::w#10 = (word/dword/signed dword) $f781 [phi:main::@24->print_word#0] -- vwuz1=vwuc1 
+  //SEG144 [66] phi from main::@23 to print_word [phi:main::@23->print_word]
+  print_word_from_b23:
+  //SEG145 [66] phi (word) print_word::w#10 = (word/dword/signed dword) $f781 [phi:main::@23->print_word#0] -- vwuz1=vwuc1 
     lda #<$f781
     sta print_word.w
     lda #>$f781
     sta print_word.w+1
     jsr print_word
-  //SEG146 [54] phi from main::@24 to main::@25 [phi:main::@24->main::@25]
-  b25_from_b24:
-    jmp b25
-  //SEG147 main::@25
-  b25:
+  //SEG146 [54] phi from main::@23 to main::@24 [phi:main::@23->main::@24]
+  b24_from_b23:
+    jmp b24
+  //SEG147 main::@24
+  b24:
   //SEG148 [55] call print_str 
-  //SEG149 [84] phi from main::@25 to print_str [phi:main::@25->print_str]
-  print_str_from_b25:
-  //SEG150 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@25->print_str#0] -- register_copy 
-  //SEG151 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@25->print_str#1] -- pbuz1=pbuc1 
+  //SEG149 [84] phi from main::@24 to print_str [phi:main::@24->print_str]
+  print_str_from_b24:
+  //SEG150 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@24->print_str#0] -- register_copy 
+  //SEG151 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@24->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG152 [56] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
-  b26_from_b25:
-    jmp b26
-  //SEG153 main::@26
-  b26:
+  //SEG152 [56] phi from main::@24 to main::@25 [phi:main::@24->main::@25]
+  b25_from_b24:
+    jmp b25
+  //SEG153 main::@25
+  b25:
   //SEG154 [57] call print_word 
-  //SEG155 [66] phi from main::@26 to print_word [phi:main::@26->print_word]
-  print_word_from_b26:
-  //SEG156 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $6488 [phi:main::@26->print_word#0] -- vwuz1=vwuc1 
+  //SEG155 [66] phi from main::@25 to print_word [phi:main::@25->print_word]
+  print_word_from_b25:
+  //SEG156 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $6488 [phi:main::@25->print_word#0] -- vwuz1=vwuc1 
     lda #<$6488
     sta print_word.w
     lda #>$6488
     sta print_word.w+1
     jsr print_word
-  //SEG157 [58] phi from main::@26 to main::@27 [phi:main::@26->main::@27]
-  b27_from_b26:
-    jmp b27
-  //SEG158 main::@27
-  b27:
+  //SEG157 [58] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
+  b26_from_b25:
+    jmp b26
+  //SEG158 main::@26
+  b26:
   //SEG159 [59] call print_ln 
-  //SEG160 [61] phi from main::@27 to print_ln [phi:main::@27->print_ln]
-  print_ln_from_b27:
-  //SEG161 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@27->print_ln#0] -- register_copy 
+  //SEG160 [61] phi from main::@26 to print_ln [phi:main::@26->print_ln]
+  print_ln_from_b26:
+  //SEG161 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@26->print_ln#0] -- register_copy 
     jsr print_ln
     jmp breturn
   //SEG162 main::@return
@@ -3839,9 +3856,9 @@ lin16u_gen: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG238 [101] (word) divr16u::return#2 ← (word) divr16u::return#0
-    jmp b3
-  //SEG239 lin16u_gen::@3
-  b3:
+    jmp b2
+  //SEG239 lin16u_gen::@2
+  b2:
   //SEG240 [102] (word) lin16u_gen::stepi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return
     sta stepi
@@ -3849,24 +3866,24 @@ lin16u_gen: {
     sta stepi+1
   //SEG241 [103] (word) divr16u::rem#4 ← (word) rem16u#1
   //SEG242 [104] call divr16u 
-  //SEG243 [117] phi from lin16u_gen::@3 to divr16u [phi:lin16u_gen::@3->divr16u]
-  divr16u_from_b3:
-  //SEG244 [117] phi (word) divr16u::divisor#6 = (byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:lin16u_gen::@3->divr16u#0] -- vwuz1=vbuc1 
+  //SEG243 [117] phi from lin16u_gen::@2 to divr16u [phi:lin16u_gen::@2->divr16u]
+  divr16u_from_b2:
+  //SEG244 [117] phi (word) divr16u::divisor#6 = (byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:lin16u_gen::@2->divr16u#0] -- vwuz1=vbuc1 
     lda #$14-1
     sta divr16u.divisor
     lda #0
     sta divr16u.divisor+1
-  //SEG245 [117] phi (word) divr16u::dividend#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@3->divr16u#1] -- vwuz1=vbuc1 
+  //SEG245 [117] phi (word) divr16u::dividend#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@2->divr16u#1] -- vwuz1=vbuc1 
     lda #0
     sta divr16u.dividend
     lda #0
     sta divr16u.dividend+1
-  //SEG246 [117] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:lin16u_gen::@3->divr16u#2] -- register_copy 
+  //SEG246 [117] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:lin16u_gen::@2->divr16u#2] -- register_copy 
     jsr divr16u
   //SEG247 [105] (word) divr16u::return#3 ← (word) divr16u::return#0
-    jmp b4
-  //SEG248 lin16u_gen::@4
-  b4:
+    jmp b3
+  //SEG248 lin16u_gen::@3
+  b3:
   //SEG249 [106] (word) lin16u_gen::stepf#0 ← (word) divr16u::return#3
   //SEG250 [107] (dword) lin16u_gen::step#0 ← (word) lin16u_gen::stepi#0 dw= (word) lin16u_gen::stepf#0 -- vduz1=vwuz2_dword_vwuz3 
     lda stepi
@@ -3886,15 +3903,15 @@ lin16u_gen: {
     sta val+2
     lda min+1
     sta val+3
-  //SEG252 [109] phi from lin16u_gen::@4 to lin16u_gen::@1 [phi:lin16u_gen::@4->lin16u_gen::@1]
-  b1_from_b4:
-  //SEG253 [109] phi (word) lin16u_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@4->lin16u_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG252 [109] phi from lin16u_gen::@3 to lin16u_gen::@1 [phi:lin16u_gen::@3->lin16u_gen::@1]
+  b1_from_b3:
+  //SEG253 [109] phi (word) lin16u_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@3->lin16u_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG254 [109] phi (word*) lin16u_gen::lintab#4 = (word*) lin16u_gen::lintab#5 [phi:lin16u_gen::@4->lin16u_gen::@1#1] -- register_copy 
-  //SEG255 [109] phi (dword) lin16u_gen::val#2 = (dword) lin16u_gen::val#0 [phi:lin16u_gen::@4->lin16u_gen::@1#2] -- register_copy 
+  //SEG254 [109] phi (word*) lin16u_gen::lintab#4 = (word*) lin16u_gen::lintab#5 [phi:lin16u_gen::@3->lin16u_gen::@1#1] -- register_copy 
+  //SEG255 [109] phi (dword) lin16u_gen::val#2 = (dword) lin16u_gen::val#0 [phi:lin16u_gen::@3->lin16u_gen::@1#2] -- register_copy 
     jmp b1
   //SEG256 [109] phi from lin16u_gen::@1 to lin16u_gen::@1 [phi:lin16u_gen::@1->lin16u_gen::@1]
   b1_from_b1:
@@ -4072,7 +4089,7 @@ divr16u: {
   print_hextab: .text "0123456789abcdef"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b29
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b3
 Removing instruction jmp b4
@@ -4085,6 +4102,7 @@ Removing instruction jmp b10
 Removing instruction jmp b11
 Removing instruction jmp b12
 Removing instruction jmp b1
+Removing instruction jmp b13
 Removing instruction jmp b14
 Removing instruction jmp b15
 Removing instruction jmp b16
@@ -4092,14 +4110,13 @@ Removing instruction jmp b17
 Removing instruction jmp b18
 Removing instruction jmp b19
 Removing instruction jmp b20
-Removing instruction jmp b21
 Removing instruction jmp b2
+Removing instruction jmp b21
 Removing instruction jmp b22
 Removing instruction jmp b23
 Removing instruction jmp b24
 Removing instruction jmp b25
 Removing instruction jmp b26
-Removing instruction jmp b27
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -4112,8 +4129,8 @@ Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
+Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -4137,7 +4154,7 @@ Removing instruction lda #0
 Replacing instruction lda #0 with TXA
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b1_from_b21 with b1
+Replacing label b1_from_b20 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b2 with b1
@@ -4149,10 +4166,10 @@ Replacing label b2_from_b1 with b2
 Replacing label b3_from_b2 with b3
 Replacing label b3_from_b2 with b3
 Replacing label b1_from_b3 with b1
-Removing instruction b29_from_bbegin:
-Removing instruction b29:
-Removing instruction main_from_b29:
-Removing instruction bend_from_b29:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b3_from_main:
 Removing instruction lin16u_gen_from_b3:
 Removing instruction b4_from_b3:
@@ -4173,27 +4190,27 @@ Removing instruction b11_from_b10:
 Removing instruction print_word_from_b11:
 Removing instruction b12_from_b11:
 Removing instruction print_ln_from_b12:
-Removing instruction b1_from_b21:
-Removing instruction b14_from_b1:
-Removing instruction print_str_from_b14:
-Removing instruction b16_from_b15:
-Removing instruction print_str_from_b16:
-Removing instruction b18_from_b17:
-Removing instruction print_str_from_b18:
-Removing instruction b20_from_b19:
-Removing instruction print_ln_from_b20:
-Removing instruction b22_from_b2:
-Removing instruction print_word_from_b22:
+Removing instruction b1_from_b20:
+Removing instruction b13_from_b1:
+Removing instruction print_str_from_b13:
+Removing instruction b15_from_b14:
+Removing instruction print_str_from_b15:
+Removing instruction b17_from_b16:
+Removing instruction print_str_from_b17:
+Removing instruction b19_from_b18:
+Removing instruction print_ln_from_b19:
+Removing instruction b21_from_b2:
+Removing instruction print_word_from_b21:
+Removing instruction b22_from_b21:
+Removing instruction print_str_from_b22:
 Removing instruction b23_from_b22:
-Removing instruction print_str_from_b23:
+Removing instruction print_word_from_b23:
 Removing instruction b24_from_b23:
-Removing instruction print_word_from_b24:
+Removing instruction print_str_from_b24:
 Removing instruction b25_from_b24:
-Removing instruction print_str_from_b25:
+Removing instruction print_word_from_b25:
 Removing instruction b26_from_b25:
-Removing instruction print_word_from_b26:
-Removing instruction b27_from_b26:
-Removing instruction print_ln_from_b27:
+Removing instruction print_ln_from_b26:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction b1_from_print_str:
@@ -4221,25 +4238,25 @@ Removing instruction b11:
 Removing instruction b12:
 Removing instruction b1_from_b12:
 Removing instruction print_byte_from_b1:
+Removing instruction b13:
 Removing instruction b14:
+Removing instruction print_word_from_b14:
 Removing instruction b15:
-Removing instruction print_word_from_b15:
 Removing instruction b16:
+Removing instruction print_word_from_b16:
 Removing instruction b17:
-Removing instruction print_word_from_b17:
 Removing instruction b18:
+Removing instruction print_word_from_b18:
 Removing instruction b19:
-Removing instruction print_word_from_b19:
 Removing instruction b20:
-Removing instruction b21:
 Removing instruction b2:
 Removing instruction print_str_from_b2:
+Removing instruction b21:
 Removing instruction b22:
 Removing instruction b23:
 Removing instruction b24:
 Removing instruction b25:
 Removing instruction b26:
-Removing instruction b27:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction print_byte_from_print_word:
@@ -4255,10 +4272,10 @@ Removing instruction breturn:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
 Removing instruction divr16u_from_lin16u_gen:
+Removing instruction b2:
+Removing instruction divr16u_from_b2:
 Removing instruction b3:
-Removing instruction divr16u_from_b3:
-Removing instruction b4:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction breturn:
 Removing instruction b1_from_divr16u:
 Removing instruction b4:
@@ -4277,7 +4294,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @29
+(label) @1
 (label) @begin
 (label) @end
 (word()) divr16u((word) divr16u::dividend , (word) divr16u::divisor , (word) divr16u::rem)
@@ -4320,8 +4337,8 @@ FINAL SYMBOL TABLE
 (void()) lin16u_gen((word) lin16u_gen::min , (word) lin16u_gen::max , (word*) lin16u_gen::lintab , (word) lin16u_gen::length)
 (word~) lin16u_gen::$5 $5 zp ZP_WORD:5 22.0
 (label) lin16u_gen::@1
+(label) lin16u_gen::@2
 (label) lin16u_gen::@3
-(label) lin16u_gen::@4
 (label) lin16u_gen::@return
 (word) lin16u_gen::ampl
 (word) lin16u_gen::ampl#0 ampl zp ZP_WORD:3 4.0
@@ -4352,6 +4369,7 @@ FINAL SYMBOL TABLE
 (label) main::@10
 (label) main::@11
 (label) main::@12
+(label) main::@13
 (label) main::@14
 (label) main::@15
 (label) main::@16
@@ -4366,7 +4384,6 @@ FINAL SYMBOL TABLE
 (label) main::@24
 (label) main::@25
 (label) main::@26
-(label) main::@27
 (label) main::@3
 (label) main::@4
 (label) main::@5
@@ -4483,11 +4500,11 @@ Score: 13521
   .label print_char_cursor = 7
   .label print_line_cursor = 3
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @29 [phi:@begin->@29]
-//SEG5 @29
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @29 to main [phi:@29->main]
-//SEG8 [3] phi from @29 to @end [phi:@29->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -4634,8 +4651,8 @@ main: {
   //SEG73 [26] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@12->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG74 [26] phi from main::@21 to main::@1 [phi:main::@21->main::@1]
-  //SEG75 [26] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@21->main::@1#0] -- register_copy 
+  //SEG74 [26] phi from main::@20 to main::@1 [phi:main::@20->main::@1]
+  //SEG75 [26] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@20->main::@1#0] -- register_copy 
   //SEG76 main::@1
   b1:
   //SEG77 [27] (byte) print_byte::b#2 ← (byte) main::i#10 -- vbuxx=vbuz1 
@@ -4650,18 +4667,18 @@ main: {
   //SEG81 [72] phi (byte*) print_char_cursor#81 = (byte*~) print_char_cursor#91 [phi:main::@1->print_byte#0] -- register_copy 
   //SEG82 [72] phi (byte) print_byte::b#3 = (byte) print_byte::b#2 [phi:main::@1->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG83 [30] phi from main::@1 to main::@14 [phi:main::@1->main::@14]
-  //SEG84 main::@14
+  //SEG83 [30] phi from main::@1 to main::@13 [phi:main::@1->main::@13]
+  //SEG84 main::@13
   //SEG85 [31] call print_str 
-  //SEG86 [84] phi from main::@14 to print_str [phi:main::@14->print_str]
-  //SEG87 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@14->print_str#0] -- register_copy 
-  //SEG88 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@14->print_str#1] -- pbuz1=pbuc1 
+  //SEG86 [84] phi from main::@13 to print_str [phi:main::@13->print_str]
+  //SEG87 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@13->print_str#0] -- register_copy 
+  //SEG88 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@13->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG89 main::@15
+  //SEG89 main::@14
   //SEG90 [32] (word) print_word::w#3 ← *((const word[$14]) main::lintab1#0 + (byte) main::i#10) -- vwuz1=pwuc1_derefidx_vbuz2 
     ldy i
     lda lintab1,y
@@ -4669,21 +4686,21 @@ main: {
     lda lintab1+1,y
     sta print_word.w+1
   //SEG91 [33] call print_word 
-  //SEG92 [66] phi from main::@15 to print_word [phi:main::@15->print_word]
-  //SEG93 [66] phi (word) print_word::w#10 = (word) print_word::w#3 [phi:main::@15->print_word#0] -- register_copy 
+  //SEG92 [66] phi from main::@14 to print_word [phi:main::@14->print_word]
+  //SEG93 [66] phi (word) print_word::w#10 = (word) print_word::w#3 [phi:main::@14->print_word#0] -- register_copy 
     jsr print_word
-  //SEG94 [34] phi from main::@15 to main::@16 [phi:main::@15->main::@16]
-  //SEG95 main::@16
+  //SEG94 [34] phi from main::@14 to main::@15 [phi:main::@14->main::@15]
+  //SEG95 main::@15
   //SEG96 [35] call print_str 
-  //SEG97 [84] phi from main::@16 to print_str [phi:main::@16->print_str]
-  //SEG98 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@16->print_str#0] -- register_copy 
-  //SEG99 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@16->print_str#1] -- pbuz1=pbuc1 
+  //SEG97 [84] phi from main::@15 to print_str [phi:main::@15->print_str]
+  //SEG98 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@15->print_str#0] -- register_copy 
+  //SEG99 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@15->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG100 main::@17
+  //SEG100 main::@16
   //SEG101 [36] (word) print_word::w#4 ← *((const word[$14]) main::lintab2#0 + (byte) main::i#10) -- vwuz1=pwuc1_derefidx_vbuz2 
     ldy i
     lda lintab2,y
@@ -4691,21 +4708,21 @@ main: {
     lda lintab2+1,y
     sta print_word.w+1
   //SEG102 [37] call print_word 
-  //SEG103 [66] phi from main::@17 to print_word [phi:main::@17->print_word]
-  //SEG104 [66] phi (word) print_word::w#10 = (word) print_word::w#4 [phi:main::@17->print_word#0] -- register_copy 
+  //SEG103 [66] phi from main::@16 to print_word [phi:main::@16->print_word]
+  //SEG104 [66] phi (word) print_word::w#10 = (word) print_word::w#4 [phi:main::@16->print_word#0] -- register_copy 
     jsr print_word
-  //SEG105 [38] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
-  //SEG106 main::@18
+  //SEG105 [38] phi from main::@16 to main::@17 [phi:main::@16->main::@17]
+  //SEG106 main::@17
   //SEG107 [39] call print_str 
-  //SEG108 [84] phi from main::@18 to print_str [phi:main::@18->print_str]
-  //SEG109 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@18->print_str#0] -- register_copy 
-  //SEG110 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@18->print_str#1] -- pbuz1=pbuc1 
+  //SEG108 [84] phi from main::@17 to print_str [phi:main::@17->print_str]
+  //SEG109 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@17->print_str#0] -- register_copy 
+  //SEG110 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@17->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG111 main::@19
+  //SEG111 main::@18
   //SEG112 [40] (word) print_word::w#5 ← *((const word[$14]) main::lintab3#0 + (byte) main::i#10) -- vwuz1=pwuc1_derefidx_vbuz2 
     ldy i
     lda lintab3,y
@@ -4713,16 +4730,16 @@ main: {
     lda lintab3+1,y
     sta print_word.w+1
   //SEG113 [41] call print_word 
-  //SEG114 [66] phi from main::@19 to print_word [phi:main::@19->print_word]
-  //SEG115 [66] phi (word) print_word::w#10 = (word) print_word::w#5 [phi:main::@19->print_word#0] -- register_copy 
+  //SEG114 [66] phi from main::@18 to print_word [phi:main::@18->print_word]
+  //SEG115 [66] phi (word) print_word::w#10 = (word) print_word::w#5 [phi:main::@18->print_word#0] -- register_copy 
     jsr print_word
-  //SEG116 [42] phi from main::@19 to main::@20 [phi:main::@19->main::@20]
-  //SEG117 main::@20
+  //SEG116 [42] phi from main::@18 to main::@19 [phi:main::@18->main::@19]
+  //SEG117 main::@19
   //SEG118 [43] call print_ln 
-  //SEG119 [61] phi from main::@20 to print_ln [phi:main::@20->print_ln]
-  //SEG120 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@20->print_ln#0] -- register_copy 
+  //SEG119 [61] phi from main::@19 to print_ln [phi:main::@19->print_ln]
+  //SEG120 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@19->print_ln#0] -- register_copy 
     jsr print_ln
-  //SEG121 main::@21
+  //SEG121 main::@20
   //SEG122 [44] (byte) main::i#1 ← (byte) main::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
@@ -4746,63 +4763,63 @@ main: {
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG130 [48] phi from main::@2 to main::@22 [phi:main::@2->main::@22]
-  //SEG131 main::@22
+  //SEG130 [48] phi from main::@2 to main::@21 [phi:main::@2->main::@21]
+  //SEG131 main::@21
   //SEG132 [49] call print_word 
-  //SEG133 [66] phi from main::@22 to print_word [phi:main::@22->print_word]
-  //SEG134 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $7461 [phi:main::@22->print_word#0] -- vwuz1=vwuc1 
+  //SEG133 [66] phi from main::@21 to print_word [phi:main::@21->print_word]
+  //SEG134 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $7461 [phi:main::@21->print_word#0] -- vwuz1=vwuc1 
     lda #<$7461
     sta print_word.w
     lda #>$7461
     sta print_word.w+1
     jsr print_word
-  //SEG135 [50] phi from main::@22 to main::@23 [phi:main::@22->main::@23]
-  //SEG136 main::@23
+  //SEG135 [50] phi from main::@21 to main::@22 [phi:main::@21->main::@22]
+  //SEG136 main::@22
   //SEG137 [51] call print_str 
-  //SEG138 [84] phi from main::@23 to print_str [phi:main::@23->print_str]
-  //SEG139 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@23->print_str#0] -- register_copy 
-  //SEG140 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@23->print_str#1] -- pbuz1=pbuc1 
+  //SEG138 [84] phi from main::@22 to print_str [phi:main::@22->print_str]
+  //SEG139 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@22->print_str#0] -- register_copy 
+  //SEG140 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@22->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG141 [52] phi from main::@23 to main::@24 [phi:main::@23->main::@24]
-  //SEG142 main::@24
+  //SEG141 [52] phi from main::@22 to main::@23 [phi:main::@22->main::@23]
+  //SEG142 main::@23
   //SEG143 [53] call print_word 
-  //SEG144 [66] phi from main::@24 to print_word [phi:main::@24->print_word]
-  //SEG145 [66] phi (word) print_word::w#10 = (word/dword/signed dword) $f781 [phi:main::@24->print_word#0] -- vwuz1=vwuc1 
+  //SEG144 [66] phi from main::@23 to print_word [phi:main::@23->print_word]
+  //SEG145 [66] phi (word) print_word::w#10 = (word/dword/signed dword) $f781 [phi:main::@23->print_word#0] -- vwuz1=vwuc1 
     lda #<$f781
     sta print_word.w
     lda #>$f781
     sta print_word.w+1
     jsr print_word
-  //SEG146 [54] phi from main::@24 to main::@25 [phi:main::@24->main::@25]
-  //SEG147 main::@25
+  //SEG146 [54] phi from main::@23 to main::@24 [phi:main::@23->main::@24]
+  //SEG147 main::@24
   //SEG148 [55] call print_str 
-  //SEG149 [84] phi from main::@25 to print_str [phi:main::@25->print_str]
-  //SEG150 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@25->print_str#0] -- register_copy 
-  //SEG151 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@25->print_str#1] -- pbuz1=pbuc1 
+  //SEG149 [84] phi from main::@24 to print_str [phi:main::@24->print_str]
+  //SEG150 [84] phi (byte*) print_char_cursor#86 = (byte*) print_char_cursor#11 [phi:main::@24->print_str#0] -- register_copy 
+  //SEG151 [84] phi (byte*) print_str::str#12 = (const string) main::str1 [phi:main::@24->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG152 [56] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
-  //SEG153 main::@26
+  //SEG152 [56] phi from main::@24 to main::@25 [phi:main::@24->main::@25]
+  //SEG153 main::@25
   //SEG154 [57] call print_word 
-  //SEG155 [66] phi from main::@26 to print_word [phi:main::@26->print_word]
-  //SEG156 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $6488 [phi:main::@26->print_word#0] -- vwuz1=vwuc1 
+  //SEG155 [66] phi from main::@25 to print_word [phi:main::@25->print_word]
+  //SEG156 [66] phi (word) print_word::w#10 = (word/signed word/dword/signed dword) $6488 [phi:main::@25->print_word#0] -- vwuz1=vwuc1 
     lda #<$6488
     sta print_word.w
     lda #>$6488
     sta print_word.w+1
     jsr print_word
-  //SEG157 [58] phi from main::@26 to main::@27 [phi:main::@26->main::@27]
-  //SEG158 main::@27
+  //SEG157 [58] phi from main::@25 to main::@26 [phi:main::@25->main::@26]
+  //SEG158 main::@26
   //SEG159 [59] call print_ln 
-  //SEG160 [61] phi from main::@27 to print_ln [phi:main::@27->print_ln]
-  //SEG161 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@27->print_ln#0] -- register_copy 
+  //SEG160 [61] phi from main::@26 to print_ln [phi:main::@26->print_ln]
+  //SEG161 [61] phi (byte*) print_line_cursor#21 = (byte*) print_line_cursor#1 [phi:main::@26->print_ln#0] -- register_copy 
     jsr print_ln
   //SEG162 main::@return
   //SEG163 [60] return 
@@ -5024,7 +5041,7 @@ lin16u_gen: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG238 [101] (word) divr16u::return#2 ← (word) divr16u::return#0
-  //SEG239 lin16u_gen::@3
+  //SEG239 lin16u_gen::@2
   //SEG240 [102] (word) lin16u_gen::stepi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return
     sta stepi
@@ -5032,19 +5049,19 @@ lin16u_gen: {
     sta stepi+1
   //SEG241 [103] (word) divr16u::rem#4 ← (word) rem16u#1
   //SEG242 [104] call divr16u 
-  //SEG243 [117] phi from lin16u_gen::@3 to divr16u [phi:lin16u_gen::@3->divr16u]
-  //SEG244 [117] phi (word) divr16u::divisor#6 = (byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:lin16u_gen::@3->divr16u#0] -- vwuz1=vbuc1 
+  //SEG243 [117] phi from lin16u_gen::@2 to divr16u [phi:lin16u_gen::@2->divr16u]
+  //SEG244 [117] phi (word) divr16u::divisor#6 = (byte/signed byte/word/signed word/dword/signed dword) $14-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:lin16u_gen::@2->divr16u#0] -- vwuz1=vbuc1 
     lda #$14-1
     sta divr16u.divisor
     lda #0
     sta divr16u.divisor+1
-  //SEG245 [117] phi (word) divr16u::dividend#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@3->divr16u#1] -- vwuz1=vbuc1 
+  //SEG245 [117] phi (word) divr16u::dividend#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@2->divr16u#1] -- vwuz1=vbuc1 
     sta divr16u.dividend
     sta divr16u.dividend+1
-  //SEG246 [117] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:lin16u_gen::@3->divr16u#2] -- register_copy 
+  //SEG246 [117] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:lin16u_gen::@2->divr16u#2] -- register_copy 
     jsr divr16u
   //SEG247 [105] (word) divr16u::return#3 ← (word) divr16u::return#0
-  //SEG248 lin16u_gen::@4
+  //SEG248 lin16u_gen::@3
   //SEG249 [106] (word) lin16u_gen::stepf#0 ← (word) divr16u::return#3
   //SEG250 [107] (dword) lin16u_gen::step#0 ← (word) lin16u_gen::stepi#0 dw= (word) lin16u_gen::stepf#0 -- vduz1=vwuz2_dword_vwuz3 
     lda stepi
@@ -5063,13 +5080,13 @@ lin16u_gen: {
     sta val+2
     lda min+1
     sta val+3
-  //SEG252 [109] phi from lin16u_gen::@4 to lin16u_gen::@1 [phi:lin16u_gen::@4->lin16u_gen::@1]
-  //SEG253 [109] phi (word) lin16u_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@4->lin16u_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG252 [109] phi from lin16u_gen::@3 to lin16u_gen::@1 [phi:lin16u_gen::@3->lin16u_gen::@1]
+  //SEG253 [109] phi (word) lin16u_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:lin16u_gen::@3->lin16u_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG254 [109] phi (word*) lin16u_gen::lintab#4 = (word*) lin16u_gen::lintab#5 [phi:lin16u_gen::@4->lin16u_gen::@1#1] -- register_copy 
-  //SEG255 [109] phi (dword) lin16u_gen::val#2 = (dword) lin16u_gen::val#0 [phi:lin16u_gen::@4->lin16u_gen::@1#2] -- register_copy 
+  //SEG254 [109] phi (word*) lin16u_gen::lintab#4 = (word*) lin16u_gen::lintab#5 [phi:lin16u_gen::@3->lin16u_gen::@1#1] -- register_copy 
+  //SEG255 [109] phi (dword) lin16u_gen::val#2 = (dword) lin16u_gen::val#0 [phi:lin16u_gen::@3->lin16u_gen::@1#2] -- register_copy 
   //SEG256 [109] phi from lin16u_gen::@1 to lin16u_gen::@1 [phi:lin16u_gen::@1->lin16u_gen::@1]
   //SEG257 [109] phi (word) lin16u_gen::i#2 = (word) lin16u_gen::i#1 [phi:lin16u_gen::@1->lin16u_gen::@1#0] -- register_copy 
   //SEG258 [109] phi (word*) lin16u_gen::lintab#4 = (word*) lin16u_gen::lintab#3 [phi:lin16u_gen::@1->lin16u_gen::@1#1] -- register_copy 
diff --git a/src/test/ref/linegen.sym b/src/test/ref/linegen.sym
index 4dfd1b07e..f6491b8af 100644
--- a/src/test/ref/linegen.sym
+++ b/src/test/ref/linegen.sym
@@ -1,4 +1,4 @@
-(label) @29
+(label) @1
 (label) @begin
 (label) @end
 (word()) divr16u((word) divr16u::dividend , (word) divr16u::divisor , (word) divr16u::rem)
@@ -41,8 +41,8 @@
 (void()) lin16u_gen((word) lin16u_gen::min , (word) lin16u_gen::max , (word*) lin16u_gen::lintab , (word) lin16u_gen::length)
 (word~) lin16u_gen::$5 $5 zp ZP_WORD:5 22.0
 (label) lin16u_gen::@1
+(label) lin16u_gen::@2
 (label) lin16u_gen::@3
-(label) lin16u_gen::@4
 (label) lin16u_gen::@return
 (word) lin16u_gen::ampl
 (word) lin16u_gen::ampl#0 ampl zp ZP_WORD:3 4.0
@@ -73,6 +73,7 @@
 (label) main::@10
 (label) main::@11
 (label) main::@12
+(label) main::@13
 (label) main::@14
 (label) main::@15
 (label) main::@16
@@ -87,7 +88,6 @@
 (label) main::@24
 (label) main::@25
 (label) main::@26
-(label) main::@27
 (label) main::@3
 (label) main::@4
 (label) main::@5
diff --git a/src/test/ref/liverange-call-problem.cfg b/src/test/ref/liverange-call-problem.cfg
index 9e17905b4..ede40b3f1 100644
--- a/src/test/ref/liverange-call-problem.cfg
+++ b/src/test/ref/liverange-call-problem.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   [5] call incw1 
   to:main::@1
diff --git a/src/test/ref/liverange-call-problem.log b/src/test/ref/liverange-call-problem.log
index 86fb3135e..f0a6d4efe 100644
--- a/src/test/ref/liverange-call-problem.log
+++ b/src/test/ref/liverange-call-problem.log
@@ -167,8 +167,9 @@ Created 2 initial phi equivalence classes
 Coalesced [8] w1#17 ← w1#11
 Coalesced [10] w2#17 ← w2#11
 Coalesced down to 2 phi equivalence classes
+Renumbering block @3 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -178,14 +179,14 @@ Adding NOP phi() at start of main::@3
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   [5] call incw1 
   to:main::@1
@@ -253,17 +254,17 @@ INITIAL ASM
   .label w2 = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -373,17 +374,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label w2 = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -466,7 +467,7 @@ incw1: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -478,10 +479,10 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction incw2_from_b1:
 Removing instruction b2_from_b1:
@@ -505,7 +506,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (void()) incw1()
@@ -542,11 +543,11 @@ Score: 82
   .label w1 = 4
   .label w2 = 2
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/liverange-call-problem.sym b/src/test/ref/liverange-call-problem.sym
index 0348e9c0e..9d093b16f 100644
--- a/src/test/ref/liverange-call-problem.sym
+++ b/src/test/ref/liverange-call-problem.sym
@@ -1,4 +1,4 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (void()) incw1()
diff --git a/src/test/ref/liverange.cfg b/src/test/ref/liverange.cfg
index 2cd92eec8..4cfb02251 100644
--- a/src/test/ref/liverange.cfg
+++ b/src/test/ref/liverange.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call inci 
   [6] (byte) inci::return#0 ← (byte) inci::return#2
diff --git a/src/test/ref/liverange.log b/src/test/ref/liverange.log
index 5dede1495..09fe55be1 100644
--- a/src/test/ref/liverange.log
+++ b/src/test/ref/liverange.log
@@ -154,22 +154,23 @@ Calls in [main] to inci:5 inci:10
 Created 1 initial phi equivalence classes
 Coalesced [9] i#15 ← i#11
 Coalesced down to 1 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call inci 
   [6] (byte) inci::return#0 ← (byte) inci::return#2
@@ -253,17 +254,17 @@ INITIAL ASM
   .label i = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -382,17 +383,17 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -456,17 +457,17 @@ inci: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction inci_from_main:
@@ -483,7 +484,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte) i
@@ -527,11 +528,11 @@ Score: 58
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/liverange.sym b/src/test/ref/liverange.sym
index bcf676fe1..5b44ddc6f 100644
--- a/src/test/ref/liverange.sym
+++ b/src/test/ref/liverange.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte) i
diff --git a/src/test/ref/localscope-loops.asm b/src/test/ref/localscope-loops.asm
index 486c750a9..bd6ce590f 100644
--- a/src/test/ref/localscope-loops.asm
+++ b/src/test/ref/localscope-loops.asm
@@ -2,107 +2,21 @@
 .pc = $801 "Basic"
 :BasicUpstart(main)
 .pc = $80d "Program"
-  .label print_char_cursor = 2
-  .label print_line_cursor = 4
-  .label print_line_cursor_12 = 6
+  .label SCREEN = $400
 main: {
     ldx #0
-    lda #<$400
-    sta print_char_cursor
-    lda #>$400
-    sta print_char_cursor+1
-    lda #<$400
-    sta print_line_cursor
-    lda #>$400
-    sta print_line_cursor+1
   b1:
-    jsr print_ln
+    lda #'a'
+    sta SCREEN,x
     inx
     cpx #6
-    bne b7
+    bne b1
     ldx #0
-  b3:
-    jsr print_str_ln
+  b2:
+    lda #'b'
+    sta SCREEN+$28,x
     inx
     cpx #6
-    bne b3
-    rts
-  b7:
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-    lda print_line_cursor_12
-    sta print_char_cursor
-    lda print_line_cursor_12+1
-    sta print_char_cursor+1
-    jmp b1
-    str: .text " xxxxx@"
-}
-// Print a zero-terminated string followed by a newline
-print_str_ln: {
-    jsr print_str
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-    jsr print_ln
-    rts
-}
-// Print a newline
-print_ln: {
-  b1:
-    lda #$28
-    clc
-    adc print_line_cursor
-    sta print_line_cursor_12
-    lda #0
-    adc print_line_cursor+1
-    sta print_line_cursor_12+1
-    cmp print_char_cursor+1
-    bcc b3
-    bne !+
-    lda print_line_cursor_12
-    cmp print_char_cursor
-    bcc b3
-  !:
-    rts
-  b3:
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-    jmp b1
-}
-// Print a zero-terminated string
-// print_str(byte* zeropage(4) str)
-print_str: {
-    .label str = 4
-    lda print_line_cursor_12
-    sta print_char_cursor
-    lda print_line_cursor_12+1
-    sta print_char_cursor+1
-    lda #<main.str
-    sta str
-    lda #>main.str
-    sta str+1
-  b1:
-    ldy #0
-    lda (str),y
-    cmp #'@'
     bne b2
     rts
-  b2:
-    ldy #0
-    lda (str),y
-    sta (print_char_cursor),y
-    inc print_char_cursor
-    bne !+
-    inc print_char_cursor+1
-  !:
-    inc str
-    bne !+
-    inc str+1
-  !:
-    jmp b1
 }
diff --git a/src/test/ref/localscope-loops.cfg b/src/test/ref/localscope-loops.cfg
index bebb57902..094365382 100644
--- a/src/test/ref/localscope-loops.cfg
+++ b/src/test/ref/localscope-loops.cfg
@@ -1,79 +1,27 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@7
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
-  [5] (byte*) print_char_cursor#26 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@7/(byte*~) print_char_cursor#33 )
-  [5] (byte*) print_line_cursor#20 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@7/(byte*~) print_line_cursor#27 )
-  [6] call print_ln 
-  to:main::@5
-main::@5: scope:[main]  from main::@1
+main::@1: scope:[main]  from main main::@1
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@1/(byte) main::i#1 )
+  [6] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte) 'a'
   [7] (byte) main::i#1 ← ++ (byte) main::i#2
-  [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@7
-  to:main::@3
-main::@3: scope:[main]  from main::@5 main::@6
-  [9] (byte) main::i1#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::i1#1 )
-  [10] call print_str_ln 
-  to:main::@6
-main::@6: scope:[main]  from main::@3
+  [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [9] (byte) main::i1#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i1#1 )
+  [10] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::i1#2) ← (byte) 'b'
   [11] (byte) main::i1#1 ← ++ (byte) main::i1#2
-  [12] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@3
+  [12] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@6
+main::@return: scope:[main]  from main::@2
   [13] return 
   to:@return
-main::@7: scope:[main]  from main::@5
-  [14] (byte*~) print_line_cursor#27 ← (byte*) print_line_cursor#12
-  [15] (byte*~) print_char_cursor#33 ← (byte*) print_line_cursor#12
-  to:main::@1
-print_str_ln: scope:[print_str_ln]  from main::@3
-  [16] phi()
-  [17] call print_str 
-  to:print_str_ln::@1
-print_str_ln::@1: scope:[print_str_ln]  from print_str_ln
-  [18] (byte*~) print_line_cursor#29 ← (byte*) print_line_cursor#12
-  [19] call print_ln 
-  to:print_str_ln::@return
-print_str_ln::@return: scope:[print_str_ln]  from print_str_ln::@1
-  [20] return 
-  to:@return
-print_ln: scope:[print_ln]  from main::@1 print_str_ln::@1
-  [21] (byte*) print_char_cursor#25 ← phi( main::@1/(byte*) print_char_cursor#26 print_str_ln::@1/(byte*) print_char_cursor#15 )
-  [21] (byte*) print_line_cursor#19 ← phi( main::@1/(byte*) print_line_cursor#20 print_str_ln::@1/(byte*~) print_line_cursor#29 )
-  to:print_ln::@1
-print_ln::@1: scope:[print_ln]  from print_ln print_ln::@3
-  [22] (byte*) print_line_cursor#11 ← phi( print_ln/(byte*) print_line_cursor#19 print_ln::@3/(byte*~) print_line_cursor#31 )
-  [23] (byte*) print_line_cursor#12 ← (byte*) print_line_cursor#11 + (byte/signed byte/word/signed word/dword/signed dword) $28
-  [24] if((byte*) print_line_cursor#12<(byte*) print_char_cursor#25) goto print_ln::@3
-  to:print_ln::@return
-print_ln::@return: scope:[print_ln]  from print_ln::@1
-  [25] return 
-  to:@return
-print_ln::@3: scope:[print_ln]  from print_ln::@1
-  [26] (byte*~) print_line_cursor#31 ← (byte*) print_line_cursor#12
-  to:print_ln::@1
-print_str: scope:[print_str]  from print_str_ln
-  [27] (byte*~) print_char_cursor#36 ← (byte*) print_line_cursor#12
-  to:print_str::@1
-print_str::@1: scope:[print_str]  from print_str print_str::@2
-  [28] (byte*) print_char_cursor#15 ← phi( print_str/(byte*~) print_char_cursor#36 print_str::@2/(byte*) print_char_cursor#4 )
-  [28] (byte*) print_str::str#2 ← phi( print_str/(const string) main::str print_str::@2/(byte*) print_str::str#1 )
-  [29] if(*((byte*) print_str::str#2)!=(byte) '@') goto print_str::@2
-  to:print_str::@return
-print_str::@return: scope:[print_str]  from print_str::@1
-  [30] return 
-  to:@return
-print_str::@2: scope:[print_str]  from print_str::@1
-  [31] *((byte*) print_char_cursor#15) ← *((byte*) print_str::str#2)
-  [32] (byte*) print_char_cursor#4 ← ++ (byte*) print_char_cursor#15
-  [33] (byte*) print_str::str#1 ← ++ (byte*) print_str::str#2
-  to:print_str::@1
diff --git a/src/test/ref/localscope-loops.log b/src/test/ref/localscope-loops.log
index c90d80cb1..26e55f4a4 100644
--- a/src/test/ref/localscope-loops.log
+++ b/src/test/ref/localscope-loops.log
@@ -1,512 +1,157 @@
 
 CONTROL FLOW GRAPH SSA
 @begin: scope:[]  from
-  (byte*) print_screen#0 ← ((byte*)) (word/signed word/dword/signed dword) $400
-  (byte*) print_line_cursor#0 ← (byte*) print_screen#0
-  (byte*) print_char_cursor#0 ← (byte*) print_line_cursor#0
-  to:@12
-print_str_ln: scope:[print_str_ln]  from main::@3
-  (byte*) print_line_cursor#23 ← phi( main::@3/(byte*) print_line_cursor#21 )
-  (byte*) print_char_cursor#23 ← phi( main::@3/(byte*) print_char_cursor#27 )
-  (byte*) print_str_ln::str#1 ← phi( main::@3/(byte*) print_str_ln::str#0 )
-  (byte*) print_str::str#0 ← (byte*) print_str_ln::str#1
-  call print_str 
-  to:print_str_ln::@1
-print_str_ln::@1: scope:[print_str_ln]  from print_str_ln
-  (byte*) print_line_cursor#18 ← phi( print_str_ln/(byte*) print_line_cursor#23 )
-  (byte*) print_char_cursor#12 ← phi( print_str_ln/(byte*) print_char_cursor#5 )
-  (byte*) print_char_cursor#1 ← (byte*) print_char_cursor#12
-  call print_ln 
-  to:print_str_ln::@2
-print_str_ln::@2: scope:[print_str_ln]  from print_str_ln::@1
-  (byte*) print_char_cursor#13 ← phi( print_str_ln::@1/(byte*) print_char_cursor#7 )
-  (byte*) print_line_cursor#9 ← phi( print_str_ln::@1/(byte*) print_line_cursor#4 )
-  (byte*) print_line_cursor#1 ← (byte*) print_line_cursor#9
-  (byte*) print_char_cursor#2 ← (byte*) print_char_cursor#13
-  to:print_str_ln::@return
-print_str_ln::@return: scope:[print_str_ln]  from print_str_ln::@2
-  (byte*) print_line_cursor#10 ← phi( print_str_ln::@2/(byte*) print_line_cursor#1 )
-  (byte*) print_char_cursor#14 ← phi( print_str_ln::@2/(byte*) print_char_cursor#2 )
-  (byte*) print_char_cursor#3 ← (byte*) print_char_cursor#14
-  (byte*) print_line_cursor#2 ← (byte*) print_line_cursor#10
-  return 
-  to:@return
-print_str: scope:[print_str]  from print_str_ln
-  (byte*) print_char_cursor#29 ← phi( print_str_ln/(byte*) print_char_cursor#23 )
-  (byte*) print_str::str#4 ← phi( print_str_ln/(byte*) print_str::str#0 )
-  to:print_str::@1
-print_str::@1: scope:[print_str]  from print_str print_str::@2
-  (byte*) print_char_cursor#24 ← phi( print_str/(byte*) print_char_cursor#29 print_str::@2/(byte*) print_char_cursor#4 )
-  (byte*) print_str::str#2 ← phi( print_str/(byte*) print_str::str#4 print_str::@2/(byte*) print_str::str#1 )
-  (bool~) print_str::$0 ← *((byte*) print_str::str#2) != (byte) '@'
-  if((bool~) print_str::$0) goto print_str::@2
-  to:print_str::@return
-print_str::@2: scope:[print_str]  from print_str::@1
-  (byte*) print_char_cursor#15 ← phi( print_str::@1/(byte*) print_char_cursor#24 )
-  (byte*) print_str::str#3 ← phi( print_str::@1/(byte*) print_str::str#2 )
-  *((byte*) print_char_cursor#15) ← *((byte*) print_str::str#3)
-  (byte*) print_char_cursor#4 ← ++ (byte*) print_char_cursor#15
-  (byte*) print_str::str#1 ← ++ (byte*) print_str::str#3
-  to:print_str::@1
-print_str::@return: scope:[print_str]  from print_str::@1
-  (byte*) print_char_cursor#16 ← phi( print_str::@1/(byte*) print_char_cursor#24 )
-  (byte*) print_char_cursor#5 ← (byte*) print_char_cursor#16
-  return 
-  to:@return
-print_ln: scope:[print_ln]  from main::@1 print_str_ln::@1
-  (byte*) print_char_cursor#25 ← phi( main::@1/(byte*) print_char_cursor#26 print_str_ln::@1/(byte*) print_char_cursor#1 )
-  (byte*) print_line_cursor#19 ← phi( main::@1/(byte*) print_line_cursor#20 print_str_ln::@1/(byte*) print_line_cursor#18 )
-  to:print_ln::@1
-print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
-  (byte*) print_char_cursor#17 ← phi( print_ln/(byte*) print_char_cursor#25 print_ln::@1/(byte*) print_char_cursor#17 )
-  (byte*) print_line_cursor#11 ← phi( print_ln/(byte*) print_line_cursor#19 print_ln::@1/(byte*) print_line_cursor#3 )
-  (byte*~) print_ln::$0 ← (byte*) print_line_cursor#11 + (byte/signed byte/word/signed word/dword/signed dword) $28
-  (byte*) print_line_cursor#3 ← (byte*~) print_ln::$0
-  (bool~) print_ln::$1 ← (byte*) print_line_cursor#3 < (byte*) print_char_cursor#17
-  if((bool~) print_ln::$1) goto print_ln::@1
-  to:print_ln::@2
-print_ln::@2: scope:[print_ln]  from print_ln::@1
-  (byte*) print_line_cursor#12 ← phi( print_ln::@1/(byte*) print_line_cursor#3 )
-  (byte*) print_char_cursor#6 ← (byte*) print_line_cursor#12
-  to:print_ln::@return
-print_ln::@return: scope:[print_ln]  from print_ln::@2
-  (byte*) print_char_cursor#18 ← phi( print_ln::@2/(byte*) print_char_cursor#6 )
-  (byte*) print_line_cursor#13 ← phi( print_ln::@2/(byte*) print_line_cursor#12 )
-  (byte*) print_line_cursor#4 ← (byte*) print_line_cursor#13
-  (byte*) print_char_cursor#7 ← (byte*) print_char_cursor#18
-  return 
-  to:@return
-@12: scope:[]  from @begin
-  (byte*) print_char_cursor#32 ← phi( @begin/(byte*) print_char_cursor#0 )
-  (byte*) print_line_cursor#26 ← phi( @begin/(byte*) print_line_cursor#0 )
-  (byte[]) print_hextab#0 ← (const string) $0
-  to:@20
-main: scope:[main]  from @20
-  (byte*) print_char_cursor#30 ← phi( @20/(byte*) print_char_cursor#28 )
-  (byte*) print_line_cursor#24 ← phi( @20/(byte*) print_line_cursor#22 )
+  (byte*) SCREEN#0 ← ((byte*)) (word/signed word/dword/signed dword) $400
+  to:@1
+main: scope:[main]  from @1
   (byte) main::i#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@1
-main::@1: scope:[main]  from main main::@5
-  (byte) main::i#3 ← phi( main/(byte) main::i#0 main::@5/(byte) main::i#1 )
-  (byte*) print_char_cursor#26 ← phi( main/(byte*) print_char_cursor#30 main::@5/(byte*) print_char_cursor#8 )
-  (byte*) print_line_cursor#20 ← phi( main/(byte*) print_line_cursor#24 main::@5/(byte*) print_line_cursor#5 )
-  call print_ln 
-  to:main::@5
-main::@5: scope:[main]  from main::@1
-  (byte) main::i#2 ← phi( main::@1/(byte) main::i#3 )
-  (byte*) print_char_cursor#19 ← phi( main::@1/(byte*) print_char_cursor#7 )
-  (byte*) print_line_cursor#14 ← phi( main::@1/(byte*) print_line_cursor#4 )
-  (byte*) print_line_cursor#5 ← (byte*) print_line_cursor#14
-  (byte*) print_char_cursor#8 ← (byte*) print_char_cursor#19
+main::@1: scope:[main]  from main main::@1
+  (byte) main::i#2 ← phi( main/(byte) main::i#0 main::@1/(byte) main::i#1 )
+  *((byte*) SCREEN#0 + (byte) main::i#2) ← (byte) 'a'
   (byte) main::i#1 ← (byte) main::i#2 + rangenext(0,5)
-  (bool~) main::$1 ← (byte) main::i#1 != rangelast(0,5)
-  if((bool~) main::$1) goto main::@1
+  (bool~) main::$0 ← (byte) main::i#1 != rangelast(0,5)
+  if((bool~) main::$0) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main::@5
-  (byte*) print_line_cursor#25 ← phi( main::@5/(byte*) print_line_cursor#5 )
-  (byte*) print_char_cursor#31 ← phi( main::@5/(byte*) print_char_cursor#8 )
+main::@2: scope:[main]  from main::@1
   (byte) main::i1#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@3
-main::@3: scope:[main]  from main::@2 main::@6
-  (byte) main::i1#3 ← phi( main::@2/(byte) main::i1#0 main::@6/(byte) main::i1#1 )
-  (byte*) print_line_cursor#21 ← phi( main::@2/(byte*) print_line_cursor#25 main::@6/(byte*) print_line_cursor#6 )
-  (byte*) print_char_cursor#27 ← phi( main::@2/(byte*) print_char_cursor#31 main::@6/(byte*) print_char_cursor#9 )
-  (byte*) print_str_ln::str#0 ← (const string) main::str
-  call print_str_ln 
-  to:main::@6
-main::@6: scope:[main]  from main::@3
-  (byte) main::i1#2 ← phi( main::@3/(byte) main::i1#3 )
-  (byte*) print_line_cursor#15 ← phi( main::@3/(byte*) print_line_cursor#2 )
-  (byte*) print_char_cursor#20 ← phi( main::@3/(byte*) print_char_cursor#3 )
-  (byte*) print_char_cursor#9 ← (byte*) print_char_cursor#20
-  (byte*) print_line_cursor#6 ← (byte*) print_line_cursor#15
+main::@3: scope:[main]  from main::@2 main::@3
+  (byte) main::i1#2 ← phi( main::@2/(byte) main::i1#0 main::@3/(byte) main::i1#1 )
+  (byte/signed word/word/dword/signed dword~) main::$1 ← (byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::i1#2
+  *((byte*) SCREEN#0 + (byte/signed word/word/dword/signed dword~) main::$1) ← (byte) 'b'
   (byte) main::i1#1 ← (byte) main::i1#2 + rangenext(0,5)
-  (bool~) main::$3 ← (byte) main::i1#1 != rangelast(0,5)
-  if((bool~) main::$3) goto main::@3
+  (bool~) main::$2 ← (byte) main::i1#1 != rangelast(0,5)
+  if((bool~) main::$2) goto main::@3
   to:main::@return
-main::@return: scope:[main]  from main::@6
-  (byte*) print_char_cursor#21 ← phi( main::@6/(byte*) print_char_cursor#9 )
-  (byte*) print_line_cursor#16 ← phi( main::@6/(byte*) print_line_cursor#6 )
-  (byte*) print_line_cursor#7 ← (byte*) print_line_cursor#16
-  (byte*) print_char_cursor#10 ← (byte*) print_char_cursor#21
+main::@return: scope:[main]  from main::@3
   return 
   to:@return
-@20: scope:[]  from @12
-  (byte*) print_char_cursor#28 ← phi( @12/(byte*) print_char_cursor#32 )
-  (byte*) print_line_cursor#22 ← phi( @12/(byte*) print_line_cursor#26 )
+@1: scope:[]  from @begin
   call main 
-  to:@21
-@21: scope:[]  from @20
-  (byte*) print_char_cursor#22 ← phi( @20/(byte*) print_char_cursor#10 )
-  (byte*) print_line_cursor#17 ← phi( @20/(byte*) print_line_cursor#7 )
-  (byte*) print_line_cursor#8 ← (byte*) print_line_cursor#17
-  (byte*) print_char_cursor#11 ← (byte*) print_char_cursor#22
+  to:@2
+@2: scope:[]  from @1
   to:@end
-@end: scope:[]  from @21
+@end: scope:[]  from @2
 
 SYMBOL TABLE SSA
-(const string) $0 = (string) "0123456789abcdef"
-(label) @12
-(label) @20
-(label) @21
+(label) @1
+(label) @2
 (label) @begin
 (label) @end
+(byte*) SCREEN
+(byte*) SCREEN#0
 (void()) main()
-(bool~) main::$1
-(bool~) main::$3
+(bool~) main::$0
+(byte/signed word/word/dword/signed dword~) main::$1
+(bool~) main::$2
 (label) main::@1
 (label) main::@2
 (label) main::@3
-(label) main::@5
-(label) main::@6
 (label) main::@return
 (byte) main::i
 (byte) main::i#0
 (byte) main::i#1
 (byte) main::i#2
-(byte) main::i#3
 (byte) main::i1
 (byte) main::i1#0
 (byte) main::i1#1
 (byte) main::i1#2
-(byte) main::i1#3
-(const string) main::str = (string) " xxxxx@"
-(byte*) print_char_cursor
-(byte*) print_char_cursor#0
-(byte*) print_char_cursor#1
-(byte*) print_char_cursor#10
-(byte*) print_char_cursor#11
-(byte*) print_char_cursor#12
-(byte*) print_char_cursor#13
-(byte*) print_char_cursor#14
-(byte*) print_char_cursor#15
-(byte*) print_char_cursor#16
-(byte*) print_char_cursor#17
-(byte*) print_char_cursor#18
-(byte*) print_char_cursor#19
-(byte*) print_char_cursor#2
-(byte*) print_char_cursor#20
-(byte*) print_char_cursor#21
-(byte*) print_char_cursor#22
-(byte*) print_char_cursor#23
-(byte*) print_char_cursor#24
-(byte*) print_char_cursor#25
-(byte*) print_char_cursor#26
-(byte*) print_char_cursor#27
-(byte*) print_char_cursor#28
-(byte*) print_char_cursor#29
-(byte*) print_char_cursor#3
-(byte*) print_char_cursor#30
-(byte*) print_char_cursor#31
-(byte*) print_char_cursor#32
-(byte*) print_char_cursor#4
-(byte*) print_char_cursor#5
-(byte*) print_char_cursor#6
-(byte*) print_char_cursor#7
-(byte*) print_char_cursor#8
-(byte*) print_char_cursor#9
-(byte[]) print_hextab
-(byte[]) print_hextab#0
-(byte*) print_line_cursor
-(byte*) print_line_cursor#0
-(byte*) print_line_cursor#1
-(byte*) print_line_cursor#10
-(byte*) print_line_cursor#11
-(byte*) print_line_cursor#12
-(byte*) print_line_cursor#13
-(byte*) print_line_cursor#14
-(byte*) print_line_cursor#15
-(byte*) print_line_cursor#16
-(byte*) print_line_cursor#17
-(byte*) print_line_cursor#18
-(byte*) print_line_cursor#19
-(byte*) print_line_cursor#2
-(byte*) print_line_cursor#20
-(byte*) print_line_cursor#21
-(byte*) print_line_cursor#22
-(byte*) print_line_cursor#23
-(byte*) print_line_cursor#24
-(byte*) print_line_cursor#25
-(byte*) print_line_cursor#26
-(byte*) print_line_cursor#3
-(byte*) print_line_cursor#4
-(byte*) print_line_cursor#5
-(byte*) print_line_cursor#6
-(byte*) print_line_cursor#7
-(byte*) print_line_cursor#8
-(byte*) print_line_cursor#9
-(void()) print_ln()
-(byte*~) print_ln::$0
-(bool~) print_ln::$1
-(label) print_ln::@1
-(label) print_ln::@2
-(label) print_ln::@return
-(byte*) print_screen
-(byte*) print_screen#0
-(void()) print_str((byte*) print_str::str)
-(bool~) print_str::$0
-(label) print_str::@1
-(label) print_str::@2
-(label) print_str::@return
-(byte*) print_str::str
-(byte*) print_str::str#0
-(byte*) print_str::str#1
-(byte*) print_str::str#2
-(byte*) print_str::str#3
-(byte*) print_str::str#4
-(void()) print_str_ln((byte*) print_str_ln::str)
-(label) print_str_ln::@1
-(label) print_str_ln::@2
-(label) print_str_ln::@return
-(byte*) print_str_ln::str
-(byte*) print_str_ln::str#0
-(byte*) print_str_ln::str#1
 
-Alias (byte*) print_line_cursor#0 = (byte*) print_screen#0 (byte*) print_char_cursor#0 (byte*) print_line_cursor#26 (byte*) print_char_cursor#32 (byte*) print_line_cursor#22 (byte*) print_char_cursor#28 
-Alias (byte*) print_line_cursor#18 = (byte*) print_line_cursor#23 
-Alias (byte*) print_char_cursor#1 = (byte*) print_char_cursor#12 
-Alias (byte*) print_line_cursor#1 = (byte*) print_line_cursor#9 (byte*) print_line_cursor#10 (byte*) print_line_cursor#2 
-Alias (byte*) print_char_cursor#13 = (byte*) print_char_cursor#2 (byte*) print_char_cursor#14 (byte*) print_char_cursor#3 
-Alias (byte*) print_str::str#2 = (byte*) print_str::str#3 
-Alias (byte*) print_char_cursor#15 = (byte*) print_char_cursor#24 (byte*) print_char_cursor#16 (byte*) print_char_cursor#5 
-Alias (byte*) print_line_cursor#12 = (byte*) print_line_cursor#3 (byte*~) print_ln::$0 (byte*) print_char_cursor#6 (byte*) print_line_cursor#13 (byte*) print_char_cursor#18 (byte*) print_line_cursor#4 (byte*) print_char_cursor#7 
-Alias (byte) main::i#2 = (byte) main::i#3 
-Alias (byte*) print_line_cursor#14 = (byte*) print_line_cursor#5 (byte*) print_line_cursor#25 
-Alias (byte*) print_char_cursor#19 = (byte*) print_char_cursor#8 (byte*) print_char_cursor#31 
-Alias (byte) main::i1#2 = (byte) main::i1#3 
-Alias (byte*) print_char_cursor#10 = (byte*) print_char_cursor#9 (byte*) print_char_cursor#20 (byte*) print_char_cursor#21 
-Alias (byte*) print_line_cursor#15 = (byte*) print_line_cursor#6 (byte*) print_line_cursor#16 (byte*) print_line_cursor#7 
-Alias (byte*) print_line_cursor#17 = (byte*) print_line_cursor#8 
-Alias (byte*) print_char_cursor#11 = (byte*) print_char_cursor#22 
-Successful SSA optimization Pass2AliasElimination
-Self Phi Eliminated (byte*) print_char_cursor#17
-Successful SSA optimization Pass2SelfPhiElimination
-Redundant Phi (byte*) print_str_ln::str#1 (byte*) print_str_ln::str#0
-Redundant Phi (byte*) print_char_cursor#23 (byte*) print_char_cursor#27
-Redundant Phi (byte*) print_line_cursor#18 (byte*) print_line_cursor#21
-Redundant Phi (byte*) print_char_cursor#1 (byte*) print_char_cursor#15
-Redundant Phi (byte*) print_line_cursor#1 (byte*) print_line_cursor#12
-Redundant Phi (byte*) print_char_cursor#13 (byte*) print_line_cursor#12
-Redundant Phi (byte*) print_str::str#4 (byte*) print_str::str#0
-Redundant Phi (byte*) print_char_cursor#29 (byte*) print_char_cursor#23
-Redundant Phi (byte*) print_char_cursor#17 (byte*) print_char_cursor#25
-Redundant Phi (byte*) print_line_cursor#24 (byte*) print_line_cursor#0
-Redundant Phi (byte*) print_char_cursor#30 (byte*) print_line_cursor#0
-Redundant Phi (byte*) print_line_cursor#14 (byte*) print_line_cursor#12
-Redundant Phi (byte*) print_char_cursor#19 (byte*) print_line_cursor#12
-Redundant Phi (byte*) print_char_cursor#10 (byte*) print_char_cursor#13
-Redundant Phi (byte*) print_line_cursor#15 (byte*) print_line_cursor#1
-Redundant Phi (byte*) print_line_cursor#17 (byte*) print_line_cursor#15
-Redundant Phi (byte*) print_char_cursor#11 (byte*) print_char_cursor#10
-Successful SSA optimization Pass2RedundantPhiElimination
-Redundant Phi (byte*) print_char_cursor#27 (byte*) print_line_cursor#12
-Redundant Phi (byte*) print_line_cursor#21 (byte*) print_line_cursor#12
-Successful SSA optimization Pass2RedundantPhiElimination
-Simple Condition (bool~) print_str::$0 [19] if(*((byte*) print_str::str#2)!=(byte) '@') goto print_str::@2
-Simple Condition (bool~) print_ln::$1 [32] if((byte*) print_line_cursor#12<(byte*) print_char_cursor#25) goto print_ln::@1
-Simple Condition (bool~) main::$1 [50] if((byte) main::i#1!=rangelast(0,5)) goto main::@1
-Simple Condition (bool~) main::$3 [61] if((byte) main::i1#1!=rangelast(0,5)) goto main::@3
+Culled Empty Block (label) @2
+Successful SSA optimization Pass2CullEmptyBlocks
+Simple Condition (bool~) main::$0 [6] if((byte) main::i#1!=rangelast(0,5)) goto main::@1
+Simple Condition (bool~) main::$2 [13] if((byte) main::i1#1!=rangelast(0,5)) goto main::@3
 Successful SSA optimization Pass2ConditionalJumpSimplification
-Constant (const byte*) print_line_cursor#0 = ((byte*))$400
-Constant (const byte[]) print_hextab#0 = $0
+Constant (const byte*) SCREEN#0 = ((byte*))$400
 Constant (const byte) main::i#0 = 0
 Constant (const byte) main::i1#0 = 0
-Constant (const byte*) print_str_ln::str#0 = main::str
 Successful SSA optimization Pass2ConstantIdentification
-Constant (const byte*) print_str::str#0 = print_str_ln::str#0
-Successful SSA optimization Pass2ConstantIdentification
-Successful SSA optimization PassNEliminateUnusedVars
-Successful SSA optimization PassNEliminateUnusedVars
+Consolidated array index constant in assignment *(SCREEN#0+$28 + main::$1)
+Successful SSA optimization Pass2ConstantAdditionElimination
+Inferred type updated to byte in [5] (byte/signed word/word/dword/signed dword~) main::$1 ← (byte) main::i1#2
 Resolved ranged next value main::i#1 ← ++ main::i#2 to ++
 Resolved ranged comparison value if(main::i#1!=rangelast(0,5)) goto main::@1 to (byte/signed byte/word/signed word/dword/signed dword) 6
 Resolved ranged next value main::i1#1 ← ++ main::i1#2 to ++
 Resolved ranged comparison value if(main::i1#1!=rangelast(0,5)) goto main::@3 to (byte/signed byte/word/signed word/dword/signed dword) 6
-Culled Empty Block (label) print_str_ln::@2
-Culled Empty Block (label) print_ln::@2
-Culled Empty Block (label) @12
 Culled Empty Block (label) main::@2
-Culled Empty Block (label) @21
 Successful SSA optimization Pass2CullEmptyBlocks
-Inlining constant with var siblings (const byte*) print_str::str#0
+Alias (byte) main::i1#2 = (byte~) main::$1 
+Successful SSA optimization Pass2AliasElimination
 Inlining constant with var siblings (const byte) main::i#0
 Inlining constant with var siblings (const byte) main::i1#0
-Inlining constant with var siblings (const byte*) print_line_cursor#0
 Constant inlined main::i#0 = (byte/signed byte/word/signed word/dword/signed dword) 0
 Constant inlined main::i1#0 = (byte/signed byte/word/signed word/dword/signed dword) 0
-Constant inlined print_str_ln::str#0 = (const string) main::str
-Constant inlined print_str::str#0 = (const string) main::str
-Constant inlined print_line_cursor#0 = ((byte*))(word/signed word/dword/signed dword) $400
 Successful SSA optimization Pass2ConstantInlining
-Added new block during phi lifting main::@7(between main::@5 and main::@1)
-Added new block during phi lifting main::@8(between main::@6 and main::@3)
-Added new block during phi lifting print_ln::@3(between print_ln::@1 and print_ln::@1)
+Added new block during phi lifting main::@5(between main::@1 and main::@1)
+Added new block during phi lifting main::@6(between main::@3 and main::@3)
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @20
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of print_str_ln
 CALL GRAPH
 Calls in [] to main:2 
-Calls in [main] to print_ln:8 print_str_ln:12 
-Calls in [print_str_ln] to print_str:21 print_ln:24 
 
-Created 9 initial phi equivalence classes
-Coalesced [6] print_line_cursor#28 ← print_line_cursor#20
-Coalesced [7] print_char_cursor#34 ← print_char_cursor#26
-Coalesced [16] main::i1#4 ← main::i1#1
-Not coalescing [17] print_line_cursor#27 ← print_line_cursor#12
-Not coalescing [18] print_char_cursor#33 ← print_line_cursor#12
-Coalesced [19] main::i#4 ← main::i#1
-Not coalescing [22] print_line_cursor#29 ← print_line_cursor#12
-Coalesced [23] print_char_cursor#35 ← print_char_cursor#15
-Coalesced [27] print_line_cursor#30 ← print_line_cursor#19
-Not coalescing [32] print_line_cursor#31 ← print_line_cursor#12
-Not coalescing [33] print_char_cursor#36 ← print_line_cursor#12
-Coalesced [40] print_str::str#5 ← print_str::str#1
-Coalesced [41] print_char_cursor#37 ← print_char_cursor#4
-Coalesced down to 6 phi equivalence classes
-Culled Empty Block (label) main::@8
+Created 2 initial phi equivalence classes
+Coalesced [14] main::i1#3 ← main::i1#1
+Coalesced [15] main::i#3 ← main::i#1
+Coalesced down to 2 phi equivalence classes
+Culled Empty Block (label) main::@6
+Culled Empty Block (label) main::@5
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @20
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of print_str_ln
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@7
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
-  [5] (byte*) print_char_cursor#26 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@7/(byte*~) print_char_cursor#33 )
-  [5] (byte*) print_line_cursor#20 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@7/(byte*~) print_line_cursor#27 )
-  [6] call print_ln 
-  to:main::@5
-main::@5: scope:[main]  from main::@1
+main::@1: scope:[main]  from main main::@1
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@1/(byte) main::i#1 )
+  [6] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte) 'a'
   [7] (byte) main::i#1 ← ++ (byte) main::i#2
-  [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@7
-  to:main::@3
-main::@3: scope:[main]  from main::@5 main::@6
-  [9] (byte) main::i1#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::i1#1 )
-  [10] call print_str_ln 
-  to:main::@6
-main::@6: scope:[main]  from main::@3
+  [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [9] (byte) main::i1#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i1#1 )
+  [10] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::i1#2) ← (byte) 'b'
   [11] (byte) main::i1#1 ← ++ (byte) main::i1#2
-  [12] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@3
+  [12] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@6
+main::@return: scope:[main]  from main::@2
   [13] return 
   to:@return
-main::@7: scope:[main]  from main::@5
-  [14] (byte*~) print_line_cursor#27 ← (byte*) print_line_cursor#12
-  [15] (byte*~) print_char_cursor#33 ← (byte*) print_line_cursor#12
-  to:main::@1
-print_str_ln: scope:[print_str_ln]  from main::@3
-  [16] phi()
-  [17] call print_str 
-  to:print_str_ln::@1
-print_str_ln::@1: scope:[print_str_ln]  from print_str_ln
-  [18] (byte*~) print_line_cursor#29 ← (byte*) print_line_cursor#12
-  [19] call print_ln 
-  to:print_str_ln::@return
-print_str_ln::@return: scope:[print_str_ln]  from print_str_ln::@1
-  [20] return 
-  to:@return
-print_ln: scope:[print_ln]  from main::@1 print_str_ln::@1
-  [21] (byte*) print_char_cursor#25 ← phi( main::@1/(byte*) print_char_cursor#26 print_str_ln::@1/(byte*) print_char_cursor#15 )
-  [21] (byte*) print_line_cursor#19 ← phi( main::@1/(byte*) print_line_cursor#20 print_str_ln::@1/(byte*~) print_line_cursor#29 )
-  to:print_ln::@1
-print_ln::@1: scope:[print_ln]  from print_ln print_ln::@3
-  [22] (byte*) print_line_cursor#11 ← phi( print_ln/(byte*) print_line_cursor#19 print_ln::@3/(byte*~) print_line_cursor#31 )
-  [23] (byte*) print_line_cursor#12 ← (byte*) print_line_cursor#11 + (byte/signed byte/word/signed word/dword/signed dword) $28
-  [24] if((byte*) print_line_cursor#12<(byte*) print_char_cursor#25) goto print_ln::@3
-  to:print_ln::@return
-print_ln::@return: scope:[print_ln]  from print_ln::@1
-  [25] return 
-  to:@return
-print_ln::@3: scope:[print_ln]  from print_ln::@1
-  [26] (byte*~) print_line_cursor#31 ← (byte*) print_line_cursor#12
-  to:print_ln::@1
-print_str: scope:[print_str]  from print_str_ln
-  [27] (byte*~) print_char_cursor#36 ← (byte*) print_line_cursor#12
-  to:print_str::@1
-print_str::@1: scope:[print_str]  from print_str print_str::@2
-  [28] (byte*) print_char_cursor#15 ← phi( print_str/(byte*~) print_char_cursor#36 print_str::@2/(byte*) print_char_cursor#4 )
-  [28] (byte*) print_str::str#2 ← phi( print_str/(const string) main::str print_str::@2/(byte*) print_str::str#1 )
-  [29] if(*((byte*) print_str::str#2)!=(byte) '@') goto print_str::@2
-  to:print_str::@return
-print_str::@return: scope:[print_str]  from print_str::@1
-  [30] return 
-  to:@return
-print_str::@2: scope:[print_str]  from print_str::@1
-  [31] *((byte*) print_char_cursor#15) ← *((byte*) print_str::str#2)
-  [32] (byte*) print_char_cursor#4 ← ++ (byte*) print_char_cursor#15
-  [33] (byte*) print_str::str#1 ← ++ (byte*) print_str::str#2
-  to:print_str::@1
 
 
 VARIABLE REGISTER WEIGHTS
+(byte*) SCREEN
 (void()) main()
 (byte) main::i
-(byte) main::i#1 8.25
-(byte) main::i#2 11.0
+(byte) main::i#1 16.5
+(byte) main::i#2 16.5
 (byte) main::i1
 (byte) main::i1#1 16.5
-(byte) main::i1#2 11.0
-(byte*) print_char_cursor
-(byte*) print_char_cursor#15 51.16666666666666
-(byte*) print_char_cursor#25 22.8
-(byte*) print_char_cursor#26 22.0
-(byte*~) print_char_cursor#33 22.0
-(byte*~) print_char_cursor#36 4.0
-(byte*) print_char_cursor#4 101.0
-(byte[]) print_hextab
-(byte*) print_line_cursor
-(byte*) print_line_cursor#11 204.0
-(byte*) print_line_cursor#12 14.954545454545455
-(byte*) print_line_cursor#19 15.0
-(byte*) print_line_cursor#20 22.0
-(byte*~) print_line_cursor#27 11.0
-(byte*~) print_line_cursor#29 4.0
-(byte*~) print_line_cursor#31 202.0
-(void()) print_ln()
-(byte*) print_screen
-(void()) print_str((byte*) print_str::str)
-(byte*) print_str::str
-(byte*) print_str::str#1 202.0
-(byte*) print_str::str#2 101.0
-(void()) print_str_ln((byte*) print_str_ln::str)
-(byte*) print_str_ln::str
+(byte) main::i1#2 16.5
 
 Initial phi equivalence classes
 [ main::i#2 main::i#1 ]
 [ main::i1#2 main::i1#1 ]
-[ print_char_cursor#25 print_char_cursor#26 print_char_cursor#33 print_char_cursor#15 print_char_cursor#36 print_char_cursor#4 ]
-[ print_line_cursor#11 print_line_cursor#19 print_line_cursor#20 print_line_cursor#27 print_line_cursor#29 print_line_cursor#31 ]
-[ print_str::str#2 print_str::str#1 ]
-Added variable print_line_cursor#12 to zero page equivalence class [ print_line_cursor#12 ]
 Complete equivalence classes
 [ main::i#2 main::i#1 ]
 [ main::i1#2 main::i1#1 ]
-[ print_char_cursor#25 print_char_cursor#26 print_char_cursor#33 print_char_cursor#15 print_char_cursor#36 print_char_cursor#4 ]
-[ print_line_cursor#11 print_line_cursor#19 print_line_cursor#20 print_line_cursor#27 print_line_cursor#29 print_line_cursor#31 ]
-[ print_str::str#2 print_str::str#1 ]
-[ print_line_cursor#12 ]
 Allocated zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
 Allocated zp ZP_BYTE:3 [ main::i1#2 main::i1#1 ]
-Allocated zp ZP_WORD:4 [ print_char_cursor#25 print_char_cursor#26 print_char_cursor#33 print_char_cursor#15 print_char_cursor#36 print_char_cursor#4 ]
-Allocated zp ZP_WORD:6 [ print_line_cursor#11 print_line_cursor#19 print_line_cursor#20 print_line_cursor#27 print_line_cursor#29 print_line_cursor#31 ]
-Allocated zp ZP_WORD:8 [ print_str::str#2 print_str::str#1 ]
-Allocated zp ZP_WORD:10 [ print_line_cursor#12 ]
 
 INITIAL ASM
 //SEG0 File Comments
@@ -516,22 +161,20 @@ INITIAL ASM
 :BasicUpstart(bbegin)
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
-  .label print_char_cursor = 4
-  .label print_line_cursor = 6
-  .label print_line_cursor_12 = $a
+  .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -544,250 +187,68 @@ main: {
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG13 [5] phi (byte*) print_char_cursor#26 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@1#1] -- pbuz1=pbuc1 
-    lda #<$400
-    sta print_char_cursor
-    lda #>$400
-    sta print_char_cursor+1
-  //SEG14 [5] phi (byte*) print_line_cursor#20 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@1#2] -- pbuz1=pbuc1 
-    lda #<$400
-    sta print_line_cursor
-    lda #>$400
-    sta print_line_cursor+1
+    jmp b1
+  //SEG13 [5] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@1->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
-  //SEG16 [6] call print_ln 
-  //SEG17 [21] phi from main::@1 to print_ln [phi:main::@1->print_ln]
-  print_ln_from_b1:
-  //SEG18 [21] phi (byte*) print_char_cursor#25 = (byte*) print_char_cursor#26 [phi:main::@1->print_ln#0] -- register_copy 
-  //SEG19 [21] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#20 [phi:main::@1->print_ln#1] -- register_copy 
-    jsr print_ln
-    jmp b5
-  //SEG20 main::@5
-  b5:
-  //SEG21 [7] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
+  //SEG16 [6] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte) 'a' -- pbuc1_derefidx_vbuz1=vbuc2 
+    lda #'a'
+    ldy i
+    sta SCREEN,y
+  //SEG17 [7] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG22 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG18 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp i
-    bne b7
-  //SEG23 [9] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
-  b3_from_b5:
-  //SEG24 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@3#0] -- vbuz1=vbuc1 
+    bne b1_from_b1
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG20 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta i1
-    jmp b3
-  //SEG25 [9] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
-  b3_from_b6:
-  //SEG26 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@6->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG27 main::@3
-  b3:
-  //SEG28 [10] call print_str_ln 
-  //SEG29 [16] phi from main::@3 to print_str_ln [phi:main::@3->print_str_ln]
-  print_str_ln_from_b3:
-    jsr print_str_ln
-    jmp b6
-  //SEG30 main::@6
-  b6:
-  //SEG31 [11] (byte) main::i1#1 ← ++ (byte) main::i1#2 -- vbuz1=_inc_vbuz1 
+    jmp b2
+  //SEG21 [9] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG22 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG23 main::@2
+  b2:
+  //SEG24 [10] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::i1#2) ← (byte) 'b' -- pbuc1_derefidx_vbuz1=vbuc2 
+    lda #'b'
+    ldy i1
+    sta SCREEN+$28,y
+  //SEG25 [11] (byte) main::i1#1 ← ++ (byte) main::i1#2 -- vbuz1=_inc_vbuz1 
     inc i1
-  //SEG32 [12] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG26 [12] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp i1
-    bne b3_from_b6
+    bne b2_from_b2
     jmp breturn
-  //SEG33 main::@return
+  //SEG27 main::@return
   breturn:
-  //SEG34 [13] return 
+  //SEG28 [13] return 
     rts
-  //SEG35 main::@7
-  b7:
-  //SEG36 [14] (byte*~) print_line_cursor#27 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-  //SEG37 [15] (byte*~) print_char_cursor#33 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_char_cursor
-    lda print_line_cursor_12+1
-    sta print_char_cursor+1
-  //SEG38 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG39 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
-  //SEG40 [5] phi (byte*) print_char_cursor#26 = (byte*~) print_char_cursor#33 [phi:main::@7->main::@1#1] -- register_copy 
-  //SEG41 [5] phi (byte*) print_line_cursor#20 = (byte*~) print_line_cursor#27 [phi:main::@7->main::@1#2] -- register_copy 
-    jmp b1
-    str: .text " xxxxx@"
-}
-//SEG42 print_str_ln
-// Print a zero-terminated string followed by a newline
-print_str_ln: {
-  //SEG43 [17] call print_str 
-    jsr print_str
-    jmp b1
-  //SEG44 print_str_ln::@1
-  b1:
-  //SEG45 [18] (byte*~) print_line_cursor#29 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-  //SEG46 [19] call print_ln 
-  //SEG47 [21] phi from print_str_ln::@1 to print_ln [phi:print_str_ln::@1->print_ln]
-  print_ln_from_b1:
-  //SEG48 [21] phi (byte*) print_char_cursor#25 = (byte*) print_char_cursor#15 [phi:print_str_ln::@1->print_ln#0] -- register_copy 
-  //SEG49 [21] phi (byte*) print_line_cursor#19 = (byte*~) print_line_cursor#29 [phi:print_str_ln::@1->print_ln#1] -- register_copy 
-    jsr print_ln
-    jmp breturn
-  //SEG50 print_str_ln::@return
-  breturn:
-  //SEG51 [20] return 
-    rts
-}
-//SEG52 print_ln
-// Print a newline
-print_ln: {
-  //SEG53 [22] phi from print_ln print_ln::@3 to print_ln::@1 [phi:print_ln/print_ln::@3->print_ln::@1]
-  b1_from_print_ln:
-  b1_from_b3:
-  //SEG54 [22] phi (byte*) print_line_cursor#11 = (byte*) print_line_cursor#19 [phi:print_ln/print_ln::@3->print_ln::@1#0] -- register_copy 
-    jmp b1
-  //SEG55 print_ln::@1
-  b1:
-  //SEG56 [23] (byte*) print_line_cursor#12 ← (byte*) print_line_cursor#11 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz2_plus_vbuc1 
-    lda #$28
-    clc
-    adc print_line_cursor
-    sta print_line_cursor_12
-    lda #0
-    adc print_line_cursor+1
-    sta print_line_cursor_12+1
-  //SEG57 [24] if((byte*) print_line_cursor#12<(byte*) print_char_cursor#25) goto print_ln::@3 -- pbuz1_lt_pbuz2_then_la1 
-    lda print_line_cursor_12+1
-    cmp print_char_cursor+1
-    bcc b3
-    bne !+
-    lda print_line_cursor_12
-    cmp print_char_cursor
-    bcc b3
-  !:
-    jmp breturn
-  //SEG58 print_ln::@return
-  breturn:
-  //SEG59 [25] return 
-    rts
-  //SEG60 print_ln::@3
-  b3:
-  //SEG61 [26] (byte*~) print_line_cursor#31 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-    jmp b1_from_b3
-}
-//SEG62 print_str
-// Print a zero-terminated string
-// print_str(byte* zeropage(8) str)
-print_str: {
-    .label str = 8
-  //SEG63 [27] (byte*~) print_char_cursor#36 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_char_cursor
-    lda print_line_cursor_12+1
-    sta print_char_cursor+1
-  //SEG64 [28] phi from print_str to print_str::@1 [phi:print_str->print_str::@1]
-  b1_from_print_str:
-  //SEG65 [28] phi (byte*) print_char_cursor#15 = (byte*~) print_char_cursor#36 [phi:print_str->print_str::@1#0] -- register_copy 
-  //SEG66 [28] phi (byte*) print_str::str#2 = (const string) main::str [phi:print_str->print_str::@1#1] -- pbuz1=pbuc1 
-    lda #<main.str
-    sta str
-    lda #>main.str
-    sta str+1
-    jmp b1
-  //SEG67 print_str::@1
-  b1:
-  //SEG68 [29] if(*((byte*) print_str::str#2)!=(byte) '@') goto print_str::@2 -- _deref_pbuz1_neq_vbuc1_then_la1 
-    ldy #0
-    lda (str),y
-    cmp #'@'
-    bne b2
-    jmp breturn
-  //SEG69 print_str::@return
-  breturn:
-  //SEG70 [30] return 
-    rts
-  //SEG71 print_str::@2
-  b2:
-  //SEG72 [31] *((byte*) print_char_cursor#15) ← *((byte*) print_str::str#2) -- _deref_pbuz1=_deref_pbuz2 
-    ldy #0
-    lda (str),y
-    ldy #0
-    sta (print_char_cursor),y
-  //SEG73 [32] (byte*) print_char_cursor#4 ← ++ (byte*) print_char_cursor#15 -- pbuz1=_inc_pbuz1 
-    inc print_char_cursor
-    bne !+
-    inc print_char_cursor+1
-  !:
-  //SEG74 [33] (byte*) print_str::str#1 ← ++ (byte*) print_str::str#2 -- pbuz1=_inc_pbuz1 
-    inc str
-    bne !+
-    inc str+1
-  !:
-  //SEG75 [28] phi from print_str::@2 to print_str::@1 [phi:print_str::@2->print_str::@1]
-  b1_from_b2:
-  //SEG76 [28] phi (byte*) print_char_cursor#15 = (byte*) print_char_cursor#4 [phi:print_str::@2->print_str::@1#0] -- register_copy 
-  //SEG77 [28] phi (byte*) print_str::str#2 = (byte*) print_str::str#1 [phi:print_str::@2->print_str::@1#1] -- register_copy 
-    jmp b1
 }
 
 REGISTER UPLIFT POTENTIAL REGISTERS
-Statement [14] (byte*~) print_line_cursor#27 ← (byte*) print_line_cursor#12 [ print_line_cursor#27 main::i#1 print_line_cursor#12 ] ( main:2 [ print_line_cursor#27 main::i#1 print_line_cursor#12 ] ) always clobbers reg byte a 
+Statement [6] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte) 'a' [ main::i#2 ] ( main:2 [ main::i#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
-Statement [15] (byte*~) print_char_cursor#33 ← (byte*) print_line_cursor#12 [ print_line_cursor#27 print_char_cursor#33 main::i#1 ] ( main:2 [ print_line_cursor#27 print_char_cursor#33 main::i#1 ] ) always clobbers reg byte a 
-Statement [18] (byte*~) print_line_cursor#29 ← (byte*) print_line_cursor#12 [ print_line_cursor#29 print_char_cursor#15 ] ( main:2::print_str_ln:10 [ main::i1#2 print_line_cursor#29 print_char_cursor#15 ] ) always clobbers reg byte a 
+Statement [10] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::i1#2) ← (byte) 'b' [ main::i1#2 ] ( main:2 [ main::i1#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:3 [ main::i1#2 main::i1#1 ]
-Statement [23] (byte*) print_line_cursor#12 ← (byte*) print_line_cursor#11 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#12 print_char_cursor#25 ] ( main:2::print_ln:6 [ main::i#2 print_line_cursor#12 print_char_cursor#25 ] main:2::print_str_ln:10::print_ln:19 [ main::i1#2 print_line_cursor#12 print_char_cursor#25 ] ) always clobbers reg byte a 
-Statement [24] if((byte*) print_line_cursor#12<(byte*) print_char_cursor#25) goto print_ln::@3 [ print_line_cursor#12 print_char_cursor#25 ] ( main:2::print_ln:6 [ main::i#2 print_line_cursor#12 print_char_cursor#25 ] main:2::print_str_ln:10::print_ln:19 [ main::i1#2 print_line_cursor#12 print_char_cursor#25 ] ) always clobbers reg byte a 
-Statement [26] (byte*~) print_line_cursor#31 ← (byte*) print_line_cursor#12 [ print_char_cursor#25 print_line_cursor#31 ] ( main:2::print_ln:6 [ main::i#2 print_char_cursor#25 print_line_cursor#31 ] main:2::print_str_ln:10::print_ln:19 [ main::i1#2 print_char_cursor#25 print_line_cursor#31 ] ) always clobbers reg byte a 
-Statement [27] (byte*~) print_char_cursor#36 ← (byte*) print_line_cursor#12 [ print_line_cursor#12 print_char_cursor#36 ] ( main:2::print_str_ln:10::print_str:17 [ main::i1#2 print_line_cursor#12 print_char_cursor#36 ] ) always clobbers reg byte a 
-Statement [29] if(*((byte*) print_str::str#2)!=(byte) '@') goto print_str::@2 [ print_line_cursor#12 print_char_cursor#15 print_str::str#2 ] ( main:2::print_str_ln:10::print_str:17 [ main::i1#2 print_line_cursor#12 print_char_cursor#15 print_str::str#2 ] ) always clobbers reg byte a reg byte y 
-Removing always clobbered register reg byte y as potential for zp ZP_BYTE:3 [ main::i1#2 main::i1#1 ]
-Statement [31] *((byte*) print_char_cursor#15) ← *((byte*) print_str::str#2) [ print_line_cursor#12 print_char_cursor#15 print_str::str#2 ] ( main:2::print_str_ln:10::print_str:17 [ main::i1#2 print_line_cursor#12 print_char_cursor#15 print_str::str#2 ] ) always clobbers reg byte a reg byte y 
-Statement [14] (byte*~) print_line_cursor#27 ← (byte*) print_line_cursor#12 [ print_line_cursor#27 main::i#1 print_line_cursor#12 ] ( main:2 [ print_line_cursor#27 main::i#1 print_line_cursor#12 ] ) always clobbers reg byte a 
-Statement [15] (byte*~) print_char_cursor#33 ← (byte*) print_line_cursor#12 [ print_line_cursor#27 print_char_cursor#33 main::i#1 ] ( main:2 [ print_line_cursor#27 print_char_cursor#33 main::i#1 ] ) always clobbers reg byte a 
-Statement [18] (byte*~) print_line_cursor#29 ← (byte*) print_line_cursor#12 [ print_line_cursor#29 print_char_cursor#15 ] ( main:2::print_str_ln:10 [ main::i1#2 print_line_cursor#29 print_char_cursor#15 ] ) always clobbers reg byte a 
-Statement [23] (byte*) print_line_cursor#12 ← (byte*) print_line_cursor#11 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#12 print_char_cursor#25 ] ( main:2::print_ln:6 [ main::i#2 print_line_cursor#12 print_char_cursor#25 ] main:2::print_str_ln:10::print_ln:19 [ main::i1#2 print_line_cursor#12 print_char_cursor#25 ] ) always clobbers reg byte a 
-Statement [24] if((byte*) print_line_cursor#12<(byte*) print_char_cursor#25) goto print_ln::@3 [ print_line_cursor#12 print_char_cursor#25 ] ( main:2::print_ln:6 [ main::i#2 print_line_cursor#12 print_char_cursor#25 ] main:2::print_str_ln:10::print_ln:19 [ main::i1#2 print_line_cursor#12 print_char_cursor#25 ] ) always clobbers reg byte a 
-Statement [26] (byte*~) print_line_cursor#31 ← (byte*) print_line_cursor#12 [ print_char_cursor#25 print_line_cursor#31 ] ( main:2::print_ln:6 [ main::i#2 print_char_cursor#25 print_line_cursor#31 ] main:2::print_str_ln:10::print_ln:19 [ main::i1#2 print_char_cursor#25 print_line_cursor#31 ] ) always clobbers reg byte a 
-Statement [27] (byte*~) print_char_cursor#36 ← (byte*) print_line_cursor#12 [ print_line_cursor#12 print_char_cursor#36 ] ( main:2::print_str_ln:10::print_str:17 [ main::i1#2 print_line_cursor#12 print_char_cursor#36 ] ) always clobbers reg byte a 
-Statement [29] if(*((byte*) print_str::str#2)!=(byte) '@') goto print_str::@2 [ print_line_cursor#12 print_char_cursor#15 print_str::str#2 ] ( main:2::print_str_ln:10::print_str:17 [ main::i1#2 print_line_cursor#12 print_char_cursor#15 print_str::str#2 ] ) always clobbers reg byte a reg byte y 
-Statement [31] *((byte*) print_char_cursor#15) ← *((byte*) print_str::str#2) [ print_line_cursor#12 print_char_cursor#15 print_str::str#2 ] ( main:2::print_str_ln:10::print_str:17 [ main::i1#2 print_line_cursor#12 print_char_cursor#15 print_str::str#2 ] ) always clobbers reg byte a reg byte y 
+Statement [6] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte) 'a' [ main::i#2 ] ( main:2 [ main::i#2 ] ) always clobbers reg byte a 
+Statement [10] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::i1#2) ← (byte) 'b' [ main::i1#2 ] ( main:2 [ main::i1#2 ] ) always clobbers reg byte a 
 Potential registers zp ZP_BYTE:2 [ main::i#2 main::i#1 ] : zp ZP_BYTE:2 , reg byte x , reg byte y , 
-Potential registers zp ZP_BYTE:3 [ main::i1#2 main::i1#1 ] : zp ZP_BYTE:3 , reg byte x , 
-Potential registers zp ZP_WORD:4 [ print_char_cursor#25 print_char_cursor#26 print_char_cursor#33 print_char_cursor#15 print_char_cursor#36 print_char_cursor#4 ] : zp ZP_WORD:4 , 
-Potential registers zp ZP_WORD:6 [ print_line_cursor#11 print_line_cursor#19 print_line_cursor#20 print_line_cursor#27 print_line_cursor#29 print_line_cursor#31 ] : zp ZP_WORD:6 , 
-Potential registers zp ZP_WORD:8 [ print_str::str#2 print_str::str#1 ] : zp ZP_WORD:8 , 
-Potential registers zp ZP_WORD:10 [ print_line_cursor#12 ] : zp ZP_WORD:10 , 
+Potential registers zp ZP_BYTE:3 [ main::i1#2 main::i1#1 ] : zp ZP_BYTE:3 , reg byte x , reg byte y , 
 
 REGISTER UPLIFT SCOPES
-Uplift Scope [] 458: zp ZP_WORD:6 [ print_line_cursor#11 print_line_cursor#19 print_line_cursor#20 print_line_cursor#27 print_line_cursor#29 print_line_cursor#31 ] 222.97: zp ZP_WORD:4 [ print_char_cursor#25 print_char_cursor#26 print_char_cursor#33 print_char_cursor#15 print_char_cursor#36 print_char_cursor#4 ] 14.95: zp ZP_WORD:10 [ print_line_cursor#12 ] 
-Uplift Scope [print_str] 303: zp ZP_WORD:8 [ print_str::str#2 print_str::str#1 ] 
-Uplift Scope [main] 27.5: zp ZP_BYTE:3 [ main::i1#2 main::i1#1 ] 19.25: zp ZP_BYTE:2 [ main::i#2 main::i#1 ] 
-Uplift Scope [print_str_ln] 
-Uplift Scope [print_ln] 
+Uplift Scope [main] 33: zp ZP_BYTE:2 [ main::i#2 main::i#1 ] 33: zp ZP_BYTE:3 [ main::i1#2 main::i1#1 ] 
+Uplift Scope [] 
 
-Uplifting [] best 14036 combination zp ZP_WORD:6 [ print_line_cursor#11 print_line_cursor#19 print_line_cursor#20 print_line_cursor#27 print_line_cursor#29 print_line_cursor#31 ] zp ZP_WORD:4 [ print_char_cursor#25 print_char_cursor#26 print_char_cursor#33 print_char_cursor#15 print_char_cursor#36 print_char_cursor#4 ] zp ZP_WORD:10 [ print_line_cursor#12 ] 
-Uplifting [print_str] best 14036 combination zp ZP_WORD:8 [ print_str::str#2 print_str::str#1 ] 
-Uplifting [main] best 13856 combination reg byte x [ main::i1#2 main::i1#1 ] reg byte x [ main::i#2 main::i#1 ] 
-Uplifting [print_str_ln] best 13856 combination 
-Uplifting [print_ln] best 13856 combination 
-Coalescing zero page register [ zp ZP_WORD:6 [ print_line_cursor#11 print_line_cursor#19 print_line_cursor#20 print_line_cursor#27 print_line_cursor#29 print_line_cursor#31 ] ] with [ zp ZP_WORD:8 [ print_str::str#2 print_str::str#1 ] ]
-Allocated (was zp ZP_WORD:4) zp ZP_WORD:2 [ print_char_cursor#25 print_char_cursor#26 print_char_cursor#33 print_char_cursor#15 print_char_cursor#36 print_char_cursor#4 ]
-Allocated (was zp ZP_WORD:6) zp ZP_WORD:4 [ print_line_cursor#11 print_line_cursor#19 print_line_cursor#20 print_line_cursor#27 print_line_cursor#29 print_line_cursor#31 print_str::str#2 print_str::str#1 ]
-Allocated (was zp ZP_WORD:10) zp ZP_WORD:6 [ print_line_cursor#12 ]
+Uplifting [main] best 478 combination reg byte x [ main::i#2 main::i#1 ] reg byte x [ main::i1#2 main::i1#1 ] 
+Uplifting [] best 478 combination 
 
 ASSEMBLER BEFORE OPTIMIZATION
 //SEG0 File Comments
@@ -797,22 +258,20 @@ ASSEMBLER BEFORE OPTIMIZATION
 :BasicUpstart(bbegin)
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
-  .label print_char_cursor = 2
-  .label print_line_cursor = 4
-  .label print_line_cursor_12 = 6
+  .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -822,315 +281,100 @@ main: {
   b1_from_main:
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG13 [5] phi (byte*) print_char_cursor#26 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@1#1] -- pbuz1=pbuc1 
-    lda #<$400
-    sta print_char_cursor
-    lda #>$400
-    sta print_char_cursor+1
-  //SEG14 [5] phi (byte*) print_line_cursor#20 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@1#2] -- pbuz1=pbuc1 
-    lda #<$400
-    sta print_line_cursor
-    lda #>$400
-    sta print_line_cursor+1
+    jmp b1
+  //SEG13 [5] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@1->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
-  //SEG16 [6] call print_ln 
-  //SEG17 [21] phi from main::@1 to print_ln [phi:main::@1->print_ln]
-  print_ln_from_b1:
-  //SEG18 [21] phi (byte*) print_char_cursor#25 = (byte*) print_char_cursor#26 [phi:main::@1->print_ln#0] -- register_copy 
-  //SEG19 [21] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#20 [phi:main::@1->print_ln#1] -- register_copy 
-    jsr print_ln
-    jmp b5
-  //SEG20 main::@5
-  b5:
-  //SEG21 [7] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
+  //SEG16 [6] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte) 'a' -- pbuc1_derefidx_vbuxx=vbuc2 
+    lda #'a'
+    sta SCREEN,x
+  //SEG17 [7] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG22 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@7 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG18 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #6
-    bne b7
-  //SEG23 [9] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
-  b3_from_b5:
-  //SEG24 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@3#0] -- vbuxx=vbuc1 
+    bne b1_from_b1
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG20 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b3
-  //SEG25 [9] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
-  b3_from_b6:
-  //SEG26 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@6->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG27 main::@3
-  b3:
-  //SEG28 [10] call print_str_ln 
-  //SEG29 [16] phi from main::@3 to print_str_ln [phi:main::@3->print_str_ln]
-  print_str_ln_from_b3:
-    jsr print_str_ln
-    jmp b6
-  //SEG30 main::@6
-  b6:
-  //SEG31 [11] (byte) main::i1#1 ← ++ (byte) main::i1#2 -- vbuxx=_inc_vbuxx 
-    inx
-  //SEG32 [12] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@3 -- vbuxx_neq_vbuc1_then_la1 
-    cpx #6
-    bne b3_from_b6
-    jmp breturn
-  //SEG33 main::@return
-  breturn:
-  //SEG34 [13] return 
-    rts
-  //SEG35 main::@7
-  b7:
-  //SEG36 [14] (byte*~) print_line_cursor#27 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-  //SEG37 [15] (byte*~) print_char_cursor#33 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_char_cursor
-    lda print_line_cursor_12+1
-    sta print_char_cursor+1
-  //SEG38 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG39 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
-  //SEG40 [5] phi (byte*) print_char_cursor#26 = (byte*~) print_char_cursor#33 [phi:main::@7->main::@1#1] -- register_copy 
-  //SEG41 [5] phi (byte*) print_line_cursor#20 = (byte*~) print_line_cursor#27 [phi:main::@7->main::@1#2] -- register_copy 
-    jmp b1
-    str: .text " xxxxx@"
-}
-//SEG42 print_str_ln
-// Print a zero-terminated string followed by a newline
-print_str_ln: {
-  //SEG43 [17] call print_str 
-    jsr print_str
-    jmp b1
-  //SEG44 print_str_ln::@1
-  b1:
-  //SEG45 [18] (byte*~) print_line_cursor#29 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-  //SEG46 [19] call print_ln 
-  //SEG47 [21] phi from print_str_ln::@1 to print_ln [phi:print_str_ln::@1->print_ln]
-  print_ln_from_b1:
-  //SEG48 [21] phi (byte*) print_char_cursor#25 = (byte*) print_char_cursor#15 [phi:print_str_ln::@1->print_ln#0] -- register_copy 
-  //SEG49 [21] phi (byte*) print_line_cursor#19 = (byte*~) print_line_cursor#29 [phi:print_str_ln::@1->print_ln#1] -- register_copy 
-    jsr print_ln
-    jmp breturn
-  //SEG50 print_str_ln::@return
-  breturn:
-  //SEG51 [20] return 
-    rts
-}
-//SEG52 print_ln
-// Print a newline
-print_ln: {
-  //SEG53 [22] phi from print_ln print_ln::@3 to print_ln::@1 [phi:print_ln/print_ln::@3->print_ln::@1]
-  b1_from_print_ln:
-  b1_from_b3:
-  //SEG54 [22] phi (byte*) print_line_cursor#11 = (byte*) print_line_cursor#19 [phi:print_ln/print_ln::@3->print_ln::@1#0] -- register_copy 
-    jmp b1
-  //SEG55 print_ln::@1
-  b1:
-  //SEG56 [23] (byte*) print_line_cursor#12 ← (byte*) print_line_cursor#11 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz2_plus_vbuc1 
-    lda #$28
-    clc
-    adc print_line_cursor
-    sta print_line_cursor_12
-    lda #0
-    adc print_line_cursor+1
-    sta print_line_cursor_12+1
-  //SEG57 [24] if((byte*) print_line_cursor#12<(byte*) print_char_cursor#25) goto print_ln::@3 -- pbuz1_lt_pbuz2_then_la1 
-    lda print_line_cursor_12+1
-    cmp print_char_cursor+1
-    bcc b3
-    bne !+
-    lda print_line_cursor_12
-    cmp print_char_cursor
-    bcc b3
-  !:
-    jmp breturn
-  //SEG58 print_ln::@return
-  breturn:
-  //SEG59 [25] return 
-    rts
-  //SEG60 print_ln::@3
-  b3:
-  //SEG61 [26] (byte*~) print_line_cursor#31 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-    jmp b1_from_b3
-}
-//SEG62 print_str
-// Print a zero-terminated string
-// print_str(byte* zeropage(4) str)
-print_str: {
-    .label str = 4
-  //SEG63 [27] (byte*~) print_char_cursor#36 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_char_cursor
-    lda print_line_cursor_12+1
-    sta print_char_cursor+1
-  //SEG64 [28] phi from print_str to print_str::@1 [phi:print_str->print_str::@1]
-  b1_from_print_str:
-  //SEG65 [28] phi (byte*) print_char_cursor#15 = (byte*~) print_char_cursor#36 [phi:print_str->print_str::@1#0] -- register_copy 
-  //SEG66 [28] phi (byte*) print_str::str#2 = (const string) main::str [phi:print_str->print_str::@1#1] -- pbuz1=pbuc1 
-    lda #<main.str
-    sta str
-    lda #>main.str
-    sta str+1
-    jmp b1
-  //SEG67 print_str::@1
-  b1:
-  //SEG68 [29] if(*((byte*) print_str::str#2)!=(byte) '@') goto print_str::@2 -- _deref_pbuz1_neq_vbuc1_then_la1 
-    ldy #0
-    lda (str),y
-    cmp #'@'
-    bne b2
-    jmp breturn
-  //SEG69 print_str::@return
-  breturn:
-  //SEG70 [30] return 
-    rts
-  //SEG71 print_str::@2
+    jmp b2
+  //SEG21 [9] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG22 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@2->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG23 main::@2
   b2:
-  //SEG72 [31] *((byte*) print_char_cursor#15) ← *((byte*) print_str::str#2) -- _deref_pbuz1=_deref_pbuz2 
-    ldy #0
-    lda (str),y
-    ldy #0
-    sta (print_char_cursor),y
-  //SEG73 [32] (byte*) print_char_cursor#4 ← ++ (byte*) print_char_cursor#15 -- pbuz1=_inc_pbuz1 
-    inc print_char_cursor
-    bne !+
-    inc print_char_cursor+1
-  !:
-  //SEG74 [33] (byte*) print_str::str#1 ← ++ (byte*) print_str::str#2 -- pbuz1=_inc_pbuz1 
-    inc str
-    bne !+
-    inc str+1
-  !:
-  //SEG75 [28] phi from print_str::@2 to print_str::@1 [phi:print_str::@2->print_str::@1]
-  b1_from_b2:
-  //SEG76 [28] phi (byte*) print_char_cursor#15 = (byte*) print_char_cursor#4 [phi:print_str::@2->print_str::@1#0] -- register_copy 
-  //SEG77 [28] phi (byte*) print_str::str#2 = (byte*) print_str::str#1 [phi:print_str::@2->print_str::@1#1] -- register_copy 
-    jmp b1
+  //SEG24 [10] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::i1#2) ← (byte) 'b' -- pbuc1_derefidx_vbuxx=vbuc2 
+    lda #'b'
+    sta SCREEN+$28,x
+  //SEG25 [11] (byte) main::i1#1 ← ++ (byte) main::i1#2 -- vbuxx=_inc_vbuxx 
+    inx
+  //SEG26 [12] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
+    cpx #6
+    bne b2_from_b2
+    jmp breturn
+  //SEG27 main::@return
+  breturn:
+  //SEG28 [13] return 
+    rts
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b20
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp b6
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction lda print_line_cursor_12+1
-Removing instruction ldy #0
-Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b3_from_b6 with b3
-Replacing label b1_from_b3 with b1
-Removing instruction b20_from_bbegin:
-Removing instruction b20:
-Removing instruction main_from_b20:
-Removing instruction bend_from_b20:
-Removing instruction print_ln_from_b1:
-Removing instruction b3_from_b6:
-Removing instruction print_str_ln_from_b3:
-Removing instruction b1_from_print_ln:
-Removing instruction b1_from_b3:
+Replacing label b1_from_b1 with b1
+Replacing label b2_from_b2 with b2
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b1:
+Removing instruction b2_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b5:
-Removing instruction b3_from_b5:
-Removing instruction b6:
+Removing instruction b2_from_b1:
 Removing instruction breturn:
-Removing instruction b1_from_b7:
-Removing instruction b1:
-Removing instruction print_ln_from_b1:
-Removing instruction breturn:
-Removing instruction breturn:
-Removing instruction b1_from_print_str:
-Removing instruction breturn:
-Removing instruction b1_from_b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
+(byte*) SCREEN
+(const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) main()
 (label) main::@1
-(label) main::@3
-(label) main::@5
-(label) main::@6
-(label) main::@7
+(label) main::@2
 (label) main::@return
 (byte) main::i
-(byte) main::i#1 reg byte x 8.25
-(byte) main::i#2 reg byte x 11.0
+(byte) main::i#1 reg byte x 16.5
+(byte) main::i#2 reg byte x 16.5
 (byte) main::i1
 (byte) main::i1#1 reg byte x 16.5
-(byte) main::i1#2 reg byte x 11.0
-(const string) main::str str = (string) " xxxxx@"
-(byte*) print_char_cursor
-(byte*) print_char_cursor#15 print_char_cursor zp ZP_WORD:2 51.16666666666666
-(byte*) print_char_cursor#25 print_char_cursor zp ZP_WORD:2 22.8
-(byte*) print_char_cursor#26 print_char_cursor zp ZP_WORD:2 22.0
-(byte*~) print_char_cursor#33 print_char_cursor zp ZP_WORD:2 22.0
-(byte*~) print_char_cursor#36 print_char_cursor zp ZP_WORD:2 4.0
-(byte*) print_char_cursor#4 print_char_cursor zp ZP_WORD:2 101.0
-(byte[]) print_hextab
-(byte*) print_line_cursor
-(byte*) print_line_cursor#11 print_line_cursor zp ZP_WORD:4 204.0
-(byte*) print_line_cursor#12 print_line_cursor#12 zp ZP_WORD:6 14.954545454545455
-(byte*) print_line_cursor#19 print_line_cursor zp ZP_WORD:4 15.0
-(byte*) print_line_cursor#20 print_line_cursor zp ZP_WORD:4 22.0
-(byte*~) print_line_cursor#27 print_line_cursor zp ZP_WORD:4 11.0
-(byte*~) print_line_cursor#29 print_line_cursor zp ZP_WORD:4 4.0
-(byte*~) print_line_cursor#31 print_line_cursor zp ZP_WORD:4 202.0
-(void()) print_ln()
-(label) print_ln::@1
-(label) print_ln::@3
-(label) print_ln::@return
-(byte*) print_screen
-(void()) print_str((byte*) print_str::str)
-(label) print_str::@1
-(label) print_str::@2
-(label) print_str::@return
-(byte*) print_str::str
-(byte*) print_str::str#1 str zp ZP_WORD:4 202.0
-(byte*) print_str::str#2 str zp ZP_WORD:4 101.0
-(void()) print_str_ln((byte*) print_str_ln::str)
-(label) print_str_ln::@1
-(label) print_str_ln::@return
-(byte*) print_str_ln::str
+(byte) main::i1#2 reg byte x 16.5
 
 reg byte x [ main::i#2 main::i#1 ]
 reg byte x [ main::i1#2 main::i1#1 ]
-zp ZP_WORD:2 [ print_char_cursor#25 print_char_cursor#26 print_char_cursor#33 print_char_cursor#15 print_char_cursor#36 print_char_cursor#4 ]
-zp ZP_WORD:4 [ print_line_cursor#11 print_line_cursor#19 print_line_cursor#20 print_line_cursor#27 print_line_cursor#29 print_line_cursor#31 print_str::str#2 print_str::str#1 ]
-zp ZP_WORD:6 [ print_line_cursor#12 ]
 
 
 FINAL ASSEMBLER
-Score: 12012
+Score: 316
 
 //SEG0 File Comments
 // Illustrates introducing local scopes inside loops etc
@@ -1139,183 +383,48 @@ Score: 12012
 :BasicUpstart(main)
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
-  .label print_char_cursor = 2
-  .label print_line_cursor = 4
-  .label print_line_cursor_12 = 6
+  .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-//SEG5 @20
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG13 [5] phi (byte*) print_char_cursor#26 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@1#1] -- pbuz1=pbuc1 
-    lda #<$400
-    sta print_char_cursor
-    lda #>$400
-    sta print_char_cursor+1
-  //SEG14 [5] phi (byte*) print_line_cursor#20 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@1#2] -- pbuz1=pbuc1 
-    lda #<$400
-    sta print_line_cursor
-    lda #>$400
-    sta print_line_cursor+1
+  //SEG13 [5] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@1->main::@1#0] -- register_copy 
   //SEG15 main::@1
   b1:
-  //SEG16 [6] call print_ln 
-  //SEG17 [21] phi from main::@1 to print_ln [phi:main::@1->print_ln]
-  //SEG18 [21] phi (byte*) print_char_cursor#25 = (byte*) print_char_cursor#26 [phi:main::@1->print_ln#0] -- register_copy 
-  //SEG19 [21] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#20 [phi:main::@1->print_ln#1] -- register_copy 
-    jsr print_ln
-  //SEG20 main::@5
-  //SEG21 [7] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
+  //SEG16 [6] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte) 'a' -- pbuc1_derefidx_vbuxx=vbuc2 
+    lda #'a'
+    sta SCREEN,x
+  //SEG17 [7] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG22 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@7 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG18 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #6
-    bne b7
-  //SEG23 [9] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
-  //SEG24 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@3#0] -- vbuxx=vbuc1 
+    bne b1
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG20 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG25 [9] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
-  //SEG26 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@6->main::@3#0] -- register_copy 
-  //SEG27 main::@3
-  b3:
-  //SEG28 [10] call print_str_ln 
-  //SEG29 [16] phi from main::@3 to print_str_ln [phi:main::@3->print_str_ln]
-    jsr print_str_ln
-  //SEG30 main::@6
-  //SEG31 [11] (byte) main::i1#1 ← ++ (byte) main::i1#2 -- vbuxx=_inc_vbuxx 
-    inx
-  //SEG32 [12] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@3 -- vbuxx_neq_vbuc1_then_la1 
-    cpx #6
-    bne b3
-  //SEG33 main::@return
-  //SEG34 [13] return 
-    rts
-  //SEG35 main::@7
-  b7:
-  //SEG36 [14] (byte*~) print_line_cursor#27 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-  //SEG37 [15] (byte*~) print_char_cursor#33 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_char_cursor
-    lda print_line_cursor_12+1
-    sta print_char_cursor+1
-  //SEG38 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  //SEG39 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
-  //SEG40 [5] phi (byte*) print_char_cursor#26 = (byte*~) print_char_cursor#33 [phi:main::@7->main::@1#1] -- register_copy 
-  //SEG41 [5] phi (byte*) print_line_cursor#20 = (byte*~) print_line_cursor#27 [phi:main::@7->main::@1#2] -- register_copy 
-    jmp b1
-    str: .text " xxxxx@"
-}
-//SEG42 print_str_ln
-// Print a zero-terminated string followed by a newline
-print_str_ln: {
-  //SEG43 [17] call print_str 
-    jsr print_str
-  //SEG44 print_str_ln::@1
-  //SEG45 [18] (byte*~) print_line_cursor#29 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-  //SEG46 [19] call print_ln 
-  //SEG47 [21] phi from print_str_ln::@1 to print_ln [phi:print_str_ln::@1->print_ln]
-  //SEG48 [21] phi (byte*) print_char_cursor#25 = (byte*) print_char_cursor#15 [phi:print_str_ln::@1->print_ln#0] -- register_copy 
-  //SEG49 [21] phi (byte*) print_line_cursor#19 = (byte*~) print_line_cursor#29 [phi:print_str_ln::@1->print_ln#1] -- register_copy 
-    jsr print_ln
-  //SEG50 print_str_ln::@return
-  //SEG51 [20] return 
-    rts
-}
-//SEG52 print_ln
-// Print a newline
-print_ln: {
-  //SEG53 [22] phi from print_ln print_ln::@3 to print_ln::@1 [phi:print_ln/print_ln::@3->print_ln::@1]
-  //SEG54 [22] phi (byte*) print_line_cursor#11 = (byte*) print_line_cursor#19 [phi:print_ln/print_ln::@3->print_ln::@1#0] -- register_copy 
-  //SEG55 print_ln::@1
-  b1:
-  //SEG56 [23] (byte*) print_line_cursor#12 ← (byte*) print_line_cursor#11 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz2_plus_vbuc1 
-    lda #$28
-    clc
-    adc print_line_cursor
-    sta print_line_cursor_12
-    lda #0
-    adc print_line_cursor+1
-    sta print_line_cursor_12+1
-  //SEG57 [24] if((byte*) print_line_cursor#12<(byte*) print_char_cursor#25) goto print_ln::@3 -- pbuz1_lt_pbuz2_then_la1 
-    cmp print_char_cursor+1
-    bcc b3
-    bne !+
-    lda print_line_cursor_12
-    cmp print_char_cursor
-    bcc b3
-  !:
-  //SEG58 print_ln::@return
-  //SEG59 [25] return 
-    rts
-  //SEG60 print_ln::@3
-  b3:
-  //SEG61 [26] (byte*~) print_line_cursor#31 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_line_cursor
-    lda print_line_cursor_12+1
-    sta print_line_cursor+1
-    jmp b1
-}
-//SEG62 print_str
-// Print a zero-terminated string
-// print_str(byte* zeropage(4) str)
-print_str: {
-    .label str = 4
-  //SEG63 [27] (byte*~) print_char_cursor#36 ← (byte*) print_line_cursor#12 -- pbuz1=pbuz2 
-    lda print_line_cursor_12
-    sta print_char_cursor
-    lda print_line_cursor_12+1
-    sta print_char_cursor+1
-  //SEG64 [28] phi from print_str to print_str::@1 [phi:print_str->print_str::@1]
-  //SEG65 [28] phi (byte*) print_char_cursor#15 = (byte*~) print_char_cursor#36 [phi:print_str->print_str::@1#0] -- register_copy 
-  //SEG66 [28] phi (byte*) print_str::str#2 = (const string) main::str [phi:print_str->print_str::@1#1] -- pbuz1=pbuc1 
-    lda #<main.str
-    sta str
-    lda #>main.str
-    sta str+1
-  //SEG67 print_str::@1
-  b1:
-  //SEG68 [29] if(*((byte*) print_str::str#2)!=(byte) '@') goto print_str::@2 -- _deref_pbuz1_neq_vbuc1_then_la1 
-    ldy #0
-    lda (str),y
-    cmp #'@'
-    bne b2
-  //SEG69 print_str::@return
-  //SEG70 [30] return 
-    rts
-  //SEG71 print_str::@2
+  //SEG21 [9] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  //SEG22 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@2->main::@2#0] -- register_copy 
+  //SEG23 main::@2
   b2:
-  //SEG72 [31] *((byte*) print_char_cursor#15) ← *((byte*) print_str::str#2) -- _deref_pbuz1=_deref_pbuz2 
-    ldy #0
-    lda (str),y
-    sta (print_char_cursor),y
-  //SEG73 [32] (byte*) print_char_cursor#4 ← ++ (byte*) print_char_cursor#15 -- pbuz1=_inc_pbuz1 
-    inc print_char_cursor
-    bne !+
-    inc print_char_cursor+1
-  !:
-  //SEG74 [33] (byte*) print_str::str#1 ← ++ (byte*) print_str::str#2 -- pbuz1=_inc_pbuz1 
-    inc str
-    bne !+
-    inc str+1
-  !:
-  //SEG75 [28] phi from print_str::@2 to print_str::@1 [phi:print_str::@2->print_str::@1]
-  //SEG76 [28] phi (byte*) print_char_cursor#15 = (byte*) print_char_cursor#4 [phi:print_str::@2->print_str::@1#0] -- register_copy 
-  //SEG77 [28] phi (byte*) print_str::str#2 = (byte*) print_str::str#1 [phi:print_str::@2->print_str::@1#1] -- register_copy 
-    jmp b1
+  //SEG24 [10] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::i1#2) ← (byte) 'b' -- pbuc1_derefidx_vbuxx=vbuc2 
+    lda #'b'
+    sta SCREEN+$28,x
+  //SEG25 [11] (byte) main::i1#1 ← ++ (byte) main::i1#2 -- vbuxx=_inc_vbuxx 
+    inx
+  //SEG26 [12] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
+    cpx #6
+    bne b2
+  //SEG27 main::@return
+  //SEG28 [13] return 
+    rts
 }
 
diff --git a/src/test/ref/localscope-loops.sym b/src/test/ref/localscope-loops.sym
index 9c1fcb3a4..4b2e2805f 100644
--- a/src/test/ref/localscope-loops.sym
+++ b/src/test/ref/localscope-loops.sym
@@ -1,55 +1,18 @@
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
+(byte*) SCREEN
+(const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) main()
 (label) main::@1
-(label) main::@3
-(label) main::@5
-(label) main::@6
-(label) main::@7
+(label) main::@2
 (label) main::@return
 (byte) main::i
-(byte) main::i#1 reg byte x 8.25
-(byte) main::i#2 reg byte x 11.0
+(byte) main::i#1 reg byte x 16.5
+(byte) main::i#2 reg byte x 16.5
 (byte) main::i1
 (byte) main::i1#1 reg byte x 16.5
-(byte) main::i1#2 reg byte x 11.0
-(const string) main::str str = (string) " xxxxx@"
-(byte*) print_char_cursor
-(byte*) print_char_cursor#15 print_char_cursor zp ZP_WORD:2 51.16666666666666
-(byte*) print_char_cursor#25 print_char_cursor zp ZP_WORD:2 22.8
-(byte*) print_char_cursor#26 print_char_cursor zp ZP_WORD:2 22.0
-(byte*~) print_char_cursor#33 print_char_cursor zp ZP_WORD:2 22.0
-(byte*~) print_char_cursor#36 print_char_cursor zp ZP_WORD:2 4.0
-(byte*) print_char_cursor#4 print_char_cursor zp ZP_WORD:2 101.0
-(byte[]) print_hextab
-(byte*) print_line_cursor
-(byte*) print_line_cursor#11 print_line_cursor zp ZP_WORD:4 204.0
-(byte*) print_line_cursor#12 print_line_cursor#12 zp ZP_WORD:6 14.954545454545455
-(byte*) print_line_cursor#19 print_line_cursor zp ZP_WORD:4 15.0
-(byte*) print_line_cursor#20 print_line_cursor zp ZP_WORD:4 22.0
-(byte*~) print_line_cursor#27 print_line_cursor zp ZP_WORD:4 11.0
-(byte*~) print_line_cursor#29 print_line_cursor zp ZP_WORD:4 4.0
-(byte*~) print_line_cursor#31 print_line_cursor zp ZP_WORD:4 202.0
-(void()) print_ln()
-(label) print_ln::@1
-(label) print_ln::@3
-(label) print_ln::@return
-(byte*) print_screen
-(void()) print_str((byte*) print_str::str)
-(label) print_str::@1
-(label) print_str::@2
-(label) print_str::@return
-(byte*) print_str::str
-(byte*) print_str::str#1 str zp ZP_WORD:4 202.0
-(byte*) print_str::str#2 str zp ZP_WORD:4 101.0
-(void()) print_str_ln((byte*) print_str_ln::str)
-(label) print_str_ln::@1
-(label) print_str_ln::@return
-(byte*) print_str_ln::str
+(byte) main::i1#2 reg byte x 16.5
 
 reg byte x [ main::i#2 main::i#1 ]
 reg byte x [ main::i1#2 main::i1#1 ]
-zp ZP_WORD:2 [ print_char_cursor#25 print_char_cursor#26 print_char_cursor#33 print_char_cursor#15 print_char_cursor#36 print_char_cursor#4 ]
-zp ZP_WORD:4 [ print_line_cursor#11 print_line_cursor#19 print_line_cursor#20 print_line_cursor#27 print_line_cursor#29 print_line_cursor#31 print_str::str#2 print_str::str#1 ]
-zp ZP_WORD:6 [ print_line_cursor#12 ]
diff --git a/src/test/ref/longbranch-interrupt-problem.cfg b/src/test/ref/longbranch-interrupt-problem.cfg
index 26b397e9c..5ad552574 100644
--- a/src/test/ref/longbranch-interrupt-problem.cfg
+++ b/src/test/ref/longbranch-interrupt-problem.cfg
@@ -1,32 +1,32 @@
 @begin: scope:[]  from
   [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   to:main::@1
-main::@1: scope:[main]  from main main::@2 main::@6
-  [5] (byte) col#12 ← phi( main/(byte) col#0 main::@6/(byte) col#1 )
+main::@1: scope:[main]  from main main::@2 main::@3
+  [5] (byte) col#12 ← phi( main/(byte) col#0 main::@3/(byte) col#1 )
   to:main::@2
 main::@2: scope:[main]  from main::@1
   [6] if((byte) col#12<=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@1
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [7] (byte) col#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@1
 irq: scope:[irq]  from
   asm { lda$dc0d  }
   [9] *((const byte*) BGCOL#0) ← (byte) col#0
   [10] if((byte) col#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto irq::@return
-  to:irq::@2
-irq::@2: scope:[irq]  from irq
+  to:irq::@1
+irq::@1: scope:[irq]  from irq
   [11] (byte) col#3 ← ++ (byte) col#0
   to:irq::@return
-irq::@return: scope:[irq]  from irq irq::@2
+irq::@return: scope:[irq]  from irq irq::@1
   [12] return 
   to:@return
diff --git a/src/test/ref/longbranch-interrupt-problem.log b/src/test/ref/longbranch-interrupt-problem.log
index 8f54d1f39..2a19af3bd 100644
--- a/src/test/ref/longbranch-interrupt-problem.log
+++ b/src/test/ref/longbranch-interrupt-problem.log
@@ -147,40 +147,43 @@ Created 1 initial phi equivalence classes
 Coalesced [5] col#17 ← col#0
 Coalesced [9] col#18 ← col#1
 Coalesced down to 1 phi equivalence classes
-Adding NOP phi() at start of @2
+Renumbering block @2 to @1
+Renumbering block main::@6 to main::@3
+Renumbering block irq::@2 to irq::@1
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   to:main::@1
-main::@1: scope:[main]  from main main::@2 main::@6
-  [5] (byte) col#12 ← phi( main/(byte) col#0 main::@6/(byte) col#1 )
+main::@1: scope:[main]  from main main::@2 main::@3
+  [5] (byte) col#12 ← phi( main/(byte) col#0 main::@3/(byte) col#1 )
   to:main::@2
 main::@2: scope:[main]  from main::@1
   [6] if((byte) col#12<=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@1
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [7] (byte) col#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@1
 irq: scope:[irq]  from
   asm { lda$dc0d  }
   [9] *((const byte*) BGCOL#0) ← (byte) col#0
   [10] if((byte) col#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto irq::@return
-  to:irq::@2
-irq::@2: scope:[irq]  from irq
+  to:irq::@1
+irq::@1: scope:[irq]  from irq
   [11] (byte) col#3 ← ++ (byte) col#0
   to:irq::@return
-irq::@return: scope:[irq]  from irq irq::@2
+irq::@return: scope:[irq]  from irq irq::@1
   [12] return 
   to:@return
 
@@ -222,15 +225,15 @@ bbegin:
 //SEG4 [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG6 @2
-b2:
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG6 @1
+b1:
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -241,10 +244,10 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  //SEG12 [5] phi from main main::@6 to main::@1 [phi:main/main::@6->main::@1]
+  //SEG12 [5] phi from main main::@3 to main::@1 [phi:main/main::@3->main::@1]
   b1_from_main:
-  b1_from_b6:
-  //SEG13 [5] phi (byte) col#12 = (byte) col#0 [phi:main/main::@6->main::@1#0] -- register_copy 
+  b1_from_b3:
+  //SEG13 [5] phi (byte) col#12 = (byte) col#0 [phi:main/main::@3->main::@1#0] -- register_copy 
     jmp b1
   //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
   b1_from_b2:
@@ -258,13 +261,13 @@ main: {
     lda #$a
     cmp col
     bcs b1_from_b2
-    jmp b6
-  //SEG18 main::@6
-  b6:
+    jmp b3
+  //SEG18 main::@3
+  b3:
   //SEG19 [7] (byte) col#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta col
-    jmp b1_from_b6
+    jmp b1_from_b3
 }
 //SEG20 irq
 irq: {
@@ -278,9 +281,9 @@ irq: {
     lda col
     cmp #0
     beq breturn
-    jmp b2
-  //SEG25 irq::@2
-  b2:
+    jmp b1
+  //SEG25 irq::@1
+  b1:
   //SEG26 [11] (byte) col#3 ← ++ (byte) col#0 -- vbuz1=_inc_vbuz2 
     ldy col
     iny
@@ -334,15 +337,15 @@ bbegin:
 //SEG4 [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG6 @2
-b2:
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG6 @1
+b1:
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -353,10 +356,10 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  //SEG12 [5] phi from main main::@6 to main::@1 [phi:main/main::@6->main::@1]
+  //SEG12 [5] phi from main main::@3 to main::@1 [phi:main/main::@3->main::@1]
   b1_from_main:
-  b1_from_b6:
-  //SEG13 [5] phi (byte) col#12 = (byte) col#0 [phi:main/main::@6->main::@1#0] -- register_copy 
+  b1_from_b3:
+  //SEG13 [5] phi (byte) col#12 = (byte) col#0 [phi:main/main::@3->main::@1#0] -- register_copy 
     jmp b1
   //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
   b1_from_b2:
@@ -370,13 +373,13 @@ main: {
     lda #$a
     cmp col
     bcs b1_from_b2
-    jmp b6
-  //SEG18 main::@6
-  b6:
+    jmp b3
+  //SEG18 main::@3
+  b3:
   //SEG19 [7] (byte) col#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta col
-    jmp b1_from_b6
+    jmp b1_from_b3
 }
 //SEG20 irq
 irq: {
@@ -390,9 +393,9 @@ irq: {
     lda col
     cmp #0
     beq breturn
-    jmp b2
-  //SEG25 irq::@2
-  b2:
+    jmp b1
+  //SEG25 irq::@1
+  b1:
   //SEG26 [11] (byte) col#3 ← ++ (byte) col#0 -- vbuz1=_inc_vbuz1 
     inc col
     jmp breturn
@@ -403,31 +406,31 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b6
-Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1 with b2
 Replacing label b1_from_b2 with b2
-Removing instruction b2_from_bbegin:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction b1_from_b2:
 Removing instruction b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction bend:
-Removing instruction b6:
-Removing instruction b2:
+Removing instruction b3:
+Removing instruction b1:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Skipping double jump to b2 in jmp b1_from_b6
+Skipping double jump to b2 in jmp b1_from_b3
 Skipping double jump to $ea81 in beq breturn
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b1_from_b6 to b1
+Relabelling long label b1_from_b3 to b1
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
@@ -438,7 +441,7 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Fixing long branch [30] beq $ea81 to bne
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -451,12 +454,12 @@ FINAL SYMBOL TABLE
 (byte) col#12 col zp ZP_BYTE:2 114.0
 (byte) col#3 col zp ZP_BYTE:2 20.0
 interrupt(KERNEL_MIN)(void()) irq()
-(label) irq::@2
+(label) irq::@1
 (label) irq::@return
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
+(label) main::@3
 
 zp ZP_BYTE:2 [ col#12 col#0 col#1 col#3 ]
 
@@ -479,11 +482,11 @@ bbegin:
 //SEG4 [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG6 @2
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG6 @1
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -492,8 +495,8 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  //SEG12 [5] phi from main main::@6 to main::@1 [phi:main/main::@6->main::@1]
-  //SEG13 [5] phi (byte) col#12 = (byte) col#0 [phi:main/main::@6->main::@1#0] -- register_copy 
+  //SEG12 [5] phi from main main::@3 to main::@1 [phi:main/main::@3->main::@1]
+  //SEG13 [5] phi (byte) col#12 = (byte) col#0 [phi:main/main::@3->main::@1#0] -- register_copy 
   //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
   //SEG15 main::@1
   //SEG16 main::@2
@@ -502,7 +505,7 @@ main: {
     lda #$a
     cmp col
     bcs b2
-  //SEG18 main::@6
+  //SEG18 main::@3
   //SEG19 [7] (byte) col#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta col
@@ -522,7 +525,7 @@ irq: {
     bne !_ea81+
     jmp $ea81
   !_ea81:
-  //SEG25 irq::@2
+  //SEG25 irq::@1
   //SEG26 [11] (byte) col#3 ← ++ (byte) col#0 -- vbuz1=_inc_vbuz1 
     inc col
   //SEG27 irq::@return
diff --git a/src/test/ref/longbranch-interrupt-problem.sym b/src/test/ref/longbranch-interrupt-problem.sym
index be97bbef4..f2d0f43c0 100644
--- a/src/test/ref/longbranch-interrupt-problem.sym
+++ b/src/test/ref/longbranch-interrupt-problem.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -11,11 +11,11 @@
 (byte) col#12 col zp ZP_BYTE:2 114.0
 (byte) col#3 col zp ZP_BYTE:2 20.0
 interrupt(KERNEL_MIN)(void()) irq()
-(label) irq::@2
+(label) irq::@1
 (label) irq::@return
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
+(label) main::@3
 
 zp ZP_BYTE:2 [ col#12 col#0 col#1 col#3 ]
diff --git a/src/test/ref/longjump2.cfg b/src/test/ref/longjump2.cfg
index d1d73cea4..b62748c03 100644
--- a/src/test/ref/longjump2.cfg
+++ b/src/test/ref/longjump2.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   [5] call long1 
   to:main::@1
diff --git a/src/test/ref/longjump2.log b/src/test/ref/longjump2.log
index 50bae0d22..af2743b66 100644
--- a/src/test/ref/longjump2.log
+++ b/src/test/ref/longjump2.log
@@ -121,8 +121,9 @@ Coalesced [24] long1::i#3 ← long1::i#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) long2::@3
 Culled Empty Block (label) long1::@3
+Renumbering block @3 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -132,14 +133,14 @@ Adding NOP phi() at start of long1
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   [5] call long1 
   to:main::@1
@@ -210,17 +211,17 @@ INITIAL ASM
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -849,17 +850,17 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1456,7 +1457,7 @@ long1: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -1467,10 +1468,10 @@ Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction long2_from_b1:
 Removing instruction b1_from_b1:
@@ -1497,7 +1498,7 @@ Fixing long branch [273] bne b1 to beq
 Fixing long branch [542] bne b1 to beq
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (void()) long1()
@@ -1535,11 +1536,11 @@ Score: 10640
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/longjump2.sym b/src/test/ref/longjump2.sym
index 7313b20dd..e27a32317 100644
--- a/src/test/ref/longjump2.sym
+++ b/src/test/ref/longjump2.sym
@@ -1,4 +1,4 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (void()) long1()
diff --git a/src/test/ref/loop-problem.cfg b/src/test/ref/loop-problem.cfg
index 13b14e5c6..3a4ade277 100644
--- a/src/test/ref/loop-problem.cfg
+++ b/src/test/ref/loop-problem.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] *((const byte*) SCREEN#0) ← (byte) '0'
   [5] call d 
   to:main::@1
@@ -21,15 +21,15 @@ main::@return: scope:[main]  from main::@1
 b: scope:[b]  from main::@1
   [9] phi()
   to:b::@1
-b::@1: scope:[b]  from b b::@3
-  [10] (byte) b::i#2 ← phi( b/(byte/signed byte/word/signed word/dword/signed dword) 0 b::@3/(byte) b::i#1 )
+b::@1: scope:[b]  from b b::@2
+  [10] (byte) b::i#2 ← phi( b/(byte/signed byte/word/signed word/dword/signed dword) 0 b::@2/(byte) b::i#1 )
   [11] call d 
-  to:b::@3
-b::@3: scope:[b]  from b::@1
+  to:b::@2
+b::@2: scope:[b]  from b::@1
   [12] (byte) b::i#1 ← ++ (byte) b::i#2
   [13] if((byte) b::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto b::@1
   to:b::@return
-b::@return: scope:[b]  from b::@3
+b::@return: scope:[b]  from b::@2
   [14] return 
   to:@return
 d: scope:[d]  from b::@1 main
diff --git a/src/test/ref/loop-problem.log b/src/test/ref/loop-problem.log
index 8952b03bc..4df9f9d73 100644
--- a/src/test/ref/loop-problem.log
+++ b/src/test/ref/loop-problem.log
@@ -99,8 +99,10 @@ Created 1 initial phi equivalence classes
 Coalesced [15] b::i#4 ← b::i#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) b::@4
+Renumbering block @3 to @1
+Renumbering block b::@3 to b::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of b
@@ -108,14 +110,14 @@ Adding NOP phi() at start of b
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] *((const byte*) SCREEN#0) ← (byte) '0'
   [5] call d 
   to:main::@1
@@ -129,15 +131,15 @@ main::@return: scope:[main]  from main::@1
 b: scope:[b]  from main::@1
   [9] phi()
   to:b::@1
-b::@1: scope:[b]  from b b::@3
-  [10] (byte) b::i#2 ← phi( b/(byte/signed byte/word/signed word/dword/signed dword) 0 b::@3/(byte) b::i#1 )
+b::@1: scope:[b]  from b b::@2
+  [10] (byte) b::i#2 ← phi( b/(byte/signed byte/word/signed word/dword/signed dword) 0 b::@2/(byte) b::i#1 )
   [11] call d 
-  to:b::@3
-b::@3: scope:[b]  from b::@1
+  to:b::@2
+b::@2: scope:[b]  from b::@1
   [12] (byte) b::i#1 ← ++ (byte) b::i#2
   [13] if((byte) b::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto b::@1
   to:b::@return
-b::@return: scope:[b]  from b::@3
+b::@return: scope:[b]  from b::@2
   [14] return 
   to:@return
 d: scope:[d]  from b::@1 main
@@ -147,7 +149,7 @@ d::@return: scope:[d]  from d
   [16] return 
   to:@return
 
-null depth in calling loop Loop head: b::@1 tails: b::@3 blocks: b::@3 b::@1  in scope d
+null depth in calling loop Loop head: b::@1 tails: b::@2 blocks: b::@2 b::@1  in scope d
 
 VARIABLE REGISTER WEIGHTS
 (byte*) SCREEN
@@ -175,15 +177,15 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -218,23 +220,23 @@ b: {
     lda #0
     sta i
     jmp b1
-  //SEG21 [10] phi from b::@3 to b::@1 [phi:b::@3->b::@1]
-  b1_from_b3:
-  //SEG22 [10] phi (byte) b::i#2 = (byte) b::i#1 [phi:b::@3->b::@1#0] -- register_copy 
+  //SEG21 [10] phi from b::@2 to b::@1 [phi:b::@2->b::@1]
+  b1_from_b2:
+  //SEG22 [10] phi (byte) b::i#2 = (byte) b::i#1 [phi:b::@2->b::@1#0] -- register_copy 
     jmp b1
   //SEG23 b::@1
   b1:
   //SEG24 [11] call d 
     jsr d
-    jmp b3
-  //SEG25 b::@3
-  b3:
+    jmp b2
+  //SEG25 b::@2
+  b2:
   //SEG26 [12] (byte) b::i#1 ← ++ (byte) b::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG27 [13] if((byte) b::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto b::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp i
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG28 b::@return
   breturn:
@@ -278,15 +280,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -319,22 +321,22 @@ b: {
   //SEG20 [10] phi (byte) b::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:b->b::@1#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
-  //SEG21 [10] phi from b::@3 to b::@1 [phi:b::@3->b::@1]
-  b1_from_b3:
-  //SEG22 [10] phi (byte) b::i#2 = (byte) b::i#1 [phi:b::@3->b::@1#0] -- register_copy 
+  //SEG21 [10] phi from b::@2 to b::@1 [phi:b::@2->b::@1]
+  b1_from_b2:
+  //SEG22 [10] phi (byte) b::i#2 = (byte) b::i#1 [phi:b::@2->b::@1#0] -- register_copy 
     jmp b1
   //SEG23 b::@1
   b1:
   //SEG24 [11] call d 
     jsr d
-    jmp b3
-  //SEG25 b::@3
-  b3:
+    jmp b2
+  //SEG25 b::@2
+  b2:
   //SEG26 [12] (byte) b::i#1 ← ++ (byte) b::i#2 -- vbuxx=_inc_vbuxx 
     inx
   //SEG27 [13] if((byte) b::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto b::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #4
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG28 b::@return
   breturn:
@@ -353,28 +355,28 @@ d: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1_from_b3 with b1
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction bend_from_b3:
+Replacing label b1_from_b2 with b1
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction b_from_b1:
-Removing instruction b1_from_b3:
+Removing instruction b1_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1:
 Removing instruction breturn:
 Removing instruction b1_from_b:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -387,14 +389,14 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) b()
 (label) b::@1
-(label) b::@3
+(label) b::@2
 (label) b::@return
 (byte) b::i
 (byte) b::i#1 reg byte x 16.5
@@ -420,10 +422,10 @@ Score: 187
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -446,13 +448,13 @@ b: {
   //SEG19 [10] phi from b to b::@1 [phi:b->b::@1]
   //SEG20 [10] phi (byte) b::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:b->b::@1#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG21 [10] phi from b::@3 to b::@1 [phi:b::@3->b::@1]
-  //SEG22 [10] phi (byte) b::i#2 = (byte) b::i#1 [phi:b::@3->b::@1#0] -- register_copy 
+  //SEG21 [10] phi from b::@2 to b::@1 [phi:b::@2->b::@1]
+  //SEG22 [10] phi (byte) b::i#2 = (byte) b::i#1 [phi:b::@2->b::@1#0] -- register_copy 
   //SEG23 b::@1
   b1:
   //SEG24 [11] call d 
     jsr d
-  //SEG25 b::@3
+  //SEG25 b::@2
   //SEG26 [12] (byte) b::i#1 ← ++ (byte) b::i#2 -- vbuxx=_inc_vbuxx 
     inx
   //SEG27 [13] if((byte) b::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto b::@1 -- vbuxx_neq_vbuc1_then_la1 
diff --git a/src/test/ref/loop-problem.sym b/src/test/ref/loop-problem.sym
index 38776e9c9..dfc2e4ff5 100644
--- a/src/test/ref/loop-problem.sym
+++ b/src/test/ref/loop-problem.sym
@@ -1,11 +1,11 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) b()
 (label) b::@1
-(label) b::@3
+(label) b::@2
 (label) b::@return
 (byte) b::i
 (byte) b::i#1 reg byte x 16.5
diff --git a/src/test/ref/loop-problem2.asm b/src/test/ref/loop-problem2.asm
index 237b0df69..c15ea5da2 100644
--- a/src/test/ref/loop-problem2.asm
+++ b/src/test/ref/loop-problem2.asm
@@ -9,17 +9,17 @@ main: {
     rts
 }
 mode_ctrl: {
-  b2:
+  b1:
     lda BORDERCOL
     cmp #$ff
-    beq b8
+    beq b3
     lda #3
     sta BORDERCOL
-    jmp b2
-  b8:
+    jmp b1
+  b3:
     lda #2
     sta BORDERCOL
-    jmp b2
+    jmp b1
 }
 print_cls: {
     .label sc = 2
diff --git a/src/test/ref/loop-problem2.cfg b/src/test/ref/loop-problem2.cfg
index 2ee086cb2..14d73d621 100644
--- a/src/test/ref/loop-problem2.cfg
+++ b/src/test/ref/loop-problem2.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
@@ -20,17 +20,17 @@ main::@return: scope:[main]  from main::@1
   to:@return
 mode_ctrl: scope:[mode_ctrl]  from main::@1
   [9] phi()
-  to:mode_ctrl::@2
-mode_ctrl::@2: scope:[mode_ctrl]  from mode_ctrl mode_ctrl::@6 mode_ctrl::@8
+  to:mode_ctrl::@1
+mode_ctrl::@1: scope:[mode_ctrl]  from mode_ctrl mode_ctrl::@2 mode_ctrl::@3
   [10] (byte) mode_ctrl::before#0 ← *((const byte*) BORDERCOL#0)
-  [11] if((byte) mode_ctrl::before#0==(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@8
-  to:mode_ctrl::@6
-mode_ctrl::@6: scope:[mode_ctrl]  from mode_ctrl::@2
+  [11] if((byte) mode_ctrl::before#0==(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@3
+  to:mode_ctrl::@2
+mode_ctrl::@2: scope:[mode_ctrl]  from mode_ctrl::@1
   [12] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3
-  to:mode_ctrl::@2
-mode_ctrl::@8: scope:[mode_ctrl]  from mode_ctrl::@2
+  to:mode_ctrl::@1
+mode_ctrl::@3: scope:[mode_ctrl]  from mode_ctrl::@1
   [13] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
-  to:mode_ctrl::@2
+  to:mode_ctrl::@1
 print_cls: scope:[print_cls]  from main
   [14] phi()
   to:print_cls::@1
diff --git a/src/test/ref/loop-problem2.log b/src/test/ref/loop-problem2.log
index 0cda89cc3..e834d5927 100644
--- a/src/test/ref/loop-problem2.log
+++ b/src/test/ref/loop-problem2.log
@@ -125,8 +125,12 @@ Created 1 initial phi equivalence classes
 Coalesced [20] print_cls::sc#3 ← print_cls::sc#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) print_cls::@3
+Renumbering block @3 to @1
+Renumbering block mode_ctrl::@2 to mode_ctrl::@1
+Renumbering block mode_ctrl::@6 to mode_ctrl::@2
+Renumbering block mode_ctrl::@8 to mode_ctrl::@3
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -136,14 +140,14 @@ Adding NOP phi() at start of print_cls
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
@@ -156,17 +160,17 @@ main::@return: scope:[main]  from main::@1
   to:@return
 mode_ctrl: scope:[mode_ctrl]  from main::@1
   [9] phi()
-  to:mode_ctrl::@2
-mode_ctrl::@2: scope:[mode_ctrl]  from mode_ctrl mode_ctrl::@6 mode_ctrl::@8
+  to:mode_ctrl::@1
+mode_ctrl::@1: scope:[mode_ctrl]  from mode_ctrl mode_ctrl::@2 mode_ctrl::@3
   [10] (byte) mode_ctrl::before#0 ← *((const byte*) BORDERCOL#0)
-  [11] if((byte) mode_ctrl::before#0==(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@8
-  to:mode_ctrl::@6
-mode_ctrl::@6: scope:[mode_ctrl]  from mode_ctrl::@2
+  [11] if((byte) mode_ctrl::before#0==(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@3
+  to:mode_ctrl::@2
+mode_ctrl::@2: scope:[mode_ctrl]  from mode_ctrl::@1
   [12] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3
-  to:mode_ctrl::@2
-mode_ctrl::@8: scope:[mode_ctrl]  from mode_ctrl::@2
+  to:mode_ctrl::@1
+mode_ctrl::@3: scope:[mode_ctrl]  from mode_ctrl::@1
   [13] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
-  to:mode_ctrl::@2
+  to:mode_ctrl::@1
 print_cls: scope:[print_cls]  from main
   [14] phi()
   to:print_cls::@1
@@ -213,17 +217,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -251,29 +255,29 @@ main: {
 //SEG19 mode_ctrl
 mode_ctrl: {
     .label before = 4
-    jmp b2
-  //SEG20 mode_ctrl::@2
-  b2:
+    jmp b1
+  //SEG20 mode_ctrl::@1
+  b1:
   //SEG21 [10] (byte) mode_ctrl::before#0 ← *((const byte*) BORDERCOL#0) -- vbuz1=_deref_pbuc1 
     lda BORDERCOL
     sta before
-  //SEG22 [11] if((byte) mode_ctrl::before#0==(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@8 -- vbuz1_eq_vbuc1_then_la1 
+  //SEG22 [11] if((byte) mode_ctrl::before#0==(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@3 -- vbuz1_eq_vbuc1_then_la1 
     lda #$ff
     cmp before
-    beq b8
-    jmp b6
-  //SEG23 mode_ctrl::@6
-  b6:
+    beq b3
+    jmp b2
+  //SEG23 mode_ctrl::@2
+  b2:
   //SEG24 [12] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3 -- _deref_pbuc1=vbuc2 
     lda #3
     sta BORDERCOL
-    jmp b2
-  //SEG25 mode_ctrl::@8
-  b8:
+    jmp b1
+  //SEG25 mode_ctrl::@3
+  b3:
   //SEG26 [13] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BORDERCOL
-    jmp b2
+    jmp b1
 }
 //SEG27 print_cls
 print_cls: {
@@ -345,17 +349,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -382,27 +386,27 @@ main: {
 }
 //SEG19 mode_ctrl
 mode_ctrl: {
-    jmp b2
-  //SEG20 mode_ctrl::@2
-  b2:
+    jmp b1
+  //SEG20 mode_ctrl::@1
+  b1:
   //SEG21 [10] (byte) mode_ctrl::before#0 ← *((const byte*) BORDERCOL#0) -- vbuaa=_deref_pbuc1 
     lda BORDERCOL
-  //SEG22 [11] if((byte) mode_ctrl::before#0==(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@8 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG22 [11] if((byte) mode_ctrl::before#0==(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@3 -- vbuaa_eq_vbuc1_then_la1 
     cmp #$ff
-    beq b8
-    jmp b6
-  //SEG23 mode_ctrl::@6
-  b6:
+    beq b3
+    jmp b2
+  //SEG23 mode_ctrl::@2
+  b2:
   //SEG24 [12] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3 -- _deref_pbuc1=vbuc2 
     lda #3
     sta BORDERCOL
-    jmp b2
-  //SEG25 mode_ctrl::@8
-  b8:
+    jmp b1
+  //SEG25 mode_ctrl::@3
+  b3:
   //SEG26 [13] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BORDERCOL
-    jmp b2
+    jmp b1
 }
 //SEG27 print_cls
 print_cls: {
@@ -445,21 +449,21 @@ print_cls: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
+Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b6
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction mode_ctrl_from_b1:
 Removing instruction b1_from_b1:
@@ -468,7 +472,7 @@ Removing instruction bend:
 Removing instruction print_cls_from_main:
 Removing instruction b1:
 Removing instruction breturn:
-Removing instruction b6:
+Removing instruction b2:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -481,7 +485,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BORDERCOL
@@ -492,9 +496,9 @@ FINAL SYMBOL TABLE
 (label) main::@1
 (label) main::@return
 (void()) mode_ctrl()
+(label) mode_ctrl::@1
 (label) mode_ctrl::@2
-(label) mode_ctrl::@6
-(label) mode_ctrl::@8
+(label) mode_ctrl::@3
 (byte) mode_ctrl::before
 (byte) mode_ctrl::before#0 reg byte a 22.0
 (void()) print_cls()
@@ -520,11 +524,11 @@ Score: 764
   .label BORDERCOL = $d020
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -542,24 +546,24 @@ main: {
 }
 //SEG19 mode_ctrl
 mode_ctrl: {
-  //SEG20 mode_ctrl::@2
-  b2:
+  //SEG20 mode_ctrl::@1
+  b1:
   //SEG21 [10] (byte) mode_ctrl::before#0 ← *((const byte*) BORDERCOL#0) -- vbuaa=_deref_pbuc1 
     lda BORDERCOL
-  //SEG22 [11] if((byte) mode_ctrl::before#0==(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@8 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG22 [11] if((byte) mode_ctrl::before#0==(byte/word/signed word/dword/signed dword) $ff) goto mode_ctrl::@3 -- vbuaa_eq_vbuc1_then_la1 
     cmp #$ff
-    beq b8
-  //SEG23 mode_ctrl::@6
+    beq b3
+  //SEG23 mode_ctrl::@2
   //SEG24 [12] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 3 -- _deref_pbuc1=vbuc2 
     lda #3
     sta BORDERCOL
-    jmp b2
-  //SEG25 mode_ctrl::@8
-  b8:
+    jmp b1
+  //SEG25 mode_ctrl::@3
+  b3:
   //SEG26 [13] *((const byte*) BORDERCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BORDERCOL
-    jmp b2
+    jmp b1
 }
 //SEG27 print_cls
 print_cls: {
diff --git a/src/test/ref/loop-problem2.sym b/src/test/ref/loop-problem2.sym
index ed214bf1d..f9b5eaefc 100644
--- a/src/test/ref/loop-problem2.sym
+++ b/src/test/ref/loop-problem2.sym
@@ -1,4 +1,4 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BORDERCOL
@@ -9,9 +9,9 @@
 (label) main::@1
 (label) main::@return
 (void()) mode_ctrl()
+(label) mode_ctrl::@1
 (label) mode_ctrl::@2
-(label) mode_ctrl::@6
-(label) mode_ctrl::@8
+(label) mode_ctrl::@3
 (byte) mode_ctrl::before
 (byte) mode_ctrl::before#0 reg byte a 22.0
 (void()) print_cls()
diff --git a/src/test/ref/loopnest.cfg b/src/test/ref/loopnest.cfg
index fd08cebb6..176022406 100644
--- a/src/test/ref/loopnest.cfg
+++ b/src/test/ref/loopnest.cfg
@@ -1,24 +1,24 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@3/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@2/(byte) main::i#1 )
   [6] call nest 
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [7] (byte) main::i#1 ← -- (byte) main::i#2
   [8] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [9] return 
   to:@return
 nest: scope:[nest]  from main::@1
diff --git a/src/test/ref/loopnest.log b/src/test/ref/loopnest.log
index b0a29e629..d6e9b5389 100644
--- a/src/test/ref/loopnest.log
+++ b/src/test/ref/loopnest.log
@@ -99,8 +99,10 @@ Coalesced [17] nest::j#3 ← nest::j#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@4
 Culled Empty Block (label) nest::@3
+Renumbering block @2 to @1
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of nest
@@ -108,25 +110,25 @@ Adding NOP phi() at start of nest
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@3/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@2/(byte) main::i#1 )
   [6] call nest 
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [7] (byte) main::i#1 ← -- (byte) main::i#2
   [8] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [9] return 
   to:@return
 nest: scope:[nest]  from main::@1
@@ -173,17 +175,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -196,9 +198,9 @@ main: {
     lda #$64
     sta i
     jmp b1
-  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -206,14 +208,14 @@ main: {
   //SEG17 [10] phi from main::@1 to nest [phi:main::@1->nest]
   nest_from_b1:
     jsr nest
-    jmp b3
-  //SEG18 main::@3
-  b3:
+    jmp b2
+  //SEG18 main::@2
+  b2:
   //SEG19 [7] (byte) main::i#1 ← -- (byte) main::i#2 -- vbuz1=_dec_vbuz1 
     dec i
   //SEG20 [8] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuz1_gt_0_then_la1 
     lda i
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG21 main::@return
   breturn:
@@ -273,17 +275,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -294,9 +296,9 @@ main: {
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@1#0] -- vbuyy=vbuc1 
     ldy #$64
     jmp b1
-  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -304,14 +306,14 @@ main: {
   //SEG17 [10] phi from main::@1 to nest [phi:main::@1->nest]
   nest_from_b1:
     jsr nest
-    jmp b3
-  //SEG18 main::@3
-  b3:
+    jmp b2
+  //SEG18 main::@2
+  b2:
   //SEG19 [7] (byte) main::i#1 ← -- (byte) main::i#2 -- vbuyy=_dec_vbuyy 
     dey
   //SEG20 [8] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuyy_gt_0_then_la1 
     cpy #0
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG21 main::@return
   breturn:
@@ -346,27 +348,27 @@ nest: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1_from_b3 with b1
+Replacing label b1_from_b2 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
-Removing instruction b1_from_b3:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b2:
 Removing instruction nest_from_b1:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction b1_from_nest:
 Removing instruction breturn:
@@ -381,14 +383,14 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte y 16.5
@@ -415,25 +417,25 @@ Score: 1353
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@1#0] -- vbuyy=vbuc1 
     ldy #$64
-  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
   //SEG15 main::@1
   b1:
   //SEG16 [6] call nest 
   //SEG17 [10] phi from main::@1 to nest [phi:main::@1->nest]
     jsr nest
-  //SEG18 main::@3
+  //SEG18 main::@2
   //SEG19 [7] (byte) main::i#1 ← -- (byte) main::i#2 -- vbuyy=_dec_vbuyy 
     dey
   //SEG20 [8] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuyy_gt_0_then_la1 
diff --git a/src/test/ref/loopnest.sym b/src/test/ref/loopnest.sym
index 499444887..819a1d861 100644
--- a/src/test/ref/loopnest.sym
+++ b/src/test/ref/loopnest.sym
@@ -1,11 +1,11 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte y 16.5
diff --git a/src/test/ref/loopnest2.cfg b/src/test/ref/loopnest2.cfg
index 9d05d55fb..00c378958 100644
--- a/src/test/ref/loopnest2.cfg
+++ b/src/test/ref/loopnest2.cfg
@@ -1,27 +1,27 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@3
   [5] (byte) main::i#5 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@3/(byte) main::i#1 )
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@5
-  [6] (byte) main::j#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@5/(byte) main::j#1 )
+main::@2: scope:[main]  from main::@1 main::@4
+  [6] (byte) main::j#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@4/(byte) main::j#1 )
   [7] call nest1 
-  to:main::@5
-main::@5: scope:[main]  from main::@2
+  to:main::@4
+main::@4: scope:[main]  from main::@2
   [8] (byte) main::j#1 ← -- (byte) main::j#2
   [9] if((byte) main::j#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@3
-main::@3: scope:[main]  from main::@5
+main::@3: scope:[main]  from main::@4
   [10] (byte) main::i#1 ← -- (byte) main::i#5
   [11] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
   to:main::@return
@@ -34,15 +34,15 @@ nest1: scope:[nest1]  from main::@2
 nest1::@1: scope:[nest1]  from nest1 nest1::@3
   [14] (byte) nest1::i#5 ← phi( nest1/(byte/signed byte/word/signed word/dword/signed dword) $64 nest1::@3/(byte) nest1::i#1 )
   to:nest1::@2
-nest1::@2: scope:[nest1]  from nest1::@1 nest1::@5
-  [15] (byte) nest1::j#2 ← phi( nest1::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 nest1::@5/(byte) nest1::j#1 )
+nest1::@2: scope:[nest1]  from nest1::@1 nest1::@4
+  [15] (byte) nest1::j#2 ← phi( nest1::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 nest1::@4/(byte) nest1::j#1 )
   [16] call nest2 
-  to:nest1::@5
-nest1::@5: scope:[nest1]  from nest1::@2
+  to:nest1::@4
+nest1::@4: scope:[nest1]  from nest1::@2
   [17] (byte) nest1::j#1 ← -- (byte) nest1::j#2
   [18] if((byte) nest1::j#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto nest1::@2
   to:nest1::@3
-nest1::@3: scope:[nest1]  from nest1::@5
+nest1::@3: scope:[nest1]  from nest1::@4
   [19] (byte) nest1::i#1 ← -- (byte) nest1::i#5
   [20] if((byte) nest1::i#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto nest1::@1
   to:nest1::@return
diff --git a/src/test/ref/loopnest2.log b/src/test/ref/loopnest2.log
index 2df8cb5ab..78ca27b09 100644
--- a/src/test/ref/loopnest2.log
+++ b/src/test/ref/loopnest2.log
@@ -231,8 +231,11 @@ Culled Empty Block (label) nest1::@6
 Culled Empty Block (label) nest1::@7
 Culled Empty Block (label) nest2::@5
 Culled Empty Block (label) nest2::@6
+Renumbering block @3 to @1
+Renumbering block main::@5 to main::@4
+Renumbering block nest1::@5 to nest1::@4
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of nest1
@@ -241,28 +244,28 @@ Adding NOP phi() at start of nest2
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@3
   [5] (byte) main::i#5 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@3/(byte) main::i#1 )
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@5
-  [6] (byte) main::j#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@5/(byte) main::j#1 )
+main::@2: scope:[main]  from main::@1 main::@4
+  [6] (byte) main::j#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@4/(byte) main::j#1 )
   [7] call nest1 
-  to:main::@5
-main::@5: scope:[main]  from main::@2
+  to:main::@4
+main::@4: scope:[main]  from main::@2
   [8] (byte) main::j#1 ← -- (byte) main::j#2
   [9] if((byte) main::j#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@3
-main::@3: scope:[main]  from main::@5
+main::@3: scope:[main]  from main::@4
   [10] (byte) main::i#1 ← -- (byte) main::i#5
   [11] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
   to:main::@return
@@ -275,15 +278,15 @@ nest1: scope:[nest1]  from main::@2
 nest1::@1: scope:[nest1]  from nest1 nest1::@3
   [14] (byte) nest1::i#5 ← phi( nest1/(byte/signed byte/word/signed word/dword/signed dword) $64 nest1::@3/(byte) nest1::i#1 )
   to:nest1::@2
-nest1::@2: scope:[nest1]  from nest1::@1 nest1::@5
-  [15] (byte) nest1::j#2 ← phi( nest1::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 nest1::@5/(byte) nest1::j#1 )
+nest1::@2: scope:[nest1]  from nest1::@1 nest1::@4
+  [15] (byte) nest1::j#2 ← phi( nest1::@1/(byte/signed byte/word/signed word/dword/signed dword) $64 nest1::@4/(byte) nest1::j#1 )
   [16] call nest2 
-  to:nest1::@5
-nest1::@5: scope:[nest1]  from nest1::@2
+  to:nest1::@4
+nest1::@4: scope:[nest1]  from nest1::@2
   [17] (byte) nest1::j#1 ← -- (byte) nest1::j#2
   [18] if((byte) nest1::j#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto nest1::@2
   to:nest1::@3
-nest1::@3: scope:[nest1]  from nest1::@5
+nest1::@3: scope:[nest1]  from nest1::@4
   [19] (byte) nest1::i#1 ← -- (byte) nest1::i#5
   [20] if((byte) nest1::i#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto nest1::@1
   to:nest1::@return
@@ -366,17 +369,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -402,9 +405,9 @@ main: {
     lda #$64
     sta j
     jmp b2
-  //SEG18 [6] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
-  b2_from_b5:
-  //SEG19 [6] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@5->main::@2#0] -- register_copy 
+  //SEG18 [6] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG19 [6] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@4->main::@2#0] -- register_copy 
     jmp b2
   //SEG20 main::@2
   b2:
@@ -412,14 +415,14 @@ main: {
   //SEG22 [13] phi from main::@2 to nest1 [phi:main::@2->nest1]
   nest1_from_b2:
     jsr nest1
-    jmp b5
-  //SEG23 main::@5
-  b5:
+    jmp b4
+  //SEG23 main::@4
+  b4:
   //SEG24 [8] (byte) main::j#1 ← -- (byte) main::j#2 -- vbuz1=_dec_vbuz1 
     dec j
   //SEG25 [9] if((byte) main::j#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2 -- vbuz1_gt_0_then_la1 
     lda j
-    bne b2_from_b5
+    bne b2_from_b4
     jmp b3
   //SEG26 main::@3
   b3:
@@ -456,9 +459,9 @@ nest1: {
     lda #$64
     sta j
     jmp b2
-  //SEG39 [15] phi from nest1::@5 to nest1::@2 [phi:nest1::@5->nest1::@2]
-  b2_from_b5:
-  //SEG40 [15] phi (byte) nest1::j#2 = (byte) nest1::j#1 [phi:nest1::@5->nest1::@2#0] -- register_copy 
+  //SEG39 [15] phi from nest1::@4 to nest1::@2 [phi:nest1::@4->nest1::@2]
+  b2_from_b4:
+  //SEG40 [15] phi (byte) nest1::j#2 = (byte) nest1::j#1 [phi:nest1::@4->nest1::@2#0] -- register_copy 
     jmp b2
   //SEG41 nest1::@2
   b2:
@@ -466,14 +469,14 @@ nest1: {
   //SEG43 [22] phi from nest1::@2 to nest2 [phi:nest1::@2->nest2]
   nest2_from_b2:
     jsr nest2
-    jmp b5
-  //SEG44 nest1::@5
-  b5:
+    jmp b4
+  //SEG44 nest1::@4
+  b4:
   //SEG45 [17] (byte) nest1::j#1 ← -- (byte) nest1::j#2 -- vbuz1=_dec_vbuz1 
     dec j
   //SEG46 [18] if((byte) nest1::j#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto nest1::@2 -- vbuz1_gt_0_then_la1 
     lda j
-    bne b2_from_b5
+    bne b2_from_b4
     jmp b3
   //SEG47 nest1::@3
   b3:
@@ -574,17 +577,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -610,9 +613,9 @@ main: {
     lda #$64
     sta j
     jmp b2
-  //SEG18 [6] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
-  b2_from_b5:
-  //SEG19 [6] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@5->main::@2#0] -- register_copy 
+  //SEG18 [6] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG19 [6] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@4->main::@2#0] -- register_copy 
     jmp b2
   //SEG20 main::@2
   b2:
@@ -620,14 +623,14 @@ main: {
   //SEG22 [13] phi from main::@2 to nest1 [phi:main::@2->nest1]
   nest1_from_b2:
     jsr nest1
-    jmp b5
-  //SEG23 main::@5
-  b5:
+    jmp b4
+  //SEG23 main::@4
+  b4:
   //SEG24 [8] (byte) main::j#1 ← -- (byte) main::j#2 -- vbuz1=_dec_vbuz1 
     dec j
   //SEG25 [9] if((byte) main::j#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2 -- vbuz1_gt_0_then_la1 
     lda j
-    bne b2_from_b5
+    bne b2_from_b4
     jmp b3
   //SEG26 main::@3
   b3:
@@ -662,9 +665,9 @@ nest1: {
   //SEG38 [15] phi (byte) nest1::j#2 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:nest1::@1->nest1::@2#0] -- vbuaa=vbuc1 
     lda #$64
     jmp b2
-  //SEG39 [15] phi from nest1::@5 to nest1::@2 [phi:nest1::@5->nest1::@2]
-  b2_from_b5:
-  //SEG40 [15] phi (byte) nest1::j#2 = (byte) nest1::j#1 [phi:nest1::@5->nest1::@2#0] -- register_copy 
+  //SEG39 [15] phi from nest1::@4 to nest1::@2 [phi:nest1::@4->nest1::@2]
+  b2_from_b4:
+  //SEG40 [15] phi (byte) nest1::j#2 = (byte) nest1::j#1 [phi:nest1::@4->nest1::@2#0] -- register_copy 
     jmp b2
   //SEG41 nest1::@2
   b2:
@@ -672,15 +675,15 @@ nest1: {
   //SEG43 [22] phi from nest1::@2 to nest2 [phi:nest1::@2->nest2]
   nest2_from_b2:
     jsr nest2
-    jmp b5
-  //SEG44 nest1::@5
-  b5:
+    jmp b4
+  //SEG44 nest1::@4
+  b4:
   //SEG45 [17] (byte) nest1::j#1 ← -- (byte) nest1::j#2 -- vbuaa=_dec_vbuaa 
     sec
     sbc #1
   //SEG46 [18] if((byte) nest1::j#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto nest1::@2 -- vbuaa_gt_0_then_la1 
     cmp #0
-    bne b2_from_b5
+    bne b2_from_b4
     jmp b3
   //SEG47 nest1::@3
   b3:
@@ -742,16 +745,16 @@ nest2: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -759,23 +762,23 @@ Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b3 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b3 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction nest1_from_b2:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction nest2_from_b2:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
@@ -783,11 +786,11 @@ Removing instruction b2_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_nest1:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_nest2:
@@ -808,7 +811,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -817,7 +820,7 @@ FINAL SYMBOL TABLE
 (label) main::@1
 (label) main::@2
 (label) main::@3
-(label) main::@5
+(label) main::@4
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 i zp ZP_BYTE:2 16.5
@@ -829,7 +832,7 @@ FINAL SYMBOL TABLE
 (label) nest1::@1
 (label) nest1::@2
 (label) nest1::@3
-(label) nest1::@5
+(label) nest1::@4
 (label) nest1::@return
 (byte) nest1::i
 (byte) nest1::i#1 i zp ZP_BYTE:4 1501.5
@@ -868,11 +871,11 @@ Score: 13472235
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -890,14 +893,14 @@ main: {
   //SEG17 [6] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
     lda #$64
     sta j
-  //SEG18 [6] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
-  //SEG19 [6] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@5->main::@2#0] -- register_copy 
+  //SEG18 [6] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  //SEG19 [6] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@4->main::@2#0] -- register_copy 
   //SEG20 main::@2
   b2:
   //SEG21 [7] call nest1 
   //SEG22 [13] phi from main::@2 to nest1 [phi:main::@2->nest1]
     jsr nest1
-  //SEG23 main::@5
+  //SEG23 main::@4
   //SEG24 [8] (byte) main::j#1 ← -- (byte) main::j#2 -- vbuz1=_dec_vbuz1 
     dec j
   //SEG25 [9] if((byte) main::j#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2 -- vbuz1_gt_0_then_la1 
@@ -927,14 +930,14 @@ nest1: {
   //SEG37 [15] phi from nest1::@1 to nest1::@2 [phi:nest1::@1->nest1::@2]
   //SEG38 [15] phi (byte) nest1::j#2 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:nest1::@1->nest1::@2#0] -- vbuaa=vbuc1 
     lda #$64
-  //SEG39 [15] phi from nest1::@5 to nest1::@2 [phi:nest1::@5->nest1::@2]
-  //SEG40 [15] phi (byte) nest1::j#2 = (byte) nest1::j#1 [phi:nest1::@5->nest1::@2#0] -- register_copy 
+  //SEG39 [15] phi from nest1::@4 to nest1::@2 [phi:nest1::@4->nest1::@2]
+  //SEG40 [15] phi (byte) nest1::j#2 = (byte) nest1::j#1 [phi:nest1::@4->nest1::@2#0] -- register_copy 
   //SEG41 nest1::@2
   b2:
   //SEG42 [16] call nest2 
   //SEG43 [22] phi from nest1::@2 to nest2 [phi:nest1::@2->nest2]
     jsr nest2
-  //SEG44 nest1::@5
+  //SEG44 nest1::@4
   //SEG45 [17] (byte) nest1::j#1 ← -- (byte) nest1::j#2 -- vbuaa=_dec_vbuaa 
     sec
     sbc #1
diff --git a/src/test/ref/loopnest2.sym b/src/test/ref/loopnest2.sym
index cfa67c94b..7fe85f541 100644
--- a/src/test/ref/loopnest2.sym
+++ b/src/test/ref/loopnest2.sym
@@ -1,4 +1,4 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -7,7 +7,7 @@
 (label) main::@1
 (label) main::@2
 (label) main::@3
-(label) main::@5
+(label) main::@4
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 i zp ZP_BYTE:2 16.5
@@ -19,7 +19,7 @@
 (label) nest1::@1
 (label) nest1::@2
 (label) nest1::@3
-(label) nest1::@5
+(label) nest1::@4
 (label) nest1::@return
 (byte) nest1::i
 (byte) nest1::i#1 i zp ZP_BYTE:4 1501.5
diff --git a/src/test/ref/loopnest3.cfg b/src/test/ref/loopnest3.cfg
index 87753d46f..b0aabd515 100644
--- a/src/test/ref/loopnest3.cfg
+++ b/src/test/ref/loopnest3.cfg
@@ -1,25 +1,25 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#1 )
   [6] (byte) b::i#0 ← (byte) main::i#2
   [7] call b 
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] (byte) main::i#1 ← ++ (byte) main::i#2
   [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [10] return 
   to:@return
 b: scope:[b]  from main::@1
diff --git a/src/test/ref/loopnest3.log b/src/test/ref/loopnest3.log
index 190736ace..12acbd262 100644
--- a/src/test/ref/loopnest3.log
+++ b/src/test/ref/loopnest3.log
@@ -138,8 +138,10 @@ Coalesced [21] c::j#3 ← c::j#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@4
 Culled Empty Block (label) c::@3
+Renumbering block @3 to @1
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of c
@@ -147,26 +149,26 @@ Adding NOP phi() at start of c
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#1 )
   [6] (byte) b::i#0 ← (byte) main::i#2
   [7] call b 
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] (byte) main::i#1 ← ++ (byte) main::i#2
   [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [10] return 
   to:@return
 b: scope:[b]  from main::@1
@@ -231,17 +233,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -254,9 +256,9 @@ main: {
     lda #0
     sta i
     jmp b1
-  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -265,15 +267,15 @@ main: {
     sta b.i
   //SEG17 [7] call b 
     jsr b
-    jmp b3
-  //SEG18 main::@3
-  b3:
+    jmp b2
+  //SEG18 main::@2
+  b2:
   //SEG19 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG20 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$65
     cmp i
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG21 main::@return
   breturn:
@@ -358,17 +360,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -379,23 +381,23 @@ main: {
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuyy=vbuc1 
     ldy #0
     jmp b1
-  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
   //SEG16 [6] (byte) b::i#0 ← (byte) main::i#2
   //SEG17 [7] call b 
     jsr b
-    jmp b3
-  //SEG18 main::@3
-  b3:
+    jmp b2
+  //SEG18 main::@2
+  b2:
   //SEG19 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuyy=_inc_vbuyy 
     iny
   //SEG20 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@1 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$65
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG21 main::@return
   breturn:
@@ -446,27 +448,27 @@ c: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1_from_b3 with b1
+Replacing label b1_from_b2 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
-Removing instruction b1_from_b3:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b2:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction c_from_b:
 Removing instruction breturn:
@@ -483,7 +485,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -502,7 +504,7 @@ FINAL SYMBOL TABLE
 (byte) c::j#2 reg byte x 151.5
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte y 16.5
@@ -525,25 +527,25 @@ Score: 1521
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
   //SEG15 main::@1
   b1:
   //SEG16 [6] (byte) b::i#0 ← (byte) main::i#2
   //SEG17 [7] call b 
     jsr b
-  //SEG18 main::@3
+  //SEG18 main::@2
   //SEG19 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuyy=_inc_vbuyy 
     iny
   //SEG20 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@1 -- vbuyy_neq_vbuc1_then_la1 
diff --git a/src/test/ref/loopnest3.sym b/src/test/ref/loopnest3.sym
index ba94b2652..6de5f046b 100644
--- a/src/test/ref/loopnest3.sym
+++ b/src/test/ref/loopnest3.sym
@@ -1,4 +1,4 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -17,7 +17,7 @@
 (byte) c::j#2 reg byte x 151.5
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte y 16.5
diff --git a/src/test/ref/loopsplit.asm b/src/test/ref/loopsplit.asm
index 63a5f46ad..bf2e168d2 100644
--- a/src/test/ref/loopsplit.asm
+++ b/src/test/ref/loopsplit.asm
@@ -13,11 +13,11 @@ main: {
   b2:
     cmp #$32
     beq !+
-    bcs b8
+    bcs b4
   !:
     dex
     jmp b1
-  b8:
+  b4:
     inx
     jmp b1
 }
diff --git a/src/test/ref/loopsplit.cfg b/src/test/ref/loopsplit.cfg
index 61d2fd7a1..aa62963ea 100644
--- a/src/test/ref/loopsplit.cfg
+++ b/src/test/ref/loopsplit.cfg
@@ -10,9 +10,9 @@
 main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@6 main::@8
-  [5] (byte) main::s#3 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::s#2 main::@8/(byte) main::s#1 )
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@6/(byte) main::i#1 main::@8/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@3 main::@4
+  [5] (byte) main::s#3 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::s#2 main::@4/(byte) main::s#1 )
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@3/(byte) main::i#1 main::@4/(byte) main::i#1 )
   [6] (byte) main::i#1 ← -- (byte) main::i#2
   [7] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@return
@@ -20,11 +20,11 @@ main::@return: scope:[main]  from main::@1
   [8] return 
   to:@return
 main::@2: scope:[main]  from main::@1
-  [9] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@8
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+  [9] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [10] (byte) main::s#2 ← -- (byte) main::s#3
   to:main::@1
-main::@8: scope:[main]  from main::@2
+main::@4: scope:[main]  from main::@2
   [11] (byte) main::s#1 ← ++ (byte) main::s#3
   to:main::@1
diff --git a/src/test/ref/loopsplit.log b/src/test/ref/loopsplit.log
index 067b717c3..f008c25c6 100644
--- a/src/test/ref/loopsplit.log
+++ b/src/test/ref/loopsplit.log
@@ -97,6 +97,8 @@ Coalesced [12] main::s#7 ← main::s#2
 Coalesced (already) [14] main::i#7 ← main::i#1
 Coalesced [15] main::s#8 ← main::s#1
 Coalesced down to 2 phi equivalence classes
+Renumbering block main::@6 to main::@3
+Renumbering block main::@8 to main::@4
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -115,9 +117,9 @@ FINAL CONTROL FLOW GRAPH
 main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@6 main::@8
-  [5] (byte) main::s#3 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::s#2 main::@8/(byte) main::s#1 )
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@6/(byte) main::i#1 main::@8/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@3 main::@4
+  [5] (byte) main::s#3 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::s#2 main::@4/(byte) main::s#1 )
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) $64 main::@3/(byte) main::i#1 main::@4/(byte) main::i#1 )
   [6] (byte) main::i#1 ← -- (byte) main::i#2
   [7] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@return
@@ -125,12 +127,12 @@ main::@return: scope:[main]  from main::@1
   [8] return 
   to:@return
 main::@2: scope:[main]  from main::@1
-  [9] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@8
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+  [9] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [10] (byte) main::s#2 ← -- (byte) main::s#3
   to:main::@1
-main::@8: scope:[main]  from main::@2
+main::@4: scope:[main]  from main::@2
   [11] (byte) main::s#1 ← ++ (byte) main::s#3
   to:main::@1
 
@@ -204,26 +206,26 @@ main: {
     rts
   //SEG19 main::@2
   b2:
-  //SEG20 [9] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@8 -- vbuz1_gt_vbuc1_then_la1 
+  //SEG20 [9] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@4 -- vbuz1_gt_vbuc1_then_la1 
     lda #$32
     cmp i
-    bcc b8
-    jmp b6
-  //SEG21 main::@6
-  b6:
+    bcc b4
+    jmp b3
+  //SEG21 main::@3
+  b3:
   //SEG22 [10] (byte) main::s#2 ← -- (byte) main::s#3 -- vbuz1=_dec_vbuz1 
     dec s
-  //SEG23 [5] phi from main::@6 main::@8 to main::@1 [phi:main::@6/main::@8->main::@1]
-  b1_from_b6:
-  b1_from_b8:
-  //SEG24 [5] phi (byte) main::s#3 = (byte) main::s#2 [phi:main::@6/main::@8->main::@1#0] -- register_copy 
-  //SEG25 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6/main::@8->main::@1#1] -- register_copy 
+  //SEG23 [5] phi from main::@3 main::@4 to main::@1 [phi:main::@3/main::@4->main::@1]
+  b1_from_b3:
+  b1_from_b4:
+  //SEG24 [5] phi (byte) main::s#3 = (byte) main::s#2 [phi:main::@3/main::@4->main::@1#0] -- register_copy 
+  //SEG25 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3/main::@4->main::@1#1] -- register_copy 
     jmp b1
-  //SEG26 main::@8
-  b8:
+  //SEG26 main::@4
+  b4:
   //SEG27 [11] (byte) main::s#1 ← ++ (byte) main::s#3 -- vbuz1=_inc_vbuz1 
     inc s
-    jmp b1_from_b8
+    jmp b1_from_b4
 }
 
 REGISTER UPLIFT POTENTIAL REGISTERS
@@ -284,27 +286,27 @@ main: {
     rts
   //SEG19 main::@2
   b2:
-  //SEG20 [9] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@8 -- vbuaa_gt_vbuc1_then_la1 
+  //SEG20 [9] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@4 -- vbuaa_gt_vbuc1_then_la1 
     cmp #$32
     beq !+
-    bcs b8
+    bcs b4
   !:
-    jmp b6
-  //SEG21 main::@6
-  b6:
+    jmp b3
+  //SEG21 main::@3
+  b3:
   //SEG22 [10] (byte) main::s#2 ← -- (byte) main::s#3 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG23 [5] phi from main::@6 main::@8 to main::@1 [phi:main::@6/main::@8->main::@1]
-  b1_from_b6:
-  b1_from_b8:
-  //SEG24 [5] phi (byte) main::s#3 = (byte) main::s#2 [phi:main::@6/main::@8->main::@1#0] -- register_copy 
-  //SEG25 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6/main::@8->main::@1#1] -- register_copy 
+  //SEG23 [5] phi from main::@3 main::@4 to main::@1 [phi:main::@3/main::@4->main::@1]
+  b1_from_b3:
+  b1_from_b4:
+  //SEG24 [5] phi (byte) main::s#3 = (byte) main::s#2 [phi:main::@3/main::@4->main::@1#0] -- register_copy 
+  //SEG25 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3/main::@4->main::@1#1] -- register_copy 
     jmp b1
-  //SEG26 main::@8
-  b8:
+  //SEG26 main::@4
+  b4:
   //SEG27 [11] (byte) main::s#1 ← ++ (byte) main::s#3 -- vbuxx=_inc_vbuxx 
     inx
-    jmp b1_from_b8
+    jmp b1_from_b4
 }
 
 ASSEMBLER OPTIMIZATIONS
@@ -312,25 +314,25 @@ Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
+Removing instruction jmp b3
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
-Removing instruction b1_from_b6:
+Removing instruction b1_from_b3:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
 Removing instruction breturn:
-Removing instruction b6:
+Removing instruction b3:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b1 in jmp b1_from_b8
+Skipping double jump to b1 in jmp b1_from_b4
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b1_from_b8 to b3
+Relabelling long label b1_from_b4 to b3
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction bbegin:
 Removing instruction b3:
@@ -343,8 +345,8 @@ FINAL SYMBOL TABLE
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
-(label) main::@8
+(label) main::@3
+(label) main::@4
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte a 11.0
@@ -394,20 +396,20 @@ main: {
     rts
   //SEG19 main::@2
   b2:
-  //SEG20 [9] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@8 -- vbuaa_gt_vbuc1_then_la1 
+  //SEG20 [9] if((byte) main::i#1>(byte/signed byte/word/signed word/dword/signed dword) $32) goto main::@4 -- vbuaa_gt_vbuc1_then_la1 
     cmp #$32
     beq !+
-    bcs b8
+    bcs b4
   !:
-  //SEG21 main::@6
+  //SEG21 main::@3
   //SEG22 [10] (byte) main::s#2 ← -- (byte) main::s#3 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG23 [5] phi from main::@6 main::@8 to main::@1 [phi:main::@6/main::@8->main::@1]
-  //SEG24 [5] phi (byte) main::s#3 = (byte) main::s#2 [phi:main::@6/main::@8->main::@1#0] -- register_copy 
-  //SEG25 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6/main::@8->main::@1#1] -- register_copy 
+  //SEG23 [5] phi from main::@3 main::@4 to main::@1 [phi:main::@3/main::@4->main::@1]
+  //SEG24 [5] phi (byte) main::s#3 = (byte) main::s#2 [phi:main::@3/main::@4->main::@1#0] -- register_copy 
+  //SEG25 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3/main::@4->main::@1#1] -- register_copy 
     jmp b1
-  //SEG26 main::@8
-  b8:
+  //SEG26 main::@4
+  b4:
   //SEG27 [11] (byte) main::s#1 ← ++ (byte) main::s#3 -- vbuxx=_inc_vbuxx 
     inx
     jmp b1
diff --git a/src/test/ref/loopsplit.sym b/src/test/ref/loopsplit.sym
index 954181d33..8505f7e82 100644
--- a/src/test/ref/loopsplit.sym
+++ b/src/test/ref/loopsplit.sym
@@ -4,8 +4,8 @@
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
-(label) main::@8
+(label) main::@3
+(label) main::@4
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte a 11.0
diff --git a/src/test/ref/mem-alignment.asm b/src/test/ref/mem-alignment.asm
index 14f9437f7..4ee51dc72 100644
--- a/src/test/ref/mem-alignment.asm
+++ b/src/test/ref/mem-alignment.asm
@@ -12,13 +12,13 @@ main: {
     bne b1
     ldy #0
     ldx #$ff
-  b3:
+  b2:
     lda bs,x
     sta cs,y
     dex
     iny
     cpy #0
-    bne b3
+    bne b2
     rts
     .align $100
     cs: .fill $100, 0
diff --git a/src/test/ref/mem-alignment.cfg b/src/test/ref/mem-alignment.cfg
index 5b831d1d4..a91f674ca 100644
--- a/src/test/ref/mem-alignment.cfg
+++ b/src/test/ref/mem-alignment.cfg
@@ -15,15 +15,15 @@ main::@1: scope:[main]  from main main::@1
   [6] *((const byte[$100]) bs#0 + (byte) main::i#2) ← (byte) main::i#2
   [7] (byte) main::i#1 ← ++ (byte) main::i#2
   [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@1 main::@3
-  [9] (byte) main::i1#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i1#1 )
-  [9] (byte) main::j#2 ← phi( main::@1/(byte/word/signed word/dword/signed dword) $ff main::@3/(byte) main::j#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [9] (byte) main::i1#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i1#1 )
+  [9] (byte) main::j#2 ← phi( main::@1/(byte/word/signed word/dword/signed dword) $ff main::@2/(byte) main::j#1 )
   [10] *((const byte[$100]) main::cs#0 + (byte) main::i1#2) ← *((const byte[$100]) bs#0 + (byte) main::j#2)
   [11] (byte) main::j#1 ← -- (byte) main::j#2
   [12] (byte) main::i1#1 ← ++ (byte) main::i1#2
-  [13] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3
+  [13] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [14] return 
   to:@return
diff --git a/src/test/ref/mem-alignment.log b/src/test/ref/mem-alignment.log
index cf7380e1d..551c76fda 100644
--- a/src/test/ref/mem-alignment.log
+++ b/src/test/ref/mem-alignment.log
@@ -106,6 +106,7 @@ Coalesced [17] main::i#3 ← main::i#1
 Coalesced down to 3 phi equivalence classes
 Culled Empty Block (label) main::@6
 Culled Empty Block (label) main::@5
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -129,16 +130,16 @@ main::@1: scope:[main]  from main main::@1
   [6] *((const byte[$100]) bs#0 + (byte) main::i#2) ← (byte) main::i#2
   [7] (byte) main::i#1 ← ++ (byte) main::i#2
   [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@1 main::@3
-  [9] (byte) main::i1#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i1#1 )
-  [9] (byte) main::j#2 ← phi( main::@1/(byte/word/signed word/dword/signed dword) $ff main::@3/(byte) main::j#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [9] (byte) main::i1#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i1#1 )
+  [9] (byte) main::j#2 ← phi( main::@1/(byte/word/signed word/dword/signed dword) $ff main::@2/(byte) main::j#1 )
   [10] *((const byte[$100]) main::cs#0 + (byte) main::i1#2) ← *((const byte[$100]) bs#0 + (byte) main::j#2)
   [11] (byte) main::j#1 ← -- (byte) main::j#2
   [12] (byte) main::i1#1 ← ++ (byte) main::i1#2
-  [13] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3
+  [13] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [14] return 
   to:@return
 
@@ -220,22 +221,22 @@ main: {
     lda i
     cmp #0
     bne b1_from_b1
-  //SEG19 [9] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
-  b3_from_b1:
-  //SEG20 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@3#0] -- vbuz1=vbuc1 
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG20 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta i1
-  //SEG21 [9] phi (byte) main::j#2 = (byte/word/signed word/dword/signed dword) $ff [phi:main::@1->main::@3#1] -- vbuz1=vbuc1 
+  //SEG21 [9] phi (byte) main::j#2 = (byte/word/signed word/dword/signed dword) $ff [phi:main::@1->main::@2#1] -- vbuz1=vbuc1 
     lda #$ff
     sta j
-    jmp b3
-  //SEG22 [9] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  b3_from_b3:
-  //SEG23 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@3->main::@3#0] -- register_copy 
-  //SEG24 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@3->main::@3#1] -- register_copy 
-    jmp b3
-  //SEG25 main::@3
-  b3:
+    jmp b2
+  //SEG22 [9] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG23 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@2->main::@2#0] -- register_copy 
+  //SEG24 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@2->main::@2#1] -- register_copy 
+    jmp b2
+  //SEG25 main::@2
+  b2:
   //SEG26 [10] *((const byte[$100]) main::cs#0 + (byte) main::i1#2) ← *((const byte[$100]) bs#0 + (byte) main::j#2) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz2 
     ldy j
     lda bs,y
@@ -245,10 +246,10 @@ main: {
     dec j
   //SEG28 [12] (byte) main::i1#1 ← ++ (byte) main::i1#2 -- vbuz1=_inc_vbuz1 
     inc i1
-  //SEG29 [13] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuz1_neq_0_then_la1 
+  //SEG29 [13] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2 -- vbuz1_neq_0_then_la1 
     lda i1
     cmp #0
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG30 main::@return
   breturn:
@@ -321,20 +322,20 @@ main: {
   //SEG18 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1_from_b1
-  //SEG19 [9] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
-  b3_from_b1:
-  //SEG20 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@3#0] -- vbuyy=vbuc1 
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+  //SEG20 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG21 [9] phi (byte) main::j#2 = (byte/word/signed word/dword/signed dword) $ff [phi:main::@1->main::@3#1] -- vbuxx=vbuc1 
+  //SEG21 [9] phi (byte) main::j#2 = (byte/word/signed word/dword/signed dword) $ff [phi:main::@1->main::@2#1] -- vbuxx=vbuc1 
     ldx #$ff
-    jmp b3
-  //SEG22 [9] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  b3_from_b3:
-  //SEG23 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@3->main::@3#0] -- register_copy 
-  //SEG24 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@3->main::@3#1] -- register_copy 
-    jmp b3
-  //SEG25 main::@3
-  b3:
+    jmp b2
+  //SEG22 [9] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  b2_from_b2:
+  //SEG23 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@2->main::@2#0] -- register_copy 
+  //SEG24 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@2->main::@2#1] -- register_copy 
+    jmp b2
+  //SEG25 main::@2
+  b2:
   //SEG26 [10] *((const byte[$100]) main::cs#0 + (byte) main::i1#2) ← *((const byte[$100]) bs#0 + (byte) main::j#2) -- pbuc1_derefidx_vbuyy=pbuc2_derefidx_vbuxx 
     lda bs,x
     sta cs,y
@@ -342,9 +343,9 @@ main: {
     dex
   //SEG28 [12] (byte) main::i1#1 ← ++ (byte) main::i1#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG29 [13] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuyy_neq_0_then_la1 
+  //SEG29 [13] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2 -- vbuyy_neq_0_then_la1 
     cpy #0
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG30 main::@return
   breturn:
@@ -360,28 +361,28 @@ ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
-Replacing label b3_from_b3 with b3
+Replacing label b2_from_b2 with b2
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
 Removing instruction b1_from_b1:
-Removing instruction b3_from_b3:
+Removing instruction b2_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b3_from_b1:
+Removing instruction b2_from_b1:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -394,7 +395,7 @@ FINAL SYMBOL TABLE
 (const byte[$100]) bs#0 bs = { fill( $100, 0) }
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte[$100]) main::cs
 (const byte[$100]) main::cs#0 cs = { fill( $100, 0) }
@@ -447,16 +448,16 @@ main: {
   //SEG18 [8] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1
-  //SEG19 [9] phi from main::@1 to main::@3 [phi:main::@1->main::@3]
-  //SEG20 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@3#0] -- vbuyy=vbuc1 
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG20 [9] phi (byte) main::i1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG21 [9] phi (byte) main::j#2 = (byte/word/signed word/dword/signed dword) $ff [phi:main::@1->main::@3#1] -- vbuxx=vbuc1 
+  //SEG21 [9] phi (byte) main::j#2 = (byte/word/signed word/dword/signed dword) $ff [phi:main::@1->main::@2#1] -- vbuxx=vbuc1 
     ldx #$ff
-  //SEG22 [9] phi from main::@3 to main::@3 [phi:main::@3->main::@3]
-  //SEG23 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@3->main::@3#0] -- register_copy 
-  //SEG24 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@3->main::@3#1] -- register_copy 
-  //SEG25 main::@3
-  b3:
+  //SEG22 [9] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
+  //SEG23 [9] phi (byte) main::i1#2 = (byte) main::i1#1 [phi:main::@2->main::@2#0] -- register_copy 
+  //SEG24 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@2->main::@2#1] -- register_copy 
+  //SEG25 main::@2
+  b2:
   //SEG26 [10] *((const byte[$100]) main::cs#0 + (byte) main::i1#2) ← *((const byte[$100]) bs#0 + (byte) main::j#2) -- pbuc1_derefidx_vbuyy=pbuc2_derefidx_vbuxx 
     lda bs,x
     sta cs,y
@@ -464,9 +465,9 @@ main: {
     dex
   //SEG28 [12] (byte) main::i1#1 ← ++ (byte) main::i1#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG29 [13] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@3 -- vbuyy_neq_0_then_la1 
+  //SEG29 [13] if((byte) main::i1#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2 -- vbuyy_neq_0_then_la1 
     cpy #0
-    bne b3
+    bne b2
   //SEG30 main::@return
   //SEG31 [14] return 
     rts
diff --git a/src/test/ref/mem-alignment.sym b/src/test/ref/mem-alignment.sym
index d90d61922..bbe930662 100644
--- a/src/test/ref/mem-alignment.sym
+++ b/src/test/ref/mem-alignment.sym
@@ -5,7 +5,7 @@
 (const byte[$100]) bs#0 bs = { fill( $100, 0) }
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte[$100]) main::cs
 (const byte[$100]) main::cs#0 cs = { fill( $100, 0) }
diff --git a/src/test/ref/min-fmul-16.asm b/src/test/ref/min-fmul-16.asm
index 0e6099baf..dc431ade4 100644
--- a/src/test/ref/min-fmul-16.asm
+++ b/src/test/ref/min-fmul-16.asm
@@ -15,10 +15,10 @@ main: {
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  b6:
+  b2:
     lda #$ff
     cmp RASTER
-    bne b6
+    bne b2
     inc BORDERCOL
     jsr mulf16u
     dec BORDERCOL
@@ -28,7 +28,7 @@ main: {
     sta print_char_cursor
     lda #>SCREEN
     sta print_char_cursor+1
-    jmp b6
+    jmp b2
 }
 // Set the screen to print on. Also resets current line/char cursor.
 print_set_screen: {
@@ -279,7 +279,7 @@ mulf_init: {
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
     ldx #-1
-  b5:
+  b4:
     lda mulf_sqr1_lo,x
     ldy #0
     sta (sqr2_lo),y
@@ -294,20 +294,20 @@ mulf_init: {
     adc dir
     tax
     cpx #0
-    bne b6
+    bne b5
     lda #1
     sta dir
-  b6:
+  b5:
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
     sta mulf_sqr2_lo+$1ff
diff --git a/src/test/ref/min-fmul-16.cfg b/src/test/ref/min-fmul-16.cfg
index 49caed03e..5c305206e 100644
--- a/src/test/ref/min-fmul-16.cfg
+++ b/src/test/ref/min-fmul-16.cfg
@@ -1,47 +1,47 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@22
-@22: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @22
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @22
+main: scope:[main]  from @1
   [4] phi()
   [5] call mulf_init 
-  to:main::@13
-main::@13: scope:[main]  from main
+  to:main::@4
+main::@4: scope:[main]  from main
   asm { sei  }
   to:main::@1
-main::@1: scope:[main]  from main::@13 main::@15
-  [7] (byte*) print_char_cursor#16 ← phi( main::@13/((byte*))(word/signed word/dword/signed dword) $400 main::@15/(const byte*) SCREEN#0 )
-  to:main::@6
-main::@6: scope:[main]  from main::@1 main::@6
-  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6
-  to:main::@8
-main::@8: scope:[main]  from main::@6
+main::@1: scope:[main]  from main::@4 main::@6
+  [7] (byte*) print_char_cursor#16 ← phi( main::@4/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(const byte*) SCREEN#0 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [9] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [10] call mulf16u 
   [11] (dword) mulf16u::return#0 ← (dword) mulf16u::return#1
-  to:main::@14
-main::@14: scope:[main]  from main::@8
+  to:main::@5
+main::@5: scope:[main]  from main::@3
   [12] (dword) main::r#0 ← (dword) mulf16u::return#0
   [13] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0)
   [14] (dword) print_dword::dw#0 ← (dword) main::r#0
   [15] call print_dword 
-  to:main::@15
-main::@15: scope:[main]  from main::@14
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [16] phi()
   [17] call print_set_screen 
   to:main::@1
-print_set_screen: scope:[print_set_screen]  from main::@15
+print_set_screen: scope:[print_set_screen]  from main::@6
   [18] phi()
   to:print_set_screen::@return
 print_set_screen::@return: scope:[print_set_screen]  from print_set_screen
   [19] return 
   to:@return
-print_dword: scope:[print_dword]  from main::@14
+print_dword: scope:[print_dword]  from main::@5
   [20] (word) print_word::w#0 ← > (dword) print_dword::dw#0
   [21] call print_word 
   to:print_dword::@1
@@ -89,7 +89,7 @@ print_char: scope:[print_char]  from print_byte print_byte::@1
 print_char::@return: scope:[print_char]  from print_char
   [42] return 
   to:@return
-mulf16u: scope:[mulf16u]  from main::@8
+mulf16u: scope:[mulf16u]  from main::@3
   [43] *((const word*) mulf16u::memA#0) ← (const word) main::a#0
   [44] *((const word*) mulf16u::memB#0) ← (const word) main::b#0
   asm { ldamemA stasm1a+1 stasm3a+1 stasm5a+1 stasm7a+1 eor#$ff stasm2a+1 stasm4a+1 stasm6a+1 stasm8a+1 ldamemA+1 stasm1b+1 stasm3b+1 stasm5b+1 stasm7b+1 eor#$ff stasm2b+1 stasm4b+1 stasm6b+1 stasm8b+1 ldxmemB sec sm1a: ldamulf_sqr1_lo,x sm2a: sbcmulf_sqr2_lo,x stamemR+0 sm3a: ldamulf_sqr1_hi,x sm4a: sbcmulf_sqr2_hi,x sta_AA+1 sec sm1b: ldamulf_sqr1_lo,x sm2b: sbcmulf_sqr2_lo,x sta_cc+1 sm3b: ldamulf_sqr1_hi,x sm4b: sbcmulf_sqr2_hi,x sta_CC+1 ldxmemB+1 sec sm5a: ldamulf_sqr1_lo,x sm6a: sbcmulf_sqr2_lo,x sta_bb+1 sm7a: ldamulf_sqr1_hi,x sm8a: sbcmulf_sqr2_hi,x sta_BB+1 sec sm5b: ldamulf_sqr1_lo,x sm6b: sbcmulf_sqr2_lo,x sta_dd+1 sm7b: ldamulf_sqr1_hi,x sm8b: sbcmulf_sqr2_hi,x stamemR+3 clc _AA: lda#0 _bb: adc#0 stamemR+1 _BB: lda#0 _CC: adc#0 stamemR+2 bcc!+ incmemR+3 clc !: _cc: lda#0 adcmemR+1 stamemR+1 _dd: lda#0 adcmemR+2 stamemR+2 bcc!+ incmemR+3 !:  }
@@ -126,30 +126,30 @@ mulf_init::@2: scope:[mulf_init]  from mulf_init::@1 mulf_init::@3
   [61] (word) mulf_init::sqr#1 ← (word) mulf_init::sqr#3 + (byte) mulf_init::x_2#2
   [62] (byte*) mulf_init::sqr1_lo#1 ← ++ (byte*) mulf_init::sqr1_lo#2
   [63] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $200) goto mulf_init::@1
-  to:mulf_init::@5
-mulf_init::@5: scope:[mulf_init]  from mulf_init::@2 mulf_init::@6
-  [64] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@6/(byte) mulf_init::dir#3 )
-  [64] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@6/(byte*) mulf_init::sqr2_hi#1 )
-  [64] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@6/(byte*) mulf_init::sqr2_lo#1 )
-  [64] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@6/(byte) mulf_init::x_255#1 )
+  to:mulf_init::@4
+mulf_init::@4: scope:[mulf_init]  from mulf_init::@2 mulf_init::@5
+  [64] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@5/(byte) mulf_init::dir#3 )
+  [64] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@5/(byte*) mulf_init::sqr2_hi#1 )
+  [64] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@5/(byte*) mulf_init::sqr2_lo#1 )
+  [64] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@5/(byte) mulf_init::x_255#1 )
   [65] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2)
   [66] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2)
   [67] (byte*) mulf_init::sqr2_hi#1 ← ++ (byte*) mulf_init::sqr2_hi#2
   [68] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2
-  [69] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12
-  to:mulf_init::@6
-mulf_init::@6: scope:[mulf_init]  from mulf_init::@12 mulf_init::@5
-  [70] (byte) mulf_init::dir#3 ← phi( mulf_init::@12/(byte) mulf_init::dir#2 mulf_init::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [69] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7
+  to:mulf_init::@5
+mulf_init::@5: scope:[mulf_init]  from mulf_init::@4 mulf_init::@7
+  [70] (byte) mulf_init::dir#3 ← phi( mulf_init::@7/(byte) mulf_init::dir#2 mulf_init::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [71] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2
-  [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5
-  to:mulf_init::@8
-mulf_init::@8: scope:[mulf_init]  from mulf_init::@6
+  [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4
+  to:mulf_init::@6
+mulf_init::@6: scope:[mulf_init]  from mulf_init::@5
   [73] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100)
   [74] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100)
   to:mulf_init::@return
-mulf_init::@return: scope:[mulf_init]  from mulf_init::@8
+mulf_init::@return: scope:[mulf_init]  from mulf_init::@6
   [75] return 
   to:@return
-mulf_init::@12: scope:[mulf_init]  from mulf_init::@5
+mulf_init::@7: scope:[mulf_init]  from mulf_init::@4
   [76] phi()
-  to:mulf_init::@6
+  to:mulf_init::@5
diff --git a/src/test/ref/min-fmul-16.log b/src/test/ref/min-fmul-16.log
index 063b43881..de98d3ef9 100644
--- a/src/test/ref/min-fmul-16.log
+++ b/src/test/ref/min-fmul-16.log
@@ -868,60 +868,70 @@ Culled Empty Block (label) mulf_init::@7
 Culled Empty Block (label) mulf_init::@11
 Culled Empty Block (label) mulf_init::@9
 Culled Empty Block (label) mulf_init::@10
+Renumbering block @22 to @1
+Renumbering block main::@6 to main::@2
+Renumbering block main::@8 to main::@3
+Renumbering block main::@13 to main::@4
+Renumbering block main::@14 to main::@5
+Renumbering block main::@15 to main::@6
+Renumbering block mulf_init::@5 to mulf_init::@4
+Renumbering block mulf_init::@6 to mulf_init::@5
+Renumbering block mulf_init::@8 to mulf_init::@6
+Renumbering block mulf_init::@12 to mulf_init::@7
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @22
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@15
+Adding NOP phi() at start of main::@6
 Adding NOP phi() at start of print_set_screen
 Adding NOP phi() at start of mulf_init
-Adding NOP phi() at start of mulf_init::@12
+Adding NOP phi() at start of mulf_init::@7
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@22
-@22: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @22
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @22
+main: scope:[main]  from @1
   [4] phi()
   [5] call mulf_init 
-  to:main::@13
-main::@13: scope:[main]  from main
+  to:main::@4
+main::@4: scope:[main]  from main
   asm { sei  }
   to:main::@1
-main::@1: scope:[main]  from main::@13 main::@15
-  [7] (byte*) print_char_cursor#16 ← phi( main::@13/((byte*))(word/signed word/dword/signed dword) $400 main::@15/(const byte*) SCREEN#0 )
-  to:main::@6
-main::@6: scope:[main]  from main::@1 main::@6
-  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6
-  to:main::@8
-main::@8: scope:[main]  from main::@6
+main::@1: scope:[main]  from main::@4 main::@6
+  [7] (byte*) print_char_cursor#16 ← phi( main::@4/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(const byte*) SCREEN#0 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1 main::@2
+  [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [9] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [10] call mulf16u 
   [11] (dword) mulf16u::return#0 ← (dword) mulf16u::return#1
-  to:main::@14
-main::@14: scope:[main]  from main::@8
+  to:main::@5
+main::@5: scope:[main]  from main::@3
   [12] (dword) main::r#0 ← (dword) mulf16u::return#0
   [13] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0)
   [14] (dword) print_dword::dw#0 ← (dword) main::r#0
   [15] call print_dword 
-  to:main::@15
-main::@15: scope:[main]  from main::@14
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [16] phi()
   [17] call print_set_screen 
   to:main::@1
-print_set_screen: scope:[print_set_screen]  from main::@15
+print_set_screen: scope:[print_set_screen]  from main::@6
   [18] phi()
   to:print_set_screen::@return
 print_set_screen::@return: scope:[print_set_screen]  from print_set_screen
   [19] return 
   to:@return
-print_dword: scope:[print_dword]  from main::@14
+print_dword: scope:[print_dword]  from main::@5
   [20] (word) print_word::w#0 ← > (dword) print_dword::dw#0
   [21] call print_word 
   to:print_dword::@1
@@ -969,7 +979,7 @@ print_char: scope:[print_char]  from print_byte print_byte::@1
 print_char::@return: scope:[print_char]  from print_char
   [42] return 
   to:@return
-mulf16u: scope:[mulf16u]  from main::@8
+mulf16u: scope:[mulf16u]  from main::@3
   [43] *((const word*) mulf16u::memA#0) ← (const word) main::a#0
   [44] *((const word*) mulf16u::memB#0) ← (const word) main::b#0
   asm { ldamemA stasm1a+1 stasm3a+1 stasm5a+1 stasm7a+1 eor#$ff stasm2a+1 stasm4a+1 stasm6a+1 stasm8a+1 ldamemA+1 stasm1b+1 stasm3b+1 stasm5b+1 stasm7b+1 eor#$ff stasm2b+1 stasm4b+1 stasm6b+1 stasm8b+1 ldxmemB sec sm1a: ldamulf_sqr1_lo,x sm2a: sbcmulf_sqr2_lo,x stamemR+0 sm3a: ldamulf_sqr1_hi,x sm4a: sbcmulf_sqr2_hi,x sta_AA+1 sec sm1b: ldamulf_sqr1_lo,x sm2b: sbcmulf_sqr2_lo,x sta_cc+1 sm3b: ldamulf_sqr1_hi,x sm4b: sbcmulf_sqr2_hi,x sta_CC+1 ldxmemB+1 sec sm5a: ldamulf_sqr1_lo,x sm6a: sbcmulf_sqr2_lo,x sta_bb+1 sm7a: ldamulf_sqr1_hi,x sm8a: sbcmulf_sqr2_hi,x sta_BB+1 sec sm5b: ldamulf_sqr1_lo,x sm6b: sbcmulf_sqr2_lo,x sta_dd+1 sm7b: ldamulf_sqr1_hi,x sm8b: sbcmulf_sqr2_hi,x stamemR+3 clc _AA: lda#0 _bb: adc#0 stamemR+1 _BB: lda#0 _CC: adc#0 stamemR+2 bcc!+ incmemR+3 clc !: _cc: lda#0 adcmemR+1 stamemR+1 _dd: lda#0 adcmemR+2 stamemR+2 bcc!+ incmemR+3 !:  }
@@ -1006,33 +1016,33 @@ mulf_init::@2: scope:[mulf_init]  from mulf_init::@1 mulf_init::@3
   [61] (word) mulf_init::sqr#1 ← (word) mulf_init::sqr#3 + (byte) mulf_init::x_2#2
   [62] (byte*) mulf_init::sqr1_lo#1 ← ++ (byte*) mulf_init::sqr1_lo#2
   [63] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $200) goto mulf_init::@1
-  to:mulf_init::@5
-mulf_init::@5: scope:[mulf_init]  from mulf_init::@2 mulf_init::@6
-  [64] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@6/(byte) mulf_init::dir#3 )
-  [64] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@6/(byte*) mulf_init::sqr2_hi#1 )
-  [64] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@6/(byte*) mulf_init::sqr2_lo#1 )
-  [64] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@6/(byte) mulf_init::x_255#1 )
+  to:mulf_init::@4
+mulf_init::@4: scope:[mulf_init]  from mulf_init::@2 mulf_init::@5
+  [64] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@5/(byte) mulf_init::dir#3 )
+  [64] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@5/(byte*) mulf_init::sqr2_hi#1 )
+  [64] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@5/(byte*) mulf_init::sqr2_lo#1 )
+  [64] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@5/(byte) mulf_init::x_255#1 )
   [65] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2)
   [66] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2)
   [67] (byte*) mulf_init::sqr2_hi#1 ← ++ (byte*) mulf_init::sqr2_hi#2
   [68] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2
-  [69] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12
-  to:mulf_init::@6
-mulf_init::@6: scope:[mulf_init]  from mulf_init::@12 mulf_init::@5
-  [70] (byte) mulf_init::dir#3 ← phi( mulf_init::@12/(byte) mulf_init::dir#2 mulf_init::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [69] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7
+  to:mulf_init::@5
+mulf_init::@5: scope:[mulf_init]  from mulf_init::@4 mulf_init::@7
+  [70] (byte) mulf_init::dir#3 ← phi( mulf_init::@7/(byte) mulf_init::dir#2 mulf_init::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [71] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2
-  [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5
-  to:mulf_init::@8
-mulf_init::@8: scope:[mulf_init]  from mulf_init::@6
+  [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4
+  to:mulf_init::@6
+mulf_init::@6: scope:[mulf_init]  from mulf_init::@5
   [73] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100)
   [74] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100)
   to:mulf_init::@return
-mulf_init::@return: scope:[mulf_init]  from mulf_init::@8
+mulf_init::@return: scope:[mulf_init]  from mulf_init::@6
   [75] return 
   to:@return
-mulf_init::@12: scope:[mulf_init]  from mulf_init::@5
+mulf_init::@7: scope:[mulf_init]  from mulf_init::@4
   [76] phi()
-  to:mulf_init::@6
+  to:mulf_init::@5
 
 
 VARIABLE REGISTER WEIGHTS
@@ -1205,17 +1215,17 @@ INITIAL ASM
   .label print_char_cursor = 6
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @22 [phi:@begin->@22]
-b22_from_bbegin:
-  jmp b22
-//SEG5 @22
-b22:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @22 to main [phi:@22->main]
-main_from_b22:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @22 to @end [phi:@22->@end]
-bend_from_b22:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1228,14 +1238,14 @@ main: {
   //SEG12 [48] phi from main to mulf_init [phi:main->mulf_init]
   mulf_init_from_main:
     jsr mulf_init
-    jmp b13
-  //SEG13 main::@13
-  b13:
+    jmp b4
+  //SEG13 main::@4
+  b4:
   //SEG14 asm { sei  }
     sei
-  //SEG15 [7] phi from main::@13 to main::@1 [phi:main::@13->main::@1]
-  b1_from_b13:
-  //SEG16 [7] phi (byte*) print_char_cursor#16 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@13->main::@1#0] -- pbuz1=pbuc1 
+  //SEG15 [7] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG16 [7] phi (byte*) print_char_cursor#16 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
@@ -1243,16 +1253,16 @@ main: {
     jmp b1
   //SEG17 main::@1
   b1:
-    jmp b6
-  //SEG18 main::@6
-  b6:
-  //SEG19 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG18 main::@2
+  b2:
+  //SEG19 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b8
-  //SEG20 main::@8
-  b8:
+    bne b2
+    jmp b3
+  //SEG20 main::@3
+  b3:
   //SEG21 [9] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG22 [10] call mulf16u 
@@ -1266,9 +1276,9 @@ main: {
     sta mulf16u.return+2
     lda mulf16u.return_1+3
     sta mulf16u.return+3
-    jmp b14
-  //SEG24 main::@14
-  b14:
+    jmp b5
+  //SEG24 main::@5
+  b5:
   //SEG25 [12] (dword) main::r#0 ← (dword) mulf16u::return#0 -- vduz1=vduz2 
     lda mulf16u.return
     sta r
@@ -1291,18 +1301,18 @@ main: {
     sta print_dword.dw+3
   //SEG28 [15] call print_dword 
     jsr print_dword
-  //SEG29 [16] phi from main::@14 to main::@15 [phi:main::@14->main::@15]
-  b15_from_b14:
-    jmp b15
-  //SEG30 main::@15
-  b15:
+  //SEG29 [16] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG30 main::@6
+  b6:
   //SEG31 [17] call print_set_screen 
-  //SEG32 [18] phi from main::@15 to print_set_screen [phi:main::@15->print_set_screen]
-  print_set_screen_from_b15:
+  //SEG32 [18] phi from main::@6 to print_set_screen [phi:main::@6->print_set_screen]
+  print_set_screen_from_b6:
     jsr print_set_screen
-  //SEG33 [7] phi from main::@15 to main::@1 [phi:main::@15->main::@1]
-  b1_from_b15:
-  //SEG34 [7] phi (byte*) print_char_cursor#16 = (const byte*) SCREEN#0 [phi:main::@15->main::@1#0] -- pbuz1=pbuc1 
+  //SEG33 [7] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG34 [7] phi (byte*) print_char_cursor#16 = (const byte*) SCREEN#0 [phi:main::@6->main::@1#0] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta print_char_cursor
     lda #>SCREEN
@@ -1696,34 +1706,34 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1_from_b2
-  //SEG126 [64] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  b5_from_b2:
-  //SEG127 [64] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG126 [64] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  b4_from_b2:
+  //SEG127 [64] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG128 [64] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG128 [64] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG129 [64] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG129 [64] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG130 [64] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuz1=vbuc1 
+  //SEG130 [64] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuz1=vbuc1 
     lda #-1
     sta x_255
-    jmp b5
-  //SEG131 [64] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  b5_from_b6:
-  //SEG132 [64] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG133 [64] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG134 [64] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG135 [64] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-    jmp b5
-  //SEG136 mulf_init::@5
-  b5:
+    jmp b4
+  //SEG131 [64] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  b4_from_b5:
+  //SEG132 [64] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG133 [64] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG134 [64] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG135 [64] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+    jmp b4
+  //SEG136 mulf_init::@4
+  b4:
   //SEG137 [65] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuz2 
     ldy x_255
     lda mulf_sqr1_lo,y
@@ -1744,33 +1754,33 @@ mulf_init: {
     clc
     adc dir
     sta x_255
-  //SEG141 [69] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuz1_neq_0_then_la1 
+  //SEG141 [69] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuz1_neq_0_then_la1 
     lda x_255
     cmp #0
-    bne b12_from_b5
-  //SEG142 [70] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  b6_from_b5:
-  //SEG143 [70] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b7_from_b4
+  //SEG142 [70] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  b5_from_b4:
+  //SEG143 [70] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-    jmp b6
-  //SEG144 mulf_init::@6
-  b6:
+    jmp b5
+  //SEG144 mulf_init::@5
+  b5:
   //SEG145 [71] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG146 [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG146 [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5_from_b6
+    bne b4_from_b5
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5_from_b6
-    jmp b8
-  //SEG147 mulf_init::@8
-  b8:
+    bne b4_from_b5
+    jmp b6
+  //SEG147 mulf_init::@6
+  b6:
   //SEG148 [73] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -1783,15 +1793,15 @@ mulf_init: {
   breturn:
   //SEG151 [75] return 
     rts
-  //SEG152 [76] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  b12_from_b5:
-    jmp b12
-  //SEG153 mulf_init::@12
-  b12:
-  //SEG154 [70] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  b6_from_b12:
-  //SEG155 [70] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
-    jmp b6
+  //SEG152 [76] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  b7_from_b4:
+    jmp b7
+  //SEG153 mulf_init::@7
+  b7:
+  //SEG154 [70] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  b5_from_b7:
+  //SEG155 [70] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
+    jmp b5
 }
   print_hextab: .text "0123456789abcdef"
   // mulf_sqr tables will contain f(x)=int(x*x/4) and g(x) = f(x-255).
@@ -1809,7 +1819,7 @@ mulf_init: {
   mulf_sqr2_hi: .fill $200, 0
 
 REGISTER UPLIFT POTENTIAL REGISTERS
-Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 [ print_char_cursor#16 ] ( main:2 [ print_char_cursor#16 ] ) always clobbers reg byte a 
+Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ print_char_cursor#16 ] ( main:2 [ print_char_cursor#16 ] ) always clobbers reg byte a 
 Statement [11] (dword) mulf16u::return#0 ← (dword) mulf16u::return#1 [ print_char_cursor#16 mulf16u::return#0 ] ( main:2 [ print_char_cursor#16 mulf16u::return#0 ] ) always clobbers reg byte a 
 Statement [12] (dword) main::r#0 ← (dword) mulf16u::return#0 [ print_char_cursor#16 main::r#0 ] ( main:2 [ print_char_cursor#16 main::r#0 ] ) always clobbers reg byte a 
 Statement [14] (dword) print_dword::dw#0 ← (dword) main::r#0 [ print_char_cursor#16 print_dword::dw#0 ] ( main:2 [ print_char_cursor#16 print_dword::dw#0 ] ) always clobbers reg byte a 
@@ -1843,10 +1853,10 @@ Removing always clobbered register reg byte a as potential for zp ZP_BYTE:21 [ m
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:21 [ mulf_init::dir#2 mulf_init::dir#3 ]
 Statement [66] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:2::mulf_init:5 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [68] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ( main:2::mulf_init:5 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ) always clobbers reg byte a 
-Statement [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
+Statement [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
 Statement [73] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:5 [ ] ) always clobbers reg byte a 
 Statement [74] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:5 [ ] ) always clobbers reg byte a 
-Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 [ print_char_cursor#16 ] ( main:2 [ print_char_cursor#16 ] ) always clobbers reg byte a 
+Statement [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ print_char_cursor#16 ] ( main:2 [ print_char_cursor#16 ] ) always clobbers reg byte a 
 Statement [11] (dword) mulf16u::return#0 ← (dword) mulf16u::return#1 [ print_char_cursor#16 mulf16u::return#0 ] ( main:2 [ print_char_cursor#16 mulf16u::return#0 ] ) always clobbers reg byte a 
 Statement [12] (dword) main::r#0 ← (dword) mulf16u::return#0 [ print_char_cursor#16 main::r#0 ] ( main:2 [ print_char_cursor#16 main::r#0 ] ) always clobbers reg byte a 
 Statement [14] (dword) print_dword::dw#0 ← (dword) main::r#0 [ print_char_cursor#16 print_dword::dw#0 ] ( main:2 [ print_char_cursor#16 print_dword::dw#0 ] ) always clobbers reg byte a 
@@ -1871,7 +1881,7 @@ Statement [63] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo#
 Statement [65] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:2::mulf_init:5 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [66] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:2::mulf_init:5 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [68] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ( main:2::mulf_init:5 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ) always clobbers reg byte a 
-Statement [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
+Statement [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
 Statement [73] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:5 [ ] ) always clobbers reg byte a 
 Statement [74] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:5 [ ] ) always clobbers reg byte a 
 Potential registers zp ZP_WORD:2 [ print_word::w#2 print_word::w#0 print_word::w#1 ] : zp ZP_WORD:2 , 
@@ -1950,17 +1960,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_char_cursor = 4
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @22 [phi:@begin->@22]
-b22_from_bbegin:
-  jmp b22
-//SEG5 @22
-b22:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @22 to main [phi:@22->main]
-main_from_b22:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @22 to @end [phi:@22->@end]
-bend_from_b22:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1973,14 +1983,14 @@ main: {
   //SEG12 [48] phi from main to mulf_init [phi:main->mulf_init]
   mulf_init_from_main:
     jsr mulf_init
-    jmp b13
-  //SEG13 main::@13
-  b13:
+    jmp b4
+  //SEG13 main::@4
+  b4:
   //SEG14 asm { sei  }
     sei
-  //SEG15 [7] phi from main::@13 to main::@1 [phi:main::@13->main::@1]
-  b1_from_b13:
-  //SEG16 [7] phi (byte*) print_char_cursor#16 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@13->main::@1#0] -- pbuz1=pbuc1 
+  //SEG15 [7] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG16 [7] phi (byte*) print_char_cursor#16 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
@@ -1988,42 +1998,42 @@ main: {
     jmp b1
   //SEG17 main::@1
   b1:
-    jmp b6
-  //SEG18 main::@6
-  b6:
-  //SEG19 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b2
+  //SEG18 main::@2
+  b2:
+  //SEG19 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-    jmp b8
-  //SEG20 main::@8
-  b8:
+    bne b2
+    jmp b3
+  //SEG20 main::@3
+  b3:
   //SEG21 [9] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG22 [10] call mulf16u 
     jsr mulf16u
   //SEG23 [11] (dword) mulf16u::return#0 ← (dword) mulf16u::return#1
-    jmp b14
-  //SEG24 main::@14
-  b14:
+    jmp b5
+  //SEG24 main::@5
+  b5:
   //SEG25 [12] (dword) main::r#0 ← (dword) mulf16u::return#0
   //SEG26 [13] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BORDERCOL
   //SEG27 [14] (dword) print_dword::dw#0 ← (dword) main::r#0
   //SEG28 [15] call print_dword 
     jsr print_dword
-  //SEG29 [16] phi from main::@14 to main::@15 [phi:main::@14->main::@15]
-  b15_from_b14:
-    jmp b15
-  //SEG30 main::@15
-  b15:
+  //SEG29 [16] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG30 main::@6
+  b6:
   //SEG31 [17] call print_set_screen 
-  //SEG32 [18] phi from main::@15 to print_set_screen [phi:main::@15->print_set_screen]
-  print_set_screen_from_b15:
+  //SEG32 [18] phi from main::@6 to print_set_screen [phi:main::@6->print_set_screen]
+  print_set_screen_from_b6:
     jsr print_set_screen
-  //SEG33 [7] phi from main::@15 to main::@1 [phi:main::@15->main::@1]
-  b1_from_b15:
-  //SEG34 [7] phi (byte*) print_char_cursor#16 = (const byte*) SCREEN#0 [phi:main::@15->main::@1#0] -- pbuz1=pbuc1 
+  //SEG33 [7] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG34 [7] phi (byte*) print_char_cursor#16 = (const byte*) SCREEN#0 [phi:main::@6->main::@1#0] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta print_char_cursor
     lda #>SCREEN
@@ -2394,33 +2404,33 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1_from_b2
-  //SEG126 [64] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  b5_from_b2:
-  //SEG127 [64] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG126 [64] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  b4_from_b2:
+  //SEG127 [64] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG128 [64] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG128 [64] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG129 [64] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG129 [64] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG130 [64] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuxx=vbuc1 
+  //SEG130 [64] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuxx=vbuc1 
     ldx #-1
-    jmp b5
-  //SEG131 [64] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  b5_from_b6:
-  //SEG132 [64] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG133 [64] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG134 [64] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG135 [64] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-    jmp b5
-  //SEG136 mulf_init::@5
-  b5:
+    jmp b4
+  //SEG131 [64] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  b4_from_b5:
+  //SEG132 [64] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG133 [64] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG134 [64] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG135 [64] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+    jmp b4
+  //SEG136 mulf_init::@4
+  b4:
   //SEG137 [65] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuxx 
     lda mulf_sqr1_lo,x
     ldy #0
@@ -2439,32 +2449,32 @@ mulf_init: {
     clc
     adc dir
     tax
-  //SEG141 [69] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuxx_neq_0_then_la1 
+  //SEG141 [69] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b12_from_b5
-  //SEG142 [70] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  b6_from_b5:
-  //SEG143 [70] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b7_from_b4
+  //SEG142 [70] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  b5_from_b4:
+  //SEG143 [70] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-    jmp b6
-  //SEG144 mulf_init::@6
-  b6:
+    jmp b5
+  //SEG144 mulf_init::@5
+  b5:
   //SEG145 [71] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG146 [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG146 [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5_from_b6
+    bne b4_from_b5
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5_from_b6
-    jmp b8
-  //SEG147 mulf_init::@8
-  b8:
+    bne b4_from_b5
+    jmp b6
+  //SEG147 mulf_init::@6
+  b6:
   //SEG148 [73] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -2477,15 +2487,15 @@ mulf_init: {
   breturn:
   //SEG151 [75] return 
     rts
-  //SEG152 [76] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  b12_from_b5:
-    jmp b12
-  //SEG153 mulf_init::@12
-  b12:
-  //SEG154 [70] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  b6_from_b12:
-  //SEG155 [70] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
-    jmp b6
+  //SEG152 [76] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  b7_from_b4:
+    jmp b7
+  //SEG153 mulf_init::@7
+  b7:
+  //SEG154 [70] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  b5_from_b7:
+  //SEG155 [70] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
+    jmp b5
 }
   print_hextab: .text "0123456789abcdef"
   // mulf_sqr tables will contain f(x)=int(x*x/4) and g(x) = f(x-255).
@@ -2503,14 +2513,14 @@ mulf_init: {
   mulf_sqr2_hi: .fill $200, 0
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b22
-Removing instruction jmp bend
-Removing instruction jmp b13
 Removing instruction jmp b1
+Removing instruction jmp bend
+Removing instruction jmp b4
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b5
 Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b14
-Removing instruction jmp b15
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -2523,46 +2533,46 @@ Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b3
 Removing instruction jmp b2
+Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp b6
-Removing instruction jmp b8
 Removing instruction jmp breturn
-Removing instruction jmp b12
+Removing instruction jmp b7
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Replacing instruction ldx #0 with TAX
 Removing instruction ldy #0
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b1 with b6
+Replacing label b1 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b2 with b1
-Replacing label b12_from_b5 with b12
-Replacing label b5_from_b6 with b5
-Replacing label b5_from_b6 with b5
-Removing instruction b22_from_bbegin:
-Removing instruction b22:
-Removing instruction main_from_b22:
-Removing instruction bend_from_b22:
+Replacing label b7_from_b4 with b7
+Replacing label b4_from_b5 with b4
+Replacing label b4_from_b5 with b4
+Removing instruction b1_from_bbegin:
 Removing instruction b1:
-Removing instruction b15_from_b14:
-Removing instruction print_set_screen_from_b15:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1:
+Removing instruction b6_from_b5:
+Removing instruction print_set_screen_from_b6:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b3:
-Removing instruction b5_from_b6:
-Removing instruction b12_from_b5:
-Removing instruction b6_from_b12:
+Removing instruction b4_from_b5:
+Removing instruction b7_from_b4:
+Removing instruction b5_from_b7:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction mulf_init_from_main:
-Removing instruction b13:
-Removing instruction b1_from_b13:
-Removing instruction b8:
-Removing instruction b14:
-Removing instruction b15:
-Removing instruction b1_from_b15:
+Removing instruction b4:
+Removing instruction b1_from_b4:
+Removing instruction b3:
+Removing instruction b5:
+Removing instruction b6:
+Removing instruction b1_from_b6:
 Removing instruction breturn:
 Removing instruction print_word_from_print_dword:
 Removing instruction b1:
@@ -2580,27 +2590,27 @@ Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b1_from_mulf_init:
 Removing instruction b3:
-Removing instruction b5_from_b2:
-Removing instruction b6_from_b5:
-Removing instruction b8:
+Removing instruction b4_from_b2:
+Removing instruction b5_from_b4:
+Removing instruction b6:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b6 in bne b12
+Skipping double jump to b5 in bne b7
 Succesful ASM optimization Pass5DoubleJumpElimination
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b4
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
-Removing instruction b12:
+Removing instruction b7:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing unreachable instruction jmp b6
+Removing unreachable instruction jmp b5
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @22
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BORDERCOL
@@ -2611,11 +2621,11 @@ FINAL SYMBOL TABLE
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) main()
 (label) main::@1
-(label) main::@13
-(label) main::@14
-(label) main::@15
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
-(label) main::@8
 (word) main::a
 (const word) main::a#0 a = (word/signed word/dword/signed dword) $4d2
 (word) main::b
@@ -2640,12 +2650,12 @@ FINAL SYMBOL TABLE
 (byte~) mulf_init::$12 reg byte a 22.0
 (byte~) mulf_init::$8 reg byte a 22.0
 (label) mulf_init::@1
-(label) mulf_init::@12
 (label) mulf_init::@2
 (label) mulf_init::@3
+(label) mulf_init::@4
 (label) mulf_init::@5
 (label) mulf_init::@6
-(label) mulf_init::@8
+(label) mulf_init::@7
 (label) mulf_init::@return
 (byte) mulf_init::c
 (byte) mulf_init::c#1 reg byte x 2.357142857142857
@@ -2756,11 +2766,11 @@ Score: 4311
   .label SCREEN = $400
   .label print_char_cursor = 4
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @22 [phi:@begin->@22]
-//SEG5 @22
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @22 to main [phi:@22->main]
-//SEG8 [3] phi from @22 to @end [phi:@22->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -2770,47 +2780,47 @@ main: {
   //SEG11 [5] call mulf_init 
   //SEG12 [48] phi from main to mulf_init [phi:main->mulf_init]
     jsr mulf_init
-  //SEG13 main::@13
+  //SEG13 main::@4
   //SEG14 asm { sei  }
     sei
-  //SEG15 [7] phi from main::@13 to main::@1 [phi:main::@13->main::@1]
-  //SEG16 [7] phi (byte*) print_char_cursor#16 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@13->main::@1#0] -- pbuz1=pbuc1 
+  //SEG15 [7] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  //SEG16 [7] phi (byte*) print_char_cursor#16 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
   //SEG17 main::@1
-  //SEG18 main::@6
-  b6:
-  //SEG19 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG18 main::@2
+  b2:
+  //SEG19 [8] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG20 main::@8
+    bne b2
+  //SEG20 main::@3
   //SEG21 [9] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG22 [10] call mulf16u 
     jsr mulf16u
   //SEG23 [11] (dword) mulf16u::return#0 ← (dword) mulf16u::return#1
-  //SEG24 main::@14
+  //SEG24 main::@5
   //SEG25 [12] (dword) main::r#0 ← (dword) mulf16u::return#0
   //SEG26 [13] *((const byte*) BORDERCOL#0) ← -- *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_dec__deref_pbuc1 
     dec BORDERCOL
   //SEG27 [14] (dword) print_dword::dw#0 ← (dword) main::r#0
   //SEG28 [15] call print_dword 
     jsr print_dword
-  //SEG29 [16] phi from main::@14 to main::@15 [phi:main::@14->main::@15]
-  //SEG30 main::@15
+  //SEG29 [16] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  //SEG30 main::@6
   //SEG31 [17] call print_set_screen 
-  //SEG32 [18] phi from main::@15 to print_set_screen [phi:main::@15->print_set_screen]
+  //SEG32 [18] phi from main::@6 to print_set_screen [phi:main::@6->print_set_screen]
     jsr print_set_screen
-  //SEG33 [7] phi from main::@15 to main::@1 [phi:main::@15->main::@1]
-  //SEG34 [7] phi (byte*) print_char_cursor#16 = (const byte*) SCREEN#0 [phi:main::@15->main::@1#0] -- pbuz1=pbuc1 
+  //SEG33 [7] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  //SEG34 [7] phi (byte*) print_char_cursor#16 = (const byte*) SCREEN#0 [phi:main::@6->main::@1#0] -- pbuz1=pbuc1 
     lda #<SCREEN
     sta print_char_cursor
     lda #>SCREEN
     sta print_char_cursor+1
-    jmp b6
+    jmp b2
 }
 //SEG35 print_set_screen
 // Set the screen to print on. Also resets current line/char cursor.
@@ -3141,29 +3151,29 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1
-  //SEG126 [64] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  //SEG127 [64] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG126 [64] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  //SEG127 [64] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG128 [64] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG128 [64] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG129 [64] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG129 [64] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG130 [64] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuxx=vbuc1 
+  //SEG130 [64] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuxx=vbuc1 
     ldx #-1
-  //SEG131 [64] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  //SEG132 [64] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG133 [64] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG134 [64] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG135 [64] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-  //SEG136 mulf_init::@5
-  b5:
+  //SEG131 [64] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  //SEG132 [64] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG133 [64] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG134 [64] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG135 [64] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+  //SEG136 mulf_init::@4
+  b4:
   //SEG137 [65] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuxx 
     lda mulf_sqr1_lo,x
     ldy #0
@@ -3181,28 +3191,28 @@ mulf_init: {
     clc
     adc dir
     tax
-  //SEG141 [69] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuxx_neq_0_then_la1 
+  //SEG141 [69] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b6
-  //SEG142 [70] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  //SEG143 [70] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b5
+  //SEG142 [70] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  //SEG143 [70] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-  //SEG144 mulf_init::@6
-  b6:
+  //SEG144 mulf_init::@5
+  b5:
   //SEG145 [71] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG146 [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG146 [72] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5
-  //SEG147 mulf_init::@8
+    bne b4
+  //SEG147 mulf_init::@6
   //SEG148 [73] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -3213,10 +3223,10 @@ mulf_init: {
   //SEG150 mulf_init::@return
   //SEG151 [75] return 
     rts
-  //SEG152 [76] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  //SEG153 mulf_init::@12
-  //SEG154 [70] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  //SEG155 [70] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
+  //SEG152 [76] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  //SEG153 mulf_init::@7
+  //SEG154 [70] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  //SEG155 [70] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
 }
   print_hextab: .text "0123456789abcdef"
   // mulf_sqr tables will contain f(x)=int(x*x/4) and g(x) = f(x-255).
diff --git a/src/test/ref/min-fmul-16.sym b/src/test/ref/min-fmul-16.sym
index 7a010a0a0..504dacf7a 100644
--- a/src/test/ref/min-fmul-16.sym
+++ b/src/test/ref/min-fmul-16.sym
@@ -1,4 +1,4 @@
-(label) @22
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BORDERCOL
@@ -9,11 +9,11 @@
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) main()
 (label) main::@1
-(label) main::@13
-(label) main::@14
-(label) main::@15
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
-(label) main::@8
 (word) main::a
 (const word) main::a#0 a = (word/signed word/dword/signed dword) $4d2
 (word) main::b
@@ -38,12 +38,12 @@
 (byte~) mulf_init::$12 reg byte a 22.0
 (byte~) mulf_init::$8 reg byte a 22.0
 (label) mulf_init::@1
-(label) mulf_init::@12
 (label) mulf_init::@2
 (label) mulf_init::@3
+(label) mulf_init::@4
 (label) mulf_init::@5
 (label) mulf_init::@6
-(label) mulf_init::@8
+(label) mulf_init::@7
 (label) mulf_init::@return
 (byte) mulf_init::c
 (byte) mulf_init::c#1 reg byte x 2.357142857142857
diff --git a/src/test/ref/modglobal.cfg b/src/test/ref/modglobal.cfg
index d3e65ce8a..b8ead93d4 100644
--- a/src/test/ref/modglobal.cfg
+++ b/src/test/ref/modglobal.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call inccnt 
   [6] (byte) inccnt::return#0 ← (byte) inccnt::return#2
diff --git a/src/test/ref/modglobal.log b/src/test/ref/modglobal.log
index 16f1d9a89..c57adc279 100644
--- a/src/test/ref/modglobal.log
+++ b/src/test/ref/modglobal.log
@@ -219,22 +219,23 @@ Coalesced [10] cnt#16 ← cnt#2
 Coalesced [11] cnt2#15 ← cnt2#11
 Coalesced [12] cnt3#15 ← cnt3#11
 Coalesced down to 3 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call inccnt 
   [6] (byte) inccnt::return#0 ← (byte) inccnt::return#2
@@ -332,17 +333,17 @@ INITIAL ASM
   .label cnt_12 = 9
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -462,17 +463,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label cnt = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -539,7 +540,7 @@ inccnt: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -549,10 +550,10 @@ Succesful ASM optimization Pass5NextJumpElimination
 Replacing instruction lda #0 with TXA
 Removing instruction lda cnt
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction inccnt_from_main:
@@ -569,7 +570,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte[$100]) SCREEN
@@ -620,11 +621,11 @@ Score: 56
   .label SCREEN = $400
   .label cnt = 2
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/modglobal.sym b/src/test/ref/modglobal.sym
index 1bd8a087d..a2e80b5b9 100644
--- a/src/test/ref/modglobal.sym
+++ b/src/test/ref/modglobal.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte[$100]) SCREEN
diff --git a/src/test/ref/modglobalmin.cfg b/src/test/ref/modglobalmin.cfg
index cfce801fd..abd6ac552 100644
--- a/src/test/ref/modglobalmin.cfg
+++ b/src/test/ref/modglobalmin.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call inccnt 
   to:main::@1
diff --git a/src/test/ref/modglobalmin.log b/src/test/ref/modglobalmin.log
index f91353766..fc2437704 100644
--- a/src/test/ref/modglobalmin.log
+++ b/src/test/ref/modglobalmin.log
@@ -112,22 +112,23 @@ Calls in [main] to inccnt:5 inccnt:9
 Created 1 initial phi equivalence classes
 Coalesced [8] cnt#17 ← cnt#2
 Coalesced down to 1 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call inccnt 
   to:main::@1
@@ -187,17 +188,17 @@ INITIAL ASM
   .label cnt_13 = 4
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -278,17 +279,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -337,17 +338,17 @@ inccnt: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction inccnt_from_main:
@@ -364,7 +365,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte[$100]) SCREEN
@@ -397,11 +398,11 @@ Score: 40
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/modglobalmin.sym b/src/test/ref/modglobalmin.sym
index 2a71c916f..7839d6f7b 100644
--- a/src/test/ref/modglobalmin.sym
+++ b/src/test/ref/modglobalmin.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte[$100]) SCREEN
diff --git a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.asm b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.asm
index cdb360635..21012a41e 100644
--- a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.asm
+++ b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.asm
@@ -72,12 +72,12 @@ loop: {
     sta sin_idx
   b1:
   // without volatile gives wrong asm
-  b6:
+  b2:
     lda framedone
     cmp #0
-    bne b8
-    jmp b6
-  b8:
+    bne b3
+    jmp b2
+  b3:
     lda #RED
     sta BORDERCOL
     // Assign sinus positions
@@ -85,7 +85,7 @@ loop: {
     sta y_idx
     ldy #0
   // without volatile gives wrong asm
-  b9:
+  b4:
     ldx y_idx
     lda YSIN,x
     sta PLEX_YPOS,y
@@ -94,7 +94,7 @@ loop: {
     stx y_idx
     iny
     cpy #PLEX_COUNT-1+1
-    bne b9
+    bne b4
     inc sin_idx
     inc BORDERCOL
     jsr plexSort
@@ -140,7 +140,7 @@ plexSort: {
     sta PLEX_SORTED_IDX+1,x
     dex
     cpx #$ff
-    bne b8
+    bne b6
   b4:
     inx
     lda nxt_idx
@@ -165,7 +165,7 @@ plexSort: {
     bne plexFreePrepare1_b1
     sta plex_free_next
     rts
-  b8:
+  b6:
     lda nxt_y
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
@@ -252,7 +252,7 @@ plex_irq: {
     sta _4
     lda plex_show_idx
     cmp #PLEX_COUNT
-    bcc b9
+    bcc b7
   b4:
     lda #IRQ_RASTER
     sta IRQ_STATUS
@@ -268,7 +268,7 @@ plex_irq: {
   b1:
     stx RASTER
     jmp b2
-  b9:
+  b7:
     cpx _4
     bcc b3
     jmp b4
diff --git a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.cfg b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.cfg
index 0c9b17e77..2692d817d 100644
--- a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.cfg
+++ b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.cfg
@@ -1,15 +1,15 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] (byte) plex_show_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [2] (byte) plex_sprite_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [3] (byte) plex_sprite_msb#0 ← (byte/signed byte/word/signed word/dword/signed dword) 1
-  to:@9
-@9: scope:[]  from @4
+  to:@2
+@2: scope:[]  from @1
   [4] (byte) plex_free_next#31 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@12
-@12: scope:[]  from @9
+  to:@3
+@3: scope:[]  from @2
   kickasm(location (const byte*) YSIN#0) {{ .var min = 50
     .var max = 250-21
     .var ampl = max-min;
@@ -21,17 +21,17 @@
         .for (var x=0;x<3; x++)
             .byte pic.getSinglecolorByte(x,y)
  }}
-  to:@14
-@14: scope:[]  from @12
+  to:@4
+@4: scope:[]  from @3
   [7] (bool) framedone#19 ← true
-  to:@16
-@16: scope:[]  from @14
+  to:@5
+@5: scope:[]  from @4
   [8] phi()
   [9] call main 
   to:@end
-@end: scope:[]  from @16
+@end: scope:[]  from @5
   [10] phi()
-main: scope:[main]  from @16
+main: scope:[main]  from @5
   asm { sei  }
   [12] call init 
   to:main::@1
@@ -45,37 +45,37 @@ main::@return: scope:[main]  from main::@1
 loop: scope:[loop]  from main::@1
   [16] (byte) loop::sin_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:loop::@1
-loop::@1: scope:[loop]  from loop loop::@15
-  [17] (byte) loop::sin_idx#6 ← phi( loop/(byte) loop::sin_idx#0 loop::@15/(byte) loop::sin_idx#1 )
-  [17] (bool) framedone#12 ← phi( loop/(bool) framedone#19 loop::@15/(bool) framedone#5 )
-  to:loop::@6
-loop::@6: scope:[loop]  from loop::@1 loop::@6
-  [18] if((bool) framedone#12) goto loop::@8
-  to:loop::@6
-loop::@8: scope:[loop]  from loop::@6
+loop::@1: scope:[loop]  from loop loop::@6
+  [17] (byte) loop::sin_idx#6 ← phi( loop/(byte) loop::sin_idx#0 loop::@6/(byte) loop::sin_idx#1 )
+  [17] (bool) framedone#12 ← phi( loop/(bool) framedone#19 loop::@6/(bool) framedone#5 )
+  to:loop::@2
+loop::@2: scope:[loop]  from loop::@1 loop::@2
+  [18] if((bool) framedone#12) goto loop::@3
+  to:loop::@2
+loop::@3: scope:[loop]  from loop::@2
   [19] *((const byte*) BORDERCOL#0) ← (const byte) RED#0
   [20] (byte) loop::y_idx#0 ← (byte) loop::sin_idx#6
-  to:loop::@9
-loop::@9: scope:[loop]  from loop::@8 loop::@9
-  [21] (byte) loop::sy#2 ← phi( loop::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@9/(byte) loop::sy#1 )
-  [21] (byte) loop::y_idx#2 ← phi( loop::@8/(byte) loop::y_idx#0 loop::@9/(byte) loop::y_idx#1 )
+  to:loop::@4
+loop::@4: scope:[loop]  from loop::@3 loop::@4
+  [21] (byte) loop::sy#2 ← phi( loop::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@4/(byte) loop::sy#1 )
+  [21] (byte) loop::y_idx#2 ← phi( loop::@3/(byte) loop::y_idx#0 loop::@4/(byte) loop::y_idx#1 )
   [22] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2)
   [23] (byte) loop::y_idx#1 ← (byte) loop::y_idx#2 + (byte/signed byte/word/signed word/dword/signed dword) 8
   [24] (byte) loop::sy#1 ← ++ (byte) loop::sy#2
-  [25] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@9
-  to:loop::@10
-loop::@10: scope:[loop]  from loop::@9
+  [25] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@4
+  to:loop::@5
+loop::@5: scope:[loop]  from loop::@4
   [26] (byte) loop::sin_idx#1 ← (byte) loop::sin_idx#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [27] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [28] call plexSort 
-  to:loop::@15
-loop::@15: scope:[loop]  from loop::@10
+  to:loop::@6
+loop::@6: scope:[loop]  from loop::@5
   [29] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0
   [30] (bool) framedone#5 ← false
   [31] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
   [32] *((const byte*) RASTER#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:loop::@1
-plexSort: scope:[plexSort]  from loop::@10
+plexSort: scope:[plexSort]  from loop::@5
   [33] phi()
   to:plexSort::@1
 plexSort::@1: scope:[plexSort]  from plexSort plexSort::@2
@@ -83,30 +83,30 @@ plexSort::@1: scope:[plexSort]  from plexSort plexSort::@2
   [35] (byte) plexSort::nxt_idx#0 ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) plexSort::m#2)
   [36] (byte) plexSort::nxt_y#0 ← *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) plexSort::nxt_idx#0)
   [37] if((byte) plexSort::nxt_y#0>=*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::m#2))) goto plexSort::@2
-  to:plexSort::@11
-plexSort::@11: scope:[plexSort]  from plexSort::@1
+  to:plexSort::@7
+plexSort::@7: scope:[plexSort]  from plexSort::@1
   [38] (byte~) plexSort::s#6 ← (byte) plexSort::m#2
   to:plexSort::@3
-plexSort::@3: scope:[plexSort]  from plexSort::@11 plexSort::@8
-  [39] (byte) plexSort::s#3 ← phi( plexSort::@8/(byte) plexSort::s#1 plexSort::@11/(byte~) plexSort::s#6 )
+plexSort::@3: scope:[plexSort]  from plexSort::@6 plexSort::@7
+  [39] (byte) plexSort::s#3 ← phi( plexSort::@6/(byte) plexSort::s#1 plexSort::@7/(byte~) plexSort::s#6 )
   [40] *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) plexSort::s#3) ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#3)
   [41] (byte) plexSort::s#1 ← -- (byte) plexSort::s#3
-  [42] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@8
+  [42] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@6
   to:plexSort::@4
-plexSort::@4: scope:[plexSort]  from plexSort::@3 plexSort::@8
+plexSort::@4: scope:[plexSort]  from plexSort::@3 plexSort::@6
   [43] (byte) plexSort::s#2 ← ++ (byte) plexSort::s#1
   [44] *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#2) ← (byte) plexSort::nxt_idx#0
   to:plexSort::@2
 plexSort::@2: scope:[plexSort]  from plexSort::@1 plexSort::@4
   [45] (byte) plexSort::m#1 ← ++ (byte) plexSort::m#2
   [46] if((byte) plexSort::m#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) 1) goto plexSort::@1
-  to:plexSort::@6
-plexSort::@6: scope:[plexSort]  from plexSort::@2
+  to:plexSort::@5
+plexSort::@5: scope:[plexSort]  from plexSort::@2
   [47] (byte) plex_show_idx#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [48] (byte) plex_sprite_idx#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [49] (byte) plex_sprite_msb#1 ← (byte/signed byte/word/signed word/dword/signed dword) 1
   to:plexSort::plexFreePrepare1
-plexSort::plexFreePrepare1: scope:[plexSort]  from plexSort::@6
+plexSort::plexFreePrepare1: scope:[plexSort]  from plexSort::@5
   [50] phi()
   to:plexSort::plexFreePrepare1_@1
 plexSort::plexFreePrepare1_@1: scope:[plexSort]  from plexSort::plexFreePrepare1 plexSort::plexFreePrepare1_@1
@@ -121,7 +121,7 @@ plexSort::plexFreePrepare1_@2: scope:[plexSort]  from plexSort::plexFreePrepare1
 plexSort::@return: scope:[plexSort]  from plexSort::plexFreePrepare1_@2
   [56] return 
   to:@return
-plexSort::@8: scope:[plexSort]  from plexSort::@3
+plexSort::@6: scope:[plexSort]  from plexSort::@3
   [57] if((byte) plexSort::nxt_y#0<*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#1))) goto plexSort::@3
   to:plexSort::@4
 init: scope:[init]  from main
@@ -176,21 +176,21 @@ plexInit::@return: scope:[plexInit]  from plexInit::@1
 plex_irq: scope:[plex_irq]  from
   [86] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0
   to:plex_irq::@3
-plex_irq::@3: scope:[plex_irq]  from plex_irq plex_irq::@9
-  [87] (byte) plex_sprite_msb#29 ← phi( plex_irq/(byte) plex_sprite_msb#0 plex_irq::@9/(byte) plex_sprite_msb#17 )
-  [87] (byte) plex_free_next#27 ← phi( plex_irq/(byte) plex_free_next#31 plex_irq::@9/(byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0 )
-  [87] (byte) plex_show_idx#27 ← phi( plex_irq/(byte) plex_show_idx#0 plex_irq::@9/(byte) plex_show_idx#16 )
-  [87] (byte) plex_sprite_idx#25 ← phi( plex_irq/(byte) plex_sprite_idx#0 plex_irq::@9/(byte/word/dword~) plexShowSprite::$7 )
+plex_irq::@3: scope:[plex_irq]  from plex_irq plex_irq::@7
+  [87] (byte) plex_sprite_msb#29 ← phi( plex_irq/(byte) plex_sprite_msb#0 plex_irq::@7/(byte) plex_sprite_msb#17 )
+  [87] (byte) plex_free_next#27 ← phi( plex_irq/(byte) plex_free_next#31 plex_irq::@7/(byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0 )
+  [87] (byte) plex_show_idx#27 ← phi( plex_irq/(byte) plex_show_idx#0 plex_irq::@7/(byte) plex_show_idx#16 )
+  [87] (byte) plex_sprite_idx#25 ← phi( plex_irq/(byte) plex_sprite_idx#0 plex_irq::@7/(byte/word/dword~) plexShowSprite::$7 )
   [88] call plexShowSprite 
   to:plex_irq::plexFreeNextYpos1
 plex_irq::plexFreeNextYpos1: scope:[plex_irq]  from plex_irq::@3
   [89] (byte) plex_irq::plexFreeNextYpos1_return#0 ← *((const byte[8]) PLEX_FREE_YPOS#0 + (byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0)
-  to:plex_irq::@7
-plex_irq::@7: scope:[plex_irq]  from plex_irq::plexFreeNextYpos1
+  to:plex_irq::@6
+plex_irq::@6: scope:[plex_irq]  from plex_irq::plexFreeNextYpos1
   [90] (byte/signed word/word/dword/signed dword~) plex_irq::$4 ← *((const byte*) RASTER#0) + (byte/signed byte/word/signed word/dword/signed dword) 2
-  [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@9
+  [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@7
   to:plex_irq::@4
-plex_irq::@4: scope:[plex_irq]  from plex_irq::@7 plex_irq::@9
+plex_irq::@4: scope:[plex_irq]  from plex_irq::@6 plex_irq::@7
   [92] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
   [93] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@1
   to:plex_irq::@5
@@ -206,7 +206,7 @@ plex_irq::@return: scope:[plex_irq]  from plex_irq::@2
 plex_irq::@1: scope:[plex_irq]  from plex_irq::@4
   [97] *((const byte*) RASTER#0) ← (byte) plex_irq::plexFreeNextYpos1_return#0
   to:plex_irq::@2
-plex_irq::@9: scope:[plex_irq]  from plex_irq::@7
+plex_irq::@7: scope:[plex_irq]  from plex_irq::@6
   [98] if((byte) plex_irq::plexFreeNextYpos1_return#0<(byte/signed word/word/dword/signed dword~) plex_irq::$4) goto plex_irq::@3
   to:plex_irq::@4
 plexShowSprite: scope:[plexShowSprite]  from plex_irq::@3
@@ -219,33 +219,33 @@ plexShowSprite::plexFreeAdd1: scope:[plexShowSprite]  from plexShowSprite
   [103] *((const byte[8]) PLEX_FREE_YPOS#0 + (byte) plex_free_next#27) ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$0#0
   [104] (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 ← (byte) plex_free_next#27 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [105] (byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0 ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  to:plexShowSprite::@7
-plexShowSprite::@7: scope:[plexShowSprite]  from plexShowSprite::plexFreeAdd1
+  to:plexShowSprite::@5
+plexShowSprite::@5: scope:[plexShowSprite]  from plexShowSprite::plexFreeAdd1
   [106] *((const byte*) PLEX_SCREEN_PTR#0 + (byte) plex_sprite_idx#25) ← *((const byte[PLEX_COUNT#0]) PLEX_PTR#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#27))
   [107] (byte) plexShowSprite::xpos_idx#0 ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#27) << (byte/signed byte/word/signed word/dword/signed dword) 1
   [108] (byte~) plexShowSprite::$3 ← < *((const word[PLEX_COUNT#0]) PLEX_XPOS#0 + (byte) plexShowSprite::xpos_idx#0)
   [109] *((const byte*) SPRITES_XPOS#0 + (byte) plexShowSprite::plex_sprite_idx2#0) ← (byte~) plexShowSprite::$3
   [110] (byte~) plexShowSprite::$4 ← > *((const word[PLEX_COUNT#0]) PLEX_XPOS#0 + (byte) plexShowSprite::xpos_idx#0)
   [111] if((byte~) plexShowSprite::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@1
-  to:plexShowSprite::@4
-plexShowSprite::@4: scope:[plexShowSprite]  from plexShowSprite::@7
+  to:plexShowSprite::@3
+plexShowSprite::@3: scope:[plexShowSprite]  from plexShowSprite::@5
   [112] (byte/word/dword~) plexShowSprite::$10 ← (byte/word/signed word/dword/signed dword) $ff ^ (byte) plex_sprite_msb#29
   [113] *((const byte*) SPRITES_XMSB#0) ← *((const byte*) SPRITES_XMSB#0) & (byte/word/dword~) plexShowSprite::$10
   to:plexShowSprite::@2
-plexShowSprite::@2: scope:[plexShowSprite]  from plexShowSprite::@1 plexShowSprite::@4
+plexShowSprite::@2: scope:[plexShowSprite]  from plexShowSprite::@1 plexShowSprite::@3
   [114] (byte/signed word/word/dword/signed dword~) plexShowSprite::$6 ← (byte) plex_sprite_idx#25 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [115] (byte/word/dword~) plexShowSprite::$7 ← (byte/signed word/word/dword/signed dword~) plexShowSprite::$6 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [116] (byte) plex_show_idx#16 ← ++ (byte) plex_show_idx#27
   [117] (byte) plex_sprite_msb#27 ← (byte) plex_sprite_msb#29 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [118] if((byte) plex_sprite_msb#27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@return
-  to:plexShowSprite::@6
-plexShowSprite::@6: scope:[plexShowSprite]  from plexShowSprite::@2
+  to:plexShowSprite::@4
+plexShowSprite::@4: scope:[plexShowSprite]  from plexShowSprite::@2
   [119] (byte) plex_sprite_msb#4 ← (byte/signed byte/word/signed word/dword/signed dword) 1
   to:plexShowSprite::@return
-plexShowSprite::@return: scope:[plexShowSprite]  from plexShowSprite::@2 plexShowSprite::@6
-  [120] (byte) plex_sprite_msb#17 ← phi( plexShowSprite::@2/(byte) plex_sprite_msb#27 plexShowSprite::@6/(byte) plex_sprite_msb#4 )
+plexShowSprite::@return: scope:[plexShowSprite]  from plexShowSprite::@2 plexShowSprite::@4
+  [120] (byte) plex_sprite_msb#17 ← phi( plexShowSprite::@2/(byte) plex_sprite_msb#27 plexShowSprite::@4/(byte) plex_sprite_msb#4 )
   [121] return 
   to:@return
-plexShowSprite::@1: scope:[plexShowSprite]  from plexShowSprite::@7
+plexShowSprite::@1: scope:[plexShowSprite]  from plexShowSprite::@5
   [122] *((const byte*) SPRITES_XMSB#0) ← *((const byte*) SPRITES_XMSB#0) | (byte) plex_sprite_msb#29
   to:plexShowSprite::@2
diff --git a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log
index 1b9e33f30..e24a10265 100644
--- a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log
+++ b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log
@@ -1849,8 +1849,26 @@ Culled Empty Block (label) init::@6
 Culled Empty Block (label) plexInit::@4
 Culled Empty Block (label) plex_irq::@10
 Culled Empty Block (label) plexShowSprite::@8
+Renumbering block @4 to @1
+Renumbering block @9 to @2
+Renumbering block @12 to @3
+Renumbering block @14 to @4
+Renumbering block @16 to @5
+Renumbering block plexSort::@6 to plexSort::@5
+Renumbering block plexSort::@8 to plexSort::@6
+Renumbering block plexSort::@11 to plexSort::@7
+Renumbering block plexShowSprite::@4 to plexShowSprite::@3
+Renumbering block plexShowSprite::@6 to plexShowSprite::@4
+Renumbering block plexShowSprite::@7 to plexShowSprite::@5
+Renumbering block plex_irq::@7 to plex_irq::@6
+Renumbering block plex_irq::@9 to plex_irq::@7
+Renumbering block loop::@6 to loop::@2
+Renumbering block loop::@8 to loop::@3
+Renumbering block loop::@9 to loop::@4
+Renumbering block loop::@10 to loop::@5
+Renumbering block loop::@15 to loop::@6
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @16
+Adding NOP phi() at start of @5
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of plexSort
@@ -1861,16 +1879,16 @@ Adding NOP phi() at start of plexInit::plexSetScreen1
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] (byte) plex_show_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [2] (byte) plex_sprite_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [3] (byte) plex_sprite_msb#0 ← (byte/signed byte/word/signed word/dword/signed dword) 1
-  to:@9
-@9: scope:[]  from @4
+  to:@2
+@2: scope:[]  from @1
   [4] (byte) plex_free_next#31 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@12
-@12: scope:[]  from @9
+  to:@3
+@3: scope:[]  from @2
   kickasm(location (const byte*) YSIN#0) {{ .var min = 50
     .var max = 250-21
     .var ampl = max-min;
@@ -1882,17 +1900,17 @@ FINAL CONTROL FLOW GRAPH
         .for (var x=0;x<3; x++)
             .byte pic.getSinglecolorByte(x,y)
  }}
-  to:@14
-@14: scope:[]  from @12
+  to:@4
+@4: scope:[]  from @3
   [7] (bool) framedone#19 ← true
-  to:@16
-@16: scope:[]  from @14
+  to:@5
+@5: scope:[]  from @4
   [8] phi()
   [9] call main 
   to:@end
-@end: scope:[]  from @16
+@end: scope:[]  from @5
   [10] phi()
-main: scope:[main]  from @16
+main: scope:[main]  from @5
   asm { sei  }
   [12] call init 
   to:main::@1
@@ -1906,37 +1924,37 @@ main::@return: scope:[main]  from main::@1
 loop: scope:[loop]  from main::@1
   [16] (byte) loop::sin_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:loop::@1
-loop::@1: scope:[loop]  from loop loop::@15
-  [17] (byte) loop::sin_idx#6 ← phi( loop/(byte) loop::sin_idx#0 loop::@15/(byte) loop::sin_idx#1 )
-  [17] (bool) framedone#12 ← phi( loop/(bool) framedone#19 loop::@15/(bool) framedone#5 )
-  to:loop::@6
-loop::@6: scope:[loop]  from loop::@1 loop::@6
-  [18] if((bool) framedone#12) goto loop::@8
-  to:loop::@6
-loop::@8: scope:[loop]  from loop::@6
+loop::@1: scope:[loop]  from loop loop::@6
+  [17] (byte) loop::sin_idx#6 ← phi( loop/(byte) loop::sin_idx#0 loop::@6/(byte) loop::sin_idx#1 )
+  [17] (bool) framedone#12 ← phi( loop/(bool) framedone#19 loop::@6/(bool) framedone#5 )
+  to:loop::@2
+loop::@2: scope:[loop]  from loop::@1 loop::@2
+  [18] if((bool) framedone#12) goto loop::@3
+  to:loop::@2
+loop::@3: scope:[loop]  from loop::@2
   [19] *((const byte*) BORDERCOL#0) ← (const byte) RED#0
   [20] (byte) loop::y_idx#0 ← (byte) loop::sin_idx#6
-  to:loop::@9
-loop::@9: scope:[loop]  from loop::@8 loop::@9
-  [21] (byte) loop::sy#2 ← phi( loop::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@9/(byte) loop::sy#1 )
-  [21] (byte) loop::y_idx#2 ← phi( loop::@8/(byte) loop::y_idx#0 loop::@9/(byte) loop::y_idx#1 )
+  to:loop::@4
+loop::@4: scope:[loop]  from loop::@3 loop::@4
+  [21] (byte) loop::sy#2 ← phi( loop::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 loop::@4/(byte) loop::sy#1 )
+  [21] (byte) loop::y_idx#2 ← phi( loop::@3/(byte) loop::y_idx#0 loop::@4/(byte) loop::y_idx#1 )
   [22] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2)
   [23] (byte) loop::y_idx#1 ← (byte) loop::y_idx#2 + (byte/signed byte/word/signed word/dword/signed dword) 8
   [24] (byte) loop::sy#1 ← ++ (byte) loop::sy#2
-  [25] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@9
-  to:loop::@10
-loop::@10: scope:[loop]  from loop::@9
+  [25] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@4
+  to:loop::@5
+loop::@5: scope:[loop]  from loop::@4
   [26] (byte) loop::sin_idx#1 ← (byte) loop::sin_idx#6 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [27] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0)
   [28] call plexSort 
-  to:loop::@15
-loop::@15: scope:[loop]  from loop::@10
+  to:loop::@6
+loop::@6: scope:[loop]  from loop::@5
   [29] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0
   [30] (bool) framedone#5 ← false
   [31] *((const byte*) VIC_CONTROL#0) ← *((const byte*) VIC_CONTROL#0) & (byte/signed byte/word/signed word/dword/signed dword) $7f
   [32] *((const byte*) RASTER#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:loop::@1
-plexSort: scope:[plexSort]  from loop::@10
+plexSort: scope:[plexSort]  from loop::@5
   [33] phi()
   to:plexSort::@1
 plexSort::@1: scope:[plexSort]  from plexSort plexSort::@2
@@ -1944,30 +1962,30 @@ plexSort::@1: scope:[plexSort]  from plexSort plexSort::@2
   [35] (byte) plexSort::nxt_idx#0 ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) plexSort::m#2)
   [36] (byte) plexSort::nxt_y#0 ← *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) plexSort::nxt_idx#0)
   [37] if((byte) plexSort::nxt_y#0>=*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::m#2))) goto plexSort::@2
-  to:plexSort::@11
-plexSort::@11: scope:[plexSort]  from plexSort::@1
+  to:plexSort::@7
+plexSort::@7: scope:[plexSort]  from plexSort::@1
   [38] (byte~) plexSort::s#6 ← (byte) plexSort::m#2
   to:plexSort::@3
-plexSort::@3: scope:[plexSort]  from plexSort::@11 plexSort::@8
-  [39] (byte) plexSort::s#3 ← phi( plexSort::@8/(byte) plexSort::s#1 plexSort::@11/(byte~) plexSort::s#6 )
+plexSort::@3: scope:[plexSort]  from plexSort::@6 plexSort::@7
+  [39] (byte) plexSort::s#3 ← phi( plexSort::@6/(byte) plexSort::s#1 plexSort::@7/(byte~) plexSort::s#6 )
   [40] *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) plexSort::s#3) ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#3)
   [41] (byte) plexSort::s#1 ← -- (byte) plexSort::s#3
-  [42] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@8
+  [42] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@6
   to:plexSort::@4
-plexSort::@4: scope:[plexSort]  from plexSort::@3 plexSort::@8
+plexSort::@4: scope:[plexSort]  from plexSort::@3 plexSort::@6
   [43] (byte) plexSort::s#2 ← ++ (byte) plexSort::s#1
   [44] *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#2) ← (byte) plexSort::nxt_idx#0
   to:plexSort::@2
 plexSort::@2: scope:[plexSort]  from plexSort::@1 plexSort::@4
   [45] (byte) plexSort::m#1 ← ++ (byte) plexSort::m#2
   [46] if((byte) plexSort::m#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) 1) goto plexSort::@1
-  to:plexSort::@6
-plexSort::@6: scope:[plexSort]  from plexSort::@2
+  to:plexSort::@5
+plexSort::@5: scope:[plexSort]  from plexSort::@2
   [47] (byte) plex_show_idx#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [48] (byte) plex_sprite_idx#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [49] (byte) plex_sprite_msb#1 ← (byte/signed byte/word/signed word/dword/signed dword) 1
   to:plexSort::plexFreePrepare1
-plexSort::plexFreePrepare1: scope:[plexSort]  from plexSort::@6
+plexSort::plexFreePrepare1: scope:[plexSort]  from plexSort::@5
   [50] phi()
   to:plexSort::plexFreePrepare1_@1
 plexSort::plexFreePrepare1_@1: scope:[plexSort]  from plexSort::plexFreePrepare1 plexSort::plexFreePrepare1_@1
@@ -1982,7 +2000,7 @@ plexSort::plexFreePrepare1_@2: scope:[plexSort]  from plexSort::plexFreePrepare1
 plexSort::@return: scope:[plexSort]  from plexSort::plexFreePrepare1_@2
   [56] return 
   to:@return
-plexSort::@8: scope:[plexSort]  from plexSort::@3
+plexSort::@6: scope:[plexSort]  from plexSort::@3
   [57] if((byte) plexSort::nxt_y#0<*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#1))) goto plexSort::@3
   to:plexSort::@4
 init: scope:[init]  from main
@@ -2037,21 +2055,21 @@ plexInit::@return: scope:[plexInit]  from plexInit::@1
 plex_irq: scope:[plex_irq]  from
   [86] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0
   to:plex_irq::@3
-plex_irq::@3: scope:[plex_irq]  from plex_irq plex_irq::@9
-  [87] (byte) plex_sprite_msb#29 ← phi( plex_irq/(byte) plex_sprite_msb#0 plex_irq::@9/(byte) plex_sprite_msb#17 )
-  [87] (byte) plex_free_next#27 ← phi( plex_irq/(byte) plex_free_next#31 plex_irq::@9/(byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0 )
-  [87] (byte) plex_show_idx#27 ← phi( plex_irq/(byte) plex_show_idx#0 plex_irq::@9/(byte) plex_show_idx#16 )
-  [87] (byte) plex_sprite_idx#25 ← phi( plex_irq/(byte) plex_sprite_idx#0 plex_irq::@9/(byte/word/dword~) plexShowSprite::$7 )
+plex_irq::@3: scope:[plex_irq]  from plex_irq plex_irq::@7
+  [87] (byte) plex_sprite_msb#29 ← phi( plex_irq/(byte) plex_sprite_msb#0 plex_irq::@7/(byte) plex_sprite_msb#17 )
+  [87] (byte) plex_free_next#27 ← phi( plex_irq/(byte) plex_free_next#31 plex_irq::@7/(byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0 )
+  [87] (byte) plex_show_idx#27 ← phi( plex_irq/(byte) plex_show_idx#0 plex_irq::@7/(byte) plex_show_idx#16 )
+  [87] (byte) plex_sprite_idx#25 ← phi( plex_irq/(byte) plex_sprite_idx#0 plex_irq::@7/(byte/word/dword~) plexShowSprite::$7 )
   [88] call plexShowSprite 
   to:plex_irq::plexFreeNextYpos1
 plex_irq::plexFreeNextYpos1: scope:[plex_irq]  from plex_irq::@3
   [89] (byte) plex_irq::plexFreeNextYpos1_return#0 ← *((const byte[8]) PLEX_FREE_YPOS#0 + (byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0)
-  to:plex_irq::@7
-plex_irq::@7: scope:[plex_irq]  from plex_irq::plexFreeNextYpos1
+  to:plex_irq::@6
+plex_irq::@6: scope:[plex_irq]  from plex_irq::plexFreeNextYpos1
   [90] (byte/signed word/word/dword/signed dword~) plex_irq::$4 ← *((const byte*) RASTER#0) + (byte/signed byte/word/signed word/dword/signed dword) 2
-  [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@9
+  [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@7
   to:plex_irq::@4
-plex_irq::@4: scope:[plex_irq]  from plex_irq::@7 plex_irq::@9
+plex_irq::@4: scope:[plex_irq]  from plex_irq::@6 plex_irq::@7
   [92] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0
   [93] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@1
   to:plex_irq::@5
@@ -2067,7 +2085,7 @@ plex_irq::@return: scope:[plex_irq]  from plex_irq::@2
 plex_irq::@1: scope:[plex_irq]  from plex_irq::@4
   [97] *((const byte*) RASTER#0) ← (byte) plex_irq::plexFreeNextYpos1_return#0
   to:plex_irq::@2
-plex_irq::@9: scope:[plex_irq]  from plex_irq::@7
+plex_irq::@7: scope:[plex_irq]  from plex_irq::@6
   [98] if((byte) plex_irq::plexFreeNextYpos1_return#0<(byte/signed word/word/dword/signed dword~) plex_irq::$4) goto plex_irq::@3
   to:plex_irq::@4
 plexShowSprite: scope:[plexShowSprite]  from plex_irq::@3
@@ -2080,34 +2098,34 @@ plexShowSprite::plexFreeAdd1: scope:[plexShowSprite]  from plexShowSprite
   [103] *((const byte[8]) PLEX_FREE_YPOS#0 + (byte) plex_free_next#27) ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$0#0
   [104] (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 ← (byte) plex_free_next#27 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [105] (byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0 ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 & (byte/signed byte/word/signed word/dword/signed dword) 7
-  to:plexShowSprite::@7
-plexShowSprite::@7: scope:[plexShowSprite]  from plexShowSprite::plexFreeAdd1
+  to:plexShowSprite::@5
+plexShowSprite::@5: scope:[plexShowSprite]  from plexShowSprite::plexFreeAdd1
   [106] *((const byte*) PLEX_SCREEN_PTR#0 + (byte) plex_sprite_idx#25) ← *((const byte[PLEX_COUNT#0]) PLEX_PTR#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#27))
   [107] (byte) plexShowSprite::xpos_idx#0 ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#27) << (byte/signed byte/word/signed word/dword/signed dword) 1
   [108] (byte~) plexShowSprite::$3 ← < *((const word[PLEX_COUNT#0]) PLEX_XPOS#0 + (byte) plexShowSprite::xpos_idx#0)
   [109] *((const byte*) SPRITES_XPOS#0 + (byte) plexShowSprite::plex_sprite_idx2#0) ← (byte~) plexShowSprite::$3
   [110] (byte~) plexShowSprite::$4 ← > *((const word[PLEX_COUNT#0]) PLEX_XPOS#0 + (byte) plexShowSprite::xpos_idx#0)
   [111] if((byte~) plexShowSprite::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@1
-  to:plexShowSprite::@4
-plexShowSprite::@4: scope:[plexShowSprite]  from plexShowSprite::@7
+  to:plexShowSprite::@3
+plexShowSprite::@3: scope:[plexShowSprite]  from plexShowSprite::@5
   [112] (byte/word/dword~) plexShowSprite::$10 ← (byte/word/signed word/dword/signed dword) $ff ^ (byte) plex_sprite_msb#29
   [113] *((const byte*) SPRITES_XMSB#0) ← *((const byte*) SPRITES_XMSB#0) & (byte/word/dword~) plexShowSprite::$10
   to:plexShowSprite::@2
-plexShowSprite::@2: scope:[plexShowSprite]  from plexShowSprite::@1 plexShowSprite::@4
+plexShowSprite::@2: scope:[plexShowSprite]  from plexShowSprite::@1 plexShowSprite::@3
   [114] (byte/signed word/word/dword/signed dword~) plexShowSprite::$6 ← (byte) plex_sprite_idx#25 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [115] (byte/word/dword~) plexShowSprite::$7 ← (byte/signed word/word/dword/signed dword~) plexShowSprite::$6 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [116] (byte) plex_show_idx#16 ← ++ (byte) plex_show_idx#27
   [117] (byte) plex_sprite_msb#27 ← (byte) plex_sprite_msb#29 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [118] if((byte) plex_sprite_msb#27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@return
-  to:plexShowSprite::@6
-plexShowSprite::@6: scope:[plexShowSprite]  from plexShowSprite::@2
+  to:plexShowSprite::@4
+plexShowSprite::@4: scope:[plexShowSprite]  from plexShowSprite::@2
   [119] (byte) plex_sprite_msb#4 ← (byte/signed byte/word/signed word/dword/signed dword) 1
   to:plexShowSprite::@return
-plexShowSprite::@return: scope:[plexShowSprite]  from plexShowSprite::@2 plexShowSprite::@6
-  [120] (byte) plex_sprite_msb#17 ← phi( plexShowSprite::@2/(byte) plex_sprite_msb#27 plexShowSprite::@6/(byte) plex_sprite_msb#4 )
+plexShowSprite::@return: scope:[plexShowSprite]  from plexShowSprite::@2 plexShowSprite::@4
+  [120] (byte) plex_sprite_msb#17 ← phi( plexShowSprite::@2/(byte) plex_sprite_msb#27 plexShowSprite::@4/(byte) plex_sprite_msb#4 )
   [121] return 
   to:@return
-plexShowSprite::@1: scope:[plexShowSprite]  from plexShowSprite::@7
+plexShowSprite::@1: scope:[plexShowSprite]  from plexShowSprite::@5
   [122] *((const byte*) SPRITES_XMSB#0) ← *((const byte*) SPRITES_XMSB#0) | (byte) plex_sprite_msb#29
   to:plexShowSprite::@2
 
@@ -2463,9 +2481,9 @@ INITIAL ASM
   .label framedone_19 = 2
 //SEG3 @begin
 bbegin:
-  jmp b4
-//SEG4 @4
-b4:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 [1] (byte) plex_show_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The index in the PLEX tables of the next sprite to show
   lda #0
@@ -2478,33 +2496,33 @@ b4:
   // The MSB bit of the next sprite to use for showing
   lda #1
   sta plex_sprite_msb
-  jmp b9
-//SEG8 @9
-b9:
+  jmp b2
+//SEG8 @2
+b2:
 //SEG9 [4] (byte) plex_free_next#31 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The index of the sprite that is free next. Since sprites are used round-robin this moves forward each time a sprite is shown.
   lda #0
   sta plex_free_next_31
-  jmp b12
-//SEG10 @12
-b12:
+  jmp b3
+//SEG10 @3
+b3:
 //SEG11 kickasm(location (const byte*) YSIN#0) {{ .var min = 50     .var max = 250-21     .var ampl = max-min;     .for(var i=0;i<256;i++)         .byte round(min+(ampl/2)+(ampl/2)*sin(toRadians(360*i/256)))  }}
 //SEG12 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
-  jmp b14
-//SEG13 @14
-b14:
+  jmp b4
+//SEG13 @4
+b4:
 //SEG14 [7] (bool) framedone#19 ← true -- vboz1=vboc1 
   lda #1
   sta framedone_19
-//SEG15 [8] phi from @14 to @16 [phi:@14->@16]
-b16_from_b14:
-  jmp b16
-//SEG16 @16
-b16:
+//SEG15 [8] phi from @4 to @5 [phi:@4->@5]
+b5_from_b4:
+  jmp b5
+//SEG16 @5
+b5:
 //SEG17 [9] call main 
   jsr main
-//SEG18 [10] phi from @16 to @end [phi:@16->@end]
-bend_from_b16:
+//SEG18 [10] phi from @5 to @end [phi:@5->@end]
+bend_from_b5:
   jmp bend
 //SEG19 @end
 bend:
@@ -2537,25 +2555,25 @@ loop: {
     // The current index into the y-sinus
     lda #0
     sta sin_idx
-  //SEG30 [17] phi from loop loop::@15 to loop::@1 [phi:loop/loop::@15->loop::@1]
+  //SEG30 [17] phi from loop loop::@6 to loop::@1 [phi:loop/loop::@6->loop::@1]
   b1_from_loop:
-  b1_from_b15:
-  //SEG31 [17] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#0 [phi:loop/loop::@15->loop::@1#0] -- register_copy 
-  //SEG32 [17] phi (bool) framedone#12 = (bool) framedone#19 [phi:loop/loop::@15->loop::@1#1] -- register_copy 
+  b1_from_b6:
+  //SEG31 [17] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#0 [phi:loop/loop::@6->loop::@1#0] -- register_copy 
+  //SEG32 [17] phi (bool) framedone#12 = (bool) framedone#19 [phi:loop/loop::@6->loop::@1#1] -- register_copy 
     jmp b1
   // without volatile gives wrong asm
   //SEG33 loop::@1
   b1:
-    jmp b6
-  //SEG34 loop::@6
-  b6:
-  //SEG35 [18] if((bool) framedone#12) goto loop::@8 -- vboz1_then_la1 
+    jmp b2
+  //SEG34 loop::@2
+  b2:
+  //SEG35 [18] if((bool) framedone#12) goto loop::@3 -- vboz1_then_la1 
     lda framedone_12
     cmp #0
-    bne b8
-    jmp b6
-  //SEG36 loop::@8
-  b8:
+    bne b3
+    jmp b2
+  //SEG36 loop::@3
+  b3:
   //SEG37 [19] *((const byte*) BORDERCOL#0) ← (const byte) RED#0 -- _deref_pbuc1=vbuc2 
     lda #RED
     sta BORDERCOL
@@ -2563,21 +2581,21 @@ loop: {
     // Assign sinus positions
     lda sin_idx
     sta y_idx
-  //SEG39 [21] phi from loop::@8 to loop::@9 [phi:loop::@8->loop::@9]
-  b9_from_b8:
-  //SEG40 [21] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@8->loop::@9#0] -- vbuz1=vbuc1 
+  //SEG39 [21] phi from loop::@3 to loop::@4 [phi:loop::@3->loop::@4]
+  b4_from_b3:
+  //SEG40 [21] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@3->loop::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta sy
-  //SEG41 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#0 [phi:loop::@8->loop::@9#1] -- register_copy 
-    jmp b9
+  //SEG41 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#0 [phi:loop::@3->loop::@4#1] -- register_copy 
+    jmp b4
   // without volatile gives wrong asm
-  //SEG42 [21] phi from loop::@9 to loop::@9 [phi:loop::@9->loop::@9]
-  b9_from_b9:
-  //SEG43 [21] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@9->loop::@9#0] -- register_copy 
-  //SEG44 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@9->loop::@9#1] -- register_copy 
-    jmp b9
-  //SEG45 loop::@9
-  b9:
+  //SEG42 [21] phi from loop::@4 to loop::@4 [phi:loop::@4->loop::@4]
+  b4_from_b4:
+  //SEG43 [21] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@4->loop::@4#0] -- register_copy 
+  //SEG44 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@4->loop::@4#1] -- register_copy 
+    jmp b4
+  //SEG45 loop::@4
+  b4:
   //SEG46 [22] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_vbuz2 
     ldy y_idx
     lda YSIN,y
@@ -2589,24 +2607,24 @@ loop: {
     stx y_idx
   //SEG48 [24] (byte) loop::sy#1 ← ++ (byte) loop::sy#2 -- vbuz1=_inc_vbuz1 
     inc sy
-  //SEG49 [25] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@9 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG49 [25] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #PLEX_COUNT-1+1
     cmp sy
-    bne b9_from_b9
-    jmp b10
-  //SEG50 loop::@10
-  b10:
+    bne b4_from_b4
+    jmp b5
+  //SEG50 loop::@5
+  b5:
   //SEG51 [26] (byte) loop::sin_idx#1 ← (byte) loop::sin_idx#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_plus_1 
     inc sin_idx
   //SEG52 [27] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG53 [28] call plexSort 
-  //SEG54 [33] phi from loop::@10 to plexSort [phi:loop::@10->plexSort]
-  plexSort_from_b10:
+  //SEG54 [33] phi from loop::@5 to plexSort [phi:loop::@5->plexSort]
+  plexSort_from_b5:
     jsr plexSort
-    jmp b15
-  //SEG55 loop::@15
-  b15:
+    jmp b6
+  //SEG55 loop::@6
+  b6:
   //SEG56 [29] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BORDERCOL
@@ -2620,7 +2638,7 @@ loop: {
   //SEG59 [32] *((const byte*) RASTER#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta RASTER
-    jmp b1_from_b15
+    jmp b1_from_b6
 }
 //SEG60 plexSort
 // Ensure that the indices in PLEX_SORTED_IDX is sorted based on the y-positions in PLEX_YPOS
@@ -2665,16 +2683,16 @@ plexSort: {
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
     bcs b2
-    jmp b11
-  //SEG69 plexSort::@11
-  b11:
+    jmp b7
+  //SEG69 plexSort::@7
+  b7:
   //SEG70 [38] (byte~) plexSort::s#6 ← (byte) plexSort::m#2 -- vbuz1=vbuz2 
     lda m
     sta s
-  //SEG71 [39] phi from plexSort::@11 plexSort::@8 to plexSort::@3 [phi:plexSort::@11/plexSort::@8->plexSort::@3]
-  b3_from_b11:
-  b3_from_b8:
-  //SEG72 [39] phi (byte) plexSort::s#3 = (byte~) plexSort::s#6 [phi:plexSort::@11/plexSort::@8->plexSort::@3#0] -- register_copy 
+  //SEG71 [39] phi from plexSort::@6 plexSort::@7 to plexSort::@3 [phi:plexSort::@6/plexSort::@7->plexSort::@3]
+  b3_from_b6:
+  b3_from_b7:
+  //SEG72 [39] phi (byte) plexSort::s#3 = (byte) plexSort::s#1 [phi:plexSort::@6/plexSort::@7->plexSort::@3#0] -- register_copy 
     jmp b3
   //SEG73 plexSort::@3
   b3:
@@ -2684,10 +2702,10 @@ plexSort: {
     sta PLEX_SORTED_IDX+1,y
   //SEG75 [41] (byte) plexSort::s#1 ← -- (byte) plexSort::s#3 -- vbuz1=_dec_vbuz1 
     dec s
-  //SEG76 [42] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG76 [42] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$ff
     cmp s
-    bne b8
+    bne b6
     jmp b4
   //SEG77 plexSort::@4
   b4:
@@ -2708,9 +2726,9 @@ plexSort: {
     lda #PLEX_COUNT-2+1
     cmp m
     bne b1_from_b2
-    jmp b6
-  //SEG83 plexSort::@6
-  b6:
+    jmp b5
+  //SEG83 plexSort::@5
+  b5:
   //SEG84 [47] (byte) plex_show_idx#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     // Prepare for showing the sprites
     lda #0
@@ -2721,8 +2739,8 @@ plexSort: {
   //SEG86 [49] (byte) plex_sprite_msb#1 ← (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuc1 
     lda #1
     sta plex_sprite_msb_1
-  //SEG87 [50] phi from plexSort::@6 to plexSort::plexFreePrepare1 [phi:plexSort::@6->plexSort::plexFreePrepare1]
-  plexFreePrepare1_from_b6:
+  //SEG87 [50] phi from plexSort::@5 to plexSort::plexFreePrepare1 [phi:plexSort::@5->plexSort::plexFreePrepare1]
+  plexFreePrepare1_from_b5:
     jmp plexFreePrepare1
   //SEG88 plexSort::plexFreePrepare1
   plexFreePrepare1:
@@ -2759,14 +2777,14 @@ plexSort: {
   breturn:
   //SEG100 [56] return 
     rts
-  //SEG101 plexSort::@8
-  b8:
+  //SEG101 plexSort::@6
+  b6:
   //SEG102 [57] if((byte) plexSort::nxt_y#0<*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#1))) goto plexSort::@3 -- vbuz1_lt_pbuc1_derefidx_pbuc2_derefidx_vbuz2_then_la1 
     lda nxt_y
     ldx s
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
-    bcc b3_from_b8
+    bcc b3_from_b6
     jmp b4
 }
 //SEG103 init
@@ -2931,13 +2949,13 @@ plex_irq: {
   //SEG154 [86] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0 -- _deref_pbuc1=vbuc2 
     lda #WHITE
     sta BORDERCOL
-  //SEG155 [87] phi from plex_irq plex_irq::@9 to plex_irq::@3 [phi:plex_irq/plex_irq::@9->plex_irq::@3]
+  //SEG155 [87] phi from plex_irq plex_irq::@7 to plex_irq::@3 [phi:plex_irq/plex_irq::@7->plex_irq::@3]
   b3_from_plex_irq:
-  b3_from_b9:
-  //SEG156 [87] phi (byte) plex_sprite_msb#29 = (byte) plex_sprite_msb#0 [phi:plex_irq/plex_irq::@9->plex_irq::@3#0] -- register_copy 
-  //SEG157 [87] phi (byte) plex_free_next#27 = (byte) plex_free_next#31 [phi:plex_irq/plex_irq::@9->plex_irq::@3#1] -- register_copy 
-  //SEG158 [87] phi (byte) plex_show_idx#27 = (byte) plex_show_idx#0 [phi:plex_irq/plex_irq::@9->plex_irq::@3#2] -- register_copy 
-  //SEG159 [87] phi (byte) plex_sprite_idx#25 = (byte) plex_sprite_idx#0 [phi:plex_irq/plex_irq::@9->plex_irq::@3#3] -- register_copy 
+  b3_from_b7:
+  //SEG156 [87] phi (byte) plex_sprite_msb#29 = (byte) plex_sprite_msb#0 [phi:plex_irq/plex_irq::@7->plex_irq::@3#0] -- register_copy 
+  //SEG157 [87] phi (byte) plex_free_next#27 = (byte) plex_free_next#31 [phi:plex_irq/plex_irq::@7->plex_irq::@3#1] -- register_copy 
+  //SEG158 [87] phi (byte) plex_show_idx#27 = (byte) plex_show_idx#0 [phi:plex_irq/plex_irq::@7->plex_irq::@3#2] -- register_copy 
+  //SEG159 [87] phi (byte) plex_sprite_idx#25 = (byte) plex_sprite_idx#0 [phi:plex_irq/plex_irq::@7->plex_irq::@3#3] -- register_copy 
     jmp b3
   //SEG160 plex_irq::@3
   b3:
@@ -2950,18 +2968,18 @@ plex_irq: {
     ldy plexShowSprite.plexFreeAdd1__2
     lda PLEX_FREE_YPOS,y
     sta plexFreeNextYpos1_return
-    jmp b7
-  //SEG164 plex_irq::@7
-  b7:
+    jmp b6
+  //SEG164 plex_irq::@6
+  b6:
   //SEG165 [90] (byte/signed word/word/dword/signed dword~) plex_irq::$4 ← *((const byte*) RASTER#0) + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=_deref_pbuc1_plus_2 
     lda RASTER
     clc
     adc #2
     sta _4
-  //SEG166 [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@9 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG166 [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@7 -- vbuz1_lt_vbuc1_then_la1 
     lda plex_show_idx
     cmp #PLEX_COUNT
-    bcc b9
+    bcc b7
     jmp b4
   //SEG167 plex_irq::@4
   b4:
@@ -2995,12 +3013,12 @@ plex_irq: {
     lda plexFreeNextYpos1_return
     sta RASTER
     jmp b2
-  //SEG178 plex_irq::@9
-  b9:
+  //SEG178 plex_irq::@7
+  b7:
   //SEG179 [98] if((byte) plex_irq::plexFreeNextYpos1_return#0<(byte/signed word/word/dword/signed dword~) plex_irq::$4) goto plex_irq::@3 -- vbuz1_lt_vbuz2_then_la1 
     lda plexFreeNextYpos1_return
     cmp _4
-    bcc b3_from_b9
+    bcc b3_from_b7
     jmp b4
 }
 //SEG180 plexShowSprite
@@ -3050,9 +3068,9 @@ plexShowSprite: {
     lda #7
     and plexFreeAdd1__1
     sta plexFreeAdd1__2
-    jmp b7
-  //SEG189 plexShowSprite::@7
-  b7:
+    jmp b5
+  //SEG189 plexShowSprite::@5
+  b5:
   //SEG190 [106] *((const byte*) PLEX_SCREEN_PTR#0 + (byte) plex_sprite_idx#25) ← *((const byte[PLEX_COUNT#0]) PLEX_PTR#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#27)) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_pbuc3_derefidx_vbuz2 
     ldx plex_show_idx
     ldy PLEX_SORTED_IDX,x
@@ -3080,9 +3098,9 @@ plexShowSprite: {
     lda _4
     cmp #0
     bne b1
-    jmp b4
-  //SEG196 plexShowSprite::@4
-  b4:
+    jmp b3
+  //SEG196 plexShowSprite::@3
+  b3:
   //SEG197 [112] (byte/word/dword~) plexShowSprite::$10 ← (byte/word/signed word/dword/signed dword) $ff ^ (byte) plex_sprite_msb#29 -- vbuz1=vbuc1_bxor_vbuz2 
     lda plex_sprite_msb
     eor #$ff
@@ -3110,16 +3128,16 @@ plexShowSprite: {
     lda plex_sprite_msb
     cmp #0
     bne breturn_from_b2
-    jmp b6
-  //SEG205 plexShowSprite::@6
-  b6:
+    jmp b4
+  //SEG205 plexShowSprite::@4
+  b4:
   //SEG206 [119] (byte) plex_sprite_msb#4 ← (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuc1 
     lda #1
     sta plex_sprite_msb
-  //SEG207 [120] phi from plexShowSprite::@2 plexShowSprite::@6 to plexShowSprite::@return [phi:plexShowSprite::@2/plexShowSprite::@6->plexShowSprite::@return]
+  //SEG207 [120] phi from plexShowSprite::@2 plexShowSprite::@4 to plexShowSprite::@return [phi:plexShowSprite::@2/plexShowSprite::@4->plexShowSprite::@return]
   breturn_from_b2:
-  breturn_from_b6:
-  //SEG208 [120] phi (byte) plex_sprite_msb#17 = (byte) plex_sprite_msb#27 [phi:plexShowSprite::@2/plexShowSprite::@6->plexShowSprite::@return#0] -- register_copy 
+  breturn_from_b4:
+  //SEG208 [120] phi (byte) plex_sprite_msb#17 = (byte) plex_sprite_msb#27 [phi:plexShowSprite::@2/plexShowSprite::@4->plexShowSprite::@return#0] -- register_copy 
     jmp breturn
   //SEG209 plexShowSprite::@return
   breturn:
@@ -3164,7 +3182,7 @@ Statement [3] (byte) plex_sprite_msb#0 ← (byte/signed byte/word/signed word/dw
 Statement [4] (byte) plex_free_next#31 ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( ) always clobbers reg byte a 
 Statement [7] (bool) framedone#19 ← true [ framedone#19 ] ( ) always clobbers reg byte a 
 Statement [16] (byte) loop::sin_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ framedone#19 loop::sin_idx#0 ] ( main:9::loop:14 [ framedone#19 loop::sin_idx#0 ] ) always clobbers reg byte a 
-Statement [18] if((bool) framedone#12) goto loop::@8 [ framedone#12 loop::sin_idx#6 ] ( main:9::loop:14 [ framedone#12 loop::sin_idx#6 ] ) always clobbers reg byte a 
+Statement [18] if((bool) framedone#12) goto loop::@3 [ framedone#12 loop::sin_idx#6 ] ( main:9::loop:14 [ framedone#12 loop::sin_idx#6 ] ) always clobbers reg byte a 
 Statement [19] *((const byte*) BORDERCOL#0) ← (const byte) RED#0 [ loop::sin_idx#6 ] ( main:9::loop:14 [ loop::sin_idx#6 ] ) always clobbers reg byte a 
 Statement [20] (byte) loop::y_idx#0 ← (byte) loop::sin_idx#6 [ loop::sin_idx#6 loop::y_idx#0 ] ( main:9::loop:14 [ loop::sin_idx#6 loop::y_idx#0 ] ) always clobbers reg byte a 
 Statement [22] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2) [ loop::sin_idx#6 loop::y_idx#2 loop::sy#2 ] ( main:9::loop:14 [ loop::sin_idx#6 loop::y_idx#2 loop::sy#2 ] ) always clobbers reg byte a 
@@ -3203,7 +3221,7 @@ Statement [75] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0 [ ] (
 Statement [76] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) plex_irq() [ ] ( main:9::init:12 [ framedone#19 ] ) always clobbers reg byte a 
 Statement [86] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0 [ plex_show_idx#0 plex_sprite_idx#0 plex_sprite_msb#0 plex_free_next#31 ] (  [ plex_show_idx#0 plex_sprite_idx#0 plex_sprite_msb#0 plex_free_next#31 ] ) always clobbers reg byte a 
 Statement [89] (byte) plex_irq::plexFreeNextYpos1_return#0 ← *((const byte[8]) PLEX_FREE_YPOS#0 + (byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0) [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 ] (  [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 ] ) always clobbers reg byte y 
-Statement [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@9 [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] (  [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] ) always clobbers reg byte a 
+Statement [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@7 [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] (  [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:26 [ plex_irq::plexFreeNextYpos1_return#0 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:27 [ plex_irq::$4 ]
 Statement [92] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0 [ plex_show_idx#16 plex_irq::plexFreeNextYpos1_return#0 ] (  [ plex_show_idx#16 plex_irq::plexFreeNextYpos1_return#0 ] ) always clobbers reg byte a 
@@ -3236,7 +3254,7 @@ Statement [3] (byte) plex_sprite_msb#0 ← (byte/signed byte/word/signed word/dw
 Statement [4] (byte) plex_free_next#31 ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( ) always clobbers reg byte a 
 Statement [7] (bool) framedone#19 ← true [ framedone#19 ] ( ) always clobbers reg byte a 
 Statement [16] (byte) loop::sin_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ framedone#19 loop::sin_idx#0 ] ( main:9::loop:14 [ framedone#19 loop::sin_idx#0 ] ) always clobbers reg byte a 
-Statement [18] if((bool) framedone#12) goto loop::@8 [ framedone#12 loop::sin_idx#6 ] ( main:9::loop:14 [ framedone#12 loop::sin_idx#6 ] ) always clobbers reg byte a 
+Statement [18] if((bool) framedone#12) goto loop::@3 [ framedone#12 loop::sin_idx#6 ] ( main:9::loop:14 [ framedone#12 loop::sin_idx#6 ] ) always clobbers reg byte a 
 Statement [19] *((const byte*) BORDERCOL#0) ← (const byte) RED#0 [ loop::sin_idx#6 ] ( main:9::loop:14 [ loop::sin_idx#6 ] ) always clobbers reg byte a 
 Statement [20] (byte) loop::y_idx#0 ← (byte) loop::sin_idx#6 [ loop::sin_idx#6 loop::y_idx#0 ] ( main:9::loop:14 [ loop::sin_idx#6 loop::y_idx#0 ] ) always clobbers reg byte a 
 Statement [22] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2) [ loop::sin_idx#6 loop::y_idx#2 loop::sy#2 ] ( main:9::loop:14 [ loop::sin_idx#6 loop::y_idx#2 loop::sy#2 ] ) always clobbers reg byte a 
@@ -3267,7 +3285,7 @@ Statement [75] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0 [ ] (
 Statement [76] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) plex_irq() [ ] ( main:9::init:12 [ framedone#19 ] ) always clobbers reg byte a 
 Statement [86] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0 [ plex_show_idx#0 plex_sprite_idx#0 plex_sprite_msb#0 plex_free_next#31 ] (  [ plex_show_idx#0 plex_sprite_idx#0 plex_sprite_msb#0 plex_free_next#31 ] ) always clobbers reg byte a 
 Statement [89] (byte) plex_irq::plexFreeNextYpos1_return#0 ← *((const byte[8]) PLEX_FREE_YPOS#0 + (byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0) [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 ] (  [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 ] ) always clobbers reg byte y 
-Statement [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@9 [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] (  [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] ) always clobbers reg byte a 
+Statement [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@7 [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] (  [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] ) always clobbers reg byte a 
 Statement [92] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0 [ plex_show_idx#16 plex_irq::plexFreeNextYpos1_return#0 ] (  [ plex_show_idx#16 plex_irq::plexFreeNextYpos1_return#0 ] ) always clobbers reg byte a 
 Statement [93] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@1 [ plex_irq::plexFreeNextYpos1_return#0 ] (  [ plex_irq::plexFreeNextYpos1_return#0 ] ) always clobbers reg byte a 
 Statement [94] (bool) framedone#3 ← true [ ] (  [ ] ) always clobbers reg byte a 
@@ -3295,7 +3313,7 @@ Statement [3] (byte) plex_sprite_msb#0 ← (byte/signed byte/word/signed word/dw
 Statement [4] (byte) plex_free_next#31 ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( ) always clobbers reg byte a 
 Statement [7] (bool) framedone#19 ← true [ framedone#19 ] ( ) always clobbers reg byte a 
 Statement [16] (byte) loop::sin_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ framedone#19 loop::sin_idx#0 ] ( main:9::loop:14 [ framedone#19 loop::sin_idx#0 ] ) always clobbers reg byte a 
-Statement [18] if((bool) framedone#12) goto loop::@8 [ framedone#12 loop::sin_idx#6 ] ( main:9::loop:14 [ framedone#12 loop::sin_idx#6 ] ) always clobbers reg byte a 
+Statement [18] if((bool) framedone#12) goto loop::@3 [ framedone#12 loop::sin_idx#6 ] ( main:9::loop:14 [ framedone#12 loop::sin_idx#6 ] ) always clobbers reg byte a 
 Statement [19] *((const byte*) BORDERCOL#0) ← (const byte) RED#0 [ loop::sin_idx#6 ] ( main:9::loop:14 [ loop::sin_idx#6 ] ) always clobbers reg byte a 
 Statement [20] (byte) loop::y_idx#0 ← (byte) loop::sin_idx#6 [ loop::sin_idx#6 loop::y_idx#0 ] ( main:9::loop:14 [ loop::sin_idx#6 loop::y_idx#0 ] ) always clobbers reg byte a 
 Statement [22] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2) [ loop::sin_idx#6 loop::y_idx#2 loop::sy#2 ] ( main:9::loop:14 [ loop::sin_idx#6 loop::y_idx#2 loop::sy#2 ] ) always clobbers reg byte a 
@@ -3326,7 +3344,7 @@ Statement [75] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0 [ ] (
 Statement [76] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) plex_irq() [ ] ( main:9::init:12 [ framedone#19 ] ) always clobbers reg byte a 
 Statement [86] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0 [ plex_show_idx#0 plex_sprite_idx#0 plex_sprite_msb#0 plex_free_next#31 ] (  [ plex_show_idx#0 plex_sprite_idx#0 plex_sprite_msb#0 plex_free_next#31 ] ) always clobbers reg byte a 
 Statement [89] (byte) plex_irq::plexFreeNextYpos1_return#0 ← *((const byte[8]) PLEX_FREE_YPOS#0 + (byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0) [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 ] (  [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 ] ) always clobbers reg byte y 
-Statement [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@9 [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] (  [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] ) always clobbers reg byte a 
+Statement [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@7 [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] (  [ plexShowSprite::$7 plex_show_idx#16 plexShowSprite::plexFreeAdd1_$2#0 plex_sprite_msb#17 plex_irq::plexFreeNextYpos1_return#0 plex_irq::$4 ] ) always clobbers reg byte a 
 Statement [92] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0 [ plex_show_idx#16 plex_irq::plexFreeNextYpos1_return#0 ] (  [ plex_show_idx#16 plex_irq::plexFreeNextYpos1_return#0 ] ) always clobbers reg byte a 
 Statement [93] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@1 [ plex_irq::plexFreeNextYpos1_return#0 ] (  [ plex_irq::plexFreeNextYpos1_return#0 ] ) always clobbers reg byte a 
 Statement [94] (bool) framedone#3 ← true [ ] (  [ ] ) always clobbers reg byte a 
@@ -3516,9 +3534,9 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label plex_free_next_31 = $a
 //SEG3 @begin
 bbegin:
-  jmp b4
-//SEG4 @4
-b4:
+  jmp b1
+//SEG4 @1
+b1:
 //SEG5 [1] (byte) plex_show_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The index in the PLEX tables of the next sprite to show
   lda #0
@@ -3531,33 +3549,33 @@ b4:
   // The MSB bit of the next sprite to use for showing
   lda #1
   sta plex_sprite_msb
-  jmp b9
-//SEG8 @9
-b9:
+  jmp b2
+//SEG8 @2
+b2:
 //SEG9 [4] (byte) plex_free_next#31 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The index of the sprite that is free next. Since sprites are used round-robin this moves forward each time a sprite is shown.
   lda #0
   sta plex_free_next_31
-  jmp b12
-//SEG10 @12
-b12:
+  jmp b3
+//SEG10 @3
+b3:
 //SEG11 kickasm(location (const byte*) YSIN#0) {{ .var min = 50     .var max = 250-21     .var ampl = max-min;     .for(var i=0;i<256;i++)         .byte round(min+(ampl/2)+(ampl/2)*sin(toRadians(360*i/256)))  }}
 //SEG12 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
-  jmp b14
-//SEG13 @14
-b14:
+  jmp b4
+//SEG13 @4
+b4:
 //SEG14 [7] (bool) framedone#19 ← true -- vboz1=vboc1 
   lda #1
   sta framedone
-//SEG15 [8] phi from @14 to @16 [phi:@14->@16]
-b16_from_b14:
-  jmp b16
-//SEG16 @16
-b16:
+//SEG15 [8] phi from @4 to @5 [phi:@4->@5]
+b5_from_b4:
+  jmp b5
+//SEG16 @5
+b5:
 //SEG17 [9] call main 
   jsr main
-//SEG18 [10] phi from @16 to @end [phi:@16->@end]
-bend_from_b16:
+//SEG18 [10] phi from @5 to @end [phi:@5->@end]
+bend_from_b5:
   jmp bend
 //SEG19 @end
 bend:
@@ -3589,25 +3607,25 @@ loop: {
     // The current index into the y-sinus
     lda #0
     sta sin_idx
-  //SEG30 [17] phi from loop loop::@15 to loop::@1 [phi:loop/loop::@15->loop::@1]
+  //SEG30 [17] phi from loop loop::@6 to loop::@1 [phi:loop/loop::@6->loop::@1]
   b1_from_loop:
-  b1_from_b15:
-  //SEG31 [17] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#0 [phi:loop/loop::@15->loop::@1#0] -- register_copy 
-  //SEG32 [17] phi (bool) framedone#12 = (bool) framedone#19 [phi:loop/loop::@15->loop::@1#1] -- register_copy 
+  b1_from_b6:
+  //SEG31 [17] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#0 [phi:loop/loop::@6->loop::@1#0] -- register_copy 
+  //SEG32 [17] phi (bool) framedone#12 = (bool) framedone#19 [phi:loop/loop::@6->loop::@1#1] -- register_copy 
     jmp b1
   // without volatile gives wrong asm
   //SEG33 loop::@1
   b1:
-    jmp b6
-  //SEG34 loop::@6
-  b6:
-  //SEG35 [18] if((bool) framedone#12) goto loop::@8 -- vboz1_then_la1 
+    jmp b2
+  //SEG34 loop::@2
+  b2:
+  //SEG35 [18] if((bool) framedone#12) goto loop::@3 -- vboz1_then_la1 
     lda framedone
     cmp #0
-    bne b8
-    jmp b6
-  //SEG36 loop::@8
-  b8:
+    bne b3
+    jmp b2
+  //SEG36 loop::@3
+  b3:
   //SEG37 [19] *((const byte*) BORDERCOL#0) ← (const byte) RED#0 -- _deref_pbuc1=vbuc2 
     lda #RED
     sta BORDERCOL
@@ -3615,20 +3633,20 @@ loop: {
     // Assign sinus positions
     lda sin_idx
     sta y_idx
-  //SEG39 [21] phi from loop::@8 to loop::@9 [phi:loop::@8->loop::@9]
-  b9_from_b8:
-  //SEG40 [21] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@8->loop::@9#0] -- vbuyy=vbuc1 
+  //SEG39 [21] phi from loop::@3 to loop::@4 [phi:loop::@3->loop::@4]
+  b4_from_b3:
+  //SEG40 [21] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@3->loop::@4#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG41 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#0 [phi:loop::@8->loop::@9#1] -- register_copy 
-    jmp b9
+  //SEG41 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#0 [phi:loop::@3->loop::@4#1] -- register_copy 
+    jmp b4
   // without volatile gives wrong asm
-  //SEG42 [21] phi from loop::@9 to loop::@9 [phi:loop::@9->loop::@9]
-  b9_from_b9:
-  //SEG43 [21] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@9->loop::@9#0] -- register_copy 
-  //SEG44 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@9->loop::@9#1] -- register_copy 
-    jmp b9
-  //SEG45 loop::@9
-  b9:
+  //SEG42 [21] phi from loop::@4 to loop::@4 [phi:loop::@4->loop::@4]
+  b4_from_b4:
+  //SEG43 [21] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@4->loop::@4#0] -- register_copy 
+  //SEG44 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@4->loop::@4#1] -- register_copy 
+    jmp b4
+  //SEG45 loop::@4
+  b4:
   //SEG46 [22] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2) -- pbuc1_derefidx_vbuyy=pbuc2_derefidx_vbuz1 
     ldx y_idx
     lda YSIN,x
@@ -3639,23 +3657,23 @@ loop: {
     stx y_idx
   //SEG48 [24] (byte) loop::sy#1 ← ++ (byte) loop::sy#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG49 [25] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@9 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG49 [25] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@4 -- vbuyy_neq_vbuc1_then_la1 
     cpy #PLEX_COUNT-1+1
-    bne b9_from_b9
-    jmp b10
-  //SEG50 loop::@10
-  b10:
+    bne b4_from_b4
+    jmp b5
+  //SEG50 loop::@5
+  b5:
   //SEG51 [26] (byte) loop::sin_idx#1 ← (byte) loop::sin_idx#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_plus_1 
     inc sin_idx
   //SEG52 [27] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG53 [28] call plexSort 
-  //SEG54 [33] phi from loop::@10 to plexSort [phi:loop::@10->plexSort]
-  plexSort_from_b10:
+  //SEG54 [33] phi from loop::@5 to plexSort [phi:loop::@5->plexSort]
+  plexSort_from_b5:
     jsr plexSort
-    jmp b15
-  //SEG55 loop::@15
-  b15:
+    jmp b6
+  //SEG55 loop::@6
+  b6:
   //SEG56 [29] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BORDERCOL
@@ -3669,7 +3687,7 @@ loop: {
   //SEG59 [32] *((const byte*) RASTER#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta RASTER
-    jmp b1_from_b15
+    jmp b1_from_b6
 }
 //SEG60 plexSort
 // Ensure that the indices in PLEX_SORTED_IDX is sorted based on the y-positions in PLEX_YPOS
@@ -3711,15 +3729,15 @@ plexSort: {
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
     bcs b2
-    jmp b11
-  //SEG69 plexSort::@11
-  b11:
+    jmp b7
+  //SEG69 plexSort::@7
+  b7:
   //SEG70 [38] (byte~) plexSort::s#6 ← (byte) plexSort::m#2 -- vbuxx=vbuz1 
     ldx m
-  //SEG71 [39] phi from plexSort::@11 plexSort::@8 to plexSort::@3 [phi:plexSort::@11/plexSort::@8->plexSort::@3]
-  b3_from_b11:
-  b3_from_b8:
-  //SEG72 [39] phi (byte) plexSort::s#3 = (byte~) plexSort::s#6 [phi:plexSort::@11/plexSort::@8->plexSort::@3#0] -- register_copy 
+  //SEG71 [39] phi from plexSort::@6 plexSort::@7 to plexSort::@3 [phi:plexSort::@6/plexSort::@7->plexSort::@3]
+  b3_from_b6:
+  b3_from_b7:
+  //SEG72 [39] phi (byte) plexSort::s#3 = (byte) plexSort::s#1 [phi:plexSort::@6/plexSort::@7->plexSort::@3#0] -- register_copy 
     jmp b3
   //SEG73 plexSort::@3
   b3:
@@ -3728,9 +3746,9 @@ plexSort: {
     sta PLEX_SORTED_IDX+1,x
   //SEG75 [41] (byte) plexSort::s#1 ← -- (byte) plexSort::s#3 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG76 [42] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG76 [42] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@6 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$ff
-    bne b8
+    bne b6
     jmp b4
   //SEG77 plexSort::@4
   b4:
@@ -3748,9 +3766,9 @@ plexSort: {
     lda #PLEX_COUNT-2+1
     cmp m
     bne b1_from_b2
-    jmp b6
-  //SEG83 plexSort::@6
-  b6:
+    jmp b5
+  //SEG83 plexSort::@5
+  b5:
   //SEG84 [47] (byte) plex_show_idx#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     // Prepare for showing the sprites
     lda #0
@@ -3761,8 +3779,8 @@ plexSort: {
   //SEG86 [49] (byte) plex_sprite_msb#1 ← (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuc1 
     lda #1
     sta plex_sprite_msb
-  //SEG87 [50] phi from plexSort::@6 to plexSort::plexFreePrepare1 [phi:plexSort::@6->plexSort::plexFreePrepare1]
-  plexFreePrepare1_from_b6:
+  //SEG87 [50] phi from plexSort::@5 to plexSort::plexFreePrepare1 [phi:plexSort::@5->plexSort::plexFreePrepare1]
+  plexFreePrepare1_from_b5:
     jmp plexFreePrepare1
   //SEG88 plexSort::plexFreePrepare1
   plexFreePrepare1:
@@ -3796,13 +3814,13 @@ plexSort: {
   breturn:
   //SEG100 [56] return 
     rts
-  //SEG101 plexSort::@8
-  b8:
+  //SEG101 plexSort::@6
+  b6:
   //SEG102 [57] if((byte) plexSort::nxt_y#0<*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#1))) goto plexSort::@3 -- vbuz1_lt_pbuc1_derefidx_pbuc2_derefidx_vbuxx_then_la1 
     lda nxt_y
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
-    bcc b3_from_b8
+    bcc b3_from_b6
     jmp b4
 }
 //SEG103 init
@@ -3952,13 +3970,13 @@ plex_irq: {
   //SEG154 [86] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0 -- _deref_pbuc1=vbuc2 
     lda #WHITE
     sta BORDERCOL
-  //SEG155 [87] phi from plex_irq plex_irq::@9 to plex_irq::@3 [phi:plex_irq/plex_irq::@9->plex_irq::@3]
+  //SEG155 [87] phi from plex_irq plex_irq::@7 to plex_irq::@3 [phi:plex_irq/plex_irq::@7->plex_irq::@3]
   b3_from_plex_irq:
-  b3_from_b9:
-  //SEG156 [87] phi (byte) plex_sprite_msb#29 = (byte) plex_sprite_msb#0 [phi:plex_irq/plex_irq::@9->plex_irq::@3#0] -- register_copy 
-  //SEG157 [87] phi (byte) plex_free_next#27 = (byte) plex_free_next#31 [phi:plex_irq/plex_irq::@9->plex_irq::@3#1] -- register_copy 
-  //SEG158 [87] phi (byte) plex_show_idx#27 = (byte) plex_show_idx#0 [phi:plex_irq/plex_irq::@9->plex_irq::@3#2] -- register_copy 
-  //SEG159 [87] phi (byte) plex_sprite_idx#25 = (byte) plex_sprite_idx#0 [phi:plex_irq/plex_irq::@9->plex_irq::@3#3] -- register_copy 
+  b3_from_b7:
+  //SEG156 [87] phi (byte) plex_sprite_msb#29 = (byte) plex_sprite_msb#0 [phi:plex_irq/plex_irq::@7->plex_irq::@3#0] -- register_copy 
+  //SEG157 [87] phi (byte) plex_free_next#27 = (byte) plex_free_next#31 [phi:plex_irq/plex_irq::@7->plex_irq::@3#1] -- register_copy 
+  //SEG158 [87] phi (byte) plex_show_idx#27 = (byte) plex_show_idx#0 [phi:plex_irq/plex_irq::@7->plex_irq::@3#2] -- register_copy 
+  //SEG159 [87] phi (byte) plex_sprite_idx#25 = (byte) plex_sprite_idx#0 [phi:plex_irq/plex_irq::@7->plex_irq::@3#3] -- register_copy 
     jmp b3
   //SEG160 plex_irq::@3
   b3:
@@ -3970,18 +3988,18 @@ plex_irq: {
   //SEG163 [89] (byte) plex_irq::plexFreeNextYpos1_return#0 ← *((const byte[8]) PLEX_FREE_YPOS#0 + (byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0) -- vbuxx=pbuc1_derefidx_vbuz1 
     ldy plexShowSprite.plexFreeAdd1__2
     ldx PLEX_FREE_YPOS,y
-    jmp b7
-  //SEG164 plex_irq::@7
-  b7:
+    jmp b6
+  //SEG164 plex_irq::@6
+  b6:
   //SEG165 [90] (byte/signed word/word/dword/signed dword~) plex_irq::$4 ← *((const byte*) RASTER#0) + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=_deref_pbuc1_plus_2 
     lda RASTER
     clc
     adc #2
     sta _4
-  //SEG166 [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@9 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG166 [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@7 -- vbuz1_lt_vbuc1_then_la1 
     lda plex_show_idx
     cmp #PLEX_COUNT
-    bcc b9
+    bcc b7
     jmp b4
   //SEG167 plex_irq::@4
   b4:
@@ -4014,11 +4032,11 @@ plex_irq: {
   //SEG177 [97] *((const byte*) RASTER#0) ← (byte) plex_irq::plexFreeNextYpos1_return#0 -- _deref_pbuc1=vbuxx 
     stx RASTER
     jmp b2
-  //SEG178 plex_irq::@9
-  b9:
+  //SEG178 plex_irq::@7
+  b7:
   //SEG179 [98] if((byte) plex_irq::plexFreeNextYpos1_return#0<(byte/signed word/word/dword/signed dword~) plex_irq::$4) goto plex_irq::@3 -- vbuxx_lt_vbuz1_then_la1 
     cpx _4
-    bcc b3_from_b9
+    bcc b3_from_b7
     jmp b4
 }
 //SEG180 plexShowSprite
@@ -4054,9 +4072,9 @@ plexShowSprite: {
   //SEG188 [105] (byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0 ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax plexFreeAdd1__2
-    jmp b7
-  //SEG189 plexShowSprite::@7
-  b7:
+    jmp b5
+  //SEG189 plexShowSprite::@5
+  b5:
   //SEG190 [106] *((const byte*) PLEX_SCREEN_PTR#0 + (byte) plex_sprite_idx#25) ← *((const byte[PLEX_COUNT#0]) PLEX_PTR#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#27)) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_pbuc3_derefidx_vbuz2 
     ldx plex_show_idx
     ldy PLEX_SORTED_IDX,x
@@ -4078,9 +4096,9 @@ plexShowSprite: {
   //SEG195 [111] if((byte~) plexShowSprite::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@1 -- vbuaa_neq_0_then_la1 
     cmp #0
     bne b1
-    jmp b4
-  //SEG196 plexShowSprite::@4
-  b4:
+    jmp b3
+  //SEG196 plexShowSprite::@3
+  b3:
   //SEG197 [112] (byte/word/dword~) plexShowSprite::$10 ← (byte/word/signed word/dword/signed dword) $ff ^ (byte) plex_sprite_msb#29 -- vbuaa=vbuc1_bxor_vbuz1 
     lda plex_sprite_msb
     eor #$ff
@@ -4104,16 +4122,16 @@ plexShowSprite: {
     lda plex_sprite_msb
     cmp #0
     bne breturn_from_b2
-    jmp b6
-  //SEG205 plexShowSprite::@6
-  b6:
+    jmp b4
+  //SEG205 plexShowSprite::@4
+  b4:
   //SEG206 [119] (byte) plex_sprite_msb#4 ← (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuc1 
     lda #1
     sta plex_sprite_msb
-  //SEG207 [120] phi from plexShowSprite::@2 plexShowSprite::@6 to plexShowSprite::@return [phi:plexShowSprite::@2/plexShowSprite::@6->plexShowSprite::@return]
+  //SEG207 [120] phi from plexShowSprite::@2 plexShowSprite::@4 to plexShowSprite::@return [phi:plexShowSprite::@2/plexShowSprite::@4->plexShowSprite::@return]
   breturn_from_b2:
-  breturn_from_b6:
-  //SEG208 [120] phi (byte) plex_sprite_msb#17 = (byte) plex_sprite_msb#27 [phi:plexShowSprite::@2/plexShowSprite::@6->plexShowSprite::@return#0] -- register_copy 
+  breturn_from_b4:
+  //SEG208 [120] phi (byte) plex_sprite_msb#17 = (byte) plex_sprite_msb#27 [phi:plexShowSprite::@2/plexShowSprite::@4->plexShowSprite::@return#0] -- register_copy 
     jmp breturn
   //SEG209 plexShowSprite::@return
   breturn:
@@ -4152,25 +4170,25 @@ plexShowSprite: {
 
 
 ASSEMBLER OPTIMIZATIONS
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp b4
-Removing instruction jmp b9
-Removing instruction jmp b12
-Removing instruction jmp b14
-Removing instruction jmp b16
+Removing instruction jmp b5
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b4
+Removing instruction jmp b5
 Removing instruction jmp b6
-Removing instruction jmp b9
-Removing instruction jmp b10
-Removing instruction jmp b15
 Removing instruction jmp b1
-Removing instruction jmp b11
+Removing instruction jmp b7
 Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b2
-Removing instruction jmp b6
+Removing instruction jmp b5
 Removing instruction jmp plexFreePrepare1
 Removing instruction jmp plexFreePrepare1_b1
 Removing instruction jmp plexFreePrepare1_b2
@@ -4185,16 +4203,16 @@ Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b3
 Removing instruction jmp plexFreeNextYpos1
-Removing instruction jmp b7
+Removing instruction jmp b6
 Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp plexFreeAdd1
-Removing instruction jmp b7
-Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b3
 Removing instruction jmp b2
-Removing instruction jmp b6
+Removing instruction jmp b4
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
@@ -4204,27 +4222,27 @@ Removing instruction lda #0
 Replacing instruction ldx #0 with TAX
 Removing instruction lda #IRQ_RASTER
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b9_from_b9 with b9
+Replacing label b4_from_b4 with b4
 Replacing label b1_from_b2 with b1
 Replacing label plexFreePrepare1_b1_from_plexFreePrepare1_b1 with plexFreePrepare1_b1
-Replacing label b3_from_b8 with b3
+Replacing label b3_from_b6 with b3
 Replacing label b1_from_b1 with b1
 Replacing label b3_from_b3 with b3
 Replacing label b1_from_b1 with b1
-Replacing label b3_from_b9 with b3
+Replacing label b3_from_b7 with b3
 Replacing label breturn_from_b2 with breturn
-Removing instruction b4:
-Removing instruction b12:
-Removing instruction b16_from_b14:
-Removing instruction bend_from_b16:
+Removing instruction b1:
+Removing instruction b3:
+Removing instruction b5_from_b4:
+Removing instruction bend_from_b5:
 Removing instruction b1_from_main:
 Removing instruction b1_from_loop:
 Removing instruction b1:
-Removing instruction b9_from_b9:
+Removing instruction b4_from_b4:
 Removing instruction b1_from_b2:
-Removing instruction b3_from_b11:
-Removing instruction b3_from_b8:
-Removing instruction plexFreePrepare1_from_b6:
+Removing instruction b3_from_b6:
+Removing instruction b3_from_b7:
+Removing instruction plexFreePrepare1_from_b5:
 Removing instruction plexFreePrepare1_b1_from_plexFreePrepare1:
 Removing instruction plexFreePrepare1_b1_from_plexFreePrepare1_b1:
 Removing instruction b1_from_b1:
@@ -4233,23 +4251,23 @@ Removing instruction plexSetScreen1_from_plexInit:
 Removing instruction b1_from_plexSetScreen1:
 Removing instruction b1_from_b1:
 Removing instruction b3_from_plex_irq:
-Removing instruction b3_from_b9:
+Removing instruction b3_from_b7:
 Removing instruction breturn_from_b2:
-Removing instruction breturn_from_b6:
+Removing instruction breturn_from_b4:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b9:
-Removing instruction b14:
-Removing instruction b16:
+Removing instruction b2:
+Removing instruction b4:
+Removing instruction b5:
 Removing instruction bend:
 Removing instruction b1:
 Removing instruction breturn:
-Removing instruction b9_from_b8:
-Removing instruction b10:
-Removing instruction plexSort_from_b10:
-Removing instruction b15:
-Removing instruction b1_from_plexSort:
-Removing instruction b11:
+Removing instruction b4_from_b3:
+Removing instruction b5:
+Removing instruction plexSort_from_b5:
 Removing instruction b6:
+Removing instruction b1_from_plexSort:
+Removing instruction b7:
+Removing instruction b5:
 Removing instruction plexFreePrepare1:
 Removing instruction plexFreePrepare1_b2:
 Removing instruction breturn:
@@ -4262,17 +4280,17 @@ Removing instruction breturn:
 Removing instruction plexSetScreen1:
 Removing instruction breturn:
 Removing instruction plexFreeNextYpos1:
-Removing instruction b7:
+Removing instruction b6:
 Removing instruction b5:
 Removing instruction breturn:
 Removing instruction plexFreeAdd1:
-Removing instruction b7:
+Removing instruction b5:
+Removing instruction b3:
 Removing instruction b4:
-Removing instruction b6:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Relabelling long label b1_from_b15 to b1
+Relabelling long label b1_from_b6 to b1
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b9
+Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp plexFreePrepare1_b1
 Removing instruction jmp b1
@@ -4284,11 +4302,11 @@ Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 
 FINAL SYMBOL TABLE
-(label) @12
-(label) @14
-(label) @16
+(label) @1
+(label) @2
+(label) @3
 (label) @4
-(label) @9
+(label) @5
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -4432,11 +4450,11 @@ FINAL SYMBOL TABLE
 (word) init::xp#2 xp zp ZP_WORD:6 8.25
 (void()) loop()
 (label) loop::@1
-(label) loop::@10
-(label) loop::@15
+(label) loop::@2
+(label) loop::@3
+(label) loop::@4
+(label) loop::@5
 (label) loop::@6
-(label) loop::@8
-(label) loop::@9
 (byte) loop::sin_idx
 (byte) loop::sin_idx#0 sin_idx zp ZP_BYTE:3 4.0
 (byte) loop::sin_idx#1 sin_idx zp ZP_BYTE:3 3.142857142857143
@@ -4469,9 +4487,9 @@ FINAL SYMBOL TABLE
 (byte/word/dword~) plexShowSprite::$7 $7 zp ZP_BYTE:8 1.0833333333333333
 (label) plexShowSprite::@1
 (label) plexShowSprite::@2
+(label) plexShowSprite::@3
 (label) plexShowSprite::@4
-(label) plexShowSprite::@6
-(label) plexShowSprite::@7
+(label) plexShowSprite::@5
 (label) plexShowSprite::@return
 (label) plexShowSprite::plexFreeAdd1
 (byte/signed word/word/dword/signed dword~) plexShowSprite::plexFreeAdd1_$0
@@ -4489,12 +4507,12 @@ FINAL SYMBOL TABLE
 (byte) plexShowSprite::ypos
 (void()) plexSort()
 (label) plexSort::@1
-(label) plexSort::@11
 (label) plexSort::@2
 (label) plexSort::@3
 (label) plexSort::@4
+(label) plexSort::@5
 (label) plexSort::@6
-(label) plexSort::@8
+(label) plexSort::@7
 (label) plexSort::@return
 (byte) plexSort::m
 (byte) plexSort::m#1 m zp ZP_BYTE:5 151.5
@@ -4526,8 +4544,8 @@ interrupt(KERNEL_MIN)(void()) plex_irq()
 (label) plex_irq::@3
 (label) plex_irq::@4
 (label) plex_irq::@5
+(label) plex_irq::@6
 (label) plex_irq::@7
-(label) plex_irq::@9
 (label) plex_irq::@return
 (label) plex_irq::plexFreeNextYpos1
 (byte) plex_irq::plexFreeNextYpos1_return
@@ -4634,7 +4652,7 @@ Score: 47957
   .label plex_free_next_31 = $a
 //SEG3 @begin
 bbegin:
-//SEG4 @4
+//SEG4 @1
 //SEG5 [1] (byte) plex_show_idx#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The index in the PLEX tables of the next sprite to show
   lda #0
@@ -4646,23 +4664,23 @@ bbegin:
   // The MSB bit of the next sprite to use for showing
   lda #1
   sta plex_sprite_msb
-//SEG8 @9
+//SEG8 @2
 //SEG9 [4] (byte) plex_free_next#31 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   // The index of the sprite that is free next. Since sprites are used round-robin this moves forward each time a sprite is shown.
   lda #0
   sta plex_free_next_31
-//SEG10 @12
+//SEG10 @3
 //SEG11 kickasm(location (const byte*) YSIN#0) {{ .var min = 50     .var max = 250-21     .var ampl = max-min;     .for(var i=0;i<256;i++)         .byte round(min+(ampl/2)+(ampl/2)*sin(toRadians(360*i/256)))  }}
 //SEG12 kickasm(location (const byte*) SPRITE#0) {{ .var pic = LoadPicture("balloon.png", List().add($000000, $ffffff))     .for (var y=0; y<21; y++)         .for (var x=0;x<3; x++)             .byte pic.getSinglecolorByte(x,y)  }}
-//SEG13 @14
+//SEG13 @4
 //SEG14 [7] (bool) framedone#19 ← true -- vboz1=vboc1 
   lda #1
   sta framedone
-//SEG15 [8] phi from @14 to @16 [phi:@14->@16]
-//SEG16 @16
+//SEG15 [8] phi from @4 to @5 [phi:@4->@5]
+//SEG16 @5
 //SEG17 [9] call main 
   jsr main
-//SEG18 [10] phi from @16 to @end [phi:@16->@end]
+//SEG18 [10] phi from @5 to @end [phi:@5->@end]
 //SEG19 @end
 //SEG20 main
 main: {
@@ -4687,21 +4705,21 @@ loop: {
     // The current index into the y-sinus
     lda #0
     sta sin_idx
-  //SEG30 [17] phi from loop loop::@15 to loop::@1 [phi:loop/loop::@15->loop::@1]
+  //SEG30 [17] phi from loop loop::@6 to loop::@1 [phi:loop/loop::@6->loop::@1]
   b1:
-  //SEG31 [17] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#0 [phi:loop/loop::@15->loop::@1#0] -- register_copy 
-  //SEG32 [17] phi (bool) framedone#12 = (bool) framedone#19 [phi:loop/loop::@15->loop::@1#1] -- register_copy 
+  //SEG31 [17] phi (byte) loop::sin_idx#6 = (byte) loop::sin_idx#0 [phi:loop/loop::@6->loop::@1#0] -- register_copy 
+  //SEG32 [17] phi (bool) framedone#12 = (bool) framedone#19 [phi:loop/loop::@6->loop::@1#1] -- register_copy 
   // without volatile gives wrong asm
   //SEG33 loop::@1
-  //SEG34 loop::@6
-  b6:
-  //SEG35 [18] if((bool) framedone#12) goto loop::@8 -- vboz1_then_la1 
+  //SEG34 loop::@2
+  b2:
+  //SEG35 [18] if((bool) framedone#12) goto loop::@3 -- vboz1_then_la1 
     lda framedone
     cmp #0
-    bne b8
-    jmp b6
-  //SEG36 loop::@8
-  b8:
+    bne b3
+    jmp b2
+  //SEG36 loop::@3
+  b3:
   //SEG37 [19] *((const byte*) BORDERCOL#0) ← (const byte) RED#0 -- _deref_pbuc1=vbuc2 
     lda #RED
     sta BORDERCOL
@@ -4709,16 +4727,16 @@ loop: {
     // Assign sinus positions
     lda sin_idx
     sta y_idx
-  //SEG39 [21] phi from loop::@8 to loop::@9 [phi:loop::@8->loop::@9]
-  //SEG40 [21] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@8->loop::@9#0] -- vbuyy=vbuc1 
+  //SEG39 [21] phi from loop::@3 to loop::@4 [phi:loop::@3->loop::@4]
+  //SEG40 [21] phi (byte) loop::sy#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:loop::@3->loop::@4#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG41 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#0 [phi:loop::@8->loop::@9#1] -- register_copy 
+  //SEG41 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#0 [phi:loop::@3->loop::@4#1] -- register_copy 
   // without volatile gives wrong asm
-  //SEG42 [21] phi from loop::@9 to loop::@9 [phi:loop::@9->loop::@9]
-  //SEG43 [21] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@9->loop::@9#0] -- register_copy 
-  //SEG44 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@9->loop::@9#1] -- register_copy 
-  //SEG45 loop::@9
-  b9:
+  //SEG42 [21] phi from loop::@4 to loop::@4 [phi:loop::@4->loop::@4]
+  //SEG43 [21] phi (byte) loop::sy#2 = (byte) loop::sy#1 [phi:loop::@4->loop::@4#0] -- register_copy 
+  //SEG44 [21] phi (byte) loop::y_idx#2 = (byte) loop::y_idx#1 [phi:loop::@4->loop::@4#1] -- register_copy 
+  //SEG45 loop::@4
+  b4:
   //SEG46 [22] *((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + (byte) loop::sy#2) ← *((const byte*) YSIN#0 + (byte) loop::y_idx#2) -- pbuc1_derefidx_vbuyy=pbuc2_derefidx_vbuz1 
     ldx y_idx
     lda YSIN,x
@@ -4729,18 +4747,18 @@ loop: {
     stx y_idx
   //SEG48 [24] (byte) loop::sy#1 ← ++ (byte) loop::sy#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG49 [25] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@9 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG49 [25] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@4 -- vbuyy_neq_vbuc1_then_la1 
     cpy #PLEX_COUNT-1+1
-    bne b9
-  //SEG50 loop::@10
+    bne b4
+  //SEG50 loop::@5
   //SEG51 [26] (byte) loop::sin_idx#1 ← (byte) loop::sin_idx#6 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_plus_1 
     inc sin_idx
   //SEG52 [27] *((const byte*) BORDERCOL#0) ← ++ *((const byte*) BORDERCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc BORDERCOL
   //SEG53 [28] call plexSort 
-  //SEG54 [33] phi from loop::@10 to plexSort [phi:loop::@10->plexSort]
+  //SEG54 [33] phi from loop::@5 to plexSort [phi:loop::@5->plexSort]
     jsr plexSort
-  //SEG55 loop::@15
+  //SEG55 loop::@6
   //SEG56 [29] *((const byte*) BORDERCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BORDERCOL
@@ -4791,10 +4809,10 @@ plexSort: {
     ldy PLEX_SORTED_IDX,x
     cmp PLEX_YPOS,y
     bcs b2
-  //SEG69 plexSort::@11
+  //SEG69 plexSort::@7
   //SEG70 [38] (byte~) plexSort::s#6 ← (byte) plexSort::m#2 -- vbuxx=vbuz1 
-  //SEG71 [39] phi from plexSort::@11 plexSort::@8 to plexSort::@3 [phi:plexSort::@11/plexSort::@8->plexSort::@3]
-  //SEG72 [39] phi (byte) plexSort::s#3 = (byte~) plexSort::s#6 [phi:plexSort::@11/plexSort::@8->plexSort::@3#0] -- register_copy 
+  //SEG71 [39] phi from plexSort::@6 plexSort::@7 to plexSort::@3 [phi:plexSort::@6/plexSort::@7->plexSort::@3]
+  //SEG72 [39] phi (byte) plexSort::s#3 = (byte) plexSort::s#1 [phi:plexSort::@6/plexSort::@7->plexSort::@3#0] -- register_copy 
   //SEG73 plexSort::@3
   b3:
   //SEG74 [40] *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0+(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) plexSort::s#3) ← *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#3) -- pbuc1_derefidx_vbuxx=pbuc2_derefidx_vbuxx 
@@ -4802,9 +4820,9 @@ plexSort: {
     sta PLEX_SORTED_IDX+1,x
   //SEG75 [41] (byte) plexSort::s#1 ← -- (byte) plexSort::s#3 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG76 [42] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG76 [42] if((byte) plexSort::s#1!=(byte/word/signed word/dword/signed dword) $ff) goto plexSort::@6 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$ff
-    bne b8
+    bne b6
   //SEG77 plexSort::@4
   b4:
   //SEG78 [43] (byte) plexSort::s#2 ← ++ (byte) plexSort::s#1 -- vbuxx=_inc_vbuxx 
@@ -4820,7 +4838,7 @@ plexSort: {
     lda #PLEX_COUNT-2+1
     cmp m
     bne b1
-  //SEG83 plexSort::@6
+  //SEG83 plexSort::@5
   //SEG84 [47] (byte) plex_show_idx#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     // Prepare for showing the sprites
     lda #0
@@ -4830,7 +4848,7 @@ plexSort: {
   //SEG86 [49] (byte) plex_sprite_msb#1 ← (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuc1 
     lda #1
     sta plex_sprite_msb
-  //SEG87 [50] phi from plexSort::@6 to plexSort::plexFreePrepare1 [phi:plexSort::@6->plexSort::plexFreePrepare1]
+  //SEG87 [50] phi from plexSort::@5 to plexSort::plexFreePrepare1 [phi:plexSort::@5->plexSort::plexFreePrepare1]
   //SEG88 plexSort::plexFreePrepare1
   //SEG89 [51] phi from plexSort::plexFreePrepare1 to plexSort::plexFreePrepare1_@1 [phi:plexSort::plexFreePrepare1->plexSort::plexFreePrepare1_@1]
   //SEG90 [51] phi (byte) plexSort::plexFreePrepare1_s#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:plexSort::plexFreePrepare1->plexSort::plexFreePrepare1_@1#0] -- vbuxx=vbuc1 
@@ -4853,8 +4871,8 @@ plexSort: {
   //SEG99 plexSort::@return
   //SEG100 [56] return 
     rts
-  //SEG101 plexSort::@8
-  b8:
+  //SEG101 plexSort::@6
+  b6:
   //SEG102 [57] if((byte) plexSort::nxt_y#0<*((const byte[PLEX_COUNT#0]) PLEX_YPOS#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plexSort::s#1))) goto plexSort::@3 -- vbuz1_lt_pbuc1_derefidx_pbuc2_derefidx_vbuxx_then_la1 
     lda nxt_y
     ldy PLEX_SORTED_IDX,x
@@ -4984,11 +5002,11 @@ plex_irq: {
   //SEG154 [86] *((const byte*) BORDERCOL#0) ← (const byte) WHITE#0 -- _deref_pbuc1=vbuc2 
     lda #WHITE
     sta BORDERCOL
-  //SEG155 [87] phi from plex_irq plex_irq::@9 to plex_irq::@3 [phi:plex_irq/plex_irq::@9->plex_irq::@3]
-  //SEG156 [87] phi (byte) plex_sprite_msb#29 = (byte) plex_sprite_msb#0 [phi:plex_irq/plex_irq::@9->plex_irq::@3#0] -- register_copy 
-  //SEG157 [87] phi (byte) plex_free_next#27 = (byte) plex_free_next#31 [phi:plex_irq/plex_irq::@9->plex_irq::@3#1] -- register_copy 
-  //SEG158 [87] phi (byte) plex_show_idx#27 = (byte) plex_show_idx#0 [phi:plex_irq/plex_irq::@9->plex_irq::@3#2] -- register_copy 
-  //SEG159 [87] phi (byte) plex_sprite_idx#25 = (byte) plex_sprite_idx#0 [phi:plex_irq/plex_irq::@9->plex_irq::@3#3] -- register_copy 
+  //SEG155 [87] phi from plex_irq plex_irq::@7 to plex_irq::@3 [phi:plex_irq/plex_irq::@7->plex_irq::@3]
+  //SEG156 [87] phi (byte) plex_sprite_msb#29 = (byte) plex_sprite_msb#0 [phi:plex_irq/plex_irq::@7->plex_irq::@3#0] -- register_copy 
+  //SEG157 [87] phi (byte) plex_free_next#27 = (byte) plex_free_next#31 [phi:plex_irq/plex_irq::@7->plex_irq::@3#1] -- register_copy 
+  //SEG158 [87] phi (byte) plex_show_idx#27 = (byte) plex_show_idx#0 [phi:plex_irq/plex_irq::@7->plex_irq::@3#2] -- register_copy 
+  //SEG159 [87] phi (byte) plex_sprite_idx#25 = (byte) plex_sprite_idx#0 [phi:plex_irq/plex_irq::@7->plex_irq::@3#3] -- register_copy 
   //SEG160 plex_irq::@3
   b3:
   //SEG161 [88] call plexShowSprite 
@@ -4997,16 +5015,16 @@ plex_irq: {
   //SEG163 [89] (byte) plex_irq::plexFreeNextYpos1_return#0 ← *((const byte[8]) PLEX_FREE_YPOS#0 + (byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0) -- vbuxx=pbuc1_derefidx_vbuz1 
     ldy plexShowSprite.plexFreeAdd1__2
     ldx PLEX_FREE_YPOS,y
-  //SEG164 plex_irq::@7
+  //SEG164 plex_irq::@6
   //SEG165 [90] (byte/signed word/word/dword/signed dword~) plex_irq::$4 ← *((const byte*) RASTER#0) + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=_deref_pbuc1_plus_2 
     lda RASTER
     clc
     adc #2
     sta _4
-  //SEG166 [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@9 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG166 [91] if((byte) plex_show_idx#16<(const byte) PLEX_COUNT#0) goto plex_irq::@7 -- vbuz1_lt_vbuc1_then_la1 
     lda plex_show_idx
     cmp #PLEX_COUNT
-    bcc b9
+    bcc b7
   //SEG167 plex_irq::@4
   b4:
   //SEG168 [92] *((const byte*) IRQ_STATUS#0) ← (const byte) IRQ_RASTER#0 -- _deref_pbuc1=vbuc2 
@@ -5033,8 +5051,8 @@ plex_irq: {
   //SEG177 [97] *((const byte*) RASTER#0) ← (byte) plex_irq::plexFreeNextYpos1_return#0 -- _deref_pbuc1=vbuxx 
     stx RASTER
     jmp b2
-  //SEG178 plex_irq::@9
-  b9:
+  //SEG178 plex_irq::@7
+  b7:
   //SEG179 [98] if((byte) plex_irq::plexFreeNextYpos1_return#0<(byte/signed word/word/dword/signed dword~) plex_irq::$4) goto plex_irq::@3 -- vbuxx_lt_vbuz1_then_la1 
     cpx _4
     bcc b3
@@ -5071,7 +5089,7 @@ plexShowSprite: {
   //SEG188 [105] (byte/word/dword) plexShowSprite::plexFreeAdd1_$2#0 ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$1#0 & (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuxx_band_vbuc1 
     lda #7
     sax plexFreeAdd1__2
-  //SEG189 plexShowSprite::@7
+  //SEG189 plexShowSprite::@5
   //SEG190 [106] *((const byte*) PLEX_SCREEN_PTR#0 + (byte) plex_sprite_idx#25) ← *((const byte[PLEX_COUNT#0]) PLEX_PTR#0 + *((const byte[PLEX_COUNT#0]) PLEX_SORTED_IDX#0 + (byte) plex_show_idx#27)) -- pbuc1_derefidx_vbuz1=pbuc2_derefidx_pbuc3_derefidx_vbuz2 
     ldx plex_show_idx
     ldy PLEX_SORTED_IDX,x
@@ -5093,7 +5111,7 @@ plexShowSprite: {
   //SEG195 [111] if((byte~) plexShowSprite::$4!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto plexShowSprite::@1 -- vbuaa_neq_0_then_la1 
     cmp #0
     bne b1
-  //SEG196 plexShowSprite::@4
+  //SEG196 plexShowSprite::@3
   //SEG197 [112] (byte/word/dword~) plexShowSprite::$10 ← (byte/word/signed word/dword/signed dword) $ff ^ (byte) plex_sprite_msb#29 -- vbuaa=vbuc1_bxor_vbuz1 
     lda plex_sprite_msb
     eor #$ff
@@ -5116,12 +5134,12 @@ plexShowSprite: {
     lda plex_sprite_msb
     cmp #0
     bne breturn
-  //SEG205 plexShowSprite::@6
+  //SEG205 plexShowSprite::@4
   //SEG206 [119] (byte) plex_sprite_msb#4 ← (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuc1 
     lda #1
     sta plex_sprite_msb
-  //SEG207 [120] phi from plexShowSprite::@2 plexShowSprite::@6 to plexShowSprite::@return [phi:plexShowSprite::@2/plexShowSprite::@6->plexShowSprite::@return]
-  //SEG208 [120] phi (byte) plex_sprite_msb#17 = (byte) plex_sprite_msb#27 [phi:plexShowSprite::@2/plexShowSprite::@6->plexShowSprite::@return#0] -- register_copy 
+  //SEG207 [120] phi from plexShowSprite::@2 plexShowSprite::@4 to plexShowSprite::@return [phi:plexShowSprite::@2/plexShowSprite::@4->plexShowSprite::@return]
+  //SEG208 [120] phi (byte) plex_sprite_msb#17 = (byte) plex_sprite_msb#27 [phi:plexShowSprite::@2/plexShowSprite::@4->plexShowSprite::@return#0] -- register_copy 
   //SEG209 plexShowSprite::@return
   breturn:
   //SEG210 [121] return 
diff --git a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.sym b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.sym
index 5b8d0dacb..37fe8be53 100644
--- a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.sym
+++ b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.sym
@@ -1,8 +1,8 @@
-(label) @12
-(label) @14
-(label) @16
+(label) @1
+(label) @2
+(label) @3
 (label) @4
-(label) @9
+(label) @5
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -146,11 +146,11 @@
 (word) init::xp#2 xp zp ZP_WORD:6 8.25
 (void()) loop()
 (label) loop::@1
-(label) loop::@10
-(label) loop::@15
+(label) loop::@2
+(label) loop::@3
+(label) loop::@4
+(label) loop::@5
 (label) loop::@6
-(label) loop::@8
-(label) loop::@9
 (byte) loop::sin_idx
 (byte) loop::sin_idx#0 sin_idx zp ZP_BYTE:3 4.0
 (byte) loop::sin_idx#1 sin_idx zp ZP_BYTE:3 3.142857142857143
@@ -183,9 +183,9 @@
 (byte/word/dword~) plexShowSprite::$7 $7 zp ZP_BYTE:8 1.0833333333333333
 (label) plexShowSprite::@1
 (label) plexShowSprite::@2
+(label) plexShowSprite::@3
 (label) plexShowSprite::@4
-(label) plexShowSprite::@6
-(label) plexShowSprite::@7
+(label) plexShowSprite::@5
 (label) plexShowSprite::@return
 (label) plexShowSprite::plexFreeAdd1
 (byte/signed word/word/dword/signed dword~) plexShowSprite::plexFreeAdd1_$0
@@ -203,12 +203,12 @@
 (byte) plexShowSprite::ypos
 (void()) plexSort()
 (label) plexSort::@1
-(label) plexSort::@11
 (label) plexSort::@2
 (label) plexSort::@3
 (label) plexSort::@4
+(label) plexSort::@5
 (label) plexSort::@6
-(label) plexSort::@8
+(label) plexSort::@7
 (label) plexSort::@return
 (byte) plexSort::m
 (byte) plexSort::m#1 m zp ZP_BYTE:5 151.5
@@ -240,8 +240,8 @@ interrupt(KERNEL_MIN)(void()) plex_irq()
 (label) plex_irq::@3
 (label) plex_irq::@4
 (label) plex_irq::@5
+(label) plex_irq::@6
 (label) plex_irq::@7
-(label) plex_irq::@9
 (label) plex_irq::@return
 (label) plex_irq::plexFreeNextYpos1
 (byte) plex_irq::plexFreeNextYpos1_return
diff --git a/src/test/ref/no-recursion-heavy.cfg b/src/test/ref/no-recursion-heavy.cfg
index 09579fbc2..b7990e57c 100644
--- a/src/test/ref/no-recursion-heavy.cfg
+++ b/src/test/ref/no-recursion-heavy.cfg
@@ -1,444 +1,444 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@7
-  [5] (byte) ba#17 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) ba#1 )
-  [5] (byte) be#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) be#13 )
-  [5] (byte) bd#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) bd#13 )
-  [5] (byte) bc#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) bc#13 )
-  [5] (byte) bb#16 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) bb#13 )
+main::@1: scope:[main]  from main main::@3
+  [5] (byte) ba#17 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) ba#1 )
+  [5] (byte) be#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) be#13 )
+  [5] (byte) bd#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) bd#13 )
+  [5] (byte) bc#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) bc#13 )
+  [5] (byte) bb#16 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) bb#13 )
   to:main::@2
 main::@2: scope:[main]  from main::@1
   [6] phi()
   [7] call f0 
-  to:main::@7
-main::@7: scope:[main]  from main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [8] (byte) ba#1 ← ++ (byte) ba#17
   to:main::@1
 f0: scope:[f0]  from main::@2
   [9] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto f0::@1
-  to:f0::@11
-f0::@11: scope:[f0]  from f0
+  to:f0::@10
+f0::@10: scope:[f0]  from f0
   [10] (byte) bb#3 ← ++ (byte) bb#16
   [11] (byte~) bb#101 ← (byte) bb#3
   [12] call fa 
   to:f0::@1
-f0::@1: scope:[f0]  from f0 f0::@11
-  [13] (byte) be#142 ← phi( f0/(byte) be#2 f0::@11/(byte) be#24 )
-  [13] (byte) bd#129 ← phi( f0/(byte) bd#2 f0::@11/(byte) bd#24 )
-  [13] (byte) bc#63 ← phi( f0/(byte) bc#2 f0::@11/(byte) bc#24 )
-  [13] (byte) bb#18 ← phi( f0/(byte) bb#16 f0::@11/(byte) bb#3 )
+f0::@1: scope:[f0]  from f0 f0::@10
+  [13] (byte) be#142 ← phi( f0/(byte) be#2 f0::@10/(byte) be#24 )
+  [13] (byte) bd#129 ← phi( f0/(byte) bd#2 f0::@10/(byte) bd#24 )
+  [13] (byte) bc#63 ← phi( f0/(byte) bc#2 f0::@10/(byte) bc#24 )
+  [13] (byte) bb#18 ← phi( f0/(byte) bb#16 f0::@10/(byte) bb#3 )
   [14] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto f0::@2
-  to:f0::@12
-f0::@12: scope:[f0]  from f0::@1
+  to:f0::@11
+f0::@11: scope:[f0]  from f0::@1
   [15] (byte) bb#4 ← ++ (byte) bb#18
   [16] (byte~) bb#102 ← (byte) bb#4
   [17] call fa 
   to:f0::@2
-f0::@2: scope:[f0]  from f0::@1 f0::@12
-  [18] (byte) be#143 ← phi( f0::@1/(byte) be#142 f0::@12/(byte) be#24 )
-  [18] (byte) bd#130 ← phi( f0::@1/(byte) bd#129 f0::@12/(byte) bd#24 )
-  [18] (byte) bc#64 ← phi( f0::@1/(byte) bc#63 f0::@12/(byte) bc#24 )
-  [18] (byte) bb#19 ← phi( f0::@1/(byte) bb#18 f0::@12/(byte) bb#4 )
+f0::@2: scope:[f0]  from f0::@1 f0::@11
+  [18] (byte) be#143 ← phi( f0::@1/(byte) be#142 f0::@11/(byte) be#24 )
+  [18] (byte) bd#130 ← phi( f0::@1/(byte) bd#129 f0::@11/(byte) bd#24 )
+  [18] (byte) bc#64 ← phi( f0::@1/(byte) bc#63 f0::@11/(byte) bc#24 )
+  [18] (byte) bb#19 ← phi( f0::@1/(byte) bb#18 f0::@11/(byte) bb#4 )
   [19] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto f0::@3
-  to:f0::@13
-f0::@13: scope:[f0]  from f0::@2
+  to:f0::@12
+f0::@12: scope:[f0]  from f0::@2
   [20] (byte) bb#5 ← ++ (byte) bb#19
   [21] (byte~) bb#103 ← (byte) bb#5
   [22] call fa 
   to:f0::@3
-f0::@3: scope:[f0]  from f0::@13 f0::@2
-  [23] (byte) be#144 ← phi( f0::@2/(byte) be#143 f0::@13/(byte) be#24 )
-  [23] (byte) bd#131 ← phi( f0::@2/(byte) bd#130 f0::@13/(byte) bd#24 )
-  [23] (byte) bc#65 ← phi( f0::@2/(byte) bc#64 f0::@13/(byte) bc#24 )
-  [23] (byte) bb#20 ← phi( f0::@2/(byte) bb#19 f0::@13/(byte) bb#5 )
+f0::@3: scope:[f0]  from f0::@12 f0::@2
+  [23] (byte) be#144 ← phi( f0::@2/(byte) be#143 f0::@12/(byte) be#24 )
+  [23] (byte) bd#131 ← phi( f0::@2/(byte) bd#130 f0::@12/(byte) bd#24 )
+  [23] (byte) bc#65 ← phi( f0::@2/(byte) bc#64 f0::@12/(byte) bc#24 )
+  [23] (byte) bb#20 ← phi( f0::@2/(byte) bb#19 f0::@12/(byte) bb#5 )
   [24] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto f0::@4
-  to:f0::@14
-f0::@14: scope:[f0]  from f0::@3
+  to:f0::@13
+f0::@13: scope:[f0]  from f0::@3
   [25] (byte) bb#6 ← ++ (byte) bb#20
   [26] (byte~) bb#104 ← (byte) bb#6
   [27] call fa 
   to:f0::@4
-f0::@4: scope:[f0]  from f0::@14 f0::@3
-  [28] (byte) be#100 ← phi( f0::@14/(byte) be#24 f0::@3/(byte) be#144 )
-  [28] (byte) bd#132 ← phi( f0::@14/(byte) bd#24 f0::@3/(byte) bd#131 )
-  [28] (byte) bc#66 ← phi( f0::@14/(byte) bc#24 f0::@3/(byte) bc#65 )
-  [28] (byte) bb#21 ← phi( f0::@14/(byte) bb#6 f0::@3/(byte) bb#20 )
+f0::@4: scope:[f0]  from f0::@13 f0::@3
+  [28] (byte) be#100 ← phi( f0::@13/(byte) be#24 f0::@3/(byte) be#144 )
+  [28] (byte) bd#132 ← phi( f0::@13/(byte) bd#24 f0::@3/(byte) bd#131 )
+  [28] (byte) bc#66 ← phi( f0::@13/(byte) bc#24 f0::@3/(byte) bc#65 )
+  [28] (byte) bb#21 ← phi( f0::@13/(byte) bb#6 f0::@3/(byte) bb#20 )
   [29] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto f0::@5
-  to:f0::@15
-f0::@15: scope:[f0]  from f0::@4
+  to:f0::@14
+f0::@14: scope:[f0]  from f0::@4
   [30] (byte) bb#66 ← ++ (byte) bb#21
   [31] (byte~) bb#105 ← (byte) bb#66
   [32] call fa 
   to:f0::@5
-f0::@5: scope:[f0]  from f0::@15 f0::@4
-  [33] (byte) be#101 ← phi( f0::@15/(byte) be#24 f0::@4/(byte) be#100 )
-  [33] (byte) bd#133 ← phi( f0::@15/(byte) bd#24 f0::@4/(byte) bd#132 )
-  [33] (byte) bc#100 ← phi( f0::@15/(byte) bc#24 f0::@4/(byte) bc#66 )
-  [33] (byte) bb#22 ← phi( f0::@15/(byte) bb#66 f0::@4/(byte) bb#21 )
+f0::@5: scope:[f0]  from f0::@14 f0::@4
+  [33] (byte) be#101 ← phi( f0::@14/(byte) be#24 f0::@4/(byte) be#100 )
+  [33] (byte) bd#133 ← phi( f0::@14/(byte) bd#24 f0::@4/(byte) bd#132 )
+  [33] (byte) bc#100 ← phi( f0::@14/(byte) bc#24 f0::@4/(byte) bc#66 )
+  [33] (byte) bb#22 ← phi( f0::@14/(byte) bb#66 f0::@4/(byte) bb#21 )
   [34] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto f0::@6
-  to:f0::@16
-f0::@16: scope:[f0]  from f0::@5
+  to:f0::@15
+f0::@15: scope:[f0]  from f0::@5
   [35] (byte) bb#67 ← ++ (byte) bb#22
   [36] (byte~) bb#106 ← (byte) bb#67
   [37] call fa 
   to:f0::@6
-f0::@6: scope:[f0]  from f0::@16 f0::@5
-  [38] (byte) be#102 ← phi( f0::@16/(byte) be#24 f0::@5/(byte) be#101 )
-  [38] (byte) bd#134 ← phi( f0::@16/(byte) bd#24 f0::@5/(byte) bd#133 )
-  [38] (byte) bc#101 ← phi( f0::@16/(byte) bc#24 f0::@5/(byte) bc#100 )
-  [38] (byte) bb#23 ← phi( f0::@16/(byte) bb#67 f0::@5/(byte) bb#22 )
+f0::@6: scope:[f0]  from f0::@15 f0::@5
+  [38] (byte) be#102 ← phi( f0::@15/(byte) be#24 f0::@5/(byte) be#101 )
+  [38] (byte) bd#134 ← phi( f0::@15/(byte) bd#24 f0::@5/(byte) bd#133 )
+  [38] (byte) bc#101 ← phi( f0::@15/(byte) bc#24 f0::@5/(byte) bc#100 )
+  [38] (byte) bb#23 ← phi( f0::@15/(byte) bb#67 f0::@5/(byte) bb#22 )
   [39] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto f0::@7
-  to:f0::@17
-f0::@17: scope:[f0]  from f0::@6
+  to:f0::@16
+f0::@16: scope:[f0]  from f0::@6
   [40] (byte) bb#68 ← ++ (byte) bb#23
   [41] (byte~) bb#107 ← (byte) bb#68
   [42] call fa 
   to:f0::@7
-f0::@7: scope:[f0]  from f0::@17 f0::@6
-  [43] (byte) be#103 ← phi( f0::@17/(byte) be#24 f0::@6/(byte) be#102 )
-  [43] (byte) bd#135 ← phi( f0::@17/(byte) bd#24 f0::@6/(byte) bd#134 )
-  [43] (byte) bc#102 ← phi( f0::@17/(byte) bc#24 f0::@6/(byte) bc#101 )
-  [43] (byte) bb#24 ← phi( f0::@17/(byte) bb#68 f0::@6/(byte) bb#23 )
+f0::@7: scope:[f0]  from f0::@16 f0::@6
+  [43] (byte) be#103 ← phi( f0::@16/(byte) be#24 f0::@6/(byte) be#102 )
+  [43] (byte) bd#135 ← phi( f0::@16/(byte) bd#24 f0::@6/(byte) bd#134 )
+  [43] (byte) bc#102 ← phi( f0::@16/(byte) bc#24 f0::@6/(byte) bc#101 )
+  [43] (byte) bb#24 ← phi( f0::@16/(byte) bb#68 f0::@6/(byte) bb#23 )
   [44] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto f0::@8
-  to:f0::@18
-f0::@18: scope:[f0]  from f0::@7
+  to:f0::@17
+f0::@17: scope:[f0]  from f0::@7
   [45] (byte) bb#10 ← ++ (byte) bb#24
   [46] (byte~) bb#108 ← (byte) bb#10
   [47] call fa 
   to:f0::@8
-f0::@8: scope:[f0]  from f0::@18 f0::@7
-  [48] (byte) be#104 ← phi( f0::@18/(byte) be#24 f0::@7/(byte) be#103 )
-  [48] (byte) bd#136 ← phi( f0::@18/(byte) bd#24 f0::@7/(byte) bd#135 )
-  [48] (byte) bc#103 ← phi( f0::@18/(byte) bc#24 f0::@7/(byte) bc#102 )
-  [48] (byte) bb#25 ← phi( f0::@18/(byte) bb#10 f0::@7/(byte) bb#24 )
+f0::@8: scope:[f0]  from f0::@17 f0::@7
+  [48] (byte) be#104 ← phi( f0::@17/(byte) be#24 f0::@7/(byte) be#103 )
+  [48] (byte) bd#136 ← phi( f0::@17/(byte) bd#24 f0::@7/(byte) bd#135 )
+  [48] (byte) bc#103 ← phi( f0::@17/(byte) bc#24 f0::@7/(byte) bc#102 )
+  [48] (byte) bb#25 ← phi( f0::@17/(byte) bb#10 f0::@7/(byte) bb#24 )
   [49] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto f0::@9
-  to:f0::@19
-f0::@19: scope:[f0]  from f0::@8
+  to:f0::@18
+f0::@18: scope:[f0]  from f0::@8
   [50] (byte) bb#11 ← ++ (byte) bb#25
   [51] (byte~) bb#109 ← (byte) bb#11
   [52] call fa 
   to:f0::@9
-f0::@9: scope:[f0]  from f0::@19 f0::@8
-  [53] (byte) be#105 ← phi( f0::@19/(byte) be#24 f0::@8/(byte) be#104 )
-  [53] (byte) bd#137 ← phi( f0::@19/(byte) bd#24 f0::@8/(byte) bd#136 )
-  [53] (byte) bc#104 ← phi( f0::@19/(byte) bc#24 f0::@8/(byte) bc#103 )
-  [53] (byte) bb#49 ← phi( f0::@19/(byte) bb#11 f0::@8/(byte) bb#25 )
+f0::@9: scope:[f0]  from f0::@18 f0::@8
+  [53] (byte) be#105 ← phi( f0::@18/(byte) be#24 f0::@8/(byte) be#104 )
+  [53] (byte) bd#137 ← phi( f0::@18/(byte) bd#24 f0::@8/(byte) bd#136 )
+  [53] (byte) bc#104 ← phi( f0::@18/(byte) bc#24 f0::@8/(byte) bc#103 )
+  [53] (byte) bb#49 ← phi( f0::@18/(byte) bb#11 f0::@8/(byte) bb#25 )
   [54] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto f0::@return
-  to:f0::@20
-f0::@20: scope:[f0]  from f0::@9
+  to:f0::@19
+f0::@19: scope:[f0]  from f0::@9
   [55] phi()
   [56] call fa 
   to:f0::@return
-f0::@return: scope:[f0]  from f0::@20 f0::@9
-  [57] (byte) be#13 ← phi( f0::@9/(byte) be#105 f0::@20/(byte) be#24 )
-  [57] (byte) bd#13 ← phi( f0::@9/(byte) bd#137 f0::@20/(byte) bd#24 )
-  [57] (byte) bc#13 ← phi( f0::@9/(byte) bc#104 f0::@20/(byte) bc#24 )
-  [57] (byte) bb#13 ← phi( f0::@9/(byte) bb#49 f0::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+f0::@return: scope:[f0]  from f0::@19 f0::@9
+  [57] (byte) be#13 ← phi( f0::@9/(byte) be#105 f0::@19/(byte) be#24 )
+  [57] (byte) bd#13 ← phi( f0::@9/(byte) bd#137 f0::@19/(byte) bd#24 )
+  [57] (byte) bc#13 ← phi( f0::@9/(byte) bc#104 f0::@19/(byte) bc#24 )
+  [57] (byte) bb#13 ← phi( f0::@9/(byte) bb#49 f0::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [58] return 
   to:@return
-fa: scope:[fa]  from f0::@11 f0::@12 f0::@13 f0::@14 f0::@15 f0::@16 f0::@17 f0::@18 f0::@19 f0::@20
-  [59] (byte) be#107 ← phi( f0::@11/(byte) be#2 f0::@12/(byte) be#142 f0::@13/(byte) be#143 f0::@14/(byte) be#144 f0::@15/(byte) be#100 f0::@16/(byte) be#101 f0::@17/(byte) be#102 f0::@18/(byte) be#103 f0::@19/(byte) be#104 f0::@20/(byte) be#105 )
-  [59] (byte) bd#138 ← phi( f0::@11/(byte) bd#2 f0::@12/(byte) bd#129 f0::@13/(byte) bd#130 f0::@14/(byte) bd#131 f0::@15/(byte) bd#132 f0::@16/(byte) bd#133 f0::@17/(byte) bd#134 f0::@18/(byte) bd#135 f0::@19/(byte) bd#136 f0::@20/(byte) bd#137 )
-  [59] (byte) bc#39 ← phi( f0::@11/(byte) bc#2 f0::@12/(byte) bc#63 f0::@13/(byte) bc#64 f0::@14/(byte) bc#65 f0::@15/(byte) bc#66 f0::@16/(byte) bc#100 f0::@17/(byte) bc#101 f0::@18/(byte) bc#102 f0::@19/(byte) bc#103 f0::@20/(byte) bc#104 )
-  [59] (byte) bb#27 ← phi( f0::@11/(byte~) bb#101 f0::@12/(byte~) bb#102 f0::@13/(byte~) bb#103 f0::@14/(byte~) bb#104 f0::@15/(byte~) bb#105 f0::@16/(byte~) bb#106 f0::@17/(byte~) bb#107 f0::@18/(byte~) bb#108 f0::@19/(byte~) bb#109 f0::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fa: scope:[fa]  from f0::@10 f0::@11 f0::@12 f0::@13 f0::@14 f0::@15 f0::@16 f0::@17 f0::@18 f0::@19
+  [59] (byte) be#107 ← phi( f0::@10/(byte) be#2 f0::@11/(byte) be#142 f0::@12/(byte) be#143 f0::@13/(byte) be#144 f0::@14/(byte) be#100 f0::@15/(byte) be#101 f0::@16/(byte) be#102 f0::@17/(byte) be#103 f0::@18/(byte) be#104 f0::@19/(byte) be#105 )
+  [59] (byte) bd#138 ← phi( f0::@10/(byte) bd#2 f0::@11/(byte) bd#129 f0::@12/(byte) bd#130 f0::@13/(byte) bd#131 f0::@14/(byte) bd#132 f0::@15/(byte) bd#133 f0::@16/(byte) bd#134 f0::@17/(byte) bd#135 f0::@18/(byte) bd#136 f0::@19/(byte) bd#137 )
+  [59] (byte) bc#39 ← phi( f0::@10/(byte) bc#2 f0::@11/(byte) bc#63 f0::@12/(byte) bc#64 f0::@13/(byte) bc#65 f0::@14/(byte) bc#66 f0::@15/(byte) bc#100 f0::@16/(byte) bc#101 f0::@17/(byte) bc#102 f0::@18/(byte) bc#103 f0::@19/(byte) bc#104 )
+  [59] (byte) bb#27 ← phi( f0::@10/(byte~) bb#101 f0::@11/(byte~) bb#102 f0::@12/(byte~) bb#103 f0::@13/(byte~) bb#104 f0::@14/(byte~) bb#105 f0::@15/(byte~) bb#106 f0::@16/(byte~) bb#107 f0::@17/(byte~) bb#108 f0::@18/(byte~) bb#109 f0::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [60] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto fa::@1
-  to:fa::@11
-fa::@11: scope:[fa]  from fa
+  to:fa::@10
+fa::@10: scope:[fa]  from fa
   [61] (byte) bc#105 ← ++ (byte) bc#39
   [62] (byte~) bc#174 ← (byte) bc#105
   [63] call fb 
   to:fa::@1
-fa::@1: scope:[fa]  from fa fa::@11
-  [64] (byte) be#108 ← phi( fa/(byte) be#107 fa::@11/(byte) be#35 )
-  [64] (byte) bd#139 ← phi( fa/(byte) bd#138 fa::@11/(byte) bd#35 )
-  [64] (byte) bc#40 ← phi( fa/(byte) bc#39 fa::@11/(byte) bc#105 )
+fa::@1: scope:[fa]  from fa fa::@10
+  [64] (byte) be#108 ← phi( fa/(byte) be#107 fa::@10/(byte) be#35 )
+  [64] (byte) bd#139 ← phi( fa/(byte) bd#138 fa::@10/(byte) bd#35 )
+  [64] (byte) bc#40 ← phi( fa/(byte) bc#39 fa::@10/(byte) bc#105 )
   [65] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto fa::@2
-  to:fa::@12
-fa::@12: scope:[fa]  from fa::@1
+  to:fa::@11
+fa::@11: scope:[fa]  from fa::@1
   [66] (byte) bc#106 ← ++ (byte) bc#40
   [67] (byte~) bc#175 ← (byte) bc#106
   [68] call fb 
   to:fa::@2
-fa::@2: scope:[fa]  from fa::@1 fa::@12
-  [69] (byte) be#109 ← phi( fa::@1/(byte) be#108 fa::@12/(byte) be#35 )
-  [69] (byte) bd#140 ← phi( fa::@1/(byte) bd#139 fa::@12/(byte) bd#35 )
-  [69] (byte) bc#41 ← phi( fa::@1/(byte) bc#40 fa::@12/(byte) bc#106 )
+fa::@2: scope:[fa]  from fa::@1 fa::@11
+  [69] (byte) be#109 ← phi( fa::@1/(byte) be#108 fa::@11/(byte) be#35 )
+  [69] (byte) bd#140 ← phi( fa::@1/(byte) bd#139 fa::@11/(byte) bd#35 )
+  [69] (byte) bc#41 ← phi( fa::@1/(byte) bc#40 fa::@11/(byte) bc#106 )
   [70] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto fa::@3
-  to:fa::@13
-fa::@13: scope:[fa]  from fa::@2
+  to:fa::@12
+fa::@12: scope:[fa]  from fa::@2
   [71] (byte) bc#107 ← ++ (byte) bc#41
   [72] (byte~) bc#176 ← (byte) bc#107
   [73] call fb 
   to:fa::@3
-fa::@3: scope:[fa]  from fa::@13 fa::@2
-  [74] (byte) be#110 ← phi( fa::@2/(byte) be#109 fa::@13/(byte) be#35 )
-  [74] (byte) bd#141 ← phi( fa::@2/(byte) bd#140 fa::@13/(byte) bd#35 )
-  [74] (byte) bc#42 ← phi( fa::@2/(byte) bc#41 fa::@13/(byte) bc#107 )
+fa::@3: scope:[fa]  from fa::@12 fa::@2
+  [74] (byte) be#110 ← phi( fa::@2/(byte) be#109 fa::@12/(byte) be#35 )
+  [74] (byte) bd#141 ← phi( fa::@2/(byte) bd#140 fa::@12/(byte) bd#35 )
+  [74] (byte) bc#42 ← phi( fa::@2/(byte) bc#41 fa::@12/(byte) bc#107 )
   [75] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto fa::@4
-  to:fa::@14
-fa::@14: scope:[fa]  from fa::@3
+  to:fa::@13
+fa::@13: scope:[fa]  from fa::@3
   [76] (byte) bc#108 ← ++ (byte) bc#42
   [77] (byte~) bc#177 ← (byte) bc#108
   [78] call fb 
   to:fa::@4
-fa::@4: scope:[fa]  from fa::@14 fa::@3
-  [79] (byte) be#111 ← phi( fa::@14/(byte) be#35 fa::@3/(byte) be#110 )
-  [79] (byte) bd#142 ← phi( fa::@14/(byte) bd#35 fa::@3/(byte) bd#141 )
-  [79] (byte) bc#43 ← phi( fa::@14/(byte) bc#108 fa::@3/(byte) bc#42 )
+fa::@4: scope:[fa]  from fa::@13 fa::@3
+  [79] (byte) be#111 ← phi( fa::@13/(byte) be#35 fa::@3/(byte) be#110 )
+  [79] (byte) bd#142 ← phi( fa::@13/(byte) bd#35 fa::@3/(byte) bd#141 )
+  [79] (byte) bc#43 ← phi( fa::@13/(byte) bc#108 fa::@3/(byte) bc#42 )
   [80] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto fa::@5
-  to:fa::@15
-fa::@15: scope:[fa]  from fa::@4
+  to:fa::@14
+fa::@14: scope:[fa]  from fa::@4
   [81] (byte) bc#109 ← ++ (byte) bc#43
   [82] (byte~) bc#178 ← (byte) bc#109
   [83] call fb 
   to:fa::@5
-fa::@5: scope:[fa]  from fa::@15 fa::@4
-  [84] (byte) be#112 ← phi( fa::@15/(byte) be#35 fa::@4/(byte) be#111 )
-  [84] (byte) bd#100 ← phi( fa::@15/(byte) bd#35 fa::@4/(byte) bd#142 )
-  [84] (byte) bc#44 ← phi( fa::@15/(byte) bc#109 fa::@4/(byte) bc#43 )
+fa::@5: scope:[fa]  from fa::@14 fa::@4
+  [84] (byte) be#112 ← phi( fa::@14/(byte) be#35 fa::@4/(byte) be#111 )
+  [84] (byte) bd#100 ← phi( fa::@14/(byte) bd#35 fa::@4/(byte) bd#142 )
+  [84] (byte) bc#44 ← phi( fa::@14/(byte) bc#109 fa::@4/(byte) bc#43 )
   [85] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto fa::@6
-  to:fa::@16
-fa::@16: scope:[fa]  from fa::@5
+  to:fa::@15
+fa::@15: scope:[fa]  from fa::@5
   [86] (byte) bc#110 ← ++ (byte) bc#44
   [87] (byte~) bc#179 ← (byte) bc#110
   [88] call fb 
   to:fa::@6
-fa::@6: scope:[fa]  from fa::@16 fa::@5
-  [89] (byte) be#113 ← phi( fa::@16/(byte) be#35 fa::@5/(byte) be#112 )
-  [89] (byte) bd#101 ← phi( fa::@16/(byte) bd#35 fa::@5/(byte) bd#100 )
-  [89] (byte) bc#45 ← phi( fa::@16/(byte) bc#110 fa::@5/(byte) bc#44 )
+fa::@6: scope:[fa]  from fa::@15 fa::@5
+  [89] (byte) be#113 ← phi( fa::@15/(byte) be#35 fa::@5/(byte) be#112 )
+  [89] (byte) bd#101 ← phi( fa::@15/(byte) bd#35 fa::@5/(byte) bd#100 )
+  [89] (byte) bc#45 ← phi( fa::@15/(byte) bc#110 fa::@5/(byte) bc#44 )
   [90] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto fa::@7
-  to:fa::@17
-fa::@17: scope:[fa]  from fa::@6
+  to:fa::@16
+fa::@16: scope:[fa]  from fa::@6
   [91] (byte) bc#111 ← ++ (byte) bc#45
   [92] (byte~) bc#180 ← (byte) bc#111
   [93] call fb 
   to:fa::@7
-fa::@7: scope:[fa]  from fa::@17 fa::@6
-  [94] (byte) be#114 ← phi( fa::@17/(byte) be#35 fa::@6/(byte) be#113 )
-  [94] (byte) bd#102 ← phi( fa::@17/(byte) bd#35 fa::@6/(byte) bd#101 )
-  [94] (byte) bc#46 ← phi( fa::@17/(byte) bc#111 fa::@6/(byte) bc#45 )
+fa::@7: scope:[fa]  from fa::@16 fa::@6
+  [94] (byte) be#114 ← phi( fa::@16/(byte) be#35 fa::@6/(byte) be#113 )
+  [94] (byte) bd#102 ← phi( fa::@16/(byte) bd#35 fa::@6/(byte) bd#101 )
+  [94] (byte) bc#46 ← phi( fa::@16/(byte) bc#111 fa::@6/(byte) bc#45 )
   [95] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto fa::@8
-  to:fa::@18
-fa::@18: scope:[fa]  from fa::@7
+  to:fa::@17
+fa::@17: scope:[fa]  from fa::@7
   [96] (byte) bc#112 ← ++ (byte) bc#46
   [97] (byte~) bc#181 ← (byte) bc#112
   [98] call fb 
   to:fa::@8
-fa::@8: scope:[fa]  from fa::@18 fa::@7
-  [99] (byte) be#115 ← phi( fa::@18/(byte) be#35 fa::@7/(byte) be#114 )
-  [99] (byte) bd#103 ← phi( fa::@18/(byte) bd#35 fa::@7/(byte) bd#102 )
-  [99] (byte) bc#47 ← phi( fa::@18/(byte) bc#112 fa::@7/(byte) bc#46 )
+fa::@8: scope:[fa]  from fa::@17 fa::@7
+  [99] (byte) be#115 ← phi( fa::@17/(byte) be#35 fa::@7/(byte) be#114 )
+  [99] (byte) bd#103 ← phi( fa::@17/(byte) bd#35 fa::@7/(byte) bd#102 )
+  [99] (byte) bc#47 ← phi( fa::@17/(byte) bc#112 fa::@7/(byte) bc#46 )
   [100] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto fa::@9
-  to:fa::@19
-fa::@19: scope:[fa]  from fa::@8
+  to:fa::@18
+fa::@18: scope:[fa]  from fa::@8
   [101] (byte) bc#123 ← ++ (byte) bc#47
   [102] (byte~) bc#182 ← (byte) bc#123
   [103] call fb 
   to:fa::@9
-fa::@9: scope:[fa]  from fa::@19 fa::@8
-  [104] (byte) be#116 ← phi( fa::@19/(byte) be#35 fa::@8/(byte) be#115 )
-  [104] (byte) bd#104 ← phi( fa::@19/(byte) bd#35 fa::@8/(byte) bd#103 )
-  [104] (byte) bc#113 ← phi( fa::@19/(byte) bc#123 fa::@8/(byte) bc#47 )
+fa::@9: scope:[fa]  from fa::@18 fa::@8
+  [104] (byte) be#116 ← phi( fa::@18/(byte) be#35 fa::@8/(byte) be#115 )
+  [104] (byte) bd#104 ← phi( fa::@18/(byte) bd#35 fa::@8/(byte) bd#103 )
+  [104] (byte) bc#113 ← phi( fa::@18/(byte) bc#123 fa::@8/(byte) bc#47 )
   [105] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fa::@return
-  to:fa::@20
-fa::@20: scope:[fa]  from fa::@9
+  to:fa::@19
+fa::@19: scope:[fa]  from fa::@9
   [106] phi()
   [107] call fb 
   to:fa::@return
-fa::@return: scope:[fa]  from fa::@20 fa::@9
-  [108] (byte) be#24 ← phi( fa::@9/(byte) be#116 fa::@20/(byte) be#35 )
-  [108] (byte) bd#24 ← phi( fa::@9/(byte) bd#104 fa::@20/(byte) bd#35 )
-  [108] (byte) bc#24 ← phi( fa::@9/(byte) bc#113 fa::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fa::@return: scope:[fa]  from fa::@19 fa::@9
+  [108] (byte) be#24 ← phi( fa::@9/(byte) be#116 fa::@19/(byte) be#35 )
+  [108] (byte) bd#24 ← phi( fa::@9/(byte) bd#104 fa::@19/(byte) bd#35 )
+  [108] (byte) bc#24 ← phi( fa::@9/(byte) bc#113 fa::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [109] return 
   to:@return
-fb: scope:[fb]  from fa::@11 fa::@12 fa::@13 fa::@14 fa::@15 fa::@16 fa::@17 fa::@18 fa::@19 fa::@20
-  [110] (byte) be#118 ← phi( fa::@11/(byte) be#107 fa::@12/(byte) be#108 fa::@13/(byte) be#109 fa::@14/(byte) be#110 fa::@15/(byte) be#111 fa::@16/(byte) be#112 fa::@17/(byte) be#113 fa::@18/(byte) be#114 fa::@19/(byte) be#115 fa::@20/(byte) be#116 )
-  [110] (byte) bd#106 ← phi( fa::@11/(byte) bd#138 fa::@12/(byte) bd#139 fa::@13/(byte) bd#140 fa::@14/(byte) bd#141 fa::@15/(byte) bd#142 fa::@16/(byte) bd#100 fa::@17/(byte) bd#101 fa::@18/(byte) bd#102 fa::@19/(byte) bd#103 fa::@20/(byte) bd#104 )
-  [110] (byte) bc#114 ← phi( fa::@11/(byte~) bc#174 fa::@12/(byte~) bc#175 fa::@13/(byte~) bc#176 fa::@14/(byte~) bc#177 fa::@15/(byte~) bc#178 fa::@16/(byte~) bc#179 fa::@17/(byte~) bc#180 fa::@18/(byte~) bc#181 fa::@19/(byte~) bc#182 fa::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fb: scope:[fb]  from fa::@10 fa::@11 fa::@12 fa::@13 fa::@14 fa::@15 fa::@16 fa::@17 fa::@18 fa::@19
+  [110] (byte) be#118 ← phi( fa::@10/(byte) be#107 fa::@11/(byte) be#108 fa::@12/(byte) be#109 fa::@13/(byte) be#110 fa::@14/(byte) be#111 fa::@15/(byte) be#112 fa::@16/(byte) be#113 fa::@17/(byte) be#114 fa::@18/(byte) be#115 fa::@19/(byte) be#116 )
+  [110] (byte) bd#106 ← phi( fa::@10/(byte) bd#138 fa::@11/(byte) bd#139 fa::@12/(byte) bd#140 fa::@13/(byte) bd#141 fa::@14/(byte) bd#142 fa::@15/(byte) bd#100 fa::@16/(byte) bd#101 fa::@17/(byte) bd#102 fa::@18/(byte) bd#103 fa::@19/(byte) bd#104 )
+  [110] (byte) bc#114 ← phi( fa::@10/(byte~) bc#174 fa::@11/(byte~) bc#175 fa::@12/(byte~) bc#176 fa::@13/(byte~) bc#177 fa::@14/(byte~) bc#178 fa::@15/(byte~) bc#179 fa::@16/(byte~) bc#180 fa::@17/(byte~) bc#181 fa::@18/(byte~) bc#182 fa::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [111] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto fb::@1
-  to:fb::@11
-fb::@11: scope:[fb]  from fb
+  to:fb::@10
+fb::@10: scope:[fb]  from fb
   [112] (byte) bd#148 ← ++ (byte) bd#106
   [113] (byte~) bd#238 ← (byte) bd#148
   [114] call fc 
   to:fb::@1
-fb::@1: scope:[fb]  from fb fb::@11
-  [115] (byte) be#119 ← phi( fb/(byte) be#118 fb::@11/(byte) be#46 )
-  [115] (byte) bd#107 ← phi( fb/(byte) bd#106 fb::@11/(byte) bd#148 )
+fb::@1: scope:[fb]  from fb fb::@10
+  [115] (byte) be#119 ← phi( fb/(byte) be#118 fb::@10/(byte) be#46 )
+  [115] (byte) bd#107 ← phi( fb/(byte) bd#106 fb::@10/(byte) bd#148 )
   [116] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto fb::@2
-  to:fb::@12
-fb::@12: scope:[fb]  from fb::@1
+  to:fb::@11
+fb::@11: scope:[fb]  from fb::@1
   [117] (byte) bd#149 ← ++ (byte) bd#107
   [118] (byte~) bd#239 ← (byte) bd#149
   [119] call fc 
   to:fb::@2
-fb::@2: scope:[fb]  from fb::@1 fb::@12
-  [120] (byte) be#120 ← phi( fb::@1/(byte) be#119 fb::@12/(byte) be#46 )
-  [120] (byte) bd#108 ← phi( fb::@1/(byte) bd#107 fb::@12/(byte) bd#149 )
+fb::@2: scope:[fb]  from fb::@1 fb::@11
+  [120] (byte) be#120 ← phi( fb::@1/(byte) be#119 fb::@11/(byte) be#46 )
+  [120] (byte) bd#108 ← phi( fb::@1/(byte) bd#107 fb::@11/(byte) bd#149 )
   [121] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto fb::@3
-  to:fb::@13
-fb::@13: scope:[fb]  from fb::@2
+  to:fb::@12
+fb::@12: scope:[fb]  from fb::@2
   [122] (byte) bd#150 ← ++ (byte) bd#108
   [123] (byte~) bd#240 ← (byte) bd#150
   [124] call fc 
   to:fb::@3
-fb::@3: scope:[fb]  from fb::@13 fb::@2
-  [125] (byte) be#121 ← phi( fb::@2/(byte) be#120 fb::@13/(byte) be#46 )
-  [125] (byte) bd#109 ← phi( fb::@2/(byte) bd#108 fb::@13/(byte) bd#150 )
+fb::@3: scope:[fb]  from fb::@12 fb::@2
+  [125] (byte) be#121 ← phi( fb::@2/(byte) be#120 fb::@12/(byte) be#46 )
+  [125] (byte) bd#109 ← phi( fb::@2/(byte) bd#108 fb::@12/(byte) bd#150 )
   [126] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto fb::@4
-  to:fb::@14
-fb::@14: scope:[fb]  from fb::@3
+  to:fb::@13
+fb::@13: scope:[fb]  from fb::@3
   [127] (byte) bd#151 ← ++ (byte) bd#109
   [128] (byte~) bd#241 ← (byte) bd#151
   [129] call fc 
   to:fb::@4
-fb::@4: scope:[fb]  from fb::@14 fb::@3
-  [130] (byte) be#122 ← phi( fb::@14/(byte) be#46 fb::@3/(byte) be#121 )
-  [130] (byte) bd#110 ← phi( fb::@14/(byte) bd#151 fb::@3/(byte) bd#109 )
+fb::@4: scope:[fb]  from fb::@13 fb::@3
+  [130] (byte) be#122 ← phi( fb::@13/(byte) be#46 fb::@3/(byte) be#121 )
+  [130] (byte) bd#110 ← phi( fb::@13/(byte) bd#151 fb::@3/(byte) bd#109 )
   [131] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto fb::@5
-  to:fb::@15
-fb::@15: scope:[fb]  from fb::@4
+  to:fb::@14
+fb::@14: scope:[fb]  from fb::@4
   [132] (byte) bd#152 ← ++ (byte) bd#110
   [133] (byte~) bd#242 ← (byte) bd#152
   [134] call fc 
   to:fb::@5
-fb::@5: scope:[fb]  from fb::@15 fb::@4
-  [135] (byte) be#123 ← phi( fb::@15/(byte) be#46 fb::@4/(byte) be#122 )
-  [135] (byte) bd#111 ← phi( fb::@15/(byte) bd#152 fb::@4/(byte) bd#110 )
+fb::@5: scope:[fb]  from fb::@14 fb::@4
+  [135] (byte) be#123 ← phi( fb::@14/(byte) be#46 fb::@4/(byte) be#122 )
+  [135] (byte) bd#111 ← phi( fb::@14/(byte) bd#152 fb::@4/(byte) bd#110 )
   [136] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto fb::@6
-  to:fb::@16
-fb::@16: scope:[fb]  from fb::@5
+  to:fb::@15
+fb::@15: scope:[fb]  from fb::@5
   [137] (byte) bd#153 ← ++ (byte) bd#111
   [138] (byte~) bd#243 ← (byte) bd#153
   [139] call fc 
   to:fb::@6
-fb::@6: scope:[fb]  from fb::@16 fb::@5
-  [140] (byte) be#124 ← phi( fb::@16/(byte) be#46 fb::@5/(byte) be#123 )
-  [140] (byte) bd#112 ← phi( fb::@16/(byte) bd#153 fb::@5/(byte) bd#111 )
+fb::@6: scope:[fb]  from fb::@15 fb::@5
+  [140] (byte) be#124 ← phi( fb::@15/(byte) be#46 fb::@5/(byte) be#123 )
+  [140] (byte) bd#112 ← phi( fb::@15/(byte) bd#153 fb::@5/(byte) bd#111 )
   [141] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto fb::@7
-  to:fb::@17
-fb::@17: scope:[fb]  from fb::@6
+  to:fb::@16
+fb::@16: scope:[fb]  from fb::@6
   [142] (byte) bd#154 ← ++ (byte) bd#112
   [143] (byte~) bd#244 ← (byte) bd#154
   [144] call fc 
   to:fb::@7
-fb::@7: scope:[fb]  from fb::@17 fb::@6
-  [145] (byte) be#125 ← phi( fb::@17/(byte) be#46 fb::@6/(byte) be#124 )
-  [145] (byte) bd#113 ← phi( fb::@17/(byte) bd#154 fb::@6/(byte) bd#112 )
+fb::@7: scope:[fb]  from fb::@16 fb::@6
+  [145] (byte) be#125 ← phi( fb::@16/(byte) be#46 fb::@6/(byte) be#124 )
+  [145] (byte) bd#113 ← phi( fb::@16/(byte) bd#154 fb::@6/(byte) bd#112 )
   [146] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto fb::@8
-  to:fb::@18
-fb::@18: scope:[fb]  from fb::@7
+  to:fb::@17
+fb::@17: scope:[fb]  from fb::@7
   [147] (byte) bd#155 ← ++ (byte) bd#113
   [148] (byte~) bd#245 ← (byte) bd#155
   [149] call fc 
   to:fb::@8
-fb::@8: scope:[fb]  from fb::@18 fb::@7
-  [150] (byte) be#126 ← phi( fb::@18/(byte) be#46 fb::@7/(byte) be#125 )
-  [150] (byte) bd#114 ← phi( fb::@18/(byte) bd#155 fb::@7/(byte) bd#113 )
+fb::@8: scope:[fb]  from fb::@17 fb::@7
+  [150] (byte) be#126 ← phi( fb::@17/(byte) be#46 fb::@7/(byte) be#125 )
+  [150] (byte) bd#114 ← phi( fb::@17/(byte) bd#155 fb::@7/(byte) bd#113 )
   [151] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto fb::@9
-  to:fb::@19
-fb::@19: scope:[fb]  from fb::@8
+  to:fb::@18
+fb::@18: scope:[fb]  from fb::@8
   [152] (byte) bd#157 ← ++ (byte) bd#114
   [153] (byte~) bd#246 ← (byte) bd#157
   [154] call fc 
   to:fb::@9
-fb::@9: scope:[fb]  from fb::@19 fb::@8
-  [155] (byte) be#127 ← phi( fb::@19/(byte) be#46 fb::@8/(byte) be#126 )
-  [155] (byte) bd#115 ← phi( fb::@19/(byte) bd#157 fb::@8/(byte) bd#114 )
+fb::@9: scope:[fb]  from fb::@18 fb::@8
+  [155] (byte) be#127 ← phi( fb::@18/(byte) be#46 fb::@8/(byte) be#126 )
+  [155] (byte) bd#115 ← phi( fb::@18/(byte) bd#157 fb::@8/(byte) bd#114 )
   [156] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fb::@return
-  to:fb::@20
-fb::@20: scope:[fb]  from fb::@9
+  to:fb::@19
+fb::@19: scope:[fb]  from fb::@9
   [157] phi()
   [158] call fc 
   to:fb::@return
-fb::@return: scope:[fb]  from fb::@20 fb::@9
-  [159] (byte) be#35 ← phi( fb::@9/(byte) be#127 fb::@20/(byte) be#46 )
-  [159] (byte) bd#35 ← phi( fb::@9/(byte) bd#115 fb::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fb::@return: scope:[fb]  from fb::@19 fb::@9
+  [159] (byte) be#35 ← phi( fb::@9/(byte) be#127 fb::@19/(byte) be#46 )
+  [159] (byte) bd#35 ← phi( fb::@9/(byte) bd#115 fb::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [160] return 
   to:@return
-fc: scope:[fc]  from fb::@11 fb::@12 fb::@13 fb::@14 fb::@15 fb::@16 fb::@17 fb::@18 fb::@19 fb::@20
-  [161] (byte) be#129 ← phi( fb::@11/(byte) be#118 fb::@12/(byte) be#119 fb::@13/(byte) be#120 fb::@14/(byte) be#121 fb::@15/(byte) be#122 fb::@16/(byte) be#123 fb::@17/(byte) be#124 fb::@18/(byte) be#125 fb::@19/(byte) be#126 fb::@20/(byte) be#127 )
-  [161] (byte) bd#117 ← phi( fb::@11/(byte~) bd#238 fb::@12/(byte~) bd#239 fb::@13/(byte~) bd#240 fb::@14/(byte~) bd#241 fb::@15/(byte~) bd#242 fb::@16/(byte~) bd#243 fb::@17/(byte~) bd#244 fb::@18/(byte~) bd#245 fb::@19/(byte~) bd#246 fb::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fc: scope:[fc]  from fb::@10 fb::@11 fb::@12 fb::@13 fb::@14 fb::@15 fb::@16 fb::@17 fb::@18 fb::@19
+  [161] (byte) be#129 ← phi( fb::@10/(byte) be#118 fb::@11/(byte) be#119 fb::@12/(byte) be#120 fb::@13/(byte) be#121 fb::@14/(byte) be#122 fb::@15/(byte) be#123 fb::@16/(byte) be#124 fb::@17/(byte) be#125 fb::@18/(byte) be#126 fb::@19/(byte) be#127 )
+  [161] (byte) bd#117 ← phi( fb::@10/(byte~) bd#238 fb::@11/(byte~) bd#239 fb::@12/(byte~) bd#240 fb::@13/(byte~) bd#241 fb::@14/(byte~) bd#242 fb::@15/(byte~) bd#243 fb::@16/(byte~) bd#244 fb::@17/(byte~) bd#245 fb::@18/(byte~) bd#246 fb::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [162] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto fc::@1
-  to:fc::@11
-fc::@11: scope:[fc]  from fc
+  to:fc::@10
+fc::@10: scope:[fc]  from fc
   [163] (byte) be#36 ← ++ (byte) be#129
   to:fc::@1
-fc::@1: scope:[fc]  from fc fc::@11
-  [164] (byte) be#130 ← phi( fc/(byte) be#129 fc::@11/(byte) be#36 )
+fc::@1: scope:[fc]  from fc fc::@10
+  [164] (byte) be#130 ← phi( fc/(byte) be#129 fc::@10/(byte) be#36 )
   [165] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto fc::@2
-  to:fc::@12
-fc::@12: scope:[fc]  from fc::@1
+  to:fc::@11
+fc::@11: scope:[fc]  from fc::@1
   [166] (byte) be#37 ← ++ (byte) be#130
   to:fc::@2
-fc::@2: scope:[fc]  from fc::@1 fc::@12
-  [167] (byte) be#131 ← phi( fc::@1/(byte) be#130 fc::@12/(byte) be#37 )
+fc::@2: scope:[fc]  from fc::@1 fc::@11
+  [167] (byte) be#131 ← phi( fc::@1/(byte) be#130 fc::@11/(byte) be#37 )
   [168] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto fc::@3
-  to:fc::@13
-fc::@13: scope:[fc]  from fc::@2
+  to:fc::@12
+fc::@12: scope:[fc]  from fc::@2
   [169] (byte) be#38 ← ++ (byte) be#131
   to:fc::@3
-fc::@3: scope:[fc]  from fc::@13 fc::@2
-  [170] (byte) be#132 ← phi( fc::@13/(byte) be#38 fc::@2/(byte) be#131 )
+fc::@3: scope:[fc]  from fc::@12 fc::@2
+  [170] (byte) be#132 ← phi( fc::@12/(byte) be#38 fc::@2/(byte) be#131 )
   [171] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto fc::@4
-  to:fc::@14
-fc::@14: scope:[fc]  from fc::@3
+  to:fc::@13
+fc::@13: scope:[fc]  from fc::@3
   [172] (byte) be#39 ← ++ (byte) be#132
   to:fc::@4
-fc::@4: scope:[fc]  from fc::@14 fc::@3
-  [173] (byte) be#133 ← phi( fc::@14/(byte) be#39 fc::@3/(byte) be#132 )
+fc::@4: scope:[fc]  from fc::@13 fc::@3
+  [173] (byte) be#133 ← phi( fc::@13/(byte) be#39 fc::@3/(byte) be#132 )
   [174] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto fc::@5
-  to:fc::@15
-fc::@15: scope:[fc]  from fc::@4
+  to:fc::@14
+fc::@14: scope:[fc]  from fc::@4
   [175] (byte) be#40 ← ++ (byte) be#133
   to:fc::@5
-fc::@5: scope:[fc]  from fc::@15 fc::@4
-  [176] (byte) be#134 ← phi( fc::@15/(byte) be#40 fc::@4/(byte) be#133 )
+fc::@5: scope:[fc]  from fc::@14 fc::@4
+  [176] (byte) be#134 ← phi( fc::@14/(byte) be#40 fc::@4/(byte) be#133 )
   [177] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto fc::@6
-  to:fc::@16
-fc::@16: scope:[fc]  from fc::@5
+  to:fc::@15
+fc::@15: scope:[fc]  from fc::@5
   [178] (byte) be#41 ← ++ (byte) be#134
   to:fc::@6
-fc::@6: scope:[fc]  from fc::@16 fc::@5
-  [179] (byte) be#135 ← phi( fc::@16/(byte) be#41 fc::@5/(byte) be#134 )
+fc::@6: scope:[fc]  from fc::@15 fc::@5
+  [179] (byte) be#135 ← phi( fc::@15/(byte) be#41 fc::@5/(byte) be#134 )
   [180] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto fc::@7
-  to:fc::@17
-fc::@17: scope:[fc]  from fc::@6
+  to:fc::@16
+fc::@16: scope:[fc]  from fc::@6
   [181] (byte) be#42 ← ++ (byte) be#135
   to:fc::@7
-fc::@7: scope:[fc]  from fc::@17 fc::@6
-  [182] (byte) be#136 ← phi( fc::@17/(byte) be#42 fc::@6/(byte) be#135 )
+fc::@7: scope:[fc]  from fc::@16 fc::@6
+  [182] (byte) be#136 ← phi( fc::@16/(byte) be#42 fc::@6/(byte) be#135 )
   [183] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto fc::@8
-  to:fc::@18
-fc::@18: scope:[fc]  from fc::@7
+  to:fc::@17
+fc::@17: scope:[fc]  from fc::@7
   [184] (byte) be#43 ← ++ (byte) be#136
   to:fc::@8
-fc::@8: scope:[fc]  from fc::@18 fc::@7
-  [185] (byte) be#137 ← phi( fc::@18/(byte) be#43 fc::@7/(byte) be#136 )
+fc::@8: scope:[fc]  from fc::@17 fc::@7
+  [185] (byte) be#137 ← phi( fc::@17/(byte) be#43 fc::@7/(byte) be#136 )
   [186] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto fc::@9
-  to:fc::@19
-fc::@19: scope:[fc]  from fc::@8
+  to:fc::@18
+fc::@18: scope:[fc]  from fc::@8
   [187] (byte) be#44 ← ++ (byte) be#137
   to:fc::@9
-fc::@9: scope:[fc]  from fc::@19 fc::@8
-  [188] (byte) be#138 ← phi( fc::@19/(byte) be#44 fc::@8/(byte) be#137 )
-  [189] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fc::@30
+fc::@9: scope:[fc]  from fc::@18 fc::@8
+  [188] (byte) be#138 ← phi( fc::@18/(byte) be#44 fc::@8/(byte) be#137 )
+  [189] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fc::@19
   to:fc::@return
-fc::@return: scope:[fc]  from fc::@30 fc::@9
-  [190] (byte) be#46 ← phi( fc::@30/(byte) be#138 fc::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fc::@return: scope:[fc]  from fc::@19 fc::@9
+  [190] (byte) be#46 ← phi( fc::@19/(byte) be#138 fc::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [191] return 
   to:@return
-fc::@30: scope:[fc]  from fc::@9
+fc::@19: scope:[fc]  from fc::@9
   [192] phi()
   to:fc::@return
diff --git a/src/test/ref/no-recursion-heavy.log b/src/test/ref/no-recursion-heavy.log
index 2d7f373d5..aaedb4c46 100644
--- a/src/test/ref/no-recursion-heavy.log
+++ b/src/test/ref/no-recursion-heavy.log
@@ -2649,459 +2649,501 @@ Culled Empty Block (label) fc::@24
 Culled Empty Block (label) fc::@23
 Culled Empty Block (label) fc::@22
 Culled Empty Block (label) fc::@21
+Renumbering block @5 to @1
+Renumbering block main::@7 to main::@3
+Renumbering block f0::@11 to f0::@10
+Renumbering block f0::@12 to f0::@11
+Renumbering block f0::@13 to f0::@12
+Renumbering block f0::@14 to f0::@13
+Renumbering block f0::@15 to f0::@14
+Renumbering block f0::@16 to f0::@15
+Renumbering block f0::@17 to f0::@16
+Renumbering block f0::@18 to f0::@17
+Renumbering block f0::@19 to f0::@18
+Renumbering block f0::@20 to f0::@19
+Renumbering block fa::@11 to fa::@10
+Renumbering block fa::@12 to fa::@11
+Renumbering block fa::@13 to fa::@12
+Renumbering block fa::@14 to fa::@13
+Renumbering block fa::@15 to fa::@14
+Renumbering block fa::@16 to fa::@15
+Renumbering block fa::@17 to fa::@16
+Renumbering block fa::@18 to fa::@17
+Renumbering block fa::@19 to fa::@18
+Renumbering block fa::@20 to fa::@19
+Renumbering block fb::@11 to fb::@10
+Renumbering block fb::@12 to fb::@11
+Renumbering block fb::@13 to fb::@12
+Renumbering block fb::@14 to fb::@13
+Renumbering block fb::@15 to fb::@14
+Renumbering block fb::@16 to fb::@15
+Renumbering block fb::@17 to fb::@16
+Renumbering block fb::@18 to fb::@17
+Renumbering block fb::@19 to fb::@18
+Renumbering block fb::@20 to fb::@19
+Renumbering block fc::@11 to fc::@10
+Renumbering block fc::@12 to fc::@11
+Renumbering block fc::@13 to fc::@12
+Renumbering block fc::@14 to fc::@13
+Renumbering block fc::@15 to fc::@14
+Renumbering block fc::@16 to fc::@15
+Renumbering block fc::@17 to fc::@16
+Renumbering block fc::@18 to fc::@17
+Renumbering block fc::@19 to fc::@18
+Renumbering block fc::@30 to fc::@19
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @5
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@2
-Adding NOP phi() at start of f0::@20
-Adding NOP phi() at start of fa::@20
-Adding NOP phi() at start of fb::@20
-Adding NOP phi() at start of fc::@30
+Adding NOP phi() at start of f0::@19
+Adding NOP phi() at start of fa::@19
+Adding NOP phi() at start of fb::@19
+Adding NOP phi() at start of fc::@19
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@7
-  [5] (byte) ba#17 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) ba#1 )
-  [5] (byte) be#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) be#13 )
-  [5] (byte) bd#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) bd#13 )
-  [5] (byte) bc#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) bc#13 )
-  [5] (byte) bb#16 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) bb#13 )
+main::@1: scope:[main]  from main main::@3
+  [5] (byte) ba#17 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) ba#1 )
+  [5] (byte) be#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) be#13 )
+  [5] (byte) bd#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) bd#13 )
+  [5] (byte) bc#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) bc#13 )
+  [5] (byte) bb#16 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) bb#13 )
   to:main::@2
 main::@2: scope:[main]  from main::@1
   [6] phi()
   [7] call f0 
-  to:main::@7
-main::@7: scope:[main]  from main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [8] (byte) ba#1 ← ++ (byte) ba#17
   to:main::@1
 f0: scope:[f0]  from main::@2
   [9] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto f0::@1
-  to:f0::@11
-f0::@11: scope:[f0]  from f0
+  to:f0::@10
+f0::@10: scope:[f0]  from f0
   [10] (byte) bb#3 ← ++ (byte) bb#16
   [11] (byte~) bb#101 ← (byte) bb#3
   [12] call fa 
   to:f0::@1
-f0::@1: scope:[f0]  from f0 f0::@11
-  [13] (byte) be#142 ← phi( f0/(byte) be#2 f0::@11/(byte) be#24 )
-  [13] (byte) bd#129 ← phi( f0/(byte) bd#2 f0::@11/(byte) bd#24 )
-  [13] (byte) bc#63 ← phi( f0/(byte) bc#2 f0::@11/(byte) bc#24 )
-  [13] (byte) bb#18 ← phi( f0/(byte) bb#16 f0::@11/(byte) bb#3 )
+f0::@1: scope:[f0]  from f0 f0::@10
+  [13] (byte) be#142 ← phi( f0/(byte) be#2 f0::@10/(byte) be#24 )
+  [13] (byte) bd#129 ← phi( f0/(byte) bd#2 f0::@10/(byte) bd#24 )
+  [13] (byte) bc#63 ← phi( f0/(byte) bc#2 f0::@10/(byte) bc#24 )
+  [13] (byte) bb#18 ← phi( f0/(byte) bb#16 f0::@10/(byte) bb#3 )
   [14] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto f0::@2
-  to:f0::@12
-f0::@12: scope:[f0]  from f0::@1
+  to:f0::@11
+f0::@11: scope:[f0]  from f0::@1
   [15] (byte) bb#4 ← ++ (byte) bb#18
   [16] (byte~) bb#102 ← (byte) bb#4
   [17] call fa 
   to:f0::@2
-f0::@2: scope:[f0]  from f0::@1 f0::@12
-  [18] (byte) be#143 ← phi( f0::@1/(byte) be#142 f0::@12/(byte) be#24 )
-  [18] (byte) bd#130 ← phi( f0::@1/(byte) bd#129 f0::@12/(byte) bd#24 )
-  [18] (byte) bc#64 ← phi( f0::@1/(byte) bc#63 f0::@12/(byte) bc#24 )
-  [18] (byte) bb#19 ← phi( f0::@1/(byte) bb#18 f0::@12/(byte) bb#4 )
+f0::@2: scope:[f0]  from f0::@1 f0::@11
+  [18] (byte) be#143 ← phi( f0::@1/(byte) be#142 f0::@11/(byte) be#24 )
+  [18] (byte) bd#130 ← phi( f0::@1/(byte) bd#129 f0::@11/(byte) bd#24 )
+  [18] (byte) bc#64 ← phi( f0::@1/(byte) bc#63 f0::@11/(byte) bc#24 )
+  [18] (byte) bb#19 ← phi( f0::@1/(byte) bb#18 f0::@11/(byte) bb#4 )
   [19] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto f0::@3
-  to:f0::@13
-f0::@13: scope:[f0]  from f0::@2
+  to:f0::@12
+f0::@12: scope:[f0]  from f0::@2
   [20] (byte) bb#5 ← ++ (byte) bb#19
   [21] (byte~) bb#103 ← (byte) bb#5
   [22] call fa 
   to:f0::@3
-f0::@3: scope:[f0]  from f0::@13 f0::@2
-  [23] (byte) be#144 ← phi( f0::@2/(byte) be#143 f0::@13/(byte) be#24 )
-  [23] (byte) bd#131 ← phi( f0::@2/(byte) bd#130 f0::@13/(byte) bd#24 )
-  [23] (byte) bc#65 ← phi( f0::@2/(byte) bc#64 f0::@13/(byte) bc#24 )
-  [23] (byte) bb#20 ← phi( f0::@2/(byte) bb#19 f0::@13/(byte) bb#5 )
+f0::@3: scope:[f0]  from f0::@12 f0::@2
+  [23] (byte) be#144 ← phi( f0::@2/(byte) be#143 f0::@12/(byte) be#24 )
+  [23] (byte) bd#131 ← phi( f0::@2/(byte) bd#130 f0::@12/(byte) bd#24 )
+  [23] (byte) bc#65 ← phi( f0::@2/(byte) bc#64 f0::@12/(byte) bc#24 )
+  [23] (byte) bb#20 ← phi( f0::@2/(byte) bb#19 f0::@12/(byte) bb#5 )
   [24] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto f0::@4
-  to:f0::@14
-f0::@14: scope:[f0]  from f0::@3
+  to:f0::@13
+f0::@13: scope:[f0]  from f0::@3
   [25] (byte) bb#6 ← ++ (byte) bb#20
   [26] (byte~) bb#104 ← (byte) bb#6
   [27] call fa 
   to:f0::@4
-f0::@4: scope:[f0]  from f0::@14 f0::@3
-  [28] (byte) be#100 ← phi( f0::@14/(byte) be#24 f0::@3/(byte) be#144 )
-  [28] (byte) bd#132 ← phi( f0::@14/(byte) bd#24 f0::@3/(byte) bd#131 )
-  [28] (byte) bc#66 ← phi( f0::@14/(byte) bc#24 f0::@3/(byte) bc#65 )
-  [28] (byte) bb#21 ← phi( f0::@14/(byte) bb#6 f0::@3/(byte) bb#20 )
+f0::@4: scope:[f0]  from f0::@13 f0::@3
+  [28] (byte) be#100 ← phi( f0::@13/(byte) be#24 f0::@3/(byte) be#144 )
+  [28] (byte) bd#132 ← phi( f0::@13/(byte) bd#24 f0::@3/(byte) bd#131 )
+  [28] (byte) bc#66 ← phi( f0::@13/(byte) bc#24 f0::@3/(byte) bc#65 )
+  [28] (byte) bb#21 ← phi( f0::@13/(byte) bb#6 f0::@3/(byte) bb#20 )
   [29] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto f0::@5
-  to:f0::@15
-f0::@15: scope:[f0]  from f0::@4
+  to:f0::@14
+f0::@14: scope:[f0]  from f0::@4
   [30] (byte) bb#66 ← ++ (byte) bb#21
   [31] (byte~) bb#105 ← (byte) bb#66
   [32] call fa 
   to:f0::@5
-f0::@5: scope:[f0]  from f0::@15 f0::@4
-  [33] (byte) be#101 ← phi( f0::@15/(byte) be#24 f0::@4/(byte) be#100 )
-  [33] (byte) bd#133 ← phi( f0::@15/(byte) bd#24 f0::@4/(byte) bd#132 )
-  [33] (byte) bc#100 ← phi( f0::@15/(byte) bc#24 f0::@4/(byte) bc#66 )
-  [33] (byte) bb#22 ← phi( f0::@15/(byte) bb#66 f0::@4/(byte) bb#21 )
+f0::@5: scope:[f0]  from f0::@14 f0::@4
+  [33] (byte) be#101 ← phi( f0::@14/(byte) be#24 f0::@4/(byte) be#100 )
+  [33] (byte) bd#133 ← phi( f0::@14/(byte) bd#24 f0::@4/(byte) bd#132 )
+  [33] (byte) bc#100 ← phi( f0::@14/(byte) bc#24 f0::@4/(byte) bc#66 )
+  [33] (byte) bb#22 ← phi( f0::@14/(byte) bb#66 f0::@4/(byte) bb#21 )
   [34] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto f0::@6
-  to:f0::@16
-f0::@16: scope:[f0]  from f0::@5
+  to:f0::@15
+f0::@15: scope:[f0]  from f0::@5
   [35] (byte) bb#67 ← ++ (byte) bb#22
   [36] (byte~) bb#106 ← (byte) bb#67
   [37] call fa 
   to:f0::@6
-f0::@6: scope:[f0]  from f0::@16 f0::@5
-  [38] (byte) be#102 ← phi( f0::@16/(byte) be#24 f0::@5/(byte) be#101 )
-  [38] (byte) bd#134 ← phi( f0::@16/(byte) bd#24 f0::@5/(byte) bd#133 )
-  [38] (byte) bc#101 ← phi( f0::@16/(byte) bc#24 f0::@5/(byte) bc#100 )
-  [38] (byte) bb#23 ← phi( f0::@16/(byte) bb#67 f0::@5/(byte) bb#22 )
+f0::@6: scope:[f0]  from f0::@15 f0::@5
+  [38] (byte) be#102 ← phi( f0::@15/(byte) be#24 f0::@5/(byte) be#101 )
+  [38] (byte) bd#134 ← phi( f0::@15/(byte) bd#24 f0::@5/(byte) bd#133 )
+  [38] (byte) bc#101 ← phi( f0::@15/(byte) bc#24 f0::@5/(byte) bc#100 )
+  [38] (byte) bb#23 ← phi( f0::@15/(byte) bb#67 f0::@5/(byte) bb#22 )
   [39] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto f0::@7
-  to:f0::@17
-f0::@17: scope:[f0]  from f0::@6
+  to:f0::@16
+f0::@16: scope:[f0]  from f0::@6
   [40] (byte) bb#68 ← ++ (byte) bb#23
   [41] (byte~) bb#107 ← (byte) bb#68
   [42] call fa 
   to:f0::@7
-f0::@7: scope:[f0]  from f0::@17 f0::@6
-  [43] (byte) be#103 ← phi( f0::@17/(byte) be#24 f0::@6/(byte) be#102 )
-  [43] (byte) bd#135 ← phi( f0::@17/(byte) bd#24 f0::@6/(byte) bd#134 )
-  [43] (byte) bc#102 ← phi( f0::@17/(byte) bc#24 f0::@6/(byte) bc#101 )
-  [43] (byte) bb#24 ← phi( f0::@17/(byte) bb#68 f0::@6/(byte) bb#23 )
+f0::@7: scope:[f0]  from f0::@16 f0::@6
+  [43] (byte) be#103 ← phi( f0::@16/(byte) be#24 f0::@6/(byte) be#102 )
+  [43] (byte) bd#135 ← phi( f0::@16/(byte) bd#24 f0::@6/(byte) bd#134 )
+  [43] (byte) bc#102 ← phi( f0::@16/(byte) bc#24 f0::@6/(byte) bc#101 )
+  [43] (byte) bb#24 ← phi( f0::@16/(byte) bb#68 f0::@6/(byte) bb#23 )
   [44] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto f0::@8
-  to:f0::@18
-f0::@18: scope:[f0]  from f0::@7
+  to:f0::@17
+f0::@17: scope:[f0]  from f0::@7
   [45] (byte) bb#10 ← ++ (byte) bb#24
   [46] (byte~) bb#108 ← (byte) bb#10
   [47] call fa 
   to:f0::@8
-f0::@8: scope:[f0]  from f0::@18 f0::@7
-  [48] (byte) be#104 ← phi( f0::@18/(byte) be#24 f0::@7/(byte) be#103 )
-  [48] (byte) bd#136 ← phi( f0::@18/(byte) bd#24 f0::@7/(byte) bd#135 )
-  [48] (byte) bc#103 ← phi( f0::@18/(byte) bc#24 f0::@7/(byte) bc#102 )
-  [48] (byte) bb#25 ← phi( f0::@18/(byte) bb#10 f0::@7/(byte) bb#24 )
+f0::@8: scope:[f0]  from f0::@17 f0::@7
+  [48] (byte) be#104 ← phi( f0::@17/(byte) be#24 f0::@7/(byte) be#103 )
+  [48] (byte) bd#136 ← phi( f0::@17/(byte) bd#24 f0::@7/(byte) bd#135 )
+  [48] (byte) bc#103 ← phi( f0::@17/(byte) bc#24 f0::@7/(byte) bc#102 )
+  [48] (byte) bb#25 ← phi( f0::@17/(byte) bb#10 f0::@7/(byte) bb#24 )
   [49] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto f0::@9
-  to:f0::@19
-f0::@19: scope:[f0]  from f0::@8
+  to:f0::@18
+f0::@18: scope:[f0]  from f0::@8
   [50] (byte) bb#11 ← ++ (byte) bb#25
   [51] (byte~) bb#109 ← (byte) bb#11
   [52] call fa 
   to:f0::@9
-f0::@9: scope:[f0]  from f0::@19 f0::@8
-  [53] (byte) be#105 ← phi( f0::@19/(byte) be#24 f0::@8/(byte) be#104 )
-  [53] (byte) bd#137 ← phi( f0::@19/(byte) bd#24 f0::@8/(byte) bd#136 )
-  [53] (byte) bc#104 ← phi( f0::@19/(byte) bc#24 f0::@8/(byte) bc#103 )
-  [53] (byte) bb#49 ← phi( f0::@19/(byte) bb#11 f0::@8/(byte) bb#25 )
+f0::@9: scope:[f0]  from f0::@18 f0::@8
+  [53] (byte) be#105 ← phi( f0::@18/(byte) be#24 f0::@8/(byte) be#104 )
+  [53] (byte) bd#137 ← phi( f0::@18/(byte) bd#24 f0::@8/(byte) bd#136 )
+  [53] (byte) bc#104 ← phi( f0::@18/(byte) bc#24 f0::@8/(byte) bc#103 )
+  [53] (byte) bb#49 ← phi( f0::@18/(byte) bb#11 f0::@8/(byte) bb#25 )
   [54] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto f0::@return
-  to:f0::@20
-f0::@20: scope:[f0]  from f0::@9
+  to:f0::@19
+f0::@19: scope:[f0]  from f0::@9
   [55] phi()
   [56] call fa 
   to:f0::@return
-f0::@return: scope:[f0]  from f0::@20 f0::@9
-  [57] (byte) be#13 ← phi( f0::@9/(byte) be#105 f0::@20/(byte) be#24 )
-  [57] (byte) bd#13 ← phi( f0::@9/(byte) bd#137 f0::@20/(byte) bd#24 )
-  [57] (byte) bc#13 ← phi( f0::@9/(byte) bc#104 f0::@20/(byte) bc#24 )
-  [57] (byte) bb#13 ← phi( f0::@9/(byte) bb#49 f0::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+f0::@return: scope:[f0]  from f0::@19 f0::@9
+  [57] (byte) be#13 ← phi( f0::@9/(byte) be#105 f0::@19/(byte) be#24 )
+  [57] (byte) bd#13 ← phi( f0::@9/(byte) bd#137 f0::@19/(byte) bd#24 )
+  [57] (byte) bc#13 ← phi( f0::@9/(byte) bc#104 f0::@19/(byte) bc#24 )
+  [57] (byte) bb#13 ← phi( f0::@9/(byte) bb#49 f0::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [58] return 
   to:@return
-fa: scope:[fa]  from f0::@11 f0::@12 f0::@13 f0::@14 f0::@15 f0::@16 f0::@17 f0::@18 f0::@19 f0::@20
-  [59] (byte) be#107 ← phi( f0::@11/(byte) be#2 f0::@12/(byte) be#142 f0::@13/(byte) be#143 f0::@14/(byte) be#144 f0::@15/(byte) be#100 f0::@16/(byte) be#101 f0::@17/(byte) be#102 f0::@18/(byte) be#103 f0::@19/(byte) be#104 f0::@20/(byte) be#105 )
-  [59] (byte) bd#138 ← phi( f0::@11/(byte) bd#2 f0::@12/(byte) bd#129 f0::@13/(byte) bd#130 f0::@14/(byte) bd#131 f0::@15/(byte) bd#132 f0::@16/(byte) bd#133 f0::@17/(byte) bd#134 f0::@18/(byte) bd#135 f0::@19/(byte) bd#136 f0::@20/(byte) bd#137 )
-  [59] (byte) bc#39 ← phi( f0::@11/(byte) bc#2 f0::@12/(byte) bc#63 f0::@13/(byte) bc#64 f0::@14/(byte) bc#65 f0::@15/(byte) bc#66 f0::@16/(byte) bc#100 f0::@17/(byte) bc#101 f0::@18/(byte) bc#102 f0::@19/(byte) bc#103 f0::@20/(byte) bc#104 )
-  [59] (byte) bb#27 ← phi( f0::@11/(byte~) bb#101 f0::@12/(byte~) bb#102 f0::@13/(byte~) bb#103 f0::@14/(byte~) bb#104 f0::@15/(byte~) bb#105 f0::@16/(byte~) bb#106 f0::@17/(byte~) bb#107 f0::@18/(byte~) bb#108 f0::@19/(byte~) bb#109 f0::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fa: scope:[fa]  from f0::@10 f0::@11 f0::@12 f0::@13 f0::@14 f0::@15 f0::@16 f0::@17 f0::@18 f0::@19
+  [59] (byte) be#107 ← phi( f0::@10/(byte) be#2 f0::@11/(byte) be#142 f0::@12/(byte) be#143 f0::@13/(byte) be#144 f0::@14/(byte) be#100 f0::@15/(byte) be#101 f0::@16/(byte) be#102 f0::@17/(byte) be#103 f0::@18/(byte) be#104 f0::@19/(byte) be#105 )
+  [59] (byte) bd#138 ← phi( f0::@10/(byte) bd#2 f0::@11/(byte) bd#129 f0::@12/(byte) bd#130 f0::@13/(byte) bd#131 f0::@14/(byte) bd#132 f0::@15/(byte) bd#133 f0::@16/(byte) bd#134 f0::@17/(byte) bd#135 f0::@18/(byte) bd#136 f0::@19/(byte) bd#137 )
+  [59] (byte) bc#39 ← phi( f0::@10/(byte) bc#2 f0::@11/(byte) bc#63 f0::@12/(byte) bc#64 f0::@13/(byte) bc#65 f0::@14/(byte) bc#66 f0::@15/(byte) bc#100 f0::@16/(byte) bc#101 f0::@17/(byte) bc#102 f0::@18/(byte) bc#103 f0::@19/(byte) bc#104 )
+  [59] (byte) bb#27 ← phi( f0::@10/(byte~) bb#101 f0::@11/(byte~) bb#102 f0::@12/(byte~) bb#103 f0::@13/(byte~) bb#104 f0::@14/(byte~) bb#105 f0::@15/(byte~) bb#106 f0::@16/(byte~) bb#107 f0::@17/(byte~) bb#108 f0::@18/(byte~) bb#109 f0::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [60] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto fa::@1
-  to:fa::@11
-fa::@11: scope:[fa]  from fa
+  to:fa::@10
+fa::@10: scope:[fa]  from fa
   [61] (byte) bc#105 ← ++ (byte) bc#39
   [62] (byte~) bc#174 ← (byte) bc#105
   [63] call fb 
   to:fa::@1
-fa::@1: scope:[fa]  from fa fa::@11
-  [64] (byte) be#108 ← phi( fa/(byte) be#107 fa::@11/(byte) be#35 )
-  [64] (byte) bd#139 ← phi( fa/(byte) bd#138 fa::@11/(byte) bd#35 )
-  [64] (byte) bc#40 ← phi( fa/(byte) bc#39 fa::@11/(byte) bc#105 )
+fa::@1: scope:[fa]  from fa fa::@10
+  [64] (byte) be#108 ← phi( fa/(byte) be#107 fa::@10/(byte) be#35 )
+  [64] (byte) bd#139 ← phi( fa/(byte) bd#138 fa::@10/(byte) bd#35 )
+  [64] (byte) bc#40 ← phi( fa/(byte) bc#39 fa::@10/(byte) bc#105 )
   [65] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto fa::@2
-  to:fa::@12
-fa::@12: scope:[fa]  from fa::@1
+  to:fa::@11
+fa::@11: scope:[fa]  from fa::@1
   [66] (byte) bc#106 ← ++ (byte) bc#40
   [67] (byte~) bc#175 ← (byte) bc#106
   [68] call fb 
   to:fa::@2
-fa::@2: scope:[fa]  from fa::@1 fa::@12
-  [69] (byte) be#109 ← phi( fa::@1/(byte) be#108 fa::@12/(byte) be#35 )
-  [69] (byte) bd#140 ← phi( fa::@1/(byte) bd#139 fa::@12/(byte) bd#35 )
-  [69] (byte) bc#41 ← phi( fa::@1/(byte) bc#40 fa::@12/(byte) bc#106 )
+fa::@2: scope:[fa]  from fa::@1 fa::@11
+  [69] (byte) be#109 ← phi( fa::@1/(byte) be#108 fa::@11/(byte) be#35 )
+  [69] (byte) bd#140 ← phi( fa::@1/(byte) bd#139 fa::@11/(byte) bd#35 )
+  [69] (byte) bc#41 ← phi( fa::@1/(byte) bc#40 fa::@11/(byte) bc#106 )
   [70] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto fa::@3
-  to:fa::@13
-fa::@13: scope:[fa]  from fa::@2
+  to:fa::@12
+fa::@12: scope:[fa]  from fa::@2
   [71] (byte) bc#107 ← ++ (byte) bc#41
   [72] (byte~) bc#176 ← (byte) bc#107
   [73] call fb 
   to:fa::@3
-fa::@3: scope:[fa]  from fa::@13 fa::@2
-  [74] (byte) be#110 ← phi( fa::@2/(byte) be#109 fa::@13/(byte) be#35 )
-  [74] (byte) bd#141 ← phi( fa::@2/(byte) bd#140 fa::@13/(byte) bd#35 )
-  [74] (byte) bc#42 ← phi( fa::@2/(byte) bc#41 fa::@13/(byte) bc#107 )
+fa::@3: scope:[fa]  from fa::@12 fa::@2
+  [74] (byte) be#110 ← phi( fa::@2/(byte) be#109 fa::@12/(byte) be#35 )
+  [74] (byte) bd#141 ← phi( fa::@2/(byte) bd#140 fa::@12/(byte) bd#35 )
+  [74] (byte) bc#42 ← phi( fa::@2/(byte) bc#41 fa::@12/(byte) bc#107 )
   [75] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto fa::@4
-  to:fa::@14
-fa::@14: scope:[fa]  from fa::@3
+  to:fa::@13
+fa::@13: scope:[fa]  from fa::@3
   [76] (byte) bc#108 ← ++ (byte) bc#42
   [77] (byte~) bc#177 ← (byte) bc#108
   [78] call fb 
   to:fa::@4
-fa::@4: scope:[fa]  from fa::@14 fa::@3
-  [79] (byte) be#111 ← phi( fa::@14/(byte) be#35 fa::@3/(byte) be#110 )
-  [79] (byte) bd#142 ← phi( fa::@14/(byte) bd#35 fa::@3/(byte) bd#141 )
-  [79] (byte) bc#43 ← phi( fa::@14/(byte) bc#108 fa::@3/(byte) bc#42 )
+fa::@4: scope:[fa]  from fa::@13 fa::@3
+  [79] (byte) be#111 ← phi( fa::@13/(byte) be#35 fa::@3/(byte) be#110 )
+  [79] (byte) bd#142 ← phi( fa::@13/(byte) bd#35 fa::@3/(byte) bd#141 )
+  [79] (byte) bc#43 ← phi( fa::@13/(byte) bc#108 fa::@3/(byte) bc#42 )
   [80] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto fa::@5
-  to:fa::@15
-fa::@15: scope:[fa]  from fa::@4
+  to:fa::@14
+fa::@14: scope:[fa]  from fa::@4
   [81] (byte) bc#109 ← ++ (byte) bc#43
   [82] (byte~) bc#178 ← (byte) bc#109
   [83] call fb 
   to:fa::@5
-fa::@5: scope:[fa]  from fa::@15 fa::@4
-  [84] (byte) be#112 ← phi( fa::@15/(byte) be#35 fa::@4/(byte) be#111 )
-  [84] (byte) bd#100 ← phi( fa::@15/(byte) bd#35 fa::@4/(byte) bd#142 )
-  [84] (byte) bc#44 ← phi( fa::@15/(byte) bc#109 fa::@4/(byte) bc#43 )
+fa::@5: scope:[fa]  from fa::@14 fa::@4
+  [84] (byte) be#112 ← phi( fa::@14/(byte) be#35 fa::@4/(byte) be#111 )
+  [84] (byte) bd#100 ← phi( fa::@14/(byte) bd#35 fa::@4/(byte) bd#142 )
+  [84] (byte) bc#44 ← phi( fa::@14/(byte) bc#109 fa::@4/(byte) bc#43 )
   [85] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto fa::@6
-  to:fa::@16
-fa::@16: scope:[fa]  from fa::@5
+  to:fa::@15
+fa::@15: scope:[fa]  from fa::@5
   [86] (byte) bc#110 ← ++ (byte) bc#44
   [87] (byte~) bc#179 ← (byte) bc#110
   [88] call fb 
   to:fa::@6
-fa::@6: scope:[fa]  from fa::@16 fa::@5
-  [89] (byte) be#113 ← phi( fa::@16/(byte) be#35 fa::@5/(byte) be#112 )
-  [89] (byte) bd#101 ← phi( fa::@16/(byte) bd#35 fa::@5/(byte) bd#100 )
-  [89] (byte) bc#45 ← phi( fa::@16/(byte) bc#110 fa::@5/(byte) bc#44 )
+fa::@6: scope:[fa]  from fa::@15 fa::@5
+  [89] (byte) be#113 ← phi( fa::@15/(byte) be#35 fa::@5/(byte) be#112 )
+  [89] (byte) bd#101 ← phi( fa::@15/(byte) bd#35 fa::@5/(byte) bd#100 )
+  [89] (byte) bc#45 ← phi( fa::@15/(byte) bc#110 fa::@5/(byte) bc#44 )
   [90] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto fa::@7
-  to:fa::@17
-fa::@17: scope:[fa]  from fa::@6
+  to:fa::@16
+fa::@16: scope:[fa]  from fa::@6
   [91] (byte) bc#111 ← ++ (byte) bc#45
   [92] (byte~) bc#180 ← (byte) bc#111
   [93] call fb 
   to:fa::@7
-fa::@7: scope:[fa]  from fa::@17 fa::@6
-  [94] (byte) be#114 ← phi( fa::@17/(byte) be#35 fa::@6/(byte) be#113 )
-  [94] (byte) bd#102 ← phi( fa::@17/(byte) bd#35 fa::@6/(byte) bd#101 )
-  [94] (byte) bc#46 ← phi( fa::@17/(byte) bc#111 fa::@6/(byte) bc#45 )
+fa::@7: scope:[fa]  from fa::@16 fa::@6
+  [94] (byte) be#114 ← phi( fa::@16/(byte) be#35 fa::@6/(byte) be#113 )
+  [94] (byte) bd#102 ← phi( fa::@16/(byte) bd#35 fa::@6/(byte) bd#101 )
+  [94] (byte) bc#46 ← phi( fa::@16/(byte) bc#111 fa::@6/(byte) bc#45 )
   [95] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto fa::@8
-  to:fa::@18
-fa::@18: scope:[fa]  from fa::@7
+  to:fa::@17
+fa::@17: scope:[fa]  from fa::@7
   [96] (byte) bc#112 ← ++ (byte) bc#46
   [97] (byte~) bc#181 ← (byte) bc#112
   [98] call fb 
   to:fa::@8
-fa::@8: scope:[fa]  from fa::@18 fa::@7
-  [99] (byte) be#115 ← phi( fa::@18/(byte) be#35 fa::@7/(byte) be#114 )
-  [99] (byte) bd#103 ← phi( fa::@18/(byte) bd#35 fa::@7/(byte) bd#102 )
-  [99] (byte) bc#47 ← phi( fa::@18/(byte) bc#112 fa::@7/(byte) bc#46 )
+fa::@8: scope:[fa]  from fa::@17 fa::@7
+  [99] (byte) be#115 ← phi( fa::@17/(byte) be#35 fa::@7/(byte) be#114 )
+  [99] (byte) bd#103 ← phi( fa::@17/(byte) bd#35 fa::@7/(byte) bd#102 )
+  [99] (byte) bc#47 ← phi( fa::@17/(byte) bc#112 fa::@7/(byte) bc#46 )
   [100] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto fa::@9
-  to:fa::@19
-fa::@19: scope:[fa]  from fa::@8
+  to:fa::@18
+fa::@18: scope:[fa]  from fa::@8
   [101] (byte) bc#123 ← ++ (byte) bc#47
   [102] (byte~) bc#182 ← (byte) bc#123
   [103] call fb 
   to:fa::@9
-fa::@9: scope:[fa]  from fa::@19 fa::@8
-  [104] (byte) be#116 ← phi( fa::@19/(byte) be#35 fa::@8/(byte) be#115 )
-  [104] (byte) bd#104 ← phi( fa::@19/(byte) bd#35 fa::@8/(byte) bd#103 )
-  [104] (byte) bc#113 ← phi( fa::@19/(byte) bc#123 fa::@8/(byte) bc#47 )
+fa::@9: scope:[fa]  from fa::@18 fa::@8
+  [104] (byte) be#116 ← phi( fa::@18/(byte) be#35 fa::@8/(byte) be#115 )
+  [104] (byte) bd#104 ← phi( fa::@18/(byte) bd#35 fa::@8/(byte) bd#103 )
+  [104] (byte) bc#113 ← phi( fa::@18/(byte) bc#123 fa::@8/(byte) bc#47 )
   [105] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fa::@return
-  to:fa::@20
-fa::@20: scope:[fa]  from fa::@9
+  to:fa::@19
+fa::@19: scope:[fa]  from fa::@9
   [106] phi()
   [107] call fb 
   to:fa::@return
-fa::@return: scope:[fa]  from fa::@20 fa::@9
-  [108] (byte) be#24 ← phi( fa::@9/(byte) be#116 fa::@20/(byte) be#35 )
-  [108] (byte) bd#24 ← phi( fa::@9/(byte) bd#104 fa::@20/(byte) bd#35 )
-  [108] (byte) bc#24 ← phi( fa::@9/(byte) bc#113 fa::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fa::@return: scope:[fa]  from fa::@19 fa::@9
+  [108] (byte) be#24 ← phi( fa::@9/(byte) be#116 fa::@19/(byte) be#35 )
+  [108] (byte) bd#24 ← phi( fa::@9/(byte) bd#104 fa::@19/(byte) bd#35 )
+  [108] (byte) bc#24 ← phi( fa::@9/(byte) bc#113 fa::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [109] return 
   to:@return
-fb: scope:[fb]  from fa::@11 fa::@12 fa::@13 fa::@14 fa::@15 fa::@16 fa::@17 fa::@18 fa::@19 fa::@20
-  [110] (byte) be#118 ← phi( fa::@11/(byte) be#107 fa::@12/(byte) be#108 fa::@13/(byte) be#109 fa::@14/(byte) be#110 fa::@15/(byte) be#111 fa::@16/(byte) be#112 fa::@17/(byte) be#113 fa::@18/(byte) be#114 fa::@19/(byte) be#115 fa::@20/(byte) be#116 )
-  [110] (byte) bd#106 ← phi( fa::@11/(byte) bd#138 fa::@12/(byte) bd#139 fa::@13/(byte) bd#140 fa::@14/(byte) bd#141 fa::@15/(byte) bd#142 fa::@16/(byte) bd#100 fa::@17/(byte) bd#101 fa::@18/(byte) bd#102 fa::@19/(byte) bd#103 fa::@20/(byte) bd#104 )
-  [110] (byte) bc#114 ← phi( fa::@11/(byte~) bc#174 fa::@12/(byte~) bc#175 fa::@13/(byte~) bc#176 fa::@14/(byte~) bc#177 fa::@15/(byte~) bc#178 fa::@16/(byte~) bc#179 fa::@17/(byte~) bc#180 fa::@18/(byte~) bc#181 fa::@19/(byte~) bc#182 fa::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fb: scope:[fb]  from fa::@10 fa::@11 fa::@12 fa::@13 fa::@14 fa::@15 fa::@16 fa::@17 fa::@18 fa::@19
+  [110] (byte) be#118 ← phi( fa::@10/(byte) be#107 fa::@11/(byte) be#108 fa::@12/(byte) be#109 fa::@13/(byte) be#110 fa::@14/(byte) be#111 fa::@15/(byte) be#112 fa::@16/(byte) be#113 fa::@17/(byte) be#114 fa::@18/(byte) be#115 fa::@19/(byte) be#116 )
+  [110] (byte) bd#106 ← phi( fa::@10/(byte) bd#138 fa::@11/(byte) bd#139 fa::@12/(byte) bd#140 fa::@13/(byte) bd#141 fa::@14/(byte) bd#142 fa::@15/(byte) bd#100 fa::@16/(byte) bd#101 fa::@17/(byte) bd#102 fa::@18/(byte) bd#103 fa::@19/(byte) bd#104 )
+  [110] (byte) bc#114 ← phi( fa::@10/(byte~) bc#174 fa::@11/(byte~) bc#175 fa::@12/(byte~) bc#176 fa::@13/(byte~) bc#177 fa::@14/(byte~) bc#178 fa::@15/(byte~) bc#179 fa::@16/(byte~) bc#180 fa::@17/(byte~) bc#181 fa::@18/(byte~) bc#182 fa::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [111] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto fb::@1
-  to:fb::@11
-fb::@11: scope:[fb]  from fb
+  to:fb::@10
+fb::@10: scope:[fb]  from fb
   [112] (byte) bd#148 ← ++ (byte) bd#106
   [113] (byte~) bd#238 ← (byte) bd#148
   [114] call fc 
   to:fb::@1
-fb::@1: scope:[fb]  from fb fb::@11
-  [115] (byte) be#119 ← phi( fb/(byte) be#118 fb::@11/(byte) be#46 )
-  [115] (byte) bd#107 ← phi( fb/(byte) bd#106 fb::@11/(byte) bd#148 )
+fb::@1: scope:[fb]  from fb fb::@10
+  [115] (byte) be#119 ← phi( fb/(byte) be#118 fb::@10/(byte) be#46 )
+  [115] (byte) bd#107 ← phi( fb/(byte) bd#106 fb::@10/(byte) bd#148 )
   [116] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto fb::@2
-  to:fb::@12
-fb::@12: scope:[fb]  from fb::@1
+  to:fb::@11
+fb::@11: scope:[fb]  from fb::@1
   [117] (byte) bd#149 ← ++ (byte) bd#107
   [118] (byte~) bd#239 ← (byte) bd#149
   [119] call fc 
   to:fb::@2
-fb::@2: scope:[fb]  from fb::@1 fb::@12
-  [120] (byte) be#120 ← phi( fb::@1/(byte) be#119 fb::@12/(byte) be#46 )
-  [120] (byte) bd#108 ← phi( fb::@1/(byte) bd#107 fb::@12/(byte) bd#149 )
+fb::@2: scope:[fb]  from fb::@1 fb::@11
+  [120] (byte) be#120 ← phi( fb::@1/(byte) be#119 fb::@11/(byte) be#46 )
+  [120] (byte) bd#108 ← phi( fb::@1/(byte) bd#107 fb::@11/(byte) bd#149 )
   [121] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto fb::@3
-  to:fb::@13
-fb::@13: scope:[fb]  from fb::@2
+  to:fb::@12
+fb::@12: scope:[fb]  from fb::@2
   [122] (byte) bd#150 ← ++ (byte) bd#108
   [123] (byte~) bd#240 ← (byte) bd#150
   [124] call fc 
   to:fb::@3
-fb::@3: scope:[fb]  from fb::@13 fb::@2
-  [125] (byte) be#121 ← phi( fb::@2/(byte) be#120 fb::@13/(byte) be#46 )
-  [125] (byte) bd#109 ← phi( fb::@2/(byte) bd#108 fb::@13/(byte) bd#150 )
+fb::@3: scope:[fb]  from fb::@12 fb::@2
+  [125] (byte) be#121 ← phi( fb::@2/(byte) be#120 fb::@12/(byte) be#46 )
+  [125] (byte) bd#109 ← phi( fb::@2/(byte) bd#108 fb::@12/(byte) bd#150 )
   [126] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto fb::@4
-  to:fb::@14
-fb::@14: scope:[fb]  from fb::@3
+  to:fb::@13
+fb::@13: scope:[fb]  from fb::@3
   [127] (byte) bd#151 ← ++ (byte) bd#109
   [128] (byte~) bd#241 ← (byte) bd#151
   [129] call fc 
   to:fb::@4
-fb::@4: scope:[fb]  from fb::@14 fb::@3
-  [130] (byte) be#122 ← phi( fb::@14/(byte) be#46 fb::@3/(byte) be#121 )
-  [130] (byte) bd#110 ← phi( fb::@14/(byte) bd#151 fb::@3/(byte) bd#109 )
+fb::@4: scope:[fb]  from fb::@13 fb::@3
+  [130] (byte) be#122 ← phi( fb::@13/(byte) be#46 fb::@3/(byte) be#121 )
+  [130] (byte) bd#110 ← phi( fb::@13/(byte) bd#151 fb::@3/(byte) bd#109 )
   [131] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto fb::@5
-  to:fb::@15
-fb::@15: scope:[fb]  from fb::@4
+  to:fb::@14
+fb::@14: scope:[fb]  from fb::@4
   [132] (byte) bd#152 ← ++ (byte) bd#110
   [133] (byte~) bd#242 ← (byte) bd#152
   [134] call fc 
   to:fb::@5
-fb::@5: scope:[fb]  from fb::@15 fb::@4
-  [135] (byte) be#123 ← phi( fb::@15/(byte) be#46 fb::@4/(byte) be#122 )
-  [135] (byte) bd#111 ← phi( fb::@15/(byte) bd#152 fb::@4/(byte) bd#110 )
+fb::@5: scope:[fb]  from fb::@14 fb::@4
+  [135] (byte) be#123 ← phi( fb::@14/(byte) be#46 fb::@4/(byte) be#122 )
+  [135] (byte) bd#111 ← phi( fb::@14/(byte) bd#152 fb::@4/(byte) bd#110 )
   [136] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto fb::@6
-  to:fb::@16
-fb::@16: scope:[fb]  from fb::@5
+  to:fb::@15
+fb::@15: scope:[fb]  from fb::@5
   [137] (byte) bd#153 ← ++ (byte) bd#111
   [138] (byte~) bd#243 ← (byte) bd#153
   [139] call fc 
   to:fb::@6
-fb::@6: scope:[fb]  from fb::@16 fb::@5
-  [140] (byte) be#124 ← phi( fb::@16/(byte) be#46 fb::@5/(byte) be#123 )
-  [140] (byte) bd#112 ← phi( fb::@16/(byte) bd#153 fb::@5/(byte) bd#111 )
+fb::@6: scope:[fb]  from fb::@15 fb::@5
+  [140] (byte) be#124 ← phi( fb::@15/(byte) be#46 fb::@5/(byte) be#123 )
+  [140] (byte) bd#112 ← phi( fb::@15/(byte) bd#153 fb::@5/(byte) bd#111 )
   [141] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto fb::@7
-  to:fb::@17
-fb::@17: scope:[fb]  from fb::@6
+  to:fb::@16
+fb::@16: scope:[fb]  from fb::@6
   [142] (byte) bd#154 ← ++ (byte) bd#112
   [143] (byte~) bd#244 ← (byte) bd#154
   [144] call fc 
   to:fb::@7
-fb::@7: scope:[fb]  from fb::@17 fb::@6
-  [145] (byte) be#125 ← phi( fb::@17/(byte) be#46 fb::@6/(byte) be#124 )
-  [145] (byte) bd#113 ← phi( fb::@17/(byte) bd#154 fb::@6/(byte) bd#112 )
+fb::@7: scope:[fb]  from fb::@16 fb::@6
+  [145] (byte) be#125 ← phi( fb::@16/(byte) be#46 fb::@6/(byte) be#124 )
+  [145] (byte) bd#113 ← phi( fb::@16/(byte) bd#154 fb::@6/(byte) bd#112 )
   [146] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto fb::@8
-  to:fb::@18
-fb::@18: scope:[fb]  from fb::@7
+  to:fb::@17
+fb::@17: scope:[fb]  from fb::@7
   [147] (byte) bd#155 ← ++ (byte) bd#113
   [148] (byte~) bd#245 ← (byte) bd#155
   [149] call fc 
   to:fb::@8
-fb::@8: scope:[fb]  from fb::@18 fb::@7
-  [150] (byte) be#126 ← phi( fb::@18/(byte) be#46 fb::@7/(byte) be#125 )
-  [150] (byte) bd#114 ← phi( fb::@18/(byte) bd#155 fb::@7/(byte) bd#113 )
+fb::@8: scope:[fb]  from fb::@17 fb::@7
+  [150] (byte) be#126 ← phi( fb::@17/(byte) be#46 fb::@7/(byte) be#125 )
+  [150] (byte) bd#114 ← phi( fb::@17/(byte) bd#155 fb::@7/(byte) bd#113 )
   [151] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto fb::@9
-  to:fb::@19
-fb::@19: scope:[fb]  from fb::@8
+  to:fb::@18
+fb::@18: scope:[fb]  from fb::@8
   [152] (byte) bd#157 ← ++ (byte) bd#114
   [153] (byte~) bd#246 ← (byte) bd#157
   [154] call fc 
   to:fb::@9
-fb::@9: scope:[fb]  from fb::@19 fb::@8
-  [155] (byte) be#127 ← phi( fb::@19/(byte) be#46 fb::@8/(byte) be#126 )
-  [155] (byte) bd#115 ← phi( fb::@19/(byte) bd#157 fb::@8/(byte) bd#114 )
+fb::@9: scope:[fb]  from fb::@18 fb::@8
+  [155] (byte) be#127 ← phi( fb::@18/(byte) be#46 fb::@8/(byte) be#126 )
+  [155] (byte) bd#115 ← phi( fb::@18/(byte) bd#157 fb::@8/(byte) bd#114 )
   [156] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fb::@return
-  to:fb::@20
-fb::@20: scope:[fb]  from fb::@9
+  to:fb::@19
+fb::@19: scope:[fb]  from fb::@9
   [157] phi()
   [158] call fc 
   to:fb::@return
-fb::@return: scope:[fb]  from fb::@20 fb::@9
-  [159] (byte) be#35 ← phi( fb::@9/(byte) be#127 fb::@20/(byte) be#46 )
-  [159] (byte) bd#35 ← phi( fb::@9/(byte) bd#115 fb::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fb::@return: scope:[fb]  from fb::@19 fb::@9
+  [159] (byte) be#35 ← phi( fb::@9/(byte) be#127 fb::@19/(byte) be#46 )
+  [159] (byte) bd#35 ← phi( fb::@9/(byte) bd#115 fb::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [160] return 
   to:@return
-fc: scope:[fc]  from fb::@11 fb::@12 fb::@13 fb::@14 fb::@15 fb::@16 fb::@17 fb::@18 fb::@19 fb::@20
-  [161] (byte) be#129 ← phi( fb::@11/(byte) be#118 fb::@12/(byte) be#119 fb::@13/(byte) be#120 fb::@14/(byte) be#121 fb::@15/(byte) be#122 fb::@16/(byte) be#123 fb::@17/(byte) be#124 fb::@18/(byte) be#125 fb::@19/(byte) be#126 fb::@20/(byte) be#127 )
-  [161] (byte) bd#117 ← phi( fb::@11/(byte~) bd#238 fb::@12/(byte~) bd#239 fb::@13/(byte~) bd#240 fb::@14/(byte~) bd#241 fb::@15/(byte~) bd#242 fb::@16/(byte~) bd#243 fb::@17/(byte~) bd#244 fb::@18/(byte~) bd#245 fb::@19/(byte~) bd#246 fb::@20/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fc: scope:[fc]  from fb::@10 fb::@11 fb::@12 fb::@13 fb::@14 fb::@15 fb::@16 fb::@17 fb::@18 fb::@19
+  [161] (byte) be#129 ← phi( fb::@10/(byte) be#118 fb::@11/(byte) be#119 fb::@12/(byte) be#120 fb::@13/(byte) be#121 fb::@14/(byte) be#122 fb::@15/(byte) be#123 fb::@16/(byte) be#124 fb::@17/(byte) be#125 fb::@18/(byte) be#126 fb::@19/(byte) be#127 )
+  [161] (byte) bd#117 ← phi( fb::@10/(byte~) bd#238 fb::@11/(byte~) bd#239 fb::@12/(byte~) bd#240 fb::@13/(byte~) bd#241 fb::@14/(byte~) bd#242 fb::@15/(byte~) bd#243 fb::@16/(byte~) bd#244 fb::@17/(byte~) bd#245 fb::@18/(byte~) bd#246 fb::@19/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [162] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto fc::@1
-  to:fc::@11
-fc::@11: scope:[fc]  from fc
+  to:fc::@10
+fc::@10: scope:[fc]  from fc
   [163] (byte) be#36 ← ++ (byte) be#129
   to:fc::@1
-fc::@1: scope:[fc]  from fc fc::@11
-  [164] (byte) be#130 ← phi( fc/(byte) be#129 fc::@11/(byte) be#36 )
+fc::@1: scope:[fc]  from fc fc::@10
+  [164] (byte) be#130 ← phi( fc/(byte) be#129 fc::@10/(byte) be#36 )
   [165] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto fc::@2
-  to:fc::@12
-fc::@12: scope:[fc]  from fc::@1
+  to:fc::@11
+fc::@11: scope:[fc]  from fc::@1
   [166] (byte) be#37 ← ++ (byte) be#130
   to:fc::@2
-fc::@2: scope:[fc]  from fc::@1 fc::@12
-  [167] (byte) be#131 ← phi( fc::@1/(byte) be#130 fc::@12/(byte) be#37 )
+fc::@2: scope:[fc]  from fc::@1 fc::@11
+  [167] (byte) be#131 ← phi( fc::@1/(byte) be#130 fc::@11/(byte) be#37 )
   [168] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto fc::@3
-  to:fc::@13
-fc::@13: scope:[fc]  from fc::@2
+  to:fc::@12
+fc::@12: scope:[fc]  from fc::@2
   [169] (byte) be#38 ← ++ (byte) be#131
   to:fc::@3
-fc::@3: scope:[fc]  from fc::@13 fc::@2
-  [170] (byte) be#132 ← phi( fc::@13/(byte) be#38 fc::@2/(byte) be#131 )
+fc::@3: scope:[fc]  from fc::@12 fc::@2
+  [170] (byte) be#132 ← phi( fc::@12/(byte) be#38 fc::@2/(byte) be#131 )
   [171] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto fc::@4
-  to:fc::@14
-fc::@14: scope:[fc]  from fc::@3
+  to:fc::@13
+fc::@13: scope:[fc]  from fc::@3
   [172] (byte) be#39 ← ++ (byte) be#132
   to:fc::@4
-fc::@4: scope:[fc]  from fc::@14 fc::@3
-  [173] (byte) be#133 ← phi( fc::@14/(byte) be#39 fc::@3/(byte) be#132 )
+fc::@4: scope:[fc]  from fc::@13 fc::@3
+  [173] (byte) be#133 ← phi( fc::@13/(byte) be#39 fc::@3/(byte) be#132 )
   [174] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto fc::@5
-  to:fc::@15
-fc::@15: scope:[fc]  from fc::@4
+  to:fc::@14
+fc::@14: scope:[fc]  from fc::@4
   [175] (byte) be#40 ← ++ (byte) be#133
   to:fc::@5
-fc::@5: scope:[fc]  from fc::@15 fc::@4
-  [176] (byte) be#134 ← phi( fc::@15/(byte) be#40 fc::@4/(byte) be#133 )
+fc::@5: scope:[fc]  from fc::@14 fc::@4
+  [176] (byte) be#134 ← phi( fc::@14/(byte) be#40 fc::@4/(byte) be#133 )
   [177] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto fc::@6
-  to:fc::@16
-fc::@16: scope:[fc]  from fc::@5
+  to:fc::@15
+fc::@15: scope:[fc]  from fc::@5
   [178] (byte) be#41 ← ++ (byte) be#134
   to:fc::@6
-fc::@6: scope:[fc]  from fc::@16 fc::@5
-  [179] (byte) be#135 ← phi( fc::@16/(byte) be#41 fc::@5/(byte) be#134 )
+fc::@6: scope:[fc]  from fc::@15 fc::@5
+  [179] (byte) be#135 ← phi( fc::@15/(byte) be#41 fc::@5/(byte) be#134 )
   [180] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto fc::@7
-  to:fc::@17
-fc::@17: scope:[fc]  from fc::@6
+  to:fc::@16
+fc::@16: scope:[fc]  from fc::@6
   [181] (byte) be#42 ← ++ (byte) be#135
   to:fc::@7
-fc::@7: scope:[fc]  from fc::@17 fc::@6
-  [182] (byte) be#136 ← phi( fc::@17/(byte) be#42 fc::@6/(byte) be#135 )
+fc::@7: scope:[fc]  from fc::@16 fc::@6
+  [182] (byte) be#136 ← phi( fc::@16/(byte) be#42 fc::@6/(byte) be#135 )
   [183] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto fc::@8
-  to:fc::@18
-fc::@18: scope:[fc]  from fc::@7
+  to:fc::@17
+fc::@17: scope:[fc]  from fc::@7
   [184] (byte) be#43 ← ++ (byte) be#136
   to:fc::@8
-fc::@8: scope:[fc]  from fc::@18 fc::@7
-  [185] (byte) be#137 ← phi( fc::@18/(byte) be#43 fc::@7/(byte) be#136 )
+fc::@8: scope:[fc]  from fc::@17 fc::@7
+  [185] (byte) be#137 ← phi( fc::@17/(byte) be#43 fc::@7/(byte) be#136 )
   [186] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto fc::@9
-  to:fc::@19
-fc::@19: scope:[fc]  from fc::@8
+  to:fc::@18
+fc::@18: scope:[fc]  from fc::@8
   [187] (byte) be#44 ← ++ (byte) be#137
   to:fc::@9
-fc::@9: scope:[fc]  from fc::@19 fc::@8
-  [188] (byte) be#138 ← phi( fc::@19/(byte) be#44 fc::@8/(byte) be#137 )
-  [189] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fc::@30
+fc::@9: scope:[fc]  from fc::@18 fc::@8
+  [188] (byte) be#138 ← phi( fc::@18/(byte) be#44 fc::@8/(byte) be#137 )
+  [189] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fc::@19
   to:fc::@return
-fc::@return: scope:[fc]  from fc::@30 fc::@9
-  [190] (byte) be#46 ← phi( fc::@30/(byte) be#138 fc::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+fc::@return: scope:[fc]  from fc::@19 fc::@9
+  [190] (byte) be#46 ← phi( fc::@19/(byte) be#138 fc::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [191] return 
   to:@return
-fc::@30: scope:[fc]  from fc::@9
+fc::@19: scope:[fc]  from fc::@9
   [192] phi()
   to:fc::@return
 
@@ -3367,17 +3409,17 @@ INITIAL ASM
   .label bd_246 = 8
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-main_from_b5:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3410,18 +3452,18 @@ main: {
   b2:
   //SEG20 [7] call f0 
     jsr f0
-    jmp b7
-  //SEG21 main::@7
-  b7:
+    jmp b3
+  //SEG21 main::@3
+  b3:
   //SEG22 [8] (byte) ba#1 ← ++ (byte) ba#17 -- vbuz1=_inc_vbuz1 
     inc ba
-  //SEG23 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG24 [5] phi (byte) ba#17 = (byte) ba#1 [phi:main::@7->main::@1#0] -- register_copy 
-  //SEG25 [5] phi (byte) be#2 = (byte) be#13 [phi:main::@7->main::@1#1] -- register_copy 
-  //SEG26 [5] phi (byte) bd#2 = (byte) bd#13 [phi:main::@7->main::@1#2] -- register_copy 
-  //SEG27 [5] phi (byte) bc#2 = (byte) bc#13 [phi:main::@7->main::@1#3] -- register_copy 
-  //SEG28 [5] phi (byte) bb#16 = (byte) bb#13 [phi:main::@7->main::@1#4] -- register_copy 
+  //SEG23 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG24 [5] phi (byte) ba#17 = (byte) ba#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG25 [5] phi (byte) be#2 = (byte) be#13 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG26 [5] phi (byte) bd#2 = (byte) bd#13 [phi:main::@3->main::@1#2] -- register_copy 
+  //SEG27 [5] phi (byte) bc#2 = (byte) bc#13 [phi:main::@3->main::@1#3] -- register_copy 
+  //SEG28 [5] phi (byte) bb#16 = (byte) bb#13 [phi:main::@3->main::@1#4] -- register_copy 
     jmp b1
 }
 //SEG29 f0
@@ -3430,29 +3472,29 @@ f0: {
     lda ba
     cmp #0
     bne b1_from_f0
-    jmp b11
-  //SEG31 f0::@11
-  b11:
+    jmp b10
+  //SEG31 f0::@10
+  b10:
   //SEG32 [10] (byte) bb#3 ← ++ (byte) bb#16 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG33 [11] (byte~) bb#101 ← (byte) bb#3 -- vbuz1=vbuz2 
     lda bb
     sta bb_101
   //SEG34 [12] call fa 
-  //SEG35 [59] phi from f0::@11 to fa [phi:f0::@11->fa]
-  fa_from_b11:
-  //SEG36 [59] phi (byte) be#107 = (byte) be#2 [phi:f0::@11->fa#0] -- register_copy 
-  //SEG37 [59] phi (byte) bd#138 = (byte) bd#2 [phi:f0::@11->fa#1] -- register_copy 
-  //SEG38 [59] phi (byte) bc#39 = (byte) bc#2 [phi:f0::@11->fa#2] -- register_copy 
-  //SEG39 [59] phi (byte) bb#27 = (byte~) bb#101 [phi:f0::@11->fa#3] -- register_copy 
+  //SEG35 [59] phi from f0::@10 to fa [phi:f0::@10->fa]
+  fa_from_b10:
+  //SEG36 [59] phi (byte) be#107 = (byte) be#2 [phi:f0::@10->fa#0] -- register_copy 
+  //SEG37 [59] phi (byte) bd#138 = (byte) bd#2 [phi:f0::@10->fa#1] -- register_copy 
+  //SEG38 [59] phi (byte) bc#39 = (byte) bc#2 [phi:f0::@10->fa#2] -- register_copy 
+  //SEG39 [59] phi (byte) bb#27 = (byte~) bb#101 [phi:f0::@10->fa#3] -- register_copy 
     jsr fa
-  //SEG40 [13] phi from f0 f0::@11 to f0::@1 [phi:f0/f0::@11->f0::@1]
+  //SEG40 [13] phi from f0 f0::@10 to f0::@1 [phi:f0/f0::@10->f0::@1]
   b1_from_f0:
-  b1_from_b11:
-  //SEG41 [13] phi (byte) be#142 = (byte) be#2 [phi:f0/f0::@11->f0::@1#0] -- register_copy 
-  //SEG42 [13] phi (byte) bd#129 = (byte) bd#2 [phi:f0/f0::@11->f0::@1#1] -- register_copy 
-  //SEG43 [13] phi (byte) bc#63 = (byte) bc#2 [phi:f0/f0::@11->f0::@1#2] -- register_copy 
-  //SEG44 [13] phi (byte) bb#18 = (byte) bb#16 [phi:f0/f0::@11->f0::@1#3] -- register_copy 
+  b1_from_b10:
+  //SEG41 [13] phi (byte) be#142 = (byte) be#2 [phi:f0/f0::@10->f0::@1#0] -- register_copy 
+  //SEG42 [13] phi (byte) bd#129 = (byte) bd#2 [phi:f0/f0::@10->f0::@1#1] -- register_copy 
+  //SEG43 [13] phi (byte) bc#63 = (byte) bc#2 [phi:f0/f0::@10->f0::@1#2] -- register_copy 
+  //SEG44 [13] phi (byte) bb#18 = (byte) bb#16 [phi:f0/f0::@10->f0::@1#3] -- register_copy 
     jmp b1
   //SEG45 f0::@1
   b1:
@@ -3460,29 +3502,29 @@ f0: {
     lda #1
     cmp ba
     bne b2_from_b1
-    jmp b12
-  //SEG47 f0::@12
-  b12:
+    jmp b11
+  //SEG47 f0::@11
+  b11:
   //SEG48 [15] (byte) bb#4 ← ++ (byte) bb#18 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG49 [16] (byte~) bb#102 ← (byte) bb#4 -- vbuz1=vbuz2 
     lda bb
     sta bb_102
   //SEG50 [17] call fa 
-  //SEG51 [59] phi from f0::@12 to fa [phi:f0::@12->fa]
-  fa_from_b12:
-  //SEG52 [59] phi (byte) be#107 = (byte) be#142 [phi:f0::@12->fa#0] -- register_copy 
-  //SEG53 [59] phi (byte) bd#138 = (byte) bd#129 [phi:f0::@12->fa#1] -- register_copy 
-  //SEG54 [59] phi (byte) bc#39 = (byte) bc#63 [phi:f0::@12->fa#2] -- register_copy 
-  //SEG55 [59] phi (byte) bb#27 = (byte~) bb#102 [phi:f0::@12->fa#3] -- register_copy 
+  //SEG51 [59] phi from f0::@11 to fa [phi:f0::@11->fa]
+  fa_from_b11:
+  //SEG52 [59] phi (byte) be#107 = (byte) be#142 [phi:f0::@11->fa#0] -- register_copy 
+  //SEG53 [59] phi (byte) bd#138 = (byte) bd#129 [phi:f0::@11->fa#1] -- register_copy 
+  //SEG54 [59] phi (byte) bc#39 = (byte) bc#63 [phi:f0::@11->fa#2] -- register_copy 
+  //SEG55 [59] phi (byte) bb#27 = (byte~) bb#102 [phi:f0::@11->fa#3] -- register_copy 
     jsr fa
-  //SEG56 [18] phi from f0::@1 f0::@12 to f0::@2 [phi:f0::@1/f0::@12->f0::@2]
+  //SEG56 [18] phi from f0::@1 f0::@11 to f0::@2 [phi:f0::@1/f0::@11->f0::@2]
   b2_from_b1:
-  b2_from_b12:
-  //SEG57 [18] phi (byte) be#143 = (byte) be#142 [phi:f0::@1/f0::@12->f0::@2#0] -- register_copy 
-  //SEG58 [18] phi (byte) bd#130 = (byte) bd#129 [phi:f0::@1/f0::@12->f0::@2#1] -- register_copy 
-  //SEG59 [18] phi (byte) bc#64 = (byte) bc#63 [phi:f0::@1/f0::@12->f0::@2#2] -- register_copy 
-  //SEG60 [18] phi (byte) bb#19 = (byte) bb#18 [phi:f0::@1/f0::@12->f0::@2#3] -- register_copy 
+  b2_from_b11:
+  //SEG57 [18] phi (byte) be#143 = (byte) be#142 [phi:f0::@1/f0::@11->f0::@2#0] -- register_copy 
+  //SEG58 [18] phi (byte) bd#130 = (byte) bd#129 [phi:f0::@1/f0::@11->f0::@2#1] -- register_copy 
+  //SEG59 [18] phi (byte) bc#64 = (byte) bc#63 [phi:f0::@1/f0::@11->f0::@2#2] -- register_copy 
+  //SEG60 [18] phi (byte) bb#19 = (byte) bb#18 [phi:f0::@1/f0::@11->f0::@2#3] -- register_copy 
     jmp b2
   //SEG61 f0::@2
   b2:
@@ -3490,29 +3532,29 @@ f0: {
     lda #2
     cmp ba
     bne b3_from_b2
-    jmp b13
-  //SEG63 f0::@13
-  b13:
+    jmp b12
+  //SEG63 f0::@12
+  b12:
   //SEG64 [20] (byte) bb#5 ← ++ (byte) bb#19 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG65 [21] (byte~) bb#103 ← (byte) bb#5 -- vbuz1=vbuz2 
     lda bb
     sta bb_103
   //SEG66 [22] call fa 
-  //SEG67 [59] phi from f0::@13 to fa [phi:f0::@13->fa]
-  fa_from_b13:
-  //SEG68 [59] phi (byte) be#107 = (byte) be#143 [phi:f0::@13->fa#0] -- register_copy 
-  //SEG69 [59] phi (byte) bd#138 = (byte) bd#130 [phi:f0::@13->fa#1] -- register_copy 
-  //SEG70 [59] phi (byte) bc#39 = (byte) bc#64 [phi:f0::@13->fa#2] -- register_copy 
-  //SEG71 [59] phi (byte) bb#27 = (byte~) bb#103 [phi:f0::@13->fa#3] -- register_copy 
+  //SEG67 [59] phi from f0::@12 to fa [phi:f0::@12->fa]
+  fa_from_b12:
+  //SEG68 [59] phi (byte) be#107 = (byte) be#143 [phi:f0::@12->fa#0] -- register_copy 
+  //SEG69 [59] phi (byte) bd#138 = (byte) bd#130 [phi:f0::@12->fa#1] -- register_copy 
+  //SEG70 [59] phi (byte) bc#39 = (byte) bc#64 [phi:f0::@12->fa#2] -- register_copy 
+  //SEG71 [59] phi (byte) bb#27 = (byte~) bb#103 [phi:f0::@12->fa#3] -- register_copy 
     jsr fa
-  //SEG72 [23] phi from f0::@13 f0::@2 to f0::@3 [phi:f0::@13/f0::@2->f0::@3]
-  b3_from_b13:
+  //SEG72 [23] phi from f0::@12 f0::@2 to f0::@3 [phi:f0::@12/f0::@2->f0::@3]
+  b3_from_b12:
   b3_from_b2:
-  //SEG73 [23] phi (byte) be#144 = (byte) be#24 [phi:f0::@13/f0::@2->f0::@3#0] -- register_copy 
-  //SEG74 [23] phi (byte) bd#131 = (byte) bd#24 [phi:f0::@13/f0::@2->f0::@3#1] -- register_copy 
-  //SEG75 [23] phi (byte) bc#65 = (byte) bc#24 [phi:f0::@13/f0::@2->f0::@3#2] -- register_copy 
-  //SEG76 [23] phi (byte) bb#20 = (byte) bb#5 [phi:f0::@13/f0::@2->f0::@3#3] -- register_copy 
+  //SEG73 [23] phi (byte) be#144 = (byte) be#24 [phi:f0::@12/f0::@2->f0::@3#0] -- register_copy 
+  //SEG74 [23] phi (byte) bd#131 = (byte) bd#24 [phi:f0::@12/f0::@2->f0::@3#1] -- register_copy 
+  //SEG75 [23] phi (byte) bc#65 = (byte) bc#24 [phi:f0::@12/f0::@2->f0::@3#2] -- register_copy 
+  //SEG76 [23] phi (byte) bb#20 = (byte) bb#5 [phi:f0::@12/f0::@2->f0::@3#3] -- register_copy 
     jmp b3
   //SEG77 f0::@3
   b3:
@@ -3520,29 +3562,29 @@ f0: {
     lda #3
     cmp ba
     bne b4_from_b3
-    jmp b14
-  //SEG79 f0::@14
-  b14:
+    jmp b13
+  //SEG79 f0::@13
+  b13:
   //SEG80 [25] (byte) bb#6 ← ++ (byte) bb#20 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG81 [26] (byte~) bb#104 ← (byte) bb#6 -- vbuz1=vbuz2 
     lda bb
     sta bb_104
   //SEG82 [27] call fa 
-  //SEG83 [59] phi from f0::@14 to fa [phi:f0::@14->fa]
-  fa_from_b14:
-  //SEG84 [59] phi (byte) be#107 = (byte) be#144 [phi:f0::@14->fa#0] -- register_copy 
-  //SEG85 [59] phi (byte) bd#138 = (byte) bd#131 [phi:f0::@14->fa#1] -- register_copy 
-  //SEG86 [59] phi (byte) bc#39 = (byte) bc#65 [phi:f0::@14->fa#2] -- register_copy 
-  //SEG87 [59] phi (byte) bb#27 = (byte~) bb#104 [phi:f0::@14->fa#3] -- register_copy 
+  //SEG83 [59] phi from f0::@13 to fa [phi:f0::@13->fa]
+  fa_from_b13:
+  //SEG84 [59] phi (byte) be#107 = (byte) be#144 [phi:f0::@13->fa#0] -- register_copy 
+  //SEG85 [59] phi (byte) bd#138 = (byte) bd#131 [phi:f0::@13->fa#1] -- register_copy 
+  //SEG86 [59] phi (byte) bc#39 = (byte) bc#65 [phi:f0::@13->fa#2] -- register_copy 
+  //SEG87 [59] phi (byte) bb#27 = (byte~) bb#104 [phi:f0::@13->fa#3] -- register_copy 
     jsr fa
-  //SEG88 [28] phi from f0::@14 f0::@3 to f0::@4 [phi:f0::@14/f0::@3->f0::@4]
-  b4_from_b14:
+  //SEG88 [28] phi from f0::@13 f0::@3 to f0::@4 [phi:f0::@13/f0::@3->f0::@4]
+  b4_from_b13:
   b4_from_b3:
-  //SEG89 [28] phi (byte) be#100 = (byte) be#24 [phi:f0::@14/f0::@3->f0::@4#0] -- register_copy 
-  //SEG90 [28] phi (byte) bd#132 = (byte) bd#24 [phi:f0::@14/f0::@3->f0::@4#1] -- register_copy 
-  //SEG91 [28] phi (byte) bc#66 = (byte) bc#24 [phi:f0::@14/f0::@3->f0::@4#2] -- register_copy 
-  //SEG92 [28] phi (byte) bb#21 = (byte) bb#6 [phi:f0::@14/f0::@3->f0::@4#3] -- register_copy 
+  //SEG89 [28] phi (byte) be#100 = (byte) be#24 [phi:f0::@13/f0::@3->f0::@4#0] -- register_copy 
+  //SEG90 [28] phi (byte) bd#132 = (byte) bd#24 [phi:f0::@13/f0::@3->f0::@4#1] -- register_copy 
+  //SEG91 [28] phi (byte) bc#66 = (byte) bc#24 [phi:f0::@13/f0::@3->f0::@4#2] -- register_copy 
+  //SEG92 [28] phi (byte) bb#21 = (byte) bb#6 [phi:f0::@13/f0::@3->f0::@4#3] -- register_copy 
     jmp b4
   //SEG93 f0::@4
   b4:
@@ -3550,29 +3592,29 @@ f0: {
     lda #4
     cmp ba
     bne b5_from_b4
-    jmp b15
-  //SEG95 f0::@15
-  b15:
+    jmp b14
+  //SEG95 f0::@14
+  b14:
   //SEG96 [30] (byte) bb#66 ← ++ (byte) bb#21 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG97 [31] (byte~) bb#105 ← (byte) bb#66 -- vbuz1=vbuz2 
     lda bb
     sta bb_105
   //SEG98 [32] call fa 
-  //SEG99 [59] phi from f0::@15 to fa [phi:f0::@15->fa]
-  fa_from_b15:
-  //SEG100 [59] phi (byte) be#107 = (byte) be#100 [phi:f0::@15->fa#0] -- register_copy 
-  //SEG101 [59] phi (byte) bd#138 = (byte) bd#132 [phi:f0::@15->fa#1] -- register_copy 
-  //SEG102 [59] phi (byte) bc#39 = (byte) bc#66 [phi:f0::@15->fa#2] -- register_copy 
-  //SEG103 [59] phi (byte) bb#27 = (byte~) bb#105 [phi:f0::@15->fa#3] -- register_copy 
+  //SEG99 [59] phi from f0::@14 to fa [phi:f0::@14->fa]
+  fa_from_b14:
+  //SEG100 [59] phi (byte) be#107 = (byte) be#100 [phi:f0::@14->fa#0] -- register_copy 
+  //SEG101 [59] phi (byte) bd#138 = (byte) bd#132 [phi:f0::@14->fa#1] -- register_copy 
+  //SEG102 [59] phi (byte) bc#39 = (byte) bc#66 [phi:f0::@14->fa#2] -- register_copy 
+  //SEG103 [59] phi (byte) bb#27 = (byte~) bb#105 [phi:f0::@14->fa#3] -- register_copy 
     jsr fa
-  //SEG104 [33] phi from f0::@15 f0::@4 to f0::@5 [phi:f0::@15/f0::@4->f0::@5]
-  b5_from_b15:
+  //SEG104 [33] phi from f0::@14 f0::@4 to f0::@5 [phi:f0::@14/f0::@4->f0::@5]
+  b5_from_b14:
   b5_from_b4:
-  //SEG105 [33] phi (byte) be#101 = (byte) be#24 [phi:f0::@15/f0::@4->f0::@5#0] -- register_copy 
-  //SEG106 [33] phi (byte) bd#133 = (byte) bd#24 [phi:f0::@15/f0::@4->f0::@5#1] -- register_copy 
-  //SEG107 [33] phi (byte) bc#100 = (byte) bc#24 [phi:f0::@15/f0::@4->f0::@5#2] -- register_copy 
-  //SEG108 [33] phi (byte) bb#22 = (byte) bb#66 [phi:f0::@15/f0::@4->f0::@5#3] -- register_copy 
+  //SEG105 [33] phi (byte) be#101 = (byte) be#24 [phi:f0::@14/f0::@4->f0::@5#0] -- register_copy 
+  //SEG106 [33] phi (byte) bd#133 = (byte) bd#24 [phi:f0::@14/f0::@4->f0::@5#1] -- register_copy 
+  //SEG107 [33] phi (byte) bc#100 = (byte) bc#24 [phi:f0::@14/f0::@4->f0::@5#2] -- register_copy 
+  //SEG108 [33] phi (byte) bb#22 = (byte) bb#66 [phi:f0::@14/f0::@4->f0::@5#3] -- register_copy 
     jmp b5
   //SEG109 f0::@5
   b5:
@@ -3580,29 +3622,29 @@ f0: {
     lda #5
     cmp ba
     bne b6_from_b5
-    jmp b16
-  //SEG111 f0::@16
-  b16:
+    jmp b15
+  //SEG111 f0::@15
+  b15:
   //SEG112 [35] (byte) bb#67 ← ++ (byte) bb#22 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG113 [36] (byte~) bb#106 ← (byte) bb#67 -- vbuz1=vbuz2 
     lda bb
     sta bb_106
   //SEG114 [37] call fa 
-  //SEG115 [59] phi from f0::@16 to fa [phi:f0::@16->fa]
-  fa_from_b16:
-  //SEG116 [59] phi (byte) be#107 = (byte) be#101 [phi:f0::@16->fa#0] -- register_copy 
-  //SEG117 [59] phi (byte) bd#138 = (byte) bd#133 [phi:f0::@16->fa#1] -- register_copy 
-  //SEG118 [59] phi (byte) bc#39 = (byte) bc#100 [phi:f0::@16->fa#2] -- register_copy 
-  //SEG119 [59] phi (byte) bb#27 = (byte~) bb#106 [phi:f0::@16->fa#3] -- register_copy 
+  //SEG115 [59] phi from f0::@15 to fa [phi:f0::@15->fa]
+  fa_from_b15:
+  //SEG116 [59] phi (byte) be#107 = (byte) be#101 [phi:f0::@15->fa#0] -- register_copy 
+  //SEG117 [59] phi (byte) bd#138 = (byte) bd#133 [phi:f0::@15->fa#1] -- register_copy 
+  //SEG118 [59] phi (byte) bc#39 = (byte) bc#100 [phi:f0::@15->fa#2] -- register_copy 
+  //SEG119 [59] phi (byte) bb#27 = (byte~) bb#106 [phi:f0::@15->fa#3] -- register_copy 
     jsr fa
-  //SEG120 [38] phi from f0::@16 f0::@5 to f0::@6 [phi:f0::@16/f0::@5->f0::@6]
-  b6_from_b16:
+  //SEG120 [38] phi from f0::@15 f0::@5 to f0::@6 [phi:f0::@15/f0::@5->f0::@6]
+  b6_from_b15:
   b6_from_b5:
-  //SEG121 [38] phi (byte) be#102 = (byte) be#24 [phi:f0::@16/f0::@5->f0::@6#0] -- register_copy 
-  //SEG122 [38] phi (byte) bd#134 = (byte) bd#24 [phi:f0::@16/f0::@5->f0::@6#1] -- register_copy 
-  //SEG123 [38] phi (byte) bc#101 = (byte) bc#24 [phi:f0::@16/f0::@5->f0::@6#2] -- register_copy 
-  //SEG124 [38] phi (byte) bb#23 = (byte) bb#67 [phi:f0::@16/f0::@5->f0::@6#3] -- register_copy 
+  //SEG121 [38] phi (byte) be#102 = (byte) be#24 [phi:f0::@15/f0::@5->f0::@6#0] -- register_copy 
+  //SEG122 [38] phi (byte) bd#134 = (byte) bd#24 [phi:f0::@15/f0::@5->f0::@6#1] -- register_copy 
+  //SEG123 [38] phi (byte) bc#101 = (byte) bc#24 [phi:f0::@15/f0::@5->f0::@6#2] -- register_copy 
+  //SEG124 [38] phi (byte) bb#23 = (byte) bb#67 [phi:f0::@15/f0::@5->f0::@6#3] -- register_copy 
     jmp b6
   //SEG125 f0::@6
   b6:
@@ -3610,29 +3652,29 @@ f0: {
     lda #6
     cmp ba
     bne b7_from_b6
-    jmp b17
-  //SEG127 f0::@17
-  b17:
+    jmp b16
+  //SEG127 f0::@16
+  b16:
   //SEG128 [40] (byte) bb#68 ← ++ (byte) bb#23 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG129 [41] (byte~) bb#107 ← (byte) bb#68 -- vbuz1=vbuz2 
     lda bb
     sta bb_107
   //SEG130 [42] call fa 
-  //SEG131 [59] phi from f0::@17 to fa [phi:f0::@17->fa]
-  fa_from_b17:
-  //SEG132 [59] phi (byte) be#107 = (byte) be#102 [phi:f0::@17->fa#0] -- register_copy 
-  //SEG133 [59] phi (byte) bd#138 = (byte) bd#134 [phi:f0::@17->fa#1] -- register_copy 
-  //SEG134 [59] phi (byte) bc#39 = (byte) bc#101 [phi:f0::@17->fa#2] -- register_copy 
-  //SEG135 [59] phi (byte) bb#27 = (byte~) bb#107 [phi:f0::@17->fa#3] -- register_copy 
+  //SEG131 [59] phi from f0::@16 to fa [phi:f0::@16->fa]
+  fa_from_b16:
+  //SEG132 [59] phi (byte) be#107 = (byte) be#102 [phi:f0::@16->fa#0] -- register_copy 
+  //SEG133 [59] phi (byte) bd#138 = (byte) bd#134 [phi:f0::@16->fa#1] -- register_copy 
+  //SEG134 [59] phi (byte) bc#39 = (byte) bc#101 [phi:f0::@16->fa#2] -- register_copy 
+  //SEG135 [59] phi (byte) bb#27 = (byte~) bb#107 [phi:f0::@16->fa#3] -- register_copy 
     jsr fa
-  //SEG136 [43] phi from f0::@17 f0::@6 to f0::@7 [phi:f0::@17/f0::@6->f0::@7]
-  b7_from_b17:
+  //SEG136 [43] phi from f0::@16 f0::@6 to f0::@7 [phi:f0::@16/f0::@6->f0::@7]
+  b7_from_b16:
   b7_from_b6:
-  //SEG137 [43] phi (byte) be#103 = (byte) be#24 [phi:f0::@17/f0::@6->f0::@7#0] -- register_copy 
-  //SEG138 [43] phi (byte) bd#135 = (byte) bd#24 [phi:f0::@17/f0::@6->f0::@7#1] -- register_copy 
-  //SEG139 [43] phi (byte) bc#102 = (byte) bc#24 [phi:f0::@17/f0::@6->f0::@7#2] -- register_copy 
-  //SEG140 [43] phi (byte) bb#24 = (byte) bb#68 [phi:f0::@17/f0::@6->f0::@7#3] -- register_copy 
+  //SEG137 [43] phi (byte) be#103 = (byte) be#24 [phi:f0::@16/f0::@6->f0::@7#0] -- register_copy 
+  //SEG138 [43] phi (byte) bd#135 = (byte) bd#24 [phi:f0::@16/f0::@6->f0::@7#1] -- register_copy 
+  //SEG139 [43] phi (byte) bc#102 = (byte) bc#24 [phi:f0::@16/f0::@6->f0::@7#2] -- register_copy 
+  //SEG140 [43] phi (byte) bb#24 = (byte) bb#68 [phi:f0::@16/f0::@6->f0::@7#3] -- register_copy 
     jmp b7
   //SEG141 f0::@7
   b7:
@@ -3640,29 +3682,29 @@ f0: {
     lda #7
     cmp ba
     bne b8_from_b7
-    jmp b18
-  //SEG143 f0::@18
-  b18:
+    jmp b17
+  //SEG143 f0::@17
+  b17:
   //SEG144 [45] (byte) bb#10 ← ++ (byte) bb#24 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG145 [46] (byte~) bb#108 ← (byte) bb#10 -- vbuz1=vbuz2 
     lda bb
     sta bb_108
   //SEG146 [47] call fa 
-  //SEG147 [59] phi from f0::@18 to fa [phi:f0::@18->fa]
-  fa_from_b18:
-  //SEG148 [59] phi (byte) be#107 = (byte) be#103 [phi:f0::@18->fa#0] -- register_copy 
-  //SEG149 [59] phi (byte) bd#138 = (byte) bd#135 [phi:f0::@18->fa#1] -- register_copy 
-  //SEG150 [59] phi (byte) bc#39 = (byte) bc#102 [phi:f0::@18->fa#2] -- register_copy 
-  //SEG151 [59] phi (byte) bb#27 = (byte~) bb#108 [phi:f0::@18->fa#3] -- register_copy 
+  //SEG147 [59] phi from f0::@17 to fa [phi:f0::@17->fa]
+  fa_from_b17:
+  //SEG148 [59] phi (byte) be#107 = (byte) be#103 [phi:f0::@17->fa#0] -- register_copy 
+  //SEG149 [59] phi (byte) bd#138 = (byte) bd#135 [phi:f0::@17->fa#1] -- register_copy 
+  //SEG150 [59] phi (byte) bc#39 = (byte) bc#102 [phi:f0::@17->fa#2] -- register_copy 
+  //SEG151 [59] phi (byte) bb#27 = (byte~) bb#108 [phi:f0::@17->fa#3] -- register_copy 
     jsr fa
-  //SEG152 [48] phi from f0::@18 f0::@7 to f0::@8 [phi:f0::@18/f0::@7->f0::@8]
-  b8_from_b18:
+  //SEG152 [48] phi from f0::@17 f0::@7 to f0::@8 [phi:f0::@17/f0::@7->f0::@8]
+  b8_from_b17:
   b8_from_b7:
-  //SEG153 [48] phi (byte) be#104 = (byte) be#24 [phi:f0::@18/f0::@7->f0::@8#0] -- register_copy 
-  //SEG154 [48] phi (byte) bd#136 = (byte) bd#24 [phi:f0::@18/f0::@7->f0::@8#1] -- register_copy 
-  //SEG155 [48] phi (byte) bc#103 = (byte) bc#24 [phi:f0::@18/f0::@7->f0::@8#2] -- register_copy 
-  //SEG156 [48] phi (byte) bb#25 = (byte) bb#10 [phi:f0::@18/f0::@7->f0::@8#3] -- register_copy 
+  //SEG153 [48] phi (byte) be#104 = (byte) be#24 [phi:f0::@17/f0::@7->f0::@8#0] -- register_copy 
+  //SEG154 [48] phi (byte) bd#136 = (byte) bd#24 [phi:f0::@17/f0::@7->f0::@8#1] -- register_copy 
+  //SEG155 [48] phi (byte) bc#103 = (byte) bc#24 [phi:f0::@17/f0::@7->f0::@8#2] -- register_copy 
+  //SEG156 [48] phi (byte) bb#25 = (byte) bb#10 [phi:f0::@17/f0::@7->f0::@8#3] -- register_copy 
     jmp b8
   //SEG157 f0::@8
   b8:
@@ -3670,29 +3712,29 @@ f0: {
     lda #8
     cmp ba
     bne b9_from_b8
-    jmp b19
-  //SEG159 f0::@19
-  b19:
+    jmp b18
+  //SEG159 f0::@18
+  b18:
   //SEG160 [50] (byte) bb#11 ← ++ (byte) bb#25 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG161 [51] (byte~) bb#109 ← (byte) bb#11 -- vbuz1=vbuz2 
     lda bb
     sta bb_109
   //SEG162 [52] call fa 
-  //SEG163 [59] phi from f0::@19 to fa [phi:f0::@19->fa]
-  fa_from_b19:
-  //SEG164 [59] phi (byte) be#107 = (byte) be#104 [phi:f0::@19->fa#0] -- register_copy 
-  //SEG165 [59] phi (byte) bd#138 = (byte) bd#136 [phi:f0::@19->fa#1] -- register_copy 
-  //SEG166 [59] phi (byte) bc#39 = (byte) bc#103 [phi:f0::@19->fa#2] -- register_copy 
-  //SEG167 [59] phi (byte) bb#27 = (byte~) bb#109 [phi:f0::@19->fa#3] -- register_copy 
+  //SEG163 [59] phi from f0::@18 to fa [phi:f0::@18->fa]
+  fa_from_b18:
+  //SEG164 [59] phi (byte) be#107 = (byte) be#104 [phi:f0::@18->fa#0] -- register_copy 
+  //SEG165 [59] phi (byte) bd#138 = (byte) bd#136 [phi:f0::@18->fa#1] -- register_copy 
+  //SEG166 [59] phi (byte) bc#39 = (byte) bc#103 [phi:f0::@18->fa#2] -- register_copy 
+  //SEG167 [59] phi (byte) bb#27 = (byte~) bb#109 [phi:f0::@18->fa#3] -- register_copy 
     jsr fa
-  //SEG168 [53] phi from f0::@19 f0::@8 to f0::@9 [phi:f0::@19/f0::@8->f0::@9]
-  b9_from_b19:
+  //SEG168 [53] phi from f0::@18 f0::@8 to f0::@9 [phi:f0::@18/f0::@8->f0::@9]
+  b9_from_b18:
   b9_from_b8:
-  //SEG169 [53] phi (byte) be#105 = (byte) be#24 [phi:f0::@19/f0::@8->f0::@9#0] -- register_copy 
-  //SEG170 [53] phi (byte) bd#137 = (byte) bd#24 [phi:f0::@19/f0::@8->f0::@9#1] -- register_copy 
-  //SEG171 [53] phi (byte) bc#104 = (byte) bc#24 [phi:f0::@19/f0::@8->f0::@9#2] -- register_copy 
-  //SEG172 [53] phi (byte) bb#49 = (byte) bb#11 [phi:f0::@19/f0::@8->f0::@9#3] -- register_copy 
+  //SEG169 [53] phi (byte) be#105 = (byte) be#24 [phi:f0::@18/f0::@8->f0::@9#0] -- register_copy 
+  //SEG170 [53] phi (byte) bd#137 = (byte) bd#24 [phi:f0::@18/f0::@8->f0::@9#1] -- register_copy 
+  //SEG171 [53] phi (byte) bc#104 = (byte) bc#24 [phi:f0::@18/f0::@8->f0::@9#2] -- register_copy 
+  //SEG172 [53] phi (byte) bb#49 = (byte) bb#11 [phi:f0::@18/f0::@8->f0::@9#3] -- register_copy 
     jmp b9
   //SEG173 f0::@9
   b9:
@@ -3700,27 +3742,27 @@ f0: {
     lda #9
     cmp ba
     bne breturn_from_b9
-  //SEG175 [55] phi from f0::@9 to f0::@20 [phi:f0::@9->f0::@20]
-  b20_from_b9:
-    jmp b20
-  //SEG176 f0::@20
-  b20:
+  //SEG175 [55] phi from f0::@9 to f0::@19 [phi:f0::@9->f0::@19]
+  b19_from_b9:
+    jmp b19
+  //SEG176 f0::@19
+  b19:
   //SEG177 [56] call fa 
-  //SEG178 [59] phi from f0::@20 to fa [phi:f0::@20->fa]
-  fa_from_b20:
-  //SEG179 [59] phi (byte) be#107 = (byte) be#105 [phi:f0::@20->fa#0] -- register_copy 
-  //SEG180 [59] phi (byte) bd#138 = (byte) bd#137 [phi:f0::@20->fa#1] -- register_copy 
-  //SEG181 [59] phi (byte) bc#39 = (byte) bc#104 [phi:f0::@20->fa#2] -- register_copy 
-  //SEG182 [59] phi (byte) bb#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@20->fa#3] -- vbuz1=vbuc1 
+  //SEG178 [59] phi from f0::@19 to fa [phi:f0::@19->fa]
+  fa_from_b19:
+  //SEG179 [59] phi (byte) be#107 = (byte) be#105 [phi:f0::@19->fa#0] -- register_copy 
+  //SEG180 [59] phi (byte) bd#138 = (byte) bd#137 [phi:f0::@19->fa#1] -- register_copy 
+  //SEG181 [59] phi (byte) bc#39 = (byte) bc#104 [phi:f0::@19->fa#2] -- register_copy 
+  //SEG182 [59] phi (byte) bb#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@19->fa#3] -- vbuz1=vbuc1 
     lda #0
     sta bb_27
     jsr fa
-  //SEG183 [57] phi from f0::@20 to f0::@return [phi:f0::@20->f0::@return]
-  breturn_from_b20:
-  //SEG184 [57] phi (byte) be#13 = (byte) be#24 [phi:f0::@20->f0::@return#0] -- register_copy 
-  //SEG185 [57] phi (byte) bd#13 = (byte) bd#24 [phi:f0::@20->f0::@return#1] -- register_copy 
-  //SEG186 [57] phi (byte) bc#13 = (byte) bc#24 [phi:f0::@20->f0::@return#2] -- register_copy 
-  //SEG187 [57] phi (byte) bb#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@20->f0::@return#3] -- vbuz1=vbuc1 
+  //SEG183 [57] phi from f0::@19 to f0::@return [phi:f0::@19->f0::@return]
+  breturn_from_b19:
+  //SEG184 [57] phi (byte) be#13 = (byte) be#24 [phi:f0::@19->f0::@return#0] -- register_copy 
+  //SEG185 [57] phi (byte) bd#13 = (byte) bd#24 [phi:f0::@19->f0::@return#1] -- register_copy 
+  //SEG186 [57] phi (byte) bc#13 = (byte) bc#24 [phi:f0::@19->f0::@return#2] -- register_copy 
+  //SEG187 [57] phi (byte) bb#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@19->f0::@return#3] -- vbuz1=vbuc1 
     lda #0
     sta bb
     jmp breturn
@@ -3742,27 +3784,27 @@ fa: {
     lda bb_27
     cmp #0
     bne b1_from_fa
-    jmp b11
-  //SEG197 fa::@11
-  b11:
+    jmp b10
+  //SEG197 fa::@10
+  b10:
   //SEG198 [61] (byte) bc#105 ← ++ (byte) bc#39 -- vbuz1=_inc_vbuz1 
     inc bc
   //SEG199 [62] (byte~) bc#174 ← (byte) bc#105 -- vbuz1=vbuz2 
     lda bc
     sta bc_174
   //SEG200 [63] call fb 
-  //SEG201 [110] phi from fa::@11 to fb [phi:fa::@11->fb]
-  fb_from_b11:
-  //SEG202 [110] phi (byte) be#118 = (byte) be#107 [phi:fa::@11->fb#0] -- register_copy 
-  //SEG203 [110] phi (byte) bd#106 = (byte) bd#138 [phi:fa::@11->fb#1] -- register_copy 
-  //SEG204 [110] phi (byte) bc#114 = (byte~) bc#174 [phi:fa::@11->fb#2] -- register_copy 
+  //SEG201 [110] phi from fa::@10 to fb [phi:fa::@10->fb]
+  fb_from_b10:
+  //SEG202 [110] phi (byte) be#118 = (byte) be#107 [phi:fa::@10->fb#0] -- register_copy 
+  //SEG203 [110] phi (byte) bd#106 = (byte) bd#138 [phi:fa::@10->fb#1] -- register_copy 
+  //SEG204 [110] phi (byte) bc#114 = (byte~) bc#174 [phi:fa::@10->fb#2] -- register_copy 
     jsr fb
-  //SEG205 [64] phi from fa fa::@11 to fa::@1 [phi:fa/fa::@11->fa::@1]
+  //SEG205 [64] phi from fa fa::@10 to fa::@1 [phi:fa/fa::@10->fa::@1]
   b1_from_fa:
-  b1_from_b11:
-  //SEG206 [64] phi (byte) be#108 = (byte) be#107 [phi:fa/fa::@11->fa::@1#0] -- register_copy 
-  //SEG207 [64] phi (byte) bd#139 = (byte) bd#138 [phi:fa/fa::@11->fa::@1#1] -- register_copy 
-  //SEG208 [64] phi (byte) bc#40 = (byte) bc#39 [phi:fa/fa::@11->fa::@1#2] -- register_copy 
+  b1_from_b10:
+  //SEG206 [64] phi (byte) be#108 = (byte) be#107 [phi:fa/fa::@10->fa::@1#0] -- register_copy 
+  //SEG207 [64] phi (byte) bd#139 = (byte) bd#138 [phi:fa/fa::@10->fa::@1#1] -- register_copy 
+  //SEG208 [64] phi (byte) bc#40 = (byte) bc#39 [phi:fa/fa::@10->fa::@1#2] -- register_copy 
     jmp b1
   //SEG209 fa::@1
   b1:
@@ -3770,27 +3812,27 @@ fa: {
     lda #1
     cmp bb_27
     bne b2_from_b1
-    jmp b12
-  //SEG211 fa::@12
-  b12:
+    jmp b11
+  //SEG211 fa::@11
+  b11:
   //SEG212 [66] (byte) bc#106 ← ++ (byte) bc#40 -- vbuz1=_inc_vbuz1 
     inc bc
   //SEG213 [67] (byte~) bc#175 ← (byte) bc#106 -- vbuz1=vbuz2 
     lda bc
     sta bc_175
   //SEG214 [68] call fb 
-  //SEG215 [110] phi from fa::@12 to fb [phi:fa::@12->fb]
-  fb_from_b12:
-  //SEG216 [110] phi (byte) be#118 = (byte) be#108 [phi:fa::@12->fb#0] -- register_copy 
-  //SEG217 [110] phi (byte) bd#106 = (byte) bd#139 [phi:fa::@12->fb#1] -- register_copy 
-  //SEG218 [110] phi (byte) bc#114 = (byte~) bc#175 [phi:fa::@12->fb#2] -- register_copy 
+  //SEG215 [110] phi from fa::@11 to fb [phi:fa::@11->fb]
+  fb_from_b11:
+  //SEG216 [110] phi (byte) be#118 = (byte) be#108 [phi:fa::@11->fb#0] -- register_copy 
+  //SEG217 [110] phi (byte) bd#106 = (byte) bd#139 [phi:fa::@11->fb#1] -- register_copy 
+  //SEG218 [110] phi (byte) bc#114 = (byte~) bc#175 [phi:fa::@11->fb#2] -- register_copy 
     jsr fb
-  //SEG219 [69] phi from fa::@1 fa::@12 to fa::@2 [phi:fa::@1/fa::@12->fa::@2]
+  //SEG219 [69] phi from fa::@1 fa::@11 to fa::@2 [phi:fa::@1/fa::@11->fa::@2]
   b2_from_b1:
-  b2_from_b12:
-  //SEG220 [69] phi (byte) be#109 = (byte) be#108 [phi:fa::@1/fa::@12->fa::@2#0] -- register_copy 
-  //SEG221 [69] phi (byte) bd#140 = (byte) bd#139 [phi:fa::@1/fa::@12->fa::@2#1] -- register_copy 
-  //SEG222 [69] phi (byte) bc#41 = (byte) bc#40 [phi:fa::@1/fa::@12->fa::@2#2] -- register_copy 
+  b2_from_b11:
+  //SEG220 [69] phi (byte) be#109 = (byte) be#108 [phi:fa::@1/fa::@11->fa::@2#0] -- register_copy 
+  //SEG221 [69] phi (byte) bd#140 = (byte) bd#139 [phi:fa::@1/fa::@11->fa::@2#1] -- register_copy 
+  //SEG222 [69] phi (byte) bc#41 = (byte) bc#40 [phi:fa::@1/fa::@11->fa::@2#2] -- register_copy 
     jmp b2
   //SEG223 fa::@2
   b2:
@@ -3798,27 +3840,27 @@ fa: {
     lda #2
     cmp bb_27
     bne b3_from_b2
-    jmp b13
-  //SEG225 fa::@13
-  b13:
+    jmp b12
+  //SEG225 fa::@12
+  b12:
   //SEG226 [71] (byte) bc#107 ← ++ (byte) bc#41 -- vbuz1=_inc_vbuz1 
     inc bc
   //SEG227 [72] (byte~) bc#176 ← (byte) bc#107 -- vbuz1=vbuz2 
     lda bc
     sta bc_176
   //SEG228 [73] call fb 
-  //SEG229 [110] phi from fa::@13 to fb [phi:fa::@13->fb]
-  fb_from_b13:
-  //SEG230 [110] phi (byte) be#118 = (byte) be#109 [phi:fa::@13->fb#0] -- register_copy 
-  //SEG231 [110] phi (byte) bd#106 = (byte) bd#140 [phi:fa::@13->fb#1] -- register_copy 
-  //SEG232 [110] phi (byte) bc#114 = (byte~) bc#176 [phi:fa::@13->fb#2] -- register_copy 
+  //SEG229 [110] phi from fa::@12 to fb [phi:fa::@12->fb]
+  fb_from_b12:
+  //SEG230 [110] phi (byte) be#118 = (byte) be#109 [phi:fa::@12->fb#0] -- register_copy 
+  //SEG231 [110] phi (byte) bd#106 = (byte) bd#140 [phi:fa::@12->fb#1] -- register_copy 
+  //SEG232 [110] phi (byte) bc#114 = (byte~) bc#176 [phi:fa::@12->fb#2] -- register_copy 
     jsr fb
-  //SEG233 [74] phi from fa::@13 fa::@2 to fa::@3 [phi:fa::@13/fa::@2->fa::@3]
-  b3_from_b13:
+  //SEG233 [74] phi from fa::@12 fa::@2 to fa::@3 [phi:fa::@12/fa::@2->fa::@3]
+  b3_from_b12:
   b3_from_b2:
-  //SEG234 [74] phi (byte) be#110 = (byte) be#35 [phi:fa::@13/fa::@2->fa::@3#0] -- register_copy 
-  //SEG235 [74] phi (byte) bd#141 = (byte) bd#35 [phi:fa::@13/fa::@2->fa::@3#1] -- register_copy 
-  //SEG236 [74] phi (byte) bc#42 = (byte) bc#107 [phi:fa::@13/fa::@2->fa::@3#2] -- register_copy 
+  //SEG234 [74] phi (byte) be#110 = (byte) be#35 [phi:fa::@12/fa::@2->fa::@3#0] -- register_copy 
+  //SEG235 [74] phi (byte) bd#141 = (byte) bd#35 [phi:fa::@12/fa::@2->fa::@3#1] -- register_copy 
+  //SEG236 [74] phi (byte) bc#42 = (byte) bc#107 [phi:fa::@12/fa::@2->fa::@3#2] -- register_copy 
     jmp b3
   //SEG237 fa::@3
   b3:
@@ -3826,27 +3868,27 @@ fa: {
     lda #3
     cmp bb_27
     bne b4_from_b3
-    jmp b14
-  //SEG239 fa::@14
-  b14:
+    jmp b13
+  //SEG239 fa::@13
+  b13:
   //SEG240 [76] (byte) bc#108 ← ++ (byte) bc#42 -- vbuz1=_inc_vbuz1 
     inc bc
   //SEG241 [77] (byte~) bc#177 ← (byte) bc#108 -- vbuz1=vbuz2 
     lda bc
     sta bc_177
   //SEG242 [78] call fb 
-  //SEG243 [110] phi from fa::@14 to fb [phi:fa::@14->fb]
-  fb_from_b14:
-  //SEG244 [110] phi (byte) be#118 = (byte) be#110 [phi:fa::@14->fb#0] -- register_copy 
-  //SEG245 [110] phi (byte) bd#106 = (byte) bd#141 [phi:fa::@14->fb#1] -- register_copy 
-  //SEG246 [110] phi (byte) bc#114 = (byte~) bc#177 [phi:fa::@14->fb#2] -- register_copy 
+  //SEG243 [110] phi from fa::@13 to fb [phi:fa::@13->fb]
+  fb_from_b13:
+  //SEG244 [110] phi (byte) be#118 = (byte) be#110 [phi:fa::@13->fb#0] -- register_copy 
+  //SEG245 [110] phi (byte) bd#106 = (byte) bd#141 [phi:fa::@13->fb#1] -- register_copy 
+  //SEG246 [110] phi (byte) bc#114 = (byte~) bc#177 [phi:fa::@13->fb#2] -- register_copy 
     jsr fb
-  //SEG247 [79] phi from fa::@14 fa::@3 to fa::@4 [phi:fa::@14/fa::@3->fa::@4]
-  b4_from_b14:
+  //SEG247 [79] phi from fa::@13 fa::@3 to fa::@4 [phi:fa::@13/fa::@3->fa::@4]
+  b4_from_b13:
   b4_from_b3:
-  //SEG248 [79] phi (byte) be#111 = (byte) be#35 [phi:fa::@14/fa::@3->fa::@4#0] -- register_copy 
-  //SEG249 [79] phi (byte) bd#142 = (byte) bd#35 [phi:fa::@14/fa::@3->fa::@4#1] -- register_copy 
-  //SEG250 [79] phi (byte) bc#43 = (byte) bc#108 [phi:fa::@14/fa::@3->fa::@4#2] -- register_copy 
+  //SEG248 [79] phi (byte) be#111 = (byte) be#35 [phi:fa::@13/fa::@3->fa::@4#0] -- register_copy 
+  //SEG249 [79] phi (byte) bd#142 = (byte) bd#35 [phi:fa::@13/fa::@3->fa::@4#1] -- register_copy 
+  //SEG250 [79] phi (byte) bc#43 = (byte) bc#108 [phi:fa::@13/fa::@3->fa::@4#2] -- register_copy 
     jmp b4
   //SEG251 fa::@4
   b4:
@@ -3854,27 +3896,27 @@ fa: {
     lda #4
     cmp bb_27
     bne b5_from_b4
-    jmp b15
-  //SEG253 fa::@15
-  b15:
+    jmp b14
+  //SEG253 fa::@14
+  b14:
   //SEG254 [81] (byte) bc#109 ← ++ (byte) bc#43 -- vbuz1=_inc_vbuz1 
     inc bc
   //SEG255 [82] (byte~) bc#178 ← (byte) bc#109 -- vbuz1=vbuz2 
     lda bc
     sta bc_178
   //SEG256 [83] call fb 
-  //SEG257 [110] phi from fa::@15 to fb [phi:fa::@15->fb]
-  fb_from_b15:
-  //SEG258 [110] phi (byte) be#118 = (byte) be#111 [phi:fa::@15->fb#0] -- register_copy 
-  //SEG259 [110] phi (byte) bd#106 = (byte) bd#142 [phi:fa::@15->fb#1] -- register_copy 
-  //SEG260 [110] phi (byte) bc#114 = (byte~) bc#178 [phi:fa::@15->fb#2] -- register_copy 
+  //SEG257 [110] phi from fa::@14 to fb [phi:fa::@14->fb]
+  fb_from_b14:
+  //SEG258 [110] phi (byte) be#118 = (byte) be#111 [phi:fa::@14->fb#0] -- register_copy 
+  //SEG259 [110] phi (byte) bd#106 = (byte) bd#142 [phi:fa::@14->fb#1] -- register_copy 
+  //SEG260 [110] phi (byte) bc#114 = (byte~) bc#178 [phi:fa::@14->fb#2] -- register_copy 
     jsr fb
-  //SEG261 [84] phi from fa::@15 fa::@4 to fa::@5 [phi:fa::@15/fa::@4->fa::@5]
-  b5_from_b15:
+  //SEG261 [84] phi from fa::@14 fa::@4 to fa::@5 [phi:fa::@14/fa::@4->fa::@5]
+  b5_from_b14:
   b5_from_b4:
-  //SEG262 [84] phi (byte) be#112 = (byte) be#35 [phi:fa::@15/fa::@4->fa::@5#0] -- register_copy 
-  //SEG263 [84] phi (byte) bd#100 = (byte) bd#35 [phi:fa::@15/fa::@4->fa::@5#1] -- register_copy 
-  //SEG264 [84] phi (byte) bc#44 = (byte) bc#109 [phi:fa::@15/fa::@4->fa::@5#2] -- register_copy 
+  //SEG262 [84] phi (byte) be#112 = (byte) be#35 [phi:fa::@14/fa::@4->fa::@5#0] -- register_copy 
+  //SEG263 [84] phi (byte) bd#100 = (byte) bd#35 [phi:fa::@14/fa::@4->fa::@5#1] -- register_copy 
+  //SEG264 [84] phi (byte) bc#44 = (byte) bc#109 [phi:fa::@14/fa::@4->fa::@5#2] -- register_copy 
     jmp b5
   //SEG265 fa::@5
   b5:
@@ -3882,27 +3924,27 @@ fa: {
     lda #5
     cmp bb_27
     bne b6_from_b5
-    jmp b16
-  //SEG267 fa::@16
-  b16:
+    jmp b15
+  //SEG267 fa::@15
+  b15:
   //SEG268 [86] (byte) bc#110 ← ++ (byte) bc#44 -- vbuz1=_inc_vbuz1 
     inc bc
   //SEG269 [87] (byte~) bc#179 ← (byte) bc#110 -- vbuz1=vbuz2 
     lda bc
     sta bc_179
   //SEG270 [88] call fb 
-  //SEG271 [110] phi from fa::@16 to fb [phi:fa::@16->fb]
-  fb_from_b16:
-  //SEG272 [110] phi (byte) be#118 = (byte) be#112 [phi:fa::@16->fb#0] -- register_copy 
-  //SEG273 [110] phi (byte) bd#106 = (byte) bd#100 [phi:fa::@16->fb#1] -- register_copy 
-  //SEG274 [110] phi (byte) bc#114 = (byte~) bc#179 [phi:fa::@16->fb#2] -- register_copy 
+  //SEG271 [110] phi from fa::@15 to fb [phi:fa::@15->fb]
+  fb_from_b15:
+  //SEG272 [110] phi (byte) be#118 = (byte) be#112 [phi:fa::@15->fb#0] -- register_copy 
+  //SEG273 [110] phi (byte) bd#106 = (byte) bd#100 [phi:fa::@15->fb#1] -- register_copy 
+  //SEG274 [110] phi (byte) bc#114 = (byte~) bc#179 [phi:fa::@15->fb#2] -- register_copy 
     jsr fb
-  //SEG275 [89] phi from fa::@16 fa::@5 to fa::@6 [phi:fa::@16/fa::@5->fa::@6]
-  b6_from_b16:
+  //SEG275 [89] phi from fa::@15 fa::@5 to fa::@6 [phi:fa::@15/fa::@5->fa::@6]
+  b6_from_b15:
   b6_from_b5:
-  //SEG276 [89] phi (byte) be#113 = (byte) be#35 [phi:fa::@16/fa::@5->fa::@6#0] -- register_copy 
-  //SEG277 [89] phi (byte) bd#101 = (byte) bd#35 [phi:fa::@16/fa::@5->fa::@6#1] -- register_copy 
-  //SEG278 [89] phi (byte) bc#45 = (byte) bc#110 [phi:fa::@16/fa::@5->fa::@6#2] -- register_copy 
+  //SEG276 [89] phi (byte) be#113 = (byte) be#35 [phi:fa::@15/fa::@5->fa::@6#0] -- register_copy 
+  //SEG277 [89] phi (byte) bd#101 = (byte) bd#35 [phi:fa::@15/fa::@5->fa::@6#1] -- register_copy 
+  //SEG278 [89] phi (byte) bc#45 = (byte) bc#110 [phi:fa::@15/fa::@5->fa::@6#2] -- register_copy 
     jmp b6
   //SEG279 fa::@6
   b6:
@@ -3910,27 +3952,27 @@ fa: {
     lda #6
     cmp bb_27
     bne b7_from_b6
-    jmp b17
-  //SEG281 fa::@17
-  b17:
+    jmp b16
+  //SEG281 fa::@16
+  b16:
   //SEG282 [91] (byte) bc#111 ← ++ (byte) bc#45 -- vbuz1=_inc_vbuz1 
     inc bc
   //SEG283 [92] (byte~) bc#180 ← (byte) bc#111 -- vbuz1=vbuz2 
     lda bc
     sta bc_180
   //SEG284 [93] call fb 
-  //SEG285 [110] phi from fa::@17 to fb [phi:fa::@17->fb]
-  fb_from_b17:
-  //SEG286 [110] phi (byte) be#118 = (byte) be#113 [phi:fa::@17->fb#0] -- register_copy 
-  //SEG287 [110] phi (byte) bd#106 = (byte) bd#101 [phi:fa::@17->fb#1] -- register_copy 
-  //SEG288 [110] phi (byte) bc#114 = (byte~) bc#180 [phi:fa::@17->fb#2] -- register_copy 
+  //SEG285 [110] phi from fa::@16 to fb [phi:fa::@16->fb]
+  fb_from_b16:
+  //SEG286 [110] phi (byte) be#118 = (byte) be#113 [phi:fa::@16->fb#0] -- register_copy 
+  //SEG287 [110] phi (byte) bd#106 = (byte) bd#101 [phi:fa::@16->fb#1] -- register_copy 
+  //SEG288 [110] phi (byte) bc#114 = (byte~) bc#180 [phi:fa::@16->fb#2] -- register_copy 
     jsr fb
-  //SEG289 [94] phi from fa::@17 fa::@6 to fa::@7 [phi:fa::@17/fa::@6->fa::@7]
-  b7_from_b17:
+  //SEG289 [94] phi from fa::@16 fa::@6 to fa::@7 [phi:fa::@16/fa::@6->fa::@7]
+  b7_from_b16:
   b7_from_b6:
-  //SEG290 [94] phi (byte) be#114 = (byte) be#35 [phi:fa::@17/fa::@6->fa::@7#0] -- register_copy 
-  //SEG291 [94] phi (byte) bd#102 = (byte) bd#35 [phi:fa::@17/fa::@6->fa::@7#1] -- register_copy 
-  //SEG292 [94] phi (byte) bc#46 = (byte) bc#111 [phi:fa::@17/fa::@6->fa::@7#2] -- register_copy 
+  //SEG290 [94] phi (byte) be#114 = (byte) be#35 [phi:fa::@16/fa::@6->fa::@7#0] -- register_copy 
+  //SEG291 [94] phi (byte) bd#102 = (byte) bd#35 [phi:fa::@16/fa::@6->fa::@7#1] -- register_copy 
+  //SEG292 [94] phi (byte) bc#46 = (byte) bc#111 [phi:fa::@16/fa::@6->fa::@7#2] -- register_copy 
     jmp b7
   //SEG293 fa::@7
   b7:
@@ -3938,27 +3980,27 @@ fa: {
     lda #7
     cmp bb_27
     bne b8_from_b7
-    jmp b18
-  //SEG295 fa::@18
-  b18:
+    jmp b17
+  //SEG295 fa::@17
+  b17:
   //SEG296 [96] (byte) bc#112 ← ++ (byte) bc#46 -- vbuz1=_inc_vbuz1 
     inc bc
   //SEG297 [97] (byte~) bc#181 ← (byte) bc#112 -- vbuz1=vbuz2 
     lda bc
     sta bc_181
   //SEG298 [98] call fb 
-  //SEG299 [110] phi from fa::@18 to fb [phi:fa::@18->fb]
-  fb_from_b18:
-  //SEG300 [110] phi (byte) be#118 = (byte) be#114 [phi:fa::@18->fb#0] -- register_copy 
-  //SEG301 [110] phi (byte) bd#106 = (byte) bd#102 [phi:fa::@18->fb#1] -- register_copy 
-  //SEG302 [110] phi (byte) bc#114 = (byte~) bc#181 [phi:fa::@18->fb#2] -- register_copy 
+  //SEG299 [110] phi from fa::@17 to fb [phi:fa::@17->fb]
+  fb_from_b17:
+  //SEG300 [110] phi (byte) be#118 = (byte) be#114 [phi:fa::@17->fb#0] -- register_copy 
+  //SEG301 [110] phi (byte) bd#106 = (byte) bd#102 [phi:fa::@17->fb#1] -- register_copy 
+  //SEG302 [110] phi (byte) bc#114 = (byte~) bc#181 [phi:fa::@17->fb#2] -- register_copy 
     jsr fb
-  //SEG303 [99] phi from fa::@18 fa::@7 to fa::@8 [phi:fa::@18/fa::@7->fa::@8]
-  b8_from_b18:
+  //SEG303 [99] phi from fa::@17 fa::@7 to fa::@8 [phi:fa::@17/fa::@7->fa::@8]
+  b8_from_b17:
   b8_from_b7:
-  //SEG304 [99] phi (byte) be#115 = (byte) be#35 [phi:fa::@18/fa::@7->fa::@8#0] -- register_copy 
-  //SEG305 [99] phi (byte) bd#103 = (byte) bd#35 [phi:fa::@18/fa::@7->fa::@8#1] -- register_copy 
-  //SEG306 [99] phi (byte) bc#47 = (byte) bc#112 [phi:fa::@18/fa::@7->fa::@8#2] -- register_copy 
+  //SEG304 [99] phi (byte) be#115 = (byte) be#35 [phi:fa::@17/fa::@7->fa::@8#0] -- register_copy 
+  //SEG305 [99] phi (byte) bd#103 = (byte) bd#35 [phi:fa::@17/fa::@7->fa::@8#1] -- register_copy 
+  //SEG306 [99] phi (byte) bc#47 = (byte) bc#112 [phi:fa::@17/fa::@7->fa::@8#2] -- register_copy 
     jmp b8
   //SEG307 fa::@8
   b8:
@@ -3966,27 +4008,27 @@ fa: {
     lda #8
     cmp bb_27
     bne b9_from_b8
-    jmp b19
-  //SEG309 fa::@19
-  b19:
+    jmp b18
+  //SEG309 fa::@18
+  b18:
   //SEG310 [101] (byte) bc#123 ← ++ (byte) bc#47 -- vbuz1=_inc_vbuz1 
     inc bc
   //SEG311 [102] (byte~) bc#182 ← (byte) bc#123 -- vbuz1=vbuz2 
     lda bc
     sta bc_182
   //SEG312 [103] call fb 
-  //SEG313 [110] phi from fa::@19 to fb [phi:fa::@19->fb]
-  fb_from_b19:
-  //SEG314 [110] phi (byte) be#118 = (byte) be#115 [phi:fa::@19->fb#0] -- register_copy 
-  //SEG315 [110] phi (byte) bd#106 = (byte) bd#103 [phi:fa::@19->fb#1] -- register_copy 
-  //SEG316 [110] phi (byte) bc#114 = (byte~) bc#182 [phi:fa::@19->fb#2] -- register_copy 
+  //SEG313 [110] phi from fa::@18 to fb [phi:fa::@18->fb]
+  fb_from_b18:
+  //SEG314 [110] phi (byte) be#118 = (byte) be#115 [phi:fa::@18->fb#0] -- register_copy 
+  //SEG315 [110] phi (byte) bd#106 = (byte) bd#103 [phi:fa::@18->fb#1] -- register_copy 
+  //SEG316 [110] phi (byte) bc#114 = (byte~) bc#182 [phi:fa::@18->fb#2] -- register_copy 
     jsr fb
-  //SEG317 [104] phi from fa::@19 fa::@8 to fa::@9 [phi:fa::@19/fa::@8->fa::@9]
-  b9_from_b19:
+  //SEG317 [104] phi from fa::@18 fa::@8 to fa::@9 [phi:fa::@18/fa::@8->fa::@9]
+  b9_from_b18:
   b9_from_b8:
-  //SEG318 [104] phi (byte) be#116 = (byte) be#35 [phi:fa::@19/fa::@8->fa::@9#0] -- register_copy 
-  //SEG319 [104] phi (byte) bd#104 = (byte) bd#35 [phi:fa::@19/fa::@8->fa::@9#1] -- register_copy 
-  //SEG320 [104] phi (byte) bc#113 = (byte) bc#123 [phi:fa::@19/fa::@8->fa::@9#2] -- register_copy 
+  //SEG318 [104] phi (byte) be#116 = (byte) be#35 [phi:fa::@18/fa::@8->fa::@9#0] -- register_copy 
+  //SEG319 [104] phi (byte) bd#104 = (byte) bd#35 [phi:fa::@18/fa::@8->fa::@9#1] -- register_copy 
+  //SEG320 [104] phi (byte) bc#113 = (byte) bc#123 [phi:fa::@18/fa::@8->fa::@9#2] -- register_copy 
     jmp b9
   //SEG321 fa::@9
   b9:
@@ -3994,25 +4036,25 @@ fa: {
     lda #9
     cmp bb_27
     bne breturn_from_b9
-  //SEG323 [106] phi from fa::@9 to fa::@20 [phi:fa::@9->fa::@20]
-  b20_from_b9:
-    jmp b20
-  //SEG324 fa::@20
-  b20:
+  //SEG323 [106] phi from fa::@9 to fa::@19 [phi:fa::@9->fa::@19]
+  b19_from_b9:
+    jmp b19
+  //SEG324 fa::@19
+  b19:
   //SEG325 [107] call fb 
-  //SEG326 [110] phi from fa::@20 to fb [phi:fa::@20->fb]
-  fb_from_b20:
-  //SEG327 [110] phi (byte) be#118 = (byte) be#116 [phi:fa::@20->fb#0] -- register_copy 
-  //SEG328 [110] phi (byte) bd#106 = (byte) bd#104 [phi:fa::@20->fb#1] -- register_copy 
-  //SEG329 [110] phi (byte) bc#114 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@20->fb#2] -- vbuz1=vbuc1 
+  //SEG326 [110] phi from fa::@19 to fb [phi:fa::@19->fb]
+  fb_from_b19:
+  //SEG327 [110] phi (byte) be#118 = (byte) be#116 [phi:fa::@19->fb#0] -- register_copy 
+  //SEG328 [110] phi (byte) bd#106 = (byte) bd#104 [phi:fa::@19->fb#1] -- register_copy 
+  //SEG329 [110] phi (byte) bc#114 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@19->fb#2] -- vbuz1=vbuc1 
     lda #0
     sta bc_114
     jsr fb
-  //SEG330 [108] phi from fa::@20 to fa::@return [phi:fa::@20->fa::@return]
-  breturn_from_b20:
-  //SEG331 [108] phi (byte) be#24 = (byte) be#35 [phi:fa::@20->fa::@return#0] -- register_copy 
-  //SEG332 [108] phi (byte) bd#24 = (byte) bd#35 [phi:fa::@20->fa::@return#1] -- register_copy 
-  //SEG333 [108] phi (byte) bc#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@20->fa::@return#2] -- vbuz1=vbuc1 
+  //SEG330 [108] phi from fa::@19 to fa::@return [phi:fa::@19->fa::@return]
+  breturn_from_b19:
+  //SEG331 [108] phi (byte) be#24 = (byte) be#35 [phi:fa::@19->fa::@return#0] -- register_copy 
+  //SEG332 [108] phi (byte) bd#24 = (byte) bd#35 [phi:fa::@19->fa::@return#1] -- register_copy 
+  //SEG333 [108] phi (byte) bc#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@19->fa::@return#2] -- vbuz1=vbuc1 
     lda #0
     sta bc
     jmp breturn
@@ -4033,25 +4075,25 @@ fb: {
     lda bc_114
     cmp #0
     bne b1_from_fb
-    jmp b11
-  //SEG342 fb::@11
-  b11:
+    jmp b10
+  //SEG342 fb::@10
+  b10:
   //SEG343 [112] (byte) bd#148 ← ++ (byte) bd#106 -- vbuz1=_inc_vbuz1 
     inc bd
   //SEG344 [113] (byte~) bd#238 ← (byte) bd#148 -- vbuz1=vbuz2 
     lda bd
     sta bd_238
   //SEG345 [114] call fc 
-  //SEG346 [161] phi from fb::@11 to fc [phi:fb::@11->fc]
-  fc_from_b11:
-  //SEG347 [161] phi (byte) be#129 = (byte) be#118 [phi:fb::@11->fc#0] -- register_copy 
-  //SEG348 [161] phi (byte) bd#117 = (byte~) bd#238 [phi:fb::@11->fc#1] -- register_copy 
+  //SEG346 [161] phi from fb::@10 to fc [phi:fb::@10->fc]
+  fc_from_b10:
+  //SEG347 [161] phi (byte) be#129 = (byte) be#118 [phi:fb::@10->fc#0] -- register_copy 
+  //SEG348 [161] phi (byte) bd#117 = (byte~) bd#238 [phi:fb::@10->fc#1] -- register_copy 
     jsr fc
-  //SEG349 [115] phi from fb fb::@11 to fb::@1 [phi:fb/fb::@11->fb::@1]
+  //SEG349 [115] phi from fb fb::@10 to fb::@1 [phi:fb/fb::@10->fb::@1]
   b1_from_fb:
-  b1_from_b11:
-  //SEG350 [115] phi (byte) be#119 = (byte) be#118 [phi:fb/fb::@11->fb::@1#0] -- register_copy 
-  //SEG351 [115] phi (byte) bd#107 = (byte) bd#106 [phi:fb/fb::@11->fb::@1#1] -- register_copy 
+  b1_from_b10:
+  //SEG350 [115] phi (byte) be#119 = (byte) be#118 [phi:fb/fb::@10->fb::@1#0] -- register_copy 
+  //SEG351 [115] phi (byte) bd#107 = (byte) bd#106 [phi:fb/fb::@10->fb::@1#1] -- register_copy 
     jmp b1
   //SEG352 fb::@1
   b1:
@@ -4059,25 +4101,25 @@ fb: {
     lda #1
     cmp bc_114
     bne b2_from_b1
-    jmp b12
-  //SEG354 fb::@12
-  b12:
+    jmp b11
+  //SEG354 fb::@11
+  b11:
   //SEG355 [117] (byte) bd#149 ← ++ (byte) bd#107 -- vbuz1=_inc_vbuz1 
     inc bd
   //SEG356 [118] (byte~) bd#239 ← (byte) bd#149 -- vbuz1=vbuz2 
     lda bd
     sta bd_239
   //SEG357 [119] call fc 
-  //SEG358 [161] phi from fb::@12 to fc [phi:fb::@12->fc]
-  fc_from_b12:
-  //SEG359 [161] phi (byte) be#129 = (byte) be#119 [phi:fb::@12->fc#0] -- register_copy 
-  //SEG360 [161] phi (byte) bd#117 = (byte~) bd#239 [phi:fb::@12->fc#1] -- register_copy 
+  //SEG358 [161] phi from fb::@11 to fc [phi:fb::@11->fc]
+  fc_from_b11:
+  //SEG359 [161] phi (byte) be#129 = (byte) be#119 [phi:fb::@11->fc#0] -- register_copy 
+  //SEG360 [161] phi (byte) bd#117 = (byte~) bd#239 [phi:fb::@11->fc#1] -- register_copy 
     jsr fc
-  //SEG361 [120] phi from fb::@1 fb::@12 to fb::@2 [phi:fb::@1/fb::@12->fb::@2]
+  //SEG361 [120] phi from fb::@1 fb::@11 to fb::@2 [phi:fb::@1/fb::@11->fb::@2]
   b2_from_b1:
-  b2_from_b12:
-  //SEG362 [120] phi (byte) be#120 = (byte) be#119 [phi:fb::@1/fb::@12->fb::@2#0] -- register_copy 
-  //SEG363 [120] phi (byte) bd#108 = (byte) bd#107 [phi:fb::@1/fb::@12->fb::@2#1] -- register_copy 
+  b2_from_b11:
+  //SEG362 [120] phi (byte) be#120 = (byte) be#119 [phi:fb::@1/fb::@11->fb::@2#0] -- register_copy 
+  //SEG363 [120] phi (byte) bd#108 = (byte) bd#107 [phi:fb::@1/fb::@11->fb::@2#1] -- register_copy 
     jmp b2
   //SEG364 fb::@2
   b2:
@@ -4085,25 +4127,25 @@ fb: {
     lda #2
     cmp bc_114
     bne b3_from_b2
-    jmp b13
-  //SEG366 fb::@13
-  b13:
+    jmp b12
+  //SEG366 fb::@12
+  b12:
   //SEG367 [122] (byte) bd#150 ← ++ (byte) bd#108 -- vbuz1=_inc_vbuz1 
     inc bd
   //SEG368 [123] (byte~) bd#240 ← (byte) bd#150 -- vbuz1=vbuz2 
     lda bd
     sta bd_240
   //SEG369 [124] call fc 
-  //SEG370 [161] phi from fb::@13 to fc [phi:fb::@13->fc]
-  fc_from_b13:
-  //SEG371 [161] phi (byte) be#129 = (byte) be#120 [phi:fb::@13->fc#0] -- register_copy 
-  //SEG372 [161] phi (byte) bd#117 = (byte~) bd#240 [phi:fb::@13->fc#1] -- register_copy 
+  //SEG370 [161] phi from fb::@12 to fc [phi:fb::@12->fc]
+  fc_from_b12:
+  //SEG371 [161] phi (byte) be#129 = (byte) be#120 [phi:fb::@12->fc#0] -- register_copy 
+  //SEG372 [161] phi (byte) bd#117 = (byte~) bd#240 [phi:fb::@12->fc#1] -- register_copy 
     jsr fc
-  //SEG373 [125] phi from fb::@13 fb::@2 to fb::@3 [phi:fb::@13/fb::@2->fb::@3]
-  b3_from_b13:
+  //SEG373 [125] phi from fb::@12 fb::@2 to fb::@3 [phi:fb::@12/fb::@2->fb::@3]
+  b3_from_b12:
   b3_from_b2:
-  //SEG374 [125] phi (byte) be#121 = (byte) be#46 [phi:fb::@13/fb::@2->fb::@3#0] -- register_copy 
-  //SEG375 [125] phi (byte) bd#109 = (byte) bd#150 [phi:fb::@13/fb::@2->fb::@3#1] -- register_copy 
+  //SEG374 [125] phi (byte) be#121 = (byte) be#46 [phi:fb::@12/fb::@2->fb::@3#0] -- register_copy 
+  //SEG375 [125] phi (byte) bd#109 = (byte) bd#150 [phi:fb::@12/fb::@2->fb::@3#1] -- register_copy 
     jmp b3
   //SEG376 fb::@3
   b3:
@@ -4111,25 +4153,25 @@ fb: {
     lda #3
     cmp bc_114
     bne b4_from_b3
-    jmp b14
-  //SEG378 fb::@14
-  b14:
+    jmp b13
+  //SEG378 fb::@13
+  b13:
   //SEG379 [127] (byte) bd#151 ← ++ (byte) bd#109 -- vbuz1=_inc_vbuz1 
     inc bd
   //SEG380 [128] (byte~) bd#241 ← (byte) bd#151 -- vbuz1=vbuz2 
     lda bd
     sta bd_241
   //SEG381 [129] call fc 
-  //SEG382 [161] phi from fb::@14 to fc [phi:fb::@14->fc]
-  fc_from_b14:
-  //SEG383 [161] phi (byte) be#129 = (byte) be#121 [phi:fb::@14->fc#0] -- register_copy 
-  //SEG384 [161] phi (byte) bd#117 = (byte~) bd#241 [phi:fb::@14->fc#1] -- register_copy 
+  //SEG382 [161] phi from fb::@13 to fc [phi:fb::@13->fc]
+  fc_from_b13:
+  //SEG383 [161] phi (byte) be#129 = (byte) be#121 [phi:fb::@13->fc#0] -- register_copy 
+  //SEG384 [161] phi (byte) bd#117 = (byte~) bd#241 [phi:fb::@13->fc#1] -- register_copy 
     jsr fc
-  //SEG385 [130] phi from fb::@14 fb::@3 to fb::@4 [phi:fb::@14/fb::@3->fb::@4]
-  b4_from_b14:
+  //SEG385 [130] phi from fb::@13 fb::@3 to fb::@4 [phi:fb::@13/fb::@3->fb::@4]
+  b4_from_b13:
   b4_from_b3:
-  //SEG386 [130] phi (byte) be#122 = (byte) be#46 [phi:fb::@14/fb::@3->fb::@4#0] -- register_copy 
-  //SEG387 [130] phi (byte) bd#110 = (byte) bd#151 [phi:fb::@14/fb::@3->fb::@4#1] -- register_copy 
+  //SEG386 [130] phi (byte) be#122 = (byte) be#46 [phi:fb::@13/fb::@3->fb::@4#0] -- register_copy 
+  //SEG387 [130] phi (byte) bd#110 = (byte) bd#151 [phi:fb::@13/fb::@3->fb::@4#1] -- register_copy 
     jmp b4
   //SEG388 fb::@4
   b4:
@@ -4137,25 +4179,25 @@ fb: {
     lda #4
     cmp bc_114
     bne b5_from_b4
-    jmp b15
-  //SEG390 fb::@15
-  b15:
+    jmp b14
+  //SEG390 fb::@14
+  b14:
   //SEG391 [132] (byte) bd#152 ← ++ (byte) bd#110 -- vbuz1=_inc_vbuz1 
     inc bd
   //SEG392 [133] (byte~) bd#242 ← (byte) bd#152 -- vbuz1=vbuz2 
     lda bd
     sta bd_242
   //SEG393 [134] call fc 
-  //SEG394 [161] phi from fb::@15 to fc [phi:fb::@15->fc]
-  fc_from_b15:
-  //SEG395 [161] phi (byte) be#129 = (byte) be#122 [phi:fb::@15->fc#0] -- register_copy 
-  //SEG396 [161] phi (byte) bd#117 = (byte~) bd#242 [phi:fb::@15->fc#1] -- register_copy 
+  //SEG394 [161] phi from fb::@14 to fc [phi:fb::@14->fc]
+  fc_from_b14:
+  //SEG395 [161] phi (byte) be#129 = (byte) be#122 [phi:fb::@14->fc#0] -- register_copy 
+  //SEG396 [161] phi (byte) bd#117 = (byte~) bd#242 [phi:fb::@14->fc#1] -- register_copy 
     jsr fc
-  //SEG397 [135] phi from fb::@15 fb::@4 to fb::@5 [phi:fb::@15/fb::@4->fb::@5]
-  b5_from_b15:
+  //SEG397 [135] phi from fb::@14 fb::@4 to fb::@5 [phi:fb::@14/fb::@4->fb::@5]
+  b5_from_b14:
   b5_from_b4:
-  //SEG398 [135] phi (byte) be#123 = (byte) be#46 [phi:fb::@15/fb::@4->fb::@5#0] -- register_copy 
-  //SEG399 [135] phi (byte) bd#111 = (byte) bd#152 [phi:fb::@15/fb::@4->fb::@5#1] -- register_copy 
+  //SEG398 [135] phi (byte) be#123 = (byte) be#46 [phi:fb::@14/fb::@4->fb::@5#0] -- register_copy 
+  //SEG399 [135] phi (byte) bd#111 = (byte) bd#152 [phi:fb::@14/fb::@4->fb::@5#1] -- register_copy 
     jmp b5
   //SEG400 fb::@5
   b5:
@@ -4163,25 +4205,25 @@ fb: {
     lda #5
     cmp bc_114
     bne b6_from_b5
-    jmp b16
-  //SEG402 fb::@16
-  b16:
+    jmp b15
+  //SEG402 fb::@15
+  b15:
   //SEG403 [137] (byte) bd#153 ← ++ (byte) bd#111 -- vbuz1=_inc_vbuz1 
     inc bd
   //SEG404 [138] (byte~) bd#243 ← (byte) bd#153 -- vbuz1=vbuz2 
     lda bd
     sta bd_243
   //SEG405 [139] call fc 
-  //SEG406 [161] phi from fb::@16 to fc [phi:fb::@16->fc]
-  fc_from_b16:
-  //SEG407 [161] phi (byte) be#129 = (byte) be#123 [phi:fb::@16->fc#0] -- register_copy 
-  //SEG408 [161] phi (byte) bd#117 = (byte~) bd#243 [phi:fb::@16->fc#1] -- register_copy 
+  //SEG406 [161] phi from fb::@15 to fc [phi:fb::@15->fc]
+  fc_from_b15:
+  //SEG407 [161] phi (byte) be#129 = (byte) be#123 [phi:fb::@15->fc#0] -- register_copy 
+  //SEG408 [161] phi (byte) bd#117 = (byte~) bd#243 [phi:fb::@15->fc#1] -- register_copy 
     jsr fc
-  //SEG409 [140] phi from fb::@16 fb::@5 to fb::@6 [phi:fb::@16/fb::@5->fb::@6]
-  b6_from_b16:
+  //SEG409 [140] phi from fb::@15 fb::@5 to fb::@6 [phi:fb::@15/fb::@5->fb::@6]
+  b6_from_b15:
   b6_from_b5:
-  //SEG410 [140] phi (byte) be#124 = (byte) be#46 [phi:fb::@16/fb::@5->fb::@6#0] -- register_copy 
-  //SEG411 [140] phi (byte) bd#112 = (byte) bd#153 [phi:fb::@16/fb::@5->fb::@6#1] -- register_copy 
+  //SEG410 [140] phi (byte) be#124 = (byte) be#46 [phi:fb::@15/fb::@5->fb::@6#0] -- register_copy 
+  //SEG411 [140] phi (byte) bd#112 = (byte) bd#153 [phi:fb::@15/fb::@5->fb::@6#1] -- register_copy 
     jmp b6
   //SEG412 fb::@6
   b6:
@@ -4189,25 +4231,25 @@ fb: {
     lda #6
     cmp bc_114
     bne b7_from_b6
-    jmp b17
-  //SEG414 fb::@17
-  b17:
+    jmp b16
+  //SEG414 fb::@16
+  b16:
   //SEG415 [142] (byte) bd#154 ← ++ (byte) bd#112 -- vbuz1=_inc_vbuz1 
     inc bd
   //SEG416 [143] (byte~) bd#244 ← (byte) bd#154 -- vbuz1=vbuz2 
     lda bd
     sta bd_244
   //SEG417 [144] call fc 
-  //SEG418 [161] phi from fb::@17 to fc [phi:fb::@17->fc]
-  fc_from_b17:
-  //SEG419 [161] phi (byte) be#129 = (byte) be#124 [phi:fb::@17->fc#0] -- register_copy 
-  //SEG420 [161] phi (byte) bd#117 = (byte~) bd#244 [phi:fb::@17->fc#1] -- register_copy 
+  //SEG418 [161] phi from fb::@16 to fc [phi:fb::@16->fc]
+  fc_from_b16:
+  //SEG419 [161] phi (byte) be#129 = (byte) be#124 [phi:fb::@16->fc#0] -- register_copy 
+  //SEG420 [161] phi (byte) bd#117 = (byte~) bd#244 [phi:fb::@16->fc#1] -- register_copy 
     jsr fc
-  //SEG421 [145] phi from fb::@17 fb::@6 to fb::@7 [phi:fb::@17/fb::@6->fb::@7]
-  b7_from_b17:
+  //SEG421 [145] phi from fb::@16 fb::@6 to fb::@7 [phi:fb::@16/fb::@6->fb::@7]
+  b7_from_b16:
   b7_from_b6:
-  //SEG422 [145] phi (byte) be#125 = (byte) be#46 [phi:fb::@17/fb::@6->fb::@7#0] -- register_copy 
-  //SEG423 [145] phi (byte) bd#113 = (byte) bd#154 [phi:fb::@17/fb::@6->fb::@7#1] -- register_copy 
+  //SEG422 [145] phi (byte) be#125 = (byte) be#46 [phi:fb::@16/fb::@6->fb::@7#0] -- register_copy 
+  //SEG423 [145] phi (byte) bd#113 = (byte) bd#154 [phi:fb::@16/fb::@6->fb::@7#1] -- register_copy 
     jmp b7
   //SEG424 fb::@7
   b7:
@@ -4215,25 +4257,25 @@ fb: {
     lda #7
     cmp bc_114
     bne b8_from_b7
-    jmp b18
-  //SEG426 fb::@18
-  b18:
+    jmp b17
+  //SEG426 fb::@17
+  b17:
   //SEG427 [147] (byte) bd#155 ← ++ (byte) bd#113 -- vbuz1=_inc_vbuz1 
     inc bd
   //SEG428 [148] (byte~) bd#245 ← (byte) bd#155 -- vbuz1=vbuz2 
     lda bd
     sta bd_245
   //SEG429 [149] call fc 
-  //SEG430 [161] phi from fb::@18 to fc [phi:fb::@18->fc]
-  fc_from_b18:
-  //SEG431 [161] phi (byte) be#129 = (byte) be#125 [phi:fb::@18->fc#0] -- register_copy 
-  //SEG432 [161] phi (byte) bd#117 = (byte~) bd#245 [phi:fb::@18->fc#1] -- register_copy 
+  //SEG430 [161] phi from fb::@17 to fc [phi:fb::@17->fc]
+  fc_from_b17:
+  //SEG431 [161] phi (byte) be#129 = (byte) be#125 [phi:fb::@17->fc#0] -- register_copy 
+  //SEG432 [161] phi (byte) bd#117 = (byte~) bd#245 [phi:fb::@17->fc#1] -- register_copy 
     jsr fc
-  //SEG433 [150] phi from fb::@18 fb::@7 to fb::@8 [phi:fb::@18/fb::@7->fb::@8]
-  b8_from_b18:
+  //SEG433 [150] phi from fb::@17 fb::@7 to fb::@8 [phi:fb::@17/fb::@7->fb::@8]
+  b8_from_b17:
   b8_from_b7:
-  //SEG434 [150] phi (byte) be#126 = (byte) be#46 [phi:fb::@18/fb::@7->fb::@8#0] -- register_copy 
-  //SEG435 [150] phi (byte) bd#114 = (byte) bd#155 [phi:fb::@18/fb::@7->fb::@8#1] -- register_copy 
+  //SEG434 [150] phi (byte) be#126 = (byte) be#46 [phi:fb::@17/fb::@7->fb::@8#0] -- register_copy 
+  //SEG435 [150] phi (byte) bd#114 = (byte) bd#155 [phi:fb::@17/fb::@7->fb::@8#1] -- register_copy 
     jmp b8
   //SEG436 fb::@8
   b8:
@@ -4241,25 +4283,25 @@ fb: {
     lda #8
     cmp bc_114
     bne b9_from_b8
-    jmp b19
-  //SEG438 fb::@19
-  b19:
+    jmp b18
+  //SEG438 fb::@18
+  b18:
   //SEG439 [152] (byte) bd#157 ← ++ (byte) bd#114 -- vbuz1=_inc_vbuz1 
     inc bd
   //SEG440 [153] (byte~) bd#246 ← (byte) bd#157 -- vbuz1=vbuz2 
     lda bd
     sta bd_246
   //SEG441 [154] call fc 
-  //SEG442 [161] phi from fb::@19 to fc [phi:fb::@19->fc]
-  fc_from_b19:
-  //SEG443 [161] phi (byte) be#129 = (byte) be#126 [phi:fb::@19->fc#0] -- register_copy 
-  //SEG444 [161] phi (byte) bd#117 = (byte~) bd#246 [phi:fb::@19->fc#1] -- register_copy 
+  //SEG442 [161] phi from fb::@18 to fc [phi:fb::@18->fc]
+  fc_from_b18:
+  //SEG443 [161] phi (byte) be#129 = (byte) be#126 [phi:fb::@18->fc#0] -- register_copy 
+  //SEG444 [161] phi (byte) bd#117 = (byte~) bd#246 [phi:fb::@18->fc#1] -- register_copy 
     jsr fc
-  //SEG445 [155] phi from fb::@19 fb::@8 to fb::@9 [phi:fb::@19/fb::@8->fb::@9]
-  b9_from_b19:
+  //SEG445 [155] phi from fb::@18 fb::@8 to fb::@9 [phi:fb::@18/fb::@8->fb::@9]
+  b9_from_b18:
   b9_from_b8:
-  //SEG446 [155] phi (byte) be#127 = (byte) be#46 [phi:fb::@19/fb::@8->fb::@9#0] -- register_copy 
-  //SEG447 [155] phi (byte) bd#115 = (byte) bd#157 [phi:fb::@19/fb::@8->fb::@9#1] -- register_copy 
+  //SEG446 [155] phi (byte) be#127 = (byte) be#46 [phi:fb::@18/fb::@8->fb::@9#0] -- register_copy 
+  //SEG447 [155] phi (byte) bd#115 = (byte) bd#157 [phi:fb::@18/fb::@8->fb::@9#1] -- register_copy 
     jmp b9
   //SEG448 fb::@9
   b9:
@@ -4267,23 +4309,23 @@ fb: {
     lda #9
     cmp bc_114
     bne breturn_from_b9
-  //SEG450 [157] phi from fb::@9 to fb::@20 [phi:fb::@9->fb::@20]
-  b20_from_b9:
-    jmp b20
-  //SEG451 fb::@20
-  b20:
+  //SEG450 [157] phi from fb::@9 to fb::@19 [phi:fb::@9->fb::@19]
+  b19_from_b9:
+    jmp b19
+  //SEG451 fb::@19
+  b19:
   //SEG452 [158] call fc 
-  //SEG453 [161] phi from fb::@20 to fc [phi:fb::@20->fc]
-  fc_from_b20:
-  //SEG454 [161] phi (byte) be#129 = (byte) be#127 [phi:fb::@20->fc#0] -- register_copy 
-  //SEG455 [161] phi (byte) bd#117 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@20->fc#1] -- vbuz1=vbuc1 
+  //SEG453 [161] phi from fb::@19 to fc [phi:fb::@19->fc]
+  fc_from_b19:
+  //SEG454 [161] phi (byte) be#129 = (byte) be#127 [phi:fb::@19->fc#0] -- register_copy 
+  //SEG455 [161] phi (byte) bd#117 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@19->fc#1] -- vbuz1=vbuc1 
     lda #0
     sta bd_117
     jsr fc
-  //SEG456 [159] phi from fb::@20 to fb::@return [phi:fb::@20->fb::@return]
-  breturn_from_b20:
-  //SEG457 [159] phi (byte) be#35 = (byte) be#46 [phi:fb::@20->fb::@return#0] -- register_copy 
-  //SEG458 [159] phi (byte) bd#35 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@20->fb::@return#1] -- vbuz1=vbuc1 
+  //SEG456 [159] phi from fb::@19 to fb::@return [phi:fb::@19->fb::@return]
+  breturn_from_b19:
+  //SEG457 [159] phi (byte) be#35 = (byte) be#46 [phi:fb::@19->fb::@return#0] -- register_copy 
+  //SEG458 [159] phi (byte) bd#35 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@19->fb::@return#1] -- vbuz1=vbuc1 
     lda #0
     sta bd
     jmp breturn
@@ -4303,15 +4345,15 @@ fc: {
     lda bd_117
     cmp #0
     bne b1_from_fc
-    jmp b11
-  //SEG466 fc::@11
-  b11:
+    jmp b10
+  //SEG466 fc::@10
+  b10:
   //SEG467 [163] (byte) be#36 ← ++ (byte) be#129 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG468 [164] phi from fc fc::@11 to fc::@1 [phi:fc/fc::@11->fc::@1]
+  //SEG468 [164] phi from fc fc::@10 to fc::@1 [phi:fc/fc::@10->fc::@1]
   b1_from_fc:
-  b1_from_b11:
-  //SEG469 [164] phi (byte) be#130 = (byte) be#129 [phi:fc/fc::@11->fc::@1#0] -- register_copy 
+  b1_from_b10:
+  //SEG469 [164] phi (byte) be#130 = (byte) be#129 [phi:fc/fc::@10->fc::@1#0] -- register_copy 
     jmp b1
   //SEG470 fc::@1
   b1:
@@ -4319,15 +4361,15 @@ fc: {
     lda #1
     cmp bd_117
     bne b2_from_b1
-    jmp b12
-  //SEG472 fc::@12
-  b12:
+    jmp b11
+  //SEG472 fc::@11
+  b11:
   //SEG473 [166] (byte) be#37 ← ++ (byte) be#130 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG474 [167] phi from fc::@1 fc::@12 to fc::@2 [phi:fc::@1/fc::@12->fc::@2]
+  //SEG474 [167] phi from fc::@1 fc::@11 to fc::@2 [phi:fc::@1/fc::@11->fc::@2]
   b2_from_b1:
-  b2_from_b12:
-  //SEG475 [167] phi (byte) be#131 = (byte) be#130 [phi:fc::@1/fc::@12->fc::@2#0] -- register_copy 
+  b2_from_b11:
+  //SEG475 [167] phi (byte) be#131 = (byte) be#130 [phi:fc::@1/fc::@11->fc::@2#0] -- register_copy 
     jmp b2
   //SEG476 fc::@2
   b2:
@@ -4335,15 +4377,15 @@ fc: {
     lda #2
     cmp bd_117
     bne b3_from_b2
-    jmp b13
-  //SEG478 fc::@13
-  b13:
+    jmp b12
+  //SEG478 fc::@12
+  b12:
   //SEG479 [169] (byte) be#38 ← ++ (byte) be#131 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG480 [170] phi from fc::@13 fc::@2 to fc::@3 [phi:fc::@13/fc::@2->fc::@3]
-  b3_from_b13:
+  //SEG480 [170] phi from fc::@12 fc::@2 to fc::@3 [phi:fc::@12/fc::@2->fc::@3]
+  b3_from_b12:
   b3_from_b2:
-  //SEG481 [170] phi (byte) be#132 = (byte) be#38 [phi:fc::@13/fc::@2->fc::@3#0] -- register_copy 
+  //SEG481 [170] phi (byte) be#132 = (byte) be#38 [phi:fc::@12/fc::@2->fc::@3#0] -- register_copy 
     jmp b3
   //SEG482 fc::@3
   b3:
@@ -4351,15 +4393,15 @@ fc: {
     lda #3
     cmp bd_117
     bne b4_from_b3
-    jmp b14
-  //SEG484 fc::@14
-  b14:
+    jmp b13
+  //SEG484 fc::@13
+  b13:
   //SEG485 [172] (byte) be#39 ← ++ (byte) be#132 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG486 [173] phi from fc::@14 fc::@3 to fc::@4 [phi:fc::@14/fc::@3->fc::@4]
-  b4_from_b14:
+  //SEG486 [173] phi from fc::@13 fc::@3 to fc::@4 [phi:fc::@13/fc::@3->fc::@4]
+  b4_from_b13:
   b4_from_b3:
-  //SEG487 [173] phi (byte) be#133 = (byte) be#39 [phi:fc::@14/fc::@3->fc::@4#0] -- register_copy 
+  //SEG487 [173] phi (byte) be#133 = (byte) be#39 [phi:fc::@13/fc::@3->fc::@4#0] -- register_copy 
     jmp b4
   //SEG488 fc::@4
   b4:
@@ -4367,15 +4409,15 @@ fc: {
     lda #4
     cmp bd_117
     bne b5_from_b4
-    jmp b15
-  //SEG490 fc::@15
-  b15:
+    jmp b14
+  //SEG490 fc::@14
+  b14:
   //SEG491 [175] (byte) be#40 ← ++ (byte) be#133 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG492 [176] phi from fc::@15 fc::@4 to fc::@5 [phi:fc::@15/fc::@4->fc::@5]
-  b5_from_b15:
+  //SEG492 [176] phi from fc::@14 fc::@4 to fc::@5 [phi:fc::@14/fc::@4->fc::@5]
+  b5_from_b14:
   b5_from_b4:
-  //SEG493 [176] phi (byte) be#134 = (byte) be#40 [phi:fc::@15/fc::@4->fc::@5#0] -- register_copy 
+  //SEG493 [176] phi (byte) be#134 = (byte) be#40 [phi:fc::@14/fc::@4->fc::@5#0] -- register_copy 
     jmp b5
   //SEG494 fc::@5
   b5:
@@ -4383,15 +4425,15 @@ fc: {
     lda #5
     cmp bd_117
     bne b6_from_b5
-    jmp b16
-  //SEG496 fc::@16
-  b16:
+    jmp b15
+  //SEG496 fc::@15
+  b15:
   //SEG497 [178] (byte) be#41 ← ++ (byte) be#134 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG498 [179] phi from fc::@16 fc::@5 to fc::@6 [phi:fc::@16/fc::@5->fc::@6]
-  b6_from_b16:
+  //SEG498 [179] phi from fc::@15 fc::@5 to fc::@6 [phi:fc::@15/fc::@5->fc::@6]
+  b6_from_b15:
   b6_from_b5:
-  //SEG499 [179] phi (byte) be#135 = (byte) be#41 [phi:fc::@16/fc::@5->fc::@6#0] -- register_copy 
+  //SEG499 [179] phi (byte) be#135 = (byte) be#41 [phi:fc::@15/fc::@5->fc::@6#0] -- register_copy 
     jmp b6
   //SEG500 fc::@6
   b6:
@@ -4399,15 +4441,15 @@ fc: {
     lda #6
     cmp bd_117
     bne b7_from_b6
-    jmp b17
-  //SEG502 fc::@17
-  b17:
+    jmp b16
+  //SEG502 fc::@16
+  b16:
   //SEG503 [181] (byte) be#42 ← ++ (byte) be#135 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG504 [182] phi from fc::@17 fc::@6 to fc::@7 [phi:fc::@17/fc::@6->fc::@7]
-  b7_from_b17:
+  //SEG504 [182] phi from fc::@16 fc::@6 to fc::@7 [phi:fc::@16/fc::@6->fc::@7]
+  b7_from_b16:
   b7_from_b6:
-  //SEG505 [182] phi (byte) be#136 = (byte) be#42 [phi:fc::@17/fc::@6->fc::@7#0] -- register_copy 
+  //SEG505 [182] phi (byte) be#136 = (byte) be#42 [phi:fc::@16/fc::@6->fc::@7#0] -- register_copy 
     jmp b7
   //SEG506 fc::@7
   b7:
@@ -4415,15 +4457,15 @@ fc: {
     lda #7
     cmp bd_117
     bne b8_from_b7
-    jmp b18
-  //SEG508 fc::@18
-  b18:
+    jmp b17
+  //SEG508 fc::@17
+  b17:
   //SEG509 [184] (byte) be#43 ← ++ (byte) be#136 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG510 [185] phi from fc::@18 fc::@7 to fc::@8 [phi:fc::@18/fc::@7->fc::@8]
-  b8_from_b18:
+  //SEG510 [185] phi from fc::@17 fc::@7 to fc::@8 [phi:fc::@17/fc::@7->fc::@8]
+  b8_from_b17:
   b8_from_b7:
-  //SEG511 [185] phi (byte) be#137 = (byte) be#43 [phi:fc::@18/fc::@7->fc::@8#0] -- register_copy 
+  //SEG511 [185] phi (byte) be#137 = (byte) be#43 [phi:fc::@17/fc::@7->fc::@8#0] -- register_copy 
     jmp b8
   //SEG512 fc::@8
   b8:
@@ -4431,22 +4473,22 @@ fc: {
     lda #8
     cmp bd_117
     bne b9_from_b8
-    jmp b19
-  //SEG514 fc::@19
-  b19:
+    jmp b18
+  //SEG514 fc::@18
+  b18:
   //SEG515 [187] (byte) be#44 ← ++ (byte) be#137 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG516 [188] phi from fc::@19 fc::@8 to fc::@9 [phi:fc::@19/fc::@8->fc::@9]
-  b9_from_b19:
+  //SEG516 [188] phi from fc::@18 fc::@8 to fc::@9 [phi:fc::@18/fc::@8->fc::@9]
+  b9_from_b18:
   b9_from_b8:
-  //SEG517 [188] phi (byte) be#138 = (byte) be#44 [phi:fc::@19/fc::@8->fc::@9#0] -- register_copy 
+  //SEG517 [188] phi (byte) be#138 = (byte) be#44 [phi:fc::@18/fc::@8->fc::@9#0] -- register_copy 
     jmp b9
   //SEG518 fc::@9
   b9:
-  //SEG519 [189] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fc::@30 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG519 [189] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fc::@19 -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp bd_117
-    bne b30_from_b9
+    bne b19_from_b9
   //SEG520 [190] phi from fc::@9 to fc::@return [phi:fc::@9->fc::@return]
   breturn_from_b9:
   //SEG521 [190] phi (byte) be#46 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fc::@9->fc::@return#0] -- vbuz1=vbuc1 
@@ -4457,14 +4499,14 @@ fc: {
   breturn:
   //SEG523 [191] return 
     rts
-  //SEG524 [192] phi from fc::@9 to fc::@30 [phi:fc::@9->fc::@30]
-  b30_from_b9:
-    jmp b30
-  //SEG525 fc::@30
-  b30:
-  //SEG526 [190] phi from fc::@30 to fc::@return [phi:fc::@30->fc::@return]
-  breturn_from_b30:
-  //SEG527 [190] phi (byte) be#46 = (byte) be#138 [phi:fc::@30->fc::@return#0] -- register_copy 
+  //SEG524 [192] phi from fc::@9 to fc::@19 [phi:fc::@9->fc::@19]
+  b19_from_b9:
+    jmp b19
+  //SEG525 fc::@19
+  b19:
+  //SEG526 [190] phi from fc::@19 to fc::@return [phi:fc::@19->fc::@return]
+  breturn_from_b19:
+  //SEG527 [190] phi (byte) be#46 = (byte) be#138 [phi:fc::@19->fc::@return#0] -- register_copy 
     jmp breturn
 }
 
@@ -4531,17 +4573,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label bb_109 = 4
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-main_from_b5:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -4572,18 +4614,18 @@ main: {
   b2:
   //SEG20 [7] call f0 
     jsr f0
-    jmp b7
-  //SEG21 main::@7
-  b7:
+    jmp b3
+  //SEG21 main::@3
+  b3:
   //SEG22 [8] (byte) ba#1 ← ++ (byte) ba#17 -- vbuz1=_inc_vbuz1 
     inc ba
-  //SEG23 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG24 [5] phi (byte) ba#17 = (byte) ba#1 [phi:main::@7->main::@1#0] -- register_copy 
-  //SEG25 [5] phi (byte) be#2 = (byte) be#13 [phi:main::@7->main::@1#1] -- register_copy 
-  //SEG26 [5] phi (byte) bd#2 = (byte) bd#13 [phi:main::@7->main::@1#2] -- register_copy 
-  //SEG27 [5] phi (byte) bc#2 = (byte) bc#13 [phi:main::@7->main::@1#3] -- register_copy 
-  //SEG28 [5] phi (byte) bb#16 = (byte) bb#13 [phi:main::@7->main::@1#4] -- register_copy 
+  //SEG23 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG24 [5] phi (byte) ba#17 = (byte) ba#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG25 [5] phi (byte) be#2 = (byte) be#13 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG26 [5] phi (byte) bd#2 = (byte) bd#13 [phi:main::@3->main::@1#2] -- register_copy 
+  //SEG27 [5] phi (byte) bc#2 = (byte) bc#13 [phi:main::@3->main::@1#3] -- register_copy 
+  //SEG28 [5] phi (byte) bb#16 = (byte) bb#13 [phi:main::@3->main::@1#4] -- register_copy 
     jmp b1
 }
 //SEG29 f0
@@ -4592,29 +4634,29 @@ f0: {
     lda ba
     cmp #0
     bne b1_from_f0
-    jmp b11
-  //SEG31 f0::@11
-  b11:
+    jmp b10
+  //SEG31 f0::@10
+  b10:
   //SEG32 [10] (byte) bb#3 ← ++ (byte) bb#16 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG33 [11] (byte~) bb#101 ← (byte) bb#3 -- vbuz1=vbuz2 
     lda bb
     sta bb_101
   //SEG34 [12] call fa 
-  //SEG35 [59] phi from f0::@11 to fa [phi:f0::@11->fa]
-  fa_from_b11:
-  //SEG36 [59] phi (byte) be#107 = (byte) be#2 [phi:f0::@11->fa#0] -- register_copy 
-  //SEG37 [59] phi (byte) bd#138 = (byte) bd#2 [phi:f0::@11->fa#1] -- register_copy 
-  //SEG38 [59] phi (byte) bc#39 = (byte) bc#2 [phi:f0::@11->fa#2] -- register_copy 
-  //SEG39 [59] phi (byte) bb#27 = (byte~) bb#101 [phi:f0::@11->fa#3] -- register_copy 
+  //SEG35 [59] phi from f0::@10 to fa [phi:f0::@10->fa]
+  fa_from_b10:
+  //SEG36 [59] phi (byte) be#107 = (byte) be#2 [phi:f0::@10->fa#0] -- register_copy 
+  //SEG37 [59] phi (byte) bd#138 = (byte) bd#2 [phi:f0::@10->fa#1] -- register_copy 
+  //SEG38 [59] phi (byte) bc#39 = (byte) bc#2 [phi:f0::@10->fa#2] -- register_copy 
+  //SEG39 [59] phi (byte) bb#27 = (byte~) bb#101 [phi:f0::@10->fa#3] -- register_copy 
     jsr fa
-  //SEG40 [13] phi from f0 f0::@11 to f0::@1 [phi:f0/f0::@11->f0::@1]
+  //SEG40 [13] phi from f0 f0::@10 to f0::@1 [phi:f0/f0::@10->f0::@1]
   b1_from_f0:
-  b1_from_b11:
-  //SEG41 [13] phi (byte) be#142 = (byte) be#2 [phi:f0/f0::@11->f0::@1#0] -- register_copy 
-  //SEG42 [13] phi (byte) bd#129 = (byte) bd#2 [phi:f0/f0::@11->f0::@1#1] -- register_copy 
-  //SEG43 [13] phi (byte) bc#63 = (byte) bc#2 [phi:f0/f0::@11->f0::@1#2] -- register_copy 
-  //SEG44 [13] phi (byte) bb#18 = (byte) bb#16 [phi:f0/f0::@11->f0::@1#3] -- register_copy 
+  b1_from_b10:
+  //SEG41 [13] phi (byte) be#142 = (byte) be#2 [phi:f0/f0::@10->f0::@1#0] -- register_copy 
+  //SEG42 [13] phi (byte) bd#129 = (byte) bd#2 [phi:f0/f0::@10->f0::@1#1] -- register_copy 
+  //SEG43 [13] phi (byte) bc#63 = (byte) bc#2 [phi:f0/f0::@10->f0::@1#2] -- register_copy 
+  //SEG44 [13] phi (byte) bb#18 = (byte) bb#16 [phi:f0/f0::@10->f0::@1#3] -- register_copy 
     jmp b1
   //SEG45 f0::@1
   b1:
@@ -4622,29 +4664,29 @@ f0: {
     lda #1
     cmp ba
     bne b2_from_b1
-    jmp b12
-  //SEG47 f0::@12
-  b12:
+    jmp b11
+  //SEG47 f0::@11
+  b11:
   //SEG48 [15] (byte) bb#4 ← ++ (byte) bb#18 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG49 [16] (byte~) bb#102 ← (byte) bb#4 -- vbuz1=vbuz2 
     lda bb
     sta bb_102
   //SEG50 [17] call fa 
-  //SEG51 [59] phi from f0::@12 to fa [phi:f0::@12->fa]
-  fa_from_b12:
-  //SEG52 [59] phi (byte) be#107 = (byte) be#142 [phi:f0::@12->fa#0] -- register_copy 
-  //SEG53 [59] phi (byte) bd#138 = (byte) bd#129 [phi:f0::@12->fa#1] -- register_copy 
-  //SEG54 [59] phi (byte) bc#39 = (byte) bc#63 [phi:f0::@12->fa#2] -- register_copy 
-  //SEG55 [59] phi (byte) bb#27 = (byte~) bb#102 [phi:f0::@12->fa#3] -- register_copy 
+  //SEG51 [59] phi from f0::@11 to fa [phi:f0::@11->fa]
+  fa_from_b11:
+  //SEG52 [59] phi (byte) be#107 = (byte) be#142 [phi:f0::@11->fa#0] -- register_copy 
+  //SEG53 [59] phi (byte) bd#138 = (byte) bd#129 [phi:f0::@11->fa#1] -- register_copy 
+  //SEG54 [59] phi (byte) bc#39 = (byte) bc#63 [phi:f0::@11->fa#2] -- register_copy 
+  //SEG55 [59] phi (byte) bb#27 = (byte~) bb#102 [phi:f0::@11->fa#3] -- register_copy 
     jsr fa
-  //SEG56 [18] phi from f0::@1 f0::@12 to f0::@2 [phi:f0::@1/f0::@12->f0::@2]
+  //SEG56 [18] phi from f0::@1 f0::@11 to f0::@2 [phi:f0::@1/f0::@11->f0::@2]
   b2_from_b1:
-  b2_from_b12:
-  //SEG57 [18] phi (byte) be#143 = (byte) be#142 [phi:f0::@1/f0::@12->f0::@2#0] -- register_copy 
-  //SEG58 [18] phi (byte) bd#130 = (byte) bd#129 [phi:f0::@1/f0::@12->f0::@2#1] -- register_copy 
-  //SEG59 [18] phi (byte) bc#64 = (byte) bc#63 [phi:f0::@1/f0::@12->f0::@2#2] -- register_copy 
-  //SEG60 [18] phi (byte) bb#19 = (byte) bb#18 [phi:f0::@1/f0::@12->f0::@2#3] -- register_copy 
+  b2_from_b11:
+  //SEG57 [18] phi (byte) be#143 = (byte) be#142 [phi:f0::@1/f0::@11->f0::@2#0] -- register_copy 
+  //SEG58 [18] phi (byte) bd#130 = (byte) bd#129 [phi:f0::@1/f0::@11->f0::@2#1] -- register_copy 
+  //SEG59 [18] phi (byte) bc#64 = (byte) bc#63 [phi:f0::@1/f0::@11->f0::@2#2] -- register_copy 
+  //SEG60 [18] phi (byte) bb#19 = (byte) bb#18 [phi:f0::@1/f0::@11->f0::@2#3] -- register_copy 
     jmp b2
   //SEG61 f0::@2
   b2:
@@ -4652,29 +4694,29 @@ f0: {
     lda #2
     cmp ba
     bne b3_from_b2
-    jmp b13
-  //SEG63 f0::@13
-  b13:
+    jmp b12
+  //SEG63 f0::@12
+  b12:
   //SEG64 [20] (byte) bb#5 ← ++ (byte) bb#19 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG65 [21] (byte~) bb#103 ← (byte) bb#5 -- vbuz1=vbuz2 
     lda bb
     sta bb_103
   //SEG66 [22] call fa 
-  //SEG67 [59] phi from f0::@13 to fa [phi:f0::@13->fa]
-  fa_from_b13:
-  //SEG68 [59] phi (byte) be#107 = (byte) be#143 [phi:f0::@13->fa#0] -- register_copy 
-  //SEG69 [59] phi (byte) bd#138 = (byte) bd#130 [phi:f0::@13->fa#1] -- register_copy 
-  //SEG70 [59] phi (byte) bc#39 = (byte) bc#64 [phi:f0::@13->fa#2] -- register_copy 
-  //SEG71 [59] phi (byte) bb#27 = (byte~) bb#103 [phi:f0::@13->fa#3] -- register_copy 
+  //SEG67 [59] phi from f0::@12 to fa [phi:f0::@12->fa]
+  fa_from_b12:
+  //SEG68 [59] phi (byte) be#107 = (byte) be#143 [phi:f0::@12->fa#0] -- register_copy 
+  //SEG69 [59] phi (byte) bd#138 = (byte) bd#130 [phi:f0::@12->fa#1] -- register_copy 
+  //SEG70 [59] phi (byte) bc#39 = (byte) bc#64 [phi:f0::@12->fa#2] -- register_copy 
+  //SEG71 [59] phi (byte) bb#27 = (byte~) bb#103 [phi:f0::@12->fa#3] -- register_copy 
     jsr fa
-  //SEG72 [23] phi from f0::@13 f0::@2 to f0::@3 [phi:f0::@13/f0::@2->f0::@3]
-  b3_from_b13:
+  //SEG72 [23] phi from f0::@12 f0::@2 to f0::@3 [phi:f0::@12/f0::@2->f0::@3]
+  b3_from_b12:
   b3_from_b2:
-  //SEG73 [23] phi (byte) be#144 = (byte) be#24 [phi:f0::@13/f0::@2->f0::@3#0] -- register_copy 
-  //SEG74 [23] phi (byte) bd#131 = (byte) bd#24 [phi:f0::@13/f0::@2->f0::@3#1] -- register_copy 
-  //SEG75 [23] phi (byte) bc#65 = (byte) bc#24 [phi:f0::@13/f0::@2->f0::@3#2] -- register_copy 
-  //SEG76 [23] phi (byte) bb#20 = (byte) bb#5 [phi:f0::@13/f0::@2->f0::@3#3] -- register_copy 
+  //SEG73 [23] phi (byte) be#144 = (byte) be#24 [phi:f0::@12/f0::@2->f0::@3#0] -- register_copy 
+  //SEG74 [23] phi (byte) bd#131 = (byte) bd#24 [phi:f0::@12/f0::@2->f0::@3#1] -- register_copy 
+  //SEG75 [23] phi (byte) bc#65 = (byte) bc#24 [phi:f0::@12/f0::@2->f0::@3#2] -- register_copy 
+  //SEG76 [23] phi (byte) bb#20 = (byte) bb#5 [phi:f0::@12/f0::@2->f0::@3#3] -- register_copy 
     jmp b3
   //SEG77 f0::@3
   b3:
@@ -4682,29 +4724,29 @@ f0: {
     lda #3
     cmp ba
     bne b4_from_b3
-    jmp b14
-  //SEG79 f0::@14
-  b14:
+    jmp b13
+  //SEG79 f0::@13
+  b13:
   //SEG80 [25] (byte) bb#6 ← ++ (byte) bb#20 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG81 [26] (byte~) bb#104 ← (byte) bb#6 -- vbuz1=vbuz2 
     lda bb
     sta bb_104
   //SEG82 [27] call fa 
-  //SEG83 [59] phi from f0::@14 to fa [phi:f0::@14->fa]
-  fa_from_b14:
-  //SEG84 [59] phi (byte) be#107 = (byte) be#144 [phi:f0::@14->fa#0] -- register_copy 
-  //SEG85 [59] phi (byte) bd#138 = (byte) bd#131 [phi:f0::@14->fa#1] -- register_copy 
-  //SEG86 [59] phi (byte) bc#39 = (byte) bc#65 [phi:f0::@14->fa#2] -- register_copy 
-  //SEG87 [59] phi (byte) bb#27 = (byte~) bb#104 [phi:f0::@14->fa#3] -- register_copy 
+  //SEG83 [59] phi from f0::@13 to fa [phi:f0::@13->fa]
+  fa_from_b13:
+  //SEG84 [59] phi (byte) be#107 = (byte) be#144 [phi:f0::@13->fa#0] -- register_copy 
+  //SEG85 [59] phi (byte) bd#138 = (byte) bd#131 [phi:f0::@13->fa#1] -- register_copy 
+  //SEG86 [59] phi (byte) bc#39 = (byte) bc#65 [phi:f0::@13->fa#2] -- register_copy 
+  //SEG87 [59] phi (byte) bb#27 = (byte~) bb#104 [phi:f0::@13->fa#3] -- register_copy 
     jsr fa
-  //SEG88 [28] phi from f0::@14 f0::@3 to f0::@4 [phi:f0::@14/f0::@3->f0::@4]
-  b4_from_b14:
+  //SEG88 [28] phi from f0::@13 f0::@3 to f0::@4 [phi:f0::@13/f0::@3->f0::@4]
+  b4_from_b13:
   b4_from_b3:
-  //SEG89 [28] phi (byte) be#100 = (byte) be#24 [phi:f0::@14/f0::@3->f0::@4#0] -- register_copy 
-  //SEG90 [28] phi (byte) bd#132 = (byte) bd#24 [phi:f0::@14/f0::@3->f0::@4#1] -- register_copy 
-  //SEG91 [28] phi (byte) bc#66 = (byte) bc#24 [phi:f0::@14/f0::@3->f0::@4#2] -- register_copy 
-  //SEG92 [28] phi (byte) bb#21 = (byte) bb#6 [phi:f0::@14/f0::@3->f0::@4#3] -- register_copy 
+  //SEG89 [28] phi (byte) be#100 = (byte) be#24 [phi:f0::@13/f0::@3->f0::@4#0] -- register_copy 
+  //SEG90 [28] phi (byte) bd#132 = (byte) bd#24 [phi:f0::@13/f0::@3->f0::@4#1] -- register_copy 
+  //SEG91 [28] phi (byte) bc#66 = (byte) bc#24 [phi:f0::@13/f0::@3->f0::@4#2] -- register_copy 
+  //SEG92 [28] phi (byte) bb#21 = (byte) bb#6 [phi:f0::@13/f0::@3->f0::@4#3] -- register_copy 
     jmp b4
   //SEG93 f0::@4
   b4:
@@ -4712,29 +4754,29 @@ f0: {
     lda #4
     cmp ba
     bne b5_from_b4
-    jmp b15
-  //SEG95 f0::@15
-  b15:
+    jmp b14
+  //SEG95 f0::@14
+  b14:
   //SEG96 [30] (byte) bb#66 ← ++ (byte) bb#21 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG97 [31] (byte~) bb#105 ← (byte) bb#66 -- vbuz1=vbuz2 
     lda bb
     sta bb_105
   //SEG98 [32] call fa 
-  //SEG99 [59] phi from f0::@15 to fa [phi:f0::@15->fa]
-  fa_from_b15:
-  //SEG100 [59] phi (byte) be#107 = (byte) be#100 [phi:f0::@15->fa#0] -- register_copy 
-  //SEG101 [59] phi (byte) bd#138 = (byte) bd#132 [phi:f0::@15->fa#1] -- register_copy 
-  //SEG102 [59] phi (byte) bc#39 = (byte) bc#66 [phi:f0::@15->fa#2] -- register_copy 
-  //SEG103 [59] phi (byte) bb#27 = (byte~) bb#105 [phi:f0::@15->fa#3] -- register_copy 
+  //SEG99 [59] phi from f0::@14 to fa [phi:f0::@14->fa]
+  fa_from_b14:
+  //SEG100 [59] phi (byte) be#107 = (byte) be#100 [phi:f0::@14->fa#0] -- register_copy 
+  //SEG101 [59] phi (byte) bd#138 = (byte) bd#132 [phi:f0::@14->fa#1] -- register_copy 
+  //SEG102 [59] phi (byte) bc#39 = (byte) bc#66 [phi:f0::@14->fa#2] -- register_copy 
+  //SEG103 [59] phi (byte) bb#27 = (byte~) bb#105 [phi:f0::@14->fa#3] -- register_copy 
     jsr fa
-  //SEG104 [33] phi from f0::@15 f0::@4 to f0::@5 [phi:f0::@15/f0::@4->f0::@5]
-  b5_from_b15:
+  //SEG104 [33] phi from f0::@14 f0::@4 to f0::@5 [phi:f0::@14/f0::@4->f0::@5]
+  b5_from_b14:
   b5_from_b4:
-  //SEG105 [33] phi (byte) be#101 = (byte) be#24 [phi:f0::@15/f0::@4->f0::@5#0] -- register_copy 
-  //SEG106 [33] phi (byte) bd#133 = (byte) bd#24 [phi:f0::@15/f0::@4->f0::@5#1] -- register_copy 
-  //SEG107 [33] phi (byte) bc#100 = (byte) bc#24 [phi:f0::@15/f0::@4->f0::@5#2] -- register_copy 
-  //SEG108 [33] phi (byte) bb#22 = (byte) bb#66 [phi:f0::@15/f0::@4->f0::@5#3] -- register_copy 
+  //SEG105 [33] phi (byte) be#101 = (byte) be#24 [phi:f0::@14/f0::@4->f0::@5#0] -- register_copy 
+  //SEG106 [33] phi (byte) bd#133 = (byte) bd#24 [phi:f0::@14/f0::@4->f0::@5#1] -- register_copy 
+  //SEG107 [33] phi (byte) bc#100 = (byte) bc#24 [phi:f0::@14/f0::@4->f0::@5#2] -- register_copy 
+  //SEG108 [33] phi (byte) bb#22 = (byte) bb#66 [phi:f0::@14/f0::@4->f0::@5#3] -- register_copy 
     jmp b5
   //SEG109 f0::@5
   b5:
@@ -4742,29 +4784,29 @@ f0: {
     lda #5
     cmp ba
     bne b6_from_b5
-    jmp b16
-  //SEG111 f0::@16
-  b16:
+    jmp b15
+  //SEG111 f0::@15
+  b15:
   //SEG112 [35] (byte) bb#67 ← ++ (byte) bb#22 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG113 [36] (byte~) bb#106 ← (byte) bb#67 -- vbuz1=vbuz2 
     lda bb
     sta bb_106
   //SEG114 [37] call fa 
-  //SEG115 [59] phi from f0::@16 to fa [phi:f0::@16->fa]
-  fa_from_b16:
-  //SEG116 [59] phi (byte) be#107 = (byte) be#101 [phi:f0::@16->fa#0] -- register_copy 
-  //SEG117 [59] phi (byte) bd#138 = (byte) bd#133 [phi:f0::@16->fa#1] -- register_copy 
-  //SEG118 [59] phi (byte) bc#39 = (byte) bc#100 [phi:f0::@16->fa#2] -- register_copy 
-  //SEG119 [59] phi (byte) bb#27 = (byte~) bb#106 [phi:f0::@16->fa#3] -- register_copy 
+  //SEG115 [59] phi from f0::@15 to fa [phi:f0::@15->fa]
+  fa_from_b15:
+  //SEG116 [59] phi (byte) be#107 = (byte) be#101 [phi:f0::@15->fa#0] -- register_copy 
+  //SEG117 [59] phi (byte) bd#138 = (byte) bd#133 [phi:f0::@15->fa#1] -- register_copy 
+  //SEG118 [59] phi (byte) bc#39 = (byte) bc#100 [phi:f0::@15->fa#2] -- register_copy 
+  //SEG119 [59] phi (byte) bb#27 = (byte~) bb#106 [phi:f0::@15->fa#3] -- register_copy 
     jsr fa
-  //SEG120 [38] phi from f0::@16 f0::@5 to f0::@6 [phi:f0::@16/f0::@5->f0::@6]
-  b6_from_b16:
+  //SEG120 [38] phi from f0::@15 f0::@5 to f0::@6 [phi:f0::@15/f0::@5->f0::@6]
+  b6_from_b15:
   b6_from_b5:
-  //SEG121 [38] phi (byte) be#102 = (byte) be#24 [phi:f0::@16/f0::@5->f0::@6#0] -- register_copy 
-  //SEG122 [38] phi (byte) bd#134 = (byte) bd#24 [phi:f0::@16/f0::@5->f0::@6#1] -- register_copy 
-  //SEG123 [38] phi (byte) bc#101 = (byte) bc#24 [phi:f0::@16/f0::@5->f0::@6#2] -- register_copy 
-  //SEG124 [38] phi (byte) bb#23 = (byte) bb#67 [phi:f0::@16/f0::@5->f0::@6#3] -- register_copy 
+  //SEG121 [38] phi (byte) be#102 = (byte) be#24 [phi:f0::@15/f0::@5->f0::@6#0] -- register_copy 
+  //SEG122 [38] phi (byte) bd#134 = (byte) bd#24 [phi:f0::@15/f0::@5->f0::@6#1] -- register_copy 
+  //SEG123 [38] phi (byte) bc#101 = (byte) bc#24 [phi:f0::@15/f0::@5->f0::@6#2] -- register_copy 
+  //SEG124 [38] phi (byte) bb#23 = (byte) bb#67 [phi:f0::@15/f0::@5->f0::@6#3] -- register_copy 
     jmp b6
   //SEG125 f0::@6
   b6:
@@ -4772,29 +4814,29 @@ f0: {
     lda #6
     cmp ba
     bne b7_from_b6
-    jmp b17
-  //SEG127 f0::@17
-  b17:
+    jmp b16
+  //SEG127 f0::@16
+  b16:
   //SEG128 [40] (byte) bb#68 ← ++ (byte) bb#23 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG129 [41] (byte~) bb#107 ← (byte) bb#68 -- vbuz1=vbuz2 
     lda bb
     sta bb_107
   //SEG130 [42] call fa 
-  //SEG131 [59] phi from f0::@17 to fa [phi:f0::@17->fa]
-  fa_from_b17:
-  //SEG132 [59] phi (byte) be#107 = (byte) be#102 [phi:f0::@17->fa#0] -- register_copy 
-  //SEG133 [59] phi (byte) bd#138 = (byte) bd#134 [phi:f0::@17->fa#1] -- register_copy 
-  //SEG134 [59] phi (byte) bc#39 = (byte) bc#101 [phi:f0::@17->fa#2] -- register_copy 
-  //SEG135 [59] phi (byte) bb#27 = (byte~) bb#107 [phi:f0::@17->fa#3] -- register_copy 
+  //SEG131 [59] phi from f0::@16 to fa [phi:f0::@16->fa]
+  fa_from_b16:
+  //SEG132 [59] phi (byte) be#107 = (byte) be#102 [phi:f0::@16->fa#0] -- register_copy 
+  //SEG133 [59] phi (byte) bd#138 = (byte) bd#134 [phi:f0::@16->fa#1] -- register_copy 
+  //SEG134 [59] phi (byte) bc#39 = (byte) bc#101 [phi:f0::@16->fa#2] -- register_copy 
+  //SEG135 [59] phi (byte) bb#27 = (byte~) bb#107 [phi:f0::@16->fa#3] -- register_copy 
     jsr fa
-  //SEG136 [43] phi from f0::@17 f0::@6 to f0::@7 [phi:f0::@17/f0::@6->f0::@7]
-  b7_from_b17:
+  //SEG136 [43] phi from f0::@16 f0::@6 to f0::@7 [phi:f0::@16/f0::@6->f0::@7]
+  b7_from_b16:
   b7_from_b6:
-  //SEG137 [43] phi (byte) be#103 = (byte) be#24 [phi:f0::@17/f0::@6->f0::@7#0] -- register_copy 
-  //SEG138 [43] phi (byte) bd#135 = (byte) bd#24 [phi:f0::@17/f0::@6->f0::@7#1] -- register_copy 
-  //SEG139 [43] phi (byte) bc#102 = (byte) bc#24 [phi:f0::@17/f0::@6->f0::@7#2] -- register_copy 
-  //SEG140 [43] phi (byte) bb#24 = (byte) bb#68 [phi:f0::@17/f0::@6->f0::@7#3] -- register_copy 
+  //SEG137 [43] phi (byte) be#103 = (byte) be#24 [phi:f0::@16/f0::@6->f0::@7#0] -- register_copy 
+  //SEG138 [43] phi (byte) bd#135 = (byte) bd#24 [phi:f0::@16/f0::@6->f0::@7#1] -- register_copy 
+  //SEG139 [43] phi (byte) bc#102 = (byte) bc#24 [phi:f0::@16/f0::@6->f0::@7#2] -- register_copy 
+  //SEG140 [43] phi (byte) bb#24 = (byte) bb#68 [phi:f0::@16/f0::@6->f0::@7#3] -- register_copy 
     jmp b7
   //SEG141 f0::@7
   b7:
@@ -4802,29 +4844,29 @@ f0: {
     lda #7
     cmp ba
     bne b8_from_b7
-    jmp b18
-  //SEG143 f0::@18
-  b18:
+    jmp b17
+  //SEG143 f0::@17
+  b17:
   //SEG144 [45] (byte) bb#10 ← ++ (byte) bb#24 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG145 [46] (byte~) bb#108 ← (byte) bb#10 -- vbuz1=vbuz2 
     lda bb
     sta bb_108
   //SEG146 [47] call fa 
-  //SEG147 [59] phi from f0::@18 to fa [phi:f0::@18->fa]
-  fa_from_b18:
-  //SEG148 [59] phi (byte) be#107 = (byte) be#103 [phi:f0::@18->fa#0] -- register_copy 
-  //SEG149 [59] phi (byte) bd#138 = (byte) bd#135 [phi:f0::@18->fa#1] -- register_copy 
-  //SEG150 [59] phi (byte) bc#39 = (byte) bc#102 [phi:f0::@18->fa#2] -- register_copy 
-  //SEG151 [59] phi (byte) bb#27 = (byte~) bb#108 [phi:f0::@18->fa#3] -- register_copy 
+  //SEG147 [59] phi from f0::@17 to fa [phi:f0::@17->fa]
+  fa_from_b17:
+  //SEG148 [59] phi (byte) be#107 = (byte) be#103 [phi:f0::@17->fa#0] -- register_copy 
+  //SEG149 [59] phi (byte) bd#138 = (byte) bd#135 [phi:f0::@17->fa#1] -- register_copy 
+  //SEG150 [59] phi (byte) bc#39 = (byte) bc#102 [phi:f0::@17->fa#2] -- register_copy 
+  //SEG151 [59] phi (byte) bb#27 = (byte~) bb#108 [phi:f0::@17->fa#3] -- register_copy 
     jsr fa
-  //SEG152 [48] phi from f0::@18 f0::@7 to f0::@8 [phi:f0::@18/f0::@7->f0::@8]
-  b8_from_b18:
+  //SEG152 [48] phi from f0::@17 f0::@7 to f0::@8 [phi:f0::@17/f0::@7->f0::@8]
+  b8_from_b17:
   b8_from_b7:
-  //SEG153 [48] phi (byte) be#104 = (byte) be#24 [phi:f0::@18/f0::@7->f0::@8#0] -- register_copy 
-  //SEG154 [48] phi (byte) bd#136 = (byte) bd#24 [phi:f0::@18/f0::@7->f0::@8#1] -- register_copy 
-  //SEG155 [48] phi (byte) bc#103 = (byte) bc#24 [phi:f0::@18/f0::@7->f0::@8#2] -- register_copy 
-  //SEG156 [48] phi (byte) bb#25 = (byte) bb#10 [phi:f0::@18/f0::@7->f0::@8#3] -- register_copy 
+  //SEG153 [48] phi (byte) be#104 = (byte) be#24 [phi:f0::@17/f0::@7->f0::@8#0] -- register_copy 
+  //SEG154 [48] phi (byte) bd#136 = (byte) bd#24 [phi:f0::@17/f0::@7->f0::@8#1] -- register_copy 
+  //SEG155 [48] phi (byte) bc#103 = (byte) bc#24 [phi:f0::@17/f0::@7->f0::@8#2] -- register_copy 
+  //SEG156 [48] phi (byte) bb#25 = (byte) bb#10 [phi:f0::@17/f0::@7->f0::@8#3] -- register_copy 
     jmp b8
   //SEG157 f0::@8
   b8:
@@ -4832,29 +4874,29 @@ f0: {
     lda #8
     cmp ba
     bne b9_from_b8
-    jmp b19
-  //SEG159 f0::@19
-  b19:
+    jmp b18
+  //SEG159 f0::@18
+  b18:
   //SEG160 [50] (byte) bb#11 ← ++ (byte) bb#25 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG161 [51] (byte~) bb#109 ← (byte) bb#11 -- vbuz1=vbuz2 
     lda bb
     sta bb_109
   //SEG162 [52] call fa 
-  //SEG163 [59] phi from f0::@19 to fa [phi:f0::@19->fa]
-  fa_from_b19:
-  //SEG164 [59] phi (byte) be#107 = (byte) be#104 [phi:f0::@19->fa#0] -- register_copy 
-  //SEG165 [59] phi (byte) bd#138 = (byte) bd#136 [phi:f0::@19->fa#1] -- register_copy 
-  //SEG166 [59] phi (byte) bc#39 = (byte) bc#103 [phi:f0::@19->fa#2] -- register_copy 
-  //SEG167 [59] phi (byte) bb#27 = (byte~) bb#109 [phi:f0::@19->fa#3] -- register_copy 
+  //SEG163 [59] phi from f0::@18 to fa [phi:f0::@18->fa]
+  fa_from_b18:
+  //SEG164 [59] phi (byte) be#107 = (byte) be#104 [phi:f0::@18->fa#0] -- register_copy 
+  //SEG165 [59] phi (byte) bd#138 = (byte) bd#136 [phi:f0::@18->fa#1] -- register_copy 
+  //SEG166 [59] phi (byte) bc#39 = (byte) bc#103 [phi:f0::@18->fa#2] -- register_copy 
+  //SEG167 [59] phi (byte) bb#27 = (byte~) bb#109 [phi:f0::@18->fa#3] -- register_copy 
     jsr fa
-  //SEG168 [53] phi from f0::@19 f0::@8 to f0::@9 [phi:f0::@19/f0::@8->f0::@9]
-  b9_from_b19:
+  //SEG168 [53] phi from f0::@18 f0::@8 to f0::@9 [phi:f0::@18/f0::@8->f0::@9]
+  b9_from_b18:
   b9_from_b8:
-  //SEG169 [53] phi (byte) be#105 = (byte) be#24 [phi:f0::@19/f0::@8->f0::@9#0] -- register_copy 
-  //SEG170 [53] phi (byte) bd#137 = (byte) bd#24 [phi:f0::@19/f0::@8->f0::@9#1] -- register_copy 
-  //SEG171 [53] phi (byte) bc#104 = (byte) bc#24 [phi:f0::@19/f0::@8->f0::@9#2] -- register_copy 
-  //SEG172 [53] phi (byte) bb#49 = (byte) bb#11 [phi:f0::@19/f0::@8->f0::@9#3] -- register_copy 
+  //SEG169 [53] phi (byte) be#105 = (byte) be#24 [phi:f0::@18/f0::@8->f0::@9#0] -- register_copy 
+  //SEG170 [53] phi (byte) bd#137 = (byte) bd#24 [phi:f0::@18/f0::@8->f0::@9#1] -- register_copy 
+  //SEG171 [53] phi (byte) bc#104 = (byte) bc#24 [phi:f0::@18/f0::@8->f0::@9#2] -- register_copy 
+  //SEG172 [53] phi (byte) bb#49 = (byte) bb#11 [phi:f0::@18/f0::@8->f0::@9#3] -- register_copy 
     jmp b9
   //SEG173 f0::@9
   b9:
@@ -4862,27 +4904,27 @@ f0: {
     lda #9
     cmp ba
     bne breturn_from_b9
-  //SEG175 [55] phi from f0::@9 to f0::@20 [phi:f0::@9->f0::@20]
-  b20_from_b9:
-    jmp b20
-  //SEG176 f0::@20
-  b20:
+  //SEG175 [55] phi from f0::@9 to f0::@19 [phi:f0::@9->f0::@19]
+  b19_from_b9:
+    jmp b19
+  //SEG176 f0::@19
+  b19:
   //SEG177 [56] call fa 
-  //SEG178 [59] phi from f0::@20 to fa [phi:f0::@20->fa]
-  fa_from_b20:
-  //SEG179 [59] phi (byte) be#107 = (byte) be#105 [phi:f0::@20->fa#0] -- register_copy 
-  //SEG180 [59] phi (byte) bd#138 = (byte) bd#137 [phi:f0::@20->fa#1] -- register_copy 
-  //SEG181 [59] phi (byte) bc#39 = (byte) bc#104 [phi:f0::@20->fa#2] -- register_copy 
-  //SEG182 [59] phi (byte) bb#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@20->fa#3] -- vbuz1=vbuc1 
+  //SEG178 [59] phi from f0::@19 to fa [phi:f0::@19->fa]
+  fa_from_b19:
+  //SEG179 [59] phi (byte) be#107 = (byte) be#105 [phi:f0::@19->fa#0] -- register_copy 
+  //SEG180 [59] phi (byte) bd#138 = (byte) bd#137 [phi:f0::@19->fa#1] -- register_copy 
+  //SEG181 [59] phi (byte) bc#39 = (byte) bc#104 [phi:f0::@19->fa#2] -- register_copy 
+  //SEG182 [59] phi (byte) bb#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@19->fa#3] -- vbuz1=vbuc1 
     lda #0
     sta bb_27
     jsr fa
-  //SEG183 [57] phi from f0::@20 to f0::@return [phi:f0::@20->f0::@return]
-  breturn_from_b20:
-  //SEG184 [57] phi (byte) be#13 = (byte) be#24 [phi:f0::@20->f0::@return#0] -- register_copy 
-  //SEG185 [57] phi (byte) bd#13 = (byte) bd#24 [phi:f0::@20->f0::@return#1] -- register_copy 
-  //SEG186 [57] phi (byte) bc#13 = (byte) bc#24 [phi:f0::@20->f0::@return#2] -- register_copy 
-  //SEG187 [57] phi (byte) bb#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@20->f0::@return#3] -- vbuz1=vbuc1 
+  //SEG183 [57] phi from f0::@19 to f0::@return [phi:f0::@19->f0::@return]
+  breturn_from_b19:
+  //SEG184 [57] phi (byte) be#13 = (byte) be#24 [phi:f0::@19->f0::@return#0] -- register_copy 
+  //SEG185 [57] phi (byte) bd#13 = (byte) bd#24 [phi:f0::@19->f0::@return#1] -- register_copy 
+  //SEG186 [57] phi (byte) bc#13 = (byte) bc#24 [phi:f0::@19->f0::@return#2] -- register_copy 
+  //SEG187 [57] phi (byte) bb#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@19->f0::@return#3] -- vbuz1=vbuc1 
     lda #0
     sta bb
     jmp breturn
@@ -4904,26 +4946,26 @@ fa: {
     lda bb_27
     cmp #0
     bne b1_from_fa
-    jmp b11
-  //SEG197 fa::@11
-  b11:
+    jmp b10
+  //SEG197 fa::@10
+  b10:
   //SEG198 [61] (byte) bc#105 ← ++ (byte) bc#39 -- vbuxx=_inc_vbuxx 
     inx
   //SEG199 [62] (byte~) bc#174 ← (byte) bc#105 -- vbuz1=vbuxx 
     stx bc
   //SEG200 [63] call fb 
-  //SEG201 [110] phi from fa::@11 to fb [phi:fa::@11->fb]
-  fb_from_b11:
-  //SEG202 [110] phi (byte) be#118 = (byte) be#107 [phi:fa::@11->fb#0] -- register_copy 
-  //SEG203 [110] phi (byte) bd#106 = (byte) bd#138 [phi:fa::@11->fb#1] -- register_copy 
-  //SEG204 [110] phi (byte) bc#114 = (byte~) bc#174 [phi:fa::@11->fb#2] -- register_copy 
+  //SEG201 [110] phi from fa::@10 to fb [phi:fa::@10->fb]
+  fb_from_b10:
+  //SEG202 [110] phi (byte) be#118 = (byte) be#107 [phi:fa::@10->fb#0] -- register_copy 
+  //SEG203 [110] phi (byte) bd#106 = (byte) bd#138 [phi:fa::@10->fb#1] -- register_copy 
+  //SEG204 [110] phi (byte) bc#114 = (byte~) bc#174 [phi:fa::@10->fb#2] -- register_copy 
     jsr fb
-  //SEG205 [64] phi from fa fa::@11 to fa::@1 [phi:fa/fa::@11->fa::@1]
+  //SEG205 [64] phi from fa fa::@10 to fa::@1 [phi:fa/fa::@10->fa::@1]
   b1_from_fa:
-  b1_from_b11:
-  //SEG206 [64] phi (byte) be#108 = (byte) be#107 [phi:fa/fa::@11->fa::@1#0] -- register_copy 
-  //SEG207 [64] phi (byte) bd#139 = (byte) bd#138 [phi:fa/fa::@11->fa::@1#1] -- register_copy 
-  //SEG208 [64] phi (byte) bc#40 = (byte) bc#39 [phi:fa/fa::@11->fa::@1#2] -- register_copy 
+  b1_from_b10:
+  //SEG206 [64] phi (byte) be#108 = (byte) be#107 [phi:fa/fa::@10->fa::@1#0] -- register_copy 
+  //SEG207 [64] phi (byte) bd#139 = (byte) bd#138 [phi:fa/fa::@10->fa::@1#1] -- register_copy 
+  //SEG208 [64] phi (byte) bc#40 = (byte) bc#39 [phi:fa/fa::@10->fa::@1#2] -- register_copy 
     jmp b1
   //SEG209 fa::@1
   b1:
@@ -4931,26 +4973,26 @@ fa: {
     lda #1
     cmp bb_27
     bne b2_from_b1
-    jmp b12
-  //SEG211 fa::@12
-  b12:
+    jmp b11
+  //SEG211 fa::@11
+  b11:
   //SEG212 [66] (byte) bc#106 ← ++ (byte) bc#40 -- vbuxx=_inc_vbuxx 
     inx
   //SEG213 [67] (byte~) bc#175 ← (byte) bc#106 -- vbuz1=vbuxx 
     stx bc
   //SEG214 [68] call fb 
-  //SEG215 [110] phi from fa::@12 to fb [phi:fa::@12->fb]
-  fb_from_b12:
-  //SEG216 [110] phi (byte) be#118 = (byte) be#108 [phi:fa::@12->fb#0] -- register_copy 
-  //SEG217 [110] phi (byte) bd#106 = (byte) bd#139 [phi:fa::@12->fb#1] -- register_copy 
-  //SEG218 [110] phi (byte) bc#114 = (byte~) bc#175 [phi:fa::@12->fb#2] -- register_copy 
+  //SEG215 [110] phi from fa::@11 to fb [phi:fa::@11->fb]
+  fb_from_b11:
+  //SEG216 [110] phi (byte) be#118 = (byte) be#108 [phi:fa::@11->fb#0] -- register_copy 
+  //SEG217 [110] phi (byte) bd#106 = (byte) bd#139 [phi:fa::@11->fb#1] -- register_copy 
+  //SEG218 [110] phi (byte) bc#114 = (byte~) bc#175 [phi:fa::@11->fb#2] -- register_copy 
     jsr fb
-  //SEG219 [69] phi from fa::@1 fa::@12 to fa::@2 [phi:fa::@1/fa::@12->fa::@2]
+  //SEG219 [69] phi from fa::@1 fa::@11 to fa::@2 [phi:fa::@1/fa::@11->fa::@2]
   b2_from_b1:
-  b2_from_b12:
-  //SEG220 [69] phi (byte) be#109 = (byte) be#108 [phi:fa::@1/fa::@12->fa::@2#0] -- register_copy 
-  //SEG221 [69] phi (byte) bd#140 = (byte) bd#139 [phi:fa::@1/fa::@12->fa::@2#1] -- register_copy 
-  //SEG222 [69] phi (byte) bc#41 = (byte) bc#40 [phi:fa::@1/fa::@12->fa::@2#2] -- register_copy 
+  b2_from_b11:
+  //SEG220 [69] phi (byte) be#109 = (byte) be#108 [phi:fa::@1/fa::@11->fa::@2#0] -- register_copy 
+  //SEG221 [69] phi (byte) bd#140 = (byte) bd#139 [phi:fa::@1/fa::@11->fa::@2#1] -- register_copy 
+  //SEG222 [69] phi (byte) bc#41 = (byte) bc#40 [phi:fa::@1/fa::@11->fa::@2#2] -- register_copy 
     jmp b2
   //SEG223 fa::@2
   b2:
@@ -4958,26 +5000,26 @@ fa: {
     lda #2
     cmp bb_27
     bne b3_from_b2
-    jmp b13
-  //SEG225 fa::@13
-  b13:
+    jmp b12
+  //SEG225 fa::@12
+  b12:
   //SEG226 [71] (byte) bc#107 ← ++ (byte) bc#41 -- vbuxx=_inc_vbuxx 
     inx
   //SEG227 [72] (byte~) bc#176 ← (byte) bc#107 -- vbuz1=vbuxx 
     stx bc
   //SEG228 [73] call fb 
-  //SEG229 [110] phi from fa::@13 to fb [phi:fa::@13->fb]
-  fb_from_b13:
-  //SEG230 [110] phi (byte) be#118 = (byte) be#109 [phi:fa::@13->fb#0] -- register_copy 
-  //SEG231 [110] phi (byte) bd#106 = (byte) bd#140 [phi:fa::@13->fb#1] -- register_copy 
-  //SEG232 [110] phi (byte) bc#114 = (byte~) bc#176 [phi:fa::@13->fb#2] -- register_copy 
+  //SEG229 [110] phi from fa::@12 to fb [phi:fa::@12->fb]
+  fb_from_b12:
+  //SEG230 [110] phi (byte) be#118 = (byte) be#109 [phi:fa::@12->fb#0] -- register_copy 
+  //SEG231 [110] phi (byte) bd#106 = (byte) bd#140 [phi:fa::@12->fb#1] -- register_copy 
+  //SEG232 [110] phi (byte) bc#114 = (byte~) bc#176 [phi:fa::@12->fb#2] -- register_copy 
     jsr fb
-  //SEG233 [74] phi from fa::@13 fa::@2 to fa::@3 [phi:fa::@13/fa::@2->fa::@3]
-  b3_from_b13:
+  //SEG233 [74] phi from fa::@12 fa::@2 to fa::@3 [phi:fa::@12/fa::@2->fa::@3]
+  b3_from_b12:
   b3_from_b2:
-  //SEG234 [74] phi (byte) be#110 = (byte) be#35 [phi:fa::@13/fa::@2->fa::@3#0] -- register_copy 
-  //SEG235 [74] phi (byte) bd#141 = (byte) bd#35 [phi:fa::@13/fa::@2->fa::@3#1] -- register_copy 
-  //SEG236 [74] phi (byte) bc#42 = (byte) bc#107 [phi:fa::@13/fa::@2->fa::@3#2] -- register_copy 
+  //SEG234 [74] phi (byte) be#110 = (byte) be#35 [phi:fa::@12/fa::@2->fa::@3#0] -- register_copy 
+  //SEG235 [74] phi (byte) bd#141 = (byte) bd#35 [phi:fa::@12/fa::@2->fa::@3#1] -- register_copy 
+  //SEG236 [74] phi (byte) bc#42 = (byte) bc#107 [phi:fa::@12/fa::@2->fa::@3#2] -- register_copy 
     jmp b3
   //SEG237 fa::@3
   b3:
@@ -4985,26 +5027,26 @@ fa: {
     lda #3
     cmp bb_27
     bne b4_from_b3
-    jmp b14
-  //SEG239 fa::@14
-  b14:
+    jmp b13
+  //SEG239 fa::@13
+  b13:
   //SEG240 [76] (byte) bc#108 ← ++ (byte) bc#42 -- vbuxx=_inc_vbuxx 
     inx
   //SEG241 [77] (byte~) bc#177 ← (byte) bc#108 -- vbuz1=vbuxx 
     stx bc
   //SEG242 [78] call fb 
-  //SEG243 [110] phi from fa::@14 to fb [phi:fa::@14->fb]
-  fb_from_b14:
-  //SEG244 [110] phi (byte) be#118 = (byte) be#110 [phi:fa::@14->fb#0] -- register_copy 
-  //SEG245 [110] phi (byte) bd#106 = (byte) bd#141 [phi:fa::@14->fb#1] -- register_copy 
-  //SEG246 [110] phi (byte) bc#114 = (byte~) bc#177 [phi:fa::@14->fb#2] -- register_copy 
+  //SEG243 [110] phi from fa::@13 to fb [phi:fa::@13->fb]
+  fb_from_b13:
+  //SEG244 [110] phi (byte) be#118 = (byte) be#110 [phi:fa::@13->fb#0] -- register_copy 
+  //SEG245 [110] phi (byte) bd#106 = (byte) bd#141 [phi:fa::@13->fb#1] -- register_copy 
+  //SEG246 [110] phi (byte) bc#114 = (byte~) bc#177 [phi:fa::@13->fb#2] -- register_copy 
     jsr fb
-  //SEG247 [79] phi from fa::@14 fa::@3 to fa::@4 [phi:fa::@14/fa::@3->fa::@4]
-  b4_from_b14:
+  //SEG247 [79] phi from fa::@13 fa::@3 to fa::@4 [phi:fa::@13/fa::@3->fa::@4]
+  b4_from_b13:
   b4_from_b3:
-  //SEG248 [79] phi (byte) be#111 = (byte) be#35 [phi:fa::@14/fa::@3->fa::@4#0] -- register_copy 
-  //SEG249 [79] phi (byte) bd#142 = (byte) bd#35 [phi:fa::@14/fa::@3->fa::@4#1] -- register_copy 
-  //SEG250 [79] phi (byte) bc#43 = (byte) bc#108 [phi:fa::@14/fa::@3->fa::@4#2] -- register_copy 
+  //SEG248 [79] phi (byte) be#111 = (byte) be#35 [phi:fa::@13/fa::@3->fa::@4#0] -- register_copy 
+  //SEG249 [79] phi (byte) bd#142 = (byte) bd#35 [phi:fa::@13/fa::@3->fa::@4#1] -- register_copy 
+  //SEG250 [79] phi (byte) bc#43 = (byte) bc#108 [phi:fa::@13/fa::@3->fa::@4#2] -- register_copy 
     jmp b4
   //SEG251 fa::@4
   b4:
@@ -5012,26 +5054,26 @@ fa: {
     lda #4
     cmp bb_27
     bne b5_from_b4
-    jmp b15
-  //SEG253 fa::@15
-  b15:
+    jmp b14
+  //SEG253 fa::@14
+  b14:
   //SEG254 [81] (byte) bc#109 ← ++ (byte) bc#43 -- vbuxx=_inc_vbuxx 
     inx
   //SEG255 [82] (byte~) bc#178 ← (byte) bc#109 -- vbuz1=vbuxx 
     stx bc
   //SEG256 [83] call fb 
-  //SEG257 [110] phi from fa::@15 to fb [phi:fa::@15->fb]
-  fb_from_b15:
-  //SEG258 [110] phi (byte) be#118 = (byte) be#111 [phi:fa::@15->fb#0] -- register_copy 
-  //SEG259 [110] phi (byte) bd#106 = (byte) bd#142 [phi:fa::@15->fb#1] -- register_copy 
-  //SEG260 [110] phi (byte) bc#114 = (byte~) bc#178 [phi:fa::@15->fb#2] -- register_copy 
+  //SEG257 [110] phi from fa::@14 to fb [phi:fa::@14->fb]
+  fb_from_b14:
+  //SEG258 [110] phi (byte) be#118 = (byte) be#111 [phi:fa::@14->fb#0] -- register_copy 
+  //SEG259 [110] phi (byte) bd#106 = (byte) bd#142 [phi:fa::@14->fb#1] -- register_copy 
+  //SEG260 [110] phi (byte) bc#114 = (byte~) bc#178 [phi:fa::@14->fb#2] -- register_copy 
     jsr fb
-  //SEG261 [84] phi from fa::@15 fa::@4 to fa::@5 [phi:fa::@15/fa::@4->fa::@5]
-  b5_from_b15:
+  //SEG261 [84] phi from fa::@14 fa::@4 to fa::@5 [phi:fa::@14/fa::@4->fa::@5]
+  b5_from_b14:
   b5_from_b4:
-  //SEG262 [84] phi (byte) be#112 = (byte) be#35 [phi:fa::@15/fa::@4->fa::@5#0] -- register_copy 
-  //SEG263 [84] phi (byte) bd#100 = (byte) bd#35 [phi:fa::@15/fa::@4->fa::@5#1] -- register_copy 
-  //SEG264 [84] phi (byte) bc#44 = (byte) bc#109 [phi:fa::@15/fa::@4->fa::@5#2] -- register_copy 
+  //SEG262 [84] phi (byte) be#112 = (byte) be#35 [phi:fa::@14/fa::@4->fa::@5#0] -- register_copy 
+  //SEG263 [84] phi (byte) bd#100 = (byte) bd#35 [phi:fa::@14/fa::@4->fa::@5#1] -- register_copy 
+  //SEG264 [84] phi (byte) bc#44 = (byte) bc#109 [phi:fa::@14/fa::@4->fa::@5#2] -- register_copy 
     jmp b5
   //SEG265 fa::@5
   b5:
@@ -5039,26 +5081,26 @@ fa: {
     lda #5
     cmp bb_27
     bne b6_from_b5
-    jmp b16
-  //SEG267 fa::@16
-  b16:
+    jmp b15
+  //SEG267 fa::@15
+  b15:
   //SEG268 [86] (byte) bc#110 ← ++ (byte) bc#44 -- vbuxx=_inc_vbuxx 
     inx
   //SEG269 [87] (byte~) bc#179 ← (byte) bc#110 -- vbuz1=vbuxx 
     stx bc
   //SEG270 [88] call fb 
-  //SEG271 [110] phi from fa::@16 to fb [phi:fa::@16->fb]
-  fb_from_b16:
-  //SEG272 [110] phi (byte) be#118 = (byte) be#112 [phi:fa::@16->fb#0] -- register_copy 
-  //SEG273 [110] phi (byte) bd#106 = (byte) bd#100 [phi:fa::@16->fb#1] -- register_copy 
-  //SEG274 [110] phi (byte) bc#114 = (byte~) bc#179 [phi:fa::@16->fb#2] -- register_copy 
+  //SEG271 [110] phi from fa::@15 to fb [phi:fa::@15->fb]
+  fb_from_b15:
+  //SEG272 [110] phi (byte) be#118 = (byte) be#112 [phi:fa::@15->fb#0] -- register_copy 
+  //SEG273 [110] phi (byte) bd#106 = (byte) bd#100 [phi:fa::@15->fb#1] -- register_copy 
+  //SEG274 [110] phi (byte) bc#114 = (byte~) bc#179 [phi:fa::@15->fb#2] -- register_copy 
     jsr fb
-  //SEG275 [89] phi from fa::@16 fa::@5 to fa::@6 [phi:fa::@16/fa::@5->fa::@6]
-  b6_from_b16:
+  //SEG275 [89] phi from fa::@15 fa::@5 to fa::@6 [phi:fa::@15/fa::@5->fa::@6]
+  b6_from_b15:
   b6_from_b5:
-  //SEG276 [89] phi (byte) be#113 = (byte) be#35 [phi:fa::@16/fa::@5->fa::@6#0] -- register_copy 
-  //SEG277 [89] phi (byte) bd#101 = (byte) bd#35 [phi:fa::@16/fa::@5->fa::@6#1] -- register_copy 
-  //SEG278 [89] phi (byte) bc#45 = (byte) bc#110 [phi:fa::@16/fa::@5->fa::@6#2] -- register_copy 
+  //SEG276 [89] phi (byte) be#113 = (byte) be#35 [phi:fa::@15/fa::@5->fa::@6#0] -- register_copy 
+  //SEG277 [89] phi (byte) bd#101 = (byte) bd#35 [phi:fa::@15/fa::@5->fa::@6#1] -- register_copy 
+  //SEG278 [89] phi (byte) bc#45 = (byte) bc#110 [phi:fa::@15/fa::@5->fa::@6#2] -- register_copy 
     jmp b6
   //SEG279 fa::@6
   b6:
@@ -5066,26 +5108,26 @@ fa: {
     lda #6
     cmp bb_27
     bne b7_from_b6
-    jmp b17
-  //SEG281 fa::@17
-  b17:
+    jmp b16
+  //SEG281 fa::@16
+  b16:
   //SEG282 [91] (byte) bc#111 ← ++ (byte) bc#45 -- vbuxx=_inc_vbuxx 
     inx
   //SEG283 [92] (byte~) bc#180 ← (byte) bc#111 -- vbuz1=vbuxx 
     stx bc
   //SEG284 [93] call fb 
-  //SEG285 [110] phi from fa::@17 to fb [phi:fa::@17->fb]
-  fb_from_b17:
-  //SEG286 [110] phi (byte) be#118 = (byte) be#113 [phi:fa::@17->fb#0] -- register_copy 
-  //SEG287 [110] phi (byte) bd#106 = (byte) bd#101 [phi:fa::@17->fb#1] -- register_copy 
-  //SEG288 [110] phi (byte) bc#114 = (byte~) bc#180 [phi:fa::@17->fb#2] -- register_copy 
+  //SEG285 [110] phi from fa::@16 to fb [phi:fa::@16->fb]
+  fb_from_b16:
+  //SEG286 [110] phi (byte) be#118 = (byte) be#113 [phi:fa::@16->fb#0] -- register_copy 
+  //SEG287 [110] phi (byte) bd#106 = (byte) bd#101 [phi:fa::@16->fb#1] -- register_copy 
+  //SEG288 [110] phi (byte) bc#114 = (byte~) bc#180 [phi:fa::@16->fb#2] -- register_copy 
     jsr fb
-  //SEG289 [94] phi from fa::@17 fa::@6 to fa::@7 [phi:fa::@17/fa::@6->fa::@7]
-  b7_from_b17:
+  //SEG289 [94] phi from fa::@16 fa::@6 to fa::@7 [phi:fa::@16/fa::@6->fa::@7]
+  b7_from_b16:
   b7_from_b6:
-  //SEG290 [94] phi (byte) be#114 = (byte) be#35 [phi:fa::@17/fa::@6->fa::@7#0] -- register_copy 
-  //SEG291 [94] phi (byte) bd#102 = (byte) bd#35 [phi:fa::@17/fa::@6->fa::@7#1] -- register_copy 
-  //SEG292 [94] phi (byte) bc#46 = (byte) bc#111 [phi:fa::@17/fa::@6->fa::@7#2] -- register_copy 
+  //SEG290 [94] phi (byte) be#114 = (byte) be#35 [phi:fa::@16/fa::@6->fa::@7#0] -- register_copy 
+  //SEG291 [94] phi (byte) bd#102 = (byte) bd#35 [phi:fa::@16/fa::@6->fa::@7#1] -- register_copy 
+  //SEG292 [94] phi (byte) bc#46 = (byte) bc#111 [phi:fa::@16/fa::@6->fa::@7#2] -- register_copy 
     jmp b7
   //SEG293 fa::@7
   b7:
@@ -5093,26 +5135,26 @@ fa: {
     lda #7
     cmp bb_27
     bne b8_from_b7
-    jmp b18
-  //SEG295 fa::@18
-  b18:
+    jmp b17
+  //SEG295 fa::@17
+  b17:
   //SEG296 [96] (byte) bc#112 ← ++ (byte) bc#46 -- vbuxx=_inc_vbuxx 
     inx
   //SEG297 [97] (byte~) bc#181 ← (byte) bc#112 -- vbuz1=vbuxx 
     stx bc
   //SEG298 [98] call fb 
-  //SEG299 [110] phi from fa::@18 to fb [phi:fa::@18->fb]
-  fb_from_b18:
-  //SEG300 [110] phi (byte) be#118 = (byte) be#114 [phi:fa::@18->fb#0] -- register_copy 
-  //SEG301 [110] phi (byte) bd#106 = (byte) bd#102 [phi:fa::@18->fb#1] -- register_copy 
-  //SEG302 [110] phi (byte) bc#114 = (byte~) bc#181 [phi:fa::@18->fb#2] -- register_copy 
+  //SEG299 [110] phi from fa::@17 to fb [phi:fa::@17->fb]
+  fb_from_b17:
+  //SEG300 [110] phi (byte) be#118 = (byte) be#114 [phi:fa::@17->fb#0] -- register_copy 
+  //SEG301 [110] phi (byte) bd#106 = (byte) bd#102 [phi:fa::@17->fb#1] -- register_copy 
+  //SEG302 [110] phi (byte) bc#114 = (byte~) bc#181 [phi:fa::@17->fb#2] -- register_copy 
     jsr fb
-  //SEG303 [99] phi from fa::@18 fa::@7 to fa::@8 [phi:fa::@18/fa::@7->fa::@8]
-  b8_from_b18:
+  //SEG303 [99] phi from fa::@17 fa::@7 to fa::@8 [phi:fa::@17/fa::@7->fa::@8]
+  b8_from_b17:
   b8_from_b7:
-  //SEG304 [99] phi (byte) be#115 = (byte) be#35 [phi:fa::@18/fa::@7->fa::@8#0] -- register_copy 
-  //SEG305 [99] phi (byte) bd#103 = (byte) bd#35 [phi:fa::@18/fa::@7->fa::@8#1] -- register_copy 
-  //SEG306 [99] phi (byte) bc#47 = (byte) bc#112 [phi:fa::@18/fa::@7->fa::@8#2] -- register_copy 
+  //SEG304 [99] phi (byte) be#115 = (byte) be#35 [phi:fa::@17/fa::@7->fa::@8#0] -- register_copy 
+  //SEG305 [99] phi (byte) bd#103 = (byte) bd#35 [phi:fa::@17/fa::@7->fa::@8#1] -- register_copy 
+  //SEG306 [99] phi (byte) bc#47 = (byte) bc#112 [phi:fa::@17/fa::@7->fa::@8#2] -- register_copy 
     jmp b8
   //SEG307 fa::@8
   b8:
@@ -5120,26 +5162,26 @@ fa: {
     lda #8
     cmp bb_27
     bne b9_from_b8
-    jmp b19
-  //SEG309 fa::@19
-  b19:
+    jmp b18
+  //SEG309 fa::@18
+  b18:
   //SEG310 [101] (byte) bc#123 ← ++ (byte) bc#47 -- vbuxx=_inc_vbuxx 
     inx
   //SEG311 [102] (byte~) bc#182 ← (byte) bc#123 -- vbuz1=vbuxx 
     stx bc
   //SEG312 [103] call fb 
-  //SEG313 [110] phi from fa::@19 to fb [phi:fa::@19->fb]
-  fb_from_b19:
-  //SEG314 [110] phi (byte) be#118 = (byte) be#115 [phi:fa::@19->fb#0] -- register_copy 
-  //SEG315 [110] phi (byte) bd#106 = (byte) bd#103 [phi:fa::@19->fb#1] -- register_copy 
-  //SEG316 [110] phi (byte) bc#114 = (byte~) bc#182 [phi:fa::@19->fb#2] -- register_copy 
+  //SEG313 [110] phi from fa::@18 to fb [phi:fa::@18->fb]
+  fb_from_b18:
+  //SEG314 [110] phi (byte) be#118 = (byte) be#115 [phi:fa::@18->fb#0] -- register_copy 
+  //SEG315 [110] phi (byte) bd#106 = (byte) bd#103 [phi:fa::@18->fb#1] -- register_copy 
+  //SEG316 [110] phi (byte) bc#114 = (byte~) bc#182 [phi:fa::@18->fb#2] -- register_copy 
     jsr fb
-  //SEG317 [104] phi from fa::@19 fa::@8 to fa::@9 [phi:fa::@19/fa::@8->fa::@9]
-  b9_from_b19:
+  //SEG317 [104] phi from fa::@18 fa::@8 to fa::@9 [phi:fa::@18/fa::@8->fa::@9]
+  b9_from_b18:
   b9_from_b8:
-  //SEG318 [104] phi (byte) be#116 = (byte) be#35 [phi:fa::@19/fa::@8->fa::@9#0] -- register_copy 
-  //SEG319 [104] phi (byte) bd#104 = (byte) bd#35 [phi:fa::@19/fa::@8->fa::@9#1] -- register_copy 
-  //SEG320 [104] phi (byte) bc#113 = (byte) bc#123 [phi:fa::@19/fa::@8->fa::@9#2] -- register_copy 
+  //SEG318 [104] phi (byte) be#116 = (byte) be#35 [phi:fa::@18/fa::@8->fa::@9#0] -- register_copy 
+  //SEG319 [104] phi (byte) bd#104 = (byte) bd#35 [phi:fa::@18/fa::@8->fa::@9#1] -- register_copy 
+  //SEG320 [104] phi (byte) bc#113 = (byte) bc#123 [phi:fa::@18/fa::@8->fa::@9#2] -- register_copy 
     jmp b9
   //SEG321 fa::@9
   b9:
@@ -5147,25 +5189,25 @@ fa: {
     lda #9
     cmp bb_27
     bne breturn_from_b9
-  //SEG323 [106] phi from fa::@9 to fa::@20 [phi:fa::@9->fa::@20]
-  b20_from_b9:
-    jmp b20
-  //SEG324 fa::@20
-  b20:
+  //SEG323 [106] phi from fa::@9 to fa::@19 [phi:fa::@9->fa::@19]
+  b19_from_b9:
+    jmp b19
+  //SEG324 fa::@19
+  b19:
   //SEG325 [107] call fb 
-  //SEG326 [110] phi from fa::@20 to fb [phi:fa::@20->fb]
-  fb_from_b20:
-  //SEG327 [110] phi (byte) be#118 = (byte) be#116 [phi:fa::@20->fb#0] -- register_copy 
-  //SEG328 [110] phi (byte) bd#106 = (byte) bd#104 [phi:fa::@20->fb#1] -- register_copy 
-  //SEG329 [110] phi (byte) bc#114 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@20->fb#2] -- vbuz1=vbuc1 
+  //SEG326 [110] phi from fa::@19 to fb [phi:fa::@19->fb]
+  fb_from_b19:
+  //SEG327 [110] phi (byte) be#118 = (byte) be#116 [phi:fa::@19->fb#0] -- register_copy 
+  //SEG328 [110] phi (byte) bd#106 = (byte) bd#104 [phi:fa::@19->fb#1] -- register_copy 
+  //SEG329 [110] phi (byte) bc#114 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@19->fb#2] -- vbuz1=vbuc1 
     lda #0
     sta bc
     jsr fb
-  //SEG330 [108] phi from fa::@20 to fa::@return [phi:fa::@20->fa::@return]
-  breturn_from_b20:
-  //SEG331 [108] phi (byte) be#24 = (byte) be#35 [phi:fa::@20->fa::@return#0] -- register_copy 
-  //SEG332 [108] phi (byte) bd#24 = (byte) bd#35 [phi:fa::@20->fa::@return#1] -- register_copy 
-  //SEG333 [108] phi (byte) bc#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@20->fa::@return#2] -- vbuxx=vbuc1 
+  //SEG330 [108] phi from fa::@19 to fa::@return [phi:fa::@19->fa::@return]
+  breturn_from_b19:
+  //SEG331 [108] phi (byte) be#24 = (byte) be#35 [phi:fa::@19->fa::@return#0] -- register_copy 
+  //SEG332 [108] phi (byte) bd#24 = (byte) bd#35 [phi:fa::@19->fa::@return#1] -- register_copy 
+  //SEG333 [108] phi (byte) bc#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@19->fa::@return#2] -- vbuxx=vbuc1 
     ldx #0
     jmp breturn
   //SEG334 [108] phi from fa::@9 to fa::@return [phi:fa::@9->fa::@return]
@@ -5185,24 +5227,24 @@ fb: {
     lda bc
     cmp #0
     bne b1_from_fb
-    jmp b11
-  //SEG342 fb::@11
-  b11:
+    jmp b10
+  //SEG342 fb::@10
+  b10:
   //SEG343 [112] (byte) bd#148 ← ++ (byte) bd#106 -- vbuyy=_inc_vbuyy 
     iny
   //SEG344 [113] (byte~) bd#238 ← (byte) bd#148 -- vbuaa=vbuyy 
     tya
   //SEG345 [114] call fc 
-  //SEG346 [161] phi from fb::@11 to fc [phi:fb::@11->fc]
-  fc_from_b11:
-  //SEG347 [161] phi (byte) be#129 = (byte) be#118 [phi:fb::@11->fc#0] -- register_copy 
-  //SEG348 [161] phi (byte) bd#117 = (byte~) bd#238 [phi:fb::@11->fc#1] -- register_copy 
+  //SEG346 [161] phi from fb::@10 to fc [phi:fb::@10->fc]
+  fc_from_b10:
+  //SEG347 [161] phi (byte) be#129 = (byte) be#118 [phi:fb::@10->fc#0] -- register_copy 
+  //SEG348 [161] phi (byte) bd#117 = (byte~) bd#238 [phi:fb::@10->fc#1] -- register_copy 
     jsr fc
-  //SEG349 [115] phi from fb fb::@11 to fb::@1 [phi:fb/fb::@11->fb::@1]
+  //SEG349 [115] phi from fb fb::@10 to fb::@1 [phi:fb/fb::@10->fb::@1]
   b1_from_fb:
-  b1_from_b11:
-  //SEG350 [115] phi (byte) be#119 = (byte) be#118 [phi:fb/fb::@11->fb::@1#0] -- register_copy 
-  //SEG351 [115] phi (byte) bd#107 = (byte) bd#106 [phi:fb/fb::@11->fb::@1#1] -- register_copy 
+  b1_from_b10:
+  //SEG350 [115] phi (byte) be#119 = (byte) be#118 [phi:fb/fb::@10->fb::@1#0] -- register_copy 
+  //SEG351 [115] phi (byte) bd#107 = (byte) bd#106 [phi:fb/fb::@10->fb::@1#1] -- register_copy 
     jmp b1
   //SEG352 fb::@1
   b1:
@@ -5210,24 +5252,24 @@ fb: {
     lda #1
     cmp bc
     bne b2_from_b1
-    jmp b12
-  //SEG354 fb::@12
-  b12:
+    jmp b11
+  //SEG354 fb::@11
+  b11:
   //SEG355 [117] (byte) bd#149 ← ++ (byte) bd#107 -- vbuyy=_inc_vbuyy 
     iny
   //SEG356 [118] (byte~) bd#239 ← (byte) bd#149 -- vbuaa=vbuyy 
     tya
   //SEG357 [119] call fc 
-  //SEG358 [161] phi from fb::@12 to fc [phi:fb::@12->fc]
-  fc_from_b12:
-  //SEG359 [161] phi (byte) be#129 = (byte) be#119 [phi:fb::@12->fc#0] -- register_copy 
-  //SEG360 [161] phi (byte) bd#117 = (byte~) bd#239 [phi:fb::@12->fc#1] -- register_copy 
+  //SEG358 [161] phi from fb::@11 to fc [phi:fb::@11->fc]
+  fc_from_b11:
+  //SEG359 [161] phi (byte) be#129 = (byte) be#119 [phi:fb::@11->fc#0] -- register_copy 
+  //SEG360 [161] phi (byte) bd#117 = (byte~) bd#239 [phi:fb::@11->fc#1] -- register_copy 
     jsr fc
-  //SEG361 [120] phi from fb::@1 fb::@12 to fb::@2 [phi:fb::@1/fb::@12->fb::@2]
+  //SEG361 [120] phi from fb::@1 fb::@11 to fb::@2 [phi:fb::@1/fb::@11->fb::@2]
   b2_from_b1:
-  b2_from_b12:
-  //SEG362 [120] phi (byte) be#120 = (byte) be#119 [phi:fb::@1/fb::@12->fb::@2#0] -- register_copy 
-  //SEG363 [120] phi (byte) bd#108 = (byte) bd#107 [phi:fb::@1/fb::@12->fb::@2#1] -- register_copy 
+  b2_from_b11:
+  //SEG362 [120] phi (byte) be#120 = (byte) be#119 [phi:fb::@1/fb::@11->fb::@2#0] -- register_copy 
+  //SEG363 [120] phi (byte) bd#108 = (byte) bd#107 [phi:fb::@1/fb::@11->fb::@2#1] -- register_copy 
     jmp b2
   //SEG364 fb::@2
   b2:
@@ -5235,24 +5277,24 @@ fb: {
     lda #2
     cmp bc
     bne b3_from_b2
-    jmp b13
-  //SEG366 fb::@13
-  b13:
+    jmp b12
+  //SEG366 fb::@12
+  b12:
   //SEG367 [122] (byte) bd#150 ← ++ (byte) bd#108 -- vbuyy=_inc_vbuyy 
     iny
   //SEG368 [123] (byte~) bd#240 ← (byte) bd#150 -- vbuaa=vbuyy 
     tya
   //SEG369 [124] call fc 
-  //SEG370 [161] phi from fb::@13 to fc [phi:fb::@13->fc]
-  fc_from_b13:
-  //SEG371 [161] phi (byte) be#129 = (byte) be#120 [phi:fb::@13->fc#0] -- register_copy 
-  //SEG372 [161] phi (byte) bd#117 = (byte~) bd#240 [phi:fb::@13->fc#1] -- register_copy 
+  //SEG370 [161] phi from fb::@12 to fc [phi:fb::@12->fc]
+  fc_from_b12:
+  //SEG371 [161] phi (byte) be#129 = (byte) be#120 [phi:fb::@12->fc#0] -- register_copy 
+  //SEG372 [161] phi (byte) bd#117 = (byte~) bd#240 [phi:fb::@12->fc#1] -- register_copy 
     jsr fc
-  //SEG373 [125] phi from fb::@13 fb::@2 to fb::@3 [phi:fb::@13/fb::@2->fb::@3]
-  b3_from_b13:
+  //SEG373 [125] phi from fb::@12 fb::@2 to fb::@3 [phi:fb::@12/fb::@2->fb::@3]
+  b3_from_b12:
   b3_from_b2:
-  //SEG374 [125] phi (byte) be#121 = (byte) be#46 [phi:fb::@13/fb::@2->fb::@3#0] -- register_copy 
-  //SEG375 [125] phi (byte) bd#109 = (byte) bd#150 [phi:fb::@13/fb::@2->fb::@3#1] -- register_copy 
+  //SEG374 [125] phi (byte) be#121 = (byte) be#46 [phi:fb::@12/fb::@2->fb::@3#0] -- register_copy 
+  //SEG375 [125] phi (byte) bd#109 = (byte) bd#150 [phi:fb::@12/fb::@2->fb::@3#1] -- register_copy 
     jmp b3
   //SEG376 fb::@3
   b3:
@@ -5260,24 +5302,24 @@ fb: {
     lda #3
     cmp bc
     bne b4_from_b3
-    jmp b14
-  //SEG378 fb::@14
-  b14:
+    jmp b13
+  //SEG378 fb::@13
+  b13:
   //SEG379 [127] (byte) bd#151 ← ++ (byte) bd#109 -- vbuyy=_inc_vbuyy 
     iny
   //SEG380 [128] (byte~) bd#241 ← (byte) bd#151 -- vbuaa=vbuyy 
     tya
   //SEG381 [129] call fc 
-  //SEG382 [161] phi from fb::@14 to fc [phi:fb::@14->fc]
-  fc_from_b14:
-  //SEG383 [161] phi (byte) be#129 = (byte) be#121 [phi:fb::@14->fc#0] -- register_copy 
-  //SEG384 [161] phi (byte) bd#117 = (byte~) bd#241 [phi:fb::@14->fc#1] -- register_copy 
+  //SEG382 [161] phi from fb::@13 to fc [phi:fb::@13->fc]
+  fc_from_b13:
+  //SEG383 [161] phi (byte) be#129 = (byte) be#121 [phi:fb::@13->fc#0] -- register_copy 
+  //SEG384 [161] phi (byte) bd#117 = (byte~) bd#241 [phi:fb::@13->fc#1] -- register_copy 
     jsr fc
-  //SEG385 [130] phi from fb::@14 fb::@3 to fb::@4 [phi:fb::@14/fb::@3->fb::@4]
-  b4_from_b14:
+  //SEG385 [130] phi from fb::@13 fb::@3 to fb::@4 [phi:fb::@13/fb::@3->fb::@4]
+  b4_from_b13:
   b4_from_b3:
-  //SEG386 [130] phi (byte) be#122 = (byte) be#46 [phi:fb::@14/fb::@3->fb::@4#0] -- register_copy 
-  //SEG387 [130] phi (byte) bd#110 = (byte) bd#151 [phi:fb::@14/fb::@3->fb::@4#1] -- register_copy 
+  //SEG386 [130] phi (byte) be#122 = (byte) be#46 [phi:fb::@13/fb::@3->fb::@4#0] -- register_copy 
+  //SEG387 [130] phi (byte) bd#110 = (byte) bd#151 [phi:fb::@13/fb::@3->fb::@4#1] -- register_copy 
     jmp b4
   //SEG388 fb::@4
   b4:
@@ -5285,24 +5327,24 @@ fb: {
     lda #4
     cmp bc
     bne b5_from_b4
-    jmp b15
-  //SEG390 fb::@15
-  b15:
+    jmp b14
+  //SEG390 fb::@14
+  b14:
   //SEG391 [132] (byte) bd#152 ← ++ (byte) bd#110 -- vbuyy=_inc_vbuyy 
     iny
   //SEG392 [133] (byte~) bd#242 ← (byte) bd#152 -- vbuaa=vbuyy 
     tya
   //SEG393 [134] call fc 
-  //SEG394 [161] phi from fb::@15 to fc [phi:fb::@15->fc]
-  fc_from_b15:
-  //SEG395 [161] phi (byte) be#129 = (byte) be#122 [phi:fb::@15->fc#0] -- register_copy 
-  //SEG396 [161] phi (byte) bd#117 = (byte~) bd#242 [phi:fb::@15->fc#1] -- register_copy 
+  //SEG394 [161] phi from fb::@14 to fc [phi:fb::@14->fc]
+  fc_from_b14:
+  //SEG395 [161] phi (byte) be#129 = (byte) be#122 [phi:fb::@14->fc#0] -- register_copy 
+  //SEG396 [161] phi (byte) bd#117 = (byte~) bd#242 [phi:fb::@14->fc#1] -- register_copy 
     jsr fc
-  //SEG397 [135] phi from fb::@15 fb::@4 to fb::@5 [phi:fb::@15/fb::@4->fb::@5]
-  b5_from_b15:
+  //SEG397 [135] phi from fb::@14 fb::@4 to fb::@5 [phi:fb::@14/fb::@4->fb::@5]
+  b5_from_b14:
   b5_from_b4:
-  //SEG398 [135] phi (byte) be#123 = (byte) be#46 [phi:fb::@15/fb::@4->fb::@5#0] -- register_copy 
-  //SEG399 [135] phi (byte) bd#111 = (byte) bd#152 [phi:fb::@15/fb::@4->fb::@5#1] -- register_copy 
+  //SEG398 [135] phi (byte) be#123 = (byte) be#46 [phi:fb::@14/fb::@4->fb::@5#0] -- register_copy 
+  //SEG399 [135] phi (byte) bd#111 = (byte) bd#152 [phi:fb::@14/fb::@4->fb::@5#1] -- register_copy 
     jmp b5
   //SEG400 fb::@5
   b5:
@@ -5310,24 +5352,24 @@ fb: {
     lda #5
     cmp bc
     bne b6_from_b5
-    jmp b16
-  //SEG402 fb::@16
-  b16:
+    jmp b15
+  //SEG402 fb::@15
+  b15:
   //SEG403 [137] (byte) bd#153 ← ++ (byte) bd#111 -- vbuyy=_inc_vbuyy 
     iny
   //SEG404 [138] (byte~) bd#243 ← (byte) bd#153 -- vbuaa=vbuyy 
     tya
   //SEG405 [139] call fc 
-  //SEG406 [161] phi from fb::@16 to fc [phi:fb::@16->fc]
-  fc_from_b16:
-  //SEG407 [161] phi (byte) be#129 = (byte) be#123 [phi:fb::@16->fc#0] -- register_copy 
-  //SEG408 [161] phi (byte) bd#117 = (byte~) bd#243 [phi:fb::@16->fc#1] -- register_copy 
+  //SEG406 [161] phi from fb::@15 to fc [phi:fb::@15->fc]
+  fc_from_b15:
+  //SEG407 [161] phi (byte) be#129 = (byte) be#123 [phi:fb::@15->fc#0] -- register_copy 
+  //SEG408 [161] phi (byte) bd#117 = (byte~) bd#243 [phi:fb::@15->fc#1] -- register_copy 
     jsr fc
-  //SEG409 [140] phi from fb::@16 fb::@5 to fb::@6 [phi:fb::@16/fb::@5->fb::@6]
-  b6_from_b16:
+  //SEG409 [140] phi from fb::@15 fb::@5 to fb::@6 [phi:fb::@15/fb::@5->fb::@6]
+  b6_from_b15:
   b6_from_b5:
-  //SEG410 [140] phi (byte) be#124 = (byte) be#46 [phi:fb::@16/fb::@5->fb::@6#0] -- register_copy 
-  //SEG411 [140] phi (byte) bd#112 = (byte) bd#153 [phi:fb::@16/fb::@5->fb::@6#1] -- register_copy 
+  //SEG410 [140] phi (byte) be#124 = (byte) be#46 [phi:fb::@15/fb::@5->fb::@6#0] -- register_copy 
+  //SEG411 [140] phi (byte) bd#112 = (byte) bd#153 [phi:fb::@15/fb::@5->fb::@6#1] -- register_copy 
     jmp b6
   //SEG412 fb::@6
   b6:
@@ -5335,24 +5377,24 @@ fb: {
     lda #6
     cmp bc
     bne b7_from_b6
-    jmp b17
-  //SEG414 fb::@17
-  b17:
+    jmp b16
+  //SEG414 fb::@16
+  b16:
   //SEG415 [142] (byte) bd#154 ← ++ (byte) bd#112 -- vbuyy=_inc_vbuyy 
     iny
   //SEG416 [143] (byte~) bd#244 ← (byte) bd#154 -- vbuaa=vbuyy 
     tya
   //SEG417 [144] call fc 
-  //SEG418 [161] phi from fb::@17 to fc [phi:fb::@17->fc]
-  fc_from_b17:
-  //SEG419 [161] phi (byte) be#129 = (byte) be#124 [phi:fb::@17->fc#0] -- register_copy 
-  //SEG420 [161] phi (byte) bd#117 = (byte~) bd#244 [phi:fb::@17->fc#1] -- register_copy 
+  //SEG418 [161] phi from fb::@16 to fc [phi:fb::@16->fc]
+  fc_from_b16:
+  //SEG419 [161] phi (byte) be#129 = (byte) be#124 [phi:fb::@16->fc#0] -- register_copy 
+  //SEG420 [161] phi (byte) bd#117 = (byte~) bd#244 [phi:fb::@16->fc#1] -- register_copy 
     jsr fc
-  //SEG421 [145] phi from fb::@17 fb::@6 to fb::@7 [phi:fb::@17/fb::@6->fb::@7]
-  b7_from_b17:
+  //SEG421 [145] phi from fb::@16 fb::@6 to fb::@7 [phi:fb::@16/fb::@6->fb::@7]
+  b7_from_b16:
   b7_from_b6:
-  //SEG422 [145] phi (byte) be#125 = (byte) be#46 [phi:fb::@17/fb::@6->fb::@7#0] -- register_copy 
-  //SEG423 [145] phi (byte) bd#113 = (byte) bd#154 [phi:fb::@17/fb::@6->fb::@7#1] -- register_copy 
+  //SEG422 [145] phi (byte) be#125 = (byte) be#46 [phi:fb::@16/fb::@6->fb::@7#0] -- register_copy 
+  //SEG423 [145] phi (byte) bd#113 = (byte) bd#154 [phi:fb::@16/fb::@6->fb::@7#1] -- register_copy 
     jmp b7
   //SEG424 fb::@7
   b7:
@@ -5360,24 +5402,24 @@ fb: {
     lda #7
     cmp bc
     bne b8_from_b7
-    jmp b18
-  //SEG426 fb::@18
-  b18:
+    jmp b17
+  //SEG426 fb::@17
+  b17:
   //SEG427 [147] (byte) bd#155 ← ++ (byte) bd#113 -- vbuyy=_inc_vbuyy 
     iny
   //SEG428 [148] (byte~) bd#245 ← (byte) bd#155 -- vbuaa=vbuyy 
     tya
   //SEG429 [149] call fc 
-  //SEG430 [161] phi from fb::@18 to fc [phi:fb::@18->fc]
-  fc_from_b18:
-  //SEG431 [161] phi (byte) be#129 = (byte) be#125 [phi:fb::@18->fc#0] -- register_copy 
-  //SEG432 [161] phi (byte) bd#117 = (byte~) bd#245 [phi:fb::@18->fc#1] -- register_copy 
+  //SEG430 [161] phi from fb::@17 to fc [phi:fb::@17->fc]
+  fc_from_b17:
+  //SEG431 [161] phi (byte) be#129 = (byte) be#125 [phi:fb::@17->fc#0] -- register_copy 
+  //SEG432 [161] phi (byte) bd#117 = (byte~) bd#245 [phi:fb::@17->fc#1] -- register_copy 
     jsr fc
-  //SEG433 [150] phi from fb::@18 fb::@7 to fb::@8 [phi:fb::@18/fb::@7->fb::@8]
-  b8_from_b18:
+  //SEG433 [150] phi from fb::@17 fb::@7 to fb::@8 [phi:fb::@17/fb::@7->fb::@8]
+  b8_from_b17:
   b8_from_b7:
-  //SEG434 [150] phi (byte) be#126 = (byte) be#46 [phi:fb::@18/fb::@7->fb::@8#0] -- register_copy 
-  //SEG435 [150] phi (byte) bd#114 = (byte) bd#155 [phi:fb::@18/fb::@7->fb::@8#1] -- register_copy 
+  //SEG434 [150] phi (byte) be#126 = (byte) be#46 [phi:fb::@17/fb::@7->fb::@8#0] -- register_copy 
+  //SEG435 [150] phi (byte) bd#114 = (byte) bd#155 [phi:fb::@17/fb::@7->fb::@8#1] -- register_copy 
     jmp b8
   //SEG436 fb::@8
   b8:
@@ -5385,24 +5427,24 @@ fb: {
     lda #8
     cmp bc
     bne b9_from_b8
-    jmp b19
-  //SEG438 fb::@19
-  b19:
+    jmp b18
+  //SEG438 fb::@18
+  b18:
   //SEG439 [152] (byte) bd#157 ← ++ (byte) bd#114 -- vbuyy=_inc_vbuyy 
     iny
   //SEG440 [153] (byte~) bd#246 ← (byte) bd#157 -- vbuaa=vbuyy 
     tya
   //SEG441 [154] call fc 
-  //SEG442 [161] phi from fb::@19 to fc [phi:fb::@19->fc]
-  fc_from_b19:
-  //SEG443 [161] phi (byte) be#129 = (byte) be#126 [phi:fb::@19->fc#0] -- register_copy 
-  //SEG444 [161] phi (byte) bd#117 = (byte~) bd#246 [phi:fb::@19->fc#1] -- register_copy 
+  //SEG442 [161] phi from fb::@18 to fc [phi:fb::@18->fc]
+  fc_from_b18:
+  //SEG443 [161] phi (byte) be#129 = (byte) be#126 [phi:fb::@18->fc#0] -- register_copy 
+  //SEG444 [161] phi (byte) bd#117 = (byte~) bd#246 [phi:fb::@18->fc#1] -- register_copy 
     jsr fc
-  //SEG445 [155] phi from fb::@19 fb::@8 to fb::@9 [phi:fb::@19/fb::@8->fb::@9]
-  b9_from_b19:
+  //SEG445 [155] phi from fb::@18 fb::@8 to fb::@9 [phi:fb::@18/fb::@8->fb::@9]
+  b9_from_b18:
   b9_from_b8:
-  //SEG446 [155] phi (byte) be#127 = (byte) be#46 [phi:fb::@19/fb::@8->fb::@9#0] -- register_copy 
-  //SEG447 [155] phi (byte) bd#115 = (byte) bd#157 [phi:fb::@19/fb::@8->fb::@9#1] -- register_copy 
+  //SEG446 [155] phi (byte) be#127 = (byte) be#46 [phi:fb::@18/fb::@8->fb::@9#0] -- register_copy 
+  //SEG447 [155] phi (byte) bd#115 = (byte) bd#157 [phi:fb::@18/fb::@8->fb::@9#1] -- register_copy 
     jmp b9
   //SEG448 fb::@9
   b9:
@@ -5410,22 +5452,22 @@ fb: {
     lda #9
     cmp bc
     bne breturn_from_b9
-  //SEG450 [157] phi from fb::@9 to fb::@20 [phi:fb::@9->fb::@20]
-  b20_from_b9:
-    jmp b20
-  //SEG451 fb::@20
-  b20:
+  //SEG450 [157] phi from fb::@9 to fb::@19 [phi:fb::@9->fb::@19]
+  b19_from_b9:
+    jmp b19
+  //SEG451 fb::@19
+  b19:
   //SEG452 [158] call fc 
-  //SEG453 [161] phi from fb::@20 to fc [phi:fb::@20->fc]
-  fc_from_b20:
-  //SEG454 [161] phi (byte) be#129 = (byte) be#127 [phi:fb::@20->fc#0] -- register_copy 
-  //SEG455 [161] phi (byte) bd#117 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@20->fc#1] -- vbuaa=vbuc1 
+  //SEG453 [161] phi from fb::@19 to fc [phi:fb::@19->fc]
+  fc_from_b19:
+  //SEG454 [161] phi (byte) be#129 = (byte) be#127 [phi:fb::@19->fc#0] -- register_copy 
+  //SEG455 [161] phi (byte) bd#117 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@19->fc#1] -- vbuaa=vbuc1 
     lda #0
     jsr fc
-  //SEG456 [159] phi from fb::@20 to fb::@return [phi:fb::@20->fb::@return]
-  breturn_from_b20:
-  //SEG457 [159] phi (byte) be#35 = (byte) be#46 [phi:fb::@20->fb::@return#0] -- register_copy 
-  //SEG458 [159] phi (byte) bd#35 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@20->fb::@return#1] -- vbuyy=vbuc1 
+  //SEG456 [159] phi from fb::@19 to fb::@return [phi:fb::@19->fb::@return]
+  breturn_from_b19:
+  //SEG457 [159] phi (byte) be#35 = (byte) be#46 [phi:fb::@19->fb::@return#0] -- register_copy 
+  //SEG458 [159] phi (byte) bd#35 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@19->fb::@return#1] -- vbuyy=vbuc1 
     ldy #0
     jmp breturn
   //SEG459 [159] phi from fb::@9 to fb::@return [phi:fb::@9->fb::@return]
@@ -5443,141 +5485,141 @@ fc: {
   //SEG465 [162] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto fc::@1 -- vbuaa_neq_0_then_la1 
     cmp #0
     bne b1_from_fc
-    jmp b11
-  //SEG466 fc::@11
-  b11:
+    jmp b10
+  //SEG466 fc::@10
+  b10:
   //SEG467 [163] (byte) be#36 ← ++ (byte) be#129 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG468 [164] phi from fc fc::@11 to fc::@1 [phi:fc/fc::@11->fc::@1]
+  //SEG468 [164] phi from fc fc::@10 to fc::@1 [phi:fc/fc::@10->fc::@1]
   b1_from_fc:
-  b1_from_b11:
-  //SEG469 [164] phi (byte) be#130 = (byte) be#129 [phi:fc/fc::@11->fc::@1#0] -- register_copy 
+  b1_from_b10:
+  //SEG469 [164] phi (byte) be#130 = (byte) be#129 [phi:fc/fc::@10->fc::@1#0] -- register_copy 
     jmp b1
   //SEG470 fc::@1
   b1:
   //SEG471 [165] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto fc::@2 -- vbuaa_neq_vbuc1_then_la1 
     cmp #1
     bne b2_from_b1
-    jmp b12
-  //SEG472 fc::@12
-  b12:
+    jmp b11
+  //SEG472 fc::@11
+  b11:
   //SEG473 [166] (byte) be#37 ← ++ (byte) be#130 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG474 [167] phi from fc::@1 fc::@12 to fc::@2 [phi:fc::@1/fc::@12->fc::@2]
+  //SEG474 [167] phi from fc::@1 fc::@11 to fc::@2 [phi:fc::@1/fc::@11->fc::@2]
   b2_from_b1:
-  b2_from_b12:
-  //SEG475 [167] phi (byte) be#131 = (byte) be#130 [phi:fc::@1/fc::@12->fc::@2#0] -- register_copy 
+  b2_from_b11:
+  //SEG475 [167] phi (byte) be#131 = (byte) be#130 [phi:fc::@1/fc::@11->fc::@2#0] -- register_copy 
     jmp b2
   //SEG476 fc::@2
   b2:
   //SEG477 [168] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto fc::@3 -- vbuaa_neq_vbuc1_then_la1 
     cmp #2
     bne b3_from_b2
-    jmp b13
-  //SEG478 fc::@13
-  b13:
+    jmp b12
+  //SEG478 fc::@12
+  b12:
   //SEG479 [169] (byte) be#38 ← ++ (byte) be#131 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG480 [170] phi from fc::@13 fc::@2 to fc::@3 [phi:fc::@13/fc::@2->fc::@3]
-  b3_from_b13:
+  //SEG480 [170] phi from fc::@12 fc::@2 to fc::@3 [phi:fc::@12/fc::@2->fc::@3]
+  b3_from_b12:
   b3_from_b2:
-  //SEG481 [170] phi (byte) be#132 = (byte) be#38 [phi:fc::@13/fc::@2->fc::@3#0] -- register_copy 
+  //SEG481 [170] phi (byte) be#132 = (byte) be#38 [phi:fc::@12/fc::@2->fc::@3#0] -- register_copy 
     jmp b3
   //SEG482 fc::@3
   b3:
   //SEG483 [171] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto fc::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #3
     bne b4_from_b3
-    jmp b14
-  //SEG484 fc::@14
-  b14:
+    jmp b13
+  //SEG484 fc::@13
+  b13:
   //SEG485 [172] (byte) be#39 ← ++ (byte) be#132 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG486 [173] phi from fc::@14 fc::@3 to fc::@4 [phi:fc::@14/fc::@3->fc::@4]
-  b4_from_b14:
+  //SEG486 [173] phi from fc::@13 fc::@3 to fc::@4 [phi:fc::@13/fc::@3->fc::@4]
+  b4_from_b13:
   b4_from_b3:
-  //SEG487 [173] phi (byte) be#133 = (byte) be#39 [phi:fc::@14/fc::@3->fc::@4#0] -- register_copy 
+  //SEG487 [173] phi (byte) be#133 = (byte) be#39 [phi:fc::@13/fc::@3->fc::@4#0] -- register_copy 
     jmp b4
   //SEG488 fc::@4
   b4:
   //SEG489 [174] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto fc::@5 -- vbuaa_neq_vbuc1_then_la1 
     cmp #4
     bne b5_from_b4
-    jmp b15
-  //SEG490 fc::@15
-  b15:
+    jmp b14
+  //SEG490 fc::@14
+  b14:
   //SEG491 [175] (byte) be#40 ← ++ (byte) be#133 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG492 [176] phi from fc::@15 fc::@4 to fc::@5 [phi:fc::@15/fc::@4->fc::@5]
-  b5_from_b15:
+  //SEG492 [176] phi from fc::@14 fc::@4 to fc::@5 [phi:fc::@14/fc::@4->fc::@5]
+  b5_from_b14:
   b5_from_b4:
-  //SEG493 [176] phi (byte) be#134 = (byte) be#40 [phi:fc::@15/fc::@4->fc::@5#0] -- register_copy 
+  //SEG493 [176] phi (byte) be#134 = (byte) be#40 [phi:fc::@14/fc::@4->fc::@5#0] -- register_copy 
     jmp b5
   //SEG494 fc::@5
   b5:
   //SEG495 [177] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto fc::@6 -- vbuaa_neq_vbuc1_then_la1 
     cmp #5
     bne b6_from_b5
-    jmp b16
-  //SEG496 fc::@16
-  b16:
+    jmp b15
+  //SEG496 fc::@15
+  b15:
   //SEG497 [178] (byte) be#41 ← ++ (byte) be#134 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG498 [179] phi from fc::@16 fc::@5 to fc::@6 [phi:fc::@16/fc::@5->fc::@6]
-  b6_from_b16:
+  //SEG498 [179] phi from fc::@15 fc::@5 to fc::@6 [phi:fc::@15/fc::@5->fc::@6]
+  b6_from_b15:
   b6_from_b5:
-  //SEG499 [179] phi (byte) be#135 = (byte) be#41 [phi:fc::@16/fc::@5->fc::@6#0] -- register_copy 
+  //SEG499 [179] phi (byte) be#135 = (byte) be#41 [phi:fc::@15/fc::@5->fc::@6#0] -- register_copy 
     jmp b6
   //SEG500 fc::@6
   b6:
   //SEG501 [180] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto fc::@7 -- vbuaa_neq_vbuc1_then_la1 
     cmp #6
     bne b7_from_b6
-    jmp b17
-  //SEG502 fc::@17
-  b17:
+    jmp b16
+  //SEG502 fc::@16
+  b16:
   //SEG503 [181] (byte) be#42 ← ++ (byte) be#135 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG504 [182] phi from fc::@17 fc::@6 to fc::@7 [phi:fc::@17/fc::@6->fc::@7]
-  b7_from_b17:
+  //SEG504 [182] phi from fc::@16 fc::@6 to fc::@7 [phi:fc::@16/fc::@6->fc::@7]
+  b7_from_b16:
   b7_from_b6:
-  //SEG505 [182] phi (byte) be#136 = (byte) be#42 [phi:fc::@17/fc::@6->fc::@7#0] -- register_copy 
+  //SEG505 [182] phi (byte) be#136 = (byte) be#42 [phi:fc::@16/fc::@6->fc::@7#0] -- register_copy 
     jmp b7
   //SEG506 fc::@7
   b7:
   //SEG507 [183] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto fc::@8 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
     bne b8_from_b7
-    jmp b18
-  //SEG508 fc::@18
-  b18:
+    jmp b17
+  //SEG508 fc::@17
+  b17:
   //SEG509 [184] (byte) be#43 ← ++ (byte) be#136 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG510 [185] phi from fc::@18 fc::@7 to fc::@8 [phi:fc::@18/fc::@7->fc::@8]
-  b8_from_b18:
+  //SEG510 [185] phi from fc::@17 fc::@7 to fc::@8 [phi:fc::@17/fc::@7->fc::@8]
+  b8_from_b17:
   b8_from_b7:
-  //SEG511 [185] phi (byte) be#137 = (byte) be#43 [phi:fc::@18/fc::@7->fc::@8#0] -- register_copy 
+  //SEG511 [185] phi (byte) be#137 = (byte) be#43 [phi:fc::@17/fc::@7->fc::@8#0] -- register_copy 
     jmp b8
   //SEG512 fc::@8
   b8:
   //SEG513 [186] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto fc::@9 -- vbuaa_neq_vbuc1_then_la1 
     cmp #8
     bne b9_from_b8
-    jmp b19
-  //SEG514 fc::@19
-  b19:
+    jmp b18
+  //SEG514 fc::@18
+  b18:
   //SEG515 [187] (byte) be#44 ← ++ (byte) be#137 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG516 [188] phi from fc::@19 fc::@8 to fc::@9 [phi:fc::@19/fc::@8->fc::@9]
-  b9_from_b19:
+  //SEG516 [188] phi from fc::@18 fc::@8 to fc::@9 [phi:fc::@18/fc::@8->fc::@9]
+  b9_from_b18:
   b9_from_b8:
-  //SEG517 [188] phi (byte) be#138 = (byte) be#44 [phi:fc::@19/fc::@8->fc::@9#0] -- register_copy 
+  //SEG517 [188] phi (byte) be#138 = (byte) be#44 [phi:fc::@18/fc::@8->fc::@9#0] -- register_copy 
     jmp b9
   //SEG518 fc::@9
   b9:
-  //SEG519 [189] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fc::@30 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG519 [189] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fc::@19 -- vbuaa_neq_vbuc1_then_la1 
     cmp #9
-    bne b30_from_b9
+    bne b19_from_b9
   //SEG520 [190] phi from fc::@9 to fc::@return [phi:fc::@9->fc::@return]
   breturn_from_b9:
   //SEG521 [190] phi (byte) be#46 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fc::@9->fc::@return#0] -- vbuz1=vbuc1 
@@ -5588,103 +5630,103 @@ fc: {
   breturn:
   //SEG523 [191] return 
     rts
-  //SEG524 [192] phi from fc::@9 to fc::@30 [phi:fc::@9->fc::@30]
-  b30_from_b9:
-    jmp b30
-  //SEG525 fc::@30
-  b30:
-  //SEG526 [190] phi from fc::@30 to fc::@return [phi:fc::@30->fc::@return]
-  breturn_from_b30:
-  //SEG527 [190] phi (byte) be#46 = (byte) be#138 [phi:fc::@30->fc::@return#0] -- register_copy 
+  //SEG524 [192] phi from fc::@9 to fc::@19 [phi:fc::@9->fc::@19]
+  b19_from_b9:
+    jmp b19
+  //SEG525 fc::@19
+  b19:
+  //SEG526 [190] phi from fc::@19 to fc::@return [phi:fc::@19->fc::@return]
+  breturn_from_b19:
+  //SEG527 [190] phi (byte) be#46 = (byte) be#138 [phi:fc::@19->fc::@return#0] -- register_copy 
     jmp breturn
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b5
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b7
-Removing instruction jmp b11
-Removing instruction jmp b1
-Removing instruction jmp b12
-Removing instruction jmp b2
-Removing instruction jmp b13
 Removing instruction jmp b3
-Removing instruction jmp b14
+Removing instruction jmp b10
+Removing instruction jmp b1
+Removing instruction jmp b11
+Removing instruction jmp b2
+Removing instruction jmp b12
+Removing instruction jmp b3
+Removing instruction jmp b13
 Removing instruction jmp b4
-Removing instruction jmp b15
+Removing instruction jmp b14
 Removing instruction jmp b5
-Removing instruction jmp b16
+Removing instruction jmp b15
 Removing instruction jmp b6
-Removing instruction jmp b17
+Removing instruction jmp b16
 Removing instruction jmp b7
-Removing instruction jmp b18
+Removing instruction jmp b17
 Removing instruction jmp b8
-Removing instruction jmp b19
+Removing instruction jmp b18
 Removing instruction jmp b9
-Removing instruction jmp b20
-Removing instruction jmp breturn
-Removing instruction jmp b11
-Removing instruction jmp b1
-Removing instruction jmp b12
-Removing instruction jmp b2
-Removing instruction jmp b13
-Removing instruction jmp b3
-Removing instruction jmp b14
-Removing instruction jmp b4
-Removing instruction jmp b15
-Removing instruction jmp b5
-Removing instruction jmp b16
-Removing instruction jmp b6
-Removing instruction jmp b17
-Removing instruction jmp b7
-Removing instruction jmp b18
-Removing instruction jmp b8
 Removing instruction jmp b19
+Removing instruction jmp breturn
+Removing instruction jmp b10
+Removing instruction jmp b1
+Removing instruction jmp b11
+Removing instruction jmp b2
+Removing instruction jmp b12
+Removing instruction jmp b3
+Removing instruction jmp b13
+Removing instruction jmp b4
+Removing instruction jmp b14
+Removing instruction jmp b5
+Removing instruction jmp b15
+Removing instruction jmp b6
+Removing instruction jmp b16
+Removing instruction jmp b7
+Removing instruction jmp b17
+Removing instruction jmp b8
+Removing instruction jmp b18
 Removing instruction jmp b9
-Removing instruction jmp b20
-Removing instruction jmp breturn
-Removing instruction jmp b11
-Removing instruction jmp b1
-Removing instruction jmp b12
-Removing instruction jmp b2
-Removing instruction jmp b13
-Removing instruction jmp b3
-Removing instruction jmp b14
-Removing instruction jmp b4
-Removing instruction jmp b15
-Removing instruction jmp b5
-Removing instruction jmp b16
-Removing instruction jmp b6
-Removing instruction jmp b17
-Removing instruction jmp b7
-Removing instruction jmp b18
-Removing instruction jmp b8
 Removing instruction jmp b19
+Removing instruction jmp breturn
+Removing instruction jmp b10
+Removing instruction jmp b1
+Removing instruction jmp b11
+Removing instruction jmp b2
+Removing instruction jmp b12
+Removing instruction jmp b3
+Removing instruction jmp b13
+Removing instruction jmp b4
+Removing instruction jmp b14
+Removing instruction jmp b5
+Removing instruction jmp b15
+Removing instruction jmp b6
+Removing instruction jmp b16
+Removing instruction jmp b7
+Removing instruction jmp b17
+Removing instruction jmp b8
+Removing instruction jmp b18
 Removing instruction jmp b9
-Removing instruction jmp b20
-Removing instruction jmp breturn
-Removing instruction jmp b11
-Removing instruction jmp b1
-Removing instruction jmp b12
-Removing instruction jmp b2
-Removing instruction jmp b13
-Removing instruction jmp b3
-Removing instruction jmp b14
-Removing instruction jmp b4
-Removing instruction jmp b15
-Removing instruction jmp b5
-Removing instruction jmp b16
-Removing instruction jmp b6
-Removing instruction jmp b17
-Removing instruction jmp b7
-Removing instruction jmp b18
-Removing instruction jmp b8
 Removing instruction jmp b19
+Removing instruction jmp breturn
+Removing instruction jmp b10
+Removing instruction jmp b1
+Removing instruction jmp b11
+Removing instruction jmp b2
+Removing instruction jmp b12
+Removing instruction jmp b3
+Removing instruction jmp b13
+Removing instruction jmp b4
+Removing instruction jmp b14
+Removing instruction jmp b5
+Removing instruction jmp b15
+Removing instruction jmp b6
+Removing instruction jmp b16
+Removing instruction jmp b7
+Removing instruction jmp b17
+Removing instruction jmp b8
+Removing instruction jmp b18
 Removing instruction jmp b9
 Removing instruction jmp breturn
-Removing instruction jmp b30
+Removing instruction jmp b19
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Replacing instruction ldy #0 with TAY
@@ -5731,101 +5773,103 @@ Replacing label b6_from_b5 with b6
 Replacing label b7_from_b6 with b7
 Replacing label b8_from_b7 with b8
 Replacing label b9_from_b8 with b9
-Replacing label b30_from_b9 with b30
-Removing instruction b5_from_bbegin:
-Removing instruction b5:
-Removing instruction main_from_b5:
-Removing instruction bend_from_b5:
+Replacing label b19_from_b9 with b19
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1:
 Removing instruction b2_from_b1:
 Removing instruction b1_from_f0:
-Removing instruction b1_from_b11:
+Removing instruction b1_from_b10:
 Removing instruction b2_from_b1:
-Removing instruction b2_from_b12:
-Removing instruction b3_from_b13:
+Removing instruction b2_from_b11:
+Removing instruction b3_from_b12:
 Removing instruction b3_from_b2:
-Removing instruction b4_from_b14:
+Removing instruction b4_from_b13:
 Removing instruction b4_from_b3:
-Removing instruction b5_from_b15:
+Removing instruction b5_from_b14:
 Removing instruction b5_from_b4:
-Removing instruction b6_from_b16:
+Removing instruction b6_from_b15:
 Removing instruction b6_from_b5:
-Removing instruction b7_from_b17:
+Removing instruction b7_from_b16:
 Removing instruction b7_from_b6:
-Removing instruction b8_from_b18:
+Removing instruction b8_from_b17:
 Removing instruction b8_from_b7:
-Removing instruction b9_from_b19:
+Removing instruction b9_from_b18:
 Removing instruction b9_from_b8:
-Removing instruction b20_from_b9:
-Removing instruction fa_from_b20:
+Removing instruction b19_from_b9:
+Removing instruction fa_from_b19:
 Removing instruction breturn_from_b9:
 Removing instruction b1_from_fa:
-Removing instruction b1_from_b11:
+Removing instruction b1_from_b10:
 Removing instruction b2_from_b1:
-Removing instruction b2_from_b12:
-Removing instruction b3_from_b13:
+Removing instruction b2_from_b11:
+Removing instruction b3_from_b12:
 Removing instruction b3_from_b2:
-Removing instruction b4_from_b14:
+Removing instruction b4_from_b13:
 Removing instruction b4_from_b3:
-Removing instruction b5_from_b15:
+Removing instruction b5_from_b14:
 Removing instruction b5_from_b4:
-Removing instruction b6_from_b16:
+Removing instruction b6_from_b15:
 Removing instruction b6_from_b5:
-Removing instruction b7_from_b17:
+Removing instruction b7_from_b16:
 Removing instruction b7_from_b6:
-Removing instruction b8_from_b18:
+Removing instruction b8_from_b17:
 Removing instruction b8_from_b7:
-Removing instruction b9_from_b19:
+Removing instruction b9_from_b18:
 Removing instruction b9_from_b8:
-Removing instruction b20_from_b9:
-Removing instruction fb_from_b20:
+Removing instruction b19_from_b9:
+Removing instruction fb_from_b19:
 Removing instruction breturn_from_b9:
 Removing instruction b1_from_fb:
-Removing instruction b1_from_b11:
+Removing instruction b1_from_b10:
 Removing instruction b2_from_b1:
-Removing instruction b2_from_b12:
-Removing instruction b3_from_b13:
+Removing instruction b2_from_b11:
+Removing instruction b3_from_b12:
 Removing instruction b3_from_b2:
-Removing instruction b4_from_b14:
+Removing instruction b4_from_b13:
 Removing instruction b4_from_b3:
-Removing instruction b5_from_b15:
+Removing instruction b5_from_b14:
 Removing instruction b5_from_b4:
-Removing instruction b6_from_b16:
+Removing instruction b6_from_b15:
 Removing instruction b6_from_b5:
-Removing instruction b7_from_b17:
+Removing instruction b7_from_b16:
 Removing instruction b7_from_b6:
-Removing instruction b8_from_b18:
+Removing instruction b8_from_b17:
 Removing instruction b8_from_b7:
-Removing instruction b9_from_b19:
+Removing instruction b9_from_b18:
 Removing instruction b9_from_b8:
-Removing instruction b20_from_b9:
-Removing instruction fc_from_b20:
+Removing instruction b19_from_b9:
+Removing instruction fc_from_b19:
 Removing instruction breturn_from_b9:
 Removing instruction b1_from_fc:
-Removing instruction b1_from_b11:
+Removing instruction b1_from_b10:
 Removing instruction b2_from_b1:
-Removing instruction b2_from_b12:
-Removing instruction b3_from_b13:
+Removing instruction b2_from_b11:
+Removing instruction b3_from_b12:
 Removing instruction b3_from_b2:
-Removing instruction b4_from_b14:
+Removing instruction b4_from_b13:
 Removing instruction b4_from_b3:
-Removing instruction b5_from_b15:
+Removing instruction b5_from_b14:
 Removing instruction b5_from_b4:
-Removing instruction b6_from_b16:
+Removing instruction b6_from_b15:
 Removing instruction b6_from_b5:
-Removing instruction b7_from_b17:
+Removing instruction b7_from_b16:
 Removing instruction b7_from_b6:
-Removing instruction b8_from_b18:
+Removing instruction b8_from_b17:
 Removing instruction b8_from_b7:
-Removing instruction b9_from_b19:
+Removing instruction b9_from_b18:
 Removing instruction b9_from_b8:
-Removing instruction b30_from_b9:
-Removing instruction breturn_from_b30:
+Removing instruction b19_from_b9:
+Removing instruction breturn_from_b19:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b7:
-Removing instruction b1_from_b7:
+Removing instruction b3:
+Removing instruction b1_from_b3:
+Removing instruction b10:
+Removing instruction fa_from_b10:
 Removing instruction b11:
 Removing instruction fa_from_b11:
 Removing instruction b12:
@@ -5843,9 +5887,9 @@ Removing instruction fa_from_b17:
 Removing instruction b18:
 Removing instruction fa_from_b18:
 Removing instruction b19:
-Removing instruction fa_from_b19:
-Removing instruction b20:
-Removing instruction breturn_from_b20:
+Removing instruction breturn_from_b19:
+Removing instruction b10:
+Removing instruction fb_from_b10:
 Removing instruction b11:
 Removing instruction fb_from_b11:
 Removing instruction b12:
@@ -5863,9 +5907,9 @@ Removing instruction fb_from_b17:
 Removing instruction b18:
 Removing instruction fb_from_b18:
 Removing instruction b19:
-Removing instruction fb_from_b19:
-Removing instruction b20:
-Removing instruction breturn_from_b20:
+Removing instruction breturn_from_b19:
+Removing instruction b10:
+Removing instruction fc_from_b10:
 Removing instruction b11:
 Removing instruction fc_from_b11:
 Removing instruction b12:
@@ -5883,9 +5927,8 @@ Removing instruction fc_from_b17:
 Removing instruction b18:
 Removing instruction fc_from_b18:
 Removing instruction b19:
-Removing instruction fc_from_b19:
-Removing instruction b20:
-Removing instruction breturn_from_b20:
+Removing instruction breturn_from_b19:
+Removing instruction b10:
 Removing instruction b11:
 Removing instruction b12:
 Removing instruction b13:
@@ -5894,26 +5937,25 @@ Removing instruction b15:
 Removing instruction b16:
 Removing instruction b17:
 Removing instruction b18:
-Removing instruction b19:
 Removing instruction breturn_from_b9:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to breturn in bne b30
+Skipping double jump to breturn in bne b19
 Succesful ASM optimization Pass5DoubleJumpElimination
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
-Removing instruction b30:
+Removing instruction b19:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp breturn
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (byte) ba
@@ -6101,6 +6143,7 @@ FINAL SYMBOL TABLE
 (byte) be#46 be zp ZP_BYTE:6 1.8333333333333335
 (void()) f0()
 (label) f0::@1
+(label) f0::@10
 (label) f0::@11
 (label) f0::@12
 (label) f0::@13
@@ -6111,7 +6154,6 @@ FINAL SYMBOL TABLE
 (label) f0::@18
 (label) f0::@19
 (label) f0::@2
-(label) f0::@20
 (label) f0::@3
 (label) f0::@4
 (label) f0::@5
@@ -6122,6 +6164,7 @@ FINAL SYMBOL TABLE
 (label) f0::@return
 (void()) fa()
 (label) fa::@1
+(label) fa::@10
 (label) fa::@11
 (label) fa::@12
 (label) fa::@13
@@ -6132,7 +6175,6 @@ FINAL SYMBOL TABLE
 (label) fa::@18
 (label) fa::@19
 (label) fa::@2
-(label) fa::@20
 (label) fa::@3
 (label) fa::@4
 (label) fa::@5
@@ -6143,6 +6185,7 @@ FINAL SYMBOL TABLE
 (label) fa::@return
 (void()) fb()
 (label) fb::@1
+(label) fb::@10
 (label) fb::@11
 (label) fb::@12
 (label) fb::@13
@@ -6153,7 +6196,6 @@ FINAL SYMBOL TABLE
 (label) fb::@18
 (label) fb::@19
 (label) fb::@2
-(label) fb::@20
 (label) fb::@3
 (label) fb::@4
 (label) fb::@5
@@ -6164,6 +6206,7 @@ FINAL SYMBOL TABLE
 (label) fb::@return
 (void()) fc()
 (label) fc::@1
+(label) fc::@10
 (label) fc::@11
 (label) fc::@12
 (label) fc::@13
@@ -6175,7 +6218,6 @@ FINAL SYMBOL TABLE
 (label) fc::@19
 (label) fc::@2
 (label) fc::@3
-(label) fc::@30
 (label) fc::@4
 (label) fc::@5
 (label) fc::@6
@@ -6186,7 +6228,7 @@ FINAL SYMBOL TABLE
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@7
+(label) main::@3
 
 zp ZP_BYTE:2 [ ba#17 ba#1 ]
 zp ZP_BYTE:3 [ bb#49 bb#11 bb#25 bb#10 bb#24 bb#68 bb#23 bb#67 bb#22 bb#66 bb#21 bb#6 bb#20 bb#19 bb#18 bb#16 bb#13 bb#3 bb#4 bb#5 ]
@@ -6222,11 +6264,11 @@ Score: 995
   .label bb_108 = 4
   .label bb_109 = 4
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-//SEG5 @5
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -6248,15 +6290,15 @@ main: {
   b2:
   //SEG20 [7] call f0 
     jsr f0
-  //SEG21 main::@7
+  //SEG21 main::@3
   //SEG22 [8] (byte) ba#1 ← ++ (byte) ba#17 -- vbuz1=_inc_vbuz1 
     inc ba
-  //SEG23 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  //SEG24 [5] phi (byte) ba#17 = (byte) ba#1 [phi:main::@7->main::@1#0] -- register_copy 
-  //SEG25 [5] phi (byte) be#2 = (byte) be#13 [phi:main::@7->main::@1#1] -- register_copy 
-  //SEG26 [5] phi (byte) bd#2 = (byte) bd#13 [phi:main::@7->main::@1#2] -- register_copy 
-  //SEG27 [5] phi (byte) bc#2 = (byte) bc#13 [phi:main::@7->main::@1#3] -- register_copy 
-  //SEG28 [5] phi (byte) bb#16 = (byte) bb#13 [phi:main::@7->main::@1#4] -- register_copy 
+  //SEG23 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  //SEG24 [5] phi (byte) ba#17 = (byte) ba#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG25 [5] phi (byte) be#2 = (byte) be#13 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG26 [5] phi (byte) bd#2 = (byte) bd#13 [phi:main::@3->main::@1#2] -- register_copy 
+  //SEG27 [5] phi (byte) bc#2 = (byte) bc#13 [phi:main::@3->main::@1#3] -- register_copy 
+  //SEG28 [5] phi (byte) bb#16 = (byte) bb#13 [phi:main::@3->main::@1#4] -- register_copy 
     jmp b2
 }
 //SEG29 f0
@@ -6265,238 +6307,238 @@ f0: {
     lda ba
     cmp #0
     bne b1
-  //SEG31 f0::@11
+  //SEG31 f0::@10
   //SEG32 [10] (byte) bb#3 ← ++ (byte) bb#16 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG33 [11] (byte~) bb#101 ← (byte) bb#3 -- vbuz1=vbuz2 
     lda bb
     sta bb_101
   //SEG34 [12] call fa 
-  //SEG35 [59] phi from f0::@11 to fa [phi:f0::@11->fa]
-  //SEG36 [59] phi (byte) be#107 = (byte) be#2 [phi:f0::@11->fa#0] -- register_copy 
-  //SEG37 [59] phi (byte) bd#138 = (byte) bd#2 [phi:f0::@11->fa#1] -- register_copy 
-  //SEG38 [59] phi (byte) bc#39 = (byte) bc#2 [phi:f0::@11->fa#2] -- register_copy 
-  //SEG39 [59] phi (byte) bb#27 = (byte~) bb#101 [phi:f0::@11->fa#3] -- register_copy 
+  //SEG35 [59] phi from f0::@10 to fa [phi:f0::@10->fa]
+  //SEG36 [59] phi (byte) be#107 = (byte) be#2 [phi:f0::@10->fa#0] -- register_copy 
+  //SEG37 [59] phi (byte) bd#138 = (byte) bd#2 [phi:f0::@10->fa#1] -- register_copy 
+  //SEG38 [59] phi (byte) bc#39 = (byte) bc#2 [phi:f0::@10->fa#2] -- register_copy 
+  //SEG39 [59] phi (byte) bb#27 = (byte~) bb#101 [phi:f0::@10->fa#3] -- register_copy 
     jsr fa
-  //SEG40 [13] phi from f0 f0::@11 to f0::@1 [phi:f0/f0::@11->f0::@1]
-  //SEG41 [13] phi (byte) be#142 = (byte) be#2 [phi:f0/f0::@11->f0::@1#0] -- register_copy 
-  //SEG42 [13] phi (byte) bd#129 = (byte) bd#2 [phi:f0/f0::@11->f0::@1#1] -- register_copy 
-  //SEG43 [13] phi (byte) bc#63 = (byte) bc#2 [phi:f0/f0::@11->f0::@1#2] -- register_copy 
-  //SEG44 [13] phi (byte) bb#18 = (byte) bb#16 [phi:f0/f0::@11->f0::@1#3] -- register_copy 
+  //SEG40 [13] phi from f0 f0::@10 to f0::@1 [phi:f0/f0::@10->f0::@1]
+  //SEG41 [13] phi (byte) be#142 = (byte) be#2 [phi:f0/f0::@10->f0::@1#0] -- register_copy 
+  //SEG42 [13] phi (byte) bd#129 = (byte) bd#2 [phi:f0/f0::@10->f0::@1#1] -- register_copy 
+  //SEG43 [13] phi (byte) bc#63 = (byte) bc#2 [phi:f0/f0::@10->f0::@1#2] -- register_copy 
+  //SEG44 [13] phi (byte) bb#18 = (byte) bb#16 [phi:f0/f0::@10->f0::@1#3] -- register_copy 
   //SEG45 f0::@1
   b1:
   //SEG46 [14] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto f0::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #1
     cmp ba
     bne b2
-  //SEG47 f0::@12
+  //SEG47 f0::@11
   //SEG48 [15] (byte) bb#4 ← ++ (byte) bb#18 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG49 [16] (byte~) bb#102 ← (byte) bb#4 -- vbuz1=vbuz2 
     lda bb
     sta bb_102
   //SEG50 [17] call fa 
-  //SEG51 [59] phi from f0::@12 to fa [phi:f0::@12->fa]
-  //SEG52 [59] phi (byte) be#107 = (byte) be#142 [phi:f0::@12->fa#0] -- register_copy 
-  //SEG53 [59] phi (byte) bd#138 = (byte) bd#129 [phi:f0::@12->fa#1] -- register_copy 
-  //SEG54 [59] phi (byte) bc#39 = (byte) bc#63 [phi:f0::@12->fa#2] -- register_copy 
-  //SEG55 [59] phi (byte) bb#27 = (byte~) bb#102 [phi:f0::@12->fa#3] -- register_copy 
+  //SEG51 [59] phi from f0::@11 to fa [phi:f0::@11->fa]
+  //SEG52 [59] phi (byte) be#107 = (byte) be#142 [phi:f0::@11->fa#0] -- register_copy 
+  //SEG53 [59] phi (byte) bd#138 = (byte) bd#129 [phi:f0::@11->fa#1] -- register_copy 
+  //SEG54 [59] phi (byte) bc#39 = (byte) bc#63 [phi:f0::@11->fa#2] -- register_copy 
+  //SEG55 [59] phi (byte) bb#27 = (byte~) bb#102 [phi:f0::@11->fa#3] -- register_copy 
     jsr fa
-  //SEG56 [18] phi from f0::@1 f0::@12 to f0::@2 [phi:f0::@1/f0::@12->f0::@2]
-  //SEG57 [18] phi (byte) be#143 = (byte) be#142 [phi:f0::@1/f0::@12->f0::@2#0] -- register_copy 
-  //SEG58 [18] phi (byte) bd#130 = (byte) bd#129 [phi:f0::@1/f0::@12->f0::@2#1] -- register_copy 
-  //SEG59 [18] phi (byte) bc#64 = (byte) bc#63 [phi:f0::@1/f0::@12->f0::@2#2] -- register_copy 
-  //SEG60 [18] phi (byte) bb#19 = (byte) bb#18 [phi:f0::@1/f0::@12->f0::@2#3] -- register_copy 
+  //SEG56 [18] phi from f0::@1 f0::@11 to f0::@2 [phi:f0::@1/f0::@11->f0::@2]
+  //SEG57 [18] phi (byte) be#143 = (byte) be#142 [phi:f0::@1/f0::@11->f0::@2#0] -- register_copy 
+  //SEG58 [18] phi (byte) bd#130 = (byte) bd#129 [phi:f0::@1/f0::@11->f0::@2#1] -- register_copy 
+  //SEG59 [18] phi (byte) bc#64 = (byte) bc#63 [phi:f0::@1/f0::@11->f0::@2#2] -- register_copy 
+  //SEG60 [18] phi (byte) bb#19 = (byte) bb#18 [phi:f0::@1/f0::@11->f0::@2#3] -- register_copy 
   //SEG61 f0::@2
   b2:
   //SEG62 [19] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto f0::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #2
     cmp ba
     bne b3
-  //SEG63 f0::@13
+  //SEG63 f0::@12
   //SEG64 [20] (byte) bb#5 ← ++ (byte) bb#19 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG65 [21] (byte~) bb#103 ← (byte) bb#5 -- vbuz1=vbuz2 
     lda bb
     sta bb_103
   //SEG66 [22] call fa 
-  //SEG67 [59] phi from f0::@13 to fa [phi:f0::@13->fa]
-  //SEG68 [59] phi (byte) be#107 = (byte) be#143 [phi:f0::@13->fa#0] -- register_copy 
-  //SEG69 [59] phi (byte) bd#138 = (byte) bd#130 [phi:f0::@13->fa#1] -- register_copy 
-  //SEG70 [59] phi (byte) bc#39 = (byte) bc#64 [phi:f0::@13->fa#2] -- register_copy 
-  //SEG71 [59] phi (byte) bb#27 = (byte~) bb#103 [phi:f0::@13->fa#3] -- register_copy 
+  //SEG67 [59] phi from f0::@12 to fa [phi:f0::@12->fa]
+  //SEG68 [59] phi (byte) be#107 = (byte) be#143 [phi:f0::@12->fa#0] -- register_copy 
+  //SEG69 [59] phi (byte) bd#138 = (byte) bd#130 [phi:f0::@12->fa#1] -- register_copy 
+  //SEG70 [59] phi (byte) bc#39 = (byte) bc#64 [phi:f0::@12->fa#2] -- register_copy 
+  //SEG71 [59] phi (byte) bb#27 = (byte~) bb#103 [phi:f0::@12->fa#3] -- register_copy 
     jsr fa
-  //SEG72 [23] phi from f0::@13 f0::@2 to f0::@3 [phi:f0::@13/f0::@2->f0::@3]
-  //SEG73 [23] phi (byte) be#144 = (byte) be#24 [phi:f0::@13/f0::@2->f0::@3#0] -- register_copy 
-  //SEG74 [23] phi (byte) bd#131 = (byte) bd#24 [phi:f0::@13/f0::@2->f0::@3#1] -- register_copy 
-  //SEG75 [23] phi (byte) bc#65 = (byte) bc#24 [phi:f0::@13/f0::@2->f0::@3#2] -- register_copy 
-  //SEG76 [23] phi (byte) bb#20 = (byte) bb#5 [phi:f0::@13/f0::@2->f0::@3#3] -- register_copy 
+  //SEG72 [23] phi from f0::@12 f0::@2 to f0::@3 [phi:f0::@12/f0::@2->f0::@3]
+  //SEG73 [23] phi (byte) be#144 = (byte) be#24 [phi:f0::@12/f0::@2->f0::@3#0] -- register_copy 
+  //SEG74 [23] phi (byte) bd#131 = (byte) bd#24 [phi:f0::@12/f0::@2->f0::@3#1] -- register_copy 
+  //SEG75 [23] phi (byte) bc#65 = (byte) bc#24 [phi:f0::@12/f0::@2->f0::@3#2] -- register_copy 
+  //SEG76 [23] phi (byte) bb#20 = (byte) bb#5 [phi:f0::@12/f0::@2->f0::@3#3] -- register_copy 
   //SEG77 f0::@3
   b3:
   //SEG78 [24] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto f0::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp ba
     bne b4
-  //SEG79 f0::@14
+  //SEG79 f0::@13
   //SEG80 [25] (byte) bb#6 ← ++ (byte) bb#20 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG81 [26] (byte~) bb#104 ← (byte) bb#6 -- vbuz1=vbuz2 
     lda bb
     sta bb_104
   //SEG82 [27] call fa 
-  //SEG83 [59] phi from f0::@14 to fa [phi:f0::@14->fa]
-  //SEG84 [59] phi (byte) be#107 = (byte) be#144 [phi:f0::@14->fa#0] -- register_copy 
-  //SEG85 [59] phi (byte) bd#138 = (byte) bd#131 [phi:f0::@14->fa#1] -- register_copy 
-  //SEG86 [59] phi (byte) bc#39 = (byte) bc#65 [phi:f0::@14->fa#2] -- register_copy 
-  //SEG87 [59] phi (byte) bb#27 = (byte~) bb#104 [phi:f0::@14->fa#3] -- register_copy 
+  //SEG83 [59] phi from f0::@13 to fa [phi:f0::@13->fa]
+  //SEG84 [59] phi (byte) be#107 = (byte) be#144 [phi:f0::@13->fa#0] -- register_copy 
+  //SEG85 [59] phi (byte) bd#138 = (byte) bd#131 [phi:f0::@13->fa#1] -- register_copy 
+  //SEG86 [59] phi (byte) bc#39 = (byte) bc#65 [phi:f0::@13->fa#2] -- register_copy 
+  //SEG87 [59] phi (byte) bb#27 = (byte~) bb#104 [phi:f0::@13->fa#3] -- register_copy 
     jsr fa
-  //SEG88 [28] phi from f0::@14 f0::@3 to f0::@4 [phi:f0::@14/f0::@3->f0::@4]
-  //SEG89 [28] phi (byte) be#100 = (byte) be#24 [phi:f0::@14/f0::@3->f0::@4#0] -- register_copy 
-  //SEG90 [28] phi (byte) bd#132 = (byte) bd#24 [phi:f0::@14/f0::@3->f0::@4#1] -- register_copy 
-  //SEG91 [28] phi (byte) bc#66 = (byte) bc#24 [phi:f0::@14/f0::@3->f0::@4#2] -- register_copy 
-  //SEG92 [28] phi (byte) bb#21 = (byte) bb#6 [phi:f0::@14/f0::@3->f0::@4#3] -- register_copy 
+  //SEG88 [28] phi from f0::@13 f0::@3 to f0::@4 [phi:f0::@13/f0::@3->f0::@4]
+  //SEG89 [28] phi (byte) be#100 = (byte) be#24 [phi:f0::@13/f0::@3->f0::@4#0] -- register_copy 
+  //SEG90 [28] phi (byte) bd#132 = (byte) bd#24 [phi:f0::@13/f0::@3->f0::@4#1] -- register_copy 
+  //SEG91 [28] phi (byte) bc#66 = (byte) bc#24 [phi:f0::@13/f0::@3->f0::@4#2] -- register_copy 
+  //SEG92 [28] phi (byte) bb#21 = (byte) bb#6 [phi:f0::@13/f0::@3->f0::@4#3] -- register_copy 
   //SEG93 f0::@4
   b4:
   //SEG94 [29] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto f0::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp ba
     bne b5
-  //SEG95 f0::@15
+  //SEG95 f0::@14
   //SEG96 [30] (byte) bb#66 ← ++ (byte) bb#21 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG97 [31] (byte~) bb#105 ← (byte) bb#66 -- vbuz1=vbuz2 
     lda bb
     sta bb_105
   //SEG98 [32] call fa 
-  //SEG99 [59] phi from f0::@15 to fa [phi:f0::@15->fa]
-  //SEG100 [59] phi (byte) be#107 = (byte) be#100 [phi:f0::@15->fa#0] -- register_copy 
-  //SEG101 [59] phi (byte) bd#138 = (byte) bd#132 [phi:f0::@15->fa#1] -- register_copy 
-  //SEG102 [59] phi (byte) bc#39 = (byte) bc#66 [phi:f0::@15->fa#2] -- register_copy 
-  //SEG103 [59] phi (byte) bb#27 = (byte~) bb#105 [phi:f0::@15->fa#3] -- register_copy 
+  //SEG99 [59] phi from f0::@14 to fa [phi:f0::@14->fa]
+  //SEG100 [59] phi (byte) be#107 = (byte) be#100 [phi:f0::@14->fa#0] -- register_copy 
+  //SEG101 [59] phi (byte) bd#138 = (byte) bd#132 [phi:f0::@14->fa#1] -- register_copy 
+  //SEG102 [59] phi (byte) bc#39 = (byte) bc#66 [phi:f0::@14->fa#2] -- register_copy 
+  //SEG103 [59] phi (byte) bb#27 = (byte~) bb#105 [phi:f0::@14->fa#3] -- register_copy 
     jsr fa
-  //SEG104 [33] phi from f0::@15 f0::@4 to f0::@5 [phi:f0::@15/f0::@4->f0::@5]
-  //SEG105 [33] phi (byte) be#101 = (byte) be#24 [phi:f0::@15/f0::@4->f0::@5#0] -- register_copy 
-  //SEG106 [33] phi (byte) bd#133 = (byte) bd#24 [phi:f0::@15/f0::@4->f0::@5#1] -- register_copy 
-  //SEG107 [33] phi (byte) bc#100 = (byte) bc#24 [phi:f0::@15/f0::@4->f0::@5#2] -- register_copy 
-  //SEG108 [33] phi (byte) bb#22 = (byte) bb#66 [phi:f0::@15/f0::@4->f0::@5#3] -- register_copy 
+  //SEG104 [33] phi from f0::@14 f0::@4 to f0::@5 [phi:f0::@14/f0::@4->f0::@5]
+  //SEG105 [33] phi (byte) be#101 = (byte) be#24 [phi:f0::@14/f0::@4->f0::@5#0] -- register_copy 
+  //SEG106 [33] phi (byte) bd#133 = (byte) bd#24 [phi:f0::@14/f0::@4->f0::@5#1] -- register_copy 
+  //SEG107 [33] phi (byte) bc#100 = (byte) bc#24 [phi:f0::@14/f0::@4->f0::@5#2] -- register_copy 
+  //SEG108 [33] phi (byte) bb#22 = (byte) bb#66 [phi:f0::@14/f0::@4->f0::@5#3] -- register_copy 
   //SEG109 f0::@5
   b5:
   //SEG110 [34] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto f0::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #5
     cmp ba
     bne b6
-  //SEG111 f0::@16
+  //SEG111 f0::@15
   //SEG112 [35] (byte) bb#67 ← ++ (byte) bb#22 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG113 [36] (byte~) bb#106 ← (byte) bb#67 -- vbuz1=vbuz2 
     lda bb
     sta bb_106
   //SEG114 [37] call fa 
-  //SEG115 [59] phi from f0::@16 to fa [phi:f0::@16->fa]
-  //SEG116 [59] phi (byte) be#107 = (byte) be#101 [phi:f0::@16->fa#0] -- register_copy 
-  //SEG117 [59] phi (byte) bd#138 = (byte) bd#133 [phi:f0::@16->fa#1] -- register_copy 
-  //SEG118 [59] phi (byte) bc#39 = (byte) bc#100 [phi:f0::@16->fa#2] -- register_copy 
-  //SEG119 [59] phi (byte) bb#27 = (byte~) bb#106 [phi:f0::@16->fa#3] -- register_copy 
+  //SEG115 [59] phi from f0::@15 to fa [phi:f0::@15->fa]
+  //SEG116 [59] phi (byte) be#107 = (byte) be#101 [phi:f0::@15->fa#0] -- register_copy 
+  //SEG117 [59] phi (byte) bd#138 = (byte) bd#133 [phi:f0::@15->fa#1] -- register_copy 
+  //SEG118 [59] phi (byte) bc#39 = (byte) bc#100 [phi:f0::@15->fa#2] -- register_copy 
+  //SEG119 [59] phi (byte) bb#27 = (byte~) bb#106 [phi:f0::@15->fa#3] -- register_copy 
     jsr fa
-  //SEG120 [38] phi from f0::@16 f0::@5 to f0::@6 [phi:f0::@16/f0::@5->f0::@6]
-  //SEG121 [38] phi (byte) be#102 = (byte) be#24 [phi:f0::@16/f0::@5->f0::@6#0] -- register_copy 
-  //SEG122 [38] phi (byte) bd#134 = (byte) bd#24 [phi:f0::@16/f0::@5->f0::@6#1] -- register_copy 
-  //SEG123 [38] phi (byte) bc#101 = (byte) bc#24 [phi:f0::@16/f0::@5->f0::@6#2] -- register_copy 
-  //SEG124 [38] phi (byte) bb#23 = (byte) bb#67 [phi:f0::@16/f0::@5->f0::@6#3] -- register_copy 
+  //SEG120 [38] phi from f0::@15 f0::@5 to f0::@6 [phi:f0::@15/f0::@5->f0::@6]
+  //SEG121 [38] phi (byte) be#102 = (byte) be#24 [phi:f0::@15/f0::@5->f0::@6#0] -- register_copy 
+  //SEG122 [38] phi (byte) bd#134 = (byte) bd#24 [phi:f0::@15/f0::@5->f0::@6#1] -- register_copy 
+  //SEG123 [38] phi (byte) bc#101 = (byte) bc#24 [phi:f0::@15/f0::@5->f0::@6#2] -- register_copy 
+  //SEG124 [38] phi (byte) bb#23 = (byte) bb#67 [phi:f0::@15/f0::@5->f0::@6#3] -- register_copy 
   //SEG125 f0::@6
   b6:
   //SEG126 [39] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto f0::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp ba
     bne b7
-  //SEG127 f0::@17
+  //SEG127 f0::@16
   //SEG128 [40] (byte) bb#68 ← ++ (byte) bb#23 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG129 [41] (byte~) bb#107 ← (byte) bb#68 -- vbuz1=vbuz2 
     lda bb
     sta bb_107
   //SEG130 [42] call fa 
-  //SEG131 [59] phi from f0::@17 to fa [phi:f0::@17->fa]
-  //SEG132 [59] phi (byte) be#107 = (byte) be#102 [phi:f0::@17->fa#0] -- register_copy 
-  //SEG133 [59] phi (byte) bd#138 = (byte) bd#134 [phi:f0::@17->fa#1] -- register_copy 
-  //SEG134 [59] phi (byte) bc#39 = (byte) bc#101 [phi:f0::@17->fa#2] -- register_copy 
-  //SEG135 [59] phi (byte) bb#27 = (byte~) bb#107 [phi:f0::@17->fa#3] -- register_copy 
+  //SEG131 [59] phi from f0::@16 to fa [phi:f0::@16->fa]
+  //SEG132 [59] phi (byte) be#107 = (byte) be#102 [phi:f0::@16->fa#0] -- register_copy 
+  //SEG133 [59] phi (byte) bd#138 = (byte) bd#134 [phi:f0::@16->fa#1] -- register_copy 
+  //SEG134 [59] phi (byte) bc#39 = (byte) bc#101 [phi:f0::@16->fa#2] -- register_copy 
+  //SEG135 [59] phi (byte) bb#27 = (byte~) bb#107 [phi:f0::@16->fa#3] -- register_copy 
     jsr fa
-  //SEG136 [43] phi from f0::@17 f0::@6 to f0::@7 [phi:f0::@17/f0::@6->f0::@7]
-  //SEG137 [43] phi (byte) be#103 = (byte) be#24 [phi:f0::@17/f0::@6->f0::@7#0] -- register_copy 
-  //SEG138 [43] phi (byte) bd#135 = (byte) bd#24 [phi:f0::@17/f0::@6->f0::@7#1] -- register_copy 
-  //SEG139 [43] phi (byte) bc#102 = (byte) bc#24 [phi:f0::@17/f0::@6->f0::@7#2] -- register_copy 
-  //SEG140 [43] phi (byte) bb#24 = (byte) bb#68 [phi:f0::@17/f0::@6->f0::@7#3] -- register_copy 
+  //SEG136 [43] phi from f0::@16 f0::@6 to f0::@7 [phi:f0::@16/f0::@6->f0::@7]
+  //SEG137 [43] phi (byte) be#103 = (byte) be#24 [phi:f0::@16/f0::@6->f0::@7#0] -- register_copy 
+  //SEG138 [43] phi (byte) bd#135 = (byte) bd#24 [phi:f0::@16/f0::@6->f0::@7#1] -- register_copy 
+  //SEG139 [43] phi (byte) bc#102 = (byte) bc#24 [phi:f0::@16/f0::@6->f0::@7#2] -- register_copy 
+  //SEG140 [43] phi (byte) bb#24 = (byte) bb#68 [phi:f0::@16/f0::@6->f0::@7#3] -- register_copy 
   //SEG141 f0::@7
   b7:
   //SEG142 [44] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto f0::@8 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp ba
     bne b8
-  //SEG143 f0::@18
+  //SEG143 f0::@17
   //SEG144 [45] (byte) bb#10 ← ++ (byte) bb#24 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG145 [46] (byte~) bb#108 ← (byte) bb#10 -- vbuz1=vbuz2 
     lda bb
     sta bb_108
   //SEG146 [47] call fa 
-  //SEG147 [59] phi from f0::@18 to fa [phi:f0::@18->fa]
-  //SEG148 [59] phi (byte) be#107 = (byte) be#103 [phi:f0::@18->fa#0] -- register_copy 
-  //SEG149 [59] phi (byte) bd#138 = (byte) bd#135 [phi:f0::@18->fa#1] -- register_copy 
-  //SEG150 [59] phi (byte) bc#39 = (byte) bc#102 [phi:f0::@18->fa#2] -- register_copy 
-  //SEG151 [59] phi (byte) bb#27 = (byte~) bb#108 [phi:f0::@18->fa#3] -- register_copy 
+  //SEG147 [59] phi from f0::@17 to fa [phi:f0::@17->fa]
+  //SEG148 [59] phi (byte) be#107 = (byte) be#103 [phi:f0::@17->fa#0] -- register_copy 
+  //SEG149 [59] phi (byte) bd#138 = (byte) bd#135 [phi:f0::@17->fa#1] -- register_copy 
+  //SEG150 [59] phi (byte) bc#39 = (byte) bc#102 [phi:f0::@17->fa#2] -- register_copy 
+  //SEG151 [59] phi (byte) bb#27 = (byte~) bb#108 [phi:f0::@17->fa#3] -- register_copy 
     jsr fa
-  //SEG152 [48] phi from f0::@18 f0::@7 to f0::@8 [phi:f0::@18/f0::@7->f0::@8]
-  //SEG153 [48] phi (byte) be#104 = (byte) be#24 [phi:f0::@18/f0::@7->f0::@8#0] -- register_copy 
-  //SEG154 [48] phi (byte) bd#136 = (byte) bd#24 [phi:f0::@18/f0::@7->f0::@8#1] -- register_copy 
-  //SEG155 [48] phi (byte) bc#103 = (byte) bc#24 [phi:f0::@18/f0::@7->f0::@8#2] -- register_copy 
-  //SEG156 [48] phi (byte) bb#25 = (byte) bb#10 [phi:f0::@18/f0::@7->f0::@8#3] -- register_copy 
+  //SEG152 [48] phi from f0::@17 f0::@7 to f0::@8 [phi:f0::@17/f0::@7->f0::@8]
+  //SEG153 [48] phi (byte) be#104 = (byte) be#24 [phi:f0::@17/f0::@7->f0::@8#0] -- register_copy 
+  //SEG154 [48] phi (byte) bd#136 = (byte) bd#24 [phi:f0::@17/f0::@7->f0::@8#1] -- register_copy 
+  //SEG155 [48] phi (byte) bc#103 = (byte) bc#24 [phi:f0::@17/f0::@7->f0::@8#2] -- register_copy 
+  //SEG156 [48] phi (byte) bb#25 = (byte) bb#10 [phi:f0::@17/f0::@7->f0::@8#3] -- register_copy 
   //SEG157 f0::@8
   b8:
   //SEG158 [49] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto f0::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp ba
     bne b9
-  //SEG159 f0::@19
+  //SEG159 f0::@18
   //SEG160 [50] (byte) bb#11 ← ++ (byte) bb#25 -- vbuz1=_inc_vbuz1 
     inc bb
   //SEG161 [51] (byte~) bb#109 ← (byte) bb#11 -- vbuz1=vbuz2 
     lda bb
     sta bb_109
   //SEG162 [52] call fa 
-  //SEG163 [59] phi from f0::@19 to fa [phi:f0::@19->fa]
-  //SEG164 [59] phi (byte) be#107 = (byte) be#104 [phi:f0::@19->fa#0] -- register_copy 
-  //SEG165 [59] phi (byte) bd#138 = (byte) bd#136 [phi:f0::@19->fa#1] -- register_copy 
-  //SEG166 [59] phi (byte) bc#39 = (byte) bc#103 [phi:f0::@19->fa#2] -- register_copy 
-  //SEG167 [59] phi (byte) bb#27 = (byte~) bb#109 [phi:f0::@19->fa#3] -- register_copy 
+  //SEG163 [59] phi from f0::@18 to fa [phi:f0::@18->fa]
+  //SEG164 [59] phi (byte) be#107 = (byte) be#104 [phi:f0::@18->fa#0] -- register_copy 
+  //SEG165 [59] phi (byte) bd#138 = (byte) bd#136 [phi:f0::@18->fa#1] -- register_copy 
+  //SEG166 [59] phi (byte) bc#39 = (byte) bc#103 [phi:f0::@18->fa#2] -- register_copy 
+  //SEG167 [59] phi (byte) bb#27 = (byte~) bb#109 [phi:f0::@18->fa#3] -- register_copy 
     jsr fa
-  //SEG168 [53] phi from f0::@19 f0::@8 to f0::@9 [phi:f0::@19/f0::@8->f0::@9]
-  //SEG169 [53] phi (byte) be#105 = (byte) be#24 [phi:f0::@19/f0::@8->f0::@9#0] -- register_copy 
-  //SEG170 [53] phi (byte) bd#137 = (byte) bd#24 [phi:f0::@19/f0::@8->f0::@9#1] -- register_copy 
-  //SEG171 [53] phi (byte) bc#104 = (byte) bc#24 [phi:f0::@19/f0::@8->f0::@9#2] -- register_copy 
-  //SEG172 [53] phi (byte) bb#49 = (byte) bb#11 [phi:f0::@19/f0::@8->f0::@9#3] -- register_copy 
+  //SEG168 [53] phi from f0::@18 f0::@8 to f0::@9 [phi:f0::@18/f0::@8->f0::@9]
+  //SEG169 [53] phi (byte) be#105 = (byte) be#24 [phi:f0::@18/f0::@8->f0::@9#0] -- register_copy 
+  //SEG170 [53] phi (byte) bd#137 = (byte) bd#24 [phi:f0::@18/f0::@8->f0::@9#1] -- register_copy 
+  //SEG171 [53] phi (byte) bc#104 = (byte) bc#24 [phi:f0::@18/f0::@8->f0::@9#2] -- register_copy 
+  //SEG172 [53] phi (byte) bb#49 = (byte) bb#11 [phi:f0::@18/f0::@8->f0::@9#3] -- register_copy 
   //SEG173 f0::@9
   b9:
   //SEG174 [54] if((byte) ba#17!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto f0::@return -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp ba
     bne breturn
-  //SEG175 [55] phi from f0::@9 to f0::@20 [phi:f0::@9->f0::@20]
-  //SEG176 f0::@20
+  //SEG175 [55] phi from f0::@9 to f0::@19 [phi:f0::@9->f0::@19]
+  //SEG176 f0::@19
   //SEG177 [56] call fa 
-  //SEG178 [59] phi from f0::@20 to fa [phi:f0::@20->fa]
-  //SEG179 [59] phi (byte) be#107 = (byte) be#105 [phi:f0::@20->fa#0] -- register_copy 
-  //SEG180 [59] phi (byte) bd#138 = (byte) bd#137 [phi:f0::@20->fa#1] -- register_copy 
-  //SEG181 [59] phi (byte) bc#39 = (byte) bc#104 [phi:f0::@20->fa#2] -- register_copy 
-  //SEG182 [59] phi (byte) bb#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@20->fa#3] -- vbuz1=vbuc1 
+  //SEG178 [59] phi from f0::@19 to fa [phi:f0::@19->fa]
+  //SEG179 [59] phi (byte) be#107 = (byte) be#105 [phi:f0::@19->fa#0] -- register_copy 
+  //SEG180 [59] phi (byte) bd#138 = (byte) bd#137 [phi:f0::@19->fa#1] -- register_copy 
+  //SEG181 [59] phi (byte) bc#39 = (byte) bc#104 [phi:f0::@19->fa#2] -- register_copy 
+  //SEG182 [59] phi (byte) bb#27 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@19->fa#3] -- vbuz1=vbuc1 
     lda #0
     sta bb_27
     jsr fa
-  //SEG183 [57] phi from f0::@20 to f0::@return [phi:f0::@20->f0::@return]
-  //SEG184 [57] phi (byte) be#13 = (byte) be#24 [phi:f0::@20->f0::@return#0] -- register_copy 
-  //SEG185 [57] phi (byte) bd#13 = (byte) bd#24 [phi:f0::@20->f0::@return#1] -- register_copy 
-  //SEG186 [57] phi (byte) bc#13 = (byte) bc#24 [phi:f0::@20->f0::@return#2] -- register_copy 
-  //SEG187 [57] phi (byte) bb#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@20->f0::@return#3] -- vbuz1=vbuc1 
+  //SEG183 [57] phi from f0::@19 to f0::@return [phi:f0::@19->f0::@return]
+  //SEG184 [57] phi (byte) be#13 = (byte) be#24 [phi:f0::@19->f0::@return#0] -- register_copy 
+  //SEG185 [57] phi (byte) bd#13 = (byte) bd#24 [phi:f0::@19->f0::@return#1] -- register_copy 
+  //SEG186 [57] phi (byte) bc#13 = (byte) bc#24 [phi:f0::@19->f0::@return#2] -- register_copy 
+  //SEG187 [57] phi (byte) bb#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:f0::@19->f0::@return#3] -- vbuz1=vbuc1 
     lda #0
     sta bb
   //SEG188 [57] phi from f0::@9 to f0::@return [phi:f0::@9->f0::@return]
@@ -6515,209 +6557,209 @@ fa: {
     lda bb_27
     cmp #0
     bne b1
-  //SEG197 fa::@11
+  //SEG197 fa::@10
   //SEG198 [61] (byte) bc#105 ← ++ (byte) bc#39 -- vbuxx=_inc_vbuxx 
     inx
   //SEG199 [62] (byte~) bc#174 ← (byte) bc#105 -- vbuz1=vbuxx 
     stx bc
   //SEG200 [63] call fb 
-  //SEG201 [110] phi from fa::@11 to fb [phi:fa::@11->fb]
-  //SEG202 [110] phi (byte) be#118 = (byte) be#107 [phi:fa::@11->fb#0] -- register_copy 
-  //SEG203 [110] phi (byte) bd#106 = (byte) bd#138 [phi:fa::@11->fb#1] -- register_copy 
-  //SEG204 [110] phi (byte) bc#114 = (byte~) bc#174 [phi:fa::@11->fb#2] -- register_copy 
+  //SEG201 [110] phi from fa::@10 to fb [phi:fa::@10->fb]
+  //SEG202 [110] phi (byte) be#118 = (byte) be#107 [phi:fa::@10->fb#0] -- register_copy 
+  //SEG203 [110] phi (byte) bd#106 = (byte) bd#138 [phi:fa::@10->fb#1] -- register_copy 
+  //SEG204 [110] phi (byte) bc#114 = (byte~) bc#174 [phi:fa::@10->fb#2] -- register_copy 
     jsr fb
-  //SEG205 [64] phi from fa fa::@11 to fa::@1 [phi:fa/fa::@11->fa::@1]
-  //SEG206 [64] phi (byte) be#108 = (byte) be#107 [phi:fa/fa::@11->fa::@1#0] -- register_copy 
-  //SEG207 [64] phi (byte) bd#139 = (byte) bd#138 [phi:fa/fa::@11->fa::@1#1] -- register_copy 
-  //SEG208 [64] phi (byte) bc#40 = (byte) bc#39 [phi:fa/fa::@11->fa::@1#2] -- register_copy 
+  //SEG205 [64] phi from fa fa::@10 to fa::@1 [phi:fa/fa::@10->fa::@1]
+  //SEG206 [64] phi (byte) be#108 = (byte) be#107 [phi:fa/fa::@10->fa::@1#0] -- register_copy 
+  //SEG207 [64] phi (byte) bd#139 = (byte) bd#138 [phi:fa/fa::@10->fa::@1#1] -- register_copy 
+  //SEG208 [64] phi (byte) bc#40 = (byte) bc#39 [phi:fa/fa::@10->fa::@1#2] -- register_copy 
   //SEG209 fa::@1
   b1:
   //SEG210 [65] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto fa::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #1
     cmp bb_27
     bne b2
-  //SEG211 fa::@12
+  //SEG211 fa::@11
   //SEG212 [66] (byte) bc#106 ← ++ (byte) bc#40 -- vbuxx=_inc_vbuxx 
     inx
   //SEG213 [67] (byte~) bc#175 ← (byte) bc#106 -- vbuz1=vbuxx 
     stx bc
   //SEG214 [68] call fb 
-  //SEG215 [110] phi from fa::@12 to fb [phi:fa::@12->fb]
-  //SEG216 [110] phi (byte) be#118 = (byte) be#108 [phi:fa::@12->fb#0] -- register_copy 
-  //SEG217 [110] phi (byte) bd#106 = (byte) bd#139 [phi:fa::@12->fb#1] -- register_copy 
-  //SEG218 [110] phi (byte) bc#114 = (byte~) bc#175 [phi:fa::@12->fb#2] -- register_copy 
+  //SEG215 [110] phi from fa::@11 to fb [phi:fa::@11->fb]
+  //SEG216 [110] phi (byte) be#118 = (byte) be#108 [phi:fa::@11->fb#0] -- register_copy 
+  //SEG217 [110] phi (byte) bd#106 = (byte) bd#139 [phi:fa::@11->fb#1] -- register_copy 
+  //SEG218 [110] phi (byte) bc#114 = (byte~) bc#175 [phi:fa::@11->fb#2] -- register_copy 
     jsr fb
-  //SEG219 [69] phi from fa::@1 fa::@12 to fa::@2 [phi:fa::@1/fa::@12->fa::@2]
-  //SEG220 [69] phi (byte) be#109 = (byte) be#108 [phi:fa::@1/fa::@12->fa::@2#0] -- register_copy 
-  //SEG221 [69] phi (byte) bd#140 = (byte) bd#139 [phi:fa::@1/fa::@12->fa::@2#1] -- register_copy 
-  //SEG222 [69] phi (byte) bc#41 = (byte) bc#40 [phi:fa::@1/fa::@12->fa::@2#2] -- register_copy 
+  //SEG219 [69] phi from fa::@1 fa::@11 to fa::@2 [phi:fa::@1/fa::@11->fa::@2]
+  //SEG220 [69] phi (byte) be#109 = (byte) be#108 [phi:fa::@1/fa::@11->fa::@2#0] -- register_copy 
+  //SEG221 [69] phi (byte) bd#140 = (byte) bd#139 [phi:fa::@1/fa::@11->fa::@2#1] -- register_copy 
+  //SEG222 [69] phi (byte) bc#41 = (byte) bc#40 [phi:fa::@1/fa::@11->fa::@2#2] -- register_copy 
   //SEG223 fa::@2
   b2:
   //SEG224 [70] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto fa::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #2
     cmp bb_27
     bne b3
-  //SEG225 fa::@13
+  //SEG225 fa::@12
   //SEG226 [71] (byte) bc#107 ← ++ (byte) bc#41 -- vbuxx=_inc_vbuxx 
     inx
   //SEG227 [72] (byte~) bc#176 ← (byte) bc#107 -- vbuz1=vbuxx 
     stx bc
   //SEG228 [73] call fb 
-  //SEG229 [110] phi from fa::@13 to fb [phi:fa::@13->fb]
-  //SEG230 [110] phi (byte) be#118 = (byte) be#109 [phi:fa::@13->fb#0] -- register_copy 
-  //SEG231 [110] phi (byte) bd#106 = (byte) bd#140 [phi:fa::@13->fb#1] -- register_copy 
-  //SEG232 [110] phi (byte) bc#114 = (byte~) bc#176 [phi:fa::@13->fb#2] -- register_copy 
+  //SEG229 [110] phi from fa::@12 to fb [phi:fa::@12->fb]
+  //SEG230 [110] phi (byte) be#118 = (byte) be#109 [phi:fa::@12->fb#0] -- register_copy 
+  //SEG231 [110] phi (byte) bd#106 = (byte) bd#140 [phi:fa::@12->fb#1] -- register_copy 
+  //SEG232 [110] phi (byte) bc#114 = (byte~) bc#176 [phi:fa::@12->fb#2] -- register_copy 
     jsr fb
-  //SEG233 [74] phi from fa::@13 fa::@2 to fa::@3 [phi:fa::@13/fa::@2->fa::@3]
-  //SEG234 [74] phi (byte) be#110 = (byte) be#35 [phi:fa::@13/fa::@2->fa::@3#0] -- register_copy 
-  //SEG235 [74] phi (byte) bd#141 = (byte) bd#35 [phi:fa::@13/fa::@2->fa::@3#1] -- register_copy 
-  //SEG236 [74] phi (byte) bc#42 = (byte) bc#107 [phi:fa::@13/fa::@2->fa::@3#2] -- register_copy 
+  //SEG233 [74] phi from fa::@12 fa::@2 to fa::@3 [phi:fa::@12/fa::@2->fa::@3]
+  //SEG234 [74] phi (byte) be#110 = (byte) be#35 [phi:fa::@12/fa::@2->fa::@3#0] -- register_copy 
+  //SEG235 [74] phi (byte) bd#141 = (byte) bd#35 [phi:fa::@12/fa::@2->fa::@3#1] -- register_copy 
+  //SEG236 [74] phi (byte) bc#42 = (byte) bc#107 [phi:fa::@12/fa::@2->fa::@3#2] -- register_copy 
   //SEG237 fa::@3
   b3:
   //SEG238 [75] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto fa::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp bb_27
     bne b4
-  //SEG239 fa::@14
+  //SEG239 fa::@13
   //SEG240 [76] (byte) bc#108 ← ++ (byte) bc#42 -- vbuxx=_inc_vbuxx 
     inx
   //SEG241 [77] (byte~) bc#177 ← (byte) bc#108 -- vbuz1=vbuxx 
     stx bc
   //SEG242 [78] call fb 
-  //SEG243 [110] phi from fa::@14 to fb [phi:fa::@14->fb]
-  //SEG244 [110] phi (byte) be#118 = (byte) be#110 [phi:fa::@14->fb#0] -- register_copy 
-  //SEG245 [110] phi (byte) bd#106 = (byte) bd#141 [phi:fa::@14->fb#1] -- register_copy 
-  //SEG246 [110] phi (byte) bc#114 = (byte~) bc#177 [phi:fa::@14->fb#2] -- register_copy 
+  //SEG243 [110] phi from fa::@13 to fb [phi:fa::@13->fb]
+  //SEG244 [110] phi (byte) be#118 = (byte) be#110 [phi:fa::@13->fb#0] -- register_copy 
+  //SEG245 [110] phi (byte) bd#106 = (byte) bd#141 [phi:fa::@13->fb#1] -- register_copy 
+  //SEG246 [110] phi (byte) bc#114 = (byte~) bc#177 [phi:fa::@13->fb#2] -- register_copy 
     jsr fb
-  //SEG247 [79] phi from fa::@14 fa::@3 to fa::@4 [phi:fa::@14/fa::@3->fa::@4]
-  //SEG248 [79] phi (byte) be#111 = (byte) be#35 [phi:fa::@14/fa::@3->fa::@4#0] -- register_copy 
-  //SEG249 [79] phi (byte) bd#142 = (byte) bd#35 [phi:fa::@14/fa::@3->fa::@4#1] -- register_copy 
-  //SEG250 [79] phi (byte) bc#43 = (byte) bc#108 [phi:fa::@14/fa::@3->fa::@4#2] -- register_copy 
+  //SEG247 [79] phi from fa::@13 fa::@3 to fa::@4 [phi:fa::@13/fa::@3->fa::@4]
+  //SEG248 [79] phi (byte) be#111 = (byte) be#35 [phi:fa::@13/fa::@3->fa::@4#0] -- register_copy 
+  //SEG249 [79] phi (byte) bd#142 = (byte) bd#35 [phi:fa::@13/fa::@3->fa::@4#1] -- register_copy 
+  //SEG250 [79] phi (byte) bc#43 = (byte) bc#108 [phi:fa::@13/fa::@3->fa::@4#2] -- register_copy 
   //SEG251 fa::@4
   b4:
   //SEG252 [80] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto fa::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp bb_27
     bne b5
-  //SEG253 fa::@15
+  //SEG253 fa::@14
   //SEG254 [81] (byte) bc#109 ← ++ (byte) bc#43 -- vbuxx=_inc_vbuxx 
     inx
   //SEG255 [82] (byte~) bc#178 ← (byte) bc#109 -- vbuz1=vbuxx 
     stx bc
   //SEG256 [83] call fb 
-  //SEG257 [110] phi from fa::@15 to fb [phi:fa::@15->fb]
-  //SEG258 [110] phi (byte) be#118 = (byte) be#111 [phi:fa::@15->fb#0] -- register_copy 
-  //SEG259 [110] phi (byte) bd#106 = (byte) bd#142 [phi:fa::@15->fb#1] -- register_copy 
-  //SEG260 [110] phi (byte) bc#114 = (byte~) bc#178 [phi:fa::@15->fb#2] -- register_copy 
+  //SEG257 [110] phi from fa::@14 to fb [phi:fa::@14->fb]
+  //SEG258 [110] phi (byte) be#118 = (byte) be#111 [phi:fa::@14->fb#0] -- register_copy 
+  //SEG259 [110] phi (byte) bd#106 = (byte) bd#142 [phi:fa::@14->fb#1] -- register_copy 
+  //SEG260 [110] phi (byte) bc#114 = (byte~) bc#178 [phi:fa::@14->fb#2] -- register_copy 
     jsr fb
-  //SEG261 [84] phi from fa::@15 fa::@4 to fa::@5 [phi:fa::@15/fa::@4->fa::@5]
-  //SEG262 [84] phi (byte) be#112 = (byte) be#35 [phi:fa::@15/fa::@4->fa::@5#0] -- register_copy 
-  //SEG263 [84] phi (byte) bd#100 = (byte) bd#35 [phi:fa::@15/fa::@4->fa::@5#1] -- register_copy 
-  //SEG264 [84] phi (byte) bc#44 = (byte) bc#109 [phi:fa::@15/fa::@4->fa::@5#2] -- register_copy 
+  //SEG261 [84] phi from fa::@14 fa::@4 to fa::@5 [phi:fa::@14/fa::@4->fa::@5]
+  //SEG262 [84] phi (byte) be#112 = (byte) be#35 [phi:fa::@14/fa::@4->fa::@5#0] -- register_copy 
+  //SEG263 [84] phi (byte) bd#100 = (byte) bd#35 [phi:fa::@14/fa::@4->fa::@5#1] -- register_copy 
+  //SEG264 [84] phi (byte) bc#44 = (byte) bc#109 [phi:fa::@14/fa::@4->fa::@5#2] -- register_copy 
   //SEG265 fa::@5
   b5:
   //SEG266 [85] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto fa::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #5
     cmp bb_27
     bne b6
-  //SEG267 fa::@16
+  //SEG267 fa::@15
   //SEG268 [86] (byte) bc#110 ← ++ (byte) bc#44 -- vbuxx=_inc_vbuxx 
     inx
   //SEG269 [87] (byte~) bc#179 ← (byte) bc#110 -- vbuz1=vbuxx 
     stx bc
   //SEG270 [88] call fb 
-  //SEG271 [110] phi from fa::@16 to fb [phi:fa::@16->fb]
-  //SEG272 [110] phi (byte) be#118 = (byte) be#112 [phi:fa::@16->fb#0] -- register_copy 
-  //SEG273 [110] phi (byte) bd#106 = (byte) bd#100 [phi:fa::@16->fb#1] -- register_copy 
-  //SEG274 [110] phi (byte) bc#114 = (byte~) bc#179 [phi:fa::@16->fb#2] -- register_copy 
+  //SEG271 [110] phi from fa::@15 to fb [phi:fa::@15->fb]
+  //SEG272 [110] phi (byte) be#118 = (byte) be#112 [phi:fa::@15->fb#0] -- register_copy 
+  //SEG273 [110] phi (byte) bd#106 = (byte) bd#100 [phi:fa::@15->fb#1] -- register_copy 
+  //SEG274 [110] phi (byte) bc#114 = (byte~) bc#179 [phi:fa::@15->fb#2] -- register_copy 
     jsr fb
-  //SEG275 [89] phi from fa::@16 fa::@5 to fa::@6 [phi:fa::@16/fa::@5->fa::@6]
-  //SEG276 [89] phi (byte) be#113 = (byte) be#35 [phi:fa::@16/fa::@5->fa::@6#0] -- register_copy 
-  //SEG277 [89] phi (byte) bd#101 = (byte) bd#35 [phi:fa::@16/fa::@5->fa::@6#1] -- register_copy 
-  //SEG278 [89] phi (byte) bc#45 = (byte) bc#110 [phi:fa::@16/fa::@5->fa::@6#2] -- register_copy 
+  //SEG275 [89] phi from fa::@15 fa::@5 to fa::@6 [phi:fa::@15/fa::@5->fa::@6]
+  //SEG276 [89] phi (byte) be#113 = (byte) be#35 [phi:fa::@15/fa::@5->fa::@6#0] -- register_copy 
+  //SEG277 [89] phi (byte) bd#101 = (byte) bd#35 [phi:fa::@15/fa::@5->fa::@6#1] -- register_copy 
+  //SEG278 [89] phi (byte) bc#45 = (byte) bc#110 [phi:fa::@15/fa::@5->fa::@6#2] -- register_copy 
   //SEG279 fa::@6
   b6:
   //SEG280 [90] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto fa::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp bb_27
     bne b7
-  //SEG281 fa::@17
+  //SEG281 fa::@16
   //SEG282 [91] (byte) bc#111 ← ++ (byte) bc#45 -- vbuxx=_inc_vbuxx 
     inx
   //SEG283 [92] (byte~) bc#180 ← (byte) bc#111 -- vbuz1=vbuxx 
     stx bc
   //SEG284 [93] call fb 
-  //SEG285 [110] phi from fa::@17 to fb [phi:fa::@17->fb]
-  //SEG286 [110] phi (byte) be#118 = (byte) be#113 [phi:fa::@17->fb#0] -- register_copy 
-  //SEG287 [110] phi (byte) bd#106 = (byte) bd#101 [phi:fa::@17->fb#1] -- register_copy 
-  //SEG288 [110] phi (byte) bc#114 = (byte~) bc#180 [phi:fa::@17->fb#2] -- register_copy 
+  //SEG285 [110] phi from fa::@16 to fb [phi:fa::@16->fb]
+  //SEG286 [110] phi (byte) be#118 = (byte) be#113 [phi:fa::@16->fb#0] -- register_copy 
+  //SEG287 [110] phi (byte) bd#106 = (byte) bd#101 [phi:fa::@16->fb#1] -- register_copy 
+  //SEG288 [110] phi (byte) bc#114 = (byte~) bc#180 [phi:fa::@16->fb#2] -- register_copy 
     jsr fb
-  //SEG289 [94] phi from fa::@17 fa::@6 to fa::@7 [phi:fa::@17/fa::@6->fa::@7]
-  //SEG290 [94] phi (byte) be#114 = (byte) be#35 [phi:fa::@17/fa::@6->fa::@7#0] -- register_copy 
-  //SEG291 [94] phi (byte) bd#102 = (byte) bd#35 [phi:fa::@17/fa::@6->fa::@7#1] -- register_copy 
-  //SEG292 [94] phi (byte) bc#46 = (byte) bc#111 [phi:fa::@17/fa::@6->fa::@7#2] -- register_copy 
+  //SEG289 [94] phi from fa::@16 fa::@6 to fa::@7 [phi:fa::@16/fa::@6->fa::@7]
+  //SEG290 [94] phi (byte) be#114 = (byte) be#35 [phi:fa::@16/fa::@6->fa::@7#0] -- register_copy 
+  //SEG291 [94] phi (byte) bd#102 = (byte) bd#35 [phi:fa::@16/fa::@6->fa::@7#1] -- register_copy 
+  //SEG292 [94] phi (byte) bc#46 = (byte) bc#111 [phi:fa::@16/fa::@6->fa::@7#2] -- register_copy 
   //SEG293 fa::@7
   b7:
   //SEG294 [95] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto fa::@8 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp bb_27
     bne b8
-  //SEG295 fa::@18
+  //SEG295 fa::@17
   //SEG296 [96] (byte) bc#112 ← ++ (byte) bc#46 -- vbuxx=_inc_vbuxx 
     inx
   //SEG297 [97] (byte~) bc#181 ← (byte) bc#112 -- vbuz1=vbuxx 
     stx bc
   //SEG298 [98] call fb 
-  //SEG299 [110] phi from fa::@18 to fb [phi:fa::@18->fb]
-  //SEG300 [110] phi (byte) be#118 = (byte) be#114 [phi:fa::@18->fb#0] -- register_copy 
-  //SEG301 [110] phi (byte) bd#106 = (byte) bd#102 [phi:fa::@18->fb#1] -- register_copy 
-  //SEG302 [110] phi (byte) bc#114 = (byte~) bc#181 [phi:fa::@18->fb#2] -- register_copy 
+  //SEG299 [110] phi from fa::@17 to fb [phi:fa::@17->fb]
+  //SEG300 [110] phi (byte) be#118 = (byte) be#114 [phi:fa::@17->fb#0] -- register_copy 
+  //SEG301 [110] phi (byte) bd#106 = (byte) bd#102 [phi:fa::@17->fb#1] -- register_copy 
+  //SEG302 [110] phi (byte) bc#114 = (byte~) bc#181 [phi:fa::@17->fb#2] -- register_copy 
     jsr fb
-  //SEG303 [99] phi from fa::@18 fa::@7 to fa::@8 [phi:fa::@18/fa::@7->fa::@8]
-  //SEG304 [99] phi (byte) be#115 = (byte) be#35 [phi:fa::@18/fa::@7->fa::@8#0] -- register_copy 
-  //SEG305 [99] phi (byte) bd#103 = (byte) bd#35 [phi:fa::@18/fa::@7->fa::@8#1] -- register_copy 
-  //SEG306 [99] phi (byte) bc#47 = (byte) bc#112 [phi:fa::@18/fa::@7->fa::@8#2] -- register_copy 
+  //SEG303 [99] phi from fa::@17 fa::@7 to fa::@8 [phi:fa::@17/fa::@7->fa::@8]
+  //SEG304 [99] phi (byte) be#115 = (byte) be#35 [phi:fa::@17/fa::@7->fa::@8#0] -- register_copy 
+  //SEG305 [99] phi (byte) bd#103 = (byte) bd#35 [phi:fa::@17/fa::@7->fa::@8#1] -- register_copy 
+  //SEG306 [99] phi (byte) bc#47 = (byte) bc#112 [phi:fa::@17/fa::@7->fa::@8#2] -- register_copy 
   //SEG307 fa::@8
   b8:
   //SEG308 [100] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto fa::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp bb_27
     bne b9
-  //SEG309 fa::@19
+  //SEG309 fa::@18
   //SEG310 [101] (byte) bc#123 ← ++ (byte) bc#47 -- vbuxx=_inc_vbuxx 
     inx
   //SEG311 [102] (byte~) bc#182 ← (byte) bc#123 -- vbuz1=vbuxx 
     stx bc
   //SEG312 [103] call fb 
-  //SEG313 [110] phi from fa::@19 to fb [phi:fa::@19->fb]
-  //SEG314 [110] phi (byte) be#118 = (byte) be#115 [phi:fa::@19->fb#0] -- register_copy 
-  //SEG315 [110] phi (byte) bd#106 = (byte) bd#103 [phi:fa::@19->fb#1] -- register_copy 
-  //SEG316 [110] phi (byte) bc#114 = (byte~) bc#182 [phi:fa::@19->fb#2] -- register_copy 
+  //SEG313 [110] phi from fa::@18 to fb [phi:fa::@18->fb]
+  //SEG314 [110] phi (byte) be#118 = (byte) be#115 [phi:fa::@18->fb#0] -- register_copy 
+  //SEG315 [110] phi (byte) bd#106 = (byte) bd#103 [phi:fa::@18->fb#1] -- register_copy 
+  //SEG316 [110] phi (byte) bc#114 = (byte~) bc#182 [phi:fa::@18->fb#2] -- register_copy 
     jsr fb
-  //SEG317 [104] phi from fa::@19 fa::@8 to fa::@9 [phi:fa::@19/fa::@8->fa::@9]
-  //SEG318 [104] phi (byte) be#116 = (byte) be#35 [phi:fa::@19/fa::@8->fa::@9#0] -- register_copy 
-  //SEG319 [104] phi (byte) bd#104 = (byte) bd#35 [phi:fa::@19/fa::@8->fa::@9#1] -- register_copy 
-  //SEG320 [104] phi (byte) bc#113 = (byte) bc#123 [phi:fa::@19/fa::@8->fa::@9#2] -- register_copy 
+  //SEG317 [104] phi from fa::@18 fa::@8 to fa::@9 [phi:fa::@18/fa::@8->fa::@9]
+  //SEG318 [104] phi (byte) be#116 = (byte) be#35 [phi:fa::@18/fa::@8->fa::@9#0] -- register_copy 
+  //SEG319 [104] phi (byte) bd#104 = (byte) bd#35 [phi:fa::@18/fa::@8->fa::@9#1] -- register_copy 
+  //SEG320 [104] phi (byte) bc#113 = (byte) bc#123 [phi:fa::@18/fa::@8->fa::@9#2] -- register_copy 
   //SEG321 fa::@9
   b9:
   //SEG322 [105] if((byte) bb#27!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fa::@return -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp bb_27
     bne breturn
-  //SEG323 [106] phi from fa::@9 to fa::@20 [phi:fa::@9->fa::@20]
-  //SEG324 fa::@20
+  //SEG323 [106] phi from fa::@9 to fa::@19 [phi:fa::@9->fa::@19]
+  //SEG324 fa::@19
   //SEG325 [107] call fb 
-  //SEG326 [110] phi from fa::@20 to fb [phi:fa::@20->fb]
-  //SEG327 [110] phi (byte) be#118 = (byte) be#116 [phi:fa::@20->fb#0] -- register_copy 
-  //SEG328 [110] phi (byte) bd#106 = (byte) bd#104 [phi:fa::@20->fb#1] -- register_copy 
-  //SEG329 [110] phi (byte) bc#114 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@20->fb#2] -- vbuz1=vbuc1 
+  //SEG326 [110] phi from fa::@19 to fb [phi:fa::@19->fb]
+  //SEG327 [110] phi (byte) be#118 = (byte) be#116 [phi:fa::@19->fb#0] -- register_copy 
+  //SEG328 [110] phi (byte) bd#106 = (byte) bd#104 [phi:fa::@19->fb#1] -- register_copy 
+  //SEG329 [110] phi (byte) bc#114 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@19->fb#2] -- vbuz1=vbuc1 
     lda #0
     sta bc
     jsr fb
-  //SEG330 [108] phi from fa::@20 to fa::@return [phi:fa::@20->fa::@return]
-  //SEG331 [108] phi (byte) be#24 = (byte) be#35 [phi:fa::@20->fa::@return#0] -- register_copy 
-  //SEG332 [108] phi (byte) bd#24 = (byte) bd#35 [phi:fa::@20->fa::@return#1] -- register_copy 
-  //SEG333 [108] phi (byte) bc#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@20->fa::@return#2] -- vbuxx=vbuc1 
+  //SEG330 [108] phi from fa::@19 to fa::@return [phi:fa::@19->fa::@return]
+  //SEG331 [108] phi (byte) be#24 = (byte) be#35 [phi:fa::@19->fa::@return#0] -- register_copy 
+  //SEG332 [108] phi (byte) bd#24 = (byte) bd#35 [phi:fa::@19->fa::@return#1] -- register_copy 
+  //SEG333 [108] phi (byte) bc#24 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fa::@19->fa::@return#2] -- vbuxx=vbuc1 
     ldx #0
   //SEG334 [108] phi from fa::@9 to fa::@return [phi:fa::@9->fa::@return]
   //SEG335 [108] phi (byte) be#24 = (byte) be#116 [phi:fa::@9->fa::@return#0] -- register_copy 
@@ -6734,188 +6776,188 @@ fb: {
     lda bc
     cmp #0
     bne b1
-  //SEG342 fb::@11
+  //SEG342 fb::@10
   //SEG343 [112] (byte) bd#148 ← ++ (byte) bd#106 -- vbuyy=_inc_vbuyy 
     iny
   //SEG344 [113] (byte~) bd#238 ← (byte) bd#148 -- vbuaa=vbuyy 
     tya
   //SEG345 [114] call fc 
-  //SEG346 [161] phi from fb::@11 to fc [phi:fb::@11->fc]
-  //SEG347 [161] phi (byte) be#129 = (byte) be#118 [phi:fb::@11->fc#0] -- register_copy 
-  //SEG348 [161] phi (byte) bd#117 = (byte~) bd#238 [phi:fb::@11->fc#1] -- register_copy 
+  //SEG346 [161] phi from fb::@10 to fc [phi:fb::@10->fc]
+  //SEG347 [161] phi (byte) be#129 = (byte) be#118 [phi:fb::@10->fc#0] -- register_copy 
+  //SEG348 [161] phi (byte) bd#117 = (byte~) bd#238 [phi:fb::@10->fc#1] -- register_copy 
     jsr fc
-  //SEG349 [115] phi from fb fb::@11 to fb::@1 [phi:fb/fb::@11->fb::@1]
-  //SEG350 [115] phi (byte) be#119 = (byte) be#118 [phi:fb/fb::@11->fb::@1#0] -- register_copy 
-  //SEG351 [115] phi (byte) bd#107 = (byte) bd#106 [phi:fb/fb::@11->fb::@1#1] -- register_copy 
+  //SEG349 [115] phi from fb fb::@10 to fb::@1 [phi:fb/fb::@10->fb::@1]
+  //SEG350 [115] phi (byte) be#119 = (byte) be#118 [phi:fb/fb::@10->fb::@1#0] -- register_copy 
+  //SEG351 [115] phi (byte) bd#107 = (byte) bd#106 [phi:fb/fb::@10->fb::@1#1] -- register_copy 
   //SEG352 fb::@1
   b1:
   //SEG353 [116] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto fb::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #1
     cmp bc
     bne b2
-  //SEG354 fb::@12
+  //SEG354 fb::@11
   //SEG355 [117] (byte) bd#149 ← ++ (byte) bd#107 -- vbuyy=_inc_vbuyy 
     iny
   //SEG356 [118] (byte~) bd#239 ← (byte) bd#149 -- vbuaa=vbuyy 
     tya
   //SEG357 [119] call fc 
-  //SEG358 [161] phi from fb::@12 to fc [phi:fb::@12->fc]
-  //SEG359 [161] phi (byte) be#129 = (byte) be#119 [phi:fb::@12->fc#0] -- register_copy 
-  //SEG360 [161] phi (byte) bd#117 = (byte~) bd#239 [phi:fb::@12->fc#1] -- register_copy 
+  //SEG358 [161] phi from fb::@11 to fc [phi:fb::@11->fc]
+  //SEG359 [161] phi (byte) be#129 = (byte) be#119 [phi:fb::@11->fc#0] -- register_copy 
+  //SEG360 [161] phi (byte) bd#117 = (byte~) bd#239 [phi:fb::@11->fc#1] -- register_copy 
     jsr fc
-  //SEG361 [120] phi from fb::@1 fb::@12 to fb::@2 [phi:fb::@1/fb::@12->fb::@2]
-  //SEG362 [120] phi (byte) be#120 = (byte) be#119 [phi:fb::@1/fb::@12->fb::@2#0] -- register_copy 
-  //SEG363 [120] phi (byte) bd#108 = (byte) bd#107 [phi:fb::@1/fb::@12->fb::@2#1] -- register_copy 
+  //SEG361 [120] phi from fb::@1 fb::@11 to fb::@2 [phi:fb::@1/fb::@11->fb::@2]
+  //SEG362 [120] phi (byte) be#120 = (byte) be#119 [phi:fb::@1/fb::@11->fb::@2#0] -- register_copy 
+  //SEG363 [120] phi (byte) bd#108 = (byte) bd#107 [phi:fb::@1/fb::@11->fb::@2#1] -- register_copy 
   //SEG364 fb::@2
   b2:
   //SEG365 [121] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto fb::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #2
     cmp bc
     bne b3
-  //SEG366 fb::@13
+  //SEG366 fb::@12
   //SEG367 [122] (byte) bd#150 ← ++ (byte) bd#108 -- vbuyy=_inc_vbuyy 
     iny
   //SEG368 [123] (byte~) bd#240 ← (byte) bd#150 -- vbuaa=vbuyy 
     tya
   //SEG369 [124] call fc 
-  //SEG370 [161] phi from fb::@13 to fc [phi:fb::@13->fc]
-  //SEG371 [161] phi (byte) be#129 = (byte) be#120 [phi:fb::@13->fc#0] -- register_copy 
-  //SEG372 [161] phi (byte) bd#117 = (byte~) bd#240 [phi:fb::@13->fc#1] -- register_copy 
+  //SEG370 [161] phi from fb::@12 to fc [phi:fb::@12->fc]
+  //SEG371 [161] phi (byte) be#129 = (byte) be#120 [phi:fb::@12->fc#0] -- register_copy 
+  //SEG372 [161] phi (byte) bd#117 = (byte~) bd#240 [phi:fb::@12->fc#1] -- register_copy 
     jsr fc
-  //SEG373 [125] phi from fb::@13 fb::@2 to fb::@3 [phi:fb::@13/fb::@2->fb::@3]
-  //SEG374 [125] phi (byte) be#121 = (byte) be#46 [phi:fb::@13/fb::@2->fb::@3#0] -- register_copy 
-  //SEG375 [125] phi (byte) bd#109 = (byte) bd#150 [phi:fb::@13/fb::@2->fb::@3#1] -- register_copy 
+  //SEG373 [125] phi from fb::@12 fb::@2 to fb::@3 [phi:fb::@12/fb::@2->fb::@3]
+  //SEG374 [125] phi (byte) be#121 = (byte) be#46 [phi:fb::@12/fb::@2->fb::@3#0] -- register_copy 
+  //SEG375 [125] phi (byte) bd#109 = (byte) bd#150 [phi:fb::@12/fb::@2->fb::@3#1] -- register_copy 
   //SEG376 fb::@3
   b3:
   //SEG377 [126] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto fb::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp bc
     bne b4
-  //SEG378 fb::@14
+  //SEG378 fb::@13
   //SEG379 [127] (byte) bd#151 ← ++ (byte) bd#109 -- vbuyy=_inc_vbuyy 
     iny
   //SEG380 [128] (byte~) bd#241 ← (byte) bd#151 -- vbuaa=vbuyy 
     tya
   //SEG381 [129] call fc 
-  //SEG382 [161] phi from fb::@14 to fc [phi:fb::@14->fc]
-  //SEG383 [161] phi (byte) be#129 = (byte) be#121 [phi:fb::@14->fc#0] -- register_copy 
-  //SEG384 [161] phi (byte) bd#117 = (byte~) bd#241 [phi:fb::@14->fc#1] -- register_copy 
+  //SEG382 [161] phi from fb::@13 to fc [phi:fb::@13->fc]
+  //SEG383 [161] phi (byte) be#129 = (byte) be#121 [phi:fb::@13->fc#0] -- register_copy 
+  //SEG384 [161] phi (byte) bd#117 = (byte~) bd#241 [phi:fb::@13->fc#1] -- register_copy 
     jsr fc
-  //SEG385 [130] phi from fb::@14 fb::@3 to fb::@4 [phi:fb::@14/fb::@3->fb::@4]
-  //SEG386 [130] phi (byte) be#122 = (byte) be#46 [phi:fb::@14/fb::@3->fb::@4#0] -- register_copy 
-  //SEG387 [130] phi (byte) bd#110 = (byte) bd#151 [phi:fb::@14/fb::@3->fb::@4#1] -- register_copy 
+  //SEG385 [130] phi from fb::@13 fb::@3 to fb::@4 [phi:fb::@13/fb::@3->fb::@4]
+  //SEG386 [130] phi (byte) be#122 = (byte) be#46 [phi:fb::@13/fb::@3->fb::@4#0] -- register_copy 
+  //SEG387 [130] phi (byte) bd#110 = (byte) bd#151 [phi:fb::@13/fb::@3->fb::@4#1] -- register_copy 
   //SEG388 fb::@4
   b4:
   //SEG389 [131] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto fb::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #4
     cmp bc
     bne b5
-  //SEG390 fb::@15
+  //SEG390 fb::@14
   //SEG391 [132] (byte) bd#152 ← ++ (byte) bd#110 -- vbuyy=_inc_vbuyy 
     iny
   //SEG392 [133] (byte~) bd#242 ← (byte) bd#152 -- vbuaa=vbuyy 
     tya
   //SEG393 [134] call fc 
-  //SEG394 [161] phi from fb::@15 to fc [phi:fb::@15->fc]
-  //SEG395 [161] phi (byte) be#129 = (byte) be#122 [phi:fb::@15->fc#0] -- register_copy 
-  //SEG396 [161] phi (byte) bd#117 = (byte~) bd#242 [phi:fb::@15->fc#1] -- register_copy 
+  //SEG394 [161] phi from fb::@14 to fc [phi:fb::@14->fc]
+  //SEG395 [161] phi (byte) be#129 = (byte) be#122 [phi:fb::@14->fc#0] -- register_copy 
+  //SEG396 [161] phi (byte) bd#117 = (byte~) bd#242 [phi:fb::@14->fc#1] -- register_copy 
     jsr fc
-  //SEG397 [135] phi from fb::@15 fb::@4 to fb::@5 [phi:fb::@15/fb::@4->fb::@5]
-  //SEG398 [135] phi (byte) be#123 = (byte) be#46 [phi:fb::@15/fb::@4->fb::@5#0] -- register_copy 
-  //SEG399 [135] phi (byte) bd#111 = (byte) bd#152 [phi:fb::@15/fb::@4->fb::@5#1] -- register_copy 
+  //SEG397 [135] phi from fb::@14 fb::@4 to fb::@5 [phi:fb::@14/fb::@4->fb::@5]
+  //SEG398 [135] phi (byte) be#123 = (byte) be#46 [phi:fb::@14/fb::@4->fb::@5#0] -- register_copy 
+  //SEG399 [135] phi (byte) bd#111 = (byte) bd#152 [phi:fb::@14/fb::@4->fb::@5#1] -- register_copy 
   //SEG400 fb::@5
   b5:
   //SEG401 [136] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto fb::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #5
     cmp bc
     bne b6
-  //SEG402 fb::@16
+  //SEG402 fb::@15
   //SEG403 [137] (byte) bd#153 ← ++ (byte) bd#111 -- vbuyy=_inc_vbuyy 
     iny
   //SEG404 [138] (byte~) bd#243 ← (byte) bd#153 -- vbuaa=vbuyy 
     tya
   //SEG405 [139] call fc 
-  //SEG406 [161] phi from fb::@16 to fc [phi:fb::@16->fc]
-  //SEG407 [161] phi (byte) be#129 = (byte) be#123 [phi:fb::@16->fc#0] -- register_copy 
-  //SEG408 [161] phi (byte) bd#117 = (byte~) bd#243 [phi:fb::@16->fc#1] -- register_copy 
+  //SEG406 [161] phi from fb::@15 to fc [phi:fb::@15->fc]
+  //SEG407 [161] phi (byte) be#129 = (byte) be#123 [phi:fb::@15->fc#0] -- register_copy 
+  //SEG408 [161] phi (byte) bd#117 = (byte~) bd#243 [phi:fb::@15->fc#1] -- register_copy 
     jsr fc
-  //SEG409 [140] phi from fb::@16 fb::@5 to fb::@6 [phi:fb::@16/fb::@5->fb::@6]
-  //SEG410 [140] phi (byte) be#124 = (byte) be#46 [phi:fb::@16/fb::@5->fb::@6#0] -- register_copy 
-  //SEG411 [140] phi (byte) bd#112 = (byte) bd#153 [phi:fb::@16/fb::@5->fb::@6#1] -- register_copy 
+  //SEG409 [140] phi from fb::@15 fb::@5 to fb::@6 [phi:fb::@15/fb::@5->fb::@6]
+  //SEG410 [140] phi (byte) be#124 = (byte) be#46 [phi:fb::@15/fb::@5->fb::@6#0] -- register_copy 
+  //SEG411 [140] phi (byte) bd#112 = (byte) bd#153 [phi:fb::@15/fb::@5->fb::@6#1] -- register_copy 
   //SEG412 fb::@6
   b6:
   //SEG413 [141] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto fb::@7 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp bc
     bne b7
-  //SEG414 fb::@17
+  //SEG414 fb::@16
   //SEG415 [142] (byte) bd#154 ← ++ (byte) bd#112 -- vbuyy=_inc_vbuyy 
     iny
   //SEG416 [143] (byte~) bd#244 ← (byte) bd#154 -- vbuaa=vbuyy 
     tya
   //SEG417 [144] call fc 
-  //SEG418 [161] phi from fb::@17 to fc [phi:fb::@17->fc]
-  //SEG419 [161] phi (byte) be#129 = (byte) be#124 [phi:fb::@17->fc#0] -- register_copy 
-  //SEG420 [161] phi (byte) bd#117 = (byte~) bd#244 [phi:fb::@17->fc#1] -- register_copy 
+  //SEG418 [161] phi from fb::@16 to fc [phi:fb::@16->fc]
+  //SEG419 [161] phi (byte) be#129 = (byte) be#124 [phi:fb::@16->fc#0] -- register_copy 
+  //SEG420 [161] phi (byte) bd#117 = (byte~) bd#244 [phi:fb::@16->fc#1] -- register_copy 
     jsr fc
-  //SEG421 [145] phi from fb::@17 fb::@6 to fb::@7 [phi:fb::@17/fb::@6->fb::@7]
-  //SEG422 [145] phi (byte) be#125 = (byte) be#46 [phi:fb::@17/fb::@6->fb::@7#0] -- register_copy 
-  //SEG423 [145] phi (byte) bd#113 = (byte) bd#154 [phi:fb::@17/fb::@6->fb::@7#1] -- register_copy 
+  //SEG421 [145] phi from fb::@16 fb::@6 to fb::@7 [phi:fb::@16/fb::@6->fb::@7]
+  //SEG422 [145] phi (byte) be#125 = (byte) be#46 [phi:fb::@16/fb::@6->fb::@7#0] -- register_copy 
+  //SEG423 [145] phi (byte) bd#113 = (byte) bd#154 [phi:fb::@16/fb::@6->fb::@7#1] -- register_copy 
   //SEG424 fb::@7
   b7:
   //SEG425 [146] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto fb::@8 -- vbuz1_neq_vbuc1_then_la1 
     lda #7
     cmp bc
     bne b8
-  //SEG426 fb::@18
+  //SEG426 fb::@17
   //SEG427 [147] (byte) bd#155 ← ++ (byte) bd#113 -- vbuyy=_inc_vbuyy 
     iny
   //SEG428 [148] (byte~) bd#245 ← (byte) bd#155 -- vbuaa=vbuyy 
     tya
   //SEG429 [149] call fc 
-  //SEG430 [161] phi from fb::@18 to fc [phi:fb::@18->fc]
-  //SEG431 [161] phi (byte) be#129 = (byte) be#125 [phi:fb::@18->fc#0] -- register_copy 
-  //SEG432 [161] phi (byte) bd#117 = (byte~) bd#245 [phi:fb::@18->fc#1] -- register_copy 
+  //SEG430 [161] phi from fb::@17 to fc [phi:fb::@17->fc]
+  //SEG431 [161] phi (byte) be#129 = (byte) be#125 [phi:fb::@17->fc#0] -- register_copy 
+  //SEG432 [161] phi (byte) bd#117 = (byte~) bd#245 [phi:fb::@17->fc#1] -- register_copy 
     jsr fc
-  //SEG433 [150] phi from fb::@18 fb::@7 to fb::@8 [phi:fb::@18/fb::@7->fb::@8]
-  //SEG434 [150] phi (byte) be#126 = (byte) be#46 [phi:fb::@18/fb::@7->fb::@8#0] -- register_copy 
-  //SEG435 [150] phi (byte) bd#114 = (byte) bd#155 [phi:fb::@18/fb::@7->fb::@8#1] -- register_copy 
+  //SEG433 [150] phi from fb::@17 fb::@7 to fb::@8 [phi:fb::@17/fb::@7->fb::@8]
+  //SEG434 [150] phi (byte) be#126 = (byte) be#46 [phi:fb::@17/fb::@7->fb::@8#0] -- register_copy 
+  //SEG435 [150] phi (byte) bd#114 = (byte) bd#155 [phi:fb::@17/fb::@7->fb::@8#1] -- register_copy 
   //SEG436 fb::@8
   b8:
   //SEG437 [151] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto fb::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp bc
     bne b9
-  //SEG438 fb::@19
+  //SEG438 fb::@18
   //SEG439 [152] (byte) bd#157 ← ++ (byte) bd#114 -- vbuyy=_inc_vbuyy 
     iny
   //SEG440 [153] (byte~) bd#246 ← (byte) bd#157 -- vbuaa=vbuyy 
     tya
   //SEG441 [154] call fc 
-  //SEG442 [161] phi from fb::@19 to fc [phi:fb::@19->fc]
-  //SEG443 [161] phi (byte) be#129 = (byte) be#126 [phi:fb::@19->fc#0] -- register_copy 
-  //SEG444 [161] phi (byte) bd#117 = (byte~) bd#246 [phi:fb::@19->fc#1] -- register_copy 
+  //SEG442 [161] phi from fb::@18 to fc [phi:fb::@18->fc]
+  //SEG443 [161] phi (byte) be#129 = (byte) be#126 [phi:fb::@18->fc#0] -- register_copy 
+  //SEG444 [161] phi (byte) bd#117 = (byte~) bd#246 [phi:fb::@18->fc#1] -- register_copy 
     jsr fc
-  //SEG445 [155] phi from fb::@19 fb::@8 to fb::@9 [phi:fb::@19/fb::@8->fb::@9]
-  //SEG446 [155] phi (byte) be#127 = (byte) be#46 [phi:fb::@19/fb::@8->fb::@9#0] -- register_copy 
-  //SEG447 [155] phi (byte) bd#115 = (byte) bd#157 [phi:fb::@19/fb::@8->fb::@9#1] -- register_copy 
+  //SEG445 [155] phi from fb::@18 fb::@8 to fb::@9 [phi:fb::@18/fb::@8->fb::@9]
+  //SEG446 [155] phi (byte) be#127 = (byte) be#46 [phi:fb::@18/fb::@8->fb::@9#0] -- register_copy 
+  //SEG447 [155] phi (byte) bd#115 = (byte) bd#157 [phi:fb::@18/fb::@8->fb::@9#1] -- register_copy 
   //SEG448 fb::@9
   b9:
   //SEG449 [156] if((byte) bc#114!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fb::@return -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp bc
     bne breturn
-  //SEG450 [157] phi from fb::@9 to fb::@20 [phi:fb::@9->fb::@20]
-  //SEG451 fb::@20
+  //SEG450 [157] phi from fb::@9 to fb::@19 [phi:fb::@9->fb::@19]
+  //SEG451 fb::@19
   //SEG452 [158] call fc 
-  //SEG453 [161] phi from fb::@20 to fc [phi:fb::@20->fc]
-  //SEG454 [161] phi (byte) be#129 = (byte) be#127 [phi:fb::@20->fc#0] -- register_copy 
-  //SEG455 [161] phi (byte) bd#117 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@20->fc#1] -- vbuaa=vbuc1 
+  //SEG453 [161] phi from fb::@19 to fc [phi:fb::@19->fc]
+  //SEG454 [161] phi (byte) be#129 = (byte) be#127 [phi:fb::@19->fc#0] -- register_copy 
+  //SEG455 [161] phi (byte) bd#117 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@19->fc#1] -- vbuaa=vbuc1 
     lda #0
     jsr fc
-  //SEG456 [159] phi from fb::@20 to fb::@return [phi:fb::@20->fb::@return]
-  //SEG457 [159] phi (byte) be#35 = (byte) be#46 [phi:fb::@20->fb::@return#0] -- register_copy 
-  //SEG458 [159] phi (byte) bd#35 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@20->fb::@return#1] -- vbuyy=vbuc1 
+  //SEG456 [159] phi from fb::@19 to fb::@return [phi:fb::@19->fb::@return]
+  //SEG457 [159] phi (byte) be#35 = (byte) be#46 [phi:fb::@19->fb::@return#0] -- register_copy 
+  //SEG458 [159] phi (byte) bd#35 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:fb::@19->fb::@return#1] -- vbuyy=vbuc1 
     ldy #0
   //SEG459 [159] phi from fb::@9 to fb::@return [phi:fb::@9->fb::@return]
   //SEG460 [159] phi (byte) be#35 = (byte) be#127 [phi:fb::@9->fb::@return#0] -- register_copy 
@@ -6930,94 +6972,94 @@ fc: {
   //SEG465 [162] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto fc::@1 -- vbuaa_neq_0_then_la1 
     cmp #0
     bne b1
-  //SEG466 fc::@11
+  //SEG466 fc::@10
   //SEG467 [163] (byte) be#36 ← ++ (byte) be#129 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG468 [164] phi from fc fc::@11 to fc::@1 [phi:fc/fc::@11->fc::@1]
-  //SEG469 [164] phi (byte) be#130 = (byte) be#129 [phi:fc/fc::@11->fc::@1#0] -- register_copy 
+  //SEG468 [164] phi from fc fc::@10 to fc::@1 [phi:fc/fc::@10->fc::@1]
+  //SEG469 [164] phi (byte) be#130 = (byte) be#129 [phi:fc/fc::@10->fc::@1#0] -- register_copy 
   //SEG470 fc::@1
   b1:
   //SEG471 [165] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 1) goto fc::@2 -- vbuaa_neq_vbuc1_then_la1 
     cmp #1
     bne b2
-  //SEG472 fc::@12
+  //SEG472 fc::@11
   //SEG473 [166] (byte) be#37 ← ++ (byte) be#130 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG474 [167] phi from fc::@1 fc::@12 to fc::@2 [phi:fc::@1/fc::@12->fc::@2]
-  //SEG475 [167] phi (byte) be#131 = (byte) be#130 [phi:fc::@1/fc::@12->fc::@2#0] -- register_copy 
+  //SEG474 [167] phi from fc::@1 fc::@11 to fc::@2 [phi:fc::@1/fc::@11->fc::@2]
+  //SEG475 [167] phi (byte) be#131 = (byte) be#130 [phi:fc::@1/fc::@11->fc::@2#0] -- register_copy 
   //SEG476 fc::@2
   b2:
   //SEG477 [168] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 2) goto fc::@3 -- vbuaa_neq_vbuc1_then_la1 
     cmp #2
     bne b3
-  //SEG478 fc::@13
+  //SEG478 fc::@12
   //SEG479 [169] (byte) be#38 ← ++ (byte) be#131 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG480 [170] phi from fc::@13 fc::@2 to fc::@3 [phi:fc::@13/fc::@2->fc::@3]
-  //SEG481 [170] phi (byte) be#132 = (byte) be#38 [phi:fc::@13/fc::@2->fc::@3#0] -- register_copy 
+  //SEG480 [170] phi from fc::@12 fc::@2 to fc::@3 [phi:fc::@12/fc::@2->fc::@3]
+  //SEG481 [170] phi (byte) be#132 = (byte) be#38 [phi:fc::@12/fc::@2->fc::@3#0] -- register_copy 
   //SEG482 fc::@3
   b3:
   //SEG483 [171] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto fc::@4 -- vbuaa_neq_vbuc1_then_la1 
     cmp #3
     bne b4
-  //SEG484 fc::@14
+  //SEG484 fc::@13
   //SEG485 [172] (byte) be#39 ← ++ (byte) be#132 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG486 [173] phi from fc::@14 fc::@3 to fc::@4 [phi:fc::@14/fc::@3->fc::@4]
-  //SEG487 [173] phi (byte) be#133 = (byte) be#39 [phi:fc::@14/fc::@3->fc::@4#0] -- register_copy 
+  //SEG486 [173] phi from fc::@13 fc::@3 to fc::@4 [phi:fc::@13/fc::@3->fc::@4]
+  //SEG487 [173] phi (byte) be#133 = (byte) be#39 [phi:fc::@13/fc::@3->fc::@4#0] -- register_copy 
   //SEG488 fc::@4
   b4:
   //SEG489 [174] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 4) goto fc::@5 -- vbuaa_neq_vbuc1_then_la1 
     cmp #4
     bne b5
-  //SEG490 fc::@15
+  //SEG490 fc::@14
   //SEG491 [175] (byte) be#40 ← ++ (byte) be#133 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG492 [176] phi from fc::@15 fc::@4 to fc::@5 [phi:fc::@15/fc::@4->fc::@5]
-  //SEG493 [176] phi (byte) be#134 = (byte) be#40 [phi:fc::@15/fc::@4->fc::@5#0] -- register_copy 
+  //SEG492 [176] phi from fc::@14 fc::@4 to fc::@5 [phi:fc::@14/fc::@4->fc::@5]
+  //SEG493 [176] phi (byte) be#134 = (byte) be#40 [phi:fc::@14/fc::@4->fc::@5#0] -- register_copy 
   //SEG494 fc::@5
   b5:
   //SEG495 [177] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto fc::@6 -- vbuaa_neq_vbuc1_then_la1 
     cmp #5
     bne b6
-  //SEG496 fc::@16
+  //SEG496 fc::@15
   //SEG497 [178] (byte) be#41 ← ++ (byte) be#134 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG498 [179] phi from fc::@16 fc::@5 to fc::@6 [phi:fc::@16/fc::@5->fc::@6]
-  //SEG499 [179] phi (byte) be#135 = (byte) be#41 [phi:fc::@16/fc::@5->fc::@6#0] -- register_copy 
+  //SEG498 [179] phi from fc::@15 fc::@5 to fc::@6 [phi:fc::@15/fc::@5->fc::@6]
+  //SEG499 [179] phi (byte) be#135 = (byte) be#41 [phi:fc::@15/fc::@5->fc::@6#0] -- register_copy 
   //SEG500 fc::@6
   b6:
   //SEG501 [180] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto fc::@7 -- vbuaa_neq_vbuc1_then_la1 
     cmp #6
     bne b7
-  //SEG502 fc::@17
+  //SEG502 fc::@16
   //SEG503 [181] (byte) be#42 ← ++ (byte) be#135 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG504 [182] phi from fc::@17 fc::@6 to fc::@7 [phi:fc::@17/fc::@6->fc::@7]
-  //SEG505 [182] phi (byte) be#136 = (byte) be#42 [phi:fc::@17/fc::@6->fc::@7#0] -- register_copy 
+  //SEG504 [182] phi from fc::@16 fc::@6 to fc::@7 [phi:fc::@16/fc::@6->fc::@7]
+  //SEG505 [182] phi (byte) be#136 = (byte) be#42 [phi:fc::@16/fc::@6->fc::@7#0] -- register_copy 
   //SEG506 fc::@7
   b7:
   //SEG507 [183] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 7) goto fc::@8 -- vbuaa_neq_vbuc1_then_la1 
     cmp #7
     bne b8
-  //SEG508 fc::@18
+  //SEG508 fc::@17
   //SEG509 [184] (byte) be#43 ← ++ (byte) be#136 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG510 [185] phi from fc::@18 fc::@7 to fc::@8 [phi:fc::@18/fc::@7->fc::@8]
-  //SEG511 [185] phi (byte) be#137 = (byte) be#43 [phi:fc::@18/fc::@7->fc::@8#0] -- register_copy 
+  //SEG510 [185] phi from fc::@17 fc::@7 to fc::@8 [phi:fc::@17/fc::@7->fc::@8]
+  //SEG511 [185] phi (byte) be#137 = (byte) be#43 [phi:fc::@17/fc::@7->fc::@8#0] -- register_copy 
   //SEG512 fc::@8
   b8:
   //SEG513 [186] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto fc::@9 -- vbuaa_neq_vbuc1_then_la1 
     cmp #8
     bne b9
-  //SEG514 fc::@19
+  //SEG514 fc::@18
   //SEG515 [187] (byte) be#44 ← ++ (byte) be#137 -- vbuz1=_inc_vbuz1 
     inc be
-  //SEG516 [188] phi from fc::@19 fc::@8 to fc::@9 [phi:fc::@19/fc::@8->fc::@9]
-  //SEG517 [188] phi (byte) be#138 = (byte) be#44 [phi:fc::@19/fc::@8->fc::@9#0] -- register_copy 
+  //SEG516 [188] phi from fc::@18 fc::@8 to fc::@9 [phi:fc::@18/fc::@8->fc::@9]
+  //SEG517 [188] phi (byte) be#138 = (byte) be#44 [phi:fc::@18/fc::@8->fc::@9#0] -- register_copy 
   //SEG518 fc::@9
   b9:
-  //SEG519 [189] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fc::@30 -- vbuaa_neq_vbuc1_then_la1 
+  //SEG519 [189] if((byte) bd#117!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto fc::@19 -- vbuaa_neq_vbuc1_then_la1 
     cmp #9
     bne breturn
   //SEG520 [190] phi from fc::@9 to fc::@return [phi:fc::@9->fc::@return]
@@ -7028,9 +7070,9 @@ fc: {
   breturn:
   //SEG523 [191] return 
     rts
-  //SEG524 [192] phi from fc::@9 to fc::@30 [phi:fc::@9->fc::@30]
-  //SEG525 fc::@30
-  //SEG526 [190] phi from fc::@30 to fc::@return [phi:fc::@30->fc::@return]
-  //SEG527 [190] phi (byte) be#46 = (byte) be#138 [phi:fc::@30->fc::@return#0] -- register_copy 
+  //SEG524 [192] phi from fc::@9 to fc::@19 [phi:fc::@9->fc::@19]
+  //SEG525 fc::@19
+  //SEG526 [190] phi from fc::@19 to fc::@return [phi:fc::@19->fc::@return]
+  //SEG527 [190] phi (byte) be#46 = (byte) be#138 [phi:fc::@19->fc::@return#0] -- register_copy 
 }
 
diff --git a/src/test/ref/no-recursion-heavy.sym b/src/test/ref/no-recursion-heavy.sym
index 85ddc607f..fd446c74a 100644
--- a/src/test/ref/no-recursion-heavy.sym
+++ b/src/test/ref/no-recursion-heavy.sym
@@ -1,4 +1,4 @@
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (byte) ba
@@ -186,6 +186,7 @@
 (byte) be#46 be zp ZP_BYTE:6 1.8333333333333335
 (void()) f0()
 (label) f0::@1
+(label) f0::@10
 (label) f0::@11
 (label) f0::@12
 (label) f0::@13
@@ -196,7 +197,6 @@
 (label) f0::@18
 (label) f0::@19
 (label) f0::@2
-(label) f0::@20
 (label) f0::@3
 (label) f0::@4
 (label) f0::@5
@@ -207,6 +207,7 @@
 (label) f0::@return
 (void()) fa()
 (label) fa::@1
+(label) fa::@10
 (label) fa::@11
 (label) fa::@12
 (label) fa::@13
@@ -217,7 +218,6 @@
 (label) fa::@18
 (label) fa::@19
 (label) fa::@2
-(label) fa::@20
 (label) fa::@3
 (label) fa::@4
 (label) fa::@5
@@ -228,6 +228,7 @@
 (label) fa::@return
 (void()) fb()
 (label) fb::@1
+(label) fb::@10
 (label) fb::@11
 (label) fb::@12
 (label) fb::@13
@@ -238,7 +239,6 @@
 (label) fb::@18
 (label) fb::@19
 (label) fb::@2
-(label) fb::@20
 (label) fb::@3
 (label) fb::@4
 (label) fb::@5
@@ -249,6 +249,7 @@
 (label) fb::@return
 (void()) fc()
 (label) fc::@1
+(label) fc::@10
 (label) fc::@11
 (label) fc::@12
 (label) fc::@13
@@ -260,7 +261,6 @@
 (label) fc::@19
 (label) fc::@2
 (label) fc::@3
-(label) fc::@30
 (label) fc::@4
 (label) fc::@5
 (label) fc::@6
@@ -271,7 +271,7 @@
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@7
+(label) main::@3
 
 zp ZP_BYTE:2 [ ba#17 ba#1 ]
 zp ZP_BYTE:3 [ bb#49 bb#11 bb#25 bb#10 bb#24 bb#68 bb#23 bb#67 bb#22 bb#66 bb#21 bb#6 bb#20 bb#19 bb#18 bb#16 bb#13 bb#3 bb#4 bb#5 ]
diff --git a/src/test/ref/norom-charset.cfg b/src/test/ref/norom-charset.cfg
index 6b88b1027..9a8e469ad 100644
--- a/src/test/ref/norom-charset.cfg
+++ b/src/test/ref/norom-charset.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@3
diff --git a/src/test/ref/norom-charset.log b/src/test/ref/norom-charset.log
index 74bc82cb3..89a1ca425 100644
--- a/src/test/ref/norom-charset.log
+++ b/src/test/ref/norom-charset.log
@@ -316,8 +316,9 @@ Culled Empty Block (label) main::@4
 Culled Empty Block (label) gen_char3::@7
 Culled Empty Block (label) gen_char3::@8
 Culled Empty Block (label) gen_char3::@9
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of gen_char3
@@ -325,14 +326,14 @@ Adding NOP phi() at start of gen_char3
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@3
@@ -465,17 +466,17 @@ INITIAL ASM
   .label CHARSET = $3000
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -708,17 +709,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label CHARSET = $3000
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -882,7 +883,7 @@ gen_char3: {
   charset_spec_row: .word $f7da, $f7de, $f24e, $d6de
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b3
@@ -899,10 +900,10 @@ Replacing label b1_from_b3 with b1
 Replacing label b3_from_b2 with b3
 Replacing label b2_from_b3 with b2
 Replacing label b1_from_b5 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b3:
 Removing instruction b1_from_b5:
 Removing instruction b2_from_b1:
@@ -932,7 +933,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) CHARSET
@@ -1006,11 +1007,11 @@ Score: 45554
   .label SCREEN = $400
   .label CHARSET = $3000
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/norom-charset.sym b/src/test/ref/norom-charset.sym
index 0c5ddd502..25f5e795a 100644
--- a/src/test/ref/norom-charset.sym
+++ b/src/test/ref/norom-charset.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) CHARSET
diff --git a/src/test/ref/overlap-allocation-2.asm b/src/test/ref/overlap-allocation-2.asm
index e20b38fb9..1d7d8b835 100644
--- a/src/test/ref/overlap-allocation-2.asm
+++ b/src/test/ref/overlap-allocation-2.asm
@@ -13,13 +13,13 @@ main: {
     cpy #9
     bne b1
     ldy #$a
-  b3:
+  b2:
     tya
     tax
     jsr line
     iny
     cpy #$13
-    bne b3
+    bne b2
     rts
 }
 // line(byte register(X) l)
diff --git a/src/test/ref/overlap-allocation-2.cfg b/src/test/ref/overlap-allocation-2.cfg
index efb6ed6dc..861ad1d34 100644
--- a/src/test/ref/overlap-allocation-2.cfg
+++ b/src/test/ref/overlap-allocation-2.cfg
@@ -1,38 +1,38 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@5
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@3
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
   [6] (byte) line::l#0 ← (byte) main::i#2
   [7] call line 
-  to:main::@5
-main::@5: scope:[main]  from main::@1
+  to:main::@3
+main::@3: scope:[main]  from main::@1
   [8] (byte) main::i#1 ← ++ (byte) main::i#2
   [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@5 main::@6
-  [10] (byte) main::j#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) $a main::@6/(byte) main::j#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@3 main::@4
+  [10] (byte) main::j#2 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) $a main::@4/(byte) main::j#1 )
   [11] (byte) line::l#1 ← (byte) main::j#2
   [12] call line 
-  to:main::@6
-main::@6: scope:[main]  from main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@2
   [13] (byte) main::j#1 ← ++ (byte) main::j#2
-  [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $13) goto main::@3
+  [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $13) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@6
+main::@return: scope:[main]  from main::@4
   [15] return 
   to:@return
-line: scope:[line]  from main::@1 main::@3
-  [16] (byte) line::l#2 ← phi( main::@1/(byte) line::l#0 main::@3/(byte) line::l#1 )
+line: scope:[line]  from main::@1 main::@2
+  [16] (byte) line::l#2 ← phi( main::@1/(byte) line::l#0 main::@2/(byte) line::l#1 )
   [17] (byte) plot::x#0 ← (byte) line::l#2
   [18] call plot 
   to:line::@1
diff --git a/src/test/ref/overlap-allocation-2.log b/src/test/ref/overlap-allocation-2.log
index 68c3a58ac..0deca4664 100644
--- a/src/test/ref/overlap-allocation-2.log
+++ b/src/test/ref/overlap-allocation-2.log
@@ -155,47 +155,51 @@ Coalesced [25] plot::x#4 ← plot::x#1
 Coalesced down to 4 phi equivalence classes
 Culled Empty Block (label) main::@8
 Culled Empty Block (label) main::@7
+Renumbering block @3 to @1
+Renumbering block main::@3 to main::@2
+Renumbering block main::@5 to main::@3
+Renumbering block main::@6 to main::@4
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@5
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@3
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
   [6] (byte) line::l#0 ← (byte) main::i#2
   [7] call line 
-  to:main::@5
-main::@5: scope:[main]  from main::@1
+  to:main::@3
+main::@3: scope:[main]  from main::@1
   [8] (byte) main::i#1 ← ++ (byte) main::i#2
   [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@5 main::@6
-  [10] (byte) main::j#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) $a main::@6/(byte) main::j#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@3 main::@4
+  [10] (byte) main::j#2 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) $a main::@4/(byte) main::j#1 )
   [11] (byte) line::l#1 ← (byte) main::j#2
   [12] call line 
-  to:main::@6
-main::@6: scope:[main]  from main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@2
   [13] (byte) main::j#1 ← ++ (byte) main::j#2
-  [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $13) goto main::@3
+  [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $13) goto main::@2
   to:main::@return
-main::@return: scope:[main]  from main::@6
+main::@return: scope:[main]  from main::@4
   [15] return 
   to:@return
-line: scope:[line]  from main::@1 main::@3
-  [16] (byte) line::l#2 ← phi( main::@1/(byte) line::l#0 main::@3/(byte) line::l#1 )
+line: scope:[line]  from main::@1 main::@2
+  [16] (byte) line::l#2 ← phi( main::@1/(byte) line::l#0 main::@2/(byte) line::l#1 )
   [17] (byte) plot::x#0 ← (byte) line::l#2
   [18] call plot 
   to:line::@1
@@ -261,17 +265,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -285,9 +289,9 @@ main: {
     lda #0
     sta i
     jmp b1
-  //SEG13 [5] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  b1_from_b5:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -299,44 +303,44 @@ main: {
   line_from_b1:
   //SEG19 [16] phi (byte) line::l#2 = (byte) line::l#0 [phi:main::@1->line#0] -- register_copy 
     jsr line
-    jmp b5
-  //SEG20 main::@5
-  b5:
+    jmp b3
+  //SEG20 main::@3
+  b3:
   //SEG21 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG22 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp i
-    bne b1_from_b5
-  //SEG23 [10] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
-  b3_from_b5:
-  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@5->main::@3#0] -- vbuz1=vbuc1 
+    bne b1_from_b3
+  //SEG23 [10] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  b2_from_b3:
+  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@3->main::@2#0] -- vbuz1=vbuc1 
     lda #$a
     sta j
-    jmp b3
-  //SEG25 [10] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
-  b3_from_b6:
-  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@6->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG27 main::@3
-  b3:
+    jmp b2
+  //SEG25 [10] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@4->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG27 main::@2
+  b2:
   //SEG28 [11] (byte) line::l#1 ← (byte) main::j#2 -- vbuz1=vbuz2 
     lda j
     sta line.l
   //SEG29 [12] call line 
-  //SEG30 [16] phi from main::@3 to line [phi:main::@3->line]
-  line_from_b3:
-  //SEG31 [16] phi (byte) line::l#2 = (byte) line::l#1 [phi:main::@3->line#0] -- register_copy 
+  //SEG30 [16] phi from main::@2 to line [phi:main::@2->line]
+  line_from_b2:
+  //SEG31 [16] phi (byte) line::l#2 = (byte) line::l#1 [phi:main::@2->line#0] -- register_copy 
     jsr line
-    jmp b6
-  //SEG32 main::@6
-  b6:
+    jmp b4
+  //SEG32 main::@4
+  b4:
   //SEG33 [13] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $13) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $13) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$13
     cmp j
-    bne b3_from_b6
+    bne b2_from_b4
     jmp breturn
   //SEG35 main::@return
   breturn:
@@ -426,17 +430,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -447,9 +451,9 @@ main: {
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuyy=vbuc1 
     ldy #0
     jmp b1
-  //SEG13 [5] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  b1_from_b5:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -461,41 +465,41 @@ main: {
   line_from_b1:
   //SEG19 [16] phi (byte) line::l#2 = (byte) line::l#0 [phi:main::@1->line#0] -- register_copy 
     jsr line
-    jmp b5
-  //SEG20 main::@5
-  b5:
+    jmp b3
+  //SEG20 main::@3
+  b3:
   //SEG21 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuyy=_inc_vbuyy 
     iny
   //SEG22 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1 -- vbuyy_neq_vbuc1_then_la1 
     cpy #9
-    bne b1_from_b5
-  //SEG23 [10] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
-  b3_from_b5:
-  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@5->main::@3#0] -- vbuyy=vbuc1 
+    bne b1_from_b3
+  //SEG23 [10] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  b2_from_b3:
+  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@3->main::@2#0] -- vbuyy=vbuc1 
     ldy #$a
-    jmp b3
-  //SEG25 [10] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
-  b3_from_b6:
-  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@6->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG27 main::@3
-  b3:
+    jmp b2
+  //SEG25 [10] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@4->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG27 main::@2
+  b2:
   //SEG28 [11] (byte) line::l#1 ← (byte) main::j#2 -- vbuxx=vbuyy 
     tya
     tax
   //SEG29 [12] call line 
-  //SEG30 [16] phi from main::@3 to line [phi:main::@3->line]
-  line_from_b3:
-  //SEG31 [16] phi (byte) line::l#2 = (byte) line::l#1 [phi:main::@3->line#0] -- register_copy 
+  //SEG30 [16] phi from main::@2 to line [phi:main::@2->line]
+  line_from_b2:
+  //SEG31 [16] phi (byte) line::l#2 = (byte) line::l#1 [phi:main::@2->line#0] -- register_copy 
     jsr line
-    jmp b6
-  //SEG32 main::@6
-  b6:
+    jmp b4
+  //SEG32 main::@4
+  b4:
   //SEG33 [13] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $13) goto main::@3 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $13) goto main::@2 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$13
-    bne b3_from_b6
+    bne b2_from_b4
     jmp breturn
   //SEG35 main::@return
   breturn:
@@ -542,33 +546,33 @@ plot: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b5
 Removing instruction jmp b3
-Removing instruction jmp b6
+Removing instruction jmp b2
+Removing instruction jmp b4
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1_from_b5 with b1
-Replacing label b3_from_b6 with b3
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
-Removing instruction b1_from_b5:
-Removing instruction b3_from_b6:
+Replacing label b1_from_b3 with b1
+Replacing label b2_from_b4 with b2
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b3:
+Removing instruction b2_from_b4:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
 Removing instruction line_from_b1:
-Removing instruction b5:
-Removing instruction b3_from_b5:
-Removing instruction line_from_b3:
-Removing instruction b6:
+Removing instruction b3:
+Removing instruction b2_from_b3:
+Removing instruction line_from_b2:
+Removing instruction b4:
 Removing instruction breturn:
 Removing instruction plot_from_line:
 Removing instruction b1:
@@ -580,13 +584,13 @@ Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -600,9 +604,9 @@ FINAL SYMBOL TABLE
 (byte) line::l#2 reg byte x 8.666666666666666
 (void()) main()
 (label) main::@1
+(label) main::@2
 (label) main::@3
-(label) main::@5
-(label) main::@6
+(label) main::@4
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte y 16.5
@@ -635,19 +639,19 @@ Score: 303
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG13 [5] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
   //SEG15 main::@1
   b1:
   //SEG16 [6] (byte) line::l#0 ← (byte) main::i#2 -- vbuxx=vbuyy 
@@ -657,32 +661,32 @@ main: {
   //SEG18 [16] phi from main::@1 to line [phi:main::@1->line]
   //SEG19 [16] phi (byte) line::l#2 = (byte) line::l#0 [phi:main::@1->line#0] -- register_copy 
     jsr line
-  //SEG20 main::@5
+  //SEG20 main::@3
   //SEG21 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuyy=_inc_vbuyy 
     iny
   //SEG22 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1 -- vbuyy_neq_vbuc1_then_la1 
     cpy #9
     bne b1
-  //SEG23 [10] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
-  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@5->main::@3#0] -- vbuyy=vbuc1 
+  //SEG23 [10] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
+  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) $a [phi:main::@3->main::@2#0] -- vbuyy=vbuc1 
     ldy #$a
-  //SEG25 [10] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
-  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@6->main::@3#0] -- register_copy 
-  //SEG27 main::@3
-  b3:
+  //SEG25 [10] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@4->main::@2#0] -- register_copy 
+  //SEG27 main::@2
+  b2:
   //SEG28 [11] (byte) line::l#1 ← (byte) main::j#2 -- vbuxx=vbuyy 
     tya
     tax
   //SEG29 [12] call line 
-  //SEG30 [16] phi from main::@3 to line [phi:main::@3->line]
-  //SEG31 [16] phi (byte) line::l#2 = (byte) line::l#1 [phi:main::@3->line#0] -- register_copy 
+  //SEG30 [16] phi from main::@2 to line [phi:main::@2->line]
+  //SEG31 [16] phi (byte) line::l#2 = (byte) line::l#1 [phi:main::@2->line#0] -- register_copy 
     jsr line
-  //SEG32 main::@6
+  //SEG32 main::@4
   //SEG33 [13] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $13) goto main::@3 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $13) goto main::@2 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$13
-    bne b3
+    bne b2
   //SEG35 main::@return
   //SEG36 [15] return 
     rts
diff --git a/src/test/ref/overlap-allocation-2.sym b/src/test/ref/overlap-allocation-2.sym
index cb7293e71..d170eed1e 100644
--- a/src/test/ref/overlap-allocation-2.sym
+++ b/src/test/ref/overlap-allocation-2.sym
@@ -1,4 +1,4 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -12,9 +12,9 @@
 (byte) line::l#2 reg byte x 8.666666666666666
 (void()) main()
 (label) main::@1
+(label) main::@2
 (label) main::@3
-(label) main::@5
-(label) main::@6
+(label) main::@4
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte y 16.5
diff --git a/src/test/ref/overlap-allocation.asm b/src/test/ref/overlap-allocation.asm
index b1d892ca6..cde9d9239 100644
--- a/src/test/ref/overlap-allocation.asm
+++ b/src/test/ref/overlap-allocation.asm
@@ -12,17 +12,17 @@ main: {
     cpx #$b
     bne b1
     ldx #0
+  b2:
+    jsr plot
+    inx
+    cpx #$b
+    bne b2
+    ldx #0
   b3:
     jsr plot
     inx
     cpx #$b
     bne b3
-    ldx #0
-  b5:
-    jsr plot
-    inx
-    cpx #$b
-    bne b5
     rts
 }
 // plot(byte register(X) x)
diff --git a/src/test/ref/overlap-allocation.cfg b/src/test/ref/overlap-allocation.cfg
index 6e93ab33e..af2f31dde 100644
--- a/src/test/ref/overlap-allocation.cfg
+++ b/src/test/ref/overlap-allocation.cfg
@@ -1,47 +1,47 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@7
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@4
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::i#1 )
   [6] (byte) plot::x#0 ← (byte) main::i#2
   [7] call plot 
-  to:main::@7
-main::@7: scope:[main]  from main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@1
   [8] (byte) main::i#1 ← ++ (byte) main::i#2
   [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@7 main::@8
-  [10] (byte) main::j#2 ← phi( main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::j#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@4 main::@5
+  [10] (byte) main::j#2 ← phi( main::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::j#1 )
   [11] (byte) plot::x#1 ← (byte) main::j#2
   [12] call plot 
-  to:main::@8
-main::@8: scope:[main]  from main::@3
-  [13] (byte) main::j#1 ← ++ (byte) main::j#2
-  [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3
   to:main::@5
-main::@5: scope:[main]  from main::@8 main::@9
-  [15] (byte) main::k#2 ← phi( main::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@9/(byte) main::k#1 )
+main::@5: scope:[main]  from main::@2
+  [13] (byte) main::j#1 ← ++ (byte) main::j#2
+  [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@5 main::@6
+  [15] (byte) main::k#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::k#1 )
   [16] (byte) plot::x#2 ← (byte) main::k#2
   [17] call plot 
-  to:main::@9
-main::@9: scope:[main]  from main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@3
   [18] (byte) main::k#1 ← ++ (byte) main::k#2
-  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@5
+  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3
   to:main::@return
-main::@return: scope:[main]  from main::@9
+main::@return: scope:[main]  from main::@6
   [20] return 
   to:@return
-plot: scope:[plot]  from main::@1 main::@3 main::@5
-  [21] (byte) plot::x#3 ← phi( main::@1/(byte) plot::x#0 main::@3/(byte) plot::x#1 main::@5/(byte) plot::x#2 )
+plot: scope:[plot]  from main::@1 main::@2 main::@3
+  [21] (byte) plot::x#3 ← phi( main::@1/(byte) plot::x#0 main::@2/(byte) plot::x#1 main::@3/(byte) plot::x#2 )
   [22] *((const byte*) SCREEN#0 + (byte) plot::x#3) ← (byte) '*'
   to:plot::@return
 plot::@return: scope:[plot]  from plot
diff --git a/src/test/ref/overlap-allocation.log b/src/test/ref/overlap-allocation.log
index a09d5b06b..5e60f2f3a 100644
--- a/src/test/ref/overlap-allocation.log
+++ b/src/test/ref/overlap-allocation.log
@@ -159,56 +159,62 @@ Coalesced down to 4 phi equivalence classes
 Culled Empty Block (label) main::@12
 Culled Empty Block (label) main::@11
 Culled Empty Block (label) main::@10
+Renumbering block @2 to @1
+Renumbering block main::@3 to main::@2
+Renumbering block main::@5 to main::@3
+Renumbering block main::@7 to main::@4
+Renumbering block main::@8 to main::@5
+Renumbering block main::@9 to main::@6
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@7
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@4
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::i#1 )
   [6] (byte) plot::x#0 ← (byte) main::i#2
   [7] call plot 
-  to:main::@7
-main::@7: scope:[main]  from main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@1
   [8] (byte) main::i#1 ← ++ (byte) main::i#2
   [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main::@7 main::@8
-  [10] (byte) main::j#2 ← phi( main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::j#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@4 main::@5
+  [10] (byte) main::j#2 ← phi( main::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::j#1 )
   [11] (byte) plot::x#1 ← (byte) main::j#2
   [12] call plot 
-  to:main::@8
-main::@8: scope:[main]  from main::@3
-  [13] (byte) main::j#1 ← ++ (byte) main::j#2
-  [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3
   to:main::@5
-main::@5: scope:[main]  from main::@8 main::@9
-  [15] (byte) main::k#2 ← phi( main::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@9/(byte) main::k#1 )
+main::@5: scope:[main]  from main::@2
+  [13] (byte) main::j#1 ← ++ (byte) main::j#2
+  [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@5 main::@6
+  [15] (byte) main::k#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::k#1 )
   [16] (byte) plot::x#2 ← (byte) main::k#2
   [17] call plot 
-  to:main::@9
-main::@9: scope:[main]  from main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@3
   [18] (byte) main::k#1 ← ++ (byte) main::k#2
-  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@5
+  [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3
   to:main::@return
-main::@return: scope:[main]  from main::@9
+main::@return: scope:[main]  from main::@6
   [20] return 
   to:@return
-plot: scope:[plot]  from main::@1 main::@3 main::@5
-  [21] (byte) plot::x#3 ← phi( main::@1/(byte) plot::x#0 main::@3/(byte) plot::x#1 main::@5/(byte) plot::x#2 )
+plot: scope:[plot]  from main::@1 main::@2 main::@3
+  [21] (byte) plot::x#3 ← phi( main::@1/(byte) plot::x#0 main::@2/(byte) plot::x#1 main::@3/(byte) plot::x#2 )
   [22] *((const byte*) SCREEN#0 + (byte) plot::x#3) ← (byte) '*'
   to:plot::@return
 plot::@return: scope:[plot]  from plot
@@ -262,17 +268,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -287,9 +293,9 @@ main: {
     lda #0
     sta i
     jmp b1
-  //SEG13 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -301,73 +307,73 @@ main: {
   plot_from_b1:
   //SEG19 [21] phi (byte) plot::x#3 = (byte) plot::x#0 [phi:main::@1->plot#0] -- register_copy 
     jsr plot
-    jmp b7
-  //SEG20 main::@7
-  b7:
+    jmp b4
+  //SEG20 main::@4
+  b4:
   //SEG21 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG22 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp i
-    bne b1_from_b7
-  //SEG23 [10] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
-  b3_from_b7:
-  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@3#0] -- vbuz1=vbuc1 
+    bne b1_from_b4
+  //SEG23 [10] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta j
-    jmp b3
-  //SEG25 [10] phi from main::@8 to main::@3 [phi:main::@8->main::@3]
-  b3_from_b8:
-  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@8->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG27 main::@3
-  b3:
+    jmp b2
+  //SEG25 [10] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
+  b2_from_b5:
+  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@5->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG27 main::@2
+  b2:
   //SEG28 [11] (byte) plot::x#1 ← (byte) main::j#2 -- vbuz1=vbuz2 
     lda j
     sta plot.x
   //SEG29 [12] call plot 
-  //SEG30 [21] phi from main::@3 to plot [phi:main::@3->plot]
-  plot_from_b3:
-  //SEG31 [21] phi (byte) plot::x#3 = (byte) plot::x#1 [phi:main::@3->plot#0] -- register_copy 
+  //SEG30 [21] phi from main::@2 to plot [phi:main::@2->plot]
+  plot_from_b2:
+  //SEG31 [21] phi (byte) plot::x#3 = (byte) plot::x#1 [phi:main::@2->plot#0] -- register_copy 
     jsr plot
-    jmp b8
-  //SEG32 main::@8
-  b8:
+    jmp b5
+  //SEG32 main::@5
+  b5:
   //SEG33 [13] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp j
-    bne b3_from_b8
-  //SEG35 [15] phi from main::@8 to main::@5 [phi:main::@8->main::@5]
-  b5_from_b8:
-  //SEG36 [15] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@5#0] -- vbuz1=vbuc1 
+    bne b2_from_b5
+  //SEG35 [15] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
+  b3_from_b5:
+  //SEG36 [15] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta k
-    jmp b5
-  //SEG37 [15] phi from main::@9 to main::@5 [phi:main::@9->main::@5]
-  b5_from_b9:
-  //SEG38 [15] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@9->main::@5#0] -- register_copy 
-    jmp b5
-  //SEG39 main::@5
-  b5:
+    jmp b3
+  //SEG37 [15] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
+  b3_from_b6:
+  //SEG38 [15] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@6->main::@3#0] -- register_copy 
+    jmp b3
+  //SEG39 main::@3
+  b3:
   //SEG40 [16] (byte) plot::x#2 ← (byte) main::k#2 -- vbuz1=vbuz2 
     lda k
     sta plot.x
   //SEG41 [17] call plot 
-  //SEG42 [21] phi from main::@5 to plot [phi:main::@5->plot]
-  plot_from_b5:
-  //SEG43 [21] phi (byte) plot::x#3 = (byte) plot::x#2 [phi:main::@5->plot#0] -- register_copy 
+  //SEG42 [21] phi from main::@3 to plot [phi:main::@3->plot]
+  plot_from_b3:
+  //SEG43 [21] phi (byte) plot::x#3 = (byte) plot::x#2 [phi:main::@3->plot#0] -- register_copy 
     jsr plot
-    jmp b9
-  //SEG44 main::@9
-  b9:
+    jmp b6
+  //SEG44 main::@6
+  b6:
   //SEG45 [18] (byte) main::k#1 ← ++ (byte) main::k#2 -- vbuz1=_inc_vbuz1 
     inc k
-  //SEG46 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG46 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp k
-    bne b5_from_b9
+    bne b3_from_b6
     jmp breturn
   //SEG47 main::@return
   breturn:
@@ -421,17 +427,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -442,9 +448,9 @@ main: {
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
-  //SEG13 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -454,64 +460,64 @@ main: {
   plot_from_b1:
   //SEG19 [21] phi (byte) plot::x#3 = (byte) plot::x#0 [phi:main::@1->plot#0] -- register_copy 
     jsr plot
-    jmp b7
-  //SEG20 main::@7
-  b7:
+    jmp b4
+  //SEG20 main::@4
+  b4:
   //SEG21 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
   //SEG22 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b1_from_b7
-  //SEG23 [10] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
-  b3_from_b7:
-  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@3#0] -- vbuxx=vbuc1 
+    bne b1_from_b4
+  //SEG23 [10] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  b2_from_b4:
+  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@2#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b3
-  //SEG25 [10] phi from main::@8 to main::@3 [phi:main::@8->main::@3]
-  b3_from_b8:
-  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@8->main::@3#0] -- register_copy 
-    jmp b3
-  //SEG27 main::@3
-  b3:
+    jmp b2
+  //SEG25 [10] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
+  b2_from_b5:
+  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@5->main::@2#0] -- register_copy 
+    jmp b2
+  //SEG27 main::@2
+  b2:
   //SEG28 [11] (byte) plot::x#1 ← (byte) main::j#2
   //SEG29 [12] call plot 
-  //SEG30 [21] phi from main::@3 to plot [phi:main::@3->plot]
-  plot_from_b3:
-  //SEG31 [21] phi (byte) plot::x#3 = (byte) plot::x#1 [phi:main::@3->plot#0] -- register_copy 
+  //SEG30 [21] phi from main::@2 to plot [phi:main::@2->plot]
+  plot_from_b2:
+  //SEG31 [21] phi (byte) plot::x#3 = (byte) plot::x#1 [phi:main::@2->plot#0] -- register_copy 
     jsr plot
-    jmp b8
-  //SEG32 main::@8
-  b8:
+    jmp b5
+  //SEG32 main::@5
+  b5:
   //SEG33 [13] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b3_from_b8
-  //SEG35 [15] phi from main::@8 to main::@5 [phi:main::@8->main::@5]
-  b5_from_b8:
-  //SEG36 [15] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@5#0] -- vbuxx=vbuc1 
+    bne b2_from_b5
+  //SEG35 [15] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
+  b3_from_b5:
+  //SEG36 [15] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@3#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b5
-  //SEG37 [15] phi from main::@9 to main::@5 [phi:main::@9->main::@5]
-  b5_from_b9:
-  //SEG38 [15] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@9->main::@5#0] -- register_copy 
-    jmp b5
-  //SEG39 main::@5
-  b5:
+    jmp b3
+  //SEG37 [15] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
+  b3_from_b6:
+  //SEG38 [15] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@6->main::@3#0] -- register_copy 
+    jmp b3
+  //SEG39 main::@3
+  b3:
   //SEG40 [16] (byte) plot::x#2 ← (byte) main::k#2
   //SEG41 [17] call plot 
-  //SEG42 [21] phi from main::@5 to plot [phi:main::@5->plot]
-  plot_from_b5:
-  //SEG43 [21] phi (byte) plot::x#3 = (byte) plot::x#2 [phi:main::@5->plot#0] -- register_copy 
+  //SEG42 [21] phi from main::@3 to plot [phi:main::@3->plot]
+  plot_from_b3:
+  //SEG43 [21] phi (byte) plot::x#3 = (byte) plot::x#2 [phi:main::@3->plot#0] -- register_copy 
     jsr plot
-    jmp b9
-  //SEG44 main::@9
-  b9:
+    jmp b6
+  //SEG44 main::@6
+  b6:
   //SEG45 [18] (byte) main::k#1 ← ++ (byte) main::k#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG46 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@5 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG46 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b5_from_b9
+    bne b3_from_b6
     jmp breturn
   //SEG47 main::@return
   breturn:
@@ -532,38 +538,38 @@ plot: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b7
-Removing instruction jmp b3
-Removing instruction jmp b8
+Removing instruction jmp b4
+Removing instruction jmp b2
 Removing instruction jmp b5
-Removing instruction jmp b9
+Removing instruction jmp b3
+Removing instruction jmp b6
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1_from_b7 with b1
-Replacing label b3_from_b8 with b3
-Replacing label b5_from_b9 with b5
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
-Removing instruction b1_from_b7:
+Replacing label b1_from_b4 with b1
+Replacing label b2_from_b5 with b2
+Replacing label b3_from_b6 with b3
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b4:
 Removing instruction plot_from_b1:
-Removing instruction b3_from_b8:
+Removing instruction b2_from_b5:
+Removing instruction plot_from_b2:
+Removing instruction b3_from_b6:
 Removing instruction plot_from_b3:
-Removing instruction b5_from_b9:
-Removing instruction plot_from_b5:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b7:
-Removing instruction b3_from_b7:
-Removing instruction b8:
-Removing instruction b5_from_b8:
-Removing instruction b9:
+Removing instruction b4:
+Removing instruction b2_from_b4:
+Removing instruction b5:
+Removing instruction b3_from_b5:
+Removing instruction b6:
 Removing instruction breturn:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -571,25 +577,25 @@ Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp b5
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) main()
 (label) main::@1
+(label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@7
-(label) main::@8
-(label) main::@9
+(label) main::@6
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
@@ -627,19 +633,19 @@ Score: 292
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG13 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@1#0] -- register_copy 
   //SEG15 main::@1
   b1:
   //SEG16 [6] (byte) plot::x#0 ← (byte) main::i#2
@@ -647,48 +653,48 @@ main: {
   //SEG18 [21] phi from main::@1 to plot [phi:main::@1->plot]
   //SEG19 [21] phi (byte) plot::x#3 = (byte) plot::x#0 [phi:main::@1->plot#0] -- register_copy 
     jsr plot
-  //SEG20 main::@7
+  //SEG20 main::@4
   //SEG21 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
   //SEG22 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
     bne b1
-  //SEG23 [10] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
-  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@3#0] -- vbuxx=vbuc1 
+  //SEG23 [10] phi from main::@4 to main::@2 [phi:main::@4->main::@2]
+  //SEG24 [10] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@2#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG25 [10] phi from main::@8 to main::@3 [phi:main::@8->main::@3]
-  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@8->main::@3#0] -- register_copy 
-  //SEG27 main::@3
-  b3:
+  //SEG25 [10] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
+  //SEG26 [10] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@5->main::@2#0] -- register_copy 
+  //SEG27 main::@2
+  b2:
   //SEG28 [11] (byte) plot::x#1 ← (byte) main::j#2
   //SEG29 [12] call plot 
-  //SEG30 [21] phi from main::@3 to plot [phi:main::@3->plot]
-  //SEG31 [21] phi (byte) plot::x#3 = (byte) plot::x#1 [phi:main::@3->plot#0] -- register_copy 
+  //SEG30 [21] phi from main::@2 to plot [phi:main::@2->plot]
+  //SEG31 [21] phi (byte) plot::x#3 = (byte) plot::x#1 [phi:main::@2->plot#0] -- register_copy 
     jsr plot
-  //SEG32 main::@8
+  //SEG32 main::@5
   //SEG33 [13] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG34 [14] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b3
-  //SEG35 [15] phi from main::@8 to main::@5 [phi:main::@8->main::@5]
-  //SEG36 [15] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@5#0] -- vbuxx=vbuc1 
+    bne b2
+  //SEG35 [15] phi from main::@5 to main::@3 [phi:main::@5->main::@3]
+  //SEG36 [15] phi (byte) main::k#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@3#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG37 [15] phi from main::@9 to main::@5 [phi:main::@9->main::@5]
-  //SEG38 [15] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@9->main::@5#0] -- register_copy 
-  //SEG39 main::@5
-  b5:
+  //SEG37 [15] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
+  //SEG38 [15] phi (byte) main::k#2 = (byte) main::k#1 [phi:main::@6->main::@3#0] -- register_copy 
+  //SEG39 main::@3
+  b3:
   //SEG40 [16] (byte) plot::x#2 ← (byte) main::k#2
   //SEG41 [17] call plot 
-  //SEG42 [21] phi from main::@5 to plot [phi:main::@5->plot]
-  //SEG43 [21] phi (byte) plot::x#3 = (byte) plot::x#2 [phi:main::@5->plot#0] -- register_copy 
+  //SEG42 [21] phi from main::@3 to plot [phi:main::@3->plot]
+  //SEG43 [21] phi (byte) plot::x#3 = (byte) plot::x#2 [phi:main::@3->plot#0] -- register_copy 
     jsr plot
-  //SEG44 main::@9
+  //SEG44 main::@6
   //SEG45 [18] (byte) main::k#1 ← ++ (byte) main::k#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG46 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@5 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG46 [19] if((byte) main::k#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@3 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b5
+    bne b3
   //SEG47 main::@return
   //SEG48 [20] return 
     rts
diff --git a/src/test/ref/overlap-allocation.sym b/src/test/ref/overlap-allocation.sym
index f2d98d74e..613147976 100644
--- a/src/test/ref/overlap-allocation.sym
+++ b/src/test/ref/overlap-allocation.sym
@@ -1,15 +1,15 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
 (const byte*) SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (void()) main()
 (label) main::@1
+(label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@7
-(label) main::@8
-(label) main::@9
+(label) main::@6
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
diff --git a/src/test/ref/print-problem.cfg b/src/test/ref/print-problem.cfg
index a9a0a768d..a68d74bb8 100644
--- a/src/test/ref/print-problem.cfg
+++ b/src/test/ref/print-problem.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call ln 
   to:main::@1
diff --git a/src/test/ref/print-problem.log b/src/test/ref/print-problem.log
index 83aab571b..bff917f03 100644
--- a/src/test/ref/print-problem.log
+++ b/src/test/ref/print-problem.log
@@ -162,22 +162,23 @@ Created 1 initial phi equivalence classes
 Coalesced [7] line#17 ← line#13
 Coalesced (already) [10] line#18 ← line#13
 Coalesced down to 1 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call ln 
   to:main::@1
@@ -240,17 +241,17 @@ INITIAL ASM
   .label line = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -337,17 +338,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -405,7 +406,7 @@ ln: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -413,10 +414,10 @@ Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction ln_from_main:
@@ -435,7 +436,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -470,11 +471,11 @@ Score: 48
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/print-problem.sym b/src/test/ref/print-problem.sym
index 122545929..3568ffaa2 100644
--- a/src/test/ref/print-problem.sym
+++ b/src/test/ref/print-problem.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
diff --git a/src/test/ref/printmsg.cfg b/src/test/ref/printmsg.cfg
index d7cff3f1c..8acf33b16 100644
--- a/src/test/ref/printmsg.cfg
+++ b/src/test/ref/printmsg.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_str 
   to:main::@1
diff --git a/src/test/ref/printmsg.log b/src/test/ref/printmsg.log
index cec6df22b..3dff1bd28 100644
--- a/src/test/ref/printmsg.log
+++ b/src/test/ref/printmsg.log
@@ -327,8 +327,9 @@ Coalesced [33] print_str::str#8 ← print_str::str#0
 Coalesced [34] print_char_cursor#35 ← print_char_cursor#1
 Coalesced down to 3 phi equivalence classes
 Culled Empty Block (label) print_ln::@3
+Renumbering block @20 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @20
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -338,14 +339,14 @@ Adding NOP phi() at start of main::@5
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_str 
   to:main::@1
@@ -449,17 +450,17 @@ INITIAL ASM
   .label print_line_cursor = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -667,17 +668,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -853,7 +854,7 @@ print_str: {
   msg3: .text "hello 2017! @"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b20
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -871,10 +872,10 @@ Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b2 with b1
-Removing instruction b20_from_bbegin:
-Removing instruction b20:
-Removing instruction main_from_b20:
-Removing instruction bend_from_b20:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction print_ln_from_b1:
 Removing instruction b3_from_b2:
@@ -906,7 +907,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -963,11 +964,11 @@ Score: 1033
   .label print_char_cursor = 6
   .label print_line_cursor = 2
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-//SEG5 @20
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/printmsg.sym b/src/test/ref/printmsg.sym
index bf3634c8e..57adf3282 100644
--- a/src/test/ref/printmsg.sym
+++ b/src/test/ref/printmsg.sym
@@ -1,4 +1,4 @@
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/ptrtest.cfg b/src/test/ref/ptrtest.cfg
index e47936ddf..d520c5046 100644
--- a/src/test/ref/ptrtest.cfg
+++ b/src/test/ref/ptrtest.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] phi()
   [5] call lvalue 
   to:main::@1
diff --git a/src/test/ref/ptrtest.log b/src/test/ref/ptrtest.log
index 5ac06a698..6b674fd1f 100644
--- a/src/test/ref/ptrtest.log
+++ b/src/test/ref/ptrtest.log
@@ -246,8 +246,9 @@ Coalesced [30] rvaluevar::screen#4 ← rvaluevar::screen#1
 Coalesced [38] rvalue::i#4 ← rvalue::i#1
 Coalesced [46] lvalue::i#4 ← lvalue::i#1
 Coalesced down to 6 phi equivalence classes
+Renumbering block @5 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @5
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -259,14 +260,14 @@ Adding NOP phi() at start of rvaluevar
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] phi()
   [5] call lvalue 
   to:main::@1
@@ -426,17 +427,17 @@ INITIAL ASM
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-main_from_b5:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -713,17 +714,17 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-main_from_b5:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -924,7 +925,7 @@ lvalue: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b5
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -939,10 +940,10 @@ Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b5_from_bbegin:
-Removing instruction b5:
-Removing instruction main_from_b5:
-Removing instruction bend_from_b5:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction b2_from_b1:
 Removing instruction rvaluevar_from_b2:
@@ -975,7 +976,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (void()) lvalue()
@@ -1052,11 +1053,11 @@ Score: 1274
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-//SEG5 @5
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/ptrtest.sym b/src/test/ref/ptrtest.sym
index 277f0b64f..dbd5b8376 100644
--- a/src/test/ref/ptrtest.sym
+++ b/src/test/ref/ptrtest.sym
@@ -1,4 +1,4 @@
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (void()) lvalue()
diff --git a/src/test/ref/roll-sprite-msb.cfg b/src/test/ref/roll-sprite-msb.cfg
index 74dbccd69..5e2d263fe 100644
--- a/src/test/ref/roll-sprite-msb.cfg
+++ b/src/test/ref/roll-sprite-msb.cfg
@@ -1,28 +1,28 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (word) main::xpos#2 ← phi( main/(byte/word/signed word/dword/signed dword) $c8 main::@3/(word) main::xpos#1 )
-  [5] (byte) main::s#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::s#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (word) main::xpos#2 ← phi( main/(byte/word/signed word/dword/signed dword) $c8 main::@2/(word) main::xpos#1 )
+  [5] (byte) main::s#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::s#1 )
   [6] (byte) position_sprite::spriteno#0 ← (byte) main::s#2
   [7] (word) position_sprite::x#0 ← (word) main::xpos#2
   [8] call position_sprite 
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [9] (word) main::xpos#1 ← (word) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $a
   [10] (byte) main::s#1 ← ++ (byte) main::s#2
   [11] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [12] return 
   to:@return
 position_sprite: scope:[position_sprite]  from main::@1
@@ -32,13 +32,13 @@ position_sprite: scope:[position_sprite]  from main::@1
   [16] (byte~) position_sprite::$2 ← < (word) position_sprite::x#0
   [17] *((const byte*) SPRITES_XPOS#0 + (byte~) position_sprite::$1) ← (byte~) position_sprite::$2
   [18] if((word) position_sprite::x#0>(byte/word/signed word/dword/signed dword) $ff) goto position_sprite::@1
-  to:position_sprite::@3
-position_sprite::@3: scope:[position_sprite]  from position_sprite
+  to:position_sprite::@2
+position_sprite::@2: scope:[position_sprite]  from position_sprite
   [19] (byte/signed byte/word/signed word/dword/signed dword~) position_sprite::$4 ← (byte/signed byte/word/signed word/dword/signed dword) 1 << (byte) position_sprite::spriteno#0
   [20] (byte/word/dword~) position_sprite::$5 ← (byte/signed byte/word/signed word/dword/signed dword~) position_sprite::$4 ^ (byte/word/signed word/dword/signed dword) $ff
   [21] *((const byte*) SPRITES_XMSB#0) ← *((const byte*) SPRITES_XMSB#0) & (byte/word/dword~) position_sprite::$5
   to:position_sprite::@return
-position_sprite::@return: scope:[position_sprite]  from position_sprite::@1 position_sprite::@3
+position_sprite::@return: scope:[position_sprite]  from position_sprite::@1 position_sprite::@2
   [22] return 
   to:@return
 position_sprite::@1: scope:[position_sprite]  from position_sprite
diff --git a/src/test/ref/roll-sprite-msb.log b/src/test/ref/roll-sprite-msb.log
index 7e0ce31fb..fcb487883 100644
--- a/src/test/ref/roll-sprite-msb.log
+++ b/src/test/ref/roll-sprite-msb.log
@@ -457,37 +457,40 @@ Coalesced [13] main::s#4 ← main::s#1
 Coalesced [14] main::xpos#4 ← main::xpos#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@4
+Renumbering block @6 to @1
+Renumbering block main::@3 to main::@2
+Renumbering block position_sprite::@3 to position_sprite::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @6
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@6
-@6: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @6
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @6
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (word) main::xpos#2 ← phi( main/(byte/word/signed word/dword/signed dword) $c8 main::@3/(word) main::xpos#1 )
-  [5] (byte) main::s#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::s#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (word) main::xpos#2 ← phi( main/(byte/word/signed word/dword/signed dword) $c8 main::@2/(word) main::xpos#1 )
+  [5] (byte) main::s#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::s#1 )
   [6] (byte) position_sprite::spriteno#0 ← (byte) main::s#2
   [7] (word) position_sprite::x#0 ← (word) main::xpos#2
   [8] call position_sprite 
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [9] (word) main::xpos#1 ← (word) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $a
   [10] (byte) main::s#1 ← ++ (byte) main::s#2
   [11] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [12] return 
   to:@return
 position_sprite: scope:[position_sprite]  from main::@1
@@ -497,13 +500,13 @@ position_sprite: scope:[position_sprite]  from main::@1
   [16] (byte~) position_sprite::$2 ← < (word) position_sprite::x#0
   [17] *((const byte*) SPRITES_XPOS#0 + (byte~) position_sprite::$1) ← (byte~) position_sprite::$2
   [18] if((word) position_sprite::x#0>(byte/word/signed word/dword/signed dword) $ff) goto position_sprite::@1
-  to:position_sprite::@3
-position_sprite::@3: scope:[position_sprite]  from position_sprite
+  to:position_sprite::@2
+position_sprite::@2: scope:[position_sprite]  from position_sprite
   [19] (byte/signed byte/word/signed word/dword/signed dword~) position_sprite::$4 ← (byte/signed byte/word/signed word/dword/signed dword) 1 << (byte) position_sprite::spriteno#0
   [20] (byte/word/dword~) position_sprite::$5 ← (byte/signed byte/word/signed word/dword/signed dword~) position_sprite::$4 ^ (byte/word/signed word/dword/signed dword) $ff
   [21] *((const byte*) SPRITES_XMSB#0) ← *((const byte*) SPRITES_XMSB#0) & (byte/word/dword~) position_sprite::$5
   to:position_sprite::@return
-position_sprite::@return: scope:[position_sprite]  from position_sprite::@1 position_sprite::@3
+position_sprite::@return: scope:[position_sprite]  from position_sprite::@1 position_sprite::@2
   [22] return 
   to:@return
 position_sprite::@1: scope:[position_sprite]  from position_sprite
@@ -658,17 +661,17 @@ INITIAL ASM
   .label SPRITES_XMSB = $d010
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @6 to main [phi:@6->main]
-main_from_b6:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -687,10 +690,10 @@ main: {
     lda #0
     sta s
     jmp b1
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG15 [5] phi (word) main::xpos#2 = (word) main::xpos#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG15 [5] phi (word) main::xpos#2 = (word) main::xpos#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@2->main::@1#1] -- register_copy 
     jmp b1
   //SEG17 main::@1
   b1:
@@ -704,9 +707,9 @@ main: {
     sta position_sprite.x+1
   //SEG20 [8] call position_sprite 
     jsr position_sprite
-    jmp b3
-  //SEG21 main::@3
-  b3:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [9] (word) main::xpos#1 ← (word) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $a -- vwuz1=vwuz1_plus_vbuc1 
     lda #$a
     clc
@@ -720,7 +723,7 @@ main: {
   //SEG24 [11] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp s
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG25 main::@return
   breturn:
@@ -766,9 +769,9 @@ position_sprite: {
     beq !+
     bcs b1
   !:
-    jmp b3
-  //SEG34 position_sprite::@3
-  b3:
+    jmp b2
+  //SEG34 position_sprite::@2
+  b2:
   //SEG35 [19] (byte/signed byte/word/signed word/dword/signed dword~) position_sprite::$4 ← (byte/signed byte/word/signed word/dword/signed dword) 1 << (byte) position_sprite::spriteno#0 -- vbuz1=vbuc1_rol_vbuz2 
     lda #1
     ldy spriteno
@@ -884,17 +887,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SPRITES_XMSB = $d010
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-b6_from_bbegin:
-  jmp b6
-//SEG5 @6
-b6:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @6 to main [phi:@6->main]
-main_from_b6:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @6 to @end [phi:@6->@end]
-bend_from_b6:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -911,10 +914,10 @@ main: {
   //SEG13 [5] phi (byte) main::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#1] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG15 [5] phi (word) main::xpos#2 = (word) main::xpos#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG15 [5] phi (word) main::xpos#2 = (word) main::xpos#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@2->main::@1#1] -- register_copy 
     jmp b1
   //SEG17 main::@1
   b1:
@@ -923,9 +926,9 @@ main: {
   //SEG19 [7] (word) position_sprite::x#0 ← (word) main::xpos#2
   //SEG20 [8] call position_sprite 
     jsr position_sprite
-    jmp b3
-  //SEG21 main::@3
-  b3:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [9] (word) main::xpos#1 ← (word) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $a -- vwuz1=vwuz1_plus_vbuc1 
     lda #$a
     clc
@@ -938,7 +941,7 @@ main: {
     inx
   //SEG24 [11] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #8
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG25 main::@return
   breturn:
@@ -974,9 +977,9 @@ position_sprite: {
     beq !+
     bcs b1
   !:
-    jmp b3
-  //SEG34 position_sprite::@3
-  b3:
+    jmp b2
+  //SEG34 position_sprite::@2
+  b2:
   //SEG35 [19] (byte/signed byte/word/signed word/dword/signed dword~) position_sprite::$4 ← (byte/signed byte/word/signed word/dword/signed dword) 1 << (byte) position_sprite::spriteno#0 -- vbuaa=vbuc1_rol_vbuz1 
     lda #1
     ldy spriteno
@@ -1016,27 +1019,27 @@ position_sprite: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b6
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing instruction ldx #0 with TAX
-Replacing label b1_from_b3 with b1
-Removing instruction b6_from_bbegin:
-Removing instruction b6:
-Removing instruction main_from_b6:
-Removing instruction bend_from_b6:
-Removing instruction b1_from_b3:
+Replacing label b1_from_b2 with b1
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
-Removing instruction b3:
+Removing instruction b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
@@ -1047,7 +1050,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -1134,7 +1137,7 @@ FINAL SYMBOL TABLE
 (byte) YELLOW
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::s
 (byte) main::s#1 reg byte x 16.5
@@ -1150,7 +1153,7 @@ FINAL SYMBOL TABLE
 (byte/word/dword~) position_sprite::$5 reg byte a 4.0
 (byte/signed byte/word/signed word/dword/signed dword~) position_sprite::$6 reg byte a 4.0
 (label) position_sprite::@1
-(label) position_sprite::@3
+(label) position_sprite::@2
 (label) position_sprite::@return
 (byte) position_sprite::spriteno
 (byte) position_sprite::spriteno#0 spriteno zp ZP_BYTE:4 2.375
@@ -1184,11 +1187,11 @@ Score: 559
   .label SPRITES_YPOS = $d001
   .label SPRITES_XMSB = $d010
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @6 [phi:@begin->@6]
-//SEG5 @6
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @6 to main [phi:@6->main]
-//SEG8 [3] phi from @6 to @end [phi:@6->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -1201,9 +1204,9 @@ main: {
     sta xpos+1
   //SEG13 [5] phi (byte) main::s#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#1] -- vbuxx=vbuc1 
     tax
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  //SEG15 [5] phi (word) main::xpos#2 = (word) main::xpos#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  //SEG15 [5] phi (word) main::xpos#2 = (word) main::xpos#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte) main::s#2 = (byte) main::s#1 [phi:main::@2->main::@1#1] -- register_copy 
   //SEG17 main::@1
   b1:
   //SEG18 [6] (byte) position_sprite::spriteno#0 ← (byte) main::s#2 -- vbuz1=vbuxx 
@@ -1211,7 +1214,7 @@ main: {
   //SEG19 [7] (word) position_sprite::x#0 ← (word) main::xpos#2
   //SEG20 [8] call position_sprite 
     jsr position_sprite
-  //SEG21 main::@3
+  //SEG21 main::@2
   //SEG22 [9] (word) main::xpos#1 ← (word) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $a -- vwuz1=vwuz1_plus_vbuc1 
     lda #$a
     clc
@@ -1258,7 +1261,7 @@ position_sprite: {
     beq !+
     bcs b1
   !:
-  //SEG34 position_sprite::@3
+  //SEG34 position_sprite::@2
   //SEG35 [19] (byte/signed byte/word/signed word/dword/signed dword~) position_sprite::$4 ← (byte/signed byte/word/signed word/dword/signed dword) 1 << (byte) position_sprite::spriteno#0 -- vbuaa=vbuc1_rol_vbuz1 
     lda #1
     ldy spriteno
diff --git a/src/test/ref/roll-sprite-msb.sym b/src/test/ref/roll-sprite-msb.sym
index ec632a623..203a2ea1c 100644
--- a/src/test/ref/roll-sprite-msb.sym
+++ b/src/test/ref/roll-sprite-msb.sym
@@ -1,4 +1,4 @@
-(label) @6
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -85,7 +85,7 @@
 (byte) YELLOW
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::s
 (byte) main::s#1 reg byte x 16.5
@@ -101,7 +101,7 @@
 (byte/word/dword~) position_sprite::$5 reg byte a 4.0
 (byte/signed byte/word/signed word/dword/signed dword~) position_sprite::$6 reg byte a 4.0
 (label) position_sprite::@1
-(label) position_sprite::@3
+(label) position_sprite::@2
 (label) position_sprite::@return
 (byte) position_sprite::spriteno
 (byte) position_sprite::spriteno#0 spriteno zp ZP_BYTE:4 2.375
diff --git a/src/test/ref/runtime-unused-procedure.cfg b/src/test/ref/runtime-unused-procedure.cfg
index c67a23180..0f943b72c 100644
--- a/src/test/ref/runtime-unused-procedure.cfg
+++ b/src/test/ref/runtime-unused-procedure.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const byte*) screen#0) ← (byte) 'a'
   to:main::@return
 main::@return: scope:[main]  from main
diff --git a/src/test/ref/runtime-unused-procedure.log b/src/test/ref/runtime-unused-procedure.log
index fe2189b76..2bf0445b6 100644
--- a/src/test/ref/runtime-unused-procedure.log
+++ b/src/test/ref/runtime-unused-procedure.log
@@ -103,21 +103,22 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const byte*) screen#0) ← (byte) 'a'
   to:main::@return
 main::@return: scope:[main]  from main
@@ -144,15 +145,15 @@ INITIAL ASM
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -189,15 +190,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -214,13 +215,13 @@ main: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction breturn:
@@ -232,7 +233,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte) call
@@ -255,10 +256,10 @@ Score: 12
 //SEG2 Global Constants & labels
   .label screen = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
diff --git a/src/test/ref/runtime-unused-procedure.sym b/src/test/ref/runtime-unused-procedure.sym
index 3fbc224e7..ae756164c 100644
--- a/src/test/ref/runtime-unused-procedure.sym
+++ b/src/test/ref/runtime-unused-procedure.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte) call
diff --git a/src/test/ref/scan-desire-problem.asm b/src/test/ref/scan-desire-problem.asm
index 4f3697c6d..6f6e0089d 100644
--- a/src/test/ref/scan-desire-problem.asm
+++ b/src/test/ref/scan-desire-problem.asm
@@ -52,8 +52,8 @@ main: {
     lda x
     cmp #$10
     bcc b1
-  b5:
-    jmp b5
+  b4:
+    jmp b4
 }
 // draw_block(byte register(A) tileno, byte register(Y) x, byte register(X) y)
 draw_block: {
@@ -187,7 +187,7 @@ mul8u: {
     txa
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -195,7 +195,7 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  b8:
+  b4:
     txa
     lsr
     tax
diff --git a/src/test/ref/scan-desire-problem.cfg b/src/test/ref/scan-desire-problem.cfg
index bc465a94d..4740ec347 100644
--- a/src/test/ref/scan-desire-problem.cfg
+++ b/src/test/ref/scan-desire-problem.cfg
@@ -1,39 +1,39 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@21
-@21: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @21
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @21
+main: scope:[main]  from @1
   [4] phi()
   [5] call init 
   to:main::@1
 main::@1: scope:[main]  from main main::@3
   [6] (byte) main::x#4 ← phi( main::@3/(byte) main::x#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@8
-  [7] (byte) main::y#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::y#1 )
+main::@2: scope:[main]  from main::@1 main::@5
+  [7] (byte) main::y#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::y#1 )
   [8] (byte) main::z#0 ← (byte) main::x#4 + (byte) main::y#2
   [9] (byte) main::tile#0 ← *((const byte*) level_address#0 + (byte) main::z#0)
   [10] (byte) draw_block::tileno#0 ← (byte) main::tile#0
   [11] (byte) draw_block::x#0 ← (byte) main::x#4
   [12] (byte) draw_block::y#0 ← (byte) main::y#2
   [13] call draw_block 
-  to:main::@8
-main::@8: scope:[main]  from main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@2
   [14] (byte) main::y#1 ← ++ (byte) main::y#2
   [15] if((byte) main::y#1<(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2
   to:main::@3
-main::@3: scope:[main]  from main::@8
+main::@3: scope:[main]  from main::@5
   [16] (byte) main::x#1 ← ++ (byte) main::x#4
   [17] if((byte) main::x#1<(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@1
-  to:main::@5
-main::@5: scope:[main]  from main::@3 main::@5
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@4
   [18] phi()
-  to:main::@5
+  to:main::@4
 draw_block: scope:[draw_block]  from main::@2
   [19] (byte) draw_block::tileno#1 ← (byte) draw_block::tileno#0 << (byte/signed byte/word/signed word/dword/signed dword) 2
   [20] (byte~) draw_block::$1 ← (byte) draw_block::x#0 << (byte/signed byte/word/signed word/dword/signed dword) 1
@@ -62,10 +62,10 @@ draw_block::@return: scope:[draw_block]  from draw_block::@1
 mul8u: scope:[mul8u]  from draw_block
   [38] phi()
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [39] (word) mul8u::mb#2 ← phi( mul8u/((word))(const byte) mul8u::b#0 mul8u::@8/(word) mul8u::mb#1 )
-  [39] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [39] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [39] (word) mul8u::mb#2 ← phi( mul8u/((word))(const byte) mul8u::b#0 mul8u::@4/(word) mul8u::mb#1 )
+  [39] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [39] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@4/(byte) mul8u::a#0 )
   [40] if((byte) mul8u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -73,13 +73,13 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [42] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [43] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [43] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [44] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [45] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [45] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [46] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [47] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
diff --git a/src/test/ref/scan-desire-problem.log b/src/test/ref/scan-desire-problem.log
index a7855bf64..0512dcb3e 100644
--- a/src/test/ref/scan-desire-problem.log
+++ b/src/test/ref/scan-desire-problem.log
@@ -1227,11 +1227,16 @@ Culled Empty Block (label) main::@9
 Culled Empty Block (label) main::@10
 Culled Empty Block (label) mul8u::@10
 Culled Empty Block (label) fill::@3
+Renumbering block @21 to @1
+Renumbering block mul8u::@6 to mul8u::@3
+Renumbering block mul8u::@8 to mul8u::@4
+Renumbering block main::@5 to main::@4
+Renumbering block main::@8 to main::@5
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @21
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@5
+Adding NOP phi() at start of main::@4
 Adding NOP phi() at start of mul8u
 Adding NOP phi() at start of init
 Adding NOP phi() at start of init::@2
@@ -1241,40 +1246,40 @@ Adding NOP phi() at start of init::toD0181
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@21
-@21: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @21
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @21
+main: scope:[main]  from @1
   [4] phi()
   [5] call init 
   to:main::@1
 main::@1: scope:[main]  from main main::@3
   [6] (byte) main::x#4 ← phi( main::@3/(byte) main::x#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   to:main::@2
-main::@2: scope:[main]  from main::@1 main::@8
-  [7] (byte) main::y#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::y#1 )
+main::@2: scope:[main]  from main::@1 main::@5
+  [7] (byte) main::y#2 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::y#1 )
   [8] (byte) main::z#0 ← (byte) main::x#4 + (byte) main::y#2
   [9] (byte) main::tile#0 ← *((const byte*) level_address#0 + (byte) main::z#0)
   [10] (byte) draw_block::tileno#0 ← (byte) main::tile#0
   [11] (byte) draw_block::x#0 ← (byte) main::x#4
   [12] (byte) draw_block::y#0 ← (byte) main::y#2
   [13] call draw_block 
-  to:main::@8
-main::@8: scope:[main]  from main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@2
   [14] (byte) main::y#1 ← ++ (byte) main::y#2
   [15] if((byte) main::y#1<(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2
   to:main::@3
-main::@3: scope:[main]  from main::@8
+main::@3: scope:[main]  from main::@5
   [16] (byte) main::x#1 ← ++ (byte) main::x#4
   [17] if((byte) main::x#1<(byte/signed byte/word/signed word/dword/signed dword) $10) goto main::@1
-  to:main::@5
-main::@5: scope:[main]  from main::@3 main::@5
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@4
   [18] phi()
-  to:main::@5
+  to:main::@4
 draw_block: scope:[draw_block]  from main::@2
   [19] (byte) draw_block::tileno#1 ← (byte) draw_block::tileno#0 << (byte/signed byte/word/signed word/dword/signed dword) 2
   [20] (byte~) draw_block::$1 ← (byte) draw_block::x#0 << (byte/signed byte/word/signed word/dword/signed dword) 1
@@ -1303,10 +1308,10 @@ draw_block::@return: scope:[draw_block]  from draw_block::@1
 mul8u: scope:[mul8u]  from draw_block
   [38] phi()
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [39] (word) mul8u::mb#2 ← phi( mul8u/((word))(const byte) mul8u::b#0 mul8u::@8/(word) mul8u::mb#1 )
-  [39] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [39] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [39] (word) mul8u::mb#2 ← phi( mul8u/((word))(const byte) mul8u::b#0 mul8u::@4/(word) mul8u::mb#1 )
+  [39] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [39] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@4/(byte) mul8u::a#0 )
   [40] if((byte) mul8u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -1314,13 +1319,13 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [42] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [43] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [43] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [44] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [45] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [45] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [46] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [47] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
@@ -1713,17 +1718,17 @@ INITIAL ASM
   .label level_address = $3000
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-b21_from_bbegin:
-  jmp b21
-//SEG5 @21
-b21:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-main_from_b21:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
-bend_from_b21:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1755,9 +1760,9 @@ main: {
     lda #0
     sta y
     jmp b2
-  //SEG20 [7] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
-  b2_from_b8:
-  //SEG21 [7] phi (byte) main::y#2 = (byte) main::y#1 [phi:main::@8->main::@2#0] -- register_copy 
+  //SEG20 [7] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
+  b2_from_b5:
+  //SEG21 [7] phi (byte) main::y#2 = (byte) main::y#1 [phi:main::@5->main::@2#0] -- register_copy 
     jmp b2
   //SEG22 main::@2
   b2:
@@ -1781,15 +1786,15 @@ main: {
     sta draw_block.y
   //SEG28 [13] call draw_block 
     jsr draw_block
-    jmp b8
-  //SEG29 main::@8
-  b8:
+    jmp b5
+  //SEG29 main::@5
+  b5:
   //SEG30 [14] (byte) main::y#1 ← ++ (byte) main::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG31 [15] if((byte) main::y#1<(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2 -- vbuz1_lt_vbuc1_then_la1 
     lda y
     cmp #9
-    bcc b2_from_b8
+    bcc b2_from_b5
     jmp b3
   //SEG32 main::@3
   b3:
@@ -1799,13 +1804,13 @@ main: {
     lda x
     cmp #$10
     bcc b1_from_b3
-  //SEG35 [18] phi from main::@3 main::@5 to main::@5 [phi:main::@3/main::@5->main::@5]
-  b5_from_b3:
-  b5_from_b5:
-    jmp b5
-  //SEG36 main::@5
-  b5:
-    jmp b5_from_b5
+  //SEG35 [18] phi from main::@3 main::@4 to main::@4 [phi:main::@3/main::@4->main::@4]
+  b4_from_b3:
+  b4_from_b4:
+    jmp b4
+  //SEG36 main::@4
+  b4:
+    jmp b4_from_b4
 }
 //SEG37 draw_block
 // draw_block(byte zeropage($e) tileno, byte zeropage($f) x, byte zeropage($10) y)
@@ -2008,13 +2013,13 @@ mul8u: {
     lda #1
     and a
     sta _1
-  //SEG71 [43] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG71 [43] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG72 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG72 mul8u::@3
+  b3:
   //SEG73 [44] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -2023,23 +2028,23 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG74 [45] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG75 [45] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG76 mul8u::@8
-  b8:
+  //SEG74 [45] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG75 [45] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG76 mul8u::@4
+  b4:
   //SEG77 [46] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr a
   //SEG78 [47] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG79 [39] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG80 [39] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG81 [39] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG82 [39] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG79 [39] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG80 [39] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG81 [39] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG82 [39] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG83 init
@@ -2359,17 +2364,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label level_address = $3000
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-b21_from_bbegin:
-  jmp b21
-//SEG5 @21
-b21:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-main_from_b21:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
-bend_from_b21:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -2399,9 +2404,9 @@ main: {
     lda #0
     sta y
     jmp b2
-  //SEG20 [7] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
-  b2_from_b8:
-  //SEG21 [7] phi (byte) main::y#2 = (byte) main::y#1 [phi:main::@8->main::@2#0] -- register_copy 
+  //SEG20 [7] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
+  b2_from_b5:
+  //SEG21 [7] phi (byte) main::y#2 = (byte) main::y#1 [phi:main::@5->main::@2#0] -- register_copy 
     jmp b2
   //SEG22 main::@2
   b2:
@@ -2419,15 +2424,15 @@ main: {
     ldx y
   //SEG28 [13] call draw_block 
     jsr draw_block
-    jmp b8
-  //SEG29 main::@8
-  b8:
+    jmp b5
+  //SEG29 main::@5
+  b5:
   //SEG30 [14] (byte) main::y#1 ← ++ (byte) main::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG31 [15] if((byte) main::y#1<(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2 -- vbuz1_lt_vbuc1_then_la1 
     lda y
     cmp #9
-    bcc b2_from_b8
+    bcc b2_from_b5
     jmp b3
   //SEG32 main::@3
   b3:
@@ -2437,13 +2442,13 @@ main: {
     lda x
     cmp #$10
     bcc b1_from_b3
-  //SEG35 [18] phi from main::@3 main::@5 to main::@5 [phi:main::@3/main::@5->main::@5]
-  b5_from_b3:
-  b5_from_b5:
-    jmp b5
-  //SEG36 main::@5
-  b5:
-    jmp b5_from_b5
+  //SEG35 [18] phi from main::@3 main::@4 to main::@4 [phi:main::@3/main::@4->main::@4]
+  b4_from_b3:
+  b4_from_b4:
+    jmp b4
+  //SEG36 main::@4
+  b4:
+    jmp b4_from_b4
 }
 //SEG37 draw_block
 // draw_block(byte register(A) tileno, byte register(Y) x, byte register(X) y)
@@ -2621,12 +2626,12 @@ mul8u: {
   //SEG70 [42] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG71 [43] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG71 [43] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG72 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG72 mul8u::@3
+  b3:
   //SEG73 [44] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -2635,13 +2640,13 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG74 [45] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG75 [45] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG76 mul8u::@8
-  b8:
+  //SEG74 [45] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG75 [45] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG76 mul8u::@4
+  b4:
   //SEG77 [46] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -2649,11 +2654,11 @@ mul8u: {
   //SEG78 [47] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG79 [39] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG80 [39] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG81 [39] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG82 [39] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG79 [39] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG80 [39] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG81 [39] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG82 [39] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG83 init
@@ -2800,19 +2805,19 @@ init_sprites: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b21
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b8
-Removing instruction jmp b3
 Removing instruction jmp b5
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp toD0181
@@ -2828,23 +2833,23 @@ Removing instruction lda #BLACK
 Removing instruction lda #0
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b2_from_b8 with b2
+Replacing label b2_from_b5 with b2
 Replacing label b1_from_b3 with b1
-Replacing label b5_from_b5 with b5
-Replacing label b8_from_b2 with b8
+Replacing label b4_from_b4 with b4
+Replacing label b4_from_b2 with b4
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b21_from_bbegin:
-Removing instruction b21:
-Removing instruction main_from_b21:
-Removing instruction bend_from_b21:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
-Removing instruction b2_from_b8:
-Removing instruction b5_from_b3:
-Removing instruction b5_from_b5:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
+Removing instruction b2_from_b5:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b4:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction b2_from_init:
 Removing instruction fill_from_b2:
 Removing instruction b3_from_b2:
@@ -2857,15 +2862,15 @@ Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction init_from_main:
 Removing instruction b1_from_main:
-Removing instruction b8:
+Removing instruction b5:
 Removing instruction b3:
 Removing instruction mul8u_from_draw_block:
 Removing instruction b1:
 Removing instruction breturn:
 Removing instruction b1_from_mul8u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
+Removing instruction b3:
+Removing instruction b1_from_b4:
 Removing instruction b2:
 Removing instruction b3:
 Removing instruction b1:
@@ -2883,7 +2888,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @21
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -3123,8 +3128,8 @@ FINAL SYMBOL TABLE
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@8
 (byte) main::tile
 (byte) main::tile#0 reg byte a 202.0
 (byte) main::x
@@ -3139,8 +3144,8 @@ FINAL SYMBOL TABLE
 (byte~) mul8u::$1 reg byte a 2002.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 1001.0
@@ -3216,11 +3221,11 @@ Score: 73438
   .label colors = $d800
   .label level_address = $3000
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-//SEG5 @21
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -3241,8 +3246,8 @@ main: {
   //SEG19 [7] phi (byte) main::y#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@1->main::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta y
-  //SEG20 [7] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
-  //SEG21 [7] phi (byte) main::y#2 = (byte) main::y#1 [phi:main::@8->main::@2#0] -- register_copy 
+  //SEG20 [7] phi from main::@5 to main::@2 [phi:main::@5->main::@2]
+  //SEG21 [7] phi (byte) main::y#2 = (byte) main::y#1 [phi:main::@5->main::@2#0] -- register_copy 
   //SEG22 main::@2
   b2:
   //SEG23 [8] (byte) main::z#0 ← (byte) main::x#4 + (byte) main::y#2 -- vbuaa=vbuz1_plus_vbuz2 
@@ -3259,7 +3264,7 @@ main: {
     ldx y
   //SEG28 [13] call draw_block 
     jsr draw_block
-  //SEG29 main::@8
+  //SEG29 main::@5
   //SEG30 [14] (byte) main::y#1 ← ++ (byte) main::y#2 -- vbuz1=_inc_vbuz1 
     inc y
   //SEG31 [15] if((byte) main::y#1<(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@2 -- vbuz1_lt_vbuc1_then_la1 
@@ -3273,10 +3278,10 @@ main: {
     lda x
     cmp #$10
     bcc b1
-  //SEG35 [18] phi from main::@3 main::@5 to main::@5 [phi:main::@3/main::@5->main::@5]
-  //SEG36 main::@5
-  b5:
-    jmp b5
+  //SEG35 [18] phi from main::@3 main::@4 to main::@4 [phi:main::@3/main::@4->main::@4]
+  //SEG36 main::@4
+  b4:
+    jmp b4
 }
 //SEG37 draw_block
 // draw_block(byte register(A) tileno, byte register(Y) x, byte register(X) y)
@@ -3443,10 +3448,10 @@ mul8u: {
   //SEG70 [42] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG71 [43] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG71 [43] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG72 mul8u::@6
+    beq b4
+  //SEG72 mul8u::@3
   //SEG73 [44] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -3455,10 +3460,10 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG74 [45] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  //SEG75 [45] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-  //SEG76 mul8u::@8
-  b8:
+  //SEG74 [45] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  //SEG75 [45] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+  //SEG76 mul8u::@4
+  b4:
   //SEG77 [46] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -3466,10 +3471,10 @@ mul8u: {
   //SEG78 [47] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG79 [39] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  //SEG80 [39] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG81 [39] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG82 [39] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG79 [39] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  //SEG80 [39] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG81 [39] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG82 [39] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG83 init
diff --git a/src/test/ref/scan-desire-problem.sym b/src/test/ref/scan-desire-problem.sym
index 73706767e..00891e2ed 100644
--- a/src/test/ref/scan-desire-problem.sym
+++ b/src/test/ref/scan-desire-problem.sym
@@ -1,4 +1,4 @@
-(label) @21
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -238,8 +238,8 @@
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@8
 (byte) main::tile
 (byte) main::tile#0 reg byte a 202.0
 (byte) main::x
@@ -254,8 +254,8 @@
 (byte~) mul8u::$1 reg byte a 2002.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 1001.0
diff --git a/src/test/ref/scrollbig-clobber.cfg b/src/test/ref/scrollbig-clobber.cfg
index 481723782..0463fb39f 100644
--- a/src/test/ref/scrollbig-clobber.cfg
+++ b/src/test/ref/scrollbig-clobber.cfg
@@ -1,28 +1,28 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
-  [5] (byte*) nxt#13 ← phi( main/(const byte*) TEXT#0 main::@3/(byte*) nxt#11 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#1 )
+  [5] (byte*) nxt#13 ← phi( main/(const byte*) TEXT#0 main::@2/(byte*) nxt#11 )
   [6] call next_char 
   [7] (byte) next_char::return#0 ← (byte) next_char::return#1
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] (byte~) main::$0 ← (byte) next_char::return#0
   [9] *((const byte*) main::SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0
   [10] (byte) main::i#1 ← ++ (byte) main::i#2
   [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [12] return 
   to:@return
 next_char: scope:[next_char]  from main::@1
diff --git a/src/test/ref/scrollbig-clobber.log b/src/test/ref/scrollbig-clobber.log
index 5f8b4a3a5..a5b071a5d 100644
--- a/src/test/ref/scrollbig-clobber.log
+++ b/src/test/ref/scrollbig-clobber.log
@@ -179,37 +179,39 @@ Coalesced [23] next_char::return#5 ← next_char::c#0
 Coalesced down to 3 phi equivalence classes
 Culled Empty Block (label) main::@4
 Culled Empty Block (label) next_char::@4
+Renumbering block @2 to @1
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
-  [5] (byte*) nxt#13 ← phi( main/(const byte*) TEXT#0 main::@3/(byte*) nxt#11 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#1 )
+  [5] (byte*) nxt#13 ← phi( main/(const byte*) TEXT#0 main::@2/(byte*) nxt#11 )
   [6] call next_char 
   [7] (byte) next_char::return#0 ← (byte) next_char::return#1
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] (byte~) main::$0 ← (byte) next_char::return#0
   [9] *((const byte*) main::SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0
   [10] (byte) main::i#1 ← ++ (byte) main::i#2
   [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [12] return 
   to:@return
 next_char: scope:[next_char]  from main::@1
@@ -278,17 +280,17 @@ INITIAL ASM
   .label nxt = 3
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -308,10 +310,10 @@ main: {
     lda #>TEXT
     sta nxt+1
     jmp b1
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte*) nxt#13 = (byte*) nxt#11 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte*) nxt#13 = (byte*) nxt#11 [phi:main::@2->main::@1#1] -- register_copy 
     jmp b1
   //SEG17 main::@1
   b1:
@@ -320,9 +322,9 @@ main: {
   //SEG19 [7] (byte) next_char::return#0 ← (byte) next_char::return#1 -- vbuz1=vbuz2 
     lda next_char.return_1
     sta next_char.return
-    jmp b3
-  //SEG20 main::@3
-  b3:
+    jmp b2
+  //SEG20 main::@2
+  b2:
   //SEG21 [8] (byte~) main::$0 ← (byte) next_char::return#0 -- vbuz1=vbuz2 
     lda next_char.return
     sta _0
@@ -335,7 +337,7 @@ main: {
   //SEG24 [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuz1_neq_0_then_la1 
     lda i
     cmp #0
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG25 main::@return
   breturn:
@@ -423,17 +425,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label nxt = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -450,10 +452,10 @@ main: {
     lda #>TEXT
     sta nxt+1
     jmp b1
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte*) nxt#13 = (byte*) nxt#11 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte*) nxt#13 = (byte*) nxt#11 [phi:main::@2->main::@1#1] -- register_copy 
     jmp b1
   //SEG17 main::@1
   b1:
@@ -461,9 +463,9 @@ main: {
     jsr next_char
   //SEG19 [7] (byte) next_char::return#0 ← (byte) next_char::return#1 -- vbuaa=vbuyy 
     tya
-    jmp b3
-  //SEG20 main::@3
-  b3:
+    jmp b2
+  //SEG20 main::@2
+  b2:
   //SEG21 [8] (byte~) main::$0 ← (byte) next_char::return#0
   //SEG22 [9] *((const byte*) main::SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0 -- pbuc1_derefidx_vbuxx=vbuaa 
     sta SCREEN,x
@@ -471,7 +473,7 @@ main: {
     inx
   //SEG24 [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@1 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG25 main::@return
   breturn:
@@ -523,27 +525,27 @@ next_char: {
   TEXT: .text "cml @"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1_from_b3 with b1
+Replacing label b1_from_b2 with b1
 Replacing label b1_from_next_char with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
-Removing instruction b1_from_b3:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b2:
 Removing instruction b1_from_next_char:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction b2:
 Removing instruction b1_from_b2:
@@ -559,7 +561,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) TEXT
@@ -567,7 +569,7 @@ FINAL SYMBOL TABLE
 (void()) main()
 (byte~) main::$0 reg byte a 22.0
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte*) main::SCREEN
 (const byte*) main::SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
@@ -608,11 +610,11 @@ Score: 366
 //SEG2 Global Constants & labels
   .label nxt = 2
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -625,16 +627,16 @@ main: {
     sta nxt
     lda #>TEXT
     sta nxt+1
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte*) nxt#13 = (byte*) nxt#11 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte*) nxt#13 = (byte*) nxt#11 [phi:main::@2->main::@1#1] -- register_copy 
   //SEG17 main::@1
   b1:
   //SEG18 [6] call next_char 
     jsr next_char
   //SEG19 [7] (byte) next_char::return#0 ← (byte) next_char::return#1 -- vbuaa=vbuyy 
     tya
-  //SEG20 main::@3
+  //SEG20 main::@2
   //SEG21 [8] (byte~) main::$0 ← (byte) next_char::return#0
   //SEG22 [9] *((const byte*) main::SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0 -- pbuc1_derefidx_vbuxx=vbuaa 
     sta SCREEN,x
diff --git a/src/test/ref/scrollbig-clobber.sym b/src/test/ref/scrollbig-clobber.sym
index 23569856c..3e7b6d4f8 100644
--- a/src/test/ref/scrollbig-clobber.sym
+++ b/src/test/ref/scrollbig-clobber.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) TEXT
@@ -6,7 +6,7 @@
 (void()) main()
 (byte~) main::$0 reg byte a 22.0
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte*) main::SCREEN
 (const byte*) main::SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
diff --git a/src/test/ref/signed-indexed-subtract.asm b/src/test/ref/signed-indexed-subtract.asm
index 54dd8f40c..83da425fc 100644
--- a/src/test/ref/signed-indexed-subtract.asm
+++ b/src/test/ref/signed-indexed-subtract.asm
@@ -41,9 +41,9 @@ main: {
     jsr print_ln
     inx
     cpx #9
-    bne b12
+    bne b9
     rts
-  b12:
+  b9:
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
diff --git a/src/test/ref/signed-indexed-subtract.cfg b/src/test/ref/signed-indexed-subtract.cfg
index 4912f339d..6361e5e58 100644
--- a/src/test/ref/signed-indexed-subtract.cfg
+++ b/src/test/ref/signed-indexed-subtract.cfg
@@ -1,60 +1,60 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@21
-@21: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @21
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @21
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@7
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@6
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::i#1 )
   [6] (byte) main::idx#0 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [7] (byte) sub::idx#0 ← (byte) main::idx#0
   [8] call sub 
-  to:main::@5
-main::@5: scope:[main]  from main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@1
   [9] (byte) sub::idx#1 ← (byte) main::idx#0
   [10] call sub 
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [11] (byte) sub::idx#2 ← (byte) main::idx#0
   [12] call sub 
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [13] (byte) main::i#1 ← ++ (byte) main::i#2
   [14] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main::@7
+main::@2: scope:[main]  from main::@6
   [15] phi()
   [16] call print_cls 
   to:main::@3
-main::@3: scope:[main]  from main::@12 main::@2
-  [17] (byte*) print_line_cursor#19 ← phi( main::@12/(byte*) print_line_cursor#1 main::@2/((byte*))(word/signed word/dword/signed dword) $400 )
-  [17] (byte*) print_char_cursor#46 ← phi( main::@12/(byte*~) print_char_cursor#56 main::@2/((byte*))(word/signed word/dword/signed dword) $400 )
-  [17] (byte) main::j#2 ← phi( main::@12/(byte) main::j#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+main::@3: scope:[main]  from main::@2 main::@9
+  [17] (byte*) print_line_cursor#19 ← phi( main::@9/(byte*) print_line_cursor#1 main::@2/((byte*))(word/signed word/dword/signed dword) $400 )
+  [17] (byte*) print_char_cursor#46 ← phi( main::@9/(byte*~) print_char_cursor#56 main::@2/((byte*))(word/signed word/dword/signed dword) $400 )
+  [17] (byte) main::j#2 ← phi( main::@9/(byte) main::j#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [18] (byte~) main::$6 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [19] (signed word) print_sword::w#1 ← *((const signed word[]) words#0 + (byte~) main::$6)
   [20] call print_sword 
-  to:main::@9
-main::@9: scope:[main]  from main::@3
+  to:main::@7
+main::@7: scope:[main]  from main::@3
   [21] phi()
   [22] call print_ln 
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [23] (byte) main::j#1 ← ++ (byte) main::j#2
-  [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@12
+  [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@9
   to:main::@return
-main::@return: scope:[main]  from main::@10
+main::@return: scope:[main]  from main::@8
   [25] return 
   to:@return
-main::@12: scope:[main]  from main::@10
+main::@9: scope:[main]  from main::@8
   [26] (byte*~) print_char_cursor#56 ← (byte*) print_line_cursor#1
   to:main::@3
-print_ln: scope:[print_ln]  from main::@9
+print_ln: scope:[print_ln]  from main::@7
   [27] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -71,13 +71,13 @@ print_sword: scope:[print_sword]  from main::@3
 print_sword::@2: scope:[print_sword]  from print_sword
   [33] phi()
   [34] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [35] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [36] (byte*) print_char_cursor#41 ← phi( print_sword/(byte*) print_char_cursor#46 print_sword::@4/(byte*) print_char_cursor#12 )
-  [36] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [36] (byte*) print_char_cursor#41 ← phi( print_sword/(byte*) print_char_cursor#46 print_sword::@3/(byte*) print_char_cursor#12 )
+  [36] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@3/(signed word) print_sword::w#0 )
   [37] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
@@ -130,9 +130,9 @@ print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
 print_cls::@return: scope:[print_cls]  from print_cls::@1
   [61] return 
   to:@return
-sub: scope:[sub]  from main::@1 main::@5 main::@6
-  [62] (byte) sub::s#3 ← phi( main::@1/(byte/word/signed word/dword/signed dword) $80 main::@5/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@6/(byte/signed byte/word/signed word/dword/signed dword) $40 )
-  [62] (byte) sub::idx#3 ← phi( main::@1/(byte) sub::idx#0 main::@5/(byte) sub::idx#1 main::@6/(byte) sub::idx#2 )
+sub: scope:[sub]  from main::@1 main::@4 main::@5
+  [62] (byte) sub::s#3 ← phi( main::@1/(byte/word/signed word/dword/signed dword) $80 main::@4/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@5/(byte/signed byte/word/signed word/dword/signed dword) $40 )
+  [62] (byte) sub::idx#3 ← phi( main::@1/(byte) sub::idx#0 main::@4/(byte) sub::idx#1 main::@5/(byte) sub::idx#2 )
   [63] *((const signed word[]) words#0 + (byte) sub::idx#3) ← *((const signed word[]) words#0 + (byte) sub::idx#3) - (byte) sub::s#3
   to:sub::@return
 sub::@return: scope:[sub]  from sub
diff --git a/src/test/ref/signed-indexed-subtract.log b/src/test/ref/signed-indexed-subtract.log
index 664a2bf37..10ae42b1e 100644
--- a/src/test/ref/signed-indexed-subtract.log
+++ b/src/test/ref/signed-indexed-subtract.log
@@ -680,12 +680,20 @@ Culled Empty Block (label) main::@11
 Culled Empty Block (label) print_ln::@3
 Culled Empty Block (label) print_sword::@5
 Culled Empty Block (label) print_cls::@3
+Renumbering block @21 to @1
+Renumbering block print_sword::@4 to print_sword::@3
+Renumbering block main::@5 to main::@4
+Renumbering block main::@6 to main::@5
+Renumbering block main::@7 to main::@6
+Renumbering block main::@9 to main::@7
+Renumbering block main::@10 to main::@8
+Renumbering block main::@12 to main::@9
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @21
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@2
-Adding NOP phi() at start of main::@9
+Adding NOP phi() at start of main::@7
 Adding NOP phi() at start of print_ln
 Adding NOP phi() at start of print_sword::@2
 Adding NOP phi() at start of print_cls
@@ -693,61 +701,61 @@ Adding NOP phi() at start of print_cls
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@21
-@21: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @21
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @21
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@7
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@6
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::i#1 )
   [6] (byte) main::idx#0 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [7] (byte) sub::idx#0 ← (byte) main::idx#0
   [8] call sub 
-  to:main::@5
-main::@5: scope:[main]  from main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@1
   [9] (byte) sub::idx#1 ← (byte) main::idx#0
   [10] call sub 
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [11] (byte) sub::idx#2 ← (byte) main::idx#0
   [12] call sub 
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [13] (byte) main::i#1 ← ++ (byte) main::i#2
   [14] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main::@7
+main::@2: scope:[main]  from main::@6
   [15] phi()
   [16] call print_cls 
   to:main::@3
-main::@3: scope:[main]  from main::@12 main::@2
-  [17] (byte*) print_line_cursor#19 ← phi( main::@12/(byte*) print_line_cursor#1 main::@2/((byte*))(word/signed word/dword/signed dword) $400 )
-  [17] (byte*) print_char_cursor#46 ← phi( main::@12/(byte*~) print_char_cursor#56 main::@2/((byte*))(word/signed word/dword/signed dword) $400 )
-  [17] (byte) main::j#2 ← phi( main::@12/(byte) main::j#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+main::@3: scope:[main]  from main::@2 main::@9
+  [17] (byte*) print_line_cursor#19 ← phi( main::@9/(byte*) print_line_cursor#1 main::@2/((byte*))(word/signed word/dword/signed dword) $400 )
+  [17] (byte*) print_char_cursor#46 ← phi( main::@9/(byte*~) print_char_cursor#56 main::@2/((byte*))(word/signed word/dword/signed dword) $400 )
+  [17] (byte) main::j#2 ← phi( main::@9/(byte) main::j#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [18] (byte~) main::$6 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [19] (signed word) print_sword::w#1 ← *((const signed word[]) words#0 + (byte~) main::$6)
   [20] call print_sword 
-  to:main::@9
-main::@9: scope:[main]  from main::@3
+  to:main::@7
+main::@7: scope:[main]  from main::@3
   [21] phi()
   [22] call print_ln 
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [23] (byte) main::j#1 ← ++ (byte) main::j#2
-  [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@12
+  [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@9
   to:main::@return
-main::@return: scope:[main]  from main::@10
+main::@return: scope:[main]  from main::@8
   [25] return 
   to:@return
-main::@12: scope:[main]  from main::@10
+main::@9: scope:[main]  from main::@8
   [26] (byte*~) print_char_cursor#56 ← (byte*) print_line_cursor#1
   to:main::@3
-print_ln: scope:[print_ln]  from main::@9
+print_ln: scope:[print_ln]  from main::@7
   [27] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -764,13 +772,13 @@ print_sword: scope:[print_sword]  from main::@3
 print_sword::@2: scope:[print_sword]  from print_sword
   [33] phi()
   [34] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [35] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [36] (byte*) print_char_cursor#41 ← phi( print_sword/(byte*) print_char_cursor#46 print_sword::@4/(byte*) print_char_cursor#12 )
-  [36] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [36] (byte*) print_char_cursor#41 ← phi( print_sword/(byte*) print_char_cursor#46 print_sword::@3/(byte*) print_char_cursor#12 )
+  [36] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@3/(signed word) print_sword::w#0 )
   [37] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
@@ -823,9 +831,9 @@ print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
 print_cls::@return: scope:[print_cls]  from print_cls::@1
   [61] return 
   to:@return
-sub: scope:[sub]  from main::@1 main::@5 main::@6
-  [62] (byte) sub::s#3 ← phi( main::@1/(byte/word/signed word/dword/signed dword) $80 main::@5/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@6/(byte/signed byte/word/signed word/dword/signed dword) $40 )
-  [62] (byte) sub::idx#3 ← phi( main::@1/(byte) sub::idx#0 main::@5/(byte) sub::idx#1 main::@6/(byte) sub::idx#2 )
+sub: scope:[sub]  from main::@1 main::@4 main::@5
+  [62] (byte) sub::s#3 ← phi( main::@1/(byte/word/signed word/dword/signed dword) $80 main::@4/(byte/signed byte/word/signed word/dword/signed dword) $40 main::@5/(byte/signed byte/word/signed word/dword/signed dword) $40 )
+  [62] (byte) sub::idx#3 ← phi( main::@1/(byte) sub::idx#0 main::@4/(byte) sub::idx#1 main::@5/(byte) sub::idx#2 )
   [63] *((const signed word[]) words#0 + (byte) sub::idx#3) ← *((const signed word[]) words#0 + (byte) sub::idx#3) - (byte) sub::s#3
   to:sub::@return
 sub::@return: scope:[sub]  from sub
@@ -948,17 +956,17 @@ INITIAL ASM
   .label print_char_cursor = $a
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-b21_from_bbegin:
-  jmp b21
-//SEG5 @21
-b21:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-main_from_b21:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
-bend_from_b21:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -974,9 +982,9 @@ main: {
     lda #0
     sta i
     jmp b1
-  //SEG13 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -995,45 +1003,45 @@ main: {
     sta sub.s
   //SEG21 [62] phi (byte) sub::idx#3 = (byte) sub::idx#0 [phi:main::@1->sub#1] -- register_copy 
     jsr sub
-    jmp b5
-  //SEG22 main::@5
-  b5:
+    jmp b4
+  //SEG22 main::@4
+  b4:
   //SEG23 [9] (byte) sub::idx#1 ← (byte) main::idx#0 -- vbuz1=vbuz2 
     lda idx
     sta sub.idx
   //SEG24 [10] call sub 
-  //SEG25 [62] phi from main::@5 to sub [phi:main::@5->sub]
-  sub_from_b5:
-  //SEG26 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@5->sub#0] -- vbuz1=vbuc1 
+  //SEG25 [62] phi from main::@4 to sub [phi:main::@4->sub]
+  sub_from_b4:
+  //SEG26 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@4->sub#0] -- vbuz1=vbuc1 
     lda #$40
     sta sub.s
-  //SEG27 [62] phi (byte) sub::idx#3 = (byte) sub::idx#1 [phi:main::@5->sub#1] -- register_copy 
+  //SEG27 [62] phi (byte) sub::idx#3 = (byte) sub::idx#1 [phi:main::@4->sub#1] -- register_copy 
     jsr sub
-    jmp b6
-  //SEG28 main::@6
-  b6:
+    jmp b5
+  //SEG28 main::@5
+  b5:
   //SEG29 [11] (byte) sub::idx#2 ← (byte) main::idx#0 -- vbuz1=vbuz2 
     lda idx
     sta sub.idx
   //SEG30 [12] call sub 
-  //SEG31 [62] phi from main::@6 to sub [phi:main::@6->sub]
-  sub_from_b6:
-  //SEG32 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@6->sub#0] -- vbuz1=vbuc1 
+  //SEG31 [62] phi from main::@5 to sub [phi:main::@5->sub]
+  sub_from_b5:
+  //SEG32 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@5->sub#0] -- vbuz1=vbuc1 
     lda #$40
     sta sub.s
-  //SEG33 [62] phi (byte) sub::idx#3 = (byte) sub::idx#2 [phi:main::@6->sub#1] -- register_copy 
+  //SEG33 [62] phi (byte) sub::idx#3 = (byte) sub::idx#2 [phi:main::@5->sub#1] -- register_copy 
     jsr sub
-    jmp b7
-  //SEG34 main::@7
-  b7:
+    jmp b6
+  //SEG34 main::@6
+  b6:
   //SEG35 [13] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG36 [14] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp i
-    bne b1_from_b7
-  //SEG37 [15] phi from main::@7 to main::@2 [phi:main::@7->main::@2]
-  b2_from_b7:
+    bne b1_from_b6
+  //SEG37 [15] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
+  b2_from_b6:
     jmp b2
   //SEG38 main::@2
   b2:
@@ -1071,41 +1079,41 @@ main: {
     sta print_sword.w+1
   //SEG48 [20] call print_sword 
     jsr print_sword
-  //SEG49 [21] phi from main::@3 to main::@9 [phi:main::@3->main::@9]
-  b9_from_b3:
-    jmp b9
-  //SEG50 main::@9
-  b9:
+  //SEG49 [21] phi from main::@3 to main::@7 [phi:main::@3->main::@7]
+  b7_from_b3:
+    jmp b7
+  //SEG50 main::@7
+  b7:
   //SEG51 [22] call print_ln 
-  //SEG52 [27] phi from main::@9 to print_ln [phi:main::@9->print_ln]
-  print_ln_from_b9:
+  //SEG52 [27] phi from main::@7 to print_ln [phi:main::@7->print_ln]
+  print_ln_from_b7:
     jsr print_ln
-    jmp b10
-  //SEG53 main::@10
-  b10:
+    jmp b8
+  //SEG53 main::@8
+  b8:
   //SEG54 [23] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG55 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@12 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG55 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@9 -- vbuz1_neq_vbuc1_then_la1 
     lda #9
     cmp j
-    bne b12
+    bne b9
     jmp breturn
   //SEG56 main::@return
   breturn:
   //SEG57 [25] return 
     rts
-  //SEG58 main::@12
-  b12:
+  //SEG58 main::@9
+  b9:
   //SEG59 [26] (byte*~) print_char_cursor#56 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG60 [17] phi from main::@12 to main::@3 [phi:main::@12->main::@3]
-  b3_from_b12:
-  //SEG61 [17] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@12->main::@3#0] -- register_copy 
-  //SEG62 [17] phi (byte*) print_char_cursor#46 = (byte*~) print_char_cursor#56 [phi:main::@12->main::@3#1] -- register_copy 
-  //SEG63 [17] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@12->main::@3#2] -- register_copy 
+  //SEG60 [17] phi from main::@9 to main::@3 [phi:main::@9->main::@3]
+  b3_from_b9:
+  //SEG61 [17] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@9->main::@3#0] -- register_copy 
+  //SEG62 [17] phi (byte*) print_char_cursor#46 = (byte*~) print_char_cursor#56 [phi:main::@9->main::@3#1] -- register_copy 
+  //SEG63 [17] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@9->main::@3#2] -- register_copy 
     jmp b3
 }
 //SEG64 print_ln
@@ -1162,9 +1170,9 @@ print_sword: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b4
-  //SEG80 print_sword::@4
-  b4:
+    jmp b3
+  //SEG80 print_sword::@3
+  b3:
   //SEG81 [35] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -1175,11 +1183,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG82 [36] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG82 [36] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG83 [36] phi (byte*) print_char_cursor#41 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG84 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG83 [36] phi (byte*) print_char_cursor#41 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG84 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG85 print_sword::@1
   b1:
@@ -1445,17 +1453,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_char_cursor = 7
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-b21_from_bbegin:
-  jmp b21
-//SEG5 @21
-b21:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-main_from_b21:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
-bend_from_b21:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1466,9 +1474,9 @@ main: {
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuyy=vbuc1 
     ldy #0
     jmp b1
-  //SEG13 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -1484,38 +1492,38 @@ main: {
     lda #$80
   //SEG21 [62] phi (byte) sub::idx#3 = (byte) sub::idx#0 [phi:main::@1->sub#1] -- register_copy 
     jsr sub
-    jmp b5
-  //SEG22 main::@5
-  b5:
+    jmp b4
+  //SEG22 main::@4
+  b4:
   //SEG23 [9] (byte) sub::idx#1 ← (byte) main::idx#0
   //SEG24 [10] call sub 
-  //SEG25 [62] phi from main::@5 to sub [phi:main::@5->sub]
-  sub_from_b5:
-  //SEG26 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@5->sub#0] -- vbuaa=vbuc1 
+  //SEG25 [62] phi from main::@4 to sub [phi:main::@4->sub]
+  sub_from_b4:
+  //SEG26 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@4->sub#0] -- vbuaa=vbuc1 
     lda #$40
-  //SEG27 [62] phi (byte) sub::idx#3 = (byte) sub::idx#1 [phi:main::@5->sub#1] -- register_copy 
+  //SEG27 [62] phi (byte) sub::idx#3 = (byte) sub::idx#1 [phi:main::@4->sub#1] -- register_copy 
     jsr sub
-    jmp b6
-  //SEG28 main::@6
-  b6:
+    jmp b5
+  //SEG28 main::@5
+  b5:
   //SEG29 [11] (byte) sub::idx#2 ← (byte) main::idx#0
   //SEG30 [12] call sub 
-  //SEG31 [62] phi from main::@6 to sub [phi:main::@6->sub]
-  sub_from_b6:
-  //SEG32 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@6->sub#0] -- vbuaa=vbuc1 
+  //SEG31 [62] phi from main::@5 to sub [phi:main::@5->sub]
+  sub_from_b5:
+  //SEG32 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@5->sub#0] -- vbuaa=vbuc1 
     lda #$40
-  //SEG33 [62] phi (byte) sub::idx#3 = (byte) sub::idx#2 [phi:main::@6->sub#1] -- register_copy 
+  //SEG33 [62] phi (byte) sub::idx#3 = (byte) sub::idx#2 [phi:main::@5->sub#1] -- register_copy 
     jsr sub
-    jmp b7
-  //SEG34 main::@7
-  b7:
+    jmp b6
+  //SEG34 main::@6
+  b6:
   //SEG35 [13] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuyy=_inc_vbuyy 
     iny
   //SEG36 [14] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1 -- vbuyy_neq_vbuc1_then_la1 
     cpy #9
-    bne b1_from_b7
-  //SEG37 [15] phi from main::@7 to main::@2 [phi:main::@7->main::@2]
-  b2_from_b7:
+    bne b1_from_b6
+  //SEG37 [15] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
+  b2_from_b6:
     jmp b2
   //SEG38 main::@2
   b2:
@@ -1551,40 +1559,40 @@ main: {
     sta print_sword.w+1
   //SEG48 [20] call print_sword 
     jsr print_sword
-  //SEG49 [21] phi from main::@3 to main::@9 [phi:main::@3->main::@9]
-  b9_from_b3:
-    jmp b9
-  //SEG50 main::@9
-  b9:
+  //SEG49 [21] phi from main::@3 to main::@7 [phi:main::@3->main::@7]
+  b7_from_b3:
+    jmp b7
+  //SEG50 main::@7
+  b7:
   //SEG51 [22] call print_ln 
-  //SEG52 [27] phi from main::@9 to print_ln [phi:main::@9->print_ln]
-  print_ln_from_b9:
+  //SEG52 [27] phi from main::@7 to print_ln [phi:main::@7->print_ln]
+  print_ln_from_b7:
     jsr print_ln
-    jmp b10
-  //SEG53 main::@10
-  b10:
+    jmp b8
+  //SEG53 main::@8
+  b8:
   //SEG54 [23] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG55 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@12 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG55 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@9 -- vbuxx_neq_vbuc1_then_la1 
     cpx #9
-    bne b12
+    bne b9
     jmp breturn
   //SEG56 main::@return
   breturn:
   //SEG57 [25] return 
     rts
-  //SEG58 main::@12
-  b12:
+  //SEG58 main::@9
+  b9:
   //SEG59 [26] (byte*~) print_char_cursor#56 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG60 [17] phi from main::@12 to main::@3 [phi:main::@12->main::@3]
-  b3_from_b12:
-  //SEG61 [17] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@12->main::@3#0] -- register_copy 
-  //SEG62 [17] phi (byte*) print_char_cursor#46 = (byte*~) print_char_cursor#56 [phi:main::@12->main::@3#1] -- register_copy 
-  //SEG63 [17] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@12->main::@3#2] -- register_copy 
+  //SEG60 [17] phi from main::@9 to main::@3 [phi:main::@9->main::@3]
+  b3_from_b9:
+  //SEG61 [17] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@9->main::@3#0] -- register_copy 
+  //SEG62 [17] phi (byte*) print_char_cursor#46 = (byte*~) print_char_cursor#56 [phi:main::@9->main::@3#1] -- register_copy 
+  //SEG63 [17] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@9->main::@3#2] -- register_copy 
     jmp b3
 }
 //SEG64 print_ln
@@ -1640,9 +1648,9 @@ print_sword: {
   //SEG79 [52] phi (byte) print_char::ch#3 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b4
-  //SEG80 print_sword::@4
-  b4:
+    jmp b3
+  //SEG80 print_sword::@3
+  b3:
   //SEG81 [35] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -1653,11 +1661,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG82 [36] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG82 [36] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG83 [36] phi (byte*) print_char_cursor#41 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG84 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG83 [36] phi (byte*) print_char_cursor#41 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG84 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG85 print_sword::@1
   b1:
@@ -1821,21 +1829,21 @@ sub: {
   words: .word -$6000, -$600, -$60, -6, 0, 6, $60, $600, $6000
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b21
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
+Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp b6
-Removing instruction jmp b7
 Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp b9
-Removing instruction jmp b10
+Removing instruction jmp b7
+Removing instruction jmp b8
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b2
-Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -1847,46 +1855,46 @@ Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1_from_b7 with b1
+Replacing label b1_from_b6 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_print_sword with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b21_from_bbegin:
-Removing instruction b21:
-Removing instruction main_from_b21:
-Removing instruction bend_from_b21:
-Removing instruction b1_from_b7:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b6:
+Removing instruction sub_from_b4:
 Removing instruction sub_from_b5:
-Removing instruction sub_from_b6:
-Removing instruction b2_from_b7:
+Removing instruction b2_from_b6:
 Removing instruction print_cls_from_b2:
-Removing instruction b9_from_b3:
-Removing instruction print_ln_from_b9:
+Removing instruction b7_from_b3:
+Removing instruction print_ln_from_b7:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction b2_from_print_sword:
 Removing instruction print_char_from_b2:
 Removing instruction b1_from_print_sword:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
 Removing instruction sub_from_b1:
+Removing instruction b4:
 Removing instruction b5:
 Removing instruction b6:
-Removing instruction b7:
 Removing instruction b2:
 Removing instruction b3_from_b2:
-Removing instruction b9:
-Removing instruction b10:
+Removing instruction b7:
+Removing instruction b8:
 Removing instruction breturn:
-Removing instruction b3_from_b12:
+Removing instruction b3_from_b9:
 Removing instruction breturn:
 Removing instruction b2:
-Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn:
 Removing instruction print_byte_from_print_word:
 Removing instruction b1:
@@ -1911,19 +1919,19 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @21
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
 (byte~) main::$6 reg byte a 22.0
 (label) main::@1
-(label) main::@10
-(label) main::@12
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
 (label) main::@6
 (label) main::@7
+(label) main::@8
 (label) main::@9
 (label) main::@return
 (byte) main::i
@@ -1975,7 +1983,7 @@ FINAL SYMBOL TABLE
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:4 4.0
@@ -2025,19 +2033,19 @@ Score: 5261
   .label print_line_cursor = 2
   .label print_char_cursor = 7
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-//SEG5 @21
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG13 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#0] -- register_copy 
   //SEG15 main::@1
   b1:
   //SEG16 [6] (byte) main::idx#0 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuyy_rol_1 
@@ -2051,29 +2059,29 @@ main: {
     lda #$80
   //SEG21 [62] phi (byte) sub::idx#3 = (byte) sub::idx#0 [phi:main::@1->sub#1] -- register_copy 
     jsr sub
-  //SEG22 main::@5
+  //SEG22 main::@4
   //SEG23 [9] (byte) sub::idx#1 ← (byte) main::idx#0
   //SEG24 [10] call sub 
-  //SEG25 [62] phi from main::@5 to sub [phi:main::@5->sub]
-  //SEG26 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@5->sub#0] -- vbuaa=vbuc1 
+  //SEG25 [62] phi from main::@4 to sub [phi:main::@4->sub]
+  //SEG26 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@4->sub#0] -- vbuaa=vbuc1 
     lda #$40
-  //SEG27 [62] phi (byte) sub::idx#3 = (byte) sub::idx#1 [phi:main::@5->sub#1] -- register_copy 
+  //SEG27 [62] phi (byte) sub::idx#3 = (byte) sub::idx#1 [phi:main::@4->sub#1] -- register_copy 
     jsr sub
-  //SEG28 main::@6
+  //SEG28 main::@5
   //SEG29 [11] (byte) sub::idx#2 ← (byte) main::idx#0
   //SEG30 [12] call sub 
-  //SEG31 [62] phi from main::@6 to sub [phi:main::@6->sub]
-  //SEG32 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@6->sub#0] -- vbuaa=vbuc1 
+  //SEG31 [62] phi from main::@5 to sub [phi:main::@5->sub]
+  //SEG32 [62] phi (byte) sub::s#3 = (byte/signed byte/word/signed word/dword/signed dword) $40 [phi:main::@5->sub#0] -- vbuaa=vbuc1 
     lda #$40
-  //SEG33 [62] phi (byte) sub::idx#3 = (byte) sub::idx#2 [phi:main::@6->sub#1] -- register_copy 
+  //SEG33 [62] phi (byte) sub::idx#3 = (byte) sub::idx#2 [phi:main::@5->sub#1] -- register_copy 
     jsr sub
-  //SEG34 main::@7
+  //SEG34 main::@6
   //SEG35 [13] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuyy=_inc_vbuyy 
     iny
   //SEG36 [14] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@1 -- vbuyy_neq_vbuc1_then_la1 
     cpy #9
     bne b1
-  //SEG37 [15] phi from main::@7 to main::@2 [phi:main::@7->main::@2]
+  //SEG37 [15] phi from main::@6 to main::@2 [phi:main::@6->main::@2]
   //SEG38 main::@2
   //SEG39 [16] call print_cls 
   //SEG40 [56] phi from main::@2 to print_cls [phi:main::@2->print_cls]
@@ -2104,31 +2112,31 @@ main: {
     sta print_sword.w+1
   //SEG48 [20] call print_sword 
     jsr print_sword
-  //SEG49 [21] phi from main::@3 to main::@9 [phi:main::@3->main::@9]
-  //SEG50 main::@9
+  //SEG49 [21] phi from main::@3 to main::@7 [phi:main::@3->main::@7]
+  //SEG50 main::@7
   //SEG51 [22] call print_ln 
-  //SEG52 [27] phi from main::@9 to print_ln [phi:main::@9->print_ln]
+  //SEG52 [27] phi from main::@7 to print_ln [phi:main::@7->print_ln]
     jsr print_ln
-  //SEG53 main::@10
+  //SEG53 main::@8
   //SEG54 [23] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG55 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@12 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG55 [24] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 9) goto main::@9 -- vbuxx_neq_vbuc1_then_la1 
     cpx #9
-    bne b12
+    bne b9
   //SEG56 main::@return
   //SEG57 [25] return 
     rts
-  //SEG58 main::@12
-  b12:
+  //SEG58 main::@9
+  b9:
   //SEG59 [26] (byte*~) print_char_cursor#56 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG60 [17] phi from main::@12 to main::@3 [phi:main::@12->main::@3]
-  //SEG61 [17] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@12->main::@3#0] -- register_copy 
-  //SEG62 [17] phi (byte*) print_char_cursor#46 = (byte*~) print_char_cursor#56 [phi:main::@12->main::@3#1] -- register_copy 
-  //SEG63 [17] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@12->main::@3#2] -- register_copy 
+  //SEG60 [17] phi from main::@9 to main::@3 [phi:main::@9->main::@3]
+  //SEG61 [17] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@9->main::@3#0] -- register_copy 
+  //SEG62 [17] phi (byte*) print_char_cursor#46 = (byte*~) print_char_cursor#56 [phi:main::@9->main::@3#1] -- register_copy 
+  //SEG63 [17] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@9->main::@3#2] -- register_copy 
     jmp b3
 }
 //SEG64 print_ln
@@ -2175,7 +2183,7 @@ print_sword: {
   //SEG79 [52] phi (byte) print_char::ch#3 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG80 print_sword::@4
+  //SEG80 print_sword::@3
   //SEG81 [35] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -2186,9 +2194,9 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG82 [36] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
-  //SEG83 [36] phi (byte*) print_char_cursor#41 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG84 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  //SEG82 [36] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
+  //SEG83 [36] phi (byte*) print_char_cursor#41 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG84 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
   //SEG85 print_sword::@1
   b1:
   //SEG86 [37] call print_word 
diff --git a/src/test/ref/signed-indexed-subtract.sym b/src/test/ref/signed-indexed-subtract.sym
index 62f0db719..c42c2ee2b 100644
--- a/src/test/ref/signed-indexed-subtract.sym
+++ b/src/test/ref/signed-indexed-subtract.sym
@@ -1,16 +1,16 @@
-(label) @21
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
 (byte~) main::$6 reg byte a 22.0
 (label) main::@1
-(label) main::@10
-(label) main::@12
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
 (label) main::@6
 (label) main::@7
+(label) main::@8
 (label) main::@9
 (label) main::@return
 (byte) main::i
@@ -62,7 +62,7 @@
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:4 4.0
diff --git a/src/test/ref/signed-words.asm b/src/test/ref/signed-words.asm
index 7d5104f07..e85a5777d 100644
--- a/src/test/ref/signed-words.asm
+++ b/src/test/ref/signed-words.asm
@@ -41,12 +41,12 @@ main: {
     sta yvel_12
     lda #0
     sta yvel_12+1
-  b2:
+  b1:
     lda #$ff
     cmp RASTER
-    bne b2
+    bne b1
     jsr anim
-    jmp b2
+    jmp b1
 }
 anim: {
     .label _5 = $c
@@ -78,12 +78,12 @@ anim: {
     bvc !+
     eor #$80
   !:
-    bpl b4
+    bpl b3
     lda #$c8
     sta yvel
     lda #0
     sta yvel+1
-  b4:
+  b3:
     lda yvel
     sta yvel_22
     lda yvel+1
@@ -203,11 +203,11 @@ init: {
     cmp #<SCREEN+$3e8
     bne b1
     ldx #0
-  b3:
+  b2:
     lda #$ff
     sta SPRITE,x
     inx
     cpx #$40
-    bne b3
+    bne b2
     rts
 }
diff --git a/src/test/ref/signed-words.cfg b/src/test/ref/signed-words.cfg
index 897f6776f..1df089b44 100644
--- a/src/test/ref/signed-words.cfg
+++ b/src/test/ref/signed-words.cfg
@@ -1,46 +1,46 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@7
-@7: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @7
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @7
+main: scope:[main]  from @1
   [4] phi()
   [5] call init 
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@2
+  [6] (signed word) yvel_init#13 ← phi( main::@2/(signed word) yvel_init#11 main/(byte/signed byte/word/signed word/dword/signed dword) $64 )
+  [6] (signed word) xvel#12 ← phi( main::@2/(signed word) xvel#10 main/(byte/word/signed word/dword/signed dword) $c8 )
+  [6] (signed word) ypos#13 ← phi( main::@2/(signed word) ypos#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] (signed word) xpos#12 ← phi( main::@2/(signed word) xpos#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] (signed word) yvel#12 ← phi( main::@2/(signed word) yvel#10 main/(byte/signed byte/word/signed word/dword/signed dword) $64 )
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@3
-  [6] (signed word) yvel_init#13 ← phi( main::@3/(signed word) yvel_init#11 main/(byte/signed byte/word/signed word/dword/signed dword) $64 )
-  [6] (signed word) xvel#12 ← phi( main::@3/(signed word) xvel#10 main/(byte/word/signed word/dword/signed dword) $c8 )
-  [6] (signed word) ypos#13 ← phi( main::@3/(signed word) ypos#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [6] (signed word) xpos#12 ← phi( main::@3/(signed word) xpos#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [6] (signed word) yvel#12 ← phi( main::@3/(signed word) yvel#10 main/(byte/signed byte/word/signed word/dword/signed dword) $64 )
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
-  to:main::@3
-main::@3: scope:[main]  from main::@2
+main::@2: scope:[main]  from main::@1
   [8] phi()
   [9] call anim 
-  to:main::@2
-anim: scope:[anim]  from main::@3
+  to:main::@1
+anim: scope:[anim]  from main::@2
   [10] if((signed word) ypos#13>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@1
   to:anim::@2
 anim::@2: scope:[anim]  from anim
   [11] (signed word) xvel#14 ← - (signed word) xvel#12
   [12] (signed word) yvel_init#3 ← (signed word) yvel_init#13 - (byte/signed byte/word/signed word/dword/signed dword) $a
-  [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@5
-  to:anim::@4
-anim::@4: scope:[anim]  from anim::@2 anim::@5
-  [14] (signed word) yvel#4 ← phi( anim::@5/(signed word) yvel_init#3 anim::@2/(byte/word/signed word/dword/signed dword) $c8 )
+  [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@4
+  to:anim::@3
+anim::@3: scope:[anim]  from anim::@2 anim::@4
+  [14] (signed word) yvel#4 ← phi( anim::@4/(signed word) yvel_init#3 anim::@2/(byte/word/signed word/dword/signed dword) $c8 )
   [15] (signed word~) yvel#22 ← (signed word) yvel#4
   to:anim::@1
-anim::@1: scope:[anim]  from anim anim::@4
-  [16] (signed word) yvel_init#11 ← phi( anim/(signed word) yvel_init#13 anim::@4/(signed word) yvel#4 )
-  [16] (signed word) ypos#10 ← phi( anim/(signed word) ypos#13 anim::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [16] (signed word) xvel#10 ← phi( anim/(signed word) xvel#12 anim::@4/(signed word) xvel#14 )
-  [16] (signed word) xpos#9 ← phi( anim/(signed word) xpos#12 anim::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [16] (signed word) yvel#9 ← phi( anim/(signed word) yvel#12 anim::@4/(signed word~) yvel#22 )
+anim::@1: scope:[anim]  from anim anim::@3
+  [16] (signed word) yvel_init#11 ← phi( anim/(signed word) yvel_init#13 anim::@3/(signed word) yvel#4 )
+  [16] (signed word) ypos#10 ← phi( anim/(signed word) ypos#13 anim::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [16] (signed word) xvel#10 ← phi( anim/(signed word) xvel#12 anim::@3/(signed word) xvel#14 )
+  [16] (signed word) xpos#9 ← phi( anim/(signed word) xpos#12 anim::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [16] (signed word) yvel#9 ← phi( anim/(signed word) yvel#12 anim::@3/(signed word~) yvel#22 )
   [17] (signed word) yvel#10 ← (signed word) yvel#9 + (const signed word) g#0
   [18] (signed word) xpos#10 ← (signed word) xpos#9 + (signed word) xvel#10
   [19] (signed word) ypos#11 ← (signed word) ypos#10 + (signed word) yvel#10
@@ -58,9 +58,9 @@ anim::@1: scope:[anim]  from anim anim::@4
 anim::@return: scope:[anim]  from anim::@1
   [30] return 
   to:@return
-anim::@5: scope:[anim]  from anim::@2
+anim::@4: scope:[anim]  from anim::@2
   [31] phi()
-  to:anim::@4
+  to:anim::@3
 init: scope:[init]  from main
   [32] *((const byte*) SPRITES_ENABLE#0) ← (byte/signed byte/word/signed word/dword/signed dword) 1
   [33] *((const byte*) SPRITES_EXPAND_X#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
@@ -75,13 +75,13 @@ init::@1: scope:[init]  from init init::@1
   [40] *((byte*) init::sc#2) ← (byte) ' '
   [41] (byte*) init::sc#1 ← ++ (byte*) init::sc#2
   [42] if((byte*) init::sc#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e8) goto init::@1
-  to:init::@3
-init::@3: scope:[init]  from init::@1 init::@3
-  [43] (byte) init::i#2 ← phi( init::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 init::@3/(byte) init::i#1 )
+  to:init::@2
+init::@2: scope:[init]  from init::@1 init::@2
+  [43] (byte) init::i#2 ← phi( init::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 init::@2/(byte) init::i#1 )
   [44] *((const byte*) SPRITE#0 + (byte) init::i#2) ← (byte/word/signed word/dword/signed dword) $ff
   [45] (byte) init::i#1 ← ++ (byte) init::i#2
-  [46] if((byte) init::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto init::@3
+  [46] if((byte) init::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto init::@2
   to:init::@return
-init::@return: scope:[init]  from init::@3
+init::@return: scope:[init]  from init::@2
   [47] return 
   to:@return
diff --git a/src/test/ref/signed-words.log b/src/test/ref/signed-words.log
index 733f9e9fa..fe45762c1 100644
--- a/src/test/ref/signed-words.log
+++ b/src/test/ref/signed-words.log
@@ -896,57 +896,63 @@ Culled Empty Block (label) anim::@3
 Culled Empty Block (label) anim::@6
 Culled Empty Block (label) init::@6
 Culled Empty Block (label) init::@5
+Renumbering block @7 to @1
+Renumbering block main::@2 to main::@1
+Renumbering block main::@3 to main::@2
+Renumbering block init::@3 to init::@2
+Renumbering block anim::@4 to anim::@3
+Renumbering block anim::@5 to anim::@4
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @7
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@3
-Adding NOP phi() at start of anim::@5
+Adding NOP phi() at start of main::@2
+Adding NOP phi() at start of anim::@4
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@7
-@7: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @7
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @7
+main: scope:[main]  from @1
   [4] phi()
   [5] call init 
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@2
+  [6] (signed word) yvel_init#13 ← phi( main::@2/(signed word) yvel_init#11 main/(byte/signed byte/word/signed word/dword/signed dword) $64 )
+  [6] (signed word) xvel#12 ← phi( main::@2/(signed word) xvel#10 main/(byte/word/signed word/dword/signed dword) $c8 )
+  [6] (signed word) ypos#13 ← phi( main::@2/(signed word) ypos#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] (signed word) xpos#12 ← phi( main::@2/(signed word) xpos#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] (signed word) yvel#12 ← phi( main::@2/(signed word) yvel#10 main/(byte/signed byte/word/signed word/dword/signed dword) $64 )
+  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1
   to:main::@2
-main::@2: scope:[main]  from main main::@2 main::@3
-  [6] (signed word) yvel_init#13 ← phi( main::@3/(signed word) yvel_init#11 main/(byte/signed byte/word/signed word/dword/signed dword) $64 )
-  [6] (signed word) xvel#12 ← phi( main::@3/(signed word) xvel#10 main/(byte/word/signed word/dword/signed dword) $c8 )
-  [6] (signed word) ypos#13 ← phi( main::@3/(signed word) ypos#11 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [6] (signed word) xpos#12 ← phi( main::@3/(signed word) xpos#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [6] (signed word) yvel#12 ← phi( main::@3/(signed word) yvel#10 main/(byte/signed byte/word/signed word/dword/signed dword) $64 )
-  [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2
-  to:main::@3
-main::@3: scope:[main]  from main::@2
+main::@2: scope:[main]  from main::@1
   [8] phi()
   [9] call anim 
-  to:main::@2
-anim: scope:[anim]  from main::@3
+  to:main::@1
+anim: scope:[anim]  from main::@2
   [10] if((signed word) ypos#13>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@1
   to:anim::@2
 anim::@2: scope:[anim]  from anim
   [11] (signed word) xvel#14 ← - (signed word) xvel#12
   [12] (signed word) yvel_init#3 ← (signed word) yvel_init#13 - (byte/signed byte/word/signed word/dword/signed dword) $a
-  [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@5
-  to:anim::@4
-anim::@4: scope:[anim]  from anim::@2 anim::@5
-  [14] (signed word) yvel#4 ← phi( anim::@5/(signed word) yvel_init#3 anim::@2/(byte/word/signed word/dword/signed dword) $c8 )
+  [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@4
+  to:anim::@3
+anim::@3: scope:[anim]  from anim::@2 anim::@4
+  [14] (signed word) yvel#4 ← phi( anim::@4/(signed word) yvel_init#3 anim::@2/(byte/word/signed word/dword/signed dword) $c8 )
   [15] (signed word~) yvel#22 ← (signed word) yvel#4
   to:anim::@1
-anim::@1: scope:[anim]  from anim anim::@4
-  [16] (signed word) yvel_init#11 ← phi( anim/(signed word) yvel_init#13 anim::@4/(signed word) yvel#4 )
-  [16] (signed word) ypos#10 ← phi( anim/(signed word) ypos#13 anim::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [16] (signed word) xvel#10 ← phi( anim/(signed word) xvel#12 anim::@4/(signed word) xvel#14 )
-  [16] (signed word) xpos#9 ← phi( anim/(signed word) xpos#12 anim::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [16] (signed word) yvel#9 ← phi( anim/(signed word) yvel#12 anim::@4/(signed word~) yvel#22 )
+anim::@1: scope:[anim]  from anim anim::@3
+  [16] (signed word) yvel_init#11 ← phi( anim/(signed word) yvel_init#13 anim::@3/(signed word) yvel#4 )
+  [16] (signed word) ypos#10 ← phi( anim/(signed word) ypos#13 anim::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [16] (signed word) xvel#10 ← phi( anim/(signed word) xvel#12 anim::@3/(signed word) xvel#14 )
+  [16] (signed word) xpos#9 ← phi( anim/(signed word) xpos#12 anim::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [16] (signed word) yvel#9 ← phi( anim/(signed word) yvel#12 anim::@3/(signed word~) yvel#22 )
   [17] (signed word) yvel#10 ← (signed word) yvel#9 + (const signed word) g#0
   [18] (signed word) xpos#10 ← (signed word) xpos#9 + (signed word) xvel#10
   [19] (signed word) ypos#11 ← (signed word) ypos#10 + (signed word) yvel#10
@@ -964,9 +970,9 @@ anim::@1: scope:[anim]  from anim anim::@4
 anim::@return: scope:[anim]  from anim::@1
   [30] return 
   to:@return
-anim::@5: scope:[anim]  from anim::@2
+anim::@4: scope:[anim]  from anim::@2
   [31] phi()
-  to:anim::@4
+  to:anim::@3
 init: scope:[init]  from main
   [32] *((const byte*) SPRITES_ENABLE#0) ← (byte/signed byte/word/signed word/dword/signed dword) 1
   [33] *((const byte*) SPRITES_EXPAND_X#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
@@ -981,14 +987,14 @@ init::@1: scope:[init]  from init init::@1
   [40] *((byte*) init::sc#2) ← (byte) ' '
   [41] (byte*) init::sc#1 ← ++ (byte*) init::sc#2
   [42] if((byte*) init::sc#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e8) goto init::@1
-  to:init::@3
-init::@3: scope:[init]  from init::@1 init::@3
-  [43] (byte) init::i#2 ← phi( init::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 init::@3/(byte) init::i#1 )
+  to:init::@2
+init::@2: scope:[init]  from init::@1 init::@2
+  [43] (byte) init::i#2 ← phi( init::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 init::@2/(byte) init::i#1 )
   [44] *((const byte*) SPRITE#0 + (byte) init::i#2) ← (byte/word/signed word/dword/signed dword) $ff
   [45] (byte) init::i#1 ← ++ (byte) init::i#2
-  [46] if((byte) init::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto init::@3
+  [46] if((byte) init::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto init::@2
   to:init::@return
-init::@return: scope:[init]  from init::@3
+init::@return: scope:[init]  from init::@2
   [47] return 
   to:@return
 
@@ -1194,17 +1200,17 @@ INITIAL ASM
   .label yvel_22 = 6
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-b7_from_bbegin:
-  jmp b7
-//SEG5 @7
-b7:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @7 to main [phi:@7->main]
-main_from_b7:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @7 to @end [phi:@7->@end]
-bend_from_b7:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1212,58 +1218,58 @@ bend:
 main: {
   //SEG11 [5] call init 
     jsr init
-  //SEG12 [6] phi from main to main::@2 [phi:main->main::@2]
-  b2_from_main:
-  //SEG13 [6] phi (signed word) yvel_init#13 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@2#0] -- vwsz1=vbuc1 
+  //SEG12 [6] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG13 [6] phi (signed word) yvel_init#13 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@1#0] -- vwsz1=vbuc1 
     lda #$64
     sta yvel_init
     lda #0
     sta yvel_init+1
-  //SEG14 [6] phi (signed word) xvel#12 = (byte/word/signed word/dword/signed dword) $c8 [phi:main->main::@2#1] -- vwsz1=vbuc1 
+  //SEG14 [6] phi (signed word) xvel#12 = (byte/word/signed word/dword/signed dword) $c8 [phi:main->main::@1#1] -- vwsz1=vbuc1 
     lda #$c8
     sta xvel
     lda #0
     sta xvel+1
-  //SEG15 [6] phi (signed word) ypos#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#2] -- vwsz1=vbuc1 
+  //SEG15 [6] phi (signed word) ypos#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#2] -- vwsz1=vbuc1 
     lda #0
     sta ypos
     lda #0
     sta ypos+1
-  //SEG16 [6] phi (signed word) xpos#12 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#3] -- vwsz1=vbuc1 
+  //SEG16 [6] phi (signed word) xpos#12 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#3] -- vwsz1=vbuc1 
     lda #0
     sta xpos
     lda #0
     sta xpos+1
-  //SEG17 [6] phi (signed word) yvel#12 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@2#4] -- vwsz1=vbuc1 
+  //SEG17 [6] phi (signed word) yvel#12 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@1#4] -- vwsz1=vbuc1 
     lda #$64
     sta yvel_12
     lda #0
     sta yvel_12+1
-    jmp b2
-  //SEG18 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  b2_from_b2:
-    jmp b2
-  //SEG19 main::@2
-  b2:
-  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG18 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG19 main::@1
+  b1:
+  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b2_from_b2
-  //SEG21 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
-  b3_from_b2:
-    jmp b3
-  //SEG22 main::@3
-  b3:
+    bne b1_from_b1
+  //SEG21 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG22 main::@2
+  b2:
   //SEG23 [9] call anim 
     jsr anim
-  //SEG24 [6] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
-  b2_from_b3:
-  //SEG25 [6] phi (signed word) yvel_init#13 = (signed word) yvel_init#11 [phi:main::@3->main::@2#0] -- register_copy 
-  //SEG26 [6] phi (signed word) xvel#12 = (signed word) xvel#10 [phi:main::@3->main::@2#1] -- register_copy 
-  //SEG27 [6] phi (signed word) ypos#13 = (signed word) ypos#11 [phi:main::@3->main::@2#2] -- register_copy 
-  //SEG28 [6] phi (signed word) xpos#12 = (signed word) xpos#10 [phi:main::@3->main::@2#3] -- register_copy 
-  //SEG29 [6] phi (signed word) yvel#12 = (signed word) yvel#10 [phi:main::@3->main::@2#4] -- register_copy 
-    jmp b2
+  //SEG24 [6] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG25 [6] phi (signed word) yvel_init#13 = (signed word) yvel_init#11 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG26 [6] phi (signed word) xvel#12 = (signed word) xvel#10 [phi:main::@2->main::@1#1] -- register_copy 
+  //SEG27 [6] phi (signed word) ypos#13 = (signed word) ypos#11 [phi:main::@2->main::@1#2] -- register_copy 
+  //SEG28 [6] phi (signed word) xpos#12 = (signed word) xpos#10 [phi:main::@2->main::@1#3] -- register_copy 
+  //SEG29 [6] phi (signed word) yvel#12 = (signed word) yvel#10 [phi:main::@2->main::@1#4] -- register_copy 
+    jmp b1
 }
 //SEG30 anim
 anim: {
@@ -1298,7 +1304,7 @@ anim: {
     bcs !+
     dec yvel_init+1
   !:
-  //SEG35 [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@5 -- vwsz1_ge_vwsc1_then_la1 
+  //SEG35 [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@4 -- vwsz1_ge_vwsc1_then_la1 
     lda yvel_init
     cmp #<-$c8
     lda yvel_init+1
@@ -1306,37 +1312,37 @@ anim: {
     bvc !+
     eor #$80
   !:
-    bpl b5_from_b2
-  //SEG36 [14] phi from anim::@2 to anim::@4 [phi:anim::@2->anim::@4]
-  b4_from_b2:
-  //SEG37 [14] phi (signed word) yvel#4 = (byte/word/signed word/dword/signed dword) $c8 [phi:anim::@2->anim::@4#0] -- vwsz1=vbuc1 
+    bpl b4_from_b2
+  //SEG36 [14] phi from anim::@2 to anim::@3 [phi:anim::@2->anim::@3]
+  b3_from_b2:
+  //SEG37 [14] phi (signed word) yvel#4 = (byte/word/signed word/dword/signed dword) $c8 [phi:anim::@2->anim::@3#0] -- vwsz1=vbuc1 
     lda #$c8
     sta yvel
     lda #0
     sta yvel+1
-    jmp b4
-  //SEG38 anim::@4
-  b4:
+    jmp b3
+  //SEG38 anim::@3
+  b3:
   //SEG39 [15] (signed word~) yvel#22 ← (signed word) yvel#4 -- vwsz1=vwsz2 
     lda yvel
     sta yvel_22
     lda yvel+1
     sta yvel_22+1
-  //SEG40 [16] phi from anim::@4 to anim::@1 [phi:anim::@4->anim::@1]
-  b1_from_b4:
-  //SEG41 [16] phi (signed word) yvel_init#11 = (signed word) yvel#4 [phi:anim::@4->anim::@1#0] -- register_copy 
-  //SEG42 [16] phi (signed word) ypos#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@4->anim::@1#1] -- vwsz1=vbuc1 
+  //SEG40 [16] phi from anim::@3 to anim::@1 [phi:anim::@3->anim::@1]
+  b1_from_b3:
+  //SEG41 [16] phi (signed word) yvel_init#11 = (signed word) yvel#4 [phi:anim::@3->anim::@1#0] -- register_copy 
+  //SEG42 [16] phi (signed word) ypos#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@1#1] -- vwsz1=vbuc1 
     lda #0
     sta ypos
     lda #0
     sta ypos+1
-  //SEG43 [16] phi (signed word) xvel#10 = (signed word) xvel#14 [phi:anim::@4->anim::@1#2] -- register_copy 
-  //SEG44 [16] phi (signed word) xpos#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@4->anim::@1#3] -- vwsz1=vbuc1 
+  //SEG43 [16] phi (signed word) xvel#10 = (signed word) xvel#14 [phi:anim::@3->anim::@1#2] -- register_copy 
+  //SEG44 [16] phi (signed word) xpos#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@1#3] -- vwsz1=vbuc1 
     lda #0
     sta xpos
     lda #0
     sta xpos+1
-  //SEG45 [16] phi (signed word) yvel#9 = (signed word~) yvel#22 [phi:anim::@4->anim::@1#4] -- register_copy 
+  //SEG45 [16] phi (signed word) yvel#9 = (signed word~) yvel#22 [phi:anim::@3->anim::@1#4] -- register_copy 
     jmp b1
   //SEG46 [16] phi from anim to anim::@1 [phi:anim->anim::@1]
   b1_from_anim:
@@ -1445,15 +1451,15 @@ anim: {
   breturn:
   //SEG67 [30] return 
     rts
-  //SEG68 [31] phi from anim::@2 to anim::@5 [phi:anim::@2->anim::@5]
-  b5_from_b2:
-    jmp b5
-  //SEG69 anim::@5
-  b5:
-  //SEG70 [14] phi from anim::@5 to anim::@4 [phi:anim::@5->anim::@4]
-  b4_from_b5:
-  //SEG71 [14] phi (signed word) yvel#4 = (signed word) yvel_init#3 [phi:anim::@5->anim::@4#0] -- register_copy 
+  //SEG68 [31] phi from anim::@2 to anim::@4 [phi:anim::@2->anim::@4]
+  b4_from_b2:
     jmp b4
+  //SEG69 anim::@4
+  b4:
+  //SEG70 [14] phi from anim::@4 to anim::@3 [phi:anim::@4->anim::@3]
+  b3_from_b4:
+  //SEG71 [14] phi (signed word) yvel#4 = (signed word) yvel_init#3 [phi:anim::@4->anim::@3#0] -- register_copy 
+    jmp b3
 }
 //SEG72 init
 // Fill and show a sprite, clear the screen
@@ -1511,28 +1517,28 @@ init: {
     lda sc
     cmp #<SCREEN+$3e8
     bne b1_from_b1
-  //SEG88 [43] phi from init::@1 to init::@3 [phi:init::@1->init::@3]
-  b3_from_b1:
-  //SEG89 [43] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@1->init::@3#0] -- vbuz1=vbuc1 
+  //SEG88 [43] phi from init::@1 to init::@2 [phi:init::@1->init::@2]
+  b2_from_b1:
+  //SEG89 [43] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@1->init::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b3
-  //SEG90 [43] phi from init::@3 to init::@3 [phi:init::@3->init::@3]
-  b3_from_b3:
-  //SEG91 [43] phi (byte) init::i#2 = (byte) init::i#1 [phi:init::@3->init::@3#0] -- register_copy 
-    jmp b3
-  //SEG92 init::@3
-  b3:
+    jmp b2
+  //SEG90 [43] phi from init::@2 to init::@2 [phi:init::@2->init::@2]
+  b2_from_b2:
+  //SEG91 [43] phi (byte) init::i#2 = (byte) init::i#1 [phi:init::@2->init::@2#0] -- register_copy 
+    jmp b2
+  //SEG92 init::@2
+  b2:
   //SEG93 [44] *((const byte*) SPRITE#0 + (byte) init::i#2) ← (byte/word/signed word/dword/signed dword) $ff -- pbuc1_derefidx_vbuz1=vbuc2 
     lda #$ff
     ldy i
     sta SPRITE,y
   //SEG94 [45] (byte) init::i#1 ← ++ (byte) init::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG95 [46] if((byte) init::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto init::@3 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG95 [46] if((byte) init::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto init::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$40
     cmp i
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG96 init::@return
   breturn:
@@ -1541,11 +1547,11 @@ init: {
 }
 
 REGISTER UPLIFT POTENTIAL REGISTERS
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ( main:2 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ( main:2 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ) always clobbers reg byte a 
 Statement [10] if((signed word) ypos#13>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@1 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ( main:2::anim:9 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ) always clobbers reg byte a 
 Statement [11] (signed word) xvel#14 ← - (signed word) xvel#12 [ yvel_init#13 xvel#14 ] ( main:2::anim:9 [ yvel_init#13 xvel#14 ] ) always clobbers reg byte a 
 Statement [12] (signed word) yvel_init#3 ← (signed word) yvel_init#13 - (byte/signed byte/word/signed word/dword/signed dword) $a [ xvel#14 yvel_init#3 ] ( main:2::anim:9 [ xvel#14 yvel_init#3 ] ) always clobbers reg byte a 
-Statement [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@5 [ xvel#14 yvel_init#3 ] ( main:2::anim:9 [ xvel#14 yvel_init#3 ] ) always clobbers reg byte a 
+Statement [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@4 [ xvel#14 yvel_init#3 ] ( main:2::anim:9 [ xvel#14 yvel_init#3 ] ) always clobbers reg byte a 
 Statement [15] (signed word~) yvel#22 ← (signed word) yvel#4 [ xvel#14 yvel#4 yvel#22 ] ( main:2::anim:9 [ xvel#14 yvel#4 yvel#22 ] ) always clobbers reg byte a 
 Statement [17] (signed word) yvel#10 ← (signed word) yvel#9 + (const signed word) g#0 [ yvel#10 xvel#10 yvel_init#11 xpos#9 ypos#10 ] ( main:2::anim:9 [ yvel#10 xvel#10 yvel_init#11 xpos#9 ypos#10 ] ) always clobbers reg byte a 
 Statement [18] (signed word) xpos#10 ← (signed word) xpos#9 + (signed word) xvel#10 [ yvel#10 xpos#10 xvel#10 yvel_init#11 ypos#10 ] ( main:2::anim:9 [ yvel#10 xpos#10 xvel#10 yvel_init#11 ypos#10 ] ) always clobbers reg byte a 
@@ -1568,11 +1574,11 @@ Statement [40] *((byte*) init::sc#2) ← (byte) ' ' [ init::sc#2 ] ( main:2::ini
 Statement [42] if((byte*) init::sc#1!=(const byte*) SCREEN#0+(word/signed word/dword/signed dword) $3e8) goto init::@1 [ init::sc#1 ] ( main:2::init:5 [ init::sc#1 ] ) always clobbers reg byte a 
 Statement [44] *((const byte*) SPRITE#0 + (byte) init::i#2) ← (byte/word/signed word/dword/signed dword) $ff [ init::i#2 ] ( main:2::init:5 [ init::i#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:14 [ init::i#2 init::i#1 ]
-Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ( main:2 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ) always clobbers reg byte a 
+Statement [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ( main:2 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ) always clobbers reg byte a 
 Statement [10] if((signed word) ypos#13>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto anim::@1 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ( main:2::anim:9 [ yvel#12 xpos#12 ypos#13 xvel#12 yvel_init#13 ] ) always clobbers reg byte a 
 Statement [11] (signed word) xvel#14 ← - (signed word) xvel#12 [ yvel_init#13 xvel#14 ] ( main:2::anim:9 [ yvel_init#13 xvel#14 ] ) always clobbers reg byte a 
 Statement [12] (signed word) yvel_init#3 ← (signed word) yvel_init#13 - (byte/signed byte/word/signed word/dword/signed dword) $a [ xvel#14 yvel_init#3 ] ( main:2::anim:9 [ xvel#14 yvel_init#3 ] ) always clobbers reg byte a 
-Statement [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@5 [ xvel#14 yvel_init#3 ] ( main:2::anim:9 [ xvel#14 yvel_init#3 ] ) always clobbers reg byte a 
+Statement [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@4 [ xvel#14 yvel_init#3 ] ( main:2::anim:9 [ xvel#14 yvel_init#3 ] ) always clobbers reg byte a 
 Statement [15] (signed word~) yvel#22 ← (signed word) yvel#4 [ xvel#14 yvel#4 yvel#22 ] ( main:2::anim:9 [ xvel#14 yvel#4 yvel#22 ] ) always clobbers reg byte a 
 Statement [17] (signed word) yvel#10 ← (signed word) yvel#9 + (const signed word) g#0 [ yvel#10 xvel#10 yvel_init#11 xpos#9 ypos#10 ] ( main:2::anim:9 [ yvel#10 xvel#10 yvel_init#11 xpos#9 ypos#10 ] ) always clobbers reg byte a 
 Statement [18] (signed word) xpos#10 ← (signed word) xpos#9 + (signed word) xvel#10 [ yvel#10 xpos#10 xvel#10 yvel_init#11 ypos#10 ] ( main:2::anim:9 [ yvel#10 xpos#10 xvel#10 yvel_init#11 ypos#10 ] ) always clobbers reg byte a 
@@ -1656,17 +1662,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label yvel_22 = 6
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-b7_from_bbegin:
-  jmp b7
-//SEG5 @7
-b7:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @7 to main [phi:@7->main]
-main_from_b7:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @7 to @end [phi:@7->@end]
-bend_from_b7:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1674,58 +1680,58 @@ bend:
 main: {
   //SEG11 [5] call init 
     jsr init
-  //SEG12 [6] phi from main to main::@2 [phi:main->main::@2]
-  b2_from_main:
-  //SEG13 [6] phi (signed word) yvel_init#13 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@2#0] -- vwsz1=vbuc1 
+  //SEG12 [6] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG13 [6] phi (signed word) yvel_init#13 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@1#0] -- vwsz1=vbuc1 
     lda #$64
     sta yvel_init
     lda #0
     sta yvel_init+1
-  //SEG14 [6] phi (signed word) xvel#12 = (byte/word/signed word/dword/signed dword) $c8 [phi:main->main::@2#1] -- vwsz1=vbuc1 
+  //SEG14 [6] phi (signed word) xvel#12 = (byte/word/signed word/dword/signed dword) $c8 [phi:main->main::@1#1] -- vwsz1=vbuc1 
     lda #$c8
     sta xvel
     lda #0
     sta xvel+1
-  //SEG15 [6] phi (signed word) ypos#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#2] -- vwsz1=vbuc1 
+  //SEG15 [6] phi (signed word) ypos#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#2] -- vwsz1=vbuc1 
     lda #0
     sta ypos
     lda #0
     sta ypos+1
-  //SEG16 [6] phi (signed word) xpos#12 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#3] -- vwsz1=vbuc1 
+  //SEG16 [6] phi (signed word) xpos#12 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#3] -- vwsz1=vbuc1 
     lda #0
     sta xpos
     lda #0
     sta xpos+1
-  //SEG17 [6] phi (signed word) yvel#12 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@2#4] -- vwsz1=vbuc1 
+  //SEG17 [6] phi (signed word) yvel#12 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@1#4] -- vwsz1=vbuc1 
     lda #$64
     sta yvel_12
     lda #0
     sta yvel_12+1
-    jmp b2
-  //SEG18 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  b2_from_b2:
-    jmp b2
-  //SEG19 main::@2
-  b2:
-  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG18 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+    jmp b1
+  //SEG19 main::@1
+  b1:
+  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b2_from_b2
-  //SEG21 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
-  b3_from_b2:
-    jmp b3
-  //SEG22 main::@3
-  b3:
+    bne b1_from_b1
+  //SEG21 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG22 main::@2
+  b2:
   //SEG23 [9] call anim 
     jsr anim
-  //SEG24 [6] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
-  b2_from_b3:
-  //SEG25 [6] phi (signed word) yvel_init#13 = (signed word) yvel_init#11 [phi:main::@3->main::@2#0] -- register_copy 
-  //SEG26 [6] phi (signed word) xvel#12 = (signed word) xvel#10 [phi:main::@3->main::@2#1] -- register_copy 
-  //SEG27 [6] phi (signed word) ypos#13 = (signed word) ypos#11 [phi:main::@3->main::@2#2] -- register_copy 
-  //SEG28 [6] phi (signed word) xpos#12 = (signed word) xpos#10 [phi:main::@3->main::@2#3] -- register_copy 
-  //SEG29 [6] phi (signed word) yvel#12 = (signed word) yvel#10 [phi:main::@3->main::@2#4] -- register_copy 
-    jmp b2
+  //SEG24 [6] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG25 [6] phi (signed word) yvel_init#13 = (signed word) yvel_init#11 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG26 [6] phi (signed word) xvel#12 = (signed word) xvel#10 [phi:main::@2->main::@1#1] -- register_copy 
+  //SEG27 [6] phi (signed word) ypos#13 = (signed word) ypos#11 [phi:main::@2->main::@1#2] -- register_copy 
+  //SEG28 [6] phi (signed word) xpos#12 = (signed word) xpos#10 [phi:main::@2->main::@1#3] -- register_copy 
+  //SEG29 [6] phi (signed word) yvel#12 = (signed word) yvel#10 [phi:main::@2->main::@1#4] -- register_copy 
+    jmp b1
 }
 //SEG30 anim
 anim: {
@@ -1757,7 +1763,7 @@ anim: {
     bcs !+
     dec yvel_init+1
   !:
-  //SEG35 [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@5 -- vwsz1_ge_vwsc1_then_la1 
+  //SEG35 [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@4 -- vwsz1_ge_vwsc1_then_la1 
     lda yvel_init
     cmp #<-$c8
     lda yvel_init+1
@@ -1765,37 +1771,37 @@ anim: {
     bvc !+
     eor #$80
   !:
-    bpl b5_from_b2
-  //SEG36 [14] phi from anim::@2 to anim::@4 [phi:anim::@2->anim::@4]
-  b4_from_b2:
-  //SEG37 [14] phi (signed word) yvel#4 = (byte/word/signed word/dword/signed dword) $c8 [phi:anim::@2->anim::@4#0] -- vwsz1=vbuc1 
+    bpl b4_from_b2
+  //SEG36 [14] phi from anim::@2 to anim::@3 [phi:anim::@2->anim::@3]
+  b3_from_b2:
+  //SEG37 [14] phi (signed word) yvel#4 = (byte/word/signed word/dword/signed dword) $c8 [phi:anim::@2->anim::@3#0] -- vwsz1=vbuc1 
     lda #$c8
     sta yvel
     lda #0
     sta yvel+1
-    jmp b4
-  //SEG38 anim::@4
-  b4:
+    jmp b3
+  //SEG38 anim::@3
+  b3:
   //SEG39 [15] (signed word~) yvel#22 ← (signed word) yvel#4 -- vwsz1=vwsz2 
     lda yvel
     sta yvel_22
     lda yvel+1
     sta yvel_22+1
-  //SEG40 [16] phi from anim::@4 to anim::@1 [phi:anim::@4->anim::@1]
-  b1_from_b4:
-  //SEG41 [16] phi (signed word) yvel_init#11 = (signed word) yvel#4 [phi:anim::@4->anim::@1#0] -- register_copy 
-  //SEG42 [16] phi (signed word) ypos#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@4->anim::@1#1] -- vwsz1=vbuc1 
+  //SEG40 [16] phi from anim::@3 to anim::@1 [phi:anim::@3->anim::@1]
+  b1_from_b3:
+  //SEG41 [16] phi (signed word) yvel_init#11 = (signed word) yvel#4 [phi:anim::@3->anim::@1#0] -- register_copy 
+  //SEG42 [16] phi (signed word) ypos#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@1#1] -- vwsz1=vbuc1 
     lda #0
     sta ypos
     lda #0
     sta ypos+1
-  //SEG43 [16] phi (signed word) xvel#10 = (signed word) xvel#14 [phi:anim::@4->anim::@1#2] -- register_copy 
-  //SEG44 [16] phi (signed word) xpos#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@4->anim::@1#3] -- vwsz1=vbuc1 
+  //SEG43 [16] phi (signed word) xvel#10 = (signed word) xvel#14 [phi:anim::@3->anim::@1#2] -- register_copy 
+  //SEG44 [16] phi (signed word) xpos#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@1#3] -- vwsz1=vbuc1 
     lda #0
     sta xpos
     lda #0
     sta xpos+1
-  //SEG45 [16] phi (signed word) yvel#9 = (signed word~) yvel#22 [phi:anim::@4->anim::@1#4] -- register_copy 
+  //SEG45 [16] phi (signed word) yvel#9 = (signed word~) yvel#22 [phi:anim::@3->anim::@1#4] -- register_copy 
     jmp b1
   //SEG46 [16] phi from anim to anim::@1 [phi:anim->anim::@1]
   b1_from_anim:
@@ -1898,15 +1904,15 @@ anim: {
   breturn:
   //SEG67 [30] return 
     rts
-  //SEG68 [31] phi from anim::@2 to anim::@5 [phi:anim::@2->anim::@5]
-  b5_from_b2:
-    jmp b5
-  //SEG69 anim::@5
-  b5:
-  //SEG70 [14] phi from anim::@5 to anim::@4 [phi:anim::@5->anim::@4]
-  b4_from_b5:
-  //SEG71 [14] phi (signed word) yvel#4 = (signed word) yvel_init#3 [phi:anim::@5->anim::@4#0] -- register_copy 
+  //SEG68 [31] phi from anim::@2 to anim::@4 [phi:anim::@2->anim::@4]
+  b4_from_b2:
     jmp b4
+  //SEG69 anim::@4
+  b4:
+  //SEG70 [14] phi from anim::@4 to anim::@3 [phi:anim::@4->anim::@3]
+  b3_from_b4:
+  //SEG71 [14] phi (signed word) yvel#4 = (signed word) yvel_init#3 [phi:anim::@4->anim::@3#0] -- register_copy 
+    jmp b3
 }
 //SEG72 init
 // Fill and show a sprite, clear the screen
@@ -1963,25 +1969,25 @@ init: {
     lda sc
     cmp #<SCREEN+$3e8
     bne b1_from_b1
-  //SEG88 [43] phi from init::@1 to init::@3 [phi:init::@1->init::@3]
-  b3_from_b1:
-  //SEG89 [43] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@1->init::@3#0] -- vbuxx=vbuc1 
+  //SEG88 [43] phi from init::@1 to init::@2 [phi:init::@1->init::@2]
+  b2_from_b1:
+  //SEG89 [43] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@1->init::@2#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b3
-  //SEG90 [43] phi from init::@3 to init::@3 [phi:init::@3->init::@3]
-  b3_from_b3:
-  //SEG91 [43] phi (byte) init::i#2 = (byte) init::i#1 [phi:init::@3->init::@3#0] -- register_copy 
-    jmp b3
-  //SEG92 init::@3
-  b3:
+    jmp b2
+  //SEG90 [43] phi from init::@2 to init::@2 [phi:init::@2->init::@2]
+  b2_from_b2:
+  //SEG91 [43] phi (byte) init::i#2 = (byte) init::i#1 [phi:init::@2->init::@2#0] -- register_copy 
+    jmp b2
+  //SEG92 init::@2
+  b2:
   //SEG93 [44] *((const byte*) SPRITE#0 + (byte) init::i#2) ← (byte/word/signed word/dword/signed dword) $ff -- pbuc1_derefidx_vbuxx=vbuc2 
     lda #$ff
     sta SPRITE,x
   //SEG94 [45] (byte) init::i#1 ← ++ (byte) init::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG95 [46] if((byte) init::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto init::@3 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG95 [46] if((byte) init::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto init::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$40
-    bne b3_from_b3
+    bne b2_from_b2
     jmp breturn
   //SEG96 init::@return
   breturn:
@@ -1990,17 +1996,17 @@ init: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b7
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
@@ -2013,54 +2019,54 @@ Removing instruction lda #0
 Removing instruction lda #0
 Removing instruction lda #$64
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b2_from_b2 with b2
+Replacing label b1_from_b1 with b1
 Replacing label b1_from_anim with b1
-Replacing label b5_from_b2 with b5
+Replacing label b4_from_b2 with b4
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Replacing label b3_from_b3 with b3
-Removing instruction b7_from_bbegin:
-Removing instruction b7:
-Removing instruction main_from_b7:
-Removing instruction bend_from_b7:
-Removing instruction b2_from_b2:
-Removing instruction b3_from_b2:
-Removing instruction b1_from_anim:
-Removing instruction b5_from_b2:
-Removing instruction b4_from_b5:
+Replacing label b2_from_b2 with b2
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b1:
-Removing instruction b3_from_b3:
+Removing instruction b2_from_b1:
+Removing instruction b1_from_anim:
+Removing instruction b4_from_b2:
+Removing instruction b3_from_b4:
+Removing instruction b1_from_b1:
+Removing instruction b2_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b2_from_main:
-Removing instruction b3:
-Removing instruction b2_from_b3:
+Removing instruction b1_from_main:
 Removing instruction b2:
-Removing instruction b4_from_b2:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b2:
+Removing instruction b2:
+Removing instruction b3_from_b2:
+Removing instruction b1_from_b3:
 Removing instruction breturn:
 Removing instruction b1_from_init:
-Removing instruction b3_from_b1:
+Removing instruction b2_from_b1:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b4 in bpl b5
+Skipping double jump to b3 in bpl b4
 Succesful ASM optimization Pass5DoubleJumpElimination
+Removing instruction jmp b1
+Removing instruction jmp b1
+Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b1
-Removing instruction jmp b1
-Removing instruction jmp b3
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
-Removing instruction b5:
+Removing instruction b4:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Removing unreachable instruction jmp b4
+Removing unreachable instruction jmp b3
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @7
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -2165,8 +2171,8 @@ FINAL SYMBOL TABLE
 (byte~) anim::$9 reg byte a 4.0
 (label) anim::@1
 (label) anim::@2
+(label) anim::@3
 (label) anim::@4
-(label) anim::@5
 (label) anim::@return
 (signed word) anim::sprite_x
 (signed word) anim::sprite_x#0 sprite_x zp ZP_WORD:12 0.8571428571428571
@@ -2176,7 +2182,7 @@ FINAL SYMBOL TABLE
 (const signed word) g#0 g = -(byte/signed byte/word/signed word/dword/signed dword) 5
 (void()) init()
 (label) init::@1
-(label) init::@3
+(label) init::@2
 (label) init::@return
 (byte) init::i
 (byte) init::i#1 reg byte x 16.5
@@ -2185,8 +2191,8 @@ FINAL SYMBOL TABLE
 (byte*) init::sc#1 sc zp ZP_WORD:2 16.5
 (byte*) init::sc#2 sc zp ZP_WORD:2 16.5
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@3
 (signed word) xpos
 (signed word) xpos#10 xpos zp ZP_WORD:8 1.0714285714285714
 (signed word) xpos#12 xpos zp ZP_WORD:8 3.25
@@ -2255,56 +2261,56 @@ Score: 6416
   .label yvel_12 = 6
   .label yvel_22 = 6
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @7 [phi:@begin->@7]
-//SEG5 @7
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @7 to main [phi:@7->main]
-//SEG8 [3] phi from @7 to @end [phi:@7->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] call init 
     jsr init
-  //SEG12 [6] phi from main to main::@2 [phi:main->main::@2]
-  //SEG13 [6] phi (signed word) yvel_init#13 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@2#0] -- vwsz1=vbuc1 
+  //SEG12 [6] phi from main to main::@1 [phi:main->main::@1]
+  //SEG13 [6] phi (signed word) yvel_init#13 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@1#0] -- vwsz1=vbuc1 
     lda #$64
     sta yvel_init
     lda #0
     sta yvel_init+1
-  //SEG14 [6] phi (signed word) xvel#12 = (byte/word/signed word/dword/signed dword) $c8 [phi:main->main::@2#1] -- vwsz1=vbuc1 
+  //SEG14 [6] phi (signed word) xvel#12 = (byte/word/signed word/dword/signed dword) $c8 [phi:main->main::@1#1] -- vwsz1=vbuc1 
     lda #$c8
     sta xvel
     lda #0
     sta xvel+1
-  //SEG15 [6] phi (signed word) ypos#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#2] -- vwsz1=vbuc1 
+  //SEG15 [6] phi (signed word) ypos#13 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#2] -- vwsz1=vbuc1 
     sta ypos
     sta ypos+1
-  //SEG16 [6] phi (signed word) xpos#12 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#3] -- vwsz1=vbuc1 
+  //SEG16 [6] phi (signed word) xpos#12 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#3] -- vwsz1=vbuc1 
     sta xpos
     sta xpos+1
-  //SEG17 [6] phi (signed word) yvel#12 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@2#4] -- vwsz1=vbuc1 
+  //SEG17 [6] phi (signed word) yvel#12 = (byte/signed byte/word/signed word/dword/signed dword) $64 [phi:main->main::@1#4] -- vwsz1=vbuc1 
     lda #$64
     sta yvel_12
     lda #0
     sta yvel_12+1
-  //SEG18 [6] phi from main::@2 to main::@2 [phi:main::@2->main::@2]
-  //SEG19 main::@2
-  b2:
-  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@2 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG18 [6] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  //SEG19 main::@1
+  b1:
+  //SEG20 [7] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b2
-  //SEG21 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
-  //SEG22 main::@3
+    bne b1
+  //SEG21 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG22 main::@2
   //SEG23 [9] call anim 
     jsr anim
-  //SEG24 [6] phi from main::@3 to main::@2 [phi:main::@3->main::@2]
-  //SEG25 [6] phi (signed word) yvel_init#13 = (signed word) yvel_init#11 [phi:main::@3->main::@2#0] -- register_copy 
-  //SEG26 [6] phi (signed word) xvel#12 = (signed word) xvel#10 [phi:main::@3->main::@2#1] -- register_copy 
-  //SEG27 [6] phi (signed word) ypos#13 = (signed word) ypos#11 [phi:main::@3->main::@2#2] -- register_copy 
-  //SEG28 [6] phi (signed word) xpos#12 = (signed word) xpos#10 [phi:main::@3->main::@2#3] -- register_copy 
-  //SEG29 [6] phi (signed word) yvel#12 = (signed word) yvel#10 [phi:main::@3->main::@2#4] -- register_copy 
-    jmp b2
+  //SEG24 [6] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  //SEG25 [6] phi (signed word) yvel_init#13 = (signed word) yvel_init#11 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG26 [6] phi (signed word) xvel#12 = (signed word) xvel#10 [phi:main::@2->main::@1#1] -- register_copy 
+  //SEG27 [6] phi (signed word) ypos#13 = (signed word) ypos#11 [phi:main::@2->main::@1#2] -- register_copy 
+  //SEG28 [6] phi (signed word) xpos#12 = (signed word) xpos#10 [phi:main::@2->main::@1#3] -- register_copy 
+  //SEG29 [6] phi (signed word) yvel#12 = (signed word) yvel#10 [phi:main::@2->main::@1#4] -- register_copy 
+    jmp b1
 }
 //SEG30 anim
 anim: {
@@ -2334,7 +2340,7 @@ anim: {
     bcs !+
     dec yvel_init+1
   !:
-  //SEG35 [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@5 -- vwsz1_ge_vwsc1_then_la1 
+  //SEG35 [13] if((signed word) yvel_init#3>=-(byte/word/signed word/dword/signed dword) $c8) goto anim::@4 -- vwsz1_ge_vwsc1_then_la1 
     lda yvel_init
     cmp #<-$c8
     lda yvel_init+1
@@ -2342,31 +2348,31 @@ anim: {
     bvc !+
     eor #$80
   !:
-    bpl b4
-  //SEG36 [14] phi from anim::@2 to anim::@4 [phi:anim::@2->anim::@4]
-  //SEG37 [14] phi (signed word) yvel#4 = (byte/word/signed word/dword/signed dword) $c8 [phi:anim::@2->anim::@4#0] -- vwsz1=vbuc1 
+    bpl b3
+  //SEG36 [14] phi from anim::@2 to anim::@3 [phi:anim::@2->anim::@3]
+  //SEG37 [14] phi (signed word) yvel#4 = (byte/word/signed word/dword/signed dword) $c8 [phi:anim::@2->anim::@3#0] -- vwsz1=vbuc1 
     lda #$c8
     sta yvel
     lda #0
     sta yvel+1
-  //SEG38 anim::@4
-  b4:
+  //SEG38 anim::@3
+  b3:
   //SEG39 [15] (signed word~) yvel#22 ← (signed word) yvel#4 -- vwsz1=vwsz2 
     lda yvel
     sta yvel_22
     lda yvel+1
     sta yvel_22+1
-  //SEG40 [16] phi from anim::@4 to anim::@1 [phi:anim::@4->anim::@1]
-  //SEG41 [16] phi (signed word) yvel_init#11 = (signed word) yvel#4 [phi:anim::@4->anim::@1#0] -- register_copy 
-  //SEG42 [16] phi (signed word) ypos#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@4->anim::@1#1] -- vwsz1=vbuc1 
+  //SEG40 [16] phi from anim::@3 to anim::@1 [phi:anim::@3->anim::@1]
+  //SEG41 [16] phi (signed word) yvel_init#11 = (signed word) yvel#4 [phi:anim::@3->anim::@1#0] -- register_copy 
+  //SEG42 [16] phi (signed word) ypos#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@1#1] -- vwsz1=vbuc1 
     lda #0
     sta ypos
     sta ypos+1
-  //SEG43 [16] phi (signed word) xvel#10 = (signed word) xvel#14 [phi:anim::@4->anim::@1#2] -- register_copy 
-  //SEG44 [16] phi (signed word) xpos#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@4->anim::@1#3] -- vwsz1=vbuc1 
+  //SEG43 [16] phi (signed word) xvel#10 = (signed word) xvel#14 [phi:anim::@3->anim::@1#2] -- register_copy 
+  //SEG44 [16] phi (signed word) xpos#9 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:anim::@3->anim::@1#3] -- vwsz1=vbuc1 
     sta xpos
     sta xpos+1
-  //SEG45 [16] phi (signed word) yvel#9 = (signed word~) yvel#22 [phi:anim::@4->anim::@1#4] -- register_copy 
+  //SEG45 [16] phi (signed word) yvel#9 = (signed word~) yvel#22 [phi:anim::@3->anim::@1#4] -- register_copy 
   //SEG46 [16] phi from anim to anim::@1 [phi:anim->anim::@1]
   //SEG47 [16] phi (signed word) yvel_init#11 = (signed word) yvel_init#13 [phi:anim->anim::@1#0] -- register_copy 
   //SEG48 [16] phi (signed word) ypos#10 = (signed word) ypos#13 [phi:anim->anim::@1#1] -- register_copy 
@@ -2464,10 +2470,10 @@ anim: {
   //SEG66 anim::@return
   //SEG67 [30] return 
     rts
-  //SEG68 [31] phi from anim::@2 to anim::@5 [phi:anim::@2->anim::@5]
-  //SEG69 anim::@5
-  //SEG70 [14] phi from anim::@5 to anim::@4 [phi:anim::@5->anim::@4]
-  //SEG71 [14] phi (signed word) yvel#4 = (signed word) yvel_init#3 [phi:anim::@5->anim::@4#0] -- register_copy 
+  //SEG68 [31] phi from anim::@2 to anim::@4 [phi:anim::@2->anim::@4]
+  //SEG69 anim::@4
+  //SEG70 [14] phi from anim::@4 to anim::@3 [phi:anim::@4->anim::@3]
+  //SEG71 [14] phi (signed word) yvel#4 = (signed word) yvel_init#3 [phi:anim::@4->anim::@3#0] -- register_copy 
 }
 //SEG72 init
 // Fill and show a sprite, clear the screen
@@ -2518,21 +2524,21 @@ init: {
     lda sc
     cmp #<SCREEN+$3e8
     bne b1
-  //SEG88 [43] phi from init::@1 to init::@3 [phi:init::@1->init::@3]
-  //SEG89 [43] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@1->init::@3#0] -- vbuxx=vbuc1 
+  //SEG88 [43] phi from init::@1 to init::@2 [phi:init::@1->init::@2]
+  //SEG89 [43] phi (byte) init::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:init::@1->init::@2#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG90 [43] phi from init::@3 to init::@3 [phi:init::@3->init::@3]
-  //SEG91 [43] phi (byte) init::i#2 = (byte) init::i#1 [phi:init::@3->init::@3#0] -- register_copy 
-  //SEG92 init::@3
-  b3:
+  //SEG90 [43] phi from init::@2 to init::@2 [phi:init::@2->init::@2]
+  //SEG91 [43] phi (byte) init::i#2 = (byte) init::i#1 [phi:init::@2->init::@2#0] -- register_copy 
+  //SEG92 init::@2
+  b2:
   //SEG93 [44] *((const byte*) SPRITE#0 + (byte) init::i#2) ← (byte/word/signed word/dword/signed dword) $ff -- pbuc1_derefidx_vbuxx=vbuc2 
     lda #$ff
     sta SPRITE,x
   //SEG94 [45] (byte) init::i#1 ← ++ (byte) init::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG95 [46] if((byte) init::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto init::@3 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG95 [46] if((byte) init::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto init::@2 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$40
-    bne b3
+    bne b2
   //SEG96 init::@return
   //SEG97 [47] return 
     rts
diff --git a/src/test/ref/signed-words.sym b/src/test/ref/signed-words.sym
index 41b3e4115..16c6868b1 100644
--- a/src/test/ref/signed-words.sym
+++ b/src/test/ref/signed-words.sym
@@ -1,4 +1,4 @@
-(label) @7
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -103,8 +103,8 @@
 (byte~) anim::$9 reg byte a 4.0
 (label) anim::@1
 (label) anim::@2
+(label) anim::@3
 (label) anim::@4
-(label) anim::@5
 (label) anim::@return
 (signed word) anim::sprite_x
 (signed word) anim::sprite_x#0 sprite_x zp ZP_WORD:12 0.8571428571428571
@@ -114,7 +114,7 @@
 (const signed word) g#0 g = -(byte/signed byte/word/signed word/dword/signed dword) 5
 (void()) init()
 (label) init::@1
-(label) init::@3
+(label) init::@2
 (label) init::@return
 (byte) init::i
 (byte) init::i#1 reg byte x 16.5
@@ -123,8 +123,8 @@
 (byte*) init::sc#1 sc zp ZP_WORD:2 16.5
 (byte*) init::sc#2 sc zp ZP_WORD:2 16.5
 (void()) main()
+(label) main::@1
 (label) main::@2
-(label) main::@3
 (signed word) xpos
 (signed word) xpos#10 xpos zp ZP_WORD:8 1.0714285714285714
 (signed word) xpos#12 xpos zp ZP_WORD:8 3.25
diff --git a/src/test/ref/sinus-basic.asm b/src/test/ref/sinus-basic.asm
index 6e7e9479f..bf19ef5b9 100644
--- a/src/test/ref/sinus-basic.asm
+++ b/src/test/ref/sinus-basic.asm
@@ -65,9 +65,9 @@ main: {
     inc i
     lda #$1a
     cmp i
-    bne b17
+    bne b15
     rts
-  b17:
+  b15:
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
diff --git a/src/test/ref/sinus-basic.cfg b/src/test/ref/sinus-basic.cfg
index 2ec170c5a..8896864e9 100644
--- a/src/test/ref/sinus-basic.cfg
+++ b/src/test/ref/sinus-basic.cfg
@@ -1,83 +1,83 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@47
-@47: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @47
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @47
+main: scope:[main]  from @1
   [4] phi()
   [5] call setFAC 
-  to:main::@3
-main::@3: scope:[main]  from main
+  to:main::@2
+main::@2: scope:[main]  from main
   [6] phi()
   [7] call divFACby10 
-  to:main::@4
-main::@4: scope:[main]  from main::@3
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [8] phi()
   [9] call setMEMtoFAC 
   to:main::@1
-main::@1: scope:[main]  from main::@17 main::@4
-  [10] (byte*) print_line_cursor#13 ← phi( main::@17/(byte*) print_line_cursor#1 main::@4/((byte*))(word/signed word/dword/signed dword) $400 )
-  [10] (byte*) print_char_cursor#32 ← phi( main::@17/(byte*~) print_char_cursor#49 main::@4/((byte*))(word/signed word/dword/signed dword) $400 )
-  [10] (byte) main::i#10 ← phi( main::@17/(byte) main::i#1 main::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+main::@1: scope:[main]  from main::@15 main::@3
+  [10] (byte*) print_line_cursor#13 ← phi( main::@15/(byte*) print_line_cursor#1 main::@3/((byte*))(word/signed word/dword/signed dword) $400 )
+  [10] (byte*) print_char_cursor#32 ← phi( main::@15/(byte*~) print_char_cursor#49 main::@3/((byte*))(word/signed word/dword/signed dword) $400 )
+  [10] (byte) main::i#10 ← phi( main::@15/(byte) main::i#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [11] (word) setFAC::w#1 ← ((word)) (byte) main::i#10
   [12] call setFAC 
-  to:main::@6
-main::@6: scope:[main]  from main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@1
   [13] phi()
   [14] call mulFACbyMEM 
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [15] phi()
   [16] call setMEMtoFAC 
-  to:main::@8
-main::@8: scope:[main]  from main::@7
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [17] phi()
   [18] call setFAC 
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [19] phi()
   [20] call divMEMbyFAC 
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [21] phi()
   [22] call sinFAC 
-  to:main::@11
-main::@11: scope:[main]  from main::@10
+  to:main::@9
+main::@9: scope:[main]  from main::@8
   [23] phi()
   [24] call mulFACbyMEM 
-  to:main::@12
-main::@12: scope:[main]  from main::@11
+  to:main::@10
+main::@10: scope:[main]  from main::@9
   [25] phi()
   [26] call addMEMtoFAC 
-  to:main::@13
-main::@13: scope:[main]  from main::@12
+  to:main::@11
+main::@11: scope:[main]  from main::@10
   [27] phi()
   [28] call getFAC 
   [29] (word) getFAC::return#2 ← (word) getFAC::return#0
-  to:main::@14
-main::@14: scope:[main]  from main::@13
+  to:main::@12
+main::@12: scope:[main]  from main::@11
   [30] (word) print_word::w#0 ← (word) getFAC::return#2
   [31] call print_word 
-  to:main::@15
-main::@15: scope:[main]  from main::@14
+  to:main::@13
+main::@13: scope:[main]  from main::@12
   [32] phi()
   [33] call print_ln 
-  to:main::@16
-main::@16: scope:[main]  from main::@15
+  to:main::@14
+main::@14: scope:[main]  from main::@13
   [34] (byte) main::i#1 ← ++ (byte) main::i#10
-  [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@17
+  [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@15
   to:main::@return
-main::@return: scope:[main]  from main::@16
+main::@return: scope:[main]  from main::@14
   [36] return 
   to:@return
-main::@17: scope:[main]  from main::@16
+main::@15: scope:[main]  from main::@14
   [37] (byte*~) print_char_cursor#49 ← (byte*) print_line_cursor#1
   to:main::@1
-print_ln: scope:[print_ln]  from main::@15
+print_ln: scope:[print_ln]  from main::@13
   [38] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -88,7 +88,7 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [42] return 
   to:@return
-print_word: scope:[print_word]  from main::@14
+print_word: scope:[print_word]  from main::@12
   [43] (byte) print_byte::b#0 ← > (word) print_word::w#0
   [44] call print_byte 
   to:print_word::@1
@@ -123,14 +123,14 @@ print_char: scope:[print_char]  from print_byte print_byte::@1
 print_char::@return: scope:[print_char]  from print_char
   [59] return 
   to:@return
-getFAC: scope:[getFAC]  from main::@13
+getFAC: scope:[getFAC]  from main::@11
   asm { jsr$b1aa sty$fe sta$ff  }
   [61] (word) getFAC::return#0 ← *((const byte*) memHi#0) w= *((const byte*) memLo#0)
   to:getFAC::@return
 getFAC::@return: scope:[getFAC]  from getFAC
   [62] return 
   to:@return
-addMEMtoFAC: scope:[addMEMtoFAC]  from main::@12
+addMEMtoFAC: scope:[addMEMtoFAC]  from main::@10
   [63] phi()
   [64] call prepareMEM 
   to:addMEMtoFAC::@1
@@ -150,8 +150,8 @@ prepareMEM: scope:[prepareMEM]  from addMEMtoFAC divMEMbyFAC mulFACbyMEM setFAC
 prepareMEM::@return: scope:[prepareMEM]  from prepareMEM
   [72] return 
   to:@return
-mulFACbyMEM: scope:[mulFACbyMEM]  from main::@11 main::@6
-  [73] (byte*) mulFACbyMEM::mem#2 ← phi( main::@11/(const byte[]) main::f_127#0 main::@6/(const byte*) main::f_2pi#0 )
+mulFACbyMEM: scope:[mulFACbyMEM]  from main::@4 main::@9
+  [73] (byte*) mulFACbyMEM::mem#2 ← phi( main::@9/(const byte[]) main::f_127#0 main::@4/(const byte*) main::f_2pi#0 )
   [74] (byte*) prepareMEM::mem#4 ← (byte*) mulFACbyMEM::mem#2
   [75] call prepareMEM 
   to:mulFACbyMEM::@1
@@ -161,13 +161,13 @@ mulFACbyMEM::@1: scope:[mulFACbyMEM]  from mulFACbyMEM
 mulFACbyMEM::@return: scope:[mulFACbyMEM]  from mulFACbyMEM::@1
   [77] return 
   to:@return
-sinFAC: scope:[sinFAC]  from main::@10
+sinFAC: scope:[sinFAC]  from main::@8
   asm { jsr$e26b  }
   to:sinFAC::@return
 sinFAC::@return: scope:[sinFAC]  from sinFAC
   [79] return 
   to:@return
-divMEMbyFAC: scope:[divMEMbyFAC]  from main::@9
+divMEMbyFAC: scope:[divMEMbyFAC]  from main::@7
   [80] phi()
   [81] call prepareMEM 
   to:divMEMbyFAC::@1
@@ -177,8 +177,8 @@ divMEMbyFAC::@1: scope:[divMEMbyFAC]  from divMEMbyFAC
 divMEMbyFAC::@return: scope:[divMEMbyFAC]  from divMEMbyFAC::@1
   [83] return 
   to:@return
-setFAC: scope:[setFAC]  from main main::@1 main::@8
-  [84] (word) setFAC::w#3 ← phi( main/(word/signed word/dword/signed dword) $4fb main::@1/(word) setFAC::w#1 main::@8/(byte/signed byte/word/signed word/dword/signed dword) $19 )
+setFAC: scope:[setFAC]  from main main::@1 main::@6
+  [84] (word) setFAC::w#3 ← phi( main/(word/signed word/dword/signed dword) $4fb main::@1/(word) setFAC::w#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) $19 )
   [85] (byte*~) prepareMEM::mem#7 ← (byte*)(word) setFAC::w#3
   [86] call prepareMEM 
   to:setFAC::@1
@@ -188,8 +188,8 @@ setFAC::@1: scope:[setFAC]  from setFAC
 setFAC::@return: scope:[setFAC]  from setFAC::@1
   [88] return 
   to:@return
-setMEMtoFAC: scope:[setMEMtoFAC]  from main::@4 main::@7
-  [89] (byte*) setMEMtoFAC::mem#2 ← phi( main::@4/(const byte[]) main::f_127#0 main::@7/(const byte[]) main::f_i#0 )
+setMEMtoFAC: scope:[setMEMtoFAC]  from main::@3 main::@5
+  [89] (byte*) setMEMtoFAC::mem#2 ← phi( main::@3/(const byte[]) main::f_127#0 main::@5/(const byte[]) main::f_i#0 )
   [90] (byte*) prepareMEM::mem#1 ← (byte*) setMEMtoFAC::mem#2
   [91] call prepareMEM 
   to:setMEMtoFAC::@1
@@ -199,7 +199,7 @@ setMEMtoFAC::@1: scope:[setMEMtoFAC]  from setMEMtoFAC
 setMEMtoFAC::@return: scope:[setMEMtoFAC]  from setMEMtoFAC::@1
   [93] return 
   to:@return
-divFACby10: scope:[divFACby10]  from main::@3
+divFACby10: scope:[divFACby10]  from main::@2
   asm { jsr$bafe  }
   to:divFACby10::@return
 divFACby10::@return: scope:[divFACby10]  from divFACby10
diff --git a/src/test/ref/sinus-basic.log b/src/test/ref/sinus-basic.log
index 290a2b911..18250d3b0 100644
--- a/src/test/ref/sinus-basic.log
+++ b/src/test/ref/sinus-basic.log
@@ -714,21 +714,36 @@ Coalesced [87] prepareMEM::mem#6 ← prepareMEM::mem#4
 Coalesced [104] prepareMEM::mem#8 ← prepareMEM::mem#1
 Coalesced down to 9 phi equivalence classes
 Culled Empty Block (label) print_ln::@3
+Renumbering block @47 to @1
+Renumbering block main::@3 to main::@2
+Renumbering block main::@4 to main::@3
+Renumbering block main::@6 to main::@4
+Renumbering block main::@7 to main::@5
+Renumbering block main::@8 to main::@6
+Renumbering block main::@9 to main::@7
+Renumbering block main::@10 to main::@8
+Renumbering block main::@11 to main::@9
+Renumbering block main::@12 to main::@10
+Renumbering block main::@13 to main::@11
+Renumbering block main::@14 to main::@12
+Renumbering block main::@15 to main::@13
+Renumbering block main::@16 to main::@14
+Renumbering block main::@17 to main::@15
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @47
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
+Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of main::@3
 Adding NOP phi() at start of main::@4
+Adding NOP phi() at start of main::@5
 Adding NOP phi() at start of main::@6
 Adding NOP phi() at start of main::@7
 Adding NOP phi() at start of main::@8
 Adding NOP phi() at start of main::@9
 Adding NOP phi() at start of main::@10
 Adding NOP phi() at start of main::@11
-Adding NOP phi() at start of main::@12
 Adding NOP phi() at start of main::@13
-Adding NOP phi() at start of main::@15
 Adding NOP phi() at start of print_ln
 Adding NOP phi() at start of addMEMtoFAC
 Adding NOP phi() at start of divMEMbyFAC
@@ -736,84 +751,84 @@ Adding NOP phi() at start of divMEMbyFAC
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@47
-@47: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @47
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @47
+main: scope:[main]  from @1
   [4] phi()
   [5] call setFAC 
-  to:main::@3
-main::@3: scope:[main]  from main
+  to:main::@2
+main::@2: scope:[main]  from main
   [6] phi()
   [7] call divFACby10 
-  to:main::@4
-main::@4: scope:[main]  from main::@3
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [8] phi()
   [9] call setMEMtoFAC 
   to:main::@1
-main::@1: scope:[main]  from main::@17 main::@4
-  [10] (byte*) print_line_cursor#13 ← phi( main::@17/(byte*) print_line_cursor#1 main::@4/((byte*))(word/signed word/dword/signed dword) $400 )
-  [10] (byte*) print_char_cursor#32 ← phi( main::@17/(byte*~) print_char_cursor#49 main::@4/((byte*))(word/signed word/dword/signed dword) $400 )
-  [10] (byte) main::i#10 ← phi( main::@17/(byte) main::i#1 main::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+main::@1: scope:[main]  from main::@15 main::@3
+  [10] (byte*) print_line_cursor#13 ← phi( main::@15/(byte*) print_line_cursor#1 main::@3/((byte*))(word/signed word/dword/signed dword) $400 )
+  [10] (byte*) print_char_cursor#32 ← phi( main::@15/(byte*~) print_char_cursor#49 main::@3/((byte*))(word/signed word/dword/signed dword) $400 )
+  [10] (byte) main::i#10 ← phi( main::@15/(byte) main::i#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [11] (word) setFAC::w#1 ← ((word)) (byte) main::i#10
   [12] call setFAC 
-  to:main::@6
-main::@6: scope:[main]  from main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@1
   [13] phi()
   [14] call mulFACbyMEM 
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [15] phi()
   [16] call setMEMtoFAC 
-  to:main::@8
-main::@8: scope:[main]  from main::@7
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [17] phi()
   [18] call setFAC 
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [19] phi()
   [20] call divMEMbyFAC 
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [21] phi()
   [22] call sinFAC 
-  to:main::@11
-main::@11: scope:[main]  from main::@10
+  to:main::@9
+main::@9: scope:[main]  from main::@8
   [23] phi()
   [24] call mulFACbyMEM 
-  to:main::@12
-main::@12: scope:[main]  from main::@11
+  to:main::@10
+main::@10: scope:[main]  from main::@9
   [25] phi()
   [26] call addMEMtoFAC 
-  to:main::@13
-main::@13: scope:[main]  from main::@12
+  to:main::@11
+main::@11: scope:[main]  from main::@10
   [27] phi()
   [28] call getFAC 
   [29] (word) getFAC::return#2 ← (word) getFAC::return#0
-  to:main::@14
-main::@14: scope:[main]  from main::@13
+  to:main::@12
+main::@12: scope:[main]  from main::@11
   [30] (word) print_word::w#0 ← (word) getFAC::return#2
   [31] call print_word 
-  to:main::@15
-main::@15: scope:[main]  from main::@14
+  to:main::@13
+main::@13: scope:[main]  from main::@12
   [32] phi()
   [33] call print_ln 
-  to:main::@16
-main::@16: scope:[main]  from main::@15
+  to:main::@14
+main::@14: scope:[main]  from main::@13
   [34] (byte) main::i#1 ← ++ (byte) main::i#10
-  [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@17
+  [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@15
   to:main::@return
-main::@return: scope:[main]  from main::@16
+main::@return: scope:[main]  from main::@14
   [36] return 
   to:@return
-main::@17: scope:[main]  from main::@16
+main::@15: scope:[main]  from main::@14
   [37] (byte*~) print_char_cursor#49 ← (byte*) print_line_cursor#1
   to:main::@1
-print_ln: scope:[print_ln]  from main::@15
+print_ln: scope:[print_ln]  from main::@13
   [38] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -824,7 +839,7 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [42] return 
   to:@return
-print_word: scope:[print_word]  from main::@14
+print_word: scope:[print_word]  from main::@12
   [43] (byte) print_byte::b#0 ← > (word) print_word::w#0
   [44] call print_byte 
   to:print_word::@1
@@ -859,14 +874,14 @@ print_char: scope:[print_char]  from print_byte print_byte::@1
 print_char::@return: scope:[print_char]  from print_char
   [59] return 
   to:@return
-getFAC: scope:[getFAC]  from main::@13
+getFAC: scope:[getFAC]  from main::@11
   asm { jsr$b1aa sty$fe sta$ff  }
   [61] (word) getFAC::return#0 ← *((const byte*) memHi#0) w= *((const byte*) memLo#0)
   to:getFAC::@return
 getFAC::@return: scope:[getFAC]  from getFAC
   [62] return 
   to:@return
-addMEMtoFAC: scope:[addMEMtoFAC]  from main::@12
+addMEMtoFAC: scope:[addMEMtoFAC]  from main::@10
   [63] phi()
   [64] call prepareMEM 
   to:addMEMtoFAC::@1
@@ -886,8 +901,8 @@ prepareMEM: scope:[prepareMEM]  from addMEMtoFAC divMEMbyFAC mulFACbyMEM setFAC
 prepareMEM::@return: scope:[prepareMEM]  from prepareMEM
   [72] return 
   to:@return
-mulFACbyMEM: scope:[mulFACbyMEM]  from main::@11 main::@6
-  [73] (byte*) mulFACbyMEM::mem#2 ← phi( main::@11/(const byte[]) main::f_127#0 main::@6/(const byte*) main::f_2pi#0 )
+mulFACbyMEM: scope:[mulFACbyMEM]  from main::@4 main::@9
+  [73] (byte*) mulFACbyMEM::mem#2 ← phi( main::@9/(const byte[]) main::f_127#0 main::@4/(const byte*) main::f_2pi#0 )
   [74] (byte*) prepareMEM::mem#4 ← (byte*) mulFACbyMEM::mem#2
   [75] call prepareMEM 
   to:mulFACbyMEM::@1
@@ -897,13 +912,13 @@ mulFACbyMEM::@1: scope:[mulFACbyMEM]  from mulFACbyMEM
 mulFACbyMEM::@return: scope:[mulFACbyMEM]  from mulFACbyMEM::@1
   [77] return 
   to:@return
-sinFAC: scope:[sinFAC]  from main::@10
+sinFAC: scope:[sinFAC]  from main::@8
   asm { jsr$e26b  }
   to:sinFAC::@return
 sinFAC::@return: scope:[sinFAC]  from sinFAC
   [79] return 
   to:@return
-divMEMbyFAC: scope:[divMEMbyFAC]  from main::@9
+divMEMbyFAC: scope:[divMEMbyFAC]  from main::@7
   [80] phi()
   [81] call prepareMEM 
   to:divMEMbyFAC::@1
@@ -913,8 +928,8 @@ divMEMbyFAC::@1: scope:[divMEMbyFAC]  from divMEMbyFAC
 divMEMbyFAC::@return: scope:[divMEMbyFAC]  from divMEMbyFAC::@1
   [83] return 
   to:@return
-setFAC: scope:[setFAC]  from main main::@1 main::@8
-  [84] (word) setFAC::w#3 ← phi( main/(word/signed word/dword/signed dword) $4fb main::@1/(word) setFAC::w#1 main::@8/(byte/signed byte/word/signed word/dword/signed dword) $19 )
+setFAC: scope:[setFAC]  from main main::@1 main::@6
+  [84] (word) setFAC::w#3 ← phi( main/(word/signed word/dword/signed dword) $4fb main::@1/(word) setFAC::w#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) $19 )
   [85] (byte*~) prepareMEM::mem#7 ← (byte*)(word) setFAC::w#3
   [86] call prepareMEM 
   to:setFAC::@1
@@ -924,8 +939,8 @@ setFAC::@1: scope:[setFAC]  from setFAC
 setFAC::@return: scope:[setFAC]  from setFAC::@1
   [88] return 
   to:@return
-setMEMtoFAC: scope:[setMEMtoFAC]  from main::@4 main::@7
-  [89] (byte*) setMEMtoFAC::mem#2 ← phi( main::@4/(const byte[]) main::f_127#0 main::@7/(const byte[]) main::f_i#0 )
+setMEMtoFAC: scope:[setMEMtoFAC]  from main::@3 main::@5
+  [89] (byte*) setMEMtoFAC::mem#2 ← phi( main::@3/(const byte[]) main::f_127#0 main::@5/(const byte[]) main::f_i#0 )
   [90] (byte*) prepareMEM::mem#1 ← (byte*) setMEMtoFAC::mem#2
   [91] call prepareMEM 
   to:setMEMtoFAC::@1
@@ -935,7 +950,7 @@ setMEMtoFAC::@1: scope:[setMEMtoFAC]  from setMEMtoFAC
 setMEMtoFAC::@return: scope:[setMEMtoFAC]  from setMEMtoFAC::@1
   [93] return 
   to:@return
-divFACby10: scope:[divFACby10]  from main::@3
+divFACby10: scope:[divFACby10]  from main::@2
   asm { jsr$bafe  }
   to:divFACby10::@return
 divFACby10::@return: scope:[divFACby10]  from divFACby10
@@ -1076,17 +1091,17 @@ INITIAL ASM
   .label print_char_cursor = 7
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @47 [phi:@begin->@47]
-b47_from_bbegin:
-  jmp b47
-//SEG5 @47
-b47:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @47 to main [phi:@47->main]
-main_from_b47:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @47 to @end [phi:@47->@end]
-bend_from_b47:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1103,40 +1118,40 @@ main: {
     lda #>$4fb
     sta setFAC.w+1
     jsr setFAC
-  //SEG14 [6] phi from main to main::@3 [phi:main->main::@3]
-  b3_from_main:
-    jmp b3
-  //SEG15 main::@3
-  b3:
+  //SEG14 [6] phi from main to main::@2 [phi:main->main::@2]
+  b2_from_main:
+    jmp b2
+  //SEG15 main::@2
+  b2:
   //SEG16 [7] call divFACby10 
     jsr divFACby10
-  //SEG17 [8] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG18 main::@4
-  b4:
+  //SEG17 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG18 main::@3
+  b3:
   //SEG19 [9] call setMEMtoFAC 
-  //SEG20 [89] phi from main::@4 to setMEMtoFAC [phi:main::@4->setMEMtoFAC]
-  setMEMtoFAC_from_b4:
-  //SEG21 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_127#0 [phi:main::@4->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG20 [89] phi from main::@3 to setMEMtoFAC [phi:main::@3->setMEMtoFAC]
+  setMEMtoFAC_from_b3:
+  //SEG21 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_127#0 [phi:main::@3->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_127
     sta setMEMtoFAC.mem
     lda #>f_127
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG22 [10] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
-  b1_from_b4:
-  //SEG23 [10] phi (byte*) print_line_cursor#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
+  //SEG22 [10] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG23 [10] phi (byte*) print_line_cursor#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@3->main::@1#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG24 [10] phi (byte*) print_char_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@4->main::@1#1] -- pbuz1=pbuc1 
+  //SEG24 [10] phi (byte*) print_char_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@3->main::@1#1] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG25 [10] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@4->main::@1#2] -- vbuz1=vbuc1 
+  //SEG25 [10] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@3->main::@1#2] -- vbuz1=vbuc1 
     lda #1
     sta i
     jmp b1
@@ -1152,92 +1167,92 @@ main: {
   setFAC_from_b1:
   //SEG30 [84] phi (word) setFAC::w#3 = (word) setFAC::w#1 [phi:main::@1->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG31 [13] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  b6_from_b1:
-    jmp b6
-  //SEG32 main::@6
-  b6:
+  //SEG31 [13] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
+  b4_from_b1:
+    jmp b4
+  //SEG32 main::@4
+  b4:
   //SEG33 [14] call mulFACbyMEM 
-  //SEG34 [73] phi from main::@6 to mulFACbyMEM [phi:main::@6->mulFACbyMEM]
-  mulFACbyMEM_from_b6:
-  //SEG35 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) main::f_2pi#0 [phi:main::@6->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG34 [73] phi from main::@4 to mulFACbyMEM [phi:main::@4->mulFACbyMEM]
+  mulFACbyMEM_from_b4:
+  //SEG35 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) main::f_2pi#0 [phi:main::@4->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_2pi
     sta mulFACbyMEM.mem
     lda #>f_2pi
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG36 [15] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG37 main::@7
-  b7:
+  //SEG36 [15] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG37 main::@5
+  b5:
   //SEG38 [16] call setMEMtoFAC 
-  //SEG39 [89] phi from main::@7 to setMEMtoFAC [phi:main::@7->setMEMtoFAC]
-  setMEMtoFAC_from_b7:
-  //SEG40 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_i#0 [phi:main::@7->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG39 [89] phi from main::@5 to setMEMtoFAC [phi:main::@5->setMEMtoFAC]
+  setMEMtoFAC_from_b5:
+  //SEG40 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_i#0 [phi:main::@5->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_i
     sta setMEMtoFAC.mem
     lda #>f_i
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG41 [17] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG42 main::@8
-  b8:
+  //SEG41 [17] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG42 main::@6
+  b6:
   //SEG43 [18] call setFAC 
-  //SEG44 [84] phi from main::@8 to setFAC [phi:main::@8->setFAC]
-  setFAC_from_b8:
-  //SEG45 [84] phi (word) setFAC::w#3 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@8->setFAC#0] -- vwuz1=vbuc1 
+  //SEG44 [84] phi from main::@6 to setFAC [phi:main::@6->setFAC]
+  setFAC_from_b6:
+  //SEG45 [84] phi (word) setFAC::w#3 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@6->setFAC#0] -- vwuz1=vbuc1 
     lda #$19
     sta setFAC.w
     lda #0
     sta setFAC.w+1
     jsr setFAC
-  //SEG46 [19] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG47 main::@9
-  b9:
+  //SEG46 [19] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG47 main::@7
+  b7:
   //SEG48 [20] call divMEMbyFAC 
-  //SEG49 [80] phi from main::@9 to divMEMbyFAC [phi:main::@9->divMEMbyFAC]
-  divMEMbyFAC_from_b9:
+  //SEG49 [80] phi from main::@7 to divMEMbyFAC [phi:main::@7->divMEMbyFAC]
+  divMEMbyFAC_from_b7:
     jsr divMEMbyFAC
-  //SEG50 [21] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG51 main::@10
-  b10:
+  //SEG50 [21] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG51 main::@8
+  b8:
   //SEG52 [22] call sinFAC 
     jsr sinFAC
-  //SEG53 [23] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG54 main::@11
-  b11:
+  //SEG53 [23] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG54 main::@9
+  b9:
   //SEG55 [24] call mulFACbyMEM 
-  //SEG56 [73] phi from main::@11 to mulFACbyMEM [phi:main::@11->mulFACbyMEM]
-  mulFACbyMEM_from_b11:
-  //SEG57 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) main::f_127#0 [phi:main::@11->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG56 [73] phi from main::@9 to mulFACbyMEM [phi:main::@9->mulFACbyMEM]
+  mulFACbyMEM_from_b9:
+  //SEG57 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) main::f_127#0 [phi:main::@9->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_127
     sta mulFACbyMEM.mem
     lda #>f_127
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG58 [25] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG59 main::@12
-  b12:
+  //SEG58 [25] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG59 main::@10
+  b10:
   //SEG60 [26] call addMEMtoFAC 
-  //SEG61 [63] phi from main::@12 to addMEMtoFAC [phi:main::@12->addMEMtoFAC]
-  addMEMtoFAC_from_b12:
+  //SEG61 [63] phi from main::@10 to addMEMtoFAC [phi:main::@10->addMEMtoFAC]
+  addMEMtoFAC_from_b10:
     jsr addMEMtoFAC
-  //SEG62 [27] phi from main::@12 to main::@13 [phi:main::@12->main::@13]
-  b13_from_b12:
-    jmp b13
-  //SEG63 main::@13
-  b13:
+  //SEG62 [27] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
+  b11_from_b10:
+    jmp b11
+  //SEG63 main::@11
+  b11:
   //SEG64 [28] call getFAC 
     jsr getFAC
   //SEG65 [29] (word) getFAC::return#2 ← (word) getFAC::return#0 -- vwuz1=vwuz2 
@@ -1245,9 +1260,9 @@ main: {
     sta getFAC.return_2
     lda getFAC.return+1
     sta getFAC.return_2+1
-    jmp b14
-  //SEG66 main::@14
-  b14:
+    jmp b12
+  //SEG66 main::@12
+  b12:
   //SEG67 [30] (word) print_word::w#0 ← (word) getFAC::return#2 -- vwuz1=vwuz2 
     lda getFAC.return_2
     sta print_word.w
@@ -1255,41 +1270,41 @@ main: {
     sta print_word.w+1
   //SEG68 [31] call print_word 
     jsr print_word
-  //SEG69 [32] phi from main::@14 to main::@15 [phi:main::@14->main::@15]
-  b15_from_b14:
-    jmp b15
-  //SEG70 main::@15
-  b15:
+  //SEG69 [32] phi from main::@12 to main::@13 [phi:main::@12->main::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG70 main::@13
+  b13:
   //SEG71 [33] call print_ln 
-  //SEG72 [38] phi from main::@15 to print_ln [phi:main::@15->print_ln]
-  print_ln_from_b15:
+  //SEG72 [38] phi from main::@13 to print_ln [phi:main::@13->print_ln]
+  print_ln_from_b13:
     jsr print_ln
-    jmp b16
-  //SEG73 main::@16
-  b16:
+    jmp b14
+  //SEG73 main::@14
+  b14:
   //SEG74 [34] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG75 [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@17 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG75 [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@15 -- vbuz1_neq_vbuc1_then_la1 
     lda #$1a
     cmp i
-    bne b17
+    bne b15
     jmp breturn
   //SEG76 main::@return
   breturn:
   //SEG77 [36] return 
     rts
-  //SEG78 main::@17
-  b17:
+  //SEG78 main::@15
+  b15:
   //SEG79 [37] (byte*~) print_char_cursor#49 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG80 [10] phi from main::@17 to main::@1 [phi:main::@17->main::@1]
-  b1_from_b17:
-  //SEG81 [10] phi (byte*) print_line_cursor#13 = (byte*) print_line_cursor#1 [phi:main::@17->main::@1#0] -- register_copy 
-  //SEG82 [10] phi (byte*) print_char_cursor#32 = (byte*~) print_char_cursor#49 [phi:main::@17->main::@1#1] -- register_copy 
-  //SEG83 [10] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@17->main::@1#2] -- register_copy 
+  //SEG80 [10] phi from main::@15 to main::@1 [phi:main::@15->main::@1]
+  b1_from_b15:
+  //SEG81 [10] phi (byte*) print_line_cursor#13 = (byte*) print_line_cursor#1 [phi:main::@15->main::@1#0] -- register_copy 
+  //SEG82 [10] phi (byte*) print_char_cursor#32 = (byte*~) print_char_cursor#49 [phi:main::@15->main::@1#1] -- register_copy 
+  //SEG83 [10] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@15->main::@1#2] -- register_copy 
     jmp b1
     f_i: .byte 0, 0, 0, 0, 0
     f_127: .byte 0, 0, 0, 0, 0
@@ -1677,7 +1692,7 @@ Statement asm { jsr$bafe  } always clobbers reg byte a reg byte x reg byte y
 Statement [11] (word) setFAC::w#1 ← ((word)) (byte) main::i#10 [ main::i#10 print_char_cursor#32 print_line_cursor#13 setFAC::w#1 ] ( main:2 [ main::i#10 print_char_cursor#32 print_line_cursor#13 setFAC::w#1 ] ) always clobbers reg byte a 
 Statement [29] (word) getFAC::return#2 ← (word) getFAC::return#0 [ main::i#10 print_char_cursor#32 print_line_cursor#13 getFAC::return#2 ] ( main:2 [ main::i#10 print_char_cursor#32 print_line_cursor#13 getFAC::return#2 ] ) always clobbers reg byte a 
 Statement [30] (word) print_word::w#0 ← (word) getFAC::return#2 [ main::i#10 print_char_cursor#32 print_line_cursor#13 print_word::w#0 ] ( main:2 [ main::i#10 print_char_cursor#32 print_line_cursor#13 print_word::w#0 ] ) always clobbers reg byte a 
-Statement [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@17 [ main::i#1 print_line_cursor#1 ] ( main:2 [ main::i#1 print_line_cursor#1 ] ) always clobbers reg byte a 
+Statement [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@15 [ main::i#1 print_line_cursor#1 ] ( main:2 [ main::i#1 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [37] (byte*~) print_char_cursor#49 ← (byte*) print_line_cursor#1 [ main::i#1 print_char_cursor#49 print_line_cursor#1 ] ( main:2 [ main::i#1 print_char_cursor#49 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [40] (byte*) print_line_cursor#1 ← (byte*) print_line_cursor#6 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#1 print_char_cursor#10 ] ( main:2::print_ln:33 [ main::i#10 print_line_cursor#1 print_char_cursor#10 ] ) always clobbers reg byte a 
 Statement [41] if((byte*) print_line_cursor#1<(byte*) print_char_cursor#10) goto print_ln::@1 [ print_line_cursor#1 print_char_cursor#10 ] ( main:2::print_ln:33 [ main::i#10 print_line_cursor#1 print_char_cursor#10 ] ) always clobbers reg byte a 
@@ -1772,17 +1787,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_char_cursor = 5
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @47 [phi:@begin->@47]
-b47_from_bbegin:
-  jmp b47
-//SEG5 @47
-b47:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @47 to main [phi:@47->main]
-main_from_b47:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @47 to @end [phi:@47->@end]
-bend_from_b47:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1799,40 +1814,40 @@ main: {
     lda #>$4fb
     sta setFAC.w+1
     jsr setFAC
-  //SEG14 [6] phi from main to main::@3 [phi:main->main::@3]
-  b3_from_main:
-    jmp b3
-  //SEG15 main::@3
-  b3:
+  //SEG14 [6] phi from main to main::@2 [phi:main->main::@2]
+  b2_from_main:
+    jmp b2
+  //SEG15 main::@2
+  b2:
   //SEG16 [7] call divFACby10 
     jsr divFACby10
-  //SEG17 [8] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG18 main::@4
-  b4:
+  //SEG17 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG18 main::@3
+  b3:
   //SEG19 [9] call setMEMtoFAC 
-  //SEG20 [89] phi from main::@4 to setMEMtoFAC [phi:main::@4->setMEMtoFAC]
-  setMEMtoFAC_from_b4:
-  //SEG21 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_127#0 [phi:main::@4->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG20 [89] phi from main::@3 to setMEMtoFAC [phi:main::@3->setMEMtoFAC]
+  setMEMtoFAC_from_b3:
+  //SEG21 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_127#0 [phi:main::@3->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_127
     sta setMEMtoFAC.mem
     lda #>f_127
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG22 [10] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
-  b1_from_b4:
-  //SEG23 [10] phi (byte*) print_line_cursor#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
+  //SEG22 [10] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG23 [10] phi (byte*) print_line_cursor#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@3->main::@1#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG24 [10] phi (byte*) print_char_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@4->main::@1#1] -- pbuz1=pbuc1 
+  //SEG24 [10] phi (byte*) print_char_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@3->main::@1#1] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG25 [10] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@4->main::@1#2] -- vbuz1=vbuc1 
+  //SEG25 [10] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@3->main::@1#2] -- vbuz1=vbuc1 
     lda #1
     sta i
     jmp b1
@@ -1848,136 +1863,136 @@ main: {
   setFAC_from_b1:
   //SEG30 [84] phi (word) setFAC::w#3 = (word) setFAC::w#1 [phi:main::@1->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG31 [13] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  b6_from_b1:
-    jmp b6
-  //SEG32 main::@6
-  b6:
+  //SEG31 [13] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
+  b4_from_b1:
+    jmp b4
+  //SEG32 main::@4
+  b4:
   //SEG33 [14] call mulFACbyMEM 
-  //SEG34 [73] phi from main::@6 to mulFACbyMEM [phi:main::@6->mulFACbyMEM]
-  mulFACbyMEM_from_b6:
-  //SEG35 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) main::f_2pi#0 [phi:main::@6->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG34 [73] phi from main::@4 to mulFACbyMEM [phi:main::@4->mulFACbyMEM]
+  mulFACbyMEM_from_b4:
+  //SEG35 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) main::f_2pi#0 [phi:main::@4->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_2pi
     sta mulFACbyMEM.mem
     lda #>f_2pi
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG36 [15] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG37 main::@7
-  b7:
+  //SEG36 [15] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG37 main::@5
+  b5:
   //SEG38 [16] call setMEMtoFAC 
-  //SEG39 [89] phi from main::@7 to setMEMtoFAC [phi:main::@7->setMEMtoFAC]
-  setMEMtoFAC_from_b7:
-  //SEG40 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_i#0 [phi:main::@7->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG39 [89] phi from main::@5 to setMEMtoFAC [phi:main::@5->setMEMtoFAC]
+  setMEMtoFAC_from_b5:
+  //SEG40 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_i#0 [phi:main::@5->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_i
     sta setMEMtoFAC.mem
     lda #>f_i
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG41 [17] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG42 main::@8
-  b8:
+  //SEG41 [17] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG42 main::@6
+  b6:
   //SEG43 [18] call setFAC 
-  //SEG44 [84] phi from main::@8 to setFAC [phi:main::@8->setFAC]
-  setFAC_from_b8:
-  //SEG45 [84] phi (word) setFAC::w#3 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@8->setFAC#0] -- vwuz1=vbuc1 
+  //SEG44 [84] phi from main::@6 to setFAC [phi:main::@6->setFAC]
+  setFAC_from_b6:
+  //SEG45 [84] phi (word) setFAC::w#3 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@6->setFAC#0] -- vwuz1=vbuc1 
     lda #$19
     sta setFAC.w
     lda #0
     sta setFAC.w+1
     jsr setFAC
-  //SEG46 [19] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG47 main::@9
-  b9:
+  //SEG46 [19] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG47 main::@7
+  b7:
   //SEG48 [20] call divMEMbyFAC 
-  //SEG49 [80] phi from main::@9 to divMEMbyFAC [phi:main::@9->divMEMbyFAC]
-  divMEMbyFAC_from_b9:
+  //SEG49 [80] phi from main::@7 to divMEMbyFAC [phi:main::@7->divMEMbyFAC]
+  divMEMbyFAC_from_b7:
     jsr divMEMbyFAC
-  //SEG50 [21] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG51 main::@10
-  b10:
+  //SEG50 [21] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG51 main::@8
+  b8:
   //SEG52 [22] call sinFAC 
     jsr sinFAC
-  //SEG53 [23] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG54 main::@11
-  b11:
+  //SEG53 [23] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG54 main::@9
+  b9:
   //SEG55 [24] call mulFACbyMEM 
-  //SEG56 [73] phi from main::@11 to mulFACbyMEM [phi:main::@11->mulFACbyMEM]
-  mulFACbyMEM_from_b11:
-  //SEG57 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) main::f_127#0 [phi:main::@11->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG56 [73] phi from main::@9 to mulFACbyMEM [phi:main::@9->mulFACbyMEM]
+  mulFACbyMEM_from_b9:
+  //SEG57 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) main::f_127#0 [phi:main::@9->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_127
     sta mulFACbyMEM.mem
     lda #>f_127
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG58 [25] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG59 main::@12
-  b12:
+  //SEG58 [25] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG59 main::@10
+  b10:
   //SEG60 [26] call addMEMtoFAC 
-  //SEG61 [63] phi from main::@12 to addMEMtoFAC [phi:main::@12->addMEMtoFAC]
-  addMEMtoFAC_from_b12:
+  //SEG61 [63] phi from main::@10 to addMEMtoFAC [phi:main::@10->addMEMtoFAC]
+  addMEMtoFAC_from_b10:
     jsr addMEMtoFAC
-  //SEG62 [27] phi from main::@12 to main::@13 [phi:main::@12->main::@13]
-  b13_from_b12:
-    jmp b13
-  //SEG63 main::@13
-  b13:
+  //SEG62 [27] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
+  b11_from_b10:
+    jmp b11
+  //SEG63 main::@11
+  b11:
   //SEG64 [28] call getFAC 
     jsr getFAC
   //SEG65 [29] (word) getFAC::return#2 ← (word) getFAC::return#0
-    jmp b14
-  //SEG66 main::@14
-  b14:
+    jmp b12
+  //SEG66 main::@12
+  b12:
   //SEG67 [30] (word) print_word::w#0 ← (word) getFAC::return#2
   //SEG68 [31] call print_word 
     jsr print_word
-  //SEG69 [32] phi from main::@14 to main::@15 [phi:main::@14->main::@15]
-  b15_from_b14:
-    jmp b15
-  //SEG70 main::@15
-  b15:
+  //SEG69 [32] phi from main::@12 to main::@13 [phi:main::@12->main::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG70 main::@13
+  b13:
   //SEG71 [33] call print_ln 
-  //SEG72 [38] phi from main::@15 to print_ln [phi:main::@15->print_ln]
-  print_ln_from_b15:
+  //SEG72 [38] phi from main::@13 to print_ln [phi:main::@13->print_ln]
+  print_ln_from_b13:
     jsr print_ln
-    jmp b16
-  //SEG73 main::@16
-  b16:
+    jmp b14
+  //SEG73 main::@14
+  b14:
   //SEG74 [34] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG75 [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@17 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG75 [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@15 -- vbuz1_neq_vbuc1_then_la1 
     lda #$1a
     cmp i
-    bne b17
+    bne b15
     jmp breturn
   //SEG76 main::@return
   breturn:
   //SEG77 [36] return 
     rts
-  //SEG78 main::@17
-  b17:
+  //SEG78 main::@15
+  b15:
   //SEG79 [37] (byte*~) print_char_cursor#49 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG80 [10] phi from main::@17 to main::@1 [phi:main::@17->main::@1]
-  b1_from_b17:
-  //SEG81 [10] phi (byte*) print_line_cursor#13 = (byte*) print_line_cursor#1 [phi:main::@17->main::@1#0] -- register_copy 
-  //SEG82 [10] phi (byte*) print_char_cursor#32 = (byte*~) print_char_cursor#49 [phi:main::@17->main::@1#1] -- register_copy 
-  //SEG83 [10] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@17->main::@1#2] -- register_copy 
+  //SEG80 [10] phi from main::@15 to main::@1 [phi:main::@15->main::@1]
+  b1_from_b15:
+  //SEG81 [10] phi (byte*) print_line_cursor#13 = (byte*) print_line_cursor#1 [phi:main::@15->main::@1#0] -- register_copy 
+  //SEG82 [10] phi (byte*) print_char_cursor#32 = (byte*~) print_char_cursor#49 [phi:main::@15->main::@1#1] -- register_copy 
+  //SEG83 [10] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@15->main::@1#2] -- register_copy 
     jmp b1
     f_i: .byte 0, 0, 0, 0, 0
     f_127: .byte 0, 0, 0, 0, 0
@@ -2305,11 +2320,13 @@ divFACby10: {
   print_hextab: .text "0123456789abcdef"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b47
-Removing instruction jmp bend
-Removing instruction jmp b3
-Removing instruction jmp b4
 Removing instruction jmp b1
+Removing instruction jmp bend
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b5
 Removing instruction jmp b6
 Removing instruction jmp b7
 Removing instruction jmp b8
@@ -2319,8 +2336,6 @@ Removing instruction jmp b11
 Removing instruction jmp b12
 Removing instruction jmp b13
 Removing instruction jmp b14
-Removing instruction jmp b15
-Removing instruction jmp b16
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -2346,38 +2361,40 @@ Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b47_from_bbegin:
-Removing instruction b47:
-Removing instruction main_from_b47:
-Removing instruction bend_from_b47:
-Removing instruction b3_from_main:
-Removing instruction b4_from_b3:
-Removing instruction setMEMtoFAC_from_b4:
-Removing instruction b6_from_b1:
-Removing instruction mulFACbyMEM_from_b6:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b2_from_main:
+Removing instruction b3_from_b2:
+Removing instruction setMEMtoFAC_from_b3:
+Removing instruction b4_from_b1:
+Removing instruction mulFACbyMEM_from_b4:
+Removing instruction b5_from_b4:
+Removing instruction setMEMtoFAC_from_b5:
+Removing instruction b6_from_b5:
+Removing instruction setFAC_from_b6:
 Removing instruction b7_from_b6:
-Removing instruction setMEMtoFAC_from_b7:
+Removing instruction divMEMbyFAC_from_b7:
 Removing instruction b8_from_b7:
-Removing instruction setFAC_from_b8:
 Removing instruction b9_from_b8:
-Removing instruction divMEMbyFAC_from_b9:
+Removing instruction mulFACbyMEM_from_b9:
 Removing instruction b10_from_b9:
+Removing instruction addMEMtoFAC_from_b10:
 Removing instruction b11_from_b10:
-Removing instruction mulFACbyMEM_from_b11:
-Removing instruction b12_from_b11:
-Removing instruction addMEMtoFAC_from_b12:
 Removing instruction b13_from_b12:
-Removing instruction b15_from_b14:
-Removing instruction print_ln_from_b15:
+Removing instruction print_ln_from_b13:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction setFAC_from_main:
+Removing instruction b2:
 Removing instruction b3:
-Removing instruction b4:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction setFAC_from_b1:
+Removing instruction b4:
+Removing instruction b5:
 Removing instruction b6:
 Removing instruction b7:
 Removing instruction b8:
@@ -2387,10 +2404,8 @@ Removing instruction b11:
 Removing instruction b12:
 Removing instruction b13:
 Removing instruction b14:
-Removing instruction b15:
-Removing instruction b16:
 Removing instruction breturn:
-Removing instruction b1_from_b17:
+Removing instruction b1_from_b15:
 Removing instruction breturn:
 Removing instruction print_byte_from_print_word:
 Removing instruction b1:
@@ -2428,7 +2443,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @47
+(label) @1
 (label) @begin
 (label) @end
 (void()) addMEMtoFAC((byte*) addMEMtoFAC::mem)
@@ -2455,10 +2470,10 @@ FINAL SYMBOL TABLE
 (label) main::@13
 (label) main::@14
 (label) main::@15
-(label) main::@16
-(label) main::@17
+(label) main::@2
 (label) main::@3
 (label) main::@4
+(label) main::@5
 (label) main::@6
 (label) main::@7
 (label) main::@8
@@ -2568,11 +2583,11 @@ Score: 4965
   .label print_line_cursor = 3
   .label print_char_cursor = 5
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @47 [phi:@begin->@47]
-//SEG5 @47
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @47 to main [phi:@47->main]
-//SEG8 [3] phi from @47 to @end [phi:@47->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -2586,32 +2601,32 @@ main: {
     lda #>$4fb
     sta setFAC.w+1
     jsr setFAC
-  //SEG14 [6] phi from main to main::@3 [phi:main->main::@3]
-  //SEG15 main::@3
+  //SEG14 [6] phi from main to main::@2 [phi:main->main::@2]
+  //SEG15 main::@2
   //SEG16 [7] call divFACby10 
     jsr divFACby10
-  //SEG17 [8] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
-  //SEG18 main::@4
+  //SEG17 [8] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  //SEG18 main::@3
   //SEG19 [9] call setMEMtoFAC 
-  //SEG20 [89] phi from main::@4 to setMEMtoFAC [phi:main::@4->setMEMtoFAC]
-  //SEG21 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_127#0 [phi:main::@4->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG20 [89] phi from main::@3 to setMEMtoFAC [phi:main::@3->setMEMtoFAC]
+  //SEG21 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_127#0 [phi:main::@3->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_127
     sta setMEMtoFAC.mem
     lda #>f_127
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG22 [10] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
-  //SEG23 [10] phi (byte*) print_line_cursor#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
+  //SEG22 [10] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  //SEG23 [10] phi (byte*) print_line_cursor#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@3->main::@1#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG24 [10] phi (byte*) print_char_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@4->main::@1#1] -- pbuz1=pbuc1 
+  //SEG24 [10] phi (byte*) print_char_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@3->main::@1#1] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG25 [10] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@4->main::@1#2] -- vbuz1=vbuc1 
+  //SEG25 [10] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:main::@3->main::@1#2] -- vbuz1=vbuc1 
     lda #1
     sta i
   //SEG26 main::@1
@@ -2625,95 +2640,95 @@ main: {
   //SEG29 [84] phi from main::@1 to setFAC [phi:main::@1->setFAC]
   //SEG30 [84] phi (word) setFAC::w#3 = (word) setFAC::w#1 [phi:main::@1->setFAC#0] -- register_copy 
     jsr setFAC
-  //SEG31 [13] phi from main::@1 to main::@6 [phi:main::@1->main::@6]
-  //SEG32 main::@6
+  //SEG31 [13] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
+  //SEG32 main::@4
   //SEG33 [14] call mulFACbyMEM 
-  //SEG34 [73] phi from main::@6 to mulFACbyMEM [phi:main::@6->mulFACbyMEM]
-  //SEG35 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) main::f_2pi#0 [phi:main::@6->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG34 [73] phi from main::@4 to mulFACbyMEM [phi:main::@4->mulFACbyMEM]
+  //SEG35 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte*) main::f_2pi#0 [phi:main::@4->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_2pi
     sta mulFACbyMEM.mem
     lda #>f_2pi
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG36 [15] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  //SEG37 main::@7
+  //SEG36 [15] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  //SEG37 main::@5
   //SEG38 [16] call setMEMtoFAC 
-  //SEG39 [89] phi from main::@7 to setMEMtoFAC [phi:main::@7->setMEMtoFAC]
-  //SEG40 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_i#0 [phi:main::@7->setMEMtoFAC#0] -- pbuz1=pbuc1 
+  //SEG39 [89] phi from main::@5 to setMEMtoFAC [phi:main::@5->setMEMtoFAC]
+  //SEG40 [89] phi (byte*) setMEMtoFAC::mem#2 = (const byte[]) main::f_i#0 [phi:main::@5->setMEMtoFAC#0] -- pbuz1=pbuc1 
     lda #<f_i
     sta setMEMtoFAC.mem
     lda #>f_i
     sta setMEMtoFAC.mem+1
     jsr setMEMtoFAC
-  //SEG41 [17] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  //SEG42 main::@8
+  //SEG41 [17] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  //SEG42 main::@6
   //SEG43 [18] call setFAC 
-  //SEG44 [84] phi from main::@8 to setFAC [phi:main::@8->setFAC]
-  //SEG45 [84] phi (word) setFAC::w#3 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@8->setFAC#0] -- vwuz1=vbuc1 
+  //SEG44 [84] phi from main::@6 to setFAC [phi:main::@6->setFAC]
+  //SEG45 [84] phi (word) setFAC::w#3 = (byte/signed byte/word/signed word/dword/signed dword) $19 [phi:main::@6->setFAC#0] -- vwuz1=vbuc1 
     lda #$19
     sta setFAC.w
     lda #0
     sta setFAC.w+1
     jsr setFAC
-  //SEG46 [19] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  //SEG47 main::@9
+  //SEG46 [19] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
+  //SEG47 main::@7
   //SEG48 [20] call divMEMbyFAC 
-  //SEG49 [80] phi from main::@9 to divMEMbyFAC [phi:main::@9->divMEMbyFAC]
+  //SEG49 [80] phi from main::@7 to divMEMbyFAC [phi:main::@7->divMEMbyFAC]
     jsr divMEMbyFAC
-  //SEG50 [21] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  //SEG51 main::@10
+  //SEG50 [21] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
+  //SEG51 main::@8
   //SEG52 [22] call sinFAC 
     jsr sinFAC
-  //SEG53 [23] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
-  //SEG54 main::@11
+  //SEG53 [23] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
+  //SEG54 main::@9
   //SEG55 [24] call mulFACbyMEM 
-  //SEG56 [73] phi from main::@11 to mulFACbyMEM [phi:main::@11->mulFACbyMEM]
-  //SEG57 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) main::f_127#0 [phi:main::@11->mulFACbyMEM#0] -- pbuz1=pbuc1 
+  //SEG56 [73] phi from main::@9 to mulFACbyMEM [phi:main::@9->mulFACbyMEM]
+  //SEG57 [73] phi (byte*) mulFACbyMEM::mem#2 = (const byte[]) main::f_127#0 [phi:main::@9->mulFACbyMEM#0] -- pbuz1=pbuc1 
     lda #<f_127
     sta mulFACbyMEM.mem
     lda #>f_127
     sta mulFACbyMEM.mem+1
     jsr mulFACbyMEM
-  //SEG58 [25] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  //SEG59 main::@12
+  //SEG58 [25] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  //SEG59 main::@10
   //SEG60 [26] call addMEMtoFAC 
-  //SEG61 [63] phi from main::@12 to addMEMtoFAC [phi:main::@12->addMEMtoFAC]
+  //SEG61 [63] phi from main::@10 to addMEMtoFAC [phi:main::@10->addMEMtoFAC]
     jsr addMEMtoFAC
-  //SEG62 [27] phi from main::@12 to main::@13 [phi:main::@12->main::@13]
-  //SEG63 main::@13
+  //SEG62 [27] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
+  //SEG63 main::@11
   //SEG64 [28] call getFAC 
     jsr getFAC
   //SEG65 [29] (word) getFAC::return#2 ← (word) getFAC::return#0
-  //SEG66 main::@14
+  //SEG66 main::@12
   //SEG67 [30] (word) print_word::w#0 ← (word) getFAC::return#2
   //SEG68 [31] call print_word 
     jsr print_word
-  //SEG69 [32] phi from main::@14 to main::@15 [phi:main::@14->main::@15]
-  //SEG70 main::@15
+  //SEG69 [32] phi from main::@12 to main::@13 [phi:main::@12->main::@13]
+  //SEG70 main::@13
   //SEG71 [33] call print_ln 
-  //SEG72 [38] phi from main::@15 to print_ln [phi:main::@15->print_ln]
+  //SEG72 [38] phi from main::@13 to print_ln [phi:main::@13->print_ln]
     jsr print_ln
-  //SEG73 main::@16
+  //SEG73 main::@14
   //SEG74 [34] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG75 [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@17 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG75 [35] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $1a) goto main::@15 -- vbuz1_neq_vbuc1_then_la1 
     lda #$1a
     cmp i
-    bne b17
+    bne b15
   //SEG76 main::@return
   //SEG77 [36] return 
     rts
-  //SEG78 main::@17
-  b17:
+  //SEG78 main::@15
+  b15:
   //SEG79 [37] (byte*~) print_char_cursor#49 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG80 [10] phi from main::@17 to main::@1 [phi:main::@17->main::@1]
-  //SEG81 [10] phi (byte*) print_line_cursor#13 = (byte*) print_line_cursor#1 [phi:main::@17->main::@1#0] -- register_copy 
-  //SEG82 [10] phi (byte*) print_char_cursor#32 = (byte*~) print_char_cursor#49 [phi:main::@17->main::@1#1] -- register_copy 
-  //SEG83 [10] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@17->main::@1#2] -- register_copy 
+  //SEG80 [10] phi from main::@15 to main::@1 [phi:main::@15->main::@1]
+  //SEG81 [10] phi (byte*) print_line_cursor#13 = (byte*) print_line_cursor#1 [phi:main::@15->main::@1#0] -- register_copy 
+  //SEG82 [10] phi (byte*) print_char_cursor#32 = (byte*~) print_char_cursor#49 [phi:main::@15->main::@1#1] -- register_copy 
+  //SEG83 [10] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@15->main::@1#2] -- register_copy 
     jmp b1
     f_i: .byte 0, 0, 0, 0, 0
     f_127: .byte 0, 0, 0, 0, 0
diff --git a/src/test/ref/sinus-basic.sym b/src/test/ref/sinus-basic.sym
index 9c04a6f5e..00a665722 100644
--- a/src/test/ref/sinus-basic.sym
+++ b/src/test/ref/sinus-basic.sym
@@ -1,4 +1,4 @@
-(label) @47
+(label) @1
 (label) @begin
 (label) @end
 (void()) addMEMtoFAC((byte*) addMEMtoFAC::mem)
@@ -25,10 +25,10 @@
 (label) main::@13
 (label) main::@14
 (label) main::@15
-(label) main::@16
-(label) main::@17
+(label) main::@2
 (label) main::@3
 (label) main::@4
+(label) main::@5
 (label) main::@6
 (label) main::@7
 (label) main::@8
diff --git a/src/test/ref/sinusgen16.asm b/src/test/ref/sinusgen16.asm
index 7233fd0d6..15d2d2f83 100644
--- a/src/test/ref/sinusgen16.asm
+++ b/src/test/ref/sinusgen16.asm
@@ -483,7 +483,7 @@ mul16u: {
     lda a
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -497,7 +497,7 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  b8:
+  b4:
     clc
     ror a+1
     ror a
diff --git a/src/test/ref/sinusgen16.cfg b/src/test/ref/sinusgen16.cfg
index e55e11dad..679474642 100644
--- a/src/test/ref/sinusgen16.cfg
+++ b/src/test/ref/sinusgen16.cfg
@@ -1,23 +1,23 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@40
-@40: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @40
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @40
+main: scope:[main]  from @1
   [4] phi()
   [5] call sin16s_gen 
-  to:main::@5
-main::@5: scope:[main]  from main
+  to:main::@4
+main::@4: scope:[main]  from main
   [6] phi()
   [7] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main::@5 main::@8
-  [8] (byte*) print_char_cursor#49 ← phi( main::@5/(const byte*) print_line_cursor#0 main::@8/(byte*) print_char_cursor#2 )
-  [8] (signed word*) main::st1#2 ← phi( main::@5/(const signed word[$78]) main::sintab1#0 main::@8/(signed word*) main::st1#1 )
+main::@1: scope:[main]  from main::@4 main::@6
+  [8] (byte*) print_char_cursor#49 ← phi( main::@4/(const byte*) print_line_cursor#0 main::@6/(byte*) print_char_cursor#2 )
+  [8] (signed word*) main::st1#2 ← phi( main::@4/(const signed word[$78]) main::sintab1#0 main::@6/(signed word*) main::st1#1 )
   [9] (signed word) main::sw#0 ← *((signed word*) main::st1#2)
   [10] if((signed word) main::sw#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@3
@@ -29,21 +29,21 @@ main::@2: scope:[main]  from main::@1 main::@3
   [13] (byte*) print_char_cursor#48 ← phi( main::@1/(byte*) print_char_cursor#49 main::@3/(byte*) print_char_cursor#2 )
   [14] (signed word) print_sword::w#1 ← (signed word) main::sw#0
   [15] call print_sword 
-  to:main::@7
-main::@7: scope:[main]  from main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@2
   [16] phi()
   [17] call print_str 
-  to:main::@8
-main::@8: scope:[main]  from main::@7
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [18] (signed word*) main::st1#1 ← (signed word*) main::st1#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [19] if((signed word*) main::st1#1<(const signed word[$78]) main::sintab1#0+(const word) main::wavelength#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@8
+main::@return: scope:[main]  from main::@6
   [20] return 
   to:@return
-print_str: scope:[print_str]  from main::@3 main::@7
-  [21] (byte*) print_char_cursor#51 ← phi( main::@3/(byte*) print_char_cursor#49 main::@7/(byte*) print_char_cursor#12 )
-  [21] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@7/(const string) main::str )
+print_str: scope:[print_str]  from main::@3 main::@5
+  [21] (byte*) print_char_cursor#51 ← phi( main::@3/(byte*) print_char_cursor#49 main::@5/(byte*) print_char_cursor#12 )
+  [21] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@5/(const string) main::str )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [22] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#51 print_str::@2/(byte*) print_char_cursor#1 )
@@ -64,13 +64,13 @@ print_sword: scope:[print_sword]  from main::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [29] phi()
   [30] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [31] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [32] (byte*) print_char_cursor#43 ← phi( print_sword/(byte*) print_char_cursor#48 print_sword::@4/(byte*) print_char_cursor#12 )
-  [32] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [32] (byte*) print_char_cursor#43 ← phi( print_sword/(byte*) print_char_cursor#48 print_sword::@3/(byte*) print_char_cursor#12 )
+  [32] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@3/(signed word) print_sword::w#0 )
   [33] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
@@ -111,7 +111,7 @@ print_char: scope:[print_char]  from print_byte print_byte::@1 print_sword::@2
 print_char::@return: scope:[print_char]  from print_char
   [51] return 
   to:@return
-print_cls: scope:[print_cls]  from main::@5
+print_cls: scope:[print_cls]  from main::@4
   [52] phi()
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -127,19 +127,19 @@ sin16s_gen: scope:[sin16s_gen]  from main
   [58] phi()
   [59] call div32u16u 
   [60] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  to:sin16s_gen::@3
-sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen
+  to:sin16s_gen::@2
+sin16s_gen::@2: scope:[sin16s_gen]  from sin16s_gen
   [61] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
   to:sin16s_gen::@1
-sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@3 sin16s_gen::@4
-  [62] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(word) sin16s_gen::i#1 )
-  [62] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@3/(const signed word[$78]) main::sintab1#0 sin16s_gen::@4/(signed word*) sin16s_gen::sintab#0 )
-  [62] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(dword) sin16s_gen::x#1 )
+sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@2 sin16s_gen::@3
+  [62] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(word) sin16s_gen::i#1 )
+  [62] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@2/(const signed word[$78]) main::sintab1#0 sin16s_gen::@3/(signed word*) sin16s_gen::sintab#0 )
+  [62] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(dword) sin16s_gen::x#1 )
   [63] (dword) sin16s::x#0 ← (dword) sin16s_gen::x#2
   [64] call sin16s 
   [65] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  to:sin16s_gen::@4
-sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
+  to:sin16s_gen::@3
+sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen::@1
   [66] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   [67] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1
   [68] (signed word*) sin16s_gen::sintab#0 ← (signed word*) sin16s_gen::sintab#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
@@ -147,7 +147,7 @@ sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
   [70] (word) sin16s_gen::i#1 ← ++ (word) sin16s_gen::i#2
   [71] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1
   to:sin16s_gen::@return
-sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@4
+sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@3
   [72] return 
   to:@return
 sin16s: scope:[sin16s]  from sin16s_gen::@1
@@ -172,77 +172,77 @@ sin16s::@2: scope:[sin16s]  from sin16s::@1 sin16s::@5
   [82] (word) mulu16_sel::v2#0 ← (word) sin16s::x1#0
   [83] call mulu16_sel 
   [84] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  to:sin16s::@8
-sin16s::@8: scope:[sin16s]  from sin16s::@2
+  to:sin16s::@7
+sin16s::@7: scope:[sin16s]  from sin16s::@2
   [85] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   [86] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   [87] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0
   [88] call mulu16_sel 
   [89] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12
-  to:sin16s::@9
-sin16s::@9: scope:[sin16s]  from sin16s::@8
+  to:sin16s::@8
+sin16s::@8: scope:[sin16s]  from sin16s::@7
   [90] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   [91] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   [92] call mulu16_sel 
   [93] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  to:sin16s::@10
-sin16s::@10: scope:[sin16s]  from sin16s::@9
+  to:sin16s::@9
+sin16s::@9: scope:[sin16s]  from sin16s::@8
   [94] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   [95] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0
   [96] (word) mulu16_sel::v1#3 ← (word) sin16s::x3#0
   [97] (word) mulu16_sel::v2#3 ← (word) sin16s::x1#0
   [98] call mulu16_sel 
   [99] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12
-  to:sin16s::@11
-sin16s::@11: scope:[sin16s]  from sin16s::@10
+  to:sin16s::@10
+sin16s::@10: scope:[sin16s]  from sin16s::@9
   [100] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   [101] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   [102] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0
   [103] call mulu16_sel 
   [104] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  to:sin16s::@12
-sin16s::@12: scope:[sin16s]  from sin16s::@11
+  to:sin16s::@11
+sin16s::@11: scope:[sin16s]  from sin16s::@10
   [105] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   [106] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [107] (word) sin16s::usinx#1 ← (word) sin16s::usinx#0 + (word) sin16s::x5_128#0
-  [108] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15
+  [108] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12
   to:sin16s::@6
-sin16s::@6: scope:[sin16s]  from sin16s::@12
+sin16s::@6: scope:[sin16s]  from sin16s::@11
   [109] (signed word) sin16s::sinx#1 ← - (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-sin16s::@3: scope:[sin16s]  from sin16s::@15 sin16s::@6
-  [110] (signed word) sin16s::return#1 ← phi( sin16s::@15/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
+sin16s::@3: scope:[sin16s]  from sin16s::@12 sin16s::@6
+  [110] (signed word) sin16s::return#1 ← phi( sin16s::@12/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
   to:sin16s::@return
 sin16s::@return: scope:[sin16s]  from sin16s::@3
   [111] return 
   to:@return
-sin16s::@15: scope:[sin16s]  from sin16s::@12
+sin16s::@12: scope:[sin16s]  from sin16s::@11
   [112] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@11 sin16s::@2 sin16s::@8 sin16s::@9
-  [113] (byte) mulu16_sel::select#5 ← phi( sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [113] (word) mulu16_sel::v2#5 ← phi( sin16s::@10/(word) mulu16_sel::v2#3 sin16s::@11/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@8/(word) mulu16_sel::v2#1 sin16s::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
-  [113] (word) mulu16_sel::v1#5 ← phi( sin16s::@10/(word) mulu16_sel::v1#3 sin16s::@11/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@8/(word) mulu16_sel::v1#1 sin16s::@9/(word) mulu16_sel::v1#2 )
+mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@2 sin16s::@7 sin16s::@8 sin16s::@9
+  [113] (byte) mulu16_sel::select#5 ← phi( sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [113] (word) mulu16_sel::v2#5 ← phi( sin16s::@9/(word) mulu16_sel::v2#3 sin16s::@10/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@7/(word) mulu16_sel::v2#1 sin16s::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
+  [113] (word) mulu16_sel::v1#5 ← phi( sin16s::@9/(word) mulu16_sel::v1#3 sin16s::@10/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@7/(word) mulu16_sel::v1#1 sin16s::@8/(word) mulu16_sel::v1#2 )
   [114] (word) mul16u::a#1 ← (word) mulu16_sel::v1#5
   [115] (word) mul16u::b#0 ← (word) mulu16_sel::v2#5
   [116] call mul16u 
   [117] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mulu16_sel::@2
-mulu16_sel::@2: scope:[mulu16_sel]  from mulu16_sel
+  to:mulu16_sel::@1
+mulu16_sel::@1: scope:[mulu16_sel]  from mulu16_sel
   [118] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   [119] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5
   [120] (word) mulu16_sel::return#12 ← > (dword~) mulu16_sel::$1
   to:mulu16_sel::@return
-mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@2
+mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@1
   [121] return 
   to:@return
 mul16u: scope:[mul16u]  from mulu16_sel
   [122] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#0
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [123] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [123] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [123] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [123] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [123] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [123] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@4/(word) mul16u::a#0 )
   [124] if((word) mul16u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -250,13 +250,13 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [126] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [127] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [127] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [128] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [129] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [129] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [130] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [131] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
@@ -264,23 +264,23 @@ div32u16u: scope:[div32u16u]  from sin16s_gen
   [132] phi()
   [133] call divr16u 
   [134] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div32u16u::@2
-div32u16u::@2: scope:[div32u16u]  from div32u16u
+  to:div32u16u::@1
+div32u16u::@1: scope:[div32u16u]  from div32u16u
   [135] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2
   [136] (word) divr16u::rem#4 ← (word) rem16u#1
   [137] call divr16u 
   [138] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:div32u16u::@3
-div32u16u::@3: scope:[div32u16u]  from div32u16u::@2
+  to:div32u16u::@2
+div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   [139] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   [140] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0
   to:div32u16u::@return
-div32u16u::@return: scope:[div32u16u]  from div32u16u::@3
+div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
   [141] return 
   to:@return
-divr16u: scope:[divr16u]  from div32u16u div32u16u::@2
-  [142] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@2/<(const dword) PI2_u4f28#0 )
-  [142] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@2/(word) divr16u::rem#4 )
+divr16u: scope:[divr16u]  from div32u16u div32u16u::@1
+  [142] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@1/<(const dword) PI2_u4f28#0 )
+  [142] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@1/(word) divr16u::rem#4 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [143] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
diff --git a/src/test/ref/sinusgen16.log b/src/test/ref/sinusgen16.log
index 57fed13ec..582bdcfba 100644
--- a/src/test/ref/sinusgen16.log
+++ b/src/test/ref/sinusgen16.log
@@ -1679,13 +1679,31 @@ Culled Empty Block (label) mul16u::@10
 Culled Empty Block (label) divr16u::@8
 Culled Empty Block (label) divr16u::@10
 Culled Empty Block (label) divr16u::@9
+Renumbering block @40 to @1
+Renumbering block div32u16u::@2 to div32u16u::@1
+Renumbering block div32u16u::@3 to div32u16u::@2
+Renumbering block mul16u::@6 to mul16u::@3
+Renumbering block mul16u::@8 to mul16u::@4
+Renumbering block sin16s_gen::@3 to sin16s_gen::@2
+Renumbering block sin16s_gen::@4 to sin16s_gen::@3
+Renumbering block sin16s::@8 to sin16s::@7
+Renumbering block sin16s::@9 to sin16s::@8
+Renumbering block sin16s::@10 to sin16s::@9
+Renumbering block sin16s::@11 to sin16s::@10
+Renumbering block sin16s::@12 to sin16s::@11
+Renumbering block sin16s::@15 to sin16s::@12
+Renumbering block mulu16_sel::@2 to mulu16_sel::@1
+Renumbering block print_sword::@4 to print_sword::@3
+Renumbering block main::@5 to main::@4
+Renumbering block main::@7 to main::@5
+Renumbering block main::@8 to main::@6
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @40
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@5
+Adding NOP phi() at start of main::@4
 Adding NOP phi() at start of main::@3
-Adding NOP phi() at start of main::@7
+Adding NOP phi() at start of main::@5
 Adding NOP phi() at start of print_sword::@2
 Adding NOP phi() at start of print_cls
 Adding NOP phi() at start of sin16s_gen
@@ -1694,24 +1712,24 @@ Adding NOP phi() at start of div32u16u
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@40
-@40: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @40
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @40
+main: scope:[main]  from @1
   [4] phi()
   [5] call sin16s_gen 
-  to:main::@5
-main::@5: scope:[main]  from main
+  to:main::@4
+main::@4: scope:[main]  from main
   [6] phi()
   [7] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main::@5 main::@8
-  [8] (byte*) print_char_cursor#49 ← phi( main::@5/(const byte*) print_line_cursor#0 main::@8/(byte*) print_char_cursor#2 )
-  [8] (signed word*) main::st1#2 ← phi( main::@5/(const signed word[$78]) main::sintab1#0 main::@8/(signed word*) main::st1#1 )
+main::@1: scope:[main]  from main::@4 main::@6
+  [8] (byte*) print_char_cursor#49 ← phi( main::@4/(const byte*) print_line_cursor#0 main::@6/(byte*) print_char_cursor#2 )
+  [8] (signed word*) main::st1#2 ← phi( main::@4/(const signed word[$78]) main::sintab1#0 main::@6/(signed word*) main::st1#1 )
   [9] (signed word) main::sw#0 ← *((signed word*) main::st1#2)
   [10] if((signed word) main::sw#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@3
@@ -1723,21 +1741,21 @@ main::@2: scope:[main]  from main::@1 main::@3
   [13] (byte*) print_char_cursor#48 ← phi( main::@1/(byte*) print_char_cursor#49 main::@3/(byte*) print_char_cursor#2 )
   [14] (signed word) print_sword::w#1 ← (signed word) main::sw#0
   [15] call print_sword 
-  to:main::@7
-main::@7: scope:[main]  from main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@2
   [16] phi()
   [17] call print_str 
-  to:main::@8
-main::@8: scope:[main]  from main::@7
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [18] (signed word*) main::st1#1 ← (signed word*) main::st1#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [19] if((signed word*) main::st1#1<(const signed word[$78]) main::sintab1#0+(const word) main::wavelength#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@8
+main::@return: scope:[main]  from main::@6
   [20] return 
   to:@return
-print_str: scope:[print_str]  from main::@3 main::@7
-  [21] (byte*) print_char_cursor#51 ← phi( main::@3/(byte*) print_char_cursor#49 main::@7/(byte*) print_char_cursor#12 )
-  [21] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@7/(const string) main::str )
+print_str: scope:[print_str]  from main::@3 main::@5
+  [21] (byte*) print_char_cursor#51 ← phi( main::@3/(byte*) print_char_cursor#49 main::@5/(byte*) print_char_cursor#12 )
+  [21] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@5/(const string) main::str )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [22] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#51 print_str::@2/(byte*) print_char_cursor#1 )
@@ -1758,13 +1776,13 @@ print_sword: scope:[print_sword]  from main::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [29] phi()
   [30] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [31] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [32] (byte*) print_char_cursor#43 ← phi( print_sword/(byte*) print_char_cursor#48 print_sword::@4/(byte*) print_char_cursor#12 )
-  [32] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [32] (byte*) print_char_cursor#43 ← phi( print_sword/(byte*) print_char_cursor#48 print_sword::@3/(byte*) print_char_cursor#12 )
+  [32] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@3/(signed word) print_sword::w#0 )
   [33] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
@@ -1805,7 +1823,7 @@ print_char: scope:[print_char]  from print_byte print_byte::@1 print_sword::@2
 print_char::@return: scope:[print_char]  from print_char
   [51] return 
   to:@return
-print_cls: scope:[print_cls]  from main::@5
+print_cls: scope:[print_cls]  from main::@4
   [52] phi()
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -1821,19 +1839,19 @@ sin16s_gen: scope:[sin16s_gen]  from main
   [58] phi()
   [59] call div32u16u 
   [60] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  to:sin16s_gen::@3
-sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen
+  to:sin16s_gen::@2
+sin16s_gen::@2: scope:[sin16s_gen]  from sin16s_gen
   [61] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
   to:sin16s_gen::@1
-sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@3 sin16s_gen::@4
-  [62] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(word) sin16s_gen::i#1 )
-  [62] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@3/(const signed word[$78]) main::sintab1#0 sin16s_gen::@4/(signed word*) sin16s_gen::sintab#0 )
-  [62] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(dword) sin16s_gen::x#1 )
+sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@2 sin16s_gen::@3
+  [62] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(word) sin16s_gen::i#1 )
+  [62] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@2/(const signed word[$78]) main::sintab1#0 sin16s_gen::@3/(signed word*) sin16s_gen::sintab#0 )
+  [62] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(dword) sin16s_gen::x#1 )
   [63] (dword) sin16s::x#0 ← (dword) sin16s_gen::x#2
   [64] call sin16s 
   [65] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  to:sin16s_gen::@4
-sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
+  to:sin16s_gen::@3
+sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen::@1
   [66] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   [67] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1
   [68] (signed word*) sin16s_gen::sintab#0 ← (signed word*) sin16s_gen::sintab#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
@@ -1841,7 +1859,7 @@ sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
   [70] (word) sin16s_gen::i#1 ← ++ (word) sin16s_gen::i#2
   [71] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1
   to:sin16s_gen::@return
-sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@4
+sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@3
   [72] return 
   to:@return
 sin16s: scope:[sin16s]  from sin16s_gen::@1
@@ -1866,77 +1884,77 @@ sin16s::@2: scope:[sin16s]  from sin16s::@1 sin16s::@5
   [82] (word) mulu16_sel::v2#0 ← (word) sin16s::x1#0
   [83] call mulu16_sel 
   [84] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  to:sin16s::@8
-sin16s::@8: scope:[sin16s]  from sin16s::@2
+  to:sin16s::@7
+sin16s::@7: scope:[sin16s]  from sin16s::@2
   [85] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   [86] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   [87] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0
   [88] call mulu16_sel 
   [89] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12
-  to:sin16s::@9
-sin16s::@9: scope:[sin16s]  from sin16s::@8
+  to:sin16s::@8
+sin16s::@8: scope:[sin16s]  from sin16s::@7
   [90] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   [91] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   [92] call mulu16_sel 
   [93] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  to:sin16s::@10
-sin16s::@10: scope:[sin16s]  from sin16s::@9
+  to:sin16s::@9
+sin16s::@9: scope:[sin16s]  from sin16s::@8
   [94] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   [95] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0
   [96] (word) mulu16_sel::v1#3 ← (word) sin16s::x3#0
   [97] (word) mulu16_sel::v2#3 ← (word) sin16s::x1#0
   [98] call mulu16_sel 
   [99] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12
-  to:sin16s::@11
-sin16s::@11: scope:[sin16s]  from sin16s::@10
+  to:sin16s::@10
+sin16s::@10: scope:[sin16s]  from sin16s::@9
   [100] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   [101] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   [102] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0
   [103] call mulu16_sel 
   [104] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  to:sin16s::@12
-sin16s::@12: scope:[sin16s]  from sin16s::@11
+  to:sin16s::@11
+sin16s::@11: scope:[sin16s]  from sin16s::@10
   [105] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   [106] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [107] (word) sin16s::usinx#1 ← (word) sin16s::usinx#0 + (word) sin16s::x5_128#0
-  [108] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15
+  [108] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12
   to:sin16s::@6
-sin16s::@6: scope:[sin16s]  from sin16s::@12
+sin16s::@6: scope:[sin16s]  from sin16s::@11
   [109] (signed word) sin16s::sinx#1 ← - (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-sin16s::@3: scope:[sin16s]  from sin16s::@15 sin16s::@6
-  [110] (signed word) sin16s::return#1 ← phi( sin16s::@15/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
+sin16s::@3: scope:[sin16s]  from sin16s::@12 sin16s::@6
+  [110] (signed word) sin16s::return#1 ← phi( sin16s::@12/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
   to:sin16s::@return
 sin16s::@return: scope:[sin16s]  from sin16s::@3
   [111] return 
   to:@return
-sin16s::@15: scope:[sin16s]  from sin16s::@12
+sin16s::@12: scope:[sin16s]  from sin16s::@11
   [112] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@11 sin16s::@2 sin16s::@8 sin16s::@9
-  [113] (byte) mulu16_sel::select#5 ← phi( sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [113] (word) mulu16_sel::v2#5 ← phi( sin16s::@10/(word) mulu16_sel::v2#3 sin16s::@11/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@8/(word) mulu16_sel::v2#1 sin16s::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
-  [113] (word) mulu16_sel::v1#5 ← phi( sin16s::@10/(word) mulu16_sel::v1#3 sin16s::@11/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@8/(word) mulu16_sel::v1#1 sin16s::@9/(word) mulu16_sel::v1#2 )
+mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@2 sin16s::@7 sin16s::@8 sin16s::@9
+  [113] (byte) mulu16_sel::select#5 ← phi( sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [113] (word) mulu16_sel::v2#5 ← phi( sin16s::@9/(word) mulu16_sel::v2#3 sin16s::@10/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@7/(word) mulu16_sel::v2#1 sin16s::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
+  [113] (word) mulu16_sel::v1#5 ← phi( sin16s::@9/(word) mulu16_sel::v1#3 sin16s::@10/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@7/(word) mulu16_sel::v1#1 sin16s::@8/(word) mulu16_sel::v1#2 )
   [114] (word) mul16u::a#1 ← (word) mulu16_sel::v1#5
   [115] (word) mul16u::b#0 ← (word) mulu16_sel::v2#5
   [116] call mul16u 
   [117] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mulu16_sel::@2
-mulu16_sel::@2: scope:[mulu16_sel]  from mulu16_sel
+  to:mulu16_sel::@1
+mulu16_sel::@1: scope:[mulu16_sel]  from mulu16_sel
   [118] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   [119] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5
   [120] (word) mulu16_sel::return#12 ← > (dword~) mulu16_sel::$1
   to:mulu16_sel::@return
-mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@2
+mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@1
   [121] return 
   to:@return
 mul16u: scope:[mul16u]  from mulu16_sel
   [122] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#0
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [123] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [123] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [123] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [123] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [123] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [123] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@4/(word) mul16u::a#0 )
   [124] if((word) mul16u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -1944,13 +1962,13 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [126] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [127] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [127] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [128] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [129] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [129] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [130] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [131] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
@@ -1958,23 +1976,23 @@ div32u16u: scope:[div32u16u]  from sin16s_gen
   [132] phi()
   [133] call divr16u 
   [134] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div32u16u::@2
-div32u16u::@2: scope:[div32u16u]  from div32u16u
+  to:div32u16u::@1
+div32u16u::@1: scope:[div32u16u]  from div32u16u
   [135] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2
   [136] (word) divr16u::rem#4 ← (word) rem16u#1
   [137] call divr16u 
   [138] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:div32u16u::@3
-div32u16u::@3: scope:[div32u16u]  from div32u16u::@2
+  to:div32u16u::@2
+div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   [139] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   [140] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0
   to:div32u16u::@return
-div32u16u::@return: scope:[div32u16u]  from div32u16u::@3
+div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
   [141] return 
   to:@return
-divr16u: scope:[divr16u]  from div32u16u div32u16u::@2
-  [142] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@2/<(const dword) PI2_u4f28#0 )
-  [142] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@2/(word) divr16u::rem#4 )
+divr16u: scope:[divr16u]  from div32u16u div32u16u::@1
+  [142] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@1/<(const dword) PI2_u4f28#0 )
+  [142] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@1/(word) divr16u::rem#4 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [143] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
@@ -2403,17 +2421,17 @@ INITIAL ASM
   .label print_char_cursor = $a
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-b40_from_bbegin:
-  jmp b40
-//SEG5 @40
-b40:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @40 to main [phi:@40->main]
-main_from_b40:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @40 to @end [phi:@40->@end]
-bend_from_b40:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -2426,32 +2444,32 @@ main: {
   //SEG12 [58] phi from main to sin16s_gen [phi:main->sin16s_gen]
   sin16s_gen_from_main:
     jsr sin16s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  b5_from_main:
-    jmp b5
-  //SEG14 main::@5
-  b5:
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  b4_from_main:
+    jmp b4
+  //SEG14 main::@4
+  b4:
   //SEG15 [7] call print_cls 
-  //SEG16 [52] phi from main::@5 to print_cls [phi:main::@5->print_cls]
-  print_cls_from_b5:
+  //SEG16 [52] phi from main::@4 to print_cls [phi:main::@4->print_cls]
+  print_cls_from_b4:
     jsr print_cls
-  //SEG17 [8] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  b1_from_b5:
-  //SEG18 [8] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#0] -- pbuz1=pbuc1 
+  //SEG17 [8] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG18 [8] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG19 [8] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@5->main::@1#1] -- pwsz1=pwsc1 
+  //SEG19 [8] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@4->main::@1#1] -- pwsz1=pwsc1 
     lda #<sintab1
     sta st1
     lda #>sintab1
     sta st1+1
     jmp b1
-  //SEG20 [8] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  b1_from_b8:
-  //SEG21 [8] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG22 [8] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG20 [8] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG21 [8] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG22 [8] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@6->main::@1#1] -- register_copy 
     jmp b1
   //SEG23 main::@1
   b1:
@@ -2494,24 +2512,24 @@ main: {
     sta print_sword.w+1
   //SEG36 [15] call print_sword 
     jsr print_sword
-  //SEG37 [16] phi from main::@2 to main::@7 [phi:main::@2->main::@7]
-  b7_from_b2:
-    jmp b7
-  //SEG38 main::@7
-  b7:
+  //SEG37 [16] phi from main::@2 to main::@5 [phi:main::@2->main::@5]
+  b5_from_b2:
+    jmp b5
+  //SEG38 main::@5
+  b5:
   //SEG39 [17] call print_str 
-  //SEG40 [21] phi from main::@7 to print_str [phi:main::@7->print_str]
-  print_str_from_b7:
-  //SEG41 [21] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@7->print_str#0] -- register_copy 
-  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG40 [21] phi from main::@5 to print_str [phi:main::@5->print_str]
+  print_str_from_b5:
+  //SEG41 [21] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@5->print_str#0] -- register_copy 
+  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@5->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b8
-  //SEG43 main::@8
-  b8:
+    jmp b6
+  //SEG43 main::@6
+  b6:
   //SEG44 [18] (signed word*) main::st1#1 ← (signed word*) main::st1#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- pwsz1=pwsz1_plus_2 
     lda st1
     clc
@@ -2523,11 +2541,11 @@ main: {
   //SEG45 [19] if((signed word*) main::st1#1<(const signed word[$78]) main::sintab1#0+(const word) main::wavelength#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto main::@1 -- pwsz1_lt_pwsc1_then_la1 
     lda st1+1
     cmp #>sintab1+wavelength*2
-    bcc b1_from_b8
+    bcc b1_from_b6
     bne !+
     lda st1
     cmp #<sintab1+wavelength*2
-    bcc b1_from_b8
+    bcc b1_from_b6
   !:
     jmp breturn
   //SEG46 main::@return
@@ -2601,9 +2619,9 @@ print_sword: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b4
-  //SEG68 print_sword::@4
-  b4:
+    jmp b3
+  //SEG68 print_sword::@3
+  b3:
   //SEG69 [31] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -2614,11 +2632,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG70 [32] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG70 [32] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG71 [32] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG72 [32] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG71 [32] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG72 [32] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG73 print_sword::@1
   b1:
@@ -2791,9 +2809,9 @@ sin16s_gen: {
     sta div32u16u.return_2+2
     lda div32u16u.return+3
     sta div32u16u.return_2+3
-    jmp b3
-  //SEG127 sin16s_gen::@3
-  b3:
+    jmp b2
+  //SEG127 sin16s_gen::@2
+  b2:
   //SEG128 [61] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2 -- vduz1=vduz2 
     lda div32u16u.return_2
     sta step
@@ -2803,19 +2821,19 @@ sin16s_gen: {
     sta step+2
     lda div32u16u.return_2+3
     sta step+3
-  //SEG129 [62] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
-  b1_from_b3:
-  //SEG130 [62] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG129 [62] phi from sin16s_gen::@2 to sin16s_gen::@1 [phi:sin16s_gen::@2->sin16s_gen::@1]
+  b1_from_b2:
+  //SEG130 [62] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG131 [62] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- pwsz1=pwsc1 
+  //SEG131 [62] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@2->sin16s_gen::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintab1
     sta sintab
     lda #>main.sintab1
     sta sintab+1
-  //SEG132 [62] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- vduz1=vbuc1 
+  //SEG132 [62] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -2824,11 +2842,11 @@ sin16s_gen: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG133 [62] phi from sin16s_gen::@4 to sin16s_gen::@1 [phi:sin16s_gen::@4->sin16s_gen::@1]
-  b1_from_b4:
-  //SEG134 [62] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@4->sin16s_gen::@1#0] -- register_copy 
-  //SEG135 [62] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@4->sin16s_gen::@1#1] -- register_copy 
-  //SEG136 [62] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@4->sin16s_gen::@1#2] -- register_copy 
+  //SEG133 [62] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
+  b1_from_b3:
+  //SEG134 [62] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- register_copy 
+  //SEG135 [62] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- register_copy 
+  //SEG136 [62] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- register_copy 
     jmp b1
   //SEG137 sin16s_gen::@1
   b1:
@@ -2848,9 +2866,9 @@ sin16s_gen: {
     sta sin16s.return
     lda sin16s.return_1+1
     sta sin16s.return+1
-    jmp b4
-  //SEG141 sin16s_gen::@4
-  b4:
+    jmp b3
+  //SEG141 sin16s_gen::@3
+  b3:
   //SEG142 [66] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0 -- vwsz1=vwsz2 
     lda sin16s.return
     sta _1
@@ -2893,11 +2911,11 @@ sin16s_gen: {
   //SEG147 [71] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG148 sin16s_gen::@return
@@ -3064,9 +3082,9 @@ sin16s: {
     sta mulu16_sel.return
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return+1
-    jmp b8
-  //SEG177 sin16s::@8
-  b8:
+    jmp b7
+  //SEG177 sin16s::@7
+  b7:
   //SEG178 [85] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -3083,22 +3101,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG181 [88] call mulu16_sel 
-  //SEG182 [113] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG183 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG182 [113] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG183 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG184 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG185 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG184 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG185 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG186 [89] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_1
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_1+1
-    jmp b9
-  //SEG187 sin16s::@9
-  b9:
+    jmp b8
+  //SEG187 sin16s::@8
+  b8:
   //SEG188 [90] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1 -- vwuz1=vwuz2 
     lda mulu16_sel.return_1
     sta x3
@@ -3110,26 +3128,26 @@ sin16s: {
     lda x3+1
     sta mulu16_sel.v1+1
   //SEG190 [92] call mulu16_sel 
-  //SEG191 [113] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG192 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG191 [113] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG192 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG193 [113] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG193 [113] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG194 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG194 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG195 [93] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_2
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_2+1
-    jmp b10
-  //SEG196 sin16s::@10
-  b10:
+    jmp b9
+  //SEG196 sin16s::@9
+  b9:
   //SEG197 [94] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2 -- vwuz1=vwuz2 
     lda mulu16_sel.return_2
     sta x3_6
@@ -3154,22 +3172,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG201 [98] call mulu16_sel 
-  //SEG202 [113] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG203 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG202 [113] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG203 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG204 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG205 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG204 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG205 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG206 [99] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_10
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_10+1
-    jmp b11
-  //SEG207 sin16s::@11
-  b11:
+    jmp b10
+  //SEG207 sin16s::@10
+  b10:
   //SEG208 [100] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10 -- vwuz1=vwuz2 
     lda mulu16_sel.return_10
     sta x4
@@ -3186,22 +3204,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG211 [103] call mulu16_sel 
-  //SEG212 [113] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG213 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG212 [113] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG213 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG214 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG215 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG214 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG215 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG216 [104] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_11
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_11+1
-    jmp b12
-  //SEG217 sin16s::@12
-  b12:
+    jmp b11
+  //SEG217 sin16s::@11
+  b11:
   //SEG218 [105] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11 -- vwuz1=vwuz2 
     lda mulu16_sel.return_11
     sta x5
@@ -3226,10 +3244,10 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx_1+1
-  //SEG221 [108] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG221 [108] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG222 sin16s::@6
   b6:
@@ -3243,10 +3261,10 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG224 [110] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  b3_from_b15:
+  //SEG224 [110] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG225 [110] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG225 [110] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
     jmp b3
   //SEG226 sin16s::@3
   b3:
@@ -3255,14 +3273,14 @@ sin16s: {
   breturn:
   //SEG228 [111] return 
     rts
-  //SEG229 sin16s::@15
-  b15:
+  //SEG229 sin16s::@12
+  b12:
   //SEG230 [112] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1 -- vwsz1=vwsz2 
     lda usinx_1
     sta return_5
     lda usinx_1+1
     sta return_5+1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
 //SEG231 mulu16_sel
 // Calculate val*val for two unsigned word values - the result is 16 selected bits of the 32-bit result.
@@ -3301,9 +3319,9 @@ mulu16_sel: {
     sta mul16u.return+2
     lda mul16u.res+3
     sta mul16u.return+3
-    jmp b2
-  //SEG236 mulu16_sel::@2
-  b2:
+    jmp b1
+  //SEG236 mulu16_sel::@1
+  b1:
   //SEG237 [118] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2 -- vduz1=vduz2 
     lda mul16u.return
     sta _0
@@ -3391,13 +3409,13 @@ mul16u: {
     lda a
     and #1
     sta _1
-  //SEG254 [127] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG254 [127] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG255 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG255 mul16u::@3
+  b3:
   //SEG256 [128] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -3412,13 +3430,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG257 [129] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG258 [129] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG259 mul16u::@8
-  b8:
+  //SEG257 [129] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG258 [129] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG259 mul16u::@4
+  b4:
   //SEG260 [130] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -3428,11 +3446,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG262 [123] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG263 [123] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG264 [123] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG265 [123] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG262 [123] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG263 [123] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG264 [123] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG265 [123] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG266 div32u16u
@@ -3462,9 +3480,9 @@ div32u16u: {
     sta divr16u.return_2
     lda divr16u.return+1
     sta divr16u.return_2+1
-    jmp b2
-  //SEG272 div32u16u::@2
-  b2:
+    jmp b1
+  //SEG272 div32u16u::@1
+  b1:
   //SEG273 [135] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return_2
     sta quotient_hi
@@ -3476,23 +3494,23 @@ div32u16u: {
     lda rem16u+1
     sta divr16u.rem+1
   //SEG275 [137] call divr16u 
-  //SEG276 [142] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  divr16u_from_b2:
-  //SEG277 [142] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG276 [142] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  divr16u_from_b1:
+  //SEG277 [142] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG278 [142] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG278 [142] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG279 [138] (word) divr16u::return#3 ← (word) divr16u::return#0 -- vwuz1=vwuz2 
     lda divr16u.return
     sta divr16u.return_3
     lda divr16u.return+1
     sta divr16u.return_3+1
-    jmp b3
-  //SEG280 div32u16u::@3
-  b3:
+    jmp b2
+  //SEG280 div32u16u::@2
+  b2:
   //SEG281 [139] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3 -- vwuz1=vwuz2 
     lda divr16u.return_3
     sta quotient_lo
@@ -3958,17 +3976,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_char_cursor = 8
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-b40_from_bbegin:
-  jmp b40
-//SEG5 @40
-b40:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @40 to main [phi:@40->main]
-main_from_b40:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @40 to @end [phi:@40->@end]
-bend_from_b40:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3981,32 +3999,32 @@ main: {
   //SEG12 [58] phi from main to sin16s_gen [phi:main->sin16s_gen]
   sin16s_gen_from_main:
     jsr sin16s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  b5_from_main:
-    jmp b5
-  //SEG14 main::@5
-  b5:
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  b4_from_main:
+    jmp b4
+  //SEG14 main::@4
+  b4:
   //SEG15 [7] call print_cls 
-  //SEG16 [52] phi from main::@5 to print_cls [phi:main::@5->print_cls]
-  print_cls_from_b5:
+  //SEG16 [52] phi from main::@4 to print_cls [phi:main::@4->print_cls]
+  print_cls_from_b4:
     jsr print_cls
-  //SEG17 [8] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  b1_from_b5:
-  //SEG18 [8] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#0] -- pbuz1=pbuc1 
+  //SEG17 [8] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG18 [8] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG19 [8] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@5->main::@1#1] -- pwsz1=pwsc1 
+  //SEG19 [8] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@4->main::@1#1] -- pwsz1=pwsc1 
     lda #<sintab1
     sta st1
     lda #>sintab1
     sta st1+1
     jmp b1
-  //SEG20 [8] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  b1_from_b8:
-  //SEG21 [8] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG22 [8] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG20 [8] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG21 [8] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG22 [8] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@6->main::@1#1] -- register_copy 
     jmp b1
   //SEG23 main::@1
   b1:
@@ -4045,24 +4063,24 @@ main: {
   //SEG35 [14] (signed word) print_sword::w#1 ← (signed word) main::sw#0
   //SEG36 [15] call print_sword 
     jsr print_sword
-  //SEG37 [16] phi from main::@2 to main::@7 [phi:main::@2->main::@7]
-  b7_from_b2:
-    jmp b7
-  //SEG38 main::@7
-  b7:
+  //SEG37 [16] phi from main::@2 to main::@5 [phi:main::@2->main::@5]
+  b5_from_b2:
+    jmp b5
+  //SEG38 main::@5
+  b5:
   //SEG39 [17] call print_str 
-  //SEG40 [21] phi from main::@7 to print_str [phi:main::@7->print_str]
-  print_str_from_b7:
-  //SEG41 [21] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@7->print_str#0] -- register_copy 
-  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG40 [21] phi from main::@5 to print_str [phi:main::@5->print_str]
+  print_str_from_b5:
+  //SEG41 [21] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@5->print_str#0] -- register_copy 
+  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@5->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b8
-  //SEG43 main::@8
-  b8:
+    jmp b6
+  //SEG43 main::@6
+  b6:
   //SEG44 [18] (signed word*) main::st1#1 ← (signed word*) main::st1#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- pwsz1=pwsz1_plus_2 
     lda st1
     clc
@@ -4074,11 +4092,11 @@ main: {
   //SEG45 [19] if((signed word*) main::st1#1<(const signed word[$78]) main::sintab1#0+(const word) main::wavelength#0*(byte/signed byte/word/signed word/dword/signed dword) 2) goto main::@1 -- pwsz1_lt_pwsc1_then_la1 
     lda st1+1
     cmp #>sintab1+wavelength*2
-    bcc b1_from_b8
+    bcc b1_from_b6
     bne !+
     lda st1
     cmp #<sintab1+wavelength*2
-    bcc b1_from_b8
+    bcc b1_from_b6
   !:
     jmp breturn
   //SEG46 main::@return
@@ -4151,9 +4169,9 @@ print_sword: {
   //SEG67 [48] phi (byte) print_char::ch#3 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b4
-  //SEG68 print_sword::@4
-  b4:
+    jmp b3
+  //SEG68 print_sword::@3
+  b3:
   //SEG69 [31] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -4164,11 +4182,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG70 [32] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG70 [32] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG71 [32] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG72 [32] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG71 [32] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG72 [32] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG73 print_sword::@1
   b1:
@@ -4323,23 +4341,23 @@ sin16s_gen: {
   div32u16u_from_sin16s_gen:
     jsr div32u16u
   //SEG126 [60] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-    jmp b3
-  //SEG127 sin16s_gen::@3
-  b3:
+    jmp b2
+  //SEG127 sin16s_gen::@2
+  b2:
   //SEG128 [61] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
-  //SEG129 [62] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
-  b1_from_b3:
-  //SEG130 [62] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG129 [62] phi from sin16s_gen::@2 to sin16s_gen::@1 [phi:sin16s_gen::@2->sin16s_gen::@1]
+  b1_from_b2:
+  //SEG130 [62] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG131 [62] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- pwsz1=pwsc1 
+  //SEG131 [62] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@2->sin16s_gen::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintab1
     sta sintab
     lda #>main.sintab1
     sta sintab+1
-  //SEG132 [62] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- vduz1=vbuc1 
+  //SEG132 [62] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -4348,11 +4366,11 @@ sin16s_gen: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG133 [62] phi from sin16s_gen::@4 to sin16s_gen::@1 [phi:sin16s_gen::@4->sin16s_gen::@1]
-  b1_from_b4:
-  //SEG134 [62] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@4->sin16s_gen::@1#0] -- register_copy 
-  //SEG135 [62] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@4->sin16s_gen::@1#1] -- register_copy 
-  //SEG136 [62] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@4->sin16s_gen::@1#2] -- register_copy 
+  //SEG133 [62] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
+  b1_from_b3:
+  //SEG134 [62] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- register_copy 
+  //SEG135 [62] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- register_copy 
+  //SEG136 [62] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- register_copy 
     jmp b1
   //SEG137 sin16s_gen::@1
   b1:
@@ -4368,9 +4386,9 @@ sin16s_gen: {
   //SEG139 [64] call sin16s 
     jsr sin16s
   //SEG140 [65] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-    jmp b4
-  //SEG141 sin16s_gen::@4
-  b4:
+    jmp b3
+  //SEG141 sin16s_gen::@3
+  b3:
   //SEG142 [66] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   //SEG143 [67] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1 -- _deref_pwsz1=vwsz2 
     ldy #0
@@ -4409,11 +4427,11 @@ sin16s_gen: {
   //SEG147 [71] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG148 sin16s_gen::@return
@@ -4564,9 +4582,9 @@ sin16s: {
   //SEG175 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG176 [84] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-    jmp b8
-  //SEG177 sin16s::@8
-  b8:
+    jmp b7
+  //SEG177 sin16s::@7
+  b7:
   //SEG178 [85] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -4579,39 +4597,39 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG181 [88] call mulu16_sel 
-  //SEG182 [113] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG183 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG182 [113] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG183 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG184 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG185 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG184 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG185 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG186 [89] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_1
     lda mulu16_sel.return+1
     sta mulu16_sel.return_1+1
-    jmp b9
-  //SEG187 sin16s::@9
-  b9:
+    jmp b8
+  //SEG187 sin16s::@8
+  b8:
   //SEG188 [90] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   //SEG189 [91] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   //SEG190 [92] call mulu16_sel 
-  //SEG191 [113] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG192 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG191 [113] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG192 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG193 [113] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG193 [113] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG194 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG194 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG195 [93] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-    jmp b10
-  //SEG196 sin16s::@10
-  b10:
+    jmp b9
+  //SEG196 sin16s::@9
+  b9:
   //SEG197 [94] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   //SEG198 [95] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -4628,21 +4646,21 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG201 [98] call mulu16_sel 
-  //SEG202 [113] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG203 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG202 [113] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG203 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG204 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG205 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG204 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG205 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG206 [99] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_10
     lda mulu16_sel.return+1
     sta mulu16_sel.return_10+1
-    jmp b11
-  //SEG207 sin16s::@11
-  b11:
+    jmp b10
+  //SEG207 sin16s::@10
+  b10:
   //SEG208 [100] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   //SEG209 [101] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   //SEG210 [102] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -4651,17 +4669,17 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG211 [103] call mulu16_sel 
-  //SEG212 [113] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG213 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG212 [113] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG213 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG214 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG215 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG214 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG215 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG216 [104] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-    jmp b12
-  //SEG217 sin16s::@12
-  b12:
+    jmp b11
+  //SEG217 sin16s::@11
+  b11:
   //SEG218 [105] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   //SEG219 [106] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -4678,10 +4696,10 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG221 [108] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG221 [108] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG222 sin16s::@6
   b6:
@@ -4695,10 +4713,10 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG224 [110] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  b3_from_b15:
+  //SEG224 [110] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG225 [110] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG225 [110] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
     jmp b3
   //SEG226 sin16s::@3
   b3:
@@ -4707,10 +4725,10 @@ sin16s: {
   breturn:
   //SEG228 [111] return 
     rts
-  //SEG229 sin16s::@15
-  b15:
+  //SEG229 sin16s::@12
+  b12:
   //SEG230 [112] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
 //SEG231 mulu16_sel
 // Calculate val*val for two unsigned word values - the result is 16 selected bits of the 32-bit result.
@@ -4733,9 +4751,9 @@ mulu16_sel: {
   //SEG234 [116] call mul16u 
     jsr mul16u
   //SEG235 [117] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-    jmp b2
-  //SEG236 mulu16_sel::@2
-  b2:
+    jmp b1
+  //SEG236 mulu16_sel::@1
+  b1:
   //SEG237 [118] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   //SEG238 [119] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5 -- vduz1=vduz1_rol_vbuxx 
     cpx #0
@@ -4805,12 +4823,12 @@ mul16u: {
   //SEG253 [126] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG254 [127] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG254 [127] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG255 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG255 mul16u::@3
+  b3:
   //SEG256 [128] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -4825,13 +4843,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG257 [129] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG258 [129] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG259 mul16u::@8
-  b8:
+  //SEG257 [129] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG258 [129] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG259 mul16u::@4
+  b4:
   //SEG260 [130] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -4841,11 +4859,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG262 [123] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG263 [123] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG264 [123] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG265 [123] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG262 [123] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG263 [123] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG264 [123] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG265 [123] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG266 div32u16u
@@ -4870,9 +4888,9 @@ div32u16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG271 [134] (word) divr16u::return#2 ← (word) divr16u::return#0
-    jmp b2
-  //SEG272 div32u16u::@2
-  b2:
+    jmp b1
+  //SEG272 div32u16u::@1
+  b1:
   //SEG273 [135] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return
     sta quotient_hi
@@ -4880,19 +4898,19 @@ div32u16u: {
     sta quotient_hi+1
   //SEG274 [136] (word) divr16u::rem#4 ← (word) rem16u#1
   //SEG275 [137] call divr16u 
-  //SEG276 [142] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  divr16u_from_b2:
-  //SEG277 [142] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG276 [142] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  divr16u_from_b1:
+  //SEG277 [142] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG278 [142] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG278 [142] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG279 [138] (word) divr16u::return#3 ← (word) divr16u::return#0
-    jmp b3
-  //SEG280 div32u16u::@3
-  b3:
+    jmp b2
+  //SEG280 div32u16u::@2
+  b2:
   //SEG281 [139] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   //SEG282 [140] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda quotient_hi
@@ -5022,52 +5040,52 @@ divr16u: {
   print_hextab: .text "0123456789abcdef"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b40
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b3
 Removing instruction jmp b2
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b4
+Removing instruction jmp b1
+Removing instruction jmp b5
+Removing instruction jmp b2
 Removing instruction jmp b7
 Removing instruction jmp b8
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b2
-Removing instruction jmp b4
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b3
-Removing instruction jmp b1
-Removing instruction jmp b4
-Removing instruction jmp breturn
-Removing instruction jmp b4
-Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b2
-Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
-Removing instruction jmp b12
 Removing instruction jmp b6
 Removing instruction jmp b3
 Removing instruction jmp breturn
-Removing instruction jmp b2
-Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp breturn
 Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -5087,54 +5105,54 @@ Replacing instruction lda #0 with TXA
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b2_from_b1 with b2
-Replacing label b1_from_b8 with b1
-Replacing label b1_from_b8 with b1
+Replacing label b1_from_b6 with b1
+Replacing label b1_from_b6 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_print_sword with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Replacing label b1_from_b4 with b1
-Replacing label b1_from_b4 with b1
+Replacing label b1_from_b3 with b1
+Replacing label b1_from_b3 with b1
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
-Replacing label b3_from_b15 with b3
-Replacing label b8_from_b2 with b8
+Replacing label b3_from_b12 with b3
+Replacing label b4_from_b2 with b4
 Replacing label b2_from_b1 with b2
 Replacing label b3_from_b2 with b3
 Replacing label b3_from_b2 with b3
 Replacing label b1_from_b3 with b1
-Removing instruction b40_from_bbegin:
-Removing instruction b40:
-Removing instruction main_from_b40:
-Removing instruction bend_from_b40:
-Removing instruction b5_from_main:
-Removing instruction print_cls_from_b5:
-Removing instruction b1_from_b8:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b4_from_main:
+Removing instruction print_cls_from_b4:
+Removing instruction b1_from_b6:
 Removing instruction b3_from_b1:
 Removing instruction print_str_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b3:
-Removing instruction b7_from_b2:
-Removing instruction print_str_from_b7:
+Removing instruction b5_from_b2:
+Removing instruction print_str_from_b5:
 Removing instruction b1_from_print_str:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_print_sword:
 Removing instruction print_char_from_b2:
 Removing instruction b1_from_print_sword:
-Removing instruction b1_from_b4:
-Removing instruction b1_from_b1:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b1:
+Removing instruction b1_from_b2:
+Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b5:
-Removing instruction mulu16_sel_from_b9:
-Removing instruction b3_from_b15:
+Removing instruction mulu16_sel_from_b8:
+Removing instruction b3_from_b12:
 Removing instruction b3_from_b6:
 Removing instruction breturn:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
@@ -5144,15 +5162,15 @@ Removing instruction breturn:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction sin16s_gen_from_main:
-Removing instruction b5:
-Removing instruction b1_from_b5:
+Removing instruction b4:
+Removing instruction b1_from_b4:
 Removing instruction b3:
-Removing instruction b7:
-Removing instruction b8:
+Removing instruction b5:
+Removing instruction b6:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b2:
-Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn:
 Removing instruction print_byte_from_print_word:
 Removing instruction b1:
@@ -5166,32 +5184,32 @@ Removing instruction breturn:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
 Removing instruction div32u16u_from_sin16s_gen:
+Removing instruction b2:
 Removing instruction b3:
-Removing instruction b4:
 Removing instruction breturn:
 Removing instruction b4:
 Removing instruction b1_from_b4:
 Removing instruction b5:
 Removing instruction mulu16_sel_from_b2:
+Removing instruction b7:
+Removing instruction mulu16_sel_from_b7:
 Removing instruction b8:
-Removing instruction mulu16_sel_from_b8:
 Removing instruction b9:
+Removing instruction mulu16_sel_from_b9:
 Removing instruction b10:
 Removing instruction mulu16_sel_from_b10:
 Removing instruction b11:
-Removing instruction mulu16_sel_from_b11:
-Removing instruction b12:
 Removing instruction b6:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction b1_from_mul16u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
-Removing instruction divr16u_from_div32u16u:
-Removing instruction b2:
-Removing instruction divr16u_from_b2:
 Removing instruction b3:
+Removing instruction b1_from_b4:
+Removing instruction divr16u_from_div32u16u:
+Removing instruction b1:
+Removing instruction divr16u_from_b1:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction b1_from_divr16u:
 Removing instruction b4:
@@ -5201,7 +5219,7 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b3 in beq b15
+Skipping double jump to b3 in beq b12
 Succesful ASM optimization Pass5DoubleJumpElimination
 Relabelling long label b1_from_sin16s to b4
 Succesful ASM optimization Pass5RelabelLongLabels
@@ -5213,13 +5231,13 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
-Removing instruction b15:
+Removing instruction b12:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b3
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @40
+(label) @1
 (label) @begin
 (label) @end
 (word) PI2_u4f12
@@ -5232,8 +5250,8 @@ FINAL SYMBOL TABLE
 (dword) PI_u4f28
 (const dword) PI_u4f28#0 PI_u4f28 = (dword/signed dword) $3243f6a9
 (dword()) div32u16u((dword) div32u16u::dividend , (word) div32u16u::divisor)
+(label) div32u16u::@1
 (label) div32u16u::@2
-(label) div32u16u::@3
 (label) div32u16u::@return
 (dword) div32u16u::dividend
 (word) div32u16u::divisor
@@ -5284,9 +5302,9 @@ FINAL SYMBOL TABLE
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@7
-(label) main::@8
+(label) main::@6
 (label) main::@return
 (signed word[$78]) main::sintab1
 (const signed word[$78]) main::sintab1#0 sintab1 = { fill( $78, 0) }
@@ -5303,8 +5321,8 @@ FINAL SYMBOL TABLE
 (byte/word~) mul16u::$1 reg byte a 202.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:21 101.0
@@ -5325,7 +5343,7 @@ FINAL SYMBOL TABLE
 (word()) mulu16_sel((word) mulu16_sel::v1 , (word) mulu16_sel::v2 , (byte) mulu16_sel::select)
 (dword~) mulu16_sel::$0 $0 zp ZP_DWORD:15 4.0
 (dword~) mulu16_sel::$1 $1 zp ZP_DWORD:15 4.0
-(label) mulu16_sel::@2
+(label) mulu16_sel::@1
 (label) mulu16_sel::@return
 (word) mulu16_sel::return
 (word) mulu16_sel::return#0 return zp ZP_WORD:19 4.0
@@ -5396,7 +5414,7 @@ FINAL SYMBOL TABLE
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:6 4.0
@@ -5417,12 +5435,12 @@ FINAL SYMBOL TABLE
 (label) sin16s::@10
 (label) sin16s::@11
 (label) sin16s::@12
-(label) sin16s::@15
 (label) sin16s::@2
 (label) sin16s::@3
 (label) sin16s::@4
 (label) sin16s::@5
 (label) sin16s::@6
+(label) sin16s::@7
 (label) sin16s::@8
 (label) sin16s::@9
 (label) sin16s::@return
@@ -5460,8 +5478,8 @@ FINAL SYMBOL TABLE
 (void()) sin16s_gen((signed word*) sin16s_gen::sintab , (word) sin16s_gen::wavelength)
 (signed word~) sin16s_gen::$1 $1 zp ZP_WORD:6 22.0
 (label) sin16s_gen::@1
+(label) sin16s_gen::@2
 (label) sin16s_gen::@3
-(label) sin16s_gen::@4
 (label) sin16s_gen::@return
 (word) sin16s_gen::i
 (word) sin16s_gen::i#1 i zp ZP_WORD:4 16.5
@@ -5519,11 +5537,11 @@ Score: 20861
   .label rem16u = 2
   .label print_char_cursor = 8
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-//SEG5 @40
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @40 to main [phi:@40->main]
-//SEG8 [3] phi from @40 to @end [phi:@40->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -5533,25 +5551,25 @@ main: {
   //SEG11 [5] call sin16s_gen 
   //SEG12 [58] phi from main to sin16s_gen [phi:main->sin16s_gen]
     jsr sin16s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  //SEG14 main::@5
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  //SEG14 main::@4
   //SEG15 [7] call print_cls 
-  //SEG16 [52] phi from main::@5 to print_cls [phi:main::@5->print_cls]
+  //SEG16 [52] phi from main::@4 to print_cls [phi:main::@4->print_cls]
     jsr print_cls
-  //SEG17 [8] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  //SEG18 [8] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#0] -- pbuz1=pbuc1 
+  //SEG17 [8] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  //SEG18 [8] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG19 [8] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@5->main::@1#1] -- pwsz1=pwsc1 
+  //SEG19 [8] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@4->main::@1#1] -- pwsz1=pwsc1 
     lda #<sintab1
     sta st1
     lda #>sintab1
     sta st1+1
-  //SEG20 [8] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  //SEG21 [8] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG22 [8] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG20 [8] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  //SEG21 [8] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG22 [8] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@6->main::@1#1] -- register_copy 
   //SEG23 main::@1
   b1:
   //SEG24 [9] (signed word) main::sw#0 ← *((signed word*) main::st1#2) -- vwsz1=_deref_pwsz2 
@@ -5581,18 +5599,18 @@ main: {
   //SEG35 [14] (signed word) print_sword::w#1 ← (signed word) main::sw#0
   //SEG36 [15] call print_sword 
     jsr print_sword
-  //SEG37 [16] phi from main::@2 to main::@7 [phi:main::@2->main::@7]
-  //SEG38 main::@7
+  //SEG37 [16] phi from main::@2 to main::@5 [phi:main::@2->main::@5]
+  //SEG38 main::@5
   //SEG39 [17] call print_str 
-  //SEG40 [21] phi from main::@7 to print_str [phi:main::@7->print_str]
-  //SEG41 [21] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@7->print_str#0] -- register_copy 
-  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG40 [21] phi from main::@5 to print_str [phi:main::@5->print_str]
+  //SEG41 [21] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@5->print_str#0] -- register_copy 
+  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@5->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG43 main::@8
+  //SEG43 main::@6
   //SEG44 [18] (signed word*) main::st1#1 ← (signed word*) main::st1#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- pwsz1=pwsz1_plus_2 
     lda st1
     clc
@@ -5669,7 +5687,7 @@ print_sword: {
   //SEG67 [48] phi (byte) print_char::ch#3 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG68 print_sword::@4
+  //SEG68 print_sword::@3
   //SEG69 [31] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -5680,9 +5698,9 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG70 [32] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
-  //SEG71 [32] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG72 [32] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  //SEG70 [32] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
+  //SEG71 [32] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG72 [32] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
   //SEG73 print_sword::@1
   b1:
   //SEG74 [33] call print_word 
@@ -5813,29 +5831,29 @@ sin16s_gen: {
   //SEG125 [132] phi from sin16s_gen to div32u16u [phi:sin16s_gen->div32u16u]
     jsr div32u16u
   //SEG126 [60] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  //SEG127 sin16s_gen::@3
+  //SEG127 sin16s_gen::@2
   //SEG128 [61] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
-  //SEG129 [62] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
-  //SEG130 [62] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG129 [62] phi from sin16s_gen::@2 to sin16s_gen::@1 [phi:sin16s_gen::@2->sin16s_gen::@1]
+  //SEG130 [62] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG131 [62] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- pwsz1=pwsc1 
+  //SEG131 [62] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@2->sin16s_gen::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintab1
     sta sintab
     lda #>main.sintab1
     sta sintab+1
-  //SEG132 [62] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- vduz1=vbuc1 
+  //SEG132 [62] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     sta x+1
     sta x+2
     sta x+3
   // u[4.28]
-  //SEG133 [62] phi from sin16s_gen::@4 to sin16s_gen::@1 [phi:sin16s_gen::@4->sin16s_gen::@1]
-  //SEG134 [62] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@4->sin16s_gen::@1#0] -- register_copy 
-  //SEG135 [62] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@4->sin16s_gen::@1#1] -- register_copy 
-  //SEG136 [62] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@4->sin16s_gen::@1#2] -- register_copy 
+  //SEG133 [62] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
+  //SEG134 [62] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- register_copy 
+  //SEG135 [62] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- register_copy 
+  //SEG136 [62] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- register_copy 
   //SEG137 sin16s_gen::@1
   b1:
   //SEG138 [63] (dword) sin16s::x#0 ← (dword) sin16s_gen::x#2 -- vduz1=vduz2 
@@ -5850,7 +5868,7 @@ sin16s_gen: {
   //SEG139 [64] call sin16s 
     jsr sin16s
   //SEG140 [65] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  //SEG141 sin16s_gen::@4
+  //SEG141 sin16s_gen::@3
   //SEG142 [66] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   //SEG143 [67] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1 -- _deref_pwsz1=vwsz2 
     ldy #0
@@ -6032,7 +6050,7 @@ sin16s: {
   //SEG175 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG176 [84] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  //SEG177 sin16s::@8
+  //SEG177 sin16s::@7
   //SEG178 [85] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -6045,33 +6063,33 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG181 [88] call mulu16_sel 
-  //SEG182 [113] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  //SEG183 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG182 [113] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  //SEG183 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG184 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG185 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG184 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG185 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG186 [89] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_1
     lda mulu16_sel.return+1
     sta mulu16_sel.return_1+1
-  //SEG187 sin16s::@9
+  //SEG187 sin16s::@8
   //SEG188 [90] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   //SEG189 [91] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   //SEG190 [92] call mulu16_sel 
-  //SEG191 [113] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  //SEG192 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG191 [113] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  //SEG192 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG193 [113] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG193 [113] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG194 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG194 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG195 [93] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  //SEG196 sin16s::@10
+  //SEG196 sin16s::@9
   //SEG197 [94] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   //SEG198 [95] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -6088,18 +6106,18 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG201 [98] call mulu16_sel 
-  //SEG202 [113] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  //SEG203 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG202 [113] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  //SEG203 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG204 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG205 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG204 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG205 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG206 [99] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_10
     lda mulu16_sel.return+1
     sta mulu16_sel.return_10+1
-  //SEG207 sin16s::@11
+  //SEG207 sin16s::@10
   //SEG208 [100] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   //SEG209 [101] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   //SEG210 [102] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -6108,14 +6126,14 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG211 [103] call mulu16_sel 
-  //SEG212 [113] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  //SEG213 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG212 [113] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  //SEG213 [113] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG214 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG215 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG214 [113] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG215 [113] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG216 [104] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  //SEG217 sin16s::@12
+  //SEG217 sin16s::@11
   //SEG218 [105] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   //SEG219 [106] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -6132,7 +6150,7 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG221 [108] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG221 [108] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
     beq b3
@@ -6147,14 +6165,14 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG224 [110] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  //SEG225 [110] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG224 [110] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  //SEG225 [110] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
   //SEG226 sin16s::@3
   b3:
   //SEG227 sin16s::@return
   //SEG228 [111] return 
     rts
-  //SEG229 sin16s::@15
+  //SEG229 sin16s::@12
   //SEG230 [112] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
 }
 //SEG231 mulu16_sel
@@ -6178,7 +6196,7 @@ mulu16_sel: {
   //SEG234 [116] call mul16u 
     jsr mul16u
   //SEG235 [117] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  //SEG236 mulu16_sel::@2
+  //SEG236 mulu16_sel::@1
   //SEG237 [118] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   //SEG238 [119] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5 -- vduz1=vduz1_rol_vbuxx 
     cpx #0
@@ -6240,10 +6258,10 @@ mul16u: {
   //SEG253 [126] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG254 [127] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG254 [127] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG255 mul16u::@6
+    beq b4
+  //SEG255 mul16u::@3
   //SEG256 [128] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -6258,10 +6276,10 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG257 [129] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  //SEG258 [129] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-  //SEG259 mul16u::@8
-  b8:
+  //SEG257 [129] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  //SEG258 [129] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+  //SEG259 mul16u::@4
+  b4:
   //SEG260 [130] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -6271,10 +6289,10 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG262 [123] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  //SEG263 [123] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG264 [123] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG265 [123] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG262 [123] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  //SEG263 [123] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG264 [123] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG265 [123] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG266 div32u16u
@@ -6297,7 +6315,7 @@ div32u16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG271 [134] (word) divr16u::return#2 ← (word) divr16u::return#0
-  //SEG272 div32u16u::@2
+  //SEG272 div32u16u::@1
   //SEG273 [135] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return
     sta quotient_hi
@@ -6305,16 +6323,16 @@ div32u16u: {
     sta quotient_hi+1
   //SEG274 [136] (word) divr16u::rem#4 ← (word) rem16u#1
   //SEG275 [137] call divr16u 
-  //SEG276 [142] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  //SEG277 [142] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG276 [142] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  //SEG277 [142] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG278 [142] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG278 [142] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG279 [138] (word) divr16u::return#3 ← (word) divr16u::return#0
-  //SEG280 div32u16u::@3
+  //SEG280 div32u16u::@2
   //SEG281 [139] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   //SEG282 [140] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda quotient_hi
diff --git a/src/test/ref/sinusgen16.sym b/src/test/ref/sinusgen16.sym
index c04254c32..cc537438a 100644
--- a/src/test/ref/sinusgen16.sym
+++ b/src/test/ref/sinusgen16.sym
@@ -1,4 +1,4 @@
-(label) @40
+(label) @1
 (label) @begin
 (label) @end
 (word) PI2_u4f12
@@ -11,8 +11,8 @@
 (dword) PI_u4f28
 (const dword) PI_u4f28#0 PI_u4f28 = (dword/signed dword) $3243f6a9
 (dword()) div32u16u((dword) div32u16u::dividend , (word) div32u16u::divisor)
+(label) div32u16u::@1
 (label) div32u16u::@2
-(label) div32u16u::@3
 (label) div32u16u::@return
 (dword) div32u16u::dividend
 (word) div32u16u::divisor
@@ -63,9 +63,9 @@
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@7
-(label) main::@8
+(label) main::@6
 (label) main::@return
 (signed word[$78]) main::sintab1
 (const signed word[$78]) main::sintab1#0 sintab1 = { fill( $78, 0) }
@@ -82,8 +82,8 @@
 (byte/word~) mul16u::$1 reg byte a 202.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:21 101.0
@@ -104,7 +104,7 @@
 (word()) mulu16_sel((word) mulu16_sel::v1 , (word) mulu16_sel::v2 , (byte) mulu16_sel::select)
 (dword~) mulu16_sel::$0 $0 zp ZP_DWORD:15 4.0
 (dword~) mulu16_sel::$1 $1 zp ZP_DWORD:15 4.0
-(label) mulu16_sel::@2
+(label) mulu16_sel::@1
 (label) mulu16_sel::@return
 (word) mulu16_sel::return
 (word) mulu16_sel::return#0 return zp ZP_WORD:19 4.0
@@ -175,7 +175,7 @@
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:6 4.0
@@ -196,12 +196,12 @@
 (label) sin16s::@10
 (label) sin16s::@11
 (label) sin16s::@12
-(label) sin16s::@15
 (label) sin16s::@2
 (label) sin16s::@3
 (label) sin16s::@4
 (label) sin16s::@5
 (label) sin16s::@6
+(label) sin16s::@7
 (label) sin16s::@8
 (label) sin16s::@9
 (label) sin16s::@return
@@ -239,8 +239,8 @@
 (void()) sin16s_gen((signed word*) sin16s_gen::sintab , (word) sin16s_gen::wavelength)
 (signed word~) sin16s_gen::$1 $1 zp ZP_WORD:6 22.0
 (label) sin16s_gen::@1
+(label) sin16s_gen::@2
 (label) sin16s_gen::@3
-(label) sin16s_gen::@4
 (label) sin16s_gen::@return
 (word) sin16s_gen::i
 (word) sin16s_gen::i#1 i zp ZP_WORD:4 16.5
diff --git a/src/test/ref/sinusgen16b.asm b/src/test/ref/sinusgen16b.asm
index e65508d39..291e3c66b 100644
--- a/src/test/ref/sinusgen16b.asm
+++ b/src/test/ref/sinusgen16b.asm
@@ -467,7 +467,7 @@ mul16u: {
     lda a
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -481,7 +481,7 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  b8:
+  b4:
     clc
     ror a+1
     ror a
diff --git a/src/test/ref/sinusgen16b.cfg b/src/test/ref/sinusgen16b.cfg
index 28e15044d..1389800c5 100644
--- a/src/test/ref/sinusgen16b.cfg
+++ b/src/test/ref/sinusgen16b.cfg
@@ -1,29 +1,29 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@42
-@42: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @42
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @42
+main: scope:[main]  from @1
   [4] phi()
   [5] call sin16s_gen 
-  to:main::@5
-main::@5: scope:[main]  from main
+  to:main::@4
+main::@4: scope:[main]  from main
   [6] phi()
   [7] call sin16s_genb 
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [8] phi()
   [9] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main::@6 main::@9
-  [10] (byte) main::i#2 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@9/(byte) main::i#1 )
-  [10] (byte*) print_char_cursor#49 ← phi( main::@6/(const byte*) print_line_cursor#0 main::@9/(byte*) print_char_cursor#2 )
-  [10] (signed word*) main::st2#2 ← phi( main::@6/(const signed word[$78]) main::sintab2#0 main::@9/(signed word*) main::st2#1 )
-  [10] (signed word*) main::st1#2 ← phi( main::@6/(const signed word[$78]) main::sintab1#0 main::@9/(signed word*) main::st1#1 )
+main::@1: scope:[main]  from main::@5 main::@7
+  [10] (byte) main::i#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
+  [10] (byte*) print_char_cursor#49 ← phi( main::@5/(const byte*) print_line_cursor#0 main::@7/(byte*) print_char_cursor#2 )
+  [10] (signed word*) main::st2#2 ← phi( main::@5/(const signed word[$78]) main::sintab2#0 main::@7/(signed word*) main::st2#1 )
+  [10] (signed word*) main::st1#2 ← phi( main::@5/(const signed word[$78]) main::sintab1#0 main::@7/(signed word*) main::st1#1 )
   [11] (signed word) main::sw#0 ← *((signed word*) main::st1#2) - *((signed word*) main::st2#2)
   [12] if((signed word) main::sw#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@3
@@ -35,23 +35,23 @@ main::@2: scope:[main]  from main::@1 main::@3
   [15] (byte*) print_char_cursor#48 ← phi( main::@1/(byte*) print_char_cursor#49 main::@3/(byte*) print_char_cursor#2 )
   [16] (signed word) print_sword::w#1 ← (signed word) main::sw#0
   [17] call print_sword 
-  to:main::@8
-main::@8: scope:[main]  from main::@2
+  to:main::@6
+main::@6: scope:[main]  from main::@2
   [18] phi()
   [19] call print_str 
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [20] (signed word*) main::st1#1 ← (signed word*) main::st1#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [21] (signed word*) main::st2#1 ← (signed word*) main::st2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [22] (byte) main::i#1 ← ++ (byte) main::i#2
   [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $78) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@9
+main::@return: scope:[main]  from main::@7
   [24] return 
   to:@return
-print_str: scope:[print_str]  from main::@3 main::@8
-  [25] (byte*) print_char_cursor#51 ← phi( main::@3/(byte*) print_char_cursor#49 main::@8/(byte*) print_char_cursor#12 )
-  [25] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@8/(const string) main::str )
+print_str: scope:[print_str]  from main::@3 main::@6
+  [25] (byte*) print_char_cursor#51 ← phi( main::@3/(byte*) print_char_cursor#49 main::@6/(byte*) print_char_cursor#12 )
+  [25] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@6/(const string) main::str )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [26] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#51 print_str::@2/(byte*) print_char_cursor#1 )
@@ -72,13 +72,13 @@ print_sword: scope:[print_sword]  from main::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [33] phi()
   [34] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [35] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [36] (byte*) print_char_cursor#43 ← phi( print_sword/(byte*) print_char_cursor#48 print_sword::@4/(byte*) print_char_cursor#12 )
-  [36] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [36] (byte*) print_char_cursor#43 ← phi( print_sword/(byte*) print_char_cursor#48 print_sword::@3/(byte*) print_char_cursor#12 )
+  [36] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@3/(signed word) print_sword::w#0 )
   [37] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
@@ -119,7 +119,7 @@ print_char: scope:[print_char]  from print_byte print_byte::@1 print_sword::@2
 print_char::@return: scope:[print_char]  from print_char
   [55] return 
   to:@return
-print_cls: scope:[print_cls]  from main::@6
+print_cls: scope:[print_cls]  from main::@5
   [56] phi()
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -131,23 +131,23 @@ print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
 print_cls::@return: scope:[print_cls]  from print_cls::@1
   [61] return 
   to:@return
-sin16s_genb: scope:[sin16s_genb]  from main::@5
+sin16s_genb: scope:[sin16s_genb]  from main::@4
   [62] phi()
   [63] call div32u16u 
   [64] (dword) div32u16u::return#3 ← (dword) div32u16u::return#0
-  to:sin16s_genb::@3
-sin16s_genb::@3: scope:[sin16s_genb]  from sin16s_genb
+  to:sin16s_genb::@2
+sin16s_genb::@2: scope:[sin16s_genb]  from sin16s_genb
   [65] (dword) sin16s_genb::step#0 ← (dword) div32u16u::return#3
   to:sin16s_genb::@1
-sin16s_genb::@1: scope:[sin16s_genb]  from sin16s_genb::@3 sin16s_genb::@4
-  [66] (word) sin16s_genb::i#2 ← phi( sin16s_genb::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_genb::@4/(word) sin16s_genb::i#1 )
-  [66] (signed word*) sin16s_genb::sintab#2 ← phi( sin16s_genb::@3/(const signed word[$78]) main::sintab2#0 sin16s_genb::@4/(signed word*) sin16s_genb::sintab#0 )
-  [66] (dword) sin16s_genb::x#2 ← phi( sin16s_genb::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_genb::@4/(dword) sin16s_genb::x#1 )
+sin16s_genb::@1: scope:[sin16s_genb]  from sin16s_genb::@2 sin16s_genb::@3
+  [66] (word) sin16s_genb::i#2 ← phi( sin16s_genb::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_genb::@3/(word) sin16s_genb::i#1 )
+  [66] (signed word*) sin16s_genb::sintab#2 ← phi( sin16s_genb::@2/(const signed word[$78]) main::sintab2#0 sin16s_genb::@3/(signed word*) sin16s_genb::sintab#0 )
+  [66] (dword) sin16s_genb::x#2 ← phi( sin16s_genb::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_genb::@3/(dword) sin16s_genb::x#1 )
   [67] (word) sin16sb::x#0 ← > (dword) sin16s_genb::x#2
   [68] call sin16sb 
   [69] (signed word) sin16sb::return#0 ← (signed word) sin16sb::return#1
-  to:sin16s_genb::@4
-sin16s_genb::@4: scope:[sin16s_genb]  from sin16s_genb::@1
+  to:sin16s_genb::@3
+sin16s_genb::@3: scope:[sin16s_genb]  from sin16s_genb::@1
   [70] (signed word~) sin16s_genb::$2 ← (signed word) sin16sb::return#0
   [71] *((signed word*) sin16s_genb::sintab#2) ← (signed word~) sin16s_genb::$2
   [72] (signed word*) sin16s_genb::sintab#0 ← (signed word*) sin16s_genb::sintab#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
@@ -155,7 +155,7 @@ sin16s_genb::@4: scope:[sin16s_genb]  from sin16s_genb::@1
   [74] (word) sin16s_genb::i#1 ← ++ (word) sin16s_genb::i#2
   [75] if((word) sin16s_genb::i#1<(const word) main::wavelength#0) goto sin16s_genb::@1
   to:sin16s_genb::@return
-sin16s_genb::@return: scope:[sin16s_genb]  from sin16s_genb::@4
+sin16s_genb::@return: scope:[sin16s_genb]  from sin16s_genb::@3
   [76] return 
   to:@return
 sin16sb: scope:[sin16sb]  from sin16s_genb::@1
@@ -179,77 +179,77 @@ sin16sb::@2: scope:[sin16sb]  from sin16sb::@1 sin16sb::@5
   [85] (word) mulu16_sel::v2#5 ← (word) sin16sb::x1#0
   [86] call mulu16_sel 
   [87] (word) mulu16_sel::return#18 ← (word) mulu16_sel::return#17
-  to:sin16sb::@8
-sin16sb::@8: scope:[sin16sb]  from sin16sb::@2
+  to:sin16sb::@7
+sin16sb::@7: scope:[sin16sb]  from sin16sb::@2
   [88] (word) sin16sb::x2#0 ← (word) mulu16_sel::return#18
   [89] (word) mulu16_sel::v1#6 ← (word) sin16sb::x2#0
   [90] (word) mulu16_sel::v2#6 ← (word) sin16sb::x1#0
   [91] call mulu16_sel 
   [92] (word) mulu16_sel::return#19 ← (word) mulu16_sel::return#17
-  to:sin16sb::@9
-sin16sb::@9: scope:[sin16sb]  from sin16sb::@8
+  to:sin16sb::@8
+sin16sb::@8: scope:[sin16sb]  from sin16sb::@7
   [93] (word) sin16sb::x3#0 ← (word) mulu16_sel::return#19
   [94] (word) mulu16_sel::v1#7 ← (word) sin16sb::x3#0
   [95] call mulu16_sel 
   [96] (word) mulu16_sel::return#20 ← (word) mulu16_sel::return#17
-  to:sin16sb::@10
-sin16sb::@10: scope:[sin16sb]  from sin16sb::@9
+  to:sin16sb::@9
+sin16sb::@9: scope:[sin16sb]  from sin16sb::@8
   [97] (word) sin16sb::x3_6#0 ← (word) mulu16_sel::return#20
   [98] (word) sin16sb::usinx#0 ← (word) sin16sb::x1#0 - (word) sin16sb::x3_6#0
   [99] (word) mulu16_sel::v1#8 ← (word) sin16sb::x3#0
   [100] (word) mulu16_sel::v2#8 ← (word) sin16sb::x1#0
   [101] call mulu16_sel 
   [102] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#17
-  to:sin16sb::@11
-sin16sb::@11: scope:[sin16sb]  from sin16sb::@10
+  to:sin16sb::@10
+sin16sb::@10: scope:[sin16sb]  from sin16sb::@9
   [103] (word) sin16sb::x4#0 ← (word) mulu16_sel::return#10
   [104] (word) mulu16_sel::v1#9 ← (word) sin16sb::x4#0
   [105] (word) mulu16_sel::v2#9 ← (word) sin16sb::x1#0
   [106] call mulu16_sel 
   [107] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#17
-  to:sin16sb::@12
-sin16sb::@12: scope:[sin16sb]  from sin16sb::@11
+  to:sin16sb::@11
+sin16sb::@11: scope:[sin16sb]  from sin16sb::@10
   [108] (word) sin16sb::x5#0 ← (word) mulu16_sel::return#11
   [109] (word) sin16sb::x5_128#0 ← (word) sin16sb::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [110] (word) sin16sb::usinx#1 ← (word) sin16sb::usinx#0 + (word) sin16sb::x5_128#0
-  [111] if((byte) sin16sb::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16sb::@15
+  [111] if((byte) sin16sb::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16sb::@12
   to:sin16sb::@6
-sin16sb::@6: scope:[sin16sb]  from sin16sb::@12
+sin16sb::@6: scope:[sin16sb]  from sin16sb::@11
   [112] (signed word) sin16sb::sinx#1 ← - (signed word)(word) sin16sb::usinx#1
   to:sin16sb::@3
-sin16sb::@3: scope:[sin16sb]  from sin16sb::@15 sin16sb::@6
-  [113] (signed word) sin16sb::return#1 ← phi( sin16sb::@15/(signed word~) sin16sb::return#5 sin16sb::@6/(signed word) sin16sb::sinx#1 )
+sin16sb::@3: scope:[sin16sb]  from sin16sb::@12 sin16sb::@6
+  [113] (signed word) sin16sb::return#1 ← phi( sin16sb::@12/(signed word~) sin16sb::return#5 sin16sb::@6/(signed word) sin16sb::sinx#1 )
   to:sin16sb::@return
 sin16sb::@return: scope:[sin16sb]  from sin16sb::@3
   [114] return 
   to:@return
-sin16sb::@15: scope:[sin16sb]  from sin16sb::@12
+sin16sb::@12: scope:[sin16sb]  from sin16sb::@11
   [115] (signed word~) sin16sb::return#5 ← (signed word)(word) sin16sb::usinx#1
   to:sin16sb::@3
-mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@11 sin16s::@2 sin16s::@8 sin16s::@9 sin16sb::@10 sin16sb::@11 sin16sb::@2 sin16sb::@8 sin16sb::@9
-  [116] (byte) mulu16_sel::select#10 ← phi( sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16sb::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16sb::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [116] (word) mulu16_sel::v2#10 ← phi( sin16s::@10/(word) mulu16_sel::v2#3 sin16s::@11/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@8/(word) mulu16_sel::v2#1 sin16s::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 sin16sb::@10/(word) mulu16_sel::v2#8 sin16sb::@11/(word) mulu16_sel::v2#9 sin16sb::@2/(word) mulu16_sel::v2#5 sin16sb::@8/(word) mulu16_sel::v2#6 sin16sb::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
-  [116] (word) mulu16_sel::v1#10 ← phi( sin16s::@10/(word) mulu16_sel::v1#3 sin16s::@11/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@8/(word) mulu16_sel::v1#1 sin16s::@9/(word) mulu16_sel::v1#2 sin16sb::@10/(word) mulu16_sel::v1#8 sin16sb::@11/(word) mulu16_sel::v1#9 sin16sb::@2/(word) mulu16_sel::v1#5 sin16sb::@8/(word) mulu16_sel::v1#6 sin16sb::@9/(word) mulu16_sel::v1#7 )
+mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@2 sin16s::@7 sin16s::@8 sin16s::@9 sin16sb::@10 sin16sb::@2 sin16sb::@7 sin16sb::@8 sin16sb::@9
+  [116] (byte) mulu16_sel::select#10 ← phi( sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16sb::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16sb::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [116] (word) mulu16_sel::v2#10 ← phi( sin16s::@9/(word) mulu16_sel::v2#3 sin16s::@10/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@7/(word) mulu16_sel::v2#1 sin16s::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 sin16sb::@9/(word) mulu16_sel::v2#8 sin16sb::@10/(word) mulu16_sel::v2#9 sin16sb::@2/(word) mulu16_sel::v2#5 sin16sb::@7/(word) mulu16_sel::v2#6 sin16sb::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
+  [116] (word) mulu16_sel::v1#10 ← phi( sin16s::@9/(word) mulu16_sel::v1#3 sin16s::@10/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@7/(word) mulu16_sel::v1#1 sin16s::@8/(word) mulu16_sel::v1#2 sin16sb::@9/(word) mulu16_sel::v1#8 sin16sb::@10/(word) mulu16_sel::v1#9 sin16sb::@2/(word) mulu16_sel::v1#5 sin16sb::@7/(word) mulu16_sel::v1#6 sin16sb::@8/(word) mulu16_sel::v1#7 )
   [117] (word) mul16u::a#1 ← (word) mulu16_sel::v1#10
   [118] (word) mul16u::b#0 ← (word) mulu16_sel::v2#10
   [119] call mul16u 
   [120] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mulu16_sel::@2
-mulu16_sel::@2: scope:[mulu16_sel]  from mulu16_sel
+  to:mulu16_sel::@1
+mulu16_sel::@1: scope:[mulu16_sel]  from mulu16_sel
   [121] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   [122] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#10
   [123] (word) mulu16_sel::return#17 ← > (dword~) mulu16_sel::$1
   to:mulu16_sel::@return
-mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@2
+mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@1
   [124] return 
   to:@return
 mul16u: scope:[mul16u]  from mulu16_sel
   [125] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#0
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [126] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [126] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [126] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [126] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [126] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [126] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@4/(word) mul16u::a#0 )
   [127] if((word) mul16u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -257,13 +257,13 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [129] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [130] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [130] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [131] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [132] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [132] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [133] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [134] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
@@ -271,23 +271,23 @@ div32u16u: scope:[div32u16u]  from sin16s_gen sin16s_genb
   [135] phi()
   [136] call divr16u 
   [137] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div32u16u::@2
-div32u16u::@2: scope:[div32u16u]  from div32u16u
+  to:div32u16u::@1
+div32u16u::@1: scope:[div32u16u]  from div32u16u
   [138] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2
   [139] (word) divr16u::rem#4 ← (word) rem16u#1
   [140] call divr16u 
   [141] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:div32u16u::@3
-div32u16u::@3: scope:[div32u16u]  from div32u16u::@2
+  to:div32u16u::@2
+div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   [142] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   [143] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0
   to:div32u16u::@return
-div32u16u::@return: scope:[div32u16u]  from div32u16u::@3
+div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
   [144] return 
   to:@return
-divr16u: scope:[divr16u]  from div32u16u div32u16u::@2
-  [145] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@2/<(const dword) PI2_u4f28#0 )
-  [145] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@2/(word) divr16u::rem#4 )
+divr16u: scope:[divr16u]  from div32u16u div32u16u::@1
+  [145] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@1/<(const dword) PI2_u4f28#0 )
+  [145] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@1/(word) divr16u::rem#4 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [146] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
@@ -328,19 +328,19 @@ sin16s_gen: scope:[sin16s_gen]  from main
   [163] phi()
   [164] call div32u16u 
   [165] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  to:sin16s_gen::@3
-sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen
+  to:sin16s_gen::@2
+sin16s_gen::@2: scope:[sin16s_gen]  from sin16s_gen
   [166] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
   to:sin16s_gen::@1
-sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@3 sin16s_gen::@4
-  [167] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(word) sin16s_gen::i#1 )
-  [167] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@3/(const signed word[$78]) main::sintab1#0 sin16s_gen::@4/(signed word*) sin16s_gen::sintab#0 )
-  [167] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(dword) sin16s_gen::x#1 )
+sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@2 sin16s_gen::@3
+  [167] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(word) sin16s_gen::i#1 )
+  [167] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@2/(const signed word[$78]) main::sintab1#0 sin16s_gen::@3/(signed word*) sin16s_gen::sintab#0 )
+  [167] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(dword) sin16s_gen::x#1 )
   [168] (dword) sin16s::x#0 ← (dword) sin16s_gen::x#2
   [169] call sin16s 
   [170] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  to:sin16s_gen::@4
-sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
+  to:sin16s_gen::@3
+sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen::@1
   [171] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   [172] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1
   [173] (signed word*) sin16s_gen::sintab#0 ← (signed word*) sin16s_gen::sintab#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
@@ -348,7 +348,7 @@ sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
   [175] (word) sin16s_gen::i#1 ← ++ (word) sin16s_gen::i#2
   [176] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1
   to:sin16s_gen::@return
-sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@4
+sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@3
   [177] return 
   to:@return
 sin16s: scope:[sin16s]  from sin16s_gen::@1
@@ -373,50 +373,50 @@ sin16s::@2: scope:[sin16s]  from sin16s::@1 sin16s::@5
   [187] (word) mulu16_sel::v2#0 ← (word) sin16s::x1#0
   [188] call mulu16_sel 
   [189] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#17
-  to:sin16s::@8
-sin16s::@8: scope:[sin16s]  from sin16s::@2
+  to:sin16s::@7
+sin16s::@7: scope:[sin16s]  from sin16s::@2
   [190] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   [191] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   [192] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0
   [193] call mulu16_sel 
   [194] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#17
-  to:sin16s::@9
-sin16s::@9: scope:[sin16s]  from sin16s::@8
+  to:sin16s::@8
+sin16s::@8: scope:[sin16s]  from sin16s::@7
   [195] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   [196] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   [197] call mulu16_sel 
   [198] (word) mulu16_sel::return#14 ← (word) mulu16_sel::return#17
-  to:sin16s::@10
-sin16s::@10: scope:[sin16s]  from sin16s::@9
+  to:sin16s::@9
+sin16s::@9: scope:[sin16s]  from sin16s::@8
   [199] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#14
   [200] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0
   [201] (word) mulu16_sel::v1#3 ← (word) sin16s::x3#0
   [202] (word) mulu16_sel::v2#3 ← (word) sin16s::x1#0
   [203] call mulu16_sel 
   [204] (word) mulu16_sel::return#15 ← (word) mulu16_sel::return#17
-  to:sin16s::@11
-sin16s::@11: scope:[sin16s]  from sin16s::@10
+  to:sin16s::@10
+sin16s::@10: scope:[sin16s]  from sin16s::@9
   [205] (word) sin16s::x4#0 ← (word) mulu16_sel::return#15
   [206] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   [207] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0
   [208] call mulu16_sel 
   [209] (word) mulu16_sel::return#16 ← (word) mulu16_sel::return#17
-  to:sin16s::@12
-sin16s::@12: scope:[sin16s]  from sin16s::@11
+  to:sin16s::@11
+sin16s::@11: scope:[sin16s]  from sin16s::@10
   [210] (word) sin16s::x5#0 ← (word) mulu16_sel::return#16
   [211] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [212] (word) sin16s::usinx#1 ← (word) sin16s::usinx#0 + (word) sin16s::x5_128#0
-  [213] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15
+  [213] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12
   to:sin16s::@6
-sin16s::@6: scope:[sin16s]  from sin16s::@12
+sin16s::@6: scope:[sin16s]  from sin16s::@11
   [214] (signed word) sin16s::sinx#1 ← - (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-sin16s::@3: scope:[sin16s]  from sin16s::@15 sin16s::@6
-  [215] (signed word) sin16s::return#1 ← phi( sin16s::@15/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
+sin16s::@3: scope:[sin16s]  from sin16s::@12 sin16s::@6
+  [215] (signed word) sin16s::return#1 ← phi( sin16s::@12/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
   to:sin16s::@return
 sin16s::@return: scope:[sin16s]  from sin16s::@3
   [216] return 
   to:@return
-sin16s::@15: scope:[sin16s]  from sin16s::@12
+sin16s::@12: scope:[sin16s]  from sin16s::@11
   [217] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
diff --git a/src/test/ref/sinusgen16b.log b/src/test/ref/sinusgen16b.log
index 749d10428..fdf34feab 100644
--- a/src/test/ref/sinusgen16b.log
+++ b/src/test/ref/sinusgen16b.log
@@ -2219,14 +2219,41 @@ Culled Empty Block (label) divr16u::@9
 Culled Empty Block (label) sin16s_gen::@5
 Culled Empty Block (label) sin16s::@14
 Culled Empty Block (label) sin16s::@13
+Renumbering block @42 to @1
+Renumbering block div32u16u::@2 to div32u16u::@1
+Renumbering block div32u16u::@3 to div32u16u::@2
+Renumbering block mul16u::@6 to mul16u::@3
+Renumbering block mul16u::@8 to mul16u::@4
+Renumbering block sin16s_gen::@3 to sin16s_gen::@2
+Renumbering block sin16s_gen::@4 to sin16s_gen::@3
+Renumbering block sin16s::@8 to sin16s::@7
+Renumbering block sin16s::@9 to sin16s::@8
+Renumbering block sin16s::@10 to sin16s::@9
+Renumbering block sin16s::@11 to sin16s::@10
+Renumbering block sin16s::@12 to sin16s::@11
+Renumbering block sin16s::@15 to sin16s::@12
+Renumbering block mulu16_sel::@2 to mulu16_sel::@1
+Renumbering block sin16s_genb::@3 to sin16s_genb::@2
+Renumbering block sin16s_genb::@4 to sin16s_genb::@3
+Renumbering block sin16sb::@8 to sin16sb::@7
+Renumbering block sin16sb::@9 to sin16sb::@8
+Renumbering block sin16sb::@10 to sin16sb::@9
+Renumbering block sin16sb::@11 to sin16sb::@10
+Renumbering block sin16sb::@12 to sin16sb::@11
+Renumbering block sin16sb::@15 to sin16sb::@12
+Renumbering block print_sword::@4 to print_sword::@3
+Renumbering block main::@5 to main::@4
+Renumbering block main::@6 to main::@5
+Renumbering block main::@8 to main::@6
+Renumbering block main::@9 to main::@7
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @42
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
+Adding NOP phi() at start of main::@4
 Adding NOP phi() at start of main::@5
-Adding NOP phi() at start of main::@6
 Adding NOP phi() at start of main::@3
-Adding NOP phi() at start of main::@8
+Adding NOP phi() at start of main::@6
 Adding NOP phi() at start of print_sword::@2
 Adding NOP phi() at start of print_cls
 Adding NOP phi() at start of sin16s_genb
@@ -2236,30 +2263,30 @@ Adding NOP phi() at start of sin16s_gen
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@42
-@42: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @42
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @42
+main: scope:[main]  from @1
   [4] phi()
   [5] call sin16s_gen 
-  to:main::@5
-main::@5: scope:[main]  from main
+  to:main::@4
+main::@4: scope:[main]  from main
   [6] phi()
   [7] call sin16s_genb 
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [8] phi()
   [9] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main::@6 main::@9
-  [10] (byte) main::i#2 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@9/(byte) main::i#1 )
-  [10] (byte*) print_char_cursor#49 ← phi( main::@6/(const byte*) print_line_cursor#0 main::@9/(byte*) print_char_cursor#2 )
-  [10] (signed word*) main::st2#2 ← phi( main::@6/(const signed word[$78]) main::sintab2#0 main::@9/(signed word*) main::st2#1 )
-  [10] (signed word*) main::st1#2 ← phi( main::@6/(const signed word[$78]) main::sintab1#0 main::@9/(signed word*) main::st1#1 )
+main::@1: scope:[main]  from main::@5 main::@7
+  [10] (byte) main::i#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
+  [10] (byte*) print_char_cursor#49 ← phi( main::@5/(const byte*) print_line_cursor#0 main::@7/(byte*) print_char_cursor#2 )
+  [10] (signed word*) main::st2#2 ← phi( main::@5/(const signed word[$78]) main::sintab2#0 main::@7/(signed word*) main::st2#1 )
+  [10] (signed word*) main::st1#2 ← phi( main::@5/(const signed word[$78]) main::sintab1#0 main::@7/(signed word*) main::st1#1 )
   [11] (signed word) main::sw#0 ← *((signed word*) main::st1#2) - *((signed word*) main::st2#2)
   [12] if((signed word) main::sw#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@3
@@ -2271,23 +2298,23 @@ main::@2: scope:[main]  from main::@1 main::@3
   [15] (byte*) print_char_cursor#48 ← phi( main::@1/(byte*) print_char_cursor#49 main::@3/(byte*) print_char_cursor#2 )
   [16] (signed word) print_sword::w#1 ← (signed word) main::sw#0
   [17] call print_sword 
-  to:main::@8
-main::@8: scope:[main]  from main::@2
+  to:main::@6
+main::@6: scope:[main]  from main::@2
   [18] phi()
   [19] call print_str 
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [20] (signed word*) main::st1#1 ← (signed word*) main::st1#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [21] (signed word*) main::st2#1 ← (signed word*) main::st2#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [22] (byte) main::i#1 ← ++ (byte) main::i#2
   [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $78) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@9
+main::@return: scope:[main]  from main::@7
   [24] return 
   to:@return
-print_str: scope:[print_str]  from main::@3 main::@8
-  [25] (byte*) print_char_cursor#51 ← phi( main::@3/(byte*) print_char_cursor#49 main::@8/(byte*) print_char_cursor#12 )
-  [25] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@8/(const string) main::str )
+print_str: scope:[print_str]  from main::@3 main::@6
+  [25] (byte*) print_char_cursor#51 ← phi( main::@3/(byte*) print_char_cursor#49 main::@6/(byte*) print_char_cursor#12 )
+  [25] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@6/(const string) main::str )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [26] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#51 print_str::@2/(byte*) print_char_cursor#1 )
@@ -2308,13 +2335,13 @@ print_sword: scope:[print_sword]  from main::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [33] phi()
   [34] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [35] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [36] (byte*) print_char_cursor#43 ← phi( print_sword/(byte*) print_char_cursor#48 print_sword::@4/(byte*) print_char_cursor#12 )
-  [36] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [36] (byte*) print_char_cursor#43 ← phi( print_sword/(byte*) print_char_cursor#48 print_sword::@3/(byte*) print_char_cursor#12 )
+  [36] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@3/(signed word) print_sword::w#0 )
   [37] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
@@ -2355,7 +2382,7 @@ print_char: scope:[print_char]  from print_byte print_byte::@1 print_sword::@2
 print_char::@return: scope:[print_char]  from print_char
   [55] return 
   to:@return
-print_cls: scope:[print_cls]  from main::@6
+print_cls: scope:[print_cls]  from main::@5
   [56] phi()
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -2367,23 +2394,23 @@ print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
 print_cls::@return: scope:[print_cls]  from print_cls::@1
   [61] return 
   to:@return
-sin16s_genb: scope:[sin16s_genb]  from main::@5
+sin16s_genb: scope:[sin16s_genb]  from main::@4
   [62] phi()
   [63] call div32u16u 
   [64] (dword) div32u16u::return#3 ← (dword) div32u16u::return#0
-  to:sin16s_genb::@3
-sin16s_genb::@3: scope:[sin16s_genb]  from sin16s_genb
+  to:sin16s_genb::@2
+sin16s_genb::@2: scope:[sin16s_genb]  from sin16s_genb
   [65] (dword) sin16s_genb::step#0 ← (dword) div32u16u::return#3
   to:sin16s_genb::@1
-sin16s_genb::@1: scope:[sin16s_genb]  from sin16s_genb::@3 sin16s_genb::@4
-  [66] (word) sin16s_genb::i#2 ← phi( sin16s_genb::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_genb::@4/(word) sin16s_genb::i#1 )
-  [66] (signed word*) sin16s_genb::sintab#2 ← phi( sin16s_genb::@3/(const signed word[$78]) main::sintab2#0 sin16s_genb::@4/(signed word*) sin16s_genb::sintab#0 )
-  [66] (dword) sin16s_genb::x#2 ← phi( sin16s_genb::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_genb::@4/(dword) sin16s_genb::x#1 )
+sin16s_genb::@1: scope:[sin16s_genb]  from sin16s_genb::@2 sin16s_genb::@3
+  [66] (word) sin16s_genb::i#2 ← phi( sin16s_genb::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_genb::@3/(word) sin16s_genb::i#1 )
+  [66] (signed word*) sin16s_genb::sintab#2 ← phi( sin16s_genb::@2/(const signed word[$78]) main::sintab2#0 sin16s_genb::@3/(signed word*) sin16s_genb::sintab#0 )
+  [66] (dword) sin16s_genb::x#2 ← phi( sin16s_genb::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_genb::@3/(dword) sin16s_genb::x#1 )
   [67] (word) sin16sb::x#0 ← > (dword) sin16s_genb::x#2
   [68] call sin16sb 
   [69] (signed word) sin16sb::return#0 ← (signed word) sin16sb::return#1
-  to:sin16s_genb::@4
-sin16s_genb::@4: scope:[sin16s_genb]  from sin16s_genb::@1
+  to:sin16s_genb::@3
+sin16s_genb::@3: scope:[sin16s_genb]  from sin16s_genb::@1
   [70] (signed word~) sin16s_genb::$2 ← (signed word) sin16sb::return#0
   [71] *((signed word*) sin16s_genb::sintab#2) ← (signed word~) sin16s_genb::$2
   [72] (signed word*) sin16s_genb::sintab#0 ← (signed word*) sin16s_genb::sintab#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
@@ -2391,7 +2418,7 @@ sin16s_genb::@4: scope:[sin16s_genb]  from sin16s_genb::@1
   [74] (word) sin16s_genb::i#1 ← ++ (word) sin16s_genb::i#2
   [75] if((word) sin16s_genb::i#1<(const word) main::wavelength#0) goto sin16s_genb::@1
   to:sin16s_genb::@return
-sin16s_genb::@return: scope:[sin16s_genb]  from sin16s_genb::@4
+sin16s_genb::@return: scope:[sin16s_genb]  from sin16s_genb::@3
   [76] return 
   to:@return
 sin16sb: scope:[sin16sb]  from sin16s_genb::@1
@@ -2415,77 +2442,77 @@ sin16sb::@2: scope:[sin16sb]  from sin16sb::@1 sin16sb::@5
   [85] (word) mulu16_sel::v2#5 ← (word) sin16sb::x1#0
   [86] call mulu16_sel 
   [87] (word) mulu16_sel::return#18 ← (word) mulu16_sel::return#17
-  to:sin16sb::@8
-sin16sb::@8: scope:[sin16sb]  from sin16sb::@2
+  to:sin16sb::@7
+sin16sb::@7: scope:[sin16sb]  from sin16sb::@2
   [88] (word) sin16sb::x2#0 ← (word) mulu16_sel::return#18
   [89] (word) mulu16_sel::v1#6 ← (word) sin16sb::x2#0
   [90] (word) mulu16_sel::v2#6 ← (word) sin16sb::x1#0
   [91] call mulu16_sel 
   [92] (word) mulu16_sel::return#19 ← (word) mulu16_sel::return#17
-  to:sin16sb::@9
-sin16sb::@9: scope:[sin16sb]  from sin16sb::@8
+  to:sin16sb::@8
+sin16sb::@8: scope:[sin16sb]  from sin16sb::@7
   [93] (word) sin16sb::x3#0 ← (word) mulu16_sel::return#19
   [94] (word) mulu16_sel::v1#7 ← (word) sin16sb::x3#0
   [95] call mulu16_sel 
   [96] (word) mulu16_sel::return#20 ← (word) mulu16_sel::return#17
-  to:sin16sb::@10
-sin16sb::@10: scope:[sin16sb]  from sin16sb::@9
+  to:sin16sb::@9
+sin16sb::@9: scope:[sin16sb]  from sin16sb::@8
   [97] (word) sin16sb::x3_6#0 ← (word) mulu16_sel::return#20
   [98] (word) sin16sb::usinx#0 ← (word) sin16sb::x1#0 - (word) sin16sb::x3_6#0
   [99] (word) mulu16_sel::v1#8 ← (word) sin16sb::x3#0
   [100] (word) mulu16_sel::v2#8 ← (word) sin16sb::x1#0
   [101] call mulu16_sel 
   [102] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#17
-  to:sin16sb::@11
-sin16sb::@11: scope:[sin16sb]  from sin16sb::@10
+  to:sin16sb::@10
+sin16sb::@10: scope:[sin16sb]  from sin16sb::@9
   [103] (word) sin16sb::x4#0 ← (word) mulu16_sel::return#10
   [104] (word) mulu16_sel::v1#9 ← (word) sin16sb::x4#0
   [105] (word) mulu16_sel::v2#9 ← (word) sin16sb::x1#0
   [106] call mulu16_sel 
   [107] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#17
-  to:sin16sb::@12
-sin16sb::@12: scope:[sin16sb]  from sin16sb::@11
+  to:sin16sb::@11
+sin16sb::@11: scope:[sin16sb]  from sin16sb::@10
   [108] (word) sin16sb::x5#0 ← (word) mulu16_sel::return#11
   [109] (word) sin16sb::x5_128#0 ← (word) sin16sb::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [110] (word) sin16sb::usinx#1 ← (word) sin16sb::usinx#0 + (word) sin16sb::x5_128#0
-  [111] if((byte) sin16sb::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16sb::@15
+  [111] if((byte) sin16sb::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16sb::@12
   to:sin16sb::@6
-sin16sb::@6: scope:[sin16sb]  from sin16sb::@12
+sin16sb::@6: scope:[sin16sb]  from sin16sb::@11
   [112] (signed word) sin16sb::sinx#1 ← - (signed word)(word) sin16sb::usinx#1
   to:sin16sb::@3
-sin16sb::@3: scope:[sin16sb]  from sin16sb::@15 sin16sb::@6
-  [113] (signed word) sin16sb::return#1 ← phi( sin16sb::@15/(signed word~) sin16sb::return#5 sin16sb::@6/(signed word) sin16sb::sinx#1 )
+sin16sb::@3: scope:[sin16sb]  from sin16sb::@12 sin16sb::@6
+  [113] (signed word) sin16sb::return#1 ← phi( sin16sb::@12/(signed word~) sin16sb::return#5 sin16sb::@6/(signed word) sin16sb::sinx#1 )
   to:sin16sb::@return
 sin16sb::@return: scope:[sin16sb]  from sin16sb::@3
   [114] return 
   to:@return
-sin16sb::@15: scope:[sin16sb]  from sin16sb::@12
+sin16sb::@12: scope:[sin16sb]  from sin16sb::@11
   [115] (signed word~) sin16sb::return#5 ← (signed word)(word) sin16sb::usinx#1
   to:sin16sb::@3
-mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@11 sin16s::@2 sin16s::@8 sin16s::@9 sin16sb::@10 sin16sb::@11 sin16sb::@2 sin16sb::@8 sin16sb::@9
-  [116] (byte) mulu16_sel::select#10 ← phi( sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16sb::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16sb::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [116] (word) mulu16_sel::v2#10 ← phi( sin16s::@10/(word) mulu16_sel::v2#3 sin16s::@11/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@8/(word) mulu16_sel::v2#1 sin16s::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 sin16sb::@10/(word) mulu16_sel::v2#8 sin16sb::@11/(word) mulu16_sel::v2#9 sin16sb::@2/(word) mulu16_sel::v2#5 sin16sb::@8/(word) mulu16_sel::v2#6 sin16sb::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
-  [116] (word) mulu16_sel::v1#10 ← phi( sin16s::@10/(word) mulu16_sel::v1#3 sin16s::@11/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@8/(word) mulu16_sel::v1#1 sin16s::@9/(word) mulu16_sel::v1#2 sin16sb::@10/(word) mulu16_sel::v1#8 sin16sb::@11/(word) mulu16_sel::v1#9 sin16sb::@2/(word) mulu16_sel::v1#5 sin16sb::@8/(word) mulu16_sel::v1#6 sin16sb::@9/(word) mulu16_sel::v1#7 )
+mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@2 sin16s::@7 sin16s::@8 sin16s::@9 sin16sb::@10 sin16sb::@2 sin16sb::@7 sin16sb::@8 sin16sb::@9
+  [116] (byte) mulu16_sel::select#10 ← phi( sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16sb::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16sb::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16sb::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [116] (word) mulu16_sel::v2#10 ← phi( sin16s::@9/(word) mulu16_sel::v2#3 sin16s::@10/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@7/(word) mulu16_sel::v2#1 sin16s::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 sin16sb::@9/(word) mulu16_sel::v2#8 sin16sb::@10/(word) mulu16_sel::v2#9 sin16sb::@2/(word) mulu16_sel::v2#5 sin16sb::@7/(word) mulu16_sel::v2#6 sin16sb::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
+  [116] (word) mulu16_sel::v1#10 ← phi( sin16s::@9/(word) mulu16_sel::v1#3 sin16s::@10/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@7/(word) mulu16_sel::v1#1 sin16s::@8/(word) mulu16_sel::v1#2 sin16sb::@9/(word) mulu16_sel::v1#8 sin16sb::@10/(word) mulu16_sel::v1#9 sin16sb::@2/(word) mulu16_sel::v1#5 sin16sb::@7/(word) mulu16_sel::v1#6 sin16sb::@8/(word) mulu16_sel::v1#7 )
   [117] (word) mul16u::a#1 ← (word) mulu16_sel::v1#10
   [118] (word) mul16u::b#0 ← (word) mulu16_sel::v2#10
   [119] call mul16u 
   [120] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mulu16_sel::@2
-mulu16_sel::@2: scope:[mulu16_sel]  from mulu16_sel
+  to:mulu16_sel::@1
+mulu16_sel::@1: scope:[mulu16_sel]  from mulu16_sel
   [121] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   [122] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#10
   [123] (word) mulu16_sel::return#17 ← > (dword~) mulu16_sel::$1
   to:mulu16_sel::@return
-mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@2
+mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@1
   [124] return 
   to:@return
 mul16u: scope:[mul16u]  from mulu16_sel
   [125] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#0
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [126] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [126] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [126] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [126] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [126] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [126] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@4/(word) mul16u::a#0 )
   [127] if((word) mul16u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -2493,13 +2520,13 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [129] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [130] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [130] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [131] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [132] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [132] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [133] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [134] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
@@ -2507,23 +2534,23 @@ div32u16u: scope:[div32u16u]  from sin16s_gen sin16s_genb
   [135] phi()
   [136] call divr16u 
   [137] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div32u16u::@2
-div32u16u::@2: scope:[div32u16u]  from div32u16u
+  to:div32u16u::@1
+div32u16u::@1: scope:[div32u16u]  from div32u16u
   [138] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2
   [139] (word) divr16u::rem#4 ← (word) rem16u#1
   [140] call divr16u 
   [141] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:div32u16u::@3
-div32u16u::@3: scope:[div32u16u]  from div32u16u::@2
+  to:div32u16u::@2
+div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   [142] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   [143] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0
   to:div32u16u::@return
-div32u16u::@return: scope:[div32u16u]  from div32u16u::@3
+div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
   [144] return 
   to:@return
-divr16u: scope:[divr16u]  from div32u16u div32u16u::@2
-  [145] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@2/<(const dword) PI2_u4f28#0 )
-  [145] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@2/(word) divr16u::rem#4 )
+divr16u: scope:[divr16u]  from div32u16u div32u16u::@1
+  [145] (word) divr16u::dividend#5 ← phi( div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@1/<(const dword) PI2_u4f28#0 )
+  [145] (word) divr16u::rem#10 ← phi( div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@1/(word) divr16u::rem#4 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [146] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
@@ -2564,19 +2591,19 @@ sin16s_gen: scope:[sin16s_gen]  from main
   [163] phi()
   [164] call div32u16u 
   [165] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  to:sin16s_gen::@3
-sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen
+  to:sin16s_gen::@2
+sin16s_gen::@2: scope:[sin16s_gen]  from sin16s_gen
   [166] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
   to:sin16s_gen::@1
-sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@3 sin16s_gen::@4
-  [167] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(word) sin16s_gen::i#1 )
-  [167] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@3/(const signed word[$78]) main::sintab1#0 sin16s_gen::@4/(signed word*) sin16s_gen::sintab#0 )
-  [167] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(dword) sin16s_gen::x#1 )
+sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@2 sin16s_gen::@3
+  [167] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(word) sin16s_gen::i#1 )
+  [167] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@2/(const signed word[$78]) main::sintab1#0 sin16s_gen::@3/(signed word*) sin16s_gen::sintab#0 )
+  [167] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(dword) sin16s_gen::x#1 )
   [168] (dword) sin16s::x#0 ← (dword) sin16s_gen::x#2
   [169] call sin16s 
   [170] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  to:sin16s_gen::@4
-sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
+  to:sin16s_gen::@3
+sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen::@1
   [171] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   [172] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1
   [173] (signed word*) sin16s_gen::sintab#0 ← (signed word*) sin16s_gen::sintab#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
@@ -2584,7 +2611,7 @@ sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
   [175] (word) sin16s_gen::i#1 ← ++ (word) sin16s_gen::i#2
   [176] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1
   to:sin16s_gen::@return
-sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@4
+sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@3
   [177] return 
   to:@return
 sin16s: scope:[sin16s]  from sin16s_gen::@1
@@ -2609,51 +2636,51 @@ sin16s::@2: scope:[sin16s]  from sin16s::@1 sin16s::@5
   [187] (word) mulu16_sel::v2#0 ← (word) sin16s::x1#0
   [188] call mulu16_sel 
   [189] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#17
-  to:sin16s::@8
-sin16s::@8: scope:[sin16s]  from sin16s::@2
+  to:sin16s::@7
+sin16s::@7: scope:[sin16s]  from sin16s::@2
   [190] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   [191] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   [192] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0
   [193] call mulu16_sel 
   [194] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#17
-  to:sin16s::@9
-sin16s::@9: scope:[sin16s]  from sin16s::@8
+  to:sin16s::@8
+sin16s::@8: scope:[sin16s]  from sin16s::@7
   [195] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   [196] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   [197] call mulu16_sel 
   [198] (word) mulu16_sel::return#14 ← (word) mulu16_sel::return#17
-  to:sin16s::@10
-sin16s::@10: scope:[sin16s]  from sin16s::@9
+  to:sin16s::@9
+sin16s::@9: scope:[sin16s]  from sin16s::@8
   [199] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#14
   [200] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0
   [201] (word) mulu16_sel::v1#3 ← (word) sin16s::x3#0
   [202] (word) mulu16_sel::v2#3 ← (word) sin16s::x1#0
   [203] call mulu16_sel 
   [204] (word) mulu16_sel::return#15 ← (word) mulu16_sel::return#17
-  to:sin16s::@11
-sin16s::@11: scope:[sin16s]  from sin16s::@10
+  to:sin16s::@10
+sin16s::@10: scope:[sin16s]  from sin16s::@9
   [205] (word) sin16s::x4#0 ← (word) mulu16_sel::return#15
   [206] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   [207] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0
   [208] call mulu16_sel 
   [209] (word) mulu16_sel::return#16 ← (word) mulu16_sel::return#17
-  to:sin16s::@12
-sin16s::@12: scope:[sin16s]  from sin16s::@11
+  to:sin16s::@11
+sin16s::@11: scope:[sin16s]  from sin16s::@10
   [210] (word) sin16s::x5#0 ← (word) mulu16_sel::return#16
   [211] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [212] (word) sin16s::usinx#1 ← (word) sin16s::usinx#0 + (word) sin16s::x5_128#0
-  [213] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15
+  [213] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12
   to:sin16s::@6
-sin16s::@6: scope:[sin16s]  from sin16s::@12
+sin16s::@6: scope:[sin16s]  from sin16s::@11
   [214] (signed word) sin16s::sinx#1 ← - (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-sin16s::@3: scope:[sin16s]  from sin16s::@15 sin16s::@6
-  [215] (signed word) sin16s::return#1 ← phi( sin16s::@15/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
+sin16s::@3: scope:[sin16s]  from sin16s::@12 sin16s::@6
+  [215] (signed word) sin16s::return#1 ← phi( sin16s::@12/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
   to:sin16s::@return
 sin16s::@return: scope:[sin16s]  from sin16s::@3
   [216] return 
   to:@return
-sin16s::@15: scope:[sin16s]  from sin16s::@12
+sin16s::@12: scope:[sin16s]  from sin16s::@11
   [217] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
 
@@ -3198,17 +3225,17 @@ INITIAL ASM
   .label print_char_cursor = $d
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @42 [phi:@begin->@42]
-b42_from_bbegin:
-  jmp b42
-//SEG5 @42
-b42:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @42 to main [phi:@42->main]
-main_from_b42:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @42 to @end [phi:@42->@end]
-bend_from_b42:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3223,51 +3250,51 @@ main: {
   //SEG12 [163] phi from main to sin16s_gen [phi:main->sin16s_gen]
   sin16s_gen_from_main:
     jsr sin16s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  b5_from_main:
-    jmp b5
-  //SEG14 main::@5
-  b5:
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  b4_from_main:
+    jmp b4
+  //SEG14 main::@4
+  b4:
   //SEG15 [7] call sin16s_genb 
-  //SEG16 [62] phi from main::@5 to sin16s_genb [phi:main::@5->sin16s_genb]
-  sin16s_genb_from_b5:
+  //SEG16 [62] phi from main::@4 to sin16s_genb [phi:main::@4->sin16s_genb]
+  sin16s_genb_from_b4:
     jsr sin16s_genb
-  //SEG17 [8] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG18 main::@6
-  b6:
+  //SEG17 [8] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG18 main::@5
+  b5:
   //SEG19 [9] call print_cls 
-  //SEG20 [56] phi from main::@6 to print_cls [phi:main::@6->print_cls]
-  print_cls_from_b6:
+  //SEG20 [56] phi from main::@5 to print_cls [phi:main::@5->print_cls]
+  print_cls_from_b5:
     jsr print_cls
-  //SEG21 [10] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  b1_from_b6:
-  //SEG22 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#0] -- vbuz1=vbuc1 
+  //SEG21 [10] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG22 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG23 [10] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@6->main::@1#1] -- pbuz1=pbuc1 
+  //SEG23 [10] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#1] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG24 [10] phi (signed word*) main::st2#2 = (const signed word[$78]) main::sintab2#0 [phi:main::@6->main::@1#2] -- pwsz1=pwsc1 
+  //SEG24 [10] phi (signed word*) main::st2#2 = (const signed word[$78]) main::sintab2#0 [phi:main::@5->main::@1#2] -- pwsz1=pwsc1 
     lda #<sintab2
     sta st2
     lda #>sintab2
     sta st2+1
-  //SEG25 [10] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@6->main::@1#3] -- pwsz1=pwsc1 
+  //SEG25 [10] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@5->main::@1#3] -- pwsz1=pwsc1 
     lda #<sintab1
     sta st1
     lda #>sintab1
     sta st1+1
     jmp b1
-  //SEG26 [10] phi from main::@9 to main::@1 [phi:main::@9->main::@1]
-  b1_from_b9:
-  //SEG27 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@9->main::@1#0] -- register_copy 
-  //SEG28 [10] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@9->main::@1#1] -- register_copy 
-  //SEG29 [10] phi (signed word*) main::st2#2 = (signed word*) main::st2#1 [phi:main::@9->main::@1#2] -- register_copy 
-  //SEG30 [10] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@9->main::@1#3] -- register_copy 
+  //SEG26 [10] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
+  b1_from_b7:
+  //SEG27 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG28 [10] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@7->main::@1#1] -- register_copy 
+  //SEG29 [10] phi (signed word*) main::st2#2 = (signed word*) main::st2#1 [phi:main::@7->main::@1#2] -- register_copy 
+  //SEG30 [10] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@7->main::@1#3] -- register_copy 
     jmp b1
   //SEG31 main::@1
   b1:
@@ -3313,24 +3340,24 @@ main: {
     sta print_sword.w+1
   //SEG44 [17] call print_sword 
     jsr print_sword
-  //SEG45 [18] phi from main::@2 to main::@8 [phi:main::@2->main::@8]
-  b8_from_b2:
-    jmp b8
-  //SEG46 main::@8
-  b8:
+  //SEG45 [18] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
+  b6_from_b2:
+    jmp b6
+  //SEG46 main::@6
+  b6:
   //SEG47 [19] call print_str 
-  //SEG48 [25] phi from main::@8 to print_str [phi:main::@8->print_str]
-  print_str_from_b8:
-  //SEG49 [25] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@8->print_str#0] -- register_copy 
-  //SEG50 [25] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@8->print_str#1] -- pbuz1=pbuc1 
+  //SEG48 [25] phi from main::@6 to print_str [phi:main::@6->print_str]
+  print_str_from_b6:
+  //SEG49 [25] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@6->print_str#0] -- register_copy 
+  //SEG50 [25] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG51 main::@9
-  b9:
+    jmp b7
+  //SEG51 main::@7
+  b7:
   //SEG52 [20] (signed word*) main::st1#1 ← (signed word*) main::st1#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- pwsz1=pwsz1_plus_2 
     lda st1
     clc
@@ -3352,7 +3379,7 @@ main: {
   //SEG55 [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $78) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$78
     cmp i
-    bne b1_from_b9
+    bne b1_from_b7
     jmp breturn
   //SEG56 main::@return
   breturn:
@@ -3426,9 +3453,9 @@ print_sword: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b4
-  //SEG78 print_sword::@4
-  b4:
+    jmp b3
+  //SEG78 print_sword::@3
+  b3:
   //SEG79 [35] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -3439,11 +3466,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG80 [36] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG80 [36] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG81 [36] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG82 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG81 [36] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG82 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG83 print_sword::@1
   b1:
@@ -3616,9 +3643,9 @@ sin16s_genb: {
     sta div32u16u.return_3+2
     lda div32u16u.return+3
     sta div32u16u.return_3+3
-    jmp b3
-  //SEG137 sin16s_genb::@3
-  b3:
+    jmp b2
+  //SEG137 sin16s_genb::@2
+  b2:
   //SEG138 [65] (dword) sin16s_genb::step#0 ← (dword) div32u16u::return#3 -- vduz1=vduz2 
     lda div32u16u.return_3
     sta step
@@ -3628,19 +3655,19 @@ sin16s_genb: {
     sta step+2
     lda div32u16u.return_3+3
     sta step+3
-  //SEG139 [66] phi from sin16s_genb::@3 to sin16s_genb::@1 [phi:sin16s_genb::@3->sin16s_genb::@1]
-  b1_from_b3:
-  //SEG140 [66] phi (word) sin16s_genb::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@3->sin16s_genb::@1#0] -- vwuz1=vbuc1 
+  //SEG139 [66] phi from sin16s_genb::@2 to sin16s_genb::@1 [phi:sin16s_genb::@2->sin16s_genb::@1]
+  b1_from_b2:
+  //SEG140 [66] phi (word) sin16s_genb::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@2->sin16s_genb::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG141 [66] phi (signed word*) sin16s_genb::sintab#2 = (const signed word[$78]) main::sintab2#0 [phi:sin16s_genb::@3->sin16s_genb::@1#1] -- pwsz1=pwsc1 
+  //SEG141 [66] phi (signed word*) sin16s_genb::sintab#2 = (const signed word[$78]) main::sintab2#0 [phi:sin16s_genb::@2->sin16s_genb::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintab2
     sta sintab
     lda #>main.sintab2
     sta sintab+1
-  //SEG142 [66] phi (dword) sin16s_genb::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@3->sin16s_genb::@1#2] -- vduz1=vbuc1 
+  //SEG142 [66] phi (dword) sin16s_genb::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@2->sin16s_genb::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -3649,11 +3676,11 @@ sin16s_genb: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG143 [66] phi from sin16s_genb::@4 to sin16s_genb::@1 [phi:sin16s_genb::@4->sin16s_genb::@1]
-  b1_from_b4:
-  //SEG144 [66] phi (word) sin16s_genb::i#2 = (word) sin16s_genb::i#1 [phi:sin16s_genb::@4->sin16s_genb::@1#0] -- register_copy 
-  //SEG145 [66] phi (signed word*) sin16s_genb::sintab#2 = (signed word*) sin16s_genb::sintab#0 [phi:sin16s_genb::@4->sin16s_genb::@1#1] -- register_copy 
-  //SEG146 [66] phi (dword) sin16s_genb::x#2 = (dword) sin16s_genb::x#1 [phi:sin16s_genb::@4->sin16s_genb::@1#2] -- register_copy 
+  //SEG143 [66] phi from sin16s_genb::@3 to sin16s_genb::@1 [phi:sin16s_genb::@3->sin16s_genb::@1]
+  b1_from_b3:
+  //SEG144 [66] phi (word) sin16s_genb::i#2 = (word) sin16s_genb::i#1 [phi:sin16s_genb::@3->sin16s_genb::@1#0] -- register_copy 
+  //SEG145 [66] phi (signed word*) sin16s_genb::sintab#2 = (signed word*) sin16s_genb::sintab#0 [phi:sin16s_genb::@3->sin16s_genb::@1#1] -- register_copy 
+  //SEG146 [66] phi (dword) sin16s_genb::x#2 = (dword) sin16s_genb::x#1 [phi:sin16s_genb::@3->sin16s_genb::@1#2] -- register_copy 
     jmp b1
   //SEG147 sin16s_genb::@1
   b1:
@@ -3669,9 +3696,9 @@ sin16s_genb: {
     sta sin16sb.return
     lda sin16sb.return_1+1
     sta sin16sb.return+1
-    jmp b4
-  //SEG151 sin16s_genb::@4
-  b4:
+    jmp b3
+  //SEG151 sin16s_genb::@3
+  b3:
   //SEG152 [70] (signed word~) sin16s_genb::$2 ← (signed word) sin16sb::return#0 -- vwsz1=vwsz2 
     lda sin16sb.return
     sta _2
@@ -3714,11 +3741,11 @@ sin16s_genb: {
   //SEG157 [75] if((word) sin16s_genb::i#1<(const word) main::wavelength#0) goto sin16s_genb::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG158 sin16s_genb::@return
@@ -3845,9 +3872,9 @@ sin16sb: {
     sta mulu16_sel.return_18
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return_18+1
-    jmp b8
-  //SEG186 sin16sb::@8
-  b8:
+    jmp b7
+  //SEG186 sin16sb::@7
+  b7:
   //SEG187 [88] (word) sin16sb::x2#0 ← (word) mulu16_sel::return#18 -- vwuz1=vwuz2 
     lda mulu16_sel.return_18
     sta x2
@@ -3864,22 +3891,22 @@ sin16sb: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG190 [91] call mulu16_sel 
-  //SEG191 [116] phi from sin16sb::@8 to mulu16_sel [phi:sin16sb::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG192 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@8->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG191 [116] phi from sin16sb::@7 to mulu16_sel [phi:sin16sb::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG192 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@7->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG193 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#6 [phi:sin16sb::@8->mulu16_sel#1] -- register_copy 
-  //SEG194 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#6 [phi:sin16sb::@8->mulu16_sel#2] -- register_copy 
+  //SEG193 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#6 [phi:sin16sb::@7->mulu16_sel#1] -- register_copy 
+  //SEG194 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#6 [phi:sin16sb::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG195 [92] (word) mulu16_sel::return#19 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return_19
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return_19+1
-    jmp b9
-  //SEG196 sin16sb::@9
-  b9:
+    jmp b8
+  //SEG196 sin16sb::@8
+  b8:
   //SEG197 [93] (word) sin16sb::x3#0 ← (word) mulu16_sel::return#19 -- vwuz1=vwuz2 
     lda mulu16_sel.return_19
     sta x3
@@ -3891,26 +3918,26 @@ sin16sb: {
     lda x3+1
     sta mulu16_sel.v1+1
   //SEG199 [95] call mulu16_sel 
-  //SEG200 [116] phi from sin16sb::@9 to mulu16_sel [phi:sin16sb::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG201 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@9->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG200 [116] phi from sin16sb::@8 to mulu16_sel [phi:sin16sb::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG201 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@8->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG202 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16sb::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG202 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16sb::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG203 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#7 [phi:sin16sb::@9->mulu16_sel#2] -- register_copy 
+  //SEG203 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#7 [phi:sin16sb::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG204 [96] (word) mulu16_sel::return#20 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return_20
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return_20+1
-    jmp b10
-  //SEG205 sin16sb::@10
-  b10:
+    jmp b9
+  //SEG205 sin16sb::@9
+  b9:
   //SEG206 [97] (word) sin16sb::x3_6#0 ← (word) mulu16_sel::return#20 -- vwuz1=vwuz2 
     lda mulu16_sel.return_20
     sta x3_6
@@ -3935,22 +3962,22 @@ sin16sb: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG210 [101] call mulu16_sel 
-  //SEG211 [116] phi from sin16sb::@10 to mulu16_sel [phi:sin16sb::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG212 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@10->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG211 [116] phi from sin16sb::@9 to mulu16_sel [phi:sin16sb::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG212 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@9->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG213 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#8 [phi:sin16sb::@10->mulu16_sel#1] -- register_copy 
-  //SEG214 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#8 [phi:sin16sb::@10->mulu16_sel#2] -- register_copy 
+  //SEG213 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#8 [phi:sin16sb::@9->mulu16_sel#1] -- register_copy 
+  //SEG214 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#8 [phi:sin16sb::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG215 [102] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return_10
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return_10+1
-    jmp b11
-  //SEG216 sin16sb::@11
-  b11:
+    jmp b10
+  //SEG216 sin16sb::@10
+  b10:
   //SEG217 [103] (word) sin16sb::x4#0 ← (word) mulu16_sel::return#10 -- vwuz1=vwuz2 
     lda mulu16_sel.return_10
     sta x4
@@ -3967,22 +3994,22 @@ sin16sb: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG220 [106] call mulu16_sel 
-  //SEG221 [116] phi from sin16sb::@11 to mulu16_sel [phi:sin16sb::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG222 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@11->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG221 [116] phi from sin16sb::@10 to mulu16_sel [phi:sin16sb::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG222 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@10->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG223 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#9 [phi:sin16sb::@11->mulu16_sel#1] -- register_copy 
-  //SEG224 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#9 [phi:sin16sb::@11->mulu16_sel#2] -- register_copy 
+  //SEG223 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#9 [phi:sin16sb::@10->mulu16_sel#1] -- register_copy 
+  //SEG224 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#9 [phi:sin16sb::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG225 [107] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return_11
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return_11+1
-    jmp b12
-  //SEG226 sin16sb::@12
-  b12:
+    jmp b11
+  //SEG226 sin16sb::@11
+  b11:
   //SEG227 [108] (word) sin16sb::x5#0 ← (word) mulu16_sel::return#11 -- vwuz1=vwuz2 
     lda mulu16_sel.return_11
     sta x5
@@ -4007,10 +4034,10 @@ sin16sb: {
     lda usinx+1
     adc x5_128+1
     sta usinx_1+1
-  //SEG230 [111] if((byte) sin16sb::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16sb::@15 -- vbuz1_eq_0_then_la1 
+  //SEG230 [111] if((byte) sin16sb::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16sb::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG231 sin16sb::@6
   b6:
@@ -4024,10 +4051,10 @@ sin16sb: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG233 [113] phi from sin16sb::@15 sin16sb::@6 to sin16sb::@3 [phi:sin16sb::@15/sin16sb::@6->sin16sb::@3]
-  b3_from_b15:
+  //SEG233 [113] phi from sin16sb::@12 sin16sb::@6 to sin16sb::@3 [phi:sin16sb::@12/sin16sb::@6->sin16sb::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG234 [113] phi (signed word) sin16sb::return#1 = (signed word~) sin16sb::return#5 [phi:sin16sb::@15/sin16sb::@6->sin16sb::@3#0] -- register_copy 
+  //SEG234 [113] phi (signed word) sin16sb::return#1 = (signed word~) sin16sb::return#5 [phi:sin16sb::@12/sin16sb::@6->sin16sb::@3#0] -- register_copy 
     jmp b3
   //SEG235 sin16sb::@3
   b3:
@@ -4036,14 +4063,14 @@ sin16sb: {
   breturn:
   //SEG237 [114] return 
     rts
-  //SEG238 sin16sb::@15
-  b15:
+  //SEG238 sin16sb::@12
+  b12:
   //SEG239 [115] (signed word~) sin16sb::return#5 ← (signed word)(word) sin16sb::usinx#1 -- vwsz1=vwsz2 
     lda usinx_1
     sta return_5
     lda usinx_1+1
     sta return_5+1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
 //SEG240 mulu16_sel
 // Calculate val*val for two unsigned word values - the result is 16 selected bits of the 32-bit result.
@@ -4087,9 +4114,9 @@ mulu16_sel: {
     sta mul16u.return+2
     lda mul16u.res+3
     sta mul16u.return+3
-    jmp b2
-  //SEG245 mulu16_sel::@2
-  b2:
+    jmp b1
+  //SEG245 mulu16_sel::@1
+  b1:
   //SEG246 [121] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2 -- vduz1=vduz2 
     lda mul16u.return
     sta _0
@@ -4177,13 +4204,13 @@ mul16u: {
     lda a
     and #1
     sta _1
-  //SEG263 [130] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG263 [130] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG264 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG264 mul16u::@3
+  b3:
   //SEG265 [131] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -4198,13 +4225,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG266 [132] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG267 [132] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG268 mul16u::@8
-  b8:
+  //SEG266 [132] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG267 [132] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG268 mul16u::@4
+  b4:
   //SEG269 [133] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -4214,11 +4241,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG271 [126] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG272 [126] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG273 [126] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG274 [126] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG271 [126] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG272 [126] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG273 [126] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG274 [126] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG275 div32u16u
@@ -4249,9 +4276,9 @@ div32u16u: {
     sta divr16u.return_2
     lda divr16u.return+1
     sta divr16u.return_2+1
-    jmp b2
-  //SEG281 div32u16u::@2
-  b2:
+    jmp b1
+  //SEG281 div32u16u::@1
+  b1:
   //SEG282 [138] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return_2
     sta quotient_hi
@@ -4263,23 +4290,23 @@ div32u16u: {
     lda rem16u+1
     sta divr16u.rem+1
   //SEG284 [140] call divr16u 
-  //SEG285 [145] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  divr16u_from_b2:
-  //SEG286 [145] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG285 [145] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  divr16u_from_b1:
+  //SEG286 [145] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG287 [145] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG287 [145] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG288 [141] (word) divr16u::return#3 ← (word) divr16u::return#0 -- vwuz1=vwuz2 
     lda divr16u.return
     sta divr16u.return_3
     lda divr16u.return+1
     sta divr16u.return_3+1
-    jmp b3
-  //SEG289 div32u16u::@3
-  b3:
+    jmp b2
+  //SEG289 div32u16u::@2
+  b2:
   //SEG290 [142] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3 -- vwuz1=vwuz2 
     lda divr16u.return_3
     sta quotient_lo
@@ -4449,9 +4476,9 @@ sin16s_gen: {
     sta div32u16u.return_2+2
     lda div32u16u.return+3
     sta div32u16u.return_2+3
-    jmp b3
-  //SEG335 sin16s_gen::@3
-  b3:
+    jmp b2
+  //SEG335 sin16s_gen::@2
+  b2:
   //SEG336 [166] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2 -- vduz1=vduz2 
     lda div32u16u.return_2
     sta step
@@ -4461,19 +4488,19 @@ sin16s_gen: {
     sta step+2
     lda div32u16u.return_2+3
     sta step+3
-  //SEG337 [167] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
-  b1_from_b3:
-  //SEG338 [167] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG337 [167] phi from sin16s_gen::@2 to sin16s_gen::@1 [phi:sin16s_gen::@2->sin16s_gen::@1]
+  b1_from_b2:
+  //SEG338 [167] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG339 [167] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- pwsz1=pwsc1 
+  //SEG339 [167] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@2->sin16s_gen::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintab1
     sta sintab
     lda #>main.sintab1
     sta sintab+1
-  //SEG340 [167] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- vduz1=vbuc1 
+  //SEG340 [167] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -4482,11 +4509,11 @@ sin16s_gen: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG341 [167] phi from sin16s_gen::@4 to sin16s_gen::@1 [phi:sin16s_gen::@4->sin16s_gen::@1]
-  b1_from_b4:
-  //SEG342 [167] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@4->sin16s_gen::@1#0] -- register_copy 
-  //SEG343 [167] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@4->sin16s_gen::@1#1] -- register_copy 
-  //SEG344 [167] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@4->sin16s_gen::@1#2] -- register_copy 
+  //SEG341 [167] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
+  b1_from_b3:
+  //SEG342 [167] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- register_copy 
+  //SEG343 [167] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- register_copy 
+  //SEG344 [167] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- register_copy 
     jmp b1
   //SEG345 sin16s_gen::@1
   b1:
@@ -4506,9 +4533,9 @@ sin16s_gen: {
     sta sin16s.return
     lda sin16s.return_1+1
     sta sin16s.return+1
-    jmp b4
-  //SEG349 sin16s_gen::@4
-  b4:
+    jmp b3
+  //SEG349 sin16s_gen::@3
+  b3:
   //SEG350 [171] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0 -- vwsz1=vwsz2 
     lda sin16s.return
     sta _1
@@ -4551,11 +4578,11 @@ sin16s_gen: {
   //SEG355 [176] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG356 sin16s_gen::@return
@@ -4722,9 +4749,9 @@ sin16s: {
     sta mulu16_sel.return
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return+1
-    jmp b8
-  //SEG385 sin16s::@8
-  b8:
+    jmp b7
+  //SEG385 sin16s::@7
+  b7:
   //SEG386 [190] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -4741,22 +4768,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG389 [193] call mulu16_sel 
-  //SEG390 [116] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG391 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG390 [116] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG391 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG392 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG393 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG392 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG393 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG394 [194] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return_1
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return_1+1
-    jmp b9
-  //SEG395 sin16s::@9
-  b9:
+    jmp b8
+  //SEG395 sin16s::@8
+  b8:
   //SEG396 [195] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1 -- vwuz1=vwuz2 
     lda mulu16_sel.return_1
     sta x3
@@ -4768,26 +4795,26 @@ sin16s: {
     lda x3+1
     sta mulu16_sel.v1+1
   //SEG398 [197] call mulu16_sel 
-  //SEG399 [116] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG400 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG399 [116] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG400 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG401 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG401 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG402 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG402 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG403 [198] (word) mulu16_sel::return#14 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return_14
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return_14+1
-    jmp b10
-  //SEG404 sin16s::@10
-  b10:
+    jmp b9
+  //SEG404 sin16s::@9
+  b9:
   //SEG405 [199] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#14 -- vwuz1=vwuz2 
     lda mulu16_sel.return_14
     sta x3_6
@@ -4812,22 +4839,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG409 [203] call mulu16_sel 
-  //SEG410 [116] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG411 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG410 [116] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG411 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG412 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG413 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG412 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG413 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG414 [204] (word) mulu16_sel::return#15 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return_15
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return_15+1
-    jmp b11
-  //SEG415 sin16s::@11
-  b11:
+    jmp b10
+  //SEG415 sin16s::@10
+  b10:
   //SEG416 [205] (word) sin16s::x4#0 ← (word) mulu16_sel::return#15 -- vwuz1=vwuz2 
     lda mulu16_sel.return_15
     sta x4
@@ -4844,22 +4871,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG419 [208] call mulu16_sel 
-  //SEG420 [116] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG421 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG420 [116] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG421 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG422 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG423 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG422 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG423 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG424 [209] (word) mulu16_sel::return#16 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return_16
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return_16+1
-    jmp b12
-  //SEG425 sin16s::@12
-  b12:
+    jmp b11
+  //SEG425 sin16s::@11
+  b11:
   //SEG426 [210] (word) sin16s::x5#0 ← (word) mulu16_sel::return#16 -- vwuz1=vwuz2 
     lda mulu16_sel.return_16
     sta x5
@@ -4884,10 +4911,10 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx_1+1
-  //SEG429 [213] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG429 [213] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG430 sin16s::@6
   b6:
@@ -4901,10 +4928,10 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG432 [215] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  b3_from_b15:
+  //SEG432 [215] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG433 [215] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG433 [215] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
     jmp b3
   //SEG434 sin16s::@3
   b3:
@@ -4913,14 +4940,14 @@ sin16s: {
   breturn:
   //SEG436 [216] return 
     rts
-  //SEG437 sin16s::@15
-  b15:
+  //SEG437 sin16s::@12
+  b12:
   //SEG438 [217] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1 -- vwsz1=vwsz2 
     lda usinx_1
     sta return_5
     lda usinx_1+1
     sta return_5+1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
   print_hextab: .text "0123456789abcdef"
 
@@ -5387,17 +5414,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_char_cursor = $b
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @42 [phi:@begin->@42]
-b42_from_bbegin:
-  jmp b42
-//SEG5 @42
-b42:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @42 to main [phi:@42->main]
-main_from_b42:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @42 to @end [phi:@42->@end]
-bend_from_b42:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -5411,50 +5438,50 @@ main: {
   //SEG12 [163] phi from main to sin16s_gen [phi:main->sin16s_gen]
   sin16s_gen_from_main:
     jsr sin16s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  b5_from_main:
-    jmp b5
-  //SEG14 main::@5
-  b5:
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  b4_from_main:
+    jmp b4
+  //SEG14 main::@4
+  b4:
   //SEG15 [7] call sin16s_genb 
-  //SEG16 [62] phi from main::@5 to sin16s_genb [phi:main::@5->sin16s_genb]
-  sin16s_genb_from_b5:
+  //SEG16 [62] phi from main::@4 to sin16s_genb [phi:main::@4->sin16s_genb]
+  sin16s_genb_from_b4:
     jsr sin16s_genb
-  //SEG17 [8] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG18 main::@6
-  b6:
+  //SEG17 [8] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG18 main::@5
+  b5:
   //SEG19 [9] call print_cls 
-  //SEG20 [56] phi from main::@6 to print_cls [phi:main::@6->print_cls]
-  print_cls_from_b6:
+  //SEG20 [56] phi from main::@5 to print_cls [phi:main::@5->print_cls]
+  print_cls_from_b5:
     jsr print_cls
-  //SEG21 [10] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  b1_from_b6:
-  //SEG22 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#0] -- vbuxx=vbuc1 
+  //SEG21 [10] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG22 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG23 [10] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@6->main::@1#1] -- pbuz1=pbuc1 
+  //SEG23 [10] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#1] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG24 [10] phi (signed word*) main::st2#2 = (const signed word[$78]) main::sintab2#0 [phi:main::@6->main::@1#2] -- pwsz1=pwsc1 
+  //SEG24 [10] phi (signed word*) main::st2#2 = (const signed word[$78]) main::sintab2#0 [phi:main::@5->main::@1#2] -- pwsz1=pwsc1 
     lda #<sintab2
     sta st2
     lda #>sintab2
     sta st2+1
-  //SEG25 [10] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@6->main::@1#3] -- pwsz1=pwsc1 
+  //SEG25 [10] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@5->main::@1#3] -- pwsz1=pwsc1 
     lda #<sintab1
     sta st1
     lda #>sintab1
     sta st1+1
     jmp b1
-  //SEG26 [10] phi from main::@9 to main::@1 [phi:main::@9->main::@1]
-  b1_from_b9:
-  //SEG27 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@9->main::@1#0] -- register_copy 
-  //SEG28 [10] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@9->main::@1#1] -- register_copy 
-  //SEG29 [10] phi (signed word*) main::st2#2 = (signed word*) main::st2#1 [phi:main::@9->main::@1#2] -- register_copy 
-  //SEG30 [10] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@9->main::@1#3] -- register_copy 
+  //SEG26 [10] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
+  b1_from_b7:
+  //SEG27 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG28 [10] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@7->main::@1#1] -- register_copy 
+  //SEG29 [10] phi (signed word*) main::st2#2 = (signed word*) main::st2#1 [phi:main::@7->main::@1#2] -- register_copy 
+  //SEG30 [10] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@7->main::@1#3] -- register_copy 
     jmp b1
   //SEG31 main::@1
   b1:
@@ -5496,24 +5523,24 @@ main: {
   //SEG43 [16] (signed word) print_sword::w#1 ← (signed word) main::sw#0
   //SEG44 [17] call print_sword 
     jsr print_sword
-  //SEG45 [18] phi from main::@2 to main::@8 [phi:main::@2->main::@8]
-  b8_from_b2:
-    jmp b8
-  //SEG46 main::@8
-  b8:
+  //SEG45 [18] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
+  b6_from_b2:
+    jmp b6
+  //SEG46 main::@6
+  b6:
   //SEG47 [19] call print_str 
-  //SEG48 [25] phi from main::@8 to print_str [phi:main::@8->print_str]
-  print_str_from_b8:
-  //SEG49 [25] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@8->print_str#0] -- register_copy 
-  //SEG50 [25] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@8->print_str#1] -- pbuz1=pbuc1 
+  //SEG48 [25] phi from main::@6 to print_str [phi:main::@6->print_str]
+  print_str_from_b6:
+  //SEG49 [25] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@6->print_str#0] -- register_copy 
+  //SEG50 [25] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG51 main::@9
-  b9:
+    jmp b7
+  //SEG51 main::@7
+  b7:
   //SEG52 [20] (signed word*) main::st1#1 ← (signed word*) main::st1#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- pwsz1=pwsz1_plus_2 
     lda st1
     clc
@@ -5534,7 +5561,7 @@ main: {
     inx
   //SEG55 [23] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $78) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$78
-    bne b1_from_b9
+    bne b1_from_b7
     jmp breturn
   //SEG56 main::@return
   breturn:
@@ -5607,9 +5634,9 @@ print_sword: {
   //SEG77 [52] phi (byte) print_char::ch#3 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b4
-  //SEG78 print_sword::@4
-  b4:
+    jmp b3
+  //SEG78 print_sword::@3
+  b3:
   //SEG79 [35] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -5620,11 +5647,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG80 [36] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG80 [36] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG81 [36] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG82 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG81 [36] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG82 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG83 print_sword::@1
   b1:
@@ -5781,23 +5808,23 @@ sin16s_genb: {
   div32u16u_from_sin16s_genb:
     jsr div32u16u
   //SEG136 [64] (dword) div32u16u::return#3 ← (dword) div32u16u::return#0
-    jmp b3
-  //SEG137 sin16s_genb::@3
-  b3:
+    jmp b2
+  //SEG137 sin16s_genb::@2
+  b2:
   //SEG138 [65] (dword) sin16s_genb::step#0 ← (dword) div32u16u::return#3
-  //SEG139 [66] phi from sin16s_genb::@3 to sin16s_genb::@1 [phi:sin16s_genb::@3->sin16s_genb::@1]
-  b1_from_b3:
-  //SEG140 [66] phi (word) sin16s_genb::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@3->sin16s_genb::@1#0] -- vwuz1=vbuc1 
+  //SEG139 [66] phi from sin16s_genb::@2 to sin16s_genb::@1 [phi:sin16s_genb::@2->sin16s_genb::@1]
+  b1_from_b2:
+  //SEG140 [66] phi (word) sin16s_genb::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@2->sin16s_genb::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG141 [66] phi (signed word*) sin16s_genb::sintab#2 = (const signed word[$78]) main::sintab2#0 [phi:sin16s_genb::@3->sin16s_genb::@1#1] -- pwsz1=pwsc1 
+  //SEG141 [66] phi (signed word*) sin16s_genb::sintab#2 = (const signed word[$78]) main::sintab2#0 [phi:sin16s_genb::@2->sin16s_genb::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintab2
     sta sintab
     lda #>main.sintab2
     sta sintab+1
-  //SEG142 [66] phi (dword) sin16s_genb::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@3->sin16s_genb::@1#2] -- vduz1=vbuc1 
+  //SEG142 [66] phi (dword) sin16s_genb::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@2->sin16s_genb::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -5806,11 +5833,11 @@ sin16s_genb: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG143 [66] phi from sin16s_genb::@4 to sin16s_genb::@1 [phi:sin16s_genb::@4->sin16s_genb::@1]
-  b1_from_b4:
-  //SEG144 [66] phi (word) sin16s_genb::i#2 = (word) sin16s_genb::i#1 [phi:sin16s_genb::@4->sin16s_genb::@1#0] -- register_copy 
-  //SEG145 [66] phi (signed word*) sin16s_genb::sintab#2 = (signed word*) sin16s_genb::sintab#0 [phi:sin16s_genb::@4->sin16s_genb::@1#1] -- register_copy 
-  //SEG146 [66] phi (dword) sin16s_genb::x#2 = (dword) sin16s_genb::x#1 [phi:sin16s_genb::@4->sin16s_genb::@1#2] -- register_copy 
+  //SEG143 [66] phi from sin16s_genb::@3 to sin16s_genb::@1 [phi:sin16s_genb::@3->sin16s_genb::@1]
+  b1_from_b3:
+  //SEG144 [66] phi (word) sin16s_genb::i#2 = (word) sin16s_genb::i#1 [phi:sin16s_genb::@3->sin16s_genb::@1#0] -- register_copy 
+  //SEG145 [66] phi (signed word*) sin16s_genb::sintab#2 = (signed word*) sin16s_genb::sintab#0 [phi:sin16s_genb::@3->sin16s_genb::@1#1] -- register_copy 
+  //SEG146 [66] phi (dword) sin16s_genb::x#2 = (dword) sin16s_genb::x#1 [phi:sin16s_genb::@3->sin16s_genb::@1#2] -- register_copy 
     jmp b1
   //SEG147 sin16s_genb::@1
   b1:
@@ -5822,9 +5849,9 @@ sin16s_genb: {
   //SEG149 [68] call sin16sb 
     jsr sin16sb
   //SEG150 [69] (signed word) sin16sb::return#0 ← (signed word) sin16sb::return#1
-    jmp b4
-  //SEG151 sin16s_genb::@4
-  b4:
+    jmp b3
+  //SEG151 sin16s_genb::@3
+  b3:
   //SEG152 [70] (signed word~) sin16s_genb::$2 ← (signed word) sin16sb::return#0
   //SEG153 [71] *((signed word*) sin16s_genb::sintab#2) ← (signed word~) sin16s_genb::$2 -- _deref_pwsz1=vwsz2 
     ldy #0
@@ -5863,11 +5890,11 @@ sin16s_genb: {
   //SEG157 [75] if((word) sin16s_genb::i#1<(const word) main::wavelength#0) goto sin16s_genb::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG158 sin16s_genb::@return
@@ -5982,9 +6009,9 @@ sin16sb: {
   //SEG184 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#5 [phi:sin16sb::@2->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG185 [87] (word) mulu16_sel::return#18 ← (word) mulu16_sel::return#17
-    jmp b8
-  //SEG186 sin16sb::@8
-  b8:
+    jmp b7
+  //SEG186 sin16sb::@7
+  b7:
   //SEG187 [88] (word) sin16sb::x2#0 ← (word) mulu16_sel::return#18 -- vwuz1=vwuz2 
     lda mulu16_sel.return_18
     sta x2
@@ -5997,39 +6024,39 @@ sin16sb: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG190 [91] call mulu16_sel 
-  //SEG191 [116] phi from sin16sb::@8 to mulu16_sel [phi:sin16sb::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG192 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG191 [116] phi from sin16sb::@7 to mulu16_sel [phi:sin16sb::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG192 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG193 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#6 [phi:sin16sb::@8->mulu16_sel#1] -- register_copy 
-  //SEG194 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#6 [phi:sin16sb::@8->mulu16_sel#2] -- register_copy 
+  //SEG193 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#6 [phi:sin16sb::@7->mulu16_sel#1] -- register_copy 
+  //SEG194 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#6 [phi:sin16sb::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG195 [92] (word) mulu16_sel::return#19 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return+1
-    jmp b9
-  //SEG196 sin16sb::@9
-  b9:
+    jmp b8
+  //SEG196 sin16sb::@8
+  b8:
   //SEG197 [93] (word) sin16sb::x3#0 ← (word) mulu16_sel::return#19
   //SEG198 [94] (word) mulu16_sel::v1#7 ← (word) sin16sb::x3#0
   //SEG199 [95] call mulu16_sel 
-  //SEG200 [116] phi from sin16sb::@9 to mulu16_sel [phi:sin16sb::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG201 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG200 [116] phi from sin16sb::@8 to mulu16_sel [phi:sin16sb::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG201 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG202 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16sb::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG202 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16sb::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG203 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#7 [phi:sin16sb::@9->mulu16_sel#2] -- register_copy 
+  //SEG203 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#7 [phi:sin16sb::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG204 [96] (word) mulu16_sel::return#20 ← (word) mulu16_sel::return#17
-    jmp b10
-  //SEG205 sin16sb::@10
-  b10:
+    jmp b9
+  //SEG205 sin16sb::@9
+  b9:
   //SEG206 [97] (word) sin16sb::x3_6#0 ← (word) mulu16_sel::return#20
   //SEG207 [98] (word) sin16sb::usinx#0 ← (word) sin16sb::x1#0 - (word) sin16sb::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -6046,21 +6073,21 @@ sin16sb: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG210 [101] call mulu16_sel 
-  //SEG211 [116] phi from sin16sb::@10 to mulu16_sel [phi:sin16sb::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG212 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG211 [116] phi from sin16sb::@9 to mulu16_sel [phi:sin16sb::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG212 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG213 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#8 [phi:sin16sb::@10->mulu16_sel#1] -- register_copy 
-  //SEG214 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#8 [phi:sin16sb::@10->mulu16_sel#2] -- register_copy 
+  //SEG213 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#8 [phi:sin16sb::@9->mulu16_sel#1] -- register_copy 
+  //SEG214 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#8 [phi:sin16sb::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG215 [102] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return+1
-    jmp b11
-  //SEG216 sin16sb::@11
-  b11:
+    jmp b10
+  //SEG216 sin16sb::@10
+  b10:
   //SEG217 [103] (word) sin16sb::x4#0 ← (word) mulu16_sel::return#10
   //SEG218 [104] (word) mulu16_sel::v1#9 ← (word) sin16sb::x4#0
   //SEG219 [105] (word) mulu16_sel::v2#9 ← (word) sin16sb::x1#0 -- vwuz1=vwuz2 
@@ -6069,17 +6096,17 @@ sin16sb: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG220 [106] call mulu16_sel 
-  //SEG221 [116] phi from sin16sb::@11 to mulu16_sel [phi:sin16sb::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG222 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG221 [116] phi from sin16sb::@10 to mulu16_sel [phi:sin16sb::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG222 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG223 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#9 [phi:sin16sb::@11->mulu16_sel#1] -- register_copy 
-  //SEG224 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#9 [phi:sin16sb::@11->mulu16_sel#2] -- register_copy 
+  //SEG223 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#9 [phi:sin16sb::@10->mulu16_sel#1] -- register_copy 
+  //SEG224 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#9 [phi:sin16sb::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG225 [107] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#17
-    jmp b12
-  //SEG226 sin16sb::@12
-  b12:
+    jmp b11
+  //SEG226 sin16sb::@11
+  b11:
   //SEG227 [108] (word) sin16sb::x5#0 ← (word) mulu16_sel::return#11
   //SEG228 [109] (word) sin16sb::x5_128#0 ← (word) sin16sb::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -6096,10 +6123,10 @@ sin16sb: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG230 [111] if((byte) sin16sb::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16sb::@15 -- vbuz1_eq_0_then_la1 
+  //SEG230 [111] if((byte) sin16sb::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16sb::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG231 sin16sb::@6
   b6:
@@ -6113,10 +6140,10 @@ sin16sb: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG233 [113] phi from sin16sb::@15 sin16sb::@6 to sin16sb::@3 [phi:sin16sb::@15/sin16sb::@6->sin16sb::@3]
-  b3_from_b15:
+  //SEG233 [113] phi from sin16sb::@12 sin16sb::@6 to sin16sb::@3 [phi:sin16sb::@12/sin16sb::@6->sin16sb::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG234 [113] phi (signed word) sin16sb::return#1 = (signed word~) sin16sb::return#5 [phi:sin16sb::@15/sin16sb::@6->sin16sb::@3#0] -- register_copy 
+  //SEG234 [113] phi (signed word) sin16sb::return#1 = (signed word~) sin16sb::return#5 [phi:sin16sb::@12/sin16sb::@6->sin16sb::@3#0] -- register_copy 
     jmp b3
   //SEG235 sin16sb::@3
   b3:
@@ -6125,10 +6152,10 @@ sin16sb: {
   breturn:
   //SEG237 [114] return 
     rts
-  //SEG238 sin16sb::@15
-  b15:
+  //SEG238 sin16sb::@12
+  b12:
   //SEG239 [115] (signed word~) sin16sb::return#5 ← (signed word)(word) sin16sb::usinx#1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
 //SEG240 mulu16_sel
 // Calculate val*val for two unsigned word values - the result is 16 selected bits of the 32-bit result.
@@ -6155,9 +6182,9 @@ mulu16_sel: {
   //SEG243 [119] call mul16u 
     jsr mul16u
   //SEG244 [120] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-    jmp b2
-  //SEG245 mulu16_sel::@2
-  b2:
+    jmp b1
+  //SEG245 mulu16_sel::@1
+  b1:
   //SEG246 [121] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   //SEG247 [122] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#10 -- vduz1=vduz1_rol_vbuxx 
     cpx #0
@@ -6227,12 +6254,12 @@ mul16u: {
   //SEG262 [129] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG263 [130] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG263 [130] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG264 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG264 mul16u::@3
+  b3:
   //SEG265 [131] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -6247,13 +6274,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG266 [132] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG267 [132] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG268 mul16u::@8
-  b8:
+  //SEG266 [132] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG267 [132] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG268 mul16u::@4
+  b4:
   //SEG269 [133] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -6263,11 +6290,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG271 [126] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG272 [126] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG273 [126] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG274 [126] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG271 [126] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG272 [126] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG273 [126] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG274 [126] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG275 div32u16u
@@ -6292,9 +6319,9 @@ div32u16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG280 [137] (word) divr16u::return#2 ← (word) divr16u::return#0
-    jmp b2
-  //SEG281 div32u16u::@2
-  b2:
+    jmp b1
+  //SEG281 div32u16u::@1
+  b1:
   //SEG282 [138] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return
     sta quotient_hi
@@ -6302,19 +6329,19 @@ div32u16u: {
     sta quotient_hi+1
   //SEG283 [139] (word) divr16u::rem#4 ← (word) rem16u#1
   //SEG284 [140] call divr16u 
-  //SEG285 [145] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  divr16u_from_b2:
-  //SEG286 [145] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG285 [145] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  divr16u_from_b1:
+  //SEG286 [145] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG287 [145] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG287 [145] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG288 [141] (word) divr16u::return#3 ← (word) divr16u::return#0
-    jmp b3
-  //SEG289 div32u16u::@3
-  b3:
+    jmp b2
+  //SEG289 div32u16u::@2
+  b2:
   //SEG290 [142] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   //SEG291 [143] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda quotient_hi
@@ -6457,23 +6484,23 @@ sin16s_gen: {
   div32u16u_from_sin16s_gen:
     jsr div32u16u
   //SEG334 [165] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-    jmp b3
-  //SEG335 sin16s_gen::@3
-  b3:
+    jmp b2
+  //SEG335 sin16s_gen::@2
+  b2:
   //SEG336 [166] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
-  //SEG337 [167] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
-  b1_from_b3:
-  //SEG338 [167] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG337 [167] phi from sin16s_gen::@2 to sin16s_gen::@1 [phi:sin16s_gen::@2->sin16s_gen::@1]
+  b1_from_b2:
+  //SEG338 [167] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG339 [167] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- pwsz1=pwsc1 
+  //SEG339 [167] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@2->sin16s_gen::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintab1
     sta sintab
     lda #>main.sintab1
     sta sintab+1
-  //SEG340 [167] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- vduz1=vbuc1 
+  //SEG340 [167] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -6482,11 +6509,11 @@ sin16s_gen: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG341 [167] phi from sin16s_gen::@4 to sin16s_gen::@1 [phi:sin16s_gen::@4->sin16s_gen::@1]
-  b1_from_b4:
-  //SEG342 [167] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@4->sin16s_gen::@1#0] -- register_copy 
-  //SEG343 [167] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@4->sin16s_gen::@1#1] -- register_copy 
-  //SEG344 [167] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@4->sin16s_gen::@1#2] -- register_copy 
+  //SEG341 [167] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
+  b1_from_b3:
+  //SEG342 [167] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- register_copy 
+  //SEG343 [167] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- register_copy 
+  //SEG344 [167] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- register_copy 
     jmp b1
   //SEG345 sin16s_gen::@1
   b1:
@@ -6502,9 +6529,9 @@ sin16s_gen: {
   //SEG347 [169] call sin16s 
     jsr sin16s
   //SEG348 [170] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-    jmp b4
-  //SEG349 sin16s_gen::@4
-  b4:
+    jmp b3
+  //SEG349 sin16s_gen::@3
+  b3:
   //SEG350 [171] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   //SEG351 [172] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1 -- _deref_pwsz1=vwsz2 
     ldy #0
@@ -6543,11 +6570,11 @@ sin16s_gen: {
   //SEG355 [176] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG356 sin16s_gen::@return
@@ -6702,9 +6729,9 @@ sin16s: {
     sta mulu16_sel.return
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return+1
-    jmp b8
-  //SEG385 sin16s::@8
-  b8:
+    jmp b7
+  //SEG385 sin16s::@7
+  b7:
   //SEG386 [190] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   //SEG387 [191] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   //SEG388 [192] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -6713,39 +6740,39 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG389 [193] call mulu16_sel 
-  //SEG390 [116] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG391 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG390 [116] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG391 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG392 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG393 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG392 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG393 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG394 [194] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return+1
-    jmp b9
-  //SEG395 sin16s::@9
-  b9:
+    jmp b8
+  //SEG395 sin16s::@8
+  b8:
   //SEG396 [195] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   //SEG397 [196] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   //SEG398 [197] call mulu16_sel 
-  //SEG399 [116] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG400 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG399 [116] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG400 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG401 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG401 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG402 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG402 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG403 [198] (word) mulu16_sel::return#14 ← (word) mulu16_sel::return#17
-    jmp b10
-  //SEG404 sin16s::@10
-  b10:
+    jmp b9
+  //SEG404 sin16s::@9
+  b9:
   //SEG405 [199] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#14
   //SEG406 [200] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -6762,21 +6789,21 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG409 [203] call mulu16_sel 
-  //SEG410 [116] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG411 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG410 [116] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG411 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG412 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG413 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG412 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG413 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG414 [204] (word) mulu16_sel::return#15 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return+1
-    jmp b11
-  //SEG415 sin16s::@11
-  b11:
+    jmp b10
+  //SEG415 sin16s::@10
+  b10:
   //SEG416 [205] (word) sin16s::x4#0 ← (word) mulu16_sel::return#15
   //SEG417 [206] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   //SEG418 [207] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -6785,17 +6812,17 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG419 [208] call mulu16_sel 
-  //SEG420 [116] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG421 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG420 [116] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG421 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG422 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG423 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG422 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG423 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG424 [209] (word) mulu16_sel::return#16 ← (word) mulu16_sel::return#17
-    jmp b12
-  //SEG425 sin16s::@12
-  b12:
+    jmp b11
+  //SEG425 sin16s::@11
+  b11:
   //SEG426 [210] (word) sin16s::x5#0 ← (word) mulu16_sel::return#16
   //SEG427 [211] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -6812,10 +6839,10 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG429 [213] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG429 [213] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG430 sin16s::@6
   b6:
@@ -6829,10 +6856,10 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG432 [215] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  b3_from_b15:
+  //SEG432 [215] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG433 [215] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG433 [215] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
     jmp b3
   //SEG434 sin16s::@3
   b3:
@@ -6841,61 +6868,61 @@ sin16s: {
   breturn:
   //SEG436 [216] return 
     rts
-  //SEG437 sin16s::@15
-  b15:
+  //SEG437 sin16s::@12
+  b12:
   //SEG438 [217] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
   print_hextab: .text "0123456789abcdef"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b42
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b4
 Removing instruction jmp b5
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp b6
-Removing instruction jmp b1
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp b8
-Removing instruction jmp b9
+Removing instruction jmp b7
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b2
-Removing instruction jmp b4
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
 Removing instruction jmp b3
 Removing instruction jmp b1
-Removing instruction jmp b4
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b5
 Removing instruction jmp b2
+Removing instruction jmp b7
 Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
-Removing instruction jmp b12
 Removing instruction jmp b6
 Removing instruction jmp b3
 Removing instruction jmp breturn
-Removing instruction jmp b2
-Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp breturn
 Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -6904,19 +6931,19 @@ Removing instruction jmp b5
 Removing instruction jmp b3
 Removing instruction jmp b6
 Removing instruction jmp breturn
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp b1
-Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b5
 Removing instruction jmp b2
+Removing instruction jmp b7
 Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
-Removing instruction jmp b12
 Removing instruction jmp b6
 Removing instruction jmp b3
 Removing instruction jmp breturn
@@ -6933,87 +6960,87 @@ Removing instruction lda #0
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b2_from_b1 with b2
-Replacing label b1_from_b9 with b1
+Replacing label b1_from_b7 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_print_sword with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Replacing label b1_from_b4 with b1
-Replacing label b1_from_b4 with b1
+Replacing label b1_from_b3 with b1
+Replacing label b1_from_b3 with b1
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
-Replacing label b3_from_b15 with b3
-Replacing label b8_from_b2 with b8
+Replacing label b3_from_b12 with b3
+Replacing label b4_from_b2 with b4
 Replacing label b2_from_b1 with b2
 Replacing label b3_from_b2 with b3
 Replacing label b3_from_b2 with b3
 Replacing label b1_from_b3 with b1
-Replacing label b1_from_b4 with b1
-Replacing label b1_from_b4 with b1
+Replacing label b1_from_b3 with b1
+Replacing label b1_from_b3 with b1
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
-Replacing label b3_from_b15 with b3
-Removing instruction b42_from_bbegin:
-Removing instruction b42:
-Removing instruction main_from_b42:
-Removing instruction bend_from_b42:
-Removing instruction b5_from_main:
-Removing instruction sin16s_genb_from_b5:
-Removing instruction b6_from_b5:
-Removing instruction print_cls_from_b6:
-Removing instruction b1_from_b9:
+Replacing label b3_from_b12 with b3
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b4_from_main:
+Removing instruction sin16s_genb_from_b4:
+Removing instruction b5_from_b4:
+Removing instruction print_cls_from_b5:
+Removing instruction b1_from_b7:
 Removing instruction b3_from_b1:
 Removing instruction print_str_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b3:
-Removing instruction b8_from_b2:
-Removing instruction print_str_from_b8:
+Removing instruction b6_from_b2:
+Removing instruction print_str_from_b6:
 Removing instruction b1_from_print_str:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_print_sword:
 Removing instruction print_char_from_b2:
 Removing instruction b1_from_print_sword:
-Removing instruction b1_from_b4:
-Removing instruction b1_from_b1:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b1:
+Removing instruction b1_from_b2:
+Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b5:
-Removing instruction mulu16_sel_from_b9:
-Removing instruction b3_from_b15:
+Removing instruction mulu16_sel_from_b8:
+Removing instruction b3_from_b12:
 Removing instruction b3_from_b6:
 Removing instruction breturn:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
 Removing instruction b3_from_b2:
 Removing instruction b3_from_b5:
 Removing instruction breturn:
+Removing instruction b1_from_b2:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b4:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b5:
-Removing instruction mulu16_sel_from_b9:
-Removing instruction b3_from_b15:
+Removing instruction mulu16_sel_from_b8:
+Removing instruction b3_from_b12:
 Removing instruction b3_from_b6:
 Removing instruction breturn:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction sin16s_gen_from_main:
+Removing instruction b4:
 Removing instruction b5:
-Removing instruction b6:
-Removing instruction b1_from_b6:
+Removing instruction b1_from_b5:
 Removing instruction b3:
-Removing instruction b8:
-Removing instruction b9:
+Removing instruction b6:
+Removing instruction b7:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b2:
-Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn:
 Removing instruction print_byte_from_print_word:
 Removing instruction b1:
@@ -7027,60 +7054,60 @@ Removing instruction breturn:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
 Removing instruction div32u16u_from_sin16s_genb:
+Removing instruction b2:
 Removing instruction b3:
-Removing instruction b4:
 Removing instruction breturn:
 Removing instruction b4:
 Removing instruction b1_from_b4:
 Removing instruction b5:
 Removing instruction mulu16_sel_from_b2:
+Removing instruction b7:
+Removing instruction mulu16_sel_from_b7:
 Removing instruction b8:
-Removing instruction mulu16_sel_from_b8:
 Removing instruction b9:
+Removing instruction mulu16_sel_from_b9:
 Removing instruction b10:
 Removing instruction mulu16_sel_from_b10:
 Removing instruction b11:
-Removing instruction mulu16_sel_from_b11:
-Removing instruction b12:
 Removing instruction b6:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction b1_from_mul16u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
-Removing instruction divr16u_from_div32u16u:
-Removing instruction b2:
-Removing instruction divr16u_from_b2:
 Removing instruction b3:
+Removing instruction b1_from_b4:
+Removing instruction divr16u_from_div32u16u:
+Removing instruction b1:
+Removing instruction divr16u_from_b1:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction b1_from_divr16u:
 Removing instruction b4:
 Removing instruction b5:
 Removing instruction b6:
 Removing instruction div32u16u_from_sin16s_gen:
+Removing instruction b2:
 Removing instruction b3:
-Removing instruction b4:
 Removing instruction breturn:
 Removing instruction b4:
 Removing instruction b1_from_b4:
 Removing instruction b5:
 Removing instruction mulu16_sel_from_b2:
+Removing instruction b7:
+Removing instruction mulu16_sel_from_b7:
 Removing instruction b8:
-Removing instruction mulu16_sel_from_b8:
 Removing instruction b9:
+Removing instruction mulu16_sel_from_b9:
 Removing instruction b10:
 Removing instruction mulu16_sel_from_b10:
 Removing instruction b11:
-Removing instruction mulu16_sel_from_b11:
-Removing instruction b12:
 Removing instruction b6:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b3 in beq b15
-Skipping double jump to b3 in beq b15
+Skipping double jump to b3 in beq b12
+Skipping double jump to b3 in beq b12
 Succesful ASM optimization Pass5DoubleJumpElimination
 Relabelling long label b1_from_sin16sb to b4
 Relabelling long label b1_from_sin16s to b4
@@ -7094,15 +7121,15 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
-Removing instruction b15:
-Removing instruction b15:
+Removing instruction b12:
+Removing instruction b12:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b3
 Removing unreachable instruction jmp b3
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @42
+(label) @1
 (label) @begin
 (label) @end
 (word) PI2_u4f12
@@ -7117,8 +7144,8 @@ FINAL SYMBOL TABLE
 (dword) PI_u4f28
 (const dword) PI_u4f28#0 PI_u4f28 = (dword/signed dword) $3243f6a9
 (dword()) div32u16u((dword) div32u16u::dividend , (word) div32u16u::divisor)
+(label) div32u16u::@1
 (label) div32u16u::@2
-(label) div32u16u::@3
 (label) div32u16u::@return
 (dword) div32u16u::dividend
 (word) div32u16u::divisor
@@ -7170,10 +7197,10 @@ FINAL SYMBOL TABLE
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
 (label) main::@6
-(label) main::@8
-(label) main::@9
+(label) main::@7
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
@@ -7198,8 +7225,8 @@ FINAL SYMBOL TABLE
 (byte/word~) mul16u::$1 reg byte a 202.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:19 101.0
@@ -7220,7 +7247,7 @@ FINAL SYMBOL TABLE
 (word()) mulu16_sel((word) mulu16_sel::v1 , (word) mulu16_sel::v2 , (byte) mulu16_sel::select)
 (dword~) mulu16_sel::$0 $0 zp ZP_DWORD:21 4.0
 (dword~) mulu16_sel::$1 $1 zp ZP_DWORD:21 4.0
-(label) mulu16_sel::@2
+(label) mulu16_sel::@1
 (label) mulu16_sel::@return
 (word) mulu16_sel::return
 (word) mulu16_sel::return#0 return zp ZP_WORD:11 4.0
@@ -7305,7 +7332,7 @@ FINAL SYMBOL TABLE
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:8 4.0
@@ -7326,12 +7353,12 @@ FINAL SYMBOL TABLE
 (label) sin16s::@10
 (label) sin16s::@11
 (label) sin16s::@12
-(label) sin16s::@15
 (label) sin16s::@2
 (label) sin16s::@3
 (label) sin16s::@4
 (label) sin16s::@5
 (label) sin16s::@6
+(label) sin16s::@7
 (label) sin16s::@8
 (label) sin16s::@9
 (label) sin16s::@return
@@ -7369,8 +7396,8 @@ FINAL SYMBOL TABLE
 (void()) sin16s_gen((signed word*) sin16s_gen::sintab , (word) sin16s_gen::wavelength)
 (signed word~) sin16s_gen::$1 $1 zp ZP_WORD:6 22.0
 (label) sin16s_gen::@1
+(label) sin16s_gen::@2
 (label) sin16s_gen::@3
-(label) sin16s_gen::@4
 (label) sin16s_gen::@return
 (word) sin16s_gen::i
 (word) sin16s_gen::i#1 i zp ZP_WORD:4 16.5
@@ -7387,8 +7414,8 @@ FINAL SYMBOL TABLE
 (void()) sin16s_genb((signed word*) sin16s_genb::sintab , (word) sin16s_genb::wavelength)
 (signed word~) sin16s_genb::$2 $2 zp ZP_WORD:8 22.0
 (label) sin16s_genb::@1
+(label) sin16s_genb::@2
 (label) sin16s_genb::@3
-(label) sin16s_genb::@4
 (label) sin16s_genb::@return
 (word) sin16s_genb::i
 (word) sin16s_genb::i#1 i zp ZP_WORD:4 16.5
@@ -7407,12 +7434,12 @@ FINAL SYMBOL TABLE
 (label) sin16sb::@10
 (label) sin16sb::@11
 (label) sin16sb::@12
-(label) sin16sb::@15
 (label) sin16sb::@2
 (label) sin16sb::@3
 (label) sin16sb::@4
 (label) sin16sb::@5
 (label) sin16sb::@6
+(label) sin16sb::@7
 (label) sin16sb::@8
 (label) sin16sb::@9
 (label) sin16sb::@return
@@ -7495,11 +7522,11 @@ Score: 23125
   .label rem16u = 2
   .label print_char_cursor = $b
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @42 [phi:@begin->@42]
-//SEG5 @42
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @42 to main [phi:@42->main]
-//SEG8 [3] phi from @42 to @end [phi:@42->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -7510,39 +7537,39 @@ main: {
   //SEG11 [5] call sin16s_gen 
   //SEG12 [163] phi from main to sin16s_gen [phi:main->sin16s_gen]
     jsr sin16s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  //SEG14 main::@5
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  //SEG14 main::@4
   //SEG15 [7] call sin16s_genb 
-  //SEG16 [62] phi from main::@5 to sin16s_genb [phi:main::@5->sin16s_genb]
+  //SEG16 [62] phi from main::@4 to sin16s_genb [phi:main::@4->sin16s_genb]
     jsr sin16s_genb
-  //SEG17 [8] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  //SEG18 main::@6
+  //SEG17 [8] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  //SEG18 main::@5
   //SEG19 [9] call print_cls 
-  //SEG20 [56] phi from main::@6 to print_cls [phi:main::@6->print_cls]
+  //SEG20 [56] phi from main::@5 to print_cls [phi:main::@5->print_cls]
     jsr print_cls
-  //SEG21 [10] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  //SEG22 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#0] -- vbuxx=vbuc1 
+  //SEG21 [10] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  //SEG22 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG23 [10] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@6->main::@1#1] -- pbuz1=pbuc1 
+  //SEG23 [10] phi (byte*) print_char_cursor#49 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#1] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG24 [10] phi (signed word*) main::st2#2 = (const signed word[$78]) main::sintab2#0 [phi:main::@6->main::@1#2] -- pwsz1=pwsc1 
+  //SEG24 [10] phi (signed word*) main::st2#2 = (const signed word[$78]) main::sintab2#0 [phi:main::@5->main::@1#2] -- pwsz1=pwsc1 
     lda #<sintab2
     sta st2
     lda #>sintab2
     sta st2+1
-  //SEG25 [10] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@6->main::@1#3] -- pwsz1=pwsc1 
+  //SEG25 [10] phi (signed word*) main::st1#2 = (const signed word[$78]) main::sintab1#0 [phi:main::@5->main::@1#3] -- pwsz1=pwsc1 
     lda #<sintab1
     sta st1
     lda #>sintab1
     sta st1+1
-  //SEG26 [10] phi from main::@9 to main::@1 [phi:main::@9->main::@1]
-  //SEG27 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@9->main::@1#0] -- register_copy 
-  //SEG28 [10] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@9->main::@1#1] -- register_copy 
-  //SEG29 [10] phi (signed word*) main::st2#2 = (signed word*) main::st2#1 [phi:main::@9->main::@1#2] -- register_copy 
-  //SEG30 [10] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@9->main::@1#3] -- register_copy 
+  //SEG26 [10] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
+  //SEG27 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG28 [10] phi (byte*) print_char_cursor#49 = (byte*) print_char_cursor#2 [phi:main::@7->main::@1#1] -- register_copy 
+  //SEG29 [10] phi (signed word*) main::st2#2 = (signed word*) main::st2#1 [phi:main::@7->main::@1#2] -- register_copy 
+  //SEG30 [10] phi (signed word*) main::st1#2 = (signed word*) main::st1#1 [phi:main::@7->main::@1#3] -- register_copy 
   //SEG31 main::@1
   b1:
   //SEG32 [11] (signed word) main::sw#0 ← *((signed word*) main::st1#2) - *((signed word*) main::st2#2) -- vwsz1=_deref_pwsz2_minus__deref_pwsz3 
@@ -7575,18 +7602,18 @@ main: {
   //SEG43 [16] (signed word) print_sword::w#1 ← (signed word) main::sw#0
   //SEG44 [17] call print_sword 
     jsr print_sword
-  //SEG45 [18] phi from main::@2 to main::@8 [phi:main::@2->main::@8]
-  //SEG46 main::@8
+  //SEG45 [18] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
+  //SEG46 main::@6
   //SEG47 [19] call print_str 
-  //SEG48 [25] phi from main::@8 to print_str [phi:main::@8->print_str]
-  //SEG49 [25] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@8->print_str#0] -- register_copy 
-  //SEG50 [25] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@8->print_str#1] -- pbuz1=pbuc1 
+  //SEG48 [25] phi from main::@6 to print_str [phi:main::@6->print_str]
+  //SEG49 [25] phi (byte*) print_char_cursor#51 = (byte*) print_char_cursor#12 [phi:main::@6->print_str#0] -- register_copy 
+  //SEG50 [25] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG51 main::@9
+  //SEG51 main::@7
   //SEG52 [20] (signed word*) main::st1#1 ← (signed word*) main::st1#2 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- pwsz1=pwsz1_plus_2 
     lda st1
     clc
@@ -7668,7 +7695,7 @@ print_sword: {
   //SEG77 [52] phi (byte) print_char::ch#3 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG78 print_sword::@4
+  //SEG78 print_sword::@3
   //SEG79 [35] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -7679,9 +7706,9 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG80 [36] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
-  //SEG81 [36] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG82 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  //SEG80 [36] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
+  //SEG81 [36] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#48 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG82 [36] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
   //SEG83 print_sword::@1
   b1:
   //SEG84 [37] call print_word 
@@ -7814,29 +7841,29 @@ sin16s_genb: {
   //SEG135 [135] phi from sin16s_genb to div32u16u [phi:sin16s_genb->div32u16u]
     jsr div32u16u
   //SEG136 [64] (dword) div32u16u::return#3 ← (dword) div32u16u::return#0
-  //SEG137 sin16s_genb::@3
+  //SEG137 sin16s_genb::@2
   //SEG138 [65] (dword) sin16s_genb::step#0 ← (dword) div32u16u::return#3
-  //SEG139 [66] phi from sin16s_genb::@3 to sin16s_genb::@1 [phi:sin16s_genb::@3->sin16s_genb::@1]
-  //SEG140 [66] phi (word) sin16s_genb::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@3->sin16s_genb::@1#0] -- vwuz1=vbuc1 
+  //SEG139 [66] phi from sin16s_genb::@2 to sin16s_genb::@1 [phi:sin16s_genb::@2->sin16s_genb::@1]
+  //SEG140 [66] phi (word) sin16s_genb::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@2->sin16s_genb::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG141 [66] phi (signed word*) sin16s_genb::sintab#2 = (const signed word[$78]) main::sintab2#0 [phi:sin16s_genb::@3->sin16s_genb::@1#1] -- pwsz1=pwsc1 
+  //SEG141 [66] phi (signed word*) sin16s_genb::sintab#2 = (const signed word[$78]) main::sintab2#0 [phi:sin16s_genb::@2->sin16s_genb::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintab2
     sta sintab
     lda #>main.sintab2
     sta sintab+1
-  //SEG142 [66] phi (dword) sin16s_genb::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@3->sin16s_genb::@1#2] -- vduz1=vbuc1 
+  //SEG142 [66] phi (dword) sin16s_genb::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_genb::@2->sin16s_genb::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     sta x+1
     sta x+2
     sta x+3
   // u[4.28]
-  //SEG143 [66] phi from sin16s_genb::@4 to sin16s_genb::@1 [phi:sin16s_genb::@4->sin16s_genb::@1]
-  //SEG144 [66] phi (word) sin16s_genb::i#2 = (word) sin16s_genb::i#1 [phi:sin16s_genb::@4->sin16s_genb::@1#0] -- register_copy 
-  //SEG145 [66] phi (signed word*) sin16s_genb::sintab#2 = (signed word*) sin16s_genb::sintab#0 [phi:sin16s_genb::@4->sin16s_genb::@1#1] -- register_copy 
-  //SEG146 [66] phi (dword) sin16s_genb::x#2 = (dword) sin16s_genb::x#1 [phi:sin16s_genb::@4->sin16s_genb::@1#2] -- register_copy 
+  //SEG143 [66] phi from sin16s_genb::@3 to sin16s_genb::@1 [phi:sin16s_genb::@3->sin16s_genb::@1]
+  //SEG144 [66] phi (word) sin16s_genb::i#2 = (word) sin16s_genb::i#1 [phi:sin16s_genb::@3->sin16s_genb::@1#0] -- register_copy 
+  //SEG145 [66] phi (signed word*) sin16s_genb::sintab#2 = (signed word*) sin16s_genb::sintab#0 [phi:sin16s_genb::@3->sin16s_genb::@1#1] -- register_copy 
+  //SEG146 [66] phi (dword) sin16s_genb::x#2 = (dword) sin16s_genb::x#1 [phi:sin16s_genb::@3->sin16s_genb::@1#2] -- register_copy 
   //SEG147 sin16s_genb::@1
   b1:
   //SEG148 [67] (word) sin16sb::x#0 ← > (dword) sin16s_genb::x#2 -- vwuz1=_hi_vduz2 
@@ -7847,7 +7874,7 @@ sin16s_genb: {
   //SEG149 [68] call sin16sb 
     jsr sin16sb
   //SEG150 [69] (signed word) sin16sb::return#0 ← (signed word) sin16sb::return#1
-  //SEG151 sin16s_genb::@4
+  //SEG151 sin16s_genb::@3
   //SEG152 [70] (signed word~) sin16s_genb::$2 ← (signed word) sin16sb::return#0
   //SEG153 [71] *((signed word*) sin16s_genb::sintab#2) ← (signed word~) sin16s_genb::$2 -- _deref_pwsz1=vwsz2 
     ldy #0
@@ -7993,7 +8020,7 @@ sin16sb: {
   //SEG184 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#5 [phi:sin16sb::@2->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG185 [87] (word) mulu16_sel::return#18 ← (word) mulu16_sel::return#17
-  //SEG186 sin16sb::@8
+  //SEG186 sin16sb::@7
   //SEG187 [88] (word) sin16sb::x2#0 ← (word) mulu16_sel::return#18 -- vwuz1=vwuz2 
     lda mulu16_sel.return_18
     sta x2
@@ -8006,33 +8033,33 @@ sin16sb: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG190 [91] call mulu16_sel 
-  //SEG191 [116] phi from sin16sb::@8 to mulu16_sel [phi:sin16sb::@8->mulu16_sel]
-  //SEG192 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG191 [116] phi from sin16sb::@7 to mulu16_sel [phi:sin16sb::@7->mulu16_sel]
+  //SEG192 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG193 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#6 [phi:sin16sb::@8->mulu16_sel#1] -- register_copy 
-  //SEG194 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#6 [phi:sin16sb::@8->mulu16_sel#2] -- register_copy 
+  //SEG193 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#6 [phi:sin16sb::@7->mulu16_sel#1] -- register_copy 
+  //SEG194 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#6 [phi:sin16sb::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG195 [92] (word) mulu16_sel::return#19 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return+1
-  //SEG196 sin16sb::@9
+  //SEG196 sin16sb::@8
   //SEG197 [93] (word) sin16sb::x3#0 ← (word) mulu16_sel::return#19
   //SEG198 [94] (word) mulu16_sel::v1#7 ← (word) sin16sb::x3#0
   //SEG199 [95] call mulu16_sel 
-  //SEG200 [116] phi from sin16sb::@9 to mulu16_sel [phi:sin16sb::@9->mulu16_sel]
-  //SEG201 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG200 [116] phi from sin16sb::@8 to mulu16_sel [phi:sin16sb::@8->mulu16_sel]
+  //SEG201 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16sb::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG202 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16sb::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG202 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16sb::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG203 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#7 [phi:sin16sb::@9->mulu16_sel#2] -- register_copy 
+  //SEG203 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#7 [phi:sin16sb::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG204 [96] (word) mulu16_sel::return#20 ← (word) mulu16_sel::return#17
-  //SEG205 sin16sb::@10
+  //SEG205 sin16sb::@9
   //SEG206 [97] (word) sin16sb::x3_6#0 ← (word) mulu16_sel::return#20
   //SEG207 [98] (word) sin16sb::usinx#0 ← (word) sin16sb::x1#0 - (word) sin16sb::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -8049,18 +8076,18 @@ sin16sb: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG210 [101] call mulu16_sel 
-  //SEG211 [116] phi from sin16sb::@10 to mulu16_sel [phi:sin16sb::@10->mulu16_sel]
-  //SEG212 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG211 [116] phi from sin16sb::@9 to mulu16_sel [phi:sin16sb::@9->mulu16_sel]
+  //SEG212 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG213 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#8 [phi:sin16sb::@10->mulu16_sel#1] -- register_copy 
-  //SEG214 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#8 [phi:sin16sb::@10->mulu16_sel#2] -- register_copy 
+  //SEG213 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#8 [phi:sin16sb::@9->mulu16_sel#1] -- register_copy 
+  //SEG214 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#8 [phi:sin16sb::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG215 [102] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return+1
-  //SEG216 sin16sb::@11
+  //SEG216 sin16sb::@10
   //SEG217 [103] (word) sin16sb::x4#0 ← (word) mulu16_sel::return#10
   //SEG218 [104] (word) mulu16_sel::v1#9 ← (word) sin16sb::x4#0
   //SEG219 [105] (word) mulu16_sel::v2#9 ← (word) sin16sb::x1#0 -- vwuz1=vwuz2 
@@ -8069,14 +8096,14 @@ sin16sb: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG220 [106] call mulu16_sel 
-  //SEG221 [116] phi from sin16sb::@11 to mulu16_sel [phi:sin16sb::@11->mulu16_sel]
-  //SEG222 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG221 [116] phi from sin16sb::@10 to mulu16_sel [phi:sin16sb::@10->mulu16_sel]
+  //SEG222 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16sb::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG223 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#9 [phi:sin16sb::@11->mulu16_sel#1] -- register_copy 
-  //SEG224 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#9 [phi:sin16sb::@11->mulu16_sel#2] -- register_copy 
+  //SEG223 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#9 [phi:sin16sb::@10->mulu16_sel#1] -- register_copy 
+  //SEG224 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#9 [phi:sin16sb::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG225 [107] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#17
-  //SEG226 sin16sb::@12
+  //SEG226 sin16sb::@11
   //SEG227 [108] (word) sin16sb::x5#0 ← (word) mulu16_sel::return#11
   //SEG228 [109] (word) sin16sb::x5_128#0 ← (word) sin16sb::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -8093,7 +8120,7 @@ sin16sb: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG230 [111] if((byte) sin16sb::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16sb::@15 -- vbuz1_eq_0_then_la1 
+  //SEG230 [111] if((byte) sin16sb::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16sb::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
     beq b3
@@ -8108,14 +8135,14 @@ sin16sb: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG233 [113] phi from sin16sb::@15 sin16sb::@6 to sin16sb::@3 [phi:sin16sb::@15/sin16sb::@6->sin16sb::@3]
-  //SEG234 [113] phi (signed word) sin16sb::return#1 = (signed word~) sin16sb::return#5 [phi:sin16sb::@15/sin16sb::@6->sin16sb::@3#0] -- register_copy 
+  //SEG233 [113] phi from sin16sb::@12 sin16sb::@6 to sin16sb::@3 [phi:sin16sb::@12/sin16sb::@6->sin16sb::@3]
+  //SEG234 [113] phi (signed word) sin16sb::return#1 = (signed word~) sin16sb::return#5 [phi:sin16sb::@12/sin16sb::@6->sin16sb::@3#0] -- register_copy 
   //SEG235 sin16sb::@3
   b3:
   //SEG236 sin16sb::@return
   //SEG237 [114] return 
     rts
-  //SEG238 sin16sb::@15
+  //SEG238 sin16sb::@12
   //SEG239 [115] (signed word~) sin16sb::return#5 ← (signed word)(word) sin16sb::usinx#1
 }
 //SEG240 mulu16_sel
@@ -8143,7 +8170,7 @@ mulu16_sel: {
   //SEG243 [119] call mul16u 
     jsr mul16u
   //SEG244 [120] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  //SEG245 mulu16_sel::@2
+  //SEG245 mulu16_sel::@1
   //SEG246 [121] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   //SEG247 [122] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#10 -- vduz1=vduz1_rol_vbuxx 
     cpx #0
@@ -8205,10 +8232,10 @@ mul16u: {
   //SEG262 [129] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG263 [130] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG263 [130] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG264 mul16u::@6
+    beq b4
+  //SEG264 mul16u::@3
   //SEG265 [131] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -8223,10 +8250,10 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG266 [132] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  //SEG267 [132] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-  //SEG268 mul16u::@8
-  b8:
+  //SEG266 [132] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  //SEG267 [132] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+  //SEG268 mul16u::@4
+  b4:
   //SEG269 [133] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -8236,10 +8263,10 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG271 [126] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  //SEG272 [126] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG273 [126] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG274 [126] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG271 [126] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  //SEG272 [126] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG273 [126] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG274 [126] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG275 div32u16u
@@ -8262,7 +8289,7 @@ div32u16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG280 [137] (word) divr16u::return#2 ← (word) divr16u::return#0
-  //SEG281 div32u16u::@2
+  //SEG281 div32u16u::@1
   //SEG282 [138] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return
     sta quotient_hi
@@ -8270,16 +8297,16 @@ div32u16u: {
     sta quotient_hi+1
   //SEG283 [139] (word) divr16u::rem#4 ← (word) rem16u#1
   //SEG284 [140] call divr16u 
-  //SEG285 [145] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  //SEG286 [145] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG285 [145] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  //SEG286 [145] phi (word) divr16u::dividend#5 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG287 [145] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG287 [145] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG288 [141] (word) divr16u::return#3 ← (word) divr16u::return#0
-  //SEG289 div32u16u::@3
+  //SEG289 div32u16u::@2
   //SEG290 [142] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#3
   //SEG291 [143] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda quotient_hi
@@ -8400,29 +8427,29 @@ sin16s_gen: {
   //SEG333 [135] phi from sin16s_gen to div32u16u [phi:sin16s_gen->div32u16u]
     jsr div32u16u
   //SEG334 [165] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  //SEG335 sin16s_gen::@3
+  //SEG335 sin16s_gen::@2
   //SEG336 [166] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
-  //SEG337 [167] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
-  //SEG338 [167] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG337 [167] phi from sin16s_gen::@2 to sin16s_gen::@1 [phi:sin16s_gen::@2->sin16s_gen::@1]
+  //SEG338 [167] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG339 [167] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- pwsz1=pwsc1 
+  //SEG339 [167] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$78]) main::sintab1#0 [phi:sin16s_gen::@2->sin16s_gen::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintab1
     sta sintab
     lda #>main.sintab1
     sta sintab+1
-  //SEG340 [167] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- vduz1=vbuc1 
+  //SEG340 [167] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     sta x+1
     sta x+2
     sta x+3
   // u[4.28]
-  //SEG341 [167] phi from sin16s_gen::@4 to sin16s_gen::@1 [phi:sin16s_gen::@4->sin16s_gen::@1]
-  //SEG342 [167] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@4->sin16s_gen::@1#0] -- register_copy 
-  //SEG343 [167] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@4->sin16s_gen::@1#1] -- register_copy 
-  //SEG344 [167] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@4->sin16s_gen::@1#2] -- register_copy 
+  //SEG341 [167] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
+  //SEG342 [167] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- register_copy 
+  //SEG343 [167] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- register_copy 
+  //SEG344 [167] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- register_copy 
   //SEG345 sin16s_gen::@1
   b1:
   //SEG346 [168] (dword) sin16s::x#0 ← (dword) sin16s_gen::x#2 -- vduz1=vduz2 
@@ -8437,7 +8464,7 @@ sin16s_gen: {
   //SEG347 [169] call sin16s 
     jsr sin16s
   //SEG348 [170] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  //SEG349 sin16s_gen::@4
+  //SEG349 sin16s_gen::@3
   //SEG350 [171] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   //SEG351 [172] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1 -- _deref_pwsz1=vwsz2 
     ldy #0
@@ -8623,7 +8650,7 @@ sin16s: {
     sta mulu16_sel.return
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return+1
-  //SEG385 sin16s::@8
+  //SEG385 sin16s::@7
   //SEG386 [190] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   //SEG387 [191] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   //SEG388 [192] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -8632,33 +8659,33 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG389 [193] call mulu16_sel 
-  //SEG390 [116] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  //SEG391 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG390 [116] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  //SEG391 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG392 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG393 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG392 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG393 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG394 [194] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return+1
-  //SEG395 sin16s::@9
+  //SEG395 sin16s::@8
   //SEG396 [195] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   //SEG397 [196] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   //SEG398 [197] call mulu16_sel 
-  //SEG399 [116] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  //SEG400 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG399 [116] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  //SEG400 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG401 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG401 [116] phi (word) mulu16_sel::v2#10 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG402 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG402 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG403 [198] (word) mulu16_sel::return#14 ← (word) mulu16_sel::return#17
-  //SEG404 sin16s::@10
+  //SEG404 sin16s::@9
   //SEG405 [199] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#14
   //SEG406 [200] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -8675,18 +8702,18 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG409 [203] call mulu16_sel 
-  //SEG410 [116] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  //SEG411 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG410 [116] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  //SEG411 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG412 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG413 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG412 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG413 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG414 [204] (word) mulu16_sel::return#15 ← (word) mulu16_sel::return#17 -- vwuz1=vwuz2 
     lda mulu16_sel.return_17
     sta mulu16_sel.return
     lda mulu16_sel.return_17+1
     sta mulu16_sel.return+1
-  //SEG415 sin16s::@11
+  //SEG415 sin16s::@10
   //SEG416 [205] (word) sin16s::x4#0 ← (word) mulu16_sel::return#15
   //SEG417 [206] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   //SEG418 [207] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -8695,14 +8722,14 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG419 [208] call mulu16_sel 
-  //SEG420 [116] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  //SEG421 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG420 [116] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  //SEG421 [116] phi (byte) mulu16_sel::select#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG422 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG423 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG422 [116] phi (word) mulu16_sel::v2#10 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG423 [116] phi (word) mulu16_sel::v1#10 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG424 [209] (word) mulu16_sel::return#16 ← (word) mulu16_sel::return#17
-  //SEG425 sin16s::@12
+  //SEG425 sin16s::@11
   //SEG426 [210] (word) sin16s::x5#0 ← (word) mulu16_sel::return#16
   //SEG427 [211] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -8719,7 +8746,7 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG429 [213] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG429 [213] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
     beq b3
@@ -8734,14 +8761,14 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG432 [215] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  //SEG433 [215] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG432 [215] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  //SEG433 [215] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
   //SEG434 sin16s::@3
   b3:
   //SEG435 sin16s::@return
   //SEG436 [216] return 
     rts
-  //SEG437 sin16s::@15
+  //SEG437 sin16s::@12
   //SEG438 [217] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
 }
   print_hextab: .text "0123456789abcdef"
diff --git a/src/test/ref/sinusgen16b.sym b/src/test/ref/sinusgen16b.sym
index 1adb7c6e8..db1152ca6 100644
--- a/src/test/ref/sinusgen16b.sym
+++ b/src/test/ref/sinusgen16b.sym
@@ -1,4 +1,4 @@
-(label) @42
+(label) @1
 (label) @begin
 (label) @end
 (word) PI2_u4f12
@@ -13,8 +13,8 @@
 (dword) PI_u4f28
 (const dword) PI_u4f28#0 PI_u4f28 = (dword/signed dword) $3243f6a9
 (dword()) div32u16u((dword) div32u16u::dividend , (word) div32u16u::divisor)
+(label) div32u16u::@1
 (label) div32u16u::@2
-(label) div32u16u::@3
 (label) div32u16u::@return
 (dword) div32u16u::dividend
 (word) div32u16u::divisor
@@ -66,10 +66,10 @@
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
 (label) main::@6
-(label) main::@8
-(label) main::@9
+(label) main::@7
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
@@ -94,8 +94,8 @@
 (byte/word~) mul16u::$1 reg byte a 202.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:19 101.0
@@ -116,7 +116,7 @@
 (word()) mulu16_sel((word) mulu16_sel::v1 , (word) mulu16_sel::v2 , (byte) mulu16_sel::select)
 (dword~) mulu16_sel::$0 $0 zp ZP_DWORD:21 4.0
 (dword~) mulu16_sel::$1 $1 zp ZP_DWORD:21 4.0
-(label) mulu16_sel::@2
+(label) mulu16_sel::@1
 (label) mulu16_sel::@return
 (word) mulu16_sel::return
 (word) mulu16_sel::return#0 return zp ZP_WORD:11 4.0
@@ -201,7 +201,7 @@
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:8 4.0
@@ -222,12 +222,12 @@
 (label) sin16s::@10
 (label) sin16s::@11
 (label) sin16s::@12
-(label) sin16s::@15
 (label) sin16s::@2
 (label) sin16s::@3
 (label) sin16s::@4
 (label) sin16s::@5
 (label) sin16s::@6
+(label) sin16s::@7
 (label) sin16s::@8
 (label) sin16s::@9
 (label) sin16s::@return
@@ -265,8 +265,8 @@
 (void()) sin16s_gen((signed word*) sin16s_gen::sintab , (word) sin16s_gen::wavelength)
 (signed word~) sin16s_gen::$1 $1 zp ZP_WORD:6 22.0
 (label) sin16s_gen::@1
+(label) sin16s_gen::@2
 (label) sin16s_gen::@3
-(label) sin16s_gen::@4
 (label) sin16s_gen::@return
 (word) sin16s_gen::i
 (word) sin16s_gen::i#1 i zp ZP_WORD:4 16.5
@@ -283,8 +283,8 @@
 (void()) sin16s_genb((signed word*) sin16s_genb::sintab , (word) sin16s_genb::wavelength)
 (signed word~) sin16s_genb::$2 $2 zp ZP_WORD:8 22.0
 (label) sin16s_genb::@1
+(label) sin16s_genb::@2
 (label) sin16s_genb::@3
-(label) sin16s_genb::@4
 (label) sin16s_genb::@return
 (word) sin16s_genb::i
 (word) sin16s_genb::i#1 i zp ZP_WORD:4 16.5
@@ -303,12 +303,12 @@
 (label) sin16sb::@10
 (label) sin16sb::@11
 (label) sin16sb::@12
-(label) sin16sb::@15
 (label) sin16sb::@2
 (label) sin16sb::@3
 (label) sin16sb::@4
 (label) sin16sb::@5
 (label) sin16sb::@6
+(label) sin16sb::@7
 (label) sin16sb::@8
 (label) sin16sb::@9
 (label) sin16sb::@return
diff --git a/src/test/ref/sinusgen8.asm b/src/test/ref/sinusgen8.asm
index 85d222158..8b2338d74 100644
--- a/src/test/ref/sinusgen8.asm
+++ b/src/test/ref/sinusgen8.asm
@@ -300,14 +300,14 @@ sin8s: {
   b3:
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
     txa
     eor #$ff
     clc
     adc #1
   b4:
     rts
-  b18:
+  b14:
     txa
     jmp b4
 }
@@ -350,7 +350,7 @@ mul8u: {
     txa
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -358,7 +358,7 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  b8:
+  b4:
     txa
     lsr
     tax
diff --git a/src/test/ref/sinusgen8.cfg b/src/test/ref/sinusgen8.cfg
index fe78ef100..d898cf86d 100644
--- a/src/test/ref/sinusgen8.cfg
+++ b/src/test/ref/sinusgen8.cfg
@@ -1,23 +1,23 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@40
-@40: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @40
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @40
+main: scope:[main]  from @1
   [4] phi()
   [5] call sin8s_gen 
-  to:main::@5
-main::@5: scope:[main]  from main
+  to:main::@4
+main::@4: scope:[main]  from main
   [6] phi()
   [7] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main::@5 main::@8
-  [8] (byte*) print_char_cursor#45 ← phi( main::@5/(const byte*) print_line_cursor#0 main::@8/(byte*) print_char_cursor#2 )
-  [8] (byte) main::i#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::i#1 )
+main::@1: scope:[main]  from main::@4 main::@6
+  [8] (byte*) print_char_cursor#45 ← phi( main::@4/(const byte*) print_line_cursor#0 main::@6/(byte*) print_char_cursor#2 )
+  [8] (byte) main::i#2 ← phi( main::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::i#1 )
   [9] (signed byte) main::sb#0 ← *((const signed byte[$c0]) main::sintab2#0 + (byte) main::i#2) - (signed byte)*((const byte[]) main::sintabref#0 + (byte) main::i#2)
   [10] if((signed byte) main::sb#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@3
@@ -29,21 +29,21 @@ main::@2: scope:[main]  from main::@1 main::@3
   [13] (byte*) print_char_cursor#44 ← phi( main::@1/(byte*) print_char_cursor#45 main::@3/(byte*) print_char_cursor#2 )
   [14] (signed byte) print_sbyte::b#1 ← (signed byte) main::sb#0
   [15] call print_sbyte 
-  to:main::@7
-main::@7: scope:[main]  from main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@2
   [16] phi()
   [17] call print_str 
-  to:main::@8
-main::@8: scope:[main]  from main::@7
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [18] (byte) main::i#1 ← ++ (byte) main::i#2
   [19] if((byte) main::i#1!=(byte/word/signed word/dword/signed dword) $c0) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@8
+main::@return: scope:[main]  from main::@6
   [20] return 
   to:@return
-print_str: scope:[print_str]  from main::@3 main::@7
-  [21] (byte*) print_char_cursor#47 ← phi( main::@3/(byte*) print_char_cursor#45 main::@7/(byte*) print_char_cursor#10 )
-  [21] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@7/(const string) main::str )
+print_str: scope:[print_str]  from main::@3 main::@5
+  [21] (byte*) print_char_cursor#47 ← phi( main::@3/(byte*) print_char_cursor#45 main::@5/(byte*) print_char_cursor#10 )
+  [21] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@5/(const string) main::str )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [22] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#47 print_str::@2/(byte*) print_char_cursor#1 )
@@ -65,8 +65,8 @@ print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [29] phi()
   [30] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [31] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [31] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
   [32] call print_byte 
   to:print_sbyte::@return
 print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
@@ -75,8 +75,8 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [34] phi()
   [35] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [36] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1
   to:print_sbyte::@2
 print_char: scope:[print_char]  from print_byte print_byte::@1 print_sbyte::@1 print_sbyte::@3
@@ -101,7 +101,7 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [47] return 
   to:@return
-print_cls: scope:[print_cls]  from main::@5
+print_cls: scope:[print_cls]  from main::@4
   [48] phi()
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -117,19 +117,19 @@ sin8s_gen: scope:[sin8s_gen]  from main
   [54] phi()
   [55] call div16u 
   [56] (word) div16u::return#2 ← (word) div16u::return#0
-  to:sin8s_gen::@3
-sin8s_gen::@3: scope:[sin8s_gen]  from sin8s_gen
+  to:sin8s_gen::@2
+sin8s_gen::@2: scope:[sin8s_gen]  from sin8s_gen
   [57] (word) sin8s_gen::step#0 ← (word) div16u::return#2
   to:sin8s_gen::@1
-sin8s_gen::@1: scope:[sin8s_gen]  from sin8s_gen::@3 sin8s_gen::@4
-  [58] (word) sin8s_gen::i#2 ← phi( sin8s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@4/(word) sin8s_gen::i#1 )
-  [58] (signed byte*) sin8s_gen::sintab#2 ← phi( sin8s_gen::@3/(const signed byte[$c0]) main::sintab2#0 sin8s_gen::@4/(signed byte*) sin8s_gen::sintab#0 )
-  [58] (word) sin8s_gen::x#2 ← phi( sin8s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@4/(word) sin8s_gen::x#1 )
+sin8s_gen::@1: scope:[sin8s_gen]  from sin8s_gen::@2 sin8s_gen::@3
+  [58] (word) sin8s_gen::i#2 ← phi( sin8s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@3/(word) sin8s_gen::i#1 )
+  [58] (signed byte*) sin8s_gen::sintab#2 ← phi( sin8s_gen::@2/(const signed byte[$c0]) main::sintab2#0 sin8s_gen::@3/(signed byte*) sin8s_gen::sintab#0 )
+  [58] (word) sin8s_gen::x#2 ← phi( sin8s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@3/(word) sin8s_gen::x#1 )
   [59] (word) sin8s::x#0 ← (word) sin8s_gen::x#2
   [60] call sin8s 
   [61] (signed byte) sin8s::return#0 ← (signed byte) sin8s::return#1
-  to:sin8s_gen::@4
-sin8s_gen::@4: scope:[sin8s_gen]  from sin8s_gen::@1
+  to:sin8s_gen::@3
+sin8s_gen::@3: scope:[sin8s_gen]  from sin8s_gen::@1
   [62] (signed byte~) sin8s_gen::$1 ← (signed byte) sin8s::return#0
   [63] *((signed byte*) sin8s_gen::sintab#2) ← (signed byte~) sin8s_gen::$1
   [64] (signed byte*) sin8s_gen::sintab#0 ← ++ (signed byte*) sin8s_gen::sintab#2
@@ -137,7 +137,7 @@ sin8s_gen::@4: scope:[sin8s_gen]  from sin8s_gen::@1
   [66] (word) sin8s_gen::i#1 ← ++ (word) sin8s_gen::i#2
   [67] if((word) sin8s_gen::i#1<(const word) main::wavelength#0) goto sin8s_gen::@1
   to:sin8s_gen::@return
-sin8s_gen::@return: scope:[sin8s_gen]  from sin8s_gen::@4
+sin8s_gen::@return: scope:[sin8s_gen]  from sin8s_gen::@3
   [68] return 
   to:@return
 sin8s: scope:[sin8s]  from sin8s_gen::@1
@@ -162,84 +162,84 @@ sin8s::@2: scope:[sin8s]  from sin8s::@1 sin8s::@6
   [78] (byte) mulu8_sel::v2#0 ← (byte) sin8s::x1#0
   [79] call mulu8_sel 
   [80] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-  to:sin8s::@10
-sin8s::@10: scope:[sin8s]  from sin8s::@2
+  to:sin8s::@9
+sin8s::@9: scope:[sin8s]  from sin8s::@2
   [81] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   [82] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0
   [83] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0
   [84] call mulu8_sel 
   [85] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-  to:sin8s::@11
-sin8s::@11: scope:[sin8s]  from sin8s::@10
+  to:sin8s::@10
+sin8s::@10: scope:[sin8s]  from sin8s::@9
   [86] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1
   [87] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0
   [88] call mulu8_sel 
   [89] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-  to:sin8s::@12
-sin8s::@12: scope:[sin8s]  from sin8s::@11
+  to:sin8s::@11
+sin8s::@11: scope:[sin8s]  from sin8s::@10
   [90] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   [91] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0
   [92] (byte) mulu8_sel::v1#3 ← (byte) sin8s::x3#0
   [93] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0
   [94] call mulu8_sel 
   [95] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-  to:sin8s::@13
-sin8s::@13: scope:[sin8s]  from sin8s::@12
+  to:sin8s::@12
+sin8s::@12: scope:[sin8s]  from sin8s::@11
   [96] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   [97] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0
   [98] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0
   [99] call mulu8_sel 
   [100] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-  to:sin8s::@14
-sin8s::@14: scope:[sin8s]  from sin8s::@13
+  to:sin8s::@13
+sin8s::@13: scope:[sin8s]  from sin8s::@12
   [101] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   [102] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [103] (byte) sin8s::usinx#1 ← (byte) sin8s::usinx#0 + (byte) sin8s::x5_128#0
   [104] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3
   to:sin8s::@7
-sin8s::@7: scope:[sin8s]  from sin8s::@14
+sin8s::@7: scope:[sin8s]  from sin8s::@13
   [105] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1
   to:sin8s::@3
-sin8s::@3: scope:[sin8s]  from sin8s::@14 sin8s::@7
-  [106] (byte) sin8s::usinx#4 ← phi( sin8s::@14/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
-  [107] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18
+sin8s::@3: scope:[sin8s]  from sin8s::@13 sin8s::@7
+  [106] (byte) sin8s::usinx#4 ← phi( sin8s::@13/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
+  [107] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14
   to:sin8s::@8
 sin8s::@8: scope:[sin8s]  from sin8s::@3
   [108] (signed byte) sin8s::sinx#1 ← - (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-sin8s::@4: scope:[sin8s]  from sin8s::@18 sin8s::@8
-  [109] (signed byte) sin8s::return#1 ← phi( sin8s::@18/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
+sin8s::@4: scope:[sin8s]  from sin8s::@14 sin8s::@8
+  [109] (signed byte) sin8s::return#1 ← phi( sin8s::@14/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
   to:sin8s::@return
 sin8s::@return: scope:[sin8s]  from sin8s::@4
   [110] return 
   to:@return
-sin8s::@18: scope:[sin8s]  from sin8s::@3
+sin8s::@14: scope:[sin8s]  from sin8s::@3
   [111] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@13 sin8s::@2
-  [112] (byte) mulu8_sel::select#5 ← phi( sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [112] (byte) mulu8_sel::v2#5 ← phi( sin8s::@10/(byte) mulu8_sel::v2#1 sin8s::@11/(const byte) sin8s::DIV_6#0 sin8s::@12/(byte) mulu8_sel::v2#3 sin8s::@13/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
-  [112] (byte) mulu8_sel::v1#5 ← phi( sin8s::@10/(byte) mulu8_sel::v1#1 sin8s::@11/(byte) mulu8_sel::v1#2 sin8s::@12/(byte) mulu8_sel::v1#3 sin8s::@13/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
+mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@2 sin8s::@9
+  [112] (byte) mulu8_sel::select#5 ← phi( sin8s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [112] (byte) mulu8_sel::v2#5 ← phi( sin8s::@9/(byte) mulu8_sel::v2#1 sin8s::@10/(const byte) sin8s::DIV_6#0 sin8s::@11/(byte) mulu8_sel::v2#3 sin8s::@12/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
+  [112] (byte) mulu8_sel::v1#5 ← phi( sin8s::@9/(byte) mulu8_sel::v1#1 sin8s::@10/(byte) mulu8_sel::v1#2 sin8s::@11/(byte) mulu8_sel::v1#3 sin8s::@12/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
   [113] (byte) mul8u::a#1 ← (byte) mulu8_sel::v1#5
   [114] (byte) mul8u::b#0 ← (byte) mulu8_sel::v2#5
   [115] call mul8u 
   [116] (word) mul8u::return#2 ← (word) mul8u::res#2
-  to:mulu8_sel::@2
-mulu8_sel::@2: scope:[mulu8_sel]  from mulu8_sel
+  to:mulu8_sel::@1
+mulu8_sel::@1: scope:[mulu8_sel]  from mulu8_sel
   [117] (word~) mulu8_sel::$0 ← (word) mul8u::return#2
   [118] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5
   [119] (byte) mulu8_sel::return#12 ← > (word~) mulu8_sel::$1
   to:mulu8_sel::@return
-mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@2
+mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@1
   [120] return 
   to:@return
 mul8u: scope:[mul8u]  from mulu8_sel
   [121] (word) mul8u::mb#0 ← ((word)) (byte) mul8u::b#0
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [122] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@8/(word) mul8u::mb#1 )
-  [122] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [122] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [122] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@4/(word) mul8u::mb#1 )
+  [122] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [122] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@4/(byte) mul8u::a#0 )
   [123] if((byte) mul8u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -247,13 +247,13 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [125] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [126] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [126] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [127] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [128] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [128] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [129] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [130] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
@@ -261,11 +261,11 @@ div16u: scope:[div16u]  from sin8s_gen
   [131] phi()
   [132] call divr16u 
   [133] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div16u::@2
-div16u::@2: scope:[div16u]  from div16u
+  to:div16u::@1
+div16u::@1: scope:[div16u]  from div16u
   [134] (word) div16u::return#0 ← (word) divr16u::return#2
   to:div16u::@return
-div16u::@return: scope:[div16u]  from div16u::@2
+div16u::@return: scope:[div16u]  from div16u::@1
   [135] return 
   to:@return
 divr16u: scope:[divr16u]  from div16u
diff --git a/src/test/ref/sinusgen8.log b/src/test/ref/sinusgen8.log
index 365b38736..db8cd4410 100644
--- a/src/test/ref/sinusgen8.log
+++ b/src/test/ref/sinusgen8.log
@@ -1613,13 +1613,30 @@ Culled Empty Block (label) mul8u::@10
 Culled Empty Block (label) divr16u::@8
 Culled Empty Block (label) divr16u::@10
 Culled Empty Block (label) divr16u::@9
+Renumbering block @40 to @1
+Renumbering block div16u::@2 to div16u::@1
+Renumbering block mul8u::@6 to mul8u::@3
+Renumbering block mul8u::@8 to mul8u::@4
+Renumbering block sin8s_gen::@3 to sin8s_gen::@2
+Renumbering block sin8s_gen::@4 to sin8s_gen::@3
+Renumbering block sin8s::@10 to sin8s::@9
+Renumbering block sin8s::@11 to sin8s::@10
+Renumbering block sin8s::@12 to sin8s::@11
+Renumbering block sin8s::@13 to sin8s::@12
+Renumbering block sin8s::@14 to sin8s::@13
+Renumbering block sin8s::@18 to sin8s::@14
+Renumbering block mulu8_sel::@2 to mulu8_sel::@1
+Renumbering block print_sbyte::@5 to print_sbyte::@4
+Renumbering block main::@5 to main::@4
+Renumbering block main::@7 to main::@5
+Renumbering block main::@8 to main::@6
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @40
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@5
+Adding NOP phi() at start of main::@4
 Adding NOP phi() at start of main::@3
-Adding NOP phi() at start of main::@7
+Adding NOP phi() at start of main::@5
 Adding NOP phi() at start of print_sbyte::@3
 Adding NOP phi() at start of print_sbyte::@1
 Adding NOP phi() at start of print_cls
@@ -1630,24 +1647,24 @@ Adding NOP phi() at start of divr16u
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@40
-@40: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @40
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @40
+main: scope:[main]  from @1
   [4] phi()
   [5] call sin8s_gen 
-  to:main::@5
-main::@5: scope:[main]  from main
+  to:main::@4
+main::@4: scope:[main]  from main
   [6] phi()
   [7] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main::@5 main::@8
-  [8] (byte*) print_char_cursor#45 ← phi( main::@5/(const byte*) print_line_cursor#0 main::@8/(byte*) print_char_cursor#2 )
-  [8] (byte) main::i#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::i#1 )
+main::@1: scope:[main]  from main::@4 main::@6
+  [8] (byte*) print_char_cursor#45 ← phi( main::@4/(const byte*) print_line_cursor#0 main::@6/(byte*) print_char_cursor#2 )
+  [8] (byte) main::i#2 ← phi( main::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::i#1 )
   [9] (signed byte) main::sb#0 ← *((const signed byte[$c0]) main::sintab2#0 + (byte) main::i#2) - (signed byte)*((const byte[]) main::sintabref#0 + (byte) main::i#2)
   [10] if((signed byte) main::sb#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@2
   to:main::@3
@@ -1659,21 +1676,21 @@ main::@2: scope:[main]  from main::@1 main::@3
   [13] (byte*) print_char_cursor#44 ← phi( main::@1/(byte*) print_char_cursor#45 main::@3/(byte*) print_char_cursor#2 )
   [14] (signed byte) print_sbyte::b#1 ← (signed byte) main::sb#0
   [15] call print_sbyte 
-  to:main::@7
-main::@7: scope:[main]  from main::@2
+  to:main::@5
+main::@5: scope:[main]  from main::@2
   [16] phi()
   [17] call print_str 
-  to:main::@8
-main::@8: scope:[main]  from main::@7
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [18] (byte) main::i#1 ← ++ (byte) main::i#2
   [19] if((byte) main::i#1!=(byte/word/signed word/dword/signed dword) $c0) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@8
+main::@return: scope:[main]  from main::@6
   [20] return 
   to:@return
-print_str: scope:[print_str]  from main::@3 main::@7
-  [21] (byte*) print_char_cursor#47 ← phi( main::@3/(byte*) print_char_cursor#45 main::@7/(byte*) print_char_cursor#10 )
-  [21] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@7/(const string) main::str )
+print_str: scope:[print_str]  from main::@3 main::@5
+  [21] (byte*) print_char_cursor#47 ← phi( main::@3/(byte*) print_char_cursor#45 main::@5/(byte*) print_char_cursor#10 )
+  [21] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@5/(const string) main::str )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [22] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#47 print_str::@2/(byte*) print_char_cursor#1 )
@@ -1695,8 +1712,8 @@ print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [29] phi()
   [30] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [31] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [31] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
   [32] call print_byte 
   to:print_sbyte::@return
 print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
@@ -1705,8 +1722,8 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [34] phi()
   [35] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [36] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1
   to:print_sbyte::@2
 print_char: scope:[print_char]  from print_byte print_byte::@1 print_sbyte::@1 print_sbyte::@3
@@ -1731,7 +1748,7 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [47] return 
   to:@return
-print_cls: scope:[print_cls]  from main::@5
+print_cls: scope:[print_cls]  from main::@4
   [48] phi()
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -1747,19 +1764,19 @@ sin8s_gen: scope:[sin8s_gen]  from main
   [54] phi()
   [55] call div16u 
   [56] (word) div16u::return#2 ← (word) div16u::return#0
-  to:sin8s_gen::@3
-sin8s_gen::@3: scope:[sin8s_gen]  from sin8s_gen
+  to:sin8s_gen::@2
+sin8s_gen::@2: scope:[sin8s_gen]  from sin8s_gen
   [57] (word) sin8s_gen::step#0 ← (word) div16u::return#2
   to:sin8s_gen::@1
-sin8s_gen::@1: scope:[sin8s_gen]  from sin8s_gen::@3 sin8s_gen::@4
-  [58] (word) sin8s_gen::i#2 ← phi( sin8s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@4/(word) sin8s_gen::i#1 )
-  [58] (signed byte*) sin8s_gen::sintab#2 ← phi( sin8s_gen::@3/(const signed byte[$c0]) main::sintab2#0 sin8s_gen::@4/(signed byte*) sin8s_gen::sintab#0 )
-  [58] (word) sin8s_gen::x#2 ← phi( sin8s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@4/(word) sin8s_gen::x#1 )
+sin8s_gen::@1: scope:[sin8s_gen]  from sin8s_gen::@2 sin8s_gen::@3
+  [58] (word) sin8s_gen::i#2 ← phi( sin8s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@3/(word) sin8s_gen::i#1 )
+  [58] (signed byte*) sin8s_gen::sintab#2 ← phi( sin8s_gen::@2/(const signed byte[$c0]) main::sintab2#0 sin8s_gen::@3/(signed byte*) sin8s_gen::sintab#0 )
+  [58] (word) sin8s_gen::x#2 ← phi( sin8s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@3/(word) sin8s_gen::x#1 )
   [59] (word) sin8s::x#0 ← (word) sin8s_gen::x#2
   [60] call sin8s 
   [61] (signed byte) sin8s::return#0 ← (signed byte) sin8s::return#1
-  to:sin8s_gen::@4
-sin8s_gen::@4: scope:[sin8s_gen]  from sin8s_gen::@1
+  to:sin8s_gen::@3
+sin8s_gen::@3: scope:[sin8s_gen]  from sin8s_gen::@1
   [62] (signed byte~) sin8s_gen::$1 ← (signed byte) sin8s::return#0
   [63] *((signed byte*) sin8s_gen::sintab#2) ← (signed byte~) sin8s_gen::$1
   [64] (signed byte*) sin8s_gen::sintab#0 ← ++ (signed byte*) sin8s_gen::sintab#2
@@ -1767,7 +1784,7 @@ sin8s_gen::@4: scope:[sin8s_gen]  from sin8s_gen::@1
   [66] (word) sin8s_gen::i#1 ← ++ (word) sin8s_gen::i#2
   [67] if((word) sin8s_gen::i#1<(const word) main::wavelength#0) goto sin8s_gen::@1
   to:sin8s_gen::@return
-sin8s_gen::@return: scope:[sin8s_gen]  from sin8s_gen::@4
+sin8s_gen::@return: scope:[sin8s_gen]  from sin8s_gen::@3
   [68] return 
   to:@return
 sin8s: scope:[sin8s]  from sin8s_gen::@1
@@ -1792,84 +1809,84 @@ sin8s::@2: scope:[sin8s]  from sin8s::@1 sin8s::@6
   [78] (byte) mulu8_sel::v2#0 ← (byte) sin8s::x1#0
   [79] call mulu8_sel 
   [80] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-  to:sin8s::@10
-sin8s::@10: scope:[sin8s]  from sin8s::@2
+  to:sin8s::@9
+sin8s::@9: scope:[sin8s]  from sin8s::@2
   [81] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   [82] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0
   [83] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0
   [84] call mulu8_sel 
   [85] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-  to:sin8s::@11
-sin8s::@11: scope:[sin8s]  from sin8s::@10
+  to:sin8s::@10
+sin8s::@10: scope:[sin8s]  from sin8s::@9
   [86] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1
   [87] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0
   [88] call mulu8_sel 
   [89] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-  to:sin8s::@12
-sin8s::@12: scope:[sin8s]  from sin8s::@11
+  to:sin8s::@11
+sin8s::@11: scope:[sin8s]  from sin8s::@10
   [90] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   [91] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0
   [92] (byte) mulu8_sel::v1#3 ← (byte) sin8s::x3#0
   [93] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0
   [94] call mulu8_sel 
   [95] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-  to:sin8s::@13
-sin8s::@13: scope:[sin8s]  from sin8s::@12
+  to:sin8s::@12
+sin8s::@12: scope:[sin8s]  from sin8s::@11
   [96] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   [97] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0
   [98] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0
   [99] call mulu8_sel 
   [100] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-  to:sin8s::@14
-sin8s::@14: scope:[sin8s]  from sin8s::@13
+  to:sin8s::@13
+sin8s::@13: scope:[sin8s]  from sin8s::@12
   [101] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   [102] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [103] (byte) sin8s::usinx#1 ← (byte) sin8s::usinx#0 + (byte) sin8s::x5_128#0
   [104] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3
   to:sin8s::@7
-sin8s::@7: scope:[sin8s]  from sin8s::@14
+sin8s::@7: scope:[sin8s]  from sin8s::@13
   [105] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1
   to:sin8s::@3
-sin8s::@3: scope:[sin8s]  from sin8s::@14 sin8s::@7
-  [106] (byte) sin8s::usinx#4 ← phi( sin8s::@14/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
-  [107] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18
+sin8s::@3: scope:[sin8s]  from sin8s::@13 sin8s::@7
+  [106] (byte) sin8s::usinx#4 ← phi( sin8s::@13/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
+  [107] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14
   to:sin8s::@8
 sin8s::@8: scope:[sin8s]  from sin8s::@3
   [108] (signed byte) sin8s::sinx#1 ← - (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-sin8s::@4: scope:[sin8s]  from sin8s::@18 sin8s::@8
-  [109] (signed byte) sin8s::return#1 ← phi( sin8s::@18/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
+sin8s::@4: scope:[sin8s]  from sin8s::@14 sin8s::@8
+  [109] (signed byte) sin8s::return#1 ← phi( sin8s::@14/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
   to:sin8s::@return
 sin8s::@return: scope:[sin8s]  from sin8s::@4
   [110] return 
   to:@return
-sin8s::@18: scope:[sin8s]  from sin8s::@3
+sin8s::@14: scope:[sin8s]  from sin8s::@3
   [111] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@13 sin8s::@2
-  [112] (byte) mulu8_sel::select#5 ← phi( sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [112] (byte) mulu8_sel::v2#5 ← phi( sin8s::@10/(byte) mulu8_sel::v2#1 sin8s::@11/(const byte) sin8s::DIV_6#0 sin8s::@12/(byte) mulu8_sel::v2#3 sin8s::@13/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
-  [112] (byte) mulu8_sel::v1#5 ← phi( sin8s::@10/(byte) mulu8_sel::v1#1 sin8s::@11/(byte) mulu8_sel::v1#2 sin8s::@12/(byte) mulu8_sel::v1#3 sin8s::@13/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
+mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@2 sin8s::@9
+  [112] (byte) mulu8_sel::select#5 ← phi( sin8s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [112] (byte) mulu8_sel::v2#5 ← phi( sin8s::@9/(byte) mulu8_sel::v2#1 sin8s::@10/(const byte) sin8s::DIV_6#0 sin8s::@11/(byte) mulu8_sel::v2#3 sin8s::@12/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
+  [112] (byte) mulu8_sel::v1#5 ← phi( sin8s::@9/(byte) mulu8_sel::v1#1 sin8s::@10/(byte) mulu8_sel::v1#2 sin8s::@11/(byte) mulu8_sel::v1#3 sin8s::@12/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
   [113] (byte) mul8u::a#1 ← (byte) mulu8_sel::v1#5
   [114] (byte) mul8u::b#0 ← (byte) mulu8_sel::v2#5
   [115] call mul8u 
   [116] (word) mul8u::return#2 ← (word) mul8u::res#2
-  to:mulu8_sel::@2
-mulu8_sel::@2: scope:[mulu8_sel]  from mulu8_sel
+  to:mulu8_sel::@1
+mulu8_sel::@1: scope:[mulu8_sel]  from mulu8_sel
   [117] (word~) mulu8_sel::$0 ← (word) mul8u::return#2
   [118] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5
   [119] (byte) mulu8_sel::return#12 ← > (word~) mulu8_sel::$1
   to:mulu8_sel::@return
-mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@2
+mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@1
   [120] return 
   to:@return
 mul8u: scope:[mul8u]  from mulu8_sel
   [121] (word) mul8u::mb#0 ← ((word)) (byte) mul8u::b#0
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [122] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@8/(word) mul8u::mb#1 )
-  [122] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [122] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [122] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@4/(word) mul8u::mb#1 )
+  [122] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [122] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@4/(byte) mul8u::a#0 )
   [123] if((byte) mul8u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -1877,13 +1894,13 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [125] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [126] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [126] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [127] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [128] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [128] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [129] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [130] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
@@ -1891,11 +1908,11 @@ div16u: scope:[div16u]  from sin8s_gen
   [131] phi()
   [132] call divr16u 
   [133] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div16u::@2
-div16u::@2: scope:[div16u]  from div16u
+  to:div16u::@1
+div16u::@1: scope:[div16u]  from div16u
   [134] (word) div16u::return#0 ← (word) divr16u::return#2
   to:div16u::@return
-div16u::@return: scope:[div16u]  from div16u::@2
+div16u::@return: scope:[div16u]  from div16u::@1
   [135] return 
   to:@return
 divr16u: scope:[divr16u]  from div16u
@@ -2303,17 +2320,17 @@ INITIAL ASM
   .label print_char_cursor = 7
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-b40_from_bbegin:
-  jmp b40
-//SEG5 @40
-b40:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @40 to main [phi:@40->main]
-main_from_b40:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @40 to @end [phi:@40->@end]
-bend_from_b40:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -2326,30 +2343,30 @@ main: {
   //SEG12 [54] phi from main to sin8s_gen [phi:main->sin8s_gen]
   sin8s_gen_from_main:
     jsr sin8s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  b5_from_main:
-    jmp b5
-  //SEG14 main::@5
-  b5:
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  b4_from_main:
+    jmp b4
+  //SEG14 main::@4
+  b4:
   //SEG15 [7] call print_cls 
-  //SEG16 [48] phi from main::@5 to print_cls [phi:main::@5->print_cls]
-  print_cls_from_b5:
+  //SEG16 [48] phi from main::@4 to print_cls [phi:main::@4->print_cls]
+  print_cls_from_b4:
     jsr print_cls
-  //SEG17 [8] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  b1_from_b5:
-  //SEG18 [8] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#0] -- pbuz1=pbuc1 
+  //SEG17 [8] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG18 [8] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG19 [8] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@1#1] -- vbuz1=vbuc1 
+  //SEG19 [8] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta i
     jmp b1
-  //SEG20 [8] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  b1_from_b8:
-  //SEG21 [8] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG22 [8] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG20 [8] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG21 [8] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG22 [8] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#1] -- register_copy 
     jmp b1
   //SEG23 main::@1
   b1:
@@ -2389,30 +2406,30 @@ main: {
     sta print_sbyte.b
   //SEG36 [15] call print_sbyte 
     jsr print_sbyte
-  //SEG37 [16] phi from main::@2 to main::@7 [phi:main::@2->main::@7]
-  b7_from_b2:
-    jmp b7
-  //SEG38 main::@7
-  b7:
+  //SEG37 [16] phi from main::@2 to main::@5 [phi:main::@2->main::@5]
+  b5_from_b2:
+    jmp b5
+  //SEG38 main::@5
+  b5:
   //SEG39 [17] call print_str 
-  //SEG40 [21] phi from main::@7 to print_str [phi:main::@7->print_str]
-  print_str_from_b7:
-  //SEG41 [21] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@7->print_str#0] -- register_copy 
-  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG40 [21] phi from main::@5 to print_str [phi:main::@5->print_str]
+  print_str_from_b5:
+  //SEG41 [21] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@5->print_str#0] -- register_copy 
+  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@5->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b8
-  //SEG43 main::@8
-  b8:
+    jmp b6
+  //SEG43 main::@6
+  b6:
   //SEG44 [18] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG45 [19] if((byte) main::i#1!=(byte/word/signed word/dword/signed dword) $c0) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c0
     cmp i
-    bne b1_from_b8
+    bne b1_from_b6
     jmp breturn
   //SEG46 main::@return
   breturn:
@@ -2487,10 +2504,10 @@ print_sbyte: {
     lda #' '
     sta print_char.ch
     jsr print_char
-  //SEG68 [31] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG68 [31] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG69 [31] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG69 [31] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG70 print_sbyte::@2
   b2:
@@ -2514,16 +2531,16 @@ print_sbyte: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b5
-  //SEG80 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG80 print_sbyte::@4
+  b4:
   //SEG81 [36] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG82 print_char
 // Print a single char
@@ -2650,38 +2667,38 @@ sin8s_gen: {
     sta div16u.return_2
     lda div16u.return+1
     sta div16u.return_2+1
-    jmp b3
-  //SEG118 sin8s_gen::@3
-  b3:
+    jmp b2
+  //SEG118 sin8s_gen::@2
+  b2:
   //SEG119 [57] (word) sin8s_gen::step#0 ← (word) div16u::return#2 -- vwuz1=vwuz2 
     lda div16u.return_2
     sta step
     lda div16u.return_2+1
     sta step+1
-  //SEG120 [58] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
-  b1_from_b3:
-  //SEG121 [58] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG120 [58] phi from sin8s_gen::@2 to sin8s_gen::@1 [phi:sin8s_gen::@2->sin8s_gen::@1]
+  b1_from_b2:
+  //SEG121 [58] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG122 [58] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintab2#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- pbsz1=pbsc1 
+  //SEG122 [58] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintab2#0 [phi:sin8s_gen::@2->sin8s_gen::@1#1] -- pbsz1=pbsc1 
     lda #<main.sintab2
     sta sintab
     lda #>main.sintab2
     sta sintab+1
-  //SEG123 [58] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- vwuz1=vbuc1 
+  //SEG123 [58] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#2] -- vwuz1=vbuc1 
     lda #0
     sta x
     lda #0
     sta x+1
     jmp b1
   // u[4.12]
-  //SEG124 [58] phi from sin8s_gen::@4 to sin8s_gen::@1 [phi:sin8s_gen::@4->sin8s_gen::@1]
-  b1_from_b4:
-  //SEG125 [58] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@4->sin8s_gen::@1#0] -- register_copy 
-  //SEG126 [58] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@4->sin8s_gen::@1#1] -- register_copy 
-  //SEG127 [58] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@4->sin8s_gen::@1#2] -- register_copy 
+  //SEG124 [58] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
+  b1_from_b3:
+  //SEG125 [58] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- register_copy 
+  //SEG126 [58] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- register_copy 
+  //SEG127 [58] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- register_copy 
     jmp b1
   //SEG128 sin8s_gen::@1
   b1:
@@ -2695,9 +2712,9 @@ sin8s_gen: {
   //SEG131 [61] (signed byte) sin8s::return#0 ← (signed byte) sin8s::return#1 -- vbsz1=vbsz2 
     lda sin8s.return_1
     sta sin8s.return
-    jmp b4
-  //SEG132 sin8s_gen::@4
-  b4:
+    jmp b3
+  //SEG132 sin8s_gen::@3
+  b3:
   //SEG133 [62] (signed byte~) sin8s_gen::$1 ← (signed byte) sin8s::return#0 -- vbsz1=vbsz2 
     lda sin8s.return
     sta _1
@@ -2726,11 +2743,11 @@ sin8s_gen: {
   //SEG138 [67] if((word) sin8s_gen::i#1<(const word) main::wavelength#0) goto sin8s_gen::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG139 sin8s_gen::@return
@@ -2859,9 +2876,9 @@ sin8s: {
   //SEG167 [80] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return
-    jmp b10
-  //SEG168 sin8s::@10
-  b10:
+    jmp b9
+  //SEG168 sin8s::@9
+  b9:
   //SEG169 [81] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0 -- vbuz1=vbuz2 
     lda mulu8_sel.return
     sta x2
@@ -2872,20 +2889,20 @@ sin8s: {
     lda x1
     sta mulu8_sel.v2
   //SEG172 [84] call mulu8_sel 
-  //SEG173 [112] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
-  mulu8_sel_from_b10:
-  //SEG174 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG173 [112] phi from sin8s::@9 to mulu8_sel [phi:sin8s::@9->mulu8_sel]
+  mulu8_sel_from_b9:
+  //SEG174 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@9->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG175 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@10->mulu8_sel#1] -- register_copy 
-  //SEG176 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
+  //SEG175 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@9->mulu8_sel#1] -- register_copy 
+  //SEG176 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@9->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG177 [85] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_1
-    jmp b11
-  //SEG178 sin8s::@11
-  b11:
+    jmp b10
+  //SEG178 sin8s::@10
+  b10:
   //SEG179 [86] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1 -- vbuz1=vbuz2 
     lda mulu8_sel.return_1
     sta x3
@@ -2893,22 +2910,22 @@ sin8s: {
     lda x3
     sta mulu8_sel.v1
   //SEG181 [88] call mulu8_sel 
-  //SEG182 [112] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
-  mulu8_sel_from_b11:
-  //SEG183 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG182 [112] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
+  mulu8_sel_from_b10:
+  //SEG183 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG184 [112] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@11->mulu8_sel#1] -- vbuz1=vbuc1 
+  //SEG184 [112] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@10->mulu8_sel#1] -- vbuz1=vbuc1 
     lda #DIV_6
     sta mulu8_sel.v2
-  //SEG185 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
+  //SEG185 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG186 [89] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_2
-    jmp b12
-  //SEG187 sin8s::@12
-  b12:
+    jmp b11
+  //SEG187 sin8s::@11
+  b11:
   //SEG188 [90] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2 -- vbuz1=vbuz2 
     lda mulu8_sel.return_2
     sta x3_6
@@ -2924,20 +2941,20 @@ sin8s: {
     lda x1
     sta mulu8_sel.v2
   //SEG192 [94] call mulu8_sel 
-  //SEG193 [112] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
-  mulu8_sel_from_b12:
-  //SEG194 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG193 [112] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
+  mulu8_sel_from_b11:
+  //SEG194 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG195 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
-  //SEG196 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
+  //SEG195 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@11->mulu8_sel#1] -- register_copy 
+  //SEG196 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG197 [95] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_10
-    jmp b13
-  //SEG198 sin8s::@13
-  b13:
+    jmp b12
+  //SEG198 sin8s::@12
+  b12:
   //SEG199 [96] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10 -- vbuz1=vbuz2 
     lda mulu8_sel.return_10
     sta x4
@@ -2948,20 +2965,20 @@ sin8s: {
     lda x1
     sta mulu8_sel.v2
   //SEG202 [99] call mulu8_sel 
-  //SEG203 [112] phi from sin8s::@13 to mulu8_sel [phi:sin8s::@13->mulu8_sel]
-  mulu8_sel_from_b13:
-  //SEG204 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@13->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG203 [112] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
+  mulu8_sel_from_b12:
+  //SEG204 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG205 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@13->mulu8_sel#1] -- register_copy 
-  //SEG206 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@13->mulu8_sel#2] -- register_copy 
+  //SEG205 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
+  //SEG206 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG207 [100] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_11
-    jmp b14
-  //SEG208 sin8s::@14
-  b14:
+    jmp b13
+  //SEG208 sin8s::@13
+  b13:
   //SEG209 [101] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11 -- vbuz1=vbuz2 
     lda mulu8_sel.return_11
     sta x5
@@ -2980,23 +2997,23 @@ sin8s: {
   //SEG212 [104] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3 -- vbuz1_lt_vbuc1_then_la1 
     lda usinx_1
     cmp #$80
-    bcc b3_from_b14
+    bcc b3_from_b13
     jmp b7
   //SEG213 sin8s::@7
   b7:
   //SEG214 [105] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1 -- vbuz1=_dec_vbuz1 
     dec usinx_2
-  //SEG215 [106] phi from sin8s::@14 sin8s::@7 to sin8s::@3 [phi:sin8s::@14/sin8s::@7->sin8s::@3]
-  b3_from_b14:
+  //SEG215 [106] phi from sin8s::@13 sin8s::@7 to sin8s::@3 [phi:sin8s::@13/sin8s::@7->sin8s::@3]
+  b3_from_b13:
   b3_from_b7:
-  //SEG216 [106] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@14/sin8s::@7->sin8s::@3#0] -- register_copy 
+  //SEG216 [106] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@13/sin8s::@7->sin8s::@3#0] -- register_copy 
     jmp b3
   //SEG217 sin8s::@3
   b3:
-  //SEG218 [107] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG218 [107] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
     jmp b8
   //SEG219 sin8s::@8
   b8:
@@ -3006,10 +3023,10 @@ sin8s: {
     clc
     adc #1
     sta sinx
-  //SEG221 [109] phi from sin8s::@18 sin8s::@8 to sin8s::@4 [phi:sin8s::@18/sin8s::@8->sin8s::@4]
-  b4_from_b18:
+  //SEG221 [109] phi from sin8s::@14 sin8s::@8 to sin8s::@4 [phi:sin8s::@14/sin8s::@8->sin8s::@4]
+  b4_from_b14:
   b4_from_b8:
-  //SEG222 [109] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@18/sin8s::@8->sin8s::@4#0] -- register_copy 
+  //SEG222 [109] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@14/sin8s::@8->sin8s::@4#0] -- register_copy 
     jmp b4
   //SEG223 sin8s::@4
   b4:
@@ -3018,12 +3035,12 @@ sin8s: {
   breturn:
   //SEG225 [110] return 
     rts
-  //SEG226 sin8s::@18
-  b18:
+  //SEG226 sin8s::@14
+  b14:
   //SEG227 [111] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4 -- vbsz1=vbsz2 
     lda usinx_4
     sta return_5
-    jmp b4_from_b18
+    jmp b4_from_b14
 }
 //SEG228 mulu8_sel
 // Calculate val*val for two unsigned byte values - the result is 8 selected bits of the 16-bit result.
@@ -3054,9 +3071,9 @@ mulu8_sel: {
     sta mul8u.return
     lda mul8u.res+1
     sta mul8u.return+1
-    jmp b2
-  //SEG233 mulu8_sel::@2
-  b2:
+    jmp b1
+  //SEG233 mulu8_sel::@1
+  b1:
   //SEG234 [117] (word~) mulu8_sel::$0 ← (word) mul8u::return#2 -- vwuz1=vwuz2 
     lda mul8u.return
     sta _0
@@ -3126,13 +3143,13 @@ mul8u: {
     lda #1
     and a
     sta _1
-  //SEG251 [126] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG251 [126] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG252 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG252 mul8u::@3
+  b3:
   //SEG253 [127] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -3141,23 +3158,23 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG254 [128] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG255 [128] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG256 mul8u::@8
-  b8:
+  //SEG254 [128] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG255 [128] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG256 mul8u::@4
+  b4:
   //SEG257 [129] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr a
   //SEG258 [130] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG259 [122] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG260 [122] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG261 [122] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG262 [122] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG259 [122] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG260 [122] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG261 [122] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG262 [122] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG263 div16u
@@ -3177,9 +3194,9 @@ div16u: {
     sta divr16u.return_2
     lda divr16u.return+1
     sta divr16u.return_2+1
-    jmp b2
-  //SEG267 div16u::@2
-  b2:
+    jmp b1
+  //SEG267 div16u::@1
+  b1:
   //SEG268 [134] (word) div16u::return#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return_2
     sta return
@@ -3582,17 +3599,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_char_cursor = 5
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-b40_from_bbegin:
-  jmp b40
-//SEG5 @40
-b40:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @40 to main [phi:@40->main]
-main_from_b40:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @40 to @end [phi:@40->@end]
-bend_from_b40:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3604,29 +3621,29 @@ main: {
   //SEG12 [54] phi from main to sin8s_gen [phi:main->sin8s_gen]
   sin8s_gen_from_main:
     jsr sin8s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  b5_from_main:
-    jmp b5
-  //SEG14 main::@5
-  b5:
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  b4_from_main:
+    jmp b4
+  //SEG14 main::@4
+  b4:
   //SEG15 [7] call print_cls 
-  //SEG16 [48] phi from main::@5 to print_cls [phi:main::@5->print_cls]
-  print_cls_from_b5:
+  //SEG16 [48] phi from main::@4 to print_cls [phi:main::@4->print_cls]
+  print_cls_from_b4:
     jsr print_cls
-  //SEG17 [8] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  b1_from_b5:
-  //SEG18 [8] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#0] -- pbuz1=pbuc1 
+  //SEG17 [8] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  b1_from_b4:
+  //SEG18 [8] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG19 [8] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@1#1] -- vbuxx=vbuc1 
+  //SEG19 [8] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@1#1] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
-  //SEG20 [8] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  b1_from_b8:
-  //SEG21 [8] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG22 [8] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG20 [8] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG21 [8] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG22 [8] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#1] -- register_copy 
     jmp b1
   //SEG23 main::@1
   b1:
@@ -3663,29 +3680,29 @@ main: {
   //SEG35 [14] (signed byte) print_sbyte::b#1 ← (signed byte) main::sb#0
   //SEG36 [15] call print_sbyte 
     jsr print_sbyte
-  //SEG37 [16] phi from main::@2 to main::@7 [phi:main::@2->main::@7]
-  b7_from_b2:
-    jmp b7
-  //SEG38 main::@7
-  b7:
+  //SEG37 [16] phi from main::@2 to main::@5 [phi:main::@2->main::@5]
+  b5_from_b2:
+    jmp b5
+  //SEG38 main::@5
+  b5:
   //SEG39 [17] call print_str 
-  //SEG40 [21] phi from main::@7 to print_str [phi:main::@7->print_str]
-  print_str_from_b7:
-  //SEG41 [21] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@7->print_str#0] -- register_copy 
-  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG40 [21] phi from main::@5 to print_str [phi:main::@5->print_str]
+  print_str_from_b5:
+  //SEG41 [21] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@5->print_str#0] -- register_copy 
+  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@5->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b8
-  //SEG43 main::@8
-  b8:
+    jmp b6
+  //SEG43 main::@6
+  b6:
   //SEG44 [18] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
   //SEG45 [19] if((byte) main::i#1!=(byte/word/signed word/dword/signed dword) $c0) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$c0
-    bne b1_from_b8
+    bne b1_from_b6
     jmp breturn
   //SEG46 main::@return
   breturn:
@@ -3759,10 +3776,10 @@ print_sbyte: {
   //SEG67 [37] phi (byte) print_char::ch#4 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG68 [31] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG68 [31] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG69 [31] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG69 [31] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG70 print_sbyte::@2
   b2:
@@ -3785,16 +3802,16 @@ print_sbyte: {
   //SEG79 [37] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b5
-  //SEG80 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG80 print_sbyte::@4
+  b4:
   //SEG81 [36] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG82 print_char
 // Print a single char
@@ -3908,34 +3925,34 @@ sin8s_gen: {
   div16u_from_sin8s_gen:
     jsr div16u
   //SEG117 [56] (word) div16u::return#2 ← (word) div16u::return#0
-    jmp b3
-  //SEG118 sin8s_gen::@3
-  b3:
+    jmp b2
+  //SEG118 sin8s_gen::@2
+  b2:
   //SEG119 [57] (word) sin8s_gen::step#0 ← (word) div16u::return#2
-  //SEG120 [58] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
-  b1_from_b3:
-  //SEG121 [58] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG120 [58] phi from sin8s_gen::@2 to sin8s_gen::@1 [phi:sin8s_gen::@2->sin8s_gen::@1]
+  b1_from_b2:
+  //SEG121 [58] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG122 [58] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintab2#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- pbsz1=pbsc1 
+  //SEG122 [58] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintab2#0 [phi:sin8s_gen::@2->sin8s_gen::@1#1] -- pbsz1=pbsc1 
     lda #<main.sintab2
     sta sintab
     lda #>main.sintab2
     sta sintab+1
-  //SEG123 [58] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- vwuz1=vbuc1 
+  //SEG123 [58] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#2] -- vwuz1=vbuc1 
     lda #0
     sta x
     lda #0
     sta x+1
     jmp b1
   // u[4.12]
-  //SEG124 [58] phi from sin8s_gen::@4 to sin8s_gen::@1 [phi:sin8s_gen::@4->sin8s_gen::@1]
-  b1_from_b4:
-  //SEG125 [58] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@4->sin8s_gen::@1#0] -- register_copy 
-  //SEG126 [58] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@4->sin8s_gen::@1#1] -- register_copy 
-  //SEG127 [58] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@4->sin8s_gen::@1#2] -- register_copy 
+  //SEG124 [58] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
+  b1_from_b3:
+  //SEG125 [58] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- register_copy 
+  //SEG126 [58] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- register_copy 
+  //SEG127 [58] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- register_copy 
     jmp b1
   //SEG128 sin8s_gen::@1
   b1:
@@ -3947,9 +3964,9 @@ sin8s_gen: {
   //SEG130 [60] call sin8s 
     jsr sin8s
   //SEG131 [61] (signed byte) sin8s::return#0 ← (signed byte) sin8s::return#1
-    jmp b4
-  //SEG132 sin8s_gen::@4
-  b4:
+    jmp b3
+  //SEG132 sin8s_gen::@3
+  b3:
   //SEG133 [62] (signed byte~) sin8s_gen::$1 ← (signed byte) sin8s::return#0
   //SEG134 [63] *((signed byte*) sin8s_gen::sintab#2) ← (signed byte~) sin8s_gen::$1 -- _deref_pbsz1=vbsaa 
     ldy #0
@@ -3975,11 +3992,11 @@ sin8s_gen: {
   //SEG138 [67] if((word) sin8s_gen::i#1<(const word) main::wavelength#0) goto sin8s_gen::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG139 sin8s_gen::@return
@@ -4088,45 +4105,45 @@ sin8s: {
   //SEG166 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#0 [phi:sin8s::@2->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG167 [80] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-    jmp b10
-  //SEG168 sin8s::@10
-  b10:
+    jmp b9
+  //SEG168 sin8s::@9
+  b9:
   //SEG169 [81] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   //SEG170 [82] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0 -- vbuxx=vbuaa 
     tax
   //SEG171 [83] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG172 [84] call mulu8_sel 
-  //SEG173 [112] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
-  mulu8_sel_from_b10:
-  //SEG174 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG173 [112] phi from sin8s::@9 to mulu8_sel [phi:sin8s::@9->mulu8_sel]
+  mulu8_sel_from_b9:
+  //SEG174 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@9->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG175 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@10->mulu8_sel#1] -- register_copy 
-  //SEG176 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
+  //SEG175 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@9->mulu8_sel#1] -- register_copy 
+  //SEG176 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@9->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG177 [85] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-    jmp b11
-  //SEG178 sin8s::@11
-  b11:
+    jmp b10
+  //SEG178 sin8s::@10
+  b10:
   //SEG179 [86] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1 -- vbuz1=vbuaa 
     sta x3
   //SEG180 [87] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0 -- vbuxx=vbuz1 
     ldx x3
   //SEG181 [88] call mulu8_sel 
-  //SEG182 [112] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
-  mulu8_sel_from_b11:
-  //SEG183 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG182 [112] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
+  mulu8_sel_from_b10:
+  //SEG183 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG184 [112] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@11->mulu8_sel#1] -- vbuyy=vbuc1 
+  //SEG184 [112] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@10->mulu8_sel#1] -- vbuyy=vbuc1 
     ldy #DIV_6
-  //SEG185 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
+  //SEG185 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG186 [89] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-    jmp b12
-  //SEG187 sin8s::@12
-  b12:
+    jmp b11
+  //SEG187 sin8s::@11
+  b11:
   //SEG188 [90] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   //SEG189 [91] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0 -- vbuz1=vbuz2_minus_vbuaa 
     eor #$ff
@@ -4138,36 +4155,36 @@ sin8s: {
   //SEG191 [93] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG192 [94] call mulu8_sel 
-  //SEG193 [112] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
-  mulu8_sel_from_b12:
-  //SEG194 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG193 [112] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
+  mulu8_sel_from_b11:
+  //SEG194 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG195 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
-  //SEG196 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
+  //SEG195 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@11->mulu8_sel#1] -- register_copy 
+  //SEG196 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG197 [95] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-    jmp b13
-  //SEG198 sin8s::@13
-  b13:
+    jmp b12
+  //SEG198 sin8s::@12
+  b12:
   //SEG199 [96] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   //SEG200 [97] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0 -- vbuxx=vbuaa 
     tax
   //SEG201 [98] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG202 [99] call mulu8_sel 
-  //SEG203 [112] phi from sin8s::@13 to mulu8_sel [phi:sin8s::@13->mulu8_sel]
-  mulu8_sel_from_b13:
-  //SEG204 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@13->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG203 [112] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
+  mulu8_sel_from_b12:
+  //SEG204 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG205 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@13->mulu8_sel#1] -- register_copy 
-  //SEG206 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@13->mulu8_sel#2] -- register_copy 
+  //SEG205 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
+  //SEG206 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG207 [100] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-    jmp b14
-  //SEG208 sin8s::@14
-  b14:
+    jmp b13
+  //SEG208 sin8s::@13
+  b13:
   //SEG209 [101] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   //SEG210 [102] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuaa=vbuaa_ror_4 
     lsr
@@ -4180,23 +4197,23 @@ sin8s: {
     tax
   //SEG212 [104] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$80
-    bcc b3_from_b14
+    bcc b3_from_b13
     jmp b7
   //SEG213 sin8s::@7
   b7:
   //SEG214 [105] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG215 [106] phi from sin8s::@14 sin8s::@7 to sin8s::@3 [phi:sin8s::@14/sin8s::@7->sin8s::@3]
-  b3_from_b14:
+  //SEG215 [106] phi from sin8s::@13 sin8s::@7 to sin8s::@3 [phi:sin8s::@13/sin8s::@7->sin8s::@3]
+  b3_from_b13:
   b3_from_b7:
-  //SEG216 [106] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@14/sin8s::@7->sin8s::@3#0] -- register_copy 
+  //SEG216 [106] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@13/sin8s::@7->sin8s::@3#0] -- register_copy 
     jmp b3
   //SEG217 sin8s::@3
   b3:
-  //SEG218 [107] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG218 [107] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
     jmp b8
   //SEG219 sin8s::@8
   b8:
@@ -4205,10 +4222,10 @@ sin8s: {
     eor #$ff
     clc
     adc #1
-  //SEG221 [109] phi from sin8s::@18 sin8s::@8 to sin8s::@4 [phi:sin8s::@18/sin8s::@8->sin8s::@4]
-  b4_from_b18:
+  //SEG221 [109] phi from sin8s::@14 sin8s::@8 to sin8s::@4 [phi:sin8s::@14/sin8s::@8->sin8s::@4]
+  b4_from_b14:
   b4_from_b8:
-  //SEG222 [109] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@18/sin8s::@8->sin8s::@4#0] -- register_copy 
+  //SEG222 [109] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@14/sin8s::@8->sin8s::@4#0] -- register_copy 
     jmp b4
   //SEG223 sin8s::@4
   b4:
@@ -4217,11 +4234,11 @@ sin8s: {
   breturn:
   //SEG225 [110] return 
     rts
-  //SEG226 sin8s::@18
-  b18:
+  //SEG226 sin8s::@14
+  b14:
   //SEG227 [111] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4 -- vbsaa=vbsxx 
     txa
-    jmp b4_from_b18
+    jmp b4_from_b14
 }
 //SEG228 mulu8_sel
 // Calculate val*val for two unsigned byte values - the result is 8 selected bits of the 16-bit result.
@@ -4237,9 +4254,9 @@ mulu8_sel: {
   //SEG231 [115] call mul8u 
     jsr mul8u
   //SEG232 [116] (word) mul8u::return#2 ← (word) mul8u::res#2
-    jmp b2
-  //SEG233 mulu8_sel::@2
-  b2:
+    jmp b1
+  //SEG233 mulu8_sel::@1
+  b1:
   //SEG234 [117] (word~) mulu8_sel::$0 ← (word) mul8u::return#2
   //SEG235 [118] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5 -- vwuz1=vwuz1_rol_vbuz2 
     ldy select
@@ -4294,12 +4311,12 @@ mul8u: {
   //SEG250 [125] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG251 [126] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG251 [126] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG252 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG252 mul8u::@3
+  b3:
   //SEG253 [127] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -4308,13 +4325,13 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG254 [128] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG255 [128] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG256 mul8u::@8
-  b8:
+  //SEG254 [128] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG255 [128] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG256 mul8u::@4
+  b4:
   //SEG257 [129] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -4322,11 +4339,11 @@ mul8u: {
   //SEG258 [130] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG259 [122] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG260 [122] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG261 [122] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG262 [122] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG259 [122] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG260 [122] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG261 [122] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG262 [122] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG263 div16u
@@ -4341,9 +4358,9 @@ div16u: {
   divr16u_from_div16u:
     jsr divr16u
   //SEG266 [133] (word) divr16u::return#2 ← (word) divr16u::return#0
-    jmp b2
-  //SEG267 div16u::@2
-  b2:
+    jmp b1
+  //SEG267 div16u::@1
+  b1:
   //SEG268 [134] (word) div16u::return#0 ← (word) divr16u::return#2
     jmp breturn
   //SEG269 div16u::@return
@@ -4472,14 +4489,14 @@ divr16u: {
   print_hextab: .text "0123456789abcdef"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b40
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b3
 Removing instruction jmp b2
-Removing instruction jmp b7
-Removing instruction jmp b8
+Removing instruction jmp b5
+Removing instruction jmp b6
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -4487,37 +4504,37 @@ Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b3
-Removing instruction jmp b1
 Removing instruction jmp b4
 Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp breturn
 Removing instruction jmp b5
 Removing instruction jmp b1
 Removing instruction jmp b6
 Removing instruction jmp b2
+Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
 Removing instruction jmp b12
 Removing instruction jmp b13
-Removing instruction jmp b14
 Removing instruction jmp b7
 Removing instruction jmp b3
 Removing instruction jmp b8
 Removing instruction jmp b4
 Removing instruction jmp breturn
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -4541,56 +4558,56 @@ Replacing instruction lda #0 with TXA
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b2_from_b1 with b2
-Replacing label b1_from_b8 with b1
+Replacing label b1_from_b6 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_print_sbyte with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Replacing label b1_from_b4 with b1
-Replacing label b1_from_b4 with b1
+Replacing label b1_from_b3 with b1
+Replacing label b1_from_b3 with b1
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
-Replacing label b3_from_b14 with b3
-Replacing label b4_from_b18 with b4
-Replacing label b8_from_b2 with b8
+Replacing label b3_from_b13 with b3
+Replacing label b4_from_b14 with b4
+Replacing label b4_from_b2 with b4
 Replacing label b2_from_b1 with b2
 Replacing label b3_from_b2 with b3
 Replacing label b3_from_b2 with b3
 Replacing label b1_from_b3 with b1
-Removing instruction b40_from_bbegin:
-Removing instruction b40:
-Removing instruction main_from_b40:
-Removing instruction bend_from_b40:
-Removing instruction b5_from_main:
-Removing instruction print_cls_from_b5:
-Removing instruction b1_from_b8:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b4_from_main:
+Removing instruction print_cls_from_b4:
+Removing instruction b1_from_b6:
 Removing instruction b3_from_b1:
 Removing instruction print_str_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b3:
-Removing instruction b7_from_b2:
-Removing instruction print_str_from_b7:
+Removing instruction b5_from_b2:
+Removing instruction print_str_from_b5:
 Removing instruction b1_from_print_str:
 Removing instruction b1_from_b2:
 Removing instruction b3_from_print_sbyte:
 Removing instruction print_char_from_b3:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_print_sbyte:
 Removing instruction print_char_from_b1:
 Removing instruction b1_from_b1:
+Removing instruction b1_from_b2:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b4:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b6:
-Removing instruction b3_from_b14:
+Removing instruction b3_from_b13:
 Removing instruction b3_from_b7:
-Removing instruction b4_from_b18:
+Removing instruction b4_from_b14:
 Removing instruction b4_from_b8:
 Removing instruction breturn:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction breturn:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
@@ -4601,16 +4618,16 @@ Removing instruction breturn:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction sin8s_gen_from_main:
-Removing instruction b5:
-Removing instruction b1_from_b5:
+Removing instruction b4:
+Removing instruction b1_from_b4:
 Removing instruction b3:
-Removing instruction b7:
-Removing instruction b8:
+Removing instruction b5:
+Removing instruction b6:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b3:
 Removing instruction breturn:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction breturn:
 Removing instruction print_char_from_print_byte:
 Removing instruction b1:
@@ -4619,13 +4636,15 @@ Removing instruction breturn:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
 Removing instruction div16u_from_sin8s_gen:
+Removing instruction b2:
 Removing instruction b3:
-Removing instruction b4:
 Removing instruction breturn:
 Removing instruction b5:
 Removing instruction b1_from_b5:
 Removing instruction b6:
 Removing instruction mulu8_sel_from_b2:
+Removing instruction b9:
+Removing instruction mulu8_sel_from_b9:
 Removing instruction b10:
 Removing instruction mulu8_sel_from_b10:
 Removing instruction b11:
@@ -4633,18 +4652,16 @@ Removing instruction mulu8_sel_from_b11:
 Removing instruction b12:
 Removing instruction mulu8_sel_from_b12:
 Removing instruction b13:
-Removing instruction mulu8_sel_from_b13:
-Removing instruction b14:
 Removing instruction b7:
 Removing instruction b8:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction b1_from_mul8u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
+Removing instruction b3:
+Removing instruction b1_from_b4:
 Removing instruction divr16u_from_div16u:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction b1_from_divr16u:
 Removing instruction b4:
 Removing instruction b5:
@@ -4666,7 +4683,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @40
+(label) @1
 (label) @begin
 (label) @end
 (word) PI2_u4f12
@@ -4679,7 +4696,7 @@ FINAL SYMBOL TABLE
 (const word) PI_u4f12#0 PI_u4f12 = (word/signed word/dword/signed dword) $3244
 (dword) PI_u4f28
 (word()) div16u((word) div16u::dividend , (word) div16u::divisor)
-(label) div16u::@2
+(label) div16u::@1
 (label) div16u::@return
 (word) div16u::dividend
 (word) div16u::divisor
@@ -4721,9 +4738,9 @@ FINAL SYMBOL TABLE
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@7
-(label) main::@8
+(label) main::@6
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
@@ -4742,8 +4759,8 @@ FINAL SYMBOL TABLE
 (byte~) mul8u::$1 reg byte a 202.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 101.0
@@ -4764,7 +4781,7 @@ FINAL SYMBOL TABLE
 (byte()) mulu8_sel((byte) mulu8_sel::v1 , (byte) mulu8_sel::v2 , (byte) mulu8_sel::select)
 (word~) mulu8_sel::$0 $0 zp ZP_WORD:9 4.0
 (word~) mulu8_sel::$1 $1 zp ZP_WORD:9 4.0
-(label) mulu8_sel::@2
+(label) mulu8_sel::@1
 (label) mulu8_sel::@return
 (byte) mulu8_sel::return
 (byte) mulu8_sel::return#0 reg byte a 4.0
@@ -4822,7 +4839,7 @@ FINAL SYMBOL TABLE
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 b zp ZP_BYTE:4 4.0
@@ -4850,7 +4867,6 @@ FINAL SYMBOL TABLE
 (label) sin8s::@12
 (label) sin8s::@13
 (label) sin8s::@14
-(label) sin8s::@18
 (label) sin8s::@2
 (label) sin8s::@3
 (label) sin8s::@4
@@ -4858,6 +4874,7 @@ FINAL SYMBOL TABLE
 (label) sin8s::@6
 (label) sin8s::@7
 (label) sin8s::@8
+(label) sin8s::@9
 (label) sin8s::@return
 (byte) sin8s::DIV_6
 (const byte) sin8s::DIV_6#0 DIV_6 = (byte/signed byte/word/signed word/dword/signed dword) $2b
@@ -4897,8 +4914,8 @@ FINAL SYMBOL TABLE
 (void()) sin8s_gen((signed byte*) sin8s_gen::sintab , (word) sin8s_gen::wavelength)
 (signed byte~) sin8s_gen::$1 reg byte a 22.0
 (label) sin8s_gen::@1
+(label) sin8s_gen::@2
 (label) sin8s_gen::@3
-(label) sin8s_gen::@4
 (label) sin8s_gen::@return
 (word) sin8s_gen::i
 (word) sin8s_gen::i#1 i zp ZP_WORD:7 16.5
@@ -4972,11 +4989,11 @@ Score: 15001
   .label rem16u = 2
   .label print_char_cursor = 5
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-//SEG5 @40
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @40 to main [phi:@40->main]
-//SEG8 [3] phi from @40 to @end [phi:@40->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -4985,22 +5002,22 @@ main: {
   //SEG11 [5] call sin8s_gen 
   //SEG12 [54] phi from main to sin8s_gen [phi:main->sin8s_gen]
     jsr sin8s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  //SEG14 main::@5
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  //SEG14 main::@4
   //SEG15 [7] call print_cls 
-  //SEG16 [48] phi from main::@5 to print_cls [phi:main::@5->print_cls]
+  //SEG16 [48] phi from main::@4 to print_cls [phi:main::@4->print_cls]
     jsr print_cls
-  //SEG17 [8] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
-  //SEG18 [8] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#0] -- pbuz1=pbuc1 
+  //SEG17 [8] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
+  //SEG18 [8] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@4->main::@1#0] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG19 [8] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@1#1] -- vbuxx=vbuc1 
+  //SEG19 [8] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@4->main::@1#1] -- vbuxx=vbuc1 
     ldx #0
-  //SEG20 [8] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  //SEG21 [8] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG22 [8] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@1#1] -- register_copy 
+  //SEG20 [8] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  //SEG21 [8] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG22 [8] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#1] -- register_copy 
   //SEG23 main::@1
   b1:
   //SEG24 [9] (signed byte) main::sb#0 ← *((const signed byte[$c0]) main::sintab2#0 + (byte) main::i#2) - (signed byte)*((const byte[]) main::sintabref#0 + (byte) main::i#2) -- vbsz1=pbsc1_derefidx_vbuxx_minus_pbsc2_derefidx_vbuxx 
@@ -5028,18 +5045,18 @@ main: {
   //SEG35 [14] (signed byte) print_sbyte::b#1 ← (signed byte) main::sb#0
   //SEG36 [15] call print_sbyte 
     jsr print_sbyte
-  //SEG37 [16] phi from main::@2 to main::@7 [phi:main::@2->main::@7]
-  //SEG38 main::@7
+  //SEG37 [16] phi from main::@2 to main::@5 [phi:main::@2->main::@5]
+  //SEG38 main::@5
   //SEG39 [17] call print_str 
-  //SEG40 [21] phi from main::@7 to print_str [phi:main::@7->print_str]
-  //SEG41 [21] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@7->print_str#0] -- register_copy 
-  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG40 [21] phi from main::@5 to print_str [phi:main::@5->print_str]
+  //SEG41 [21] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@5->print_str#0] -- register_copy 
+  //SEG42 [21] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@5->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG43 main::@8
+  //SEG43 main::@6
   //SEG44 [18] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
   //SEG45 [19] if((byte) main::i#1!=(byte/word/signed word/dword/signed dword) $c0) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
@@ -5106,8 +5123,8 @@ print_sbyte: {
   //SEG67 [37] phi (byte) print_char::ch#4 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG68 [31] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
-  //SEG69 [31] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  //SEG68 [31] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
+  //SEG69 [31] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
   //SEG70 print_sbyte::@2
   b2:
   //SEG71 [32] call print_byte 
@@ -5124,7 +5141,7 @@ print_sbyte: {
   //SEG79 [37] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG80 print_sbyte::@5
+  //SEG80 print_sbyte::@4
   //SEG81 [36] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
@@ -5230,27 +5247,27 @@ sin8s_gen: {
   //SEG116 [131] phi from sin8s_gen to div16u [phi:sin8s_gen->div16u]
     jsr div16u
   //SEG117 [56] (word) div16u::return#2 ← (word) div16u::return#0
-  //SEG118 sin8s_gen::@3
+  //SEG118 sin8s_gen::@2
   //SEG119 [57] (word) sin8s_gen::step#0 ← (word) div16u::return#2
-  //SEG120 [58] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
-  //SEG121 [58] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG120 [58] phi from sin8s_gen::@2 to sin8s_gen::@1 [phi:sin8s_gen::@2->sin8s_gen::@1]
+  //SEG121 [58] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG122 [58] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintab2#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- pbsz1=pbsc1 
+  //SEG122 [58] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintab2#0 [phi:sin8s_gen::@2->sin8s_gen::@1#1] -- pbsz1=pbsc1 
     lda #<main.sintab2
     sta sintab
     lda #>main.sintab2
     sta sintab+1
-  //SEG123 [58] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- vwuz1=vbuc1 
+  //SEG123 [58] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#2] -- vwuz1=vbuc1 
     lda #0
     sta x
     sta x+1
   // u[4.12]
-  //SEG124 [58] phi from sin8s_gen::@4 to sin8s_gen::@1 [phi:sin8s_gen::@4->sin8s_gen::@1]
-  //SEG125 [58] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@4->sin8s_gen::@1#0] -- register_copy 
-  //SEG126 [58] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@4->sin8s_gen::@1#1] -- register_copy 
-  //SEG127 [58] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@4->sin8s_gen::@1#2] -- register_copy 
+  //SEG124 [58] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
+  //SEG125 [58] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- register_copy 
+  //SEG126 [58] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- register_copy 
+  //SEG127 [58] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- register_copy 
   //SEG128 sin8s_gen::@1
   b1:
   //SEG129 [59] (word) sin8s::x#0 ← (word) sin8s_gen::x#2 -- vwuz1=vwuz2 
@@ -5261,7 +5278,7 @@ sin8s_gen: {
   //SEG130 [60] call sin8s 
     jsr sin8s
   //SEG131 [61] (signed byte) sin8s::return#0 ← (signed byte) sin8s::return#1
-  //SEG132 sin8s_gen::@4
+  //SEG132 sin8s_gen::@3
   //SEG133 [62] (signed byte~) sin8s_gen::$1 ← (signed byte) sin8s::return#0
   //SEG134 [63] *((signed byte*) sin8s_gen::sintab#2) ← (signed byte~) sin8s_gen::$1 -- _deref_pbsz1=vbsaa 
     ldy #0
@@ -5388,37 +5405,37 @@ sin8s: {
   //SEG166 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#0 [phi:sin8s::@2->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG167 [80] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-  //SEG168 sin8s::@10
+  //SEG168 sin8s::@9
   //SEG169 [81] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   //SEG170 [82] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0 -- vbuxx=vbuaa 
     tax
   //SEG171 [83] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG172 [84] call mulu8_sel 
-  //SEG173 [112] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
-  //SEG174 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG173 [112] phi from sin8s::@9 to mulu8_sel [phi:sin8s::@9->mulu8_sel]
+  //SEG174 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@9->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG175 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@10->mulu8_sel#1] -- register_copy 
-  //SEG176 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
+  //SEG175 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@9->mulu8_sel#1] -- register_copy 
+  //SEG176 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@9->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG177 [85] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-  //SEG178 sin8s::@11
+  //SEG178 sin8s::@10
   //SEG179 [86] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1 -- vbuz1=vbuaa 
     sta x3
   //SEG180 [87] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0 -- vbuxx=vbuz1 
     tax
   //SEG181 [88] call mulu8_sel 
-  //SEG182 [112] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
-  //SEG183 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG182 [112] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
+  //SEG183 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG184 [112] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@11->mulu8_sel#1] -- vbuyy=vbuc1 
+  //SEG184 [112] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@10->mulu8_sel#1] -- vbuyy=vbuc1 
     ldy #DIV_6
-  //SEG185 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
+  //SEG185 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG186 [89] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-  //SEG187 sin8s::@12
+  //SEG187 sin8s::@11
   //SEG188 [90] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   //SEG189 [91] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0 -- vbuz1=vbuz2_minus_vbuaa 
     eor #$ff
@@ -5430,30 +5447,30 @@ sin8s: {
   //SEG191 [93] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG192 [94] call mulu8_sel 
-  //SEG193 [112] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
-  //SEG194 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG193 [112] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
+  //SEG194 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG195 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
-  //SEG196 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
+  //SEG195 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@11->mulu8_sel#1] -- register_copy 
+  //SEG196 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG197 [95] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-  //SEG198 sin8s::@13
+  //SEG198 sin8s::@12
   //SEG199 [96] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   //SEG200 [97] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0 -- vbuxx=vbuaa 
     tax
   //SEG201 [98] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG202 [99] call mulu8_sel 
-  //SEG203 [112] phi from sin8s::@13 to mulu8_sel [phi:sin8s::@13->mulu8_sel]
-  //SEG204 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@13->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG203 [112] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
+  //SEG204 [112] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG205 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@13->mulu8_sel#1] -- register_copy 
-  //SEG206 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@13->mulu8_sel#2] -- register_copy 
+  //SEG205 [112] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
+  //SEG206 [112] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG207 [100] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-  //SEG208 sin8s::@14
+  //SEG208 sin8s::@13
   //SEG209 [101] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   //SEG210 [102] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuaa=vbuaa_ror_4 
     lsr
@@ -5470,29 +5487,29 @@ sin8s: {
   //SEG213 sin8s::@7
   //SEG214 [105] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG215 [106] phi from sin8s::@14 sin8s::@7 to sin8s::@3 [phi:sin8s::@14/sin8s::@7->sin8s::@3]
-  //SEG216 [106] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@14/sin8s::@7->sin8s::@3#0] -- register_copy 
+  //SEG215 [106] phi from sin8s::@13 sin8s::@7 to sin8s::@3 [phi:sin8s::@13/sin8s::@7->sin8s::@3]
+  //SEG216 [106] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@13/sin8s::@7->sin8s::@3#0] -- register_copy 
   //SEG217 sin8s::@3
   b3:
-  //SEG218 [107] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG218 [107] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
   //SEG219 sin8s::@8
   //SEG220 [108] (signed byte) sin8s::sinx#1 ← - (signed byte)(byte) sin8s::usinx#4 -- vbsaa=_neg_vbsxx 
     txa
     eor #$ff
     clc
     adc #1
-  //SEG221 [109] phi from sin8s::@18 sin8s::@8 to sin8s::@4 [phi:sin8s::@18/sin8s::@8->sin8s::@4]
-  //SEG222 [109] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@18/sin8s::@8->sin8s::@4#0] -- register_copy 
+  //SEG221 [109] phi from sin8s::@14 sin8s::@8 to sin8s::@4 [phi:sin8s::@14/sin8s::@8->sin8s::@4]
+  //SEG222 [109] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@14/sin8s::@8->sin8s::@4#0] -- register_copy 
   //SEG223 sin8s::@4
   b4:
   //SEG224 sin8s::@return
   //SEG225 [110] return 
     rts
-  //SEG226 sin8s::@18
-  b18:
+  //SEG226 sin8s::@14
+  b14:
   //SEG227 [111] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4 -- vbsaa=vbsxx 
     txa
     jmp b4
@@ -5511,7 +5528,7 @@ mulu8_sel: {
   //SEG231 [115] call mul8u 
     jsr mul8u
   //SEG232 [116] (word) mul8u::return#2 ← (word) mul8u::res#2
-  //SEG233 mulu8_sel::@2
+  //SEG233 mulu8_sel::@1
   //SEG234 [117] (word~) mulu8_sel::$0 ← (word) mul8u::return#2
   //SEG235 [118] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5 -- vwuz1=vwuz1_rol_vbuz2 
     ldy select
@@ -5558,10 +5575,10 @@ mul8u: {
   //SEG250 [125] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG251 [126] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG251 [126] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG252 mul8u::@6
+    beq b4
+  //SEG252 mul8u::@3
   //SEG253 [127] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -5570,10 +5587,10 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG254 [128] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  //SEG255 [128] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-  //SEG256 mul8u::@8
-  b8:
+  //SEG254 [128] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  //SEG255 [128] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+  //SEG256 mul8u::@4
+  b4:
   //SEG257 [129] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -5581,10 +5598,10 @@ mul8u: {
   //SEG258 [130] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG259 [122] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  //SEG260 [122] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG261 [122] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG262 [122] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG259 [122] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  //SEG260 [122] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG261 [122] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG262 [122] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG263 div16u
@@ -5598,7 +5615,7 @@ div16u: {
   //SEG265 [136] phi from div16u to divr16u [phi:div16u->divr16u]
     jsr divr16u
   //SEG266 [133] (word) divr16u::return#2 ← (word) divr16u::return#0
-  //SEG267 div16u::@2
+  //SEG267 div16u::@1
   //SEG268 [134] (word) div16u::return#0 ← (word) divr16u::return#2
   //SEG269 div16u::@return
   //SEG270 [135] return 
diff --git a/src/test/ref/sinusgen8.sym b/src/test/ref/sinusgen8.sym
index c51a12ad2..2317ca165 100644
--- a/src/test/ref/sinusgen8.sym
+++ b/src/test/ref/sinusgen8.sym
@@ -1,4 +1,4 @@
-(label) @40
+(label) @1
 (label) @begin
 (label) @end
 (word) PI2_u4f12
@@ -11,7 +11,7 @@
 (const word) PI_u4f12#0 PI_u4f12 = (word/signed word/dword/signed dword) $3244
 (dword) PI_u4f28
 (word()) div16u((word) div16u::dividend , (word) div16u::divisor)
-(label) div16u::@2
+(label) div16u::@1
 (label) div16u::@return
 (word) div16u::dividend
 (word) div16u::divisor
@@ -53,9 +53,9 @@
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@7
-(label) main::@8
+(label) main::@6
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
@@ -74,8 +74,8 @@
 (byte~) mul8u::$1 reg byte a 202.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 101.0
@@ -96,7 +96,7 @@
 (byte()) mulu8_sel((byte) mulu8_sel::v1 , (byte) mulu8_sel::v2 , (byte) mulu8_sel::select)
 (word~) mulu8_sel::$0 $0 zp ZP_WORD:9 4.0
 (word~) mulu8_sel::$1 $1 zp ZP_WORD:9 4.0
-(label) mulu8_sel::@2
+(label) mulu8_sel::@1
 (label) mulu8_sel::@return
 (byte) mulu8_sel::return
 (byte) mulu8_sel::return#0 reg byte a 4.0
@@ -154,7 +154,7 @@
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 b zp ZP_BYTE:4 4.0
@@ -182,7 +182,6 @@
 (label) sin8s::@12
 (label) sin8s::@13
 (label) sin8s::@14
-(label) sin8s::@18
 (label) sin8s::@2
 (label) sin8s::@3
 (label) sin8s::@4
@@ -190,6 +189,7 @@
 (label) sin8s::@6
 (label) sin8s::@7
 (label) sin8s::@8
+(label) sin8s::@9
 (label) sin8s::@return
 (byte) sin8s::DIV_6
 (const byte) sin8s::DIV_6#0 DIV_6 = (byte/signed byte/word/signed word/dword/signed dword) $2b
@@ -229,8 +229,8 @@
 (void()) sin8s_gen((signed byte*) sin8s_gen::sintab , (word) sin8s_gen::wavelength)
 (signed byte~) sin8s_gen::$1 reg byte a 22.0
 (label) sin8s_gen::@1
+(label) sin8s_gen::@2
 (label) sin8s_gen::@3
-(label) sin8s_gen::@4
 (label) sin8s_gen::@return
 (word) sin8s_gen::i
 (word) sin8s_gen::i#1 i zp ZP_WORD:7 16.5
diff --git a/src/test/ref/sinusgen8b.asm b/src/test/ref/sinusgen8b.asm
index b1f895c41..16c3600b9 100644
--- a/src/test/ref/sinusgen8b.asm
+++ b/src/test/ref/sinusgen8b.asm
@@ -488,7 +488,7 @@ mul16u: {
     lda a
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -502,7 +502,7 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  b8:
+  b4:
     clc
     ror a+1
     ror a
@@ -755,14 +755,14 @@ sin8s: {
   b3:
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
     txa
     eor #$ff
     clc
     adc #1
   b4:
     rts
-  b18:
+  b14:
     txa
     jmp b4
 }
@@ -805,7 +805,7 @@ mul8u: {
     txa
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -813,7 +813,7 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  b8:
+  b4:
     txa
     lsr
     tax
diff --git a/src/test/ref/sinusgen8b.cfg b/src/test/ref/sinusgen8b.cfg
index 81189f917..9eb030271 100644
--- a/src/test/ref/sinusgen8b.cfg
+++ b/src/test/ref/sinusgen8b.cfg
@@ -1,27 +1,27 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@40
-@40: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @40
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @40
+main: scope:[main]  from @1
   [4] phi()
   [5] call sin8s_gen 
-  to:main::@5
-main::@5: scope:[main]  from main
+  to:main::@4
+main::@4: scope:[main]  from main
   [6] phi()
   [7] call sin16s_gen 
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [8] phi()
   [9] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main::@6 main::@9
-  [10] (byte*) print_char_cursor#45 ← phi( main::@6/(const byte*) print_line_cursor#0 main::@9/(byte*) print_char_cursor#2 )
-  [10] (byte) main::i#2 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@9/(byte) main::i#1 )
+main::@1: scope:[main]  from main::@5 main::@7
+  [10] (byte*) print_char_cursor#45 ← phi( main::@5/(const byte*) print_line_cursor#0 main::@7/(byte*) print_char_cursor#2 )
+  [10] (byte) main::i#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
   [11] (signed byte) main::sb#0 ← *((const signed byte[$c0]) main::sintabb#0 + (byte) main::i#2)
   [12] (word~) main::$3 ← ((word)) (byte) main::i#2
   [13] (word~) main::$4 ← (word~) main::$3 << (byte/signed byte/word/signed word/dword/signed dword) 1
@@ -39,21 +39,21 @@ main::@2: scope:[main]  from main::@1 main::@3
   [21] (byte*) print_char_cursor#44 ← phi( main::@1/(byte*) print_char_cursor#45 main::@3/(byte*) print_char_cursor#2 )
   [22] (signed byte) print_sbyte::b#1 ← (signed byte) main::sd#0
   [23] call print_sbyte 
-  to:main::@8
-main::@8: scope:[main]  from main::@2
+  to:main::@6
+main::@6: scope:[main]  from main::@2
   [24] phi()
   [25] call print_str 
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [26] (byte) main::i#1 ← ++ (byte) main::i#2
   [27] if((byte) main::i#1!=(byte/word/signed word/dword/signed dword) $c0) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@9
+main::@return: scope:[main]  from main::@7
   [28] return 
   to:@return
-print_str: scope:[print_str]  from main::@3 main::@8
-  [29] (byte*) print_char_cursor#47 ← phi( main::@3/(byte*) print_char_cursor#45 main::@8/(byte*) print_char_cursor#10 )
-  [29] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@8/(const string) main::str )
+print_str: scope:[print_str]  from main::@3 main::@6
+  [29] (byte*) print_char_cursor#47 ← phi( main::@3/(byte*) print_char_cursor#45 main::@6/(byte*) print_char_cursor#10 )
+  [29] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@6/(const string) main::str )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [30] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#47 print_str::@2/(byte*) print_char_cursor#1 )
@@ -75,8 +75,8 @@ print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [37] phi()
   [38] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [39] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [39] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
   [40] call print_byte 
   to:print_sbyte::@return
 print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
@@ -85,8 +85,8 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [42] phi()
   [43] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [44] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1
   to:print_sbyte::@2
 print_char: scope:[print_char]  from print_byte print_byte::@1 print_sbyte::@1 print_sbyte::@3
@@ -111,7 +111,7 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [55] return 
   to:@return
-print_cls: scope:[print_cls]  from main::@6
+print_cls: scope:[print_cls]  from main::@5
   [56] phi()
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -123,23 +123,23 @@ print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
 print_cls::@return: scope:[print_cls]  from print_cls::@1
   [61] return 
   to:@return
-sin16s_gen: scope:[sin16s_gen]  from main::@5
+sin16s_gen: scope:[sin16s_gen]  from main::@4
   [62] phi()
   [63] call div32u16u 
   [64] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  to:sin16s_gen::@3
-sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen
+  to:sin16s_gen::@2
+sin16s_gen::@2: scope:[sin16s_gen]  from sin16s_gen
   [65] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
   to:sin16s_gen::@1
-sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@3 sin16s_gen::@4
-  [66] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(word) sin16s_gen::i#1 )
-  [66] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@3/(const signed word[$c0]) main::sintabw#0 sin16s_gen::@4/(signed word*) sin16s_gen::sintab#0 )
-  [66] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(dword) sin16s_gen::x#1 )
+sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@2 sin16s_gen::@3
+  [66] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(word) sin16s_gen::i#1 )
+  [66] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@2/(const signed word[$c0]) main::sintabw#0 sin16s_gen::@3/(signed word*) sin16s_gen::sintab#0 )
+  [66] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(dword) sin16s_gen::x#1 )
   [67] (dword) sin16s::x#0 ← (dword) sin16s_gen::x#2
   [68] call sin16s 
   [69] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  to:sin16s_gen::@4
-sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
+  to:sin16s_gen::@3
+sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen::@1
   [70] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   [71] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1
   [72] (signed word*) sin16s_gen::sintab#0 ← (signed word*) sin16s_gen::sintab#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
@@ -147,7 +147,7 @@ sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
   [74] (word) sin16s_gen::i#1 ← ++ (word) sin16s_gen::i#2
   [75] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1
   to:sin16s_gen::@return
-sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@4
+sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@3
   [76] return 
   to:@return
 sin16s: scope:[sin16s]  from sin16s_gen::@1
@@ -172,77 +172,77 @@ sin16s::@2: scope:[sin16s]  from sin16s::@1 sin16s::@5
   [86] (word) mulu16_sel::v2#0 ← (word) sin16s::x1#0
   [87] call mulu16_sel 
   [88] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  to:sin16s::@8
-sin16s::@8: scope:[sin16s]  from sin16s::@2
+  to:sin16s::@7
+sin16s::@7: scope:[sin16s]  from sin16s::@2
   [89] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   [90] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   [91] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0
   [92] call mulu16_sel 
   [93] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12
-  to:sin16s::@9
-sin16s::@9: scope:[sin16s]  from sin16s::@8
+  to:sin16s::@8
+sin16s::@8: scope:[sin16s]  from sin16s::@7
   [94] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   [95] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   [96] call mulu16_sel 
   [97] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  to:sin16s::@10
-sin16s::@10: scope:[sin16s]  from sin16s::@9
+  to:sin16s::@9
+sin16s::@9: scope:[sin16s]  from sin16s::@8
   [98] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   [99] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0
   [100] (word) mulu16_sel::v1#3 ← (word) sin16s::x3#0
   [101] (word) mulu16_sel::v2#3 ← (word) sin16s::x1#0
   [102] call mulu16_sel 
   [103] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12
-  to:sin16s::@11
-sin16s::@11: scope:[sin16s]  from sin16s::@10
+  to:sin16s::@10
+sin16s::@10: scope:[sin16s]  from sin16s::@9
   [104] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   [105] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   [106] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0
   [107] call mulu16_sel 
   [108] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  to:sin16s::@12
-sin16s::@12: scope:[sin16s]  from sin16s::@11
+  to:sin16s::@11
+sin16s::@11: scope:[sin16s]  from sin16s::@10
   [109] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   [110] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [111] (word) sin16s::usinx#1 ← (word) sin16s::usinx#0 + (word) sin16s::x5_128#0
-  [112] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15
+  [112] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12
   to:sin16s::@6
-sin16s::@6: scope:[sin16s]  from sin16s::@12
+sin16s::@6: scope:[sin16s]  from sin16s::@11
   [113] (signed word) sin16s::sinx#1 ← - (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-sin16s::@3: scope:[sin16s]  from sin16s::@15 sin16s::@6
-  [114] (signed word) sin16s::return#1 ← phi( sin16s::@15/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
+sin16s::@3: scope:[sin16s]  from sin16s::@12 sin16s::@6
+  [114] (signed word) sin16s::return#1 ← phi( sin16s::@12/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
   to:sin16s::@return
 sin16s::@return: scope:[sin16s]  from sin16s::@3
   [115] return 
   to:@return
-sin16s::@15: scope:[sin16s]  from sin16s::@12
+sin16s::@12: scope:[sin16s]  from sin16s::@11
   [116] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@11 sin16s::@2 sin16s::@8 sin16s::@9
-  [117] (byte) mulu16_sel::select#5 ← phi( sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [117] (word) mulu16_sel::v2#5 ← phi( sin16s::@10/(word) mulu16_sel::v2#3 sin16s::@11/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@8/(word) mulu16_sel::v2#1 sin16s::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
-  [117] (word) mulu16_sel::v1#5 ← phi( sin16s::@10/(word) mulu16_sel::v1#3 sin16s::@11/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@8/(word) mulu16_sel::v1#1 sin16s::@9/(word) mulu16_sel::v1#2 )
+mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@2 sin16s::@7 sin16s::@8 sin16s::@9
+  [117] (byte) mulu16_sel::select#5 ← phi( sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [117] (word) mulu16_sel::v2#5 ← phi( sin16s::@9/(word) mulu16_sel::v2#3 sin16s::@10/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@7/(word) mulu16_sel::v2#1 sin16s::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
+  [117] (word) mulu16_sel::v1#5 ← phi( sin16s::@9/(word) mulu16_sel::v1#3 sin16s::@10/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@7/(word) mulu16_sel::v1#1 sin16s::@8/(word) mulu16_sel::v1#2 )
   [118] (word) mul16u::a#1 ← (word) mulu16_sel::v1#5
   [119] (word) mul16u::b#0 ← (word) mulu16_sel::v2#5
   [120] call mul16u 
   [121] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mulu16_sel::@2
-mulu16_sel::@2: scope:[mulu16_sel]  from mulu16_sel
+  to:mulu16_sel::@1
+mulu16_sel::@1: scope:[mulu16_sel]  from mulu16_sel
   [122] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   [123] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5
   [124] (word) mulu16_sel::return#12 ← > (dword~) mulu16_sel::$1
   to:mulu16_sel::@return
-mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@2
+mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@1
   [125] return 
   to:@return
 mul16u: scope:[mul16u]  from mulu16_sel
   [126] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#0
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [127] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [127] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [127] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [127] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [127] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [127] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@4/(word) mul16u::a#0 )
   [128] if((word) mul16u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -250,13 +250,13 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [130] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [131] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [131] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [132] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [133] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [133] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [134] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [135] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
@@ -264,23 +264,23 @@ div32u16u: scope:[div32u16u]  from sin16s_gen
   [136] phi()
   [137] call divr16u 
   [138] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:div32u16u::@2
-div32u16u::@2: scope:[div32u16u]  from div32u16u
+  to:div32u16u::@1
+div32u16u::@1: scope:[div32u16u]  from div32u16u
   [139] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#3
   [140] (word) divr16u::rem#5 ← (word) rem16u#1
   [141] call divr16u 
   [142] (word) divr16u::return#4 ← (word) divr16u::return#0
-  to:div32u16u::@3
-div32u16u::@3: scope:[div32u16u]  from div32u16u::@2
+  to:div32u16u::@2
+div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   [143] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#4
   [144] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0
   to:div32u16u::@return
-div32u16u::@return: scope:[div32u16u]  from div32u16u::@3
+div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
   [145] return 
   to:@return
-divr16u: scope:[divr16u]  from div16u div32u16u div32u16u::@2
-  [146] (word) divr16u::dividend#6 ← phi( div16u/(const word) PI2_u4f12#0 div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@2/<(const dword) PI2_u4f28#0 )
-  [146] (word) divr16u::rem#11 ← phi( div16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@2/(word) divr16u::rem#5 )
+divr16u: scope:[divr16u]  from div16u div32u16u div32u16u::@1
+  [146] (word) divr16u::dividend#6 ← phi( div16u/(const word) PI2_u4f12#0 div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@1/<(const dword) PI2_u4f28#0 )
+  [146] (word) divr16u::rem#11 ← phi( div16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@1/(word) divr16u::rem#5 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [147] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
@@ -321,19 +321,19 @@ sin8s_gen: scope:[sin8s_gen]  from main
   [164] phi()
   [165] call div16u 
   [166] (word) div16u::return#2 ← (word) div16u::return#0
-  to:sin8s_gen::@3
-sin8s_gen::@3: scope:[sin8s_gen]  from sin8s_gen
+  to:sin8s_gen::@2
+sin8s_gen::@2: scope:[sin8s_gen]  from sin8s_gen
   [167] (word) sin8s_gen::step#0 ← (word) div16u::return#2
   to:sin8s_gen::@1
-sin8s_gen::@1: scope:[sin8s_gen]  from sin8s_gen::@3 sin8s_gen::@4
-  [168] (word) sin8s_gen::i#2 ← phi( sin8s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@4/(word) sin8s_gen::i#1 )
-  [168] (signed byte*) sin8s_gen::sintab#2 ← phi( sin8s_gen::@3/(const signed byte[$c0]) main::sintabb#0 sin8s_gen::@4/(signed byte*) sin8s_gen::sintab#0 )
-  [168] (word) sin8s_gen::x#2 ← phi( sin8s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@4/(word) sin8s_gen::x#1 )
+sin8s_gen::@1: scope:[sin8s_gen]  from sin8s_gen::@2 sin8s_gen::@3
+  [168] (word) sin8s_gen::i#2 ← phi( sin8s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@3/(word) sin8s_gen::i#1 )
+  [168] (signed byte*) sin8s_gen::sintab#2 ← phi( sin8s_gen::@2/(const signed byte[$c0]) main::sintabb#0 sin8s_gen::@3/(signed byte*) sin8s_gen::sintab#0 )
+  [168] (word) sin8s_gen::x#2 ← phi( sin8s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@3/(word) sin8s_gen::x#1 )
   [169] (word) sin8s::x#0 ← (word) sin8s_gen::x#2
   [170] call sin8s 
   [171] (signed byte) sin8s::return#0 ← (signed byte) sin8s::return#1
-  to:sin8s_gen::@4
-sin8s_gen::@4: scope:[sin8s_gen]  from sin8s_gen::@1
+  to:sin8s_gen::@3
+sin8s_gen::@3: scope:[sin8s_gen]  from sin8s_gen::@1
   [172] (signed byte~) sin8s_gen::$1 ← (signed byte) sin8s::return#0
   [173] *((signed byte*) sin8s_gen::sintab#2) ← (signed byte~) sin8s_gen::$1
   [174] (signed byte*) sin8s_gen::sintab#0 ← ++ (signed byte*) sin8s_gen::sintab#2
@@ -341,7 +341,7 @@ sin8s_gen::@4: scope:[sin8s_gen]  from sin8s_gen::@1
   [176] (word) sin8s_gen::i#1 ← ++ (word) sin8s_gen::i#2
   [177] if((word) sin8s_gen::i#1<(const word) main::wavelength#0) goto sin8s_gen::@1
   to:sin8s_gen::@return
-sin8s_gen::@return: scope:[sin8s_gen]  from sin8s_gen::@4
+sin8s_gen::@return: scope:[sin8s_gen]  from sin8s_gen::@3
   [178] return 
   to:@return
 sin8s: scope:[sin8s]  from sin8s_gen::@1
@@ -366,84 +366,84 @@ sin8s::@2: scope:[sin8s]  from sin8s::@1 sin8s::@6
   [188] (byte) mulu8_sel::v2#0 ← (byte) sin8s::x1#0
   [189] call mulu8_sel 
   [190] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-  to:sin8s::@10
-sin8s::@10: scope:[sin8s]  from sin8s::@2
+  to:sin8s::@9
+sin8s::@9: scope:[sin8s]  from sin8s::@2
   [191] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   [192] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0
   [193] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0
   [194] call mulu8_sel 
   [195] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-  to:sin8s::@11
-sin8s::@11: scope:[sin8s]  from sin8s::@10
+  to:sin8s::@10
+sin8s::@10: scope:[sin8s]  from sin8s::@9
   [196] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1
   [197] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0
   [198] call mulu8_sel 
   [199] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-  to:sin8s::@12
-sin8s::@12: scope:[sin8s]  from sin8s::@11
+  to:sin8s::@11
+sin8s::@11: scope:[sin8s]  from sin8s::@10
   [200] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   [201] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0
   [202] (byte) mulu8_sel::v1#3 ← (byte) sin8s::x3#0
   [203] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0
   [204] call mulu8_sel 
   [205] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-  to:sin8s::@13
-sin8s::@13: scope:[sin8s]  from sin8s::@12
+  to:sin8s::@12
+sin8s::@12: scope:[sin8s]  from sin8s::@11
   [206] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   [207] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0
   [208] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0
   [209] call mulu8_sel 
   [210] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-  to:sin8s::@14
-sin8s::@14: scope:[sin8s]  from sin8s::@13
+  to:sin8s::@13
+sin8s::@13: scope:[sin8s]  from sin8s::@12
   [211] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   [212] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [213] (byte) sin8s::usinx#1 ← (byte) sin8s::usinx#0 + (byte) sin8s::x5_128#0
   [214] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3
   to:sin8s::@7
-sin8s::@7: scope:[sin8s]  from sin8s::@14
+sin8s::@7: scope:[sin8s]  from sin8s::@13
   [215] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1
   to:sin8s::@3
-sin8s::@3: scope:[sin8s]  from sin8s::@14 sin8s::@7
-  [216] (byte) sin8s::usinx#4 ← phi( sin8s::@14/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
-  [217] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18
+sin8s::@3: scope:[sin8s]  from sin8s::@13 sin8s::@7
+  [216] (byte) sin8s::usinx#4 ← phi( sin8s::@13/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
+  [217] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14
   to:sin8s::@8
 sin8s::@8: scope:[sin8s]  from sin8s::@3
   [218] (signed byte) sin8s::sinx#1 ← - (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-sin8s::@4: scope:[sin8s]  from sin8s::@18 sin8s::@8
-  [219] (signed byte) sin8s::return#1 ← phi( sin8s::@18/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
+sin8s::@4: scope:[sin8s]  from sin8s::@14 sin8s::@8
+  [219] (signed byte) sin8s::return#1 ← phi( sin8s::@14/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
   to:sin8s::@return
 sin8s::@return: scope:[sin8s]  from sin8s::@4
   [220] return 
   to:@return
-sin8s::@18: scope:[sin8s]  from sin8s::@3
+sin8s::@14: scope:[sin8s]  from sin8s::@3
   [221] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@13 sin8s::@2
-  [222] (byte) mulu8_sel::select#5 ← phi( sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [222] (byte) mulu8_sel::v2#5 ← phi( sin8s::@10/(byte) mulu8_sel::v2#1 sin8s::@11/(const byte) sin8s::DIV_6#0 sin8s::@12/(byte) mulu8_sel::v2#3 sin8s::@13/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
-  [222] (byte) mulu8_sel::v1#5 ← phi( sin8s::@10/(byte) mulu8_sel::v1#1 sin8s::@11/(byte) mulu8_sel::v1#2 sin8s::@12/(byte) mulu8_sel::v1#3 sin8s::@13/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
+mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@2 sin8s::@9
+  [222] (byte) mulu8_sel::select#5 ← phi( sin8s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [222] (byte) mulu8_sel::v2#5 ← phi( sin8s::@9/(byte) mulu8_sel::v2#1 sin8s::@10/(const byte) sin8s::DIV_6#0 sin8s::@11/(byte) mulu8_sel::v2#3 sin8s::@12/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
+  [222] (byte) mulu8_sel::v1#5 ← phi( sin8s::@9/(byte) mulu8_sel::v1#1 sin8s::@10/(byte) mulu8_sel::v1#2 sin8s::@11/(byte) mulu8_sel::v1#3 sin8s::@12/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
   [223] (byte) mul8u::a#1 ← (byte) mulu8_sel::v1#5
   [224] (byte) mul8u::b#0 ← (byte) mulu8_sel::v2#5
   [225] call mul8u 
   [226] (word) mul8u::return#2 ← (word) mul8u::res#2
-  to:mulu8_sel::@2
-mulu8_sel::@2: scope:[mulu8_sel]  from mulu8_sel
+  to:mulu8_sel::@1
+mulu8_sel::@1: scope:[mulu8_sel]  from mulu8_sel
   [227] (word~) mulu8_sel::$0 ← (word) mul8u::return#2
   [228] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5
   [229] (byte) mulu8_sel::return#12 ← > (word~) mulu8_sel::$1
   to:mulu8_sel::@return
-mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@2
+mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@1
   [230] return 
   to:@return
 mul8u: scope:[mul8u]  from mulu8_sel
   [231] (word) mul8u::mb#0 ← ((word)) (byte) mul8u::b#0
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [232] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@8/(word) mul8u::mb#1 )
-  [232] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [232] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [232] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@4/(word) mul8u::mb#1 )
+  [232] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [232] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@4/(byte) mul8u::a#0 )
   [233] if((byte) mul8u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -451,13 +451,13 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [235] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [236] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [236] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [237] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [238] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [238] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [239] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [240] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
@@ -465,10 +465,10 @@ div16u: scope:[div16u]  from sin8s_gen
   [241] phi()
   [242] call divr16u 
   [243] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div16u::@2
-div16u::@2: scope:[div16u]  from div16u
+  to:div16u::@1
+div16u::@1: scope:[div16u]  from div16u
   [244] (word) div16u::return#0 ← (word) divr16u::return#2
   to:div16u::@return
-div16u::@return: scope:[div16u]  from div16u::@2
+div16u::@return: scope:[div16u]  from div16u::@1
   [245] return 
   to:@return
diff --git a/src/test/ref/sinusgen8b.log b/src/test/ref/sinusgen8b.log
index 5679c252d..045b23437 100644
--- a/src/test/ref/sinusgen8b.log
+++ b/src/test/ref/sinusgen8b.log
@@ -2397,14 +2397,45 @@ Culled Empty Block (label) sin8s::@17
 Culled Empty Block (label) sin8s::@16
 Culled Empty Block (label) sin8s::@15
 Culled Empty Block (label) mul8u::@10
+Renumbering block @40 to @1
+Renumbering block div16u::@2 to div16u::@1
+Renumbering block div32u16u::@2 to div32u16u::@1
+Renumbering block div32u16u::@3 to div32u16u::@2
+Renumbering block mul8u::@6 to mul8u::@3
+Renumbering block mul8u::@8 to mul8u::@4
+Renumbering block mul16u::@6 to mul16u::@3
+Renumbering block mul16u::@8 to mul16u::@4
+Renumbering block sin16s_gen::@3 to sin16s_gen::@2
+Renumbering block sin16s_gen::@4 to sin16s_gen::@3
+Renumbering block sin8s_gen::@3 to sin8s_gen::@2
+Renumbering block sin8s_gen::@4 to sin8s_gen::@3
+Renumbering block sin16s::@8 to sin16s::@7
+Renumbering block sin16s::@9 to sin16s::@8
+Renumbering block sin16s::@10 to sin16s::@9
+Renumbering block sin16s::@11 to sin16s::@10
+Renumbering block sin16s::@12 to sin16s::@11
+Renumbering block sin16s::@15 to sin16s::@12
+Renumbering block sin8s::@10 to sin8s::@9
+Renumbering block sin8s::@11 to sin8s::@10
+Renumbering block sin8s::@12 to sin8s::@11
+Renumbering block sin8s::@13 to sin8s::@12
+Renumbering block sin8s::@14 to sin8s::@13
+Renumbering block sin8s::@18 to sin8s::@14
+Renumbering block mulu16_sel::@2 to mulu16_sel::@1
+Renumbering block mulu8_sel::@2 to mulu8_sel::@1
+Renumbering block print_sbyte::@5 to print_sbyte::@4
+Renumbering block main::@5 to main::@4
+Renumbering block main::@6 to main::@5
+Renumbering block main::@8 to main::@6
+Renumbering block main::@9 to main::@7
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @40
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
+Adding NOP phi() at start of main::@4
 Adding NOP phi() at start of main::@5
-Adding NOP phi() at start of main::@6
 Adding NOP phi() at start of main::@3
-Adding NOP phi() at start of main::@8
+Adding NOP phi() at start of main::@6
 Adding NOP phi() at start of print_sbyte::@3
 Adding NOP phi() at start of print_sbyte::@1
 Adding NOP phi() at start of print_cls
@@ -2416,28 +2447,28 @@ Adding NOP phi() at start of div16u
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@40
-@40: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @40
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @40
+main: scope:[main]  from @1
   [4] phi()
   [5] call sin8s_gen 
-  to:main::@5
-main::@5: scope:[main]  from main
+  to:main::@4
+main::@4: scope:[main]  from main
   [6] phi()
   [7] call sin16s_gen 
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [8] phi()
   [9] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main::@6 main::@9
-  [10] (byte*) print_char_cursor#45 ← phi( main::@6/(const byte*) print_line_cursor#0 main::@9/(byte*) print_char_cursor#2 )
-  [10] (byte) main::i#2 ← phi( main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@9/(byte) main::i#1 )
+main::@1: scope:[main]  from main::@5 main::@7
+  [10] (byte*) print_char_cursor#45 ← phi( main::@5/(const byte*) print_line_cursor#0 main::@7/(byte*) print_char_cursor#2 )
+  [10] (byte) main::i#2 ← phi( main::@5/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
   [11] (signed byte) main::sb#0 ← *((const signed byte[$c0]) main::sintabb#0 + (byte) main::i#2)
   [12] (word~) main::$3 ← ((word)) (byte) main::i#2
   [13] (word~) main::$4 ← (word~) main::$3 << (byte/signed byte/word/signed word/dword/signed dword) 1
@@ -2455,21 +2486,21 @@ main::@2: scope:[main]  from main::@1 main::@3
   [21] (byte*) print_char_cursor#44 ← phi( main::@1/(byte*) print_char_cursor#45 main::@3/(byte*) print_char_cursor#2 )
   [22] (signed byte) print_sbyte::b#1 ← (signed byte) main::sd#0
   [23] call print_sbyte 
-  to:main::@8
-main::@8: scope:[main]  from main::@2
+  to:main::@6
+main::@6: scope:[main]  from main::@2
   [24] phi()
   [25] call print_str 
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [26] (byte) main::i#1 ← ++ (byte) main::i#2
   [27] if((byte) main::i#1!=(byte/word/signed word/dword/signed dword) $c0) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@9
+main::@return: scope:[main]  from main::@7
   [28] return 
   to:@return
-print_str: scope:[print_str]  from main::@3 main::@8
-  [29] (byte*) print_char_cursor#47 ← phi( main::@3/(byte*) print_char_cursor#45 main::@8/(byte*) print_char_cursor#10 )
-  [29] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@8/(const string) main::str )
+print_str: scope:[print_str]  from main::@3 main::@6
+  [29] (byte*) print_char_cursor#47 ← phi( main::@3/(byte*) print_char_cursor#45 main::@6/(byte*) print_char_cursor#10 )
+  [29] (byte*) print_str::str#5 ← phi( main::@3/(const string) main::str1 main::@6/(const string) main::str )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [30] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#47 print_str::@2/(byte*) print_char_cursor#1 )
@@ -2491,8 +2522,8 @@ print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [37] phi()
   [38] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [39] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [39] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
   [40] call print_byte 
   to:print_sbyte::@return
 print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
@@ -2501,8 +2532,8 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [42] phi()
   [43] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [44] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1
   to:print_sbyte::@2
 print_char: scope:[print_char]  from print_byte print_byte::@1 print_sbyte::@1 print_sbyte::@3
@@ -2527,7 +2558,7 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [55] return 
   to:@return
-print_cls: scope:[print_cls]  from main::@6
+print_cls: scope:[print_cls]  from main::@5
   [56] phi()
   to:print_cls::@1
 print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
@@ -2539,23 +2570,23 @@ print_cls::@1: scope:[print_cls]  from print_cls print_cls::@1
 print_cls::@return: scope:[print_cls]  from print_cls::@1
   [61] return 
   to:@return
-sin16s_gen: scope:[sin16s_gen]  from main::@5
+sin16s_gen: scope:[sin16s_gen]  from main::@4
   [62] phi()
   [63] call div32u16u 
   [64] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  to:sin16s_gen::@3
-sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen
+  to:sin16s_gen::@2
+sin16s_gen::@2: scope:[sin16s_gen]  from sin16s_gen
   [65] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
   to:sin16s_gen::@1
-sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@3 sin16s_gen::@4
-  [66] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(word) sin16s_gen::i#1 )
-  [66] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@3/(const signed word[$c0]) main::sintabw#0 sin16s_gen::@4/(signed word*) sin16s_gen::sintab#0 )
-  [66] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@4/(dword) sin16s_gen::x#1 )
+sin16s_gen::@1: scope:[sin16s_gen]  from sin16s_gen::@2 sin16s_gen::@3
+  [66] (word) sin16s_gen::i#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(word) sin16s_gen::i#1 )
+  [66] (signed word*) sin16s_gen::sintab#2 ← phi( sin16s_gen::@2/(const signed word[$c0]) main::sintabw#0 sin16s_gen::@3/(signed word*) sin16s_gen::sintab#0 )
+  [66] (dword) sin16s_gen::x#2 ← phi( sin16s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s_gen::@3/(dword) sin16s_gen::x#1 )
   [67] (dword) sin16s::x#0 ← (dword) sin16s_gen::x#2
   [68] call sin16s 
   [69] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  to:sin16s_gen::@4
-sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
+  to:sin16s_gen::@3
+sin16s_gen::@3: scope:[sin16s_gen]  from sin16s_gen::@1
   [70] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   [71] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1
   [72] (signed word*) sin16s_gen::sintab#0 ← (signed word*) sin16s_gen::sintab#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
@@ -2563,7 +2594,7 @@ sin16s_gen::@4: scope:[sin16s_gen]  from sin16s_gen::@1
   [74] (word) sin16s_gen::i#1 ← ++ (word) sin16s_gen::i#2
   [75] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1
   to:sin16s_gen::@return
-sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@4
+sin16s_gen::@return: scope:[sin16s_gen]  from sin16s_gen::@3
   [76] return 
   to:@return
 sin16s: scope:[sin16s]  from sin16s_gen::@1
@@ -2588,77 +2619,77 @@ sin16s::@2: scope:[sin16s]  from sin16s::@1 sin16s::@5
   [86] (word) mulu16_sel::v2#0 ← (word) sin16s::x1#0
   [87] call mulu16_sel 
   [88] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  to:sin16s::@8
-sin16s::@8: scope:[sin16s]  from sin16s::@2
+  to:sin16s::@7
+sin16s::@7: scope:[sin16s]  from sin16s::@2
   [89] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0
   [90] (word) mulu16_sel::v1#1 ← (word) sin16s::x2#0
   [91] (word) mulu16_sel::v2#1 ← (word) sin16s::x1#0
   [92] call mulu16_sel 
   [93] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12
-  to:sin16s::@9
-sin16s::@9: scope:[sin16s]  from sin16s::@8
+  to:sin16s::@8
+sin16s::@8: scope:[sin16s]  from sin16s::@7
   [94] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   [95] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   [96] call mulu16_sel 
   [97] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  to:sin16s::@10
-sin16s::@10: scope:[sin16s]  from sin16s::@9
+  to:sin16s::@9
+sin16s::@9: scope:[sin16s]  from sin16s::@8
   [98] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   [99] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0
   [100] (word) mulu16_sel::v1#3 ← (word) sin16s::x3#0
   [101] (word) mulu16_sel::v2#3 ← (word) sin16s::x1#0
   [102] call mulu16_sel 
   [103] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12
-  to:sin16s::@11
-sin16s::@11: scope:[sin16s]  from sin16s::@10
+  to:sin16s::@10
+sin16s::@10: scope:[sin16s]  from sin16s::@9
   [104] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   [105] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   [106] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0
   [107] call mulu16_sel 
   [108] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  to:sin16s::@12
-sin16s::@12: scope:[sin16s]  from sin16s::@11
+  to:sin16s::@11
+sin16s::@11: scope:[sin16s]  from sin16s::@10
   [109] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   [110] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [111] (word) sin16s::usinx#1 ← (word) sin16s::usinx#0 + (word) sin16s::x5_128#0
-  [112] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15
+  [112] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12
   to:sin16s::@6
-sin16s::@6: scope:[sin16s]  from sin16s::@12
+sin16s::@6: scope:[sin16s]  from sin16s::@11
   [113] (signed word) sin16s::sinx#1 ← - (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-sin16s::@3: scope:[sin16s]  from sin16s::@15 sin16s::@6
-  [114] (signed word) sin16s::return#1 ← phi( sin16s::@15/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
+sin16s::@3: scope:[sin16s]  from sin16s::@12 sin16s::@6
+  [114] (signed word) sin16s::return#1 ← phi( sin16s::@12/(signed word~) sin16s::return#5 sin16s::@6/(signed word) sin16s::sinx#1 )
   to:sin16s::@return
 sin16s::@return: scope:[sin16s]  from sin16s::@3
   [115] return 
   to:@return
-sin16s::@15: scope:[sin16s]  from sin16s::@12
+sin16s::@12: scope:[sin16s]  from sin16s::@11
   [116] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
   to:sin16s::@3
-mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@11 sin16s::@2 sin16s::@8 sin16s::@9
-  [117] (byte) mulu16_sel::select#5 ← phi( sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 )
-  [117] (word) mulu16_sel::v2#5 ← phi( sin16s::@10/(word) mulu16_sel::v2#3 sin16s::@11/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@8/(word) mulu16_sel::v2#1 sin16s::@9/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
-  [117] (word) mulu16_sel::v1#5 ← phi( sin16s::@10/(word) mulu16_sel::v1#3 sin16s::@11/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@8/(word) mulu16_sel::v1#1 sin16s::@9/(word) mulu16_sel::v1#2 )
+mulu16_sel: scope:[mulu16_sel]  from sin16s::@10 sin16s::@2 sin16s::@7 sin16s::@8 sin16s::@9
+  [117] (byte) mulu16_sel::select#5 ← phi( sin16s::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 1 sin16s::@8/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [117] (word) mulu16_sel::v2#5 ← phi( sin16s::@9/(word) mulu16_sel::v2#3 sin16s::@10/(word) mulu16_sel::v2#4 sin16s::@2/(word) mulu16_sel::v2#0 sin16s::@7/(word) mulu16_sel::v2#1 sin16s::@8/(dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 )
+  [117] (word) mulu16_sel::v1#5 ← phi( sin16s::@9/(word) mulu16_sel::v1#3 sin16s::@10/(word) mulu16_sel::v1#4 sin16s::@2/(word) mulu16_sel::v1#0 sin16s::@7/(word) mulu16_sel::v1#1 sin16s::@8/(word) mulu16_sel::v1#2 )
   [118] (word) mul16u::a#1 ← (word) mulu16_sel::v1#5
   [119] (word) mul16u::b#0 ← (word) mulu16_sel::v2#5
   [120] call mul16u 
   [121] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mulu16_sel::@2
-mulu16_sel::@2: scope:[mulu16_sel]  from mulu16_sel
+  to:mulu16_sel::@1
+mulu16_sel::@1: scope:[mulu16_sel]  from mulu16_sel
   [122] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   [123] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5
   [124] (word) mulu16_sel::return#12 ← > (dword~) mulu16_sel::$1
   to:mulu16_sel::@return
-mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@2
+mulu16_sel::@return: scope:[mulu16_sel]  from mulu16_sel::@1
   [125] return 
   to:@return
 mul16u: scope:[mul16u]  from mulu16_sel
   [126] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#0
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [127] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [127] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [127] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [127] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [127] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [127] (word) mul16u::a#2 ← phi( mul16u/(word) mul16u::a#1 mul16u::@4/(word) mul16u::a#0 )
   [128] if((word) mul16u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -2666,13 +2697,13 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [130] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [131] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [131] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [132] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [133] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [133] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [134] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [135] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
@@ -2680,23 +2711,23 @@ div32u16u: scope:[div32u16u]  from sin16s_gen
   [136] phi()
   [137] call divr16u 
   [138] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:div32u16u::@2
-div32u16u::@2: scope:[div32u16u]  from div32u16u
+  to:div32u16u::@1
+div32u16u::@1: scope:[div32u16u]  from div32u16u
   [139] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#3
   [140] (word) divr16u::rem#5 ← (word) rem16u#1
   [141] call divr16u 
   [142] (word) divr16u::return#4 ← (word) divr16u::return#0
-  to:div32u16u::@3
-div32u16u::@3: scope:[div32u16u]  from div32u16u::@2
+  to:div32u16u::@2
+div32u16u::@2: scope:[div32u16u]  from div32u16u::@1
   [143] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#4
   [144] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0
   to:div32u16u::@return
-div32u16u::@return: scope:[div32u16u]  from div32u16u::@3
+div32u16u::@return: scope:[div32u16u]  from div32u16u::@2
   [145] return 
   to:@return
-divr16u: scope:[divr16u]  from div16u div32u16u div32u16u::@2
-  [146] (word) divr16u::dividend#6 ← phi( div16u/(const word) PI2_u4f12#0 div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@2/<(const dword) PI2_u4f28#0 )
-  [146] (word) divr16u::rem#11 ← phi( div16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@2/(word) divr16u::rem#5 )
+divr16u: scope:[divr16u]  from div16u div32u16u div32u16u::@1
+  [146] (word) divr16u::dividend#6 ← phi( div16u/(const word) PI2_u4f12#0 div32u16u/>(const dword) PI2_u4f28#0 div32u16u::@1/<(const dword) PI2_u4f28#0 )
+  [146] (word) divr16u::rem#11 ← phi( div16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u/(byte/signed byte/word/signed word/dword/signed dword) 0 div32u16u::@1/(word) divr16u::rem#5 )
   to:divr16u::@1
 divr16u::@1: scope:[divr16u]  from divr16u divr16u::@3
   [147] (byte) divr16u::i#2 ← phi( divr16u/(byte/signed byte/word/signed word/dword/signed dword) 0 divr16u::@3/(byte) divr16u::i#1 )
@@ -2737,19 +2768,19 @@ sin8s_gen: scope:[sin8s_gen]  from main
   [164] phi()
   [165] call div16u 
   [166] (word) div16u::return#2 ← (word) div16u::return#0
-  to:sin8s_gen::@3
-sin8s_gen::@3: scope:[sin8s_gen]  from sin8s_gen
+  to:sin8s_gen::@2
+sin8s_gen::@2: scope:[sin8s_gen]  from sin8s_gen
   [167] (word) sin8s_gen::step#0 ← (word) div16u::return#2
   to:sin8s_gen::@1
-sin8s_gen::@1: scope:[sin8s_gen]  from sin8s_gen::@3 sin8s_gen::@4
-  [168] (word) sin8s_gen::i#2 ← phi( sin8s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@4/(word) sin8s_gen::i#1 )
-  [168] (signed byte*) sin8s_gen::sintab#2 ← phi( sin8s_gen::@3/(const signed byte[$c0]) main::sintabb#0 sin8s_gen::@4/(signed byte*) sin8s_gen::sintab#0 )
-  [168] (word) sin8s_gen::x#2 ← phi( sin8s_gen::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@4/(word) sin8s_gen::x#1 )
+sin8s_gen::@1: scope:[sin8s_gen]  from sin8s_gen::@2 sin8s_gen::@3
+  [168] (word) sin8s_gen::i#2 ← phi( sin8s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@3/(word) sin8s_gen::i#1 )
+  [168] (signed byte*) sin8s_gen::sintab#2 ← phi( sin8s_gen::@2/(const signed byte[$c0]) main::sintabb#0 sin8s_gen::@3/(signed byte*) sin8s_gen::sintab#0 )
+  [168] (word) sin8s_gen::x#2 ← phi( sin8s_gen::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s_gen::@3/(word) sin8s_gen::x#1 )
   [169] (word) sin8s::x#0 ← (word) sin8s_gen::x#2
   [170] call sin8s 
   [171] (signed byte) sin8s::return#0 ← (signed byte) sin8s::return#1
-  to:sin8s_gen::@4
-sin8s_gen::@4: scope:[sin8s_gen]  from sin8s_gen::@1
+  to:sin8s_gen::@3
+sin8s_gen::@3: scope:[sin8s_gen]  from sin8s_gen::@1
   [172] (signed byte~) sin8s_gen::$1 ← (signed byte) sin8s::return#0
   [173] *((signed byte*) sin8s_gen::sintab#2) ← (signed byte~) sin8s_gen::$1
   [174] (signed byte*) sin8s_gen::sintab#0 ← ++ (signed byte*) sin8s_gen::sintab#2
@@ -2757,7 +2788,7 @@ sin8s_gen::@4: scope:[sin8s_gen]  from sin8s_gen::@1
   [176] (word) sin8s_gen::i#1 ← ++ (word) sin8s_gen::i#2
   [177] if((word) sin8s_gen::i#1<(const word) main::wavelength#0) goto sin8s_gen::@1
   to:sin8s_gen::@return
-sin8s_gen::@return: scope:[sin8s_gen]  from sin8s_gen::@4
+sin8s_gen::@return: scope:[sin8s_gen]  from sin8s_gen::@3
   [178] return 
   to:@return
 sin8s: scope:[sin8s]  from sin8s_gen::@1
@@ -2782,84 +2813,84 @@ sin8s::@2: scope:[sin8s]  from sin8s::@1 sin8s::@6
   [188] (byte) mulu8_sel::v2#0 ← (byte) sin8s::x1#0
   [189] call mulu8_sel 
   [190] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-  to:sin8s::@10
-sin8s::@10: scope:[sin8s]  from sin8s::@2
+  to:sin8s::@9
+sin8s::@9: scope:[sin8s]  from sin8s::@2
   [191] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   [192] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0
   [193] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0
   [194] call mulu8_sel 
   [195] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-  to:sin8s::@11
-sin8s::@11: scope:[sin8s]  from sin8s::@10
+  to:sin8s::@10
+sin8s::@10: scope:[sin8s]  from sin8s::@9
   [196] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1
   [197] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0
   [198] call mulu8_sel 
   [199] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-  to:sin8s::@12
-sin8s::@12: scope:[sin8s]  from sin8s::@11
+  to:sin8s::@11
+sin8s::@11: scope:[sin8s]  from sin8s::@10
   [200] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   [201] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0
   [202] (byte) mulu8_sel::v1#3 ← (byte) sin8s::x3#0
   [203] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0
   [204] call mulu8_sel 
   [205] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-  to:sin8s::@13
-sin8s::@13: scope:[sin8s]  from sin8s::@12
+  to:sin8s::@12
+sin8s::@12: scope:[sin8s]  from sin8s::@11
   [206] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   [207] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0
   [208] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0
   [209] call mulu8_sel 
   [210] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-  to:sin8s::@14
-sin8s::@14: scope:[sin8s]  from sin8s::@13
+  to:sin8s::@13
+sin8s::@13: scope:[sin8s]  from sin8s::@12
   [211] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   [212] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [213] (byte) sin8s::usinx#1 ← (byte) sin8s::usinx#0 + (byte) sin8s::x5_128#0
   [214] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3
   to:sin8s::@7
-sin8s::@7: scope:[sin8s]  from sin8s::@14
+sin8s::@7: scope:[sin8s]  from sin8s::@13
   [215] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1
   to:sin8s::@3
-sin8s::@3: scope:[sin8s]  from sin8s::@14 sin8s::@7
-  [216] (byte) sin8s::usinx#4 ← phi( sin8s::@14/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
-  [217] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18
+sin8s::@3: scope:[sin8s]  from sin8s::@13 sin8s::@7
+  [216] (byte) sin8s::usinx#4 ← phi( sin8s::@13/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
+  [217] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14
   to:sin8s::@8
 sin8s::@8: scope:[sin8s]  from sin8s::@3
   [218] (signed byte) sin8s::sinx#1 ← - (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-sin8s::@4: scope:[sin8s]  from sin8s::@18 sin8s::@8
-  [219] (signed byte) sin8s::return#1 ← phi( sin8s::@18/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
+sin8s::@4: scope:[sin8s]  from sin8s::@14 sin8s::@8
+  [219] (signed byte) sin8s::return#1 ← phi( sin8s::@14/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
   to:sin8s::@return
 sin8s::@return: scope:[sin8s]  from sin8s::@4
   [220] return 
   to:@return
-sin8s::@18: scope:[sin8s]  from sin8s::@3
+sin8s::@14: scope:[sin8s]  from sin8s::@3
   [221] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@13 sin8s::@2
-  [222] (byte) mulu8_sel::select#5 ← phi( sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [222] (byte) mulu8_sel::v2#5 ← phi( sin8s::@10/(byte) mulu8_sel::v2#1 sin8s::@11/(const byte) sin8s::DIV_6#0 sin8s::@12/(byte) mulu8_sel::v2#3 sin8s::@13/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
-  [222] (byte) mulu8_sel::v1#5 ← phi( sin8s::@10/(byte) mulu8_sel::v1#1 sin8s::@11/(byte) mulu8_sel::v1#2 sin8s::@12/(byte) mulu8_sel::v1#3 sin8s::@13/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
+mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@2 sin8s::@9
+  [222] (byte) mulu8_sel::select#5 ← phi( sin8s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [222] (byte) mulu8_sel::v2#5 ← phi( sin8s::@9/(byte) mulu8_sel::v2#1 sin8s::@10/(const byte) sin8s::DIV_6#0 sin8s::@11/(byte) mulu8_sel::v2#3 sin8s::@12/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
+  [222] (byte) mulu8_sel::v1#5 ← phi( sin8s::@9/(byte) mulu8_sel::v1#1 sin8s::@10/(byte) mulu8_sel::v1#2 sin8s::@11/(byte) mulu8_sel::v1#3 sin8s::@12/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
   [223] (byte) mul8u::a#1 ← (byte) mulu8_sel::v1#5
   [224] (byte) mul8u::b#0 ← (byte) mulu8_sel::v2#5
   [225] call mul8u 
   [226] (word) mul8u::return#2 ← (word) mul8u::res#2
-  to:mulu8_sel::@2
-mulu8_sel::@2: scope:[mulu8_sel]  from mulu8_sel
+  to:mulu8_sel::@1
+mulu8_sel::@1: scope:[mulu8_sel]  from mulu8_sel
   [227] (word~) mulu8_sel::$0 ← (word) mul8u::return#2
   [228] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5
   [229] (byte) mulu8_sel::return#12 ← > (word~) mulu8_sel::$1
   to:mulu8_sel::@return
-mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@2
+mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@1
   [230] return 
   to:@return
 mul8u: scope:[mul8u]  from mulu8_sel
   [231] (word) mul8u::mb#0 ← ((word)) (byte) mul8u::b#0
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [232] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@8/(word) mul8u::mb#1 )
-  [232] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [232] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [232] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@4/(word) mul8u::mb#1 )
+  [232] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [232] (byte) mul8u::a#2 ← phi( mul8u/(byte) mul8u::a#1 mul8u::@4/(byte) mul8u::a#0 )
   [233] if((byte) mul8u::a#2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -2867,13 +2898,13 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [235] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [236] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [236] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [237] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [238] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [238] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [239] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [240] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
@@ -2881,11 +2912,11 @@ div16u: scope:[div16u]  from sin8s_gen
   [241] phi()
   [242] call divr16u 
   [243] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div16u::@2
-div16u::@2: scope:[div16u]  from div16u
+  to:div16u::@1
+div16u::@1: scope:[div16u]  from div16u
   [244] (word) div16u::return#0 ← (word) divr16u::return#2
   to:div16u::@return
-div16u::@return: scope:[div16u]  from div16u::@2
+div16u::@return: scope:[div16u]  from div16u::@1
   [245] return 
   to:@return
 
@@ -3519,17 +3550,17 @@ INITIAL ASM
   .label print_char_cursor = 7
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-b40_from_bbegin:
-  jmp b40
-//SEG5 @40
-b40:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @40 to main [phi:@40->main]
-main_from_b40:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @40 to @end [phi:@40->@end]
-bend_from_b40:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3548,39 +3579,39 @@ main: {
   //SEG12 [164] phi from main to sin8s_gen [phi:main->sin8s_gen]
   sin8s_gen_from_main:
     jsr sin8s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  b5_from_main:
-    jmp b5
-  //SEG14 main::@5
-  b5:
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  b4_from_main:
+    jmp b4
+  //SEG14 main::@4
+  b4:
   //SEG15 [7] call sin16s_gen 
-  //SEG16 [62] phi from main::@5 to sin16s_gen [phi:main::@5->sin16s_gen]
-  sin16s_gen_from_b5:
+  //SEG16 [62] phi from main::@4 to sin16s_gen [phi:main::@4->sin16s_gen]
+  sin16s_gen_from_b4:
     jsr sin16s_gen
-  //SEG17 [8] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG18 main::@6
-  b6:
+  //SEG17 [8] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG18 main::@5
+  b5:
   //SEG19 [9] call print_cls 
-  //SEG20 [56] phi from main::@6 to print_cls [phi:main::@6->print_cls]
-  print_cls_from_b6:
+  //SEG20 [56] phi from main::@5 to print_cls [phi:main::@5->print_cls]
+  print_cls_from_b5:
     jsr print_cls
-  //SEG21 [10] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  b1_from_b6:
-  //SEG22 [10] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@6->main::@1#0] -- pbuz1=pbuc1 
+  //SEG21 [10] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG22 [10] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#0] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG23 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#1] -- vbuz1=vbuc1 
+  //SEG23 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@1#1] -- vbuz1=vbuc1 
     lda #0
     sta i
     jmp b1
-  //SEG24 [10] phi from main::@9 to main::@1 [phi:main::@9->main::@1]
-  b1_from_b9:
-  //SEG25 [10] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@9->main::@1#0] -- register_copy 
-  //SEG26 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@9->main::@1#1] -- register_copy 
+  //SEG24 [10] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
+  b1_from_b7:
+  //SEG25 [10] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG26 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#1] -- register_copy 
     jmp b1
   //SEG27 main::@1
   b1:
@@ -3653,30 +3684,30 @@ main: {
     sta print_sbyte.b
   //SEG46 [23] call print_sbyte 
     jsr print_sbyte
-  //SEG47 [24] phi from main::@2 to main::@8 [phi:main::@2->main::@8]
-  b8_from_b2:
-    jmp b8
-  //SEG48 main::@8
-  b8:
+  //SEG47 [24] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
+  b6_from_b2:
+    jmp b6
+  //SEG48 main::@6
+  b6:
   //SEG49 [25] call print_str 
-  //SEG50 [29] phi from main::@8 to print_str [phi:main::@8->print_str]
-  print_str_from_b8:
-  //SEG51 [29] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@8->print_str#0] -- register_copy 
-  //SEG52 [29] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@8->print_str#1] -- pbuz1=pbuc1 
+  //SEG50 [29] phi from main::@6 to print_str [phi:main::@6->print_str]
+  print_str_from_b6:
+  //SEG51 [29] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@6->print_str#0] -- register_copy 
+  //SEG52 [29] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG53 main::@9
-  b9:
+    jmp b7
+  //SEG53 main::@7
+  b7:
   //SEG54 [26] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG55 [27] if((byte) main::i#1!=(byte/word/signed word/dword/signed dword) $c0) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c0
     cmp i
-    bne b1_from_b9
+    bne b1_from_b7
     jmp breturn
   //SEG56 main::@return
   breturn:
@@ -3750,10 +3781,10 @@ print_sbyte: {
     lda #' '
     sta print_char.ch
     jsr print_char
-  //SEG78 [39] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG78 [39] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG79 [39] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG79 [39] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG80 print_sbyte::@2
   b2:
@@ -3777,16 +3808,16 @@ print_sbyte: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b5
-  //SEG90 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG90 print_sbyte::@4
+  b4:
   //SEG91 [44] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG92 print_char
 // Print a single char
@@ -3917,9 +3948,9 @@ sin16s_gen: {
     sta div32u16u.return_2+2
     lda div32u16u.return+3
     sta div32u16u.return_2+3
-    jmp b3
-  //SEG128 sin16s_gen::@3
-  b3:
+    jmp b2
+  //SEG128 sin16s_gen::@2
+  b2:
   //SEG129 [65] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2 -- vduz1=vduz2 
     lda div32u16u.return_2
     sta step
@@ -3929,19 +3960,19 @@ sin16s_gen: {
     sta step+2
     lda div32u16u.return_2+3
     sta step+3
-  //SEG130 [66] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
-  b1_from_b3:
-  //SEG131 [66] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG130 [66] phi from sin16s_gen::@2 to sin16s_gen::@1 [phi:sin16s_gen::@2->sin16s_gen::@1]
+  b1_from_b2:
+  //SEG131 [66] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG132 [66] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$c0]) main::sintabw#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- pwsz1=pwsc1 
+  //SEG132 [66] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$c0]) main::sintabw#0 [phi:sin16s_gen::@2->sin16s_gen::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintabw
     sta sintab
     lda #>main.sintabw
     sta sintab+1
-  //SEG133 [66] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- vduz1=vbuc1 
+  //SEG133 [66] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -3950,11 +3981,11 @@ sin16s_gen: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG134 [66] phi from sin16s_gen::@4 to sin16s_gen::@1 [phi:sin16s_gen::@4->sin16s_gen::@1]
-  b1_from_b4:
-  //SEG135 [66] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@4->sin16s_gen::@1#0] -- register_copy 
-  //SEG136 [66] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@4->sin16s_gen::@1#1] -- register_copy 
-  //SEG137 [66] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@4->sin16s_gen::@1#2] -- register_copy 
+  //SEG134 [66] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
+  b1_from_b3:
+  //SEG135 [66] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- register_copy 
+  //SEG136 [66] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- register_copy 
+  //SEG137 [66] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- register_copy 
     jmp b1
   //SEG138 sin16s_gen::@1
   b1:
@@ -3974,9 +4005,9 @@ sin16s_gen: {
     sta sin16s.return
     lda sin16s.return_1+1
     sta sin16s.return+1
-    jmp b4
-  //SEG142 sin16s_gen::@4
-  b4:
+    jmp b3
+  //SEG142 sin16s_gen::@3
+  b3:
   //SEG143 [70] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0 -- vwsz1=vwsz2 
     lda sin16s.return
     sta _1
@@ -4019,11 +4050,11 @@ sin16s_gen: {
   //SEG148 [75] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG149 sin16s_gen::@return
@@ -4190,9 +4221,9 @@ sin16s: {
     sta mulu16_sel.return
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return+1
-    jmp b8
-  //SEG178 sin16s::@8
-  b8:
+    jmp b7
+  //SEG178 sin16s::@7
+  b7:
   //SEG179 [89] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -4209,22 +4240,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG182 [92] call mulu16_sel 
-  //SEG183 [117] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG184 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG183 [117] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG184 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG185 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG186 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG185 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG186 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG187 [93] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_1
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_1+1
-    jmp b9
-  //SEG188 sin16s::@9
-  b9:
+    jmp b8
+  //SEG188 sin16s::@8
+  b8:
   //SEG189 [94] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1 -- vwuz1=vwuz2 
     lda mulu16_sel.return_1
     sta x3
@@ -4236,26 +4267,26 @@ sin16s: {
     lda x3+1
     sta mulu16_sel.v1+1
   //SEG191 [96] call mulu16_sel 
-  //SEG192 [117] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG193 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG192 [117] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG193 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu16_sel.select
-  //SEG194 [117] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG194 [117] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG195 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG195 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG196 [97] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_2
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_2+1
-    jmp b10
-  //SEG197 sin16s::@10
-  b10:
+    jmp b9
+  //SEG197 sin16s::@9
+  b9:
   //SEG198 [98] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2 -- vwuz1=vwuz2 
     lda mulu16_sel.return_2
     sta x3_6
@@ -4280,22 +4311,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG202 [102] call mulu16_sel 
-  //SEG203 [117] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG204 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG203 [117] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG204 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG205 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG206 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG205 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG206 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG207 [103] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_10
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_10+1
-    jmp b11
-  //SEG208 sin16s::@11
-  b11:
+    jmp b10
+  //SEG208 sin16s::@10
+  b10:
   //SEG209 [104] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10 -- vwuz1=vwuz2 
     lda mulu16_sel.return_10
     sta x4
@@ -4312,22 +4343,22 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG212 [107] call mulu16_sel 
-  //SEG213 [117] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG214 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuz1=vbuc1 
+  //SEG213 [117] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG214 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu16_sel.select
-  //SEG215 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG216 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG215 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG216 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG217 [108] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return_12
     sta mulu16_sel.return_11
     lda mulu16_sel.return_12+1
     sta mulu16_sel.return_11+1
-    jmp b12
-  //SEG218 sin16s::@12
-  b12:
+    jmp b11
+  //SEG218 sin16s::@11
+  b11:
   //SEG219 [109] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11 -- vwuz1=vwuz2 
     lda mulu16_sel.return_11
     sta x5
@@ -4352,10 +4383,10 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx_1+1
-  //SEG222 [112] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG222 [112] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG223 sin16s::@6
   b6:
@@ -4369,10 +4400,10 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG225 [114] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  b3_from_b15:
+  //SEG225 [114] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG226 [114] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG226 [114] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
     jmp b3
   //SEG227 sin16s::@3
   b3:
@@ -4381,14 +4412,14 @@ sin16s: {
   breturn:
   //SEG229 [115] return 
     rts
-  //SEG230 sin16s::@15
-  b15:
+  //SEG230 sin16s::@12
+  b12:
   //SEG231 [116] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1 -- vwsz1=vwsz2 
     lda usinx_1
     sta return_5
     lda usinx_1+1
     sta return_5+1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
 //SEG232 mulu16_sel
 // Calculate val*val for two unsigned word values - the result is 16 selected bits of the 32-bit result.
@@ -4427,9 +4458,9 @@ mulu16_sel: {
     sta mul16u.return+2
     lda mul16u.res+3
     sta mul16u.return+3
-    jmp b2
-  //SEG237 mulu16_sel::@2
-  b2:
+    jmp b1
+  //SEG237 mulu16_sel::@1
+  b1:
   //SEG238 [122] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2 -- vduz1=vduz2 
     lda mul16u.return
     sta _0
@@ -4517,13 +4548,13 @@ mul16u: {
     lda a
     and #1
     sta _1
-  //SEG255 [131] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG255 [131] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG256 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG256 mul16u::@3
+  b3:
   //SEG257 [132] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -4538,13 +4569,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG258 [133] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG259 [133] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG260 mul16u::@8
-  b8:
+  //SEG258 [133] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG259 [133] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG260 mul16u::@4
+  b4:
   //SEG261 [134] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -4554,11 +4585,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG263 [127] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG264 [127] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG265 [127] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG266 [127] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG263 [127] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG264 [127] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG265 [127] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG266 [127] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG267 div32u16u
@@ -4588,9 +4619,9 @@ div32u16u: {
     sta divr16u.return_3
     lda divr16u.return+1
     sta divr16u.return_3+1
-    jmp b2
-  //SEG273 div32u16u::@2
-  b2:
+    jmp b1
+  //SEG273 div32u16u::@1
+  b1:
   //SEG274 [139] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#3 -- vwuz1=vwuz2 
     lda divr16u.return_3
     sta quotient_hi
@@ -4602,23 +4633,23 @@ div32u16u: {
     lda rem16u+1
     sta divr16u.rem+1
   //SEG276 [141] call divr16u 
-  //SEG277 [146] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  divr16u_from_b2:
-  //SEG278 [146] phi (word) divr16u::dividend#6 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG277 [146] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  divr16u_from_b1:
+  //SEG278 [146] phi (word) divr16u::dividend#6 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG279 [146] phi (word) divr16u::rem#11 = (word) divr16u::rem#5 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG279 [146] phi (word) divr16u::rem#11 = (word) divr16u::rem#5 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG280 [142] (word) divr16u::return#4 ← (word) divr16u::return#0 -- vwuz1=vwuz2 
     lda divr16u.return
     sta divr16u.return_4
     lda divr16u.return+1
     sta divr16u.return_4+1
-    jmp b3
-  //SEG281 div32u16u::@3
-  b3:
+    jmp b2
+  //SEG281 div32u16u::@2
+  b2:
   //SEG282 [143] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#4 -- vwuz1=vwuz2 
     lda divr16u.return_4
     sta quotient_lo
@@ -4785,38 +4816,38 @@ sin8s_gen: {
     sta div16u.return_2
     lda div16u.return+1
     sta div16u.return_2+1
-    jmp b3
-  //SEG327 sin8s_gen::@3
-  b3:
+    jmp b2
+  //SEG327 sin8s_gen::@2
+  b2:
   //SEG328 [167] (word) sin8s_gen::step#0 ← (word) div16u::return#2 -- vwuz1=vwuz2 
     lda div16u.return_2
     sta step
     lda div16u.return_2+1
     sta step+1
-  //SEG329 [168] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
-  b1_from_b3:
-  //SEG330 [168] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG329 [168] phi from sin8s_gen::@2 to sin8s_gen::@1 [phi:sin8s_gen::@2->sin8s_gen::@1]
+  b1_from_b2:
+  //SEG330 [168] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG331 [168] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintabb#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- pbsz1=pbsc1 
+  //SEG331 [168] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintabb#0 [phi:sin8s_gen::@2->sin8s_gen::@1#1] -- pbsz1=pbsc1 
     lda #<main.sintabb
     sta sintab
     lda #>main.sintabb
     sta sintab+1
-  //SEG332 [168] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- vwuz1=vbuc1 
+  //SEG332 [168] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#2] -- vwuz1=vbuc1 
     lda #0
     sta x
     lda #0
     sta x+1
     jmp b1
   // u[4.12]
-  //SEG333 [168] phi from sin8s_gen::@4 to sin8s_gen::@1 [phi:sin8s_gen::@4->sin8s_gen::@1]
-  b1_from_b4:
-  //SEG334 [168] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@4->sin8s_gen::@1#0] -- register_copy 
-  //SEG335 [168] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@4->sin8s_gen::@1#1] -- register_copy 
-  //SEG336 [168] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@4->sin8s_gen::@1#2] -- register_copy 
+  //SEG333 [168] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
+  b1_from_b3:
+  //SEG334 [168] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- register_copy 
+  //SEG335 [168] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- register_copy 
+  //SEG336 [168] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- register_copy 
     jmp b1
   //SEG337 sin8s_gen::@1
   b1:
@@ -4830,9 +4861,9 @@ sin8s_gen: {
   //SEG340 [171] (signed byte) sin8s::return#0 ← (signed byte) sin8s::return#1 -- vbsz1=vbsz2 
     lda sin8s.return_1
     sta sin8s.return
-    jmp b4
-  //SEG341 sin8s_gen::@4
-  b4:
+    jmp b3
+  //SEG341 sin8s_gen::@3
+  b3:
   //SEG342 [172] (signed byte~) sin8s_gen::$1 ← (signed byte) sin8s::return#0 -- vbsz1=vbsz2 
     lda sin8s.return
     sta _1
@@ -4861,11 +4892,11 @@ sin8s_gen: {
   //SEG347 [177] if((word) sin8s_gen::i#1<(const word) main::wavelength#0) goto sin8s_gen::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG348 sin8s_gen::@return
@@ -4994,9 +5025,9 @@ sin8s: {
   //SEG376 [190] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return
-    jmp b10
-  //SEG377 sin8s::@10
-  b10:
+    jmp b9
+  //SEG377 sin8s::@9
+  b9:
   //SEG378 [191] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0 -- vbuz1=vbuz2 
     lda mulu8_sel.return
     sta x2
@@ -5007,20 +5038,20 @@ sin8s: {
     lda x1
     sta mulu8_sel.v2
   //SEG381 [194] call mulu8_sel 
-  //SEG382 [222] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
-  mulu8_sel_from_b10:
-  //SEG383 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG382 [222] phi from sin8s::@9 to mulu8_sel [phi:sin8s::@9->mulu8_sel]
+  mulu8_sel_from_b9:
+  //SEG383 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@9->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG384 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@10->mulu8_sel#1] -- register_copy 
-  //SEG385 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
+  //SEG384 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@9->mulu8_sel#1] -- register_copy 
+  //SEG385 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@9->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG386 [195] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_1
-    jmp b11
-  //SEG387 sin8s::@11
-  b11:
+    jmp b10
+  //SEG387 sin8s::@10
+  b10:
   //SEG388 [196] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1 -- vbuz1=vbuz2 
     lda mulu8_sel.return_1
     sta x3
@@ -5028,22 +5059,22 @@ sin8s: {
     lda x3
     sta mulu8_sel.v1
   //SEG390 [198] call mulu8_sel 
-  //SEG391 [222] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
-  mulu8_sel_from_b11:
-  //SEG392 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG391 [222] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
+  mulu8_sel_from_b10:
+  //SEG392 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG393 [222] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@11->mulu8_sel#1] -- vbuz1=vbuc1 
+  //SEG393 [222] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@10->mulu8_sel#1] -- vbuz1=vbuc1 
     lda #DIV_6
     sta mulu8_sel.v2
-  //SEG394 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
+  //SEG394 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG395 [199] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_2
-    jmp b12
-  //SEG396 sin8s::@12
-  b12:
+    jmp b11
+  //SEG396 sin8s::@11
+  b11:
   //SEG397 [200] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2 -- vbuz1=vbuz2 
     lda mulu8_sel.return_2
     sta x3_6
@@ -5059,20 +5090,20 @@ sin8s: {
     lda x1
     sta mulu8_sel.v2
   //SEG401 [204] call mulu8_sel 
-  //SEG402 [222] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
-  mulu8_sel_from_b12:
-  //SEG403 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG402 [222] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
+  mulu8_sel_from_b11:
+  //SEG403 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG404 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
-  //SEG405 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
+  //SEG404 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@11->mulu8_sel#1] -- register_copy 
+  //SEG405 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG406 [205] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_10
-    jmp b13
-  //SEG407 sin8s::@13
-  b13:
+    jmp b12
+  //SEG407 sin8s::@12
+  b12:
   //SEG408 [206] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10 -- vbuz1=vbuz2 
     lda mulu8_sel.return_10
     sta x4
@@ -5083,20 +5114,20 @@ sin8s: {
     lda x1
     sta mulu8_sel.v2
   //SEG411 [209] call mulu8_sel 
-  //SEG412 [222] phi from sin8s::@13 to mulu8_sel [phi:sin8s::@13->mulu8_sel]
-  mulu8_sel_from_b13:
-  //SEG413 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@13->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG412 [222] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
+  mulu8_sel_from_b12:
+  //SEG413 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG414 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@13->mulu8_sel#1] -- register_copy 
-  //SEG415 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@13->mulu8_sel#2] -- register_copy 
+  //SEG414 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
+  //SEG415 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG416 [210] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_11
-    jmp b14
-  //SEG417 sin8s::@14
-  b14:
+    jmp b13
+  //SEG417 sin8s::@13
+  b13:
   //SEG418 [211] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11 -- vbuz1=vbuz2 
     lda mulu8_sel.return_11
     sta x5
@@ -5115,23 +5146,23 @@ sin8s: {
   //SEG421 [214] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3 -- vbuz1_lt_vbuc1_then_la1 
     lda usinx_1
     cmp #$80
-    bcc b3_from_b14
+    bcc b3_from_b13
     jmp b7
   //SEG422 sin8s::@7
   b7:
   //SEG423 [215] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1 -- vbuz1=_dec_vbuz1 
     dec usinx_2
-  //SEG424 [216] phi from sin8s::@14 sin8s::@7 to sin8s::@3 [phi:sin8s::@14/sin8s::@7->sin8s::@3]
-  b3_from_b14:
+  //SEG424 [216] phi from sin8s::@13 sin8s::@7 to sin8s::@3 [phi:sin8s::@13/sin8s::@7->sin8s::@3]
+  b3_from_b13:
   b3_from_b7:
-  //SEG425 [216] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@14/sin8s::@7->sin8s::@3#0] -- register_copy 
+  //SEG425 [216] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@13/sin8s::@7->sin8s::@3#0] -- register_copy 
     jmp b3
   //SEG426 sin8s::@3
   b3:
-  //SEG427 [217] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG427 [217] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
     jmp b8
   //SEG428 sin8s::@8
   b8:
@@ -5141,10 +5172,10 @@ sin8s: {
     clc
     adc #1
     sta sinx
-  //SEG430 [219] phi from sin8s::@18 sin8s::@8 to sin8s::@4 [phi:sin8s::@18/sin8s::@8->sin8s::@4]
-  b4_from_b18:
+  //SEG430 [219] phi from sin8s::@14 sin8s::@8 to sin8s::@4 [phi:sin8s::@14/sin8s::@8->sin8s::@4]
+  b4_from_b14:
   b4_from_b8:
-  //SEG431 [219] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@18/sin8s::@8->sin8s::@4#0] -- register_copy 
+  //SEG431 [219] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@14/sin8s::@8->sin8s::@4#0] -- register_copy 
     jmp b4
   //SEG432 sin8s::@4
   b4:
@@ -5153,12 +5184,12 @@ sin8s: {
   breturn:
   //SEG434 [220] return 
     rts
-  //SEG435 sin8s::@18
-  b18:
+  //SEG435 sin8s::@14
+  b14:
   //SEG436 [221] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4 -- vbsz1=vbsz2 
     lda usinx_4
     sta return_5
-    jmp b4_from_b18
+    jmp b4_from_b14
 }
 //SEG437 mulu8_sel
 // Calculate val*val for two unsigned byte values - the result is 8 selected bits of the 16-bit result.
@@ -5189,9 +5220,9 @@ mulu8_sel: {
     sta mul8u.return
     lda mul8u.res+1
     sta mul8u.return+1
-    jmp b2
-  //SEG442 mulu8_sel::@2
-  b2:
+    jmp b1
+  //SEG442 mulu8_sel::@1
+  b1:
   //SEG443 [227] (word~) mulu8_sel::$0 ← (word) mul8u::return#2 -- vwuz1=vwuz2 
     lda mul8u.return
     sta _0
@@ -5261,13 +5292,13 @@ mul8u: {
     lda #1
     and a
     sta _1
-  //SEG460 [236] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG460 [236] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG461 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG461 mul8u::@3
+  b3:
   //SEG462 [237] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -5276,23 +5307,23 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG463 [238] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG464 [238] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG465 mul8u::@8
-  b8:
+  //SEG463 [238] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG464 [238] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG465 mul8u::@4
+  b4:
   //SEG466 [239] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr a
   //SEG467 [240] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG468 [232] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG469 [232] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG470 [232] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG471 [232] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG468 [232] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG469 [232] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG470 [232] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG471 [232] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG472 div16u
@@ -5322,9 +5353,9 @@ div16u: {
     sta divr16u.return_2
     lda divr16u.return+1
     sta divr16u.return_2+1
-    jmp b2
-  //SEG478 div16u::@2
-  b2:
+    jmp b1
+  //SEG478 div16u::@1
+  b1:
   //SEG479 [244] (word) div16u::return#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return_2
     sta return
@@ -5833,17 +5864,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_char_cursor = 5
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-b40_from_bbegin:
-  jmp b40
-//SEG5 @40
-b40:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @40 to main [phi:@40->main]
-main_from_b40:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @40 to @end [phi:@40->@end]
-bend_from_b40:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -5860,38 +5891,38 @@ main: {
   //SEG12 [164] phi from main to sin8s_gen [phi:main->sin8s_gen]
   sin8s_gen_from_main:
     jsr sin8s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  b5_from_main:
-    jmp b5
-  //SEG14 main::@5
-  b5:
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  b4_from_main:
+    jmp b4
+  //SEG14 main::@4
+  b4:
   //SEG15 [7] call sin16s_gen 
-  //SEG16 [62] phi from main::@5 to sin16s_gen [phi:main::@5->sin16s_gen]
-  sin16s_gen_from_b5:
+  //SEG16 [62] phi from main::@4 to sin16s_gen [phi:main::@4->sin16s_gen]
+  sin16s_gen_from_b4:
     jsr sin16s_gen
-  //SEG17 [8] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG18 main::@6
-  b6:
+  //SEG17 [8] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG18 main::@5
+  b5:
   //SEG19 [9] call print_cls 
-  //SEG20 [56] phi from main::@6 to print_cls [phi:main::@6->print_cls]
-  print_cls_from_b6:
+  //SEG20 [56] phi from main::@5 to print_cls [phi:main::@5->print_cls]
+  print_cls_from_b5:
     jsr print_cls
-  //SEG21 [10] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  b1_from_b6:
-  //SEG22 [10] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@6->main::@1#0] -- pbuz1=pbuc1 
+  //SEG21 [10] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG22 [10] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#0] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG23 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#1] -- vbuxx=vbuc1 
+  //SEG23 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@1#1] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
-  //SEG24 [10] phi from main::@9 to main::@1 [phi:main::@9->main::@1]
-  b1_from_b9:
-  //SEG25 [10] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@9->main::@1#0] -- register_copy 
-  //SEG26 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@9->main::@1#1] -- register_copy 
+  //SEG24 [10] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
+  b1_from_b7:
+  //SEG25 [10] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG26 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#1] -- register_copy 
     jmp b1
   //SEG27 main::@1
   b1:
@@ -5956,29 +5987,29 @@ main: {
   //SEG45 [22] (signed byte) print_sbyte::b#1 ← (signed byte) main::sd#0
   //SEG46 [23] call print_sbyte 
     jsr print_sbyte
-  //SEG47 [24] phi from main::@2 to main::@8 [phi:main::@2->main::@8]
-  b8_from_b2:
-    jmp b8
-  //SEG48 main::@8
-  b8:
+  //SEG47 [24] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
+  b6_from_b2:
+    jmp b6
+  //SEG48 main::@6
+  b6:
   //SEG49 [25] call print_str 
-  //SEG50 [29] phi from main::@8 to print_str [phi:main::@8->print_str]
-  print_str_from_b8:
-  //SEG51 [29] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@8->print_str#0] -- register_copy 
-  //SEG52 [29] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@8->print_str#1] -- pbuz1=pbuc1 
+  //SEG50 [29] phi from main::@6 to print_str [phi:main::@6->print_str]
+  print_str_from_b6:
+  //SEG51 [29] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@6->print_str#0] -- register_copy 
+  //SEG52 [29] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG53 main::@9
-  b9:
+    jmp b7
+  //SEG53 main::@7
+  b7:
   //SEG54 [26] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
   //SEG55 [27] if((byte) main::i#1!=(byte/word/signed word/dword/signed dword) $c0) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$c0
-    bne b1_from_b9
+    bne b1_from_b7
     jmp breturn
   //SEG56 main::@return
   breturn:
@@ -6051,10 +6082,10 @@ print_sbyte: {
   //SEG77 [45] phi (byte) print_char::ch#4 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG78 [39] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG78 [39] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG79 [39] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG79 [39] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG80 print_sbyte::@2
   b2:
@@ -6077,16 +6108,16 @@ print_sbyte: {
   //SEG89 [45] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b5
-  //SEG90 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG90 print_sbyte::@4
+  b4:
   //SEG91 [44] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG92 print_char
 // Print a single char
@@ -6201,23 +6232,23 @@ sin16s_gen: {
   div32u16u_from_sin16s_gen:
     jsr div32u16u
   //SEG127 [64] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-    jmp b3
-  //SEG128 sin16s_gen::@3
-  b3:
+    jmp b2
+  //SEG128 sin16s_gen::@2
+  b2:
   //SEG129 [65] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
-  //SEG130 [66] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
-  b1_from_b3:
-  //SEG131 [66] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG130 [66] phi from sin16s_gen::@2 to sin16s_gen::@1 [phi:sin16s_gen::@2->sin16s_gen::@1]
+  b1_from_b2:
+  //SEG131 [66] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG132 [66] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$c0]) main::sintabw#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- pwsz1=pwsc1 
+  //SEG132 [66] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$c0]) main::sintabw#0 [phi:sin16s_gen::@2->sin16s_gen::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintabw
     sta sintab
     lda #>main.sintabw
     sta sintab+1
-  //SEG133 [66] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- vduz1=vbuc1 
+  //SEG133 [66] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     lda #0
@@ -6226,11 +6257,11 @@ sin16s_gen: {
     sta x+3
     jmp b1
   // u[4.28]
-  //SEG134 [66] phi from sin16s_gen::@4 to sin16s_gen::@1 [phi:sin16s_gen::@4->sin16s_gen::@1]
-  b1_from_b4:
-  //SEG135 [66] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@4->sin16s_gen::@1#0] -- register_copy 
-  //SEG136 [66] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@4->sin16s_gen::@1#1] -- register_copy 
-  //SEG137 [66] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@4->sin16s_gen::@1#2] -- register_copy 
+  //SEG134 [66] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
+  b1_from_b3:
+  //SEG135 [66] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- register_copy 
+  //SEG136 [66] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- register_copy 
+  //SEG137 [66] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- register_copy 
     jmp b1
   //SEG138 sin16s_gen::@1
   b1:
@@ -6246,9 +6277,9 @@ sin16s_gen: {
   //SEG140 [68] call sin16s 
     jsr sin16s
   //SEG141 [69] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-    jmp b4
-  //SEG142 sin16s_gen::@4
-  b4:
+    jmp b3
+  //SEG142 sin16s_gen::@3
+  b3:
   //SEG143 [70] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   //SEG144 [71] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1 -- _deref_pwsz1=vwsz2 
     ldy #0
@@ -6287,11 +6318,11 @@ sin16s_gen: {
   //SEG148 [75] if((word) sin16s_gen::i#1<(const word) main::wavelength#0) goto sin16s_gen::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG149 sin16s_gen::@return
@@ -6442,9 +6473,9 @@ sin16s: {
   //SEG176 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG177 [88] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-    jmp b8
-  //SEG178 sin16s::@8
-  b8:
+    jmp b7
+  //SEG178 sin16s::@7
+  b7:
   //SEG179 [89] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -6457,39 +6488,39 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG182 [92] call mulu16_sel 
-  //SEG183 [117] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  mulu16_sel_from_b8:
-  //SEG184 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG183 [117] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  mulu16_sel_from_b7:
+  //SEG184 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG185 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG186 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG185 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG186 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG187 [93] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_1
     lda mulu16_sel.return+1
     sta mulu16_sel.return_1+1
-    jmp b9
-  //SEG188 sin16s::@9
-  b9:
+    jmp b8
+  //SEG188 sin16s::@8
+  b8:
   //SEG189 [94] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   //SEG190 [95] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   //SEG191 [96] call mulu16_sel 
-  //SEG192 [117] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  mulu16_sel_from_b9:
-  //SEG193 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG192 [117] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  mulu16_sel_from_b8:
+  //SEG193 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG194 [117] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG194 [117] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG195 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG195 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG196 [97] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-    jmp b10
-  //SEG197 sin16s::@10
-  b10:
+    jmp b9
+  //SEG197 sin16s::@9
+  b9:
   //SEG198 [98] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   //SEG199 [99] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -6506,21 +6537,21 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG202 [102] call mulu16_sel 
-  //SEG203 [117] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  mulu16_sel_from_b10:
-  //SEG204 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG203 [117] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  mulu16_sel_from_b9:
+  //SEG204 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG205 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG206 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG205 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG206 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG207 [103] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_10
     lda mulu16_sel.return+1
     sta mulu16_sel.return_10+1
-    jmp b11
-  //SEG208 sin16s::@11
-  b11:
+    jmp b10
+  //SEG208 sin16s::@10
+  b10:
   //SEG209 [104] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   //SEG210 [105] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   //SEG211 [106] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -6529,17 +6560,17 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG212 [107] call mulu16_sel 
-  //SEG213 [117] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  mulu16_sel_from_b11:
-  //SEG214 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG213 [117] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  mulu16_sel_from_b10:
+  //SEG214 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG215 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG216 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG215 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG216 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG217 [108] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-    jmp b12
-  //SEG218 sin16s::@12
-  b12:
+    jmp b11
+  //SEG218 sin16s::@11
+  b11:
   //SEG219 [109] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   //SEG220 [110] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -6556,10 +6587,10 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG222 [112] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG222 [112] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b15
+    beq b12
     jmp b6
   //SEG223 sin16s::@6
   b6:
@@ -6573,10 +6604,10 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG225 [114] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  b3_from_b15:
+  //SEG225 [114] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  b3_from_b12:
   b3_from_b6:
-  //SEG226 [114] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG226 [114] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
     jmp b3
   //SEG227 sin16s::@3
   b3:
@@ -6585,10 +6616,10 @@ sin16s: {
   breturn:
   //SEG229 [115] return 
     rts
-  //SEG230 sin16s::@15
-  b15:
+  //SEG230 sin16s::@12
+  b12:
   //SEG231 [116] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
-    jmp b3_from_b15
+    jmp b3_from_b12
 }
 //SEG232 mulu16_sel
 // Calculate val*val for two unsigned word values - the result is 16 selected bits of the 32-bit result.
@@ -6611,9 +6642,9 @@ mulu16_sel: {
   //SEG235 [120] call mul16u 
     jsr mul16u
   //SEG236 [121] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-    jmp b2
-  //SEG237 mulu16_sel::@2
-  b2:
+    jmp b1
+  //SEG237 mulu16_sel::@1
+  b1:
   //SEG238 [122] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   //SEG239 [123] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5 -- vduz1=vduz1_rol_vbuxx 
     cpx #0
@@ -6683,12 +6714,12 @@ mul16u: {
   //SEG254 [130] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG255 [131] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG255 [131] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG256 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG256 mul16u::@3
+  b3:
   //SEG257 [132] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -6703,13 +6734,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG258 [133] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG259 [133] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG260 mul16u::@8
-  b8:
+  //SEG258 [133] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG259 [133] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG260 mul16u::@4
+  b4:
   //SEG261 [134] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -6719,11 +6750,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG263 [127] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG264 [127] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG265 [127] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG266 [127] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG263 [127] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG264 [127] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG265 [127] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG266 [127] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG267 div32u16u
@@ -6748,9 +6779,9 @@ div32u16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG272 [138] (word) divr16u::return#3 ← (word) divr16u::return#0
-    jmp b2
-  //SEG273 div32u16u::@2
-  b2:
+    jmp b1
+  //SEG273 div32u16u::@1
+  b1:
   //SEG274 [139] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#3 -- vwuz1=vwuz2 
     lda divr16u.return
     sta quotient_hi
@@ -6758,19 +6789,19 @@ div32u16u: {
     sta quotient_hi+1
   //SEG275 [140] (word) divr16u::rem#5 ← (word) rem16u#1
   //SEG276 [141] call divr16u 
-  //SEG277 [146] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  divr16u_from_b2:
-  //SEG278 [146] phi (word) divr16u::dividend#6 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG277 [146] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  divr16u_from_b1:
+  //SEG278 [146] phi (word) divr16u::dividend#6 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG279 [146] phi (word) divr16u::rem#11 = (word) divr16u::rem#5 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG279 [146] phi (word) divr16u::rem#11 = (word) divr16u::rem#5 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG280 [142] (word) divr16u::return#4 ← (word) divr16u::return#0
-    jmp b3
-  //SEG281 div32u16u::@3
-  b3:
+    jmp b2
+  //SEG281 div32u16u::@2
+  b2:
   //SEG282 [143] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#4
   //SEG283 [144] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda quotient_hi
@@ -6912,34 +6943,34 @@ sin8s_gen: {
   div16u_from_sin8s_gen:
     jsr div16u
   //SEG326 [166] (word) div16u::return#2 ← (word) div16u::return#0
-    jmp b3
-  //SEG327 sin8s_gen::@3
-  b3:
+    jmp b2
+  //SEG327 sin8s_gen::@2
+  b2:
   //SEG328 [167] (word) sin8s_gen::step#0 ← (word) div16u::return#2
-  //SEG329 [168] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
-  b1_from_b3:
-  //SEG330 [168] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG329 [168] phi from sin8s_gen::@2 to sin8s_gen::@1 [phi:sin8s_gen::@2->sin8s_gen::@1]
+  b1_from_b2:
+  //SEG330 [168] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG331 [168] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintabb#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- pbsz1=pbsc1 
+  //SEG331 [168] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintabb#0 [phi:sin8s_gen::@2->sin8s_gen::@1#1] -- pbsz1=pbsc1 
     lda #<main.sintabb
     sta sintab
     lda #>main.sintabb
     sta sintab+1
-  //SEG332 [168] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- vwuz1=vbuc1 
+  //SEG332 [168] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#2] -- vwuz1=vbuc1 
     lda #0
     sta x
     lda #0
     sta x+1
     jmp b1
   // u[4.12]
-  //SEG333 [168] phi from sin8s_gen::@4 to sin8s_gen::@1 [phi:sin8s_gen::@4->sin8s_gen::@1]
-  b1_from_b4:
-  //SEG334 [168] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@4->sin8s_gen::@1#0] -- register_copy 
-  //SEG335 [168] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@4->sin8s_gen::@1#1] -- register_copy 
-  //SEG336 [168] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@4->sin8s_gen::@1#2] -- register_copy 
+  //SEG333 [168] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
+  b1_from_b3:
+  //SEG334 [168] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- register_copy 
+  //SEG335 [168] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- register_copy 
+  //SEG336 [168] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- register_copy 
     jmp b1
   //SEG337 sin8s_gen::@1
   b1:
@@ -6951,9 +6982,9 @@ sin8s_gen: {
   //SEG339 [170] call sin8s 
     jsr sin8s
   //SEG340 [171] (signed byte) sin8s::return#0 ← (signed byte) sin8s::return#1
-    jmp b4
-  //SEG341 sin8s_gen::@4
-  b4:
+    jmp b3
+  //SEG341 sin8s_gen::@3
+  b3:
   //SEG342 [172] (signed byte~) sin8s_gen::$1 ← (signed byte) sin8s::return#0
   //SEG343 [173] *((signed byte*) sin8s_gen::sintab#2) ← (signed byte~) sin8s_gen::$1 -- _deref_pbsz1=vbsaa 
     ldy #0
@@ -6979,11 +7010,11 @@ sin8s_gen: {
   //SEG347 [177] if((word) sin8s_gen::i#1<(const word) main::wavelength#0) goto sin8s_gen::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
     bne !+
     lda i
     cmp #<main.wavelength
-    bcc b1_from_b4
+    bcc b1_from_b3
   !:
     jmp breturn
   //SEG348 sin8s_gen::@return
@@ -7092,45 +7123,45 @@ sin8s: {
   //SEG375 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#0 [phi:sin8s::@2->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG376 [190] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-    jmp b10
-  //SEG377 sin8s::@10
-  b10:
+    jmp b9
+  //SEG377 sin8s::@9
+  b9:
   //SEG378 [191] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   //SEG379 [192] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0 -- vbuxx=vbuaa 
     tax
   //SEG380 [193] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG381 [194] call mulu8_sel 
-  //SEG382 [222] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
-  mulu8_sel_from_b10:
-  //SEG383 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG382 [222] phi from sin8s::@9 to mulu8_sel [phi:sin8s::@9->mulu8_sel]
+  mulu8_sel_from_b9:
+  //SEG383 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@9->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG384 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@10->mulu8_sel#1] -- register_copy 
-  //SEG385 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
+  //SEG384 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@9->mulu8_sel#1] -- register_copy 
+  //SEG385 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@9->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG386 [195] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-    jmp b11
-  //SEG387 sin8s::@11
-  b11:
+    jmp b10
+  //SEG387 sin8s::@10
+  b10:
   //SEG388 [196] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1 -- vbuz1=vbuaa 
     sta x3
   //SEG389 [197] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0 -- vbuxx=vbuz1 
     ldx x3
   //SEG390 [198] call mulu8_sel 
-  //SEG391 [222] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
-  mulu8_sel_from_b11:
-  //SEG392 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG391 [222] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
+  mulu8_sel_from_b10:
+  //SEG392 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG393 [222] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@11->mulu8_sel#1] -- vbuyy=vbuc1 
+  //SEG393 [222] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@10->mulu8_sel#1] -- vbuyy=vbuc1 
     ldy #DIV_6
-  //SEG394 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
+  //SEG394 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG395 [199] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-    jmp b12
-  //SEG396 sin8s::@12
-  b12:
+    jmp b11
+  //SEG396 sin8s::@11
+  b11:
   //SEG397 [200] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   //SEG398 [201] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0 -- vbuz1=vbuz2_minus_vbuaa 
     eor #$ff
@@ -7142,36 +7173,36 @@ sin8s: {
   //SEG400 [203] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG401 [204] call mulu8_sel 
-  //SEG402 [222] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
-  mulu8_sel_from_b12:
-  //SEG403 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG402 [222] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
+  mulu8_sel_from_b11:
+  //SEG403 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG404 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
-  //SEG405 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
+  //SEG404 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@11->mulu8_sel#1] -- register_copy 
+  //SEG405 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG406 [205] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-    jmp b13
-  //SEG407 sin8s::@13
-  b13:
+    jmp b12
+  //SEG407 sin8s::@12
+  b12:
   //SEG408 [206] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   //SEG409 [207] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0 -- vbuxx=vbuaa 
     tax
   //SEG410 [208] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG411 [209] call mulu8_sel 
-  //SEG412 [222] phi from sin8s::@13 to mulu8_sel [phi:sin8s::@13->mulu8_sel]
-  mulu8_sel_from_b13:
-  //SEG413 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@13->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG412 [222] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
+  mulu8_sel_from_b12:
+  //SEG413 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG414 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@13->mulu8_sel#1] -- register_copy 
-  //SEG415 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@13->mulu8_sel#2] -- register_copy 
+  //SEG414 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
+  //SEG415 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG416 [210] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-    jmp b14
-  //SEG417 sin8s::@14
-  b14:
+    jmp b13
+  //SEG417 sin8s::@13
+  b13:
   //SEG418 [211] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   //SEG419 [212] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuaa=vbuaa_ror_4 
     lsr
@@ -7184,23 +7215,23 @@ sin8s: {
     tax
   //SEG421 [214] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$80
-    bcc b3_from_b14
+    bcc b3_from_b13
     jmp b7
   //SEG422 sin8s::@7
   b7:
   //SEG423 [215] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG424 [216] phi from sin8s::@14 sin8s::@7 to sin8s::@3 [phi:sin8s::@14/sin8s::@7->sin8s::@3]
-  b3_from_b14:
+  //SEG424 [216] phi from sin8s::@13 sin8s::@7 to sin8s::@3 [phi:sin8s::@13/sin8s::@7->sin8s::@3]
+  b3_from_b13:
   b3_from_b7:
-  //SEG425 [216] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@14/sin8s::@7->sin8s::@3#0] -- register_copy 
+  //SEG425 [216] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@13/sin8s::@7->sin8s::@3#0] -- register_copy 
     jmp b3
   //SEG426 sin8s::@3
   b3:
-  //SEG427 [217] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG427 [217] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
     jmp b8
   //SEG428 sin8s::@8
   b8:
@@ -7209,10 +7240,10 @@ sin8s: {
     eor #$ff
     clc
     adc #1
-  //SEG430 [219] phi from sin8s::@18 sin8s::@8 to sin8s::@4 [phi:sin8s::@18/sin8s::@8->sin8s::@4]
-  b4_from_b18:
+  //SEG430 [219] phi from sin8s::@14 sin8s::@8 to sin8s::@4 [phi:sin8s::@14/sin8s::@8->sin8s::@4]
+  b4_from_b14:
   b4_from_b8:
-  //SEG431 [219] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@18/sin8s::@8->sin8s::@4#0] -- register_copy 
+  //SEG431 [219] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@14/sin8s::@8->sin8s::@4#0] -- register_copy 
     jmp b4
   //SEG432 sin8s::@4
   b4:
@@ -7221,11 +7252,11 @@ sin8s: {
   breturn:
   //SEG434 [220] return 
     rts
-  //SEG435 sin8s::@18
-  b18:
+  //SEG435 sin8s::@14
+  b14:
   //SEG436 [221] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4 -- vbsaa=vbsxx 
     txa
-    jmp b4_from_b18
+    jmp b4_from_b14
 }
 //SEG437 mulu8_sel
 // Calculate val*val for two unsigned byte values - the result is 8 selected bits of the 16-bit result.
@@ -7241,9 +7272,9 @@ mulu8_sel: {
   //SEG440 [225] call mul8u 
     jsr mul8u
   //SEG441 [226] (word) mul8u::return#2 ← (word) mul8u::res#2
-    jmp b2
-  //SEG442 mulu8_sel::@2
-  b2:
+    jmp b1
+  //SEG442 mulu8_sel::@1
+  b1:
   //SEG443 [227] (word~) mulu8_sel::$0 ← (word) mul8u::return#2
   //SEG444 [228] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5 -- vwuz1=vwuz1_rol_vbuz2 
     ldy select
@@ -7298,12 +7329,12 @@ mul8u: {
   //SEG459 [235] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG460 [236] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG460 [236] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG461 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG461 mul8u::@3
+  b3:
   //SEG462 [237] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -7312,13 +7343,13 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG463 [238] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG464 [238] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG465 mul8u::@8
-  b8:
+  //SEG463 [238] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG464 [238] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG465 mul8u::@4
+  b4:
   //SEG466 [239] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -7326,11 +7357,11 @@ mul8u: {
   //SEG467 [240] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG468 [232] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG469 [232] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG470 [232] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG471 [232] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG468 [232] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG469 [232] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG470 [232] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG471 [232] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG472 div16u
@@ -7355,9 +7386,9 @@ div16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG477 [243] (word) divr16u::return#2 ← (word) divr16u::return#0
-    jmp b2
-  //SEG478 div16u::@2
-  b2:
+    jmp b1
+  //SEG478 div16u::@1
+  b1:
   //SEG479 [244] (word) div16u::return#0 ← (word) divr16u::return#2
     jmp breturn
   //SEG480 div16u::@return
@@ -7368,15 +7399,15 @@ div16u: {
   print_hextab: .text "0123456789abcdef"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b40
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b4
 Removing instruction jmp b5
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp b6
-Removing instruction jmp b1
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp b8
-Removing instruction jmp b9
+Removing instruction jmp b7
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -7384,36 +7415,36 @@ Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b3
-Removing instruction jmp b1
 Removing instruction jmp b4
 Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp breturn
 Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b5
 Removing instruction jmp b2
+Removing instruction jmp b7
 Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
-Removing instruction jmp b12
 Removing instruction jmp b6
 Removing instruction jmp b3
 Removing instruction jmp breturn
-Removing instruction jmp b2
-Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp breturn
 Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -7422,31 +7453,31 @@ Removing instruction jmp b5
 Removing instruction jmp b3
 Removing instruction jmp b6
 Removing instruction jmp breturn
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp b1
-Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b5
 Removing instruction jmp b1
 Removing instruction jmp b6
 Removing instruction jmp b2
+Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
 Removing instruction jmp b12
 Removing instruction jmp b13
-Removing instruction jmp b14
 Removing instruction jmp b7
 Removing instruction jmp b3
 Removing instruction jmp b8
 Removing instruction jmp b4
 Removing instruction jmp breturn
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda sw+1
@@ -7467,97 +7498,97 @@ Removing instruction lda #0
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b2_from_b1 with b2
-Replacing label b1_from_b9 with b1
+Replacing label b1_from_b7 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_print_sbyte with b1
-Replacing label b2_from_b5 with b2
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Replacing label b1_from_b4 with b1
-Replacing label b1_from_b4 with b1
+Replacing label b1_from_b3 with b1
+Replacing label b1_from_b3 with b1
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
-Replacing label b3_from_b15 with b3
-Replacing label b8_from_b2 with b8
+Replacing label b3_from_b12 with b3
+Replacing label b4_from_b2 with b4
 Replacing label b2_from_b1 with b2
 Replacing label b3_from_b2 with b3
 Replacing label b3_from_b2 with b3
 Replacing label b1_from_b3 with b1
-Replacing label b1_from_b4 with b1
-Replacing label b1_from_b4 with b1
+Replacing label b1_from_b3 with b1
+Replacing label b1_from_b3 with b1
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
-Replacing label b3_from_b14 with b3
-Replacing label b4_from_b18 with b4
-Replacing label b8_from_b2 with b8
-Removing instruction b40_from_bbegin:
-Removing instruction b40:
-Removing instruction main_from_b40:
-Removing instruction bend_from_b40:
-Removing instruction b5_from_main:
-Removing instruction sin16s_gen_from_b5:
-Removing instruction b6_from_b5:
-Removing instruction print_cls_from_b6:
-Removing instruction b1_from_b9:
+Replacing label b3_from_b13 with b3
+Replacing label b4_from_b14 with b4
+Replacing label b4_from_b2 with b4
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b4_from_main:
+Removing instruction sin16s_gen_from_b4:
+Removing instruction b5_from_b4:
+Removing instruction print_cls_from_b5:
+Removing instruction b1_from_b7:
 Removing instruction b3_from_b1:
 Removing instruction print_str_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b3:
-Removing instruction b8_from_b2:
-Removing instruction print_str_from_b8:
+Removing instruction b6_from_b2:
+Removing instruction print_str_from_b6:
 Removing instruction b1_from_print_str:
 Removing instruction b1_from_b2:
 Removing instruction b3_from_print_sbyte:
 Removing instruction print_char_from_b3:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction b1_from_print_sbyte:
 Removing instruction print_char_from_b1:
 Removing instruction b1_from_b1:
+Removing instruction b1_from_b2:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b4:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b5:
-Removing instruction mulu16_sel_from_b9:
-Removing instruction b3_from_b15:
+Removing instruction mulu16_sel_from_b8:
+Removing instruction b3_from_b12:
 Removing instruction b3_from_b6:
 Removing instruction breturn:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
 Removing instruction b3_from_b2:
 Removing instruction b3_from_b5:
 Removing instruction breturn:
+Removing instruction b1_from_b2:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b4:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b6:
-Removing instruction b3_from_b14:
+Removing instruction b3_from_b13:
 Removing instruction b3_from_b7:
-Removing instruction b4_from_b18:
+Removing instruction b4_from_b14:
 Removing instruction b4_from_b8:
 Removing instruction breturn:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction breturn:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction sin8s_gen_from_main:
+Removing instruction b4:
 Removing instruction b5:
+Removing instruction b1_from_b5:
+Removing instruction b3:
 Removing instruction b6:
-Removing instruction b1_from_b6:
-Removing instruction b3:
-Removing instruction b8:
-Removing instruction b9:
+Removing instruction b7:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b3:
 Removing instruction breturn:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction breturn:
 Removing instruction print_char_from_print_byte:
 Removing instruction b1:
@@ -7566,45 +7597,47 @@ Removing instruction breturn:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
 Removing instruction div32u16u_from_sin16s_gen:
+Removing instruction b2:
 Removing instruction b3:
-Removing instruction b4:
 Removing instruction breturn:
 Removing instruction b4:
 Removing instruction b1_from_b4:
 Removing instruction b5:
 Removing instruction mulu16_sel_from_b2:
+Removing instruction b7:
+Removing instruction mulu16_sel_from_b7:
 Removing instruction b8:
-Removing instruction mulu16_sel_from_b8:
 Removing instruction b9:
+Removing instruction mulu16_sel_from_b9:
 Removing instruction b10:
 Removing instruction mulu16_sel_from_b10:
 Removing instruction b11:
-Removing instruction mulu16_sel_from_b11:
-Removing instruction b12:
 Removing instruction b6:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction b1_from_mul16u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
-Removing instruction divr16u_from_div32u16u:
-Removing instruction b2:
-Removing instruction divr16u_from_b2:
 Removing instruction b3:
+Removing instruction b1_from_b4:
+Removing instruction divr16u_from_div32u16u:
+Removing instruction b1:
+Removing instruction divr16u_from_b1:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction b1_from_divr16u:
 Removing instruction b4:
 Removing instruction b5:
 Removing instruction b6:
 Removing instruction div16u_from_sin8s_gen:
+Removing instruction b2:
 Removing instruction b3:
-Removing instruction b4:
 Removing instruction breturn:
 Removing instruction b5:
 Removing instruction b1_from_b5:
 Removing instruction b6:
 Removing instruction mulu8_sel_from_b2:
+Removing instruction b9:
+Removing instruction mulu8_sel_from_b9:
 Removing instruction b10:
 Removing instruction mulu8_sel_from_b10:
 Removing instruction b11:
@@ -7612,23 +7645,21 @@ Removing instruction mulu8_sel_from_b11:
 Removing instruction b12:
 Removing instruction mulu8_sel_from_b12:
 Removing instruction b13:
-Removing instruction mulu8_sel_from_b13:
-Removing instruction b14:
 Removing instruction b7:
 Removing instruction b8:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction b1_from_mul8u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
+Removing instruction b3:
+Removing instruction b1_from_b4:
 Removing instruction divr16u_from_div16u:
-Removing instruction b2:
+Removing instruction b1:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b3 in beq b15
+Skipping double jump to b3 in beq b12
 Succesful ASM optimization Pass5DoubleJumpElimination
 Relabelling long label b1_from_sin16s to b4
 Relabelling long label b1_from_sin8s to b5
@@ -7643,13 +7674,13 @@ Removing instruction lda #0
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
-Removing instruction b15:
+Removing instruction b12:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b3
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @40
+(label) @1
 (label) @begin
 (label) @end
 (word) PI2_u4f12
@@ -7665,7 +7696,7 @@ FINAL SYMBOL TABLE
 (dword) PI_u4f28
 (const dword) PI_u4f28#0 PI_u4f28 = (dword/signed dword) $3243f6a9
 (word()) div16u((word) div16u::dividend , (word) div16u::divisor)
-(label) div16u::@2
+(label) div16u::@1
 (label) div16u::@return
 (word) div16u::dividend
 (word) div16u::divisor
@@ -7673,8 +7704,8 @@ FINAL SYMBOL TABLE
 (word) div16u::return#0 return zp ZP_WORD:15 1.3333333333333333
 (word) div16u::return#2 return zp ZP_WORD:15 4.0
 (dword()) div32u16u((dword) div32u16u::dividend , (word) div32u16u::divisor)
+(label) div32u16u::@1
 (label) div32u16u::@2
-(label) div32u16u::@3
 (label) div32u16u::@return
 (dword) div32u16u::dividend
 (word) div32u16u::divisor
@@ -7730,10 +7761,10 @@ FINAL SYMBOL TABLE
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
 (label) main::@6
-(label) main::@8
-(label) main::@9
+(label) main::@7
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
@@ -7756,8 +7787,8 @@ FINAL SYMBOL TABLE
 (byte/word~) mul16u::$1 reg byte a 202.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:21 101.0
@@ -7779,8 +7810,8 @@ FINAL SYMBOL TABLE
 (byte~) mul8u::$1 reg byte a 202.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 101.0
@@ -7801,7 +7832,7 @@ FINAL SYMBOL TABLE
 (word()) mulu16_sel((word) mulu16_sel::v1 , (word) mulu16_sel::v2 , (byte) mulu16_sel::select)
 (dword~) mulu16_sel::$0 $0 zp ZP_DWORD:11 4.0
 (dword~) mulu16_sel::$1 $1 zp ZP_DWORD:11 4.0
-(label) mulu16_sel::@2
+(label) mulu16_sel::@1
 (label) mulu16_sel::@return
 (word) mulu16_sel::return
 (word) mulu16_sel::return#0 return zp ZP_WORD:19 4.0
@@ -7828,7 +7859,7 @@ FINAL SYMBOL TABLE
 (byte()) mulu8_sel((byte) mulu8_sel::v1 , (byte) mulu8_sel::v2 , (byte) mulu8_sel::select)
 (word~) mulu8_sel::$0 $0 zp ZP_WORD:19 4.0
 (word~) mulu8_sel::$1 $1 zp ZP_WORD:19 4.0
-(label) mulu8_sel::@2
+(label) mulu8_sel::@1
 (label) mulu8_sel::@return
 (byte) mulu8_sel::return
 (byte) mulu8_sel::return#0 reg byte a 4.0
@@ -7886,7 +7917,7 @@ FINAL SYMBOL TABLE
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 b zp ZP_BYTE:4 4.0
@@ -7912,12 +7943,12 @@ FINAL SYMBOL TABLE
 (label) sin16s::@10
 (label) sin16s::@11
 (label) sin16s::@12
-(label) sin16s::@15
 (label) sin16s::@2
 (label) sin16s::@3
 (label) sin16s::@4
 (label) sin16s::@5
 (label) sin16s::@6
+(label) sin16s::@7
 (label) sin16s::@8
 (label) sin16s::@9
 (label) sin16s::@return
@@ -7955,8 +7986,8 @@ FINAL SYMBOL TABLE
 (void()) sin16s_gen((signed word*) sin16s_gen::sintab , (word) sin16s_gen::wavelength)
 (signed word~) sin16s_gen::$1 $1 zp ZP_WORD:15 22.0
 (label) sin16s_gen::@1
+(label) sin16s_gen::@2
 (label) sin16s_gen::@3
-(label) sin16s_gen::@4
 (label) sin16s_gen::@return
 (word) sin16s_gen::i
 (word) sin16s_gen::i#1 i zp ZP_WORD:5 16.5
@@ -7978,7 +8009,6 @@ FINAL SYMBOL TABLE
 (label) sin8s::@12
 (label) sin8s::@13
 (label) sin8s::@14
-(label) sin8s::@18
 (label) sin8s::@2
 (label) sin8s::@3
 (label) sin8s::@4
@@ -7986,6 +8016,7 @@ FINAL SYMBOL TABLE
 (label) sin8s::@6
 (label) sin8s::@7
 (label) sin8s::@8
+(label) sin8s::@9
 (label) sin8s::@return
 (byte) sin8s::DIV_6
 (const byte) sin8s::DIV_6#0 DIV_6 = (byte/signed byte/word/signed word/dword/signed dword) $2b
@@ -8025,8 +8056,8 @@ FINAL SYMBOL TABLE
 (void()) sin8s_gen((signed byte*) sin8s_gen::sintab , (word) sin8s_gen::wavelength)
 (signed byte~) sin8s_gen::$1 reg byte a 22.0
 (label) sin8s_gen::@1
+(label) sin8s_gen::@2
 (label) sin8s_gen::@3
-(label) sin8s_gen::@4
 (label) sin8s_gen::@return
 (word) sin8s_gen::i
 (word) sin8s_gen::i#1 i zp ZP_WORD:17 16.5
@@ -8114,11 +8145,11 @@ Score: 28330
   .label rem16u = 2
   .label print_char_cursor = 5
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-//SEG5 @40
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @40 to main [phi:@40->main]
-//SEG8 [3] phi from @40 to @end [phi:@40->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -8132,27 +8163,27 @@ main: {
   //SEG11 [5] call sin8s_gen 
   //SEG12 [164] phi from main to sin8s_gen [phi:main->sin8s_gen]
     jsr sin8s_gen
-  //SEG13 [6] phi from main to main::@5 [phi:main->main::@5]
-  //SEG14 main::@5
+  //SEG13 [6] phi from main to main::@4 [phi:main->main::@4]
+  //SEG14 main::@4
   //SEG15 [7] call sin16s_gen 
-  //SEG16 [62] phi from main::@5 to sin16s_gen [phi:main::@5->sin16s_gen]
+  //SEG16 [62] phi from main::@4 to sin16s_gen [phi:main::@4->sin16s_gen]
     jsr sin16s_gen
-  //SEG17 [8] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  //SEG18 main::@6
+  //SEG17 [8] phi from main::@4 to main::@5 [phi:main::@4->main::@5]
+  //SEG18 main::@5
   //SEG19 [9] call print_cls 
-  //SEG20 [56] phi from main::@6 to print_cls [phi:main::@6->print_cls]
+  //SEG20 [56] phi from main::@5 to print_cls [phi:main::@5->print_cls]
     jsr print_cls
-  //SEG21 [10] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
-  //SEG22 [10] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@6->main::@1#0] -- pbuz1=pbuc1 
+  //SEG21 [10] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  //SEG22 [10] phi (byte*) print_char_cursor#45 = (const byte*) print_line_cursor#0 [phi:main::@5->main::@1#0] -- pbuz1=pbuc1 
     lda #<print_line_cursor
     sta print_char_cursor
     lda #>print_line_cursor
     sta print_char_cursor+1
-  //SEG23 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@1#1] -- vbuxx=vbuc1 
+  //SEG23 [10] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@5->main::@1#1] -- vbuxx=vbuc1 
     ldx #0
-  //SEG24 [10] phi from main::@9 to main::@1 [phi:main::@9->main::@1]
-  //SEG25 [10] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@9->main::@1#0] -- register_copy 
-  //SEG26 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@9->main::@1#1] -- register_copy 
+  //SEG24 [10] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
+  //SEG25 [10] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#2 [phi:main::@7->main::@1#0] -- register_copy 
+  //SEG26 [10] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#1] -- register_copy 
   //SEG27 main::@1
   b1:
   //SEG28 [11] (signed byte) main::sb#0 ← *((const signed byte[$c0]) main::sintabb#0 + (byte) main::i#2) -- vbsz1=pbsc1_derefidx_vbuxx 
@@ -8207,18 +8238,18 @@ main: {
   //SEG45 [22] (signed byte) print_sbyte::b#1 ← (signed byte) main::sd#0
   //SEG46 [23] call print_sbyte 
     jsr print_sbyte
-  //SEG47 [24] phi from main::@2 to main::@8 [phi:main::@2->main::@8]
-  //SEG48 main::@8
+  //SEG47 [24] phi from main::@2 to main::@6 [phi:main::@2->main::@6]
+  //SEG48 main::@6
   //SEG49 [25] call print_str 
-  //SEG50 [29] phi from main::@8 to print_str [phi:main::@8->print_str]
-  //SEG51 [29] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@8->print_str#0] -- register_copy 
-  //SEG52 [29] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@8->print_str#1] -- pbuz1=pbuc1 
+  //SEG50 [29] phi from main::@6 to print_str [phi:main::@6->print_str]
+  //SEG51 [29] phi (byte*) print_char_cursor#47 = (byte*) print_char_cursor#10 [phi:main::@6->print_str#0] -- register_copy 
+  //SEG52 [29] phi (byte*) print_str::str#5 = (const string) main::str [phi:main::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG53 main::@9
+  //SEG53 main::@7
   //SEG54 [26] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
   //SEG55 [27] if((byte) main::i#1!=(byte/word/signed word/dword/signed dword) $c0) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
@@ -8284,8 +8315,8 @@ print_sbyte: {
   //SEG77 [45] phi (byte) print_char::ch#4 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG78 [39] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
-  //SEG79 [39] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  //SEG78 [39] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
+  //SEG79 [39] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
   //SEG80 print_sbyte::@2
   b2:
   //SEG81 [40] call print_byte 
@@ -8302,7 +8333,7 @@ print_sbyte: {
   //SEG89 [45] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG90 print_sbyte::@5
+  //SEG90 print_sbyte::@4
   //SEG91 [44] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
@@ -8409,29 +8440,29 @@ sin16s_gen: {
   //SEG126 [136] phi from sin16s_gen to div32u16u [phi:sin16s_gen->div32u16u]
     jsr div32u16u
   //SEG127 [64] (dword) div32u16u::return#2 ← (dword) div32u16u::return#0
-  //SEG128 sin16s_gen::@3
+  //SEG128 sin16s_gen::@2
   //SEG129 [65] (dword) sin16s_gen::step#0 ← (dword) div32u16u::return#2
-  //SEG130 [66] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
-  //SEG131 [66] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG130 [66] phi from sin16s_gen::@2 to sin16s_gen::@1 [phi:sin16s_gen::@2->sin16s_gen::@1]
+  //SEG131 [66] phi (word) sin16s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG132 [66] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$c0]) main::sintabw#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- pwsz1=pwsc1 
+  //SEG132 [66] phi (signed word*) sin16s_gen::sintab#2 = (const signed word[$c0]) main::sintabw#0 [phi:sin16s_gen::@2->sin16s_gen::@1#1] -- pwsz1=pwsc1 
     lda #<main.sintabw
     sta sintab
     lda #>main.sintabw
     sta sintab+1
-  //SEG133 [66] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- vduz1=vbuc1 
+  //SEG133 [66] phi (dword) sin16s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s_gen::@2->sin16s_gen::@1#2] -- vduz1=vbuc1 
     lda #0
     sta x
     sta x+1
     sta x+2
     sta x+3
   // u[4.28]
-  //SEG134 [66] phi from sin16s_gen::@4 to sin16s_gen::@1 [phi:sin16s_gen::@4->sin16s_gen::@1]
-  //SEG135 [66] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@4->sin16s_gen::@1#0] -- register_copy 
-  //SEG136 [66] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@4->sin16s_gen::@1#1] -- register_copy 
-  //SEG137 [66] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@4->sin16s_gen::@1#2] -- register_copy 
+  //SEG134 [66] phi from sin16s_gen::@3 to sin16s_gen::@1 [phi:sin16s_gen::@3->sin16s_gen::@1]
+  //SEG135 [66] phi (word) sin16s_gen::i#2 = (word) sin16s_gen::i#1 [phi:sin16s_gen::@3->sin16s_gen::@1#0] -- register_copy 
+  //SEG136 [66] phi (signed word*) sin16s_gen::sintab#2 = (signed word*) sin16s_gen::sintab#0 [phi:sin16s_gen::@3->sin16s_gen::@1#1] -- register_copy 
+  //SEG137 [66] phi (dword) sin16s_gen::x#2 = (dword) sin16s_gen::x#1 [phi:sin16s_gen::@3->sin16s_gen::@1#2] -- register_copy 
   //SEG138 sin16s_gen::@1
   b1:
   //SEG139 [67] (dword) sin16s::x#0 ← (dword) sin16s_gen::x#2 -- vduz1=vduz2 
@@ -8446,7 +8477,7 @@ sin16s_gen: {
   //SEG140 [68] call sin16s 
     jsr sin16s
   //SEG141 [69] (signed word) sin16s::return#0 ← (signed word) sin16s::return#1
-  //SEG142 sin16s_gen::@4
+  //SEG142 sin16s_gen::@3
   //SEG143 [70] (signed word~) sin16s_gen::$1 ← (signed word) sin16s::return#0
   //SEG144 [71] *((signed word*) sin16s_gen::sintab#2) ← (signed word~) sin16s_gen::$1 -- _deref_pwsz1=vwsz2 
     ldy #0
@@ -8628,7 +8659,7 @@ sin16s: {
   //SEG176 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#0 [phi:sin16s::@2->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG177 [88] (word) mulu16_sel::return#0 ← (word) mulu16_sel::return#12
-  //SEG178 sin16s::@8
+  //SEG178 sin16s::@7
   //SEG179 [89] (word) sin16s::x2#0 ← (word) mulu16_sel::return#0 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta x2
@@ -8641,33 +8672,33 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG182 [92] call mulu16_sel 
-  //SEG183 [117] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
-  //SEG184 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG183 [117] phi from sin16s::@7 to mulu16_sel [phi:sin16s::@7->mulu16_sel]
+  //SEG184 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@7->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG185 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@8->mulu16_sel#1] -- register_copy 
-  //SEG186 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
+  //SEG185 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#1 [phi:sin16s::@7->mulu16_sel#1] -- register_copy 
+  //SEG186 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#1 [phi:sin16s::@7->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG187 [93] (word) mulu16_sel::return#1 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_1
     lda mulu16_sel.return+1
     sta mulu16_sel.return_1+1
-  //SEG188 sin16s::@9
+  //SEG188 sin16s::@8
   //SEG189 [94] (word) sin16s::x3#0 ← (word) mulu16_sel::return#1
   //SEG190 [95] (word) mulu16_sel::v1#2 ← (word) sin16s::x3#0
   //SEG191 [96] call mulu16_sel 
-  //SEG192 [117] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
-  //SEG193 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG192 [117] phi from sin16s::@8 to mulu16_sel [phi:sin16s::@8->mulu16_sel]
+  //SEG193 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin16s::@8->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #1
-  //SEG194 [117] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@9->mulu16_sel#1] -- vwuz1=vwuc1 
+  //SEG194 [117] phi (word) mulu16_sel::v2#5 = (dword/signed dword) $10000/(byte/signed byte/word/signed word/dword/signed dword) 6 [phi:sin16s::@8->mulu16_sel#1] -- vwuz1=vwuc1 
     lda #<$10000/6
     sta mulu16_sel.v2
     lda #>$10000/6
     sta mulu16_sel.v2+1
-  //SEG195 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
+  //SEG195 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#2 [phi:sin16s::@8->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG196 [97] (word) mulu16_sel::return#2 ← (word) mulu16_sel::return#12
-  //SEG197 sin16s::@10
+  //SEG197 sin16s::@9
   //SEG198 [98] (word) sin16s::x3_6#0 ← (word) mulu16_sel::return#2
   //SEG199 [99] (word) sin16s::usinx#0 ← (word) sin16s::x1#0 - (word) sin16s::x3_6#0 -- vwuz1=vwuz2_minus_vwuz3 
     lda x1
@@ -8684,18 +8715,18 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG202 [102] call mulu16_sel 
-  //SEG203 [117] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
-  //SEG204 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG203 [117] phi from sin16s::@9 to mulu16_sel [phi:sin16s::@9->mulu16_sel]
+  //SEG204 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@9->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG205 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
-  //SEG206 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
+  //SEG205 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#3 [phi:sin16s::@9->mulu16_sel#1] -- register_copy 
+  //SEG206 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#3 [phi:sin16s::@9->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG207 [103] (word) mulu16_sel::return#10 ← (word) mulu16_sel::return#12 -- vwuz1=vwuz2 
     lda mulu16_sel.return
     sta mulu16_sel.return_10
     lda mulu16_sel.return+1
     sta mulu16_sel.return_10+1
-  //SEG208 sin16s::@11
+  //SEG208 sin16s::@10
   //SEG209 [104] (word) sin16s::x4#0 ← (word) mulu16_sel::return#10
   //SEG210 [105] (word) mulu16_sel::v1#4 ← (word) sin16s::x4#0
   //SEG211 [106] (word) mulu16_sel::v2#4 ← (word) sin16s::x1#0 -- vwuz1=vwuz2 
@@ -8704,14 +8735,14 @@ sin16s: {
     lda x1+1
     sta mulu16_sel.v2+1
   //SEG212 [107] call mulu16_sel 
-  //SEG213 [117] phi from sin16s::@11 to mulu16_sel [phi:sin16s::@11->mulu16_sel]
-  //SEG214 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@11->mulu16_sel#0] -- vbuxx=vbuc1 
+  //SEG213 [117] phi from sin16s::@10 to mulu16_sel [phi:sin16s::@10->mulu16_sel]
+  //SEG214 [117] phi (byte) mulu16_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin16s::@10->mulu16_sel#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG215 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@11->mulu16_sel#1] -- register_copy 
-  //SEG216 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@11->mulu16_sel#2] -- register_copy 
+  //SEG215 [117] phi (word) mulu16_sel::v2#5 = (word) mulu16_sel::v2#4 [phi:sin16s::@10->mulu16_sel#1] -- register_copy 
+  //SEG216 [117] phi (word) mulu16_sel::v1#5 = (word) mulu16_sel::v1#4 [phi:sin16s::@10->mulu16_sel#2] -- register_copy 
     jsr mulu16_sel
   //SEG217 [108] (word) mulu16_sel::return#11 ← (word) mulu16_sel::return#12
-  //SEG218 sin16s::@12
+  //SEG218 sin16s::@11
   //SEG219 [109] (word) sin16s::x5#0 ← (word) mulu16_sel::return#11
   //SEG220 [110] (word) sin16s::x5_128#0 ← (word) sin16s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vwuz1=vwuz1_ror_4 
     ldy #4
@@ -8728,7 +8759,7 @@ sin16s: {
     lda usinx+1
     adc x5_128+1
     sta usinx+1
-  //SEG222 [112] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@15 -- vbuz1_eq_0_then_la1 
+  //SEG222 [112] if((byte) sin16s::isUpper#2==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin16s::@12 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
     beq b3
@@ -8743,14 +8774,14 @@ sin16s: {
     eor #$ff
     adc #0
     sta sinx+1
-  //SEG225 [114] phi from sin16s::@15 sin16s::@6 to sin16s::@3 [phi:sin16s::@15/sin16s::@6->sin16s::@3]
-  //SEG226 [114] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@15/sin16s::@6->sin16s::@3#0] -- register_copy 
+  //SEG225 [114] phi from sin16s::@12 sin16s::@6 to sin16s::@3 [phi:sin16s::@12/sin16s::@6->sin16s::@3]
+  //SEG226 [114] phi (signed word) sin16s::return#1 = (signed word~) sin16s::return#5 [phi:sin16s::@12/sin16s::@6->sin16s::@3#0] -- register_copy 
   //SEG227 sin16s::@3
   b3:
   //SEG228 sin16s::@return
   //SEG229 [115] return 
     rts
-  //SEG230 sin16s::@15
+  //SEG230 sin16s::@12
   //SEG231 [116] (signed word~) sin16s::return#5 ← (signed word)(word) sin16s::usinx#1
 }
 //SEG232 mulu16_sel
@@ -8774,7 +8805,7 @@ mulu16_sel: {
   //SEG235 [120] call mul16u 
     jsr mul16u
   //SEG236 [121] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  //SEG237 mulu16_sel::@2
+  //SEG237 mulu16_sel::@1
   //SEG238 [122] (dword~) mulu16_sel::$0 ← (dword) mul16u::return#2
   //SEG239 [123] (dword~) mulu16_sel::$1 ← (dword~) mulu16_sel::$0 << (byte) mulu16_sel::select#5 -- vduz1=vduz1_rol_vbuxx 
     cpx #0
@@ -8836,10 +8867,10 @@ mul16u: {
   //SEG254 [130] (byte/word~) mul16u::$1 ← (word) mul16u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG255 [131] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG255 [131] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG256 mul16u::@6
+    beq b4
+  //SEG256 mul16u::@3
   //SEG257 [132] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -8854,10 +8885,10 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG258 [133] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  //SEG259 [133] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-  //SEG260 mul16u::@8
-  b8:
+  //SEG258 [133] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  //SEG259 [133] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+  //SEG260 mul16u::@4
+  b4:
   //SEG261 [134] (word) mul16u::a#0 ← (word) mul16u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -8867,10 +8898,10 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG263 [127] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  //SEG264 [127] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG265 [127] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG266 [127] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG263 [127] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  //SEG264 [127] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG265 [127] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG266 [127] phi (word) mul16u::a#2 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG267 div32u16u
@@ -8893,7 +8924,7 @@ div32u16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG272 [138] (word) divr16u::return#3 ← (word) divr16u::return#0
-  //SEG273 div32u16u::@2
+  //SEG273 div32u16u::@1
   //SEG274 [139] (word) div32u16u::quotient_hi#0 ← (word) divr16u::return#3 -- vwuz1=vwuz2 
     lda divr16u.return
     sta quotient_hi
@@ -8901,16 +8932,16 @@ div32u16u: {
     sta quotient_hi+1
   //SEG275 [140] (word) divr16u::rem#5 ← (word) rem16u#1
   //SEG276 [141] call divr16u 
-  //SEG277 [146] phi from div32u16u::@2 to divr16u [phi:div32u16u::@2->divr16u]
-  //SEG278 [146] phi (word) divr16u::dividend#6 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@2->divr16u#0] -- vwuz1=vwuc1 
+  //SEG277 [146] phi from div32u16u::@1 to divr16u [phi:div32u16u::@1->divr16u]
+  //SEG278 [146] phi (word) divr16u::dividend#6 = <(const dword) PI2_u4f28#0 [phi:div32u16u::@1->divr16u#0] -- vwuz1=vwuc1 
     lda #<PI2_u4f28&$ffff
     sta divr16u.dividend
     lda #>PI2_u4f28&$ffff
     sta divr16u.dividend+1
-  //SEG279 [146] phi (word) divr16u::rem#11 = (word) divr16u::rem#5 [phi:div32u16u::@2->divr16u#1] -- register_copy 
+  //SEG279 [146] phi (word) divr16u::rem#11 = (word) divr16u::rem#5 [phi:div32u16u::@1->divr16u#1] -- register_copy 
     jsr divr16u
   //SEG280 [142] (word) divr16u::return#4 ← (word) divr16u::return#0
-  //SEG281 div32u16u::@3
+  //SEG281 div32u16u::@2
   //SEG282 [143] (word) div32u16u::quotient_lo#0 ← (word) divr16u::return#4
   //SEG283 [144] (dword) div32u16u::return#0 ← (word) div32u16u::quotient_hi#0 dw= (word) div32u16u::quotient_lo#0 -- vduz1=vwuz2_dword_vwuz3 
     lda quotient_hi
@@ -9030,27 +9061,27 @@ sin8s_gen: {
   //SEG325 [241] phi from sin8s_gen to div16u [phi:sin8s_gen->div16u]
     jsr div16u
   //SEG326 [166] (word) div16u::return#2 ← (word) div16u::return#0
-  //SEG327 sin8s_gen::@3
+  //SEG327 sin8s_gen::@2
   //SEG328 [167] (word) sin8s_gen::step#0 ← (word) div16u::return#2
-  //SEG329 [168] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
-  //SEG330 [168] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- vwuz1=vbuc1 
+  //SEG329 [168] phi from sin8s_gen::@2 to sin8s_gen::@1 [phi:sin8s_gen::@2->sin8s_gen::@1]
+  //SEG330 [168] phi (word) sin8s_gen::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG331 [168] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintabb#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- pbsz1=pbsc1 
+  //SEG331 [168] phi (signed byte*) sin8s_gen::sintab#2 = (const signed byte[$c0]) main::sintabb#0 [phi:sin8s_gen::@2->sin8s_gen::@1#1] -- pbsz1=pbsc1 
     lda #<main.sintabb
     sta sintab
     lda #>main.sintabb
     sta sintab+1
-  //SEG332 [168] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- vwuz1=vbuc1 
+  //SEG332 [168] phi (word) sin8s_gen::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s_gen::@2->sin8s_gen::@1#2] -- vwuz1=vbuc1 
     lda #0
     sta x
     sta x+1
   // u[4.12]
-  //SEG333 [168] phi from sin8s_gen::@4 to sin8s_gen::@1 [phi:sin8s_gen::@4->sin8s_gen::@1]
-  //SEG334 [168] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@4->sin8s_gen::@1#0] -- register_copy 
-  //SEG335 [168] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@4->sin8s_gen::@1#1] -- register_copy 
-  //SEG336 [168] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@4->sin8s_gen::@1#2] -- register_copy 
+  //SEG333 [168] phi from sin8s_gen::@3 to sin8s_gen::@1 [phi:sin8s_gen::@3->sin8s_gen::@1]
+  //SEG334 [168] phi (word) sin8s_gen::i#2 = (word) sin8s_gen::i#1 [phi:sin8s_gen::@3->sin8s_gen::@1#0] -- register_copy 
+  //SEG335 [168] phi (signed byte*) sin8s_gen::sintab#2 = (signed byte*) sin8s_gen::sintab#0 [phi:sin8s_gen::@3->sin8s_gen::@1#1] -- register_copy 
+  //SEG336 [168] phi (word) sin8s_gen::x#2 = (word) sin8s_gen::x#1 [phi:sin8s_gen::@3->sin8s_gen::@1#2] -- register_copy 
   //SEG337 sin8s_gen::@1
   b1:
   //SEG338 [169] (word) sin8s::x#0 ← (word) sin8s_gen::x#2 -- vwuz1=vwuz2 
@@ -9061,7 +9092,7 @@ sin8s_gen: {
   //SEG339 [170] call sin8s 
     jsr sin8s
   //SEG340 [171] (signed byte) sin8s::return#0 ← (signed byte) sin8s::return#1
-  //SEG341 sin8s_gen::@4
+  //SEG341 sin8s_gen::@3
   //SEG342 [172] (signed byte~) sin8s_gen::$1 ← (signed byte) sin8s::return#0
   //SEG343 [173] *((signed byte*) sin8s_gen::sintab#2) ← (signed byte~) sin8s_gen::$1 -- _deref_pbsz1=vbsaa 
     ldy #0
@@ -9188,37 +9219,37 @@ sin8s: {
   //SEG375 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#0 [phi:sin8s::@2->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG376 [190] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-  //SEG377 sin8s::@10
+  //SEG377 sin8s::@9
   //SEG378 [191] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   //SEG379 [192] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0 -- vbuxx=vbuaa 
     tax
   //SEG380 [193] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG381 [194] call mulu8_sel 
-  //SEG382 [222] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
-  //SEG383 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG382 [222] phi from sin8s::@9 to mulu8_sel [phi:sin8s::@9->mulu8_sel]
+  //SEG383 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@9->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG384 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@10->mulu8_sel#1] -- register_copy 
-  //SEG385 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
+  //SEG384 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@9->mulu8_sel#1] -- register_copy 
+  //SEG385 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@9->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG386 [195] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-  //SEG387 sin8s::@11
+  //SEG387 sin8s::@10
   //SEG388 [196] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1 -- vbuz1=vbuaa 
     sta x3
   //SEG389 [197] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0 -- vbuxx=vbuz1 
     tax
   //SEG390 [198] call mulu8_sel 
-  //SEG391 [222] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
-  //SEG392 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG391 [222] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
+  //SEG392 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG393 [222] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@11->mulu8_sel#1] -- vbuyy=vbuc1 
+  //SEG393 [222] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@10->mulu8_sel#1] -- vbuyy=vbuc1 
     ldy #DIV_6
-  //SEG394 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
+  //SEG394 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG395 [199] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-  //SEG396 sin8s::@12
+  //SEG396 sin8s::@11
   //SEG397 [200] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   //SEG398 [201] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0 -- vbuz1=vbuz2_minus_vbuaa 
     eor #$ff
@@ -9230,30 +9261,30 @@ sin8s: {
   //SEG400 [203] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG401 [204] call mulu8_sel 
-  //SEG402 [222] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
-  //SEG403 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG402 [222] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
+  //SEG403 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG404 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
-  //SEG405 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
+  //SEG404 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@11->mulu8_sel#1] -- register_copy 
+  //SEG405 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG406 [205] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-  //SEG407 sin8s::@13
+  //SEG407 sin8s::@12
   //SEG408 [206] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   //SEG409 [207] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0 -- vbuxx=vbuaa 
     tax
   //SEG410 [208] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG411 [209] call mulu8_sel 
-  //SEG412 [222] phi from sin8s::@13 to mulu8_sel [phi:sin8s::@13->mulu8_sel]
-  //SEG413 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@13->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG412 [222] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
+  //SEG413 [222] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG414 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@13->mulu8_sel#1] -- register_copy 
-  //SEG415 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@13->mulu8_sel#2] -- register_copy 
+  //SEG414 [222] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
+  //SEG415 [222] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG416 [210] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-  //SEG417 sin8s::@14
+  //SEG417 sin8s::@13
   //SEG418 [211] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   //SEG419 [212] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuaa=vbuaa_ror_4 
     lsr
@@ -9270,29 +9301,29 @@ sin8s: {
   //SEG422 sin8s::@7
   //SEG423 [215] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG424 [216] phi from sin8s::@14 sin8s::@7 to sin8s::@3 [phi:sin8s::@14/sin8s::@7->sin8s::@3]
-  //SEG425 [216] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@14/sin8s::@7->sin8s::@3#0] -- register_copy 
+  //SEG424 [216] phi from sin8s::@13 sin8s::@7 to sin8s::@3 [phi:sin8s::@13/sin8s::@7->sin8s::@3]
+  //SEG425 [216] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@13/sin8s::@7->sin8s::@3#0] -- register_copy 
   //SEG426 sin8s::@3
   b3:
-  //SEG427 [217] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG427 [217] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
   //SEG428 sin8s::@8
   //SEG429 [218] (signed byte) sin8s::sinx#1 ← - (signed byte)(byte) sin8s::usinx#4 -- vbsaa=_neg_vbsxx 
     txa
     eor #$ff
     clc
     adc #1
-  //SEG430 [219] phi from sin8s::@18 sin8s::@8 to sin8s::@4 [phi:sin8s::@18/sin8s::@8->sin8s::@4]
-  //SEG431 [219] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@18/sin8s::@8->sin8s::@4#0] -- register_copy 
+  //SEG430 [219] phi from sin8s::@14 sin8s::@8 to sin8s::@4 [phi:sin8s::@14/sin8s::@8->sin8s::@4]
+  //SEG431 [219] phi (signed byte) sin8s::return#1 = (signed byte~) sin8s::return#5 [phi:sin8s::@14/sin8s::@8->sin8s::@4#0] -- register_copy 
   //SEG432 sin8s::@4
   b4:
   //SEG433 sin8s::@return
   //SEG434 [220] return 
     rts
-  //SEG435 sin8s::@18
-  b18:
+  //SEG435 sin8s::@14
+  b14:
   //SEG436 [221] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4 -- vbsaa=vbsxx 
     txa
     jmp b4
@@ -9311,7 +9342,7 @@ mulu8_sel: {
   //SEG440 [225] call mul8u 
     jsr mul8u
   //SEG441 [226] (word) mul8u::return#2 ← (word) mul8u::res#2
-  //SEG442 mulu8_sel::@2
+  //SEG442 mulu8_sel::@1
   //SEG443 [227] (word~) mulu8_sel::$0 ← (word) mul8u::return#2
   //SEG444 [228] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5 -- vwuz1=vwuz1_rol_vbuz2 
     ldy select
@@ -9358,10 +9389,10 @@ mul8u: {
   //SEG459 [235] (byte~) mul8u::$1 ← (byte) mul8u::a#2 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG460 [236] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG460 [236] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG461 mul8u::@6
+    beq b4
+  //SEG461 mul8u::@3
   //SEG462 [237] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -9370,10 +9401,10 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG463 [238] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  //SEG464 [238] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-  //SEG465 mul8u::@8
-  b8:
+  //SEG463 [238] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  //SEG464 [238] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+  //SEG465 mul8u::@4
+  b4:
   //SEG466 [239] (byte) mul8u::a#0 ← (byte) mul8u::a#2 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -9381,10 +9412,10 @@ mul8u: {
   //SEG467 [240] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG468 [232] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  //SEG469 [232] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG470 [232] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG471 [232] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG468 [232] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  //SEG469 [232] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG470 [232] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG471 [232] phi (byte) mul8u::a#2 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG472 div16u
@@ -9407,7 +9438,7 @@ div16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG477 [243] (word) divr16u::return#2 ← (word) divr16u::return#0
-  //SEG478 div16u::@2
+  //SEG478 div16u::@1
   //SEG479 [244] (word) div16u::return#0 ← (word) divr16u::return#2
   //SEG480 div16u::@return
   //SEG481 [245] return 
diff --git a/src/test/ref/sinusgen8b.sym b/src/test/ref/sinusgen8b.sym
index 02cb8cc47..7212a8177 100644
--- a/src/test/ref/sinusgen8b.sym
+++ b/src/test/ref/sinusgen8b.sym
@@ -1,4 +1,4 @@
-(label) @40
+(label) @1
 (label) @begin
 (label) @end
 (word) PI2_u4f12
@@ -14,7 +14,7 @@
 (dword) PI_u4f28
 (const dword) PI_u4f28#0 PI_u4f28 = (dword/signed dword) $3243f6a9
 (word()) div16u((word) div16u::dividend , (word) div16u::divisor)
-(label) div16u::@2
+(label) div16u::@1
 (label) div16u::@return
 (word) div16u::dividend
 (word) div16u::divisor
@@ -22,8 +22,8 @@
 (word) div16u::return#0 return zp ZP_WORD:15 1.3333333333333333
 (word) div16u::return#2 return zp ZP_WORD:15 4.0
 (dword()) div32u16u((dword) div32u16u::dividend , (word) div32u16u::divisor)
+(label) div32u16u::@1
 (label) div32u16u::@2
-(label) div32u16u::@3
 (label) div32u16u::@return
 (dword) div32u16u::dividend
 (word) div32u16u::divisor
@@ -79,10 +79,10 @@
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
 (label) main::@6
-(label) main::@8
-(label) main::@9
+(label) main::@7
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 16.5
@@ -105,8 +105,8 @@
 (byte/word~) mul16u::$1 reg byte a 202.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:21 101.0
@@ -128,8 +128,8 @@
 (byte~) mul8u::$1 reg byte a 202.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 101.0
@@ -150,7 +150,7 @@
 (word()) mulu16_sel((word) mulu16_sel::v1 , (word) mulu16_sel::v2 , (byte) mulu16_sel::select)
 (dword~) mulu16_sel::$0 $0 zp ZP_DWORD:11 4.0
 (dword~) mulu16_sel::$1 $1 zp ZP_DWORD:11 4.0
-(label) mulu16_sel::@2
+(label) mulu16_sel::@1
 (label) mulu16_sel::@return
 (word) mulu16_sel::return
 (word) mulu16_sel::return#0 return zp ZP_WORD:19 4.0
@@ -177,7 +177,7 @@
 (byte()) mulu8_sel((byte) mulu8_sel::v1 , (byte) mulu8_sel::v2 , (byte) mulu8_sel::select)
 (word~) mulu8_sel::$0 $0 zp ZP_WORD:19 4.0
 (word~) mulu8_sel::$1 $1 zp ZP_WORD:19 4.0
-(label) mulu8_sel::@2
+(label) mulu8_sel::@1
 (label) mulu8_sel::@return
 (byte) mulu8_sel::return
 (byte) mulu8_sel::return#0 reg byte a 4.0
@@ -235,7 +235,7 @@
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 b zp ZP_BYTE:4 4.0
@@ -261,12 +261,12 @@
 (label) sin16s::@10
 (label) sin16s::@11
 (label) sin16s::@12
-(label) sin16s::@15
 (label) sin16s::@2
 (label) sin16s::@3
 (label) sin16s::@4
 (label) sin16s::@5
 (label) sin16s::@6
+(label) sin16s::@7
 (label) sin16s::@8
 (label) sin16s::@9
 (label) sin16s::@return
@@ -304,8 +304,8 @@
 (void()) sin16s_gen((signed word*) sin16s_gen::sintab , (word) sin16s_gen::wavelength)
 (signed word~) sin16s_gen::$1 $1 zp ZP_WORD:15 22.0
 (label) sin16s_gen::@1
+(label) sin16s_gen::@2
 (label) sin16s_gen::@3
-(label) sin16s_gen::@4
 (label) sin16s_gen::@return
 (word) sin16s_gen::i
 (word) sin16s_gen::i#1 i zp ZP_WORD:5 16.5
@@ -327,7 +327,6 @@
 (label) sin8s::@12
 (label) sin8s::@13
 (label) sin8s::@14
-(label) sin8s::@18
 (label) sin8s::@2
 (label) sin8s::@3
 (label) sin8s::@4
@@ -335,6 +334,7 @@
 (label) sin8s::@6
 (label) sin8s::@7
 (label) sin8s::@8
+(label) sin8s::@9
 (label) sin8s::@return
 (byte) sin8s::DIV_6
 (const byte) sin8s::DIV_6#0 DIV_6 = (byte/signed byte/word/signed word/dword/signed dword) $2b
@@ -374,8 +374,8 @@
 (void()) sin8s_gen((signed byte*) sin8s_gen::sintab , (word) sin8s_gen::wavelength)
 (signed byte~) sin8s_gen::$1 reg byte a 22.0
 (label) sin8s_gen::@1
+(label) sin8s_gen::@2
 (label) sin8s_gen::@3
-(label) sin8s_gen::@4
 (label) sin8s_gen::@return
 (word) sin8s_gen::i
 (word) sin8s_gen::i#1 i zp ZP_WORD:17 16.5
diff --git a/src/test/ref/sinusgenscale8.asm b/src/test/ref/sinusgenscale8.asm
index 922517ff2..0db2fed31 100644
--- a/src/test/ref/sinusgenscale8.asm
+++ b/src/test/ref/sinusgenscale8.asm
@@ -358,7 +358,7 @@ mul8u: {
     txa
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -366,7 +366,7 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  b8:
+  b4:
     txa
     lsr
     tax
@@ -476,14 +476,14 @@ sin8s: {
   b3:
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
     txa
     eor #$ff
     clc
     adc #1
   b4:
     rts
-  b18:
+  b14:
     txa
     jmp b4
 }
diff --git a/src/test/ref/sinusgenscale8.cfg b/src/test/ref/sinusgenscale8.cfg
index 90147134a..ecae2a4a6 100644
--- a/src/test/ref/sinusgenscale8.cfg
+++ b/src/test/ref/sinusgenscale8.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@41
-@41: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @41
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @41
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
@@ -22,66 +22,66 @@ sin8u_table: scope:[sin8u_table]  from main::@1
   [9] phi()
   [10] call div16u 
   [11] (word) div16u::return#2 ← (word) div16u::return#0
-  to:sin8u_table::@3
-sin8u_table::@3: scope:[sin8u_table]  from sin8u_table
+  to:sin8u_table::@2
+sin8u_table::@2: scope:[sin8u_table]  from sin8u_table
   [12] (word) sin8u_table::step#0 ← (word) div16u::return#2
   [13] call print_str 
-  to:sin8u_table::@4
-sin8u_table::@4: scope:[sin8u_table]  from sin8u_table::@3
+  to:sin8u_table::@3
+sin8u_table::@3: scope:[sin8u_table]  from sin8u_table::@2
   [14] (word) print_word::w#1 ← (word) sin8u_table::step#0
   [15] call print_word 
-  to:sin8u_table::@5
-sin8u_table::@5: scope:[sin8u_table]  from sin8u_table::@4
+  to:sin8u_table::@4
+sin8u_table::@4: scope:[sin8u_table]  from sin8u_table::@3
   [16] phi()
   [17] call print_str 
-  to:sin8u_table::@6
-sin8u_table::@6: scope:[sin8u_table]  from sin8u_table::@5
+  to:sin8u_table::@5
+sin8u_table::@5: scope:[sin8u_table]  from sin8u_table::@4
   [18] phi()
   [19] call print_byte 
-  to:sin8u_table::@7
-sin8u_table::@7: scope:[sin8u_table]  from sin8u_table::@6
+  to:sin8u_table::@6
+sin8u_table::@6: scope:[sin8u_table]  from sin8u_table::@5
   [20] phi()
   [21] call print_str 
-  to:sin8u_table::@8
-sin8u_table::@8: scope:[sin8u_table]  from sin8u_table::@7
+  to:sin8u_table::@7
+sin8u_table::@7: scope:[sin8u_table]  from sin8u_table::@6
   [22] phi()
   [23] call print_byte 
-  to:sin8u_table::@9
-sin8u_table::@9: scope:[sin8u_table]  from sin8u_table::@8
+  to:sin8u_table::@8
+sin8u_table::@8: scope:[sin8u_table]  from sin8u_table::@7
   [24] phi()
   [25] call print_str 
-  to:sin8u_table::@10
-sin8u_table::@10: scope:[sin8u_table]  from sin8u_table::@9
+  to:sin8u_table::@9
+sin8u_table::@9: scope:[sin8u_table]  from sin8u_table::@8
   [26] phi()
   [27] call print_byte 
-  to:sin8u_table::@11
-sin8u_table::@11: scope:[sin8u_table]  from sin8u_table::@10
+  to:sin8u_table::@10
+sin8u_table::@10: scope:[sin8u_table]  from sin8u_table::@9
   [28] phi()
   [29] call print_str 
-  to:sin8u_table::@12
-sin8u_table::@12: scope:[sin8u_table]  from sin8u_table::@11
+  to:sin8u_table::@11
+sin8u_table::@11: scope:[sin8u_table]  from sin8u_table::@10
   [30] phi()
   [31] call print_byte 
-  to:sin8u_table::@13
-sin8u_table::@13: scope:[sin8u_table]  from sin8u_table::@12
+  to:sin8u_table::@12
+sin8u_table::@12: scope:[sin8u_table]  from sin8u_table::@11
   [32] phi()
   [33] call print_ln 
   to:sin8u_table::@1
-sin8u_table::@1: scope:[sin8u_table]  from sin8u_table::@13 sin8u_table::@25
-  [34] (word) sin8u_table::i#10 ← phi( sin8u_table::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8u_table::@25/(word) sin8u_table::i#1 )
-  [34] (byte*) sin8u_table::sintab#2 ← phi( sin8u_table::@13/(const byte[$14]) main::sintab#0 sin8u_table::@25/(byte*) sin8u_table::sintab#1 )
-  [34] (word) sin8u_table::x#10 ← phi( sin8u_table::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8u_table::@25/(word) sin8u_table::x#1 )
+sin8u_table::@1: scope:[sin8u_table]  from sin8u_table::@12 sin8u_table::@23
+  [34] (word) sin8u_table::i#10 ← phi( sin8u_table::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8u_table::@23/(word) sin8u_table::i#1 )
+  [34] (byte*) sin8u_table::sintab#2 ← phi( sin8u_table::@12/(const byte[$14]) main::sintab#0 sin8u_table::@23/(byte*) sin8u_table::sintab#1 )
+  [34] (word) sin8u_table::x#10 ← phi( sin8u_table::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8u_table::@23/(word) sin8u_table::x#1 )
   [35] (word) sin8s::x#2 ← (word) sin8u_table::x#10
   [36] call sin8s 
   [37] (signed byte) sin8s::return#2 ← (signed byte) sin8s::return#0
-  to:sin8u_table::@15
-sin8u_table::@15: scope:[sin8u_table]  from sin8u_table::@1
+  to:sin8u_table::@13
+sin8u_table::@13: scope:[sin8u_table]  from sin8u_table::@1
   [38] (signed byte) sin8u_table::sinx#0 ← (signed byte) sin8s::return#2
   [39] (signed byte) mul8su::a#0 ← (signed byte) sin8u_table::sinx#0
   [40] call mul8su 
   [41] (signed word) mul8su::return#2 ← (signed word)(word) mul8su::m#2
-  to:sin8u_table::@16
-sin8u_table::@16: scope:[sin8u_table]  from sin8u_table::@15
+  to:sin8u_table::@14
+sin8u_table::@14: scope:[sin8u_table]  from sin8u_table::@13
   [42] (signed word) sin8u_table::sinx_sc#0 ← (signed word) mul8su::return#2
   [43] (byte~) sin8u_table::$21 ← > (signed word) sin8u_table::sinx_sc#0
   [44] (byte) sin8u_table::sinx_tr#0 ← (const byte) sin8u_table::mid#0 + (byte~) sin8u_table::$21
@@ -89,49 +89,49 @@ sin8u_table::@16: scope:[sin8u_table]  from sin8u_table::@15
   [46] (byte*) sin8u_table::sintab#1 ← ++ (byte*) sin8u_table::sintab#2
   [47] (byte*~) print_char_cursor#126 ← (byte*) print_line_cursor#1
   [48] call print_str 
-  to:sin8u_table::@17
-sin8u_table::@17: scope:[sin8u_table]  from sin8u_table::@16
+  to:sin8u_table::@15
+sin8u_table::@15: scope:[sin8u_table]  from sin8u_table::@14
   [49] (word) print_word::w#2 ← (word) sin8u_table::x#10
   [50] call print_word 
-  to:sin8u_table::@18
-sin8u_table::@18: scope:[sin8u_table]  from sin8u_table::@17
+  to:sin8u_table::@16
+sin8u_table::@16: scope:[sin8u_table]  from sin8u_table::@15
   [51] phi()
   [52] call print_str 
-  to:sin8u_table::@19
-sin8u_table::@19: scope:[sin8u_table]  from sin8u_table::@18
+  to:sin8u_table::@17
+sin8u_table::@17: scope:[sin8u_table]  from sin8u_table::@16
   [53] (signed byte) print_sbyte::b#1 ← (signed byte) sin8u_table::sinx#0
   [54] call print_sbyte 
-  to:sin8u_table::@20
-sin8u_table::@20: scope:[sin8u_table]  from sin8u_table::@19
+  to:sin8u_table::@18
+sin8u_table::@18: scope:[sin8u_table]  from sin8u_table::@17
   [55] phi()
   [56] call print_str 
-  to:sin8u_table::@21
-sin8u_table::@21: scope:[sin8u_table]  from sin8u_table::@20
+  to:sin8u_table::@19
+sin8u_table::@19: scope:[sin8u_table]  from sin8u_table::@18
   [57] (signed word) print_sword::w#1 ← (signed word) sin8u_table::sinx_sc#0
   [58] call print_sword 
-  to:sin8u_table::@22
-sin8u_table::@22: scope:[sin8u_table]  from sin8u_table::@21
+  to:sin8u_table::@20
+sin8u_table::@20: scope:[sin8u_table]  from sin8u_table::@19
   [59] phi()
   [60] call print_str 
-  to:sin8u_table::@23
-sin8u_table::@23: scope:[sin8u_table]  from sin8u_table::@22
+  to:sin8u_table::@21
+sin8u_table::@21: scope:[sin8u_table]  from sin8u_table::@20
   [61] (byte) print_byte::b#7 ← (byte) sin8u_table::sinx_tr#0
   [62] call print_byte 
-  to:sin8u_table::@24
-sin8u_table::@24: scope:[sin8u_table]  from sin8u_table::@23
+  to:sin8u_table::@22
+sin8u_table::@22: scope:[sin8u_table]  from sin8u_table::@21
   [63] phi()
   [64] call print_ln 
-  to:sin8u_table::@25
-sin8u_table::@25: scope:[sin8u_table]  from sin8u_table::@24
+  to:sin8u_table::@23
+sin8u_table::@23: scope:[sin8u_table]  from sin8u_table::@22
   [65] (word) sin8u_table::x#1 ← (word) sin8u_table::x#10 + (word) sin8u_table::step#0
   [66] (word) sin8u_table::i#1 ← ++ (word) sin8u_table::i#10
   [67] if((word) sin8u_table::i#1<(const word) main::tabsize#0) goto sin8u_table::@1
   to:sin8u_table::@return
-sin8u_table::@return: scope:[sin8u_table]  from sin8u_table::@25
+sin8u_table::@return: scope:[sin8u_table]  from sin8u_table::@23
   [68] return 
   to:@return
-print_ln: scope:[print_ln]  from sin8u_table::@13 sin8u_table::@24
-  [69] (byte*) print_line_cursor#23 ← phi( sin8u_table::@13/((byte*))(word/signed word/dword/signed dword) $400 sin8u_table::@24/(byte*) print_line_cursor#1 )
+print_ln: scope:[print_ln]  from sin8u_table::@12 sin8u_table::@22
+  [69] (byte*) print_line_cursor#23 ← phi( sin8u_table::@12/((byte*))(word/signed word/dword/signed dword) $400 sin8u_table::@22/(byte*) print_line_cursor#1 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [70] (byte*) print_line_cursor#12 ← phi( print_ln/(byte*) print_line_cursor#23 print_ln::@1/(byte*) print_line_cursor#1 )
@@ -141,9 +141,9 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [73] return 
   to:@return
-print_byte: scope:[print_byte]  from print_sbyte::@2 print_word print_word::@1 sin8u_table::@10 sin8u_table::@12 sin8u_table::@23 sin8u_table::@6 sin8u_table::@8
-  [74] (byte*) print_char_cursor#100 ← phi( print_sbyte::@2/(byte*) print_char_cursor#18 print_word/(byte*) print_char_cursor#99 print_word::@1/(byte*) print_char_cursor#18 sin8u_table::@10/(byte*) print_char_cursor#2 sin8u_table::@12/(byte*) print_char_cursor#2 sin8u_table::@23/(byte*) print_char_cursor#2 sin8u_table::@6/(byte*) print_char_cursor#2 sin8u_table::@8/(byte*) print_char_cursor#2 )
-  [74] (byte) print_byte::b#8 ← phi( print_sbyte::@2/(byte~) print_byte::b#10 print_word/(byte) print_byte::b#1 print_word::@1/(byte) print_byte::b#2 sin8u_table::@10/(const byte) sin8u_table::amplitude#0 sin8u_table::@12/(const byte) sin8u_table::mid#0 sin8u_table::@23/(byte) print_byte::b#7 sin8u_table::@6/(const byte) sin8u_table::min#0 sin8u_table::@8/(const byte) sin8u_table::max#0 )
+print_byte: scope:[print_byte]  from print_sbyte::@2 print_word print_word::@1 sin8u_table::@11 sin8u_table::@21 sin8u_table::@5 sin8u_table::@7 sin8u_table::@9
+  [74] (byte*) print_char_cursor#100 ← phi( print_sbyte::@2/(byte*) print_char_cursor#18 print_word/(byte*) print_char_cursor#99 print_word::@1/(byte*) print_char_cursor#18 sin8u_table::@9/(byte*) print_char_cursor#2 sin8u_table::@11/(byte*) print_char_cursor#2 sin8u_table::@21/(byte*) print_char_cursor#2 sin8u_table::@5/(byte*) print_char_cursor#2 sin8u_table::@7/(byte*) print_char_cursor#2 )
+  [74] (byte) print_byte::b#8 ← phi( print_sbyte::@2/(byte~) print_byte::b#10 print_word/(byte) print_byte::b#1 print_word::@1/(byte) print_byte::b#2 sin8u_table::@9/(const byte) sin8u_table::amplitude#0 sin8u_table::@11/(const byte) sin8u_table::mid#0 sin8u_table::@21/(byte) print_byte::b#7 sin8u_table::@5/(const byte) sin8u_table::min#0 sin8u_table::@7/(const byte) sin8u_table::max#0 )
   [75] (byte~) print_byte::$0 ← (byte) print_byte::b#8 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [76] (byte) print_char::ch#3 ← *((const byte[]) print_hextab#0 + (byte~) print_byte::$0)
   [77] call print_char 
@@ -165,9 +165,9 @@ print_char: scope:[print_char]  from print_byte print_byte::@1 print_sbyte::@1 p
 print_char::@return: scope:[print_char]  from print_char
   [85] return 
   to:@return
-print_str: scope:[print_str]  from sin8u_table::@11 sin8u_table::@16 sin8u_table::@18 sin8u_table::@20 sin8u_table::@22 sin8u_table::@3 sin8u_table::@5 sin8u_table::@7 sin8u_table::@9
-  [86] (byte*) print_char_cursor#105 ← phi( sin8u_table::@11/(byte*) print_char_cursor#18 sin8u_table::@16/(byte*~) print_char_cursor#126 sin8u_table::@18/(byte*) print_char_cursor#18 sin8u_table::@20/(byte*) print_char_cursor#18 sin8u_table::@22/(byte*) print_char_cursor#18 sin8u_table::@3/((byte*))(word/signed word/dword/signed dword) $400 sin8u_table::@5/(byte*) print_char_cursor#18 sin8u_table::@7/(byte*) print_char_cursor#18 sin8u_table::@9/(byte*) print_char_cursor#18 )
-  [86] (byte*) print_str::str#12 ← phi( sin8u_table::@11/(const string) sin8u_table::str4 sin8u_table::@16/(const string) sin8u_table::str5 sin8u_table::@18/(const string) sin8u_table::str6 sin8u_table::@20/(const string) sin8u_table::str7 sin8u_table::@22/(const string) sin8u_table::str8 sin8u_table::@3/(const string) sin8u_table::str sin8u_table::@5/(const string) sin8u_table::str1 sin8u_table::@7/(const string) sin8u_table::str2 sin8u_table::@9/(const string) sin8u_table::str3 )
+print_str: scope:[print_str]  from sin8u_table::@10 sin8u_table::@14 sin8u_table::@16 sin8u_table::@18 sin8u_table::@2 sin8u_table::@20 sin8u_table::@4 sin8u_table::@6 sin8u_table::@8
+  [86] (byte*) print_char_cursor#105 ← phi( sin8u_table::@10/(byte*) print_char_cursor#18 sin8u_table::@14/(byte*~) print_char_cursor#126 sin8u_table::@16/(byte*) print_char_cursor#18 sin8u_table::@18/(byte*) print_char_cursor#18 sin8u_table::@20/(byte*) print_char_cursor#18 sin8u_table::@2/((byte*))(word/signed word/dword/signed dword) $400 sin8u_table::@4/(byte*) print_char_cursor#18 sin8u_table::@6/(byte*) print_char_cursor#18 sin8u_table::@8/(byte*) print_char_cursor#18 )
+  [86] (byte*) print_str::str#12 ← phi( sin8u_table::@10/(const string) sin8u_table::str4 sin8u_table::@14/(const string) sin8u_table::str5 sin8u_table::@16/(const string) sin8u_table::str6 sin8u_table::@18/(const string) sin8u_table::str7 sin8u_table::@20/(const string) sin8u_table::str8 sin8u_table::@2/(const string) sin8u_table::str sin8u_table::@4/(const string) sin8u_table::str1 sin8u_table::@6/(const string) sin8u_table::str2 sin8u_table::@8/(const string) sin8u_table::str3 )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [87] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#105 print_str::@2/(byte*) print_char_cursor#1 )
@@ -182,28 +182,28 @@ print_str::@2: scope:[print_str]  from print_str::@1
   [91] (byte*) print_char_cursor#1 ← ++ (byte*) print_char_cursor#2
   [92] (byte*) print_str::str#0 ← ++ (byte*) print_str::str#10
   to:print_str::@1
-print_sword: scope:[print_sword]  from sin8u_table::@21
+print_sword: scope:[print_sword]  from sin8u_table::@19
   [93] if((signed word) print_sword::w#1>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sword::@1
   to:print_sword::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [94] phi()
   [95] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [96] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [97] (byte*) print_char_cursor#94 ← phi( print_sword/(byte*) print_char_cursor#2 print_sword::@4/(byte*) print_char_cursor#18 )
-  [97] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [97] (byte*) print_char_cursor#94 ← phi( print_sword/(byte*) print_char_cursor#2 print_sword::@3/(byte*) print_char_cursor#18 )
+  [97] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@3/(signed word) print_sword::w#0 )
   [98] (word~) print_word::w#5 ← (word)(signed word) print_sword::w#3
   [99] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
   [100] return 
   to:@return
-print_word: scope:[print_word]  from print_sword::@1 sin8u_table::@17 sin8u_table::@4
-  [101] (byte*) print_char_cursor#99 ← phi( print_sword::@1/(byte*) print_char_cursor#94 sin8u_table::@17/(byte*) print_char_cursor#2 sin8u_table::@4/(byte*) print_char_cursor#2 )
-  [101] (word) print_word::w#3 ← phi( print_sword::@1/(word~) print_word::w#5 sin8u_table::@17/(word) print_word::w#2 sin8u_table::@4/(word) print_word::w#1 )
+print_word: scope:[print_word]  from print_sword::@1 sin8u_table::@15 sin8u_table::@3
+  [101] (byte*) print_char_cursor#99 ← phi( print_sword::@1/(byte*) print_char_cursor#94 sin8u_table::@15/(byte*) print_char_cursor#2 sin8u_table::@3/(byte*) print_char_cursor#2 )
+  [101] (word) print_word::w#3 ← phi( print_sword::@1/(word~) print_word::w#5 sin8u_table::@15/(word) print_word::w#2 sin8u_table::@3/(word) print_word::w#1 )
   [102] (byte) print_byte::b#1 ← > (word) print_word::w#3
   [103] call print_byte 
   to:print_word::@1
@@ -214,15 +214,15 @@ print_word::@1: scope:[print_word]  from print_word
 print_word::@return: scope:[print_word]  from print_word::@1
   [106] return 
   to:@return
-print_sbyte: scope:[print_sbyte]  from sin8u_table::@19
+print_sbyte: scope:[print_sbyte]  from sin8u_table::@17
   [107] if((signed byte) print_sbyte::b#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sbyte::@1
   to:print_sbyte::@3
 print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [108] phi()
   [109] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [110] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [110] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
   [111] (byte~) print_byte::b#10 ← (byte)(signed byte) print_sbyte::b#4
   [112] call print_byte 
   to:print_sbyte::@return
@@ -232,26 +232,26 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [114] phi()
   [115] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [116] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1
   to:print_sbyte::@2
-mul8su: scope:[mul8su]  from sin8u_table::@15
+mul8su: scope:[mul8su]  from sin8u_table::@13
   [117] (byte~) mul8u::a#8 ← (byte)(signed byte) mul8su::a#0
   [118] call mul8u 
   [119] (word) mul8u::return#2 ← (word) mul8u::res#2
-  to:mul8su::@4
-mul8su::@4: scope:[mul8su]  from mul8su
+  to:mul8su::@3
+mul8su::@3: scope:[mul8su]  from mul8su
   [120] (word) mul8su::m#0 ← (word) mul8u::return#2
   [121] if((signed byte) mul8su::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8su::@1
   to:mul8su::@2
-mul8su::@2: scope:[mul8su]  from mul8su::@4
+mul8su::@2: scope:[mul8su]  from mul8su::@3
   [122] (byte~) mul8su::$7 ← > (word) mul8su::m#0
   [123] (byte~) mul8su::$10 ← (byte~) mul8su::$7 - ((byte))(const byte) mul8su::b#0
   [124] (word) mul8su::m#1 ← (word) mul8su::m#0 hi= (byte~) mul8su::$10
   to:mul8su::@1
-mul8su::@1: scope:[mul8su]  from mul8su::@2 mul8su::@4
-  [125] (word) mul8su::m#2 ← phi( mul8su::@2/(word) mul8su::m#1 mul8su::@4/(word) mul8su::m#0 )
+mul8su::@1: scope:[mul8su]  from mul8su::@2 mul8su::@3
+  [125] (word) mul8su::m#2 ← phi( mul8su::@2/(word) mul8su::m#1 mul8su::@3/(word) mul8su::m#0 )
   to:mul8su::@return
 mul8su::@return: scope:[mul8su]  from mul8su::@1
   [126] return 
@@ -261,10 +261,10 @@ mul8u: scope:[mul8u]  from mul8su mulu8_sel
   [127] (byte) mul8u::b#2 ← phi( mul8su/((byte))(const byte) mul8su::b#0 mulu8_sel/(byte) mul8u::b#1 )
   [128] (word) mul8u::mb#0 ← ((word)) (byte) mul8u::b#2
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [129] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@8/(word) mul8u::mb#1 )
-  [129] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [129] (byte) mul8u::a#3 ← phi( mul8u/(byte) mul8u::a#6 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [129] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@4/(word) mul8u::mb#1 )
+  [129] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [129] (byte) mul8u::a#3 ← phi( mul8u/(byte) mul8u::a#6 mul8u::@4/(byte) mul8u::a#0 )
   [130] if((byte) mul8u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -272,13 +272,13 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [132] (byte~) mul8u::$1 ← (byte) mul8u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [133] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [133] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [134] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [135] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [135] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [136] (byte) mul8u::a#0 ← (byte) mul8u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [137] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
@@ -304,86 +304,86 @@ sin8s::@2: scope:[sin8s]  from sin8s::@1 sin8s::@6
   [147] (byte) mulu8_sel::v2#0 ← (byte) sin8s::x1#0
   [148] call mulu8_sel 
   [149] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-  to:sin8s::@10
-sin8s::@10: scope:[sin8s]  from sin8s::@2
+  to:sin8s::@9
+sin8s::@9: scope:[sin8s]  from sin8s::@2
   [150] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   [151] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0
   [152] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0
   [153] call mulu8_sel 
   [154] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-  to:sin8s::@11
-sin8s::@11: scope:[sin8s]  from sin8s::@10
+  to:sin8s::@10
+sin8s::@10: scope:[sin8s]  from sin8s::@9
   [155] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1
   [156] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0
   [157] call mulu8_sel 
   [158] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-  to:sin8s::@12
-sin8s::@12: scope:[sin8s]  from sin8s::@11
+  to:sin8s::@11
+sin8s::@11: scope:[sin8s]  from sin8s::@10
   [159] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   [160] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0
   [161] (byte) mulu8_sel::v1#3 ← (byte) sin8s::x3#0
   [162] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0
   [163] call mulu8_sel 
   [164] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-  to:sin8s::@13
-sin8s::@13: scope:[sin8s]  from sin8s::@12
+  to:sin8s::@12
+sin8s::@12: scope:[sin8s]  from sin8s::@11
   [165] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   [166] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0
   [167] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0
   [168] call mulu8_sel 
   [169] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-  to:sin8s::@14
-sin8s::@14: scope:[sin8s]  from sin8s::@13
+  to:sin8s::@13
+sin8s::@13: scope:[sin8s]  from sin8s::@12
   [170] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   [171] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [172] (byte) sin8s::usinx#1 ← (byte) sin8s::usinx#0 + (byte) sin8s::x5_128#0
   [173] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3
   to:sin8s::@7
-sin8s::@7: scope:[sin8s]  from sin8s::@14
+sin8s::@7: scope:[sin8s]  from sin8s::@13
   [174] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1
   to:sin8s::@3
-sin8s::@3: scope:[sin8s]  from sin8s::@14 sin8s::@7
-  [175] (byte) sin8s::usinx#4 ← phi( sin8s::@14/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
-  [176] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18
+sin8s::@3: scope:[sin8s]  from sin8s::@13 sin8s::@7
+  [175] (byte) sin8s::usinx#4 ← phi( sin8s::@13/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
+  [176] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14
   to:sin8s::@8
 sin8s::@8: scope:[sin8s]  from sin8s::@3
   [177] (signed byte) sin8s::sinx#1 ← - (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-sin8s::@4: scope:[sin8s]  from sin8s::@18 sin8s::@8
-  [178] (signed byte) sin8s::return#0 ← phi( sin8s::@18/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
+sin8s::@4: scope:[sin8s]  from sin8s::@14 sin8s::@8
+  [178] (signed byte) sin8s::return#0 ← phi( sin8s::@14/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
   to:sin8s::@return
 sin8s::@return: scope:[sin8s]  from sin8s::@4
   [179] return 
   to:@return
-sin8s::@18: scope:[sin8s]  from sin8s::@3
+sin8s::@14: scope:[sin8s]  from sin8s::@3
   [180] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@13 sin8s::@2
-  [181] (byte) mulu8_sel::select#5 ← phi( sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [181] (byte) mulu8_sel::v2#5 ← phi( sin8s::@10/(byte) mulu8_sel::v2#1 sin8s::@11/(const byte) sin8s::DIV_6#0 sin8s::@12/(byte) mulu8_sel::v2#3 sin8s::@13/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
-  [181] (byte) mulu8_sel::v1#5 ← phi( sin8s::@10/(byte) mulu8_sel::v1#1 sin8s::@11/(byte) mulu8_sel::v1#2 sin8s::@12/(byte) mulu8_sel::v1#3 sin8s::@13/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
+mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@2 sin8s::@9
+  [181] (byte) mulu8_sel::select#5 ← phi( sin8s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [181] (byte) mulu8_sel::v2#5 ← phi( sin8s::@9/(byte) mulu8_sel::v2#1 sin8s::@10/(const byte) sin8s::DIV_6#0 sin8s::@11/(byte) mulu8_sel::v2#3 sin8s::@12/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
+  [181] (byte) mulu8_sel::v1#5 ← phi( sin8s::@9/(byte) mulu8_sel::v1#1 sin8s::@10/(byte) mulu8_sel::v1#2 sin8s::@11/(byte) mulu8_sel::v1#3 sin8s::@12/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
   [182] (byte) mul8u::a#2 ← (byte) mulu8_sel::v1#5
   [183] (byte) mul8u::b#1 ← (byte) mulu8_sel::v2#5
   [184] call mul8u 
   [185] (word) mul8u::return#3 ← (word) mul8u::res#2
-  to:mulu8_sel::@2
-mulu8_sel::@2: scope:[mulu8_sel]  from mulu8_sel
+  to:mulu8_sel::@1
+mulu8_sel::@1: scope:[mulu8_sel]  from mulu8_sel
   [186] (word~) mulu8_sel::$0 ← (word) mul8u::return#3
   [187] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5
   [188] (byte) mulu8_sel::return#12 ← > (word~) mulu8_sel::$1
   to:mulu8_sel::@return
-mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@2
+mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@1
   [189] return 
   to:@return
 div16u: scope:[div16u]  from sin8u_table
   [190] phi()
   [191] call divr16u 
   [192] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div16u::@2
-div16u::@2: scope:[div16u]  from div16u
+  to:div16u::@1
+div16u::@1: scope:[div16u]  from div16u
   [193] (word) div16u::return#0 ← (word) divr16u::return#2
   to:div16u::@return
-div16u::@return: scope:[div16u]  from div16u::@2
+div16u::@return: scope:[div16u]  from div16u::@1
   [194] return 
   to:@return
 divr16u: scope:[divr16u]  from div16u
diff --git a/src/test/ref/sinusgenscale8.log b/src/test/ref/sinusgenscale8.log
index f0976b5ee..950c98509 100644
--- a/src/test/ref/sinusgenscale8.log
+++ b/src/test/ref/sinusgenscale8.log
@@ -2588,12 +2588,49 @@ Culled Empty Block (label) divr16u::@8
 Culled Empty Block (label) divr16u::@10
 Culled Empty Block (label) divr16u::@9
 Culled Empty Block (label) print_cls::@3
+Renumbering block @41 to @1
+Renumbering block div16u::@2 to div16u::@1
+Renumbering block mul8u::@6 to mul8u::@3
+Renumbering block mul8u::@8 to mul8u::@4
+Renumbering block mul8su::@4 to mul8su::@3
+Renumbering block sin8s::@10 to sin8s::@9
+Renumbering block sin8s::@11 to sin8s::@10
+Renumbering block sin8s::@12 to sin8s::@11
+Renumbering block sin8s::@13 to sin8s::@12
+Renumbering block sin8s::@14 to sin8s::@13
+Renumbering block sin8s::@18 to sin8s::@14
+Renumbering block mulu8_sel::@2 to mulu8_sel::@1
+Renumbering block print_sword::@4 to print_sword::@3
+Renumbering block print_sbyte::@5 to print_sbyte::@4
+Renumbering block sin8u_table::@3 to sin8u_table::@2
+Renumbering block sin8u_table::@4 to sin8u_table::@3
+Renumbering block sin8u_table::@5 to sin8u_table::@4
+Renumbering block sin8u_table::@6 to sin8u_table::@5
+Renumbering block sin8u_table::@7 to sin8u_table::@6
+Renumbering block sin8u_table::@8 to sin8u_table::@7
+Renumbering block sin8u_table::@9 to sin8u_table::@8
+Renumbering block sin8u_table::@10 to sin8u_table::@9
+Renumbering block sin8u_table::@11 to sin8u_table::@10
+Renumbering block sin8u_table::@12 to sin8u_table::@11
+Renumbering block sin8u_table::@13 to sin8u_table::@12
+Renumbering block sin8u_table::@15 to sin8u_table::@13
+Renumbering block sin8u_table::@16 to sin8u_table::@14
+Renumbering block sin8u_table::@17 to sin8u_table::@15
+Renumbering block sin8u_table::@18 to sin8u_table::@16
+Renumbering block sin8u_table::@19 to sin8u_table::@17
+Renumbering block sin8u_table::@20 to sin8u_table::@18
+Renumbering block sin8u_table::@21 to sin8u_table::@19
+Renumbering block sin8u_table::@22 to sin8u_table::@20
+Renumbering block sin8u_table::@23 to sin8u_table::@21
+Renumbering block sin8u_table::@24 to sin8u_table::@22
+Renumbering block sin8u_table::@25 to sin8u_table::@23
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @41
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of sin8u_table
+Adding NOP phi() at start of sin8u_table::@4
 Adding NOP phi() at start of sin8u_table::@5
 Adding NOP phi() at start of sin8u_table::@6
 Adding NOP phi() at start of sin8u_table::@7
@@ -2602,11 +2639,10 @@ Adding NOP phi() at start of sin8u_table::@9
 Adding NOP phi() at start of sin8u_table::@10
 Adding NOP phi() at start of sin8u_table::@11
 Adding NOP phi() at start of sin8u_table::@12
-Adding NOP phi() at start of sin8u_table::@13
+Adding NOP phi() at start of sin8u_table::@16
 Adding NOP phi() at start of sin8u_table::@18
 Adding NOP phi() at start of sin8u_table::@20
 Adding NOP phi() at start of sin8u_table::@22
-Adding NOP phi() at start of sin8u_table::@24
 Adding NOP phi() at start of print_sword::@2
 Adding NOP phi() at start of print_sbyte::@3
 Adding NOP phi() at start of print_sbyte::@1
@@ -2617,14 +2653,14 @@ Adding NOP phi() at start of print_cls
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@41
-@41: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @41
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @41
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
@@ -2639,66 +2675,66 @@ sin8u_table: scope:[sin8u_table]  from main::@1
   [9] phi()
   [10] call div16u 
   [11] (word) div16u::return#2 ← (word) div16u::return#0
-  to:sin8u_table::@3
-sin8u_table::@3: scope:[sin8u_table]  from sin8u_table
+  to:sin8u_table::@2
+sin8u_table::@2: scope:[sin8u_table]  from sin8u_table
   [12] (word) sin8u_table::step#0 ← (word) div16u::return#2
   [13] call print_str 
-  to:sin8u_table::@4
-sin8u_table::@4: scope:[sin8u_table]  from sin8u_table::@3
+  to:sin8u_table::@3
+sin8u_table::@3: scope:[sin8u_table]  from sin8u_table::@2
   [14] (word) print_word::w#1 ← (word) sin8u_table::step#0
   [15] call print_word 
-  to:sin8u_table::@5
-sin8u_table::@5: scope:[sin8u_table]  from sin8u_table::@4
+  to:sin8u_table::@4
+sin8u_table::@4: scope:[sin8u_table]  from sin8u_table::@3
   [16] phi()
   [17] call print_str 
-  to:sin8u_table::@6
-sin8u_table::@6: scope:[sin8u_table]  from sin8u_table::@5
+  to:sin8u_table::@5
+sin8u_table::@5: scope:[sin8u_table]  from sin8u_table::@4
   [18] phi()
   [19] call print_byte 
-  to:sin8u_table::@7
-sin8u_table::@7: scope:[sin8u_table]  from sin8u_table::@6
+  to:sin8u_table::@6
+sin8u_table::@6: scope:[sin8u_table]  from sin8u_table::@5
   [20] phi()
   [21] call print_str 
-  to:sin8u_table::@8
-sin8u_table::@8: scope:[sin8u_table]  from sin8u_table::@7
+  to:sin8u_table::@7
+sin8u_table::@7: scope:[sin8u_table]  from sin8u_table::@6
   [22] phi()
   [23] call print_byte 
-  to:sin8u_table::@9
-sin8u_table::@9: scope:[sin8u_table]  from sin8u_table::@8
+  to:sin8u_table::@8
+sin8u_table::@8: scope:[sin8u_table]  from sin8u_table::@7
   [24] phi()
   [25] call print_str 
-  to:sin8u_table::@10
-sin8u_table::@10: scope:[sin8u_table]  from sin8u_table::@9
+  to:sin8u_table::@9
+sin8u_table::@9: scope:[sin8u_table]  from sin8u_table::@8
   [26] phi()
   [27] call print_byte 
-  to:sin8u_table::@11
-sin8u_table::@11: scope:[sin8u_table]  from sin8u_table::@10
+  to:sin8u_table::@10
+sin8u_table::@10: scope:[sin8u_table]  from sin8u_table::@9
   [28] phi()
   [29] call print_str 
-  to:sin8u_table::@12
-sin8u_table::@12: scope:[sin8u_table]  from sin8u_table::@11
+  to:sin8u_table::@11
+sin8u_table::@11: scope:[sin8u_table]  from sin8u_table::@10
   [30] phi()
   [31] call print_byte 
-  to:sin8u_table::@13
-sin8u_table::@13: scope:[sin8u_table]  from sin8u_table::@12
+  to:sin8u_table::@12
+sin8u_table::@12: scope:[sin8u_table]  from sin8u_table::@11
   [32] phi()
   [33] call print_ln 
   to:sin8u_table::@1
-sin8u_table::@1: scope:[sin8u_table]  from sin8u_table::@13 sin8u_table::@25
-  [34] (word) sin8u_table::i#10 ← phi( sin8u_table::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8u_table::@25/(word) sin8u_table::i#1 )
-  [34] (byte*) sin8u_table::sintab#2 ← phi( sin8u_table::@13/(const byte[$14]) main::sintab#0 sin8u_table::@25/(byte*) sin8u_table::sintab#1 )
-  [34] (word) sin8u_table::x#10 ← phi( sin8u_table::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8u_table::@25/(word) sin8u_table::x#1 )
+sin8u_table::@1: scope:[sin8u_table]  from sin8u_table::@12 sin8u_table::@23
+  [34] (word) sin8u_table::i#10 ← phi( sin8u_table::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8u_table::@23/(word) sin8u_table::i#1 )
+  [34] (byte*) sin8u_table::sintab#2 ← phi( sin8u_table::@12/(const byte[$14]) main::sintab#0 sin8u_table::@23/(byte*) sin8u_table::sintab#1 )
+  [34] (word) sin8u_table::x#10 ← phi( sin8u_table::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8u_table::@23/(word) sin8u_table::x#1 )
   [35] (word) sin8s::x#2 ← (word) sin8u_table::x#10
   [36] call sin8s 
   [37] (signed byte) sin8s::return#2 ← (signed byte) sin8s::return#0
-  to:sin8u_table::@15
-sin8u_table::@15: scope:[sin8u_table]  from sin8u_table::@1
+  to:sin8u_table::@13
+sin8u_table::@13: scope:[sin8u_table]  from sin8u_table::@1
   [38] (signed byte) sin8u_table::sinx#0 ← (signed byte) sin8s::return#2
   [39] (signed byte) mul8su::a#0 ← (signed byte) sin8u_table::sinx#0
   [40] call mul8su 
   [41] (signed word) mul8su::return#2 ← (signed word)(word) mul8su::m#2
-  to:sin8u_table::@16
-sin8u_table::@16: scope:[sin8u_table]  from sin8u_table::@15
+  to:sin8u_table::@14
+sin8u_table::@14: scope:[sin8u_table]  from sin8u_table::@13
   [42] (signed word) sin8u_table::sinx_sc#0 ← (signed word) mul8su::return#2
   [43] (byte~) sin8u_table::$21 ← > (signed word) sin8u_table::sinx_sc#0
   [44] (byte) sin8u_table::sinx_tr#0 ← (const byte) sin8u_table::mid#0 + (byte~) sin8u_table::$21
@@ -2706,49 +2742,49 @@ sin8u_table::@16: scope:[sin8u_table]  from sin8u_table::@15
   [46] (byte*) sin8u_table::sintab#1 ← ++ (byte*) sin8u_table::sintab#2
   [47] (byte*~) print_char_cursor#126 ← (byte*) print_line_cursor#1
   [48] call print_str 
-  to:sin8u_table::@17
-sin8u_table::@17: scope:[sin8u_table]  from sin8u_table::@16
+  to:sin8u_table::@15
+sin8u_table::@15: scope:[sin8u_table]  from sin8u_table::@14
   [49] (word) print_word::w#2 ← (word) sin8u_table::x#10
   [50] call print_word 
-  to:sin8u_table::@18
-sin8u_table::@18: scope:[sin8u_table]  from sin8u_table::@17
+  to:sin8u_table::@16
+sin8u_table::@16: scope:[sin8u_table]  from sin8u_table::@15
   [51] phi()
   [52] call print_str 
-  to:sin8u_table::@19
-sin8u_table::@19: scope:[sin8u_table]  from sin8u_table::@18
+  to:sin8u_table::@17
+sin8u_table::@17: scope:[sin8u_table]  from sin8u_table::@16
   [53] (signed byte) print_sbyte::b#1 ← (signed byte) sin8u_table::sinx#0
   [54] call print_sbyte 
-  to:sin8u_table::@20
-sin8u_table::@20: scope:[sin8u_table]  from sin8u_table::@19
+  to:sin8u_table::@18
+sin8u_table::@18: scope:[sin8u_table]  from sin8u_table::@17
   [55] phi()
   [56] call print_str 
-  to:sin8u_table::@21
-sin8u_table::@21: scope:[sin8u_table]  from sin8u_table::@20
+  to:sin8u_table::@19
+sin8u_table::@19: scope:[sin8u_table]  from sin8u_table::@18
   [57] (signed word) print_sword::w#1 ← (signed word) sin8u_table::sinx_sc#0
   [58] call print_sword 
-  to:sin8u_table::@22
-sin8u_table::@22: scope:[sin8u_table]  from sin8u_table::@21
+  to:sin8u_table::@20
+sin8u_table::@20: scope:[sin8u_table]  from sin8u_table::@19
   [59] phi()
   [60] call print_str 
-  to:sin8u_table::@23
-sin8u_table::@23: scope:[sin8u_table]  from sin8u_table::@22
+  to:sin8u_table::@21
+sin8u_table::@21: scope:[sin8u_table]  from sin8u_table::@20
   [61] (byte) print_byte::b#7 ← (byte) sin8u_table::sinx_tr#0
   [62] call print_byte 
-  to:sin8u_table::@24
-sin8u_table::@24: scope:[sin8u_table]  from sin8u_table::@23
+  to:sin8u_table::@22
+sin8u_table::@22: scope:[sin8u_table]  from sin8u_table::@21
   [63] phi()
   [64] call print_ln 
-  to:sin8u_table::@25
-sin8u_table::@25: scope:[sin8u_table]  from sin8u_table::@24
+  to:sin8u_table::@23
+sin8u_table::@23: scope:[sin8u_table]  from sin8u_table::@22
   [65] (word) sin8u_table::x#1 ← (word) sin8u_table::x#10 + (word) sin8u_table::step#0
   [66] (word) sin8u_table::i#1 ← ++ (word) sin8u_table::i#10
   [67] if((word) sin8u_table::i#1<(const word) main::tabsize#0) goto sin8u_table::@1
   to:sin8u_table::@return
-sin8u_table::@return: scope:[sin8u_table]  from sin8u_table::@25
+sin8u_table::@return: scope:[sin8u_table]  from sin8u_table::@23
   [68] return 
   to:@return
-print_ln: scope:[print_ln]  from sin8u_table::@13 sin8u_table::@24
-  [69] (byte*) print_line_cursor#23 ← phi( sin8u_table::@13/((byte*))(word/signed word/dword/signed dword) $400 sin8u_table::@24/(byte*) print_line_cursor#1 )
+print_ln: scope:[print_ln]  from sin8u_table::@12 sin8u_table::@22
+  [69] (byte*) print_line_cursor#23 ← phi( sin8u_table::@12/((byte*))(word/signed word/dword/signed dword) $400 sin8u_table::@22/(byte*) print_line_cursor#1 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [70] (byte*) print_line_cursor#12 ← phi( print_ln/(byte*) print_line_cursor#23 print_ln::@1/(byte*) print_line_cursor#1 )
@@ -2758,9 +2794,9 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [73] return 
   to:@return
-print_byte: scope:[print_byte]  from print_sbyte::@2 print_word print_word::@1 sin8u_table::@10 sin8u_table::@12 sin8u_table::@23 sin8u_table::@6 sin8u_table::@8
-  [74] (byte*) print_char_cursor#100 ← phi( print_sbyte::@2/(byte*) print_char_cursor#18 print_word/(byte*) print_char_cursor#99 print_word::@1/(byte*) print_char_cursor#18 sin8u_table::@10/(byte*) print_char_cursor#2 sin8u_table::@12/(byte*) print_char_cursor#2 sin8u_table::@23/(byte*) print_char_cursor#2 sin8u_table::@6/(byte*) print_char_cursor#2 sin8u_table::@8/(byte*) print_char_cursor#2 )
-  [74] (byte) print_byte::b#8 ← phi( print_sbyte::@2/(byte~) print_byte::b#10 print_word/(byte) print_byte::b#1 print_word::@1/(byte) print_byte::b#2 sin8u_table::@10/(const byte) sin8u_table::amplitude#0 sin8u_table::@12/(const byte) sin8u_table::mid#0 sin8u_table::@23/(byte) print_byte::b#7 sin8u_table::@6/(const byte) sin8u_table::min#0 sin8u_table::@8/(const byte) sin8u_table::max#0 )
+print_byte: scope:[print_byte]  from print_sbyte::@2 print_word print_word::@1 sin8u_table::@11 sin8u_table::@21 sin8u_table::@5 sin8u_table::@7 sin8u_table::@9
+  [74] (byte*) print_char_cursor#100 ← phi( print_sbyte::@2/(byte*) print_char_cursor#18 print_word/(byte*) print_char_cursor#99 print_word::@1/(byte*) print_char_cursor#18 sin8u_table::@9/(byte*) print_char_cursor#2 sin8u_table::@11/(byte*) print_char_cursor#2 sin8u_table::@21/(byte*) print_char_cursor#2 sin8u_table::@5/(byte*) print_char_cursor#2 sin8u_table::@7/(byte*) print_char_cursor#2 )
+  [74] (byte) print_byte::b#8 ← phi( print_sbyte::@2/(byte~) print_byte::b#10 print_word/(byte) print_byte::b#1 print_word::@1/(byte) print_byte::b#2 sin8u_table::@9/(const byte) sin8u_table::amplitude#0 sin8u_table::@11/(const byte) sin8u_table::mid#0 sin8u_table::@21/(byte) print_byte::b#7 sin8u_table::@5/(const byte) sin8u_table::min#0 sin8u_table::@7/(const byte) sin8u_table::max#0 )
   [75] (byte~) print_byte::$0 ← (byte) print_byte::b#8 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [76] (byte) print_char::ch#3 ← *((const byte[]) print_hextab#0 + (byte~) print_byte::$0)
   [77] call print_char 
@@ -2782,9 +2818,9 @@ print_char: scope:[print_char]  from print_byte print_byte::@1 print_sbyte::@1 p
 print_char::@return: scope:[print_char]  from print_char
   [85] return 
   to:@return
-print_str: scope:[print_str]  from sin8u_table::@11 sin8u_table::@16 sin8u_table::@18 sin8u_table::@20 sin8u_table::@22 sin8u_table::@3 sin8u_table::@5 sin8u_table::@7 sin8u_table::@9
-  [86] (byte*) print_char_cursor#105 ← phi( sin8u_table::@11/(byte*) print_char_cursor#18 sin8u_table::@16/(byte*~) print_char_cursor#126 sin8u_table::@18/(byte*) print_char_cursor#18 sin8u_table::@20/(byte*) print_char_cursor#18 sin8u_table::@22/(byte*) print_char_cursor#18 sin8u_table::@3/((byte*))(word/signed word/dword/signed dword) $400 sin8u_table::@5/(byte*) print_char_cursor#18 sin8u_table::@7/(byte*) print_char_cursor#18 sin8u_table::@9/(byte*) print_char_cursor#18 )
-  [86] (byte*) print_str::str#12 ← phi( sin8u_table::@11/(const string) sin8u_table::str4 sin8u_table::@16/(const string) sin8u_table::str5 sin8u_table::@18/(const string) sin8u_table::str6 sin8u_table::@20/(const string) sin8u_table::str7 sin8u_table::@22/(const string) sin8u_table::str8 sin8u_table::@3/(const string) sin8u_table::str sin8u_table::@5/(const string) sin8u_table::str1 sin8u_table::@7/(const string) sin8u_table::str2 sin8u_table::@9/(const string) sin8u_table::str3 )
+print_str: scope:[print_str]  from sin8u_table::@10 sin8u_table::@14 sin8u_table::@16 sin8u_table::@18 sin8u_table::@2 sin8u_table::@20 sin8u_table::@4 sin8u_table::@6 sin8u_table::@8
+  [86] (byte*) print_char_cursor#105 ← phi( sin8u_table::@10/(byte*) print_char_cursor#18 sin8u_table::@14/(byte*~) print_char_cursor#126 sin8u_table::@16/(byte*) print_char_cursor#18 sin8u_table::@18/(byte*) print_char_cursor#18 sin8u_table::@20/(byte*) print_char_cursor#18 sin8u_table::@2/((byte*))(word/signed word/dword/signed dword) $400 sin8u_table::@4/(byte*) print_char_cursor#18 sin8u_table::@6/(byte*) print_char_cursor#18 sin8u_table::@8/(byte*) print_char_cursor#18 )
+  [86] (byte*) print_str::str#12 ← phi( sin8u_table::@10/(const string) sin8u_table::str4 sin8u_table::@14/(const string) sin8u_table::str5 sin8u_table::@16/(const string) sin8u_table::str6 sin8u_table::@18/(const string) sin8u_table::str7 sin8u_table::@20/(const string) sin8u_table::str8 sin8u_table::@2/(const string) sin8u_table::str sin8u_table::@4/(const string) sin8u_table::str1 sin8u_table::@6/(const string) sin8u_table::str2 sin8u_table::@8/(const string) sin8u_table::str3 )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [87] (byte*) print_char_cursor#2 ← phi( print_str/(byte*) print_char_cursor#105 print_str::@2/(byte*) print_char_cursor#1 )
@@ -2799,28 +2835,28 @@ print_str::@2: scope:[print_str]  from print_str::@1
   [91] (byte*) print_char_cursor#1 ← ++ (byte*) print_char_cursor#2
   [92] (byte*) print_str::str#0 ← ++ (byte*) print_str::str#10
   to:print_str::@1
-print_sword: scope:[print_sword]  from sin8u_table::@21
+print_sword: scope:[print_sword]  from sin8u_table::@19
   [93] if((signed word) print_sword::w#1>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sword::@1
   to:print_sword::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [94] phi()
   [95] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [96] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [97] (byte*) print_char_cursor#94 ← phi( print_sword/(byte*) print_char_cursor#2 print_sword::@4/(byte*) print_char_cursor#18 )
-  [97] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [97] (byte*) print_char_cursor#94 ← phi( print_sword/(byte*) print_char_cursor#2 print_sword::@3/(byte*) print_char_cursor#18 )
+  [97] (signed word) print_sword::w#3 ← phi( print_sword/(signed word) print_sword::w#1 print_sword::@3/(signed word) print_sword::w#0 )
   [98] (word~) print_word::w#5 ← (word)(signed word) print_sword::w#3
   [99] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
   [100] return 
   to:@return
-print_word: scope:[print_word]  from print_sword::@1 sin8u_table::@17 sin8u_table::@4
-  [101] (byte*) print_char_cursor#99 ← phi( print_sword::@1/(byte*) print_char_cursor#94 sin8u_table::@17/(byte*) print_char_cursor#2 sin8u_table::@4/(byte*) print_char_cursor#2 )
-  [101] (word) print_word::w#3 ← phi( print_sword::@1/(word~) print_word::w#5 sin8u_table::@17/(word) print_word::w#2 sin8u_table::@4/(word) print_word::w#1 )
+print_word: scope:[print_word]  from print_sword::@1 sin8u_table::@15 sin8u_table::@3
+  [101] (byte*) print_char_cursor#99 ← phi( print_sword::@1/(byte*) print_char_cursor#94 sin8u_table::@15/(byte*) print_char_cursor#2 sin8u_table::@3/(byte*) print_char_cursor#2 )
+  [101] (word) print_word::w#3 ← phi( print_sword::@1/(word~) print_word::w#5 sin8u_table::@15/(word) print_word::w#2 sin8u_table::@3/(word) print_word::w#1 )
   [102] (byte) print_byte::b#1 ← > (word) print_word::w#3
   [103] call print_byte 
   to:print_word::@1
@@ -2831,15 +2867,15 @@ print_word::@1: scope:[print_word]  from print_word
 print_word::@return: scope:[print_word]  from print_word::@1
   [106] return 
   to:@return
-print_sbyte: scope:[print_sbyte]  from sin8u_table::@19
+print_sbyte: scope:[print_sbyte]  from sin8u_table::@17
   [107] if((signed byte) print_sbyte::b#1<(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sbyte::@1
   to:print_sbyte::@3
 print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [108] phi()
   [109] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [110] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [110] (signed byte) print_sbyte::b#4 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#1 )
   [111] (byte~) print_byte::b#10 ← (byte)(signed byte) print_sbyte::b#4
   [112] call print_byte 
   to:print_sbyte::@return
@@ -2849,26 +2885,26 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [114] phi()
   [115] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [116] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1
   to:print_sbyte::@2
-mul8su: scope:[mul8su]  from sin8u_table::@15
+mul8su: scope:[mul8su]  from sin8u_table::@13
   [117] (byte~) mul8u::a#8 ← (byte)(signed byte) mul8su::a#0
   [118] call mul8u 
   [119] (word) mul8u::return#2 ← (word) mul8u::res#2
-  to:mul8su::@4
-mul8su::@4: scope:[mul8su]  from mul8su
+  to:mul8su::@3
+mul8su::@3: scope:[mul8su]  from mul8su
   [120] (word) mul8su::m#0 ← (word) mul8u::return#2
   [121] if((signed byte) mul8su::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8su::@1
   to:mul8su::@2
-mul8su::@2: scope:[mul8su]  from mul8su::@4
+mul8su::@2: scope:[mul8su]  from mul8su::@3
   [122] (byte~) mul8su::$7 ← > (word) mul8su::m#0
   [123] (byte~) mul8su::$10 ← (byte~) mul8su::$7 - ((byte))(const byte) mul8su::b#0
   [124] (word) mul8su::m#1 ← (word) mul8su::m#0 hi= (byte~) mul8su::$10
   to:mul8su::@1
-mul8su::@1: scope:[mul8su]  from mul8su::@2 mul8su::@4
-  [125] (word) mul8su::m#2 ← phi( mul8su::@2/(word) mul8su::m#1 mul8su::@4/(word) mul8su::m#0 )
+mul8su::@1: scope:[mul8su]  from mul8su::@2 mul8su::@3
+  [125] (word) mul8su::m#2 ← phi( mul8su::@2/(word) mul8su::m#1 mul8su::@3/(word) mul8su::m#0 )
   to:mul8su::@return
 mul8su::@return: scope:[mul8su]  from mul8su::@1
   [126] return 
@@ -2878,10 +2914,10 @@ mul8u: scope:[mul8u]  from mul8su mulu8_sel
   [127] (byte) mul8u::b#2 ← phi( mul8su/((byte))(const byte) mul8su::b#0 mulu8_sel/(byte) mul8u::b#1 )
   [128] (word) mul8u::mb#0 ← ((word)) (byte) mul8u::b#2
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [129] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@8/(word) mul8u::mb#1 )
-  [129] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [129] (byte) mul8u::a#3 ← phi( mul8u/(byte) mul8u::a#6 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [129] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@4/(word) mul8u::mb#1 )
+  [129] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [129] (byte) mul8u::a#3 ← phi( mul8u/(byte) mul8u::a#6 mul8u::@4/(byte) mul8u::a#0 )
   [130] if((byte) mul8u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -2889,13 +2925,13 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [132] (byte~) mul8u::$1 ← (byte) mul8u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [133] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [133] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [134] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [135] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [135] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [136] (byte) mul8u::a#0 ← (byte) mul8u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [137] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
@@ -2921,86 +2957,86 @@ sin8s::@2: scope:[sin8s]  from sin8s::@1 sin8s::@6
   [147] (byte) mulu8_sel::v2#0 ← (byte) sin8s::x1#0
   [148] call mulu8_sel 
   [149] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-  to:sin8s::@10
-sin8s::@10: scope:[sin8s]  from sin8s::@2
+  to:sin8s::@9
+sin8s::@9: scope:[sin8s]  from sin8s::@2
   [150] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   [151] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0
   [152] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0
   [153] call mulu8_sel 
   [154] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-  to:sin8s::@11
-sin8s::@11: scope:[sin8s]  from sin8s::@10
+  to:sin8s::@10
+sin8s::@10: scope:[sin8s]  from sin8s::@9
   [155] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1
   [156] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0
   [157] call mulu8_sel 
   [158] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-  to:sin8s::@12
-sin8s::@12: scope:[sin8s]  from sin8s::@11
+  to:sin8s::@11
+sin8s::@11: scope:[sin8s]  from sin8s::@10
   [159] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   [160] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0
   [161] (byte) mulu8_sel::v1#3 ← (byte) sin8s::x3#0
   [162] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0
   [163] call mulu8_sel 
   [164] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-  to:sin8s::@13
-sin8s::@13: scope:[sin8s]  from sin8s::@12
+  to:sin8s::@12
+sin8s::@12: scope:[sin8s]  from sin8s::@11
   [165] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   [166] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0
   [167] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0
   [168] call mulu8_sel 
   [169] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-  to:sin8s::@14
-sin8s::@14: scope:[sin8s]  from sin8s::@13
+  to:sin8s::@13
+sin8s::@13: scope:[sin8s]  from sin8s::@12
   [170] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   [171] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [172] (byte) sin8s::usinx#1 ← (byte) sin8s::usinx#0 + (byte) sin8s::x5_128#0
   [173] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3
   to:sin8s::@7
-sin8s::@7: scope:[sin8s]  from sin8s::@14
+sin8s::@7: scope:[sin8s]  from sin8s::@13
   [174] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1
   to:sin8s::@3
-sin8s::@3: scope:[sin8s]  from sin8s::@14 sin8s::@7
-  [175] (byte) sin8s::usinx#4 ← phi( sin8s::@14/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
-  [176] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18
+sin8s::@3: scope:[sin8s]  from sin8s::@13 sin8s::@7
+  [175] (byte) sin8s::usinx#4 ← phi( sin8s::@13/(byte) sin8s::usinx#1 sin8s::@7/(byte) sin8s::usinx#2 )
+  [176] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14
   to:sin8s::@8
 sin8s::@8: scope:[sin8s]  from sin8s::@3
   [177] (signed byte) sin8s::sinx#1 ← - (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-sin8s::@4: scope:[sin8s]  from sin8s::@18 sin8s::@8
-  [178] (signed byte) sin8s::return#0 ← phi( sin8s::@18/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
+sin8s::@4: scope:[sin8s]  from sin8s::@14 sin8s::@8
+  [178] (signed byte) sin8s::return#0 ← phi( sin8s::@14/(signed byte~) sin8s::return#5 sin8s::@8/(signed byte) sin8s::sinx#1 )
   to:sin8s::@return
 sin8s::@return: scope:[sin8s]  from sin8s::@4
   [179] return 
   to:@return
-sin8s::@18: scope:[sin8s]  from sin8s::@3
+sin8s::@14: scope:[sin8s]  from sin8s::@3
   [180] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4
   to:sin8s::@4
-mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@13 sin8s::@2
-  [181] (byte) mulu8_sel::select#5 ← phi( sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@13/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [181] (byte) mulu8_sel::v2#5 ← phi( sin8s::@10/(byte) mulu8_sel::v2#1 sin8s::@11/(const byte) sin8s::DIV_6#0 sin8s::@12/(byte) mulu8_sel::v2#3 sin8s::@13/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
-  [181] (byte) mulu8_sel::v1#5 ← phi( sin8s::@10/(byte) mulu8_sel::v1#1 sin8s::@11/(byte) mulu8_sel::v1#2 sin8s::@12/(byte) mulu8_sel::v1#3 sin8s::@13/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
+mulu8_sel: scope:[mulu8_sel]  from sin8s::@10 sin8s::@11 sin8s::@12 sin8s::@2 sin8s::@9
+  [181] (byte) mulu8_sel::select#5 ← phi( sin8s::@9/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@10/(byte/signed byte/word/signed word/dword/signed dword) 1 sin8s::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@12/(byte/signed byte/word/signed word/dword/signed dword) 0 sin8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [181] (byte) mulu8_sel::v2#5 ← phi( sin8s::@9/(byte) mulu8_sel::v2#1 sin8s::@10/(const byte) sin8s::DIV_6#0 sin8s::@11/(byte) mulu8_sel::v2#3 sin8s::@12/(byte) mulu8_sel::v2#4 sin8s::@2/(byte) mulu8_sel::v2#0 )
+  [181] (byte) mulu8_sel::v1#5 ← phi( sin8s::@9/(byte) mulu8_sel::v1#1 sin8s::@10/(byte) mulu8_sel::v1#2 sin8s::@11/(byte) mulu8_sel::v1#3 sin8s::@12/(byte) mulu8_sel::v1#4 sin8s::@2/(byte) mulu8_sel::v1#0 )
   [182] (byte) mul8u::a#2 ← (byte) mulu8_sel::v1#5
   [183] (byte) mul8u::b#1 ← (byte) mulu8_sel::v2#5
   [184] call mul8u 
   [185] (word) mul8u::return#3 ← (word) mul8u::res#2
-  to:mulu8_sel::@2
-mulu8_sel::@2: scope:[mulu8_sel]  from mulu8_sel
+  to:mulu8_sel::@1
+mulu8_sel::@1: scope:[mulu8_sel]  from mulu8_sel
   [186] (word~) mulu8_sel::$0 ← (word) mul8u::return#3
   [187] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5
   [188] (byte) mulu8_sel::return#12 ← > (word~) mulu8_sel::$1
   to:mulu8_sel::@return
-mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@2
+mulu8_sel::@return: scope:[mulu8_sel]  from mulu8_sel::@1
   [189] return 
   to:@return
 div16u: scope:[div16u]  from sin8u_table
   [190] phi()
   [191] call divr16u 
   [192] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div16u::@2
-div16u::@2: scope:[div16u]  from div16u
+  to:div16u::@1
+div16u::@1: scope:[div16u]  from div16u
   [193] (word) div16u::return#0 ← (word) divr16u::return#2
   to:div16u::@return
-div16u::@return: scope:[div16u]  from div16u::@2
+div16u::@return: scope:[div16u]  from div16u::@1
   [194] return 
   to:@return
 divr16u: scope:[divr16u]  from div16u
@@ -3496,17 +3532,17 @@ INITIAL ASM
   .label print_line_cursor = 8
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @41 [phi:@begin->@41]
-b41_from_bbegin:
-  jmp b41
-//SEG5 @41
-b41:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @41 to main [phi:@41->main]
-main_from_b41:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @41 to @end [phi:@41->@end]
-bend_from_b41:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3563,192 +3599,192 @@ sin8u_table: {
     sta div16u.return_2
     lda div16u.return+1
     sta div16u.return_2+1
-    jmp b3
-  //SEG23 sin8u_table::@3
-  b3:
+    jmp b2
+  //SEG23 sin8u_table::@2
+  b2:
   //SEG24 [12] (word) sin8u_table::step#0 ← (word) div16u::return#2 -- vwuz1=vwuz2 
     lda div16u.return_2
     sta step
     lda div16u.return_2+1
     sta step+1
   //SEG25 [13] call print_str 
-  //SEG26 [86] phi from sin8u_table::@3 to print_str [phi:sin8u_table::@3->print_str]
-  print_str_from_b3:
-  //SEG27 [86] phi (byte*) print_char_cursor#105 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@3->print_str#0] -- pbuz1=pbuc1 
+  //SEG26 [86] phi from sin8u_table::@2 to print_str [phi:sin8u_table::@2->print_str]
+  print_str_from_b2:
+  //SEG27 [86] phi (byte*) print_char_cursor#105 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@2->print_str#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG28 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str [phi:sin8u_table::@3->print_str#1] -- pbuz1=pbuc1 
+  //SEG28 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str [phi:sin8u_table::@2->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b4
-  //SEG29 sin8u_table::@4
-  b4:
+    jmp b3
+  //SEG29 sin8u_table::@3
+  b3:
   //SEG30 [14] (word) print_word::w#1 ← (word) sin8u_table::step#0 -- vwuz1=vwuz2 
     lda step
     sta print_word.w
     lda step+1
     sta print_word.w+1
   //SEG31 [15] call print_word 
-  //SEG32 [101] phi from sin8u_table::@4 to print_word [phi:sin8u_table::@4->print_word]
-  print_word_from_b4:
-  //SEG33 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@4->print_word#0] -- register_copy 
-  //SEG34 [101] phi (word) print_word::w#3 = (word) print_word::w#1 [phi:sin8u_table::@4->print_word#1] -- register_copy 
+  //SEG32 [101] phi from sin8u_table::@3 to print_word [phi:sin8u_table::@3->print_word]
+  print_word_from_b3:
+  //SEG33 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@3->print_word#0] -- register_copy 
+  //SEG34 [101] phi (word) print_word::w#3 = (word) print_word::w#1 [phi:sin8u_table::@3->print_word#1] -- register_copy 
     jsr print_word
-  //SEG35 [16] phi from sin8u_table::@4 to sin8u_table::@5 [phi:sin8u_table::@4->sin8u_table::@5]
-  b5_from_b4:
-    jmp b5
-  //SEG36 sin8u_table::@5
-  b5:
+  //SEG35 [16] phi from sin8u_table::@3 to sin8u_table::@4 [phi:sin8u_table::@3->sin8u_table::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG36 sin8u_table::@4
+  b4:
   //SEG37 [17] call print_str 
-  //SEG38 [86] phi from sin8u_table::@5 to print_str [phi:sin8u_table::@5->print_str]
-  print_str_from_b5:
-  //SEG39 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@5->print_str#0] -- register_copy 
-  //SEG40 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str1 [phi:sin8u_table::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG38 [86] phi from sin8u_table::@4 to print_str [phi:sin8u_table::@4->print_str]
+  print_str_from_b4:
+  //SEG39 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@4->print_str#0] -- register_copy 
+  //SEG40 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str1 [phi:sin8u_table::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG41 [18] phi from sin8u_table::@5 to sin8u_table::@6 [phi:sin8u_table::@5->sin8u_table::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG42 sin8u_table::@6
-  b6:
+  //SEG41 [18] phi from sin8u_table::@4 to sin8u_table::@5 [phi:sin8u_table::@4->sin8u_table::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG42 sin8u_table::@5
+  b5:
   //SEG43 [19] call print_byte 
-  //SEG44 [74] phi from sin8u_table::@6 to print_byte [phi:sin8u_table::@6->print_byte]
-  print_byte_from_b6:
-  //SEG45 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@6->print_byte#0] -- register_copy 
-  //SEG46 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::min#0 [phi:sin8u_table::@6->print_byte#1] -- vbuz1=vbuc1 
+  //SEG44 [74] phi from sin8u_table::@5 to print_byte [phi:sin8u_table::@5->print_byte]
+  print_byte_from_b5:
+  //SEG45 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@5->print_byte#0] -- register_copy 
+  //SEG46 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::min#0 [phi:sin8u_table::@5->print_byte#1] -- vbuz1=vbuc1 
     lda #min
     sta print_byte.b
     jsr print_byte
-  //SEG47 [20] phi from sin8u_table::@6 to sin8u_table::@7 [phi:sin8u_table::@6->sin8u_table::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG48 sin8u_table::@7
-  b7:
+  //SEG47 [20] phi from sin8u_table::@5 to sin8u_table::@6 [phi:sin8u_table::@5->sin8u_table::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG48 sin8u_table::@6
+  b6:
   //SEG49 [21] call print_str 
-  //SEG50 [86] phi from sin8u_table::@7 to print_str [phi:sin8u_table::@7->print_str]
-  print_str_from_b7:
-  //SEG51 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@7->print_str#0] -- register_copy 
-  //SEG52 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str2 [phi:sin8u_table::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG50 [86] phi from sin8u_table::@6 to print_str [phi:sin8u_table::@6->print_str]
+  print_str_from_b6:
+  //SEG51 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@6->print_str#0] -- register_copy 
+  //SEG52 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str2 [phi:sin8u_table::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-  //SEG53 [22] phi from sin8u_table::@7 to sin8u_table::@8 [phi:sin8u_table::@7->sin8u_table::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG54 sin8u_table::@8
-  b8:
+  //SEG53 [22] phi from sin8u_table::@6 to sin8u_table::@7 [phi:sin8u_table::@6->sin8u_table::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG54 sin8u_table::@7
+  b7:
   //SEG55 [23] call print_byte 
-  //SEG56 [74] phi from sin8u_table::@8 to print_byte [phi:sin8u_table::@8->print_byte]
-  print_byte_from_b8:
-  //SEG57 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@8->print_byte#0] -- register_copy 
-  //SEG58 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::max#0 [phi:sin8u_table::@8->print_byte#1] -- vbuz1=vbuc1 
+  //SEG56 [74] phi from sin8u_table::@7 to print_byte [phi:sin8u_table::@7->print_byte]
+  print_byte_from_b7:
+  //SEG57 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@7->print_byte#0] -- register_copy 
+  //SEG58 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::max#0 [phi:sin8u_table::@7->print_byte#1] -- vbuz1=vbuc1 
     lda #max
     sta print_byte.b
     jsr print_byte
-  //SEG59 [24] phi from sin8u_table::@8 to sin8u_table::@9 [phi:sin8u_table::@8->sin8u_table::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG60 sin8u_table::@9
-  b9:
+  //SEG59 [24] phi from sin8u_table::@7 to sin8u_table::@8 [phi:sin8u_table::@7->sin8u_table::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG60 sin8u_table::@8
+  b8:
   //SEG61 [25] call print_str 
-  //SEG62 [86] phi from sin8u_table::@9 to print_str [phi:sin8u_table::@9->print_str]
-  print_str_from_b9:
-  //SEG63 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@9->print_str#0] -- register_copy 
-  //SEG64 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str3 [phi:sin8u_table::@9->print_str#1] -- pbuz1=pbuc1 
+  //SEG62 [86] phi from sin8u_table::@8 to print_str [phi:sin8u_table::@8->print_str]
+  print_str_from_b8:
+  //SEG63 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@8->print_str#0] -- register_copy 
+  //SEG64 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str3 [phi:sin8u_table::@8->print_str#1] -- pbuz1=pbuc1 
     lda #<str3
     sta print_str.str
     lda #>str3
     sta print_str.str+1
     jsr print_str
-  //SEG65 [26] phi from sin8u_table::@9 to sin8u_table::@10 [phi:sin8u_table::@9->sin8u_table::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG66 sin8u_table::@10
-  b10:
+  //SEG65 [26] phi from sin8u_table::@8 to sin8u_table::@9 [phi:sin8u_table::@8->sin8u_table::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG66 sin8u_table::@9
+  b9:
   //SEG67 [27] call print_byte 
-  //SEG68 [74] phi from sin8u_table::@10 to print_byte [phi:sin8u_table::@10->print_byte]
-  print_byte_from_b10:
-  //SEG69 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@10->print_byte#0] -- register_copy 
-  //SEG70 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::amplitude#0 [phi:sin8u_table::@10->print_byte#1] -- vbuz1=vbuc1 
+  //SEG68 [74] phi from sin8u_table::@9 to print_byte [phi:sin8u_table::@9->print_byte]
+  print_byte_from_b9:
+  //SEG69 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@9->print_byte#0] -- register_copy 
+  //SEG70 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::amplitude#0 [phi:sin8u_table::@9->print_byte#1] -- vbuz1=vbuc1 
     lda #amplitude
     sta print_byte.b
     jsr print_byte
-  //SEG71 [28] phi from sin8u_table::@10 to sin8u_table::@11 [phi:sin8u_table::@10->sin8u_table::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG72 sin8u_table::@11
-  b11:
+  //SEG71 [28] phi from sin8u_table::@9 to sin8u_table::@10 [phi:sin8u_table::@9->sin8u_table::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG72 sin8u_table::@10
+  b10:
   //SEG73 [29] call print_str 
-  //SEG74 [86] phi from sin8u_table::@11 to print_str [phi:sin8u_table::@11->print_str]
-  print_str_from_b11:
-  //SEG75 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@11->print_str#0] -- register_copy 
-  //SEG76 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str4 [phi:sin8u_table::@11->print_str#1] -- pbuz1=pbuc1 
+  //SEG74 [86] phi from sin8u_table::@10 to print_str [phi:sin8u_table::@10->print_str]
+  print_str_from_b10:
+  //SEG75 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@10->print_str#0] -- register_copy 
+  //SEG76 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str4 [phi:sin8u_table::@10->print_str#1] -- pbuz1=pbuc1 
     lda #<str4
     sta print_str.str
     lda #>str4
     sta print_str.str+1
     jsr print_str
-  //SEG77 [30] phi from sin8u_table::@11 to sin8u_table::@12 [phi:sin8u_table::@11->sin8u_table::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG78 sin8u_table::@12
-  b12:
+  //SEG77 [30] phi from sin8u_table::@10 to sin8u_table::@11 [phi:sin8u_table::@10->sin8u_table::@11]
+  b11_from_b10:
+    jmp b11
+  //SEG78 sin8u_table::@11
+  b11:
   //SEG79 [31] call print_byte 
-  //SEG80 [74] phi from sin8u_table::@12 to print_byte [phi:sin8u_table::@12->print_byte]
-  print_byte_from_b12:
-  //SEG81 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@12->print_byte#0] -- register_copy 
-  //SEG82 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::mid#0 [phi:sin8u_table::@12->print_byte#1] -- vbuz1=vbuc1 
+  //SEG80 [74] phi from sin8u_table::@11 to print_byte [phi:sin8u_table::@11->print_byte]
+  print_byte_from_b11:
+  //SEG81 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@11->print_byte#0] -- register_copy 
+  //SEG82 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::mid#0 [phi:sin8u_table::@11->print_byte#1] -- vbuz1=vbuc1 
     lda #mid
     sta print_byte.b
     jsr print_byte
-  //SEG83 [32] phi from sin8u_table::@12 to sin8u_table::@13 [phi:sin8u_table::@12->sin8u_table::@13]
-  b13_from_b12:
-    jmp b13
-  //SEG84 sin8u_table::@13
-  b13:
+  //SEG83 [32] phi from sin8u_table::@11 to sin8u_table::@12 [phi:sin8u_table::@11->sin8u_table::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG84 sin8u_table::@12
+  b12:
   //SEG85 [33] call print_ln 
-  //SEG86 [69] phi from sin8u_table::@13 to print_ln [phi:sin8u_table::@13->print_ln]
-  print_ln_from_b13:
-  //SEG87 [69] phi (byte*) print_line_cursor#23 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@13->print_ln#0] -- pbuz1=pbuc1 
+  //SEG86 [69] phi from sin8u_table::@12 to print_ln [phi:sin8u_table::@12->print_ln]
+  print_ln_from_b12:
+  //SEG87 [69] phi (byte*) print_line_cursor#23 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@12->print_ln#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
     jsr print_ln
-  //SEG88 [34] phi from sin8u_table::@13 to sin8u_table::@1 [phi:sin8u_table::@13->sin8u_table::@1]
-  b1_from_b13:
-  //SEG89 [34] phi (word) sin8u_table::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@13->sin8u_table::@1#0] -- vwuz1=vbuc1 
+  //SEG88 [34] phi from sin8u_table::@12 to sin8u_table::@1 [phi:sin8u_table::@12->sin8u_table::@1]
+  b1_from_b12:
+  //SEG89 [34] phi (word) sin8u_table::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@12->sin8u_table::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG90 [34] phi (byte*) sin8u_table::sintab#2 = (const byte[$14]) main::sintab#0 [phi:sin8u_table::@13->sin8u_table::@1#1] -- pbuz1=pbuc1 
+  //SEG90 [34] phi (byte*) sin8u_table::sintab#2 = (const byte[$14]) main::sintab#0 [phi:sin8u_table::@12->sin8u_table::@1#1] -- pbuz1=pbuc1 
     lda #<main.sintab
     sta sintab
     lda #>main.sintab
     sta sintab+1
-  //SEG91 [34] phi (word) sin8u_table::x#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@13->sin8u_table::@1#2] -- vwuz1=vbuc1 
+  //SEG91 [34] phi (word) sin8u_table::x#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@12->sin8u_table::@1#2] -- vwuz1=vbuc1 
     lda #0
     sta x
     lda #0
     sta x+1
     jmp b1
   // u[4.12]
-  //SEG92 [34] phi from sin8u_table::@25 to sin8u_table::@1 [phi:sin8u_table::@25->sin8u_table::@1]
-  b1_from_b25:
-  //SEG93 [34] phi (word) sin8u_table::i#10 = (word) sin8u_table::i#1 [phi:sin8u_table::@25->sin8u_table::@1#0] -- register_copy 
-  //SEG94 [34] phi (byte*) sin8u_table::sintab#2 = (byte*) sin8u_table::sintab#1 [phi:sin8u_table::@25->sin8u_table::@1#1] -- register_copy 
-  //SEG95 [34] phi (word) sin8u_table::x#10 = (word) sin8u_table::x#1 [phi:sin8u_table::@25->sin8u_table::@1#2] -- register_copy 
+  //SEG92 [34] phi from sin8u_table::@23 to sin8u_table::@1 [phi:sin8u_table::@23->sin8u_table::@1]
+  b1_from_b23:
+  //SEG93 [34] phi (word) sin8u_table::i#10 = (word) sin8u_table::i#1 [phi:sin8u_table::@23->sin8u_table::@1#0] -- register_copy 
+  //SEG94 [34] phi (byte*) sin8u_table::sintab#2 = (byte*) sin8u_table::sintab#1 [phi:sin8u_table::@23->sin8u_table::@1#1] -- register_copy 
+  //SEG95 [34] phi (word) sin8u_table::x#10 = (word) sin8u_table::x#1 [phi:sin8u_table::@23->sin8u_table::@1#2] -- register_copy 
     jmp b1
   //SEG96 sin8u_table::@1
   b1:
@@ -3762,9 +3798,9 @@ sin8u_table: {
   //SEG99 [37] (signed byte) sin8s::return#2 ← (signed byte) sin8s::return#0 -- vbsz1=vbsz2 
     lda sin8s.return
     sta sin8s.return_2
-    jmp b15
-  //SEG100 sin8u_table::@15
-  b15:
+    jmp b13
+  //SEG100 sin8u_table::@13
+  b13:
   //SEG101 [38] (signed byte) sin8u_table::sinx#0 ← (signed byte) sin8s::return#2 -- vbsz1=vbsz2 
     lda sin8s.return_2
     sta sinx
@@ -3778,9 +3814,9 @@ sin8u_table: {
     sta mul8su.return
     lda mul8su.m+1
     sta mul8su.return+1
-    jmp b16
-  //SEG105 sin8u_table::@16
-  b16:
+    jmp b14
+  //SEG105 sin8u_table::@14
+  b14:
   //SEG106 [42] (signed word) sin8u_table::sinx_sc#0 ← (signed word) mul8su::return#2 -- vwsz1=vwsz2 
     lda mul8su.return
     sta sinx_sc
@@ -3808,70 +3844,70 @@ sin8u_table: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG112 [48] call print_str 
-  //SEG113 [86] phi from sin8u_table::@16 to print_str [phi:sin8u_table::@16->print_str]
-  print_str_from_b16:
-  //SEG114 [86] phi (byte*) print_char_cursor#105 = (byte*~) print_char_cursor#126 [phi:sin8u_table::@16->print_str#0] -- register_copy 
-  //SEG115 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str5 [phi:sin8u_table::@16->print_str#1] -- pbuz1=pbuc1 
+  //SEG113 [86] phi from sin8u_table::@14 to print_str [phi:sin8u_table::@14->print_str]
+  print_str_from_b14:
+  //SEG114 [86] phi (byte*) print_char_cursor#105 = (byte*~) print_char_cursor#126 [phi:sin8u_table::@14->print_str#0] -- register_copy 
+  //SEG115 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str5 [phi:sin8u_table::@14->print_str#1] -- pbuz1=pbuc1 
     lda #<str5
     sta print_str.str
     lda #>str5
     sta print_str.str+1
     jsr print_str
-    jmp b17
-  //SEG116 sin8u_table::@17
-  b17:
+    jmp b15
+  //SEG116 sin8u_table::@15
+  b15:
   //SEG117 [49] (word) print_word::w#2 ← (word) sin8u_table::x#10 -- vwuz1=vwuz2 
     lda x
     sta print_word.w
     lda x+1
     sta print_word.w+1
   //SEG118 [50] call print_word 
-  //SEG119 [101] phi from sin8u_table::@17 to print_word [phi:sin8u_table::@17->print_word]
-  print_word_from_b17:
-  //SEG120 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@17->print_word#0] -- register_copy 
-  //SEG121 [101] phi (word) print_word::w#3 = (word) print_word::w#2 [phi:sin8u_table::@17->print_word#1] -- register_copy 
+  //SEG119 [101] phi from sin8u_table::@15 to print_word [phi:sin8u_table::@15->print_word]
+  print_word_from_b15:
+  //SEG120 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@15->print_word#0] -- register_copy 
+  //SEG121 [101] phi (word) print_word::w#3 = (word) print_word::w#2 [phi:sin8u_table::@15->print_word#1] -- register_copy 
     jsr print_word
-  //SEG122 [51] phi from sin8u_table::@17 to sin8u_table::@18 [phi:sin8u_table::@17->sin8u_table::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG123 sin8u_table::@18
-  b18:
+  //SEG122 [51] phi from sin8u_table::@15 to sin8u_table::@16 [phi:sin8u_table::@15->sin8u_table::@16]
+  b16_from_b15:
+    jmp b16
+  //SEG123 sin8u_table::@16
+  b16:
   //SEG124 [52] call print_str 
-  //SEG125 [86] phi from sin8u_table::@18 to print_str [phi:sin8u_table::@18->print_str]
-  print_str_from_b18:
-  //SEG126 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@18->print_str#0] -- register_copy 
-  //SEG127 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str6 [phi:sin8u_table::@18->print_str#1] -- pbuz1=pbuc1 
+  //SEG125 [86] phi from sin8u_table::@16 to print_str [phi:sin8u_table::@16->print_str]
+  print_str_from_b16:
+  //SEG126 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@16->print_str#0] -- register_copy 
+  //SEG127 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str6 [phi:sin8u_table::@16->print_str#1] -- pbuz1=pbuc1 
     lda #<str6
     sta print_str.str
     lda #>str6
     sta print_str.str+1
     jsr print_str
-    jmp b19
-  //SEG128 sin8u_table::@19
-  b19:
+    jmp b17
+  //SEG128 sin8u_table::@17
+  b17:
   //SEG129 [53] (signed byte) print_sbyte::b#1 ← (signed byte) sin8u_table::sinx#0 -- vbsz1=vbsz2 
     lda sinx
     sta print_sbyte.b
   //SEG130 [54] call print_sbyte 
     jsr print_sbyte
-  //SEG131 [55] phi from sin8u_table::@19 to sin8u_table::@20 [phi:sin8u_table::@19->sin8u_table::@20]
-  b20_from_b19:
-    jmp b20
-  //SEG132 sin8u_table::@20
-  b20:
+  //SEG131 [55] phi from sin8u_table::@17 to sin8u_table::@18 [phi:sin8u_table::@17->sin8u_table::@18]
+  b18_from_b17:
+    jmp b18
+  //SEG132 sin8u_table::@18
+  b18:
   //SEG133 [56] call print_str 
-  //SEG134 [86] phi from sin8u_table::@20 to print_str [phi:sin8u_table::@20->print_str]
-  print_str_from_b20:
-  //SEG135 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@20->print_str#0] -- register_copy 
-  //SEG136 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str7 [phi:sin8u_table::@20->print_str#1] -- pbuz1=pbuc1 
+  //SEG134 [86] phi from sin8u_table::@18 to print_str [phi:sin8u_table::@18->print_str]
+  print_str_from_b18:
+  //SEG135 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@18->print_str#0] -- register_copy 
+  //SEG136 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str7 [phi:sin8u_table::@18->print_str#1] -- pbuz1=pbuc1 
     lda #<str7
     sta print_str.str
     lda #>str7
     sta print_str.str+1
     jsr print_str
-    jmp b21
-  //SEG137 sin8u_table::@21
-  b21:
+    jmp b19
+  //SEG137 sin8u_table::@19
+  b19:
   //SEG138 [57] (signed word) print_sword::w#1 ← (signed word) sin8u_table::sinx_sc#0 -- vwsz1=vwsz2 
     lda sinx_sc
     sta print_sword.w
@@ -3879,46 +3915,46 @@ sin8u_table: {
     sta print_sword.w+1
   //SEG139 [58] call print_sword 
     jsr print_sword
-  //SEG140 [59] phi from sin8u_table::@21 to sin8u_table::@22 [phi:sin8u_table::@21->sin8u_table::@22]
-  b22_from_b21:
-    jmp b22
-  //SEG141 sin8u_table::@22
-  b22:
+  //SEG140 [59] phi from sin8u_table::@19 to sin8u_table::@20 [phi:sin8u_table::@19->sin8u_table::@20]
+  b20_from_b19:
+    jmp b20
+  //SEG141 sin8u_table::@20
+  b20:
   //SEG142 [60] call print_str 
-  //SEG143 [86] phi from sin8u_table::@22 to print_str [phi:sin8u_table::@22->print_str]
-  print_str_from_b22:
-  //SEG144 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@22->print_str#0] -- register_copy 
-  //SEG145 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str8 [phi:sin8u_table::@22->print_str#1] -- pbuz1=pbuc1 
+  //SEG143 [86] phi from sin8u_table::@20 to print_str [phi:sin8u_table::@20->print_str]
+  print_str_from_b20:
+  //SEG144 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@20->print_str#0] -- register_copy 
+  //SEG145 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str8 [phi:sin8u_table::@20->print_str#1] -- pbuz1=pbuc1 
     lda #<str8
     sta print_str.str
     lda #>str8
     sta print_str.str+1
     jsr print_str
-    jmp b23
-  //SEG146 sin8u_table::@23
-  b23:
+    jmp b21
+  //SEG146 sin8u_table::@21
+  b21:
   //SEG147 [61] (byte) print_byte::b#7 ← (byte) sin8u_table::sinx_tr#0 -- vbuz1=vbuz2 
     lda sinx_tr
     sta print_byte.b
   //SEG148 [62] call print_byte 
-  //SEG149 [74] phi from sin8u_table::@23 to print_byte [phi:sin8u_table::@23->print_byte]
-  print_byte_from_b23:
-  //SEG150 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@23->print_byte#0] -- register_copy 
-  //SEG151 [74] phi (byte) print_byte::b#8 = (byte) print_byte::b#7 [phi:sin8u_table::@23->print_byte#1] -- register_copy 
+  //SEG149 [74] phi from sin8u_table::@21 to print_byte [phi:sin8u_table::@21->print_byte]
+  print_byte_from_b21:
+  //SEG150 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@21->print_byte#0] -- register_copy 
+  //SEG151 [74] phi (byte) print_byte::b#8 = (byte) print_byte::b#7 [phi:sin8u_table::@21->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG152 [63] phi from sin8u_table::@23 to sin8u_table::@24 [phi:sin8u_table::@23->sin8u_table::@24]
-  b24_from_b23:
-    jmp b24
-  //SEG153 sin8u_table::@24
-  b24:
+  //SEG152 [63] phi from sin8u_table::@21 to sin8u_table::@22 [phi:sin8u_table::@21->sin8u_table::@22]
+  b22_from_b21:
+    jmp b22
+  //SEG153 sin8u_table::@22
+  b22:
   //SEG154 [64] call print_ln 
-  //SEG155 [69] phi from sin8u_table::@24 to print_ln [phi:sin8u_table::@24->print_ln]
-  print_ln_from_b24:
-  //SEG156 [69] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:sin8u_table::@24->print_ln#0] -- register_copy 
+  //SEG155 [69] phi from sin8u_table::@22 to print_ln [phi:sin8u_table::@22->print_ln]
+  print_ln_from_b22:
+  //SEG156 [69] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:sin8u_table::@22->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b25
-  //SEG157 sin8u_table::@25
-  b25:
+    jmp b23
+  //SEG157 sin8u_table::@23
+  b23:
   //SEG158 [65] (word) sin8u_table::x#1 ← (word) sin8u_table::x#10 + (word) sin8u_table::step#0 -- vwuz1=vwuz1_plus_vwuz2 
     lda x
     clc
@@ -3935,11 +3971,11 @@ sin8u_table: {
   //SEG160 [67] if((word) sin8u_table::i#1<(const word) main::tabsize#0) goto sin8u_table::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.tabsize
-    bcc b1_from_b25
+    bcc b1_from_b23
     bne !+
     lda i
     cmp #<main.tabsize
-    bcc b1_from_b25
+    bcc b1_from_b23
   !:
     jmp breturn
   //SEG161 sin8u_table::@return
@@ -4119,9 +4155,9 @@ print_sword: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b4
-  //SEG212 print_sword::@4
-  b4:
+    jmp b3
+  //SEG212 print_sword::@3
+  b3:
   //SEG213 [96] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -4132,11 +4168,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG214 [97] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG214 [97] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG215 [97] phi (byte*) print_char_cursor#94 = (byte*) print_char_cursor#2 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG216 [97] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG215 [97] phi (byte*) print_char_cursor#94 = (byte*) print_char_cursor#2 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG216 [97] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG217 print_sword::@1
   b1:
@@ -4210,10 +4246,10 @@ print_sbyte: {
     lda #' '
     sta print_char.ch
     jsr print_char
-  //SEG247 [110] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG247 [110] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG248 [110] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG248 [110] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG249 print_sbyte::@2
   b2:
@@ -4244,16 +4280,16 @@ print_sbyte: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b5
-  //SEG263 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG263 print_sbyte::@4
+  b4:
   //SEG264 [116] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG265 mul8su
 // Multiply a signed byte and an unsigned byte (into a signed word)
@@ -4282,9 +4318,9 @@ mul8su: {
     sta mul8u.return
     lda mul8u.res+1
     sta mul8u.return+1
-    jmp b4
-  //SEG272 mul8su::@4
-  b4:
+    jmp b3
+  //SEG272 mul8su::@3
+  b3:
   //SEG273 [120] (word) mul8su::m#0 ← (word) mul8u::return#2 -- vwuz1=vwuz2 
     lda mul8u.return
     sta m
@@ -4293,7 +4329,7 @@ mul8su: {
   //SEG274 [121] if((signed byte) mul8su::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8su::@1 -- vbsz1_ge_0_then_la1 
     lda a
     cmp #0
-    bpl b1_from_b4
+    bpl b1_from_b3
     jmp b2
   //SEG275 mul8su::@2
   b2:
@@ -4307,10 +4343,10 @@ mul8su: {
   //SEG278 [124] (word) mul8su::m#1 ← (word) mul8su::m#0 hi= (byte~) mul8su::$10 -- vwuz1=vwuz1_sethi_vbuz2 
     lda _10
     sta m+1
-  //SEG279 [125] phi from mul8su::@2 mul8su::@4 to mul8su::@1 [phi:mul8su::@2/mul8su::@4->mul8su::@1]
+  //SEG279 [125] phi from mul8su::@2 mul8su::@3 to mul8su::@1 [phi:mul8su::@2/mul8su::@3->mul8su::@1]
   b1_from_b2:
-  b1_from_b4:
-  //SEG280 [125] phi (word) mul8su::m#2 = (word) mul8su::m#1 [phi:mul8su::@2/mul8su::@4->mul8su::@1#0] -- register_copy 
+  b1_from_b3:
+  //SEG280 [125] phi (word) mul8su::m#2 = (word) mul8su::m#1 [phi:mul8su::@2/mul8su::@3->mul8su::@1#0] -- register_copy 
     jmp b1
   //SEG281 mul8su::@1
   b1:
@@ -4363,13 +4399,13 @@ mul8u: {
     lda #1
     and a
     sta _1
-  //SEG296 [133] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG296 [133] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG297 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG297 mul8u::@3
+  b3:
   //SEG298 [134] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -4378,23 +4414,23 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG299 [135] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG300 [135] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG301 mul8u::@8
-  b8:
+  //SEG299 [135] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG300 [135] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG301 mul8u::@4
+  b4:
   //SEG302 [136] (byte) mul8u::a#0 ← (byte) mul8u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr a
   //SEG303 [137] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG304 [129] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG305 [129] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG306 [129] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG307 [129] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG304 [129] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG305 [129] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG306 [129] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG307 [129] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG308 sin8s
@@ -4517,9 +4553,9 @@ sin8s: {
   //SEG334 [149] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return
-    jmp b10
-  //SEG335 sin8s::@10
-  b10:
+    jmp b9
+  //SEG335 sin8s::@9
+  b9:
   //SEG336 [150] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0 -- vbuz1=vbuz2 
     lda mulu8_sel.return
     sta x2
@@ -4530,20 +4566,20 @@ sin8s: {
     lda x1
     sta mulu8_sel.v2
   //SEG339 [153] call mulu8_sel 
-  //SEG340 [181] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
-  mulu8_sel_from_b10:
-  //SEG341 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG340 [181] phi from sin8s::@9 to mulu8_sel [phi:sin8s::@9->mulu8_sel]
+  mulu8_sel_from_b9:
+  //SEG341 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@9->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG342 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@10->mulu8_sel#1] -- register_copy 
-  //SEG343 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
+  //SEG342 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@9->mulu8_sel#1] -- register_copy 
+  //SEG343 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@9->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG344 [154] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_1
-    jmp b11
-  //SEG345 sin8s::@11
-  b11:
+    jmp b10
+  //SEG345 sin8s::@10
+  b10:
   //SEG346 [155] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1 -- vbuz1=vbuz2 
     lda mulu8_sel.return_1
     sta x3
@@ -4551,22 +4587,22 @@ sin8s: {
     lda x3
     sta mulu8_sel.v1
   //SEG348 [157] call mulu8_sel 
-  //SEG349 [181] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
-  mulu8_sel_from_b11:
-  //SEG350 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG349 [181] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
+  mulu8_sel_from_b10:
+  //SEG350 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG351 [181] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@11->mulu8_sel#1] -- vbuz1=vbuc1 
+  //SEG351 [181] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@10->mulu8_sel#1] -- vbuz1=vbuc1 
     lda #DIV_6
     sta mulu8_sel.v2
-  //SEG352 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
+  //SEG352 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG353 [158] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_2
-    jmp b12
-  //SEG354 sin8s::@12
-  b12:
+    jmp b11
+  //SEG354 sin8s::@11
+  b11:
   //SEG355 [159] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2 -- vbuz1=vbuz2 
     lda mulu8_sel.return_2
     sta x3_6
@@ -4582,20 +4618,20 @@ sin8s: {
     lda x1
     sta mulu8_sel.v2
   //SEG359 [163] call mulu8_sel 
-  //SEG360 [181] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
-  mulu8_sel_from_b12:
-  //SEG361 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG360 [181] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
+  mulu8_sel_from_b11:
+  //SEG361 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG362 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
-  //SEG363 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
+  //SEG362 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@11->mulu8_sel#1] -- register_copy 
+  //SEG363 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG364 [164] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_10
-    jmp b13
-  //SEG365 sin8s::@13
-  b13:
+    jmp b12
+  //SEG365 sin8s::@12
+  b12:
   //SEG366 [165] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10 -- vbuz1=vbuz2 
     lda mulu8_sel.return_10
     sta x4
@@ -4606,20 +4642,20 @@ sin8s: {
     lda x1
     sta mulu8_sel.v2
   //SEG369 [168] call mulu8_sel 
-  //SEG370 [181] phi from sin8s::@13 to mulu8_sel [phi:sin8s::@13->mulu8_sel]
-  mulu8_sel_from_b13:
-  //SEG371 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@13->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG370 [181] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
+  mulu8_sel_from_b12:
+  //SEG371 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG372 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@13->mulu8_sel#1] -- register_copy 
-  //SEG373 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@13->mulu8_sel#2] -- register_copy 
+  //SEG372 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
+  //SEG373 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG374 [169] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12 -- vbuz1=vbuz2 
     lda mulu8_sel.return_12
     sta mulu8_sel.return_11
-    jmp b14
-  //SEG375 sin8s::@14
-  b14:
+    jmp b13
+  //SEG375 sin8s::@13
+  b13:
   //SEG376 [170] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11 -- vbuz1=vbuz2 
     lda mulu8_sel.return_11
     sta x5
@@ -4638,23 +4674,23 @@ sin8s: {
   //SEG379 [173] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3 -- vbuz1_lt_vbuc1_then_la1 
     lda usinx_1
     cmp #$80
-    bcc b3_from_b14
+    bcc b3_from_b13
     jmp b7
   //SEG380 sin8s::@7
   b7:
   //SEG381 [174] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1 -- vbuz1=_dec_vbuz1 
     dec usinx_2
-  //SEG382 [175] phi from sin8s::@14 sin8s::@7 to sin8s::@3 [phi:sin8s::@14/sin8s::@7->sin8s::@3]
-  b3_from_b14:
+  //SEG382 [175] phi from sin8s::@13 sin8s::@7 to sin8s::@3 [phi:sin8s::@13/sin8s::@7->sin8s::@3]
+  b3_from_b13:
   b3_from_b7:
-  //SEG383 [175] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@14/sin8s::@7->sin8s::@3#0] -- register_copy 
+  //SEG383 [175] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@13/sin8s::@7->sin8s::@3#0] -- register_copy 
     jmp b3
   //SEG384 sin8s::@3
   b3:
-  //SEG385 [176] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG385 [176] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
     jmp b8
   //SEG386 sin8s::@8
   b8:
@@ -4664,10 +4700,10 @@ sin8s: {
     clc
     adc #1
     sta sinx
-  //SEG388 [178] phi from sin8s::@18 sin8s::@8 to sin8s::@4 [phi:sin8s::@18/sin8s::@8->sin8s::@4]
-  b4_from_b18:
+  //SEG388 [178] phi from sin8s::@14 sin8s::@8 to sin8s::@4 [phi:sin8s::@14/sin8s::@8->sin8s::@4]
+  b4_from_b14:
   b4_from_b8:
-  //SEG389 [178] phi (signed byte) sin8s::return#0 = (signed byte~) sin8s::return#5 [phi:sin8s::@18/sin8s::@8->sin8s::@4#0] -- register_copy 
+  //SEG389 [178] phi (signed byte) sin8s::return#0 = (signed byte~) sin8s::return#5 [phi:sin8s::@14/sin8s::@8->sin8s::@4#0] -- register_copy 
     jmp b4
   //SEG390 sin8s::@4
   b4:
@@ -4676,12 +4712,12 @@ sin8s: {
   breturn:
   //SEG392 [179] return 
     rts
-  //SEG393 sin8s::@18
-  b18:
+  //SEG393 sin8s::@14
+  b14:
   //SEG394 [180] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4 -- vbsz1=vbsz2 
     lda usinx_4
     sta return
-    jmp b4_from_b18
+    jmp b4_from_b14
 }
 //SEG395 mulu8_sel
 // Calculate val*val for two unsigned byte values - the result is 8 selected bits of the 16-bit result.
@@ -4716,9 +4752,9 @@ mulu8_sel: {
     sta mul8u.return_3
     lda mul8u.res+1
     sta mul8u.return_3+1
-    jmp b2
-  //SEG403 mulu8_sel::@2
-  b2:
+    jmp b1
+  //SEG403 mulu8_sel::@1
+  b1:
   //SEG404 [186] (word~) mulu8_sel::$0 ← (word) mul8u::return#3 -- vwuz1=vwuz2 
     lda mul8u.return_3
     sta _0
@@ -4763,9 +4799,9 @@ div16u: {
     sta divr16u.return_2
     lda divr16u.return+1
     sta divr16u.return_2+1
-    jmp b2
-  //SEG413 div16u::@2
-  b2:
+    jmp b1
+  //SEG413 div16u::@1
+  b1:
   //SEG414 [193] (word) div16u::return#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return_2
     sta return
@@ -5265,17 +5301,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 8
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @41 [phi:@begin->@41]
-b41_from_bbegin:
-  jmp b41
-//SEG5 @41
-b41:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @41 to main [phi:@41->main]
-main_from_b41:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @41 to @end [phi:@41->@end]
-bend_from_b41:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -5326,188 +5362,188 @@ sin8u_table: {
   div16u_from_sin8u_table:
     jsr div16u
   //SEG22 [11] (word) div16u::return#2 ← (word) div16u::return#0
-    jmp b3
-  //SEG23 sin8u_table::@3
-  b3:
+    jmp b2
+  //SEG23 sin8u_table::@2
+  b2:
   //SEG24 [12] (word) sin8u_table::step#0 ← (word) div16u::return#2
   //SEG25 [13] call print_str 
-  //SEG26 [86] phi from sin8u_table::@3 to print_str [phi:sin8u_table::@3->print_str]
-  print_str_from_b3:
-  //SEG27 [86] phi (byte*) print_char_cursor#105 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@3->print_str#0] -- pbuz1=pbuc1 
+  //SEG26 [86] phi from sin8u_table::@2 to print_str [phi:sin8u_table::@2->print_str]
+  print_str_from_b2:
+  //SEG27 [86] phi (byte*) print_char_cursor#105 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@2->print_str#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG28 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str [phi:sin8u_table::@3->print_str#1] -- pbuz1=pbuc1 
+  //SEG28 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str [phi:sin8u_table::@2->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b4
-  //SEG29 sin8u_table::@4
-  b4:
+    jmp b3
+  //SEG29 sin8u_table::@3
+  b3:
   //SEG30 [14] (word) print_word::w#1 ← (word) sin8u_table::step#0 -- vwuz1=vwuz2 
     lda step
     sta print_word.w
     lda step+1
     sta print_word.w+1
   //SEG31 [15] call print_word 
-  //SEG32 [101] phi from sin8u_table::@4 to print_word [phi:sin8u_table::@4->print_word]
-  print_word_from_b4:
-  //SEG33 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@4->print_word#0] -- register_copy 
-  //SEG34 [101] phi (word) print_word::w#3 = (word) print_word::w#1 [phi:sin8u_table::@4->print_word#1] -- register_copy 
+  //SEG32 [101] phi from sin8u_table::@3 to print_word [phi:sin8u_table::@3->print_word]
+  print_word_from_b3:
+  //SEG33 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@3->print_word#0] -- register_copy 
+  //SEG34 [101] phi (word) print_word::w#3 = (word) print_word::w#1 [phi:sin8u_table::@3->print_word#1] -- register_copy 
     jsr print_word
-  //SEG35 [16] phi from sin8u_table::@4 to sin8u_table::@5 [phi:sin8u_table::@4->sin8u_table::@5]
-  b5_from_b4:
-    jmp b5
-  //SEG36 sin8u_table::@5
-  b5:
+  //SEG35 [16] phi from sin8u_table::@3 to sin8u_table::@4 [phi:sin8u_table::@3->sin8u_table::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG36 sin8u_table::@4
+  b4:
   //SEG37 [17] call print_str 
-  //SEG38 [86] phi from sin8u_table::@5 to print_str [phi:sin8u_table::@5->print_str]
-  print_str_from_b5:
-  //SEG39 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@5->print_str#0] -- register_copy 
-  //SEG40 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str1 [phi:sin8u_table::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG38 [86] phi from sin8u_table::@4 to print_str [phi:sin8u_table::@4->print_str]
+  print_str_from_b4:
+  //SEG39 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@4->print_str#0] -- register_copy 
+  //SEG40 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str1 [phi:sin8u_table::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG41 [18] phi from sin8u_table::@5 to sin8u_table::@6 [phi:sin8u_table::@5->sin8u_table::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG42 sin8u_table::@6
-  b6:
+  //SEG41 [18] phi from sin8u_table::@4 to sin8u_table::@5 [phi:sin8u_table::@4->sin8u_table::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG42 sin8u_table::@5
+  b5:
   //SEG43 [19] call print_byte 
-  //SEG44 [74] phi from sin8u_table::@6 to print_byte [phi:sin8u_table::@6->print_byte]
-  print_byte_from_b6:
-  //SEG45 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@6->print_byte#0] -- register_copy 
-  //SEG46 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::min#0 [phi:sin8u_table::@6->print_byte#1] -- vbuz1=vbuc1 
+  //SEG44 [74] phi from sin8u_table::@5 to print_byte [phi:sin8u_table::@5->print_byte]
+  print_byte_from_b5:
+  //SEG45 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@5->print_byte#0] -- register_copy 
+  //SEG46 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::min#0 [phi:sin8u_table::@5->print_byte#1] -- vbuz1=vbuc1 
     lda #min
     sta print_byte.b
     jsr print_byte
-  //SEG47 [20] phi from sin8u_table::@6 to sin8u_table::@7 [phi:sin8u_table::@6->sin8u_table::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG48 sin8u_table::@7
-  b7:
+  //SEG47 [20] phi from sin8u_table::@5 to sin8u_table::@6 [phi:sin8u_table::@5->sin8u_table::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG48 sin8u_table::@6
+  b6:
   //SEG49 [21] call print_str 
-  //SEG50 [86] phi from sin8u_table::@7 to print_str [phi:sin8u_table::@7->print_str]
-  print_str_from_b7:
-  //SEG51 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@7->print_str#0] -- register_copy 
-  //SEG52 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str2 [phi:sin8u_table::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG50 [86] phi from sin8u_table::@6 to print_str [phi:sin8u_table::@6->print_str]
+  print_str_from_b6:
+  //SEG51 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@6->print_str#0] -- register_copy 
+  //SEG52 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str2 [phi:sin8u_table::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-  //SEG53 [22] phi from sin8u_table::@7 to sin8u_table::@8 [phi:sin8u_table::@7->sin8u_table::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG54 sin8u_table::@8
-  b8:
+  //SEG53 [22] phi from sin8u_table::@6 to sin8u_table::@7 [phi:sin8u_table::@6->sin8u_table::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG54 sin8u_table::@7
+  b7:
   //SEG55 [23] call print_byte 
-  //SEG56 [74] phi from sin8u_table::@8 to print_byte [phi:sin8u_table::@8->print_byte]
-  print_byte_from_b8:
-  //SEG57 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@8->print_byte#0] -- register_copy 
-  //SEG58 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::max#0 [phi:sin8u_table::@8->print_byte#1] -- vbuz1=vbuc1 
+  //SEG56 [74] phi from sin8u_table::@7 to print_byte [phi:sin8u_table::@7->print_byte]
+  print_byte_from_b7:
+  //SEG57 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@7->print_byte#0] -- register_copy 
+  //SEG58 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::max#0 [phi:sin8u_table::@7->print_byte#1] -- vbuz1=vbuc1 
     lda #max
     sta print_byte.b
     jsr print_byte
-  //SEG59 [24] phi from sin8u_table::@8 to sin8u_table::@9 [phi:sin8u_table::@8->sin8u_table::@9]
-  b9_from_b8:
-    jmp b9
-  //SEG60 sin8u_table::@9
-  b9:
+  //SEG59 [24] phi from sin8u_table::@7 to sin8u_table::@8 [phi:sin8u_table::@7->sin8u_table::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG60 sin8u_table::@8
+  b8:
   //SEG61 [25] call print_str 
-  //SEG62 [86] phi from sin8u_table::@9 to print_str [phi:sin8u_table::@9->print_str]
-  print_str_from_b9:
-  //SEG63 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@9->print_str#0] -- register_copy 
-  //SEG64 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str3 [phi:sin8u_table::@9->print_str#1] -- pbuz1=pbuc1 
+  //SEG62 [86] phi from sin8u_table::@8 to print_str [phi:sin8u_table::@8->print_str]
+  print_str_from_b8:
+  //SEG63 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@8->print_str#0] -- register_copy 
+  //SEG64 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str3 [phi:sin8u_table::@8->print_str#1] -- pbuz1=pbuc1 
     lda #<str3
     sta print_str.str
     lda #>str3
     sta print_str.str+1
     jsr print_str
-  //SEG65 [26] phi from sin8u_table::@9 to sin8u_table::@10 [phi:sin8u_table::@9->sin8u_table::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG66 sin8u_table::@10
-  b10:
+  //SEG65 [26] phi from sin8u_table::@8 to sin8u_table::@9 [phi:sin8u_table::@8->sin8u_table::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG66 sin8u_table::@9
+  b9:
   //SEG67 [27] call print_byte 
-  //SEG68 [74] phi from sin8u_table::@10 to print_byte [phi:sin8u_table::@10->print_byte]
-  print_byte_from_b10:
-  //SEG69 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@10->print_byte#0] -- register_copy 
-  //SEG70 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::amplitude#0 [phi:sin8u_table::@10->print_byte#1] -- vbuz1=vbuc1 
+  //SEG68 [74] phi from sin8u_table::@9 to print_byte [phi:sin8u_table::@9->print_byte]
+  print_byte_from_b9:
+  //SEG69 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@9->print_byte#0] -- register_copy 
+  //SEG70 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::amplitude#0 [phi:sin8u_table::@9->print_byte#1] -- vbuz1=vbuc1 
     lda #amplitude
     sta print_byte.b
     jsr print_byte
-  //SEG71 [28] phi from sin8u_table::@10 to sin8u_table::@11 [phi:sin8u_table::@10->sin8u_table::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG72 sin8u_table::@11
-  b11:
+  //SEG71 [28] phi from sin8u_table::@9 to sin8u_table::@10 [phi:sin8u_table::@9->sin8u_table::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG72 sin8u_table::@10
+  b10:
   //SEG73 [29] call print_str 
-  //SEG74 [86] phi from sin8u_table::@11 to print_str [phi:sin8u_table::@11->print_str]
-  print_str_from_b11:
-  //SEG75 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@11->print_str#0] -- register_copy 
-  //SEG76 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str4 [phi:sin8u_table::@11->print_str#1] -- pbuz1=pbuc1 
+  //SEG74 [86] phi from sin8u_table::@10 to print_str [phi:sin8u_table::@10->print_str]
+  print_str_from_b10:
+  //SEG75 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@10->print_str#0] -- register_copy 
+  //SEG76 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str4 [phi:sin8u_table::@10->print_str#1] -- pbuz1=pbuc1 
     lda #<str4
     sta print_str.str
     lda #>str4
     sta print_str.str+1
     jsr print_str
-  //SEG77 [30] phi from sin8u_table::@11 to sin8u_table::@12 [phi:sin8u_table::@11->sin8u_table::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG78 sin8u_table::@12
-  b12:
+  //SEG77 [30] phi from sin8u_table::@10 to sin8u_table::@11 [phi:sin8u_table::@10->sin8u_table::@11]
+  b11_from_b10:
+    jmp b11
+  //SEG78 sin8u_table::@11
+  b11:
   //SEG79 [31] call print_byte 
-  //SEG80 [74] phi from sin8u_table::@12 to print_byte [phi:sin8u_table::@12->print_byte]
-  print_byte_from_b12:
-  //SEG81 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@12->print_byte#0] -- register_copy 
-  //SEG82 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::mid#0 [phi:sin8u_table::@12->print_byte#1] -- vbuz1=vbuc1 
+  //SEG80 [74] phi from sin8u_table::@11 to print_byte [phi:sin8u_table::@11->print_byte]
+  print_byte_from_b11:
+  //SEG81 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@11->print_byte#0] -- register_copy 
+  //SEG82 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::mid#0 [phi:sin8u_table::@11->print_byte#1] -- vbuz1=vbuc1 
     lda #mid
     sta print_byte.b
     jsr print_byte
-  //SEG83 [32] phi from sin8u_table::@12 to sin8u_table::@13 [phi:sin8u_table::@12->sin8u_table::@13]
-  b13_from_b12:
-    jmp b13
-  //SEG84 sin8u_table::@13
-  b13:
+  //SEG83 [32] phi from sin8u_table::@11 to sin8u_table::@12 [phi:sin8u_table::@11->sin8u_table::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG84 sin8u_table::@12
+  b12:
   //SEG85 [33] call print_ln 
-  //SEG86 [69] phi from sin8u_table::@13 to print_ln [phi:sin8u_table::@13->print_ln]
-  print_ln_from_b13:
-  //SEG87 [69] phi (byte*) print_line_cursor#23 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@13->print_ln#0] -- pbuz1=pbuc1 
+  //SEG86 [69] phi from sin8u_table::@12 to print_ln [phi:sin8u_table::@12->print_ln]
+  print_ln_from_b12:
+  //SEG87 [69] phi (byte*) print_line_cursor#23 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@12->print_ln#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
     jsr print_ln
-  //SEG88 [34] phi from sin8u_table::@13 to sin8u_table::@1 [phi:sin8u_table::@13->sin8u_table::@1]
-  b1_from_b13:
-  //SEG89 [34] phi (word) sin8u_table::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@13->sin8u_table::@1#0] -- vwuz1=vbuc1 
+  //SEG88 [34] phi from sin8u_table::@12 to sin8u_table::@1 [phi:sin8u_table::@12->sin8u_table::@1]
+  b1_from_b12:
+  //SEG89 [34] phi (word) sin8u_table::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@12->sin8u_table::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG90 [34] phi (byte*) sin8u_table::sintab#2 = (const byte[$14]) main::sintab#0 [phi:sin8u_table::@13->sin8u_table::@1#1] -- pbuz1=pbuc1 
+  //SEG90 [34] phi (byte*) sin8u_table::sintab#2 = (const byte[$14]) main::sintab#0 [phi:sin8u_table::@12->sin8u_table::@1#1] -- pbuz1=pbuc1 
     lda #<main.sintab
     sta sintab
     lda #>main.sintab
     sta sintab+1
-  //SEG91 [34] phi (word) sin8u_table::x#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@13->sin8u_table::@1#2] -- vwuz1=vbuc1 
+  //SEG91 [34] phi (word) sin8u_table::x#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@12->sin8u_table::@1#2] -- vwuz1=vbuc1 
     lda #0
     sta x
     lda #0
     sta x+1
     jmp b1
   // u[4.12]
-  //SEG92 [34] phi from sin8u_table::@25 to sin8u_table::@1 [phi:sin8u_table::@25->sin8u_table::@1]
-  b1_from_b25:
-  //SEG93 [34] phi (word) sin8u_table::i#10 = (word) sin8u_table::i#1 [phi:sin8u_table::@25->sin8u_table::@1#0] -- register_copy 
-  //SEG94 [34] phi (byte*) sin8u_table::sintab#2 = (byte*) sin8u_table::sintab#1 [phi:sin8u_table::@25->sin8u_table::@1#1] -- register_copy 
-  //SEG95 [34] phi (word) sin8u_table::x#10 = (word) sin8u_table::x#1 [phi:sin8u_table::@25->sin8u_table::@1#2] -- register_copy 
+  //SEG92 [34] phi from sin8u_table::@23 to sin8u_table::@1 [phi:sin8u_table::@23->sin8u_table::@1]
+  b1_from_b23:
+  //SEG93 [34] phi (word) sin8u_table::i#10 = (word) sin8u_table::i#1 [phi:sin8u_table::@23->sin8u_table::@1#0] -- register_copy 
+  //SEG94 [34] phi (byte*) sin8u_table::sintab#2 = (byte*) sin8u_table::sintab#1 [phi:sin8u_table::@23->sin8u_table::@1#1] -- register_copy 
+  //SEG95 [34] phi (word) sin8u_table::x#10 = (word) sin8u_table::x#1 [phi:sin8u_table::@23->sin8u_table::@1#2] -- register_copy 
     jmp b1
   //SEG96 sin8u_table::@1
   b1:
@@ -5519,9 +5555,9 @@ sin8u_table: {
   //SEG98 [36] call sin8s 
     jsr sin8s
   //SEG99 [37] (signed byte) sin8s::return#2 ← (signed byte) sin8s::return#0
-    jmp b15
-  //SEG100 sin8u_table::@15
-  b15:
+    jmp b13
+  //SEG100 sin8u_table::@13
+  b13:
   //SEG101 [38] (signed byte) sin8u_table::sinx#0 ← (signed byte) sin8s::return#2 -- vbsz1=vbsaa 
     sta sinx
   //SEG102 [39] (signed byte) mul8su::a#0 ← (signed byte) sin8u_table::sinx#0 -- vbsyy=vbsz1 
@@ -5529,9 +5565,9 @@ sin8u_table: {
   //SEG103 [40] call mul8su 
     jsr mul8su
   //SEG104 [41] (signed word) mul8su::return#2 ← (signed word)(word) mul8su::m#2
-    jmp b16
-  //SEG105 sin8u_table::@16
-  b16:
+    jmp b14
+  //SEG105 sin8u_table::@14
+  b14:
   //SEG106 [42] (signed word) sin8u_table::sinx_sc#0 ← (signed word) mul8su::return#2
   //SEG107 [43] (byte~) sin8u_table::$21 ← > (signed word) sin8u_table::sinx_sc#0 -- vbuaa=_hi_vwsz1 
     lda sinx_sc+1
@@ -5553,70 +5589,70 @@ sin8u_table: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG112 [48] call print_str 
-  //SEG113 [86] phi from sin8u_table::@16 to print_str [phi:sin8u_table::@16->print_str]
-  print_str_from_b16:
-  //SEG114 [86] phi (byte*) print_char_cursor#105 = (byte*~) print_char_cursor#126 [phi:sin8u_table::@16->print_str#0] -- register_copy 
-  //SEG115 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str5 [phi:sin8u_table::@16->print_str#1] -- pbuz1=pbuc1 
+  //SEG113 [86] phi from sin8u_table::@14 to print_str [phi:sin8u_table::@14->print_str]
+  print_str_from_b14:
+  //SEG114 [86] phi (byte*) print_char_cursor#105 = (byte*~) print_char_cursor#126 [phi:sin8u_table::@14->print_str#0] -- register_copy 
+  //SEG115 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str5 [phi:sin8u_table::@14->print_str#1] -- pbuz1=pbuc1 
     lda #<str5
     sta print_str.str
     lda #>str5
     sta print_str.str+1
     jsr print_str
-    jmp b17
-  //SEG116 sin8u_table::@17
-  b17:
+    jmp b15
+  //SEG116 sin8u_table::@15
+  b15:
   //SEG117 [49] (word) print_word::w#2 ← (word) sin8u_table::x#10 -- vwuz1=vwuz2 
     lda x
     sta print_word.w
     lda x+1
     sta print_word.w+1
   //SEG118 [50] call print_word 
-  //SEG119 [101] phi from sin8u_table::@17 to print_word [phi:sin8u_table::@17->print_word]
-  print_word_from_b17:
-  //SEG120 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@17->print_word#0] -- register_copy 
-  //SEG121 [101] phi (word) print_word::w#3 = (word) print_word::w#2 [phi:sin8u_table::@17->print_word#1] -- register_copy 
+  //SEG119 [101] phi from sin8u_table::@15 to print_word [phi:sin8u_table::@15->print_word]
+  print_word_from_b15:
+  //SEG120 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@15->print_word#0] -- register_copy 
+  //SEG121 [101] phi (word) print_word::w#3 = (word) print_word::w#2 [phi:sin8u_table::@15->print_word#1] -- register_copy 
     jsr print_word
-  //SEG122 [51] phi from sin8u_table::@17 to sin8u_table::@18 [phi:sin8u_table::@17->sin8u_table::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG123 sin8u_table::@18
-  b18:
+  //SEG122 [51] phi from sin8u_table::@15 to sin8u_table::@16 [phi:sin8u_table::@15->sin8u_table::@16]
+  b16_from_b15:
+    jmp b16
+  //SEG123 sin8u_table::@16
+  b16:
   //SEG124 [52] call print_str 
-  //SEG125 [86] phi from sin8u_table::@18 to print_str [phi:sin8u_table::@18->print_str]
-  print_str_from_b18:
-  //SEG126 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@18->print_str#0] -- register_copy 
-  //SEG127 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str6 [phi:sin8u_table::@18->print_str#1] -- pbuz1=pbuc1 
+  //SEG125 [86] phi from sin8u_table::@16 to print_str [phi:sin8u_table::@16->print_str]
+  print_str_from_b16:
+  //SEG126 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@16->print_str#0] -- register_copy 
+  //SEG127 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str6 [phi:sin8u_table::@16->print_str#1] -- pbuz1=pbuc1 
     lda #<str6
     sta print_str.str
     lda #>str6
     sta print_str.str+1
     jsr print_str
-    jmp b19
-  //SEG128 sin8u_table::@19
-  b19:
+    jmp b17
+  //SEG128 sin8u_table::@17
+  b17:
   //SEG129 [53] (signed byte) print_sbyte::b#1 ← (signed byte) sin8u_table::sinx#0 -- vbsz1=vbsz2 
     lda sinx
     sta print_sbyte.b
   //SEG130 [54] call print_sbyte 
     jsr print_sbyte
-  //SEG131 [55] phi from sin8u_table::@19 to sin8u_table::@20 [phi:sin8u_table::@19->sin8u_table::@20]
-  b20_from_b19:
-    jmp b20
-  //SEG132 sin8u_table::@20
-  b20:
+  //SEG131 [55] phi from sin8u_table::@17 to sin8u_table::@18 [phi:sin8u_table::@17->sin8u_table::@18]
+  b18_from_b17:
+    jmp b18
+  //SEG132 sin8u_table::@18
+  b18:
   //SEG133 [56] call print_str 
-  //SEG134 [86] phi from sin8u_table::@20 to print_str [phi:sin8u_table::@20->print_str]
-  print_str_from_b20:
-  //SEG135 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@20->print_str#0] -- register_copy 
-  //SEG136 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str7 [phi:sin8u_table::@20->print_str#1] -- pbuz1=pbuc1 
+  //SEG134 [86] phi from sin8u_table::@18 to print_str [phi:sin8u_table::@18->print_str]
+  print_str_from_b18:
+  //SEG135 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@18->print_str#0] -- register_copy 
+  //SEG136 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str7 [phi:sin8u_table::@18->print_str#1] -- pbuz1=pbuc1 
     lda #<str7
     sta print_str.str
     lda #>str7
     sta print_str.str+1
     jsr print_str
-    jmp b21
-  //SEG137 sin8u_table::@21
-  b21:
+    jmp b19
+  //SEG137 sin8u_table::@19
+  b19:
   //SEG138 [57] (signed word) print_sword::w#1 ← (signed word) sin8u_table::sinx_sc#0 -- vwsz1=vwsz2 
     lda sinx_sc
     sta print_sword.w
@@ -5624,45 +5660,45 @@ sin8u_table: {
     sta print_sword.w+1
   //SEG139 [58] call print_sword 
     jsr print_sword
-  //SEG140 [59] phi from sin8u_table::@21 to sin8u_table::@22 [phi:sin8u_table::@21->sin8u_table::@22]
-  b22_from_b21:
-    jmp b22
-  //SEG141 sin8u_table::@22
-  b22:
+  //SEG140 [59] phi from sin8u_table::@19 to sin8u_table::@20 [phi:sin8u_table::@19->sin8u_table::@20]
+  b20_from_b19:
+    jmp b20
+  //SEG141 sin8u_table::@20
+  b20:
   //SEG142 [60] call print_str 
-  //SEG143 [86] phi from sin8u_table::@22 to print_str [phi:sin8u_table::@22->print_str]
-  print_str_from_b22:
-  //SEG144 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@22->print_str#0] -- register_copy 
-  //SEG145 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str8 [phi:sin8u_table::@22->print_str#1] -- pbuz1=pbuc1 
+  //SEG143 [86] phi from sin8u_table::@20 to print_str [phi:sin8u_table::@20->print_str]
+  print_str_from_b20:
+  //SEG144 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@20->print_str#0] -- register_copy 
+  //SEG145 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str8 [phi:sin8u_table::@20->print_str#1] -- pbuz1=pbuc1 
     lda #<str8
     sta print_str.str
     lda #>str8
     sta print_str.str+1
     jsr print_str
-    jmp b23
-  //SEG146 sin8u_table::@23
-  b23:
+    jmp b21
+  //SEG146 sin8u_table::@21
+  b21:
   //SEG147 [61] (byte) print_byte::b#7 ← (byte) sin8u_table::sinx_tr#0 -- vbuz1=vbuxx 
     stx print_byte.b
   //SEG148 [62] call print_byte 
-  //SEG149 [74] phi from sin8u_table::@23 to print_byte [phi:sin8u_table::@23->print_byte]
-  print_byte_from_b23:
-  //SEG150 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@23->print_byte#0] -- register_copy 
-  //SEG151 [74] phi (byte) print_byte::b#8 = (byte) print_byte::b#7 [phi:sin8u_table::@23->print_byte#1] -- register_copy 
+  //SEG149 [74] phi from sin8u_table::@21 to print_byte [phi:sin8u_table::@21->print_byte]
+  print_byte_from_b21:
+  //SEG150 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@21->print_byte#0] -- register_copy 
+  //SEG151 [74] phi (byte) print_byte::b#8 = (byte) print_byte::b#7 [phi:sin8u_table::@21->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG152 [63] phi from sin8u_table::@23 to sin8u_table::@24 [phi:sin8u_table::@23->sin8u_table::@24]
-  b24_from_b23:
-    jmp b24
-  //SEG153 sin8u_table::@24
-  b24:
+  //SEG152 [63] phi from sin8u_table::@21 to sin8u_table::@22 [phi:sin8u_table::@21->sin8u_table::@22]
+  b22_from_b21:
+    jmp b22
+  //SEG153 sin8u_table::@22
+  b22:
   //SEG154 [64] call print_ln 
-  //SEG155 [69] phi from sin8u_table::@24 to print_ln [phi:sin8u_table::@24->print_ln]
-  print_ln_from_b24:
-  //SEG156 [69] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:sin8u_table::@24->print_ln#0] -- register_copy 
+  //SEG155 [69] phi from sin8u_table::@22 to print_ln [phi:sin8u_table::@22->print_ln]
+  print_ln_from_b22:
+  //SEG156 [69] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:sin8u_table::@22->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b25
-  //SEG157 sin8u_table::@25
-  b25:
+    jmp b23
+  //SEG157 sin8u_table::@23
+  b23:
   //SEG158 [65] (word) sin8u_table::x#1 ← (word) sin8u_table::x#10 + (word) sin8u_table::step#0 -- vwuz1=vwuz1_plus_vwuz2 
     lda x
     clc
@@ -5679,11 +5715,11 @@ sin8u_table: {
   //SEG160 [67] if((word) sin8u_table::i#1<(const word) main::tabsize#0) goto sin8u_table::@1 -- vwuz1_lt_vwuc1_then_la1 
     lda i+1
     cmp #>main.tabsize
-    bcc b1_from_b25
+    bcc b1_from_b23
     bne !+
     lda i
     cmp #<main.tabsize
-    bcc b1_from_b25
+    bcc b1_from_b23
   !:
     jmp breturn
   //SEG161 sin8u_table::@return
@@ -5854,9 +5890,9 @@ print_sword: {
   //SEG211 [82] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b4
-  //SEG212 print_sword::@4
-  b4:
+    jmp b3
+  //SEG212 print_sword::@3
+  b3:
   //SEG213 [96] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -5867,11 +5903,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG214 [97] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG214 [97] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG215 [97] phi (byte*) print_char_cursor#94 = (byte*) print_char_cursor#2 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG216 [97] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG215 [97] phi (byte*) print_char_cursor#94 = (byte*) print_char_cursor#2 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG216 [97] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG217 print_sword::@1
   b1:
@@ -5940,10 +5976,10 @@ print_sbyte: {
   //SEG246 [82] phi (byte) print_char::ch#5 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG247 [110] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG247 [110] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG248 [110] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG248 [110] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG249 print_sbyte::@2
   b2:
@@ -5971,16 +6007,16 @@ print_sbyte: {
   //SEG262 [82] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b5
-  //SEG263 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG263 print_sbyte::@4
+  b4:
   //SEG264 [116] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG265 mul8su
 // Multiply a signed byte and an unsigned byte (into a signed word)
@@ -6001,13 +6037,13 @@ mul8su: {
     lda #b
     jsr mul8u
   //SEG271 [119] (word) mul8u::return#2 ← (word) mul8u::res#2
-    jmp b4
-  //SEG272 mul8su::@4
-  b4:
+    jmp b3
+  //SEG272 mul8su::@3
+  b3:
   //SEG273 [120] (word) mul8su::m#0 ← (word) mul8u::return#2
   //SEG274 [121] if((signed byte) mul8su::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8su::@1 -- vbsyy_ge_0_then_la1 
     cpy #0
-    bpl b1_from_b4
+    bpl b1_from_b3
     jmp b2
   //SEG275 mul8su::@2
   b2:
@@ -6018,10 +6054,10 @@ mul8su: {
     sbc #b
   //SEG278 [124] (word) mul8su::m#1 ← (word) mul8su::m#0 hi= (byte~) mul8su::$10 -- vwuz1=vwuz1_sethi_vbuaa 
     sta m+1
-  //SEG279 [125] phi from mul8su::@2 mul8su::@4 to mul8su::@1 [phi:mul8su::@2/mul8su::@4->mul8su::@1]
+  //SEG279 [125] phi from mul8su::@2 mul8su::@3 to mul8su::@1 [phi:mul8su::@2/mul8su::@3->mul8su::@1]
   b1_from_b2:
-  b1_from_b4:
-  //SEG280 [125] phi (word) mul8su::m#2 = (word) mul8su::m#1 [phi:mul8su::@2/mul8su::@4->mul8su::@1#0] -- register_copy 
+  b1_from_b3:
+  //SEG280 [125] phi (word) mul8su::m#2 = (word) mul8su::m#1 [phi:mul8su::@2/mul8su::@3->mul8su::@1#0] -- register_copy 
     jmp b1
   //SEG281 mul8su::@1
   b1:
@@ -6067,12 +6103,12 @@ mul8u: {
   //SEG295 [132] (byte~) mul8u::$1 ← (byte) mul8u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG296 [133] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG296 [133] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG297 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG297 mul8u::@3
+  b3:
   //SEG298 [134] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -6081,13 +6117,13 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG299 [135] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG300 [135] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG301 mul8u::@8
-  b8:
+  //SEG299 [135] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG300 [135] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG301 mul8u::@4
+  b4:
   //SEG302 [136] (byte) mul8u::a#0 ← (byte) mul8u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -6095,11 +6131,11 @@ mul8u: {
   //SEG303 [137] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG304 [129] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG305 [129] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG306 [129] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG307 [129] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG304 [129] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG305 [129] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG306 [129] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG307 [129] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG308 sin8s
@@ -6203,45 +6239,45 @@ sin8s: {
   //SEG333 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#0 [phi:sin8s::@2->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG334 [149] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-    jmp b10
-  //SEG335 sin8s::@10
-  b10:
+    jmp b9
+  //SEG335 sin8s::@9
+  b9:
   //SEG336 [150] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   //SEG337 [151] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0 -- vbuxx=vbuaa 
     tax
   //SEG338 [152] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG339 [153] call mulu8_sel 
-  //SEG340 [181] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
-  mulu8_sel_from_b10:
-  //SEG341 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG340 [181] phi from sin8s::@9 to mulu8_sel [phi:sin8s::@9->mulu8_sel]
+  mulu8_sel_from_b9:
+  //SEG341 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@9->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG342 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@10->mulu8_sel#1] -- register_copy 
-  //SEG343 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
+  //SEG342 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@9->mulu8_sel#1] -- register_copy 
+  //SEG343 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@9->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG344 [154] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-    jmp b11
-  //SEG345 sin8s::@11
-  b11:
+    jmp b10
+  //SEG345 sin8s::@10
+  b10:
   //SEG346 [155] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1 -- vbuz1=vbuaa 
     sta x3
   //SEG347 [156] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0 -- vbuxx=vbuz1 
     ldx x3
   //SEG348 [157] call mulu8_sel 
-  //SEG349 [181] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
-  mulu8_sel_from_b11:
-  //SEG350 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG349 [181] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
+  mulu8_sel_from_b10:
+  //SEG350 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG351 [181] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@11->mulu8_sel#1] -- vbuyy=vbuc1 
+  //SEG351 [181] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@10->mulu8_sel#1] -- vbuyy=vbuc1 
     ldy #DIV_6
-  //SEG352 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
+  //SEG352 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG353 [158] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-    jmp b12
-  //SEG354 sin8s::@12
-  b12:
+    jmp b11
+  //SEG354 sin8s::@11
+  b11:
   //SEG355 [159] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   //SEG356 [160] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0 -- vbuz1=vbuz2_minus_vbuaa 
     eor #$ff
@@ -6253,36 +6289,36 @@ sin8s: {
   //SEG358 [162] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG359 [163] call mulu8_sel 
-  //SEG360 [181] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
-  mulu8_sel_from_b12:
-  //SEG361 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG360 [181] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
+  mulu8_sel_from_b11:
+  //SEG361 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG362 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
-  //SEG363 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
+  //SEG362 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@11->mulu8_sel#1] -- register_copy 
+  //SEG363 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG364 [164] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-    jmp b13
-  //SEG365 sin8s::@13
-  b13:
+    jmp b12
+  //SEG365 sin8s::@12
+  b12:
   //SEG366 [165] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   //SEG367 [166] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0 -- vbuxx=vbuaa 
     tax
   //SEG368 [167] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG369 [168] call mulu8_sel 
-  //SEG370 [181] phi from sin8s::@13 to mulu8_sel [phi:sin8s::@13->mulu8_sel]
-  mulu8_sel_from_b13:
-  //SEG371 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@13->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG370 [181] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
+  mulu8_sel_from_b12:
+  //SEG371 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG372 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@13->mulu8_sel#1] -- register_copy 
-  //SEG373 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@13->mulu8_sel#2] -- register_copy 
+  //SEG372 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
+  //SEG373 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG374 [169] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-    jmp b14
-  //SEG375 sin8s::@14
-  b14:
+    jmp b13
+  //SEG375 sin8s::@13
+  b13:
   //SEG376 [170] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   //SEG377 [171] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuaa=vbuaa_ror_4 
     lsr
@@ -6295,23 +6331,23 @@ sin8s: {
     tax
   //SEG379 [173] if((byte) sin8s::usinx#1<(byte/word/signed word/dword/signed dword) $80) goto sin8s::@3 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$80
-    bcc b3_from_b14
+    bcc b3_from_b13
     jmp b7
   //SEG380 sin8s::@7
   b7:
   //SEG381 [174] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG382 [175] phi from sin8s::@14 sin8s::@7 to sin8s::@3 [phi:sin8s::@14/sin8s::@7->sin8s::@3]
-  b3_from_b14:
+  //SEG382 [175] phi from sin8s::@13 sin8s::@7 to sin8s::@3 [phi:sin8s::@13/sin8s::@7->sin8s::@3]
+  b3_from_b13:
   b3_from_b7:
-  //SEG383 [175] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@14/sin8s::@7->sin8s::@3#0] -- register_copy 
+  //SEG383 [175] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@13/sin8s::@7->sin8s::@3#0] -- register_copy 
     jmp b3
   //SEG384 sin8s::@3
   b3:
-  //SEG385 [176] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG385 [176] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
     jmp b8
   //SEG386 sin8s::@8
   b8:
@@ -6320,10 +6356,10 @@ sin8s: {
     eor #$ff
     clc
     adc #1
-  //SEG388 [178] phi from sin8s::@18 sin8s::@8 to sin8s::@4 [phi:sin8s::@18/sin8s::@8->sin8s::@4]
-  b4_from_b18:
+  //SEG388 [178] phi from sin8s::@14 sin8s::@8 to sin8s::@4 [phi:sin8s::@14/sin8s::@8->sin8s::@4]
+  b4_from_b14:
   b4_from_b8:
-  //SEG389 [178] phi (signed byte) sin8s::return#0 = (signed byte~) sin8s::return#5 [phi:sin8s::@18/sin8s::@8->sin8s::@4#0] -- register_copy 
+  //SEG389 [178] phi (signed byte) sin8s::return#0 = (signed byte~) sin8s::return#5 [phi:sin8s::@14/sin8s::@8->sin8s::@4#0] -- register_copy 
     jmp b4
   //SEG390 sin8s::@4
   b4:
@@ -6332,11 +6368,11 @@ sin8s: {
   breturn:
   //SEG392 [179] return 
     rts
-  //SEG393 sin8s::@18
-  b18:
+  //SEG393 sin8s::@14
+  b14:
   //SEG394 [180] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4 -- vbsaa=vbsxx 
     txa
-    jmp b4_from_b18
+    jmp b4_from_b14
 }
 //SEG395 mulu8_sel
 // Calculate val*val for two unsigned byte values - the result is 8 selected bits of the 16-bit result.
@@ -6356,9 +6392,9 @@ mulu8_sel: {
   //SEG401 [127] phi (byte) mul8u::b#2 = (byte) mul8u::b#1 [phi:mulu8_sel->mul8u#1] -- register_copy 
     jsr mul8u
   //SEG402 [185] (word) mul8u::return#3 ← (word) mul8u::res#2
-    jmp b2
-  //SEG403 mulu8_sel::@2
-  b2:
+    jmp b1
+  //SEG403 mulu8_sel::@1
+  b1:
   //SEG404 [186] (word~) mulu8_sel::$0 ← (word) mul8u::return#3
   //SEG405 [187] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5 -- vwuz1=vwuz1_rol_vbuz2 
     ldy select
@@ -6389,9 +6425,9 @@ div16u: {
   divr16u_from_div16u:
     jsr divr16u
   //SEG412 [192] (word) divr16u::return#2 ← (word) divr16u::return#0
-    jmp b2
-  //SEG413 div16u::@2
-  b2:
+    jmp b1
+  //SEG413 div16u::@1
+  b1:
   //SEG414 [193] (word) div16u::return#0 ← (word) divr16u::return#2
     jmp breturn
   //SEG415 div16u::@return
@@ -6560,10 +6596,11 @@ print_cls: {
   print_hextab: .text "0123456789abcdef"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b41
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
+Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b5
@@ -6574,8 +6611,9 @@ Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
 Removing instruction jmp b12
-Removing instruction jmp b13
 Removing instruction jmp b1
+Removing instruction jmp b13
+Removing instruction jmp b14
 Removing instruction jmp b15
 Removing instruction jmp b16
 Removing instruction jmp b17
@@ -6585,8 +6623,6 @@ Removing instruction jmp b20
 Removing instruction jmp b21
 Removing instruction jmp b22
 Removing instruction jmp b23
-Removing instruction jmp b24
-Removing instruction jmp b25
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -6596,7 +6632,7 @@ Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b2
-Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -6605,32 +6641,32 @@ Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b5
 Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp b1
 Removing instruction jmp b6
 Removing instruction jmp b2
+Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp b11
 Removing instruction jmp b12
 Removing instruction jmp b13
-Removing instruction jmp b14
 Removing instruction jmp b7
 Removing instruction jmp b3
 Removing instruction jmp b8
 Removing instruction jmp b4
 Removing instruction jmp breturn
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -6655,60 +6691,60 @@ Removing instruction lda #0
 Replacing instruction lda #0 with TXA
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b1_from_b25 with b1
-Replacing label b1_from_b25 with b1
+Replacing label b1_from_b23 with b1
+Replacing label b1_from_b23 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_print_sword with b1
 Replacing label b1_from_print_sbyte with b1
-Replacing label b2_from_b5 with b2
-Replacing label b1_from_b4 with b1
-Replacing label b8_from_b2 with b8
+Replacing label b2_from_b4 with b2
+Replacing label b1_from_b3 with b1
+Replacing label b4_from_b2 with b4
 Replacing label b2_from_b1 with b2
 Replacing label b2_from_b1 with b2
-Replacing label b3_from_b14 with b3
-Replacing label b4_from_b18 with b4
+Replacing label b3_from_b13 with b3
+Replacing label b4_from_b14 with b4
 Replacing label b2_from_b1 with b2
 Replacing label b3_from_b2 with b3
 Replacing label b3_from_b2 with b3
 Replacing label b1_from_b3 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b41_from_bbegin:
-Removing instruction b41:
-Removing instruction main_from_b41:
-Removing instruction bend_from_b41:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction sin8u_table_from_b1:
-Removing instruction print_str_from_b3:
+Removing instruction print_str_from_b2:
+Removing instruction b4_from_b3:
+Removing instruction print_str_from_b4:
 Removing instruction b5_from_b4:
-Removing instruction print_str_from_b5:
+Removing instruction print_byte_from_b5:
 Removing instruction b6_from_b5:
-Removing instruction print_byte_from_b6:
+Removing instruction print_str_from_b6:
 Removing instruction b7_from_b6:
-Removing instruction print_str_from_b7:
+Removing instruction print_byte_from_b7:
 Removing instruction b8_from_b7:
-Removing instruction print_byte_from_b8:
+Removing instruction print_str_from_b8:
 Removing instruction b9_from_b8:
-Removing instruction print_str_from_b9:
+Removing instruction print_byte_from_b9:
 Removing instruction b10_from_b9:
-Removing instruction print_byte_from_b10:
+Removing instruction print_str_from_b10:
 Removing instruction b11_from_b10:
-Removing instruction print_str_from_b11:
+Removing instruction print_byte_from_b11:
 Removing instruction b12_from_b11:
-Removing instruction print_byte_from_b12:
-Removing instruction b13_from_b12:
-Removing instruction print_ln_from_b13:
-Removing instruction b1_from_b25:
+Removing instruction print_ln_from_b12:
+Removing instruction b1_from_b23:
+Removing instruction b16_from_b15:
+Removing instruction print_str_from_b16:
 Removing instruction b18_from_b17:
 Removing instruction print_str_from_b18:
 Removing instruction b20_from_b19:
 Removing instruction print_str_from_b20:
 Removing instruction b22_from_b21:
-Removing instruction print_str_from_b22:
-Removing instruction b24_from_b23:
-Removing instruction print_ln_from_b24:
+Removing instruction print_ln_from_b22:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction b1_from_print_str:
@@ -6716,25 +6752,25 @@ Removing instruction b1_from_b2:
 Removing instruction b2_from_print_sword:
 Removing instruction print_char_from_b2:
 Removing instruction b1_from_print_sword:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction print_word_from_b1:
 Removing instruction b3_from_print_sbyte:
 Removing instruction print_char_from_b3:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction print_byte_from_b2:
 Removing instruction b1_from_print_sbyte:
 Removing instruction print_char_from_b1:
 Removing instruction b1_from_b2:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction breturn:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b6:
-Removing instruction b3_from_b14:
+Removing instruction b3_from_b13:
 Removing instruction b3_from_b7:
-Removing instruction b4_from_b18:
+Removing instruction b4_from_b14:
 Removing instruction b4_from_b8:
 Removing instruction breturn:
 Removing instruction breturn:
@@ -6751,9 +6787,10 @@ Removing instruction print_cls_from_main:
 Removing instruction b1:
 Removing instruction breturn:
 Removing instruction div16u_from_sin8u_table:
+Removing instruction b2:
 Removing instruction b3:
+Removing instruction print_word_from_b3:
 Removing instruction b4:
-Removing instruction print_word_from_b4:
 Removing instruction b5:
 Removing instruction b6:
 Removing instruction b7:
@@ -6762,22 +6799,21 @@ Removing instruction b9:
 Removing instruction b10:
 Removing instruction b11:
 Removing instruction b12:
+Removing instruction b1_from_b12:
 Removing instruction b13:
-Removing instruction b1_from_b13:
+Removing instruction b14:
+Removing instruction print_str_from_b14:
 Removing instruction b15:
+Removing instruction print_word_from_b15:
 Removing instruction b16:
-Removing instruction print_str_from_b16:
 Removing instruction b17:
-Removing instruction print_word_from_b17:
 Removing instruction b18:
 Removing instruction b19:
 Removing instruction b20:
 Removing instruction b21:
+Removing instruction print_byte_from_b21:
 Removing instruction b22:
 Removing instruction b23:
-Removing instruction print_byte_from_b23:
-Removing instruction b24:
-Removing instruction b25:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction print_char_from_print_byte:
@@ -6787,7 +6823,7 @@ Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b2:
-Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn:
 Removing instruction print_byte_from_print_word:
 Removing instruction b1:
@@ -6795,18 +6831,20 @@ Removing instruction print_byte_from_b1:
 Removing instruction breturn:
 Removing instruction b3:
 Removing instruction breturn:
-Removing instruction b5:
-Removing instruction mul8u_from_mul8su:
 Removing instruction b4:
+Removing instruction mul8u_from_mul8su:
+Removing instruction b3:
 Removing instruction b2:
 Removing instruction b1_from_mul8u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
+Removing instruction b3:
+Removing instruction b1_from_b4:
 Removing instruction b5:
 Removing instruction b1_from_b5:
 Removing instruction b6:
 Removing instruction mulu8_sel_from_b2:
+Removing instruction b9:
+Removing instruction mulu8_sel_from_b9:
 Removing instruction b10:
 Removing instruction mulu8_sel_from_b10:
 Removing instruction b11:
@@ -6814,15 +6852,13 @@ Removing instruction mulu8_sel_from_b11:
 Removing instruction b12:
 Removing instruction mulu8_sel_from_b12:
 Removing instruction b13:
-Removing instruction mulu8_sel_from_b13:
-Removing instruction b14:
 Removing instruction b7:
 Removing instruction b8:
 Removing instruction mul8u_from_mulu8_sel:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction divr16u_from_div16u:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction b1_from_divr16u:
 Removing instruction b4:
 Removing instruction b5:
@@ -6847,7 +6883,7 @@ Fixing long branch [172] bcc b1 to bcs
 Fixing long branch [178] bcc b1 to bcs
 
 FINAL SYMBOL TABLE
-(label) @41
+(label) @1
 (label) @begin
 (label) @end
 (word) PI2_u4f12
@@ -6860,7 +6896,7 @@ FINAL SYMBOL TABLE
 (const word) PI_u4f12#0 PI_u4f12 = (word/signed word/dword/signed dword) $3244
 (dword) PI_u4f28
 (word()) div16u((word) div16u::dividend , (word) div16u::divisor)
-(label) div16u::@2
+(label) div16u::@1
 (label) div16u::@return
 (word) div16u::dividend
 (word) div16u::divisor
@@ -6910,7 +6946,7 @@ FINAL SYMBOL TABLE
 (byte~) mul8su::$7 reg byte a 4.0
 (label) mul8su::@1
 (label) mul8su::@2
-(label) mul8su::@4
+(label) mul8su::@3
 (label) mul8su::@return
 (signed byte) mul8su::a
 (signed byte) mul8su::a#0 reg byte y 2.6
@@ -6926,8 +6962,8 @@ FINAL SYMBOL TABLE
 (byte~) mul8u::$1 reg byte a 202.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 101.0
@@ -6952,7 +6988,7 @@ FINAL SYMBOL TABLE
 (byte()) mulu8_sel((byte) mulu8_sel::v1 , (byte) mulu8_sel::v2 , (byte) mulu8_sel::select)
 (word~) mulu8_sel::$0 $0 zp ZP_WORD:15 4.0
 (word~) mulu8_sel::$1 $1 zp ZP_WORD:15 4.0
-(label) mulu8_sel::@2
+(label) mulu8_sel::@1
 (label) mulu8_sel::@return
 (byte) mulu8_sel::return
 (byte) mulu8_sel::return#0 reg byte a 4.0
@@ -7022,7 +7058,7 @@ FINAL SYMBOL TABLE
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 b zp ZP_BYTE:10 4.0
@@ -7040,7 +7076,7 @@ FINAL SYMBOL TABLE
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:11 4.0
@@ -7067,7 +7103,6 @@ FINAL SYMBOL TABLE
 (label) sin8s::@12
 (label) sin8s::@13
 (label) sin8s::@14
-(label) sin8s::@18
 (label) sin8s::@2
 (label) sin8s::@3
 (label) sin8s::@4
@@ -7075,6 +7110,7 @@ FINAL SYMBOL TABLE
 (label) sin8s::@6
 (label) sin8s::@7
 (label) sin8s::@8
+(label) sin8s::@9
 (label) sin8s::@return
 (byte) sin8s::DIV_6
 (const byte) sin8s::DIV_6#0 DIV_6 = (byte/signed byte/word/signed word/dword/signed dword) $2b
@@ -7118,17 +7154,17 @@ FINAL SYMBOL TABLE
 (label) sin8u_table::@11
 (label) sin8u_table::@12
 (label) sin8u_table::@13
+(label) sin8u_table::@14
 (label) sin8u_table::@15
 (label) sin8u_table::@16
 (label) sin8u_table::@17
 (label) sin8u_table::@18
 (label) sin8u_table::@19
+(label) sin8u_table::@2
 (label) sin8u_table::@20
 (label) sin8u_table::@21
 (label) sin8u_table::@22
 (label) sin8u_table::@23
-(label) sin8u_table::@24
-(label) sin8u_table::@25
 (label) sin8u_table::@3
 (label) sin8u_table::@4
 (label) sin8u_table::@5
@@ -7239,11 +7275,11 @@ Score: 19454
   .label print_char_cursor = $d
   .label print_line_cursor = 8
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @41 [phi:@begin->@41]
-//SEG5 @41
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @41 to main [phi:@41->main]
-//SEG8 [3] phi from @41 to @end [phi:@41->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -7284,141 +7320,141 @@ sin8u_table: {
   //SEG21 [190] phi from sin8u_table to div16u [phi:sin8u_table->div16u]
     jsr div16u
   //SEG22 [11] (word) div16u::return#2 ← (word) div16u::return#0
-  //SEG23 sin8u_table::@3
+  //SEG23 sin8u_table::@2
   //SEG24 [12] (word) sin8u_table::step#0 ← (word) div16u::return#2
   //SEG25 [13] call print_str 
-  //SEG26 [86] phi from sin8u_table::@3 to print_str [phi:sin8u_table::@3->print_str]
-  //SEG27 [86] phi (byte*) print_char_cursor#105 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@3->print_str#0] -- pbuz1=pbuc1 
+  //SEG26 [86] phi from sin8u_table::@2 to print_str [phi:sin8u_table::@2->print_str]
+  //SEG27 [86] phi (byte*) print_char_cursor#105 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@2->print_str#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG28 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str [phi:sin8u_table::@3->print_str#1] -- pbuz1=pbuc1 
+  //SEG28 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str [phi:sin8u_table::@2->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG29 sin8u_table::@4
+  //SEG29 sin8u_table::@3
   //SEG30 [14] (word) print_word::w#1 ← (word) sin8u_table::step#0 -- vwuz1=vwuz2 
     lda step
     sta print_word.w
     lda step+1
     sta print_word.w+1
   //SEG31 [15] call print_word 
-  //SEG32 [101] phi from sin8u_table::@4 to print_word [phi:sin8u_table::@4->print_word]
-  //SEG33 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@4->print_word#0] -- register_copy 
-  //SEG34 [101] phi (word) print_word::w#3 = (word) print_word::w#1 [phi:sin8u_table::@4->print_word#1] -- register_copy 
+  //SEG32 [101] phi from sin8u_table::@3 to print_word [phi:sin8u_table::@3->print_word]
+  //SEG33 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@3->print_word#0] -- register_copy 
+  //SEG34 [101] phi (word) print_word::w#3 = (word) print_word::w#1 [phi:sin8u_table::@3->print_word#1] -- register_copy 
     jsr print_word
-  //SEG35 [16] phi from sin8u_table::@4 to sin8u_table::@5 [phi:sin8u_table::@4->sin8u_table::@5]
-  //SEG36 sin8u_table::@5
+  //SEG35 [16] phi from sin8u_table::@3 to sin8u_table::@4 [phi:sin8u_table::@3->sin8u_table::@4]
+  //SEG36 sin8u_table::@4
   //SEG37 [17] call print_str 
-  //SEG38 [86] phi from sin8u_table::@5 to print_str [phi:sin8u_table::@5->print_str]
-  //SEG39 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@5->print_str#0] -- register_copy 
-  //SEG40 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str1 [phi:sin8u_table::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG38 [86] phi from sin8u_table::@4 to print_str [phi:sin8u_table::@4->print_str]
+  //SEG39 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@4->print_str#0] -- register_copy 
+  //SEG40 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str1 [phi:sin8u_table::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG41 [18] phi from sin8u_table::@5 to sin8u_table::@6 [phi:sin8u_table::@5->sin8u_table::@6]
-  //SEG42 sin8u_table::@6
+  //SEG41 [18] phi from sin8u_table::@4 to sin8u_table::@5 [phi:sin8u_table::@4->sin8u_table::@5]
+  //SEG42 sin8u_table::@5
   //SEG43 [19] call print_byte 
-  //SEG44 [74] phi from sin8u_table::@6 to print_byte [phi:sin8u_table::@6->print_byte]
-  //SEG45 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@6->print_byte#0] -- register_copy 
-  //SEG46 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::min#0 [phi:sin8u_table::@6->print_byte#1] -- vbuz1=vbuc1 
+  //SEG44 [74] phi from sin8u_table::@5 to print_byte [phi:sin8u_table::@5->print_byte]
+  //SEG45 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@5->print_byte#0] -- register_copy 
+  //SEG46 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::min#0 [phi:sin8u_table::@5->print_byte#1] -- vbuz1=vbuc1 
     lda #min
     sta print_byte.b
     jsr print_byte
-  //SEG47 [20] phi from sin8u_table::@6 to sin8u_table::@7 [phi:sin8u_table::@6->sin8u_table::@7]
-  //SEG48 sin8u_table::@7
+  //SEG47 [20] phi from sin8u_table::@5 to sin8u_table::@6 [phi:sin8u_table::@5->sin8u_table::@6]
+  //SEG48 sin8u_table::@6
   //SEG49 [21] call print_str 
-  //SEG50 [86] phi from sin8u_table::@7 to print_str [phi:sin8u_table::@7->print_str]
-  //SEG51 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@7->print_str#0] -- register_copy 
-  //SEG52 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str2 [phi:sin8u_table::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG50 [86] phi from sin8u_table::@6 to print_str [phi:sin8u_table::@6->print_str]
+  //SEG51 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@6->print_str#0] -- register_copy 
+  //SEG52 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str2 [phi:sin8u_table::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-  //SEG53 [22] phi from sin8u_table::@7 to sin8u_table::@8 [phi:sin8u_table::@7->sin8u_table::@8]
-  //SEG54 sin8u_table::@8
+  //SEG53 [22] phi from sin8u_table::@6 to sin8u_table::@7 [phi:sin8u_table::@6->sin8u_table::@7]
+  //SEG54 sin8u_table::@7
   //SEG55 [23] call print_byte 
-  //SEG56 [74] phi from sin8u_table::@8 to print_byte [phi:sin8u_table::@8->print_byte]
-  //SEG57 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@8->print_byte#0] -- register_copy 
-  //SEG58 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::max#0 [phi:sin8u_table::@8->print_byte#1] -- vbuz1=vbuc1 
+  //SEG56 [74] phi from sin8u_table::@7 to print_byte [phi:sin8u_table::@7->print_byte]
+  //SEG57 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@7->print_byte#0] -- register_copy 
+  //SEG58 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::max#0 [phi:sin8u_table::@7->print_byte#1] -- vbuz1=vbuc1 
     lda #max
     sta print_byte.b
     jsr print_byte
-  //SEG59 [24] phi from sin8u_table::@8 to sin8u_table::@9 [phi:sin8u_table::@8->sin8u_table::@9]
-  //SEG60 sin8u_table::@9
+  //SEG59 [24] phi from sin8u_table::@7 to sin8u_table::@8 [phi:sin8u_table::@7->sin8u_table::@8]
+  //SEG60 sin8u_table::@8
   //SEG61 [25] call print_str 
-  //SEG62 [86] phi from sin8u_table::@9 to print_str [phi:sin8u_table::@9->print_str]
-  //SEG63 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@9->print_str#0] -- register_copy 
-  //SEG64 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str3 [phi:sin8u_table::@9->print_str#1] -- pbuz1=pbuc1 
+  //SEG62 [86] phi from sin8u_table::@8 to print_str [phi:sin8u_table::@8->print_str]
+  //SEG63 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@8->print_str#0] -- register_copy 
+  //SEG64 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str3 [phi:sin8u_table::@8->print_str#1] -- pbuz1=pbuc1 
     lda #<str3
     sta print_str.str
     lda #>str3
     sta print_str.str+1
     jsr print_str
-  //SEG65 [26] phi from sin8u_table::@9 to sin8u_table::@10 [phi:sin8u_table::@9->sin8u_table::@10]
-  //SEG66 sin8u_table::@10
+  //SEG65 [26] phi from sin8u_table::@8 to sin8u_table::@9 [phi:sin8u_table::@8->sin8u_table::@9]
+  //SEG66 sin8u_table::@9
   //SEG67 [27] call print_byte 
-  //SEG68 [74] phi from sin8u_table::@10 to print_byte [phi:sin8u_table::@10->print_byte]
-  //SEG69 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@10->print_byte#0] -- register_copy 
-  //SEG70 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::amplitude#0 [phi:sin8u_table::@10->print_byte#1] -- vbuz1=vbuc1 
+  //SEG68 [74] phi from sin8u_table::@9 to print_byte [phi:sin8u_table::@9->print_byte]
+  //SEG69 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@9->print_byte#0] -- register_copy 
+  //SEG70 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::amplitude#0 [phi:sin8u_table::@9->print_byte#1] -- vbuz1=vbuc1 
     lda #amplitude
     sta print_byte.b
     jsr print_byte
-  //SEG71 [28] phi from sin8u_table::@10 to sin8u_table::@11 [phi:sin8u_table::@10->sin8u_table::@11]
-  //SEG72 sin8u_table::@11
+  //SEG71 [28] phi from sin8u_table::@9 to sin8u_table::@10 [phi:sin8u_table::@9->sin8u_table::@10]
+  //SEG72 sin8u_table::@10
   //SEG73 [29] call print_str 
-  //SEG74 [86] phi from sin8u_table::@11 to print_str [phi:sin8u_table::@11->print_str]
-  //SEG75 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@11->print_str#0] -- register_copy 
-  //SEG76 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str4 [phi:sin8u_table::@11->print_str#1] -- pbuz1=pbuc1 
+  //SEG74 [86] phi from sin8u_table::@10 to print_str [phi:sin8u_table::@10->print_str]
+  //SEG75 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@10->print_str#0] -- register_copy 
+  //SEG76 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str4 [phi:sin8u_table::@10->print_str#1] -- pbuz1=pbuc1 
     lda #<str4
     sta print_str.str
     lda #>str4
     sta print_str.str+1
     jsr print_str
-  //SEG77 [30] phi from sin8u_table::@11 to sin8u_table::@12 [phi:sin8u_table::@11->sin8u_table::@12]
-  //SEG78 sin8u_table::@12
+  //SEG77 [30] phi from sin8u_table::@10 to sin8u_table::@11 [phi:sin8u_table::@10->sin8u_table::@11]
+  //SEG78 sin8u_table::@11
   //SEG79 [31] call print_byte 
-  //SEG80 [74] phi from sin8u_table::@12 to print_byte [phi:sin8u_table::@12->print_byte]
-  //SEG81 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@12->print_byte#0] -- register_copy 
-  //SEG82 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::mid#0 [phi:sin8u_table::@12->print_byte#1] -- vbuz1=vbuc1 
+  //SEG80 [74] phi from sin8u_table::@11 to print_byte [phi:sin8u_table::@11->print_byte]
+  //SEG81 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@11->print_byte#0] -- register_copy 
+  //SEG82 [74] phi (byte) print_byte::b#8 = (const byte) sin8u_table::mid#0 [phi:sin8u_table::@11->print_byte#1] -- vbuz1=vbuc1 
     lda #mid
     sta print_byte.b
     jsr print_byte
-  //SEG83 [32] phi from sin8u_table::@12 to sin8u_table::@13 [phi:sin8u_table::@12->sin8u_table::@13]
-  //SEG84 sin8u_table::@13
+  //SEG83 [32] phi from sin8u_table::@11 to sin8u_table::@12 [phi:sin8u_table::@11->sin8u_table::@12]
+  //SEG84 sin8u_table::@12
   //SEG85 [33] call print_ln 
-  //SEG86 [69] phi from sin8u_table::@13 to print_ln [phi:sin8u_table::@13->print_ln]
-  //SEG87 [69] phi (byte*) print_line_cursor#23 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@13->print_ln#0] -- pbuz1=pbuc1 
+  //SEG86 [69] phi from sin8u_table::@12 to print_ln [phi:sin8u_table::@12->print_ln]
+  //SEG87 [69] phi (byte*) print_line_cursor#23 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:sin8u_table::@12->print_ln#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
     jsr print_ln
-  //SEG88 [34] phi from sin8u_table::@13 to sin8u_table::@1 [phi:sin8u_table::@13->sin8u_table::@1]
-  //SEG89 [34] phi (word) sin8u_table::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@13->sin8u_table::@1#0] -- vwuz1=vbuc1 
+  //SEG88 [34] phi from sin8u_table::@12 to sin8u_table::@1 [phi:sin8u_table::@12->sin8u_table::@1]
+  //SEG89 [34] phi (word) sin8u_table::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@12->sin8u_table::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG90 [34] phi (byte*) sin8u_table::sintab#2 = (const byte[$14]) main::sintab#0 [phi:sin8u_table::@13->sin8u_table::@1#1] -- pbuz1=pbuc1 
+  //SEG90 [34] phi (byte*) sin8u_table::sintab#2 = (const byte[$14]) main::sintab#0 [phi:sin8u_table::@12->sin8u_table::@1#1] -- pbuz1=pbuc1 
     lda #<main.sintab
     sta sintab
     lda #>main.sintab
     sta sintab+1
-  //SEG91 [34] phi (word) sin8u_table::x#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@13->sin8u_table::@1#2] -- vwuz1=vbuc1 
+  //SEG91 [34] phi (word) sin8u_table::x#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8u_table::@12->sin8u_table::@1#2] -- vwuz1=vbuc1 
     lda #0
     sta x
     sta x+1
   // u[4.12]
-  //SEG92 [34] phi from sin8u_table::@25 to sin8u_table::@1 [phi:sin8u_table::@25->sin8u_table::@1]
-  //SEG93 [34] phi (word) sin8u_table::i#10 = (word) sin8u_table::i#1 [phi:sin8u_table::@25->sin8u_table::@1#0] -- register_copy 
-  //SEG94 [34] phi (byte*) sin8u_table::sintab#2 = (byte*) sin8u_table::sintab#1 [phi:sin8u_table::@25->sin8u_table::@1#1] -- register_copy 
-  //SEG95 [34] phi (word) sin8u_table::x#10 = (word) sin8u_table::x#1 [phi:sin8u_table::@25->sin8u_table::@1#2] -- register_copy 
+  //SEG92 [34] phi from sin8u_table::@23 to sin8u_table::@1 [phi:sin8u_table::@23->sin8u_table::@1]
+  //SEG93 [34] phi (word) sin8u_table::i#10 = (word) sin8u_table::i#1 [phi:sin8u_table::@23->sin8u_table::@1#0] -- register_copy 
+  //SEG94 [34] phi (byte*) sin8u_table::sintab#2 = (byte*) sin8u_table::sintab#1 [phi:sin8u_table::@23->sin8u_table::@1#1] -- register_copy 
+  //SEG95 [34] phi (word) sin8u_table::x#10 = (word) sin8u_table::x#1 [phi:sin8u_table::@23->sin8u_table::@1#2] -- register_copy 
   //SEG96 sin8u_table::@1
   b1:
   //SEG97 [35] (word) sin8s::x#2 ← (word) sin8u_table::x#10 -- vwuz1=vwuz2 
@@ -7429,7 +7465,7 @@ sin8u_table: {
   //SEG98 [36] call sin8s 
     jsr sin8s
   //SEG99 [37] (signed byte) sin8s::return#2 ← (signed byte) sin8s::return#0
-  //SEG100 sin8u_table::@15
+  //SEG100 sin8u_table::@13
   //SEG101 [38] (signed byte) sin8u_table::sinx#0 ← (signed byte) sin8s::return#2 -- vbsz1=vbsaa 
     sta sinx
   //SEG102 [39] (signed byte) mul8su::a#0 ← (signed byte) sin8u_table::sinx#0 -- vbsyy=vbsz1 
@@ -7437,7 +7473,7 @@ sin8u_table: {
   //SEG103 [40] call mul8su 
     jsr mul8su
   //SEG104 [41] (signed word) mul8su::return#2 ← (signed word)(word) mul8su::m#2
-  //SEG105 sin8u_table::@16
+  //SEG105 sin8u_table::@14
   //SEG106 [42] (signed word) sin8u_table::sinx_sc#0 ← (signed word) mul8su::return#2
   //SEG107 [43] (byte~) sin8u_table::$21 ← > (signed word) sin8u_table::sinx_sc#0 -- vbuaa=_hi_vwsz1 
     lda sinx_sc+1
@@ -7459,54 +7495,54 @@ sin8u_table: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG112 [48] call print_str 
-  //SEG113 [86] phi from sin8u_table::@16 to print_str [phi:sin8u_table::@16->print_str]
-  //SEG114 [86] phi (byte*) print_char_cursor#105 = (byte*~) print_char_cursor#126 [phi:sin8u_table::@16->print_str#0] -- register_copy 
-  //SEG115 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str5 [phi:sin8u_table::@16->print_str#1] -- pbuz1=pbuc1 
+  //SEG113 [86] phi from sin8u_table::@14 to print_str [phi:sin8u_table::@14->print_str]
+  //SEG114 [86] phi (byte*) print_char_cursor#105 = (byte*~) print_char_cursor#126 [phi:sin8u_table::@14->print_str#0] -- register_copy 
+  //SEG115 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str5 [phi:sin8u_table::@14->print_str#1] -- pbuz1=pbuc1 
     lda #<str5
     sta print_str.str
     lda #>str5
     sta print_str.str+1
     jsr print_str
-  //SEG116 sin8u_table::@17
+  //SEG116 sin8u_table::@15
   //SEG117 [49] (word) print_word::w#2 ← (word) sin8u_table::x#10 -- vwuz1=vwuz2 
     lda x
     sta print_word.w
     lda x+1
     sta print_word.w+1
   //SEG118 [50] call print_word 
-  //SEG119 [101] phi from sin8u_table::@17 to print_word [phi:sin8u_table::@17->print_word]
-  //SEG120 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@17->print_word#0] -- register_copy 
-  //SEG121 [101] phi (word) print_word::w#3 = (word) print_word::w#2 [phi:sin8u_table::@17->print_word#1] -- register_copy 
+  //SEG119 [101] phi from sin8u_table::@15 to print_word [phi:sin8u_table::@15->print_word]
+  //SEG120 [101] phi (byte*) print_char_cursor#99 = (byte*) print_char_cursor#2 [phi:sin8u_table::@15->print_word#0] -- register_copy 
+  //SEG121 [101] phi (word) print_word::w#3 = (word) print_word::w#2 [phi:sin8u_table::@15->print_word#1] -- register_copy 
     jsr print_word
-  //SEG122 [51] phi from sin8u_table::@17 to sin8u_table::@18 [phi:sin8u_table::@17->sin8u_table::@18]
-  //SEG123 sin8u_table::@18
+  //SEG122 [51] phi from sin8u_table::@15 to sin8u_table::@16 [phi:sin8u_table::@15->sin8u_table::@16]
+  //SEG123 sin8u_table::@16
   //SEG124 [52] call print_str 
-  //SEG125 [86] phi from sin8u_table::@18 to print_str [phi:sin8u_table::@18->print_str]
-  //SEG126 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@18->print_str#0] -- register_copy 
-  //SEG127 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str6 [phi:sin8u_table::@18->print_str#1] -- pbuz1=pbuc1 
+  //SEG125 [86] phi from sin8u_table::@16 to print_str [phi:sin8u_table::@16->print_str]
+  //SEG126 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@16->print_str#0] -- register_copy 
+  //SEG127 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str6 [phi:sin8u_table::@16->print_str#1] -- pbuz1=pbuc1 
     lda #<str6
     sta print_str.str
     lda #>str6
     sta print_str.str+1
     jsr print_str
-  //SEG128 sin8u_table::@19
+  //SEG128 sin8u_table::@17
   //SEG129 [53] (signed byte) print_sbyte::b#1 ← (signed byte) sin8u_table::sinx#0 -- vbsz1=vbsz2 
     lda sinx
     sta print_sbyte.b
   //SEG130 [54] call print_sbyte 
     jsr print_sbyte
-  //SEG131 [55] phi from sin8u_table::@19 to sin8u_table::@20 [phi:sin8u_table::@19->sin8u_table::@20]
-  //SEG132 sin8u_table::@20
+  //SEG131 [55] phi from sin8u_table::@17 to sin8u_table::@18 [phi:sin8u_table::@17->sin8u_table::@18]
+  //SEG132 sin8u_table::@18
   //SEG133 [56] call print_str 
-  //SEG134 [86] phi from sin8u_table::@20 to print_str [phi:sin8u_table::@20->print_str]
-  //SEG135 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@20->print_str#0] -- register_copy 
-  //SEG136 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str7 [phi:sin8u_table::@20->print_str#1] -- pbuz1=pbuc1 
+  //SEG134 [86] phi from sin8u_table::@18 to print_str [phi:sin8u_table::@18->print_str]
+  //SEG135 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@18->print_str#0] -- register_copy 
+  //SEG136 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str7 [phi:sin8u_table::@18->print_str#1] -- pbuz1=pbuc1 
     lda #<str7
     sta print_str.str
     lda #>str7
     sta print_str.str+1
     jsr print_str
-  //SEG137 sin8u_table::@21
+  //SEG137 sin8u_table::@19
   //SEG138 [57] (signed word) print_sword::w#1 ← (signed word) sin8u_table::sinx_sc#0 -- vwsz1=vwsz2 
     lda sinx_sc
     sta print_sword.w
@@ -7514,32 +7550,32 @@ sin8u_table: {
     sta print_sword.w+1
   //SEG139 [58] call print_sword 
     jsr print_sword
-  //SEG140 [59] phi from sin8u_table::@21 to sin8u_table::@22 [phi:sin8u_table::@21->sin8u_table::@22]
-  //SEG141 sin8u_table::@22
+  //SEG140 [59] phi from sin8u_table::@19 to sin8u_table::@20 [phi:sin8u_table::@19->sin8u_table::@20]
+  //SEG141 sin8u_table::@20
   //SEG142 [60] call print_str 
-  //SEG143 [86] phi from sin8u_table::@22 to print_str [phi:sin8u_table::@22->print_str]
-  //SEG144 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@22->print_str#0] -- register_copy 
-  //SEG145 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str8 [phi:sin8u_table::@22->print_str#1] -- pbuz1=pbuc1 
+  //SEG143 [86] phi from sin8u_table::@20 to print_str [phi:sin8u_table::@20->print_str]
+  //SEG144 [86] phi (byte*) print_char_cursor#105 = (byte*) print_char_cursor#18 [phi:sin8u_table::@20->print_str#0] -- register_copy 
+  //SEG145 [86] phi (byte*) print_str::str#12 = (const string) sin8u_table::str8 [phi:sin8u_table::@20->print_str#1] -- pbuz1=pbuc1 
     lda #<str8
     sta print_str.str
     lda #>str8
     sta print_str.str+1
     jsr print_str
-  //SEG146 sin8u_table::@23
+  //SEG146 sin8u_table::@21
   //SEG147 [61] (byte) print_byte::b#7 ← (byte) sin8u_table::sinx_tr#0 -- vbuz1=vbuxx 
     stx print_byte.b
   //SEG148 [62] call print_byte 
-  //SEG149 [74] phi from sin8u_table::@23 to print_byte [phi:sin8u_table::@23->print_byte]
-  //SEG150 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@23->print_byte#0] -- register_copy 
-  //SEG151 [74] phi (byte) print_byte::b#8 = (byte) print_byte::b#7 [phi:sin8u_table::@23->print_byte#1] -- register_copy 
+  //SEG149 [74] phi from sin8u_table::@21 to print_byte [phi:sin8u_table::@21->print_byte]
+  //SEG150 [74] phi (byte*) print_char_cursor#100 = (byte*) print_char_cursor#2 [phi:sin8u_table::@21->print_byte#0] -- register_copy 
+  //SEG151 [74] phi (byte) print_byte::b#8 = (byte) print_byte::b#7 [phi:sin8u_table::@21->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG152 [63] phi from sin8u_table::@23 to sin8u_table::@24 [phi:sin8u_table::@23->sin8u_table::@24]
-  //SEG153 sin8u_table::@24
+  //SEG152 [63] phi from sin8u_table::@21 to sin8u_table::@22 [phi:sin8u_table::@21->sin8u_table::@22]
+  //SEG153 sin8u_table::@22
   //SEG154 [64] call print_ln 
-  //SEG155 [69] phi from sin8u_table::@24 to print_ln [phi:sin8u_table::@24->print_ln]
-  //SEG156 [69] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:sin8u_table::@24->print_ln#0] -- register_copy 
+  //SEG155 [69] phi from sin8u_table::@22 to print_ln [phi:sin8u_table::@22->print_ln]
+  //SEG156 [69] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:sin8u_table::@22->print_ln#0] -- register_copy 
     jsr print_ln
-  //SEG157 sin8u_table::@25
+  //SEG157 sin8u_table::@23
   //SEG158 [65] (word) sin8u_table::x#1 ← (word) sin8u_table::x#10 + (word) sin8u_table::step#0 -- vwuz1=vwuz1_plus_vwuz2 
     lda x
     clc
@@ -7710,7 +7746,7 @@ print_sword: {
   //SEG211 [82] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG212 print_sword::@4
+  //SEG212 print_sword::@3
   //SEG213 [96] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#1 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -7721,9 +7757,9 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG214 [97] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
-  //SEG215 [97] phi (byte*) print_char_cursor#94 = (byte*) print_char_cursor#2 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG216 [97] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  //SEG214 [97] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
+  //SEG215 [97] phi (byte*) print_char_cursor#94 = (byte*) print_char_cursor#2 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG216 [97] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
   //SEG217 print_sword::@1
   b1:
   //SEG218 [98] (word~) print_word::w#5 ← (word)(signed word) print_sword::w#3
@@ -7778,8 +7814,8 @@ print_sbyte: {
   //SEG246 [82] phi (byte) print_char::ch#5 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG247 [110] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
-  //SEG248 [110] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  //SEG247 [110] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
+  //SEG248 [110] phi (signed byte) print_sbyte::b#4 = (signed byte) print_sbyte::b#1 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
   //SEG249 print_sbyte::@2
   b2:
   //SEG250 [111] (byte~) print_byte::b#10 ← (byte)(signed byte) print_sbyte::b#4
@@ -7800,7 +7836,7 @@ print_sbyte: {
   //SEG262 [82] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG263 print_sbyte::@5
+  //SEG263 print_sbyte::@4
   //SEG264 [116] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#1 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
@@ -7827,7 +7863,7 @@ mul8su: {
     lda #b
     jsr mul8u
   //SEG271 [119] (word) mul8u::return#2 ← (word) mul8u::res#2
-  //SEG272 mul8su::@4
+  //SEG272 mul8su::@3
   //SEG273 [120] (word) mul8su::m#0 ← (word) mul8u::return#2
   //SEG274 [121] if((signed byte) mul8su::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8su::@1 -- vbsyy_ge_0_then_la1 
     cpy #0
@@ -7840,8 +7876,8 @@ mul8su: {
     sbc #b
   //SEG278 [124] (word) mul8su::m#1 ← (word) mul8su::m#0 hi= (byte~) mul8su::$10 -- vwuz1=vwuz1_sethi_vbuaa 
     sta m+1
-  //SEG279 [125] phi from mul8su::@2 mul8su::@4 to mul8su::@1 [phi:mul8su::@2/mul8su::@4->mul8su::@1]
-  //SEG280 [125] phi (word) mul8su::m#2 = (word) mul8su::m#1 [phi:mul8su::@2/mul8su::@4->mul8su::@1#0] -- register_copy 
+  //SEG279 [125] phi from mul8su::@2 mul8su::@3 to mul8su::@1 [phi:mul8su::@2/mul8su::@3->mul8su::@1]
+  //SEG280 [125] phi (word) mul8su::m#2 = (word) mul8su::m#1 [phi:mul8su::@2/mul8su::@3->mul8su::@1#0] -- register_copy 
   //SEG281 mul8su::@1
   b1:
   //SEG282 mul8su::@return
@@ -7878,10 +7914,10 @@ mul8u: {
   //SEG295 [132] (byte~) mul8u::$1 ← (byte) mul8u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG296 [133] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG296 [133] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG297 mul8u::@6
+    beq b4
+  //SEG297 mul8u::@3
   //SEG298 [134] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -7890,10 +7926,10 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG299 [135] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  //SEG300 [135] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-  //SEG301 mul8u::@8
-  b8:
+  //SEG299 [135] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  //SEG300 [135] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+  //SEG301 mul8u::@4
+  b4:
   //SEG302 [136] (byte) mul8u::a#0 ← (byte) mul8u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -7901,10 +7937,10 @@ mul8u: {
   //SEG303 [137] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG304 [129] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  //SEG305 [129] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG306 [129] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG307 [129] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG304 [129] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  //SEG305 [129] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG306 [129] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG307 [129] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG308 sin8s
@@ -7998,37 +8034,37 @@ sin8s: {
   //SEG333 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#0 [phi:sin8s::@2->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG334 [149] (byte) mulu8_sel::return#0 ← (byte) mulu8_sel::return#12
-  //SEG335 sin8s::@10
+  //SEG335 sin8s::@9
   //SEG336 [150] (byte) sin8s::x2#0 ← (byte) mulu8_sel::return#0
   //SEG337 [151] (byte) mulu8_sel::v1#1 ← (byte) sin8s::x2#0 -- vbuxx=vbuaa 
     tax
   //SEG338 [152] (byte) mulu8_sel::v2#1 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG339 [153] call mulu8_sel 
-  //SEG340 [181] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
-  //SEG341 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG340 [181] phi from sin8s::@9 to mulu8_sel [phi:sin8s::@9->mulu8_sel]
+  //SEG341 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@9->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG342 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@10->mulu8_sel#1] -- register_copy 
-  //SEG343 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
+  //SEG342 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#1 [phi:sin8s::@9->mulu8_sel#1] -- register_copy 
+  //SEG343 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#1 [phi:sin8s::@9->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG344 [154] (byte) mulu8_sel::return#1 ← (byte) mulu8_sel::return#12
-  //SEG345 sin8s::@11
+  //SEG345 sin8s::@10
   //SEG346 [155] (byte) sin8s::x3#0 ← (byte) mulu8_sel::return#1 -- vbuz1=vbuaa 
     sta x3
   //SEG347 [156] (byte) mulu8_sel::v1#2 ← (byte) sin8s::x3#0 -- vbuxx=vbuz1 
     tax
   //SEG348 [157] call mulu8_sel 
-  //SEG349 [181] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
-  //SEG350 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG349 [181] phi from sin8s::@10 to mulu8_sel [phi:sin8s::@10->mulu8_sel]
+  //SEG350 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:sin8s::@10->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #1
     sta mulu8_sel.select
-  //SEG351 [181] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@11->mulu8_sel#1] -- vbuyy=vbuc1 
+  //SEG351 [181] phi (byte) mulu8_sel::v2#5 = (const byte) sin8s::DIV_6#0 [phi:sin8s::@10->mulu8_sel#1] -- vbuyy=vbuc1 
     ldy #DIV_6
-  //SEG352 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
+  //SEG352 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#2 [phi:sin8s::@10->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG353 [158] (byte) mulu8_sel::return#2 ← (byte) mulu8_sel::return#12
-  //SEG354 sin8s::@12
+  //SEG354 sin8s::@11
   //SEG355 [159] (byte) sin8s::x3_6#0 ← (byte) mulu8_sel::return#2
   //SEG356 [160] (byte) sin8s::usinx#0 ← (byte) sin8s::x1#0 - (byte) sin8s::x3_6#0 -- vbuz1=vbuz2_minus_vbuaa 
     eor #$ff
@@ -8040,30 +8076,30 @@ sin8s: {
   //SEG358 [162] (byte) mulu8_sel::v2#3 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG359 [163] call mulu8_sel 
-  //SEG360 [181] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
-  //SEG361 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG360 [181] phi from sin8s::@11 to mulu8_sel [phi:sin8s::@11->mulu8_sel]
+  //SEG361 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@11->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG362 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
-  //SEG363 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
+  //SEG362 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#3 [phi:sin8s::@11->mulu8_sel#1] -- register_copy 
+  //SEG363 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#3 [phi:sin8s::@11->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG364 [164] (byte) mulu8_sel::return#10 ← (byte) mulu8_sel::return#12
-  //SEG365 sin8s::@13
+  //SEG365 sin8s::@12
   //SEG366 [165] (byte) sin8s::x4#0 ← (byte) mulu8_sel::return#10
   //SEG367 [166] (byte) mulu8_sel::v1#4 ← (byte) sin8s::x4#0 -- vbuxx=vbuaa 
     tax
   //SEG368 [167] (byte) mulu8_sel::v2#4 ← (byte) sin8s::x1#0 -- vbuyy=vbuz1 
     ldy x1
   //SEG369 [168] call mulu8_sel 
-  //SEG370 [181] phi from sin8s::@13 to mulu8_sel [phi:sin8s::@13->mulu8_sel]
-  //SEG371 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@13->mulu8_sel#0] -- vbuz1=vbuc1 
+  //SEG370 [181] phi from sin8s::@12 to mulu8_sel [phi:sin8s::@12->mulu8_sel]
+  //SEG371 [181] phi (byte) mulu8_sel::select#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:sin8s::@12->mulu8_sel#0] -- vbuz1=vbuc1 
     lda #0
     sta mulu8_sel.select
-  //SEG372 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@13->mulu8_sel#1] -- register_copy 
-  //SEG373 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@13->mulu8_sel#2] -- register_copy 
+  //SEG372 [181] phi (byte) mulu8_sel::v2#5 = (byte) mulu8_sel::v2#4 [phi:sin8s::@12->mulu8_sel#1] -- register_copy 
+  //SEG373 [181] phi (byte) mulu8_sel::v1#5 = (byte) mulu8_sel::v1#4 [phi:sin8s::@12->mulu8_sel#2] -- register_copy 
     jsr mulu8_sel
   //SEG374 [169] (byte) mulu8_sel::return#11 ← (byte) mulu8_sel::return#12
-  //SEG375 sin8s::@14
+  //SEG375 sin8s::@13
   //SEG376 [170] (byte) sin8s::x5#0 ← (byte) mulu8_sel::return#11
   //SEG377 [171] (byte) sin8s::x5_128#0 ← (byte) sin8s::x5#0 >> (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuaa=vbuaa_ror_4 
     lsr
@@ -8080,29 +8116,29 @@ sin8s: {
   //SEG380 sin8s::@7
   //SEG381 [174] (byte) sin8s::usinx#2 ← -- (byte) sin8s::usinx#1 -- vbuxx=_dec_vbuxx 
     dex
-  //SEG382 [175] phi from sin8s::@14 sin8s::@7 to sin8s::@3 [phi:sin8s::@14/sin8s::@7->sin8s::@3]
-  //SEG383 [175] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@14/sin8s::@7->sin8s::@3#0] -- register_copy 
+  //SEG382 [175] phi from sin8s::@13 sin8s::@7 to sin8s::@3 [phi:sin8s::@13/sin8s::@7->sin8s::@3]
+  //SEG383 [175] phi (byte) sin8s::usinx#4 = (byte) sin8s::usinx#1 [phi:sin8s::@13/sin8s::@7->sin8s::@3#0] -- register_copy 
   //SEG384 sin8s::@3
   b3:
-  //SEG385 [176] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG385 [176] if((byte) sin8s::isUpper#10==(byte/signed byte/word/signed word/dword/signed dword) 0) goto sin8s::@14 -- vbuz1_eq_0_then_la1 
     lda isUpper
     cmp #0
-    beq b18
+    beq b14
   //SEG386 sin8s::@8
   //SEG387 [177] (signed byte) sin8s::sinx#1 ← - (signed byte)(byte) sin8s::usinx#4 -- vbsaa=_neg_vbsxx 
     txa
     eor #$ff
     clc
     adc #1
-  //SEG388 [178] phi from sin8s::@18 sin8s::@8 to sin8s::@4 [phi:sin8s::@18/sin8s::@8->sin8s::@4]
-  //SEG389 [178] phi (signed byte) sin8s::return#0 = (signed byte~) sin8s::return#5 [phi:sin8s::@18/sin8s::@8->sin8s::@4#0] -- register_copy 
+  //SEG388 [178] phi from sin8s::@14 sin8s::@8 to sin8s::@4 [phi:sin8s::@14/sin8s::@8->sin8s::@4]
+  //SEG389 [178] phi (signed byte) sin8s::return#0 = (signed byte~) sin8s::return#5 [phi:sin8s::@14/sin8s::@8->sin8s::@4#0] -- register_copy 
   //SEG390 sin8s::@4
   b4:
   //SEG391 sin8s::@return
   //SEG392 [179] return 
     rts
-  //SEG393 sin8s::@18
-  b18:
+  //SEG393 sin8s::@14
+  b14:
   //SEG394 [180] (signed byte~) sin8s::return#5 ← (signed byte)(byte) sin8s::usinx#4 -- vbsaa=vbsxx 
     txa
     jmp b4
@@ -8124,7 +8160,7 @@ mulu8_sel: {
   //SEG401 [127] phi (byte) mul8u::b#2 = (byte) mul8u::b#1 [phi:mulu8_sel->mul8u#1] -- register_copy 
     jsr mul8u
   //SEG402 [185] (word) mul8u::return#3 ← (word) mul8u::res#2
-  //SEG403 mulu8_sel::@2
+  //SEG403 mulu8_sel::@1
   //SEG404 [186] (word~) mulu8_sel::$0 ← (word) mul8u::return#3
   //SEG405 [187] (word~) mulu8_sel::$1 ← (word~) mulu8_sel::$0 << (byte) mulu8_sel::select#5 -- vwuz1=vwuz1_rol_vbuz2 
     ldy select
@@ -8152,7 +8188,7 @@ div16u: {
   //SEG411 [195] phi from div16u to divr16u [phi:div16u->divr16u]
     jsr divr16u
   //SEG412 [192] (word) divr16u::return#2 ← (word) divr16u::return#0
-  //SEG413 div16u::@2
+  //SEG413 div16u::@1
   //SEG414 [193] (word) div16u::return#0 ← (word) divr16u::return#2
   //SEG415 div16u::@return
   //SEG416 [194] return 
diff --git a/src/test/ref/sinusgenscale8.sym b/src/test/ref/sinusgenscale8.sym
index 648e59fd8..35c537b09 100644
--- a/src/test/ref/sinusgenscale8.sym
+++ b/src/test/ref/sinusgenscale8.sym
@@ -1,4 +1,4 @@
-(label) @41
+(label) @1
 (label) @begin
 (label) @end
 (word) PI2_u4f12
@@ -11,7 +11,7 @@
 (const word) PI_u4f12#0 PI_u4f12 = (word/signed word/dword/signed dword) $3244
 (dword) PI_u4f28
 (word()) div16u((word) div16u::dividend , (word) div16u::divisor)
-(label) div16u::@2
+(label) div16u::@1
 (label) div16u::@return
 (word) div16u::dividend
 (word) div16u::divisor
@@ -61,7 +61,7 @@
 (byte~) mul8su::$7 reg byte a 4.0
 (label) mul8su::@1
 (label) mul8su::@2
-(label) mul8su::@4
+(label) mul8su::@3
 (label) mul8su::@return
 (signed byte) mul8su::a
 (signed byte) mul8su::a#0 reg byte y 2.6
@@ -77,8 +77,8 @@
 (byte~) mul8u::$1 reg byte a 202.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 101.0
@@ -103,7 +103,7 @@
 (byte()) mulu8_sel((byte) mulu8_sel::v1 , (byte) mulu8_sel::v2 , (byte) mulu8_sel::select)
 (word~) mulu8_sel::$0 $0 zp ZP_WORD:15 4.0
 (word~) mulu8_sel::$1 $1 zp ZP_WORD:15 4.0
-(label) mulu8_sel::@2
+(label) mulu8_sel::@1
 (label) mulu8_sel::@return
 (byte) mulu8_sel::return
 (byte) mulu8_sel::return#0 reg byte a 4.0
@@ -173,7 +173,7 @@
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 b zp ZP_BYTE:10 4.0
@@ -191,7 +191,7 @@
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:11 4.0
@@ -218,7 +218,6 @@
 (label) sin8s::@12
 (label) sin8s::@13
 (label) sin8s::@14
-(label) sin8s::@18
 (label) sin8s::@2
 (label) sin8s::@3
 (label) sin8s::@4
@@ -226,6 +225,7 @@
 (label) sin8s::@6
 (label) sin8s::@7
 (label) sin8s::@8
+(label) sin8s::@9
 (label) sin8s::@return
 (byte) sin8s::DIV_6
 (const byte) sin8s::DIV_6#0 DIV_6 = (byte/signed byte/word/signed word/dword/signed dword) $2b
@@ -269,17 +269,17 @@
 (label) sin8u_table::@11
 (label) sin8u_table::@12
 (label) sin8u_table::@13
+(label) sin8u_table::@14
 (label) sin8u_table::@15
 (label) sin8u_table::@16
 (label) sin8u_table::@17
 (label) sin8u_table::@18
 (label) sin8u_table::@19
+(label) sin8u_table::@2
 (label) sin8u_table::@20
 (label) sin8u_table::@21
 (label) sin8u_table::@22
 (label) sin8u_table::@23
-(label) sin8u_table::@24
-(label) sin8u_table::@25
 (label) sin8u_table::@3
 (label) sin8u_table::@4
 (label) sin8u_table::@5
diff --git a/src/test/ref/string-const-consolidation-noroot.cfg b/src/test/ref/string-const-consolidation-noroot.cfg
index 127493cbe..629891b45 100644
--- a/src/test/ref/string-const-consolidation-noroot.cfg
+++ b/src/test/ref/string-const-consolidation-noroot.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call print 
   to:main::@1
diff --git a/src/test/ref/string-const-consolidation-noroot.log b/src/test/ref/string-const-consolidation-noroot.log
index cbce130a4..e368a2b46 100644
--- a/src/test/ref/string-const-consolidation-noroot.log
+++ b/src/test/ref/string-const-consolidation-noroot.log
@@ -174,8 +174,9 @@ Coalesced (already) [12] screen#21 ← screen#18
 Coalesced [19] print::string#7 ← print::string#3
 Coalesced [20] screen#22 ← screen#5
 Coalesced down to 2 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -184,14 +185,14 @@ Adding NOP phi() at start of main::@2
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call print 
   to:main::@1
@@ -257,17 +258,17 @@ INITIAL ASM
   .label screen = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -384,17 +385,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -486,7 +487,7 @@ print: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -496,10 +497,10 @@ Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction print_from_b1:
 Removing instruction b2_from_b1:
@@ -521,7 +522,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -559,11 +560,11 @@ Score: 675
 //SEG2 Global Constants & labels
   .label screen = 2
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/string-const-consolidation-noroot.sym b/src/test/ref/string-const-consolidation-noroot.sym
index 6d7363165..0285f0a7a 100644
--- a/src/test/ref/string-const-consolidation-noroot.sym
+++ b/src/test/ref/string-const-consolidation-noroot.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/string-const-consolidation.cfg b/src/test/ref/string-const-consolidation.cfg
index 185690db9..46be35497 100644
--- a/src/test/ref/string-const-consolidation.cfg
+++ b/src/test/ref/string-const-consolidation.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call print 
   to:main::@1
diff --git a/src/test/ref/string-const-consolidation.log b/src/test/ref/string-const-consolidation.log
index 497853b74..b92f97020 100644
--- a/src/test/ref/string-const-consolidation.log
+++ b/src/test/ref/string-const-consolidation.log
@@ -174,8 +174,9 @@ Coalesced (already) [12] screen#21 ← screen#18
 Coalesced [19] print::string#7 ← print::string#3
 Coalesced [20] screen#22 ← screen#5
 Coalesced down to 2 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -184,14 +185,14 @@ Adding NOP phi() at start of main::@2
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call print 
   to:main::@1
@@ -257,17 +258,17 @@ INITIAL ASM
   .label screen = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -384,17 +385,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = 2
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -486,7 +487,7 @@ print: {
   rex1: .text "rex@"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -496,10 +497,10 @@ Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction print_from_b1:
 Removing instruction b2_from_b1:
@@ -521,7 +522,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -559,11 +560,11 @@ Score: 675
 //SEG2 Global Constants & labels
   .label screen = 2
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/string-const-consolidation.sym b/src/test/ref/string-const-consolidation.sym
index 7d72b4e1a..4eee53597 100644
--- a/src/test/ref/string-const-consolidation.sym
+++ b/src/test/ref/string-const-consolidation.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/summin.cfg b/src/test/ref/summin.cfg
index 7754a56a9..24743fa95 100644
--- a/src/test/ref/summin.cfg
+++ b/src/test/ref/summin.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call sum 
   [6] (byte) sum::return#0 ← (byte) sum::return#3
diff --git a/src/test/ref/summin.log b/src/test/ref/summin.log
index 490ea938e..20e429dc1 100644
--- a/src/test/ref/summin.log
+++ b/src/test/ref/summin.log
@@ -155,22 +155,23 @@ Calls in [main] to sum:5 sum:8 sum:11
 
 Created 2 initial phi equivalence classes
 Coalesced down to 2 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call sum 
   [6] (byte) sum::return#0 ← (byte) sum::return#3
@@ -273,17 +274,17 @@ INITIAL ASM
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -446,17 +447,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -536,7 +537,7 @@ sum: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -544,10 +545,10 @@ Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction sum_from_main:
@@ -566,7 +567,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -621,11 +622,11 @@ Score: 74
 //SEG2 Global Constants & labels
   .label screen = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/summin.sym b/src/test/ref/summin.sym
index 2e718680b..a8ffdba79 100644
--- a/src/test/ref/summin.sym
+++ b/src/test/ref/summin.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/test-address-of-param.cfg b/src/test/ref/test-address-of-param.cfg
index ce83cb1bc..c7fed72b7 100644
--- a/src/test/ref/test-address-of-param.cfg
+++ b/src/test/ref/test-address-of-param.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] (byte) main::b1#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [5] (byte) main::b2#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [6] (byte) main::b3#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
diff --git a/src/test/ref/test-address-of-param.log b/src/test/ref/test-address-of-param.log
index 958576825..44a9eb608 100644
--- a/src/test/ref/test-address-of-param.log
+++ b/src/test/ref/test-address-of-param.log
@@ -146,8 +146,9 @@ Calls in [main] to setByte:7 setByte:9 setByte:11
 
 Created 2 initial phi equivalence classes
 Coalesced down to 2 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of main::@2
@@ -155,14 +156,14 @@ Adding NOP phi() at start of main::@2
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] (byte) main::b1#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [5] (byte) main::b2#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   [6] (byte) main::b3#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
@@ -236,15 +237,15 @@ INITIAL ASM
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -383,15 +384,15 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -487,7 +488,7 @@ setByte: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -498,9 +499,9 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Removing instruction lda #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction setByte_from_b1:
 Removing instruction b2_from_b1:
@@ -521,7 +522,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -561,10 +562,10 @@ Score: 108
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
diff --git a/src/test/ref/test-address-of-param.sym b/src/test/ref/test-address-of-param.sym
index 1ef79db02..07f4de7ca 100644
--- a/src/test/ref/test-address-of-param.sym
+++ b/src/test/ref/test-address-of-param.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/test-comments-block.cfg b/src/test/ref/test-comments-block.cfg
index c1d0e8bab..8634936a7 100644
--- a/src/test/ref/test-comments-block.cfg
+++ b/src/test/ref/test-comments-block.cfg
@@ -1,30 +1,30 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
-  [5] (byte) main::b#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::b#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#1 )
+  [5] (byte) main::b#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::b#1 )
   [6] (byte) sum::b#0 ← (byte) main::b#2
   [7] call sum 
   [8] (byte) sum::return#0 ← (byte) sum::return#1
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [9] (byte~) main::$0 ← (byte) sum::return#0
   [10] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0
   [11] (byte) main::i#1 ← ++ (byte) main::i#2
   [12] (byte) main::b#1 ← ++ (byte) main::b#2
   [13] if((byte) main::b#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [14] return 
   to:@return
 sum: scope:[sum]  from main::@1
diff --git a/src/test/ref/test-comments-block.log b/src/test/ref/test-comments-block.log
index 7a8174488..b758c1598 100644
--- a/src/test/ref/test-comments-block.log
+++ b/src/test/ref/test-comments-block.log
@@ -134,39 +134,41 @@ Coalesced [15] main::b#4 ← main::b#1
 Coalesced [16] main::i#4 ← main::i#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@4
+Renumbering block @2 to @1
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
-  [5] (byte) main::b#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::b#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#1 )
+  [5] (byte) main::b#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::b#1 )
   [6] (byte) sum::b#0 ← (byte) main::b#2
   [7] call sum 
   [8] (byte) sum::return#0 ← (byte) sum::return#1
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [9] (byte~) main::$0 ← (byte) sum::return#0
   [10] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0
   [11] (byte) main::i#1 ← ++ (byte) main::i#2
   [12] (byte) main::b#1 ← ++ (byte) main::b#2
   [13] if((byte) main::b#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [14] return 
   to:@return
 sum: scope:[sum]  from main::@1
@@ -234,17 +236,17 @@ INITIAL ASM
   .const a = 'a'
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -264,10 +266,10 @@ main: {
     sta b
     jmp b1
   // Do some sums
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@2->main::@1#1] -- register_copy 
     jmp b1
   //SEG17 main::@1
   b1:
@@ -279,9 +281,9 @@ main: {
   //SEG20 [8] (byte) sum::return#0 ← (byte) sum::return#1 -- vbuz1=vbuz2 
     lda sum.return_1
     sta sum.return
-    jmp b3
-  //SEG21 main::@3
-  b3:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [9] (byte~) main::$0 ← (byte) sum::return#0 -- vbuz1=vbuz2 
     lda sum.return
     sta _0
@@ -297,7 +299,7 @@ main: {
   //SEG26 [13] if((byte) main::b#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp b
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG27 main::@return
   breturn:
@@ -361,17 +363,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const a = 'a'
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -386,10 +388,10 @@ main: {
     ldx #0
     jmp b1
   // Do some sums
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@2->main::@1#1] -- register_copy 
     jmp b1
   //SEG17 main::@1
   b1:
@@ -398,9 +400,9 @@ main: {
   //SEG19 [7] call sum 
     jsr sum
   //SEG20 [8] (byte) sum::return#0 ← (byte) sum::return#1
-    jmp b3
-  //SEG21 main::@3
-  b3:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [9] (byte~) main::$0 ← (byte) sum::return#0
   //SEG23 [10] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0 -- pbuc1_derefidx_vbuyy=vbuaa 
     // Output the result on the screen
@@ -411,7 +413,7 @@ main: {
     inx
   //SEG26 [13] if((byte) main::b#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG27 main::@return
   breturn:
@@ -437,23 +439,23 @@ sum: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1_from_b3 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
-Removing instruction b1_from_b3:
+Replacing label b1_from_b2 with b1
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -466,7 +468,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -476,7 +478,7 @@ FINAL SYMBOL TABLE
 (void()) main()
 (byte~) main::$0 reg byte a 22.0
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::b
 (byte) main::b#1 reg byte x 16.5
@@ -519,11 +521,11 @@ Score: 271
   // One of the bytes used for addition
   .const a = 'a'
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 /* The program entry point */
@@ -534,9 +536,9 @@ main: {
   //SEG13 [5] phi (byte) main::b#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#1] -- vbuxx=vbuc1 
     ldx #0
   // Do some sums
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@2->main::@1#1] -- register_copy 
   //SEG17 main::@1
   b1:
   //SEG18 [6] (byte) sum::b#0 ← (byte) main::b#2 -- vbuaa=vbuxx 
@@ -544,7 +546,7 @@ main: {
   //SEG19 [7] call sum 
     jsr sum
   //SEG20 [8] (byte) sum::return#0 ← (byte) sum::return#1
-  //SEG21 main::@3
+  //SEG21 main::@2
   //SEG22 [9] (byte~) main::$0 ← (byte) sum::return#0
   //SEG23 [10] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0 -- pbuc1_derefidx_vbuyy=vbuaa 
     // Output the result on the screen
diff --git a/src/test/ref/test-comments-block.sym b/src/test/ref/test-comments-block.sym
index 05e1fa4d1..64b9d7113 100644
--- a/src/test/ref/test-comments-block.sym
+++ b/src/test/ref/test-comments-block.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -8,7 +8,7 @@
 (void()) main()
 (byte~) main::$0 reg byte a 22.0
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::b
 (byte) main::b#1 reg byte x 16.5
diff --git a/src/test/ref/test-comments-single.cfg b/src/test/ref/test-comments-single.cfg
index c1d0e8bab..8634936a7 100644
--- a/src/test/ref/test-comments-single.cfg
+++ b/src/test/ref/test-comments-single.cfg
@@ -1,30 +1,30 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
-  [5] (byte) main::b#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::b#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#1 )
+  [5] (byte) main::b#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::b#1 )
   [6] (byte) sum::b#0 ← (byte) main::b#2
   [7] call sum 
   [8] (byte) sum::return#0 ← (byte) sum::return#1
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [9] (byte~) main::$0 ← (byte) sum::return#0
   [10] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0
   [11] (byte) main::i#1 ← ++ (byte) main::i#2
   [12] (byte) main::b#1 ← ++ (byte) main::b#2
   [13] if((byte) main::b#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [14] return 
   to:@return
 sum: scope:[sum]  from main::@1
diff --git a/src/test/ref/test-comments-single.log b/src/test/ref/test-comments-single.log
index c273020c0..274011843 100644
--- a/src/test/ref/test-comments-single.log
+++ b/src/test/ref/test-comments-single.log
@@ -134,39 +134,41 @@ Coalesced [15] main::b#4 ← main::b#1
 Coalesced [16] main::i#4 ← main::i#1
 Coalesced down to 2 phi equivalence classes
 Culled Empty Block (label) main::@4
+Renumbering block @2 to @1
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
-  [5] (byte) main::b#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::b#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#1 )
+  [5] (byte) main::b#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::b#1 )
   [6] (byte) sum::b#0 ← (byte) main::b#2
   [7] call sum 
   [8] (byte) sum::return#0 ← (byte) sum::return#1
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [9] (byte~) main::$0 ← (byte) sum::return#0
   [10] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0
   [11] (byte) main::i#1 ← ++ (byte) main::i#2
   [12] (byte) main::b#1 ← ++ (byte) main::b#2
   [13] if((byte) main::b#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [14] return 
   to:@return
 sum: scope:[sum]  from main::@1
@@ -233,17 +235,17 @@ INITIAL ASM
   .const a = 'a'
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -263,10 +265,10 @@ main: {
     sta b
     jmp b1
   // Do some sums
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@2->main::@1#1] -- register_copy 
     jmp b1
   //SEG17 main::@1
   b1:
@@ -278,9 +280,9 @@ main: {
   //SEG20 [8] (byte) sum::return#0 ← (byte) sum::return#1 -- vbuz1=vbuz2 
     lda sum.return_1
     sta sum.return
-    jmp b3
-  //SEG21 main::@3
-  b3:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [9] (byte~) main::$0 ← (byte) sum::return#0 -- vbuz1=vbuz2 
     lda sum.return
     sta _0
@@ -296,7 +298,7 @@ main: {
   //SEG26 [13] if((byte) main::b#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp b
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG27 main::@return
   breturn:
@@ -358,17 +360,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const a = 'a'
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -383,10 +385,10 @@ main: {
     ldx #0
     jmp b1
   // Do some sums
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@2->main::@1#1] -- register_copy 
     jmp b1
   //SEG17 main::@1
   b1:
@@ -395,9 +397,9 @@ main: {
   //SEG19 [7] call sum 
     jsr sum
   //SEG20 [8] (byte) sum::return#0 ← (byte) sum::return#1
-    jmp b3
-  //SEG21 main::@3
-  b3:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [9] (byte~) main::$0 ← (byte) sum::return#0
   //SEG23 [10] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0 -- pbuc1_derefidx_vbuyy=vbuaa 
     // Output the result on the screen
@@ -408,7 +410,7 @@ main: {
     inx
   //SEG26 [13] if((byte) main::b#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG27 main::@return
   breturn:
@@ -433,23 +435,23 @@ sum: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1_from_b3 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
-Removing instruction b1_from_b3:
+Replacing label b1_from_b2 with b1
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -462,7 +464,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -472,7 +474,7 @@ FINAL SYMBOL TABLE
 (void()) main()
 (byte~) main::$0 reg byte a 22.0
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::b
 (byte) main::b#1 reg byte x 16.5
@@ -514,11 +516,11 @@ Score: 271
   // One of the bytes used for addition
   .const a = 'a'
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 // The program entry point
@@ -529,9 +531,9 @@ main: {
   //SEG13 [5] phi (byte) main::b#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#1] -- vbuxx=vbuc1 
     ldx #0
   // Do some sums
-  //SEG14 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
-  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@3->main::@1#1] -- register_copy 
+  //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  //SEG15 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
+  //SEG16 [5] phi (byte) main::b#2 = (byte) main::b#1 [phi:main::@2->main::@1#1] -- register_copy 
   //SEG17 main::@1
   b1:
   //SEG18 [6] (byte) sum::b#0 ← (byte) main::b#2 -- vbuaa=vbuxx 
@@ -539,7 +541,7 @@ main: {
   //SEG19 [7] call sum 
     jsr sum
   //SEG20 [8] (byte) sum::return#0 ← (byte) sum::return#1
-  //SEG21 main::@3
+  //SEG21 main::@2
   //SEG22 [9] (byte~) main::$0 ← (byte) sum::return#0
   //SEG23 [10] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$0 -- pbuc1_derefidx_vbuyy=vbuaa 
     // Output the result on the screen
diff --git a/src/test/ref/test-comments-single.sym b/src/test/ref/test-comments-single.sym
index 05e1fa4d1..64b9d7113 100644
--- a/src/test/ref/test-comments-single.sym
+++ b/src/test/ref/test-comments-single.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -8,7 +8,7 @@
 (void()) main()
 (byte~) main::$0 reg byte a 22.0
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::b
 (byte) main::b#1 reg byte x 16.5
diff --git a/src/test/ref/test-comparisons-sword.asm b/src/test/ref/test-comparisons-sword.asm
index 0898d3367..9cbdab988 100644
--- a/src/test/ref/test-comparisons-sword.asm
+++ b/src/test/ref/test-comparisons-sword.asm
@@ -33,7 +33,7 @@ main: {
     sta print_char_cursor+1
     lda #0
     sta i
-  b7:
+  b2:
     lda i
     asl
     tay
@@ -43,7 +43,7 @@ main: {
     sta w1+1
     lda #0
     sta j
-  b8:
+  b3:
     lda j
     asl
     tay
@@ -52,7 +52,7 @@ main: {
     lda swords+1,y
     sta w2+1
     ldx #0
-  b9:
+  b4:
     lda w1
     sta compare.w1
     lda w1+1
@@ -61,7 +61,7 @@ main: {
     inc s
     lda #3
     cmp s
-    bne b10
+    bne b5
     jsr print_ln
     lda print_line_cursor
     sta print_char_cursor
@@ -69,19 +69,19 @@ main: {
     sta print_char_cursor+1
     lda #0
     sta s
-  b10:
+  b5:
     inx
     cpx #6
-    bne b9
+    bne b4
     inc j
     lda #3
     cmp j
-    bne b8
+    bne b3
     inc i
     cmp i
-    bne b7
-  b2:
-    jmp b2
+    bne b2
+  b1:
+    jmp b1
 }
 // Print a newline
 print_ln: {
@@ -129,45 +129,45 @@ compare: {
     cpx #EQ
     beq b5
     cpx #NE
-    bne b7
+    bne b10
     lda w1
     cmp w2
     bne !+
     lda w1+1
     cmp w2+1
-    beq b6
+    beq b9
   !:
     lda #TT
     sta r
-    jmp b33
-  b6:
+    jmp b23
+  b9:
     lda #FF
     sta r
-  b33:
+  b23:
     lda #<ops_1
     sta ops
     lda #>ops_1
     sta ops+1
-    jmp b11
-  b7:
+    jmp b6
+  b10:
     lda #FF
     sta r
     lda #<0
     sta ops
     sta ops+1
-  b11:
+  b6:
     lda w1+1
-    bmi b12
+    bmi b7
     lda #' '
     jsr print_char
-  b12:
+  b7:
     jsr print_sword
     jsr print_str
     lda w2+1
-    bmi b13
+    bmi b8
     lda #' '
     jsr print_char
-  b13:
+  b8:
     lda w2
     sta print_sword.w
     lda w2+1
@@ -179,22 +179,22 @@ compare: {
   b5:
     lda w1+1
     cmp w2+1
-    bne b8
+    bne b11
     lda w1
     cmp w2
-    bne b8
+    bne b11
     lda #TT
     sta r
-    jmp b34
-  b8:
+    jmp b24
+  b11:
     lda #FF
     sta r
-  b34:
+  b24:
     lda #<ops_2
     sta ops
     lda #>ops_2
     sta ops+1
-    jmp b11
+    jmp b6
   b4:
     lda w2
     cmp w1
@@ -204,20 +204,20 @@ compare: {
     eor #$80
   !:
     beq !e+
-    bpl b9
+    bpl b12
   !e:
     lda #TT
     sta r
-    jmp b35
-  b9:
+    jmp b25
+  b12:
     lda #FF
     sta r
-  b35:
+  b25:
     lda #<ops_3
     sta ops
     lda #>ops_3
     sta ops+1
-    jmp b11
+    jmp b6
   b3:
     lda w2
     cmp w1
@@ -226,19 +226,19 @@ compare: {
     bvc !+
     eor #$80
   !:
-    bpl b10
+    bpl b13
     lda #TT
     sta r
-    jmp b36
-  b10:
+    jmp b26
+  b13:
     lda #FF
     sta r
-  b36:
+  b26:
     lda #<ops_4
     sta ops
     lda #>ops_4
     sta ops+1
-    jmp b11
+    jmp b6
   b2:
     lda w1
     cmp w2
@@ -252,16 +252,16 @@ compare: {
   !e:
     lda #TT
     sta r
-    jmp b37
+    jmp b27
   b14:
     lda #FF
     sta r
-  b37:
+  b27:
     lda #<ops_5
     sta ops
     lda #>ops_5
     sta ops+1
-    jmp b11
+    jmp b6
   b1:
     lda w1
     cmp w2
@@ -273,16 +273,16 @@ compare: {
     bpl b15
     lda #TT
     sta r
-    jmp b38
+    jmp b28
   b15:
     lda #FF
     sta r
-  b38:
+  b28:
     lda #<ops_6
     sta ops
     lda #>ops_6
     sta ops+1
-    jmp b11
+    jmp b6
     ops_1: .text "!=@"
     ops_2: .text "==@"
     ops_3: .text ">=@"
diff --git a/src/test/ref/test-comparisons-sword.cfg b/src/test/ref/test-comparisons-sword.cfg
index 89901d11c..2df6efddf 100644
--- a/src/test/ref/test-comparisons-sword.cfg
+++ b/src/test/ref/test-comparisons-sword.cfg
@@ -1,70 +1,70 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@25
-@25: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @25
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @25
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
-  to:main::@7
-main::@7: scope:[main]  from main main::@13
-  [6] (byte*) print_line_cursor#32 ← phi( main::@13/(byte*) print_line_cursor#23 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (byte) main::s#8 ← phi( main::@13/(byte) main::s#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [6] (byte*) print_char_cursor#82 ← phi( main::@13/(byte*) print_char_cursor#75 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (byte) main::i#2 ← phi( main::@13/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@2
+main::@2: scope:[main]  from main main::@8
+  [6] (byte*) print_line_cursor#32 ← phi( main::@8/(byte*) print_line_cursor#23 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (byte) main::s#8 ← phi( main::@8/(byte) main::s#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] (byte*) print_char_cursor#82 ← phi( main::@8/(byte*) print_char_cursor#75 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (byte) main::i#2 ← phi( main::@8/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [7] (byte~) main::$1 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [8] (signed word) main::w1#0 ← *((const signed word[]) swords#0 + (byte~) main::$1)
-  to:main::@8
-main::@8: scope:[main]  from main::@12 main::@7
-  [9] (byte*) print_line_cursor#31 ← phi( main::@12/(byte*) print_line_cursor#23 main::@7/(byte*) print_line_cursor#32 )
-  [9] (byte) main::s#6 ← phi( main::@12/(byte) main::s#10 main::@7/(byte) main::s#8 )
-  [9] (byte*) print_char_cursor#76 ← phi( main::@12/(byte*) print_char_cursor#75 main::@7/(byte*) print_char_cursor#82 )
-  [9] (byte) main::j#2 ← phi( main::@12/(byte) main::j#1 main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@7
+  [9] (byte*) print_line_cursor#31 ← phi( main::@7/(byte*) print_line_cursor#23 main::@2/(byte*) print_line_cursor#32 )
+  [9] (byte) main::s#6 ← phi( main::@7/(byte) main::s#10 main::@2/(byte) main::s#8 )
+  [9] (byte*) print_char_cursor#76 ← phi( main::@7/(byte*) print_char_cursor#75 main::@2/(byte*) print_char_cursor#82 )
+  [9] (byte) main::j#2 ← phi( main::@7/(byte) main::j#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [10] (byte~) main::$2 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [11] (signed word) main::w2#0 ← *((const signed word[]) swords#0 + (byte~) main::$2)
-  to:main::@9
-main::@9: scope:[main]  from main::@10 main::@8
-  [12] (byte*) print_line_cursor#19 ← phi( main::@10/(byte*) print_line_cursor#23 main::@8/(byte*) print_line_cursor#31 )
-  [12] (byte) main::s#3 ← phi( main::@10/(byte) main::s#10 main::@8/(byte) main::s#6 )
-  [12] (byte*) print_char_cursor#67 ← phi( main::@10/(byte*) print_char_cursor#75 main::@8/(byte*) print_char_cursor#76 )
-  [12] (byte) main::op#2 ← phi( main::@10/(byte) main::op#1 main::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@5
+  [12] (byte*) print_line_cursor#19 ← phi( main::@5/(byte*) print_line_cursor#23 main::@3/(byte*) print_line_cursor#31 )
+  [12] (byte) main::s#3 ← phi( main::@5/(byte) main::s#10 main::@3/(byte) main::s#6 )
+  [12] (byte*) print_char_cursor#67 ← phi( main::@5/(byte*) print_char_cursor#75 main::@3/(byte*) print_char_cursor#76 )
+  [12] (byte) main::op#2 ← phi( main::@5/(byte) main::op#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [13] (signed word) compare::w1#0 ← (signed word) main::w1#0
   [14] (signed word) compare::w2#0 ← (signed word) main::w2#0
   [15] (byte) compare::op#0 ← (byte) main::op#2
   [16] call compare 
-  to:main::@16
-main::@16: scope:[main]  from main::@9
+  to:main::@9
+main::@9: scope:[main]  from main::@4
   [17] (byte) main::s#1 ← ++ (byte) main::s#3
-  [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@10
-  to:main::@11
-main::@11: scope:[main]  from main::@16
+  [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@9
   [19] phi()
   [20] call print_ln 
   [21] (byte*~) print_char_cursor#116 ← (byte*) print_line_cursor#1
-  to:main::@10
-main::@10: scope:[main]  from main::@11 main::@16
-  [22] (byte*) print_line_cursor#23 ← phi( main::@16/(byte*) print_line_cursor#19 main::@11/(byte*) print_line_cursor#1 )
-  [22] (byte) main::s#10 ← phi( main::@16/(byte) main::s#1 main::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [22] (byte*) print_char_cursor#75 ← phi( main::@16/(byte*) print_char_cursor#14 main::@11/(byte*~) print_char_cursor#116 )
+  to:main::@5
+main::@5: scope:[main]  from main::@6 main::@9
+  [22] (byte*) print_line_cursor#23 ← phi( main::@9/(byte*) print_line_cursor#19 main::@6/(byte*) print_line_cursor#1 )
+  [22] (byte) main::s#10 ← phi( main::@9/(byte) main::s#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [22] (byte*) print_char_cursor#75 ← phi( main::@9/(byte*) print_char_cursor#14 main::@6/(byte*~) print_char_cursor#116 )
   [23] (byte) main::op#1 ← ++ (byte) main::op#2
-  [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@9
-  to:main::@12
-main::@12: scope:[main]  from main::@10
+  [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@4
+  to:main::@7
+main::@7: scope:[main]  from main::@5
   [25] (byte) main::j#1 ← ++ (byte) main::j#2
-  [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@8
-  to:main::@13
-main::@13: scope:[main]  from main::@12
+  [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [27] (byte) main::i#1 ← ++ (byte) main::i#2
-  [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@7
-  to:main::@2
-main::@2: scope:[main]  from main::@13 main::@2
+  [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@1 main::@8
   [29] phi()
-  to:main::@2
-print_ln: scope:[print_ln]  from main::@11
+  to:main::@1
+print_ln: scope:[print_ln]  from main::@6
   [30] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -75,139 +75,139 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [34] return 
   to:@return
-compare: scope:[compare]  from main::@9
+compare: scope:[compare]  from main::@4
   [35] if((byte) compare::op#0==(const byte) LT#0) goto compare::@1
-  to:compare::@14
-compare::@14: scope:[compare]  from compare
+  to:compare::@9
+compare::@9: scope:[compare]  from compare
   [36] if((byte) compare::op#0==(const byte) LE#0) goto compare::@2
+  to:compare::@10
+compare::@10: scope:[compare]  from compare::@9
+  [37] if((byte) compare::op#0==(const byte) GT#0) goto compare::@3
+  to:compare::@11
+compare::@11: scope:[compare]  from compare::@10
+  [38] if((byte) compare::op#0==(const byte) GE#0) goto compare::@4
+  to:compare::@12
+compare::@12: scope:[compare]  from compare::@11
+  [39] if((byte) compare::op#0==(const byte) EQ#0) goto compare::@5
+  to:compare::@13
+compare::@13: scope:[compare]  from compare::@12
+  [40] if((byte) compare::op#0!=(const byte) NE#0) goto compare::@6
+  to:compare::@14
+compare::@14: scope:[compare]  from compare::@13
+  [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@23
   to:compare::@15
 compare::@15: scope:[compare]  from compare::@14
-  [37] if((byte) compare::op#0==(const byte) GT#0) goto compare::@3
-  to:compare::@16
-compare::@16: scope:[compare]  from compare::@15
-  [38] if((byte) compare::op#0==(const byte) GE#0) goto compare::@4
-  to:compare::@17
-compare::@17: scope:[compare]  from compare::@16
-  [39] if((byte) compare::op#0==(const byte) EQ#0) goto compare::@5
-  to:compare::@18
-compare::@18: scope:[compare]  from compare::@17
-  [40] if((byte) compare::op#0!=(const byte) NE#0) goto compare::@11
-  to:compare::@19
-compare::@19: scope:[compare]  from compare::@18
-  [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@33
-  to:compare::@20
-compare::@20: scope:[compare]  from compare::@19
   [42] phi()
-  to:compare::@33
-compare::@33: scope:[compare]  from compare::@19 compare::@20
-  [43] (byte) compare::r#16 ← phi( compare::@19/(const byte) FF#0 compare::@20/(const byte) TT#0 )
-  to:compare::@11
-compare::@11: scope:[compare]  from compare::@18 compare::@33 compare::@34 compare::@35 compare::@36 compare::@37 compare::@38
-  [44] (byte) compare::r#10 ← phi( compare::@33/(byte) compare::r#16 compare::@34/(byte) compare::r#17 compare::@35/(byte) compare::r#18 compare::@36/(byte) compare::r#19 compare::@37/(byte) compare::r#20 compare::@38/(byte) compare::r#21 compare::@18/(const byte) FF#0 )
-  [44] (byte*) compare::ops#10 ← phi( compare::@33/(const byte*) compare::ops#1 compare::@34/(const byte*) compare::ops#2 compare::@35/(const byte*) compare::ops#3 compare::@36/(const byte*) compare::ops#4 compare::@37/(const byte*) compare::ops#5 compare::@38/(const byte*) compare::ops#6 compare::@18/(byte*) 0 )
-  [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@12
-  to:compare::@31
-compare::@31: scope:[compare]  from compare::@11
+  to:compare::@23
+compare::@23: scope:[compare]  from compare::@14 compare::@15
+  [43] (byte) compare::r#16 ← phi( compare::@14/(const byte) FF#0 compare::@15/(const byte) TT#0 )
+  to:compare::@6
+compare::@6: scope:[compare]  from compare::@13 compare::@23 compare::@24 compare::@25 compare::@26 compare::@27 compare::@28
+  [44] (byte) compare::r#10 ← phi( compare::@23/(byte) compare::r#16 compare::@24/(byte) compare::r#17 compare::@25/(byte) compare::r#18 compare::@26/(byte) compare::r#19 compare::@27/(byte) compare::r#20 compare::@28/(byte) compare::r#21 compare::@13/(const byte) FF#0 )
+  [44] (byte*) compare::ops#10 ← phi( compare::@23/(const byte*) compare::ops#1 compare::@24/(const byte*) compare::ops#2 compare::@25/(const byte*) compare::ops#3 compare::@26/(const byte*) compare::ops#4 compare::@27/(const byte*) compare::ops#5 compare::@28/(const byte*) compare::ops#6 compare::@13/(byte*) 0 )
+  [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@7
+  to:compare::@21
+compare::@21: scope:[compare]  from compare::@6
   [46] phi()
   [47] call print_char 
-  to:compare::@12
-compare::@12: scope:[compare]  from compare::@11 compare::@31
-  [48] (byte*) print_char_cursor#70 ← phi( compare::@11/(byte*) print_char_cursor#67 compare::@31/(byte*) print_char_cursor#14 )
+  to:compare::@7
+compare::@7: scope:[compare]  from compare::@21 compare::@6
+  [48] (byte*) print_char_cursor#70 ← phi( compare::@6/(byte*) print_char_cursor#67 compare::@21/(byte*) print_char_cursor#14 )
   [49] (signed word) print_sword::w#1 ← (signed word) compare::w1#0
   [50] call print_sword 
-  to:compare::@39
-compare::@39: scope:[compare]  from compare::@12
+  to:compare::@29
+compare::@29: scope:[compare]  from compare::@7
   [51] (byte*) print_str::str#1 ← (byte*) compare::ops#10
   [52] call print_str 
-  to:compare::@40
-compare::@40: scope:[compare]  from compare::@39
-  [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@13
-  to:compare::@32
-compare::@32: scope:[compare]  from compare::@40
+  to:compare::@30
+compare::@30: scope:[compare]  from compare::@29
+  [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@8
+  to:compare::@22
+compare::@22: scope:[compare]  from compare::@30
   [54] phi()
   [55] call print_char 
-  to:compare::@13
-compare::@13: scope:[compare]  from compare::@32 compare::@40
-  [56] (byte*) print_char_cursor#71 ← phi( compare::@40/(byte*) print_char_cursor#2 compare::@32/(byte*) print_char_cursor#14 )
+  to:compare::@8
+compare::@8: scope:[compare]  from compare::@22 compare::@30
+  [56] (byte*) print_char_cursor#71 ← phi( compare::@30/(byte*) print_char_cursor#2 compare::@22/(byte*) print_char_cursor#14 )
   [57] (signed word) print_sword::w#2 ← (signed word) compare::w2#0
   [58] call print_sword 
-  to:compare::@42
-compare::@42: scope:[compare]  from compare::@13
+  to:compare::@31
+compare::@31: scope:[compare]  from compare::@8
   [59] (byte) print_char::ch#4 ← (byte) compare::r#10
   [60] call print_char 
   to:compare::@return
-compare::@return: scope:[compare]  from compare::@42
+compare::@return: scope:[compare]  from compare::@31
   [61] return 
   to:@return
-compare::@5: scope:[compare]  from compare::@17
-  [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@34
-  to:compare::@22
-compare::@22: scope:[compare]  from compare::@5
+compare::@5: scope:[compare]  from compare::@12
+  [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@24
+  to:compare::@16
+compare::@16: scope:[compare]  from compare::@5
   [63] phi()
-  to:compare::@34
-compare::@34: scope:[compare]  from compare::@22 compare::@5
-  [64] (byte) compare::r#17 ← phi( compare::@22/(const byte) TT#0 compare::@5/(const byte) FF#0 )
-  to:compare::@11
-compare::@4: scope:[compare]  from compare::@16
-  [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@35
   to:compare::@24
-compare::@24: scope:[compare]  from compare::@4
+compare::@24: scope:[compare]  from compare::@16 compare::@5
+  [64] (byte) compare::r#17 ← phi( compare::@16/(const byte) TT#0 compare::@5/(const byte) FF#0 )
+  to:compare::@6
+compare::@4: scope:[compare]  from compare::@11
+  [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@25
+  to:compare::@17
+compare::@17: scope:[compare]  from compare::@4
   [66] phi()
-  to:compare::@35
-compare::@35: scope:[compare]  from compare::@24 compare::@4
-  [67] (byte) compare::r#18 ← phi( compare::@24/(const byte) TT#0 compare::@4/(const byte) FF#0 )
-  to:compare::@11
-compare::@3: scope:[compare]  from compare::@15
-  [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@36
-  to:compare::@26
-compare::@26: scope:[compare]  from compare::@3
+  to:compare::@25
+compare::@25: scope:[compare]  from compare::@17 compare::@4
+  [67] (byte) compare::r#18 ← phi( compare::@17/(const byte) TT#0 compare::@4/(const byte) FF#0 )
+  to:compare::@6
+compare::@3: scope:[compare]  from compare::@10
+  [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@26
+  to:compare::@18
+compare::@18: scope:[compare]  from compare::@3
   [69] phi()
-  to:compare::@36
-compare::@36: scope:[compare]  from compare::@26 compare::@3
-  [70] (byte) compare::r#19 ← phi( compare::@26/(const byte) TT#0 compare::@3/(const byte) FF#0 )
-  to:compare::@11
-compare::@2: scope:[compare]  from compare::@14
-  [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@37
-  to:compare::@28
-compare::@28: scope:[compare]  from compare::@2
+  to:compare::@26
+compare::@26: scope:[compare]  from compare::@18 compare::@3
+  [70] (byte) compare::r#19 ← phi( compare::@18/(const byte) TT#0 compare::@3/(const byte) FF#0 )
+  to:compare::@6
+compare::@2: scope:[compare]  from compare::@9
+  [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@27
+  to:compare::@19
+compare::@19: scope:[compare]  from compare::@2
   [72] phi()
-  to:compare::@37
-compare::@37: scope:[compare]  from compare::@2 compare::@28
-  [73] (byte) compare::r#20 ← phi( compare::@2/(const byte) FF#0 compare::@28/(const byte) TT#0 )
-  to:compare::@11
+  to:compare::@27
+compare::@27: scope:[compare]  from compare::@19 compare::@2
+  [73] (byte) compare::r#20 ← phi( compare::@2/(const byte) FF#0 compare::@19/(const byte) TT#0 )
+  to:compare::@6
 compare::@1: scope:[compare]  from compare
-  [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@38
-  to:compare::@30
-compare::@30: scope:[compare]  from compare::@1
+  [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@28
+  to:compare::@20
+compare::@20: scope:[compare]  from compare::@1
   [75] phi()
-  to:compare::@38
-compare::@38: scope:[compare]  from compare::@1 compare::@30
-  [76] (byte) compare::r#21 ← phi( compare::@1/(const byte) FF#0 compare::@30/(const byte) TT#0 )
-  to:compare::@11
-print_char: scope:[print_char]  from compare::@31 compare::@32 compare::@42 print_byte print_byte::@1 print_sword::@2
-  [77] (byte*) print_char_cursor#43 ← phi( compare::@31/(byte*) print_char_cursor#67 compare::@32/(byte*) print_char_cursor#2 compare::@42/(byte*) print_char_cursor#14 print_byte/(byte*) print_char_cursor#63 print_byte::@1/(byte*) print_char_cursor#14 print_sword::@2/(byte*) print_char_cursor#61 )
-  [77] (byte) print_char::ch#6 ← phi( compare::@31/(byte) ' ' compare::@32/(byte) ' ' compare::@42/(byte) print_char::ch#4 print_byte/(byte) print_char::ch#1 print_byte::@1/(byte) print_char::ch#2 print_sword::@2/(byte) '-' )
+  to:compare::@28
+compare::@28: scope:[compare]  from compare::@1 compare::@20
+  [76] (byte) compare::r#21 ← phi( compare::@1/(const byte) FF#0 compare::@20/(const byte) TT#0 )
+  to:compare::@6
+print_char: scope:[print_char]  from compare::@21 compare::@22 compare::@31 print_byte print_byte::@1 print_sword::@2
+  [77] (byte*) print_char_cursor#43 ← phi( compare::@21/(byte*) print_char_cursor#67 compare::@22/(byte*) print_char_cursor#2 compare::@31/(byte*) print_char_cursor#14 print_byte/(byte*) print_char_cursor#63 print_byte::@1/(byte*) print_char_cursor#14 print_sword::@2/(byte*) print_char_cursor#61 )
+  [77] (byte) print_char::ch#6 ← phi( compare::@21/(byte) ' ' compare::@22/(byte) ' ' compare::@31/(byte) print_char::ch#4 print_byte/(byte) print_char::ch#1 print_byte::@1/(byte) print_char::ch#2 print_sword::@2/(byte) '-' )
   [78] *((byte*) print_char_cursor#43) ← (byte) print_char::ch#6
   [79] (byte*) print_char_cursor#14 ← ++ (byte*) print_char_cursor#43
   to:print_char::@return
 print_char::@return: scope:[print_char]  from print_char
   [80] return 
   to:@return
-print_sword: scope:[print_sword]  from compare::@12 compare::@13
-  [81] (byte*) print_char_cursor#61 ← phi( compare::@12/(byte*) print_char_cursor#70 compare::@13/(byte*) print_char_cursor#71 )
-  [81] (signed word) print_sword::w#3 ← phi( compare::@12/(signed word) print_sword::w#1 compare::@13/(signed word) print_sword::w#2 )
+print_sword: scope:[print_sword]  from compare::@7 compare::@8
+  [81] (byte*) print_char_cursor#61 ← phi( compare::@7/(byte*) print_char_cursor#70 compare::@8/(byte*) print_char_cursor#71 )
+  [81] (signed word) print_sword::w#3 ← phi( compare::@7/(signed word) print_sword::w#1 compare::@8/(signed word) print_sword::w#2 )
   [82] if((signed word) print_sword::w#3>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sword::@1
   to:print_sword::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [83] phi()
   [84] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [85] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [86] (byte*) print_char_cursor#60 ← phi( print_sword/(byte*) print_char_cursor#61 print_sword::@4/(byte*) print_char_cursor#14 )
-  [86] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [86] (byte*) print_char_cursor#60 ← phi( print_sword/(byte*) print_char_cursor#61 print_sword::@3/(byte*) print_char_cursor#14 )
+  [86] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@3/(signed word) print_sword::w#0 )
   [87] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
@@ -239,7 +239,7 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [101] return 
   to:@return
-print_str: scope:[print_str]  from compare::@39
+print_str: scope:[print_str]  from compare::@29
   [102] phi()
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
diff --git a/src/test/ref/test-comparisons-sword.log b/src/test/ref/test-comparisons-sword.log
index e9b2ed7a0..1024a01d6 100644
--- a/src/test/ref/test-comparisons-sword.log
+++ b/src/test/ref/test-comparisons-sword.log
@@ -1901,21 +1901,58 @@ Culled Empty Block (label) compare::@46
 Culled Empty Block (label) compare::@45
 Culled Empty Block (label) print_sword::@5
 Culled Empty Block (label) print_cls::@3
+Renumbering block @25 to @1
+Renumbering block print_sword::@4 to print_sword::@3
+Renumbering block main::@2 to main::@1
+Renumbering block main::@7 to main::@2
+Renumbering block main::@8 to main::@3
+Renumbering block main::@9 to main::@4
+Renumbering block main::@10 to main::@5
+Renumbering block main::@11 to main::@6
+Renumbering block main::@12 to main::@7
+Renumbering block main::@13 to main::@8
+Renumbering block main::@16 to main::@9
+Renumbering block compare::@11 to compare::@6
+Renumbering block compare::@12 to compare::@7
+Renumbering block compare::@13 to compare::@8
+Renumbering block compare::@14 to compare::@9
+Renumbering block compare::@15 to compare::@10
+Renumbering block compare::@16 to compare::@11
+Renumbering block compare::@17 to compare::@12
+Renumbering block compare::@18 to compare::@13
+Renumbering block compare::@19 to compare::@14
+Renumbering block compare::@20 to compare::@15
+Renumbering block compare::@22 to compare::@16
+Renumbering block compare::@24 to compare::@17
+Renumbering block compare::@26 to compare::@18
+Renumbering block compare::@28 to compare::@19
+Renumbering block compare::@30 to compare::@20
+Renumbering block compare::@31 to compare::@21
+Renumbering block compare::@32 to compare::@22
+Renumbering block compare::@33 to compare::@23
+Renumbering block compare::@34 to compare::@24
+Renumbering block compare::@35 to compare::@25
+Renumbering block compare::@36 to compare::@26
+Renumbering block compare::@37 to compare::@27
+Renumbering block compare::@38 to compare::@28
+Renumbering block compare::@39 to compare::@29
+Renumbering block compare::@40 to compare::@30
+Renumbering block compare::@42 to compare::@31
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @25
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@11
-Adding NOP phi() at start of main::@2
+Adding NOP phi() at start of main::@6
+Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of print_ln
-Adding NOP phi() at start of compare::@20
-Adding NOP phi() at start of compare::@31
-Adding NOP phi() at start of compare::@32
+Adding NOP phi() at start of compare::@15
+Adding NOP phi() at start of compare::@21
 Adding NOP phi() at start of compare::@22
-Adding NOP phi() at start of compare::@24
-Adding NOP phi() at start of compare::@26
-Adding NOP phi() at start of compare::@28
-Adding NOP phi() at start of compare::@30
+Adding NOP phi() at start of compare::@16
+Adding NOP phi() at start of compare::@17
+Adding NOP phi() at start of compare::@18
+Adding NOP phi() at start of compare::@19
+Adding NOP phi() at start of compare::@20
 Adding NOP phi() at start of print_sword::@2
 Adding NOP phi() at start of print_str
 Adding NOP phi() at start of print_cls
@@ -1923,71 +1960,71 @@ Adding NOP phi() at start of print_cls
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@25
-@25: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @25
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @25
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
-  to:main::@7
-main::@7: scope:[main]  from main main::@13
-  [6] (byte*) print_line_cursor#32 ← phi( main::@13/(byte*) print_line_cursor#23 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (byte) main::s#8 ← phi( main::@13/(byte) main::s#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [6] (byte*) print_char_cursor#82 ← phi( main::@13/(byte*) print_char_cursor#75 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (byte) main::i#2 ← phi( main::@13/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@2
+main::@2: scope:[main]  from main main::@8
+  [6] (byte*) print_line_cursor#32 ← phi( main::@8/(byte*) print_line_cursor#23 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (byte) main::s#8 ← phi( main::@8/(byte) main::s#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] (byte*) print_char_cursor#82 ← phi( main::@8/(byte*) print_char_cursor#75 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (byte) main::i#2 ← phi( main::@8/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [7] (byte~) main::$1 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [8] (signed word) main::w1#0 ← *((const signed word[]) swords#0 + (byte~) main::$1)
-  to:main::@8
-main::@8: scope:[main]  from main::@12 main::@7
-  [9] (byte*) print_line_cursor#31 ← phi( main::@12/(byte*) print_line_cursor#23 main::@7/(byte*) print_line_cursor#32 )
-  [9] (byte) main::s#6 ← phi( main::@12/(byte) main::s#10 main::@7/(byte) main::s#8 )
-  [9] (byte*) print_char_cursor#76 ← phi( main::@12/(byte*) print_char_cursor#75 main::@7/(byte*) print_char_cursor#82 )
-  [9] (byte) main::j#2 ← phi( main::@12/(byte) main::j#1 main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@7
+  [9] (byte*) print_line_cursor#31 ← phi( main::@7/(byte*) print_line_cursor#23 main::@2/(byte*) print_line_cursor#32 )
+  [9] (byte) main::s#6 ← phi( main::@7/(byte) main::s#10 main::@2/(byte) main::s#8 )
+  [9] (byte*) print_char_cursor#76 ← phi( main::@7/(byte*) print_char_cursor#75 main::@2/(byte*) print_char_cursor#82 )
+  [9] (byte) main::j#2 ← phi( main::@7/(byte) main::j#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [10] (byte~) main::$2 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [11] (signed word) main::w2#0 ← *((const signed word[]) swords#0 + (byte~) main::$2)
-  to:main::@9
-main::@9: scope:[main]  from main::@10 main::@8
-  [12] (byte*) print_line_cursor#19 ← phi( main::@10/(byte*) print_line_cursor#23 main::@8/(byte*) print_line_cursor#31 )
-  [12] (byte) main::s#3 ← phi( main::@10/(byte) main::s#10 main::@8/(byte) main::s#6 )
-  [12] (byte*) print_char_cursor#67 ← phi( main::@10/(byte*) print_char_cursor#75 main::@8/(byte*) print_char_cursor#76 )
-  [12] (byte) main::op#2 ← phi( main::@10/(byte) main::op#1 main::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@5
+  [12] (byte*) print_line_cursor#19 ← phi( main::@5/(byte*) print_line_cursor#23 main::@3/(byte*) print_line_cursor#31 )
+  [12] (byte) main::s#3 ← phi( main::@5/(byte) main::s#10 main::@3/(byte) main::s#6 )
+  [12] (byte*) print_char_cursor#67 ← phi( main::@5/(byte*) print_char_cursor#75 main::@3/(byte*) print_char_cursor#76 )
+  [12] (byte) main::op#2 ← phi( main::@5/(byte) main::op#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [13] (signed word) compare::w1#0 ← (signed word) main::w1#0
   [14] (signed word) compare::w2#0 ← (signed word) main::w2#0
   [15] (byte) compare::op#0 ← (byte) main::op#2
   [16] call compare 
-  to:main::@16
-main::@16: scope:[main]  from main::@9
+  to:main::@9
+main::@9: scope:[main]  from main::@4
   [17] (byte) main::s#1 ← ++ (byte) main::s#3
-  [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@10
-  to:main::@11
-main::@11: scope:[main]  from main::@16
+  [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@9
   [19] phi()
   [20] call print_ln 
   [21] (byte*~) print_char_cursor#116 ← (byte*) print_line_cursor#1
-  to:main::@10
-main::@10: scope:[main]  from main::@11 main::@16
-  [22] (byte*) print_line_cursor#23 ← phi( main::@16/(byte*) print_line_cursor#19 main::@11/(byte*) print_line_cursor#1 )
-  [22] (byte) main::s#10 ← phi( main::@16/(byte) main::s#1 main::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [22] (byte*) print_char_cursor#75 ← phi( main::@16/(byte*) print_char_cursor#14 main::@11/(byte*~) print_char_cursor#116 )
+  to:main::@5
+main::@5: scope:[main]  from main::@6 main::@9
+  [22] (byte*) print_line_cursor#23 ← phi( main::@9/(byte*) print_line_cursor#19 main::@6/(byte*) print_line_cursor#1 )
+  [22] (byte) main::s#10 ← phi( main::@9/(byte) main::s#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [22] (byte*) print_char_cursor#75 ← phi( main::@9/(byte*) print_char_cursor#14 main::@6/(byte*~) print_char_cursor#116 )
   [23] (byte) main::op#1 ← ++ (byte) main::op#2
-  [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@9
-  to:main::@12
-main::@12: scope:[main]  from main::@10
+  [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@4
+  to:main::@7
+main::@7: scope:[main]  from main::@5
   [25] (byte) main::j#1 ← ++ (byte) main::j#2
-  [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@8
-  to:main::@13
-main::@13: scope:[main]  from main::@12
+  [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [27] (byte) main::i#1 ← ++ (byte) main::i#2
-  [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@7
-  to:main::@2
-main::@2: scope:[main]  from main::@13 main::@2
+  [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@1 main::@8
   [29] phi()
-  to:main::@2
-print_ln: scope:[print_ln]  from main::@11
+  to:main::@1
+print_ln: scope:[print_ln]  from main::@6
   [30] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -1998,139 +2035,139 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [34] return 
   to:@return
-compare: scope:[compare]  from main::@9
+compare: scope:[compare]  from main::@4
   [35] if((byte) compare::op#0==(const byte) LT#0) goto compare::@1
-  to:compare::@14
-compare::@14: scope:[compare]  from compare
+  to:compare::@9
+compare::@9: scope:[compare]  from compare
   [36] if((byte) compare::op#0==(const byte) LE#0) goto compare::@2
+  to:compare::@10
+compare::@10: scope:[compare]  from compare::@9
+  [37] if((byte) compare::op#0==(const byte) GT#0) goto compare::@3
+  to:compare::@11
+compare::@11: scope:[compare]  from compare::@10
+  [38] if((byte) compare::op#0==(const byte) GE#0) goto compare::@4
+  to:compare::@12
+compare::@12: scope:[compare]  from compare::@11
+  [39] if((byte) compare::op#0==(const byte) EQ#0) goto compare::@5
+  to:compare::@13
+compare::@13: scope:[compare]  from compare::@12
+  [40] if((byte) compare::op#0!=(const byte) NE#0) goto compare::@6
+  to:compare::@14
+compare::@14: scope:[compare]  from compare::@13
+  [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@23
   to:compare::@15
 compare::@15: scope:[compare]  from compare::@14
-  [37] if((byte) compare::op#0==(const byte) GT#0) goto compare::@3
-  to:compare::@16
-compare::@16: scope:[compare]  from compare::@15
-  [38] if((byte) compare::op#0==(const byte) GE#0) goto compare::@4
-  to:compare::@17
-compare::@17: scope:[compare]  from compare::@16
-  [39] if((byte) compare::op#0==(const byte) EQ#0) goto compare::@5
-  to:compare::@18
-compare::@18: scope:[compare]  from compare::@17
-  [40] if((byte) compare::op#0!=(const byte) NE#0) goto compare::@11
-  to:compare::@19
-compare::@19: scope:[compare]  from compare::@18
-  [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@33
-  to:compare::@20
-compare::@20: scope:[compare]  from compare::@19
   [42] phi()
-  to:compare::@33
-compare::@33: scope:[compare]  from compare::@19 compare::@20
-  [43] (byte) compare::r#16 ← phi( compare::@19/(const byte) FF#0 compare::@20/(const byte) TT#0 )
-  to:compare::@11
-compare::@11: scope:[compare]  from compare::@18 compare::@33 compare::@34 compare::@35 compare::@36 compare::@37 compare::@38
-  [44] (byte) compare::r#10 ← phi( compare::@33/(byte) compare::r#16 compare::@34/(byte) compare::r#17 compare::@35/(byte) compare::r#18 compare::@36/(byte) compare::r#19 compare::@37/(byte) compare::r#20 compare::@38/(byte) compare::r#21 compare::@18/(const byte) FF#0 )
-  [44] (byte*) compare::ops#10 ← phi( compare::@33/(const byte*) compare::ops#1 compare::@34/(const byte*) compare::ops#2 compare::@35/(const byte*) compare::ops#3 compare::@36/(const byte*) compare::ops#4 compare::@37/(const byte*) compare::ops#5 compare::@38/(const byte*) compare::ops#6 compare::@18/(byte*) 0 )
-  [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@12
-  to:compare::@31
-compare::@31: scope:[compare]  from compare::@11
+  to:compare::@23
+compare::@23: scope:[compare]  from compare::@14 compare::@15
+  [43] (byte) compare::r#16 ← phi( compare::@14/(const byte) FF#0 compare::@15/(const byte) TT#0 )
+  to:compare::@6
+compare::@6: scope:[compare]  from compare::@13 compare::@23 compare::@24 compare::@25 compare::@26 compare::@27 compare::@28
+  [44] (byte) compare::r#10 ← phi( compare::@23/(byte) compare::r#16 compare::@24/(byte) compare::r#17 compare::@25/(byte) compare::r#18 compare::@26/(byte) compare::r#19 compare::@27/(byte) compare::r#20 compare::@28/(byte) compare::r#21 compare::@13/(const byte) FF#0 )
+  [44] (byte*) compare::ops#10 ← phi( compare::@23/(const byte*) compare::ops#1 compare::@24/(const byte*) compare::ops#2 compare::@25/(const byte*) compare::ops#3 compare::@26/(const byte*) compare::ops#4 compare::@27/(const byte*) compare::ops#5 compare::@28/(const byte*) compare::ops#6 compare::@13/(byte*) 0 )
+  [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@7
+  to:compare::@21
+compare::@21: scope:[compare]  from compare::@6
   [46] phi()
   [47] call print_char 
-  to:compare::@12
-compare::@12: scope:[compare]  from compare::@11 compare::@31
-  [48] (byte*) print_char_cursor#70 ← phi( compare::@11/(byte*) print_char_cursor#67 compare::@31/(byte*) print_char_cursor#14 )
+  to:compare::@7
+compare::@7: scope:[compare]  from compare::@21 compare::@6
+  [48] (byte*) print_char_cursor#70 ← phi( compare::@6/(byte*) print_char_cursor#67 compare::@21/(byte*) print_char_cursor#14 )
   [49] (signed word) print_sword::w#1 ← (signed word) compare::w1#0
   [50] call print_sword 
-  to:compare::@39
-compare::@39: scope:[compare]  from compare::@12
+  to:compare::@29
+compare::@29: scope:[compare]  from compare::@7
   [51] (byte*) print_str::str#1 ← (byte*) compare::ops#10
   [52] call print_str 
-  to:compare::@40
-compare::@40: scope:[compare]  from compare::@39
-  [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@13
-  to:compare::@32
-compare::@32: scope:[compare]  from compare::@40
+  to:compare::@30
+compare::@30: scope:[compare]  from compare::@29
+  [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@8
+  to:compare::@22
+compare::@22: scope:[compare]  from compare::@30
   [54] phi()
   [55] call print_char 
-  to:compare::@13
-compare::@13: scope:[compare]  from compare::@32 compare::@40
-  [56] (byte*) print_char_cursor#71 ← phi( compare::@40/(byte*) print_char_cursor#2 compare::@32/(byte*) print_char_cursor#14 )
+  to:compare::@8
+compare::@8: scope:[compare]  from compare::@22 compare::@30
+  [56] (byte*) print_char_cursor#71 ← phi( compare::@30/(byte*) print_char_cursor#2 compare::@22/(byte*) print_char_cursor#14 )
   [57] (signed word) print_sword::w#2 ← (signed word) compare::w2#0
   [58] call print_sword 
-  to:compare::@42
-compare::@42: scope:[compare]  from compare::@13
+  to:compare::@31
+compare::@31: scope:[compare]  from compare::@8
   [59] (byte) print_char::ch#4 ← (byte) compare::r#10
   [60] call print_char 
   to:compare::@return
-compare::@return: scope:[compare]  from compare::@42
+compare::@return: scope:[compare]  from compare::@31
   [61] return 
   to:@return
-compare::@5: scope:[compare]  from compare::@17
-  [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@34
-  to:compare::@22
-compare::@22: scope:[compare]  from compare::@5
+compare::@5: scope:[compare]  from compare::@12
+  [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@24
+  to:compare::@16
+compare::@16: scope:[compare]  from compare::@5
   [63] phi()
-  to:compare::@34
-compare::@34: scope:[compare]  from compare::@22 compare::@5
-  [64] (byte) compare::r#17 ← phi( compare::@22/(const byte) TT#0 compare::@5/(const byte) FF#0 )
-  to:compare::@11
-compare::@4: scope:[compare]  from compare::@16
-  [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@35
   to:compare::@24
-compare::@24: scope:[compare]  from compare::@4
+compare::@24: scope:[compare]  from compare::@16 compare::@5
+  [64] (byte) compare::r#17 ← phi( compare::@16/(const byte) TT#0 compare::@5/(const byte) FF#0 )
+  to:compare::@6
+compare::@4: scope:[compare]  from compare::@11
+  [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@25
+  to:compare::@17
+compare::@17: scope:[compare]  from compare::@4
   [66] phi()
-  to:compare::@35
-compare::@35: scope:[compare]  from compare::@24 compare::@4
-  [67] (byte) compare::r#18 ← phi( compare::@24/(const byte) TT#0 compare::@4/(const byte) FF#0 )
-  to:compare::@11
-compare::@3: scope:[compare]  from compare::@15
-  [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@36
-  to:compare::@26
-compare::@26: scope:[compare]  from compare::@3
+  to:compare::@25
+compare::@25: scope:[compare]  from compare::@17 compare::@4
+  [67] (byte) compare::r#18 ← phi( compare::@17/(const byte) TT#0 compare::@4/(const byte) FF#0 )
+  to:compare::@6
+compare::@3: scope:[compare]  from compare::@10
+  [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@26
+  to:compare::@18
+compare::@18: scope:[compare]  from compare::@3
   [69] phi()
-  to:compare::@36
-compare::@36: scope:[compare]  from compare::@26 compare::@3
-  [70] (byte) compare::r#19 ← phi( compare::@26/(const byte) TT#0 compare::@3/(const byte) FF#0 )
-  to:compare::@11
-compare::@2: scope:[compare]  from compare::@14
-  [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@37
-  to:compare::@28
-compare::@28: scope:[compare]  from compare::@2
+  to:compare::@26
+compare::@26: scope:[compare]  from compare::@18 compare::@3
+  [70] (byte) compare::r#19 ← phi( compare::@18/(const byte) TT#0 compare::@3/(const byte) FF#0 )
+  to:compare::@6
+compare::@2: scope:[compare]  from compare::@9
+  [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@27
+  to:compare::@19
+compare::@19: scope:[compare]  from compare::@2
   [72] phi()
-  to:compare::@37
-compare::@37: scope:[compare]  from compare::@2 compare::@28
-  [73] (byte) compare::r#20 ← phi( compare::@2/(const byte) FF#0 compare::@28/(const byte) TT#0 )
-  to:compare::@11
+  to:compare::@27
+compare::@27: scope:[compare]  from compare::@19 compare::@2
+  [73] (byte) compare::r#20 ← phi( compare::@2/(const byte) FF#0 compare::@19/(const byte) TT#0 )
+  to:compare::@6
 compare::@1: scope:[compare]  from compare
-  [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@38
-  to:compare::@30
-compare::@30: scope:[compare]  from compare::@1
+  [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@28
+  to:compare::@20
+compare::@20: scope:[compare]  from compare::@1
   [75] phi()
-  to:compare::@38
-compare::@38: scope:[compare]  from compare::@1 compare::@30
-  [76] (byte) compare::r#21 ← phi( compare::@1/(const byte) FF#0 compare::@30/(const byte) TT#0 )
-  to:compare::@11
-print_char: scope:[print_char]  from compare::@31 compare::@32 compare::@42 print_byte print_byte::@1 print_sword::@2
-  [77] (byte*) print_char_cursor#43 ← phi( compare::@31/(byte*) print_char_cursor#67 compare::@32/(byte*) print_char_cursor#2 compare::@42/(byte*) print_char_cursor#14 print_byte/(byte*) print_char_cursor#63 print_byte::@1/(byte*) print_char_cursor#14 print_sword::@2/(byte*) print_char_cursor#61 )
-  [77] (byte) print_char::ch#6 ← phi( compare::@31/(byte) ' ' compare::@32/(byte) ' ' compare::@42/(byte) print_char::ch#4 print_byte/(byte) print_char::ch#1 print_byte::@1/(byte) print_char::ch#2 print_sword::@2/(byte) '-' )
+  to:compare::@28
+compare::@28: scope:[compare]  from compare::@1 compare::@20
+  [76] (byte) compare::r#21 ← phi( compare::@1/(const byte) FF#0 compare::@20/(const byte) TT#0 )
+  to:compare::@6
+print_char: scope:[print_char]  from compare::@21 compare::@22 compare::@31 print_byte print_byte::@1 print_sword::@2
+  [77] (byte*) print_char_cursor#43 ← phi( compare::@21/(byte*) print_char_cursor#67 compare::@22/(byte*) print_char_cursor#2 compare::@31/(byte*) print_char_cursor#14 print_byte/(byte*) print_char_cursor#63 print_byte::@1/(byte*) print_char_cursor#14 print_sword::@2/(byte*) print_char_cursor#61 )
+  [77] (byte) print_char::ch#6 ← phi( compare::@21/(byte) ' ' compare::@22/(byte) ' ' compare::@31/(byte) print_char::ch#4 print_byte/(byte) print_char::ch#1 print_byte::@1/(byte) print_char::ch#2 print_sword::@2/(byte) '-' )
   [78] *((byte*) print_char_cursor#43) ← (byte) print_char::ch#6
   [79] (byte*) print_char_cursor#14 ← ++ (byte*) print_char_cursor#43
   to:print_char::@return
 print_char::@return: scope:[print_char]  from print_char
   [80] return 
   to:@return
-print_sword: scope:[print_sword]  from compare::@12 compare::@13
-  [81] (byte*) print_char_cursor#61 ← phi( compare::@12/(byte*) print_char_cursor#70 compare::@13/(byte*) print_char_cursor#71 )
-  [81] (signed word) print_sword::w#3 ← phi( compare::@12/(signed word) print_sword::w#1 compare::@13/(signed word) print_sword::w#2 )
+print_sword: scope:[print_sword]  from compare::@7 compare::@8
+  [81] (byte*) print_char_cursor#61 ← phi( compare::@7/(byte*) print_char_cursor#70 compare::@8/(byte*) print_char_cursor#71 )
+  [81] (signed word) print_sword::w#3 ← phi( compare::@7/(signed word) print_sword::w#1 compare::@8/(signed word) print_sword::w#2 )
   [82] if((signed word) print_sword::w#3>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sword::@1
   to:print_sword::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [83] phi()
   [84] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [85] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [86] (byte*) print_char_cursor#60 ← phi( print_sword/(byte*) print_char_cursor#61 print_sword::@4/(byte*) print_char_cursor#14 )
-  [86] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [86] (byte*) print_char_cursor#60 ← phi( print_sword/(byte*) print_char_cursor#61 print_sword::@3/(byte*) print_char_cursor#14 )
+  [86] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@3/(signed word) print_sword::w#0 )
   [87] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
@@ -2162,7 +2199,7 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [101] return 
   to:@return
-print_str: scope:[print_str]  from compare::@39
+print_str: scope:[print_str]  from compare::@29
   [102] phi()
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
@@ -2468,17 +2505,17 @@ INITIAL ASM
   .label print_line_cursor = 6
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @25 [phi:@begin->@25]
-b25_from_bbegin:
-  jmp b25
-//SEG5 @25
-b25:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @25 to main [phi:@25->main]
-main_from_b25:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @25 to @end [phi:@25->@end]
-bend_from_b25:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -2496,34 +2533,34 @@ main: {
   //SEG12 [109] phi from main to print_cls [phi:main->print_cls]
   print_cls_from_main:
     jsr print_cls
-  //SEG13 [6] phi from main to main::@7 [phi:main->main::@7]
-  b7_from_main:
-  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
+  b2_from_main:
+  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#1] -- vbuz1=vbuc1 
+  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG16 [6] phi (byte*) print_char_cursor#82 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#2] -- pbuz1=pbuc1 
+  //SEG16 [6] phi (byte*) print_char_cursor#82 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#2] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#3] -- vbuz1=vbuc1 
+  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#3] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b7
-  //SEG18 [6] phi from main::@13 to main::@7 [phi:main::@13->main::@7]
-  b7_from_b13:
-  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@13->main::@7#0] -- register_copy 
-  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@13->main::@7#1] -- register_copy 
-  //SEG21 [6] phi (byte*) print_char_cursor#82 = (byte*) print_char_cursor#75 [phi:main::@13->main::@7#2] -- register_copy 
-  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@13->main::@7#3] -- register_copy 
-    jmp b7
-  //SEG23 main::@7
-  b7:
+    jmp b2
+  //SEG18 [6] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
+  b2_from_b8:
+  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@8->main::@2#0] -- register_copy 
+  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@8->main::@2#1] -- register_copy 
+  //SEG21 [6] phi (byte*) print_char_cursor#82 = (byte*) print_char_cursor#75 [phi:main::@8->main::@2#2] -- register_copy 
+  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@2#3] -- register_copy 
+    jmp b2
+  //SEG23 main::@2
+  b2:
   //SEG24 [7] (byte~) main::$1 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_rol_1 
     lda i
     asl
@@ -2534,24 +2571,24 @@ main: {
     sta w1
     lda swords+1,y
     sta w1+1
-  //SEG26 [9] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@7->main::@8#0] -- register_copy 
-  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@7->main::@8#1] -- register_copy 
-  //SEG29 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#82 [phi:main::@7->main::@8#2] -- register_copy 
-  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#3] -- vbuz1=vbuc1 
+  //SEG26 [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@2->main::@3#0] -- register_copy 
+  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@2->main::@3#1] -- register_copy 
+  //SEG29 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#82 [phi:main::@2->main::@3#2] -- register_copy 
+  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#3] -- vbuz1=vbuc1 
     lda #0
     sta j
-    jmp b8
-  //SEG31 [9] phi from main::@12 to main::@8 [phi:main::@12->main::@8]
-  b8_from_b12:
-  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@12->main::@8#0] -- register_copy 
-  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@12->main::@8#1] -- register_copy 
-  //SEG34 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#75 [phi:main::@12->main::@8#2] -- register_copy 
-  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@12->main::@8#3] -- register_copy 
-    jmp b8
-  //SEG36 main::@8
-  b8:
+    jmp b3
+  //SEG31 [9] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
+  b3_from_b7:
+  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@7->main::@3#1] -- register_copy 
+  //SEG34 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#75 [phi:main::@7->main::@3#2] -- register_copy 
+  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@7->main::@3#3] -- register_copy 
+    jmp b3
+  //SEG36 main::@3
+  b3:
   //SEG37 [10] (byte~) main::$2 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_rol_1 
     lda j
     asl
@@ -2562,24 +2599,24 @@ main: {
     sta w2
     lda swords+1,y
     sta w2+1
-  //SEG39 [12] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  b9_from_b8:
-  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@8->main::@9#0] -- register_copy 
-  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@8->main::@9#1] -- register_copy 
-  //SEG42 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#76 [phi:main::@8->main::@9#2] -- register_copy 
-  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@9#3] -- vbuz1=vbuc1 
+  //SEG39 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@3->main::@4#0] -- register_copy 
+  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@3->main::@4#1] -- register_copy 
+  //SEG42 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#76 [phi:main::@3->main::@4#2] -- register_copy 
+  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#3] -- vbuz1=vbuc1 
     lda #0
     sta op
-    jmp b9
-  //SEG44 [12] phi from main::@10 to main::@9 [phi:main::@10->main::@9]
-  b9_from_b10:
-  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@10->main::@9#0] -- register_copy 
-  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@10->main::@9#1] -- register_copy 
-  //SEG47 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#75 [phi:main::@10->main::@9#2] -- register_copy 
-  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@10->main::@9#3] -- register_copy 
-    jmp b9
-  //SEG49 main::@9
-  b9:
+    jmp b4
+  //SEG44 [12] phi from main::@5 to main::@4 [phi:main::@5->main::@4]
+  b4_from_b5:
+  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@5->main::@4#0] -- register_copy 
+  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@5->main::@4#1] -- register_copy 
+  //SEG47 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#75 [phi:main::@5->main::@4#2] -- register_copy 
+  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@5->main::@4#3] -- register_copy 
+    jmp b4
+  //SEG49 main::@4
+  b4:
   //SEG50 [13] (signed word) compare::w1#0 ← (signed word) main::w1#0 -- vwsz1=vwsz2 
     lda w1
     sta compare.w1
@@ -2595,76 +2632,76 @@ main: {
     sta compare.op
   //SEG53 [16] call compare 
     jsr compare
-    jmp b16
-  //SEG54 main::@16
-  b16:
+    jmp b9
+  //SEG54 main::@9
+  b9:
   //SEG55 [17] (byte) main::s#1 ← ++ (byte) main::s#3 -- vbuz1=_inc_vbuz1 
     inc s
-  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp s
-    bne b10_from_b16
-  //SEG57 [19] phi from main::@16 to main::@11 [phi:main::@16->main::@11]
-  b11_from_b16:
-    jmp b11
-  //SEG58 main::@11
-  b11:
+    bne b5_from_b9
+  //SEG57 [19] phi from main::@9 to main::@6 [phi:main::@9->main::@6]
+  b6_from_b9:
+    jmp b6
+  //SEG58 main::@6
+  b6:
   //SEG59 [20] call print_ln 
-  //SEG60 [30] phi from main::@11 to print_ln [phi:main::@11->print_ln]
-  print_ln_from_b11:
+  //SEG60 [30] phi from main::@6 to print_ln [phi:main::@6->print_ln]
+  print_ln_from_b6:
     jsr print_ln
   //SEG61 [21] (byte*~) print_char_cursor#116 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG62 [22] phi from main::@11 to main::@10 [phi:main::@11->main::@10]
-  b10_from_b11:
-  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@11->main::@10#0] -- register_copy 
-  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@11->main::@10#1] -- vbuz1=vbuc1 
+  //SEG62 [22] phi from main::@6 to main::@5 [phi:main::@6->main::@5]
+  b5_from_b6:
+  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@6->main::@5#0] -- register_copy 
+  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@5#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG65 [22] phi (byte*) print_char_cursor#75 = (byte*~) print_char_cursor#116 [phi:main::@11->main::@10#2] -- register_copy 
-    jmp b10
-  //SEG66 [22] phi from main::@16 to main::@10 [phi:main::@16->main::@10]
-  b10_from_b16:
-  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@16->main::@10#0] -- register_copy 
-  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@16->main::@10#1] -- register_copy 
-  //SEG69 [22] phi (byte*) print_char_cursor#75 = (byte*) print_char_cursor#14 [phi:main::@16->main::@10#2] -- register_copy 
-    jmp b10
-  //SEG70 main::@10
-  b10:
+  //SEG65 [22] phi (byte*) print_char_cursor#75 = (byte*~) print_char_cursor#116 [phi:main::@6->main::@5#2] -- register_copy 
+    jmp b5
+  //SEG66 [22] phi from main::@9 to main::@5 [phi:main::@9->main::@5]
+  b5_from_b9:
+  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@9->main::@5#0] -- register_copy 
+  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@9->main::@5#1] -- register_copy 
+  //SEG69 [22] phi (byte*) print_char_cursor#75 = (byte*) print_char_cursor#14 [phi:main::@9->main::@5#2] -- register_copy 
+    jmp b5
+  //SEG70 main::@5
+  b5:
   //SEG71 [23] (byte) main::op#1 ← ++ (byte) main::op#2 -- vbuz1=_inc_vbuz1 
     inc op
-  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@9 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp op
-    bne b9_from_b10
-    jmp b12
-  //SEG73 main::@12
-  b12:
+    bne b4_from_b5
+    jmp b7
+  //SEG73 main::@7
+  b7:
   //SEG74 [25] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp j
-    bne b8_from_b12
-    jmp b13
-  //SEG76 main::@13
-  b13:
+    bne b3_from_b7
+    jmp b8
+  //SEG76 main::@8
+  b8:
   //SEG77 [27] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp i
-    bne b7_from_b13
-  //SEG79 [29] phi from main::@13 main::@2 to main::@2 [phi:main::@13/main::@2->main::@2]
-  b2_from_b13:
-  b2_from_b2:
-    jmp b2
-  //SEG80 main::@2
-  b2:
-    jmp b2_from_b2
+    bne b2_from_b8
+  //SEG79 [29] phi from main::@1 main::@8 to main::@1 [phi:main::@1/main::@8->main::@1]
+  b1_from_b1:
+  b1_from_b8:
+    jmp b1
+  //SEG80 main::@1
+  b1:
+    jmp b1_from_b1
 }
 //SEG81 print_ln
 // Print a newline
@@ -2712,187 +2749,187 @@ compare: {
     lda #LT
     cmp op
     beq b1
-    jmp b14
-  //SEG91 compare::@14
-  b14:
+    jmp b9
+  //SEG91 compare::@9
+  b9:
   //SEG92 [36] if((byte) compare::op#0==(const byte) LE#0) goto compare::@2 -- vbuz1_eq_vbuc1_then_la1 
     lda #LE
     cmp op
     beq b2
-    jmp b15
-  //SEG93 compare::@15
-  b15:
+    jmp b10
+  //SEG93 compare::@10
+  b10:
   //SEG94 [37] if((byte) compare::op#0==(const byte) GT#0) goto compare::@3 -- vbuz1_eq_vbuc1_then_la1 
     lda #GT
     cmp op
     beq b3
-    jmp b16
-  //SEG95 compare::@16
-  b16:
+    jmp b11
+  //SEG95 compare::@11
+  b11:
   //SEG96 [38] if((byte) compare::op#0==(const byte) GE#0) goto compare::@4 -- vbuz1_eq_vbuc1_then_la1 
     lda #GE
     cmp op
     beq b4
-    jmp b17
-  //SEG97 compare::@17
-  b17:
+    jmp b12
+  //SEG97 compare::@12
+  b12:
   //SEG98 [39] if((byte) compare::op#0==(const byte) EQ#0) goto compare::@5 -- vbuz1_eq_vbuc1_then_la1 
     lda #EQ
     cmp op
     beq b5
-    jmp b18
-  //SEG99 compare::@18
-  b18:
-  //SEG100 [40] if((byte) compare::op#0!=(const byte) NE#0) goto compare::@11 -- vbuz1_neq_vbuc1_then_la1 
+    jmp b13
+  //SEG99 compare::@13
+  b13:
+  //SEG100 [40] if((byte) compare::op#0!=(const byte) NE#0) goto compare::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #NE
     cmp op
-    bne b11_from_b18
-    jmp b19
-  //SEG101 compare::@19
-  b19:
-  //SEG102 [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@33 -- vwsz1_eq_vwsz2_then_la1 
+    bne b6_from_b13
+    jmp b14
+  //SEG101 compare::@14
+  b14:
+  //SEG102 [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@23 -- vwsz1_eq_vwsz2_then_la1 
     lda w1
     cmp w2
     bne !+
     lda w1+1
     cmp w2+1
-    beq b33_from_b19
+    beq b23_from_b14
   !:
-  //SEG103 [42] phi from compare::@19 to compare::@20 [phi:compare::@19->compare::@20]
-  b20_from_b19:
-    jmp b20
-  //SEG104 compare::@20
-  b20:
-  //SEG105 [43] phi from compare::@20 to compare::@33 [phi:compare::@20->compare::@33]
-  b33_from_b20:
-  //SEG106 [43] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@20->compare::@33#0] -- vbuz1=vbuc1 
+  //SEG103 [42] phi from compare::@14 to compare::@15 [phi:compare::@14->compare::@15]
+  b15_from_b14:
+    jmp b15
+  //SEG104 compare::@15
+  b15:
+  //SEG105 [43] phi from compare::@15 to compare::@23 [phi:compare::@15->compare::@23]
+  b23_from_b15:
+  //SEG106 [43] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@15->compare::@23#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b33
-  //SEG107 [43] phi from compare::@19 to compare::@33 [phi:compare::@19->compare::@33]
-  b33_from_b19:
-  //SEG108 [43] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@19->compare::@33#0] -- vbuz1=vbuc1 
+    jmp b23
+  //SEG107 [43] phi from compare::@14 to compare::@23 [phi:compare::@14->compare::@23]
+  b23_from_b14:
+  //SEG108 [43] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@14->compare::@23#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b33
-  //SEG109 compare::@33
-  b33:
-  //SEG110 [44] phi from compare::@33 to compare::@11 [phi:compare::@33->compare::@11]
-  b11_from_b33:
-  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@33->compare::@11#0] -- register_copy 
-  //SEG112 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#1 [phi:compare::@33->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b23
+  //SEG109 compare::@23
+  b23:
+  //SEG110 [44] phi from compare::@23 to compare::@6 [phi:compare::@23->compare::@6]
+  b6_from_b23:
+  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@23->compare::@6#0] -- register_copy 
+  //SEG112 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#1 [phi:compare::@23->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_1
     sta ops
     lda #>ops_1
     sta ops+1
-    jmp b11
-  //SEG113 [44] phi from compare::@18 to compare::@11 [phi:compare::@18->compare::@11]
-  b11_from_b18:
-  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@18->compare::@11#0] -- vbuz1=vbuc1 
+    jmp b6
+  //SEG113 [44] phi from compare::@13 to compare::@6 [phi:compare::@13->compare::@6]
+  b6_from_b13:
+  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@13->compare::@6#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG115 [44] phi (byte*) compare::ops#10 = (byte*) 0 [phi:compare::@18->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG115 [44] phi (byte*) compare::ops#10 = (byte*) 0 [phi:compare::@13->compare::@6#1] -- pbuz1=pbuc1 
     lda #<0
     sta ops
     lda #>0
     sta ops+1
-    jmp b11
-  //SEG116 compare::@11
-  b11:
-  //SEG117 [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@12 -- vwsz1_lt_0_then_la1 
+    jmp b6
+  //SEG116 compare::@6
+  b6:
+  //SEG117 [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@7 -- vwsz1_lt_0_then_la1 
     lda w1+1
-    bmi b12_from_b11
-  //SEG118 [46] phi from compare::@11 to compare::@31 [phi:compare::@11->compare::@31]
-  b31_from_b11:
-    jmp b31
-  //SEG119 compare::@31
-  b31:
+    bmi b7_from_b6
+  //SEG118 [46] phi from compare::@6 to compare::@21 [phi:compare::@6->compare::@21]
+  b21_from_b6:
+    jmp b21
+  //SEG119 compare::@21
+  b21:
   //SEG120 [47] call print_char 
-  //SEG121 [77] phi from compare::@31 to print_char [phi:compare::@31->print_char]
-  print_char_from_b31:
-  //SEG122 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#67 [phi:compare::@31->print_char#0] -- register_copy 
-  //SEG123 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@31->print_char#1] -- vbuz1=vbuc1 
+  //SEG121 [77] phi from compare::@21 to print_char [phi:compare::@21->print_char]
+  print_char_from_b21:
+  //SEG122 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#67 [phi:compare::@21->print_char#0] -- register_copy 
+  //SEG123 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@21->print_char#1] -- vbuz1=vbuc1 
     lda #' '
     sta print_char.ch
     jsr print_char
-  //SEG124 [48] phi from compare::@11 compare::@31 to compare::@12 [phi:compare::@11/compare::@31->compare::@12]
-  b12_from_b11:
-  b12_from_b31:
-  //SEG125 [48] phi (byte*) print_char_cursor#70 = (byte*) print_char_cursor#67 [phi:compare::@11/compare::@31->compare::@12#0] -- register_copy 
-    jmp b12
-  //SEG126 compare::@12
-  b12:
+  //SEG124 [48] phi from compare::@21 compare::@6 to compare::@7 [phi:compare::@21/compare::@6->compare::@7]
+  b7_from_b21:
+  b7_from_b6:
+  //SEG125 [48] phi (byte*) print_char_cursor#70 = (byte*) print_char_cursor#14 [phi:compare::@21/compare::@6->compare::@7#0] -- register_copy 
+    jmp b7
+  //SEG126 compare::@7
+  b7:
   //SEG127 [49] (signed word) print_sword::w#1 ← (signed word) compare::w1#0 -- vwsz1=vwsz2 
     lda w1
     sta print_sword.w
     lda w1+1
     sta print_sword.w+1
   //SEG128 [50] call print_sword 
-  //SEG129 [81] phi from compare::@12 to print_sword [phi:compare::@12->print_sword]
-  print_sword_from_b12:
-  //SEG130 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#70 [phi:compare::@12->print_sword#0] -- register_copy 
-  //SEG131 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:compare::@12->print_sword#1] -- register_copy 
+  //SEG129 [81] phi from compare::@7 to print_sword [phi:compare::@7->print_sword]
+  print_sword_from_b7:
+  //SEG130 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#70 [phi:compare::@7->print_sword#0] -- register_copy 
+  //SEG131 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:compare::@7->print_sword#1] -- register_copy 
     jsr print_sword
-    jmp b39
-  //SEG132 compare::@39
-  b39:
+    jmp b29
+  //SEG132 compare::@29
+  b29:
   //SEG133 [51] (byte*) print_str::str#1 ← (byte*) compare::ops#10 -- pbuz1=pbuz2 
     lda ops
     sta print_str.str
     lda ops+1
     sta print_str.str+1
   //SEG134 [52] call print_str 
-  //SEG135 [102] phi from compare::@39 to print_str [phi:compare::@39->print_str]
-  print_str_from_b39:
+  //SEG135 [102] phi from compare::@29 to print_str [phi:compare::@29->print_str]
+  print_str_from_b29:
     jsr print_str
-    jmp b40
-  //SEG136 compare::@40
-  b40:
-  //SEG137 [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@13 -- vwsz1_lt_0_then_la1 
+    jmp b30
+  //SEG136 compare::@30
+  b30:
+  //SEG137 [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@8 -- vwsz1_lt_0_then_la1 
     lda w2+1
-    bmi b13_from_b40
-  //SEG138 [54] phi from compare::@40 to compare::@32 [phi:compare::@40->compare::@32]
-  b32_from_b40:
-    jmp b32
-  //SEG139 compare::@32
-  b32:
+    bmi b8_from_b30
+  //SEG138 [54] phi from compare::@30 to compare::@22 [phi:compare::@30->compare::@22]
+  b22_from_b30:
+    jmp b22
+  //SEG139 compare::@22
+  b22:
   //SEG140 [55] call print_char 
-  //SEG141 [77] phi from compare::@32 to print_char [phi:compare::@32->print_char]
-  print_char_from_b32:
-  //SEG142 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#2 [phi:compare::@32->print_char#0] -- register_copy 
-  //SEG143 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@32->print_char#1] -- vbuz1=vbuc1 
+  //SEG141 [77] phi from compare::@22 to print_char [phi:compare::@22->print_char]
+  print_char_from_b22:
+  //SEG142 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#2 [phi:compare::@22->print_char#0] -- register_copy 
+  //SEG143 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@22->print_char#1] -- vbuz1=vbuc1 
     lda #' '
     sta print_char.ch
     jsr print_char
-  //SEG144 [56] phi from compare::@32 compare::@40 to compare::@13 [phi:compare::@32/compare::@40->compare::@13]
-  b13_from_b32:
-  b13_from_b40:
-  //SEG145 [56] phi (byte*) print_char_cursor#71 = (byte*) print_char_cursor#14 [phi:compare::@32/compare::@40->compare::@13#0] -- register_copy 
-    jmp b13
-  //SEG146 compare::@13
-  b13:
+  //SEG144 [56] phi from compare::@22 compare::@30 to compare::@8 [phi:compare::@22/compare::@30->compare::@8]
+  b8_from_b22:
+  b8_from_b30:
+  //SEG145 [56] phi (byte*) print_char_cursor#71 = (byte*) print_char_cursor#14 [phi:compare::@22/compare::@30->compare::@8#0] -- register_copy 
+    jmp b8
+  //SEG146 compare::@8
+  b8:
   //SEG147 [57] (signed word) print_sword::w#2 ← (signed word) compare::w2#0 -- vwsz1=vwsz2 
     lda w2
     sta print_sword.w
     lda w2+1
     sta print_sword.w+1
   //SEG148 [58] call print_sword 
-  //SEG149 [81] phi from compare::@13 to print_sword [phi:compare::@13->print_sword]
-  print_sword_from_b13:
-  //SEG150 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#71 [phi:compare::@13->print_sword#0] -- register_copy 
-  //SEG151 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:compare::@13->print_sword#1] -- register_copy 
+  //SEG149 [81] phi from compare::@8 to print_sword [phi:compare::@8->print_sword]
+  print_sword_from_b8:
+  //SEG150 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#71 [phi:compare::@8->print_sword#0] -- register_copy 
+  //SEG151 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:compare::@8->print_sword#1] -- register_copy 
     jsr print_sword
-    jmp b42
-  //SEG152 compare::@42
-  b42:
+    jmp b31
+  //SEG152 compare::@31
+  b31:
   //SEG153 [59] (byte) print_char::ch#4 ← (byte) compare::r#10 -- vbuz1=vbuz2 
     lda r
     sta print_char.ch
   //SEG154 [60] call print_char 
-  //SEG155 [77] phi from compare::@42 to print_char [phi:compare::@42->print_char]
-  print_char_from_b42:
-  //SEG156 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#14 [phi:compare::@42->print_char#0] -- register_copy 
-  //SEG157 [77] phi (byte) print_char::ch#6 = (byte) print_char::ch#4 [phi:compare::@42->print_char#1] -- register_copy 
+  //SEG155 [77] phi from compare::@31 to print_char [phi:compare::@31->print_char]
+  print_char_from_b31:
+  //SEG156 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#14 [phi:compare::@31->print_char#0] -- register_copy 
+  //SEG157 [77] phi (byte) print_char::ch#6 = (byte) print_char::ch#4 [phi:compare::@31->print_char#1] -- register_copy 
     jsr print_char
     jmp breturn
   //SEG158 compare::@return
@@ -2901,44 +2938,44 @@ compare: {
     rts
   //SEG160 compare::@5
   b5:
-  //SEG161 [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@34 -- vwsz1_neq_vwsz2_then_la1 
+  //SEG161 [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@24 -- vwsz1_neq_vwsz2_then_la1 
     lda w1+1
     cmp w2+1
-    bne b34_from_b5
+    bne b24_from_b5
     lda w1
     cmp w2
-    bne b34_from_b5
-  //SEG162 [63] phi from compare::@5 to compare::@22 [phi:compare::@5->compare::@22]
-  b22_from_b5:
-    jmp b22
-  //SEG163 compare::@22
-  b22:
-  //SEG164 [64] phi from compare::@22 to compare::@34 [phi:compare::@22->compare::@34]
-  b34_from_b22:
-  //SEG165 [64] phi (byte) compare::r#17 = (const byte) TT#0 [phi:compare::@22->compare::@34#0] -- vbuz1=vbuc1 
+    bne b24_from_b5
+  //SEG162 [63] phi from compare::@5 to compare::@16 [phi:compare::@5->compare::@16]
+  b16_from_b5:
+    jmp b16
+  //SEG163 compare::@16
+  b16:
+  //SEG164 [64] phi from compare::@16 to compare::@24 [phi:compare::@16->compare::@24]
+  b24_from_b16:
+  //SEG165 [64] phi (byte) compare::r#17 = (const byte) TT#0 [phi:compare::@16->compare::@24#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b34
-  //SEG166 [64] phi from compare::@5 to compare::@34 [phi:compare::@5->compare::@34]
-  b34_from_b5:
-  //SEG167 [64] phi (byte) compare::r#17 = (const byte) FF#0 [phi:compare::@5->compare::@34#0] -- vbuz1=vbuc1 
+    jmp b24
+  //SEG166 [64] phi from compare::@5 to compare::@24 [phi:compare::@5->compare::@24]
+  b24_from_b5:
+  //SEG167 [64] phi (byte) compare::r#17 = (const byte) FF#0 [phi:compare::@5->compare::@24#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b34
-  //SEG168 compare::@34
-  b34:
-  //SEG169 [44] phi from compare::@34 to compare::@11 [phi:compare::@34->compare::@11]
-  b11_from_b34:
-  //SEG170 [44] phi (byte) compare::r#10 = (byte) compare::r#17 [phi:compare::@34->compare::@11#0] -- register_copy 
-  //SEG171 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#2 [phi:compare::@34->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b24
+  //SEG168 compare::@24
+  b24:
+  //SEG169 [44] phi from compare::@24 to compare::@6 [phi:compare::@24->compare::@6]
+  b6_from_b24:
+  //SEG170 [44] phi (byte) compare::r#10 = (byte) compare::r#17 [phi:compare::@24->compare::@6#0] -- register_copy 
+  //SEG171 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#2 [phi:compare::@24->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_2
     sta ops
     lda #>ops_2
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG172 compare::@4
   b4:
-  //SEG173 [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@35 -- vwsz1_lt_vwsz2_then_la1 
+  //SEG173 [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@25 -- vwsz1_lt_vwsz2_then_la1 
     lda w2
     cmp w1
     lda w2+1
@@ -2947,39 +2984,39 @@ compare: {
     eor #$80
   !:
     beq !e+
-    bpl b35_from_b4
+    bpl b25_from_b4
   !e:
-  //SEG174 [66] phi from compare::@4 to compare::@24 [phi:compare::@4->compare::@24]
-  b24_from_b4:
-    jmp b24
-  //SEG175 compare::@24
-  b24:
-  //SEG176 [67] phi from compare::@24 to compare::@35 [phi:compare::@24->compare::@35]
-  b35_from_b24:
-  //SEG177 [67] phi (byte) compare::r#18 = (const byte) TT#0 [phi:compare::@24->compare::@35#0] -- vbuz1=vbuc1 
+  //SEG174 [66] phi from compare::@4 to compare::@17 [phi:compare::@4->compare::@17]
+  b17_from_b4:
+    jmp b17
+  //SEG175 compare::@17
+  b17:
+  //SEG176 [67] phi from compare::@17 to compare::@25 [phi:compare::@17->compare::@25]
+  b25_from_b17:
+  //SEG177 [67] phi (byte) compare::r#18 = (const byte) TT#0 [phi:compare::@17->compare::@25#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b35
-  //SEG178 [67] phi from compare::@4 to compare::@35 [phi:compare::@4->compare::@35]
-  b35_from_b4:
-  //SEG179 [67] phi (byte) compare::r#18 = (const byte) FF#0 [phi:compare::@4->compare::@35#0] -- vbuz1=vbuc1 
+    jmp b25
+  //SEG178 [67] phi from compare::@4 to compare::@25 [phi:compare::@4->compare::@25]
+  b25_from_b4:
+  //SEG179 [67] phi (byte) compare::r#18 = (const byte) FF#0 [phi:compare::@4->compare::@25#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b35
-  //SEG180 compare::@35
-  b35:
-  //SEG181 [44] phi from compare::@35 to compare::@11 [phi:compare::@35->compare::@11]
-  b11_from_b35:
-  //SEG182 [44] phi (byte) compare::r#10 = (byte) compare::r#18 [phi:compare::@35->compare::@11#0] -- register_copy 
-  //SEG183 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#3 [phi:compare::@35->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b25
+  //SEG180 compare::@25
+  b25:
+  //SEG181 [44] phi from compare::@25 to compare::@6 [phi:compare::@25->compare::@6]
+  b6_from_b25:
+  //SEG182 [44] phi (byte) compare::r#10 = (byte) compare::r#18 [phi:compare::@25->compare::@6#0] -- register_copy 
+  //SEG183 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#3 [phi:compare::@25->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_3
     sta ops
     lda #>ops_3
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG184 compare::@3
   b3:
-  //SEG185 [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@36 -- vwsz1_le_vwsz2_then_la1 
+  //SEG185 [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@26 -- vwsz1_le_vwsz2_then_la1 
     lda w2
     cmp w1
     lda w2+1
@@ -2987,38 +3024,38 @@ compare: {
     bvc !+
     eor #$80
   !:
-    bpl b36_from_b3
-  //SEG186 [69] phi from compare::@3 to compare::@26 [phi:compare::@3->compare::@26]
-  b26_from_b3:
-    jmp b26
-  //SEG187 compare::@26
-  b26:
-  //SEG188 [70] phi from compare::@26 to compare::@36 [phi:compare::@26->compare::@36]
-  b36_from_b26:
-  //SEG189 [70] phi (byte) compare::r#19 = (const byte) TT#0 [phi:compare::@26->compare::@36#0] -- vbuz1=vbuc1 
+    bpl b26_from_b3
+  //SEG186 [69] phi from compare::@3 to compare::@18 [phi:compare::@3->compare::@18]
+  b18_from_b3:
+    jmp b18
+  //SEG187 compare::@18
+  b18:
+  //SEG188 [70] phi from compare::@18 to compare::@26 [phi:compare::@18->compare::@26]
+  b26_from_b18:
+  //SEG189 [70] phi (byte) compare::r#19 = (const byte) TT#0 [phi:compare::@18->compare::@26#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b36
-  //SEG190 [70] phi from compare::@3 to compare::@36 [phi:compare::@3->compare::@36]
-  b36_from_b3:
-  //SEG191 [70] phi (byte) compare::r#19 = (const byte) FF#0 [phi:compare::@3->compare::@36#0] -- vbuz1=vbuc1 
+    jmp b26
+  //SEG190 [70] phi from compare::@3 to compare::@26 [phi:compare::@3->compare::@26]
+  b26_from_b3:
+  //SEG191 [70] phi (byte) compare::r#19 = (const byte) FF#0 [phi:compare::@3->compare::@26#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b36
-  //SEG192 compare::@36
-  b36:
-  //SEG193 [44] phi from compare::@36 to compare::@11 [phi:compare::@36->compare::@11]
-  b11_from_b36:
-  //SEG194 [44] phi (byte) compare::r#10 = (byte) compare::r#19 [phi:compare::@36->compare::@11#0] -- register_copy 
-  //SEG195 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#4 [phi:compare::@36->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b26
+  //SEG192 compare::@26
+  b26:
+  //SEG193 [44] phi from compare::@26 to compare::@6 [phi:compare::@26->compare::@6]
+  b6_from_b26:
+  //SEG194 [44] phi (byte) compare::r#10 = (byte) compare::r#19 [phi:compare::@26->compare::@6#0] -- register_copy 
+  //SEG195 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#4 [phi:compare::@26->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_4
     sta ops
     lda #>ops_4
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG196 compare::@2
   b2:
-  //SEG197 [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@37 -- vwsz1_gt_vwsz2_then_la1 
+  //SEG197 [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@27 -- vwsz1_gt_vwsz2_then_la1 
     lda w1
     cmp w2
     lda w1+1
@@ -3027,39 +3064,39 @@ compare: {
     eor #$80
   !:
     beq !e+
-    bpl b37_from_b2
+    bpl b27_from_b2
   !e:
-  //SEG198 [72] phi from compare::@2 to compare::@28 [phi:compare::@2->compare::@28]
-  b28_from_b2:
-    jmp b28
-  //SEG199 compare::@28
-  b28:
-  //SEG200 [73] phi from compare::@28 to compare::@37 [phi:compare::@28->compare::@37]
-  b37_from_b28:
-  //SEG201 [73] phi (byte) compare::r#20 = (const byte) TT#0 [phi:compare::@28->compare::@37#0] -- vbuz1=vbuc1 
+  //SEG198 [72] phi from compare::@2 to compare::@19 [phi:compare::@2->compare::@19]
+  b19_from_b2:
+    jmp b19
+  //SEG199 compare::@19
+  b19:
+  //SEG200 [73] phi from compare::@19 to compare::@27 [phi:compare::@19->compare::@27]
+  b27_from_b19:
+  //SEG201 [73] phi (byte) compare::r#20 = (const byte) TT#0 [phi:compare::@19->compare::@27#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b37
-  //SEG202 [73] phi from compare::@2 to compare::@37 [phi:compare::@2->compare::@37]
-  b37_from_b2:
-  //SEG203 [73] phi (byte) compare::r#20 = (const byte) FF#0 [phi:compare::@2->compare::@37#0] -- vbuz1=vbuc1 
+    jmp b27
+  //SEG202 [73] phi from compare::@2 to compare::@27 [phi:compare::@2->compare::@27]
+  b27_from_b2:
+  //SEG203 [73] phi (byte) compare::r#20 = (const byte) FF#0 [phi:compare::@2->compare::@27#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b37
-  //SEG204 compare::@37
-  b37:
-  //SEG205 [44] phi from compare::@37 to compare::@11 [phi:compare::@37->compare::@11]
-  b11_from_b37:
-  //SEG206 [44] phi (byte) compare::r#10 = (byte) compare::r#20 [phi:compare::@37->compare::@11#0] -- register_copy 
-  //SEG207 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#5 [phi:compare::@37->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b27
+  //SEG204 compare::@27
+  b27:
+  //SEG205 [44] phi from compare::@27 to compare::@6 [phi:compare::@27->compare::@6]
+  b6_from_b27:
+  //SEG206 [44] phi (byte) compare::r#10 = (byte) compare::r#20 [phi:compare::@27->compare::@6#0] -- register_copy 
+  //SEG207 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#5 [phi:compare::@27->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_5
     sta ops
     lda #>ops_5
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG208 compare::@1
   b1:
-  //SEG209 [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@38 -- vwsz1_ge_vwsz2_then_la1 
+  //SEG209 [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@28 -- vwsz1_ge_vwsz2_then_la1 
     lda w1
     cmp w2
     lda w1+1
@@ -3067,35 +3104,35 @@ compare: {
     bvc !+
     eor #$80
   !:
-    bpl b38_from_b1
-  //SEG210 [75] phi from compare::@1 to compare::@30 [phi:compare::@1->compare::@30]
-  b30_from_b1:
-    jmp b30
-  //SEG211 compare::@30
-  b30:
-  //SEG212 [76] phi from compare::@30 to compare::@38 [phi:compare::@30->compare::@38]
-  b38_from_b30:
-  //SEG213 [76] phi (byte) compare::r#21 = (const byte) TT#0 [phi:compare::@30->compare::@38#0] -- vbuz1=vbuc1 
+    bpl b28_from_b1
+  //SEG210 [75] phi from compare::@1 to compare::@20 [phi:compare::@1->compare::@20]
+  b20_from_b1:
+    jmp b20
+  //SEG211 compare::@20
+  b20:
+  //SEG212 [76] phi from compare::@20 to compare::@28 [phi:compare::@20->compare::@28]
+  b28_from_b20:
+  //SEG213 [76] phi (byte) compare::r#21 = (const byte) TT#0 [phi:compare::@20->compare::@28#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b38
-  //SEG214 [76] phi from compare::@1 to compare::@38 [phi:compare::@1->compare::@38]
-  b38_from_b1:
-  //SEG215 [76] phi (byte) compare::r#21 = (const byte) FF#0 [phi:compare::@1->compare::@38#0] -- vbuz1=vbuc1 
+    jmp b28
+  //SEG214 [76] phi from compare::@1 to compare::@28 [phi:compare::@1->compare::@28]
+  b28_from_b1:
+  //SEG215 [76] phi (byte) compare::r#21 = (const byte) FF#0 [phi:compare::@1->compare::@28#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b38
-  //SEG216 compare::@38
-  b38:
-  //SEG217 [44] phi from compare::@38 to compare::@11 [phi:compare::@38->compare::@11]
-  b11_from_b38:
-  //SEG218 [44] phi (byte) compare::r#10 = (byte) compare::r#21 [phi:compare::@38->compare::@11#0] -- register_copy 
-  //SEG219 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#6 [phi:compare::@38->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b28
+  //SEG216 compare::@28
+  b28:
+  //SEG217 [44] phi from compare::@28 to compare::@6 [phi:compare::@28->compare::@6]
+  b6_from_b28:
+  //SEG218 [44] phi (byte) compare::r#10 = (byte) compare::r#21 [phi:compare::@28->compare::@6#0] -- register_copy 
+  //SEG219 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#6 [phi:compare::@28->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_6
     sta ops
     lda #>ops_6
     sta ops+1
-    jmp b11
+    jmp b6
     ops_1: .text "!=@"
     ops_2: .text "==@"
     ops_3: .text ">=@"
@@ -3144,9 +3181,9 @@ print_sword: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b4
-  //SEG233 print_sword::@4
-  b4:
+    jmp b3
+  //SEG233 print_sword::@3
+  b3:
   //SEG234 [85] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -3157,11 +3194,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG235 [86] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG235 [86] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG236 [86] phi (byte*) print_char_cursor#60 = (byte*) print_char_cursor#61 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG237 [86] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG236 [86] phi (byte*) print_char_cursor#60 = (byte*) print_char_cursor#61 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG237 [86] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG238 print_sword::@1
   b1:
@@ -3349,18 +3386,18 @@ Statement [14] (signed word) compare::w2#0 ← (signed word) main::w2#0 [ main::
 Statement [21] (byte*~) print_char_cursor#116 ← (byte*) print_line_cursor#1 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_char_cursor#116 print_line_cursor#1 ] ( main:2 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_char_cursor#116 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [32] (byte*) print_line_cursor#1 ← (byte*) print_line_cursor#9 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#1 print_char_cursor#14 ] ( main:2::print_ln:20 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_line_cursor#1 print_char_cursor#14 ] ) always clobbers reg byte a 
 Statement [33] if((byte*) print_line_cursor#1<(byte*) print_char_cursor#14) goto print_ln::@1 [ print_line_cursor#1 print_char_cursor#14 ] ( main:2::print_ln:20 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_line_cursor#1 print_char_cursor#14 ] ) always clobbers reg byte a 
-Statement [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@33 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@12 [ print_char_cursor#67 compare::w1#0 compare::w2#0 compare::ops#10 compare::r#10 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 compare::ops#10 compare::r#10 ] ) always clobbers reg byte a 
+Statement [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@23 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@7 [ print_char_cursor#67 compare::w1#0 compare::w2#0 compare::ops#10 compare::r#10 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 compare::ops#10 compare::r#10 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:10 [ compare::r#10 compare::r#16 compare::r#17 compare::r#18 compare::r#19 compare::r#20 compare::r#21 ]
 Statement [49] (signed word) print_sword::w#1 ← (signed word) compare::w1#0 [ compare::w2#0 compare::ops#10 compare::r#10 print_char_cursor#70 print_sword::w#1 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_char_cursor#70 print_sword::w#1 ] ) always clobbers reg byte a 
 Statement [51] (byte*) print_str::str#1 ← (byte*) compare::ops#10 [ compare::w2#0 print_char_cursor#14 compare::r#10 print_str::str#1 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 print_char_cursor#14 compare::r#10 print_str::str#1 ] ) always clobbers reg byte a 
-Statement [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@13 [ compare::w2#0 compare::r#10 print_char_cursor#2 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::r#10 print_char_cursor#2 ] ) always clobbers reg byte a 
+Statement [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@8 [ compare::w2#0 compare::r#10 print_char_cursor#2 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::r#10 print_char_cursor#2 ] ) always clobbers reg byte a 
 Statement [57] (signed word) print_sword::w#2 ← (signed word) compare::w2#0 [ compare::r#10 print_char_cursor#71 print_sword::w#2 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_char_cursor#71 print_sword::w#2 ] ) always clobbers reg byte a 
-Statement [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@34 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@35 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@36 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@37 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@38 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@24 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@25 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@26 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@27 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@28 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
 Statement [78] *((byte*) print_char_cursor#43) ← (byte) print_char::ch#6 [ print_char_cursor#43 ] ( main:2::compare:16::print_char:47 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w1#0 compare::w2#0 compare::ops#10 compare::r#10 print_char_cursor#43 ] main:2::compare:16::print_char:55 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::r#10 print_char_cursor#43 ] main:2::compare:16::print_char:60 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#43 ] main:2::compare:16::print_sword:50::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_sword::w#3 print_char_cursor#43 ] main:2::compare:16::print_sword:58::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_sword::w#3 print_char_cursor#43 ] main:2::compare:16::print_sword:50::print_word:87::print_byte:90::print_char:97 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_sword::w#4 print_byte::b#2 print_char_cursor#43 ] main:2::compare:16::print_sword:58::print_word:87::print_byte:90::print_char:97 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_sword::w#4 print_byte::b#2 print_char_cursor#43 ] main:2::compare:16::print_sword:50::print_word:87::print_byte:92::print_char:97 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_byte::b#2 print_char_cursor#43 ] main:2::compare:16::print_sword:58::print_word:87::print_byte:92::print_char:97 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_byte::b#2 print_char_cursor#43 ] main:2::compare:16::print_sword:50::print_word:87::print_byte:90::print_char:100 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_sword::w#4 print_char_cursor#43 ] main:2::compare:16::print_sword:58::print_word:87::print_byte:90::print_char:100 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_sword::w#4 print_char_cursor#43 ] main:2::compare:16::print_sword:50::print_word:87::print_byte:92::print_char:100 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_char_cursor#43 ] main:2::compare:16::print_sword:58::print_word:87::print_byte:92::print_char:100 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_char_cursor#43 ] ) always clobbers reg byte y 
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:3 [ main::j#2 main::j#1 ]
@@ -3388,17 +3425,17 @@ Statement [14] (signed word) compare::w2#0 ← (signed word) main::w2#0 [ main::
 Statement [21] (byte*~) print_char_cursor#116 ← (byte*) print_line_cursor#1 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_char_cursor#116 print_line_cursor#1 ] ( main:2 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_char_cursor#116 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [32] (byte*) print_line_cursor#1 ← (byte*) print_line_cursor#9 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#1 print_char_cursor#14 ] ( main:2::print_ln:20 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_line_cursor#1 print_char_cursor#14 ] ) always clobbers reg byte a 
 Statement [33] if((byte*) print_line_cursor#1<(byte*) print_char_cursor#14) goto print_ln::@1 [ print_line_cursor#1 print_char_cursor#14 ] ( main:2::print_ln:20 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_line_cursor#1 print_char_cursor#14 ] ) always clobbers reg byte a 
-Statement [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@33 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@12 [ print_char_cursor#67 compare::w1#0 compare::w2#0 compare::ops#10 compare::r#10 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 compare::ops#10 compare::r#10 ] ) always clobbers reg byte a 
+Statement [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@23 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@7 [ print_char_cursor#67 compare::w1#0 compare::w2#0 compare::ops#10 compare::r#10 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 compare::ops#10 compare::r#10 ] ) always clobbers reg byte a 
 Statement [49] (signed word) print_sword::w#1 ← (signed word) compare::w1#0 [ compare::w2#0 compare::ops#10 compare::r#10 print_char_cursor#70 print_sword::w#1 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_char_cursor#70 print_sword::w#1 ] ) always clobbers reg byte a 
 Statement [51] (byte*) print_str::str#1 ← (byte*) compare::ops#10 [ compare::w2#0 print_char_cursor#14 compare::r#10 print_str::str#1 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 print_char_cursor#14 compare::r#10 print_str::str#1 ] ) always clobbers reg byte a 
-Statement [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@13 [ compare::w2#0 compare::r#10 print_char_cursor#2 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::r#10 print_char_cursor#2 ] ) always clobbers reg byte a 
+Statement [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@8 [ compare::w2#0 compare::r#10 print_char_cursor#2 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::r#10 print_char_cursor#2 ] ) always clobbers reg byte a 
 Statement [57] (signed word) print_sword::w#2 ← (signed word) compare::w2#0 [ compare::r#10 print_char_cursor#71 print_sword::w#2 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_char_cursor#71 print_sword::w#2 ] ) always clobbers reg byte a 
-Statement [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@34 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@35 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@36 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@37 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@38 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@24 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@25 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@26 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@27 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@28 [ print_char_cursor#67 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#67 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
 Statement [78] *((byte*) print_char_cursor#43) ← (byte) print_char::ch#6 [ print_char_cursor#43 ] ( main:2::compare:16::print_char:47 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w1#0 compare::w2#0 compare::ops#10 compare::r#10 print_char_cursor#43 ] main:2::compare:16::print_char:55 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::r#10 print_char_cursor#43 ] main:2::compare:16::print_char:60 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#43 ] main:2::compare:16::print_sword:50::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_sword::w#3 print_char_cursor#43 ] main:2::compare:16::print_sword:58::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_sword::w#3 print_char_cursor#43 ] main:2::compare:16::print_sword:50::print_word:87::print_byte:90::print_char:97 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_sword::w#4 print_byte::b#2 print_char_cursor#43 ] main:2::compare:16::print_sword:58::print_word:87::print_byte:90::print_char:97 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_sword::w#4 print_byte::b#2 print_char_cursor#43 ] main:2::compare:16::print_sword:50::print_word:87::print_byte:92::print_char:97 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_byte::b#2 print_char_cursor#43 ] main:2::compare:16::print_sword:58::print_word:87::print_byte:92::print_char:97 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_byte::b#2 print_char_cursor#43 ] main:2::compare:16::print_sword:50::print_word:87::print_byte:90::print_char:100 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_sword::w#4 print_char_cursor#43 ] main:2::compare:16::print_sword:58::print_word:87::print_byte:90::print_char:100 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_sword::w#4 print_char_cursor#43 ] main:2::compare:16::print_sword:50::print_word:87::print_byte:92::print_char:100 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_char_cursor#43 ] main:2::compare:16::print_sword:58::print_word:87::print_byte:92::print_char:100 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_char_cursor#43 ] ) always clobbers reg byte y 
 Statement [82] if((signed word) print_sword::w#3>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sword::@1 [ print_char_cursor#61 print_sword::w#3 ] ( main:2::compare:16::print_sword:50 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_char_cursor#61 print_sword::w#3 ] main:2::compare:16::print_sword:58 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_char_cursor#61 print_sword::w#3 ] ) always clobbers reg byte a 
 Statement [85] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3 [ print_char_cursor#14 print_sword::w#0 ] ( main:2::compare:16::print_sword:50 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#10 compare::r#10 print_char_cursor#14 print_sword::w#0 ] main:2::compare:16::print_sword:58 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_char_cursor#14 print_sword::w#0 ] ) always clobbers reg byte a 
@@ -3502,17 +3539,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 5
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @25 [phi:@begin->@25]
-b25_from_bbegin:
-  jmp b25
-//SEG5 @25
-b25:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @25 to main [phi:@25->main]
-main_from_b25:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @25 to @end [phi:@25->@end]
-bend_from_b25:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3527,34 +3564,34 @@ main: {
   //SEG12 [109] phi from main to print_cls [phi:main->print_cls]
   print_cls_from_main:
     jsr print_cls
-  //SEG13 [6] phi from main to main::@7 [phi:main->main::@7]
-  b7_from_main:
-  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
+  b2_from_main:
+  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#1] -- vbuz1=vbuc1 
+  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG16 [6] phi (byte*) print_char_cursor#82 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#2] -- pbuz1=pbuc1 
+  //SEG16 [6] phi (byte*) print_char_cursor#82 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#2] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#3] -- vbuz1=vbuc1 
+  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#3] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b7
-  //SEG18 [6] phi from main::@13 to main::@7 [phi:main::@13->main::@7]
-  b7_from_b13:
-  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@13->main::@7#0] -- register_copy 
-  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@13->main::@7#1] -- register_copy 
-  //SEG21 [6] phi (byte*) print_char_cursor#82 = (byte*) print_char_cursor#75 [phi:main::@13->main::@7#2] -- register_copy 
-  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@13->main::@7#3] -- register_copy 
-    jmp b7
-  //SEG23 main::@7
-  b7:
+    jmp b2
+  //SEG18 [6] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
+  b2_from_b8:
+  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@8->main::@2#0] -- register_copy 
+  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@8->main::@2#1] -- register_copy 
+  //SEG21 [6] phi (byte*) print_char_cursor#82 = (byte*) print_char_cursor#75 [phi:main::@8->main::@2#2] -- register_copy 
+  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@2#3] -- register_copy 
+    jmp b2
+  //SEG23 main::@2
+  b2:
   //SEG24 [7] (byte~) main::$1 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_rol_1 
     lda i
     asl
@@ -3564,24 +3601,24 @@ main: {
     sta w1
     lda swords+1,y
     sta w1+1
-  //SEG26 [9] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@7->main::@8#0] -- register_copy 
-  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@7->main::@8#1] -- register_copy 
-  //SEG29 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#82 [phi:main::@7->main::@8#2] -- register_copy 
-  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#3] -- vbuz1=vbuc1 
+  //SEG26 [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@2->main::@3#0] -- register_copy 
+  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@2->main::@3#1] -- register_copy 
+  //SEG29 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#82 [phi:main::@2->main::@3#2] -- register_copy 
+  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#3] -- vbuz1=vbuc1 
     lda #0
     sta j
-    jmp b8
-  //SEG31 [9] phi from main::@12 to main::@8 [phi:main::@12->main::@8]
-  b8_from_b12:
-  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@12->main::@8#0] -- register_copy 
-  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@12->main::@8#1] -- register_copy 
-  //SEG34 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#75 [phi:main::@12->main::@8#2] -- register_copy 
-  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@12->main::@8#3] -- register_copy 
-    jmp b8
-  //SEG36 main::@8
-  b8:
+    jmp b3
+  //SEG31 [9] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
+  b3_from_b7:
+  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@7->main::@3#1] -- register_copy 
+  //SEG34 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#75 [phi:main::@7->main::@3#2] -- register_copy 
+  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@7->main::@3#3] -- register_copy 
+    jmp b3
+  //SEG36 main::@3
+  b3:
   //SEG37 [10] (byte~) main::$2 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_rol_1 
     lda j
     asl
@@ -3591,23 +3628,23 @@ main: {
     sta w2
     lda swords+1,y
     sta w2+1
-  //SEG39 [12] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  b9_from_b8:
-  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@8->main::@9#0] -- register_copy 
-  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@8->main::@9#1] -- register_copy 
-  //SEG42 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#76 [phi:main::@8->main::@9#2] -- register_copy 
-  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@9#3] -- vbuxx=vbuc1 
+  //SEG39 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@3->main::@4#0] -- register_copy 
+  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@3->main::@4#1] -- register_copy 
+  //SEG42 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#76 [phi:main::@3->main::@4#2] -- register_copy 
+  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#3] -- vbuxx=vbuc1 
     ldx #0
-    jmp b9
-  //SEG44 [12] phi from main::@10 to main::@9 [phi:main::@10->main::@9]
-  b9_from_b10:
-  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@10->main::@9#0] -- register_copy 
-  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@10->main::@9#1] -- register_copy 
-  //SEG47 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#75 [phi:main::@10->main::@9#2] -- register_copy 
-  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@10->main::@9#3] -- register_copy 
-    jmp b9
-  //SEG49 main::@9
-  b9:
+    jmp b4
+  //SEG44 [12] phi from main::@5 to main::@4 [phi:main::@5->main::@4]
+  b4_from_b5:
+  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@5->main::@4#0] -- register_copy 
+  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@5->main::@4#1] -- register_copy 
+  //SEG47 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#75 [phi:main::@5->main::@4#2] -- register_copy 
+  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@5->main::@4#3] -- register_copy 
+    jmp b4
+  //SEG49 main::@4
+  b4:
   //SEG50 [13] (signed word) compare::w1#0 ← (signed word) main::w1#0 -- vwsz1=vwsz2 
     lda w1
     sta compare.w1
@@ -3617,75 +3654,75 @@ main: {
   //SEG52 [15] (byte) compare::op#0 ← (byte) main::op#2
   //SEG53 [16] call compare 
     jsr compare
-    jmp b16
-  //SEG54 main::@16
-  b16:
+    jmp b9
+  //SEG54 main::@9
+  b9:
   //SEG55 [17] (byte) main::s#1 ← ++ (byte) main::s#3 -- vbuz1=_inc_vbuz1 
     inc s
-  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp s
-    bne b10_from_b16
-  //SEG57 [19] phi from main::@16 to main::@11 [phi:main::@16->main::@11]
-  b11_from_b16:
-    jmp b11
-  //SEG58 main::@11
-  b11:
+    bne b5_from_b9
+  //SEG57 [19] phi from main::@9 to main::@6 [phi:main::@9->main::@6]
+  b6_from_b9:
+    jmp b6
+  //SEG58 main::@6
+  b6:
   //SEG59 [20] call print_ln 
-  //SEG60 [30] phi from main::@11 to print_ln [phi:main::@11->print_ln]
-  print_ln_from_b11:
+  //SEG60 [30] phi from main::@6 to print_ln [phi:main::@6->print_ln]
+  print_ln_from_b6:
     jsr print_ln
   //SEG61 [21] (byte*~) print_char_cursor#116 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG62 [22] phi from main::@11 to main::@10 [phi:main::@11->main::@10]
-  b10_from_b11:
-  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@11->main::@10#0] -- register_copy 
-  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@11->main::@10#1] -- vbuz1=vbuc1 
+  //SEG62 [22] phi from main::@6 to main::@5 [phi:main::@6->main::@5]
+  b5_from_b6:
+  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@6->main::@5#0] -- register_copy 
+  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@5#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG65 [22] phi (byte*) print_char_cursor#75 = (byte*~) print_char_cursor#116 [phi:main::@11->main::@10#2] -- register_copy 
-    jmp b10
-  //SEG66 [22] phi from main::@16 to main::@10 [phi:main::@16->main::@10]
-  b10_from_b16:
-  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@16->main::@10#0] -- register_copy 
-  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@16->main::@10#1] -- register_copy 
-  //SEG69 [22] phi (byte*) print_char_cursor#75 = (byte*) print_char_cursor#14 [phi:main::@16->main::@10#2] -- register_copy 
-    jmp b10
-  //SEG70 main::@10
-  b10:
+  //SEG65 [22] phi (byte*) print_char_cursor#75 = (byte*~) print_char_cursor#116 [phi:main::@6->main::@5#2] -- register_copy 
+    jmp b5
+  //SEG66 [22] phi from main::@9 to main::@5 [phi:main::@9->main::@5]
+  b5_from_b9:
+  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@9->main::@5#0] -- register_copy 
+  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@9->main::@5#1] -- register_copy 
+  //SEG69 [22] phi (byte*) print_char_cursor#75 = (byte*) print_char_cursor#14 [phi:main::@9->main::@5#2] -- register_copy 
+    jmp b5
+  //SEG70 main::@5
+  b5:
   //SEG71 [23] (byte) main::op#1 ← ++ (byte) main::op#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@9 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #6
-    bne b9_from_b10
-    jmp b12
-  //SEG73 main::@12
-  b12:
+    bne b4_from_b5
+    jmp b7
+  //SEG73 main::@7
+  b7:
   //SEG74 [25] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp j
-    bne b8_from_b12
-    jmp b13
-  //SEG76 main::@13
-  b13:
+    bne b3_from_b7
+    jmp b8
+  //SEG76 main::@8
+  b8:
   //SEG77 [27] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp i
-    bne b7_from_b13
-  //SEG79 [29] phi from main::@13 main::@2 to main::@2 [phi:main::@13/main::@2->main::@2]
-  b2_from_b13:
-  b2_from_b2:
-    jmp b2
-  //SEG80 main::@2
-  b2:
-    jmp b2_from_b2
+    bne b2_from_b8
+  //SEG79 [29] phi from main::@1 main::@8 to main::@1 [phi:main::@1/main::@8->main::@1]
+  b1_from_b1:
+  b1_from_b8:
+    jmp b1
+  //SEG80 main::@1
+  b1:
+    jmp b1_from_b1
 }
 //SEG81 print_ln
 // Print a newline
@@ -3731,171 +3768,171 @@ compare: {
   //SEG90 [35] if((byte) compare::op#0==(const byte) LT#0) goto compare::@1 -- vbuxx_eq_vbuc1_then_la1 
     cpx #LT
     beq b1
-    jmp b14
-  //SEG91 compare::@14
-  b14:
+    jmp b9
+  //SEG91 compare::@9
+  b9:
   //SEG92 [36] if((byte) compare::op#0==(const byte) LE#0) goto compare::@2 -- vbuxx_eq_vbuc1_then_la1 
     cpx #LE
     beq b2
-    jmp b15
-  //SEG93 compare::@15
-  b15:
+    jmp b10
+  //SEG93 compare::@10
+  b10:
   //SEG94 [37] if((byte) compare::op#0==(const byte) GT#0) goto compare::@3 -- vbuxx_eq_vbuc1_then_la1 
     cpx #GT
     beq b3
-    jmp b16
-  //SEG95 compare::@16
-  b16:
+    jmp b11
+  //SEG95 compare::@11
+  b11:
   //SEG96 [38] if((byte) compare::op#0==(const byte) GE#0) goto compare::@4 -- vbuxx_eq_vbuc1_then_la1 
     cpx #GE
     beq b4
-    jmp b17
-  //SEG97 compare::@17
-  b17:
+    jmp b12
+  //SEG97 compare::@12
+  b12:
   //SEG98 [39] if((byte) compare::op#0==(const byte) EQ#0) goto compare::@5 -- vbuxx_eq_vbuc1_then_la1 
     cpx #EQ
     beq b5
-    jmp b18
-  //SEG99 compare::@18
-  b18:
-  //SEG100 [40] if((byte) compare::op#0!=(const byte) NE#0) goto compare::@11 -- vbuxx_neq_vbuc1_then_la1 
+    jmp b13
+  //SEG99 compare::@13
+  b13:
+  //SEG100 [40] if((byte) compare::op#0!=(const byte) NE#0) goto compare::@6 -- vbuxx_neq_vbuc1_then_la1 
     cpx #NE
-    bne b11_from_b18
-    jmp b19
-  //SEG101 compare::@19
-  b19:
-  //SEG102 [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@33 -- vwsz1_eq_vwsz2_then_la1 
+    bne b6_from_b13
+    jmp b14
+  //SEG101 compare::@14
+  b14:
+  //SEG102 [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@23 -- vwsz1_eq_vwsz2_then_la1 
     lda w1
     cmp w2
     bne !+
     lda w1+1
     cmp w2+1
-    beq b33_from_b19
+    beq b23_from_b14
   !:
-  //SEG103 [42] phi from compare::@19 to compare::@20 [phi:compare::@19->compare::@20]
-  b20_from_b19:
-    jmp b20
-  //SEG104 compare::@20
-  b20:
-  //SEG105 [43] phi from compare::@20 to compare::@33 [phi:compare::@20->compare::@33]
-  b33_from_b20:
-  //SEG106 [43] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@20->compare::@33#0] -- vbuz1=vbuc1 
+  //SEG103 [42] phi from compare::@14 to compare::@15 [phi:compare::@14->compare::@15]
+  b15_from_b14:
+    jmp b15
+  //SEG104 compare::@15
+  b15:
+  //SEG105 [43] phi from compare::@15 to compare::@23 [phi:compare::@15->compare::@23]
+  b23_from_b15:
+  //SEG106 [43] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@15->compare::@23#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b33
-  //SEG107 [43] phi from compare::@19 to compare::@33 [phi:compare::@19->compare::@33]
-  b33_from_b19:
-  //SEG108 [43] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@19->compare::@33#0] -- vbuz1=vbuc1 
+    jmp b23
+  //SEG107 [43] phi from compare::@14 to compare::@23 [phi:compare::@14->compare::@23]
+  b23_from_b14:
+  //SEG108 [43] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@14->compare::@23#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b33
-  //SEG109 compare::@33
-  b33:
-  //SEG110 [44] phi from compare::@33 to compare::@11 [phi:compare::@33->compare::@11]
-  b11_from_b33:
-  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@33->compare::@11#0] -- register_copy 
-  //SEG112 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#1 [phi:compare::@33->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b23
+  //SEG109 compare::@23
+  b23:
+  //SEG110 [44] phi from compare::@23 to compare::@6 [phi:compare::@23->compare::@6]
+  b6_from_b23:
+  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@23->compare::@6#0] -- register_copy 
+  //SEG112 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#1 [phi:compare::@23->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_1
     sta ops
     lda #>ops_1
     sta ops+1
-    jmp b11
-  //SEG113 [44] phi from compare::@18 to compare::@11 [phi:compare::@18->compare::@11]
-  b11_from_b18:
-  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@18->compare::@11#0] -- vbuz1=vbuc1 
+    jmp b6
+  //SEG113 [44] phi from compare::@13 to compare::@6 [phi:compare::@13->compare::@6]
+  b6_from_b13:
+  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@13->compare::@6#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG115 [44] phi (byte*) compare::ops#10 = (byte*) 0 [phi:compare::@18->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG115 [44] phi (byte*) compare::ops#10 = (byte*) 0 [phi:compare::@13->compare::@6#1] -- pbuz1=pbuc1 
     lda #<0
     sta ops
     lda #>0
     sta ops+1
-    jmp b11
-  //SEG116 compare::@11
-  b11:
-  //SEG117 [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@12 -- vwsz1_lt_0_then_la1 
+    jmp b6
+  //SEG116 compare::@6
+  b6:
+  //SEG117 [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@7 -- vwsz1_lt_0_then_la1 
     lda w1+1
-    bmi b12_from_b11
-  //SEG118 [46] phi from compare::@11 to compare::@31 [phi:compare::@11->compare::@31]
-  b31_from_b11:
-    jmp b31
-  //SEG119 compare::@31
-  b31:
+    bmi b7_from_b6
+  //SEG118 [46] phi from compare::@6 to compare::@21 [phi:compare::@6->compare::@21]
+  b21_from_b6:
+    jmp b21
+  //SEG119 compare::@21
+  b21:
   //SEG120 [47] call print_char 
-  //SEG121 [77] phi from compare::@31 to print_char [phi:compare::@31->print_char]
-  print_char_from_b31:
-  //SEG122 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#67 [phi:compare::@31->print_char#0] -- register_copy 
-  //SEG123 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@31->print_char#1] -- vbuaa=vbuc1 
+  //SEG121 [77] phi from compare::@21 to print_char [phi:compare::@21->print_char]
+  print_char_from_b21:
+  //SEG122 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#67 [phi:compare::@21->print_char#0] -- register_copy 
+  //SEG123 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@21->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG124 [48] phi from compare::@11 compare::@31 to compare::@12 [phi:compare::@11/compare::@31->compare::@12]
-  b12_from_b11:
-  b12_from_b31:
-  //SEG125 [48] phi (byte*) print_char_cursor#70 = (byte*) print_char_cursor#67 [phi:compare::@11/compare::@31->compare::@12#0] -- register_copy 
-    jmp b12
-  //SEG126 compare::@12
-  b12:
+  //SEG124 [48] phi from compare::@21 compare::@6 to compare::@7 [phi:compare::@21/compare::@6->compare::@7]
+  b7_from_b21:
+  b7_from_b6:
+  //SEG125 [48] phi (byte*) print_char_cursor#70 = (byte*) print_char_cursor#14 [phi:compare::@21/compare::@6->compare::@7#0] -- register_copy 
+    jmp b7
+  //SEG126 compare::@7
+  b7:
   //SEG127 [49] (signed word) print_sword::w#1 ← (signed word) compare::w1#0
   //SEG128 [50] call print_sword 
-  //SEG129 [81] phi from compare::@12 to print_sword [phi:compare::@12->print_sword]
-  print_sword_from_b12:
-  //SEG130 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#70 [phi:compare::@12->print_sword#0] -- register_copy 
-  //SEG131 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:compare::@12->print_sword#1] -- register_copy 
+  //SEG129 [81] phi from compare::@7 to print_sword [phi:compare::@7->print_sword]
+  print_sword_from_b7:
+  //SEG130 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#70 [phi:compare::@7->print_sword#0] -- register_copy 
+  //SEG131 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:compare::@7->print_sword#1] -- register_copy 
     jsr print_sword
-    jmp b39
-  //SEG132 compare::@39
-  b39:
+    jmp b29
+  //SEG132 compare::@29
+  b29:
   //SEG133 [51] (byte*) print_str::str#1 ← (byte*) compare::ops#10
   //SEG134 [52] call print_str 
-  //SEG135 [102] phi from compare::@39 to print_str [phi:compare::@39->print_str]
-  print_str_from_b39:
+  //SEG135 [102] phi from compare::@29 to print_str [phi:compare::@29->print_str]
+  print_str_from_b29:
     jsr print_str
-    jmp b40
-  //SEG136 compare::@40
-  b40:
-  //SEG137 [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@13 -- vwsz1_lt_0_then_la1 
+    jmp b30
+  //SEG136 compare::@30
+  b30:
+  //SEG137 [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@8 -- vwsz1_lt_0_then_la1 
     lda w2+1
-    bmi b13_from_b40
-  //SEG138 [54] phi from compare::@40 to compare::@32 [phi:compare::@40->compare::@32]
-  b32_from_b40:
-    jmp b32
-  //SEG139 compare::@32
-  b32:
+    bmi b8_from_b30
+  //SEG138 [54] phi from compare::@30 to compare::@22 [phi:compare::@30->compare::@22]
+  b22_from_b30:
+    jmp b22
+  //SEG139 compare::@22
+  b22:
   //SEG140 [55] call print_char 
-  //SEG141 [77] phi from compare::@32 to print_char [phi:compare::@32->print_char]
-  print_char_from_b32:
-  //SEG142 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#2 [phi:compare::@32->print_char#0] -- register_copy 
-  //SEG143 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@32->print_char#1] -- vbuaa=vbuc1 
+  //SEG141 [77] phi from compare::@22 to print_char [phi:compare::@22->print_char]
+  print_char_from_b22:
+  //SEG142 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#2 [phi:compare::@22->print_char#0] -- register_copy 
+  //SEG143 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@22->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG144 [56] phi from compare::@32 compare::@40 to compare::@13 [phi:compare::@32/compare::@40->compare::@13]
-  b13_from_b32:
-  b13_from_b40:
-  //SEG145 [56] phi (byte*) print_char_cursor#71 = (byte*) print_char_cursor#14 [phi:compare::@32/compare::@40->compare::@13#0] -- register_copy 
-    jmp b13
-  //SEG146 compare::@13
-  b13:
+  //SEG144 [56] phi from compare::@22 compare::@30 to compare::@8 [phi:compare::@22/compare::@30->compare::@8]
+  b8_from_b22:
+  b8_from_b30:
+  //SEG145 [56] phi (byte*) print_char_cursor#71 = (byte*) print_char_cursor#14 [phi:compare::@22/compare::@30->compare::@8#0] -- register_copy 
+    jmp b8
+  //SEG146 compare::@8
+  b8:
   //SEG147 [57] (signed word) print_sword::w#2 ← (signed word) compare::w2#0 -- vwsz1=vwsz2 
     lda w2
     sta print_sword.w
     lda w2+1
     sta print_sword.w+1
   //SEG148 [58] call print_sword 
-  //SEG149 [81] phi from compare::@13 to print_sword [phi:compare::@13->print_sword]
-  print_sword_from_b13:
-  //SEG150 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#71 [phi:compare::@13->print_sword#0] -- register_copy 
-  //SEG151 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:compare::@13->print_sword#1] -- register_copy 
+  //SEG149 [81] phi from compare::@8 to print_sword [phi:compare::@8->print_sword]
+  print_sword_from_b8:
+  //SEG150 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#71 [phi:compare::@8->print_sword#0] -- register_copy 
+  //SEG151 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:compare::@8->print_sword#1] -- register_copy 
     jsr print_sword
-    jmp b42
-  //SEG152 compare::@42
-  b42:
+    jmp b31
+  //SEG152 compare::@31
+  b31:
   //SEG153 [59] (byte) print_char::ch#4 ← (byte) compare::r#10 -- vbuaa=vbuz1 
     lda r
   //SEG154 [60] call print_char 
-  //SEG155 [77] phi from compare::@42 to print_char [phi:compare::@42->print_char]
-  print_char_from_b42:
-  //SEG156 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#14 [phi:compare::@42->print_char#0] -- register_copy 
-  //SEG157 [77] phi (byte) print_char::ch#6 = (byte) print_char::ch#4 [phi:compare::@42->print_char#1] -- register_copy 
+  //SEG155 [77] phi from compare::@31 to print_char [phi:compare::@31->print_char]
+  print_char_from_b31:
+  //SEG156 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#14 [phi:compare::@31->print_char#0] -- register_copy 
+  //SEG157 [77] phi (byte) print_char::ch#6 = (byte) print_char::ch#4 [phi:compare::@31->print_char#1] -- register_copy 
     jsr print_char
     jmp breturn
   //SEG158 compare::@return
@@ -3904,44 +3941,44 @@ compare: {
     rts
   //SEG160 compare::@5
   b5:
-  //SEG161 [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@34 -- vwsz1_neq_vwsz2_then_la1 
+  //SEG161 [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@24 -- vwsz1_neq_vwsz2_then_la1 
     lda w1+1
     cmp w2+1
-    bne b34_from_b5
+    bne b24_from_b5
     lda w1
     cmp w2
-    bne b34_from_b5
-  //SEG162 [63] phi from compare::@5 to compare::@22 [phi:compare::@5->compare::@22]
-  b22_from_b5:
-    jmp b22
-  //SEG163 compare::@22
-  b22:
-  //SEG164 [64] phi from compare::@22 to compare::@34 [phi:compare::@22->compare::@34]
-  b34_from_b22:
-  //SEG165 [64] phi (byte) compare::r#17 = (const byte) TT#0 [phi:compare::@22->compare::@34#0] -- vbuz1=vbuc1 
+    bne b24_from_b5
+  //SEG162 [63] phi from compare::@5 to compare::@16 [phi:compare::@5->compare::@16]
+  b16_from_b5:
+    jmp b16
+  //SEG163 compare::@16
+  b16:
+  //SEG164 [64] phi from compare::@16 to compare::@24 [phi:compare::@16->compare::@24]
+  b24_from_b16:
+  //SEG165 [64] phi (byte) compare::r#17 = (const byte) TT#0 [phi:compare::@16->compare::@24#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b34
-  //SEG166 [64] phi from compare::@5 to compare::@34 [phi:compare::@5->compare::@34]
-  b34_from_b5:
-  //SEG167 [64] phi (byte) compare::r#17 = (const byte) FF#0 [phi:compare::@5->compare::@34#0] -- vbuz1=vbuc1 
+    jmp b24
+  //SEG166 [64] phi from compare::@5 to compare::@24 [phi:compare::@5->compare::@24]
+  b24_from_b5:
+  //SEG167 [64] phi (byte) compare::r#17 = (const byte) FF#0 [phi:compare::@5->compare::@24#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b34
-  //SEG168 compare::@34
-  b34:
-  //SEG169 [44] phi from compare::@34 to compare::@11 [phi:compare::@34->compare::@11]
-  b11_from_b34:
-  //SEG170 [44] phi (byte) compare::r#10 = (byte) compare::r#17 [phi:compare::@34->compare::@11#0] -- register_copy 
-  //SEG171 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#2 [phi:compare::@34->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b24
+  //SEG168 compare::@24
+  b24:
+  //SEG169 [44] phi from compare::@24 to compare::@6 [phi:compare::@24->compare::@6]
+  b6_from_b24:
+  //SEG170 [44] phi (byte) compare::r#10 = (byte) compare::r#17 [phi:compare::@24->compare::@6#0] -- register_copy 
+  //SEG171 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#2 [phi:compare::@24->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_2
     sta ops
     lda #>ops_2
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG172 compare::@4
   b4:
-  //SEG173 [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@35 -- vwsz1_lt_vwsz2_then_la1 
+  //SEG173 [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@25 -- vwsz1_lt_vwsz2_then_la1 
     lda w2
     cmp w1
     lda w2+1
@@ -3950,39 +3987,39 @@ compare: {
     eor #$80
   !:
     beq !e+
-    bpl b35_from_b4
+    bpl b25_from_b4
   !e:
-  //SEG174 [66] phi from compare::@4 to compare::@24 [phi:compare::@4->compare::@24]
-  b24_from_b4:
-    jmp b24
-  //SEG175 compare::@24
-  b24:
-  //SEG176 [67] phi from compare::@24 to compare::@35 [phi:compare::@24->compare::@35]
-  b35_from_b24:
-  //SEG177 [67] phi (byte) compare::r#18 = (const byte) TT#0 [phi:compare::@24->compare::@35#0] -- vbuz1=vbuc1 
+  //SEG174 [66] phi from compare::@4 to compare::@17 [phi:compare::@4->compare::@17]
+  b17_from_b4:
+    jmp b17
+  //SEG175 compare::@17
+  b17:
+  //SEG176 [67] phi from compare::@17 to compare::@25 [phi:compare::@17->compare::@25]
+  b25_from_b17:
+  //SEG177 [67] phi (byte) compare::r#18 = (const byte) TT#0 [phi:compare::@17->compare::@25#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b35
-  //SEG178 [67] phi from compare::@4 to compare::@35 [phi:compare::@4->compare::@35]
-  b35_from_b4:
-  //SEG179 [67] phi (byte) compare::r#18 = (const byte) FF#0 [phi:compare::@4->compare::@35#0] -- vbuz1=vbuc1 
+    jmp b25
+  //SEG178 [67] phi from compare::@4 to compare::@25 [phi:compare::@4->compare::@25]
+  b25_from_b4:
+  //SEG179 [67] phi (byte) compare::r#18 = (const byte) FF#0 [phi:compare::@4->compare::@25#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b35
-  //SEG180 compare::@35
-  b35:
-  //SEG181 [44] phi from compare::@35 to compare::@11 [phi:compare::@35->compare::@11]
-  b11_from_b35:
-  //SEG182 [44] phi (byte) compare::r#10 = (byte) compare::r#18 [phi:compare::@35->compare::@11#0] -- register_copy 
-  //SEG183 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#3 [phi:compare::@35->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b25
+  //SEG180 compare::@25
+  b25:
+  //SEG181 [44] phi from compare::@25 to compare::@6 [phi:compare::@25->compare::@6]
+  b6_from_b25:
+  //SEG182 [44] phi (byte) compare::r#10 = (byte) compare::r#18 [phi:compare::@25->compare::@6#0] -- register_copy 
+  //SEG183 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#3 [phi:compare::@25->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_3
     sta ops
     lda #>ops_3
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG184 compare::@3
   b3:
-  //SEG185 [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@36 -- vwsz1_le_vwsz2_then_la1 
+  //SEG185 [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@26 -- vwsz1_le_vwsz2_then_la1 
     lda w2
     cmp w1
     lda w2+1
@@ -3990,38 +4027,38 @@ compare: {
     bvc !+
     eor #$80
   !:
-    bpl b36_from_b3
-  //SEG186 [69] phi from compare::@3 to compare::@26 [phi:compare::@3->compare::@26]
-  b26_from_b3:
-    jmp b26
-  //SEG187 compare::@26
-  b26:
-  //SEG188 [70] phi from compare::@26 to compare::@36 [phi:compare::@26->compare::@36]
-  b36_from_b26:
-  //SEG189 [70] phi (byte) compare::r#19 = (const byte) TT#0 [phi:compare::@26->compare::@36#0] -- vbuz1=vbuc1 
+    bpl b26_from_b3
+  //SEG186 [69] phi from compare::@3 to compare::@18 [phi:compare::@3->compare::@18]
+  b18_from_b3:
+    jmp b18
+  //SEG187 compare::@18
+  b18:
+  //SEG188 [70] phi from compare::@18 to compare::@26 [phi:compare::@18->compare::@26]
+  b26_from_b18:
+  //SEG189 [70] phi (byte) compare::r#19 = (const byte) TT#0 [phi:compare::@18->compare::@26#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b36
-  //SEG190 [70] phi from compare::@3 to compare::@36 [phi:compare::@3->compare::@36]
-  b36_from_b3:
-  //SEG191 [70] phi (byte) compare::r#19 = (const byte) FF#0 [phi:compare::@3->compare::@36#0] -- vbuz1=vbuc1 
+    jmp b26
+  //SEG190 [70] phi from compare::@3 to compare::@26 [phi:compare::@3->compare::@26]
+  b26_from_b3:
+  //SEG191 [70] phi (byte) compare::r#19 = (const byte) FF#0 [phi:compare::@3->compare::@26#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b36
-  //SEG192 compare::@36
-  b36:
-  //SEG193 [44] phi from compare::@36 to compare::@11 [phi:compare::@36->compare::@11]
-  b11_from_b36:
-  //SEG194 [44] phi (byte) compare::r#10 = (byte) compare::r#19 [phi:compare::@36->compare::@11#0] -- register_copy 
-  //SEG195 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#4 [phi:compare::@36->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b26
+  //SEG192 compare::@26
+  b26:
+  //SEG193 [44] phi from compare::@26 to compare::@6 [phi:compare::@26->compare::@6]
+  b6_from_b26:
+  //SEG194 [44] phi (byte) compare::r#10 = (byte) compare::r#19 [phi:compare::@26->compare::@6#0] -- register_copy 
+  //SEG195 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#4 [phi:compare::@26->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_4
     sta ops
     lda #>ops_4
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG196 compare::@2
   b2:
-  //SEG197 [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@37 -- vwsz1_gt_vwsz2_then_la1 
+  //SEG197 [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@27 -- vwsz1_gt_vwsz2_then_la1 
     lda w1
     cmp w2
     lda w1+1
@@ -4030,39 +4067,39 @@ compare: {
     eor #$80
   !:
     beq !e+
-    bpl b37_from_b2
+    bpl b27_from_b2
   !e:
-  //SEG198 [72] phi from compare::@2 to compare::@28 [phi:compare::@2->compare::@28]
-  b28_from_b2:
-    jmp b28
-  //SEG199 compare::@28
-  b28:
-  //SEG200 [73] phi from compare::@28 to compare::@37 [phi:compare::@28->compare::@37]
-  b37_from_b28:
-  //SEG201 [73] phi (byte) compare::r#20 = (const byte) TT#0 [phi:compare::@28->compare::@37#0] -- vbuz1=vbuc1 
+  //SEG198 [72] phi from compare::@2 to compare::@19 [phi:compare::@2->compare::@19]
+  b19_from_b2:
+    jmp b19
+  //SEG199 compare::@19
+  b19:
+  //SEG200 [73] phi from compare::@19 to compare::@27 [phi:compare::@19->compare::@27]
+  b27_from_b19:
+  //SEG201 [73] phi (byte) compare::r#20 = (const byte) TT#0 [phi:compare::@19->compare::@27#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b37
-  //SEG202 [73] phi from compare::@2 to compare::@37 [phi:compare::@2->compare::@37]
-  b37_from_b2:
-  //SEG203 [73] phi (byte) compare::r#20 = (const byte) FF#0 [phi:compare::@2->compare::@37#0] -- vbuz1=vbuc1 
+    jmp b27
+  //SEG202 [73] phi from compare::@2 to compare::@27 [phi:compare::@2->compare::@27]
+  b27_from_b2:
+  //SEG203 [73] phi (byte) compare::r#20 = (const byte) FF#0 [phi:compare::@2->compare::@27#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b37
-  //SEG204 compare::@37
-  b37:
-  //SEG205 [44] phi from compare::@37 to compare::@11 [phi:compare::@37->compare::@11]
-  b11_from_b37:
-  //SEG206 [44] phi (byte) compare::r#10 = (byte) compare::r#20 [phi:compare::@37->compare::@11#0] -- register_copy 
-  //SEG207 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#5 [phi:compare::@37->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b27
+  //SEG204 compare::@27
+  b27:
+  //SEG205 [44] phi from compare::@27 to compare::@6 [phi:compare::@27->compare::@6]
+  b6_from_b27:
+  //SEG206 [44] phi (byte) compare::r#10 = (byte) compare::r#20 [phi:compare::@27->compare::@6#0] -- register_copy 
+  //SEG207 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#5 [phi:compare::@27->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_5
     sta ops
     lda #>ops_5
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG208 compare::@1
   b1:
-  //SEG209 [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@38 -- vwsz1_ge_vwsz2_then_la1 
+  //SEG209 [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@28 -- vwsz1_ge_vwsz2_then_la1 
     lda w1
     cmp w2
     lda w1+1
@@ -4070,35 +4107,35 @@ compare: {
     bvc !+
     eor #$80
   !:
-    bpl b38_from_b1
-  //SEG210 [75] phi from compare::@1 to compare::@30 [phi:compare::@1->compare::@30]
-  b30_from_b1:
-    jmp b30
-  //SEG211 compare::@30
-  b30:
-  //SEG212 [76] phi from compare::@30 to compare::@38 [phi:compare::@30->compare::@38]
-  b38_from_b30:
-  //SEG213 [76] phi (byte) compare::r#21 = (const byte) TT#0 [phi:compare::@30->compare::@38#0] -- vbuz1=vbuc1 
+    bpl b28_from_b1
+  //SEG210 [75] phi from compare::@1 to compare::@20 [phi:compare::@1->compare::@20]
+  b20_from_b1:
+    jmp b20
+  //SEG211 compare::@20
+  b20:
+  //SEG212 [76] phi from compare::@20 to compare::@28 [phi:compare::@20->compare::@28]
+  b28_from_b20:
+  //SEG213 [76] phi (byte) compare::r#21 = (const byte) TT#0 [phi:compare::@20->compare::@28#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b38
-  //SEG214 [76] phi from compare::@1 to compare::@38 [phi:compare::@1->compare::@38]
-  b38_from_b1:
-  //SEG215 [76] phi (byte) compare::r#21 = (const byte) FF#0 [phi:compare::@1->compare::@38#0] -- vbuz1=vbuc1 
+    jmp b28
+  //SEG214 [76] phi from compare::@1 to compare::@28 [phi:compare::@1->compare::@28]
+  b28_from_b1:
+  //SEG215 [76] phi (byte) compare::r#21 = (const byte) FF#0 [phi:compare::@1->compare::@28#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b38
-  //SEG216 compare::@38
-  b38:
-  //SEG217 [44] phi from compare::@38 to compare::@11 [phi:compare::@38->compare::@11]
-  b11_from_b38:
-  //SEG218 [44] phi (byte) compare::r#10 = (byte) compare::r#21 [phi:compare::@38->compare::@11#0] -- register_copy 
-  //SEG219 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#6 [phi:compare::@38->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b28
+  //SEG216 compare::@28
+  b28:
+  //SEG217 [44] phi from compare::@28 to compare::@6 [phi:compare::@28->compare::@6]
+  b6_from_b28:
+  //SEG218 [44] phi (byte) compare::r#10 = (byte) compare::r#21 [phi:compare::@28->compare::@6#0] -- register_copy 
+  //SEG219 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#6 [phi:compare::@28->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_6
     sta ops
     lda #>ops_6
     sta ops+1
-    jmp b11
+    jmp b6
     ops_1: .text "!=@"
     ops_2: .text "==@"
     ops_3: .text ">=@"
@@ -4144,9 +4181,9 @@ print_sword: {
   //SEG232 [77] phi (byte) print_char::ch#6 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b4
-  //SEG233 print_sword::@4
-  b4:
+    jmp b3
+  //SEG233 print_sword::@3
+  b3:
   //SEG234 [85] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -4157,11 +4194,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG235 [86] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG235 [86] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG236 [86] phi (byte*) print_char_cursor#60 = (byte*) print_char_cursor#61 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG237 [86] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG236 [86] phi (byte*) print_char_cursor#60 = (byte*) print_char_cursor#61 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG237 [86] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG238 print_sword::@1
   b1:
@@ -4330,49 +4367,49 @@ print_cls: {
   swords: .word -$6fed, $12, $7fed
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b25
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b9
+Removing instruction jmp b6
+Removing instruction jmp b5
 Removing instruction jmp b7
 Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b16
-Removing instruction jmp b11
-Removing instruction jmp b10
-Removing instruction jmp b12
-Removing instruction jmp b13
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp b1
 Removing instruction jmp breturn
+Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp b11
+Removing instruction jmp b12
+Removing instruction jmp b13
 Removing instruction jmp b14
 Removing instruction jmp b15
-Removing instruction jmp b16
-Removing instruction jmp b17
-Removing instruction jmp b18
-Removing instruction jmp b19
-Removing instruction jmp b20
-Removing instruction jmp b33
-Removing instruction jmp b11
-Removing instruction jmp b31
-Removing instruction jmp b12
-Removing instruction jmp b39
-Removing instruction jmp b40
-Removing instruction jmp b32
-Removing instruction jmp b13
-Removing instruction jmp b42
-Removing instruction jmp breturn
-Removing instruction jmp b22
-Removing instruction jmp b34
-Removing instruction jmp b24
-Removing instruction jmp b35
-Removing instruction jmp b26
-Removing instruction jmp b36
-Removing instruction jmp b28
-Removing instruction jmp b37
+Removing instruction jmp b23
+Removing instruction jmp b6
+Removing instruction jmp b21
+Removing instruction jmp b7
+Removing instruction jmp b29
 Removing instruction jmp b30
-Removing instruction jmp b38
+Removing instruction jmp b22
+Removing instruction jmp b8
+Removing instruction jmp b31
+Removing instruction jmp breturn
+Removing instruction jmp b16
+Removing instruction jmp b24
+Removing instruction jmp b17
+Removing instruction jmp b25
+Removing instruction jmp b18
+Removing instruction jmp b26
+Removing instruction jmp b19
+Removing instruction jmp b27
+Removing instruction jmp b20
+Removing instruction jmp b28
 Removing instruction jmp breturn
 Removing instruction jmp b2
-Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -4387,103 +4424,103 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #>0
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b10_from_b16 with b10
-Replacing label b9_from_b10 with b9
-Replacing label b8_from_b12 with b8
-Replacing label b7_from_b13 with b7
-Replacing label b2_from_b2 with b2
+Replacing label b5_from_b9 with b5
+Replacing label b4_from_b5 with b4
+Replacing label b3_from_b7 with b3
+Replacing label b2_from_b8 with b2
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Replacing label b12_from_b11 with b12
-Replacing label b13_from_b40 with b13
+Replacing label b1_from_b1 with b1
+Replacing label b7_from_b6 with b7
+Replacing label b8_from_b30 with b8
 Replacing label b1_from_print_sword with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b25_from_bbegin:
-Removing instruction b25:
-Removing instruction main_from_b25:
-Removing instruction bend_from_b25:
-Removing instruction b7_from_b13:
-Removing instruction b8_from_b12:
-Removing instruction b9_from_b10:
-Removing instruction b11_from_b16:
-Removing instruction print_ln_from_b11:
-Removing instruction b10_from_b16:
-Removing instruction b2_from_b13:
-Removing instruction b2_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b2_from_b8:
+Removing instruction b3_from_b7:
+Removing instruction b4_from_b5:
+Removing instruction b6_from_b9:
+Removing instruction print_ln_from_b6:
+Removing instruction b5_from_b9:
+Removing instruction b1_from_b1:
+Removing instruction b1_from_b8:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
-Removing instruction b20_from_b19:
-Removing instruction b33_from_b20:
-Removing instruction b11_from_b33:
-Removing instruction b31_from_b11:
-Removing instruction print_char_from_b31:
-Removing instruction b12_from_b11:
-Removing instruction b12_from_b31:
-Removing instruction print_sword_from_b12:
-Removing instruction print_str_from_b39:
-Removing instruction b32_from_b40:
-Removing instruction print_char_from_b32:
-Removing instruction b13_from_b32:
-Removing instruction b13_from_b40:
-Removing instruction b22_from_b5:
-Removing instruction b34_from_b22:
-Removing instruction b11_from_b34:
-Removing instruction b24_from_b4:
-Removing instruction b35_from_b24:
-Removing instruction b11_from_b35:
-Removing instruction b26_from_b3:
-Removing instruction b36_from_b26:
-Removing instruction b11_from_b36:
-Removing instruction b28_from_b2:
-Removing instruction b37_from_b28:
-Removing instruction b11_from_b37:
-Removing instruction b30_from_b1:
-Removing instruction b38_from_b30:
-Removing instruction b11_from_b38:
+Removing instruction b15_from_b14:
+Removing instruction b23_from_b15:
+Removing instruction b6_from_b23:
+Removing instruction b21_from_b6:
+Removing instruction print_char_from_b21:
+Removing instruction b7_from_b21:
+Removing instruction b7_from_b6:
+Removing instruction print_sword_from_b7:
+Removing instruction print_str_from_b29:
+Removing instruction b22_from_b30:
+Removing instruction print_char_from_b22:
+Removing instruction b8_from_b22:
+Removing instruction b8_from_b30:
+Removing instruction b16_from_b5:
+Removing instruction b24_from_b16:
+Removing instruction b6_from_b24:
+Removing instruction b17_from_b4:
+Removing instruction b25_from_b17:
+Removing instruction b6_from_b25:
+Removing instruction b18_from_b3:
+Removing instruction b26_from_b18:
+Removing instruction b6_from_b26:
+Removing instruction b19_from_b2:
+Removing instruction b27_from_b19:
+Removing instruction b6_from_b27:
+Removing instruction b20_from_b1:
+Removing instruction b28_from_b20:
+Removing instruction b6_from_b28:
 Removing instruction b2_from_print_sword:
 Removing instruction print_char_from_b2:
 Removing instruction b1_from_print_sword:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction b1_from_print_str:
 Removing instruction b1_from_b2:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction print_cls_from_main:
-Removing instruction b7_from_main:
-Removing instruction b8_from_b7:
-Removing instruction b9_from_b8:
-Removing instruction b16:
+Removing instruction b2_from_main:
+Removing instruction b3_from_b2:
+Removing instruction b4_from_b3:
+Removing instruction b9:
+Removing instruction b6:
+Removing instruction b5_from_b6:
+Removing instruction b7:
+Removing instruction b8:
+Removing instruction breturn:
+Removing instruction b9:
+Removing instruction b10:
 Removing instruction b11:
-Removing instruction b10_from_b11:
 Removing instruction b12:
 Removing instruction b13:
-Removing instruction breturn:
 Removing instruction b14:
 Removing instruction b15:
+Removing instruction b21:
+Removing instruction b29:
+Removing instruction b30:
+Removing instruction b22:
+Removing instruction print_sword_from_b8:
+Removing instruction b31:
+Removing instruction print_char_from_b31:
+Removing instruction breturn:
 Removing instruction b16:
 Removing instruction b17:
 Removing instruction b18:
 Removing instruction b19:
 Removing instruction b20:
-Removing instruction b31:
-Removing instruction b39:
-Removing instruction b40:
-Removing instruction b32:
-Removing instruction print_sword_from_b13:
-Removing instruction b42:
-Removing instruction print_char_from_b42:
-Removing instruction breturn:
-Removing instruction b22:
-Removing instruction b24:
-Removing instruction b26:
-Removing instruction b28:
-Removing instruction b30:
 Removing instruction breturn:
 Removing instruction b2:
-Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn:
 Removing instruction print_byte_from_print_word:
 Removing instruction b1:
@@ -4500,18 +4537,18 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Relabelling long label b33_from_b19 to b6
-Relabelling long label b11_from_b18 to b7
-Relabelling long label b34_from_b5 to b8
-Relabelling long label b35_from_b4 to b9
-Relabelling long label b36_from_b3 to b10
-Relabelling long label b37_from_b2 to b14
-Relabelling long label b38_from_b1 to b15
+Relabelling long label b23_from_b14 to b9
+Relabelling long label b6_from_b13 to b10
+Relabelling long label b24_from_b5 to b11
+Relabelling long label b25_from_b4 to b12
+Relabelling long label b26_from_b3 to b13
+Relabelling long label b27_from_b2 to b14
+Relabelling long label b28_from_b1 to b15
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b10
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #3
@@ -4524,7 +4561,7 @@ Fixing long branch [121] beq b3 to bne
 Fixing long branch [125] beq b4 to bne
 
 FINAL SYMBOL TABLE
-(label) @25
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -4624,6 +4661,7 @@ FINAL SYMBOL TABLE
 (byte) YELLOW
 (void()) compare((signed word) compare::w1 , (signed word) compare::w2 , (byte) compare::op)
 (label) compare::@1
+(label) compare::@10
 (label) compare::@11
 (label) compare::@12
 (label) compare::@13
@@ -4635,25 +4673,24 @@ FINAL SYMBOL TABLE
 (label) compare::@19
 (label) compare::@2
 (label) compare::@20
+(label) compare::@21
 (label) compare::@22
+(label) compare::@23
 (label) compare::@24
+(label) compare::@25
 (label) compare::@26
+(label) compare::@27
 (label) compare::@28
+(label) compare::@29
 (label) compare::@3
 (label) compare::@30
 (label) compare::@31
-(label) compare::@32
-(label) compare::@33
-(label) compare::@34
-(label) compare::@35
-(label) compare::@36
-(label) compare::@37
-(label) compare::@38
-(label) compare::@39
 (label) compare::@4
-(label) compare::@40
-(label) compare::@42
 (label) compare::@5
+(label) compare::@6
+(label) compare::@7
+(label) compare::@8
+(label) compare::@9
 (label) compare::@return
 (byte) compare::op
 (byte) compare::op#0 reg byte x 168.8333333333334
@@ -4680,12 +4717,12 @@ FINAL SYMBOL TABLE
 (void()) main()
 (byte~) main::$1 reg byte a 22.0
 (byte~) main::$2 reg byte a 202.0
-(label) main::@10
-(label) main::@11
-(label) main::@12
-(label) main::@13
-(label) main::@16
+(label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
+(label) main::@6
 (label) main::@7
 (label) main::@8
 (label) main::@9
@@ -4769,7 +4806,7 @@ FINAL SYMBOL TABLE
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:10 4.0
@@ -4827,11 +4864,11 @@ Score: 966649
   .label print_char_cursor = $c
   .label print_line_cursor = 5
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @25 [phi:@begin->@25]
-//SEG5 @25
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @25 to main [phi:@25->main]
-//SEG8 [3] phi from @25 to @end [phi:@25->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -4843,30 +4880,30 @@ main: {
   //SEG11 [5] call print_cls 
   //SEG12 [109] phi from main to print_cls [phi:main->print_cls]
     jsr print_cls
-  //SEG13 [6] phi from main to main::@7 [phi:main->main::@7]
-  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
+  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#1] -- vbuz1=vbuc1 
+  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG16 [6] phi (byte*) print_char_cursor#82 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#2] -- pbuz1=pbuc1 
+  //SEG16 [6] phi (byte*) print_char_cursor#82 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#2] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#3] -- vbuz1=vbuc1 
+  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#3] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG18 [6] phi from main::@13 to main::@7 [phi:main::@13->main::@7]
-  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@13->main::@7#0] -- register_copy 
-  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@13->main::@7#1] -- register_copy 
-  //SEG21 [6] phi (byte*) print_char_cursor#82 = (byte*) print_char_cursor#75 [phi:main::@13->main::@7#2] -- register_copy 
-  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@13->main::@7#3] -- register_copy 
-  //SEG23 main::@7
-  b7:
+  //SEG18 [6] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
+  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@8->main::@2#0] -- register_copy 
+  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@8->main::@2#1] -- register_copy 
+  //SEG21 [6] phi (byte*) print_char_cursor#82 = (byte*) print_char_cursor#75 [phi:main::@8->main::@2#2] -- register_copy 
+  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@2#3] -- register_copy 
+  //SEG23 main::@2
+  b2:
   //SEG24 [7] (byte~) main::$1 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_rol_1 
     lda i
     asl
@@ -4876,20 +4913,20 @@ main: {
     sta w1
     lda swords+1,y
     sta w1+1
-  //SEG26 [9] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@7->main::@8#0] -- register_copy 
-  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@7->main::@8#1] -- register_copy 
-  //SEG29 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#82 [phi:main::@7->main::@8#2] -- register_copy 
-  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#3] -- vbuz1=vbuc1 
+  //SEG26 [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@2->main::@3#0] -- register_copy 
+  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@2->main::@3#1] -- register_copy 
+  //SEG29 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#82 [phi:main::@2->main::@3#2] -- register_copy 
+  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#3] -- vbuz1=vbuc1 
     lda #0
     sta j
-  //SEG31 [9] phi from main::@12 to main::@8 [phi:main::@12->main::@8]
-  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@12->main::@8#0] -- register_copy 
-  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@12->main::@8#1] -- register_copy 
-  //SEG34 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#75 [phi:main::@12->main::@8#2] -- register_copy 
-  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@12->main::@8#3] -- register_copy 
-  //SEG36 main::@8
-  b8:
+  //SEG31 [9] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
+  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@7->main::@3#1] -- register_copy 
+  //SEG34 [9] phi (byte*) print_char_cursor#76 = (byte*) print_char_cursor#75 [phi:main::@7->main::@3#2] -- register_copy 
+  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@7->main::@3#3] -- register_copy 
+  //SEG36 main::@3
+  b3:
   //SEG37 [10] (byte~) main::$2 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_rol_1 
     lda j
     asl
@@ -4899,19 +4936,19 @@ main: {
     sta w2
     lda swords+1,y
     sta w2+1
-  //SEG39 [12] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@8->main::@9#0] -- register_copy 
-  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@8->main::@9#1] -- register_copy 
-  //SEG42 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#76 [phi:main::@8->main::@9#2] -- register_copy 
-  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@9#3] -- vbuxx=vbuc1 
+  //SEG39 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@3->main::@4#0] -- register_copy 
+  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@3->main::@4#1] -- register_copy 
+  //SEG42 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#76 [phi:main::@3->main::@4#2] -- register_copy 
+  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#3] -- vbuxx=vbuc1 
     ldx #0
-  //SEG44 [12] phi from main::@10 to main::@9 [phi:main::@10->main::@9]
-  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@10->main::@9#0] -- register_copy 
-  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@10->main::@9#1] -- register_copy 
-  //SEG47 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#75 [phi:main::@10->main::@9#2] -- register_copy 
-  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@10->main::@9#3] -- register_copy 
-  //SEG49 main::@9
-  b9:
+  //SEG44 [12] phi from main::@5 to main::@4 [phi:main::@5->main::@4]
+  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@5->main::@4#0] -- register_copy 
+  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@5->main::@4#1] -- register_copy 
+  //SEG47 [12] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#75 [phi:main::@5->main::@4#2] -- register_copy 
+  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@5->main::@4#3] -- register_copy 
+  //SEG49 main::@4
+  b4:
   //SEG50 [13] (signed word) compare::w1#0 ← (signed word) main::w1#0 -- vwsz1=vwsz2 
     lda w1
     sta compare.w1
@@ -4921,57 +4958,57 @@ main: {
   //SEG52 [15] (byte) compare::op#0 ← (byte) main::op#2
   //SEG53 [16] call compare 
     jsr compare
-  //SEG54 main::@16
+  //SEG54 main::@9
   //SEG55 [17] (byte) main::s#1 ← ++ (byte) main::s#3 -- vbuz1=_inc_vbuz1 
     inc s
-  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp s
-    bne b10
-  //SEG57 [19] phi from main::@16 to main::@11 [phi:main::@16->main::@11]
-  //SEG58 main::@11
+    bne b5
+  //SEG57 [19] phi from main::@9 to main::@6 [phi:main::@9->main::@6]
+  //SEG58 main::@6
   //SEG59 [20] call print_ln 
-  //SEG60 [30] phi from main::@11 to print_ln [phi:main::@11->print_ln]
+  //SEG60 [30] phi from main::@6 to print_ln [phi:main::@6->print_ln]
     jsr print_ln
   //SEG61 [21] (byte*~) print_char_cursor#116 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG62 [22] phi from main::@11 to main::@10 [phi:main::@11->main::@10]
-  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@11->main::@10#0] -- register_copy 
-  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@11->main::@10#1] -- vbuz1=vbuc1 
+  //SEG62 [22] phi from main::@6 to main::@5 [phi:main::@6->main::@5]
+  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@6->main::@5#0] -- register_copy 
+  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@5#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG65 [22] phi (byte*) print_char_cursor#75 = (byte*~) print_char_cursor#116 [phi:main::@11->main::@10#2] -- register_copy 
-  //SEG66 [22] phi from main::@16 to main::@10 [phi:main::@16->main::@10]
-  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@16->main::@10#0] -- register_copy 
-  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@16->main::@10#1] -- register_copy 
-  //SEG69 [22] phi (byte*) print_char_cursor#75 = (byte*) print_char_cursor#14 [phi:main::@16->main::@10#2] -- register_copy 
-  //SEG70 main::@10
-  b10:
+  //SEG65 [22] phi (byte*) print_char_cursor#75 = (byte*~) print_char_cursor#116 [phi:main::@6->main::@5#2] -- register_copy 
+  //SEG66 [22] phi from main::@9 to main::@5 [phi:main::@9->main::@5]
+  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@9->main::@5#0] -- register_copy 
+  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@9->main::@5#1] -- register_copy 
+  //SEG69 [22] phi (byte*) print_char_cursor#75 = (byte*) print_char_cursor#14 [phi:main::@9->main::@5#2] -- register_copy 
+  //SEG70 main::@5
+  b5:
   //SEG71 [23] (byte) main::op#1 ← ++ (byte) main::op#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@9 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #6
-    bne b9
-  //SEG73 main::@12
+    bne b4
+  //SEG73 main::@7
   //SEG74 [25] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp j
-    bne b8
-  //SEG76 main::@13
+    bne b3
+  //SEG76 main::@8
   //SEG77 [27] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     cmp i
-    bne b7
-  //SEG79 [29] phi from main::@13 main::@2 to main::@2 [phi:main::@13/main::@2->main::@2]
-  //SEG80 main::@2
-  b2:
-    jmp b2
+    bne b2
+  //SEG79 [29] phi from main::@1 main::@8 to main::@1 [phi:main::@1/main::@8->main::@1]
+  //SEG80 main::@1
+  b1:
+    jmp b1
 }
 //SEG81 print_ln
 // Print a newline
@@ -5014,171 +5051,171 @@ compare: {
     bne !b1+
     jmp b1
   !b1:
-  //SEG91 compare::@14
+  //SEG91 compare::@9
   //SEG92 [36] if((byte) compare::op#0==(const byte) LE#0) goto compare::@2 -- vbuxx_eq_vbuc1_then_la1 
     cpx #LE
     bne !b2+
     jmp b2
   !b2:
-  //SEG93 compare::@15
+  //SEG93 compare::@10
   //SEG94 [37] if((byte) compare::op#0==(const byte) GT#0) goto compare::@3 -- vbuxx_eq_vbuc1_then_la1 
     cpx #GT
     bne !b3+
     jmp b3
   !b3:
-  //SEG95 compare::@16
+  //SEG95 compare::@11
   //SEG96 [38] if((byte) compare::op#0==(const byte) GE#0) goto compare::@4 -- vbuxx_eq_vbuc1_then_la1 
     cpx #GE
     bne !b4+
     jmp b4
   !b4:
-  //SEG97 compare::@17
+  //SEG97 compare::@12
   //SEG98 [39] if((byte) compare::op#0==(const byte) EQ#0) goto compare::@5 -- vbuxx_eq_vbuc1_then_la1 
     cpx #EQ
     beq b5
-  //SEG99 compare::@18
-  //SEG100 [40] if((byte) compare::op#0!=(const byte) NE#0) goto compare::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG99 compare::@13
+  //SEG100 [40] if((byte) compare::op#0!=(const byte) NE#0) goto compare::@6 -- vbuxx_neq_vbuc1_then_la1 
     cpx #NE
-    bne b7
-  //SEG101 compare::@19
-  //SEG102 [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@33 -- vwsz1_eq_vwsz2_then_la1 
+    bne b10
+  //SEG101 compare::@14
+  //SEG102 [41] if((signed word) compare::w1#0==(signed word) compare::w2#0) goto compare::@23 -- vwsz1_eq_vwsz2_then_la1 
     lda w1
     cmp w2
     bne !+
     lda w1+1
     cmp w2+1
-    beq b6
+    beq b9
   !:
-  //SEG103 [42] phi from compare::@19 to compare::@20 [phi:compare::@19->compare::@20]
-  //SEG104 compare::@20
-  //SEG105 [43] phi from compare::@20 to compare::@33 [phi:compare::@20->compare::@33]
-  //SEG106 [43] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@20->compare::@33#0] -- vbuz1=vbuc1 
+  //SEG103 [42] phi from compare::@14 to compare::@15 [phi:compare::@14->compare::@15]
+  //SEG104 compare::@15
+  //SEG105 [43] phi from compare::@15 to compare::@23 [phi:compare::@15->compare::@23]
+  //SEG106 [43] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@15->compare::@23#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b33
-  //SEG107 [43] phi from compare::@19 to compare::@33 [phi:compare::@19->compare::@33]
-  b6:
-  //SEG108 [43] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@19->compare::@33#0] -- vbuz1=vbuc1 
+    jmp b23
+  //SEG107 [43] phi from compare::@14 to compare::@23 [phi:compare::@14->compare::@23]
+  b9:
+  //SEG108 [43] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@14->compare::@23#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG109 compare::@33
-  b33:
-  //SEG110 [44] phi from compare::@33 to compare::@11 [phi:compare::@33->compare::@11]
-  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@33->compare::@11#0] -- register_copy 
-  //SEG112 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#1 [phi:compare::@33->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG109 compare::@23
+  b23:
+  //SEG110 [44] phi from compare::@23 to compare::@6 [phi:compare::@23->compare::@6]
+  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@23->compare::@6#0] -- register_copy 
+  //SEG112 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#1 [phi:compare::@23->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_1
     sta ops
     lda #>ops_1
     sta ops+1
-    jmp b11
-  //SEG113 [44] phi from compare::@18 to compare::@11 [phi:compare::@18->compare::@11]
-  b7:
-  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@18->compare::@11#0] -- vbuz1=vbuc1 
+    jmp b6
+  //SEG113 [44] phi from compare::@13 to compare::@6 [phi:compare::@13->compare::@6]
+  b10:
+  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@13->compare::@6#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG115 [44] phi (byte*) compare::ops#10 = (byte*) 0 [phi:compare::@18->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG115 [44] phi (byte*) compare::ops#10 = (byte*) 0 [phi:compare::@13->compare::@6#1] -- pbuz1=pbuc1 
     lda #<0
     sta ops
     sta ops+1
-  //SEG116 compare::@11
-  b11:
-  //SEG117 [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@12 -- vwsz1_lt_0_then_la1 
+  //SEG116 compare::@6
+  b6:
+  //SEG117 [45] if((signed word) compare::w1#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@7 -- vwsz1_lt_0_then_la1 
     lda w1+1
-    bmi b12
-  //SEG118 [46] phi from compare::@11 to compare::@31 [phi:compare::@11->compare::@31]
-  //SEG119 compare::@31
+    bmi b7
+  //SEG118 [46] phi from compare::@6 to compare::@21 [phi:compare::@6->compare::@21]
+  //SEG119 compare::@21
   //SEG120 [47] call print_char 
-  //SEG121 [77] phi from compare::@31 to print_char [phi:compare::@31->print_char]
-  //SEG122 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#67 [phi:compare::@31->print_char#0] -- register_copy 
-  //SEG123 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@31->print_char#1] -- vbuaa=vbuc1 
+  //SEG121 [77] phi from compare::@21 to print_char [phi:compare::@21->print_char]
+  //SEG122 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#67 [phi:compare::@21->print_char#0] -- register_copy 
+  //SEG123 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@21->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG124 [48] phi from compare::@11 compare::@31 to compare::@12 [phi:compare::@11/compare::@31->compare::@12]
-  //SEG125 [48] phi (byte*) print_char_cursor#70 = (byte*) print_char_cursor#67 [phi:compare::@11/compare::@31->compare::@12#0] -- register_copy 
-  //SEG126 compare::@12
-  b12:
+  //SEG124 [48] phi from compare::@21 compare::@6 to compare::@7 [phi:compare::@21/compare::@6->compare::@7]
+  //SEG125 [48] phi (byte*) print_char_cursor#70 = (byte*) print_char_cursor#14 [phi:compare::@21/compare::@6->compare::@7#0] -- register_copy 
+  //SEG126 compare::@7
+  b7:
   //SEG127 [49] (signed word) print_sword::w#1 ← (signed word) compare::w1#0
   //SEG128 [50] call print_sword 
-  //SEG129 [81] phi from compare::@12 to print_sword [phi:compare::@12->print_sword]
-  //SEG130 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#70 [phi:compare::@12->print_sword#0] -- register_copy 
-  //SEG131 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:compare::@12->print_sword#1] -- register_copy 
+  //SEG129 [81] phi from compare::@7 to print_sword [phi:compare::@7->print_sword]
+  //SEG130 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#70 [phi:compare::@7->print_sword#0] -- register_copy 
+  //SEG131 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:compare::@7->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG132 compare::@39
+  //SEG132 compare::@29
   //SEG133 [51] (byte*) print_str::str#1 ← (byte*) compare::ops#10
   //SEG134 [52] call print_str 
-  //SEG135 [102] phi from compare::@39 to print_str [phi:compare::@39->print_str]
+  //SEG135 [102] phi from compare::@29 to print_str [phi:compare::@29->print_str]
     jsr print_str
-  //SEG136 compare::@40
-  //SEG137 [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@13 -- vwsz1_lt_0_then_la1 
+  //SEG136 compare::@30
+  //SEG137 [53] if((signed word) compare::w2#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@8 -- vwsz1_lt_0_then_la1 
     lda w2+1
-    bmi b13
-  //SEG138 [54] phi from compare::@40 to compare::@32 [phi:compare::@40->compare::@32]
-  //SEG139 compare::@32
+    bmi b8
+  //SEG138 [54] phi from compare::@30 to compare::@22 [phi:compare::@30->compare::@22]
+  //SEG139 compare::@22
   //SEG140 [55] call print_char 
-  //SEG141 [77] phi from compare::@32 to print_char [phi:compare::@32->print_char]
-  //SEG142 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#2 [phi:compare::@32->print_char#0] -- register_copy 
-  //SEG143 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@32->print_char#1] -- vbuaa=vbuc1 
+  //SEG141 [77] phi from compare::@22 to print_char [phi:compare::@22->print_char]
+  //SEG142 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#2 [phi:compare::@22->print_char#0] -- register_copy 
+  //SEG143 [77] phi (byte) print_char::ch#6 = (byte) ' ' [phi:compare::@22->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG144 [56] phi from compare::@32 compare::@40 to compare::@13 [phi:compare::@32/compare::@40->compare::@13]
-  //SEG145 [56] phi (byte*) print_char_cursor#71 = (byte*) print_char_cursor#14 [phi:compare::@32/compare::@40->compare::@13#0] -- register_copy 
-  //SEG146 compare::@13
-  b13:
+  //SEG144 [56] phi from compare::@22 compare::@30 to compare::@8 [phi:compare::@22/compare::@30->compare::@8]
+  //SEG145 [56] phi (byte*) print_char_cursor#71 = (byte*) print_char_cursor#14 [phi:compare::@22/compare::@30->compare::@8#0] -- register_copy 
+  //SEG146 compare::@8
+  b8:
   //SEG147 [57] (signed word) print_sword::w#2 ← (signed word) compare::w2#0 -- vwsz1=vwsz2 
     lda w2
     sta print_sword.w
     lda w2+1
     sta print_sword.w+1
   //SEG148 [58] call print_sword 
-  //SEG149 [81] phi from compare::@13 to print_sword [phi:compare::@13->print_sword]
-  //SEG150 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#71 [phi:compare::@13->print_sword#0] -- register_copy 
-  //SEG151 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:compare::@13->print_sword#1] -- register_copy 
+  //SEG149 [81] phi from compare::@8 to print_sword [phi:compare::@8->print_sword]
+  //SEG150 [81] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#71 [phi:compare::@8->print_sword#0] -- register_copy 
+  //SEG151 [81] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:compare::@8->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG152 compare::@42
+  //SEG152 compare::@31
   //SEG153 [59] (byte) print_char::ch#4 ← (byte) compare::r#10 -- vbuaa=vbuz1 
     lda r
   //SEG154 [60] call print_char 
-  //SEG155 [77] phi from compare::@42 to print_char [phi:compare::@42->print_char]
-  //SEG156 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#14 [phi:compare::@42->print_char#0] -- register_copy 
-  //SEG157 [77] phi (byte) print_char::ch#6 = (byte) print_char::ch#4 [phi:compare::@42->print_char#1] -- register_copy 
+  //SEG155 [77] phi from compare::@31 to print_char [phi:compare::@31->print_char]
+  //SEG156 [77] phi (byte*) print_char_cursor#43 = (byte*) print_char_cursor#14 [phi:compare::@31->print_char#0] -- register_copy 
+  //SEG157 [77] phi (byte) print_char::ch#6 = (byte) print_char::ch#4 [phi:compare::@31->print_char#1] -- register_copy 
     jsr print_char
   //SEG158 compare::@return
   //SEG159 [61] return 
     rts
   //SEG160 compare::@5
   b5:
-  //SEG161 [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@34 -- vwsz1_neq_vwsz2_then_la1 
+  //SEG161 [62] if((signed word) compare::w1#0!=(signed word) compare::w2#0) goto compare::@24 -- vwsz1_neq_vwsz2_then_la1 
     lda w1+1
     cmp w2+1
-    bne b8
+    bne b11
     lda w1
     cmp w2
-    bne b8
-  //SEG162 [63] phi from compare::@5 to compare::@22 [phi:compare::@5->compare::@22]
-  //SEG163 compare::@22
-  //SEG164 [64] phi from compare::@22 to compare::@34 [phi:compare::@22->compare::@34]
-  //SEG165 [64] phi (byte) compare::r#17 = (const byte) TT#0 [phi:compare::@22->compare::@34#0] -- vbuz1=vbuc1 
+    bne b11
+  //SEG162 [63] phi from compare::@5 to compare::@16 [phi:compare::@5->compare::@16]
+  //SEG163 compare::@16
+  //SEG164 [64] phi from compare::@16 to compare::@24 [phi:compare::@16->compare::@24]
+  //SEG165 [64] phi (byte) compare::r#17 = (const byte) TT#0 [phi:compare::@16->compare::@24#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b34
-  //SEG166 [64] phi from compare::@5 to compare::@34 [phi:compare::@5->compare::@34]
-  b8:
-  //SEG167 [64] phi (byte) compare::r#17 = (const byte) FF#0 [phi:compare::@5->compare::@34#0] -- vbuz1=vbuc1 
+    jmp b24
+  //SEG166 [64] phi from compare::@5 to compare::@24 [phi:compare::@5->compare::@24]
+  b11:
+  //SEG167 [64] phi (byte) compare::r#17 = (const byte) FF#0 [phi:compare::@5->compare::@24#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG168 compare::@34
-  b34:
-  //SEG169 [44] phi from compare::@34 to compare::@11 [phi:compare::@34->compare::@11]
-  //SEG170 [44] phi (byte) compare::r#10 = (byte) compare::r#17 [phi:compare::@34->compare::@11#0] -- register_copy 
-  //SEG171 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#2 [phi:compare::@34->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG168 compare::@24
+  b24:
+  //SEG169 [44] phi from compare::@24 to compare::@6 [phi:compare::@24->compare::@6]
+  //SEG170 [44] phi (byte) compare::r#10 = (byte) compare::r#17 [phi:compare::@24->compare::@6#0] -- register_copy 
+  //SEG171 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#2 [phi:compare::@24->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_2
     sta ops
     lda #>ops_2
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG172 compare::@4
   b4:
-  //SEG173 [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@35 -- vwsz1_lt_vwsz2_then_la1 
+  //SEG173 [65] if((signed word) compare::w1#0<(signed word) compare::w2#0) goto compare::@25 -- vwsz1_lt_vwsz2_then_la1 
     lda w2
     cmp w1
     lda w2+1
@@ -5187,33 +5224,33 @@ compare: {
     eor #$80
   !:
     beq !e+
-    bpl b9
+    bpl b12
   !e:
-  //SEG174 [66] phi from compare::@4 to compare::@24 [phi:compare::@4->compare::@24]
-  //SEG175 compare::@24
-  //SEG176 [67] phi from compare::@24 to compare::@35 [phi:compare::@24->compare::@35]
-  //SEG177 [67] phi (byte) compare::r#18 = (const byte) TT#0 [phi:compare::@24->compare::@35#0] -- vbuz1=vbuc1 
+  //SEG174 [66] phi from compare::@4 to compare::@17 [phi:compare::@4->compare::@17]
+  //SEG175 compare::@17
+  //SEG176 [67] phi from compare::@17 to compare::@25 [phi:compare::@17->compare::@25]
+  //SEG177 [67] phi (byte) compare::r#18 = (const byte) TT#0 [phi:compare::@17->compare::@25#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b35
-  //SEG178 [67] phi from compare::@4 to compare::@35 [phi:compare::@4->compare::@35]
-  b9:
-  //SEG179 [67] phi (byte) compare::r#18 = (const byte) FF#0 [phi:compare::@4->compare::@35#0] -- vbuz1=vbuc1 
+    jmp b25
+  //SEG178 [67] phi from compare::@4 to compare::@25 [phi:compare::@4->compare::@25]
+  b12:
+  //SEG179 [67] phi (byte) compare::r#18 = (const byte) FF#0 [phi:compare::@4->compare::@25#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG180 compare::@35
-  b35:
-  //SEG181 [44] phi from compare::@35 to compare::@11 [phi:compare::@35->compare::@11]
-  //SEG182 [44] phi (byte) compare::r#10 = (byte) compare::r#18 [phi:compare::@35->compare::@11#0] -- register_copy 
-  //SEG183 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#3 [phi:compare::@35->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG180 compare::@25
+  b25:
+  //SEG181 [44] phi from compare::@25 to compare::@6 [phi:compare::@25->compare::@6]
+  //SEG182 [44] phi (byte) compare::r#10 = (byte) compare::r#18 [phi:compare::@25->compare::@6#0] -- register_copy 
+  //SEG183 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#3 [phi:compare::@25->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_3
     sta ops
     lda #>ops_3
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG184 compare::@3
   b3:
-  //SEG185 [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@36 -- vwsz1_le_vwsz2_then_la1 
+  //SEG185 [68] if((signed word) compare::w1#0<=(signed word) compare::w2#0) goto compare::@26 -- vwsz1_le_vwsz2_then_la1 
     lda w2
     cmp w1
     lda w2+1
@@ -5221,32 +5258,32 @@ compare: {
     bvc !+
     eor #$80
   !:
-    bpl b10
-  //SEG186 [69] phi from compare::@3 to compare::@26 [phi:compare::@3->compare::@26]
-  //SEG187 compare::@26
-  //SEG188 [70] phi from compare::@26 to compare::@36 [phi:compare::@26->compare::@36]
-  //SEG189 [70] phi (byte) compare::r#19 = (const byte) TT#0 [phi:compare::@26->compare::@36#0] -- vbuz1=vbuc1 
+    bpl b13
+  //SEG186 [69] phi from compare::@3 to compare::@18 [phi:compare::@3->compare::@18]
+  //SEG187 compare::@18
+  //SEG188 [70] phi from compare::@18 to compare::@26 [phi:compare::@18->compare::@26]
+  //SEG189 [70] phi (byte) compare::r#19 = (const byte) TT#0 [phi:compare::@18->compare::@26#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b36
-  //SEG190 [70] phi from compare::@3 to compare::@36 [phi:compare::@3->compare::@36]
-  b10:
-  //SEG191 [70] phi (byte) compare::r#19 = (const byte) FF#0 [phi:compare::@3->compare::@36#0] -- vbuz1=vbuc1 
+    jmp b26
+  //SEG190 [70] phi from compare::@3 to compare::@26 [phi:compare::@3->compare::@26]
+  b13:
+  //SEG191 [70] phi (byte) compare::r#19 = (const byte) FF#0 [phi:compare::@3->compare::@26#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG192 compare::@36
-  b36:
-  //SEG193 [44] phi from compare::@36 to compare::@11 [phi:compare::@36->compare::@11]
-  //SEG194 [44] phi (byte) compare::r#10 = (byte) compare::r#19 [phi:compare::@36->compare::@11#0] -- register_copy 
-  //SEG195 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#4 [phi:compare::@36->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG192 compare::@26
+  b26:
+  //SEG193 [44] phi from compare::@26 to compare::@6 [phi:compare::@26->compare::@6]
+  //SEG194 [44] phi (byte) compare::r#10 = (byte) compare::r#19 [phi:compare::@26->compare::@6#0] -- register_copy 
+  //SEG195 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#4 [phi:compare::@26->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_4
     sta ops
     lda #>ops_4
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG196 compare::@2
   b2:
-  //SEG197 [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@37 -- vwsz1_gt_vwsz2_then_la1 
+  //SEG197 [71] if((signed word) compare::w1#0>(signed word) compare::w2#0) goto compare::@27 -- vwsz1_gt_vwsz2_then_la1 
     lda w1
     cmp w2
     lda w1+1
@@ -5257,31 +5294,31 @@ compare: {
     beq !e+
     bpl b14
   !e:
-  //SEG198 [72] phi from compare::@2 to compare::@28 [phi:compare::@2->compare::@28]
-  //SEG199 compare::@28
-  //SEG200 [73] phi from compare::@28 to compare::@37 [phi:compare::@28->compare::@37]
-  //SEG201 [73] phi (byte) compare::r#20 = (const byte) TT#0 [phi:compare::@28->compare::@37#0] -- vbuz1=vbuc1 
+  //SEG198 [72] phi from compare::@2 to compare::@19 [phi:compare::@2->compare::@19]
+  //SEG199 compare::@19
+  //SEG200 [73] phi from compare::@19 to compare::@27 [phi:compare::@19->compare::@27]
+  //SEG201 [73] phi (byte) compare::r#20 = (const byte) TT#0 [phi:compare::@19->compare::@27#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b37
-  //SEG202 [73] phi from compare::@2 to compare::@37 [phi:compare::@2->compare::@37]
+    jmp b27
+  //SEG202 [73] phi from compare::@2 to compare::@27 [phi:compare::@2->compare::@27]
   b14:
-  //SEG203 [73] phi (byte) compare::r#20 = (const byte) FF#0 [phi:compare::@2->compare::@37#0] -- vbuz1=vbuc1 
+  //SEG203 [73] phi (byte) compare::r#20 = (const byte) FF#0 [phi:compare::@2->compare::@27#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG204 compare::@37
-  b37:
-  //SEG205 [44] phi from compare::@37 to compare::@11 [phi:compare::@37->compare::@11]
-  //SEG206 [44] phi (byte) compare::r#10 = (byte) compare::r#20 [phi:compare::@37->compare::@11#0] -- register_copy 
-  //SEG207 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#5 [phi:compare::@37->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG204 compare::@27
+  b27:
+  //SEG205 [44] phi from compare::@27 to compare::@6 [phi:compare::@27->compare::@6]
+  //SEG206 [44] phi (byte) compare::r#10 = (byte) compare::r#20 [phi:compare::@27->compare::@6#0] -- register_copy 
+  //SEG207 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#5 [phi:compare::@27->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_5
     sta ops
     lda #>ops_5
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG208 compare::@1
   b1:
-  //SEG209 [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@38 -- vwsz1_ge_vwsz2_then_la1 
+  //SEG209 [74] if((signed word) compare::w1#0>=(signed word) compare::w2#0) goto compare::@28 -- vwsz1_ge_vwsz2_then_la1 
     lda w1
     cmp w2
     lda w1+1
@@ -5290,28 +5327,28 @@ compare: {
     eor #$80
   !:
     bpl b15
-  //SEG210 [75] phi from compare::@1 to compare::@30 [phi:compare::@1->compare::@30]
-  //SEG211 compare::@30
-  //SEG212 [76] phi from compare::@30 to compare::@38 [phi:compare::@30->compare::@38]
-  //SEG213 [76] phi (byte) compare::r#21 = (const byte) TT#0 [phi:compare::@30->compare::@38#0] -- vbuz1=vbuc1 
+  //SEG210 [75] phi from compare::@1 to compare::@20 [phi:compare::@1->compare::@20]
+  //SEG211 compare::@20
+  //SEG212 [76] phi from compare::@20 to compare::@28 [phi:compare::@20->compare::@28]
+  //SEG213 [76] phi (byte) compare::r#21 = (const byte) TT#0 [phi:compare::@20->compare::@28#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b38
-  //SEG214 [76] phi from compare::@1 to compare::@38 [phi:compare::@1->compare::@38]
+    jmp b28
+  //SEG214 [76] phi from compare::@1 to compare::@28 [phi:compare::@1->compare::@28]
   b15:
-  //SEG215 [76] phi (byte) compare::r#21 = (const byte) FF#0 [phi:compare::@1->compare::@38#0] -- vbuz1=vbuc1 
+  //SEG215 [76] phi (byte) compare::r#21 = (const byte) FF#0 [phi:compare::@1->compare::@28#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG216 compare::@38
-  b38:
-  //SEG217 [44] phi from compare::@38 to compare::@11 [phi:compare::@38->compare::@11]
-  //SEG218 [44] phi (byte) compare::r#10 = (byte) compare::r#21 [phi:compare::@38->compare::@11#0] -- register_copy 
-  //SEG219 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#6 [phi:compare::@38->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG216 compare::@28
+  b28:
+  //SEG217 [44] phi from compare::@28 to compare::@6 [phi:compare::@28->compare::@6]
+  //SEG218 [44] phi (byte) compare::r#10 = (byte) compare::r#21 [phi:compare::@28->compare::@6#0] -- register_copy 
+  //SEG219 [44] phi (byte*) compare::ops#10 = (const byte*) compare::ops#6 [phi:compare::@28->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_6
     sta ops
     lda #>ops_6
     sta ops+1
-    jmp b11
+    jmp b6
     ops_1: .text "!=@"
     ops_2: .text "==@"
     ops_3: .text ">=@"
@@ -5351,7 +5388,7 @@ print_sword: {
   //SEG232 [77] phi (byte) print_char::ch#6 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG233 print_sword::@4
+  //SEG233 print_sword::@3
   //SEG234 [85] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -5362,9 +5399,9 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG235 [86] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
-  //SEG236 [86] phi (byte*) print_char_cursor#60 = (byte*) print_char_cursor#61 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG237 [86] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  //SEG235 [86] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
+  //SEG236 [86] phi (byte*) print_char_cursor#60 = (byte*) print_char_cursor#61 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG237 [86] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
   //SEG238 print_sword::@1
   b1:
   //SEG239 [87] call print_word 
diff --git a/src/test/ref/test-comparisons-sword.sym b/src/test/ref/test-comparisons-sword.sym
index da1ac7531..285bc0e25 100644
--- a/src/test/ref/test-comparisons-sword.sym
+++ b/src/test/ref/test-comparisons-sword.sym
@@ -1,4 +1,4 @@
-(label) @25
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -98,6 +98,7 @@
 (byte) YELLOW
 (void()) compare((signed word) compare::w1 , (signed word) compare::w2 , (byte) compare::op)
 (label) compare::@1
+(label) compare::@10
 (label) compare::@11
 (label) compare::@12
 (label) compare::@13
@@ -109,25 +110,24 @@
 (label) compare::@19
 (label) compare::@2
 (label) compare::@20
+(label) compare::@21
 (label) compare::@22
+(label) compare::@23
 (label) compare::@24
+(label) compare::@25
 (label) compare::@26
+(label) compare::@27
 (label) compare::@28
+(label) compare::@29
 (label) compare::@3
 (label) compare::@30
 (label) compare::@31
-(label) compare::@32
-(label) compare::@33
-(label) compare::@34
-(label) compare::@35
-(label) compare::@36
-(label) compare::@37
-(label) compare::@38
-(label) compare::@39
 (label) compare::@4
-(label) compare::@40
-(label) compare::@42
 (label) compare::@5
+(label) compare::@6
+(label) compare::@7
+(label) compare::@8
+(label) compare::@9
 (label) compare::@return
 (byte) compare::op
 (byte) compare::op#0 reg byte x 168.8333333333334
@@ -154,12 +154,12 @@
 (void()) main()
 (byte~) main::$1 reg byte a 22.0
 (byte~) main::$2 reg byte a 202.0
-(label) main::@10
-(label) main::@11
-(label) main::@12
-(label) main::@13
-(label) main::@16
+(label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
+(label) main::@6
 (label) main::@7
 (label) main::@8
 (label) main::@9
@@ -243,7 +243,7 @@
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:10 4.0
diff --git a/src/test/ref/test-comparisons-word.asm b/src/test/ref/test-comparisons-word.asm
index 312485e22..d951df2ac 100644
--- a/src/test/ref/test-comparisons-word.asm
+++ b/src/test/ref/test-comparisons-word.asm
@@ -26,7 +26,7 @@ main: {
     sta print_char_cursor+1
     lda #0
     sta i
-  b7:
+  b2:
     lda i
     asl
     tay
@@ -36,7 +36,7 @@ main: {
     sta w1+1
     lda #0
     sta j
-  b8:
+  b3:
     lda j
     asl
     tay
@@ -45,7 +45,7 @@ main: {
     lda words+1,y
     sta w2+1
     ldx #0
-  b9:
+  b4:
     lda w1
     sta compare.w1
     lda w1+1
@@ -54,7 +54,7 @@ main: {
     inc s
     lda #3
     cmp s
-    bne b10
+    bne b5
     jsr print_ln
     lda print_line_cursor
     sta print_char_cursor
@@ -62,19 +62,19 @@ main: {
     sta print_char_cursor+1
     lda #0
     sta s
-  b10:
+  b5:
     inx
     cpx #6
-    bne b9
+    bne b4
     inc j
     lda #3
     cmp j
-    bne b8
+    bne b3
     inc i
     cmp i
-    bne b7
-  b2:
-    jmp b2
+    bne b2
+  b1:
+    jmp b1
 }
 // Print a newline
 print_ln: {
@@ -120,33 +120,33 @@ compare: {
     cpx #4
     beq b5
     cpx #5
-    bne b7
+    bne b8
     lda w1
     cmp w2
     bne !+
     lda w1+1
     cmp w2+1
-    beq b6
+    beq b7
   !:
     lda #TT
     sta r
-    jmp b29
-  b6:
+    jmp b19
+  b7:
     lda #FF
     sta r
-  b29:
+  b19:
     lda #<ops_1
     sta ops
     lda #>ops_1
     sta ops+1
-    jmp b11
-  b7:
+    jmp b6
+  b8:
     lda #FF
     sta r
     lda #<0
     sta ops
     sta ops+1
-  b11:
+  b6:
     jsr print_word
     jsr print_str
     lda w2
@@ -162,43 +162,43 @@ compare: {
   b5:
     lda w1+1
     cmp w2+1
-    bne b8
+    bne b9
     lda w1
     cmp w2
-    bne b8
+    bne b9
     lda #TT
     sta r
-    jmp b30
-  b8:
+    jmp b20
+  b9:
     lda #FF
     sta r
-  b30:
+  b20:
     lda #<ops_2
     sta ops
     lda #>ops_2
     sta ops+1
-    jmp b11
+    jmp b6
   b4:
     lda w1+1
     cmp w2+1
-    bcc b9
+    bcc b10
     bne !+
     lda w1
     cmp w2
-    bcc b9
+    bcc b10
   !:
     lda #TT
     sta r
-    jmp b31
-  b9:
+    jmp b21
+  b10:
     lda #FF
     sta r
-  b31:
+  b21:
     lda #<ops_3
     sta ops
     lda #>ops_3
     sta ops+1
-    jmp b11
+    jmp b6
   b3:
     lda w1+1
     cmp w2+1
@@ -206,20 +206,20 @@ compare: {
     lda w1
     cmp w2
   !:
-    bcc b10
-    beq b10
+    bcc b11
+    beq b11
     lda #TT
     sta r
-    jmp b32
-  b10:
+    jmp b22
+  b11:
     lda #FF
     sta r
-  b32:
+  b22:
     lda #<ops_4
     sta ops
     lda #>ops_4
     sta ops+1
-    jmp b11
+    jmp b6
   b2:
     lda w2+1
     cmp w1+1
@@ -231,16 +231,16 @@ compare: {
   !:
     lda #TT
     sta r
-    jmp b33
+    jmp b23
   b12:
     lda #FF
     sta r
-  b33:
+  b23:
     lda #<ops_5
     sta ops
     lda #>ops_5
     sta ops+1
-    jmp b11
+    jmp b6
   b1:
     lda w2+1
     cmp w1+1
@@ -252,16 +252,16 @@ compare: {
     beq b13
     lda #TT
     sta r
-    jmp b34
+    jmp b24
   b13:
     lda #FF
     sta r
-  b34:
+  b24:
     lda #<ops_6
     sta ops
     lda #>ops_6
     sta ops+1
-    jmp b11
+    jmp b6
     ops_1: .text "!=@"
     ops_2: .text "==@"
     ops_3: .text ">=@"
diff --git a/src/test/ref/test-comparisons-word.cfg b/src/test/ref/test-comparisons-word.cfg
index 29f8f4355..ec505d834 100644
--- a/src/test/ref/test-comparisons-word.cfg
+++ b/src/test/ref/test-comparisons-word.cfg
@@ -1,70 +1,70 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@25
-@25: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @25
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @25
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
-  to:main::@7
-main::@7: scope:[main]  from main main::@13
-  [6] (byte*) print_line_cursor#32 ← phi( main::@13/(byte*) print_line_cursor#23 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (byte) main::s#8 ← phi( main::@13/(byte) main::s#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [6] (byte*) print_char_cursor#74 ← phi( main::@13/(byte*) print_char_cursor#61 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (byte) main::i#2 ← phi( main::@13/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@2
+main::@2: scope:[main]  from main main::@8
+  [6] (byte*) print_line_cursor#32 ← phi( main::@8/(byte*) print_line_cursor#23 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (byte) main::s#8 ← phi( main::@8/(byte) main::s#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] (byte*) print_char_cursor#74 ← phi( main::@8/(byte*) print_char_cursor#61 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (byte) main::i#2 ← phi( main::@8/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [7] (byte~) main::$1 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [8] (word) main::w1#0 ← *((const word[]) words#0 + (byte~) main::$1)
-  to:main::@8
-main::@8: scope:[main]  from main::@12 main::@7
-  [9] (byte*) print_line_cursor#31 ← phi( main::@12/(byte*) print_line_cursor#23 main::@7/(byte*) print_line_cursor#32 )
-  [9] (byte) main::s#6 ← phi( main::@12/(byte) main::s#10 main::@7/(byte) main::s#8 )
-  [9] (byte*) print_char_cursor#62 ← phi( main::@12/(byte*) print_char_cursor#61 main::@7/(byte*) print_char_cursor#74 )
-  [9] (byte) main::j#2 ← phi( main::@12/(byte) main::j#1 main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@7
+  [9] (byte*) print_line_cursor#31 ← phi( main::@7/(byte*) print_line_cursor#23 main::@2/(byte*) print_line_cursor#32 )
+  [9] (byte) main::s#6 ← phi( main::@7/(byte) main::s#10 main::@2/(byte) main::s#8 )
+  [9] (byte*) print_char_cursor#62 ← phi( main::@7/(byte*) print_char_cursor#61 main::@2/(byte*) print_char_cursor#74 )
+  [9] (byte) main::j#2 ← phi( main::@7/(byte) main::j#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [10] (byte~) main::$2 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [11] (word) main::w2#0 ← *((const word[]) words#0 + (byte~) main::$2)
-  to:main::@9
-main::@9: scope:[main]  from main::@10 main::@8
-  [12] (byte*) print_line_cursor#19 ← phi( main::@10/(byte*) print_line_cursor#23 main::@8/(byte*) print_line_cursor#31 )
-  [12] (byte) main::s#3 ← phi( main::@10/(byte) main::s#10 main::@8/(byte) main::s#6 )
-  [12] (byte*) print_char_cursor#55 ← phi( main::@10/(byte*) print_char_cursor#61 main::@8/(byte*) print_char_cursor#62 )
-  [12] (byte) main::op#2 ← phi( main::@10/(byte) main::op#1 main::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@5
+  [12] (byte*) print_line_cursor#19 ← phi( main::@5/(byte*) print_line_cursor#23 main::@3/(byte*) print_line_cursor#31 )
+  [12] (byte) main::s#3 ← phi( main::@5/(byte) main::s#10 main::@3/(byte) main::s#6 )
+  [12] (byte*) print_char_cursor#55 ← phi( main::@5/(byte*) print_char_cursor#61 main::@3/(byte*) print_char_cursor#62 )
+  [12] (byte) main::op#2 ← phi( main::@5/(byte) main::op#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [13] (word) compare::w1#0 ← (word) main::w1#0
   [14] (word) compare::w2#0 ← (word) main::w2#0
   [15] (byte) compare::op#0 ← (byte) main::op#2
   [16] call compare 
-  to:main::@16
-main::@16: scope:[main]  from main::@9
+  to:main::@9
+main::@9: scope:[main]  from main::@4
   [17] (byte) main::s#1 ← ++ (byte) main::s#3
-  [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@10
-  to:main::@11
-main::@11: scope:[main]  from main::@16
+  [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@9
   [19] phi()
   [20] call print_ln 
   [21] (byte*~) print_char_cursor#101 ← (byte*) print_line_cursor#1
-  to:main::@10
-main::@10: scope:[main]  from main::@11 main::@16
-  [22] (byte*) print_line_cursor#23 ← phi( main::@16/(byte*) print_line_cursor#19 main::@11/(byte*) print_line_cursor#1 )
-  [22] (byte) main::s#10 ← phi( main::@16/(byte) main::s#1 main::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [22] (byte*) print_char_cursor#61 ← phi( main::@16/(byte*) print_char_cursor#11 main::@11/(byte*~) print_char_cursor#101 )
+  to:main::@5
+main::@5: scope:[main]  from main::@6 main::@9
+  [22] (byte*) print_line_cursor#23 ← phi( main::@9/(byte*) print_line_cursor#19 main::@6/(byte*) print_line_cursor#1 )
+  [22] (byte) main::s#10 ← phi( main::@9/(byte) main::s#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [22] (byte*) print_char_cursor#61 ← phi( main::@9/(byte*) print_char_cursor#11 main::@6/(byte*~) print_char_cursor#101 )
   [23] (byte) main::op#1 ← ++ (byte) main::op#2
-  [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@9
-  to:main::@12
-main::@12: scope:[main]  from main::@10
+  [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@4
+  to:main::@7
+main::@7: scope:[main]  from main::@5
   [25] (byte) main::j#1 ← ++ (byte) main::j#2
-  [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@8
-  to:main::@13
-main::@13: scope:[main]  from main::@12
+  [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [27] (byte) main::i#1 ← ++ (byte) main::i#2
-  [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@7
-  to:main::@2
-main::@2: scope:[main]  from main::@13 main::@2
+  [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@1 main::@8
   [29] phi()
-  to:main::@2
-print_ln: scope:[print_ln]  from main::@11
+  to:main::@1
+print_ln: scope:[print_ln]  from main::@6
   [30] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -75,115 +75,115 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [34] return 
   to:@return
-compare: scope:[compare]  from main::@9
+compare: scope:[compare]  from main::@4
   [35] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@1
-  to:compare::@12
-compare::@12: scope:[compare]  from compare
+  to:compare::@7
+compare::@7: scope:[compare]  from compare
   [36] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto compare::@2
+  to:compare::@8
+compare::@8: scope:[compare]  from compare::@7
+  [37] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto compare::@3
+  to:compare::@9
+compare::@9: scope:[compare]  from compare::@8
+  [38] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto compare::@4
+  to:compare::@10
+compare::@10: scope:[compare]  from compare::@9
+  [39] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto compare::@5
+  to:compare::@11
+compare::@11: scope:[compare]  from compare::@10
+  [40] if((byte) compare::op#0!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto compare::@6
+  to:compare::@12
+compare::@12: scope:[compare]  from compare::@11
+  [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@19
   to:compare::@13
 compare::@13: scope:[compare]  from compare::@12
-  [37] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto compare::@3
-  to:compare::@14
-compare::@14: scope:[compare]  from compare::@13
-  [38] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto compare::@4
-  to:compare::@15
-compare::@15: scope:[compare]  from compare::@14
-  [39] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto compare::@5
-  to:compare::@16
-compare::@16: scope:[compare]  from compare::@15
-  [40] if((byte) compare::op#0!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto compare::@11
-  to:compare::@17
-compare::@17: scope:[compare]  from compare::@16
-  [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@29
-  to:compare::@18
-compare::@18: scope:[compare]  from compare::@17
   [42] phi()
-  to:compare::@29
-compare::@29: scope:[compare]  from compare::@17 compare::@18
-  [43] (byte) compare::r#11 ← phi( compare::@17/(const byte) FF#0 compare::@18/(const byte) TT#0 )
-  to:compare::@11
-compare::@11: scope:[compare]  from compare::@16 compare::@29 compare::@30 compare::@31 compare::@32 compare::@33 compare::@34
-  [44] (byte) compare::r#10 ← phi( compare::@29/(byte) compare::r#11 compare::@30/(byte) compare::r#12 compare::@31/(byte) compare::r#13 compare::@32/(byte) compare::r#14 compare::@33/(byte) compare::r#15 compare::@34/(byte) compare::r#16 compare::@16/(const byte) FF#0 )
-  [44] (byte*) compare::ops#7 ← phi( compare::@29/(const byte*) compare::ops#1 compare::@30/(const byte*) compare::ops#2 compare::@31/(const byte*) compare::ops#3 compare::@32/(const byte*) compare::ops#4 compare::@33/(const byte*) compare::ops#5 compare::@34/(const byte*) compare::ops#6 compare::@16/(byte*) 0 )
+  to:compare::@19
+compare::@19: scope:[compare]  from compare::@12 compare::@13
+  [43] (byte) compare::r#11 ← phi( compare::@12/(const byte) FF#0 compare::@13/(const byte) TT#0 )
+  to:compare::@6
+compare::@6: scope:[compare]  from compare::@11 compare::@19 compare::@20 compare::@21 compare::@22 compare::@23 compare::@24
+  [44] (byte) compare::r#10 ← phi( compare::@19/(byte) compare::r#11 compare::@20/(byte) compare::r#12 compare::@21/(byte) compare::r#13 compare::@22/(byte) compare::r#14 compare::@23/(byte) compare::r#15 compare::@24/(byte) compare::r#16 compare::@11/(const byte) FF#0 )
+  [44] (byte*) compare::ops#7 ← phi( compare::@19/(const byte*) compare::ops#1 compare::@20/(const byte*) compare::ops#2 compare::@21/(const byte*) compare::ops#3 compare::@22/(const byte*) compare::ops#4 compare::@23/(const byte*) compare::ops#5 compare::@24/(const byte*) compare::ops#6 compare::@11/(byte*) 0 )
   [45] (word) print_word::w#0 ← (word) compare::w1#0
   [46] call print_word 
-  to:compare::@35
-compare::@35: scope:[compare]  from compare::@11
+  to:compare::@25
+compare::@25: scope:[compare]  from compare::@6
   [47] (byte*) print_str::str#1 ← (byte*) compare::ops#7
   [48] call print_str 
-  to:compare::@36
-compare::@36: scope:[compare]  from compare::@35
+  to:compare::@26
+compare::@26: scope:[compare]  from compare::@25
   [49] (word) print_word::w#1 ← (word) compare::w2#0
   [50] call print_word 
-  to:compare::@37
-compare::@37: scope:[compare]  from compare::@36
+  to:compare::@27
+compare::@27: scope:[compare]  from compare::@26
   [51] (byte) print_char::ch#2 ← (byte) compare::r#10
   [52] call print_char 
-  to:compare::@38
-compare::@38: scope:[compare]  from compare::@37
+  to:compare::@28
+compare::@28: scope:[compare]  from compare::@27
   [53] phi()
   [54] call print_char 
   to:compare::@return
-compare::@return: scope:[compare]  from compare::@38
+compare::@return: scope:[compare]  from compare::@28
   [55] return 
   to:@return
-compare::@5: scope:[compare]  from compare::@15
-  [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@30
-  to:compare::@20
-compare::@20: scope:[compare]  from compare::@5
+compare::@5: scope:[compare]  from compare::@10
+  [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@20
+  to:compare::@14
+compare::@14: scope:[compare]  from compare::@5
   [57] phi()
-  to:compare::@30
-compare::@30: scope:[compare]  from compare::@20 compare::@5
-  [58] (byte) compare::r#12 ← phi( compare::@20/(const byte) TT#0 compare::@5/(const byte) FF#0 )
-  to:compare::@11
-compare::@4: scope:[compare]  from compare::@14
-  [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@31
-  to:compare::@22
-compare::@22: scope:[compare]  from compare::@4
+  to:compare::@20
+compare::@20: scope:[compare]  from compare::@14 compare::@5
+  [58] (byte) compare::r#12 ← phi( compare::@14/(const byte) TT#0 compare::@5/(const byte) FF#0 )
+  to:compare::@6
+compare::@4: scope:[compare]  from compare::@9
+  [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@21
+  to:compare::@15
+compare::@15: scope:[compare]  from compare::@4
   [60] phi()
-  to:compare::@31
-compare::@31: scope:[compare]  from compare::@22 compare::@4
-  [61] (byte) compare::r#13 ← phi( compare::@22/(const byte) TT#0 compare::@4/(const byte) FF#0 )
-  to:compare::@11
-compare::@3: scope:[compare]  from compare::@13
-  [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@32
-  to:compare::@24
-compare::@24: scope:[compare]  from compare::@3
+  to:compare::@21
+compare::@21: scope:[compare]  from compare::@15 compare::@4
+  [61] (byte) compare::r#13 ← phi( compare::@15/(const byte) TT#0 compare::@4/(const byte) FF#0 )
+  to:compare::@6
+compare::@3: scope:[compare]  from compare::@8
+  [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@22
+  to:compare::@16
+compare::@16: scope:[compare]  from compare::@3
   [63] phi()
-  to:compare::@32
-compare::@32: scope:[compare]  from compare::@24 compare::@3
-  [64] (byte) compare::r#14 ← phi( compare::@24/(const byte) TT#0 compare::@3/(const byte) FF#0 )
-  to:compare::@11
-compare::@2: scope:[compare]  from compare::@12
-  [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@33
-  to:compare::@26
-compare::@26: scope:[compare]  from compare::@2
+  to:compare::@22
+compare::@22: scope:[compare]  from compare::@16 compare::@3
+  [64] (byte) compare::r#14 ← phi( compare::@16/(const byte) TT#0 compare::@3/(const byte) FF#0 )
+  to:compare::@6
+compare::@2: scope:[compare]  from compare::@7
+  [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@23
+  to:compare::@17
+compare::@17: scope:[compare]  from compare::@2
   [66] phi()
-  to:compare::@33
-compare::@33: scope:[compare]  from compare::@2 compare::@26
-  [67] (byte) compare::r#15 ← phi( compare::@2/(const byte) FF#0 compare::@26/(const byte) TT#0 )
-  to:compare::@11
+  to:compare::@23
+compare::@23: scope:[compare]  from compare::@17 compare::@2
+  [67] (byte) compare::r#15 ← phi( compare::@2/(const byte) FF#0 compare::@17/(const byte) TT#0 )
+  to:compare::@6
 compare::@1: scope:[compare]  from compare
-  [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@34
-  to:compare::@28
-compare::@28: scope:[compare]  from compare::@1
+  [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@24
+  to:compare::@18
+compare::@18: scope:[compare]  from compare::@1
   [69] phi()
-  to:compare::@34
-compare::@34: scope:[compare]  from compare::@1 compare::@28
-  [70] (byte) compare::r#16 ← phi( compare::@1/(const byte) FF#0 compare::@28/(const byte) TT#0 )
-  to:compare::@11
-print_char: scope:[print_char]  from compare::@37 compare::@38 print_byte print_byte::@1
-  [71] (byte*) print_char_cursor#36 ← phi( compare::@37/(byte*) print_char_cursor#11 compare::@38/(byte*) print_char_cursor#11 print_byte/(byte*) print_char_cursor#53 print_byte::@1/(byte*) print_char_cursor#11 )
-  [71] (byte) print_char::ch#4 ← phi( compare::@37/(byte) print_char::ch#2 compare::@38/(byte) ' ' print_byte/(byte) print_char::ch#0 print_byte::@1/(byte) print_char::ch#1 )
+  to:compare::@24
+compare::@24: scope:[compare]  from compare::@1 compare::@18
+  [70] (byte) compare::r#16 ← phi( compare::@1/(const byte) FF#0 compare::@18/(const byte) TT#0 )
+  to:compare::@6
+print_char: scope:[print_char]  from compare::@27 compare::@28 print_byte print_byte::@1
+  [71] (byte*) print_char_cursor#36 ← phi( compare::@27/(byte*) print_char_cursor#11 compare::@28/(byte*) print_char_cursor#11 print_byte/(byte*) print_char_cursor#53 print_byte::@1/(byte*) print_char_cursor#11 )
+  [71] (byte) print_char::ch#4 ← phi( compare::@27/(byte) print_char::ch#2 compare::@28/(byte) ' ' print_byte/(byte) print_char::ch#0 print_byte::@1/(byte) print_char::ch#1 )
   [72] *((byte*) print_char_cursor#36) ← (byte) print_char::ch#4
   [73] (byte*) print_char_cursor#11 ← ++ (byte*) print_char_cursor#36
   to:print_char::@return
 print_char::@return: scope:[print_char]  from print_char
   [74] return 
   to:@return
-print_word: scope:[print_word]  from compare::@11 compare::@36
-  [75] (byte*) print_char_cursor#52 ← phi( compare::@11/(byte*) print_char_cursor#55 compare::@36/(byte*) print_char_cursor#2 )
-  [75] (word) print_word::w#2 ← phi( compare::@11/(word) print_word::w#0 compare::@36/(word) print_word::w#1 )
+print_word: scope:[print_word]  from compare::@26 compare::@6
+  [75] (byte*) print_char_cursor#52 ← phi( compare::@6/(byte*) print_char_cursor#55 compare::@26/(byte*) print_char_cursor#2 )
+  [75] (word) print_word::w#2 ← phi( compare::@6/(word) print_word::w#0 compare::@26/(word) print_word::w#1 )
   [76] (byte) print_byte::b#0 ← > (word) print_word::w#2
   [77] call print_byte 
   to:print_word::@1
@@ -209,7 +209,7 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [88] return 
   to:@return
-print_str: scope:[print_str]  from compare::@35
+print_str: scope:[print_str]  from compare::@25
   [89] phi()
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
diff --git a/src/test/ref/test-comparisons-word.log b/src/test/ref/test-comparisons-word.log
index 7a9390708..ddfa9ddbb 100644
--- a/src/test/ref/test-comparisons-word.log
+++ b/src/test/ref/test-comparisons-word.log
@@ -1702,91 +1702,124 @@ Culled Empty Block (label) main::@20
 Culled Empty Block (label) main::@21
 Culled Empty Block (label) print_ln::@3
 Culled Empty Block (label) print_cls::@3
+Renumbering block @25 to @1
+Renumbering block main::@2 to main::@1
+Renumbering block main::@7 to main::@2
+Renumbering block main::@8 to main::@3
+Renumbering block main::@9 to main::@4
+Renumbering block main::@10 to main::@5
+Renumbering block main::@11 to main::@6
+Renumbering block main::@12 to main::@7
+Renumbering block main::@13 to main::@8
+Renumbering block main::@16 to main::@9
+Renumbering block compare::@11 to compare::@6
+Renumbering block compare::@12 to compare::@7
+Renumbering block compare::@13 to compare::@8
+Renumbering block compare::@14 to compare::@9
+Renumbering block compare::@15 to compare::@10
+Renumbering block compare::@16 to compare::@11
+Renumbering block compare::@17 to compare::@12
+Renumbering block compare::@18 to compare::@13
+Renumbering block compare::@20 to compare::@14
+Renumbering block compare::@22 to compare::@15
+Renumbering block compare::@24 to compare::@16
+Renumbering block compare::@26 to compare::@17
+Renumbering block compare::@28 to compare::@18
+Renumbering block compare::@29 to compare::@19
+Renumbering block compare::@30 to compare::@20
+Renumbering block compare::@31 to compare::@21
+Renumbering block compare::@32 to compare::@22
+Renumbering block compare::@33 to compare::@23
+Renumbering block compare::@34 to compare::@24
+Renumbering block compare::@35 to compare::@25
+Renumbering block compare::@36 to compare::@26
+Renumbering block compare::@37 to compare::@27
+Renumbering block compare::@38 to compare::@28
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @25
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@11
-Adding NOP phi() at start of main::@2
+Adding NOP phi() at start of main::@6
+Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of print_ln
-Adding NOP phi() at start of compare::@18
-Adding NOP phi() at start of compare::@38
-Adding NOP phi() at start of compare::@20
-Adding NOP phi() at start of compare::@22
-Adding NOP phi() at start of compare::@24
-Adding NOP phi() at start of compare::@26
+Adding NOP phi() at start of compare::@13
 Adding NOP phi() at start of compare::@28
+Adding NOP phi() at start of compare::@14
+Adding NOP phi() at start of compare::@15
+Adding NOP phi() at start of compare::@16
+Adding NOP phi() at start of compare::@17
+Adding NOP phi() at start of compare::@18
 Adding NOP phi() at start of print_str
 Adding NOP phi() at start of print_cls
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@25
-@25: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @25
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @25
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
-  to:main::@7
-main::@7: scope:[main]  from main main::@13
-  [6] (byte*) print_line_cursor#32 ← phi( main::@13/(byte*) print_line_cursor#23 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (byte) main::s#8 ← phi( main::@13/(byte) main::s#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [6] (byte*) print_char_cursor#74 ← phi( main::@13/(byte*) print_char_cursor#61 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (byte) main::i#2 ← phi( main::@13/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@2
+main::@2: scope:[main]  from main main::@8
+  [6] (byte*) print_line_cursor#32 ← phi( main::@8/(byte*) print_line_cursor#23 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (byte) main::s#8 ← phi( main::@8/(byte) main::s#10 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [6] (byte*) print_char_cursor#74 ← phi( main::@8/(byte*) print_char_cursor#61 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (byte) main::i#2 ← phi( main::@8/(byte) main::i#1 main/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [7] (byte~) main::$1 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [8] (word) main::w1#0 ← *((const word[]) words#0 + (byte~) main::$1)
-  to:main::@8
-main::@8: scope:[main]  from main::@12 main::@7
-  [9] (byte*) print_line_cursor#31 ← phi( main::@12/(byte*) print_line_cursor#23 main::@7/(byte*) print_line_cursor#32 )
-  [9] (byte) main::s#6 ← phi( main::@12/(byte) main::s#10 main::@7/(byte) main::s#8 )
-  [9] (byte*) print_char_cursor#62 ← phi( main::@12/(byte*) print_char_cursor#61 main::@7/(byte*) print_char_cursor#74 )
-  [9] (byte) main::j#2 ← phi( main::@12/(byte) main::j#1 main::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@3
+main::@3: scope:[main]  from main::@2 main::@7
+  [9] (byte*) print_line_cursor#31 ← phi( main::@7/(byte*) print_line_cursor#23 main::@2/(byte*) print_line_cursor#32 )
+  [9] (byte) main::s#6 ← phi( main::@7/(byte) main::s#10 main::@2/(byte) main::s#8 )
+  [9] (byte*) print_char_cursor#62 ← phi( main::@7/(byte*) print_char_cursor#61 main::@2/(byte*) print_char_cursor#74 )
+  [9] (byte) main::j#2 ← phi( main::@7/(byte) main::j#1 main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [10] (byte~) main::$2 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [11] (word) main::w2#0 ← *((const word[]) words#0 + (byte~) main::$2)
-  to:main::@9
-main::@9: scope:[main]  from main::@10 main::@8
-  [12] (byte*) print_line_cursor#19 ← phi( main::@10/(byte*) print_line_cursor#23 main::@8/(byte*) print_line_cursor#31 )
-  [12] (byte) main::s#3 ← phi( main::@10/(byte) main::s#10 main::@8/(byte) main::s#6 )
-  [12] (byte*) print_char_cursor#55 ← phi( main::@10/(byte*) print_char_cursor#61 main::@8/(byte*) print_char_cursor#62 )
-  [12] (byte) main::op#2 ← phi( main::@10/(byte) main::op#1 main::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@5
+  [12] (byte*) print_line_cursor#19 ← phi( main::@5/(byte*) print_line_cursor#23 main::@3/(byte*) print_line_cursor#31 )
+  [12] (byte) main::s#3 ← phi( main::@5/(byte) main::s#10 main::@3/(byte) main::s#6 )
+  [12] (byte*) print_char_cursor#55 ← phi( main::@5/(byte*) print_char_cursor#61 main::@3/(byte*) print_char_cursor#62 )
+  [12] (byte) main::op#2 ← phi( main::@5/(byte) main::op#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [13] (word) compare::w1#0 ← (word) main::w1#0
   [14] (word) compare::w2#0 ← (word) main::w2#0
   [15] (byte) compare::op#0 ← (byte) main::op#2
   [16] call compare 
-  to:main::@16
-main::@16: scope:[main]  from main::@9
+  to:main::@9
+main::@9: scope:[main]  from main::@4
   [17] (byte) main::s#1 ← ++ (byte) main::s#3
-  [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@10
-  to:main::@11
-main::@11: scope:[main]  from main::@16
+  [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@5
+  to:main::@6
+main::@6: scope:[main]  from main::@9
   [19] phi()
   [20] call print_ln 
   [21] (byte*~) print_char_cursor#101 ← (byte*) print_line_cursor#1
-  to:main::@10
-main::@10: scope:[main]  from main::@11 main::@16
-  [22] (byte*) print_line_cursor#23 ← phi( main::@16/(byte*) print_line_cursor#19 main::@11/(byte*) print_line_cursor#1 )
-  [22] (byte) main::s#10 ← phi( main::@16/(byte) main::s#1 main::@11/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [22] (byte*) print_char_cursor#61 ← phi( main::@16/(byte*) print_char_cursor#11 main::@11/(byte*~) print_char_cursor#101 )
+  to:main::@5
+main::@5: scope:[main]  from main::@6 main::@9
+  [22] (byte*) print_line_cursor#23 ← phi( main::@9/(byte*) print_line_cursor#19 main::@6/(byte*) print_line_cursor#1 )
+  [22] (byte) main::s#10 ← phi( main::@9/(byte) main::s#1 main::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [22] (byte*) print_char_cursor#61 ← phi( main::@9/(byte*) print_char_cursor#11 main::@6/(byte*~) print_char_cursor#101 )
   [23] (byte) main::op#1 ← ++ (byte) main::op#2
-  [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@9
-  to:main::@12
-main::@12: scope:[main]  from main::@10
+  [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@4
+  to:main::@7
+main::@7: scope:[main]  from main::@5
   [25] (byte) main::j#1 ← ++ (byte) main::j#2
-  [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@8
-  to:main::@13
-main::@13: scope:[main]  from main::@12
+  [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [27] (byte) main::i#1 ← ++ (byte) main::i#2
-  [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@7
-  to:main::@2
-main::@2: scope:[main]  from main::@13 main::@2
+  [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@2
+  to:main::@1
+main::@1: scope:[main]  from main::@1 main::@8
   [29] phi()
-  to:main::@2
-print_ln: scope:[print_ln]  from main::@11
+  to:main::@1
+print_ln: scope:[print_ln]  from main::@6
   [30] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -1797,115 +1830,115 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [34] return 
   to:@return
-compare: scope:[compare]  from main::@9
+compare: scope:[compare]  from main::@4
   [35] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@1
-  to:compare::@12
-compare::@12: scope:[compare]  from compare
+  to:compare::@7
+compare::@7: scope:[compare]  from compare
   [36] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto compare::@2
+  to:compare::@8
+compare::@8: scope:[compare]  from compare::@7
+  [37] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto compare::@3
+  to:compare::@9
+compare::@9: scope:[compare]  from compare::@8
+  [38] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto compare::@4
+  to:compare::@10
+compare::@10: scope:[compare]  from compare::@9
+  [39] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto compare::@5
+  to:compare::@11
+compare::@11: scope:[compare]  from compare::@10
+  [40] if((byte) compare::op#0!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto compare::@6
+  to:compare::@12
+compare::@12: scope:[compare]  from compare::@11
+  [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@19
   to:compare::@13
 compare::@13: scope:[compare]  from compare::@12
-  [37] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto compare::@3
-  to:compare::@14
-compare::@14: scope:[compare]  from compare::@13
-  [38] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto compare::@4
-  to:compare::@15
-compare::@15: scope:[compare]  from compare::@14
-  [39] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto compare::@5
-  to:compare::@16
-compare::@16: scope:[compare]  from compare::@15
-  [40] if((byte) compare::op#0!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto compare::@11
-  to:compare::@17
-compare::@17: scope:[compare]  from compare::@16
-  [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@29
-  to:compare::@18
-compare::@18: scope:[compare]  from compare::@17
   [42] phi()
-  to:compare::@29
-compare::@29: scope:[compare]  from compare::@17 compare::@18
-  [43] (byte) compare::r#11 ← phi( compare::@17/(const byte) FF#0 compare::@18/(const byte) TT#0 )
-  to:compare::@11
-compare::@11: scope:[compare]  from compare::@16 compare::@29 compare::@30 compare::@31 compare::@32 compare::@33 compare::@34
-  [44] (byte) compare::r#10 ← phi( compare::@29/(byte) compare::r#11 compare::@30/(byte) compare::r#12 compare::@31/(byte) compare::r#13 compare::@32/(byte) compare::r#14 compare::@33/(byte) compare::r#15 compare::@34/(byte) compare::r#16 compare::@16/(const byte) FF#0 )
-  [44] (byte*) compare::ops#7 ← phi( compare::@29/(const byte*) compare::ops#1 compare::@30/(const byte*) compare::ops#2 compare::@31/(const byte*) compare::ops#3 compare::@32/(const byte*) compare::ops#4 compare::@33/(const byte*) compare::ops#5 compare::@34/(const byte*) compare::ops#6 compare::@16/(byte*) 0 )
+  to:compare::@19
+compare::@19: scope:[compare]  from compare::@12 compare::@13
+  [43] (byte) compare::r#11 ← phi( compare::@12/(const byte) FF#0 compare::@13/(const byte) TT#0 )
+  to:compare::@6
+compare::@6: scope:[compare]  from compare::@11 compare::@19 compare::@20 compare::@21 compare::@22 compare::@23 compare::@24
+  [44] (byte) compare::r#10 ← phi( compare::@19/(byte) compare::r#11 compare::@20/(byte) compare::r#12 compare::@21/(byte) compare::r#13 compare::@22/(byte) compare::r#14 compare::@23/(byte) compare::r#15 compare::@24/(byte) compare::r#16 compare::@11/(const byte) FF#0 )
+  [44] (byte*) compare::ops#7 ← phi( compare::@19/(const byte*) compare::ops#1 compare::@20/(const byte*) compare::ops#2 compare::@21/(const byte*) compare::ops#3 compare::@22/(const byte*) compare::ops#4 compare::@23/(const byte*) compare::ops#5 compare::@24/(const byte*) compare::ops#6 compare::@11/(byte*) 0 )
   [45] (word) print_word::w#0 ← (word) compare::w1#0
   [46] call print_word 
-  to:compare::@35
-compare::@35: scope:[compare]  from compare::@11
+  to:compare::@25
+compare::@25: scope:[compare]  from compare::@6
   [47] (byte*) print_str::str#1 ← (byte*) compare::ops#7
   [48] call print_str 
-  to:compare::@36
-compare::@36: scope:[compare]  from compare::@35
+  to:compare::@26
+compare::@26: scope:[compare]  from compare::@25
   [49] (word) print_word::w#1 ← (word) compare::w2#0
   [50] call print_word 
-  to:compare::@37
-compare::@37: scope:[compare]  from compare::@36
+  to:compare::@27
+compare::@27: scope:[compare]  from compare::@26
   [51] (byte) print_char::ch#2 ← (byte) compare::r#10
   [52] call print_char 
-  to:compare::@38
-compare::@38: scope:[compare]  from compare::@37
+  to:compare::@28
+compare::@28: scope:[compare]  from compare::@27
   [53] phi()
   [54] call print_char 
   to:compare::@return
-compare::@return: scope:[compare]  from compare::@38
+compare::@return: scope:[compare]  from compare::@28
   [55] return 
   to:@return
-compare::@5: scope:[compare]  from compare::@15
-  [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@30
-  to:compare::@20
-compare::@20: scope:[compare]  from compare::@5
+compare::@5: scope:[compare]  from compare::@10
+  [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@20
+  to:compare::@14
+compare::@14: scope:[compare]  from compare::@5
   [57] phi()
-  to:compare::@30
-compare::@30: scope:[compare]  from compare::@20 compare::@5
-  [58] (byte) compare::r#12 ← phi( compare::@20/(const byte) TT#0 compare::@5/(const byte) FF#0 )
-  to:compare::@11
-compare::@4: scope:[compare]  from compare::@14
-  [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@31
-  to:compare::@22
-compare::@22: scope:[compare]  from compare::@4
+  to:compare::@20
+compare::@20: scope:[compare]  from compare::@14 compare::@5
+  [58] (byte) compare::r#12 ← phi( compare::@14/(const byte) TT#0 compare::@5/(const byte) FF#0 )
+  to:compare::@6
+compare::@4: scope:[compare]  from compare::@9
+  [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@21
+  to:compare::@15
+compare::@15: scope:[compare]  from compare::@4
   [60] phi()
-  to:compare::@31
-compare::@31: scope:[compare]  from compare::@22 compare::@4
-  [61] (byte) compare::r#13 ← phi( compare::@22/(const byte) TT#0 compare::@4/(const byte) FF#0 )
-  to:compare::@11
-compare::@3: scope:[compare]  from compare::@13
-  [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@32
-  to:compare::@24
-compare::@24: scope:[compare]  from compare::@3
+  to:compare::@21
+compare::@21: scope:[compare]  from compare::@15 compare::@4
+  [61] (byte) compare::r#13 ← phi( compare::@15/(const byte) TT#0 compare::@4/(const byte) FF#0 )
+  to:compare::@6
+compare::@3: scope:[compare]  from compare::@8
+  [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@22
+  to:compare::@16
+compare::@16: scope:[compare]  from compare::@3
   [63] phi()
-  to:compare::@32
-compare::@32: scope:[compare]  from compare::@24 compare::@3
-  [64] (byte) compare::r#14 ← phi( compare::@24/(const byte) TT#0 compare::@3/(const byte) FF#0 )
-  to:compare::@11
-compare::@2: scope:[compare]  from compare::@12
-  [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@33
-  to:compare::@26
-compare::@26: scope:[compare]  from compare::@2
+  to:compare::@22
+compare::@22: scope:[compare]  from compare::@16 compare::@3
+  [64] (byte) compare::r#14 ← phi( compare::@16/(const byte) TT#0 compare::@3/(const byte) FF#0 )
+  to:compare::@6
+compare::@2: scope:[compare]  from compare::@7
+  [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@23
+  to:compare::@17
+compare::@17: scope:[compare]  from compare::@2
   [66] phi()
-  to:compare::@33
-compare::@33: scope:[compare]  from compare::@2 compare::@26
-  [67] (byte) compare::r#15 ← phi( compare::@2/(const byte) FF#0 compare::@26/(const byte) TT#0 )
-  to:compare::@11
+  to:compare::@23
+compare::@23: scope:[compare]  from compare::@17 compare::@2
+  [67] (byte) compare::r#15 ← phi( compare::@2/(const byte) FF#0 compare::@17/(const byte) TT#0 )
+  to:compare::@6
 compare::@1: scope:[compare]  from compare
-  [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@34
-  to:compare::@28
-compare::@28: scope:[compare]  from compare::@1
+  [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@24
+  to:compare::@18
+compare::@18: scope:[compare]  from compare::@1
   [69] phi()
-  to:compare::@34
-compare::@34: scope:[compare]  from compare::@1 compare::@28
-  [70] (byte) compare::r#16 ← phi( compare::@1/(const byte) FF#0 compare::@28/(const byte) TT#0 )
-  to:compare::@11
-print_char: scope:[print_char]  from compare::@37 compare::@38 print_byte print_byte::@1
-  [71] (byte*) print_char_cursor#36 ← phi( compare::@37/(byte*) print_char_cursor#11 compare::@38/(byte*) print_char_cursor#11 print_byte/(byte*) print_char_cursor#53 print_byte::@1/(byte*) print_char_cursor#11 )
-  [71] (byte) print_char::ch#4 ← phi( compare::@37/(byte) print_char::ch#2 compare::@38/(byte) ' ' print_byte/(byte) print_char::ch#0 print_byte::@1/(byte) print_char::ch#1 )
+  to:compare::@24
+compare::@24: scope:[compare]  from compare::@1 compare::@18
+  [70] (byte) compare::r#16 ← phi( compare::@1/(const byte) FF#0 compare::@18/(const byte) TT#0 )
+  to:compare::@6
+print_char: scope:[print_char]  from compare::@27 compare::@28 print_byte print_byte::@1
+  [71] (byte*) print_char_cursor#36 ← phi( compare::@27/(byte*) print_char_cursor#11 compare::@28/(byte*) print_char_cursor#11 print_byte/(byte*) print_char_cursor#53 print_byte::@1/(byte*) print_char_cursor#11 )
+  [71] (byte) print_char::ch#4 ← phi( compare::@27/(byte) print_char::ch#2 compare::@28/(byte) ' ' print_byte/(byte) print_char::ch#0 print_byte::@1/(byte) print_char::ch#1 )
   [72] *((byte*) print_char_cursor#36) ← (byte) print_char::ch#4
   [73] (byte*) print_char_cursor#11 ← ++ (byte*) print_char_cursor#36
   to:print_char::@return
 print_char::@return: scope:[print_char]  from print_char
   [74] return 
   to:@return
-print_word: scope:[print_word]  from compare::@11 compare::@36
-  [75] (byte*) print_char_cursor#52 ← phi( compare::@11/(byte*) print_char_cursor#55 compare::@36/(byte*) print_char_cursor#2 )
-  [75] (word) print_word::w#2 ← phi( compare::@11/(word) print_word::w#0 compare::@36/(word) print_word::w#1 )
+print_word: scope:[print_word]  from compare::@26 compare::@6
+  [75] (byte*) print_char_cursor#52 ← phi( compare::@6/(byte*) print_char_cursor#55 compare::@26/(byte*) print_char_cursor#2 )
+  [75] (word) print_word::w#2 ← phi( compare::@6/(word) print_word::w#0 compare::@26/(word) print_word::w#1 )
   [76] (byte) print_byte::b#0 ← > (word) print_word::w#2
   [77] call print_byte 
   to:print_word::@1
@@ -1931,7 +1964,7 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [88] return 
   to:@return
-print_str: scope:[print_str]  from compare::@35
+print_str: scope:[print_str]  from compare::@25
   [89] phi()
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
@@ -2223,17 +2256,17 @@ INITIAL ASM
   .label print_line_cursor = 6
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @25 [phi:@begin->@25]
-b25_from_bbegin:
-  jmp b25
-//SEG5 @25
-b25:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @25 to main [phi:@25->main]
-main_from_b25:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @25 to @end [phi:@25->@end]
-bend_from_b25:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -2251,34 +2284,34 @@ main: {
   //SEG12 [96] phi from main to print_cls [phi:main->print_cls]
   print_cls_from_main:
     jsr print_cls
-  //SEG13 [6] phi from main to main::@7 [phi:main->main::@7]
-  b7_from_main:
-  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
+  b2_from_main:
+  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#1] -- vbuz1=vbuc1 
+  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG16 [6] phi (byte*) print_char_cursor#74 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#2] -- pbuz1=pbuc1 
+  //SEG16 [6] phi (byte*) print_char_cursor#74 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#2] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#3] -- vbuz1=vbuc1 
+  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#3] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b7
-  //SEG18 [6] phi from main::@13 to main::@7 [phi:main::@13->main::@7]
-  b7_from_b13:
-  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@13->main::@7#0] -- register_copy 
-  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@13->main::@7#1] -- register_copy 
-  //SEG21 [6] phi (byte*) print_char_cursor#74 = (byte*) print_char_cursor#61 [phi:main::@13->main::@7#2] -- register_copy 
-  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@13->main::@7#3] -- register_copy 
-    jmp b7
-  //SEG23 main::@7
-  b7:
+    jmp b2
+  //SEG18 [6] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
+  b2_from_b8:
+  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@8->main::@2#0] -- register_copy 
+  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@8->main::@2#1] -- register_copy 
+  //SEG21 [6] phi (byte*) print_char_cursor#74 = (byte*) print_char_cursor#61 [phi:main::@8->main::@2#2] -- register_copy 
+  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@2#3] -- register_copy 
+    jmp b2
+  //SEG23 main::@2
+  b2:
   //SEG24 [7] (byte~) main::$1 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_rol_1 
     lda i
     asl
@@ -2289,24 +2322,24 @@ main: {
     sta w1
     lda words+1,y
     sta w1+1
-  //SEG26 [9] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@7->main::@8#0] -- register_copy 
-  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@7->main::@8#1] -- register_copy 
-  //SEG29 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#74 [phi:main::@7->main::@8#2] -- register_copy 
-  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#3] -- vbuz1=vbuc1 
+  //SEG26 [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@2->main::@3#0] -- register_copy 
+  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@2->main::@3#1] -- register_copy 
+  //SEG29 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#74 [phi:main::@2->main::@3#2] -- register_copy 
+  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#3] -- vbuz1=vbuc1 
     lda #0
     sta j
-    jmp b8
-  //SEG31 [9] phi from main::@12 to main::@8 [phi:main::@12->main::@8]
-  b8_from_b12:
-  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@12->main::@8#0] -- register_copy 
-  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@12->main::@8#1] -- register_copy 
-  //SEG34 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#61 [phi:main::@12->main::@8#2] -- register_copy 
-  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@12->main::@8#3] -- register_copy 
-    jmp b8
-  //SEG36 main::@8
-  b8:
+    jmp b3
+  //SEG31 [9] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
+  b3_from_b7:
+  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@7->main::@3#1] -- register_copy 
+  //SEG34 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#61 [phi:main::@7->main::@3#2] -- register_copy 
+  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@7->main::@3#3] -- register_copy 
+    jmp b3
+  //SEG36 main::@3
+  b3:
   //SEG37 [10] (byte~) main::$2 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_rol_1 
     lda j
     asl
@@ -2317,24 +2350,24 @@ main: {
     sta w2
     lda words+1,y
     sta w2+1
-  //SEG39 [12] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  b9_from_b8:
-  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@8->main::@9#0] -- register_copy 
-  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@8->main::@9#1] -- register_copy 
-  //SEG42 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#62 [phi:main::@8->main::@9#2] -- register_copy 
-  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@9#3] -- vbuz1=vbuc1 
+  //SEG39 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@3->main::@4#0] -- register_copy 
+  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@3->main::@4#1] -- register_copy 
+  //SEG42 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#62 [phi:main::@3->main::@4#2] -- register_copy 
+  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#3] -- vbuz1=vbuc1 
     lda #0
     sta op
-    jmp b9
-  //SEG44 [12] phi from main::@10 to main::@9 [phi:main::@10->main::@9]
-  b9_from_b10:
-  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@10->main::@9#0] -- register_copy 
-  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@10->main::@9#1] -- register_copy 
-  //SEG47 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#61 [phi:main::@10->main::@9#2] -- register_copy 
-  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@10->main::@9#3] -- register_copy 
-    jmp b9
-  //SEG49 main::@9
-  b9:
+    jmp b4
+  //SEG44 [12] phi from main::@5 to main::@4 [phi:main::@5->main::@4]
+  b4_from_b5:
+  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@5->main::@4#0] -- register_copy 
+  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@5->main::@4#1] -- register_copy 
+  //SEG47 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#61 [phi:main::@5->main::@4#2] -- register_copy 
+  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@5->main::@4#3] -- register_copy 
+    jmp b4
+  //SEG49 main::@4
+  b4:
   //SEG50 [13] (word) compare::w1#0 ← (word) main::w1#0 -- vwuz1=vwuz2 
     lda w1
     sta compare.w1
@@ -2350,76 +2383,76 @@ main: {
     sta compare.op
   //SEG53 [16] call compare 
     jsr compare
-    jmp b16
-  //SEG54 main::@16
-  b16:
+    jmp b9
+  //SEG54 main::@9
+  b9:
   //SEG55 [17] (byte) main::s#1 ← ++ (byte) main::s#3 -- vbuz1=_inc_vbuz1 
     inc s
-  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp s
-    bne b10_from_b16
-  //SEG57 [19] phi from main::@16 to main::@11 [phi:main::@16->main::@11]
-  b11_from_b16:
-    jmp b11
-  //SEG58 main::@11
-  b11:
+    bne b5_from_b9
+  //SEG57 [19] phi from main::@9 to main::@6 [phi:main::@9->main::@6]
+  b6_from_b9:
+    jmp b6
+  //SEG58 main::@6
+  b6:
   //SEG59 [20] call print_ln 
-  //SEG60 [30] phi from main::@11 to print_ln [phi:main::@11->print_ln]
-  print_ln_from_b11:
+  //SEG60 [30] phi from main::@6 to print_ln [phi:main::@6->print_ln]
+  print_ln_from_b6:
     jsr print_ln
   //SEG61 [21] (byte*~) print_char_cursor#101 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG62 [22] phi from main::@11 to main::@10 [phi:main::@11->main::@10]
-  b10_from_b11:
-  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@11->main::@10#0] -- register_copy 
-  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@11->main::@10#1] -- vbuz1=vbuc1 
+  //SEG62 [22] phi from main::@6 to main::@5 [phi:main::@6->main::@5]
+  b5_from_b6:
+  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@6->main::@5#0] -- register_copy 
+  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@5#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG65 [22] phi (byte*) print_char_cursor#61 = (byte*~) print_char_cursor#101 [phi:main::@11->main::@10#2] -- register_copy 
-    jmp b10
-  //SEG66 [22] phi from main::@16 to main::@10 [phi:main::@16->main::@10]
-  b10_from_b16:
-  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@16->main::@10#0] -- register_copy 
-  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@16->main::@10#1] -- register_copy 
-  //SEG69 [22] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#11 [phi:main::@16->main::@10#2] -- register_copy 
-    jmp b10
-  //SEG70 main::@10
-  b10:
+  //SEG65 [22] phi (byte*) print_char_cursor#61 = (byte*~) print_char_cursor#101 [phi:main::@6->main::@5#2] -- register_copy 
+    jmp b5
+  //SEG66 [22] phi from main::@9 to main::@5 [phi:main::@9->main::@5]
+  b5_from_b9:
+  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@9->main::@5#0] -- register_copy 
+  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@9->main::@5#1] -- register_copy 
+  //SEG69 [22] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#11 [phi:main::@9->main::@5#2] -- register_copy 
+    jmp b5
+  //SEG70 main::@5
+  b5:
   //SEG71 [23] (byte) main::op#1 ← ++ (byte) main::op#2 -- vbuz1=_inc_vbuz1 
     inc op
-  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@9 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp op
-    bne b9_from_b10
-    jmp b12
-  //SEG73 main::@12
-  b12:
+    bne b4_from_b5
+    jmp b7
+  //SEG73 main::@7
+  b7:
   //SEG74 [25] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp j
-    bne b8_from_b12
-    jmp b13
-  //SEG76 main::@13
-  b13:
+    bne b3_from_b7
+    jmp b8
+  //SEG76 main::@8
+  b8:
   //SEG77 [27] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp i
-    bne b7_from_b13
-  //SEG79 [29] phi from main::@13 main::@2 to main::@2 [phi:main::@13/main::@2->main::@2]
-  b2_from_b13:
-  b2_from_b2:
-    jmp b2
-  //SEG80 main::@2
-  b2:
-    jmp b2_from_b2
+    bne b2_from_b8
+  //SEG79 [29] phi from main::@1 main::@8 to main::@1 [phi:main::@1/main::@8->main::@1]
+  b1_from_b1:
+  b1_from_b8:
+    jmp b1
+  //SEG80 main::@1
+  b1:
+    jmp b1_from_b1
 }
 //SEG81 print_ln
 // Print a newline
@@ -2467,152 +2500,152 @@ compare: {
     lda op
     cmp #0
     beq b1
-    jmp b12
-  //SEG91 compare::@12
-  b12:
+    jmp b7
+  //SEG91 compare::@7
+  b7:
   //SEG92 [36] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto compare::@2 -- vbuz1_eq_vbuc1_then_la1 
     lda #1
     cmp op
     beq b2
-    jmp b13
-  //SEG93 compare::@13
-  b13:
+    jmp b8
+  //SEG93 compare::@8
+  b8:
   //SEG94 [37] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto compare::@3 -- vbuz1_eq_vbuc1_then_la1 
     lda #2
     cmp op
     beq b3
-    jmp b14
-  //SEG95 compare::@14
-  b14:
+    jmp b9
+  //SEG95 compare::@9
+  b9:
   //SEG96 [38] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto compare::@4 -- vbuz1_eq_vbuc1_then_la1 
     lda #3
     cmp op
     beq b4
-    jmp b15
-  //SEG97 compare::@15
-  b15:
+    jmp b10
+  //SEG97 compare::@10
+  b10:
   //SEG98 [39] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto compare::@5 -- vbuz1_eq_vbuc1_then_la1 
     lda #4
     cmp op
     beq b5
-    jmp b16
-  //SEG99 compare::@16
-  b16:
-  //SEG100 [40] if((byte) compare::op#0!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto compare::@11 -- vbuz1_neq_vbuc1_then_la1 
+    jmp b11
+  //SEG99 compare::@11
+  b11:
+  //SEG100 [40] if((byte) compare::op#0!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto compare::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #5
     cmp op
-    bne b11_from_b16
-    jmp b17
-  //SEG101 compare::@17
-  b17:
-  //SEG102 [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@29 -- vwuz1_eq_vwuz2_then_la1 
+    bne b6_from_b11
+    jmp b12
+  //SEG101 compare::@12
+  b12:
+  //SEG102 [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@19 -- vwuz1_eq_vwuz2_then_la1 
     lda w1
     cmp w2
     bne !+
     lda w1+1
     cmp w2+1
-    beq b29_from_b17
+    beq b19_from_b12
   !:
-  //SEG103 [42] phi from compare::@17 to compare::@18 [phi:compare::@17->compare::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG104 compare::@18
-  b18:
-  //SEG105 [43] phi from compare::@18 to compare::@29 [phi:compare::@18->compare::@29]
-  b29_from_b18:
-  //SEG106 [43] phi (byte) compare::r#11 = (const byte) TT#0 [phi:compare::@18->compare::@29#0] -- vbuz1=vbuc1 
+  //SEG103 [42] phi from compare::@12 to compare::@13 [phi:compare::@12->compare::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG104 compare::@13
+  b13:
+  //SEG105 [43] phi from compare::@13 to compare::@19 [phi:compare::@13->compare::@19]
+  b19_from_b13:
+  //SEG106 [43] phi (byte) compare::r#11 = (const byte) TT#0 [phi:compare::@13->compare::@19#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b29
-  //SEG107 [43] phi from compare::@17 to compare::@29 [phi:compare::@17->compare::@29]
-  b29_from_b17:
-  //SEG108 [43] phi (byte) compare::r#11 = (const byte) FF#0 [phi:compare::@17->compare::@29#0] -- vbuz1=vbuc1 
+    jmp b19
+  //SEG107 [43] phi from compare::@12 to compare::@19 [phi:compare::@12->compare::@19]
+  b19_from_b12:
+  //SEG108 [43] phi (byte) compare::r#11 = (const byte) FF#0 [phi:compare::@12->compare::@19#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b29
-  //SEG109 compare::@29
-  b29:
-  //SEG110 [44] phi from compare::@29 to compare::@11 [phi:compare::@29->compare::@11]
-  b11_from_b29:
-  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#11 [phi:compare::@29->compare::@11#0] -- register_copy 
-  //SEG112 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#1 [phi:compare::@29->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b19
+  //SEG109 compare::@19
+  b19:
+  //SEG110 [44] phi from compare::@19 to compare::@6 [phi:compare::@19->compare::@6]
+  b6_from_b19:
+  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#11 [phi:compare::@19->compare::@6#0] -- register_copy 
+  //SEG112 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#1 [phi:compare::@19->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_1
     sta ops
     lda #>ops_1
     sta ops+1
-    jmp b11
-  //SEG113 [44] phi from compare::@16 to compare::@11 [phi:compare::@16->compare::@11]
-  b11_from_b16:
-  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@16->compare::@11#0] -- vbuz1=vbuc1 
+    jmp b6
+  //SEG113 [44] phi from compare::@11 to compare::@6 [phi:compare::@11->compare::@6]
+  b6_from_b11:
+  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@11->compare::@6#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG115 [44] phi (byte*) compare::ops#7 = (byte*) 0 [phi:compare::@16->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG115 [44] phi (byte*) compare::ops#7 = (byte*) 0 [phi:compare::@11->compare::@6#1] -- pbuz1=pbuc1 
     lda #<0
     sta ops
     lda #>0
     sta ops+1
-    jmp b11
-  //SEG116 compare::@11
-  b11:
+    jmp b6
+  //SEG116 compare::@6
+  b6:
   //SEG117 [45] (word) print_word::w#0 ← (word) compare::w1#0 -- vwuz1=vwuz2 
     lda w1
     sta print_word.w
     lda w1+1
     sta print_word.w+1
   //SEG118 [46] call print_word 
-  //SEG119 [75] phi from compare::@11 to print_word [phi:compare::@11->print_word]
-  print_word_from_b11:
-  //SEG120 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#55 [phi:compare::@11->print_word#0] -- register_copy 
-  //SEG121 [75] phi (word) print_word::w#2 = (word) print_word::w#0 [phi:compare::@11->print_word#1] -- register_copy 
+  //SEG119 [75] phi from compare::@6 to print_word [phi:compare::@6->print_word]
+  print_word_from_b6:
+  //SEG120 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#55 [phi:compare::@6->print_word#0] -- register_copy 
+  //SEG121 [75] phi (word) print_word::w#2 = (word) print_word::w#0 [phi:compare::@6->print_word#1] -- register_copy 
     jsr print_word
-    jmp b35
-  //SEG122 compare::@35
-  b35:
+    jmp b25
+  //SEG122 compare::@25
+  b25:
   //SEG123 [47] (byte*) print_str::str#1 ← (byte*) compare::ops#7 -- pbuz1=pbuz2 
     lda ops
     sta print_str.str
     lda ops+1
     sta print_str.str+1
   //SEG124 [48] call print_str 
-  //SEG125 [89] phi from compare::@35 to print_str [phi:compare::@35->print_str]
-  print_str_from_b35:
+  //SEG125 [89] phi from compare::@25 to print_str [phi:compare::@25->print_str]
+  print_str_from_b25:
     jsr print_str
-    jmp b36
-  //SEG126 compare::@36
-  b36:
+    jmp b26
+  //SEG126 compare::@26
+  b26:
   //SEG127 [49] (word) print_word::w#1 ← (word) compare::w2#0 -- vwuz1=vwuz2 
     lda w2
     sta print_word.w
     lda w2+1
     sta print_word.w+1
   //SEG128 [50] call print_word 
-  //SEG129 [75] phi from compare::@36 to print_word [phi:compare::@36->print_word]
-  print_word_from_b36:
-  //SEG130 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#2 [phi:compare::@36->print_word#0] -- register_copy 
-  //SEG131 [75] phi (word) print_word::w#2 = (word) print_word::w#1 [phi:compare::@36->print_word#1] -- register_copy 
+  //SEG129 [75] phi from compare::@26 to print_word [phi:compare::@26->print_word]
+  print_word_from_b26:
+  //SEG130 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#2 [phi:compare::@26->print_word#0] -- register_copy 
+  //SEG131 [75] phi (word) print_word::w#2 = (word) print_word::w#1 [phi:compare::@26->print_word#1] -- register_copy 
     jsr print_word
-    jmp b37
-  //SEG132 compare::@37
-  b37:
+    jmp b27
+  //SEG132 compare::@27
+  b27:
   //SEG133 [51] (byte) print_char::ch#2 ← (byte) compare::r#10 -- vbuz1=vbuz2 
     lda r
     sta print_char.ch
   //SEG134 [52] call print_char 
-  //SEG135 [71] phi from compare::@37 to print_char [phi:compare::@37->print_char]
-  print_char_from_b37:
-  //SEG136 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@37->print_char#0] -- register_copy 
-  //SEG137 [71] phi (byte) print_char::ch#4 = (byte) print_char::ch#2 [phi:compare::@37->print_char#1] -- register_copy 
+  //SEG135 [71] phi from compare::@27 to print_char [phi:compare::@27->print_char]
+  print_char_from_b27:
+  //SEG136 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@27->print_char#0] -- register_copy 
+  //SEG137 [71] phi (byte) print_char::ch#4 = (byte) print_char::ch#2 [phi:compare::@27->print_char#1] -- register_copy 
     jsr print_char
-  //SEG138 [53] phi from compare::@37 to compare::@38 [phi:compare::@37->compare::@38]
-  b38_from_b37:
-    jmp b38
-  //SEG139 compare::@38
-  b38:
+  //SEG138 [53] phi from compare::@27 to compare::@28 [phi:compare::@27->compare::@28]
+  b28_from_b27:
+    jmp b28
+  //SEG139 compare::@28
+  b28:
   //SEG140 [54] call print_char 
-  //SEG141 [71] phi from compare::@38 to print_char [phi:compare::@38->print_char]
-  print_char_from_b38:
-  //SEG142 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@38->print_char#0] -- register_copy 
-  //SEG143 [71] phi (byte) print_char::ch#4 = (byte) ' ' [phi:compare::@38->print_char#1] -- vbuz1=vbuc1 
+  //SEG141 [71] phi from compare::@28 to print_char [phi:compare::@28->print_char]
+  print_char_from_b28:
+  //SEG142 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@28->print_char#0] -- register_copy 
+  //SEG143 [71] phi (byte) print_char::ch#4 = (byte) ' ' [phi:compare::@28->print_char#1] -- vbuz1=vbuc1 
     lda #' '
     sta print_char.ch
     jsr print_char
@@ -2623,197 +2656,197 @@ compare: {
     rts
   //SEG146 compare::@5
   b5:
-  //SEG147 [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@30 -- vwuz1_neq_vwuz2_then_la1 
+  //SEG147 [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@20 -- vwuz1_neq_vwuz2_then_la1 
     lda w1+1
     cmp w2+1
-    bne b30_from_b5
+    bne b20_from_b5
     lda w1
     cmp w2
-    bne b30_from_b5
-  //SEG148 [57] phi from compare::@5 to compare::@20 [phi:compare::@5->compare::@20]
-  b20_from_b5:
-    jmp b20
-  //SEG149 compare::@20
-  b20:
-  //SEG150 [58] phi from compare::@20 to compare::@30 [phi:compare::@20->compare::@30]
-  b30_from_b20:
-  //SEG151 [58] phi (byte) compare::r#12 = (const byte) TT#0 [phi:compare::@20->compare::@30#0] -- vbuz1=vbuc1 
+    bne b20_from_b5
+  //SEG148 [57] phi from compare::@5 to compare::@14 [phi:compare::@5->compare::@14]
+  b14_from_b5:
+    jmp b14
+  //SEG149 compare::@14
+  b14:
+  //SEG150 [58] phi from compare::@14 to compare::@20 [phi:compare::@14->compare::@20]
+  b20_from_b14:
+  //SEG151 [58] phi (byte) compare::r#12 = (const byte) TT#0 [phi:compare::@14->compare::@20#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b30
-  //SEG152 [58] phi from compare::@5 to compare::@30 [phi:compare::@5->compare::@30]
-  b30_from_b5:
-  //SEG153 [58] phi (byte) compare::r#12 = (const byte) FF#0 [phi:compare::@5->compare::@30#0] -- vbuz1=vbuc1 
+    jmp b20
+  //SEG152 [58] phi from compare::@5 to compare::@20 [phi:compare::@5->compare::@20]
+  b20_from_b5:
+  //SEG153 [58] phi (byte) compare::r#12 = (const byte) FF#0 [phi:compare::@5->compare::@20#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b30
-  //SEG154 compare::@30
-  b30:
-  //SEG155 [44] phi from compare::@30 to compare::@11 [phi:compare::@30->compare::@11]
-  b11_from_b30:
-  //SEG156 [44] phi (byte) compare::r#10 = (byte) compare::r#12 [phi:compare::@30->compare::@11#0] -- register_copy 
-  //SEG157 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#2 [phi:compare::@30->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b20
+  //SEG154 compare::@20
+  b20:
+  //SEG155 [44] phi from compare::@20 to compare::@6 [phi:compare::@20->compare::@6]
+  b6_from_b20:
+  //SEG156 [44] phi (byte) compare::r#10 = (byte) compare::r#12 [phi:compare::@20->compare::@6#0] -- register_copy 
+  //SEG157 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#2 [phi:compare::@20->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_2
     sta ops
     lda #>ops_2
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG158 compare::@4
   b4:
-  //SEG159 [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@31 -- vwuz1_lt_vwuz2_then_la1 
+  //SEG159 [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@21 -- vwuz1_lt_vwuz2_then_la1 
     lda w1+1
     cmp w2+1
-    bcc b31_from_b4
+    bcc b21_from_b4
     bne !+
     lda w1
     cmp w2
-    bcc b31_from_b4
+    bcc b21_from_b4
   !:
-  //SEG160 [60] phi from compare::@4 to compare::@22 [phi:compare::@4->compare::@22]
-  b22_from_b4:
-    jmp b22
-  //SEG161 compare::@22
-  b22:
-  //SEG162 [61] phi from compare::@22 to compare::@31 [phi:compare::@22->compare::@31]
-  b31_from_b22:
-  //SEG163 [61] phi (byte) compare::r#13 = (const byte) TT#0 [phi:compare::@22->compare::@31#0] -- vbuz1=vbuc1 
+  //SEG160 [60] phi from compare::@4 to compare::@15 [phi:compare::@4->compare::@15]
+  b15_from_b4:
+    jmp b15
+  //SEG161 compare::@15
+  b15:
+  //SEG162 [61] phi from compare::@15 to compare::@21 [phi:compare::@15->compare::@21]
+  b21_from_b15:
+  //SEG163 [61] phi (byte) compare::r#13 = (const byte) TT#0 [phi:compare::@15->compare::@21#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b31
-  //SEG164 [61] phi from compare::@4 to compare::@31 [phi:compare::@4->compare::@31]
-  b31_from_b4:
-  //SEG165 [61] phi (byte) compare::r#13 = (const byte) FF#0 [phi:compare::@4->compare::@31#0] -- vbuz1=vbuc1 
+    jmp b21
+  //SEG164 [61] phi from compare::@4 to compare::@21 [phi:compare::@4->compare::@21]
+  b21_from_b4:
+  //SEG165 [61] phi (byte) compare::r#13 = (const byte) FF#0 [phi:compare::@4->compare::@21#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b31
-  //SEG166 compare::@31
-  b31:
-  //SEG167 [44] phi from compare::@31 to compare::@11 [phi:compare::@31->compare::@11]
-  b11_from_b31:
-  //SEG168 [44] phi (byte) compare::r#10 = (byte) compare::r#13 [phi:compare::@31->compare::@11#0] -- register_copy 
-  //SEG169 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#3 [phi:compare::@31->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b21
+  //SEG166 compare::@21
+  b21:
+  //SEG167 [44] phi from compare::@21 to compare::@6 [phi:compare::@21->compare::@6]
+  b6_from_b21:
+  //SEG168 [44] phi (byte) compare::r#10 = (byte) compare::r#13 [phi:compare::@21->compare::@6#0] -- register_copy 
+  //SEG169 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#3 [phi:compare::@21->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_3
     sta ops
     lda #>ops_3
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG170 compare::@3
   b3:
-  //SEG171 [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@32 -- vwuz1_le_vwuz2_then_la1 
+  //SEG171 [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@22 -- vwuz1_le_vwuz2_then_la1 
     lda w1+1
     cmp w2+1
     bne !+
     lda w1
     cmp w2
   !:
-    bcc b32_from_b3
-    beq b32_from_b3
-  //SEG172 [63] phi from compare::@3 to compare::@24 [phi:compare::@3->compare::@24]
-  b24_from_b3:
-    jmp b24
-  //SEG173 compare::@24
-  b24:
-  //SEG174 [64] phi from compare::@24 to compare::@32 [phi:compare::@24->compare::@32]
-  b32_from_b24:
-  //SEG175 [64] phi (byte) compare::r#14 = (const byte) TT#0 [phi:compare::@24->compare::@32#0] -- vbuz1=vbuc1 
+    bcc b22_from_b3
+    beq b22_from_b3
+  //SEG172 [63] phi from compare::@3 to compare::@16 [phi:compare::@3->compare::@16]
+  b16_from_b3:
+    jmp b16
+  //SEG173 compare::@16
+  b16:
+  //SEG174 [64] phi from compare::@16 to compare::@22 [phi:compare::@16->compare::@22]
+  b22_from_b16:
+  //SEG175 [64] phi (byte) compare::r#14 = (const byte) TT#0 [phi:compare::@16->compare::@22#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b32
-  //SEG176 [64] phi from compare::@3 to compare::@32 [phi:compare::@3->compare::@32]
-  b32_from_b3:
-  //SEG177 [64] phi (byte) compare::r#14 = (const byte) FF#0 [phi:compare::@3->compare::@32#0] -- vbuz1=vbuc1 
+    jmp b22
+  //SEG176 [64] phi from compare::@3 to compare::@22 [phi:compare::@3->compare::@22]
+  b22_from_b3:
+  //SEG177 [64] phi (byte) compare::r#14 = (const byte) FF#0 [phi:compare::@3->compare::@22#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b32
-  //SEG178 compare::@32
-  b32:
-  //SEG179 [44] phi from compare::@32 to compare::@11 [phi:compare::@32->compare::@11]
-  b11_from_b32:
-  //SEG180 [44] phi (byte) compare::r#10 = (byte) compare::r#14 [phi:compare::@32->compare::@11#0] -- register_copy 
-  //SEG181 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#4 [phi:compare::@32->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b22
+  //SEG178 compare::@22
+  b22:
+  //SEG179 [44] phi from compare::@22 to compare::@6 [phi:compare::@22->compare::@6]
+  b6_from_b22:
+  //SEG180 [44] phi (byte) compare::r#10 = (byte) compare::r#14 [phi:compare::@22->compare::@6#0] -- register_copy 
+  //SEG181 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#4 [phi:compare::@22->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_4
     sta ops
     lda #>ops_4
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG182 compare::@2
   b2:
-  //SEG183 [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@33 -- vwuz1_gt_vwuz2_then_la1 
+  //SEG183 [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@23 -- vwuz1_gt_vwuz2_then_la1 
     lda w2+1
     cmp w1+1
-    bcc b33_from_b2
+    bcc b23_from_b2
     bne !+
     lda w2
     cmp w1
-    bcc b33_from_b2
+    bcc b23_from_b2
   !:
-  //SEG184 [66] phi from compare::@2 to compare::@26 [phi:compare::@2->compare::@26]
-  b26_from_b2:
-    jmp b26
-  //SEG185 compare::@26
-  b26:
-  //SEG186 [67] phi from compare::@26 to compare::@33 [phi:compare::@26->compare::@33]
-  b33_from_b26:
-  //SEG187 [67] phi (byte) compare::r#15 = (const byte) TT#0 [phi:compare::@26->compare::@33#0] -- vbuz1=vbuc1 
+  //SEG184 [66] phi from compare::@2 to compare::@17 [phi:compare::@2->compare::@17]
+  b17_from_b2:
+    jmp b17
+  //SEG185 compare::@17
+  b17:
+  //SEG186 [67] phi from compare::@17 to compare::@23 [phi:compare::@17->compare::@23]
+  b23_from_b17:
+  //SEG187 [67] phi (byte) compare::r#15 = (const byte) TT#0 [phi:compare::@17->compare::@23#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b33
-  //SEG188 [67] phi from compare::@2 to compare::@33 [phi:compare::@2->compare::@33]
-  b33_from_b2:
-  //SEG189 [67] phi (byte) compare::r#15 = (const byte) FF#0 [phi:compare::@2->compare::@33#0] -- vbuz1=vbuc1 
+    jmp b23
+  //SEG188 [67] phi from compare::@2 to compare::@23 [phi:compare::@2->compare::@23]
+  b23_from_b2:
+  //SEG189 [67] phi (byte) compare::r#15 = (const byte) FF#0 [phi:compare::@2->compare::@23#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b33
-  //SEG190 compare::@33
-  b33:
-  //SEG191 [44] phi from compare::@33 to compare::@11 [phi:compare::@33->compare::@11]
-  b11_from_b33:
-  //SEG192 [44] phi (byte) compare::r#10 = (byte) compare::r#15 [phi:compare::@33->compare::@11#0] -- register_copy 
-  //SEG193 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#5 [phi:compare::@33->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b23
+  //SEG190 compare::@23
+  b23:
+  //SEG191 [44] phi from compare::@23 to compare::@6 [phi:compare::@23->compare::@6]
+  b6_from_b23:
+  //SEG192 [44] phi (byte) compare::r#10 = (byte) compare::r#15 [phi:compare::@23->compare::@6#0] -- register_copy 
+  //SEG193 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#5 [phi:compare::@23->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_5
     sta ops
     lda #>ops_5
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG194 compare::@1
   b1:
-  //SEG195 [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@34 -- vwuz1_ge_vwuz2_then_la1 
+  //SEG195 [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@24 -- vwuz1_ge_vwuz2_then_la1 
     lda w2+1
     cmp w1+1
     bne !+
     lda w2
     cmp w1
   !:
-    bcc b34_from_b1
-    beq b34_from_b1
-  //SEG196 [69] phi from compare::@1 to compare::@28 [phi:compare::@1->compare::@28]
-  b28_from_b1:
-    jmp b28
-  //SEG197 compare::@28
-  b28:
-  //SEG198 [70] phi from compare::@28 to compare::@34 [phi:compare::@28->compare::@34]
-  b34_from_b28:
-  //SEG199 [70] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@28->compare::@34#0] -- vbuz1=vbuc1 
+    bcc b24_from_b1
+    beq b24_from_b1
+  //SEG196 [69] phi from compare::@1 to compare::@18 [phi:compare::@1->compare::@18]
+  b18_from_b1:
+    jmp b18
+  //SEG197 compare::@18
+  b18:
+  //SEG198 [70] phi from compare::@18 to compare::@24 [phi:compare::@18->compare::@24]
+  b24_from_b18:
+  //SEG199 [70] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@18->compare::@24#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b34
-  //SEG200 [70] phi from compare::@1 to compare::@34 [phi:compare::@1->compare::@34]
-  b34_from_b1:
-  //SEG201 [70] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@1->compare::@34#0] -- vbuz1=vbuc1 
+    jmp b24
+  //SEG200 [70] phi from compare::@1 to compare::@24 [phi:compare::@1->compare::@24]
+  b24_from_b1:
+  //SEG201 [70] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@1->compare::@24#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b34
-  //SEG202 compare::@34
-  b34:
-  //SEG203 [44] phi from compare::@34 to compare::@11 [phi:compare::@34->compare::@11]
-  b11_from_b34:
-  //SEG204 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@34->compare::@11#0] -- register_copy 
-  //SEG205 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#6 [phi:compare::@34->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b24
+  //SEG202 compare::@24
+  b24:
+  //SEG203 [44] phi from compare::@24 to compare::@6 [phi:compare::@24->compare::@6]
+  b6_from_b24:
+  //SEG204 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@24->compare::@6#0] -- register_copy 
+  //SEG205 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#6 [phi:compare::@24->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_6
     sta ops
     lda #>ops_6
     sta ops+1
-    jmp b11
+    jmp b6
     ops_1: .text "!=@"
     ops_2: .text "==@"
     ops_3: .text ">=@"
@@ -3019,16 +3052,16 @@ Statement [14] (word) compare::w2#0 ← (word) main::w2#0 [ main::i#2 main::w1#0
 Statement [21] (byte*~) print_char_cursor#101 ← (byte*) print_line_cursor#1 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_char_cursor#101 print_line_cursor#1 ] ( main:2 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_char_cursor#101 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [32] (byte*) print_line_cursor#1 ← (byte*) print_line_cursor#9 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#1 print_char_cursor#11 ] ( main:2::print_ln:20 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_line_cursor#1 print_char_cursor#11 ] ) always clobbers reg byte a 
 Statement [33] if((byte*) print_line_cursor#1<(byte*) print_char_cursor#11) goto print_ln::@1 [ print_line_cursor#1 print_char_cursor#11 ] ( main:2::print_ln:20 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_line_cursor#1 print_char_cursor#11 ] ) always clobbers reg byte a 
-Statement [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@29 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@19 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
 Statement [45] (word) print_word::w#0 ← (word) compare::w1#0 [ print_char_cursor#55 compare::w2#0 compare::ops#7 compare::r#10 print_word::w#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w2#0 compare::ops#7 compare::r#10 print_word::w#0 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:10 [ compare::r#10 compare::r#11 compare::r#12 compare::r#13 compare::r#14 compare::r#15 compare::r#16 ]
 Statement [47] (byte*) print_str::str#1 ← (byte*) compare::ops#7 [ compare::w2#0 print_char_cursor#11 compare::r#10 print_str::str#1 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 print_char_cursor#11 compare::r#10 print_str::str#1 ] ) always clobbers reg byte a 
 Statement [49] (word) print_word::w#1 ← (word) compare::w2#0 [ compare::r#10 print_word::w#1 print_char_cursor#2 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_word::w#1 print_char_cursor#2 ] ) always clobbers reg byte a 
-Statement [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@30 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@31 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@32 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@33 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@34 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@20 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@21 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@22 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@23 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@24 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
 Statement [72] *((byte*) print_char_cursor#36) ← (byte) print_char::ch#4 [ print_char_cursor#36 ] ( main:2::compare:16::print_char:52 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#36 ] main:2::compare:16::print_char:54 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#36 ] main:2::compare:16::print_word:46::print_byte:77::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#7 compare::r#10 print_word::w#2 print_byte::b#2 print_char_cursor#36 ] main:2::compare:16::print_word:50::print_byte:77::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_word::w#2 print_byte::b#2 print_char_cursor#36 ] main:2::compare:16::print_word:46::print_byte:79::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#7 compare::r#10 print_byte::b#2 print_char_cursor#36 ] main:2::compare:16::print_word:50::print_byte:79::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_byte::b#2 print_char_cursor#36 ] main:2::compare:16::print_word:46::print_byte:77::print_char:87 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#7 compare::r#10 print_word::w#2 print_char_cursor#36 ] main:2::compare:16::print_word:50::print_byte:77::print_char:87 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_word::w#2 print_char_cursor#36 ] main:2::compare:16::print_word:46::print_byte:79::print_char:87 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#7 compare::r#10 print_char_cursor#36 ] main:2::compare:16::print_word:50::print_byte:79::print_char:87 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_char_cursor#36 ] ) always clobbers reg byte y 
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:2 [ main::i#2 main::i#1 ]
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:3 [ main::j#2 main::j#1 ]
@@ -3054,15 +3087,15 @@ Statement [14] (word) compare::w2#0 ← (word) main::w2#0 [ main::i#2 main::w1#0
 Statement [21] (byte*~) print_char_cursor#101 ← (byte*) print_line_cursor#1 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_char_cursor#101 print_line_cursor#1 ] ( main:2 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_char_cursor#101 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [32] (byte*) print_line_cursor#1 ← (byte*) print_line_cursor#9 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#1 print_char_cursor#11 ] ( main:2::print_ln:20 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_line_cursor#1 print_char_cursor#11 ] ) always clobbers reg byte a 
 Statement [33] if((byte*) print_line_cursor#1<(byte*) print_char_cursor#11) goto print_ln::@1 [ print_line_cursor#1 print_char_cursor#11 ] ( main:2::print_ln:20 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 print_line_cursor#1 print_char_cursor#11 ] ) always clobbers reg byte a 
-Statement [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@29 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@19 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
 Statement [45] (word) print_word::w#0 ← (word) compare::w1#0 [ print_char_cursor#55 compare::w2#0 compare::ops#7 compare::r#10 print_word::w#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w2#0 compare::ops#7 compare::r#10 print_word::w#0 ] ) always clobbers reg byte a 
 Statement [47] (byte*) print_str::str#1 ← (byte*) compare::ops#7 [ compare::w2#0 print_char_cursor#11 compare::r#10 print_str::str#1 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 print_char_cursor#11 compare::r#10 print_str::str#1 ] ) always clobbers reg byte a 
 Statement [49] (word) print_word::w#1 ← (word) compare::w2#0 [ compare::r#10 print_word::w#1 print_char_cursor#2 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_word::w#1 print_char_cursor#2 ] ) always clobbers reg byte a 
-Statement [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@30 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@31 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@32 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@33 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
-Statement [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@34 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@20 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@21 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@22 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@23 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
+Statement [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@24 [ print_char_cursor#55 compare::w1#0 compare::w2#0 ] ( main:2::compare:16 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#55 compare::w1#0 compare::w2#0 ] ) always clobbers reg byte a 
 Statement [72] *((byte*) print_char_cursor#36) ← (byte) print_char::ch#4 [ print_char_cursor#36 ] ( main:2::compare:16::print_char:52 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#36 ] main:2::compare:16::print_char:54 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 print_char_cursor#36 ] main:2::compare:16::print_word:46::print_byte:77::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#7 compare::r#10 print_word::w#2 print_byte::b#2 print_char_cursor#36 ] main:2::compare:16::print_word:50::print_byte:77::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_word::w#2 print_byte::b#2 print_char_cursor#36 ] main:2::compare:16::print_word:46::print_byte:79::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#7 compare::r#10 print_byte::b#2 print_char_cursor#36 ] main:2::compare:16::print_word:50::print_byte:79::print_char:84 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_byte::b#2 print_char_cursor#36 ] main:2::compare:16::print_word:46::print_byte:77::print_char:87 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#7 compare::r#10 print_word::w#2 print_char_cursor#36 ] main:2::compare:16::print_word:50::print_byte:77::print_char:87 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_word::w#2 print_char_cursor#36 ] main:2::compare:16::print_word:46::print_byte:79::print_char:87 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#7 compare::r#10 print_char_cursor#36 ] main:2::compare:16::print_word:50::print_byte:79::print_char:87 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_char_cursor#36 ] ) always clobbers reg byte y 
 Statement [76] (byte) print_byte::b#0 ← > (word) print_word::w#2 [ print_word::w#2 print_char_cursor#52 print_byte::b#0 ] ( main:2::compare:16::print_word:46 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#7 compare::r#10 print_word::w#2 print_char_cursor#52 print_byte::b#0 ] main:2::compare:16::print_word:50 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_word::w#2 print_char_cursor#52 print_byte::b#0 ] ) always clobbers reg byte a 
 Statement [78] (byte) print_byte::b#1 ← < (word) print_word::w#2 [ print_char_cursor#11 print_byte::b#1 ] ( main:2::compare:16::print_word:46 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::w2#0 compare::ops#7 compare::r#10 print_char_cursor#11 print_byte::b#1 ] main:2::compare:16::print_word:50 [ main::i#2 main::w1#0 main::j#2 main::w2#0 main::op#2 main::s#3 print_line_cursor#19 compare::r#10 print_char_cursor#11 print_byte::b#1 ] ) always clobbers reg byte a 
@@ -3155,17 +3188,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 5
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @25 [phi:@begin->@25]
-b25_from_bbegin:
-  jmp b25
-//SEG5 @25
-b25:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @25 to main [phi:@25->main]
-main_from_b25:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @25 to @end [phi:@25->@end]
-bend_from_b25:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3180,34 +3213,34 @@ main: {
   //SEG12 [96] phi from main to print_cls [phi:main->print_cls]
   print_cls_from_main:
     jsr print_cls
-  //SEG13 [6] phi from main to main::@7 [phi:main->main::@7]
-  b7_from_main:
-  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
+  b2_from_main:
+  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#1] -- vbuz1=vbuc1 
+  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG16 [6] phi (byte*) print_char_cursor#74 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#2] -- pbuz1=pbuc1 
+  //SEG16 [6] phi (byte*) print_char_cursor#74 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#2] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#3] -- vbuz1=vbuc1 
+  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#3] -- vbuz1=vbuc1 
     lda #0
     sta i
-    jmp b7
-  //SEG18 [6] phi from main::@13 to main::@7 [phi:main::@13->main::@7]
-  b7_from_b13:
-  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@13->main::@7#0] -- register_copy 
-  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@13->main::@7#1] -- register_copy 
-  //SEG21 [6] phi (byte*) print_char_cursor#74 = (byte*) print_char_cursor#61 [phi:main::@13->main::@7#2] -- register_copy 
-  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@13->main::@7#3] -- register_copy 
-    jmp b7
-  //SEG23 main::@7
-  b7:
+    jmp b2
+  //SEG18 [6] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
+  b2_from_b8:
+  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@8->main::@2#0] -- register_copy 
+  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@8->main::@2#1] -- register_copy 
+  //SEG21 [6] phi (byte*) print_char_cursor#74 = (byte*) print_char_cursor#61 [phi:main::@8->main::@2#2] -- register_copy 
+  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@2#3] -- register_copy 
+    jmp b2
+  //SEG23 main::@2
+  b2:
   //SEG24 [7] (byte~) main::$1 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_rol_1 
     lda i
     asl
@@ -3217,24 +3250,24 @@ main: {
     sta w1
     lda words+1,y
     sta w1+1
-  //SEG26 [9] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@7->main::@8#0] -- register_copy 
-  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@7->main::@8#1] -- register_copy 
-  //SEG29 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#74 [phi:main::@7->main::@8#2] -- register_copy 
-  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#3] -- vbuz1=vbuc1 
+  //SEG26 [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  b3_from_b2:
+  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@2->main::@3#0] -- register_copy 
+  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@2->main::@3#1] -- register_copy 
+  //SEG29 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#74 [phi:main::@2->main::@3#2] -- register_copy 
+  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#3] -- vbuz1=vbuc1 
     lda #0
     sta j
-    jmp b8
-  //SEG31 [9] phi from main::@12 to main::@8 [phi:main::@12->main::@8]
-  b8_from_b12:
-  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@12->main::@8#0] -- register_copy 
-  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@12->main::@8#1] -- register_copy 
-  //SEG34 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#61 [phi:main::@12->main::@8#2] -- register_copy 
-  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@12->main::@8#3] -- register_copy 
-    jmp b8
-  //SEG36 main::@8
-  b8:
+    jmp b3
+  //SEG31 [9] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
+  b3_from_b7:
+  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@7->main::@3#1] -- register_copy 
+  //SEG34 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#61 [phi:main::@7->main::@3#2] -- register_copy 
+  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@7->main::@3#3] -- register_copy 
+    jmp b3
+  //SEG36 main::@3
+  b3:
   //SEG37 [10] (byte~) main::$2 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_rol_1 
     lda j
     asl
@@ -3244,23 +3277,23 @@ main: {
     sta w2
     lda words+1,y
     sta w2+1
-  //SEG39 [12] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  b9_from_b8:
-  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@8->main::@9#0] -- register_copy 
-  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@8->main::@9#1] -- register_copy 
-  //SEG42 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#62 [phi:main::@8->main::@9#2] -- register_copy 
-  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@9#3] -- vbuxx=vbuc1 
+  //SEG39 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@3->main::@4#0] -- register_copy 
+  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@3->main::@4#1] -- register_copy 
+  //SEG42 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#62 [phi:main::@3->main::@4#2] -- register_copy 
+  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#3] -- vbuxx=vbuc1 
     ldx #0
-    jmp b9
-  //SEG44 [12] phi from main::@10 to main::@9 [phi:main::@10->main::@9]
-  b9_from_b10:
-  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@10->main::@9#0] -- register_copy 
-  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@10->main::@9#1] -- register_copy 
-  //SEG47 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#61 [phi:main::@10->main::@9#2] -- register_copy 
-  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@10->main::@9#3] -- register_copy 
-    jmp b9
-  //SEG49 main::@9
-  b9:
+    jmp b4
+  //SEG44 [12] phi from main::@5 to main::@4 [phi:main::@5->main::@4]
+  b4_from_b5:
+  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@5->main::@4#0] -- register_copy 
+  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@5->main::@4#1] -- register_copy 
+  //SEG47 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#61 [phi:main::@5->main::@4#2] -- register_copy 
+  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@5->main::@4#3] -- register_copy 
+    jmp b4
+  //SEG49 main::@4
+  b4:
   //SEG50 [13] (word) compare::w1#0 ← (word) main::w1#0 -- vwuz1=vwuz2 
     lda w1
     sta compare.w1
@@ -3270,75 +3303,75 @@ main: {
   //SEG52 [15] (byte) compare::op#0 ← (byte) main::op#2
   //SEG53 [16] call compare 
     jsr compare
-    jmp b16
-  //SEG54 main::@16
-  b16:
+    jmp b9
+  //SEG54 main::@9
+  b9:
   //SEG55 [17] (byte) main::s#1 ← ++ (byte) main::s#3 -- vbuz1=_inc_vbuz1 
     inc s
-  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp s
-    bne b10_from_b16
-  //SEG57 [19] phi from main::@16 to main::@11 [phi:main::@16->main::@11]
-  b11_from_b16:
-    jmp b11
-  //SEG58 main::@11
-  b11:
+    bne b5_from_b9
+  //SEG57 [19] phi from main::@9 to main::@6 [phi:main::@9->main::@6]
+  b6_from_b9:
+    jmp b6
+  //SEG58 main::@6
+  b6:
   //SEG59 [20] call print_ln 
-  //SEG60 [30] phi from main::@11 to print_ln [phi:main::@11->print_ln]
-  print_ln_from_b11:
+  //SEG60 [30] phi from main::@6 to print_ln [phi:main::@6->print_ln]
+  print_ln_from_b6:
     jsr print_ln
   //SEG61 [21] (byte*~) print_char_cursor#101 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG62 [22] phi from main::@11 to main::@10 [phi:main::@11->main::@10]
-  b10_from_b11:
-  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@11->main::@10#0] -- register_copy 
-  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@11->main::@10#1] -- vbuz1=vbuc1 
+  //SEG62 [22] phi from main::@6 to main::@5 [phi:main::@6->main::@5]
+  b5_from_b6:
+  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@6->main::@5#0] -- register_copy 
+  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@5#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG65 [22] phi (byte*) print_char_cursor#61 = (byte*~) print_char_cursor#101 [phi:main::@11->main::@10#2] -- register_copy 
-    jmp b10
-  //SEG66 [22] phi from main::@16 to main::@10 [phi:main::@16->main::@10]
-  b10_from_b16:
-  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@16->main::@10#0] -- register_copy 
-  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@16->main::@10#1] -- register_copy 
-  //SEG69 [22] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#11 [phi:main::@16->main::@10#2] -- register_copy 
-    jmp b10
-  //SEG70 main::@10
-  b10:
+  //SEG65 [22] phi (byte*) print_char_cursor#61 = (byte*~) print_char_cursor#101 [phi:main::@6->main::@5#2] -- register_copy 
+    jmp b5
+  //SEG66 [22] phi from main::@9 to main::@5 [phi:main::@9->main::@5]
+  b5_from_b9:
+  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@9->main::@5#0] -- register_copy 
+  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@9->main::@5#1] -- register_copy 
+  //SEG69 [22] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#11 [phi:main::@9->main::@5#2] -- register_copy 
+    jmp b5
+  //SEG70 main::@5
+  b5:
   //SEG71 [23] (byte) main::op#1 ← ++ (byte) main::op#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@9 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #6
-    bne b9_from_b10
-    jmp b12
-  //SEG73 main::@12
-  b12:
+    bne b4_from_b5
+    jmp b7
+  //SEG73 main::@7
+  b7:
   //SEG74 [25] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp j
-    bne b8_from_b12
-    jmp b13
-  //SEG76 main::@13
-  b13:
+    bne b3_from_b7
+    jmp b8
+  //SEG76 main::@8
+  b8:
   //SEG77 [27] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp i
-    bne b7_from_b13
-  //SEG79 [29] phi from main::@13 main::@2 to main::@2 [phi:main::@13/main::@2->main::@2]
-  b2_from_b13:
-  b2_from_b2:
-    jmp b2
-  //SEG80 main::@2
-  b2:
-    jmp b2_from_b2
+    bne b2_from_b8
+  //SEG79 [29] phi from main::@1 main::@8 to main::@1 [phi:main::@1/main::@8->main::@1]
+  b1_from_b1:
+  b1_from_b8:
+    jmp b1
+  //SEG80 main::@1
+  b1:
+    jmp b1_from_b1
 }
 //SEG81 print_ln
 // Print a newline
@@ -3384,138 +3417,138 @@ compare: {
   //SEG90 [35] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto compare::@1 -- vbuxx_eq_0_then_la1 
     cpx #0
     beq b1
-    jmp b12
-  //SEG91 compare::@12
-  b12:
+    jmp b7
+  //SEG91 compare::@7
+  b7:
   //SEG92 [36] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto compare::@2 -- vbuxx_eq_vbuc1_then_la1 
     cpx #1
     beq b2
-    jmp b13
-  //SEG93 compare::@13
-  b13:
+    jmp b8
+  //SEG93 compare::@8
+  b8:
   //SEG94 [37] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto compare::@3 -- vbuxx_eq_vbuc1_then_la1 
     cpx #2
     beq b3
-    jmp b14
-  //SEG95 compare::@14
-  b14:
+    jmp b9
+  //SEG95 compare::@9
+  b9:
   //SEG96 [38] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto compare::@4 -- vbuxx_eq_vbuc1_then_la1 
     cpx #3
     beq b4
-    jmp b15
-  //SEG97 compare::@15
-  b15:
+    jmp b10
+  //SEG97 compare::@10
+  b10:
   //SEG98 [39] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto compare::@5 -- vbuxx_eq_vbuc1_then_la1 
     cpx #4
     beq b5
-    jmp b16
-  //SEG99 compare::@16
-  b16:
-  //SEG100 [40] if((byte) compare::op#0!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto compare::@11 -- vbuxx_neq_vbuc1_then_la1 
+    jmp b11
+  //SEG99 compare::@11
+  b11:
+  //SEG100 [40] if((byte) compare::op#0!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto compare::@6 -- vbuxx_neq_vbuc1_then_la1 
     cpx #5
-    bne b11_from_b16
-    jmp b17
-  //SEG101 compare::@17
-  b17:
-  //SEG102 [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@29 -- vwuz1_eq_vwuz2_then_la1 
+    bne b6_from_b11
+    jmp b12
+  //SEG101 compare::@12
+  b12:
+  //SEG102 [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@19 -- vwuz1_eq_vwuz2_then_la1 
     lda w1
     cmp w2
     bne !+
     lda w1+1
     cmp w2+1
-    beq b29_from_b17
+    beq b19_from_b12
   !:
-  //SEG103 [42] phi from compare::@17 to compare::@18 [phi:compare::@17->compare::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG104 compare::@18
-  b18:
-  //SEG105 [43] phi from compare::@18 to compare::@29 [phi:compare::@18->compare::@29]
-  b29_from_b18:
-  //SEG106 [43] phi (byte) compare::r#11 = (const byte) TT#0 [phi:compare::@18->compare::@29#0] -- vbuz1=vbuc1 
+  //SEG103 [42] phi from compare::@12 to compare::@13 [phi:compare::@12->compare::@13]
+  b13_from_b12:
+    jmp b13
+  //SEG104 compare::@13
+  b13:
+  //SEG105 [43] phi from compare::@13 to compare::@19 [phi:compare::@13->compare::@19]
+  b19_from_b13:
+  //SEG106 [43] phi (byte) compare::r#11 = (const byte) TT#0 [phi:compare::@13->compare::@19#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b29
-  //SEG107 [43] phi from compare::@17 to compare::@29 [phi:compare::@17->compare::@29]
-  b29_from_b17:
-  //SEG108 [43] phi (byte) compare::r#11 = (const byte) FF#0 [phi:compare::@17->compare::@29#0] -- vbuz1=vbuc1 
+    jmp b19
+  //SEG107 [43] phi from compare::@12 to compare::@19 [phi:compare::@12->compare::@19]
+  b19_from_b12:
+  //SEG108 [43] phi (byte) compare::r#11 = (const byte) FF#0 [phi:compare::@12->compare::@19#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b29
-  //SEG109 compare::@29
-  b29:
-  //SEG110 [44] phi from compare::@29 to compare::@11 [phi:compare::@29->compare::@11]
-  b11_from_b29:
-  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#11 [phi:compare::@29->compare::@11#0] -- register_copy 
-  //SEG112 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#1 [phi:compare::@29->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b19
+  //SEG109 compare::@19
+  b19:
+  //SEG110 [44] phi from compare::@19 to compare::@6 [phi:compare::@19->compare::@6]
+  b6_from_b19:
+  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#11 [phi:compare::@19->compare::@6#0] -- register_copy 
+  //SEG112 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#1 [phi:compare::@19->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_1
     sta ops
     lda #>ops_1
     sta ops+1
-    jmp b11
-  //SEG113 [44] phi from compare::@16 to compare::@11 [phi:compare::@16->compare::@11]
-  b11_from_b16:
-  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@16->compare::@11#0] -- vbuz1=vbuc1 
+    jmp b6
+  //SEG113 [44] phi from compare::@11 to compare::@6 [phi:compare::@11->compare::@6]
+  b6_from_b11:
+  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@11->compare::@6#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG115 [44] phi (byte*) compare::ops#7 = (byte*) 0 [phi:compare::@16->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG115 [44] phi (byte*) compare::ops#7 = (byte*) 0 [phi:compare::@11->compare::@6#1] -- pbuz1=pbuc1 
     lda #<0
     sta ops
     lda #>0
     sta ops+1
-    jmp b11
-  //SEG116 compare::@11
-  b11:
+    jmp b6
+  //SEG116 compare::@6
+  b6:
   //SEG117 [45] (word) print_word::w#0 ← (word) compare::w1#0
   //SEG118 [46] call print_word 
-  //SEG119 [75] phi from compare::@11 to print_word [phi:compare::@11->print_word]
-  print_word_from_b11:
-  //SEG120 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#55 [phi:compare::@11->print_word#0] -- register_copy 
-  //SEG121 [75] phi (word) print_word::w#2 = (word) print_word::w#0 [phi:compare::@11->print_word#1] -- register_copy 
+  //SEG119 [75] phi from compare::@6 to print_word [phi:compare::@6->print_word]
+  print_word_from_b6:
+  //SEG120 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#55 [phi:compare::@6->print_word#0] -- register_copy 
+  //SEG121 [75] phi (word) print_word::w#2 = (word) print_word::w#0 [phi:compare::@6->print_word#1] -- register_copy 
     jsr print_word
-    jmp b35
-  //SEG122 compare::@35
-  b35:
+    jmp b25
+  //SEG122 compare::@25
+  b25:
   //SEG123 [47] (byte*) print_str::str#1 ← (byte*) compare::ops#7
   //SEG124 [48] call print_str 
-  //SEG125 [89] phi from compare::@35 to print_str [phi:compare::@35->print_str]
-  print_str_from_b35:
+  //SEG125 [89] phi from compare::@25 to print_str [phi:compare::@25->print_str]
+  print_str_from_b25:
     jsr print_str
-    jmp b36
-  //SEG126 compare::@36
-  b36:
+    jmp b26
+  //SEG126 compare::@26
+  b26:
   //SEG127 [49] (word) print_word::w#1 ← (word) compare::w2#0 -- vwuz1=vwuz2 
     lda w2
     sta print_word.w
     lda w2+1
     sta print_word.w+1
   //SEG128 [50] call print_word 
-  //SEG129 [75] phi from compare::@36 to print_word [phi:compare::@36->print_word]
-  print_word_from_b36:
-  //SEG130 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#2 [phi:compare::@36->print_word#0] -- register_copy 
-  //SEG131 [75] phi (word) print_word::w#2 = (word) print_word::w#1 [phi:compare::@36->print_word#1] -- register_copy 
+  //SEG129 [75] phi from compare::@26 to print_word [phi:compare::@26->print_word]
+  print_word_from_b26:
+  //SEG130 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#2 [phi:compare::@26->print_word#0] -- register_copy 
+  //SEG131 [75] phi (word) print_word::w#2 = (word) print_word::w#1 [phi:compare::@26->print_word#1] -- register_copy 
     jsr print_word
-    jmp b37
-  //SEG132 compare::@37
-  b37:
+    jmp b27
+  //SEG132 compare::@27
+  b27:
   //SEG133 [51] (byte) print_char::ch#2 ← (byte) compare::r#10 -- vbuaa=vbuz1 
     lda r
   //SEG134 [52] call print_char 
-  //SEG135 [71] phi from compare::@37 to print_char [phi:compare::@37->print_char]
-  print_char_from_b37:
-  //SEG136 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@37->print_char#0] -- register_copy 
-  //SEG137 [71] phi (byte) print_char::ch#4 = (byte) print_char::ch#2 [phi:compare::@37->print_char#1] -- register_copy 
+  //SEG135 [71] phi from compare::@27 to print_char [phi:compare::@27->print_char]
+  print_char_from_b27:
+  //SEG136 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@27->print_char#0] -- register_copy 
+  //SEG137 [71] phi (byte) print_char::ch#4 = (byte) print_char::ch#2 [phi:compare::@27->print_char#1] -- register_copy 
     jsr print_char
-  //SEG138 [53] phi from compare::@37 to compare::@38 [phi:compare::@37->compare::@38]
-  b38_from_b37:
-    jmp b38
-  //SEG139 compare::@38
-  b38:
+  //SEG138 [53] phi from compare::@27 to compare::@28 [phi:compare::@27->compare::@28]
+  b28_from_b27:
+    jmp b28
+  //SEG139 compare::@28
+  b28:
   //SEG140 [54] call print_char 
-  //SEG141 [71] phi from compare::@38 to print_char [phi:compare::@38->print_char]
-  print_char_from_b38:
-  //SEG142 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@38->print_char#0] -- register_copy 
-  //SEG143 [71] phi (byte) print_char::ch#4 = (byte) ' ' [phi:compare::@38->print_char#1] -- vbuaa=vbuc1 
+  //SEG141 [71] phi from compare::@28 to print_char [phi:compare::@28->print_char]
+  print_char_from_b28:
+  //SEG142 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@28->print_char#0] -- register_copy 
+  //SEG143 [71] phi (byte) print_char::ch#4 = (byte) ' ' [phi:compare::@28->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
     jmp breturn
@@ -3525,197 +3558,197 @@ compare: {
     rts
   //SEG146 compare::@5
   b5:
-  //SEG147 [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@30 -- vwuz1_neq_vwuz2_then_la1 
+  //SEG147 [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@20 -- vwuz1_neq_vwuz2_then_la1 
     lda w1+1
     cmp w2+1
-    bne b30_from_b5
+    bne b20_from_b5
     lda w1
     cmp w2
-    bne b30_from_b5
-  //SEG148 [57] phi from compare::@5 to compare::@20 [phi:compare::@5->compare::@20]
-  b20_from_b5:
-    jmp b20
-  //SEG149 compare::@20
-  b20:
-  //SEG150 [58] phi from compare::@20 to compare::@30 [phi:compare::@20->compare::@30]
-  b30_from_b20:
-  //SEG151 [58] phi (byte) compare::r#12 = (const byte) TT#0 [phi:compare::@20->compare::@30#0] -- vbuz1=vbuc1 
+    bne b20_from_b5
+  //SEG148 [57] phi from compare::@5 to compare::@14 [phi:compare::@5->compare::@14]
+  b14_from_b5:
+    jmp b14
+  //SEG149 compare::@14
+  b14:
+  //SEG150 [58] phi from compare::@14 to compare::@20 [phi:compare::@14->compare::@20]
+  b20_from_b14:
+  //SEG151 [58] phi (byte) compare::r#12 = (const byte) TT#0 [phi:compare::@14->compare::@20#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b30
-  //SEG152 [58] phi from compare::@5 to compare::@30 [phi:compare::@5->compare::@30]
-  b30_from_b5:
-  //SEG153 [58] phi (byte) compare::r#12 = (const byte) FF#0 [phi:compare::@5->compare::@30#0] -- vbuz1=vbuc1 
+    jmp b20
+  //SEG152 [58] phi from compare::@5 to compare::@20 [phi:compare::@5->compare::@20]
+  b20_from_b5:
+  //SEG153 [58] phi (byte) compare::r#12 = (const byte) FF#0 [phi:compare::@5->compare::@20#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b30
-  //SEG154 compare::@30
-  b30:
-  //SEG155 [44] phi from compare::@30 to compare::@11 [phi:compare::@30->compare::@11]
-  b11_from_b30:
-  //SEG156 [44] phi (byte) compare::r#10 = (byte) compare::r#12 [phi:compare::@30->compare::@11#0] -- register_copy 
-  //SEG157 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#2 [phi:compare::@30->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b20
+  //SEG154 compare::@20
+  b20:
+  //SEG155 [44] phi from compare::@20 to compare::@6 [phi:compare::@20->compare::@6]
+  b6_from_b20:
+  //SEG156 [44] phi (byte) compare::r#10 = (byte) compare::r#12 [phi:compare::@20->compare::@6#0] -- register_copy 
+  //SEG157 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#2 [phi:compare::@20->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_2
     sta ops
     lda #>ops_2
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG158 compare::@4
   b4:
-  //SEG159 [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@31 -- vwuz1_lt_vwuz2_then_la1 
+  //SEG159 [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@21 -- vwuz1_lt_vwuz2_then_la1 
     lda w1+1
     cmp w2+1
-    bcc b31_from_b4
+    bcc b21_from_b4
     bne !+
     lda w1
     cmp w2
-    bcc b31_from_b4
+    bcc b21_from_b4
   !:
-  //SEG160 [60] phi from compare::@4 to compare::@22 [phi:compare::@4->compare::@22]
-  b22_from_b4:
-    jmp b22
-  //SEG161 compare::@22
-  b22:
-  //SEG162 [61] phi from compare::@22 to compare::@31 [phi:compare::@22->compare::@31]
-  b31_from_b22:
-  //SEG163 [61] phi (byte) compare::r#13 = (const byte) TT#0 [phi:compare::@22->compare::@31#0] -- vbuz1=vbuc1 
+  //SEG160 [60] phi from compare::@4 to compare::@15 [phi:compare::@4->compare::@15]
+  b15_from_b4:
+    jmp b15
+  //SEG161 compare::@15
+  b15:
+  //SEG162 [61] phi from compare::@15 to compare::@21 [phi:compare::@15->compare::@21]
+  b21_from_b15:
+  //SEG163 [61] phi (byte) compare::r#13 = (const byte) TT#0 [phi:compare::@15->compare::@21#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b31
-  //SEG164 [61] phi from compare::@4 to compare::@31 [phi:compare::@4->compare::@31]
-  b31_from_b4:
-  //SEG165 [61] phi (byte) compare::r#13 = (const byte) FF#0 [phi:compare::@4->compare::@31#0] -- vbuz1=vbuc1 
+    jmp b21
+  //SEG164 [61] phi from compare::@4 to compare::@21 [phi:compare::@4->compare::@21]
+  b21_from_b4:
+  //SEG165 [61] phi (byte) compare::r#13 = (const byte) FF#0 [phi:compare::@4->compare::@21#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b31
-  //SEG166 compare::@31
-  b31:
-  //SEG167 [44] phi from compare::@31 to compare::@11 [phi:compare::@31->compare::@11]
-  b11_from_b31:
-  //SEG168 [44] phi (byte) compare::r#10 = (byte) compare::r#13 [phi:compare::@31->compare::@11#0] -- register_copy 
-  //SEG169 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#3 [phi:compare::@31->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b21
+  //SEG166 compare::@21
+  b21:
+  //SEG167 [44] phi from compare::@21 to compare::@6 [phi:compare::@21->compare::@6]
+  b6_from_b21:
+  //SEG168 [44] phi (byte) compare::r#10 = (byte) compare::r#13 [phi:compare::@21->compare::@6#0] -- register_copy 
+  //SEG169 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#3 [phi:compare::@21->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_3
     sta ops
     lda #>ops_3
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG170 compare::@3
   b3:
-  //SEG171 [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@32 -- vwuz1_le_vwuz2_then_la1 
+  //SEG171 [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@22 -- vwuz1_le_vwuz2_then_la1 
     lda w1+1
     cmp w2+1
     bne !+
     lda w1
     cmp w2
   !:
-    bcc b32_from_b3
-    beq b32_from_b3
-  //SEG172 [63] phi from compare::@3 to compare::@24 [phi:compare::@3->compare::@24]
-  b24_from_b3:
-    jmp b24
-  //SEG173 compare::@24
-  b24:
-  //SEG174 [64] phi from compare::@24 to compare::@32 [phi:compare::@24->compare::@32]
-  b32_from_b24:
-  //SEG175 [64] phi (byte) compare::r#14 = (const byte) TT#0 [phi:compare::@24->compare::@32#0] -- vbuz1=vbuc1 
+    bcc b22_from_b3
+    beq b22_from_b3
+  //SEG172 [63] phi from compare::@3 to compare::@16 [phi:compare::@3->compare::@16]
+  b16_from_b3:
+    jmp b16
+  //SEG173 compare::@16
+  b16:
+  //SEG174 [64] phi from compare::@16 to compare::@22 [phi:compare::@16->compare::@22]
+  b22_from_b16:
+  //SEG175 [64] phi (byte) compare::r#14 = (const byte) TT#0 [phi:compare::@16->compare::@22#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b32
-  //SEG176 [64] phi from compare::@3 to compare::@32 [phi:compare::@3->compare::@32]
-  b32_from_b3:
-  //SEG177 [64] phi (byte) compare::r#14 = (const byte) FF#0 [phi:compare::@3->compare::@32#0] -- vbuz1=vbuc1 
+    jmp b22
+  //SEG176 [64] phi from compare::@3 to compare::@22 [phi:compare::@3->compare::@22]
+  b22_from_b3:
+  //SEG177 [64] phi (byte) compare::r#14 = (const byte) FF#0 [phi:compare::@3->compare::@22#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b32
-  //SEG178 compare::@32
-  b32:
-  //SEG179 [44] phi from compare::@32 to compare::@11 [phi:compare::@32->compare::@11]
-  b11_from_b32:
-  //SEG180 [44] phi (byte) compare::r#10 = (byte) compare::r#14 [phi:compare::@32->compare::@11#0] -- register_copy 
-  //SEG181 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#4 [phi:compare::@32->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b22
+  //SEG178 compare::@22
+  b22:
+  //SEG179 [44] phi from compare::@22 to compare::@6 [phi:compare::@22->compare::@6]
+  b6_from_b22:
+  //SEG180 [44] phi (byte) compare::r#10 = (byte) compare::r#14 [phi:compare::@22->compare::@6#0] -- register_copy 
+  //SEG181 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#4 [phi:compare::@22->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_4
     sta ops
     lda #>ops_4
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG182 compare::@2
   b2:
-  //SEG183 [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@33 -- vwuz1_gt_vwuz2_then_la1 
+  //SEG183 [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@23 -- vwuz1_gt_vwuz2_then_la1 
     lda w2+1
     cmp w1+1
-    bcc b33_from_b2
+    bcc b23_from_b2
     bne !+
     lda w2
     cmp w1
-    bcc b33_from_b2
+    bcc b23_from_b2
   !:
-  //SEG184 [66] phi from compare::@2 to compare::@26 [phi:compare::@2->compare::@26]
-  b26_from_b2:
-    jmp b26
-  //SEG185 compare::@26
-  b26:
-  //SEG186 [67] phi from compare::@26 to compare::@33 [phi:compare::@26->compare::@33]
-  b33_from_b26:
-  //SEG187 [67] phi (byte) compare::r#15 = (const byte) TT#0 [phi:compare::@26->compare::@33#0] -- vbuz1=vbuc1 
+  //SEG184 [66] phi from compare::@2 to compare::@17 [phi:compare::@2->compare::@17]
+  b17_from_b2:
+    jmp b17
+  //SEG185 compare::@17
+  b17:
+  //SEG186 [67] phi from compare::@17 to compare::@23 [phi:compare::@17->compare::@23]
+  b23_from_b17:
+  //SEG187 [67] phi (byte) compare::r#15 = (const byte) TT#0 [phi:compare::@17->compare::@23#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b33
-  //SEG188 [67] phi from compare::@2 to compare::@33 [phi:compare::@2->compare::@33]
-  b33_from_b2:
-  //SEG189 [67] phi (byte) compare::r#15 = (const byte) FF#0 [phi:compare::@2->compare::@33#0] -- vbuz1=vbuc1 
+    jmp b23
+  //SEG188 [67] phi from compare::@2 to compare::@23 [phi:compare::@2->compare::@23]
+  b23_from_b2:
+  //SEG189 [67] phi (byte) compare::r#15 = (const byte) FF#0 [phi:compare::@2->compare::@23#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b33
-  //SEG190 compare::@33
-  b33:
-  //SEG191 [44] phi from compare::@33 to compare::@11 [phi:compare::@33->compare::@11]
-  b11_from_b33:
-  //SEG192 [44] phi (byte) compare::r#10 = (byte) compare::r#15 [phi:compare::@33->compare::@11#0] -- register_copy 
-  //SEG193 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#5 [phi:compare::@33->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b23
+  //SEG190 compare::@23
+  b23:
+  //SEG191 [44] phi from compare::@23 to compare::@6 [phi:compare::@23->compare::@6]
+  b6_from_b23:
+  //SEG192 [44] phi (byte) compare::r#10 = (byte) compare::r#15 [phi:compare::@23->compare::@6#0] -- register_copy 
+  //SEG193 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#5 [phi:compare::@23->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_5
     sta ops
     lda #>ops_5
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG194 compare::@1
   b1:
-  //SEG195 [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@34 -- vwuz1_ge_vwuz2_then_la1 
+  //SEG195 [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@24 -- vwuz1_ge_vwuz2_then_la1 
     lda w2+1
     cmp w1+1
     bne !+
     lda w2
     cmp w1
   !:
-    bcc b34_from_b1
-    beq b34_from_b1
-  //SEG196 [69] phi from compare::@1 to compare::@28 [phi:compare::@1->compare::@28]
-  b28_from_b1:
-    jmp b28
-  //SEG197 compare::@28
-  b28:
-  //SEG198 [70] phi from compare::@28 to compare::@34 [phi:compare::@28->compare::@34]
-  b34_from_b28:
-  //SEG199 [70] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@28->compare::@34#0] -- vbuz1=vbuc1 
+    bcc b24_from_b1
+    beq b24_from_b1
+  //SEG196 [69] phi from compare::@1 to compare::@18 [phi:compare::@1->compare::@18]
+  b18_from_b1:
+    jmp b18
+  //SEG197 compare::@18
+  b18:
+  //SEG198 [70] phi from compare::@18 to compare::@24 [phi:compare::@18->compare::@24]
+  b24_from_b18:
+  //SEG199 [70] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@18->compare::@24#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b34
-  //SEG200 [70] phi from compare::@1 to compare::@34 [phi:compare::@1->compare::@34]
-  b34_from_b1:
-  //SEG201 [70] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@1->compare::@34#0] -- vbuz1=vbuc1 
+    jmp b24
+  //SEG200 [70] phi from compare::@1 to compare::@24 [phi:compare::@1->compare::@24]
+  b24_from_b1:
+  //SEG201 [70] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@1->compare::@24#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-    jmp b34
-  //SEG202 compare::@34
-  b34:
-  //SEG203 [44] phi from compare::@34 to compare::@11 [phi:compare::@34->compare::@11]
-  b11_from_b34:
-  //SEG204 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@34->compare::@11#0] -- register_copy 
-  //SEG205 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#6 [phi:compare::@34->compare::@11#1] -- pbuz1=pbuc1 
+    jmp b24
+  //SEG202 compare::@24
+  b24:
+  //SEG203 [44] phi from compare::@24 to compare::@6 [phi:compare::@24->compare::@6]
+  b6_from_b24:
+  //SEG204 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@24->compare::@6#0] -- register_copy 
+  //SEG205 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#6 [phi:compare::@24->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_6
     sta ops
     lda #>ops_6
     sta ops+1
-    jmp b11
+    jmp b6
     ops_1: .text "!=@"
     ops_2: .text "==@"
     ops_3: .text ">=@"
@@ -3900,43 +3933,43 @@ print_cls: {
   words: .word $12, $3f34, $cfed
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b25
+Removing instruction jmp b1
 Removing instruction jmp bend
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b9
+Removing instruction jmp b6
+Removing instruction jmp b5
+Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b1
+Removing instruction jmp b1
+Removing instruction jmp breturn
 Removing instruction jmp b7
 Removing instruction jmp b8
 Removing instruction jmp b9
-Removing instruction jmp b16
-Removing instruction jmp b11
 Removing instruction jmp b10
-Removing instruction jmp b12
-Removing instruction jmp b13
-Removing instruction jmp b2
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b12
-Removing instruction jmp b13
-Removing instruction jmp b14
-Removing instruction jmp b15
-Removing instruction jmp b16
-Removing instruction jmp b17
-Removing instruction jmp b18
-Removing instruction jmp b29
 Removing instruction jmp b11
-Removing instruction jmp b35
-Removing instruction jmp b36
-Removing instruction jmp b37
-Removing instruction jmp b38
-Removing instruction jmp breturn
-Removing instruction jmp b20
-Removing instruction jmp b30
-Removing instruction jmp b22
-Removing instruction jmp b31
-Removing instruction jmp b24
-Removing instruction jmp b32
+Removing instruction jmp b12
+Removing instruction jmp b13
+Removing instruction jmp b19
+Removing instruction jmp b6
+Removing instruction jmp b25
 Removing instruction jmp b26
-Removing instruction jmp b33
+Removing instruction jmp b27
 Removing instruction jmp b28
-Removing instruction jmp b34
+Removing instruction jmp breturn
+Removing instruction jmp b14
+Removing instruction jmp b20
+Removing instruction jmp b15
+Removing instruction jmp b21
+Removing instruction jmp b16
+Removing instruction jmp b22
+Removing instruction jmp b17
+Removing instruction jmp b23
+Removing instruction jmp b18
+Removing instruction jmp b24
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -3950,86 +3983,86 @@ Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #>0
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b10_from_b16 with b10
-Replacing label b9_from_b10 with b9
-Replacing label b8_from_b12 with b8
-Replacing label b7_from_b13 with b7
-Replacing label b2_from_b2 with b2
+Replacing label b5_from_b9 with b5
+Replacing label b4_from_b5 with b4
+Replacing label b3_from_b7 with b3
+Replacing label b2_from_b8 with b2
+Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b25_from_bbegin:
-Removing instruction b25:
-Removing instruction main_from_b25:
-Removing instruction bend_from_b25:
-Removing instruction b7_from_b13:
-Removing instruction b8_from_b12:
-Removing instruction b9_from_b10:
-Removing instruction b11_from_b16:
-Removing instruction print_ln_from_b11:
-Removing instruction b10_from_b16:
-Removing instruction b2_from_b13:
-Removing instruction b2_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b2_from_b8:
+Removing instruction b3_from_b7:
+Removing instruction b4_from_b5:
+Removing instruction b6_from_b9:
+Removing instruction print_ln_from_b6:
+Removing instruction b5_from_b9:
+Removing instruction b1_from_b1:
+Removing instruction b1_from_b8:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
-Removing instruction b18_from_b17:
-Removing instruction b29_from_b18:
-Removing instruction b11_from_b29:
-Removing instruction print_word_from_b11:
-Removing instruction print_str_from_b35:
-Removing instruction b38_from_b37:
-Removing instruction print_char_from_b38:
-Removing instruction b20_from_b5:
-Removing instruction b30_from_b20:
-Removing instruction b11_from_b30:
-Removing instruction b22_from_b4:
-Removing instruction b31_from_b22:
-Removing instruction b11_from_b31:
-Removing instruction b24_from_b3:
-Removing instruction b32_from_b24:
-Removing instruction b11_from_b32:
-Removing instruction b26_from_b2:
-Removing instruction b33_from_b26:
-Removing instruction b11_from_b33:
-Removing instruction b28_from_b1:
-Removing instruction b34_from_b28:
-Removing instruction b11_from_b34:
+Removing instruction b13_from_b12:
+Removing instruction b19_from_b13:
+Removing instruction b6_from_b19:
+Removing instruction print_word_from_b6:
+Removing instruction print_str_from_b25:
+Removing instruction b28_from_b27:
+Removing instruction print_char_from_b28:
+Removing instruction b14_from_b5:
+Removing instruction b20_from_b14:
+Removing instruction b6_from_b20:
+Removing instruction b15_from_b4:
+Removing instruction b21_from_b15:
+Removing instruction b6_from_b21:
+Removing instruction b16_from_b3:
+Removing instruction b22_from_b16:
+Removing instruction b6_from_b22:
+Removing instruction b17_from_b2:
+Removing instruction b23_from_b17:
+Removing instruction b6_from_b23:
+Removing instruction b18_from_b1:
+Removing instruction b24_from_b18:
+Removing instruction b6_from_b24:
 Removing instruction b1_from_print_str:
 Removing instruction b1_from_b2:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction print_cls_from_main:
-Removing instruction b7_from_main:
-Removing instruction b8_from_b7:
-Removing instruction b9_from_b8:
-Removing instruction b16:
-Removing instruction b11:
-Removing instruction b10_from_b11:
-Removing instruction b12:
-Removing instruction b13:
+Removing instruction b2_from_main:
+Removing instruction b3_from_b2:
+Removing instruction b4_from_b3:
+Removing instruction b9:
+Removing instruction b6:
+Removing instruction b5_from_b6:
+Removing instruction b7:
+Removing instruction b8:
 Removing instruction breturn:
+Removing instruction b7:
+Removing instruction b8:
+Removing instruction b9:
+Removing instruction b10:
+Removing instruction b11:
 Removing instruction b12:
 Removing instruction b13:
+Removing instruction b25:
+Removing instruction b26:
+Removing instruction print_word_from_b26:
+Removing instruction b27:
+Removing instruction print_char_from_b27:
+Removing instruction b28:
+Removing instruction breturn:
 Removing instruction b14:
 Removing instruction b15:
 Removing instruction b16:
 Removing instruction b17:
 Removing instruction b18:
-Removing instruction b35:
-Removing instruction b36:
-Removing instruction print_word_from_b36:
-Removing instruction b37:
-Removing instruction print_char_from_b37:
-Removing instruction b38:
-Removing instruction breturn:
-Removing instruction b20:
-Removing instruction b22:
-Removing instruction b24:
-Removing instruction b26:
-Removing instruction b28:
 Removing instruction breturn:
 Removing instruction print_byte_from_print_word:
 Removing instruction b1:
@@ -4046,18 +4079,18 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Relabelling long label b29_from_b17 to b6
-Relabelling long label b11_from_b16 to b7
-Relabelling long label b30_from_b5 to b8
-Relabelling long label b31_from_b4 to b9
-Relabelling long label b32_from_b3 to b10
-Relabelling long label b33_from_b2 to b12
-Relabelling long label b34_from_b1 to b13
+Relabelling long label b19_from_b12 to b7
+Relabelling long label b6_from_b11 to b8
+Relabelling long label b20_from_b5 to b9
+Relabelling long label b21_from_b4 to b10
+Relabelling long label b22_from_b3 to b11
+Relabelling long label b23_from_b2 to b12
+Relabelling long label b24_from_b1 to b13
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b10
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #3
@@ -4069,7 +4102,7 @@ Fixing long branch [110] beq b2 to bne
 Fixing long branch [114] beq b3 to bne
 
 FINAL SYMBOL TABLE
-(label) @25
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -4163,6 +4196,7 @@ FINAL SYMBOL TABLE
 (byte) YELLOW
 (void()) compare((word) compare::w1 , (word) compare::w2 , (byte) compare::op)
 (label) compare::@1
+(label) compare::@10
 (label) compare::@11
 (label) compare::@12
 (label) compare::@13
@@ -4171,25 +4205,24 @@ FINAL SYMBOL TABLE
 (label) compare::@16
 (label) compare::@17
 (label) compare::@18
+(label) compare::@19
 (label) compare::@2
 (label) compare::@20
+(label) compare::@21
 (label) compare::@22
+(label) compare::@23
 (label) compare::@24
+(label) compare::@25
 (label) compare::@26
+(label) compare::@27
 (label) compare::@28
-(label) compare::@29
 (label) compare::@3
-(label) compare::@30
-(label) compare::@31
-(label) compare::@32
-(label) compare::@33
-(label) compare::@34
-(label) compare::@35
-(label) compare::@36
-(label) compare::@37
-(label) compare::@38
 (label) compare::@4
 (label) compare::@5
+(label) compare::@6
+(label) compare::@7
+(label) compare::@8
+(label) compare::@9
 (label) compare::@return
 (byte) compare::op
 (byte) compare::op#0 reg byte x 168.8333333333334
@@ -4216,12 +4249,12 @@ FINAL SYMBOL TABLE
 (void()) main()
 (byte~) main::$1 reg byte a 22.0
 (byte~) main::$2 reg byte a 202.0
-(label) main::@10
-(label) main::@11
-(label) main::@12
-(label) main::@13
-(label) main::@16
+(label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
+(label) main::@6
 (label) main::@7
 (label) main::@8
 (label) main::@9
@@ -4345,11 +4378,11 @@ Score: 966577
   .label print_char_cursor = $c
   .label print_line_cursor = 5
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @25 [phi:@begin->@25]
-//SEG5 @25
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @25 to main [phi:@25->main]
-//SEG8 [3] phi from @25 to @end [phi:@25->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -4361,30 +4394,30 @@ main: {
   //SEG11 [5] call print_cls 
   //SEG12 [96] phi from main to print_cls [phi:main->print_cls]
     jsr print_cls
-  //SEG13 [6] phi from main to main::@7 [phi:main->main::@7]
-  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#0] -- pbuz1=pbuc1 
+  //SEG13 [6] phi from main to main::@2 [phi:main->main::@2]
+  //SEG14 [6] phi (byte*) print_line_cursor#32 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#1] -- vbuz1=vbuc1 
+  //SEG15 [6] phi (byte) main::s#8 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG16 [6] phi (byte*) print_char_cursor#74 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@7#2] -- pbuz1=pbuc1 
+  //SEG16 [6] phi (byte*) print_char_cursor#74 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@2#2] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@7#3] -- vbuz1=vbuc1 
+  //SEG17 [6] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@2#3] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG18 [6] phi from main::@13 to main::@7 [phi:main::@13->main::@7]
-  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@13->main::@7#0] -- register_copy 
-  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@13->main::@7#1] -- register_copy 
-  //SEG21 [6] phi (byte*) print_char_cursor#74 = (byte*) print_char_cursor#61 [phi:main::@13->main::@7#2] -- register_copy 
-  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@13->main::@7#3] -- register_copy 
-  //SEG23 main::@7
-  b7:
+  //SEG18 [6] phi from main::@8 to main::@2 [phi:main::@8->main::@2]
+  //SEG19 [6] phi (byte*) print_line_cursor#32 = (byte*) print_line_cursor#23 [phi:main::@8->main::@2#0] -- register_copy 
+  //SEG20 [6] phi (byte) main::s#8 = (byte) main::s#10 [phi:main::@8->main::@2#1] -- register_copy 
+  //SEG21 [6] phi (byte*) print_char_cursor#74 = (byte*) print_char_cursor#61 [phi:main::@8->main::@2#2] -- register_copy 
+  //SEG22 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@2#3] -- register_copy 
+  //SEG23 main::@2
+  b2:
   //SEG24 [7] (byte~) main::$1 ← (byte) main::i#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_rol_1 
     lda i
     asl
@@ -4394,20 +4427,20 @@ main: {
     sta w1
     lda words+1,y
     sta w1+1
-  //SEG26 [9] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@7->main::@8#0] -- register_copy 
-  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@7->main::@8#1] -- register_copy 
-  //SEG29 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#74 [phi:main::@7->main::@8#2] -- register_copy 
-  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@7->main::@8#3] -- vbuz1=vbuc1 
+  //SEG26 [9] phi from main::@2 to main::@3 [phi:main::@2->main::@3]
+  //SEG27 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#32 [phi:main::@2->main::@3#0] -- register_copy 
+  //SEG28 [9] phi (byte) main::s#6 = (byte) main::s#8 [phi:main::@2->main::@3#1] -- register_copy 
+  //SEG29 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#74 [phi:main::@2->main::@3#2] -- register_copy 
+  //SEG30 [9] phi (byte) main::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#3] -- vbuz1=vbuc1 
     lda #0
     sta j
-  //SEG31 [9] phi from main::@12 to main::@8 [phi:main::@12->main::@8]
-  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@12->main::@8#0] -- register_copy 
-  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@12->main::@8#1] -- register_copy 
-  //SEG34 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#61 [phi:main::@12->main::@8#2] -- register_copy 
-  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@12->main::@8#3] -- register_copy 
-  //SEG36 main::@8
-  b8:
+  //SEG31 [9] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
+  //SEG32 [9] phi (byte*) print_line_cursor#31 = (byte*) print_line_cursor#23 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG33 [9] phi (byte) main::s#6 = (byte) main::s#10 [phi:main::@7->main::@3#1] -- register_copy 
+  //SEG34 [9] phi (byte*) print_char_cursor#62 = (byte*) print_char_cursor#61 [phi:main::@7->main::@3#2] -- register_copy 
+  //SEG35 [9] phi (byte) main::j#2 = (byte) main::j#1 [phi:main::@7->main::@3#3] -- register_copy 
+  //SEG36 main::@3
+  b3:
   //SEG37 [10] (byte~) main::$2 ← (byte) main::j#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_rol_1 
     lda j
     asl
@@ -4417,19 +4450,19 @@ main: {
     sta w2
     lda words+1,y
     sta w2+1
-  //SEG39 [12] phi from main::@8 to main::@9 [phi:main::@8->main::@9]
-  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@8->main::@9#0] -- register_copy 
-  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@8->main::@9#1] -- register_copy 
-  //SEG42 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#62 [phi:main::@8->main::@9#2] -- register_copy 
-  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@9#3] -- vbuxx=vbuc1 
+  //SEG39 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG40 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#31 [phi:main::@3->main::@4#0] -- register_copy 
+  //SEG41 [12] phi (byte) main::s#3 = (byte) main::s#6 [phi:main::@3->main::@4#1] -- register_copy 
+  //SEG42 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#62 [phi:main::@3->main::@4#2] -- register_copy 
+  //SEG43 [12] phi (byte) main::op#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#3] -- vbuxx=vbuc1 
     ldx #0
-  //SEG44 [12] phi from main::@10 to main::@9 [phi:main::@10->main::@9]
-  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@10->main::@9#0] -- register_copy 
-  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@10->main::@9#1] -- register_copy 
-  //SEG47 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#61 [phi:main::@10->main::@9#2] -- register_copy 
-  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@10->main::@9#3] -- register_copy 
-  //SEG49 main::@9
-  b9:
+  //SEG44 [12] phi from main::@5 to main::@4 [phi:main::@5->main::@4]
+  //SEG45 [12] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#23 [phi:main::@5->main::@4#0] -- register_copy 
+  //SEG46 [12] phi (byte) main::s#3 = (byte) main::s#10 [phi:main::@5->main::@4#1] -- register_copy 
+  //SEG47 [12] phi (byte*) print_char_cursor#55 = (byte*) print_char_cursor#61 [phi:main::@5->main::@4#2] -- register_copy 
+  //SEG48 [12] phi (byte) main::op#2 = (byte) main::op#1 [phi:main::@5->main::@4#3] -- register_copy 
+  //SEG49 main::@4
+  b4:
   //SEG50 [13] (word) compare::w1#0 ← (word) main::w1#0 -- vwuz1=vwuz2 
     lda w1
     sta compare.w1
@@ -4439,57 +4472,57 @@ main: {
   //SEG52 [15] (byte) compare::op#0 ← (byte) main::op#2
   //SEG53 [16] call compare 
     jsr compare
-  //SEG54 main::@16
+  //SEG54 main::@9
   //SEG55 [17] (byte) main::s#1 ← ++ (byte) main::s#3 -- vbuz1=_inc_vbuz1 
     inc s
-  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG56 [18] if((byte) main::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp s
-    bne b10
-  //SEG57 [19] phi from main::@16 to main::@11 [phi:main::@16->main::@11]
-  //SEG58 main::@11
+    bne b5
+  //SEG57 [19] phi from main::@9 to main::@6 [phi:main::@9->main::@6]
+  //SEG58 main::@6
   //SEG59 [20] call print_ln 
-  //SEG60 [30] phi from main::@11 to print_ln [phi:main::@11->print_ln]
+  //SEG60 [30] phi from main::@6 to print_ln [phi:main::@6->print_ln]
     jsr print_ln
   //SEG61 [21] (byte*~) print_char_cursor#101 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG62 [22] phi from main::@11 to main::@10 [phi:main::@11->main::@10]
-  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@11->main::@10#0] -- register_copy 
-  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@11->main::@10#1] -- vbuz1=vbuc1 
+  //SEG62 [22] phi from main::@6 to main::@5 [phi:main::@6->main::@5]
+  //SEG63 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#1 [phi:main::@6->main::@5#0] -- register_copy 
+  //SEG64 [22] phi (byte) main::s#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@6->main::@5#1] -- vbuz1=vbuc1 
     lda #0
     sta s
-  //SEG65 [22] phi (byte*) print_char_cursor#61 = (byte*~) print_char_cursor#101 [phi:main::@11->main::@10#2] -- register_copy 
-  //SEG66 [22] phi from main::@16 to main::@10 [phi:main::@16->main::@10]
-  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@16->main::@10#0] -- register_copy 
-  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@16->main::@10#1] -- register_copy 
-  //SEG69 [22] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#11 [phi:main::@16->main::@10#2] -- register_copy 
-  //SEG70 main::@10
-  b10:
+  //SEG65 [22] phi (byte*) print_char_cursor#61 = (byte*~) print_char_cursor#101 [phi:main::@6->main::@5#2] -- register_copy 
+  //SEG66 [22] phi from main::@9 to main::@5 [phi:main::@9->main::@5]
+  //SEG67 [22] phi (byte*) print_line_cursor#23 = (byte*) print_line_cursor#19 [phi:main::@9->main::@5#0] -- register_copy 
+  //SEG68 [22] phi (byte) main::s#10 = (byte) main::s#1 [phi:main::@9->main::@5#1] -- register_copy 
+  //SEG69 [22] phi (byte*) print_char_cursor#61 = (byte*) print_char_cursor#11 [phi:main::@9->main::@5#2] -- register_copy 
+  //SEG70 main::@5
+  b5:
   //SEG71 [23] (byte) main::op#1 ← ++ (byte) main::op#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@9 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG72 [24] if((byte) main::op#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@4 -- vbuxx_neq_vbuc1_then_la1 
     cpx #6
-    bne b9
-  //SEG73 main::@12
+    bne b4
+  //SEG73 main::@7
   //SEG74 [25] (byte) main::j#1 ← ++ (byte) main::j#2 -- vbuz1=_inc_vbuz1 
     inc j
-  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG75 [26] if((byte) main::j#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #3
     cmp j
-    bne b8
-  //SEG76 main::@13
+    bne b3
+  //SEG76 main::@8
   //SEG77 [27] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG78 [28] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 3) goto main::@2 -- vbuz1_neq_vbuc1_then_la1 
     cmp i
-    bne b7
-  //SEG79 [29] phi from main::@13 main::@2 to main::@2 [phi:main::@13/main::@2->main::@2]
-  //SEG80 main::@2
-  b2:
-    jmp b2
+    bne b2
+  //SEG79 [29] phi from main::@1 main::@8 to main::@1 [phi:main::@1/main::@8->main::@1]
+  //SEG80 main::@1
+  b1:
+    jmp b1
 }
 //SEG81 print_ln
 // Print a newline
@@ -4532,108 +4565,108 @@ compare: {
     bne !b1+
     jmp b1
   !b1:
-  //SEG91 compare::@12
+  //SEG91 compare::@7
   //SEG92 [36] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 1) goto compare::@2 -- vbuxx_eq_vbuc1_then_la1 
     cpx #1
     bne !b2+
     jmp b2
   !b2:
-  //SEG93 compare::@13
+  //SEG93 compare::@8
   //SEG94 [37] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 2) goto compare::@3 -- vbuxx_eq_vbuc1_then_la1 
     cpx #2
     bne !b3+
     jmp b3
   !b3:
-  //SEG95 compare::@14
+  //SEG95 compare::@9
   //SEG96 [38] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 3) goto compare::@4 -- vbuxx_eq_vbuc1_then_la1 
     cpx #3
     beq b4
-  //SEG97 compare::@15
+  //SEG97 compare::@10
   //SEG98 [39] if((byte) compare::op#0==(byte/signed byte/word/signed word/dword/signed dword) 4) goto compare::@5 -- vbuxx_eq_vbuc1_then_la1 
     cpx #4
     beq b5
-  //SEG99 compare::@16
-  //SEG100 [40] if((byte) compare::op#0!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto compare::@11 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG99 compare::@11
+  //SEG100 [40] if((byte) compare::op#0!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto compare::@6 -- vbuxx_neq_vbuc1_then_la1 
     cpx #5
-    bne b7
-  //SEG101 compare::@17
-  //SEG102 [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@29 -- vwuz1_eq_vwuz2_then_la1 
+    bne b8
+  //SEG101 compare::@12
+  //SEG102 [41] if((word) compare::w1#0==(word) compare::w2#0) goto compare::@19 -- vwuz1_eq_vwuz2_then_la1 
     lda w1
     cmp w2
     bne !+
     lda w1+1
     cmp w2+1
-    beq b6
+    beq b7
   !:
-  //SEG103 [42] phi from compare::@17 to compare::@18 [phi:compare::@17->compare::@18]
-  //SEG104 compare::@18
-  //SEG105 [43] phi from compare::@18 to compare::@29 [phi:compare::@18->compare::@29]
-  //SEG106 [43] phi (byte) compare::r#11 = (const byte) TT#0 [phi:compare::@18->compare::@29#0] -- vbuz1=vbuc1 
+  //SEG103 [42] phi from compare::@12 to compare::@13 [phi:compare::@12->compare::@13]
+  //SEG104 compare::@13
+  //SEG105 [43] phi from compare::@13 to compare::@19 [phi:compare::@13->compare::@19]
+  //SEG106 [43] phi (byte) compare::r#11 = (const byte) TT#0 [phi:compare::@13->compare::@19#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b29
-  //SEG107 [43] phi from compare::@17 to compare::@29 [phi:compare::@17->compare::@29]
-  b6:
-  //SEG108 [43] phi (byte) compare::r#11 = (const byte) FF#0 [phi:compare::@17->compare::@29#0] -- vbuz1=vbuc1 
+    jmp b19
+  //SEG107 [43] phi from compare::@12 to compare::@19 [phi:compare::@12->compare::@19]
+  b7:
+  //SEG108 [43] phi (byte) compare::r#11 = (const byte) FF#0 [phi:compare::@12->compare::@19#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG109 compare::@29
-  b29:
-  //SEG110 [44] phi from compare::@29 to compare::@11 [phi:compare::@29->compare::@11]
-  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#11 [phi:compare::@29->compare::@11#0] -- register_copy 
-  //SEG112 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#1 [phi:compare::@29->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG109 compare::@19
+  b19:
+  //SEG110 [44] phi from compare::@19 to compare::@6 [phi:compare::@19->compare::@6]
+  //SEG111 [44] phi (byte) compare::r#10 = (byte) compare::r#11 [phi:compare::@19->compare::@6#0] -- register_copy 
+  //SEG112 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#1 [phi:compare::@19->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_1
     sta ops
     lda #>ops_1
     sta ops+1
-    jmp b11
-  //SEG113 [44] phi from compare::@16 to compare::@11 [phi:compare::@16->compare::@11]
-  b7:
-  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@16->compare::@11#0] -- vbuz1=vbuc1 
+    jmp b6
+  //SEG113 [44] phi from compare::@11 to compare::@6 [phi:compare::@11->compare::@6]
+  b8:
+  //SEG114 [44] phi (byte) compare::r#10 = (const byte) FF#0 [phi:compare::@11->compare::@6#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG115 [44] phi (byte*) compare::ops#7 = (byte*) 0 [phi:compare::@16->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG115 [44] phi (byte*) compare::ops#7 = (byte*) 0 [phi:compare::@11->compare::@6#1] -- pbuz1=pbuc1 
     lda #<0
     sta ops
     sta ops+1
-  //SEG116 compare::@11
-  b11:
+  //SEG116 compare::@6
+  b6:
   //SEG117 [45] (word) print_word::w#0 ← (word) compare::w1#0
   //SEG118 [46] call print_word 
-  //SEG119 [75] phi from compare::@11 to print_word [phi:compare::@11->print_word]
-  //SEG120 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#55 [phi:compare::@11->print_word#0] -- register_copy 
-  //SEG121 [75] phi (word) print_word::w#2 = (word) print_word::w#0 [phi:compare::@11->print_word#1] -- register_copy 
+  //SEG119 [75] phi from compare::@6 to print_word [phi:compare::@6->print_word]
+  //SEG120 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#55 [phi:compare::@6->print_word#0] -- register_copy 
+  //SEG121 [75] phi (word) print_word::w#2 = (word) print_word::w#0 [phi:compare::@6->print_word#1] -- register_copy 
     jsr print_word
-  //SEG122 compare::@35
+  //SEG122 compare::@25
   //SEG123 [47] (byte*) print_str::str#1 ← (byte*) compare::ops#7
   //SEG124 [48] call print_str 
-  //SEG125 [89] phi from compare::@35 to print_str [phi:compare::@35->print_str]
+  //SEG125 [89] phi from compare::@25 to print_str [phi:compare::@25->print_str]
     jsr print_str
-  //SEG126 compare::@36
+  //SEG126 compare::@26
   //SEG127 [49] (word) print_word::w#1 ← (word) compare::w2#0 -- vwuz1=vwuz2 
     lda w2
     sta print_word.w
     lda w2+1
     sta print_word.w+1
   //SEG128 [50] call print_word 
-  //SEG129 [75] phi from compare::@36 to print_word [phi:compare::@36->print_word]
-  //SEG130 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#2 [phi:compare::@36->print_word#0] -- register_copy 
-  //SEG131 [75] phi (word) print_word::w#2 = (word) print_word::w#1 [phi:compare::@36->print_word#1] -- register_copy 
+  //SEG129 [75] phi from compare::@26 to print_word [phi:compare::@26->print_word]
+  //SEG130 [75] phi (byte*) print_char_cursor#52 = (byte*) print_char_cursor#2 [phi:compare::@26->print_word#0] -- register_copy 
+  //SEG131 [75] phi (word) print_word::w#2 = (word) print_word::w#1 [phi:compare::@26->print_word#1] -- register_copy 
     jsr print_word
-  //SEG132 compare::@37
+  //SEG132 compare::@27
   //SEG133 [51] (byte) print_char::ch#2 ← (byte) compare::r#10 -- vbuaa=vbuz1 
     lda r
   //SEG134 [52] call print_char 
-  //SEG135 [71] phi from compare::@37 to print_char [phi:compare::@37->print_char]
-  //SEG136 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@37->print_char#0] -- register_copy 
-  //SEG137 [71] phi (byte) print_char::ch#4 = (byte) print_char::ch#2 [phi:compare::@37->print_char#1] -- register_copy 
+  //SEG135 [71] phi from compare::@27 to print_char [phi:compare::@27->print_char]
+  //SEG136 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@27->print_char#0] -- register_copy 
+  //SEG137 [71] phi (byte) print_char::ch#4 = (byte) print_char::ch#2 [phi:compare::@27->print_char#1] -- register_copy 
     jsr print_char
-  //SEG138 [53] phi from compare::@37 to compare::@38 [phi:compare::@37->compare::@38]
-  //SEG139 compare::@38
+  //SEG138 [53] phi from compare::@27 to compare::@28 [phi:compare::@27->compare::@28]
+  //SEG139 compare::@28
   //SEG140 [54] call print_char 
-  //SEG141 [71] phi from compare::@38 to print_char [phi:compare::@38->print_char]
-  //SEG142 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@38->print_char#0] -- register_copy 
-  //SEG143 [71] phi (byte) print_char::ch#4 = (byte) ' ' [phi:compare::@38->print_char#1] -- vbuaa=vbuc1 
+  //SEG141 [71] phi from compare::@28 to print_char [phi:compare::@28->print_char]
+  //SEG142 [71] phi (byte*) print_char_cursor#36 = (byte*) print_char_cursor#11 [phi:compare::@28->print_char#0] -- register_copy 
+  //SEG143 [71] phi (byte) print_char::ch#4 = (byte) ' ' [phi:compare::@28->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
   //SEG144 compare::@return
@@ -4641,104 +4674,104 @@ compare: {
     rts
   //SEG146 compare::@5
   b5:
-  //SEG147 [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@30 -- vwuz1_neq_vwuz2_then_la1 
+  //SEG147 [56] if((word) compare::w1#0!=(word) compare::w2#0) goto compare::@20 -- vwuz1_neq_vwuz2_then_la1 
     lda w1+1
     cmp w2+1
-    bne b8
+    bne b9
     lda w1
     cmp w2
-    bne b8
-  //SEG148 [57] phi from compare::@5 to compare::@20 [phi:compare::@5->compare::@20]
-  //SEG149 compare::@20
-  //SEG150 [58] phi from compare::@20 to compare::@30 [phi:compare::@20->compare::@30]
-  //SEG151 [58] phi (byte) compare::r#12 = (const byte) TT#0 [phi:compare::@20->compare::@30#0] -- vbuz1=vbuc1 
+    bne b9
+  //SEG148 [57] phi from compare::@5 to compare::@14 [phi:compare::@5->compare::@14]
+  //SEG149 compare::@14
+  //SEG150 [58] phi from compare::@14 to compare::@20 [phi:compare::@14->compare::@20]
+  //SEG151 [58] phi (byte) compare::r#12 = (const byte) TT#0 [phi:compare::@14->compare::@20#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b30
-  //SEG152 [58] phi from compare::@5 to compare::@30 [phi:compare::@5->compare::@30]
-  b8:
-  //SEG153 [58] phi (byte) compare::r#12 = (const byte) FF#0 [phi:compare::@5->compare::@30#0] -- vbuz1=vbuc1 
+    jmp b20
+  //SEG152 [58] phi from compare::@5 to compare::@20 [phi:compare::@5->compare::@20]
+  b9:
+  //SEG153 [58] phi (byte) compare::r#12 = (const byte) FF#0 [phi:compare::@5->compare::@20#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG154 compare::@30
-  b30:
-  //SEG155 [44] phi from compare::@30 to compare::@11 [phi:compare::@30->compare::@11]
-  //SEG156 [44] phi (byte) compare::r#10 = (byte) compare::r#12 [phi:compare::@30->compare::@11#0] -- register_copy 
-  //SEG157 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#2 [phi:compare::@30->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG154 compare::@20
+  b20:
+  //SEG155 [44] phi from compare::@20 to compare::@6 [phi:compare::@20->compare::@6]
+  //SEG156 [44] phi (byte) compare::r#10 = (byte) compare::r#12 [phi:compare::@20->compare::@6#0] -- register_copy 
+  //SEG157 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#2 [phi:compare::@20->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_2
     sta ops
     lda #>ops_2
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG158 compare::@4
   b4:
-  //SEG159 [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@31 -- vwuz1_lt_vwuz2_then_la1 
+  //SEG159 [59] if((word) compare::w1#0<(word) compare::w2#0) goto compare::@21 -- vwuz1_lt_vwuz2_then_la1 
     lda w1+1
     cmp w2+1
-    bcc b9
+    bcc b10
     bne !+
     lda w1
     cmp w2
-    bcc b9
+    bcc b10
   !:
-  //SEG160 [60] phi from compare::@4 to compare::@22 [phi:compare::@4->compare::@22]
-  //SEG161 compare::@22
-  //SEG162 [61] phi from compare::@22 to compare::@31 [phi:compare::@22->compare::@31]
-  //SEG163 [61] phi (byte) compare::r#13 = (const byte) TT#0 [phi:compare::@22->compare::@31#0] -- vbuz1=vbuc1 
+  //SEG160 [60] phi from compare::@4 to compare::@15 [phi:compare::@4->compare::@15]
+  //SEG161 compare::@15
+  //SEG162 [61] phi from compare::@15 to compare::@21 [phi:compare::@15->compare::@21]
+  //SEG163 [61] phi (byte) compare::r#13 = (const byte) TT#0 [phi:compare::@15->compare::@21#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b31
-  //SEG164 [61] phi from compare::@4 to compare::@31 [phi:compare::@4->compare::@31]
-  b9:
-  //SEG165 [61] phi (byte) compare::r#13 = (const byte) FF#0 [phi:compare::@4->compare::@31#0] -- vbuz1=vbuc1 
+    jmp b21
+  //SEG164 [61] phi from compare::@4 to compare::@21 [phi:compare::@4->compare::@21]
+  b10:
+  //SEG165 [61] phi (byte) compare::r#13 = (const byte) FF#0 [phi:compare::@4->compare::@21#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG166 compare::@31
-  b31:
-  //SEG167 [44] phi from compare::@31 to compare::@11 [phi:compare::@31->compare::@11]
-  //SEG168 [44] phi (byte) compare::r#10 = (byte) compare::r#13 [phi:compare::@31->compare::@11#0] -- register_copy 
-  //SEG169 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#3 [phi:compare::@31->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG166 compare::@21
+  b21:
+  //SEG167 [44] phi from compare::@21 to compare::@6 [phi:compare::@21->compare::@6]
+  //SEG168 [44] phi (byte) compare::r#10 = (byte) compare::r#13 [phi:compare::@21->compare::@6#0] -- register_copy 
+  //SEG169 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#3 [phi:compare::@21->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_3
     sta ops
     lda #>ops_3
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG170 compare::@3
   b3:
-  //SEG171 [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@32 -- vwuz1_le_vwuz2_then_la1 
+  //SEG171 [62] if((word) compare::w1#0<=(word) compare::w2#0) goto compare::@22 -- vwuz1_le_vwuz2_then_la1 
     lda w1+1
     cmp w2+1
     bne !+
     lda w1
     cmp w2
   !:
-    bcc b10
-    beq b10
-  //SEG172 [63] phi from compare::@3 to compare::@24 [phi:compare::@3->compare::@24]
-  //SEG173 compare::@24
-  //SEG174 [64] phi from compare::@24 to compare::@32 [phi:compare::@24->compare::@32]
-  //SEG175 [64] phi (byte) compare::r#14 = (const byte) TT#0 [phi:compare::@24->compare::@32#0] -- vbuz1=vbuc1 
+    bcc b11
+    beq b11
+  //SEG172 [63] phi from compare::@3 to compare::@16 [phi:compare::@3->compare::@16]
+  //SEG173 compare::@16
+  //SEG174 [64] phi from compare::@16 to compare::@22 [phi:compare::@16->compare::@22]
+  //SEG175 [64] phi (byte) compare::r#14 = (const byte) TT#0 [phi:compare::@16->compare::@22#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b32
-  //SEG176 [64] phi from compare::@3 to compare::@32 [phi:compare::@3->compare::@32]
-  b10:
-  //SEG177 [64] phi (byte) compare::r#14 = (const byte) FF#0 [phi:compare::@3->compare::@32#0] -- vbuz1=vbuc1 
+    jmp b22
+  //SEG176 [64] phi from compare::@3 to compare::@22 [phi:compare::@3->compare::@22]
+  b11:
+  //SEG177 [64] phi (byte) compare::r#14 = (const byte) FF#0 [phi:compare::@3->compare::@22#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG178 compare::@32
-  b32:
-  //SEG179 [44] phi from compare::@32 to compare::@11 [phi:compare::@32->compare::@11]
-  //SEG180 [44] phi (byte) compare::r#10 = (byte) compare::r#14 [phi:compare::@32->compare::@11#0] -- register_copy 
-  //SEG181 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#4 [phi:compare::@32->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG178 compare::@22
+  b22:
+  //SEG179 [44] phi from compare::@22 to compare::@6 [phi:compare::@22->compare::@6]
+  //SEG180 [44] phi (byte) compare::r#10 = (byte) compare::r#14 [phi:compare::@22->compare::@6#0] -- register_copy 
+  //SEG181 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#4 [phi:compare::@22->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_4
     sta ops
     lda #>ops_4
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG182 compare::@2
   b2:
-  //SEG183 [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@33 -- vwuz1_gt_vwuz2_then_la1 
+  //SEG183 [65] if((word) compare::w1#0>(word) compare::w2#0) goto compare::@23 -- vwuz1_gt_vwuz2_then_la1 
     lda w2+1
     cmp w1+1
     bcc b12
@@ -4747,31 +4780,31 @@ compare: {
     cmp w1
     bcc b12
   !:
-  //SEG184 [66] phi from compare::@2 to compare::@26 [phi:compare::@2->compare::@26]
-  //SEG185 compare::@26
-  //SEG186 [67] phi from compare::@26 to compare::@33 [phi:compare::@26->compare::@33]
-  //SEG187 [67] phi (byte) compare::r#15 = (const byte) TT#0 [phi:compare::@26->compare::@33#0] -- vbuz1=vbuc1 
+  //SEG184 [66] phi from compare::@2 to compare::@17 [phi:compare::@2->compare::@17]
+  //SEG185 compare::@17
+  //SEG186 [67] phi from compare::@17 to compare::@23 [phi:compare::@17->compare::@23]
+  //SEG187 [67] phi (byte) compare::r#15 = (const byte) TT#0 [phi:compare::@17->compare::@23#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b33
-  //SEG188 [67] phi from compare::@2 to compare::@33 [phi:compare::@2->compare::@33]
+    jmp b23
+  //SEG188 [67] phi from compare::@2 to compare::@23 [phi:compare::@2->compare::@23]
   b12:
-  //SEG189 [67] phi (byte) compare::r#15 = (const byte) FF#0 [phi:compare::@2->compare::@33#0] -- vbuz1=vbuc1 
+  //SEG189 [67] phi (byte) compare::r#15 = (const byte) FF#0 [phi:compare::@2->compare::@23#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG190 compare::@33
-  b33:
-  //SEG191 [44] phi from compare::@33 to compare::@11 [phi:compare::@33->compare::@11]
-  //SEG192 [44] phi (byte) compare::r#10 = (byte) compare::r#15 [phi:compare::@33->compare::@11#0] -- register_copy 
-  //SEG193 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#5 [phi:compare::@33->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG190 compare::@23
+  b23:
+  //SEG191 [44] phi from compare::@23 to compare::@6 [phi:compare::@23->compare::@6]
+  //SEG192 [44] phi (byte) compare::r#10 = (byte) compare::r#15 [phi:compare::@23->compare::@6#0] -- register_copy 
+  //SEG193 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#5 [phi:compare::@23->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_5
     sta ops
     lda #>ops_5
     sta ops+1
-    jmp b11
+    jmp b6
   //SEG194 compare::@1
   b1:
-  //SEG195 [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@34 -- vwuz1_ge_vwuz2_then_la1 
+  //SEG195 [68] if((word) compare::w1#0>=(word) compare::w2#0) goto compare::@24 -- vwuz1_ge_vwuz2_then_la1 
     lda w2+1
     cmp w1+1
     bne !+
@@ -4780,28 +4813,28 @@ compare: {
   !:
     bcc b13
     beq b13
-  //SEG196 [69] phi from compare::@1 to compare::@28 [phi:compare::@1->compare::@28]
-  //SEG197 compare::@28
-  //SEG198 [70] phi from compare::@28 to compare::@34 [phi:compare::@28->compare::@34]
-  //SEG199 [70] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@28->compare::@34#0] -- vbuz1=vbuc1 
+  //SEG196 [69] phi from compare::@1 to compare::@18 [phi:compare::@1->compare::@18]
+  //SEG197 compare::@18
+  //SEG198 [70] phi from compare::@18 to compare::@24 [phi:compare::@18->compare::@24]
+  //SEG199 [70] phi (byte) compare::r#16 = (const byte) TT#0 [phi:compare::@18->compare::@24#0] -- vbuz1=vbuc1 
     lda #TT
     sta r
-    jmp b34
-  //SEG200 [70] phi from compare::@1 to compare::@34 [phi:compare::@1->compare::@34]
+    jmp b24
+  //SEG200 [70] phi from compare::@1 to compare::@24 [phi:compare::@1->compare::@24]
   b13:
-  //SEG201 [70] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@1->compare::@34#0] -- vbuz1=vbuc1 
+  //SEG201 [70] phi (byte) compare::r#16 = (const byte) FF#0 [phi:compare::@1->compare::@24#0] -- vbuz1=vbuc1 
     lda #FF
     sta r
-  //SEG202 compare::@34
-  b34:
-  //SEG203 [44] phi from compare::@34 to compare::@11 [phi:compare::@34->compare::@11]
-  //SEG204 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@34->compare::@11#0] -- register_copy 
-  //SEG205 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#6 [phi:compare::@34->compare::@11#1] -- pbuz1=pbuc1 
+  //SEG202 compare::@24
+  b24:
+  //SEG203 [44] phi from compare::@24 to compare::@6 [phi:compare::@24->compare::@6]
+  //SEG204 [44] phi (byte) compare::r#10 = (byte) compare::r#16 [phi:compare::@24->compare::@6#0] -- register_copy 
+  //SEG205 [44] phi (byte*) compare::ops#7 = (const byte*) compare::ops#6 [phi:compare::@24->compare::@6#1] -- pbuz1=pbuc1 
     lda #<ops_6
     sta ops
     lda #>ops_6
     sta ops+1
-    jmp b11
+    jmp b6
     ops_1: .text "!=@"
     ops_2: .text "==@"
     ops_3: .text ">=@"
diff --git a/src/test/ref/test-comparisons-word.sym b/src/test/ref/test-comparisons-word.sym
index d5e2bf3f7..4d1eade0c 100644
--- a/src/test/ref/test-comparisons-word.sym
+++ b/src/test/ref/test-comparisons-word.sym
@@ -1,4 +1,4 @@
-(label) @25
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -92,6 +92,7 @@
 (byte) YELLOW
 (void()) compare((word) compare::w1 , (word) compare::w2 , (byte) compare::op)
 (label) compare::@1
+(label) compare::@10
 (label) compare::@11
 (label) compare::@12
 (label) compare::@13
@@ -100,25 +101,24 @@
 (label) compare::@16
 (label) compare::@17
 (label) compare::@18
+(label) compare::@19
 (label) compare::@2
 (label) compare::@20
+(label) compare::@21
 (label) compare::@22
+(label) compare::@23
 (label) compare::@24
+(label) compare::@25
 (label) compare::@26
+(label) compare::@27
 (label) compare::@28
-(label) compare::@29
 (label) compare::@3
-(label) compare::@30
-(label) compare::@31
-(label) compare::@32
-(label) compare::@33
-(label) compare::@34
-(label) compare::@35
-(label) compare::@36
-(label) compare::@37
-(label) compare::@38
 (label) compare::@4
 (label) compare::@5
+(label) compare::@6
+(label) compare::@7
+(label) compare::@8
+(label) compare::@9
 (label) compare::@return
 (byte) compare::op
 (byte) compare::op#0 reg byte x 168.8333333333334
@@ -145,12 +145,12 @@
 (void()) main()
 (byte~) main::$1 reg byte a 22.0
 (byte~) main::$2 reg byte a 202.0
-(label) main::@10
-(label) main::@11
-(label) main::@12
-(label) main::@13
-(label) main::@16
+(label) main::@1
 (label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
+(label) main::@6
 (label) main::@7
 (label) main::@8
 (label) main::@9
diff --git a/src/test/ref/test-comparisons.asm b/src/test/ref/test-comparisons.asm
index aff1807ac..01a95f948 100644
--- a/src/test/ref/test-comparisons.asm
+++ b/src/test/ref/test-comparisons.asm
@@ -362,10 +362,10 @@ main: {
     inc i
     lda #5
     cmp i
-    bne b71
-  b43:
-    jmp b43
-  b71:
+    bne b68
+  b42:
+    jmp b42
+  b68:
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
diff --git a/src/test/ref/test-comparisons.cfg b/src/test/ref/test-comparisons.cfg
index b68c4722f..29c9cd13f 100644
--- a/src/test/ref/test-comparisons.cfg
+++ b/src/test/ref/test-comparisons.cfg
@@ -1,21 +1,21 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@21
-@21: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @21
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @21
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main main::@71
-  [6] (byte*) print_line_cursor#27 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@71/(byte*) print_line_cursor#1 )
-  [6] (byte) main::i#10 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@71/(byte) main::i#1 )
-  [6] (byte*) print_char_cursor#120 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@71/(byte*~) print_char_cursor#142 )
-  [6] (byte) main::a#10 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 7 main::@71/(byte) main::a#1 )
+main::@1: scope:[main]  from main main::@68
+  [6] (byte*) print_line_cursor#27 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@68/(byte*) print_line_cursor#1 )
+  [6] (byte) main::i#10 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@68/(byte) main::i#1 )
+  [6] (byte*) print_char_cursor#120 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@68/(byte*~) print_char_cursor#142 )
+  [6] (byte) main::a#10 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 7 main::@68/(byte) main::a#1 )
   [7] (byte) main::b#0 ← (byte/word/signed word/dword/signed dword) $ce - (byte) main::a#10
   [8] if((byte) main::a#10>=(byte) main::b#0) goto main::@2
   to:main::@22
@@ -28,286 +28,286 @@ main::@2: scope:[main]  from main::@1 main::@22
   [12] (byte) printu::b#0 ← (byte) main::b#0
   [13] (byte) printu::res#0 ← (byte) main::r#41
   [14] call printu 
-  to:main::@46
-main::@46: scope:[main]  from main::@2
+  to:main::@43
+main::@43: scope:[main]  from main::@2
   [15] if((byte) main::a#10>=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@3
   to:main::@23
-main::@23: scope:[main]  from main::@46
+main::@23: scope:[main]  from main::@43
   [16] phi()
   to:main::@3
-main::@3: scope:[main]  from main::@23 main::@46
-  [17] (byte) main::r#42 ← phi( main::@23/(byte) '+' main::@46/(byte) '-' )
+main::@3: scope:[main]  from main::@23 main::@43
+  [17] (byte) main::r#42 ← phi( main::@23/(byte) '+' main::@43/(byte) '-' )
   [18] (byte) printu::a#1 ← (byte) main::a#10
   [19] (byte) printu::res#1 ← (byte) main::r#42
   [20] call printu 
-  to:main::@47
-main::@47: scope:[main]  from main::@3
+  to:main::@44
+main::@44: scope:[main]  from main::@3
   [21] if((byte) main::a#10>=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@4
   to:main::@24
-main::@24: scope:[main]  from main::@47
+main::@24: scope:[main]  from main::@44
   [22] phi()
   to:main::@4
-main::@4: scope:[main]  from main::@24 main::@47
-  [23] (byte) main::r#43 ← phi( main::@24/(byte) '+' main::@47/(byte) '-' )
+main::@4: scope:[main]  from main::@24 main::@44
+  [23] (byte) main::r#43 ← phi( main::@24/(byte) '+' main::@44/(byte) '-' )
   [24] (byte) printu::a#2 ← (byte) main::a#10
   [25] (byte) printu::b#2 ← *((const byte[5]) main::cs#0 + (byte) main::i#10)
   [26] (byte) printu::res#2 ← (byte) main::r#43
   [27] call printu 
-  to:main::@48
-main::@48: scope:[main]  from main::@4
+  to:main::@45
+main::@45: scope:[main]  from main::@4
   [28] if((byte) main::a#10>=(byte) main::a#10) goto main::@5
   to:main::@25
-main::@25: scope:[main]  from main::@48
+main::@25: scope:[main]  from main::@45
   [29] phi()
   to:main::@5
-main::@5: scope:[main]  from main::@25 main::@48
-  [30] (byte) main::r#44 ← phi( main::@25/(byte) '+' main::@48/(byte) '-' )
+main::@5: scope:[main]  from main::@25 main::@45
+  [30] (byte) main::r#44 ← phi( main::@25/(byte) '+' main::@45/(byte) '-' )
   [31] (byte) printu::a#3 ← (byte) main::a#10
   [32] (byte) printu::b#3 ← (byte) main::a#10
   [33] (byte) printu::res#3 ← (byte) main::r#44
   [34] call printu 
-  to:main::@49
-main::@49: scope:[main]  from main::@5
+  to:main::@46
+main::@46: scope:[main]  from main::@5
   [35] phi()
   [36] call print_ln 
-  to:main::@50
-main::@50: scope:[main]  from main::@49
+  to:main::@47
+main::@47: scope:[main]  from main::@46
   [37] if((byte) main::a#10<=(byte) main::b#0) goto main::@6
   to:main::@26
-main::@26: scope:[main]  from main::@50
+main::@26: scope:[main]  from main::@47
   [38] phi()
   to:main::@6
-main::@6: scope:[main]  from main::@26 main::@50
-  [39] (byte) main::r#45 ← phi( main::@26/(byte) '+' main::@50/(byte) '-' )
+main::@6: scope:[main]  from main::@26 main::@47
+  [39] (byte) main::r#45 ← phi( main::@26/(byte) '+' main::@47/(byte) '-' )
   [40] (byte) printu::a#4 ← (byte) main::a#10
   [41] (byte) printu::b#4 ← (byte) main::b#0
   [42] (byte) printu::res#4 ← (byte) main::r#45
   [43] (byte*~) print_char_cursor#159 ← (byte*) print_line_cursor#1
   [44] call printu 
-  to:main::@51
-main::@51: scope:[main]  from main::@6
+  to:main::@48
+main::@48: scope:[main]  from main::@6
   [45] if((byte) main::a#10<=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@7
   to:main::@27
-main::@27: scope:[main]  from main::@51
+main::@27: scope:[main]  from main::@48
   [46] phi()
   to:main::@7
-main::@7: scope:[main]  from main::@27 main::@51
-  [47] (byte) main::r#46 ← phi( main::@27/(byte) '+' main::@51/(byte) '-' )
+main::@7: scope:[main]  from main::@27 main::@48
+  [47] (byte) main::r#46 ← phi( main::@27/(byte) '+' main::@48/(byte) '-' )
   [48] (byte) printu::a#5 ← (byte) main::a#10
   [49] (byte) printu::res#5 ← (byte) main::r#46
   [50] call printu 
-  to:main::@52
-main::@52: scope:[main]  from main::@7
+  to:main::@49
+main::@49: scope:[main]  from main::@7
   [51] if((byte) main::a#10<=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@8
   to:main::@28
-main::@28: scope:[main]  from main::@52
+main::@28: scope:[main]  from main::@49
   [52] phi()
   to:main::@8
-main::@8: scope:[main]  from main::@28 main::@52
-  [53] (byte) main::r#47 ← phi( main::@28/(byte) '+' main::@52/(byte) '-' )
+main::@8: scope:[main]  from main::@28 main::@49
+  [53] (byte) main::r#47 ← phi( main::@28/(byte) '+' main::@49/(byte) '-' )
   [54] (byte) printu::a#6 ← (byte) main::a#10
   [55] (byte) printu::b#6 ← *((const byte[5]) main::cs#0 + (byte) main::i#10)
   [56] (byte) printu::res#6 ← (byte) main::r#47
   [57] call printu 
-  to:main::@53
-main::@53: scope:[main]  from main::@8
+  to:main::@50
+main::@50: scope:[main]  from main::@8
   [58] if((byte) main::a#10<=(byte) main::a#10) goto main::@9
   to:main::@29
-main::@29: scope:[main]  from main::@53
+main::@29: scope:[main]  from main::@50
   [59] phi()
   to:main::@9
-main::@9: scope:[main]  from main::@29 main::@53
-  [60] (byte) main::r#48 ← phi( main::@29/(byte) '+' main::@53/(byte) '-' )
+main::@9: scope:[main]  from main::@29 main::@50
+  [60] (byte) main::r#48 ← phi( main::@29/(byte) '+' main::@50/(byte) '-' )
   [61] (byte) printu::a#7 ← (byte) main::a#10
   [62] (byte) printu::b#7 ← (byte) main::a#10
   [63] (byte) printu::res#7 ← (byte) main::r#48
   [64] call printu 
-  to:main::@54
-main::@54: scope:[main]  from main::@9
+  to:main::@51
+main::@51: scope:[main]  from main::@9
   [65] phi()
   [66] call print_ln 
-  to:main::@55
-main::@55: scope:[main]  from main::@54
+  to:main::@52
+main::@52: scope:[main]  from main::@51
   [67] if((byte) main::a#10>(byte) main::b#0) goto main::@10
   to:main::@30
-main::@30: scope:[main]  from main::@55
+main::@30: scope:[main]  from main::@52
   [68] phi()
   to:main::@10
-main::@10: scope:[main]  from main::@30 main::@55
-  [69] (byte) main::r#49 ← phi( main::@30/(byte) '+' main::@55/(byte) '-' )
+main::@10: scope:[main]  from main::@30 main::@52
+  [69] (byte) main::r#49 ← phi( main::@30/(byte) '+' main::@52/(byte) '-' )
   [70] (byte) printu::a#8 ← (byte) main::a#10
   [71] (byte) printu::b#8 ← (byte) main::b#0
   [72] (byte) printu::res#8 ← (byte) main::r#49
   [73] (byte*~) print_char_cursor#143 ← (byte*) print_line_cursor#1
   [74] call printu 
-  to:main::@56
-main::@56: scope:[main]  from main::@10
+  to:main::@53
+main::@53: scope:[main]  from main::@10
   [75] if((byte) main::a#10>(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@11
   to:main::@31
-main::@31: scope:[main]  from main::@56
+main::@31: scope:[main]  from main::@53
   [76] phi()
   to:main::@11
-main::@11: scope:[main]  from main::@31 main::@56
-  [77] (byte) main::r#50 ← phi( main::@31/(byte) '+' main::@56/(byte) '-' )
+main::@11: scope:[main]  from main::@31 main::@53
+  [77] (byte) main::r#50 ← phi( main::@31/(byte) '+' main::@53/(byte) '-' )
   [78] (byte) printu::a#9 ← (byte) main::a#10
   [79] (byte) printu::res#9 ← (byte) main::r#50
   [80] call printu 
-  to:main::@57
-main::@57: scope:[main]  from main::@11
+  to:main::@54
+main::@54: scope:[main]  from main::@11
   [81] if((byte) main::a#10>*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@12
   to:main::@32
-main::@32: scope:[main]  from main::@57
+main::@32: scope:[main]  from main::@54
   [82] phi()
   to:main::@12
-main::@12: scope:[main]  from main::@32 main::@57
-  [83] (byte) main::r#51 ← phi( main::@32/(byte) '+' main::@57/(byte) '-' )
+main::@12: scope:[main]  from main::@32 main::@54
+  [83] (byte) main::r#51 ← phi( main::@32/(byte) '+' main::@54/(byte) '-' )
   [84] (byte) printu::a#10 ← (byte) main::a#10
   [85] (byte) printu::b#10 ← *((const byte[5]) main::cs#0 + (byte) main::i#10)
   [86] (byte) printu::res#10 ← (byte) main::r#51
   [87] call printu 
-  to:main::@58
-main::@58: scope:[main]  from main::@12
+  to:main::@55
+main::@55: scope:[main]  from main::@12
   [88] if((byte) main::a#10>(byte) main::a#10) goto main::@13
   to:main::@33
-main::@33: scope:[main]  from main::@58
+main::@33: scope:[main]  from main::@55
   [89] phi()
   to:main::@13
-main::@13: scope:[main]  from main::@33 main::@58
-  [90] (byte) main::r#52 ← phi( main::@33/(byte) '+' main::@58/(byte) '-' )
+main::@13: scope:[main]  from main::@33 main::@55
+  [90] (byte) main::r#52 ← phi( main::@33/(byte) '+' main::@55/(byte) '-' )
   [91] (byte) printu::a#11 ← (byte) main::a#10
   [92] (byte) printu::b#11 ← (byte) main::a#10
   [93] (byte) printu::res#11 ← (byte) main::r#52
   [94] call printu 
-  to:main::@59
-main::@59: scope:[main]  from main::@13
+  to:main::@56
+main::@56: scope:[main]  from main::@13
   [95] phi()
   [96] call print_ln 
-  to:main::@60
-main::@60: scope:[main]  from main::@59
+  to:main::@57
+main::@57: scope:[main]  from main::@56
   [97] if((byte) main::a#10<(byte) main::b#0) goto main::@14
   to:main::@34
-main::@34: scope:[main]  from main::@60
+main::@34: scope:[main]  from main::@57
   [98] phi()
   to:main::@14
-main::@14: scope:[main]  from main::@34 main::@60
-  [99] (byte) main::r#53 ← phi( main::@34/(byte) '+' main::@60/(byte) '-' )
+main::@14: scope:[main]  from main::@34 main::@57
+  [99] (byte) main::r#53 ← phi( main::@34/(byte) '+' main::@57/(byte) '-' )
   [100] (byte) printu::a#12 ← (byte) main::a#10
   [101] (byte) printu::b#12 ← (byte) main::b#0
   [102] (byte) printu::res#12 ← (byte) main::r#53
   [103] (byte*~) print_char_cursor#147 ← (byte*) print_line_cursor#1
   [104] call printu 
-  to:main::@61
-main::@61: scope:[main]  from main::@14
+  to:main::@58
+main::@58: scope:[main]  from main::@14
   [105] if((byte) main::a#10<(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@15
   to:main::@35
-main::@35: scope:[main]  from main::@61
+main::@35: scope:[main]  from main::@58
   [106] phi()
   to:main::@15
-main::@15: scope:[main]  from main::@35 main::@61
-  [107] (byte) main::r#54 ← phi( main::@35/(byte) '+' main::@61/(byte) '-' )
+main::@15: scope:[main]  from main::@35 main::@58
+  [107] (byte) main::r#54 ← phi( main::@35/(byte) '+' main::@58/(byte) '-' )
   [108] (byte) printu::a#13 ← (byte) main::a#10
   [109] (byte) printu::res#13 ← (byte) main::r#54
   [110] call printu 
-  to:main::@62
-main::@62: scope:[main]  from main::@15
+  to:main::@59
+main::@59: scope:[main]  from main::@15
   [111] if((byte) main::a#10<*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@16
   to:main::@36
-main::@36: scope:[main]  from main::@62
+main::@36: scope:[main]  from main::@59
   [112] phi()
   to:main::@16
-main::@16: scope:[main]  from main::@36 main::@62
-  [113] (byte) main::r#55 ← phi( main::@36/(byte) '+' main::@62/(byte) '-' )
+main::@16: scope:[main]  from main::@36 main::@59
+  [113] (byte) main::r#55 ← phi( main::@36/(byte) '+' main::@59/(byte) '-' )
   [114] (byte) printu::a#14 ← (byte) main::a#10
   [115] (byte) printu::b#14 ← *((const byte[5]) main::cs#0 + (byte) main::i#10)
   [116] (byte) printu::res#14 ← (byte) main::r#55
   [117] call printu 
-  to:main::@63
-main::@63: scope:[main]  from main::@16
+  to:main::@60
+main::@60: scope:[main]  from main::@16
   [118] if((byte) main::a#10<(byte) main::a#10) goto main::@17
   to:main::@37
-main::@37: scope:[main]  from main::@63
+main::@37: scope:[main]  from main::@60
   [119] phi()
   to:main::@17
-main::@17: scope:[main]  from main::@37 main::@63
-  [120] (byte) main::r#56 ← phi( main::@37/(byte) '+' main::@63/(byte) '-' )
+main::@17: scope:[main]  from main::@37 main::@60
+  [120] (byte) main::r#56 ← phi( main::@37/(byte) '+' main::@60/(byte) '-' )
   [121] (byte) printu::a#15 ← (byte) main::a#10
   [122] (byte) printu::b#15 ← (byte) main::a#10
   [123] (byte) printu::res#15 ← (byte) main::r#56
   [124] call printu 
-  to:main::@64
-main::@64: scope:[main]  from main::@17
+  to:main::@61
+main::@61: scope:[main]  from main::@17
   [125] phi()
   [126] call print_ln 
-  to:main::@65
-main::@65: scope:[main]  from main::@64
+  to:main::@62
+main::@62: scope:[main]  from main::@61
   [127] if((byte) main::a#10!=(byte) main::b#0) goto main::@18
   to:main::@38
-main::@38: scope:[main]  from main::@65
+main::@38: scope:[main]  from main::@62
   [128] phi()
   to:main::@18
-main::@18: scope:[main]  from main::@38 main::@65
-  [129] (byte) main::r#57 ← phi( main::@38/(byte) '+' main::@65/(byte) '-' )
+main::@18: scope:[main]  from main::@38 main::@62
+  [129] (byte) main::r#57 ← phi( main::@38/(byte) '+' main::@62/(byte) '-' )
   [130] (byte) printu::a#16 ← (byte) main::a#10
   [131] (byte) printu::b#16 ← (byte) main::b#0
   [132] (byte) printu::res#16 ← (byte) main::r#57
   [133] (byte*~) print_char_cursor#151 ← (byte*) print_line_cursor#1
   [134] call printu 
-  to:main::@66
-main::@66: scope:[main]  from main::@18
+  to:main::@63
+main::@63: scope:[main]  from main::@18
   [135] if((byte) main::a#10!=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@19
   to:main::@39
-main::@39: scope:[main]  from main::@66
+main::@39: scope:[main]  from main::@63
   [136] phi()
   to:main::@19
-main::@19: scope:[main]  from main::@39 main::@66
-  [137] (byte) main::r#58 ← phi( main::@39/(byte) '+' main::@66/(byte) '-' )
+main::@19: scope:[main]  from main::@39 main::@63
+  [137] (byte) main::r#58 ← phi( main::@39/(byte) '+' main::@63/(byte) '-' )
   [138] (byte) printu::a#17 ← (byte) main::a#10
   [139] (byte) printu::res#17 ← (byte) main::r#58
   [140] call printu 
-  to:main::@67
-main::@67: scope:[main]  from main::@19
+  to:main::@64
+main::@64: scope:[main]  from main::@19
   [141] if((byte) main::a#10!=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@20
   to:main::@40
-main::@40: scope:[main]  from main::@67
+main::@40: scope:[main]  from main::@64
   [142] phi()
   to:main::@20
-main::@20: scope:[main]  from main::@40 main::@67
-  [143] (byte) main::r#59 ← phi( main::@40/(byte) '+' main::@67/(byte) '-' )
+main::@20: scope:[main]  from main::@40 main::@64
+  [143] (byte) main::r#59 ← phi( main::@40/(byte) '+' main::@64/(byte) '-' )
   [144] (byte) printu::a#18 ← (byte) main::a#10
   [145] (byte) printu::b#18 ← *((const byte[5]) main::cs#0 + (byte) main::i#10)
   [146] (byte) printu::res#18 ← (byte) main::r#59
   [147] call printu 
-  to:main::@68
-main::@68: scope:[main]  from main::@20
+  to:main::@65
+main::@65: scope:[main]  from main::@20
   [148] if((byte) main::a#10!=(byte) main::a#10) goto main::@21
   to:main::@41
-main::@41: scope:[main]  from main::@68
+main::@41: scope:[main]  from main::@65
   [149] phi()
   to:main::@21
-main::@21: scope:[main]  from main::@41 main::@68
-  [150] (byte) main::r#60 ← phi( main::@41/(byte) '+' main::@68/(byte) '-' )
+main::@21: scope:[main]  from main::@41 main::@65
+  [150] (byte) main::r#60 ← phi( main::@41/(byte) '+' main::@65/(byte) '-' )
   [151] (byte) printu::a#19 ← (byte) main::a#10
   [152] (byte) printu::b#19 ← (byte) main::a#10
   [153] (byte) printu::res#19 ← (byte) main::r#60
   [154] call printu 
-  to:main::@69
-main::@69: scope:[main]  from main::@21
+  to:main::@66
+main::@66: scope:[main]  from main::@21
   [155] phi()
   [156] call print_ln 
-  to:main::@70
-main::@70: scope:[main]  from main::@69
+  to:main::@67
+main::@67: scope:[main]  from main::@66
   [157] (byte) main::a#1 ← (byte) main::a#10 + (byte/signed byte/word/signed word/dword/signed dword) $30
   [158] (byte) main::i#1 ← ++ (byte) main::i#10
-  [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@71
-  to:main::@43
-main::@43: scope:[main]  from main::@43 main::@70
+  [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@68
+  to:main::@42
+main::@42: scope:[main]  from main::@42 main::@67
   [160] phi()
-  to:main::@43
-main::@71: scope:[main]  from main::@70
+  to:main::@42
+main::@68: scope:[main]  from main::@67
   [161] (byte*~) print_char_cursor#142 ← (byte*) print_line_cursor#1
   to:main::@1
-print_ln: scope:[print_ln]  from main::@49 main::@54 main::@59 main::@64 main::@69
-  [162] (byte*) print_line_cursor#25 ← phi( main::@49/(byte*) print_line_cursor#27 main::@54/(byte*) print_line_cursor#1 main::@59/(byte*) print_line_cursor#1 main::@64/(byte*) print_line_cursor#1 main::@69/(byte*) print_line_cursor#1 )
+print_ln: scope:[print_ln]  from main::@46 main::@51 main::@56 main::@61 main::@66
+  [162] (byte*) print_line_cursor#25 ← phi( main::@46/(byte*) print_line_cursor#27 main::@51/(byte*) print_line_cursor#1 main::@56/(byte*) print_line_cursor#1 main::@61/(byte*) print_line_cursor#1 main::@66/(byte*) print_line_cursor#1 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [163] (byte*) print_line_cursor#13 ← phi( print_ln/(byte*) print_line_cursor#25 print_ln::@1/(byte*) print_line_cursor#1 )
diff --git a/src/test/ref/test-comparisons.log b/src/test/ref/test-comparisons.log
index c266b5ab7..77935d650 100644
--- a/src/test/ref/test-comparisons.log
+++ b/src/test/ref/test-comparisons.log
@@ -2395,36 +2395,64 @@ Coalesced [295] print_cls::sc#3 ← print_cls::sc#1
 Coalesced down to 32 phi equivalence classes
 Culled Empty Block (label) print_ln::@3
 Culled Empty Block (label) print_cls::@3
+Renumbering block @21 to @1
+Renumbering block main::@43 to main::@42
+Renumbering block main::@46 to main::@43
+Renumbering block main::@47 to main::@44
+Renumbering block main::@48 to main::@45
+Renumbering block main::@49 to main::@46
+Renumbering block main::@50 to main::@47
+Renumbering block main::@51 to main::@48
+Renumbering block main::@52 to main::@49
+Renumbering block main::@53 to main::@50
+Renumbering block main::@54 to main::@51
+Renumbering block main::@55 to main::@52
+Renumbering block main::@56 to main::@53
+Renumbering block main::@57 to main::@54
+Renumbering block main::@58 to main::@55
+Renumbering block main::@59 to main::@56
+Renumbering block main::@60 to main::@57
+Renumbering block main::@61 to main::@58
+Renumbering block main::@62 to main::@59
+Renumbering block main::@63 to main::@60
+Renumbering block main::@64 to main::@61
+Renumbering block main::@65 to main::@62
+Renumbering block main::@66 to main::@63
+Renumbering block main::@67 to main::@64
+Renumbering block main::@68 to main::@65
+Renumbering block main::@69 to main::@66
+Renumbering block main::@70 to main::@67
+Renumbering block main::@71 to main::@68
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @21
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@22
 Adding NOP phi() at start of main::@23
 Adding NOP phi() at start of main::@24
 Adding NOP phi() at start of main::@25
-Adding NOP phi() at start of main::@49
+Adding NOP phi() at start of main::@46
 Adding NOP phi() at start of main::@26
 Adding NOP phi() at start of main::@27
 Adding NOP phi() at start of main::@28
 Adding NOP phi() at start of main::@29
-Adding NOP phi() at start of main::@54
+Adding NOP phi() at start of main::@51
 Adding NOP phi() at start of main::@30
 Adding NOP phi() at start of main::@31
 Adding NOP phi() at start of main::@32
 Adding NOP phi() at start of main::@33
-Adding NOP phi() at start of main::@59
+Adding NOP phi() at start of main::@56
 Adding NOP phi() at start of main::@34
 Adding NOP phi() at start of main::@35
 Adding NOP phi() at start of main::@36
 Adding NOP phi() at start of main::@37
-Adding NOP phi() at start of main::@64
+Adding NOP phi() at start of main::@61
 Adding NOP phi() at start of main::@38
 Adding NOP phi() at start of main::@39
 Adding NOP phi() at start of main::@40
 Adding NOP phi() at start of main::@41
-Adding NOP phi() at start of main::@69
-Adding NOP phi() at start of main::@43
+Adding NOP phi() at start of main::@66
+Adding NOP phi() at start of main::@42
 Adding NOP phi() at start of printu::@4
 Adding NOP phi() at start of print_str
 Adding NOP phi() at start of print_cls
@@ -2432,22 +2460,22 @@ Adding NOP phi() at start of print_cls
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@21
-@21: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @21
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @21
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main main::@71
-  [6] (byte*) print_line_cursor#27 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@71/(byte*) print_line_cursor#1 )
-  [6] (byte) main::i#10 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@71/(byte) main::i#1 )
-  [6] (byte*) print_char_cursor#120 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@71/(byte*~) print_char_cursor#142 )
-  [6] (byte) main::a#10 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 7 main::@71/(byte) main::a#1 )
+main::@1: scope:[main]  from main main::@68
+  [6] (byte*) print_line_cursor#27 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@68/(byte*) print_line_cursor#1 )
+  [6] (byte) main::i#10 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@68/(byte) main::i#1 )
+  [6] (byte*) print_char_cursor#120 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@68/(byte*~) print_char_cursor#142 )
+  [6] (byte) main::a#10 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 7 main::@68/(byte) main::a#1 )
   [7] (byte) main::b#0 ← (byte/word/signed word/dword/signed dword) $ce - (byte) main::a#10
   [8] if((byte) main::a#10>=(byte) main::b#0) goto main::@2
   to:main::@22
@@ -2460,286 +2488,286 @@ main::@2: scope:[main]  from main::@1 main::@22
   [12] (byte) printu::b#0 ← (byte) main::b#0
   [13] (byte) printu::res#0 ← (byte) main::r#41
   [14] call printu 
-  to:main::@46
-main::@46: scope:[main]  from main::@2
+  to:main::@43
+main::@43: scope:[main]  from main::@2
   [15] if((byte) main::a#10>=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@3
   to:main::@23
-main::@23: scope:[main]  from main::@46
+main::@23: scope:[main]  from main::@43
   [16] phi()
   to:main::@3
-main::@3: scope:[main]  from main::@23 main::@46
-  [17] (byte) main::r#42 ← phi( main::@23/(byte) '+' main::@46/(byte) '-' )
+main::@3: scope:[main]  from main::@23 main::@43
+  [17] (byte) main::r#42 ← phi( main::@23/(byte) '+' main::@43/(byte) '-' )
   [18] (byte) printu::a#1 ← (byte) main::a#10
   [19] (byte) printu::res#1 ← (byte) main::r#42
   [20] call printu 
-  to:main::@47
-main::@47: scope:[main]  from main::@3
+  to:main::@44
+main::@44: scope:[main]  from main::@3
   [21] if((byte) main::a#10>=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@4
   to:main::@24
-main::@24: scope:[main]  from main::@47
+main::@24: scope:[main]  from main::@44
   [22] phi()
   to:main::@4
-main::@4: scope:[main]  from main::@24 main::@47
-  [23] (byte) main::r#43 ← phi( main::@24/(byte) '+' main::@47/(byte) '-' )
+main::@4: scope:[main]  from main::@24 main::@44
+  [23] (byte) main::r#43 ← phi( main::@24/(byte) '+' main::@44/(byte) '-' )
   [24] (byte) printu::a#2 ← (byte) main::a#10
   [25] (byte) printu::b#2 ← *((const byte[5]) main::cs#0 + (byte) main::i#10)
   [26] (byte) printu::res#2 ← (byte) main::r#43
   [27] call printu 
-  to:main::@48
-main::@48: scope:[main]  from main::@4
+  to:main::@45
+main::@45: scope:[main]  from main::@4
   [28] if((byte) main::a#10>=(byte) main::a#10) goto main::@5
   to:main::@25
-main::@25: scope:[main]  from main::@48
+main::@25: scope:[main]  from main::@45
   [29] phi()
   to:main::@5
-main::@5: scope:[main]  from main::@25 main::@48
-  [30] (byte) main::r#44 ← phi( main::@25/(byte) '+' main::@48/(byte) '-' )
+main::@5: scope:[main]  from main::@25 main::@45
+  [30] (byte) main::r#44 ← phi( main::@25/(byte) '+' main::@45/(byte) '-' )
   [31] (byte) printu::a#3 ← (byte) main::a#10
   [32] (byte) printu::b#3 ← (byte) main::a#10
   [33] (byte) printu::res#3 ← (byte) main::r#44
   [34] call printu 
-  to:main::@49
-main::@49: scope:[main]  from main::@5
+  to:main::@46
+main::@46: scope:[main]  from main::@5
   [35] phi()
   [36] call print_ln 
-  to:main::@50
-main::@50: scope:[main]  from main::@49
+  to:main::@47
+main::@47: scope:[main]  from main::@46
   [37] if((byte) main::a#10<=(byte) main::b#0) goto main::@6
   to:main::@26
-main::@26: scope:[main]  from main::@50
+main::@26: scope:[main]  from main::@47
   [38] phi()
   to:main::@6
-main::@6: scope:[main]  from main::@26 main::@50
-  [39] (byte) main::r#45 ← phi( main::@26/(byte) '+' main::@50/(byte) '-' )
+main::@6: scope:[main]  from main::@26 main::@47
+  [39] (byte) main::r#45 ← phi( main::@26/(byte) '+' main::@47/(byte) '-' )
   [40] (byte) printu::a#4 ← (byte) main::a#10
   [41] (byte) printu::b#4 ← (byte) main::b#0
   [42] (byte) printu::res#4 ← (byte) main::r#45
   [43] (byte*~) print_char_cursor#159 ← (byte*) print_line_cursor#1
   [44] call printu 
-  to:main::@51
-main::@51: scope:[main]  from main::@6
+  to:main::@48
+main::@48: scope:[main]  from main::@6
   [45] if((byte) main::a#10<=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@7
   to:main::@27
-main::@27: scope:[main]  from main::@51
+main::@27: scope:[main]  from main::@48
   [46] phi()
   to:main::@7
-main::@7: scope:[main]  from main::@27 main::@51
-  [47] (byte) main::r#46 ← phi( main::@27/(byte) '+' main::@51/(byte) '-' )
+main::@7: scope:[main]  from main::@27 main::@48
+  [47] (byte) main::r#46 ← phi( main::@27/(byte) '+' main::@48/(byte) '-' )
   [48] (byte) printu::a#5 ← (byte) main::a#10
   [49] (byte) printu::res#5 ← (byte) main::r#46
   [50] call printu 
-  to:main::@52
-main::@52: scope:[main]  from main::@7
+  to:main::@49
+main::@49: scope:[main]  from main::@7
   [51] if((byte) main::a#10<=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@8
   to:main::@28
-main::@28: scope:[main]  from main::@52
+main::@28: scope:[main]  from main::@49
   [52] phi()
   to:main::@8
-main::@8: scope:[main]  from main::@28 main::@52
-  [53] (byte) main::r#47 ← phi( main::@28/(byte) '+' main::@52/(byte) '-' )
+main::@8: scope:[main]  from main::@28 main::@49
+  [53] (byte) main::r#47 ← phi( main::@28/(byte) '+' main::@49/(byte) '-' )
   [54] (byte) printu::a#6 ← (byte) main::a#10
   [55] (byte) printu::b#6 ← *((const byte[5]) main::cs#0 + (byte) main::i#10)
   [56] (byte) printu::res#6 ← (byte) main::r#47
   [57] call printu 
-  to:main::@53
-main::@53: scope:[main]  from main::@8
+  to:main::@50
+main::@50: scope:[main]  from main::@8
   [58] if((byte) main::a#10<=(byte) main::a#10) goto main::@9
   to:main::@29
-main::@29: scope:[main]  from main::@53
+main::@29: scope:[main]  from main::@50
   [59] phi()
   to:main::@9
-main::@9: scope:[main]  from main::@29 main::@53
-  [60] (byte) main::r#48 ← phi( main::@29/(byte) '+' main::@53/(byte) '-' )
+main::@9: scope:[main]  from main::@29 main::@50
+  [60] (byte) main::r#48 ← phi( main::@29/(byte) '+' main::@50/(byte) '-' )
   [61] (byte) printu::a#7 ← (byte) main::a#10
   [62] (byte) printu::b#7 ← (byte) main::a#10
   [63] (byte) printu::res#7 ← (byte) main::r#48
   [64] call printu 
-  to:main::@54
-main::@54: scope:[main]  from main::@9
+  to:main::@51
+main::@51: scope:[main]  from main::@9
   [65] phi()
   [66] call print_ln 
-  to:main::@55
-main::@55: scope:[main]  from main::@54
+  to:main::@52
+main::@52: scope:[main]  from main::@51
   [67] if((byte) main::a#10>(byte) main::b#0) goto main::@10
   to:main::@30
-main::@30: scope:[main]  from main::@55
+main::@30: scope:[main]  from main::@52
   [68] phi()
   to:main::@10
-main::@10: scope:[main]  from main::@30 main::@55
-  [69] (byte) main::r#49 ← phi( main::@30/(byte) '+' main::@55/(byte) '-' )
+main::@10: scope:[main]  from main::@30 main::@52
+  [69] (byte) main::r#49 ← phi( main::@30/(byte) '+' main::@52/(byte) '-' )
   [70] (byte) printu::a#8 ← (byte) main::a#10
   [71] (byte) printu::b#8 ← (byte) main::b#0
   [72] (byte) printu::res#8 ← (byte) main::r#49
   [73] (byte*~) print_char_cursor#143 ← (byte*) print_line_cursor#1
   [74] call printu 
-  to:main::@56
-main::@56: scope:[main]  from main::@10
+  to:main::@53
+main::@53: scope:[main]  from main::@10
   [75] if((byte) main::a#10>(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@11
   to:main::@31
-main::@31: scope:[main]  from main::@56
+main::@31: scope:[main]  from main::@53
   [76] phi()
   to:main::@11
-main::@11: scope:[main]  from main::@31 main::@56
-  [77] (byte) main::r#50 ← phi( main::@31/(byte) '+' main::@56/(byte) '-' )
+main::@11: scope:[main]  from main::@31 main::@53
+  [77] (byte) main::r#50 ← phi( main::@31/(byte) '+' main::@53/(byte) '-' )
   [78] (byte) printu::a#9 ← (byte) main::a#10
   [79] (byte) printu::res#9 ← (byte) main::r#50
   [80] call printu 
-  to:main::@57
-main::@57: scope:[main]  from main::@11
+  to:main::@54
+main::@54: scope:[main]  from main::@11
   [81] if((byte) main::a#10>*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@12
   to:main::@32
-main::@32: scope:[main]  from main::@57
+main::@32: scope:[main]  from main::@54
   [82] phi()
   to:main::@12
-main::@12: scope:[main]  from main::@32 main::@57
-  [83] (byte) main::r#51 ← phi( main::@32/(byte) '+' main::@57/(byte) '-' )
+main::@12: scope:[main]  from main::@32 main::@54
+  [83] (byte) main::r#51 ← phi( main::@32/(byte) '+' main::@54/(byte) '-' )
   [84] (byte) printu::a#10 ← (byte) main::a#10
   [85] (byte) printu::b#10 ← *((const byte[5]) main::cs#0 + (byte) main::i#10)
   [86] (byte) printu::res#10 ← (byte) main::r#51
   [87] call printu 
-  to:main::@58
-main::@58: scope:[main]  from main::@12
+  to:main::@55
+main::@55: scope:[main]  from main::@12
   [88] if((byte) main::a#10>(byte) main::a#10) goto main::@13
   to:main::@33
-main::@33: scope:[main]  from main::@58
+main::@33: scope:[main]  from main::@55
   [89] phi()
   to:main::@13
-main::@13: scope:[main]  from main::@33 main::@58
-  [90] (byte) main::r#52 ← phi( main::@33/(byte) '+' main::@58/(byte) '-' )
+main::@13: scope:[main]  from main::@33 main::@55
+  [90] (byte) main::r#52 ← phi( main::@33/(byte) '+' main::@55/(byte) '-' )
   [91] (byte) printu::a#11 ← (byte) main::a#10
   [92] (byte) printu::b#11 ← (byte) main::a#10
   [93] (byte) printu::res#11 ← (byte) main::r#52
   [94] call printu 
-  to:main::@59
-main::@59: scope:[main]  from main::@13
+  to:main::@56
+main::@56: scope:[main]  from main::@13
   [95] phi()
   [96] call print_ln 
-  to:main::@60
-main::@60: scope:[main]  from main::@59
+  to:main::@57
+main::@57: scope:[main]  from main::@56
   [97] if((byte) main::a#10<(byte) main::b#0) goto main::@14
   to:main::@34
-main::@34: scope:[main]  from main::@60
+main::@34: scope:[main]  from main::@57
   [98] phi()
   to:main::@14
-main::@14: scope:[main]  from main::@34 main::@60
-  [99] (byte) main::r#53 ← phi( main::@34/(byte) '+' main::@60/(byte) '-' )
+main::@14: scope:[main]  from main::@34 main::@57
+  [99] (byte) main::r#53 ← phi( main::@34/(byte) '+' main::@57/(byte) '-' )
   [100] (byte) printu::a#12 ← (byte) main::a#10
   [101] (byte) printu::b#12 ← (byte) main::b#0
   [102] (byte) printu::res#12 ← (byte) main::r#53
   [103] (byte*~) print_char_cursor#147 ← (byte*) print_line_cursor#1
   [104] call printu 
-  to:main::@61
-main::@61: scope:[main]  from main::@14
+  to:main::@58
+main::@58: scope:[main]  from main::@14
   [105] if((byte) main::a#10<(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@15
   to:main::@35
-main::@35: scope:[main]  from main::@61
+main::@35: scope:[main]  from main::@58
   [106] phi()
   to:main::@15
-main::@15: scope:[main]  from main::@35 main::@61
-  [107] (byte) main::r#54 ← phi( main::@35/(byte) '+' main::@61/(byte) '-' )
+main::@15: scope:[main]  from main::@35 main::@58
+  [107] (byte) main::r#54 ← phi( main::@35/(byte) '+' main::@58/(byte) '-' )
   [108] (byte) printu::a#13 ← (byte) main::a#10
   [109] (byte) printu::res#13 ← (byte) main::r#54
   [110] call printu 
-  to:main::@62
-main::@62: scope:[main]  from main::@15
+  to:main::@59
+main::@59: scope:[main]  from main::@15
   [111] if((byte) main::a#10<*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@16
   to:main::@36
-main::@36: scope:[main]  from main::@62
+main::@36: scope:[main]  from main::@59
   [112] phi()
   to:main::@16
-main::@16: scope:[main]  from main::@36 main::@62
-  [113] (byte) main::r#55 ← phi( main::@36/(byte) '+' main::@62/(byte) '-' )
+main::@16: scope:[main]  from main::@36 main::@59
+  [113] (byte) main::r#55 ← phi( main::@36/(byte) '+' main::@59/(byte) '-' )
   [114] (byte) printu::a#14 ← (byte) main::a#10
   [115] (byte) printu::b#14 ← *((const byte[5]) main::cs#0 + (byte) main::i#10)
   [116] (byte) printu::res#14 ← (byte) main::r#55
   [117] call printu 
-  to:main::@63
-main::@63: scope:[main]  from main::@16
+  to:main::@60
+main::@60: scope:[main]  from main::@16
   [118] if((byte) main::a#10<(byte) main::a#10) goto main::@17
   to:main::@37
-main::@37: scope:[main]  from main::@63
+main::@37: scope:[main]  from main::@60
   [119] phi()
   to:main::@17
-main::@17: scope:[main]  from main::@37 main::@63
-  [120] (byte) main::r#56 ← phi( main::@37/(byte) '+' main::@63/(byte) '-' )
+main::@17: scope:[main]  from main::@37 main::@60
+  [120] (byte) main::r#56 ← phi( main::@37/(byte) '+' main::@60/(byte) '-' )
   [121] (byte) printu::a#15 ← (byte) main::a#10
   [122] (byte) printu::b#15 ← (byte) main::a#10
   [123] (byte) printu::res#15 ← (byte) main::r#56
   [124] call printu 
-  to:main::@64
-main::@64: scope:[main]  from main::@17
+  to:main::@61
+main::@61: scope:[main]  from main::@17
   [125] phi()
   [126] call print_ln 
-  to:main::@65
-main::@65: scope:[main]  from main::@64
+  to:main::@62
+main::@62: scope:[main]  from main::@61
   [127] if((byte) main::a#10!=(byte) main::b#0) goto main::@18
   to:main::@38
-main::@38: scope:[main]  from main::@65
+main::@38: scope:[main]  from main::@62
   [128] phi()
   to:main::@18
-main::@18: scope:[main]  from main::@38 main::@65
-  [129] (byte) main::r#57 ← phi( main::@38/(byte) '+' main::@65/(byte) '-' )
+main::@18: scope:[main]  from main::@38 main::@62
+  [129] (byte) main::r#57 ← phi( main::@38/(byte) '+' main::@62/(byte) '-' )
   [130] (byte) printu::a#16 ← (byte) main::a#10
   [131] (byte) printu::b#16 ← (byte) main::b#0
   [132] (byte) printu::res#16 ← (byte) main::r#57
   [133] (byte*~) print_char_cursor#151 ← (byte*) print_line_cursor#1
   [134] call printu 
-  to:main::@66
-main::@66: scope:[main]  from main::@18
+  to:main::@63
+main::@63: scope:[main]  from main::@18
   [135] if((byte) main::a#10!=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@19
   to:main::@39
-main::@39: scope:[main]  from main::@66
+main::@39: scope:[main]  from main::@63
   [136] phi()
   to:main::@19
-main::@19: scope:[main]  from main::@39 main::@66
-  [137] (byte) main::r#58 ← phi( main::@39/(byte) '+' main::@66/(byte) '-' )
+main::@19: scope:[main]  from main::@39 main::@63
+  [137] (byte) main::r#58 ← phi( main::@39/(byte) '+' main::@63/(byte) '-' )
   [138] (byte) printu::a#17 ← (byte) main::a#10
   [139] (byte) printu::res#17 ← (byte) main::r#58
   [140] call printu 
-  to:main::@67
-main::@67: scope:[main]  from main::@19
+  to:main::@64
+main::@64: scope:[main]  from main::@19
   [141] if((byte) main::a#10!=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@20
   to:main::@40
-main::@40: scope:[main]  from main::@67
+main::@40: scope:[main]  from main::@64
   [142] phi()
   to:main::@20
-main::@20: scope:[main]  from main::@40 main::@67
-  [143] (byte) main::r#59 ← phi( main::@40/(byte) '+' main::@67/(byte) '-' )
+main::@20: scope:[main]  from main::@40 main::@64
+  [143] (byte) main::r#59 ← phi( main::@40/(byte) '+' main::@64/(byte) '-' )
   [144] (byte) printu::a#18 ← (byte) main::a#10
   [145] (byte) printu::b#18 ← *((const byte[5]) main::cs#0 + (byte) main::i#10)
   [146] (byte) printu::res#18 ← (byte) main::r#59
   [147] call printu 
-  to:main::@68
-main::@68: scope:[main]  from main::@20
+  to:main::@65
+main::@65: scope:[main]  from main::@20
   [148] if((byte) main::a#10!=(byte) main::a#10) goto main::@21
   to:main::@41
-main::@41: scope:[main]  from main::@68
+main::@41: scope:[main]  from main::@65
   [149] phi()
   to:main::@21
-main::@21: scope:[main]  from main::@41 main::@68
-  [150] (byte) main::r#60 ← phi( main::@41/(byte) '+' main::@68/(byte) '-' )
+main::@21: scope:[main]  from main::@41 main::@65
+  [150] (byte) main::r#60 ← phi( main::@41/(byte) '+' main::@65/(byte) '-' )
   [151] (byte) printu::a#19 ← (byte) main::a#10
   [152] (byte) printu::b#19 ← (byte) main::a#10
   [153] (byte) printu::res#19 ← (byte) main::r#60
   [154] call printu 
-  to:main::@69
-main::@69: scope:[main]  from main::@21
+  to:main::@66
+main::@66: scope:[main]  from main::@21
   [155] phi()
   [156] call print_ln 
-  to:main::@70
-main::@70: scope:[main]  from main::@69
+  to:main::@67
+main::@67: scope:[main]  from main::@66
   [157] (byte) main::a#1 ← (byte) main::a#10 + (byte/signed byte/word/signed word/dword/signed dword) $30
   [158] (byte) main::i#1 ← ++ (byte) main::i#10
-  [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@71
-  to:main::@43
-main::@43: scope:[main]  from main::@43 main::@70
+  [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@68
+  to:main::@42
+main::@42: scope:[main]  from main::@42 main::@67
   [160] phi()
-  to:main::@43
-main::@71: scope:[main]  from main::@70
+  to:main::@42
+main::@68: scope:[main]  from main::@67
   [161] (byte*~) print_char_cursor#142 ← (byte*) print_line_cursor#1
   to:main::@1
-print_ln: scope:[print_ln]  from main::@49 main::@54 main::@59 main::@64 main::@69
-  [162] (byte*) print_line_cursor#25 ← phi( main::@49/(byte*) print_line_cursor#27 main::@54/(byte*) print_line_cursor#1 main::@59/(byte*) print_line_cursor#1 main::@64/(byte*) print_line_cursor#1 main::@69/(byte*) print_line_cursor#1 )
+print_ln: scope:[print_ln]  from main::@46 main::@51 main::@56 main::@61 main::@66
+  [162] (byte*) print_line_cursor#25 ← phi( main::@46/(byte*) print_line_cursor#27 main::@51/(byte*) print_line_cursor#1 main::@56/(byte*) print_line_cursor#1 main::@61/(byte*) print_line_cursor#1 main::@66/(byte*) print_line_cursor#1 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [163] (byte*) print_line_cursor#13 ← phi( print_ln/(byte*) print_line_cursor#25 print_ln::@1/(byte*) print_line_cursor#1 )
@@ -3093,17 +3121,17 @@ INITIAL ASM
   .label print_line_cursor = $18
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-b21_from_bbegin:
-  jmp b21
-//SEG5 @21
-b21:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-main_from_b21:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
-bend_from_b21:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -3207,15 +3235,15 @@ main: {
   //SEG36 [167] phi (byte) printu::a#20 = (byte) printu::a#0 [phi:main::@2->printu#3] -- register_copy 
   //SEG37 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#120 [phi:main::@2->printu#4] -- register_copy 
     jsr printu
-    jmp b46
-  //SEG38 main::@46
-  b46:
+    jmp b43
+  //SEG38 main::@43
+  b43:
   //SEG39 [15] if((byte) main::a#10>=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@3 -- vbuz1_ge_vbuc1_then_la1 
     lda a
     cmp #$37
-    bcs b3_from_b46
-  //SEG40 [16] phi from main::@46 to main::@23 [phi:main::@46->main::@23]
-  b23_from_b46:
+    bcs b3_from_b43
+  //SEG40 [16] phi from main::@43 to main::@23 [phi:main::@43->main::@23]
+  b23_from_b43:
     jmp b23
   //SEG41 main::@23
   b23:
@@ -3225,9 +3253,9 @@ main: {
     lda #'+'
     sta r_42
     jmp b3
-  //SEG44 [17] phi from main::@46 to main::@3 [phi:main::@46->main::@3]
-  b3_from_b46:
-  //SEG45 [17] phi (byte) main::r#42 = (byte) '-' [phi:main::@46->main::@3#0] -- vbuz1=vbuc1 
+  //SEG44 [17] phi from main::@43 to main::@3 [phi:main::@43->main::@3]
+  b3_from_b43:
+  //SEG45 [17] phi (byte) main::r#42 = (byte) '-' [phi:main::@43->main::@3#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_42
     jmp b3
@@ -3254,16 +3282,16 @@ main: {
   //SEG54 [167] phi (byte) printu::a#20 = (byte) printu::a#1 [phi:main::@3->printu#3] -- register_copy 
   //SEG55 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@3->printu#4] -- register_copy 
     jsr printu
-    jmp b47
-  //SEG56 main::@47
-  b47:
+    jmp b44
+  //SEG56 main::@44
+  b44:
   //SEG57 [21] if((byte) main::a#10>=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@4 -- vbuz1_ge_pbuc1_derefidx_vbuz2_then_la1 
     lda a
     ldy i
     cmp cs,y
-    bcs b4_from_b47
-  //SEG58 [22] phi from main::@47 to main::@24 [phi:main::@47->main::@24]
-  b24_from_b47:
+    bcs b4_from_b44
+  //SEG58 [22] phi from main::@44 to main::@24 [phi:main::@44->main::@24]
+  b24_from_b44:
     jmp b24
   //SEG59 main::@24
   b24:
@@ -3273,9 +3301,9 @@ main: {
     lda #'+'
     sta r_43
     jmp b4
-  //SEG62 [23] phi from main::@47 to main::@4 [phi:main::@47->main::@4]
-  b4_from_b47:
-  //SEG63 [23] phi (byte) main::r#43 = (byte) '-' [phi:main::@47->main::@4#0] -- vbuz1=vbuc1 
+  //SEG62 [23] phi from main::@44 to main::@4 [phi:main::@44->main::@4]
+  b4_from_b44:
+  //SEG63 [23] phi (byte) main::r#43 = (byte) '-' [phi:main::@44->main::@4#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_43
     jmp b4
@@ -3304,15 +3332,15 @@ main: {
   //SEG73 [167] phi (byte) printu::a#20 = (byte) printu::a#2 [phi:main::@4->printu#3] -- register_copy 
   //SEG74 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@4->printu#4] -- register_copy 
     jsr printu
-    jmp b48
-  //SEG75 main::@48
-  b48:
+    jmp b45
+  //SEG75 main::@45
+  b45:
   //SEG76 [28] if((byte) main::a#10>=(byte) main::a#10) goto main::@5 -- vbuz1_ge_vbuz1_then_la1 
     lda a
     cmp a
-    bcs b5_from_b48
-  //SEG77 [29] phi from main::@48 to main::@25 [phi:main::@48->main::@25]
-  b25_from_b48:
+    bcs b5_from_b45
+  //SEG77 [29] phi from main::@45 to main::@25 [phi:main::@45->main::@25]
+  b25_from_b45:
     jmp b25
   //SEG78 main::@25
   b25:
@@ -3322,9 +3350,9 @@ main: {
     lda #'+'
     sta r_44
     jmp b5
-  //SEG81 [30] phi from main::@48 to main::@5 [phi:main::@48->main::@5]
-  b5_from_b48:
-  //SEG82 [30] phi (byte) main::r#44 = (byte) '-' [phi:main::@48->main::@5#0] -- vbuz1=vbuc1 
+  //SEG81 [30] phi from main::@45 to main::@5 [phi:main::@45->main::@5]
+  b5_from_b45:
+  //SEG82 [30] phi (byte) main::r#44 = (byte) '-' [phi:main::@45->main::@5#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_44
     jmp b5
@@ -3352,25 +3380,25 @@ main: {
   //SEG92 [167] phi (byte) printu::a#20 = (byte) printu::a#3 [phi:main::@5->printu#3] -- register_copy 
   //SEG93 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@5->printu#4] -- register_copy 
     jsr printu
-  //SEG94 [35] phi from main::@5 to main::@49 [phi:main::@5->main::@49]
-  b49_from_b5:
-    jmp b49
-  //SEG95 main::@49
-  b49:
+  //SEG94 [35] phi from main::@5 to main::@46 [phi:main::@5->main::@46]
+  b46_from_b5:
+    jmp b46
+  //SEG95 main::@46
+  b46:
   //SEG96 [36] call print_ln 
-  //SEG97 [162] phi from main::@49 to print_ln [phi:main::@49->print_ln]
-  print_ln_from_b49:
-  //SEG98 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#27 [phi:main::@49->print_ln#0] -- register_copy 
+  //SEG97 [162] phi from main::@46 to print_ln [phi:main::@46->print_ln]
+  print_ln_from_b46:
+  //SEG98 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#27 [phi:main::@46->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b50
-  //SEG99 main::@50
-  b50:
+    jmp b47
+  //SEG99 main::@47
+  b47:
   //SEG100 [37] if((byte) main::a#10<=(byte) main::b#0) goto main::@6 -- vbuz1_le_vbuz2_then_la1 
     lda b
     cmp a
-    bcs b6_from_b50
-  //SEG101 [38] phi from main::@50 to main::@26 [phi:main::@50->main::@26]
-  b26_from_b50:
+    bcs b6_from_b47
+  //SEG101 [38] phi from main::@47 to main::@26 [phi:main::@47->main::@26]
+  b26_from_b47:
     jmp b26
   //SEG102 main::@26
   b26:
@@ -3380,9 +3408,9 @@ main: {
     lda #'+'
     sta r_45
     jmp b6
-  //SEG105 [39] phi from main::@50 to main::@6 [phi:main::@50->main::@6]
-  b6_from_b50:
-  //SEG106 [39] phi (byte) main::r#45 = (byte) '-' [phi:main::@50->main::@6#0] -- vbuz1=vbuc1 
+  //SEG105 [39] phi from main::@47 to main::@6 [phi:main::@47->main::@6]
+  b6_from_b47:
+  //SEG106 [39] phi (byte) main::r#45 = (byte) '-' [phi:main::@47->main::@6#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_45
     jmp b6
@@ -3415,15 +3443,15 @@ main: {
   //SEG117 [167] phi (byte) printu::a#20 = (byte) printu::a#4 [phi:main::@6->printu#3] -- register_copy 
   //SEG118 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#159 [phi:main::@6->printu#4] -- register_copy 
     jsr printu
-    jmp b51
-  //SEG119 main::@51
-  b51:
+    jmp b48
+  //SEG119 main::@48
+  b48:
   //SEG120 [45] if((byte) main::a#10<=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@7 -- vbuz1_le_vbuc1_then_la1 
     lda #$37
     cmp a
-    bcs b7_from_b51
-  //SEG121 [46] phi from main::@51 to main::@27 [phi:main::@51->main::@27]
-  b27_from_b51:
+    bcs b7_from_b48
+  //SEG121 [46] phi from main::@48 to main::@27 [phi:main::@48->main::@27]
+  b27_from_b48:
     jmp b27
   //SEG122 main::@27
   b27:
@@ -3433,9 +3461,9 @@ main: {
     lda #'+'
     sta r_46
     jmp b7
-  //SEG125 [47] phi from main::@51 to main::@7 [phi:main::@51->main::@7]
-  b7_from_b51:
-  //SEG126 [47] phi (byte) main::r#46 = (byte) '-' [phi:main::@51->main::@7#0] -- vbuz1=vbuc1 
+  //SEG125 [47] phi from main::@48 to main::@7 [phi:main::@48->main::@7]
+  b7_from_b48:
+  //SEG126 [47] phi (byte) main::r#46 = (byte) '-' [phi:main::@48->main::@7#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_46
     jmp b7
@@ -3462,16 +3490,16 @@ main: {
   //SEG135 [167] phi (byte) printu::a#20 = (byte) printu::a#5 [phi:main::@7->printu#3] -- register_copy 
   //SEG136 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@7->printu#4] -- register_copy 
     jsr printu
-    jmp b52
-  //SEG137 main::@52
-  b52:
+    jmp b49
+  //SEG137 main::@49
+  b49:
   //SEG138 [51] if((byte) main::a#10<=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@8 -- vbuz1_le_pbuc1_derefidx_vbuz2_then_la1 
     ldy i
     lda cs,y
     cmp a
-    bcs b8_from_b52
-  //SEG139 [52] phi from main::@52 to main::@28 [phi:main::@52->main::@28]
-  b28_from_b52:
+    bcs b8_from_b49
+  //SEG139 [52] phi from main::@49 to main::@28 [phi:main::@49->main::@28]
+  b28_from_b49:
     jmp b28
   //SEG140 main::@28
   b28:
@@ -3481,9 +3509,9 @@ main: {
     lda #'+'
     sta r_47
     jmp b8
-  //SEG143 [53] phi from main::@52 to main::@8 [phi:main::@52->main::@8]
-  b8_from_b52:
-  //SEG144 [53] phi (byte) main::r#47 = (byte) '-' [phi:main::@52->main::@8#0] -- vbuz1=vbuc1 
+  //SEG143 [53] phi from main::@49 to main::@8 [phi:main::@49->main::@8]
+  b8_from_b49:
+  //SEG144 [53] phi (byte) main::r#47 = (byte) '-' [phi:main::@49->main::@8#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_47
     jmp b8
@@ -3512,15 +3540,15 @@ main: {
   //SEG154 [167] phi (byte) printu::a#20 = (byte) printu::a#6 [phi:main::@8->printu#3] -- register_copy 
   //SEG155 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@8->printu#4] -- register_copy 
     jsr printu
-    jmp b53
-  //SEG156 main::@53
-  b53:
+    jmp b50
+  //SEG156 main::@50
+  b50:
   //SEG157 [58] if((byte) main::a#10<=(byte) main::a#10) goto main::@9 -- vbuz1_le_vbuz1_then_la1 
     lda a
     cmp a
-    bcs b9_from_b53
-  //SEG158 [59] phi from main::@53 to main::@29 [phi:main::@53->main::@29]
-  b29_from_b53:
+    bcs b9_from_b50
+  //SEG158 [59] phi from main::@50 to main::@29 [phi:main::@50->main::@29]
+  b29_from_b50:
     jmp b29
   //SEG159 main::@29
   b29:
@@ -3530,9 +3558,9 @@ main: {
     lda #'+'
     sta r_48
     jmp b9
-  //SEG162 [60] phi from main::@53 to main::@9 [phi:main::@53->main::@9]
-  b9_from_b53:
-  //SEG163 [60] phi (byte) main::r#48 = (byte) '-' [phi:main::@53->main::@9#0] -- vbuz1=vbuc1 
+  //SEG162 [60] phi from main::@50 to main::@9 [phi:main::@50->main::@9]
+  b9_from_b50:
+  //SEG163 [60] phi (byte) main::r#48 = (byte) '-' [phi:main::@50->main::@9#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_48
     jmp b9
@@ -3560,25 +3588,25 @@ main: {
   //SEG173 [167] phi (byte) printu::a#20 = (byte) printu::a#7 [phi:main::@9->printu#3] -- register_copy 
   //SEG174 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@9->printu#4] -- register_copy 
     jsr printu
-  //SEG175 [65] phi from main::@9 to main::@54 [phi:main::@9->main::@54]
-  b54_from_b9:
-    jmp b54
-  //SEG176 main::@54
-  b54:
+  //SEG175 [65] phi from main::@9 to main::@51 [phi:main::@9->main::@51]
+  b51_from_b9:
+    jmp b51
+  //SEG176 main::@51
+  b51:
   //SEG177 [66] call print_ln 
-  //SEG178 [162] phi from main::@54 to print_ln [phi:main::@54->print_ln]
-  print_ln_from_b54:
-  //SEG179 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@54->print_ln#0] -- register_copy 
+  //SEG178 [162] phi from main::@51 to print_ln [phi:main::@51->print_ln]
+  print_ln_from_b51:
+  //SEG179 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@51->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b55
-  //SEG180 main::@55
-  b55:
+    jmp b52
+  //SEG180 main::@52
+  b52:
   //SEG181 [67] if((byte) main::a#10>(byte) main::b#0) goto main::@10 -- vbuz1_gt_vbuz2_then_la1 
     lda b
     cmp a
-    bcc b10_from_b55
-  //SEG182 [68] phi from main::@55 to main::@30 [phi:main::@55->main::@30]
-  b30_from_b55:
+    bcc b10_from_b52
+  //SEG182 [68] phi from main::@52 to main::@30 [phi:main::@52->main::@30]
+  b30_from_b52:
     jmp b30
   //SEG183 main::@30
   b30:
@@ -3588,9 +3616,9 @@ main: {
     lda #'+'
     sta r_49
     jmp b10
-  //SEG186 [69] phi from main::@55 to main::@10 [phi:main::@55->main::@10]
-  b10_from_b55:
-  //SEG187 [69] phi (byte) main::r#49 = (byte) '-' [phi:main::@55->main::@10#0] -- vbuz1=vbuc1 
+  //SEG186 [69] phi from main::@52 to main::@10 [phi:main::@52->main::@10]
+  b10_from_b52:
+  //SEG187 [69] phi (byte) main::r#49 = (byte) '-' [phi:main::@52->main::@10#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_49
     jmp b10
@@ -3623,15 +3651,15 @@ main: {
   //SEG198 [167] phi (byte) printu::a#20 = (byte) printu::a#8 [phi:main::@10->printu#3] -- register_copy 
   //SEG199 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#143 [phi:main::@10->printu#4] -- register_copy 
     jsr printu
-    jmp b56
-  //SEG200 main::@56
-  b56:
+    jmp b53
+  //SEG200 main::@53
+  b53:
   //SEG201 [75] if((byte) main::a#10>(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@11 -- vbuz1_gt_vbuc1_then_la1 
     lda #$37
     cmp a
-    bcc b11_from_b56
-  //SEG202 [76] phi from main::@56 to main::@31 [phi:main::@56->main::@31]
-  b31_from_b56:
+    bcc b11_from_b53
+  //SEG202 [76] phi from main::@53 to main::@31 [phi:main::@53->main::@31]
+  b31_from_b53:
     jmp b31
   //SEG203 main::@31
   b31:
@@ -3641,9 +3669,9 @@ main: {
     lda #'+'
     sta r_50
     jmp b11
-  //SEG206 [77] phi from main::@56 to main::@11 [phi:main::@56->main::@11]
-  b11_from_b56:
-  //SEG207 [77] phi (byte) main::r#50 = (byte) '-' [phi:main::@56->main::@11#0] -- vbuz1=vbuc1 
+  //SEG206 [77] phi from main::@53 to main::@11 [phi:main::@53->main::@11]
+  b11_from_b53:
+  //SEG207 [77] phi (byte) main::r#50 = (byte) '-' [phi:main::@53->main::@11#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_50
     jmp b11
@@ -3670,16 +3698,16 @@ main: {
   //SEG216 [167] phi (byte) printu::a#20 = (byte) printu::a#9 [phi:main::@11->printu#3] -- register_copy 
   //SEG217 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@11->printu#4] -- register_copy 
     jsr printu
-    jmp b57
-  //SEG218 main::@57
-  b57:
+    jmp b54
+  //SEG218 main::@54
+  b54:
   //SEG219 [81] if((byte) main::a#10>*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@12 -- vbuz1_gt_pbuc1_derefidx_vbuz2_then_la1 
     ldy i
     lda cs,y
     cmp a
-    bcc b12_from_b57
-  //SEG220 [82] phi from main::@57 to main::@32 [phi:main::@57->main::@32]
-  b32_from_b57:
+    bcc b12_from_b54
+  //SEG220 [82] phi from main::@54 to main::@32 [phi:main::@54->main::@32]
+  b32_from_b54:
     jmp b32
   //SEG221 main::@32
   b32:
@@ -3689,9 +3717,9 @@ main: {
     lda #'+'
     sta r_51
     jmp b12
-  //SEG224 [83] phi from main::@57 to main::@12 [phi:main::@57->main::@12]
-  b12_from_b57:
-  //SEG225 [83] phi (byte) main::r#51 = (byte) '-' [phi:main::@57->main::@12#0] -- vbuz1=vbuc1 
+  //SEG224 [83] phi from main::@54 to main::@12 [phi:main::@54->main::@12]
+  b12_from_b54:
+  //SEG225 [83] phi (byte) main::r#51 = (byte) '-' [phi:main::@54->main::@12#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_51
     jmp b12
@@ -3720,15 +3748,15 @@ main: {
   //SEG235 [167] phi (byte) printu::a#20 = (byte) printu::a#10 [phi:main::@12->printu#3] -- register_copy 
   //SEG236 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@12->printu#4] -- register_copy 
     jsr printu
-    jmp b58
-  //SEG237 main::@58
-  b58:
+    jmp b55
+  //SEG237 main::@55
+  b55:
   //SEG238 [88] if((byte) main::a#10>(byte) main::a#10) goto main::@13 -- vbuz1_gt_vbuz1_then_la1 
     lda a
     cmp a
-    bcc b13_from_b58
-  //SEG239 [89] phi from main::@58 to main::@33 [phi:main::@58->main::@33]
-  b33_from_b58:
+    bcc b13_from_b55
+  //SEG239 [89] phi from main::@55 to main::@33 [phi:main::@55->main::@33]
+  b33_from_b55:
     jmp b33
   //SEG240 main::@33
   b33:
@@ -3738,9 +3766,9 @@ main: {
     lda #'+'
     sta r_52
     jmp b13
-  //SEG243 [90] phi from main::@58 to main::@13 [phi:main::@58->main::@13]
-  b13_from_b58:
-  //SEG244 [90] phi (byte) main::r#52 = (byte) '-' [phi:main::@58->main::@13#0] -- vbuz1=vbuc1 
+  //SEG243 [90] phi from main::@55 to main::@13 [phi:main::@55->main::@13]
+  b13_from_b55:
+  //SEG244 [90] phi (byte) main::r#52 = (byte) '-' [phi:main::@55->main::@13#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_52
     jmp b13
@@ -3768,25 +3796,25 @@ main: {
   //SEG254 [167] phi (byte) printu::a#20 = (byte) printu::a#11 [phi:main::@13->printu#3] -- register_copy 
   //SEG255 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@13->printu#4] -- register_copy 
     jsr printu
-  //SEG256 [95] phi from main::@13 to main::@59 [phi:main::@13->main::@59]
-  b59_from_b13:
-    jmp b59
-  //SEG257 main::@59
-  b59:
+  //SEG256 [95] phi from main::@13 to main::@56 [phi:main::@13->main::@56]
+  b56_from_b13:
+    jmp b56
+  //SEG257 main::@56
+  b56:
   //SEG258 [96] call print_ln 
-  //SEG259 [162] phi from main::@59 to print_ln [phi:main::@59->print_ln]
-  print_ln_from_b59:
-  //SEG260 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@59->print_ln#0] -- register_copy 
+  //SEG259 [162] phi from main::@56 to print_ln [phi:main::@56->print_ln]
+  print_ln_from_b56:
+  //SEG260 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@56->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b60
-  //SEG261 main::@60
-  b60:
+    jmp b57
+  //SEG261 main::@57
+  b57:
   //SEG262 [97] if((byte) main::a#10<(byte) main::b#0) goto main::@14 -- vbuz1_lt_vbuz2_then_la1 
     lda a
     cmp b
-    bcc b14_from_b60
-  //SEG263 [98] phi from main::@60 to main::@34 [phi:main::@60->main::@34]
-  b34_from_b60:
+    bcc b14_from_b57
+  //SEG263 [98] phi from main::@57 to main::@34 [phi:main::@57->main::@34]
+  b34_from_b57:
     jmp b34
   //SEG264 main::@34
   b34:
@@ -3796,9 +3824,9 @@ main: {
     lda #'+'
     sta r_53
     jmp b14
-  //SEG267 [99] phi from main::@60 to main::@14 [phi:main::@60->main::@14]
-  b14_from_b60:
-  //SEG268 [99] phi (byte) main::r#53 = (byte) '-' [phi:main::@60->main::@14#0] -- vbuz1=vbuc1 
+  //SEG267 [99] phi from main::@57 to main::@14 [phi:main::@57->main::@14]
+  b14_from_b57:
+  //SEG268 [99] phi (byte) main::r#53 = (byte) '-' [phi:main::@57->main::@14#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_53
     jmp b14
@@ -3831,15 +3859,15 @@ main: {
   //SEG279 [167] phi (byte) printu::a#20 = (byte) printu::a#12 [phi:main::@14->printu#3] -- register_copy 
   //SEG280 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#147 [phi:main::@14->printu#4] -- register_copy 
     jsr printu
-    jmp b61
-  //SEG281 main::@61
-  b61:
+    jmp b58
+  //SEG281 main::@58
+  b58:
   //SEG282 [105] if((byte) main::a#10<(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@15 -- vbuz1_lt_vbuc1_then_la1 
     lda a
     cmp #$37
-    bcc b15_from_b61
-  //SEG283 [106] phi from main::@61 to main::@35 [phi:main::@61->main::@35]
-  b35_from_b61:
+    bcc b15_from_b58
+  //SEG283 [106] phi from main::@58 to main::@35 [phi:main::@58->main::@35]
+  b35_from_b58:
     jmp b35
   //SEG284 main::@35
   b35:
@@ -3849,9 +3877,9 @@ main: {
     lda #'+'
     sta r_54
     jmp b15
-  //SEG287 [107] phi from main::@61 to main::@15 [phi:main::@61->main::@15]
-  b15_from_b61:
-  //SEG288 [107] phi (byte) main::r#54 = (byte) '-' [phi:main::@61->main::@15#0] -- vbuz1=vbuc1 
+  //SEG287 [107] phi from main::@58 to main::@15 [phi:main::@58->main::@15]
+  b15_from_b58:
+  //SEG288 [107] phi (byte) main::r#54 = (byte) '-' [phi:main::@58->main::@15#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_54
     jmp b15
@@ -3878,16 +3906,16 @@ main: {
   //SEG297 [167] phi (byte) printu::a#20 = (byte) printu::a#13 [phi:main::@15->printu#3] -- register_copy 
   //SEG298 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@15->printu#4] -- register_copy 
     jsr printu
-    jmp b62
-  //SEG299 main::@62
-  b62:
+    jmp b59
+  //SEG299 main::@59
+  b59:
   //SEG300 [111] if((byte) main::a#10<*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@16 -- vbuz1_lt_pbuc1_derefidx_vbuz2_then_la1 
     lda a
     ldy i
     cmp cs,y
-    bcc b16_from_b62
-  //SEG301 [112] phi from main::@62 to main::@36 [phi:main::@62->main::@36]
-  b36_from_b62:
+    bcc b16_from_b59
+  //SEG301 [112] phi from main::@59 to main::@36 [phi:main::@59->main::@36]
+  b36_from_b59:
     jmp b36
   //SEG302 main::@36
   b36:
@@ -3897,9 +3925,9 @@ main: {
     lda #'+'
     sta r_55
     jmp b16
-  //SEG305 [113] phi from main::@62 to main::@16 [phi:main::@62->main::@16]
-  b16_from_b62:
-  //SEG306 [113] phi (byte) main::r#55 = (byte) '-' [phi:main::@62->main::@16#0] -- vbuz1=vbuc1 
+  //SEG305 [113] phi from main::@59 to main::@16 [phi:main::@59->main::@16]
+  b16_from_b59:
+  //SEG306 [113] phi (byte) main::r#55 = (byte) '-' [phi:main::@59->main::@16#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_55
     jmp b16
@@ -3928,15 +3956,15 @@ main: {
   //SEG316 [167] phi (byte) printu::a#20 = (byte) printu::a#14 [phi:main::@16->printu#3] -- register_copy 
   //SEG317 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@16->printu#4] -- register_copy 
     jsr printu
-    jmp b63
-  //SEG318 main::@63
-  b63:
+    jmp b60
+  //SEG318 main::@60
+  b60:
   //SEG319 [118] if((byte) main::a#10<(byte) main::a#10) goto main::@17 -- vbuz1_lt_vbuz1_then_la1 
     lda a
     cmp a
-    bcc b17_from_b63
-  //SEG320 [119] phi from main::@63 to main::@37 [phi:main::@63->main::@37]
-  b37_from_b63:
+    bcc b17_from_b60
+  //SEG320 [119] phi from main::@60 to main::@37 [phi:main::@60->main::@37]
+  b37_from_b60:
     jmp b37
   //SEG321 main::@37
   b37:
@@ -3946,9 +3974,9 @@ main: {
     lda #'+'
     sta r_56
     jmp b17
-  //SEG324 [120] phi from main::@63 to main::@17 [phi:main::@63->main::@17]
-  b17_from_b63:
-  //SEG325 [120] phi (byte) main::r#56 = (byte) '-' [phi:main::@63->main::@17#0] -- vbuz1=vbuc1 
+  //SEG324 [120] phi from main::@60 to main::@17 [phi:main::@60->main::@17]
+  b17_from_b60:
+  //SEG325 [120] phi (byte) main::r#56 = (byte) '-' [phi:main::@60->main::@17#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_56
     jmp b17
@@ -3976,25 +4004,25 @@ main: {
   //SEG335 [167] phi (byte) printu::a#20 = (byte) printu::a#15 [phi:main::@17->printu#3] -- register_copy 
   //SEG336 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@17->printu#4] -- register_copy 
     jsr printu
-  //SEG337 [125] phi from main::@17 to main::@64 [phi:main::@17->main::@64]
-  b64_from_b17:
-    jmp b64
-  //SEG338 main::@64
-  b64:
+  //SEG337 [125] phi from main::@17 to main::@61 [phi:main::@17->main::@61]
+  b61_from_b17:
+    jmp b61
+  //SEG338 main::@61
+  b61:
   //SEG339 [126] call print_ln 
-  //SEG340 [162] phi from main::@64 to print_ln [phi:main::@64->print_ln]
-  print_ln_from_b64:
-  //SEG341 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@64->print_ln#0] -- register_copy 
+  //SEG340 [162] phi from main::@61 to print_ln [phi:main::@61->print_ln]
+  print_ln_from_b61:
+  //SEG341 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@61->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b65
-  //SEG342 main::@65
-  b65:
+    jmp b62
+  //SEG342 main::@62
+  b62:
   //SEG343 [127] if((byte) main::a#10!=(byte) main::b#0) goto main::@18 -- vbuz1_neq_vbuz2_then_la1 
     lda a
     cmp b
-    bne b18_from_b65
-  //SEG344 [128] phi from main::@65 to main::@38 [phi:main::@65->main::@38]
-  b38_from_b65:
+    bne b18_from_b62
+  //SEG344 [128] phi from main::@62 to main::@38 [phi:main::@62->main::@38]
+  b38_from_b62:
     jmp b38
   //SEG345 main::@38
   b38:
@@ -4004,9 +4032,9 @@ main: {
     lda #'+'
     sta r_57
     jmp b18
-  //SEG348 [129] phi from main::@65 to main::@18 [phi:main::@65->main::@18]
-  b18_from_b65:
-  //SEG349 [129] phi (byte) main::r#57 = (byte) '-' [phi:main::@65->main::@18#0] -- vbuz1=vbuc1 
+  //SEG348 [129] phi from main::@62 to main::@18 [phi:main::@62->main::@18]
+  b18_from_b62:
+  //SEG349 [129] phi (byte) main::r#57 = (byte) '-' [phi:main::@62->main::@18#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_57
     jmp b18
@@ -4039,15 +4067,15 @@ main: {
   //SEG360 [167] phi (byte) printu::a#20 = (byte) printu::a#16 [phi:main::@18->printu#3] -- register_copy 
   //SEG361 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#151 [phi:main::@18->printu#4] -- register_copy 
     jsr printu
-    jmp b66
-  //SEG362 main::@66
-  b66:
+    jmp b63
+  //SEG362 main::@63
+  b63:
   //SEG363 [135] if((byte) main::a#10!=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@19 -- vbuz1_neq_vbuc1_then_la1 
     lda #$37
     cmp a
-    bne b19_from_b66
-  //SEG364 [136] phi from main::@66 to main::@39 [phi:main::@66->main::@39]
-  b39_from_b66:
+    bne b19_from_b63
+  //SEG364 [136] phi from main::@63 to main::@39 [phi:main::@63->main::@39]
+  b39_from_b63:
     jmp b39
   //SEG365 main::@39
   b39:
@@ -4057,9 +4085,9 @@ main: {
     lda #'+'
     sta r_58
     jmp b19
-  //SEG368 [137] phi from main::@66 to main::@19 [phi:main::@66->main::@19]
-  b19_from_b66:
-  //SEG369 [137] phi (byte) main::r#58 = (byte) '-' [phi:main::@66->main::@19#0] -- vbuz1=vbuc1 
+  //SEG368 [137] phi from main::@63 to main::@19 [phi:main::@63->main::@19]
+  b19_from_b63:
+  //SEG369 [137] phi (byte) main::r#58 = (byte) '-' [phi:main::@63->main::@19#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_58
     jmp b19
@@ -4086,16 +4114,16 @@ main: {
   //SEG378 [167] phi (byte) printu::a#20 = (byte) printu::a#17 [phi:main::@19->printu#3] -- register_copy 
   //SEG379 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@19->printu#4] -- register_copy 
     jsr printu
-    jmp b67
-  //SEG380 main::@67
-  b67:
+    jmp b64
+  //SEG380 main::@64
+  b64:
   //SEG381 [141] if((byte) main::a#10!=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@20 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
     lda a
     ldy i
     cmp cs,y
-    bne b20_from_b67
-  //SEG382 [142] phi from main::@67 to main::@40 [phi:main::@67->main::@40]
-  b40_from_b67:
+    bne b20_from_b64
+  //SEG382 [142] phi from main::@64 to main::@40 [phi:main::@64->main::@40]
+  b40_from_b64:
     jmp b40
   //SEG383 main::@40
   b40:
@@ -4105,9 +4133,9 @@ main: {
     lda #'+'
     sta r_59
     jmp b20
-  //SEG386 [143] phi from main::@67 to main::@20 [phi:main::@67->main::@20]
-  b20_from_b67:
-  //SEG387 [143] phi (byte) main::r#59 = (byte) '-' [phi:main::@67->main::@20#0] -- vbuz1=vbuc1 
+  //SEG386 [143] phi from main::@64 to main::@20 [phi:main::@64->main::@20]
+  b20_from_b64:
+  //SEG387 [143] phi (byte) main::r#59 = (byte) '-' [phi:main::@64->main::@20#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_59
     jmp b20
@@ -4136,15 +4164,15 @@ main: {
   //SEG397 [167] phi (byte) printu::a#20 = (byte) printu::a#18 [phi:main::@20->printu#3] -- register_copy 
   //SEG398 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@20->printu#4] -- register_copy 
     jsr printu
-    jmp b68
-  //SEG399 main::@68
-  b68:
+    jmp b65
+  //SEG399 main::@65
+  b65:
   //SEG400 [148] if((byte) main::a#10!=(byte) main::a#10) goto main::@21 -- vbuz1_neq_vbuz1_then_la1 
     lda a
     cmp a
-    bne b21_from_b68
-  //SEG401 [149] phi from main::@68 to main::@41 [phi:main::@68->main::@41]
-  b41_from_b68:
+    bne b21_from_b65
+  //SEG401 [149] phi from main::@65 to main::@41 [phi:main::@65->main::@41]
+  b41_from_b65:
     jmp b41
   //SEG402 main::@41
   b41:
@@ -4154,9 +4182,9 @@ main: {
     lda #'+'
     sta r_60
     jmp b21
-  //SEG405 [150] phi from main::@68 to main::@21 [phi:main::@68->main::@21]
-  b21_from_b68:
-  //SEG406 [150] phi (byte) main::r#60 = (byte) '-' [phi:main::@68->main::@21#0] -- vbuz1=vbuc1 
+  //SEG405 [150] phi from main::@65 to main::@21 [phi:main::@65->main::@21]
+  b21_from_b65:
+  //SEG406 [150] phi (byte) main::r#60 = (byte) '-' [phi:main::@65->main::@21#0] -- vbuz1=vbuc1 
     lda #'-'
     sta r_60
     jmp b21
@@ -4184,49 +4212,49 @@ main: {
   //SEG416 [167] phi (byte) printu::a#20 = (byte) printu::a#19 [phi:main::@21->printu#3] -- register_copy 
   //SEG417 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@21->printu#4] -- register_copy 
     jsr printu
-  //SEG418 [155] phi from main::@21 to main::@69 [phi:main::@21->main::@69]
-  b69_from_b21:
-    jmp b69
-  //SEG419 main::@69
-  b69:
+  //SEG418 [155] phi from main::@21 to main::@66 [phi:main::@21->main::@66]
+  b66_from_b21:
+    jmp b66
+  //SEG419 main::@66
+  b66:
   //SEG420 [156] call print_ln 
-  //SEG421 [162] phi from main::@69 to print_ln [phi:main::@69->print_ln]
-  print_ln_from_b69:
-  //SEG422 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@69->print_ln#0] -- register_copy 
+  //SEG421 [162] phi from main::@66 to print_ln [phi:main::@66->print_ln]
+  print_ln_from_b66:
+  //SEG422 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@66->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b70
-  //SEG423 main::@70
-  b70:
+    jmp b67
+  //SEG423 main::@67
+  b67:
   //SEG424 [157] (byte) main::a#1 ← (byte) main::a#10 + (byte/signed byte/word/signed word/dword/signed dword) $30 -- vbuz1=vbuz1_plus_vbuc1 
     lax a
     axs #-[$30]
     stx a
   //SEG425 [158] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG426 [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@71 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG426 [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@68 -- vbuz1_neq_vbuc1_then_la1 
     lda #5
     cmp i
-    bne b71
-  //SEG427 [160] phi from main::@43 main::@70 to main::@43 [phi:main::@43/main::@70->main::@43]
-  b43_from_b43:
-  b43_from_b70:
-    jmp b43
-  //SEG428 main::@43
-  b43:
-    jmp b43_from_b43
-  //SEG429 main::@71
-  b71:
+    bne b68
+  //SEG427 [160] phi from main::@42 main::@67 to main::@42 [phi:main::@42/main::@67->main::@42]
+  b42_from_b42:
+  b42_from_b67:
+    jmp b42
+  //SEG428 main::@42
+  b42:
+    jmp b42_from_b42
+  //SEG429 main::@68
+  b68:
   //SEG430 [161] (byte*~) print_char_cursor#142 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG431 [6] phi from main::@71 to main::@1 [phi:main::@71->main::@1]
-  b1_from_b71:
-  //SEG432 [6] phi (byte*) print_line_cursor#27 = (byte*) print_line_cursor#1 [phi:main::@71->main::@1#0] -- register_copy 
-  //SEG433 [6] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@71->main::@1#1] -- register_copy 
-  //SEG434 [6] phi (byte*) print_char_cursor#120 = (byte*~) print_char_cursor#142 [phi:main::@71->main::@1#2] -- register_copy 
-  //SEG435 [6] phi (byte) main::a#10 = (byte) main::a#1 [phi:main::@71->main::@1#3] -- register_copy 
+  //SEG431 [6] phi from main::@68 to main::@1 [phi:main::@68->main::@1]
+  b1_from_b68:
+  //SEG432 [6] phi (byte*) print_line_cursor#27 = (byte*) print_line_cursor#1 [phi:main::@68->main::@1#0] -- register_copy 
+  //SEG433 [6] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@68->main::@1#1] -- register_copy 
+  //SEG434 [6] phi (byte*) print_char_cursor#120 = (byte*~) print_char_cursor#142 [phi:main::@68->main::@1#2] -- register_copy 
+  //SEG435 [6] phi (byte) main::a#10 = (byte) main::a#1 [phi:main::@68->main::@1#3] -- register_copy 
     jmp b1
     op: .text "< @"
     op4: .text "> @"
@@ -4562,7 +4590,7 @@ Statement [141] if((byte) main::a#10!=*((const byte[5]) main::cs#0 + (byte) main
 Statement [148] if((byte) main::a#10!=(byte) main::a#10) goto main::@21 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ( main:2 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ) always clobbers reg byte a 
 Statement [157] (byte) main::a#1 ← (byte) main::a#10 + (byte/signed byte/word/signed word/dword/signed dword) $30 [ main::i#10 main::a#1 print_line_cursor#1 ] ( main:2 [ main::i#10 main::a#1 print_line_cursor#1 ] ) always clobbers reg byte a reg byte x 
 Removing always clobbered register reg byte x as potential for zp ZP_BYTE:3 [ main::i#10 main::i#1 ]
-Statement [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@71 [ main::a#1 main::i#1 print_line_cursor#1 ] ( main:2 [ main::a#1 main::i#1 print_line_cursor#1 ] ) always clobbers reg byte a 
+Statement [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@68 [ main::a#1 main::i#1 print_line_cursor#1 ] ( main:2 [ main::a#1 main::i#1 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [161] (byte*~) print_char_cursor#142 ← (byte*) print_line_cursor#1 [ main::a#1 print_char_cursor#142 main::i#1 print_line_cursor#1 ] ( main:2 [ main::a#1 print_char_cursor#142 main::i#1 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [164] (byte*) print_line_cursor#1 ← (byte*) print_line_cursor#13 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#1 print_char_cursor#55 ] ( main:2::print_ln:36 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:66 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:96 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:126 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:156 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ) always clobbers reg byte a 
 Statement [165] if((byte*) print_line_cursor#1<(byte*) print_char_cursor#55) goto print_ln::@1 [ print_line_cursor#1 print_char_cursor#55 ] ( main:2::print_ln:36 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:66 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:96 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:126 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:156 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ) always clobbers reg byte a 
@@ -4601,7 +4629,7 @@ Statement [145] (byte) printu::b#18 ← *((const byte[5]) main::cs#0 + (byte) ma
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:22 [ main::r#59 ]
 Statement [148] if((byte) main::a#10!=(byte) main::a#10) goto main::@21 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ( main:2 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ) always clobbers reg byte a 
 Statement [157] (byte) main::a#1 ← (byte) main::a#10 + (byte/signed byte/word/signed word/dword/signed dword) $30 [ main::i#10 main::a#1 print_line_cursor#1 ] ( main:2 [ main::i#10 main::a#1 print_line_cursor#1 ] ) always clobbers reg byte a reg byte x 
-Statement [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@71 [ main::a#1 main::i#1 print_line_cursor#1 ] ( main:2 [ main::a#1 main::i#1 print_line_cursor#1 ] ) always clobbers reg byte a 
+Statement [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@68 [ main::a#1 main::i#1 print_line_cursor#1 ] ( main:2 [ main::a#1 main::i#1 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [161] (byte*~) print_char_cursor#142 ← (byte*) print_line_cursor#1 [ main::a#1 print_char_cursor#142 main::i#1 print_line_cursor#1 ] ( main:2 [ main::a#1 print_char_cursor#142 main::i#1 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [164] (byte*) print_line_cursor#1 ← (byte*) print_line_cursor#13 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#1 print_char_cursor#55 ] ( main:2::print_ln:36 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:66 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:96 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:126 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:156 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ) always clobbers reg byte a 
 Statement [165] if((byte*) print_line_cursor#1<(byte*) print_char_cursor#55) goto print_ln::@1 [ print_line_cursor#1 print_char_cursor#55 ] ( main:2::print_ln:36 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:66 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:96 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:126 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:156 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ) always clobbers reg byte a 
@@ -4635,7 +4663,7 @@ Statement [141] if((byte) main::a#10!=*((const byte[5]) main::cs#0 + (byte) main
 Statement [145] (byte) printu::b#18 ← *((const byte[5]) main::cs#0 + (byte) main::i#10) [ main::a#10 main::i#10 print_line_cursor#1 main::r#59 printu::a#18 printu::b#18 print_char_cursor#55 ] ( main:2 [ main::a#10 main::i#10 print_line_cursor#1 main::r#59 printu::a#18 printu::b#18 print_char_cursor#55 ] ) always clobbers reg byte y 
 Statement [148] if((byte) main::a#10!=(byte) main::a#10) goto main::@21 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ( main:2 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ) always clobbers reg byte a 
 Statement [157] (byte) main::a#1 ← (byte) main::a#10 + (byte/signed byte/word/signed word/dword/signed dword) $30 [ main::i#10 main::a#1 print_line_cursor#1 ] ( main:2 [ main::i#10 main::a#1 print_line_cursor#1 ] ) always clobbers reg byte a reg byte x 
-Statement [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@71 [ main::a#1 main::i#1 print_line_cursor#1 ] ( main:2 [ main::a#1 main::i#1 print_line_cursor#1 ] ) always clobbers reg byte a 
+Statement [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@68 [ main::a#1 main::i#1 print_line_cursor#1 ] ( main:2 [ main::a#1 main::i#1 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [161] (byte*~) print_char_cursor#142 ← (byte*) print_line_cursor#1 [ main::a#1 print_char_cursor#142 main::i#1 print_line_cursor#1 ] ( main:2 [ main::a#1 print_char_cursor#142 main::i#1 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [164] (byte*) print_line_cursor#1 ← (byte*) print_line_cursor#13 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#1 print_char_cursor#55 ] ( main:2::print_ln:36 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:66 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:96 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:126 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:156 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ) always clobbers reg byte a 
 Statement [165] if((byte*) print_line_cursor#1<(byte*) print_char_cursor#55) goto print_ln::@1 [ print_line_cursor#1 print_char_cursor#55 ] ( main:2::print_ln:36 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:66 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:96 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:126 [ main::a#10 main::i#10 main::b#0 print_line_cursor#1 print_char_cursor#55 ] main:2::print_ln:156 [ main::a#10 main::i#10 print_line_cursor#1 print_char_cursor#55 ] ) always clobbers reg byte a 
@@ -4776,17 +4804,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 4
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-b21_from_bbegin:
-  jmp b21
-//SEG5 @21
-b21:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-main_from_b21:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
-bend_from_b21:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -4864,15 +4892,15 @@ main: {
   //SEG36 [167] phi (byte) printu::a#20 = (byte) printu::a#0 [phi:main::@2->printu#3] -- register_copy 
   //SEG37 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#120 [phi:main::@2->printu#4] -- register_copy 
     jsr printu
-    jmp b46
-  //SEG38 main::@46
-  b46:
+    jmp b43
+  //SEG38 main::@43
+  b43:
   //SEG39 [15] if((byte) main::a#10>=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@3 -- vbuz1_ge_vbuc1_then_la1 
     lda a
     cmp #$37
-    bcs b3_from_b46
-  //SEG40 [16] phi from main::@46 to main::@23 [phi:main::@46->main::@23]
-  b23_from_b46:
+    bcs b3_from_b43
+  //SEG40 [16] phi from main::@43 to main::@23 [phi:main::@43->main::@23]
+  b23_from_b43:
     jmp b23
   //SEG41 main::@23
   b23:
@@ -4881,9 +4909,9 @@ main: {
   //SEG43 [17] phi (byte) main::r#42 = (byte) '+' [phi:main::@23->main::@3#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b3
-  //SEG44 [17] phi from main::@46 to main::@3 [phi:main::@46->main::@3]
-  b3_from_b46:
-  //SEG45 [17] phi (byte) main::r#42 = (byte) '-' [phi:main::@46->main::@3#0] -- vbuxx=vbuc1 
+  //SEG44 [17] phi from main::@43 to main::@3 [phi:main::@43->main::@3]
+  b3_from_b43:
+  //SEG45 [17] phi (byte) main::r#42 = (byte) '-' [phi:main::@43->main::@3#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b3
   //SEG46 main::@3
@@ -4905,16 +4933,16 @@ main: {
   //SEG54 [167] phi (byte) printu::a#20 = (byte) printu::a#1 [phi:main::@3->printu#3] -- register_copy 
   //SEG55 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@3->printu#4] -- register_copy 
     jsr printu
-    jmp b47
-  //SEG56 main::@47
-  b47:
+    jmp b44
+  //SEG56 main::@44
+  b44:
   //SEG57 [21] if((byte) main::a#10>=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@4 -- vbuz1_ge_pbuc1_derefidx_vbuz2_then_la1 
     lda a
     ldy i
     cmp cs,y
-    bcs b4_from_b47
-  //SEG58 [22] phi from main::@47 to main::@24 [phi:main::@47->main::@24]
-  b24_from_b47:
+    bcs b4_from_b44
+  //SEG58 [22] phi from main::@44 to main::@24 [phi:main::@44->main::@24]
+  b24_from_b44:
     jmp b24
   //SEG59 main::@24
   b24:
@@ -4923,9 +4951,9 @@ main: {
   //SEG61 [23] phi (byte) main::r#43 = (byte) '+' [phi:main::@24->main::@4#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b4
-  //SEG62 [23] phi from main::@47 to main::@4 [phi:main::@47->main::@4]
-  b4_from_b47:
-  //SEG63 [23] phi (byte) main::r#43 = (byte) '-' [phi:main::@47->main::@4#0] -- vbuxx=vbuc1 
+  //SEG62 [23] phi from main::@44 to main::@4 [phi:main::@44->main::@4]
+  b4_from_b44:
+  //SEG63 [23] phi (byte) main::r#43 = (byte) '-' [phi:main::@44->main::@4#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b4
   //SEG64 main::@4
@@ -4949,15 +4977,15 @@ main: {
   //SEG73 [167] phi (byte) printu::a#20 = (byte) printu::a#2 [phi:main::@4->printu#3] -- register_copy 
   //SEG74 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@4->printu#4] -- register_copy 
     jsr printu
-    jmp b48
-  //SEG75 main::@48
-  b48:
+    jmp b45
+  //SEG75 main::@45
+  b45:
   //SEG76 [28] if((byte) main::a#10>=(byte) main::a#10) goto main::@5 -- vbuz1_ge_vbuz1_then_la1 
     lda a
     cmp a
-    bcs b5_from_b48
-  //SEG77 [29] phi from main::@48 to main::@25 [phi:main::@48->main::@25]
-  b25_from_b48:
+    bcs b5_from_b45
+  //SEG77 [29] phi from main::@45 to main::@25 [phi:main::@45->main::@25]
+  b25_from_b45:
     jmp b25
   //SEG78 main::@25
   b25:
@@ -4966,9 +4994,9 @@ main: {
   //SEG80 [30] phi (byte) main::r#44 = (byte) '+' [phi:main::@25->main::@5#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b5
-  //SEG81 [30] phi from main::@48 to main::@5 [phi:main::@48->main::@5]
-  b5_from_b48:
-  //SEG82 [30] phi (byte) main::r#44 = (byte) '-' [phi:main::@48->main::@5#0] -- vbuxx=vbuc1 
+  //SEG81 [30] phi from main::@45 to main::@5 [phi:main::@45->main::@5]
+  b5_from_b45:
+  //SEG82 [30] phi (byte) main::r#44 = (byte) '-' [phi:main::@45->main::@5#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b5
   //SEG83 main::@5
@@ -4991,25 +5019,25 @@ main: {
   //SEG92 [167] phi (byte) printu::a#20 = (byte) printu::a#3 [phi:main::@5->printu#3] -- register_copy 
   //SEG93 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@5->printu#4] -- register_copy 
     jsr printu
-  //SEG94 [35] phi from main::@5 to main::@49 [phi:main::@5->main::@49]
-  b49_from_b5:
-    jmp b49
-  //SEG95 main::@49
-  b49:
+  //SEG94 [35] phi from main::@5 to main::@46 [phi:main::@5->main::@46]
+  b46_from_b5:
+    jmp b46
+  //SEG95 main::@46
+  b46:
   //SEG96 [36] call print_ln 
-  //SEG97 [162] phi from main::@49 to print_ln [phi:main::@49->print_ln]
-  print_ln_from_b49:
-  //SEG98 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#27 [phi:main::@49->print_ln#0] -- register_copy 
+  //SEG97 [162] phi from main::@46 to print_ln [phi:main::@46->print_ln]
+  print_ln_from_b46:
+  //SEG98 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#27 [phi:main::@46->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b50
-  //SEG99 main::@50
-  b50:
+    jmp b47
+  //SEG99 main::@47
+  b47:
   //SEG100 [37] if((byte) main::a#10<=(byte) main::b#0) goto main::@6 -- vbuz1_le_vbuz2_then_la1 
     lda b
     cmp a
-    bcs b6_from_b50
-  //SEG101 [38] phi from main::@50 to main::@26 [phi:main::@50->main::@26]
-  b26_from_b50:
+    bcs b6_from_b47
+  //SEG101 [38] phi from main::@47 to main::@26 [phi:main::@47->main::@26]
+  b26_from_b47:
     jmp b26
   //SEG102 main::@26
   b26:
@@ -5018,9 +5046,9 @@ main: {
   //SEG104 [39] phi (byte) main::r#45 = (byte) '+' [phi:main::@26->main::@6#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b6
-  //SEG105 [39] phi from main::@50 to main::@6 [phi:main::@50->main::@6]
-  b6_from_b50:
-  //SEG106 [39] phi (byte) main::r#45 = (byte) '-' [phi:main::@50->main::@6#0] -- vbuxx=vbuc1 
+  //SEG105 [39] phi from main::@47 to main::@6 [phi:main::@47->main::@6]
+  b6_from_b47:
+  //SEG106 [39] phi (byte) main::r#45 = (byte) '-' [phi:main::@47->main::@6#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b6
   //SEG107 main::@6
@@ -5048,15 +5076,15 @@ main: {
   //SEG117 [167] phi (byte) printu::a#20 = (byte) printu::a#4 [phi:main::@6->printu#3] -- register_copy 
   //SEG118 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#159 [phi:main::@6->printu#4] -- register_copy 
     jsr printu
-    jmp b51
-  //SEG119 main::@51
-  b51:
+    jmp b48
+  //SEG119 main::@48
+  b48:
   //SEG120 [45] if((byte) main::a#10<=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@7 -- vbuz1_le_vbuc1_then_la1 
     lda #$37
     cmp a
-    bcs b7_from_b51
-  //SEG121 [46] phi from main::@51 to main::@27 [phi:main::@51->main::@27]
-  b27_from_b51:
+    bcs b7_from_b48
+  //SEG121 [46] phi from main::@48 to main::@27 [phi:main::@48->main::@27]
+  b27_from_b48:
     jmp b27
   //SEG122 main::@27
   b27:
@@ -5065,9 +5093,9 @@ main: {
   //SEG124 [47] phi (byte) main::r#46 = (byte) '+' [phi:main::@27->main::@7#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b7
-  //SEG125 [47] phi from main::@51 to main::@7 [phi:main::@51->main::@7]
-  b7_from_b51:
-  //SEG126 [47] phi (byte) main::r#46 = (byte) '-' [phi:main::@51->main::@7#0] -- vbuxx=vbuc1 
+  //SEG125 [47] phi from main::@48 to main::@7 [phi:main::@48->main::@7]
+  b7_from_b48:
+  //SEG126 [47] phi (byte) main::r#46 = (byte) '-' [phi:main::@48->main::@7#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b7
   //SEG127 main::@7
@@ -5089,16 +5117,16 @@ main: {
   //SEG135 [167] phi (byte) printu::a#20 = (byte) printu::a#5 [phi:main::@7->printu#3] -- register_copy 
   //SEG136 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@7->printu#4] -- register_copy 
     jsr printu
-    jmp b52
-  //SEG137 main::@52
-  b52:
+    jmp b49
+  //SEG137 main::@49
+  b49:
   //SEG138 [51] if((byte) main::a#10<=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@8 -- vbuz1_le_pbuc1_derefidx_vbuz2_then_la1 
     ldy i
     lda cs,y
     cmp a
-    bcs b8_from_b52
-  //SEG139 [52] phi from main::@52 to main::@28 [phi:main::@52->main::@28]
-  b28_from_b52:
+    bcs b8_from_b49
+  //SEG139 [52] phi from main::@49 to main::@28 [phi:main::@49->main::@28]
+  b28_from_b49:
     jmp b28
   //SEG140 main::@28
   b28:
@@ -5107,9 +5135,9 @@ main: {
   //SEG142 [53] phi (byte) main::r#47 = (byte) '+' [phi:main::@28->main::@8#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b8
-  //SEG143 [53] phi from main::@52 to main::@8 [phi:main::@52->main::@8]
-  b8_from_b52:
-  //SEG144 [53] phi (byte) main::r#47 = (byte) '-' [phi:main::@52->main::@8#0] -- vbuxx=vbuc1 
+  //SEG143 [53] phi from main::@49 to main::@8 [phi:main::@49->main::@8]
+  b8_from_b49:
+  //SEG144 [53] phi (byte) main::r#47 = (byte) '-' [phi:main::@49->main::@8#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b8
   //SEG145 main::@8
@@ -5133,15 +5161,15 @@ main: {
   //SEG154 [167] phi (byte) printu::a#20 = (byte) printu::a#6 [phi:main::@8->printu#3] -- register_copy 
   //SEG155 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@8->printu#4] -- register_copy 
     jsr printu
-    jmp b53
-  //SEG156 main::@53
-  b53:
+    jmp b50
+  //SEG156 main::@50
+  b50:
   //SEG157 [58] if((byte) main::a#10<=(byte) main::a#10) goto main::@9 -- vbuz1_le_vbuz1_then_la1 
     lda a
     cmp a
-    bcs b9_from_b53
-  //SEG158 [59] phi from main::@53 to main::@29 [phi:main::@53->main::@29]
-  b29_from_b53:
+    bcs b9_from_b50
+  //SEG158 [59] phi from main::@50 to main::@29 [phi:main::@50->main::@29]
+  b29_from_b50:
     jmp b29
   //SEG159 main::@29
   b29:
@@ -5150,9 +5178,9 @@ main: {
   //SEG161 [60] phi (byte) main::r#48 = (byte) '+' [phi:main::@29->main::@9#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b9
-  //SEG162 [60] phi from main::@53 to main::@9 [phi:main::@53->main::@9]
-  b9_from_b53:
-  //SEG163 [60] phi (byte) main::r#48 = (byte) '-' [phi:main::@53->main::@9#0] -- vbuxx=vbuc1 
+  //SEG162 [60] phi from main::@50 to main::@9 [phi:main::@50->main::@9]
+  b9_from_b50:
+  //SEG163 [60] phi (byte) main::r#48 = (byte) '-' [phi:main::@50->main::@9#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b9
   //SEG164 main::@9
@@ -5175,25 +5203,25 @@ main: {
   //SEG173 [167] phi (byte) printu::a#20 = (byte) printu::a#7 [phi:main::@9->printu#3] -- register_copy 
   //SEG174 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@9->printu#4] -- register_copy 
     jsr printu
-  //SEG175 [65] phi from main::@9 to main::@54 [phi:main::@9->main::@54]
-  b54_from_b9:
-    jmp b54
-  //SEG176 main::@54
-  b54:
+  //SEG175 [65] phi from main::@9 to main::@51 [phi:main::@9->main::@51]
+  b51_from_b9:
+    jmp b51
+  //SEG176 main::@51
+  b51:
   //SEG177 [66] call print_ln 
-  //SEG178 [162] phi from main::@54 to print_ln [phi:main::@54->print_ln]
-  print_ln_from_b54:
-  //SEG179 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@54->print_ln#0] -- register_copy 
+  //SEG178 [162] phi from main::@51 to print_ln [phi:main::@51->print_ln]
+  print_ln_from_b51:
+  //SEG179 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@51->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b55
-  //SEG180 main::@55
-  b55:
+    jmp b52
+  //SEG180 main::@52
+  b52:
   //SEG181 [67] if((byte) main::a#10>(byte) main::b#0) goto main::@10 -- vbuz1_gt_vbuz2_then_la1 
     lda b
     cmp a
-    bcc b10_from_b55
-  //SEG182 [68] phi from main::@55 to main::@30 [phi:main::@55->main::@30]
-  b30_from_b55:
+    bcc b10_from_b52
+  //SEG182 [68] phi from main::@52 to main::@30 [phi:main::@52->main::@30]
+  b30_from_b52:
     jmp b30
   //SEG183 main::@30
   b30:
@@ -5202,9 +5230,9 @@ main: {
   //SEG185 [69] phi (byte) main::r#49 = (byte) '+' [phi:main::@30->main::@10#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b10
-  //SEG186 [69] phi from main::@55 to main::@10 [phi:main::@55->main::@10]
-  b10_from_b55:
-  //SEG187 [69] phi (byte) main::r#49 = (byte) '-' [phi:main::@55->main::@10#0] -- vbuxx=vbuc1 
+  //SEG186 [69] phi from main::@52 to main::@10 [phi:main::@52->main::@10]
+  b10_from_b52:
+  //SEG187 [69] phi (byte) main::r#49 = (byte) '-' [phi:main::@52->main::@10#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b10
   //SEG188 main::@10
@@ -5232,15 +5260,15 @@ main: {
   //SEG198 [167] phi (byte) printu::a#20 = (byte) printu::a#8 [phi:main::@10->printu#3] -- register_copy 
   //SEG199 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#143 [phi:main::@10->printu#4] -- register_copy 
     jsr printu
-    jmp b56
-  //SEG200 main::@56
-  b56:
+    jmp b53
+  //SEG200 main::@53
+  b53:
   //SEG201 [75] if((byte) main::a#10>(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@11 -- vbuz1_gt_vbuc1_then_la1 
     lda #$37
     cmp a
-    bcc b11_from_b56
-  //SEG202 [76] phi from main::@56 to main::@31 [phi:main::@56->main::@31]
-  b31_from_b56:
+    bcc b11_from_b53
+  //SEG202 [76] phi from main::@53 to main::@31 [phi:main::@53->main::@31]
+  b31_from_b53:
     jmp b31
   //SEG203 main::@31
   b31:
@@ -5249,9 +5277,9 @@ main: {
   //SEG205 [77] phi (byte) main::r#50 = (byte) '+' [phi:main::@31->main::@11#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b11
-  //SEG206 [77] phi from main::@56 to main::@11 [phi:main::@56->main::@11]
-  b11_from_b56:
-  //SEG207 [77] phi (byte) main::r#50 = (byte) '-' [phi:main::@56->main::@11#0] -- vbuxx=vbuc1 
+  //SEG206 [77] phi from main::@53 to main::@11 [phi:main::@53->main::@11]
+  b11_from_b53:
+  //SEG207 [77] phi (byte) main::r#50 = (byte) '-' [phi:main::@53->main::@11#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b11
   //SEG208 main::@11
@@ -5273,16 +5301,16 @@ main: {
   //SEG216 [167] phi (byte) printu::a#20 = (byte) printu::a#9 [phi:main::@11->printu#3] -- register_copy 
   //SEG217 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@11->printu#4] -- register_copy 
     jsr printu
-    jmp b57
-  //SEG218 main::@57
-  b57:
+    jmp b54
+  //SEG218 main::@54
+  b54:
   //SEG219 [81] if((byte) main::a#10>*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@12 -- vbuz1_gt_pbuc1_derefidx_vbuz2_then_la1 
     ldy i
     lda cs,y
     cmp a
-    bcc b12_from_b57
-  //SEG220 [82] phi from main::@57 to main::@32 [phi:main::@57->main::@32]
-  b32_from_b57:
+    bcc b12_from_b54
+  //SEG220 [82] phi from main::@54 to main::@32 [phi:main::@54->main::@32]
+  b32_from_b54:
     jmp b32
   //SEG221 main::@32
   b32:
@@ -5291,9 +5319,9 @@ main: {
   //SEG223 [83] phi (byte) main::r#51 = (byte) '+' [phi:main::@32->main::@12#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b12
-  //SEG224 [83] phi from main::@57 to main::@12 [phi:main::@57->main::@12]
-  b12_from_b57:
-  //SEG225 [83] phi (byte) main::r#51 = (byte) '-' [phi:main::@57->main::@12#0] -- vbuxx=vbuc1 
+  //SEG224 [83] phi from main::@54 to main::@12 [phi:main::@54->main::@12]
+  b12_from_b54:
+  //SEG225 [83] phi (byte) main::r#51 = (byte) '-' [phi:main::@54->main::@12#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b12
   //SEG226 main::@12
@@ -5317,15 +5345,15 @@ main: {
   //SEG235 [167] phi (byte) printu::a#20 = (byte) printu::a#10 [phi:main::@12->printu#3] -- register_copy 
   //SEG236 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@12->printu#4] -- register_copy 
     jsr printu
-    jmp b58
-  //SEG237 main::@58
-  b58:
+    jmp b55
+  //SEG237 main::@55
+  b55:
   //SEG238 [88] if((byte) main::a#10>(byte) main::a#10) goto main::@13 -- vbuz1_gt_vbuz1_then_la1 
     lda a
     cmp a
-    bcc b13_from_b58
-  //SEG239 [89] phi from main::@58 to main::@33 [phi:main::@58->main::@33]
-  b33_from_b58:
+    bcc b13_from_b55
+  //SEG239 [89] phi from main::@55 to main::@33 [phi:main::@55->main::@33]
+  b33_from_b55:
     jmp b33
   //SEG240 main::@33
   b33:
@@ -5334,9 +5362,9 @@ main: {
   //SEG242 [90] phi (byte) main::r#52 = (byte) '+' [phi:main::@33->main::@13#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b13
-  //SEG243 [90] phi from main::@58 to main::@13 [phi:main::@58->main::@13]
-  b13_from_b58:
-  //SEG244 [90] phi (byte) main::r#52 = (byte) '-' [phi:main::@58->main::@13#0] -- vbuxx=vbuc1 
+  //SEG243 [90] phi from main::@55 to main::@13 [phi:main::@55->main::@13]
+  b13_from_b55:
+  //SEG244 [90] phi (byte) main::r#52 = (byte) '-' [phi:main::@55->main::@13#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b13
   //SEG245 main::@13
@@ -5359,25 +5387,25 @@ main: {
   //SEG254 [167] phi (byte) printu::a#20 = (byte) printu::a#11 [phi:main::@13->printu#3] -- register_copy 
   //SEG255 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@13->printu#4] -- register_copy 
     jsr printu
-  //SEG256 [95] phi from main::@13 to main::@59 [phi:main::@13->main::@59]
-  b59_from_b13:
-    jmp b59
-  //SEG257 main::@59
-  b59:
+  //SEG256 [95] phi from main::@13 to main::@56 [phi:main::@13->main::@56]
+  b56_from_b13:
+    jmp b56
+  //SEG257 main::@56
+  b56:
   //SEG258 [96] call print_ln 
-  //SEG259 [162] phi from main::@59 to print_ln [phi:main::@59->print_ln]
-  print_ln_from_b59:
-  //SEG260 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@59->print_ln#0] -- register_copy 
+  //SEG259 [162] phi from main::@56 to print_ln [phi:main::@56->print_ln]
+  print_ln_from_b56:
+  //SEG260 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@56->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b60
-  //SEG261 main::@60
-  b60:
+    jmp b57
+  //SEG261 main::@57
+  b57:
   //SEG262 [97] if((byte) main::a#10<(byte) main::b#0) goto main::@14 -- vbuz1_lt_vbuz2_then_la1 
     lda a
     cmp b
-    bcc b14_from_b60
-  //SEG263 [98] phi from main::@60 to main::@34 [phi:main::@60->main::@34]
-  b34_from_b60:
+    bcc b14_from_b57
+  //SEG263 [98] phi from main::@57 to main::@34 [phi:main::@57->main::@34]
+  b34_from_b57:
     jmp b34
   //SEG264 main::@34
   b34:
@@ -5386,9 +5414,9 @@ main: {
   //SEG266 [99] phi (byte) main::r#53 = (byte) '+' [phi:main::@34->main::@14#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b14
-  //SEG267 [99] phi from main::@60 to main::@14 [phi:main::@60->main::@14]
-  b14_from_b60:
-  //SEG268 [99] phi (byte) main::r#53 = (byte) '-' [phi:main::@60->main::@14#0] -- vbuxx=vbuc1 
+  //SEG267 [99] phi from main::@57 to main::@14 [phi:main::@57->main::@14]
+  b14_from_b57:
+  //SEG268 [99] phi (byte) main::r#53 = (byte) '-' [phi:main::@57->main::@14#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b14
   //SEG269 main::@14
@@ -5416,15 +5444,15 @@ main: {
   //SEG279 [167] phi (byte) printu::a#20 = (byte) printu::a#12 [phi:main::@14->printu#3] -- register_copy 
   //SEG280 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#147 [phi:main::@14->printu#4] -- register_copy 
     jsr printu
-    jmp b61
-  //SEG281 main::@61
-  b61:
+    jmp b58
+  //SEG281 main::@58
+  b58:
   //SEG282 [105] if((byte) main::a#10<(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@15 -- vbuz1_lt_vbuc1_then_la1 
     lda a
     cmp #$37
-    bcc b15_from_b61
-  //SEG283 [106] phi from main::@61 to main::@35 [phi:main::@61->main::@35]
-  b35_from_b61:
+    bcc b15_from_b58
+  //SEG283 [106] phi from main::@58 to main::@35 [phi:main::@58->main::@35]
+  b35_from_b58:
     jmp b35
   //SEG284 main::@35
   b35:
@@ -5433,9 +5461,9 @@ main: {
   //SEG286 [107] phi (byte) main::r#54 = (byte) '+' [phi:main::@35->main::@15#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b15
-  //SEG287 [107] phi from main::@61 to main::@15 [phi:main::@61->main::@15]
-  b15_from_b61:
-  //SEG288 [107] phi (byte) main::r#54 = (byte) '-' [phi:main::@61->main::@15#0] -- vbuxx=vbuc1 
+  //SEG287 [107] phi from main::@58 to main::@15 [phi:main::@58->main::@15]
+  b15_from_b58:
+  //SEG288 [107] phi (byte) main::r#54 = (byte) '-' [phi:main::@58->main::@15#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b15
   //SEG289 main::@15
@@ -5457,16 +5485,16 @@ main: {
   //SEG297 [167] phi (byte) printu::a#20 = (byte) printu::a#13 [phi:main::@15->printu#3] -- register_copy 
   //SEG298 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@15->printu#4] -- register_copy 
     jsr printu
-    jmp b62
-  //SEG299 main::@62
-  b62:
+    jmp b59
+  //SEG299 main::@59
+  b59:
   //SEG300 [111] if((byte) main::a#10<*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@16 -- vbuz1_lt_pbuc1_derefidx_vbuz2_then_la1 
     lda a
     ldy i
     cmp cs,y
-    bcc b16_from_b62
-  //SEG301 [112] phi from main::@62 to main::@36 [phi:main::@62->main::@36]
-  b36_from_b62:
+    bcc b16_from_b59
+  //SEG301 [112] phi from main::@59 to main::@36 [phi:main::@59->main::@36]
+  b36_from_b59:
     jmp b36
   //SEG302 main::@36
   b36:
@@ -5475,9 +5503,9 @@ main: {
   //SEG304 [113] phi (byte) main::r#55 = (byte) '+' [phi:main::@36->main::@16#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b16
-  //SEG305 [113] phi from main::@62 to main::@16 [phi:main::@62->main::@16]
-  b16_from_b62:
-  //SEG306 [113] phi (byte) main::r#55 = (byte) '-' [phi:main::@62->main::@16#0] -- vbuxx=vbuc1 
+  //SEG305 [113] phi from main::@59 to main::@16 [phi:main::@59->main::@16]
+  b16_from_b59:
+  //SEG306 [113] phi (byte) main::r#55 = (byte) '-' [phi:main::@59->main::@16#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b16
   //SEG307 main::@16
@@ -5501,15 +5529,15 @@ main: {
   //SEG316 [167] phi (byte) printu::a#20 = (byte) printu::a#14 [phi:main::@16->printu#3] -- register_copy 
   //SEG317 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@16->printu#4] -- register_copy 
     jsr printu
-    jmp b63
-  //SEG318 main::@63
-  b63:
+    jmp b60
+  //SEG318 main::@60
+  b60:
   //SEG319 [118] if((byte) main::a#10<(byte) main::a#10) goto main::@17 -- vbuz1_lt_vbuz1_then_la1 
     lda a
     cmp a
-    bcc b17_from_b63
-  //SEG320 [119] phi from main::@63 to main::@37 [phi:main::@63->main::@37]
-  b37_from_b63:
+    bcc b17_from_b60
+  //SEG320 [119] phi from main::@60 to main::@37 [phi:main::@60->main::@37]
+  b37_from_b60:
     jmp b37
   //SEG321 main::@37
   b37:
@@ -5518,9 +5546,9 @@ main: {
   //SEG323 [120] phi (byte) main::r#56 = (byte) '+' [phi:main::@37->main::@17#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b17
-  //SEG324 [120] phi from main::@63 to main::@17 [phi:main::@63->main::@17]
-  b17_from_b63:
-  //SEG325 [120] phi (byte) main::r#56 = (byte) '-' [phi:main::@63->main::@17#0] -- vbuxx=vbuc1 
+  //SEG324 [120] phi from main::@60 to main::@17 [phi:main::@60->main::@17]
+  b17_from_b60:
+  //SEG325 [120] phi (byte) main::r#56 = (byte) '-' [phi:main::@60->main::@17#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b17
   //SEG326 main::@17
@@ -5543,25 +5571,25 @@ main: {
   //SEG335 [167] phi (byte) printu::a#20 = (byte) printu::a#15 [phi:main::@17->printu#3] -- register_copy 
   //SEG336 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@17->printu#4] -- register_copy 
     jsr printu
-  //SEG337 [125] phi from main::@17 to main::@64 [phi:main::@17->main::@64]
-  b64_from_b17:
-    jmp b64
-  //SEG338 main::@64
-  b64:
+  //SEG337 [125] phi from main::@17 to main::@61 [phi:main::@17->main::@61]
+  b61_from_b17:
+    jmp b61
+  //SEG338 main::@61
+  b61:
   //SEG339 [126] call print_ln 
-  //SEG340 [162] phi from main::@64 to print_ln [phi:main::@64->print_ln]
-  print_ln_from_b64:
-  //SEG341 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@64->print_ln#0] -- register_copy 
+  //SEG340 [162] phi from main::@61 to print_ln [phi:main::@61->print_ln]
+  print_ln_from_b61:
+  //SEG341 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@61->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b65
-  //SEG342 main::@65
-  b65:
+    jmp b62
+  //SEG342 main::@62
+  b62:
   //SEG343 [127] if((byte) main::a#10!=(byte) main::b#0) goto main::@18 -- vbuz1_neq_vbuz2_then_la1 
     lda a
     cmp b
-    bne b18_from_b65
-  //SEG344 [128] phi from main::@65 to main::@38 [phi:main::@65->main::@38]
-  b38_from_b65:
+    bne b18_from_b62
+  //SEG344 [128] phi from main::@62 to main::@38 [phi:main::@62->main::@38]
+  b38_from_b62:
     jmp b38
   //SEG345 main::@38
   b38:
@@ -5570,9 +5598,9 @@ main: {
   //SEG347 [129] phi (byte) main::r#57 = (byte) '+' [phi:main::@38->main::@18#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b18
-  //SEG348 [129] phi from main::@65 to main::@18 [phi:main::@65->main::@18]
-  b18_from_b65:
-  //SEG349 [129] phi (byte) main::r#57 = (byte) '-' [phi:main::@65->main::@18#0] -- vbuxx=vbuc1 
+  //SEG348 [129] phi from main::@62 to main::@18 [phi:main::@62->main::@18]
+  b18_from_b62:
+  //SEG349 [129] phi (byte) main::r#57 = (byte) '-' [phi:main::@62->main::@18#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b18
   //SEG350 main::@18
@@ -5600,15 +5628,15 @@ main: {
   //SEG360 [167] phi (byte) printu::a#20 = (byte) printu::a#16 [phi:main::@18->printu#3] -- register_copy 
   //SEG361 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#151 [phi:main::@18->printu#4] -- register_copy 
     jsr printu
-    jmp b66
-  //SEG362 main::@66
-  b66:
+    jmp b63
+  //SEG362 main::@63
+  b63:
   //SEG363 [135] if((byte) main::a#10!=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@19 -- vbuz1_neq_vbuc1_then_la1 
     lda #$37
     cmp a
-    bne b19_from_b66
-  //SEG364 [136] phi from main::@66 to main::@39 [phi:main::@66->main::@39]
-  b39_from_b66:
+    bne b19_from_b63
+  //SEG364 [136] phi from main::@63 to main::@39 [phi:main::@63->main::@39]
+  b39_from_b63:
     jmp b39
   //SEG365 main::@39
   b39:
@@ -5617,9 +5645,9 @@ main: {
   //SEG367 [137] phi (byte) main::r#58 = (byte) '+' [phi:main::@39->main::@19#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b19
-  //SEG368 [137] phi from main::@66 to main::@19 [phi:main::@66->main::@19]
-  b19_from_b66:
-  //SEG369 [137] phi (byte) main::r#58 = (byte) '-' [phi:main::@66->main::@19#0] -- vbuxx=vbuc1 
+  //SEG368 [137] phi from main::@63 to main::@19 [phi:main::@63->main::@19]
+  b19_from_b63:
+  //SEG369 [137] phi (byte) main::r#58 = (byte) '-' [phi:main::@63->main::@19#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b19
   //SEG370 main::@19
@@ -5641,16 +5669,16 @@ main: {
   //SEG378 [167] phi (byte) printu::a#20 = (byte) printu::a#17 [phi:main::@19->printu#3] -- register_copy 
   //SEG379 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@19->printu#4] -- register_copy 
     jsr printu
-    jmp b67
-  //SEG380 main::@67
-  b67:
+    jmp b64
+  //SEG380 main::@64
+  b64:
   //SEG381 [141] if((byte) main::a#10!=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@20 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
     lda a
     ldy i
     cmp cs,y
-    bne b20_from_b67
-  //SEG382 [142] phi from main::@67 to main::@40 [phi:main::@67->main::@40]
-  b40_from_b67:
+    bne b20_from_b64
+  //SEG382 [142] phi from main::@64 to main::@40 [phi:main::@64->main::@40]
+  b40_from_b64:
     jmp b40
   //SEG383 main::@40
   b40:
@@ -5659,9 +5687,9 @@ main: {
   //SEG385 [143] phi (byte) main::r#59 = (byte) '+' [phi:main::@40->main::@20#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b20
-  //SEG386 [143] phi from main::@67 to main::@20 [phi:main::@67->main::@20]
-  b20_from_b67:
-  //SEG387 [143] phi (byte) main::r#59 = (byte) '-' [phi:main::@67->main::@20#0] -- vbuxx=vbuc1 
+  //SEG386 [143] phi from main::@64 to main::@20 [phi:main::@64->main::@20]
+  b20_from_b64:
+  //SEG387 [143] phi (byte) main::r#59 = (byte) '-' [phi:main::@64->main::@20#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b20
   //SEG388 main::@20
@@ -5685,15 +5713,15 @@ main: {
   //SEG397 [167] phi (byte) printu::a#20 = (byte) printu::a#18 [phi:main::@20->printu#3] -- register_copy 
   //SEG398 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@20->printu#4] -- register_copy 
     jsr printu
-    jmp b68
-  //SEG399 main::@68
-  b68:
+    jmp b65
+  //SEG399 main::@65
+  b65:
   //SEG400 [148] if((byte) main::a#10!=(byte) main::a#10) goto main::@21 -- vbuz1_neq_vbuz1_then_la1 
     lda a
     cmp a
-    bne b21_from_b68
-  //SEG401 [149] phi from main::@68 to main::@41 [phi:main::@68->main::@41]
-  b41_from_b68:
+    bne b21_from_b65
+  //SEG401 [149] phi from main::@65 to main::@41 [phi:main::@65->main::@41]
+  b41_from_b65:
     jmp b41
   //SEG402 main::@41
   b41:
@@ -5702,9 +5730,9 @@ main: {
   //SEG404 [150] phi (byte) main::r#60 = (byte) '+' [phi:main::@41->main::@21#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b21
-  //SEG405 [150] phi from main::@68 to main::@21 [phi:main::@68->main::@21]
-  b21_from_b68:
-  //SEG406 [150] phi (byte) main::r#60 = (byte) '-' [phi:main::@68->main::@21#0] -- vbuxx=vbuc1 
+  //SEG405 [150] phi from main::@65 to main::@21 [phi:main::@65->main::@21]
+  b21_from_b65:
+  //SEG406 [150] phi (byte) main::r#60 = (byte) '-' [phi:main::@65->main::@21#0] -- vbuxx=vbuc1 
     ldx #'-'
     jmp b21
   //SEG407 main::@21
@@ -5727,49 +5755,49 @@ main: {
   //SEG416 [167] phi (byte) printu::a#20 = (byte) printu::a#19 [phi:main::@21->printu#3] -- register_copy 
   //SEG417 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@21->printu#4] -- register_copy 
     jsr printu
-  //SEG418 [155] phi from main::@21 to main::@69 [phi:main::@21->main::@69]
-  b69_from_b21:
-    jmp b69
-  //SEG419 main::@69
-  b69:
+  //SEG418 [155] phi from main::@21 to main::@66 [phi:main::@21->main::@66]
+  b66_from_b21:
+    jmp b66
+  //SEG419 main::@66
+  b66:
   //SEG420 [156] call print_ln 
-  //SEG421 [162] phi from main::@69 to print_ln [phi:main::@69->print_ln]
-  print_ln_from_b69:
-  //SEG422 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@69->print_ln#0] -- register_copy 
+  //SEG421 [162] phi from main::@66 to print_ln [phi:main::@66->print_ln]
+  print_ln_from_b66:
+  //SEG422 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@66->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b70
-  //SEG423 main::@70
-  b70:
+    jmp b67
+  //SEG423 main::@67
+  b67:
   //SEG424 [157] (byte) main::a#1 ← (byte) main::a#10 + (byte/signed byte/word/signed word/dword/signed dword) $30 -- vbuz1=vbuz1_plus_vbuc1 
     lax a
     axs #-[$30]
     stx a
   //SEG425 [158] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG426 [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@71 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG426 [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@68 -- vbuz1_neq_vbuc1_then_la1 
     lda #5
     cmp i
-    bne b71
-  //SEG427 [160] phi from main::@43 main::@70 to main::@43 [phi:main::@43/main::@70->main::@43]
-  b43_from_b43:
-  b43_from_b70:
-    jmp b43
-  //SEG428 main::@43
-  b43:
-    jmp b43_from_b43
-  //SEG429 main::@71
-  b71:
+    bne b68
+  //SEG427 [160] phi from main::@42 main::@67 to main::@42 [phi:main::@42/main::@67->main::@42]
+  b42_from_b42:
+  b42_from_b67:
+    jmp b42
+  //SEG428 main::@42
+  b42:
+    jmp b42_from_b42
+  //SEG429 main::@68
+  b68:
   //SEG430 [161] (byte*~) print_char_cursor#142 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG431 [6] phi from main::@71 to main::@1 [phi:main::@71->main::@1]
-  b1_from_b71:
-  //SEG432 [6] phi (byte*) print_line_cursor#27 = (byte*) print_line_cursor#1 [phi:main::@71->main::@1#0] -- register_copy 
-  //SEG433 [6] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@71->main::@1#1] -- register_copy 
-  //SEG434 [6] phi (byte*) print_char_cursor#120 = (byte*~) print_char_cursor#142 [phi:main::@71->main::@1#2] -- register_copy 
-  //SEG435 [6] phi (byte) main::a#10 = (byte) main::a#1 [phi:main::@71->main::@1#3] -- register_copy 
+  //SEG431 [6] phi from main::@68 to main::@1 [phi:main::@68->main::@1]
+  b1_from_b68:
+  //SEG432 [6] phi (byte*) print_line_cursor#27 = (byte*) print_line_cursor#1 [phi:main::@68->main::@1#0] -- register_copy 
+  //SEG433 [6] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@68->main::@1#1] -- register_copy 
+  //SEG434 [6] phi (byte*) print_char_cursor#120 = (byte*~) print_char_cursor#142 [phi:main::@68->main::@1#2] -- register_copy 
+  //SEG435 [6] phi (byte) main::a#10 = (byte) main::a#1 [phi:main::@68->main::@1#3] -- register_copy 
     jmp b1
     op: .text "< @"
     op4: .text "> @"
@@ -6029,75 +6057,75 @@ print_cls: {
   print_hextab: .text "0123456789abcdef"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b21
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b22
 Removing instruction jmp b2
-Removing instruction jmp b46
+Removing instruction jmp b43
 Removing instruction jmp b23
 Removing instruction jmp b3
-Removing instruction jmp b47
+Removing instruction jmp b44
 Removing instruction jmp b24
 Removing instruction jmp b4
-Removing instruction jmp b48
+Removing instruction jmp b45
 Removing instruction jmp b25
 Removing instruction jmp b5
-Removing instruction jmp b49
-Removing instruction jmp b50
+Removing instruction jmp b46
+Removing instruction jmp b47
 Removing instruction jmp b26
 Removing instruction jmp b6
-Removing instruction jmp b51
+Removing instruction jmp b48
 Removing instruction jmp b27
 Removing instruction jmp b7
-Removing instruction jmp b52
+Removing instruction jmp b49
 Removing instruction jmp b28
 Removing instruction jmp b8
-Removing instruction jmp b53
+Removing instruction jmp b50
 Removing instruction jmp b29
 Removing instruction jmp b9
-Removing instruction jmp b54
-Removing instruction jmp b55
+Removing instruction jmp b51
+Removing instruction jmp b52
 Removing instruction jmp b30
 Removing instruction jmp b10
-Removing instruction jmp b56
+Removing instruction jmp b53
 Removing instruction jmp b31
 Removing instruction jmp b11
-Removing instruction jmp b57
+Removing instruction jmp b54
 Removing instruction jmp b32
 Removing instruction jmp b12
-Removing instruction jmp b58
+Removing instruction jmp b55
 Removing instruction jmp b33
 Removing instruction jmp b13
-Removing instruction jmp b59
-Removing instruction jmp b60
+Removing instruction jmp b56
+Removing instruction jmp b57
 Removing instruction jmp b34
 Removing instruction jmp b14
-Removing instruction jmp b61
+Removing instruction jmp b58
 Removing instruction jmp b35
 Removing instruction jmp b15
-Removing instruction jmp b62
+Removing instruction jmp b59
 Removing instruction jmp b36
 Removing instruction jmp b16
-Removing instruction jmp b63
+Removing instruction jmp b60
 Removing instruction jmp b37
 Removing instruction jmp b17
-Removing instruction jmp b64
-Removing instruction jmp b65
+Removing instruction jmp b61
+Removing instruction jmp b62
 Removing instruction jmp b38
 Removing instruction jmp b18
-Removing instruction jmp b66
+Removing instruction jmp b63
 Removing instruction jmp b39
 Removing instruction jmp b19
-Removing instruction jmp b67
+Removing instruction jmp b64
 Removing instruction jmp b40
 Removing instruction jmp b20
-Removing instruction jmp b68
+Removing instruction jmp b65
 Removing instruction jmp b41
 Removing instruction jmp b21
-Removing instruction jmp b69
-Removing instruction jmp b70
-Removing instruction jmp b43
+Removing instruction jmp b66
+Removing instruction jmp b67
+Removing instruction jmp b42
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -6116,73 +6144,73 @@ Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b43_from_b43 with b43
+Replacing label b42_from_b42 with b42
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b21_from_bbegin:
-Removing instruction b21:
-Removing instruction main_from_b21:
-Removing instruction bend_from_b21:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b22_from_b1:
 Removing instruction b2_from_b22:
-Removing instruction b23_from_b46:
+Removing instruction b23_from_b43:
 Removing instruction b3_from_b23:
 Removing instruction printu_from_b3:
-Removing instruction b24_from_b47:
+Removing instruction b24_from_b44:
 Removing instruction b4_from_b24:
-Removing instruction b25_from_b48:
+Removing instruction b25_from_b45:
 Removing instruction b5_from_b25:
-Removing instruction b49_from_b5:
-Removing instruction print_ln_from_b49:
-Removing instruction b26_from_b50:
+Removing instruction b46_from_b5:
+Removing instruction print_ln_from_b46:
+Removing instruction b26_from_b47:
 Removing instruction b6_from_b26:
-Removing instruction b27_from_b51:
+Removing instruction b27_from_b48:
 Removing instruction b7_from_b27:
 Removing instruction printu_from_b7:
-Removing instruction b28_from_b52:
+Removing instruction b28_from_b49:
 Removing instruction b8_from_b28:
-Removing instruction b29_from_b53:
+Removing instruction b29_from_b50:
 Removing instruction b9_from_b29:
-Removing instruction b54_from_b9:
-Removing instruction print_ln_from_b54:
-Removing instruction b30_from_b55:
+Removing instruction b51_from_b9:
+Removing instruction print_ln_from_b51:
+Removing instruction b30_from_b52:
 Removing instruction b10_from_b30:
-Removing instruction b31_from_b56:
+Removing instruction b31_from_b53:
 Removing instruction b11_from_b31:
 Removing instruction printu_from_b11:
-Removing instruction b32_from_b57:
+Removing instruction b32_from_b54:
 Removing instruction b12_from_b32:
-Removing instruction b33_from_b58:
+Removing instruction b33_from_b55:
 Removing instruction b13_from_b33:
-Removing instruction b59_from_b13:
-Removing instruction print_ln_from_b59:
-Removing instruction b34_from_b60:
+Removing instruction b56_from_b13:
+Removing instruction print_ln_from_b56:
+Removing instruction b34_from_b57:
 Removing instruction b14_from_b34:
-Removing instruction b35_from_b61:
+Removing instruction b35_from_b58:
 Removing instruction b15_from_b35:
 Removing instruction printu_from_b15:
-Removing instruction b36_from_b62:
+Removing instruction b36_from_b59:
 Removing instruction b16_from_b36:
-Removing instruction b37_from_b63:
+Removing instruction b37_from_b60:
 Removing instruction b17_from_b37:
-Removing instruction b64_from_b17:
-Removing instruction print_ln_from_b64:
-Removing instruction b38_from_b65:
+Removing instruction b61_from_b17:
+Removing instruction print_ln_from_b61:
+Removing instruction b38_from_b62:
 Removing instruction b18_from_b38:
-Removing instruction b39_from_b66:
+Removing instruction b39_from_b63:
 Removing instruction b19_from_b39:
 Removing instruction printu_from_b19:
-Removing instruction b40_from_b67:
+Removing instruction b40_from_b64:
 Removing instruction b20_from_b40:
-Removing instruction b41_from_b68:
+Removing instruction b41_from_b65:
 Removing instruction b21_from_b41:
-Removing instruction b69_from_b21:
-Removing instruction print_ln_from_b69:
-Removing instruction b43_from_b43:
-Removing instruction b43_from_b70:
+Removing instruction b66_from_b21:
+Removing instruction print_ln_from_b66:
+Removing instruction b42_from_b42:
+Removing instruction b42_from_b67:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction print_str_from_b2:
@@ -6197,65 +6225,65 @@ Removing instruction print_cls_from_main:
 Removing instruction b1_from_main:
 Removing instruction b22:
 Removing instruction printu_from_b2:
-Removing instruction b46:
+Removing instruction b43:
 Removing instruction b23:
-Removing instruction b47:
+Removing instruction b44:
 Removing instruction b24:
 Removing instruction printu_from_b4:
-Removing instruction b48:
+Removing instruction b45:
 Removing instruction b25:
 Removing instruction printu_from_b5:
-Removing instruction b49:
-Removing instruction b50:
+Removing instruction b46:
+Removing instruction b47:
 Removing instruction b26:
 Removing instruction printu_from_b6:
-Removing instruction b51:
+Removing instruction b48:
 Removing instruction b27:
-Removing instruction b52:
+Removing instruction b49:
 Removing instruction b28:
 Removing instruction printu_from_b8:
-Removing instruction b53:
+Removing instruction b50:
 Removing instruction b29:
 Removing instruction printu_from_b9:
-Removing instruction b54:
-Removing instruction b55:
+Removing instruction b51:
+Removing instruction b52:
 Removing instruction b30:
 Removing instruction printu_from_b10:
-Removing instruction b56:
+Removing instruction b53:
 Removing instruction b31:
-Removing instruction b57:
+Removing instruction b54:
 Removing instruction b32:
 Removing instruction printu_from_b12:
-Removing instruction b58:
+Removing instruction b55:
 Removing instruction b33:
 Removing instruction printu_from_b13:
-Removing instruction b59:
-Removing instruction b60:
+Removing instruction b56:
+Removing instruction b57:
 Removing instruction b34:
 Removing instruction printu_from_b14:
-Removing instruction b61:
+Removing instruction b58:
 Removing instruction b35:
-Removing instruction b62:
+Removing instruction b59:
 Removing instruction b36:
 Removing instruction printu_from_b16:
-Removing instruction b63:
+Removing instruction b60:
 Removing instruction b37:
 Removing instruction printu_from_b17:
-Removing instruction b64:
-Removing instruction b65:
+Removing instruction b61:
+Removing instruction b62:
 Removing instruction b38:
 Removing instruction printu_from_b18:
-Removing instruction b66:
+Removing instruction b63:
 Removing instruction b39:
-Removing instruction b67:
+Removing instruction b64:
 Removing instruction b40:
 Removing instruction printu_from_b20:
-Removing instruction b68:
+Removing instruction b65:
 Removing instruction b41:
 Removing instruction printu_from_b21:
-Removing instruction b69:
-Removing instruction b70:
-Removing instruction b1_from_b71:
+Removing instruction b66:
+Removing instruction b67:
+Removing instruction b1_from_b68:
 Removing instruction breturn:
 Removing instruction print_char_from_printu:
 Removing instruction b1:
@@ -6280,25 +6308,25 @@ Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Relabelling long label b2_from_b1 to b22
-Relabelling long label b3_from_b46 to b23
-Relabelling long label b4_from_b47 to b24
-Relabelling long label b5_from_b48 to b25
-Relabelling long label b6_from_b50 to b26
-Relabelling long label b7_from_b51 to b27
-Relabelling long label b8_from_b52 to b28
-Relabelling long label b9_from_b53 to b29
-Relabelling long label b10_from_b55 to b30
-Relabelling long label b11_from_b56 to b31
-Relabelling long label b12_from_b57 to b32
-Relabelling long label b13_from_b58 to b33
-Relabelling long label b14_from_b60 to b34
-Relabelling long label b15_from_b61 to b35
-Relabelling long label b16_from_b62 to b36
-Relabelling long label b17_from_b63 to b37
-Relabelling long label b18_from_b65 to b38
-Relabelling long label b19_from_b66 to b39
-Relabelling long label b20_from_b67 to b40
-Relabelling long label b21_from_b68 to b41
+Relabelling long label b3_from_b43 to b23
+Relabelling long label b4_from_b44 to b24
+Relabelling long label b5_from_b45 to b25
+Relabelling long label b6_from_b47 to b26
+Relabelling long label b7_from_b48 to b27
+Relabelling long label b8_from_b49 to b28
+Relabelling long label b9_from_b50 to b29
+Relabelling long label b10_from_b52 to b30
+Relabelling long label b11_from_b53 to b31
+Relabelling long label b12_from_b54 to b32
+Relabelling long label b13_from_b55 to b33
+Relabelling long label b14_from_b57 to b34
+Relabelling long label b15_from_b58 to b35
+Relabelling long label b16_from_b59 to b36
+Relabelling long label b17_from_b60 to b37
+Relabelling long label b18_from_b62 to b38
+Relabelling long label b19_from_b63 to b39
+Relabelling long label b20_from_b64 to b40
+Relabelling long label b21_from_b65 to b41
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
@@ -6306,7 +6334,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @21
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -6346,7 +6374,10 @@ FINAL SYMBOL TABLE
 (label) main::@4
 (label) main::@40
 (label) main::@41
+(label) main::@42
 (label) main::@43
+(label) main::@44
+(label) main::@45
 (label) main::@46
 (label) main::@47
 (label) main::@48
@@ -6372,10 +6403,7 @@ FINAL SYMBOL TABLE
 (label) main::@66
 (label) main::@67
 (label) main::@68
-(label) main::@69
 (label) main::@7
-(label) main::@70
-(label) main::@71
 (label) main::@8
 (label) main::@9
 (byte) main::a
@@ -6585,11 +6613,11 @@ Score: 15721
   .label print_char_cursor = 9
   .label print_line_cursor = 4
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-//SEG5 @21
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -6656,20 +6684,20 @@ main: {
   //SEG36 [167] phi (byte) printu::a#20 = (byte) printu::a#0 [phi:main::@2->printu#3] -- register_copy 
   //SEG37 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#120 [phi:main::@2->printu#4] -- register_copy 
     jsr printu
-  //SEG38 main::@46
+  //SEG38 main::@43
   //SEG39 [15] if((byte) main::a#10>=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@3 -- vbuz1_ge_vbuc1_then_la1 
     lda a
     cmp #$37
     bcs b23
-  //SEG40 [16] phi from main::@46 to main::@23 [phi:main::@46->main::@23]
+  //SEG40 [16] phi from main::@43 to main::@23 [phi:main::@43->main::@23]
   //SEG41 main::@23
   //SEG42 [17] phi from main::@23 to main::@3 [phi:main::@23->main::@3]
   //SEG43 [17] phi (byte) main::r#42 = (byte) '+' [phi:main::@23->main::@3#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b3
-  //SEG44 [17] phi from main::@46 to main::@3 [phi:main::@46->main::@3]
+  //SEG44 [17] phi from main::@43 to main::@3 [phi:main::@43->main::@3]
   b23:
-  //SEG45 [17] phi (byte) main::r#42 = (byte) '-' [phi:main::@46->main::@3#0] -- vbuxx=vbuc1 
+  //SEG45 [17] phi (byte) main::r#42 = (byte) '-' [phi:main::@43->main::@3#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG46 main::@3
   b3:
@@ -6689,21 +6717,21 @@ main: {
   //SEG54 [167] phi (byte) printu::a#20 = (byte) printu::a#1 [phi:main::@3->printu#3] -- register_copy 
   //SEG55 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@3->printu#4] -- register_copy 
     jsr printu
-  //SEG56 main::@47
+  //SEG56 main::@44
   //SEG57 [21] if((byte) main::a#10>=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@4 -- vbuz1_ge_pbuc1_derefidx_vbuz2_then_la1 
     lda a
     ldy i
     cmp cs,y
     bcs b24
-  //SEG58 [22] phi from main::@47 to main::@24 [phi:main::@47->main::@24]
+  //SEG58 [22] phi from main::@44 to main::@24 [phi:main::@44->main::@24]
   //SEG59 main::@24
   //SEG60 [23] phi from main::@24 to main::@4 [phi:main::@24->main::@4]
   //SEG61 [23] phi (byte) main::r#43 = (byte) '+' [phi:main::@24->main::@4#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b4
-  //SEG62 [23] phi from main::@47 to main::@4 [phi:main::@47->main::@4]
+  //SEG62 [23] phi from main::@44 to main::@4 [phi:main::@44->main::@4]
   b24:
-  //SEG63 [23] phi (byte) main::r#43 = (byte) '-' [phi:main::@47->main::@4#0] -- vbuxx=vbuc1 
+  //SEG63 [23] phi (byte) main::r#43 = (byte) '-' [phi:main::@44->main::@4#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG64 main::@4
   b4:
@@ -6725,20 +6753,20 @@ main: {
   //SEG73 [167] phi (byte) printu::a#20 = (byte) printu::a#2 [phi:main::@4->printu#3] -- register_copy 
   //SEG74 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@4->printu#4] -- register_copy 
     jsr printu
-  //SEG75 main::@48
+  //SEG75 main::@45
   //SEG76 [28] if((byte) main::a#10>=(byte) main::a#10) goto main::@5 -- vbuz1_ge_vbuz1_then_la1 
     lda a
     cmp a
     bcs b25
-  //SEG77 [29] phi from main::@48 to main::@25 [phi:main::@48->main::@25]
+  //SEG77 [29] phi from main::@45 to main::@25 [phi:main::@45->main::@25]
   //SEG78 main::@25
   //SEG79 [30] phi from main::@25 to main::@5 [phi:main::@25->main::@5]
   //SEG80 [30] phi (byte) main::r#44 = (byte) '+' [phi:main::@25->main::@5#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b5
-  //SEG81 [30] phi from main::@48 to main::@5 [phi:main::@48->main::@5]
+  //SEG81 [30] phi from main::@45 to main::@5 [phi:main::@45->main::@5]
   b25:
-  //SEG82 [30] phi (byte) main::r#44 = (byte) '-' [phi:main::@48->main::@5#0] -- vbuxx=vbuc1 
+  //SEG82 [30] phi (byte) main::r#44 = (byte) '-' [phi:main::@45->main::@5#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG83 main::@5
   b5:
@@ -6759,26 +6787,26 @@ main: {
   //SEG92 [167] phi (byte) printu::a#20 = (byte) printu::a#3 [phi:main::@5->printu#3] -- register_copy 
   //SEG93 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@5->printu#4] -- register_copy 
     jsr printu
-  //SEG94 [35] phi from main::@5 to main::@49 [phi:main::@5->main::@49]
-  //SEG95 main::@49
+  //SEG94 [35] phi from main::@5 to main::@46 [phi:main::@5->main::@46]
+  //SEG95 main::@46
   //SEG96 [36] call print_ln 
-  //SEG97 [162] phi from main::@49 to print_ln [phi:main::@49->print_ln]
-  //SEG98 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#27 [phi:main::@49->print_ln#0] -- register_copy 
+  //SEG97 [162] phi from main::@46 to print_ln [phi:main::@46->print_ln]
+  //SEG98 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#27 [phi:main::@46->print_ln#0] -- register_copy 
     jsr print_ln
-  //SEG99 main::@50
+  //SEG99 main::@47
   //SEG100 [37] if((byte) main::a#10<=(byte) main::b#0) goto main::@6 -- vbuz1_le_vbuz2_then_la1 
     lda b
     cmp a
     bcs b26
-  //SEG101 [38] phi from main::@50 to main::@26 [phi:main::@50->main::@26]
+  //SEG101 [38] phi from main::@47 to main::@26 [phi:main::@47->main::@26]
   //SEG102 main::@26
   //SEG103 [39] phi from main::@26 to main::@6 [phi:main::@26->main::@6]
   //SEG104 [39] phi (byte) main::r#45 = (byte) '+' [phi:main::@26->main::@6#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b6
-  //SEG105 [39] phi from main::@50 to main::@6 [phi:main::@50->main::@6]
+  //SEG105 [39] phi from main::@47 to main::@6 [phi:main::@47->main::@6]
   b26:
-  //SEG106 [39] phi (byte) main::r#45 = (byte) '-' [phi:main::@50->main::@6#0] -- vbuxx=vbuc1 
+  //SEG106 [39] phi (byte) main::r#45 = (byte) '-' [phi:main::@47->main::@6#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG107 main::@6
   b6:
@@ -6804,20 +6832,20 @@ main: {
   //SEG117 [167] phi (byte) printu::a#20 = (byte) printu::a#4 [phi:main::@6->printu#3] -- register_copy 
   //SEG118 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#159 [phi:main::@6->printu#4] -- register_copy 
     jsr printu
-  //SEG119 main::@51
+  //SEG119 main::@48
   //SEG120 [45] if((byte) main::a#10<=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@7 -- vbuz1_le_vbuc1_then_la1 
     lda #$37
     cmp a
     bcs b27
-  //SEG121 [46] phi from main::@51 to main::@27 [phi:main::@51->main::@27]
+  //SEG121 [46] phi from main::@48 to main::@27 [phi:main::@48->main::@27]
   //SEG122 main::@27
   //SEG123 [47] phi from main::@27 to main::@7 [phi:main::@27->main::@7]
   //SEG124 [47] phi (byte) main::r#46 = (byte) '+' [phi:main::@27->main::@7#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b7
-  //SEG125 [47] phi from main::@51 to main::@7 [phi:main::@51->main::@7]
+  //SEG125 [47] phi from main::@48 to main::@7 [phi:main::@48->main::@7]
   b27:
-  //SEG126 [47] phi (byte) main::r#46 = (byte) '-' [phi:main::@51->main::@7#0] -- vbuxx=vbuc1 
+  //SEG126 [47] phi (byte) main::r#46 = (byte) '-' [phi:main::@48->main::@7#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG127 main::@7
   b7:
@@ -6837,21 +6865,21 @@ main: {
   //SEG135 [167] phi (byte) printu::a#20 = (byte) printu::a#5 [phi:main::@7->printu#3] -- register_copy 
   //SEG136 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@7->printu#4] -- register_copy 
     jsr printu
-  //SEG137 main::@52
+  //SEG137 main::@49
   //SEG138 [51] if((byte) main::a#10<=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@8 -- vbuz1_le_pbuc1_derefidx_vbuz2_then_la1 
     ldy i
     lda cs,y
     cmp a
     bcs b28
-  //SEG139 [52] phi from main::@52 to main::@28 [phi:main::@52->main::@28]
+  //SEG139 [52] phi from main::@49 to main::@28 [phi:main::@49->main::@28]
   //SEG140 main::@28
   //SEG141 [53] phi from main::@28 to main::@8 [phi:main::@28->main::@8]
   //SEG142 [53] phi (byte) main::r#47 = (byte) '+' [phi:main::@28->main::@8#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b8
-  //SEG143 [53] phi from main::@52 to main::@8 [phi:main::@52->main::@8]
+  //SEG143 [53] phi from main::@49 to main::@8 [phi:main::@49->main::@8]
   b28:
-  //SEG144 [53] phi (byte) main::r#47 = (byte) '-' [phi:main::@52->main::@8#0] -- vbuxx=vbuc1 
+  //SEG144 [53] phi (byte) main::r#47 = (byte) '-' [phi:main::@49->main::@8#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG145 main::@8
   b8:
@@ -6873,20 +6901,20 @@ main: {
   //SEG154 [167] phi (byte) printu::a#20 = (byte) printu::a#6 [phi:main::@8->printu#3] -- register_copy 
   //SEG155 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@8->printu#4] -- register_copy 
     jsr printu
-  //SEG156 main::@53
+  //SEG156 main::@50
   //SEG157 [58] if((byte) main::a#10<=(byte) main::a#10) goto main::@9 -- vbuz1_le_vbuz1_then_la1 
     lda a
     cmp a
     bcs b29
-  //SEG158 [59] phi from main::@53 to main::@29 [phi:main::@53->main::@29]
+  //SEG158 [59] phi from main::@50 to main::@29 [phi:main::@50->main::@29]
   //SEG159 main::@29
   //SEG160 [60] phi from main::@29 to main::@9 [phi:main::@29->main::@9]
   //SEG161 [60] phi (byte) main::r#48 = (byte) '+' [phi:main::@29->main::@9#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b9
-  //SEG162 [60] phi from main::@53 to main::@9 [phi:main::@53->main::@9]
+  //SEG162 [60] phi from main::@50 to main::@9 [phi:main::@50->main::@9]
   b29:
-  //SEG163 [60] phi (byte) main::r#48 = (byte) '-' [phi:main::@53->main::@9#0] -- vbuxx=vbuc1 
+  //SEG163 [60] phi (byte) main::r#48 = (byte) '-' [phi:main::@50->main::@9#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG164 main::@9
   b9:
@@ -6907,26 +6935,26 @@ main: {
   //SEG173 [167] phi (byte) printu::a#20 = (byte) printu::a#7 [phi:main::@9->printu#3] -- register_copy 
   //SEG174 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@9->printu#4] -- register_copy 
     jsr printu
-  //SEG175 [65] phi from main::@9 to main::@54 [phi:main::@9->main::@54]
-  //SEG176 main::@54
+  //SEG175 [65] phi from main::@9 to main::@51 [phi:main::@9->main::@51]
+  //SEG176 main::@51
   //SEG177 [66] call print_ln 
-  //SEG178 [162] phi from main::@54 to print_ln [phi:main::@54->print_ln]
-  //SEG179 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@54->print_ln#0] -- register_copy 
+  //SEG178 [162] phi from main::@51 to print_ln [phi:main::@51->print_ln]
+  //SEG179 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@51->print_ln#0] -- register_copy 
     jsr print_ln
-  //SEG180 main::@55
+  //SEG180 main::@52
   //SEG181 [67] if((byte) main::a#10>(byte) main::b#0) goto main::@10 -- vbuz1_gt_vbuz2_then_la1 
     lda b
     cmp a
     bcc b30
-  //SEG182 [68] phi from main::@55 to main::@30 [phi:main::@55->main::@30]
+  //SEG182 [68] phi from main::@52 to main::@30 [phi:main::@52->main::@30]
   //SEG183 main::@30
   //SEG184 [69] phi from main::@30 to main::@10 [phi:main::@30->main::@10]
   //SEG185 [69] phi (byte) main::r#49 = (byte) '+' [phi:main::@30->main::@10#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b10
-  //SEG186 [69] phi from main::@55 to main::@10 [phi:main::@55->main::@10]
+  //SEG186 [69] phi from main::@52 to main::@10 [phi:main::@52->main::@10]
   b30:
-  //SEG187 [69] phi (byte) main::r#49 = (byte) '-' [phi:main::@55->main::@10#0] -- vbuxx=vbuc1 
+  //SEG187 [69] phi (byte) main::r#49 = (byte) '-' [phi:main::@52->main::@10#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG188 main::@10
   b10:
@@ -6952,20 +6980,20 @@ main: {
   //SEG198 [167] phi (byte) printu::a#20 = (byte) printu::a#8 [phi:main::@10->printu#3] -- register_copy 
   //SEG199 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#143 [phi:main::@10->printu#4] -- register_copy 
     jsr printu
-  //SEG200 main::@56
+  //SEG200 main::@53
   //SEG201 [75] if((byte) main::a#10>(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@11 -- vbuz1_gt_vbuc1_then_la1 
     lda #$37
     cmp a
     bcc b31
-  //SEG202 [76] phi from main::@56 to main::@31 [phi:main::@56->main::@31]
+  //SEG202 [76] phi from main::@53 to main::@31 [phi:main::@53->main::@31]
   //SEG203 main::@31
   //SEG204 [77] phi from main::@31 to main::@11 [phi:main::@31->main::@11]
   //SEG205 [77] phi (byte) main::r#50 = (byte) '+' [phi:main::@31->main::@11#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b11
-  //SEG206 [77] phi from main::@56 to main::@11 [phi:main::@56->main::@11]
+  //SEG206 [77] phi from main::@53 to main::@11 [phi:main::@53->main::@11]
   b31:
-  //SEG207 [77] phi (byte) main::r#50 = (byte) '-' [phi:main::@56->main::@11#0] -- vbuxx=vbuc1 
+  //SEG207 [77] phi (byte) main::r#50 = (byte) '-' [phi:main::@53->main::@11#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG208 main::@11
   b11:
@@ -6985,21 +7013,21 @@ main: {
   //SEG216 [167] phi (byte) printu::a#20 = (byte) printu::a#9 [phi:main::@11->printu#3] -- register_copy 
   //SEG217 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@11->printu#4] -- register_copy 
     jsr printu
-  //SEG218 main::@57
+  //SEG218 main::@54
   //SEG219 [81] if((byte) main::a#10>*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@12 -- vbuz1_gt_pbuc1_derefidx_vbuz2_then_la1 
     ldy i
     lda cs,y
     cmp a
     bcc b32
-  //SEG220 [82] phi from main::@57 to main::@32 [phi:main::@57->main::@32]
+  //SEG220 [82] phi from main::@54 to main::@32 [phi:main::@54->main::@32]
   //SEG221 main::@32
   //SEG222 [83] phi from main::@32 to main::@12 [phi:main::@32->main::@12]
   //SEG223 [83] phi (byte) main::r#51 = (byte) '+' [phi:main::@32->main::@12#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b12
-  //SEG224 [83] phi from main::@57 to main::@12 [phi:main::@57->main::@12]
+  //SEG224 [83] phi from main::@54 to main::@12 [phi:main::@54->main::@12]
   b32:
-  //SEG225 [83] phi (byte) main::r#51 = (byte) '-' [phi:main::@57->main::@12#0] -- vbuxx=vbuc1 
+  //SEG225 [83] phi (byte) main::r#51 = (byte) '-' [phi:main::@54->main::@12#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG226 main::@12
   b12:
@@ -7021,20 +7049,20 @@ main: {
   //SEG235 [167] phi (byte) printu::a#20 = (byte) printu::a#10 [phi:main::@12->printu#3] -- register_copy 
   //SEG236 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@12->printu#4] -- register_copy 
     jsr printu
-  //SEG237 main::@58
+  //SEG237 main::@55
   //SEG238 [88] if((byte) main::a#10>(byte) main::a#10) goto main::@13 -- vbuz1_gt_vbuz1_then_la1 
     lda a
     cmp a
     bcc b33
-  //SEG239 [89] phi from main::@58 to main::@33 [phi:main::@58->main::@33]
+  //SEG239 [89] phi from main::@55 to main::@33 [phi:main::@55->main::@33]
   //SEG240 main::@33
   //SEG241 [90] phi from main::@33 to main::@13 [phi:main::@33->main::@13]
   //SEG242 [90] phi (byte) main::r#52 = (byte) '+' [phi:main::@33->main::@13#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b13
-  //SEG243 [90] phi from main::@58 to main::@13 [phi:main::@58->main::@13]
+  //SEG243 [90] phi from main::@55 to main::@13 [phi:main::@55->main::@13]
   b33:
-  //SEG244 [90] phi (byte) main::r#52 = (byte) '-' [phi:main::@58->main::@13#0] -- vbuxx=vbuc1 
+  //SEG244 [90] phi (byte) main::r#52 = (byte) '-' [phi:main::@55->main::@13#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG245 main::@13
   b13:
@@ -7055,26 +7083,26 @@ main: {
   //SEG254 [167] phi (byte) printu::a#20 = (byte) printu::a#11 [phi:main::@13->printu#3] -- register_copy 
   //SEG255 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@13->printu#4] -- register_copy 
     jsr printu
-  //SEG256 [95] phi from main::@13 to main::@59 [phi:main::@13->main::@59]
-  //SEG257 main::@59
+  //SEG256 [95] phi from main::@13 to main::@56 [phi:main::@13->main::@56]
+  //SEG257 main::@56
   //SEG258 [96] call print_ln 
-  //SEG259 [162] phi from main::@59 to print_ln [phi:main::@59->print_ln]
-  //SEG260 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@59->print_ln#0] -- register_copy 
+  //SEG259 [162] phi from main::@56 to print_ln [phi:main::@56->print_ln]
+  //SEG260 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@56->print_ln#0] -- register_copy 
     jsr print_ln
-  //SEG261 main::@60
+  //SEG261 main::@57
   //SEG262 [97] if((byte) main::a#10<(byte) main::b#0) goto main::@14 -- vbuz1_lt_vbuz2_then_la1 
     lda a
     cmp b
     bcc b34
-  //SEG263 [98] phi from main::@60 to main::@34 [phi:main::@60->main::@34]
+  //SEG263 [98] phi from main::@57 to main::@34 [phi:main::@57->main::@34]
   //SEG264 main::@34
   //SEG265 [99] phi from main::@34 to main::@14 [phi:main::@34->main::@14]
   //SEG266 [99] phi (byte) main::r#53 = (byte) '+' [phi:main::@34->main::@14#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b14
-  //SEG267 [99] phi from main::@60 to main::@14 [phi:main::@60->main::@14]
+  //SEG267 [99] phi from main::@57 to main::@14 [phi:main::@57->main::@14]
   b34:
-  //SEG268 [99] phi (byte) main::r#53 = (byte) '-' [phi:main::@60->main::@14#0] -- vbuxx=vbuc1 
+  //SEG268 [99] phi (byte) main::r#53 = (byte) '-' [phi:main::@57->main::@14#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG269 main::@14
   b14:
@@ -7100,20 +7128,20 @@ main: {
   //SEG279 [167] phi (byte) printu::a#20 = (byte) printu::a#12 [phi:main::@14->printu#3] -- register_copy 
   //SEG280 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#147 [phi:main::@14->printu#4] -- register_copy 
     jsr printu
-  //SEG281 main::@61
+  //SEG281 main::@58
   //SEG282 [105] if((byte) main::a#10<(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@15 -- vbuz1_lt_vbuc1_then_la1 
     lda a
     cmp #$37
     bcc b35
-  //SEG283 [106] phi from main::@61 to main::@35 [phi:main::@61->main::@35]
+  //SEG283 [106] phi from main::@58 to main::@35 [phi:main::@58->main::@35]
   //SEG284 main::@35
   //SEG285 [107] phi from main::@35 to main::@15 [phi:main::@35->main::@15]
   //SEG286 [107] phi (byte) main::r#54 = (byte) '+' [phi:main::@35->main::@15#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b15
-  //SEG287 [107] phi from main::@61 to main::@15 [phi:main::@61->main::@15]
+  //SEG287 [107] phi from main::@58 to main::@15 [phi:main::@58->main::@15]
   b35:
-  //SEG288 [107] phi (byte) main::r#54 = (byte) '-' [phi:main::@61->main::@15#0] -- vbuxx=vbuc1 
+  //SEG288 [107] phi (byte) main::r#54 = (byte) '-' [phi:main::@58->main::@15#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG289 main::@15
   b15:
@@ -7133,21 +7161,21 @@ main: {
   //SEG297 [167] phi (byte) printu::a#20 = (byte) printu::a#13 [phi:main::@15->printu#3] -- register_copy 
   //SEG298 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@15->printu#4] -- register_copy 
     jsr printu
-  //SEG299 main::@62
+  //SEG299 main::@59
   //SEG300 [111] if((byte) main::a#10<*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@16 -- vbuz1_lt_pbuc1_derefidx_vbuz2_then_la1 
     lda a
     ldy i
     cmp cs,y
     bcc b36
-  //SEG301 [112] phi from main::@62 to main::@36 [phi:main::@62->main::@36]
+  //SEG301 [112] phi from main::@59 to main::@36 [phi:main::@59->main::@36]
   //SEG302 main::@36
   //SEG303 [113] phi from main::@36 to main::@16 [phi:main::@36->main::@16]
   //SEG304 [113] phi (byte) main::r#55 = (byte) '+' [phi:main::@36->main::@16#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b16
-  //SEG305 [113] phi from main::@62 to main::@16 [phi:main::@62->main::@16]
+  //SEG305 [113] phi from main::@59 to main::@16 [phi:main::@59->main::@16]
   b36:
-  //SEG306 [113] phi (byte) main::r#55 = (byte) '-' [phi:main::@62->main::@16#0] -- vbuxx=vbuc1 
+  //SEG306 [113] phi (byte) main::r#55 = (byte) '-' [phi:main::@59->main::@16#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG307 main::@16
   b16:
@@ -7169,20 +7197,20 @@ main: {
   //SEG316 [167] phi (byte) printu::a#20 = (byte) printu::a#14 [phi:main::@16->printu#3] -- register_copy 
   //SEG317 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@16->printu#4] -- register_copy 
     jsr printu
-  //SEG318 main::@63
+  //SEG318 main::@60
   //SEG319 [118] if((byte) main::a#10<(byte) main::a#10) goto main::@17 -- vbuz1_lt_vbuz1_then_la1 
     lda a
     cmp a
     bcc b37
-  //SEG320 [119] phi from main::@63 to main::@37 [phi:main::@63->main::@37]
+  //SEG320 [119] phi from main::@60 to main::@37 [phi:main::@60->main::@37]
   //SEG321 main::@37
   //SEG322 [120] phi from main::@37 to main::@17 [phi:main::@37->main::@17]
   //SEG323 [120] phi (byte) main::r#56 = (byte) '+' [phi:main::@37->main::@17#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b17
-  //SEG324 [120] phi from main::@63 to main::@17 [phi:main::@63->main::@17]
+  //SEG324 [120] phi from main::@60 to main::@17 [phi:main::@60->main::@17]
   b37:
-  //SEG325 [120] phi (byte) main::r#56 = (byte) '-' [phi:main::@63->main::@17#0] -- vbuxx=vbuc1 
+  //SEG325 [120] phi (byte) main::r#56 = (byte) '-' [phi:main::@60->main::@17#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG326 main::@17
   b17:
@@ -7203,26 +7231,26 @@ main: {
   //SEG335 [167] phi (byte) printu::a#20 = (byte) printu::a#15 [phi:main::@17->printu#3] -- register_copy 
   //SEG336 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@17->printu#4] -- register_copy 
     jsr printu
-  //SEG337 [125] phi from main::@17 to main::@64 [phi:main::@17->main::@64]
-  //SEG338 main::@64
+  //SEG337 [125] phi from main::@17 to main::@61 [phi:main::@17->main::@61]
+  //SEG338 main::@61
   //SEG339 [126] call print_ln 
-  //SEG340 [162] phi from main::@64 to print_ln [phi:main::@64->print_ln]
-  //SEG341 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@64->print_ln#0] -- register_copy 
+  //SEG340 [162] phi from main::@61 to print_ln [phi:main::@61->print_ln]
+  //SEG341 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@61->print_ln#0] -- register_copy 
     jsr print_ln
-  //SEG342 main::@65
+  //SEG342 main::@62
   //SEG343 [127] if((byte) main::a#10!=(byte) main::b#0) goto main::@18 -- vbuz1_neq_vbuz2_then_la1 
     lda a
     cmp b
     bne b38
-  //SEG344 [128] phi from main::@65 to main::@38 [phi:main::@65->main::@38]
+  //SEG344 [128] phi from main::@62 to main::@38 [phi:main::@62->main::@38]
   //SEG345 main::@38
   //SEG346 [129] phi from main::@38 to main::@18 [phi:main::@38->main::@18]
   //SEG347 [129] phi (byte) main::r#57 = (byte) '+' [phi:main::@38->main::@18#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b18
-  //SEG348 [129] phi from main::@65 to main::@18 [phi:main::@65->main::@18]
+  //SEG348 [129] phi from main::@62 to main::@18 [phi:main::@62->main::@18]
   b38:
-  //SEG349 [129] phi (byte) main::r#57 = (byte) '-' [phi:main::@65->main::@18#0] -- vbuxx=vbuc1 
+  //SEG349 [129] phi (byte) main::r#57 = (byte) '-' [phi:main::@62->main::@18#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG350 main::@18
   b18:
@@ -7248,20 +7276,20 @@ main: {
   //SEG360 [167] phi (byte) printu::a#20 = (byte) printu::a#16 [phi:main::@18->printu#3] -- register_copy 
   //SEG361 [167] phi (byte*) print_char_cursor#95 = (byte*~) print_char_cursor#151 [phi:main::@18->printu#4] -- register_copy 
     jsr printu
-  //SEG362 main::@66
+  //SEG362 main::@63
   //SEG363 [135] if((byte) main::a#10!=(byte/signed byte/word/signed word/dword/signed dword) $37) goto main::@19 -- vbuz1_neq_vbuc1_then_la1 
     lda #$37
     cmp a
     bne b39
-  //SEG364 [136] phi from main::@66 to main::@39 [phi:main::@66->main::@39]
+  //SEG364 [136] phi from main::@63 to main::@39 [phi:main::@63->main::@39]
   //SEG365 main::@39
   //SEG366 [137] phi from main::@39 to main::@19 [phi:main::@39->main::@19]
   //SEG367 [137] phi (byte) main::r#58 = (byte) '+' [phi:main::@39->main::@19#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b19
-  //SEG368 [137] phi from main::@66 to main::@19 [phi:main::@66->main::@19]
+  //SEG368 [137] phi from main::@63 to main::@19 [phi:main::@63->main::@19]
   b39:
-  //SEG369 [137] phi (byte) main::r#58 = (byte) '-' [phi:main::@66->main::@19#0] -- vbuxx=vbuc1 
+  //SEG369 [137] phi (byte) main::r#58 = (byte) '-' [phi:main::@63->main::@19#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG370 main::@19
   b19:
@@ -7281,21 +7309,21 @@ main: {
   //SEG378 [167] phi (byte) printu::a#20 = (byte) printu::a#17 [phi:main::@19->printu#3] -- register_copy 
   //SEG379 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@19->printu#4] -- register_copy 
     jsr printu
-  //SEG380 main::@67
+  //SEG380 main::@64
   //SEG381 [141] if((byte) main::a#10!=*((const byte[5]) main::cs#0 + (byte) main::i#10)) goto main::@20 -- vbuz1_neq_pbuc1_derefidx_vbuz2_then_la1 
     lda a
     ldy i
     cmp cs,y
     bne b40
-  //SEG382 [142] phi from main::@67 to main::@40 [phi:main::@67->main::@40]
+  //SEG382 [142] phi from main::@64 to main::@40 [phi:main::@64->main::@40]
   //SEG383 main::@40
   //SEG384 [143] phi from main::@40 to main::@20 [phi:main::@40->main::@20]
   //SEG385 [143] phi (byte) main::r#59 = (byte) '+' [phi:main::@40->main::@20#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b20
-  //SEG386 [143] phi from main::@67 to main::@20 [phi:main::@67->main::@20]
+  //SEG386 [143] phi from main::@64 to main::@20 [phi:main::@64->main::@20]
   b40:
-  //SEG387 [143] phi (byte) main::r#59 = (byte) '-' [phi:main::@67->main::@20#0] -- vbuxx=vbuc1 
+  //SEG387 [143] phi (byte) main::r#59 = (byte) '-' [phi:main::@64->main::@20#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG388 main::@20
   b20:
@@ -7317,20 +7345,20 @@ main: {
   //SEG397 [167] phi (byte) printu::a#20 = (byte) printu::a#18 [phi:main::@20->printu#3] -- register_copy 
   //SEG398 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@20->printu#4] -- register_copy 
     jsr printu
-  //SEG399 main::@68
+  //SEG399 main::@65
   //SEG400 [148] if((byte) main::a#10!=(byte) main::a#10) goto main::@21 -- vbuz1_neq_vbuz1_then_la1 
     lda a
     cmp a
     bne b41
-  //SEG401 [149] phi from main::@68 to main::@41 [phi:main::@68->main::@41]
+  //SEG401 [149] phi from main::@65 to main::@41 [phi:main::@65->main::@41]
   //SEG402 main::@41
   //SEG403 [150] phi from main::@41 to main::@21 [phi:main::@41->main::@21]
   //SEG404 [150] phi (byte) main::r#60 = (byte) '+' [phi:main::@41->main::@21#0] -- vbuxx=vbuc1 
     ldx #'+'
     jmp b21
-  //SEG405 [150] phi from main::@68 to main::@21 [phi:main::@68->main::@21]
+  //SEG405 [150] phi from main::@65 to main::@21 [phi:main::@65->main::@21]
   b41:
-  //SEG406 [150] phi (byte) main::r#60 = (byte) '-' [phi:main::@68->main::@21#0] -- vbuxx=vbuc1 
+  //SEG406 [150] phi (byte) main::r#60 = (byte) '-' [phi:main::@65->main::@21#0] -- vbuxx=vbuc1 
     ldx #'-'
   //SEG407 main::@21
   b21:
@@ -7351,39 +7379,39 @@ main: {
   //SEG416 [167] phi (byte) printu::a#20 = (byte) printu::a#19 [phi:main::@21->printu#3] -- register_copy 
   //SEG417 [167] phi (byte*) print_char_cursor#95 = (byte*) print_char_cursor#55 [phi:main::@21->printu#4] -- register_copy 
     jsr printu
-  //SEG418 [155] phi from main::@21 to main::@69 [phi:main::@21->main::@69]
-  //SEG419 main::@69
+  //SEG418 [155] phi from main::@21 to main::@66 [phi:main::@21->main::@66]
+  //SEG419 main::@66
   //SEG420 [156] call print_ln 
-  //SEG421 [162] phi from main::@69 to print_ln [phi:main::@69->print_ln]
-  //SEG422 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@69->print_ln#0] -- register_copy 
+  //SEG421 [162] phi from main::@66 to print_ln [phi:main::@66->print_ln]
+  //SEG422 [162] phi (byte*) print_line_cursor#25 = (byte*) print_line_cursor#1 [phi:main::@66->print_ln#0] -- register_copy 
     jsr print_ln
-  //SEG423 main::@70
+  //SEG423 main::@67
   //SEG424 [157] (byte) main::a#1 ← (byte) main::a#10 + (byte/signed byte/word/signed word/dword/signed dword) $30 -- vbuz1=vbuz1_plus_vbuc1 
     lax a
     axs #-[$30]
     stx a
   //SEG425 [158] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG426 [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@71 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG426 [159] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@68 -- vbuz1_neq_vbuc1_then_la1 
     lda #5
     cmp i
-    bne b71
-  //SEG427 [160] phi from main::@43 main::@70 to main::@43 [phi:main::@43/main::@70->main::@43]
-  //SEG428 main::@43
-  b43:
-    jmp b43
-  //SEG429 main::@71
-  b71:
+    bne b68
+  //SEG427 [160] phi from main::@42 main::@67 to main::@42 [phi:main::@42/main::@67->main::@42]
+  //SEG428 main::@42
+  b42:
+    jmp b42
+  //SEG429 main::@68
+  b68:
   //SEG430 [161] (byte*~) print_char_cursor#142 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG431 [6] phi from main::@71 to main::@1 [phi:main::@71->main::@1]
-  //SEG432 [6] phi (byte*) print_line_cursor#27 = (byte*) print_line_cursor#1 [phi:main::@71->main::@1#0] -- register_copy 
-  //SEG433 [6] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@71->main::@1#1] -- register_copy 
-  //SEG434 [6] phi (byte*) print_char_cursor#120 = (byte*~) print_char_cursor#142 [phi:main::@71->main::@1#2] -- register_copy 
-  //SEG435 [6] phi (byte) main::a#10 = (byte) main::a#1 [phi:main::@71->main::@1#3] -- register_copy 
+  //SEG431 [6] phi from main::@68 to main::@1 [phi:main::@68->main::@1]
+  //SEG432 [6] phi (byte*) print_line_cursor#27 = (byte*) print_line_cursor#1 [phi:main::@68->main::@1#0] -- register_copy 
+  //SEG433 [6] phi (byte) main::i#10 = (byte) main::i#1 [phi:main::@68->main::@1#1] -- register_copy 
+  //SEG434 [6] phi (byte*) print_char_cursor#120 = (byte*~) print_char_cursor#142 [phi:main::@68->main::@1#2] -- register_copy 
+  //SEG435 [6] phi (byte) main::a#10 = (byte) main::a#1 [phi:main::@68->main::@1#3] -- register_copy 
     jmp b1
     op: .text "< @"
     op4: .text "> @"
diff --git a/src/test/ref/test-comparisons.sym b/src/test/ref/test-comparisons.sym
index f9e154b30..3123d6999 100644
--- a/src/test/ref/test-comparisons.sym
+++ b/src/test/ref/test-comparisons.sym
@@ -1,4 +1,4 @@
-(label) @21
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -38,7 +38,10 @@
 (label) main::@4
 (label) main::@40
 (label) main::@41
+(label) main::@42
 (label) main::@43
+(label) main::@44
+(label) main::@45
 (label) main::@46
 (label) main::@47
 (label) main::@48
@@ -64,10 +67,7 @@
 (label) main::@66
 (label) main::@67
 (label) main::@68
-(label) main::@69
 (label) main::@7
-(label) main::@70
-(label) main::@71
 (label) main::@8
 (label) main::@9
 (byte) main::a
diff --git a/src/test/ref/test-division.asm b/src/test/ref/test-division.asm
index 59a00c6fa..6987878cf 100644
--- a/src/test/ref/test-division.asm
+++ b/src/test/ref/test-division.asm
@@ -444,7 +444,7 @@ div8s: {
     tay
     lda neg
     cmp #0
-    beq b18
+    beq b9
     txa
     eor #$ff
     clc
@@ -456,7 +456,7 @@ div8s: {
     adc #1
   breturn:
     rts
-  b18:
+  b9:
     tya
     jmp breturn
   b3:
@@ -671,9 +671,9 @@ test_8u: {
     inc i
     lda #6
     cmp i
-    bne b12
+    bne b11
     rts
-  b12:
+  b11:
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
diff --git a/src/test/ref/test-division.cfg b/src/test/ref/test-division.cfg
index ff834183d..ef4b9e041 100644
--- a/src/test/ref/test-division.cfg
+++ b/src/test/ref/test-division.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@32
-@32: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @32
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @32
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
@@ -33,58 +33,58 @@ main::@return: scope:[main]  from main::@4
 test_16s: scope:[test_16s]  from main::@4
   [15] phi()
   to:test_16s::@1
-test_16s::@1: scope:[test_16s]  from test_16s test_16s::@11
-  [16] (byte) test_16s::i#10 ← phi( test_16s/(byte/signed byte/word/signed word/dword/signed dword) 0 test_16s::@11/(byte) test_16s::i#1 )
+test_16s::@1: scope:[test_16s]  from test_16s test_16s::@10
+  [16] (byte) test_16s::i#10 ← phi( test_16s/(byte/signed byte/word/signed word/dword/signed dword) 0 test_16s::@10/(byte) test_16s::i#1 )
   [17] (signed word) test_16s::dividend#0 ← *((const signed word[]) test_16s::dividends#0 + (byte) test_16s::i#10)
   [18] (signed word) test_16s::divisor#0 ← *((const signed word[]) test_16s::divisors#0 + (byte) test_16s::i#10)
   [19] (signed word) div16s::dividend#0 ← (signed word) test_16s::dividend#0
   [20] (signed word) div16s::divisor#0 ← (signed word) test_16s::divisor#0
   [21] call div16s 
   [22] (signed word) div16s::return#2 ← (signed word) div16s::return#0
-  to:test_16s::@3
-test_16s::@3: scope:[test_16s]  from test_16s::@1
+  to:test_16s::@2
+test_16s::@2: scope:[test_16s]  from test_16s::@1
   [23] (signed word) test_16s::res#0 ← (signed word) div16s::return#2
   [24] (signed word) print_sword::w#1 ← (signed word) test_16s::dividend#0
   [25] (byte*~) print_char_cursor#159 ← (byte*) print_line_cursor#1
   [26] call print_sword 
-  to:test_16s::@4
-test_16s::@4: scope:[test_16s]  from test_16s::@3
+  to:test_16s::@3
+test_16s::@3: scope:[test_16s]  from test_16s::@2
   [27] phi()
   [28] call print_str 
-  to:test_16s::@5
-test_16s::@5: scope:[test_16s]  from test_16s::@4
+  to:test_16s::@4
+test_16s::@4: scope:[test_16s]  from test_16s::@3
   [29] (signed word) print_sword::w#2 ← (signed word) test_16s::divisor#0
   [30] call print_sword 
-  to:test_16s::@6
-test_16s::@6: scope:[test_16s]  from test_16s::@5
+  to:test_16s::@5
+test_16s::@5: scope:[test_16s]  from test_16s::@4
   [31] phi()
   [32] call print_str 
-  to:test_16s::@7
-test_16s::@7: scope:[test_16s]  from test_16s::@6
+  to:test_16s::@6
+test_16s::@6: scope:[test_16s]  from test_16s::@5
   [33] (signed word) print_sword::w#3 ← (signed word) test_16s::res#0
   [34] call print_sword 
-  to:test_16s::@8
-test_16s::@8: scope:[test_16s]  from test_16s::@7
+  to:test_16s::@7
+test_16s::@7: scope:[test_16s]  from test_16s::@6
   [35] phi()
   [36] call print_str 
-  to:test_16s::@9
-test_16s::@9: scope:[test_16s]  from test_16s::@8
+  to:test_16s::@8
+test_16s::@8: scope:[test_16s]  from test_16s::@7
   [37] (signed word) print_sword::w#4 ← (signed word) rem16s#11
   [38] call print_sword 
-  to:test_16s::@10
-test_16s::@10: scope:[test_16s]  from test_16s::@9
+  to:test_16s::@9
+test_16s::@9: scope:[test_16s]  from test_16s::@8
   [39] phi()
   [40] call print_ln 
-  to:test_16s::@11
-test_16s::@11: scope:[test_16s]  from test_16s::@10
+  to:test_16s::@10
+test_16s::@10: scope:[test_16s]  from test_16s::@9
   [41] (byte) test_16s::i#1 ← (byte) test_16s::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [42] if((byte) test_16s::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $c) goto test_16s::@1
   to:test_16s::@return
-test_16s::@return: scope:[test_16s]  from test_16s::@11
+test_16s::@return: scope:[test_16s]  from test_16s::@10
   [43] return 
   to:@return
-print_ln: scope:[print_ln]  from test_16s::@10 test_16u::@10 test_8s::@10 test_8u::@10
-  [44] (byte*) print_line_cursor#39 ← phi( test_16s::@10/(byte*) print_line_cursor#1 test_16u::@10/(byte*) print_line_cursor#1 test_8s::@10/(byte*) print_line_cursor#1 test_8u::@10/(byte*) print_line_cursor#41 )
+print_ln: scope:[print_ln]  from test_16s::@9 test_16u::@9 test_8s::@9 test_8u::@9
+  [44] (byte*) print_line_cursor#39 ← phi( test_16s::@9/(byte*) print_line_cursor#1 test_16u::@9/(byte*) print_line_cursor#1 test_8s::@9/(byte*) print_line_cursor#1 test_8u::@9/(byte*) print_line_cursor#41 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [45] (byte*) print_line_cursor#20 ← phi( print_ln/(byte*) print_line_cursor#39 print_ln::@1/(byte*) print_line_cursor#1 )
@@ -94,30 +94,30 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [48] return 
   to:@return
-print_sword: scope:[print_sword]  from test_16s::@3 test_16s::@5 test_16s::@7 test_16s::@9
-  [49] (byte*) print_char_cursor#131 ← phi( test_16s::@3/(byte*~) print_char_cursor#159 test_16s::@5/(byte*) print_char_cursor#128 test_16s::@7/(byte*) print_char_cursor#128 test_16s::@9/(byte*) print_char_cursor#128 )
-  [49] (signed word) print_sword::w#5 ← phi( test_16s::@3/(signed word) print_sword::w#1 test_16s::@5/(signed word) print_sword::w#2 test_16s::@7/(signed word) print_sword::w#3 test_16s::@9/(signed word) print_sword::w#4 )
+print_sword: scope:[print_sword]  from test_16s::@2 test_16s::@4 test_16s::@6 test_16s::@8
+  [49] (byte*) print_char_cursor#131 ← phi( test_16s::@2/(byte*~) print_char_cursor#159 test_16s::@4/(byte*) print_char_cursor#128 test_16s::@6/(byte*) print_char_cursor#128 test_16s::@8/(byte*) print_char_cursor#128 )
+  [49] (signed word) print_sword::w#5 ← phi( test_16s::@2/(signed word) print_sword::w#1 test_16s::@4/(signed word) print_sword::w#2 test_16s::@6/(signed word) print_sword::w#3 test_16s::@8/(signed word) print_sword::w#4 )
   [50] if((signed word) print_sword::w#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sword::@1
   to:print_sword::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [51] phi()
   [52] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [53] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#5
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [54] (byte*) print_char_cursor#130 ← phi( print_sword/(byte*) print_char_cursor#131 print_sword::@4/(byte*) print_char_cursor#18 )
-  [54] (signed word) print_sword::w#6 ← phi( print_sword/(signed word) print_sword::w#5 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [54] (byte*) print_char_cursor#130 ← phi( print_sword/(byte*) print_char_cursor#131 print_sword::@3/(byte*) print_char_cursor#18 )
+  [54] (signed word) print_sword::w#6 ← phi( print_sword/(signed word) print_sword::w#5 print_sword::@3/(signed word) print_sword::w#0 )
   [55] (word~) print_word::w#7 ← (word)(signed word) print_sword::w#6
   [56] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
   [57] return 
   to:@return
-print_word: scope:[print_word]  from print_sword::@1 test_16u::@3 test_16u::@5 test_16u::@7 test_16u::@9
-  [58] (byte*) print_char_cursor#135 ← phi( print_sword::@1/(byte*) print_char_cursor#130 test_16u::@3/(byte*~) print_char_cursor#166 test_16u::@5/(byte*) print_char_cursor#128 test_16u::@7/(byte*) print_char_cursor#128 test_16u::@9/(byte*) print_char_cursor#128 )
-  [58] (word) print_word::w#5 ← phi( print_sword::@1/(word~) print_word::w#7 test_16u::@3/(word) print_word::w#1 test_16u::@5/(word) print_word::w#2 test_16u::@7/(word) print_word::w#3 test_16u::@9/(word) print_word::w#4 )
+print_word: scope:[print_word]  from print_sword::@1 test_16u::@2 test_16u::@4 test_16u::@6 test_16u::@8
+  [58] (byte*) print_char_cursor#135 ← phi( print_sword::@1/(byte*) print_char_cursor#130 test_16u::@2/(byte*~) print_char_cursor#166 test_16u::@4/(byte*) print_char_cursor#128 test_16u::@6/(byte*) print_char_cursor#128 test_16u::@8/(byte*) print_char_cursor#128 )
+  [58] (word) print_word::w#5 ← phi( print_sword::@1/(word~) print_word::w#7 test_16u::@2/(word) print_word::w#1 test_16u::@4/(word) print_word::w#2 test_16u::@6/(word) print_word::w#3 test_16u::@8/(word) print_word::w#4 )
   [59] (byte) print_byte::b#1 ← > (word) print_word::w#5
   [60] call print_byte 
   to:print_word::@1
@@ -128,9 +128,9 @@ print_word::@1: scope:[print_word]  from print_word
 print_word::@return: scope:[print_word]  from print_word::@1
   [63] return 
   to:@return
-print_byte: scope:[print_byte]  from print_sbyte::@2 print_word print_word::@1 test_8u::@3 test_8u::@5 test_8u::@7 test_8u::@9
-  [64] (byte*) print_char_cursor#136 ← phi( print_sbyte::@2/(byte*) print_char_cursor#18 print_word/(byte*) print_char_cursor#135 print_word::@1/(byte*) print_char_cursor#18 test_8u::@3/(byte*) print_char_cursor#138 test_8u::@5/(byte*) print_char_cursor#128 test_8u::@7/(byte*) print_char_cursor#128 test_8u::@9/(byte*) print_char_cursor#128 )
-  [64] (byte) print_byte::b#7 ← phi( print_sbyte::@2/(byte~) print_byte::b#9 print_word/(byte) print_byte::b#1 print_word::@1/(byte) print_byte::b#2 test_8u::@3/(byte) print_byte::b#3 test_8u::@5/(byte) print_byte::b#4 test_8u::@7/(byte) print_byte::b#5 test_8u::@9/(byte) print_byte::b#6 )
+print_byte: scope:[print_byte]  from print_sbyte::@2 print_word print_word::@1 test_8u::@2 test_8u::@4 test_8u::@6 test_8u::@8
+  [64] (byte*) print_char_cursor#136 ← phi( print_sbyte::@2/(byte*) print_char_cursor#18 print_word/(byte*) print_char_cursor#135 print_word::@1/(byte*) print_char_cursor#18 test_8u::@2/(byte*) print_char_cursor#138 test_8u::@4/(byte*) print_char_cursor#128 test_8u::@6/(byte*) print_char_cursor#128 test_8u::@8/(byte*) print_char_cursor#128 )
+  [64] (byte) print_byte::b#7 ← phi( print_sbyte::@2/(byte~) print_byte::b#9 print_word/(byte) print_byte::b#1 print_word::@1/(byte) print_byte::b#2 test_8u::@2/(byte) print_byte::b#3 test_8u::@4/(byte) print_byte::b#4 test_8u::@6/(byte) print_byte::b#5 test_8u::@8/(byte) print_byte::b#6 )
   [65] (byte~) print_byte::$0 ← (byte) print_byte::b#7 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [66] (byte) print_char::ch#3 ← *((const byte[]) print_hextab#0 + (byte~) print_byte::$0)
   [67] call print_char 
@@ -152,8 +152,8 @@ print_char: scope:[print_char]  from print_byte print_byte::@1 print_sbyte::@1 p
 print_char::@return: scope:[print_char]  from print_char
   [75] return 
   to:@return
-print_str: scope:[print_str]  from test_16s::@4 test_16s::@6 test_16s::@8 test_16u::@4 test_16u::@6 test_16u::@8 test_8s::@4 test_8s::@6 test_8s::@8 test_8u::@4 test_8u::@6 test_8u::@8
-  [76] (byte*) print_str::str#15 ← phi( test_16s::@4/(const string) str test_16s::@6/(const string) str1 test_16s::@8/(const string) str2 test_16u::@4/(const string) str test_16u::@6/(const string) str1 test_16u::@8/(const string) str2 test_8s::@4/(const string) str test_8s::@6/(const string) str1 test_8s::@8/(const string) str2 test_8u::@4/(const string) str test_8u::@6/(const string) str1 test_8u::@8/(const string) str2 )
+print_str: scope:[print_str]  from test_16s::@3 test_16s::@5 test_16s::@7 test_16u::@3 test_16u::@5 test_16u::@7 test_8s::@3 test_8s::@5 test_8s::@7 test_8u::@3 test_8u::@5 test_8u::@7
+  [76] (byte*) print_str::str#15 ← phi( test_16s::@3/(const string) str test_16s::@5/(const string) str1 test_16s::@7/(const string) str2 test_16u::@3/(const string) str test_16u::@5/(const string) str1 test_16u::@7/(const string) str2 test_8s::@3/(const string) str test_8s::@5/(const string) str1 test_8s::@7/(const string) str2 test_8u::@3/(const string) str test_8u::@5/(const string) str1 test_8u::@7/(const string) str2 )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [77] (byte*) print_char_cursor#128 ← phi( print_str/(byte*) print_char_cursor#18 print_str::@2/(byte*) print_char_cursor#1 )
@@ -173,51 +173,51 @@ div16s: scope:[div16s]  from test_16s::@1
   [84] (signed word) divr16s::divisor#0 ← (signed word) div16s::divisor#0
   [85] call divr16s 
   [86] (signed word) divr16s::return#3 ← (signed word) divr16s::return#2
-  to:div16s::@2
-div16s::@2: scope:[div16s]  from div16s
+  to:div16s::@1
+div16s::@1: scope:[div16s]  from div16s
   [87] (signed word) div16s::return#0 ← (signed word) divr16s::return#3
   to:div16s::@return
-div16s::@return: scope:[div16s]  from div16s::@2
+div16s::@return: scope:[div16s]  from div16s::@1
   [88] return 
   to:@return
 divr16s: scope:[divr16s]  from div16s
   [89] if((signed word) divr16s::dividend#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@1
-  to:divr16s::@17
-divr16s::@17: scope:[divr16s]  from divr16s
+  to:divr16s::@7
+divr16s::@7: scope:[divr16s]  from divr16s
   [90] (word~) divr16s::dividendu#8 ← (word)(signed word) divr16s::dividend#0
   to:divr16s::@2
-divr16s::@2: scope:[divr16s]  from divr16s::@1 divr16s::@17
-  [91] (word) divr16s::remu#3 ← phi( divr16s::@1/((word))-(const signed word) divr16s::rem#0 divr16s::@17/((word))(const signed word) divr16s::rem#0 )
-  [91] (word) divr16s::dividendu#3 ← phi( divr16s::@1/(word~) divr16s::dividendu#7 divr16s::@17/(word~) divr16s::dividendu#8 )
-  [91] (byte) divr16s::neg#3 ← phi( divr16s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 divr16s::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+divr16s::@2: scope:[divr16s]  from divr16s::@1 divr16s::@7
+  [91] (word) divr16s::remu#3 ← phi( divr16s::@1/((word))-(const signed word) divr16s::rem#0 divr16s::@7/((word))(const signed word) divr16s::rem#0 )
+  [91] (word) divr16s::dividendu#3 ← phi( divr16s::@1/(word~) divr16s::dividendu#7 divr16s::@7/(word~) divr16s::dividendu#8 )
+  [91] (byte) divr16s::neg#3 ← phi( divr16s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 divr16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [92] if((signed word) divr16s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@3
-  to:divr16s::@18
-divr16s::@18: scope:[divr16s]  from divr16s::@2
+  to:divr16s::@8
+divr16s::@8: scope:[divr16s]  from divr16s::@2
   [93] (word~) divr16s::divisoru#5 ← (word)(signed word) divr16s::divisor#0
   to:divr16s::@4
-divr16s::@4: scope:[divr16s]  from divr16s::@18 divr16s::@3
-  [94] (byte) divr16s::neg#4 ← phi( divr16s::@3/(byte) divr16s::neg#2 divr16s::@18/(byte) divr16s::neg#3 )
-  [94] (word) divr16s::divisoru#3 ← phi( divr16s::@3/(word~) divr16s::divisoru#4 divr16s::@18/(word~) divr16s::divisoru#5 )
+divr16s::@4: scope:[divr16s]  from divr16s::@3 divr16s::@8
+  [94] (byte) divr16s::neg#4 ← phi( divr16s::@3/(byte) divr16s::neg#2 divr16s::@8/(byte) divr16s::neg#3 )
+  [94] (word) divr16s::divisoru#3 ← phi( divr16s::@3/(word~) divr16s::divisoru#4 divr16s::@8/(word~) divr16s::divisoru#5 )
   [95] (word) divr16u::dividend#2 ← (word) divr16s::dividendu#3
   [96] (word) divr16u::divisor#1 ← (word) divr16s::divisoru#3
   [97] (word) divr16u::rem#4 ← (word) divr16s::remu#3
   [98] call divr16u 
   [99] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:divr16s::@15
-divr16s::@15: scope:[divr16s]  from divr16s::@4
+  to:divr16s::@6
+divr16s::@6: scope:[divr16s]  from divr16s::@4
   [100] (word) divr16s::resultu#0 ← (word) divr16u::return#3
-  [101] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@19
-  to:divr16s::@11
-divr16s::@11: scope:[divr16s]  from divr16s::@15
+  [101] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@9
+  to:divr16s::@5
+divr16s::@5: scope:[divr16s]  from divr16s::@6
   [102] (signed word) rem16s#2 ← - (signed word)(word) rem16u#1
   [103] (signed word) divr16s::return#1 ← - (signed word)(word) divr16s::resultu#0
   to:divr16s::@return
-divr16s::@return: scope:[divr16s]  from divr16s::@11 divr16s::@19
-  [104] (signed word) rem16s#11 ← phi( divr16s::@11/(signed word) rem16s#2 divr16s::@19/(signed word~) rem16s#37 )
-  [104] (signed word) divr16s::return#2 ← phi( divr16s::@11/(signed word) divr16s::return#1 divr16s::@19/(signed word~) divr16s::return#7 )
+divr16s::@return: scope:[divr16s]  from divr16s::@5 divr16s::@9
+  [104] (signed word) rem16s#11 ← phi( divr16s::@5/(signed word) rem16s#2 divr16s::@9/(signed word~) rem16s#37 )
+  [104] (signed word) divr16s::return#2 ← phi( divr16s::@5/(signed word) divr16s::return#1 divr16s::@9/(signed word~) divr16s::return#7 )
   [105] return 
   to:@return
-divr16s::@19: scope:[divr16s]  from divr16s::@15
+divr16s::@9: scope:[divr16s]  from divr16s::@6
   [106] (signed word~) divr16s::return#7 ← (signed word)(word) divr16s::resultu#0
   [107] (signed word~) rem16s#37 ← (signed word)(word) rem16u#1
   to:divr16s::@return
@@ -273,67 +273,67 @@ divr16u::@return: scope:[divr16u]  from divr16u::@6
 test_8s: scope:[test_8s]  from main::@3
   [131] phi()
   to:test_8s::@1
-test_8s::@1: scope:[test_8s]  from test_8s test_8s::@11
-  [132] (byte) test_8s::i#10 ← phi( test_8s/(byte/signed byte/word/signed word/dword/signed dword) 0 test_8s::@11/(byte) test_8s::i#1 )
+test_8s::@1: scope:[test_8s]  from test_8s test_8s::@10
+  [132] (byte) test_8s::i#10 ← phi( test_8s/(byte/signed byte/word/signed word/dword/signed dword) 0 test_8s::@10/(byte) test_8s::i#1 )
   [133] (signed byte) test_8s::dividend#0 ← *((const signed byte[]) test_8s::dividends#0 + (byte) test_8s::i#10)
   [134] (signed byte) test_8s::divisor#0 ← *((const signed byte[]) test_8s::divisors#0 + (byte) test_8s::i#10)
   [135] (signed byte) div8s::dividend#0 ← (signed byte) test_8s::dividend#0
   [136] (signed byte) div8s::divisor#0 ← (signed byte) test_8s::divisor#0
   [137] call div8s 
   [138] (signed byte) div8s::return#3 ← (signed byte) div8s::return#2
-  to:test_8s::@3
-test_8s::@3: scope:[test_8s]  from test_8s::@1
+  to:test_8s::@2
+test_8s::@2: scope:[test_8s]  from test_8s::@1
   [139] (signed byte) test_8s::res#0 ← (signed byte) div8s::return#3
   [140] (signed byte) print_sbyte::b#1 ← (signed byte) test_8s::dividend#0
   [141] (byte*~) print_char_cursor#184 ← (byte*) print_line_cursor#1
   [142] call print_sbyte 
-  to:test_8s::@4
-test_8s::@4: scope:[test_8s]  from test_8s::@3
+  to:test_8s::@3
+test_8s::@3: scope:[test_8s]  from test_8s::@2
   [143] phi()
   [144] call print_str 
-  to:test_8s::@5
-test_8s::@5: scope:[test_8s]  from test_8s::@4
+  to:test_8s::@4
+test_8s::@4: scope:[test_8s]  from test_8s::@3
   [145] (signed byte) print_sbyte::b#2 ← (signed byte) test_8s::divisor#0
   [146] call print_sbyte 
-  to:test_8s::@6
-test_8s::@6: scope:[test_8s]  from test_8s::@5
+  to:test_8s::@5
+test_8s::@5: scope:[test_8s]  from test_8s::@4
   [147] phi()
   [148] call print_str 
-  to:test_8s::@7
-test_8s::@7: scope:[test_8s]  from test_8s::@6
+  to:test_8s::@6
+test_8s::@6: scope:[test_8s]  from test_8s::@5
   [149] (signed byte) print_sbyte::b#3 ← (signed byte) test_8s::res#0
   [150] call print_sbyte 
-  to:test_8s::@8
-test_8s::@8: scope:[test_8s]  from test_8s::@7
+  to:test_8s::@7
+test_8s::@7: scope:[test_8s]  from test_8s::@6
   [151] phi()
   [152] call print_str 
-  to:test_8s::@9
-test_8s::@9: scope:[test_8s]  from test_8s::@8
+  to:test_8s::@8
+test_8s::@8: scope:[test_8s]  from test_8s::@7
   [153] (signed byte) print_sbyte::b#4 ← (signed byte) rem8s#3
   [154] call print_sbyte 
-  to:test_8s::@10
-test_8s::@10: scope:[test_8s]  from test_8s::@9
+  to:test_8s::@9
+test_8s::@9: scope:[test_8s]  from test_8s::@8
   [155] phi()
   [156] call print_ln 
-  to:test_8s::@11
-test_8s::@11: scope:[test_8s]  from test_8s::@10
+  to:test_8s::@10
+test_8s::@10: scope:[test_8s]  from test_8s::@9
   [157] (byte) test_8s::i#1 ← ++ (byte) test_8s::i#10
   [158] if((byte) test_8s::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8s::@1
   to:test_8s::@return
-test_8s::@return: scope:[test_8s]  from test_8s::@11
+test_8s::@return: scope:[test_8s]  from test_8s::@10
   [159] return 
   to:@return
-print_sbyte: scope:[print_sbyte]  from test_8s::@3 test_8s::@5 test_8s::@7 test_8s::@9
-  [160] (byte*) print_char_cursor#132 ← phi( test_8s::@3/(byte*~) print_char_cursor#184 test_8s::@5/(byte*) print_char_cursor#128 test_8s::@7/(byte*) print_char_cursor#128 test_8s::@9/(byte*) print_char_cursor#128 )
-  [160] (signed byte) print_sbyte::b#10 ← phi( test_8s::@3/(signed byte) print_sbyte::b#1 test_8s::@5/(signed byte) print_sbyte::b#2 test_8s::@7/(signed byte) print_sbyte::b#3 test_8s::@9/(signed byte) print_sbyte::b#4 )
+print_sbyte: scope:[print_sbyte]  from test_8s::@2 test_8s::@4 test_8s::@6 test_8s::@8
+  [160] (byte*) print_char_cursor#132 ← phi( test_8s::@2/(byte*~) print_char_cursor#184 test_8s::@4/(byte*) print_char_cursor#128 test_8s::@6/(byte*) print_char_cursor#128 test_8s::@8/(byte*) print_char_cursor#128 )
+  [160] (signed byte) print_sbyte::b#10 ← phi( test_8s::@2/(signed byte) print_sbyte::b#1 test_8s::@4/(signed byte) print_sbyte::b#2 test_8s::@6/(signed byte) print_sbyte::b#3 test_8s::@8/(signed byte) print_sbyte::b#4 )
   [161] if((signed byte) print_sbyte::b#10<(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sbyte::@1
   to:print_sbyte::@3
 print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [162] phi()
   [163] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [164] (signed byte) print_sbyte::b#7 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#10 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [164] (signed byte) print_sbyte::b#7 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#10 )
   [165] (byte~) print_byte::b#9 ← (byte)(signed byte) print_sbyte::b#7
   [166] call print_byte 
   to:print_sbyte::@return
@@ -343,46 +343,46 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [168] phi()
   [169] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [170] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#10
   to:print_sbyte::@2
 div8s: scope:[div8s]  from test_8s::@1
   [171] if((signed byte) div8s::dividend#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@1
-  to:div8s::@16
-div8s::@16: scope:[div8s]  from div8s
+  to:div8s::@7
+div8s::@7: scope:[div8s]  from div8s
   [172] (byte~) div8s::dividendu#8 ← (byte)(signed byte) div8s::dividend#0
   to:div8s::@2
-div8s::@2: scope:[div8s]  from div8s::@1 div8s::@16
-  [173] (byte) div8s::dividendu#3 ← phi( div8s::@1/(byte~) div8s::dividendu#7 div8s::@16/(byte~) div8s::dividendu#8 )
-  [173] (byte) div8s::neg#3 ← phi( div8s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 div8s::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+div8s::@2: scope:[div8s]  from div8s::@1 div8s::@7
+  [173] (byte) div8s::dividendu#3 ← phi( div8s::@1/(byte~) div8s::dividendu#7 div8s::@7/(byte~) div8s::dividendu#8 )
+  [173] (byte) div8s::neg#3 ← phi( div8s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 div8s::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [174] if((signed byte) div8s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@3
-  to:div8s::@17
-div8s::@17: scope:[div8s]  from div8s::@2
+  to:div8s::@8
+div8s::@8: scope:[div8s]  from div8s::@2
   [175] (byte~) div8s::divisoru#5 ← (byte)(signed byte) div8s::divisor#0
   to:div8s::@4
-div8s::@4: scope:[div8s]  from div8s::@17 div8s::@3
-  [176] (byte) div8s::neg#4 ← phi( div8s::@3/(byte) div8s::neg#2 div8s::@17/(byte) div8s::neg#3 )
-  [176] (byte) div8s::divisoru#3 ← phi( div8s::@3/(byte~) div8s::divisoru#4 div8s::@17/(byte~) div8s::divisoru#5 )
+div8s::@4: scope:[div8s]  from div8s::@3 div8s::@8
+  [176] (byte) div8s::neg#4 ← phi( div8s::@3/(byte) div8s::neg#2 div8s::@8/(byte) div8s::neg#3 )
+  [176] (byte) div8s::divisoru#3 ← phi( div8s::@3/(byte~) div8s::divisoru#4 div8s::@8/(byte~) div8s::divisoru#5 )
   [177] (byte) div8u::dividend#0 ← (byte) div8s::dividendu#3
   [178] (byte) div8u::divisor#0 ← (byte) div8s::divisoru#3
   [179] call div8u 
   [180] (byte) div8u::return#2 ← (byte) div8u::return#0
-  to:div8s::@15
-div8s::@15: scope:[div8s]  from div8s::@4
+  to:div8s::@6
+div8s::@6: scope:[div8s]  from div8s::@4
   [181] (byte) div8s::resultu#0 ← (byte) div8u::return#2
-  [182] if((byte) div8s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@18
-  to:div8s::@11
-div8s::@11: scope:[div8s]  from div8s::@15
+  [182] if((byte) div8s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@9
+  to:div8s::@5
+div8s::@5: scope:[div8s]  from div8s::@6
   [183] (signed byte) rem8s#2 ← - (signed byte)(byte) rem8u#17
   [184] (signed byte) div8s::return#1 ← - (signed byte)(byte) div8s::resultu#0
   to:div8s::@return
-div8s::@return: scope:[div8s]  from div8s::@11 div8s::@18
-  [185] (signed byte) rem8s#3 ← phi( div8s::@11/(signed byte) rem8s#2 div8s::@18/(signed byte~) rem8s#33 )
-  [185] (signed byte) div8s::return#2 ← phi( div8s::@11/(signed byte) div8s::return#1 div8s::@18/(signed byte~) div8s::return#7 )
+div8s::@return: scope:[div8s]  from div8s::@5 div8s::@9
+  [185] (signed byte) rem8s#3 ← phi( div8s::@5/(signed byte) rem8s#2 div8s::@9/(signed byte~) rem8s#33 )
+  [185] (signed byte) div8s::return#2 ← phi( div8s::@5/(signed byte) div8s::return#1 div8s::@9/(signed byte~) div8s::return#7 )
   [186] return 
   to:@return
-div8s::@18: scope:[div8s]  from div8s::@15
+div8s::@9: scope:[div8s]  from div8s::@6
   [187] (signed byte~) div8s::return#7 ← (signed byte)(byte) div8s::resultu#0
   [188] (signed byte~) rem8s#33 ← (signed byte)(byte) rem8u#17
   to:div8s::@return
@@ -402,11 +402,11 @@ div8u: scope:[div8u]  from div8s::@4 test_8u::@1
   [196] (byte) divr8u::divisor#0 ← (byte) div8u::divisor#2
   [197] call divr8u 
   [198] (byte) divr8u::return#0 ← (byte) divr8u::return#1
-  to:div8u::@2
-div8u::@2: scope:[div8u]  from div8u
+  to:div8u::@1
+div8u::@1: scope:[div8u]  from div8u
   [199] (byte) div8u::return#0 ← (byte) divr8u::return#0
   to:div8u::@return
-div8u::@return: scope:[div8u]  from div8u::@2
+div8u::@return: scope:[div8u]  from div8u::@1
   [200] return 
   to:@return
 divr8u: scope:[divr8u]  from div8u
@@ -449,54 +449,54 @@ divr8u::@return: scope:[divr8u]  from divr8u::@6
 test_16u: scope:[test_16u]  from main::@2
   [218] phi()
   to:test_16u::@1
-test_16u::@1: scope:[test_16u]  from test_16u test_16u::@11
-  [219] (byte) test_16u::i#10 ← phi( test_16u/(byte/signed byte/word/signed word/dword/signed dword) 0 test_16u::@11/(byte) test_16u::i#1 )
+test_16u::@1: scope:[test_16u]  from test_16u test_16u::@10
+  [219] (byte) test_16u::i#10 ← phi( test_16u/(byte/signed byte/word/signed word/dword/signed dword) 0 test_16u::@10/(byte) test_16u::i#1 )
   [220] (word) test_16u::dividend#0 ← *((const word[]) test_16u::dividends#0 + (byte) test_16u::i#10)
   [221] (word) test_16u::divisor#0 ← *((const word[]) test_16u::divisors#0 + (byte) test_16u::i#10)
   [222] (word) div16u::dividend#0 ← (word) test_16u::dividend#0
   [223] (word) div16u::divisor#0 ← (word) test_16u::divisor#0
   [224] call div16u 
   [225] (word) div16u::return#2 ← (word) div16u::return#0
-  to:test_16u::@3
-test_16u::@3: scope:[test_16u]  from test_16u::@1
+  to:test_16u::@2
+test_16u::@2: scope:[test_16u]  from test_16u::@1
   [226] (word) test_16u::res#0 ← (word) div16u::return#2
   [227] (word) print_word::w#1 ← (word) test_16u::dividend#0
   [228] (byte*~) print_char_cursor#166 ← (byte*) print_line_cursor#1
   [229] call print_word 
-  to:test_16u::@4
-test_16u::@4: scope:[test_16u]  from test_16u::@3
+  to:test_16u::@3
+test_16u::@3: scope:[test_16u]  from test_16u::@2
   [230] phi()
   [231] call print_str 
-  to:test_16u::@5
-test_16u::@5: scope:[test_16u]  from test_16u::@4
+  to:test_16u::@4
+test_16u::@4: scope:[test_16u]  from test_16u::@3
   [232] (word) print_word::w#2 ← (word) test_16u::divisor#0
   [233] call print_word 
-  to:test_16u::@6
-test_16u::@6: scope:[test_16u]  from test_16u::@5
+  to:test_16u::@5
+test_16u::@5: scope:[test_16u]  from test_16u::@4
   [234] phi()
   [235] call print_str 
-  to:test_16u::@7
-test_16u::@7: scope:[test_16u]  from test_16u::@6
+  to:test_16u::@6
+test_16u::@6: scope:[test_16u]  from test_16u::@5
   [236] (word) print_word::w#3 ← (word) test_16u::res#0
   [237] call print_word 
-  to:test_16u::@8
-test_16u::@8: scope:[test_16u]  from test_16u::@7
+  to:test_16u::@7
+test_16u::@7: scope:[test_16u]  from test_16u::@6
   [238] phi()
   [239] call print_str 
-  to:test_16u::@9
-test_16u::@9: scope:[test_16u]  from test_16u::@8
+  to:test_16u::@8
+test_16u::@8: scope:[test_16u]  from test_16u::@7
   [240] (word) print_word::w#4 ← (word) rem16u#1
   [241] call print_word 
-  to:test_16u::@10
-test_16u::@10: scope:[test_16u]  from test_16u::@9
+  to:test_16u::@9
+test_16u::@9: scope:[test_16u]  from test_16u::@8
   [242] phi()
   [243] call print_ln 
-  to:test_16u::@11
-test_16u::@11: scope:[test_16u]  from test_16u::@10
+  to:test_16u::@10
+test_16u::@10: scope:[test_16u]  from test_16u::@9
   [244] (byte) test_16u::i#1 ← (byte) test_16u::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [245] if((byte) test_16u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $c) goto test_16u::@1
   to:test_16u::@return
-test_16u::@return: scope:[test_16u]  from test_16u::@11
+test_16u::@return: scope:[test_16u]  from test_16u::@10
   [246] return 
   to:@return
 div16u: scope:[div16u]  from test_16u::@1
@@ -504,68 +504,68 @@ div16u: scope:[div16u]  from test_16u::@1
   [248] (word) divr16u::divisor#0 ← (word) div16u::divisor#0
   [249] call divr16u 
   [250] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div16u::@2
-div16u::@2: scope:[div16u]  from div16u
+  to:div16u::@1
+div16u::@1: scope:[div16u]  from div16u
   [251] (word) div16u::return#0 ← (word) divr16u::return#2
   to:div16u::@return
-div16u::@return: scope:[div16u]  from div16u::@2
+div16u::@return: scope:[div16u]  from div16u::@1
   [252] return 
   to:@return
 test_8u: scope:[test_8u]  from main::@1
   [253] phi()
   to:test_8u::@1
-test_8u::@1: scope:[test_8u]  from test_8u test_8u::@12
-  [254] (byte*) print_line_cursor#41 ← phi( test_8u/((byte*))(word/signed word/dword/signed dword) $400 test_8u::@12/(byte*) print_line_cursor#1 )
-  [254] (byte*) print_char_cursor#138 ← phi( test_8u/((byte*))(word/signed word/dword/signed dword) $400 test_8u::@12/(byte*~) print_char_cursor#188 )
-  [254] (byte) test_8u::i#10 ← phi( test_8u/(byte/signed byte/word/signed word/dword/signed dword) 0 test_8u::@12/(byte) test_8u::i#1 )
+test_8u::@1: scope:[test_8u]  from test_8u test_8u::@11
+  [254] (byte*) print_line_cursor#41 ← phi( test_8u/((byte*))(word/signed word/dword/signed dword) $400 test_8u::@11/(byte*) print_line_cursor#1 )
+  [254] (byte*) print_char_cursor#138 ← phi( test_8u/((byte*))(word/signed word/dword/signed dword) $400 test_8u::@11/(byte*~) print_char_cursor#188 )
+  [254] (byte) test_8u::i#10 ← phi( test_8u/(byte/signed byte/word/signed word/dword/signed dword) 0 test_8u::@11/(byte) test_8u::i#1 )
   [255] (byte) test_8u::dividend#0 ← *((const byte[]) test_8u::dividends#0 + (byte) test_8u::i#10)
   [256] (byte) test_8u::divisor#0 ← *((const byte[]) test_8u::divisors#0 + (byte) test_8u::i#10)
   [257] (byte) div8u::dividend#1 ← (byte) test_8u::dividend#0
   [258] (byte) div8u::divisor#1 ← (byte) test_8u::divisor#0
   [259] call div8u 
   [260] (byte) div8u::return#3 ← (byte) div8u::return#0
-  to:test_8u::@3
-test_8u::@3: scope:[test_8u]  from test_8u::@1
+  to:test_8u::@2
+test_8u::@2: scope:[test_8u]  from test_8u::@1
   [261] (byte) test_8u::res#0 ← (byte) div8u::return#3
   [262] (byte) print_byte::b#3 ← (byte) test_8u::dividend#0
   [263] call print_byte 
-  to:test_8u::@4
-test_8u::@4: scope:[test_8u]  from test_8u::@3
+  to:test_8u::@3
+test_8u::@3: scope:[test_8u]  from test_8u::@2
   [264] phi()
   [265] call print_str 
-  to:test_8u::@5
-test_8u::@5: scope:[test_8u]  from test_8u::@4
+  to:test_8u::@4
+test_8u::@4: scope:[test_8u]  from test_8u::@3
   [266] (byte) print_byte::b#4 ← (byte) test_8u::divisor#0
   [267] call print_byte 
-  to:test_8u::@6
-test_8u::@6: scope:[test_8u]  from test_8u::@5
+  to:test_8u::@5
+test_8u::@5: scope:[test_8u]  from test_8u::@4
   [268] phi()
   [269] call print_str 
-  to:test_8u::@7
-test_8u::@7: scope:[test_8u]  from test_8u::@6
+  to:test_8u::@6
+test_8u::@6: scope:[test_8u]  from test_8u::@5
   [270] (byte) print_byte::b#5 ← (byte) test_8u::res#0
   [271] call print_byte 
-  to:test_8u::@8
-test_8u::@8: scope:[test_8u]  from test_8u::@7
+  to:test_8u::@7
+test_8u::@7: scope:[test_8u]  from test_8u::@6
   [272] phi()
   [273] call print_str 
-  to:test_8u::@9
-test_8u::@9: scope:[test_8u]  from test_8u::@8
+  to:test_8u::@8
+test_8u::@8: scope:[test_8u]  from test_8u::@7
   [274] (byte) print_byte::b#6 ← (byte) rem8u#17
   [275] call print_byte 
-  to:test_8u::@10
-test_8u::@10: scope:[test_8u]  from test_8u::@9
+  to:test_8u::@9
+test_8u::@9: scope:[test_8u]  from test_8u::@8
   [276] phi()
   [277] call print_ln 
-  to:test_8u::@11
-test_8u::@11: scope:[test_8u]  from test_8u::@10
+  to:test_8u::@10
+test_8u::@10: scope:[test_8u]  from test_8u::@9
   [278] (byte) test_8u::i#1 ← ++ (byte) test_8u::i#10
-  [279] if((byte) test_8u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8u::@12
+  [279] if((byte) test_8u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8u::@11
   to:test_8u::@return
-test_8u::@return: scope:[test_8u]  from test_8u::@11
+test_8u::@return: scope:[test_8u]  from test_8u::@10
   [280] return 
   to:@return
-test_8u::@12: scope:[test_8u]  from test_8u::@11
+test_8u::@11: scope:[test_8u]  from test_8u::@10
   [281] (byte*~) print_char_cursor#188 ← (byte*) print_line_cursor#1
   to:test_8u::@1
 print_cls: scope:[print_cls]  from main
diff --git a/src/test/ref/test-division.log b/src/test/ref/test-division.log
index e80e90f26..ee17c9349 100644
--- a/src/test/ref/test-division.log
+++ b/src/test/ref/test-division.log
@@ -3341,8 +3341,61 @@ Culled Empty Block (label) divr8u::@10
 Culled Empty Block (label) divr8u::@9
 Culled Empty Block (label) test_16u::@12
 Culled Empty Block (label) print_cls::@3
+Renumbering block @32 to @1
+Renumbering block print_sword::@4 to print_sword::@3
+Renumbering block print_sbyte::@5 to print_sbyte::@4
+Renumbering block div8u::@2 to div8u::@1
+Renumbering block div16u::@2 to div16u::@1
+Renumbering block div8s::@11 to div8s::@5
+Renumbering block div8s::@15 to div8s::@6
+Renumbering block div8s::@16 to div8s::@7
+Renumbering block div8s::@17 to div8s::@8
+Renumbering block div8s::@18 to div8s::@9
+Renumbering block divr16s::@11 to divr16s::@5
+Renumbering block divr16s::@15 to divr16s::@6
+Renumbering block divr16s::@17 to divr16s::@7
+Renumbering block divr16s::@18 to divr16s::@8
+Renumbering block divr16s::@19 to divr16s::@9
+Renumbering block div16s::@2 to div16s::@1
+Renumbering block test_8u::@3 to test_8u::@2
+Renumbering block test_8u::@4 to test_8u::@3
+Renumbering block test_8u::@5 to test_8u::@4
+Renumbering block test_8u::@6 to test_8u::@5
+Renumbering block test_8u::@7 to test_8u::@6
+Renumbering block test_8u::@8 to test_8u::@7
+Renumbering block test_8u::@9 to test_8u::@8
+Renumbering block test_8u::@10 to test_8u::@9
+Renumbering block test_8u::@11 to test_8u::@10
+Renumbering block test_8u::@12 to test_8u::@11
+Renumbering block test_16u::@3 to test_16u::@2
+Renumbering block test_16u::@4 to test_16u::@3
+Renumbering block test_16u::@5 to test_16u::@4
+Renumbering block test_16u::@6 to test_16u::@5
+Renumbering block test_16u::@7 to test_16u::@6
+Renumbering block test_16u::@8 to test_16u::@7
+Renumbering block test_16u::@9 to test_16u::@8
+Renumbering block test_16u::@10 to test_16u::@9
+Renumbering block test_16u::@11 to test_16u::@10
+Renumbering block test_8s::@3 to test_8s::@2
+Renumbering block test_8s::@4 to test_8s::@3
+Renumbering block test_8s::@5 to test_8s::@4
+Renumbering block test_8s::@6 to test_8s::@5
+Renumbering block test_8s::@7 to test_8s::@6
+Renumbering block test_8s::@8 to test_8s::@7
+Renumbering block test_8s::@9 to test_8s::@8
+Renumbering block test_8s::@10 to test_8s::@9
+Renumbering block test_8s::@11 to test_8s::@10
+Renumbering block test_16s::@3 to test_16s::@2
+Renumbering block test_16s::@4 to test_16s::@3
+Renumbering block test_16s::@5 to test_16s::@4
+Renumbering block test_16s::@6 to test_16s::@5
+Renumbering block test_16s::@7 to test_16s::@6
+Renumbering block test_16s::@8 to test_16s::@7
+Renumbering block test_16s::@9 to test_16s::@8
+Renumbering block test_16s::@10 to test_16s::@9
+Renumbering block test_16s::@11 to test_16s::@10
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @32
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -3350,42 +3403,42 @@ Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of main::@3
 Adding NOP phi() at start of main::@4
 Adding NOP phi() at start of test_16s
-Adding NOP phi() at start of test_16s::@4
-Adding NOP phi() at start of test_16s::@6
-Adding NOP phi() at start of test_16s::@8
-Adding NOP phi() at start of test_16s::@10
+Adding NOP phi() at start of test_16s::@3
+Adding NOP phi() at start of test_16s::@5
+Adding NOP phi() at start of test_16s::@7
+Adding NOP phi() at start of test_16s::@9
 Adding NOP phi() at start of print_sword::@2
 Adding NOP phi() at start of test_8s
-Adding NOP phi() at start of test_8s::@4
-Adding NOP phi() at start of test_8s::@6
-Adding NOP phi() at start of test_8s::@8
-Adding NOP phi() at start of test_8s::@10
+Adding NOP phi() at start of test_8s::@3
+Adding NOP phi() at start of test_8s::@5
+Adding NOP phi() at start of test_8s::@7
+Adding NOP phi() at start of test_8s::@9
 Adding NOP phi() at start of print_sbyte::@3
 Adding NOP phi() at start of print_sbyte::@1
 Adding NOP phi() at start of divr8u
 Adding NOP phi() at start of test_16u
-Adding NOP phi() at start of test_16u::@4
-Adding NOP phi() at start of test_16u::@6
-Adding NOP phi() at start of test_16u::@8
-Adding NOP phi() at start of test_16u::@10
+Adding NOP phi() at start of test_16u::@3
+Adding NOP phi() at start of test_16u::@5
+Adding NOP phi() at start of test_16u::@7
+Adding NOP phi() at start of test_16u::@9
 Adding NOP phi() at start of test_8u
-Adding NOP phi() at start of test_8u::@4
-Adding NOP phi() at start of test_8u::@6
-Adding NOP phi() at start of test_8u::@8
-Adding NOP phi() at start of test_8u::@10
+Adding NOP phi() at start of test_8u::@3
+Adding NOP phi() at start of test_8u::@5
+Adding NOP phi() at start of test_8u::@7
+Adding NOP phi() at start of test_8u::@9
 Adding NOP phi() at start of print_cls
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@32
-@32: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @32
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @32
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
@@ -3411,58 +3464,58 @@ main::@return: scope:[main]  from main::@4
 test_16s: scope:[test_16s]  from main::@4
   [15] phi()
   to:test_16s::@1
-test_16s::@1: scope:[test_16s]  from test_16s test_16s::@11
-  [16] (byte) test_16s::i#10 ← phi( test_16s/(byte/signed byte/word/signed word/dword/signed dword) 0 test_16s::@11/(byte) test_16s::i#1 )
+test_16s::@1: scope:[test_16s]  from test_16s test_16s::@10
+  [16] (byte) test_16s::i#10 ← phi( test_16s/(byte/signed byte/word/signed word/dword/signed dword) 0 test_16s::@10/(byte) test_16s::i#1 )
   [17] (signed word) test_16s::dividend#0 ← *((const signed word[]) test_16s::dividends#0 + (byte) test_16s::i#10)
   [18] (signed word) test_16s::divisor#0 ← *((const signed word[]) test_16s::divisors#0 + (byte) test_16s::i#10)
   [19] (signed word) div16s::dividend#0 ← (signed word) test_16s::dividend#0
   [20] (signed word) div16s::divisor#0 ← (signed word) test_16s::divisor#0
   [21] call div16s 
   [22] (signed word) div16s::return#2 ← (signed word) div16s::return#0
-  to:test_16s::@3
-test_16s::@3: scope:[test_16s]  from test_16s::@1
+  to:test_16s::@2
+test_16s::@2: scope:[test_16s]  from test_16s::@1
   [23] (signed word) test_16s::res#0 ← (signed word) div16s::return#2
   [24] (signed word) print_sword::w#1 ← (signed word) test_16s::dividend#0
   [25] (byte*~) print_char_cursor#159 ← (byte*) print_line_cursor#1
   [26] call print_sword 
-  to:test_16s::@4
-test_16s::@4: scope:[test_16s]  from test_16s::@3
+  to:test_16s::@3
+test_16s::@3: scope:[test_16s]  from test_16s::@2
   [27] phi()
   [28] call print_str 
-  to:test_16s::@5
-test_16s::@5: scope:[test_16s]  from test_16s::@4
+  to:test_16s::@4
+test_16s::@4: scope:[test_16s]  from test_16s::@3
   [29] (signed word) print_sword::w#2 ← (signed word) test_16s::divisor#0
   [30] call print_sword 
-  to:test_16s::@6
-test_16s::@6: scope:[test_16s]  from test_16s::@5
+  to:test_16s::@5
+test_16s::@5: scope:[test_16s]  from test_16s::@4
   [31] phi()
   [32] call print_str 
-  to:test_16s::@7
-test_16s::@7: scope:[test_16s]  from test_16s::@6
+  to:test_16s::@6
+test_16s::@6: scope:[test_16s]  from test_16s::@5
   [33] (signed word) print_sword::w#3 ← (signed word) test_16s::res#0
   [34] call print_sword 
-  to:test_16s::@8
-test_16s::@8: scope:[test_16s]  from test_16s::@7
+  to:test_16s::@7
+test_16s::@7: scope:[test_16s]  from test_16s::@6
   [35] phi()
   [36] call print_str 
-  to:test_16s::@9
-test_16s::@9: scope:[test_16s]  from test_16s::@8
+  to:test_16s::@8
+test_16s::@8: scope:[test_16s]  from test_16s::@7
   [37] (signed word) print_sword::w#4 ← (signed word) rem16s#11
   [38] call print_sword 
-  to:test_16s::@10
-test_16s::@10: scope:[test_16s]  from test_16s::@9
+  to:test_16s::@9
+test_16s::@9: scope:[test_16s]  from test_16s::@8
   [39] phi()
   [40] call print_ln 
-  to:test_16s::@11
-test_16s::@11: scope:[test_16s]  from test_16s::@10
+  to:test_16s::@10
+test_16s::@10: scope:[test_16s]  from test_16s::@9
   [41] (byte) test_16s::i#1 ← (byte) test_16s::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [42] if((byte) test_16s::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $c) goto test_16s::@1
   to:test_16s::@return
-test_16s::@return: scope:[test_16s]  from test_16s::@11
+test_16s::@return: scope:[test_16s]  from test_16s::@10
   [43] return 
   to:@return
-print_ln: scope:[print_ln]  from test_16s::@10 test_16u::@10 test_8s::@10 test_8u::@10
-  [44] (byte*) print_line_cursor#39 ← phi( test_16s::@10/(byte*) print_line_cursor#1 test_16u::@10/(byte*) print_line_cursor#1 test_8s::@10/(byte*) print_line_cursor#1 test_8u::@10/(byte*) print_line_cursor#41 )
+print_ln: scope:[print_ln]  from test_16s::@9 test_16u::@9 test_8s::@9 test_8u::@9
+  [44] (byte*) print_line_cursor#39 ← phi( test_16s::@9/(byte*) print_line_cursor#1 test_16u::@9/(byte*) print_line_cursor#1 test_8s::@9/(byte*) print_line_cursor#1 test_8u::@9/(byte*) print_line_cursor#41 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [45] (byte*) print_line_cursor#20 ← phi( print_ln/(byte*) print_line_cursor#39 print_ln::@1/(byte*) print_line_cursor#1 )
@@ -3472,30 +3525,30 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [48] return 
   to:@return
-print_sword: scope:[print_sword]  from test_16s::@3 test_16s::@5 test_16s::@7 test_16s::@9
-  [49] (byte*) print_char_cursor#131 ← phi( test_16s::@3/(byte*~) print_char_cursor#159 test_16s::@5/(byte*) print_char_cursor#128 test_16s::@7/(byte*) print_char_cursor#128 test_16s::@9/(byte*) print_char_cursor#128 )
-  [49] (signed word) print_sword::w#5 ← phi( test_16s::@3/(signed word) print_sword::w#1 test_16s::@5/(signed word) print_sword::w#2 test_16s::@7/(signed word) print_sword::w#3 test_16s::@9/(signed word) print_sword::w#4 )
+print_sword: scope:[print_sword]  from test_16s::@2 test_16s::@4 test_16s::@6 test_16s::@8
+  [49] (byte*) print_char_cursor#131 ← phi( test_16s::@2/(byte*~) print_char_cursor#159 test_16s::@4/(byte*) print_char_cursor#128 test_16s::@6/(byte*) print_char_cursor#128 test_16s::@8/(byte*) print_char_cursor#128 )
+  [49] (signed word) print_sword::w#5 ← phi( test_16s::@2/(signed word) print_sword::w#1 test_16s::@4/(signed word) print_sword::w#2 test_16s::@6/(signed word) print_sword::w#3 test_16s::@8/(signed word) print_sword::w#4 )
   [50] if((signed word) print_sword::w#5>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sword::@1
   to:print_sword::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [51] phi()
   [52] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [53] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#5
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [54] (byte*) print_char_cursor#130 ← phi( print_sword/(byte*) print_char_cursor#131 print_sword::@4/(byte*) print_char_cursor#18 )
-  [54] (signed word) print_sword::w#6 ← phi( print_sword/(signed word) print_sword::w#5 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [54] (byte*) print_char_cursor#130 ← phi( print_sword/(byte*) print_char_cursor#131 print_sword::@3/(byte*) print_char_cursor#18 )
+  [54] (signed word) print_sword::w#6 ← phi( print_sword/(signed word) print_sword::w#5 print_sword::@3/(signed word) print_sword::w#0 )
   [55] (word~) print_word::w#7 ← (word)(signed word) print_sword::w#6
   [56] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
   [57] return 
   to:@return
-print_word: scope:[print_word]  from print_sword::@1 test_16u::@3 test_16u::@5 test_16u::@7 test_16u::@9
-  [58] (byte*) print_char_cursor#135 ← phi( print_sword::@1/(byte*) print_char_cursor#130 test_16u::@3/(byte*~) print_char_cursor#166 test_16u::@5/(byte*) print_char_cursor#128 test_16u::@7/(byte*) print_char_cursor#128 test_16u::@9/(byte*) print_char_cursor#128 )
-  [58] (word) print_word::w#5 ← phi( print_sword::@1/(word~) print_word::w#7 test_16u::@3/(word) print_word::w#1 test_16u::@5/(word) print_word::w#2 test_16u::@7/(word) print_word::w#3 test_16u::@9/(word) print_word::w#4 )
+print_word: scope:[print_word]  from print_sword::@1 test_16u::@2 test_16u::@4 test_16u::@6 test_16u::@8
+  [58] (byte*) print_char_cursor#135 ← phi( print_sword::@1/(byte*) print_char_cursor#130 test_16u::@2/(byte*~) print_char_cursor#166 test_16u::@4/(byte*) print_char_cursor#128 test_16u::@6/(byte*) print_char_cursor#128 test_16u::@8/(byte*) print_char_cursor#128 )
+  [58] (word) print_word::w#5 ← phi( print_sword::@1/(word~) print_word::w#7 test_16u::@2/(word) print_word::w#1 test_16u::@4/(word) print_word::w#2 test_16u::@6/(word) print_word::w#3 test_16u::@8/(word) print_word::w#4 )
   [59] (byte) print_byte::b#1 ← > (word) print_word::w#5
   [60] call print_byte 
   to:print_word::@1
@@ -3506,9 +3559,9 @@ print_word::@1: scope:[print_word]  from print_word
 print_word::@return: scope:[print_word]  from print_word::@1
   [63] return 
   to:@return
-print_byte: scope:[print_byte]  from print_sbyte::@2 print_word print_word::@1 test_8u::@3 test_8u::@5 test_8u::@7 test_8u::@9
-  [64] (byte*) print_char_cursor#136 ← phi( print_sbyte::@2/(byte*) print_char_cursor#18 print_word/(byte*) print_char_cursor#135 print_word::@1/(byte*) print_char_cursor#18 test_8u::@3/(byte*) print_char_cursor#138 test_8u::@5/(byte*) print_char_cursor#128 test_8u::@7/(byte*) print_char_cursor#128 test_8u::@9/(byte*) print_char_cursor#128 )
-  [64] (byte) print_byte::b#7 ← phi( print_sbyte::@2/(byte~) print_byte::b#9 print_word/(byte) print_byte::b#1 print_word::@1/(byte) print_byte::b#2 test_8u::@3/(byte) print_byte::b#3 test_8u::@5/(byte) print_byte::b#4 test_8u::@7/(byte) print_byte::b#5 test_8u::@9/(byte) print_byte::b#6 )
+print_byte: scope:[print_byte]  from print_sbyte::@2 print_word print_word::@1 test_8u::@2 test_8u::@4 test_8u::@6 test_8u::@8
+  [64] (byte*) print_char_cursor#136 ← phi( print_sbyte::@2/(byte*) print_char_cursor#18 print_word/(byte*) print_char_cursor#135 print_word::@1/(byte*) print_char_cursor#18 test_8u::@2/(byte*) print_char_cursor#138 test_8u::@4/(byte*) print_char_cursor#128 test_8u::@6/(byte*) print_char_cursor#128 test_8u::@8/(byte*) print_char_cursor#128 )
+  [64] (byte) print_byte::b#7 ← phi( print_sbyte::@2/(byte~) print_byte::b#9 print_word/(byte) print_byte::b#1 print_word::@1/(byte) print_byte::b#2 test_8u::@2/(byte) print_byte::b#3 test_8u::@4/(byte) print_byte::b#4 test_8u::@6/(byte) print_byte::b#5 test_8u::@8/(byte) print_byte::b#6 )
   [65] (byte~) print_byte::$0 ← (byte) print_byte::b#7 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [66] (byte) print_char::ch#3 ← *((const byte[]) print_hextab#0 + (byte~) print_byte::$0)
   [67] call print_char 
@@ -3530,8 +3583,8 @@ print_char: scope:[print_char]  from print_byte print_byte::@1 print_sbyte::@1 p
 print_char::@return: scope:[print_char]  from print_char
   [75] return 
   to:@return
-print_str: scope:[print_str]  from test_16s::@4 test_16s::@6 test_16s::@8 test_16u::@4 test_16u::@6 test_16u::@8 test_8s::@4 test_8s::@6 test_8s::@8 test_8u::@4 test_8u::@6 test_8u::@8
-  [76] (byte*) print_str::str#15 ← phi( test_16s::@4/(const string) str test_16s::@6/(const string) str1 test_16s::@8/(const string) str2 test_16u::@4/(const string) str test_16u::@6/(const string) str1 test_16u::@8/(const string) str2 test_8s::@4/(const string) str test_8s::@6/(const string) str1 test_8s::@8/(const string) str2 test_8u::@4/(const string) str test_8u::@6/(const string) str1 test_8u::@8/(const string) str2 )
+print_str: scope:[print_str]  from test_16s::@3 test_16s::@5 test_16s::@7 test_16u::@3 test_16u::@5 test_16u::@7 test_8s::@3 test_8s::@5 test_8s::@7 test_8u::@3 test_8u::@5 test_8u::@7
+  [76] (byte*) print_str::str#15 ← phi( test_16s::@3/(const string) str test_16s::@5/(const string) str1 test_16s::@7/(const string) str2 test_16u::@3/(const string) str test_16u::@5/(const string) str1 test_16u::@7/(const string) str2 test_8s::@3/(const string) str test_8s::@5/(const string) str1 test_8s::@7/(const string) str2 test_8u::@3/(const string) str test_8u::@5/(const string) str1 test_8u::@7/(const string) str2 )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [77] (byte*) print_char_cursor#128 ← phi( print_str/(byte*) print_char_cursor#18 print_str::@2/(byte*) print_char_cursor#1 )
@@ -3551,51 +3604,51 @@ div16s: scope:[div16s]  from test_16s::@1
   [84] (signed word) divr16s::divisor#0 ← (signed word) div16s::divisor#0
   [85] call divr16s 
   [86] (signed word) divr16s::return#3 ← (signed word) divr16s::return#2
-  to:div16s::@2
-div16s::@2: scope:[div16s]  from div16s
+  to:div16s::@1
+div16s::@1: scope:[div16s]  from div16s
   [87] (signed word) div16s::return#0 ← (signed word) divr16s::return#3
   to:div16s::@return
-div16s::@return: scope:[div16s]  from div16s::@2
+div16s::@return: scope:[div16s]  from div16s::@1
   [88] return 
   to:@return
 divr16s: scope:[divr16s]  from div16s
   [89] if((signed word) divr16s::dividend#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@1
-  to:divr16s::@17
-divr16s::@17: scope:[divr16s]  from divr16s
+  to:divr16s::@7
+divr16s::@7: scope:[divr16s]  from divr16s
   [90] (word~) divr16s::dividendu#8 ← (word)(signed word) divr16s::dividend#0
   to:divr16s::@2
-divr16s::@2: scope:[divr16s]  from divr16s::@1 divr16s::@17
-  [91] (word) divr16s::remu#3 ← phi( divr16s::@1/((word))-(const signed word) divr16s::rem#0 divr16s::@17/((word))(const signed word) divr16s::rem#0 )
-  [91] (word) divr16s::dividendu#3 ← phi( divr16s::@1/(word~) divr16s::dividendu#7 divr16s::@17/(word~) divr16s::dividendu#8 )
-  [91] (byte) divr16s::neg#3 ← phi( divr16s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 divr16s::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+divr16s::@2: scope:[divr16s]  from divr16s::@1 divr16s::@7
+  [91] (word) divr16s::remu#3 ← phi( divr16s::@1/((word))-(const signed word) divr16s::rem#0 divr16s::@7/((word))(const signed word) divr16s::rem#0 )
+  [91] (word) divr16s::dividendu#3 ← phi( divr16s::@1/(word~) divr16s::dividendu#7 divr16s::@7/(word~) divr16s::dividendu#8 )
+  [91] (byte) divr16s::neg#3 ← phi( divr16s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 divr16s::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [92] if((signed word) divr16s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@3
-  to:divr16s::@18
-divr16s::@18: scope:[divr16s]  from divr16s::@2
+  to:divr16s::@8
+divr16s::@8: scope:[divr16s]  from divr16s::@2
   [93] (word~) divr16s::divisoru#5 ← (word)(signed word) divr16s::divisor#0
   to:divr16s::@4
-divr16s::@4: scope:[divr16s]  from divr16s::@18 divr16s::@3
-  [94] (byte) divr16s::neg#4 ← phi( divr16s::@3/(byte) divr16s::neg#2 divr16s::@18/(byte) divr16s::neg#3 )
-  [94] (word) divr16s::divisoru#3 ← phi( divr16s::@3/(word~) divr16s::divisoru#4 divr16s::@18/(word~) divr16s::divisoru#5 )
+divr16s::@4: scope:[divr16s]  from divr16s::@3 divr16s::@8
+  [94] (byte) divr16s::neg#4 ← phi( divr16s::@3/(byte) divr16s::neg#2 divr16s::@8/(byte) divr16s::neg#3 )
+  [94] (word) divr16s::divisoru#3 ← phi( divr16s::@3/(word~) divr16s::divisoru#4 divr16s::@8/(word~) divr16s::divisoru#5 )
   [95] (word) divr16u::dividend#2 ← (word) divr16s::dividendu#3
   [96] (word) divr16u::divisor#1 ← (word) divr16s::divisoru#3
   [97] (word) divr16u::rem#4 ← (word) divr16s::remu#3
   [98] call divr16u 
   [99] (word) divr16u::return#3 ← (word) divr16u::return#0
-  to:divr16s::@15
-divr16s::@15: scope:[divr16s]  from divr16s::@4
+  to:divr16s::@6
+divr16s::@6: scope:[divr16s]  from divr16s::@4
   [100] (word) divr16s::resultu#0 ← (word) divr16u::return#3
-  [101] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@19
-  to:divr16s::@11
-divr16s::@11: scope:[divr16s]  from divr16s::@15
+  [101] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@9
+  to:divr16s::@5
+divr16s::@5: scope:[divr16s]  from divr16s::@6
   [102] (signed word) rem16s#2 ← - (signed word)(word) rem16u#1
   [103] (signed word) divr16s::return#1 ← - (signed word)(word) divr16s::resultu#0
   to:divr16s::@return
-divr16s::@return: scope:[divr16s]  from divr16s::@11 divr16s::@19
-  [104] (signed word) rem16s#11 ← phi( divr16s::@11/(signed word) rem16s#2 divr16s::@19/(signed word~) rem16s#37 )
-  [104] (signed word) divr16s::return#2 ← phi( divr16s::@11/(signed word) divr16s::return#1 divr16s::@19/(signed word~) divr16s::return#7 )
+divr16s::@return: scope:[divr16s]  from divr16s::@5 divr16s::@9
+  [104] (signed word) rem16s#11 ← phi( divr16s::@5/(signed word) rem16s#2 divr16s::@9/(signed word~) rem16s#37 )
+  [104] (signed word) divr16s::return#2 ← phi( divr16s::@5/(signed word) divr16s::return#1 divr16s::@9/(signed word~) divr16s::return#7 )
   [105] return 
   to:@return
-divr16s::@19: scope:[divr16s]  from divr16s::@15
+divr16s::@9: scope:[divr16s]  from divr16s::@6
   [106] (signed word~) divr16s::return#7 ← (signed word)(word) divr16s::resultu#0
   [107] (signed word~) rem16s#37 ← (signed word)(word) rem16u#1
   to:divr16s::@return
@@ -3651,67 +3704,67 @@ divr16u::@return: scope:[divr16u]  from divr16u::@6
 test_8s: scope:[test_8s]  from main::@3
   [131] phi()
   to:test_8s::@1
-test_8s::@1: scope:[test_8s]  from test_8s test_8s::@11
-  [132] (byte) test_8s::i#10 ← phi( test_8s/(byte/signed byte/word/signed word/dword/signed dword) 0 test_8s::@11/(byte) test_8s::i#1 )
+test_8s::@1: scope:[test_8s]  from test_8s test_8s::@10
+  [132] (byte) test_8s::i#10 ← phi( test_8s/(byte/signed byte/word/signed word/dword/signed dword) 0 test_8s::@10/(byte) test_8s::i#1 )
   [133] (signed byte) test_8s::dividend#0 ← *((const signed byte[]) test_8s::dividends#0 + (byte) test_8s::i#10)
   [134] (signed byte) test_8s::divisor#0 ← *((const signed byte[]) test_8s::divisors#0 + (byte) test_8s::i#10)
   [135] (signed byte) div8s::dividend#0 ← (signed byte) test_8s::dividend#0
   [136] (signed byte) div8s::divisor#0 ← (signed byte) test_8s::divisor#0
   [137] call div8s 
   [138] (signed byte) div8s::return#3 ← (signed byte) div8s::return#2
-  to:test_8s::@3
-test_8s::@3: scope:[test_8s]  from test_8s::@1
+  to:test_8s::@2
+test_8s::@2: scope:[test_8s]  from test_8s::@1
   [139] (signed byte) test_8s::res#0 ← (signed byte) div8s::return#3
   [140] (signed byte) print_sbyte::b#1 ← (signed byte) test_8s::dividend#0
   [141] (byte*~) print_char_cursor#184 ← (byte*) print_line_cursor#1
   [142] call print_sbyte 
-  to:test_8s::@4
-test_8s::@4: scope:[test_8s]  from test_8s::@3
+  to:test_8s::@3
+test_8s::@3: scope:[test_8s]  from test_8s::@2
   [143] phi()
   [144] call print_str 
-  to:test_8s::@5
-test_8s::@5: scope:[test_8s]  from test_8s::@4
+  to:test_8s::@4
+test_8s::@4: scope:[test_8s]  from test_8s::@3
   [145] (signed byte) print_sbyte::b#2 ← (signed byte) test_8s::divisor#0
   [146] call print_sbyte 
-  to:test_8s::@6
-test_8s::@6: scope:[test_8s]  from test_8s::@5
+  to:test_8s::@5
+test_8s::@5: scope:[test_8s]  from test_8s::@4
   [147] phi()
   [148] call print_str 
-  to:test_8s::@7
-test_8s::@7: scope:[test_8s]  from test_8s::@6
+  to:test_8s::@6
+test_8s::@6: scope:[test_8s]  from test_8s::@5
   [149] (signed byte) print_sbyte::b#3 ← (signed byte) test_8s::res#0
   [150] call print_sbyte 
-  to:test_8s::@8
-test_8s::@8: scope:[test_8s]  from test_8s::@7
+  to:test_8s::@7
+test_8s::@7: scope:[test_8s]  from test_8s::@6
   [151] phi()
   [152] call print_str 
-  to:test_8s::@9
-test_8s::@9: scope:[test_8s]  from test_8s::@8
+  to:test_8s::@8
+test_8s::@8: scope:[test_8s]  from test_8s::@7
   [153] (signed byte) print_sbyte::b#4 ← (signed byte) rem8s#3
   [154] call print_sbyte 
-  to:test_8s::@10
-test_8s::@10: scope:[test_8s]  from test_8s::@9
+  to:test_8s::@9
+test_8s::@9: scope:[test_8s]  from test_8s::@8
   [155] phi()
   [156] call print_ln 
-  to:test_8s::@11
-test_8s::@11: scope:[test_8s]  from test_8s::@10
+  to:test_8s::@10
+test_8s::@10: scope:[test_8s]  from test_8s::@9
   [157] (byte) test_8s::i#1 ← ++ (byte) test_8s::i#10
   [158] if((byte) test_8s::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8s::@1
   to:test_8s::@return
-test_8s::@return: scope:[test_8s]  from test_8s::@11
+test_8s::@return: scope:[test_8s]  from test_8s::@10
   [159] return 
   to:@return
-print_sbyte: scope:[print_sbyte]  from test_8s::@3 test_8s::@5 test_8s::@7 test_8s::@9
-  [160] (byte*) print_char_cursor#132 ← phi( test_8s::@3/(byte*~) print_char_cursor#184 test_8s::@5/(byte*) print_char_cursor#128 test_8s::@7/(byte*) print_char_cursor#128 test_8s::@9/(byte*) print_char_cursor#128 )
-  [160] (signed byte) print_sbyte::b#10 ← phi( test_8s::@3/(signed byte) print_sbyte::b#1 test_8s::@5/(signed byte) print_sbyte::b#2 test_8s::@7/(signed byte) print_sbyte::b#3 test_8s::@9/(signed byte) print_sbyte::b#4 )
+print_sbyte: scope:[print_sbyte]  from test_8s::@2 test_8s::@4 test_8s::@6 test_8s::@8
+  [160] (byte*) print_char_cursor#132 ← phi( test_8s::@2/(byte*~) print_char_cursor#184 test_8s::@4/(byte*) print_char_cursor#128 test_8s::@6/(byte*) print_char_cursor#128 test_8s::@8/(byte*) print_char_cursor#128 )
+  [160] (signed byte) print_sbyte::b#10 ← phi( test_8s::@2/(signed byte) print_sbyte::b#1 test_8s::@4/(signed byte) print_sbyte::b#2 test_8s::@6/(signed byte) print_sbyte::b#3 test_8s::@8/(signed byte) print_sbyte::b#4 )
   [161] if((signed byte) print_sbyte::b#10<(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sbyte::@1
   to:print_sbyte::@3
 print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [162] phi()
   [163] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [164] (signed byte) print_sbyte::b#7 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#10 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [164] (signed byte) print_sbyte::b#7 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#10 )
   [165] (byte~) print_byte::b#9 ← (byte)(signed byte) print_sbyte::b#7
   [166] call print_byte 
   to:print_sbyte::@return
@@ -3721,46 +3774,46 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [168] phi()
   [169] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [170] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#10
   to:print_sbyte::@2
 div8s: scope:[div8s]  from test_8s::@1
   [171] if((signed byte) div8s::dividend#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@1
-  to:div8s::@16
-div8s::@16: scope:[div8s]  from div8s
+  to:div8s::@7
+div8s::@7: scope:[div8s]  from div8s
   [172] (byte~) div8s::dividendu#8 ← (byte)(signed byte) div8s::dividend#0
   to:div8s::@2
-div8s::@2: scope:[div8s]  from div8s::@1 div8s::@16
-  [173] (byte) div8s::dividendu#3 ← phi( div8s::@1/(byte~) div8s::dividendu#7 div8s::@16/(byte~) div8s::dividendu#8 )
-  [173] (byte) div8s::neg#3 ← phi( div8s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 div8s::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+div8s::@2: scope:[div8s]  from div8s::@1 div8s::@7
+  [173] (byte) div8s::dividendu#3 ← phi( div8s::@1/(byte~) div8s::dividendu#7 div8s::@7/(byte~) div8s::dividendu#8 )
+  [173] (byte) div8s::neg#3 ← phi( div8s::@1/(byte/signed byte/word/signed word/dword/signed dword) 1 div8s::@7/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [174] if((signed byte) div8s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@3
-  to:div8s::@17
-div8s::@17: scope:[div8s]  from div8s::@2
+  to:div8s::@8
+div8s::@8: scope:[div8s]  from div8s::@2
   [175] (byte~) div8s::divisoru#5 ← (byte)(signed byte) div8s::divisor#0
   to:div8s::@4
-div8s::@4: scope:[div8s]  from div8s::@17 div8s::@3
-  [176] (byte) div8s::neg#4 ← phi( div8s::@3/(byte) div8s::neg#2 div8s::@17/(byte) div8s::neg#3 )
-  [176] (byte) div8s::divisoru#3 ← phi( div8s::@3/(byte~) div8s::divisoru#4 div8s::@17/(byte~) div8s::divisoru#5 )
+div8s::@4: scope:[div8s]  from div8s::@3 div8s::@8
+  [176] (byte) div8s::neg#4 ← phi( div8s::@3/(byte) div8s::neg#2 div8s::@8/(byte) div8s::neg#3 )
+  [176] (byte) div8s::divisoru#3 ← phi( div8s::@3/(byte~) div8s::divisoru#4 div8s::@8/(byte~) div8s::divisoru#5 )
   [177] (byte) div8u::dividend#0 ← (byte) div8s::dividendu#3
   [178] (byte) div8u::divisor#0 ← (byte) div8s::divisoru#3
   [179] call div8u 
   [180] (byte) div8u::return#2 ← (byte) div8u::return#0
-  to:div8s::@15
-div8s::@15: scope:[div8s]  from div8s::@4
+  to:div8s::@6
+div8s::@6: scope:[div8s]  from div8s::@4
   [181] (byte) div8s::resultu#0 ← (byte) div8u::return#2
-  [182] if((byte) div8s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@18
-  to:div8s::@11
-div8s::@11: scope:[div8s]  from div8s::@15
+  [182] if((byte) div8s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@9
+  to:div8s::@5
+div8s::@5: scope:[div8s]  from div8s::@6
   [183] (signed byte) rem8s#2 ← - (signed byte)(byte) rem8u#17
   [184] (signed byte) div8s::return#1 ← - (signed byte)(byte) div8s::resultu#0
   to:div8s::@return
-div8s::@return: scope:[div8s]  from div8s::@11 div8s::@18
-  [185] (signed byte) rem8s#3 ← phi( div8s::@11/(signed byte) rem8s#2 div8s::@18/(signed byte~) rem8s#33 )
-  [185] (signed byte) div8s::return#2 ← phi( div8s::@11/(signed byte) div8s::return#1 div8s::@18/(signed byte~) div8s::return#7 )
+div8s::@return: scope:[div8s]  from div8s::@5 div8s::@9
+  [185] (signed byte) rem8s#3 ← phi( div8s::@5/(signed byte) rem8s#2 div8s::@9/(signed byte~) rem8s#33 )
+  [185] (signed byte) div8s::return#2 ← phi( div8s::@5/(signed byte) div8s::return#1 div8s::@9/(signed byte~) div8s::return#7 )
   [186] return 
   to:@return
-div8s::@18: scope:[div8s]  from div8s::@15
+div8s::@9: scope:[div8s]  from div8s::@6
   [187] (signed byte~) div8s::return#7 ← (signed byte)(byte) div8s::resultu#0
   [188] (signed byte~) rem8s#33 ← (signed byte)(byte) rem8u#17
   to:div8s::@return
@@ -3780,11 +3833,11 @@ div8u: scope:[div8u]  from div8s::@4 test_8u::@1
   [196] (byte) divr8u::divisor#0 ← (byte) div8u::divisor#2
   [197] call divr8u 
   [198] (byte) divr8u::return#0 ← (byte) divr8u::return#1
-  to:div8u::@2
-div8u::@2: scope:[div8u]  from div8u
+  to:div8u::@1
+div8u::@1: scope:[div8u]  from div8u
   [199] (byte) div8u::return#0 ← (byte) divr8u::return#0
   to:div8u::@return
-div8u::@return: scope:[div8u]  from div8u::@2
+div8u::@return: scope:[div8u]  from div8u::@1
   [200] return 
   to:@return
 divr8u: scope:[divr8u]  from div8u
@@ -3827,54 +3880,54 @@ divr8u::@return: scope:[divr8u]  from divr8u::@6
 test_16u: scope:[test_16u]  from main::@2
   [218] phi()
   to:test_16u::@1
-test_16u::@1: scope:[test_16u]  from test_16u test_16u::@11
-  [219] (byte) test_16u::i#10 ← phi( test_16u/(byte/signed byte/word/signed word/dword/signed dword) 0 test_16u::@11/(byte) test_16u::i#1 )
+test_16u::@1: scope:[test_16u]  from test_16u test_16u::@10
+  [219] (byte) test_16u::i#10 ← phi( test_16u/(byte/signed byte/word/signed word/dword/signed dword) 0 test_16u::@10/(byte) test_16u::i#1 )
   [220] (word) test_16u::dividend#0 ← *((const word[]) test_16u::dividends#0 + (byte) test_16u::i#10)
   [221] (word) test_16u::divisor#0 ← *((const word[]) test_16u::divisors#0 + (byte) test_16u::i#10)
   [222] (word) div16u::dividend#0 ← (word) test_16u::dividend#0
   [223] (word) div16u::divisor#0 ← (word) test_16u::divisor#0
   [224] call div16u 
   [225] (word) div16u::return#2 ← (word) div16u::return#0
-  to:test_16u::@3
-test_16u::@3: scope:[test_16u]  from test_16u::@1
+  to:test_16u::@2
+test_16u::@2: scope:[test_16u]  from test_16u::@1
   [226] (word) test_16u::res#0 ← (word) div16u::return#2
   [227] (word) print_word::w#1 ← (word) test_16u::dividend#0
   [228] (byte*~) print_char_cursor#166 ← (byte*) print_line_cursor#1
   [229] call print_word 
-  to:test_16u::@4
-test_16u::@4: scope:[test_16u]  from test_16u::@3
+  to:test_16u::@3
+test_16u::@3: scope:[test_16u]  from test_16u::@2
   [230] phi()
   [231] call print_str 
-  to:test_16u::@5
-test_16u::@5: scope:[test_16u]  from test_16u::@4
+  to:test_16u::@4
+test_16u::@4: scope:[test_16u]  from test_16u::@3
   [232] (word) print_word::w#2 ← (word) test_16u::divisor#0
   [233] call print_word 
-  to:test_16u::@6
-test_16u::@6: scope:[test_16u]  from test_16u::@5
+  to:test_16u::@5
+test_16u::@5: scope:[test_16u]  from test_16u::@4
   [234] phi()
   [235] call print_str 
-  to:test_16u::@7
-test_16u::@7: scope:[test_16u]  from test_16u::@6
+  to:test_16u::@6
+test_16u::@6: scope:[test_16u]  from test_16u::@5
   [236] (word) print_word::w#3 ← (word) test_16u::res#0
   [237] call print_word 
-  to:test_16u::@8
-test_16u::@8: scope:[test_16u]  from test_16u::@7
+  to:test_16u::@7
+test_16u::@7: scope:[test_16u]  from test_16u::@6
   [238] phi()
   [239] call print_str 
-  to:test_16u::@9
-test_16u::@9: scope:[test_16u]  from test_16u::@8
+  to:test_16u::@8
+test_16u::@8: scope:[test_16u]  from test_16u::@7
   [240] (word) print_word::w#4 ← (word) rem16u#1
   [241] call print_word 
-  to:test_16u::@10
-test_16u::@10: scope:[test_16u]  from test_16u::@9
+  to:test_16u::@9
+test_16u::@9: scope:[test_16u]  from test_16u::@8
   [242] phi()
   [243] call print_ln 
-  to:test_16u::@11
-test_16u::@11: scope:[test_16u]  from test_16u::@10
+  to:test_16u::@10
+test_16u::@10: scope:[test_16u]  from test_16u::@9
   [244] (byte) test_16u::i#1 ← (byte) test_16u::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [245] if((byte) test_16u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $c) goto test_16u::@1
   to:test_16u::@return
-test_16u::@return: scope:[test_16u]  from test_16u::@11
+test_16u::@return: scope:[test_16u]  from test_16u::@10
   [246] return 
   to:@return
 div16u: scope:[div16u]  from test_16u::@1
@@ -3882,68 +3935,68 @@ div16u: scope:[div16u]  from test_16u::@1
   [248] (word) divr16u::divisor#0 ← (word) div16u::divisor#0
   [249] call divr16u 
   [250] (word) divr16u::return#2 ← (word) divr16u::return#0
-  to:div16u::@2
-div16u::@2: scope:[div16u]  from div16u
+  to:div16u::@1
+div16u::@1: scope:[div16u]  from div16u
   [251] (word) div16u::return#0 ← (word) divr16u::return#2
   to:div16u::@return
-div16u::@return: scope:[div16u]  from div16u::@2
+div16u::@return: scope:[div16u]  from div16u::@1
   [252] return 
   to:@return
 test_8u: scope:[test_8u]  from main::@1
   [253] phi()
   to:test_8u::@1
-test_8u::@1: scope:[test_8u]  from test_8u test_8u::@12
-  [254] (byte*) print_line_cursor#41 ← phi( test_8u/((byte*))(word/signed word/dword/signed dword) $400 test_8u::@12/(byte*) print_line_cursor#1 )
-  [254] (byte*) print_char_cursor#138 ← phi( test_8u/((byte*))(word/signed word/dword/signed dword) $400 test_8u::@12/(byte*~) print_char_cursor#188 )
-  [254] (byte) test_8u::i#10 ← phi( test_8u/(byte/signed byte/word/signed word/dword/signed dword) 0 test_8u::@12/(byte) test_8u::i#1 )
+test_8u::@1: scope:[test_8u]  from test_8u test_8u::@11
+  [254] (byte*) print_line_cursor#41 ← phi( test_8u/((byte*))(word/signed word/dword/signed dword) $400 test_8u::@11/(byte*) print_line_cursor#1 )
+  [254] (byte*) print_char_cursor#138 ← phi( test_8u/((byte*))(word/signed word/dword/signed dword) $400 test_8u::@11/(byte*~) print_char_cursor#188 )
+  [254] (byte) test_8u::i#10 ← phi( test_8u/(byte/signed byte/word/signed word/dword/signed dword) 0 test_8u::@11/(byte) test_8u::i#1 )
   [255] (byte) test_8u::dividend#0 ← *((const byte[]) test_8u::dividends#0 + (byte) test_8u::i#10)
   [256] (byte) test_8u::divisor#0 ← *((const byte[]) test_8u::divisors#0 + (byte) test_8u::i#10)
   [257] (byte) div8u::dividend#1 ← (byte) test_8u::dividend#0
   [258] (byte) div8u::divisor#1 ← (byte) test_8u::divisor#0
   [259] call div8u 
   [260] (byte) div8u::return#3 ← (byte) div8u::return#0
-  to:test_8u::@3
-test_8u::@3: scope:[test_8u]  from test_8u::@1
+  to:test_8u::@2
+test_8u::@2: scope:[test_8u]  from test_8u::@1
   [261] (byte) test_8u::res#0 ← (byte) div8u::return#3
   [262] (byte) print_byte::b#3 ← (byte) test_8u::dividend#0
   [263] call print_byte 
-  to:test_8u::@4
-test_8u::@4: scope:[test_8u]  from test_8u::@3
+  to:test_8u::@3
+test_8u::@3: scope:[test_8u]  from test_8u::@2
   [264] phi()
   [265] call print_str 
-  to:test_8u::@5
-test_8u::@5: scope:[test_8u]  from test_8u::@4
+  to:test_8u::@4
+test_8u::@4: scope:[test_8u]  from test_8u::@3
   [266] (byte) print_byte::b#4 ← (byte) test_8u::divisor#0
   [267] call print_byte 
-  to:test_8u::@6
-test_8u::@6: scope:[test_8u]  from test_8u::@5
+  to:test_8u::@5
+test_8u::@5: scope:[test_8u]  from test_8u::@4
   [268] phi()
   [269] call print_str 
-  to:test_8u::@7
-test_8u::@7: scope:[test_8u]  from test_8u::@6
+  to:test_8u::@6
+test_8u::@6: scope:[test_8u]  from test_8u::@5
   [270] (byte) print_byte::b#5 ← (byte) test_8u::res#0
   [271] call print_byte 
-  to:test_8u::@8
-test_8u::@8: scope:[test_8u]  from test_8u::@7
+  to:test_8u::@7
+test_8u::@7: scope:[test_8u]  from test_8u::@6
   [272] phi()
   [273] call print_str 
-  to:test_8u::@9
-test_8u::@9: scope:[test_8u]  from test_8u::@8
+  to:test_8u::@8
+test_8u::@8: scope:[test_8u]  from test_8u::@7
   [274] (byte) print_byte::b#6 ← (byte) rem8u#17
   [275] call print_byte 
-  to:test_8u::@10
-test_8u::@10: scope:[test_8u]  from test_8u::@9
+  to:test_8u::@9
+test_8u::@9: scope:[test_8u]  from test_8u::@8
   [276] phi()
   [277] call print_ln 
-  to:test_8u::@11
-test_8u::@11: scope:[test_8u]  from test_8u::@10
+  to:test_8u::@10
+test_8u::@10: scope:[test_8u]  from test_8u::@9
   [278] (byte) test_8u::i#1 ← ++ (byte) test_8u::i#10
-  [279] if((byte) test_8u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8u::@12
+  [279] if((byte) test_8u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8u::@11
   to:test_8u::@return
-test_8u::@return: scope:[test_8u]  from test_8u::@11
+test_8u::@return: scope:[test_8u]  from test_8u::@10
   [280] return 
   to:@return
-test_8u::@12: scope:[test_8u]  from test_8u::@11
+test_8u::@11: scope:[test_8u]  from test_8u::@10
   [281] (byte*~) print_char_cursor#188 ← (byte*) print_line_cursor#1
   to:test_8u::@1
 print_cls: scope:[print_cls]  from main
@@ -4503,17 +4556,17 @@ INITIAL ASM
   .label rem8u = $64
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @32 [phi:@begin->@32]
-b32_from_bbegin:
-  jmp b32
-//SEG5 @32
-b32:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @32 to main [phi:@32->main]
-main_from_b32:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @32 to @end [phi:@32->@end]
-bend_from_b32:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -4577,9 +4630,9 @@ test_16s: {
     lda #0
     sta i
     jmp b1
-  //SEG34 [16] phi from test_16s::@11 to test_16s::@1 [phi:test_16s::@11->test_16s::@1]
-  b1_from_b11:
-  //SEG35 [16] phi (byte) test_16s::i#10 = (byte) test_16s::i#1 [phi:test_16s::@11->test_16s::@1#0] -- register_copy 
+  //SEG34 [16] phi from test_16s::@10 to test_16s::@1 [phi:test_16s::@10->test_16s::@1]
+  b1_from_b10:
+  //SEG35 [16] phi (byte) test_16s::i#10 = (byte) test_16s::i#1 [phi:test_16s::@10->test_16s::@1#0] -- register_copy 
     jmp b1
   //SEG36 test_16s::@1
   b1:
@@ -4612,9 +4665,9 @@ test_16s: {
     sta div16s.return_2
     lda div16s.return+1
     sta div16s.return_2+1
-    jmp b3
-  //SEG43 test_16s::@3
-  b3:
+    jmp b2
+  //SEG43 test_16s::@2
+  b2:
   //SEG44 [23] (signed word) test_16s::res#0 ← (signed word) div16s::return#2 -- vwsz1=vwsz2 
     lda div16s.return_2
     sta res
@@ -4631,108 +4684,108 @@ test_16s: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG47 [26] call print_sword 
-  //SEG48 [49] phi from test_16s::@3 to print_sword [phi:test_16s::@3->print_sword]
-  print_sword_from_b3:
-  //SEG49 [49] phi (byte*) print_char_cursor#131 = (byte*~) print_char_cursor#159 [phi:test_16s::@3->print_sword#0] -- register_copy 
-  //SEG50 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#1 [phi:test_16s::@3->print_sword#1] -- register_copy 
+  //SEG48 [49] phi from test_16s::@2 to print_sword [phi:test_16s::@2->print_sword]
+  print_sword_from_b2:
+  //SEG49 [49] phi (byte*) print_char_cursor#131 = (byte*~) print_char_cursor#159 [phi:test_16s::@2->print_sword#0] -- register_copy 
+  //SEG50 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#1 [phi:test_16s::@2->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG51 [27] phi from test_16s::@3 to test_16s::@4 [phi:test_16s::@3->test_16s::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG52 test_16s::@4
-  b4:
+  //SEG51 [27] phi from test_16s::@2 to test_16s::@3 [phi:test_16s::@2->test_16s::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG52 test_16s::@3
+  b3:
   //SEG53 [28] call print_str 
-  //SEG54 [76] phi from test_16s::@4 to print_str [phi:test_16s::@4->print_str]
-  print_str_from_b4:
-  //SEG55 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16s::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG54 [76] phi from test_16s::@3 to print_str [phi:test_16s::@3->print_str]
+  print_str_from_b3:
+  //SEG55 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16s::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b5
-  //SEG56 test_16s::@5
-  b5:
+    jmp b4
+  //SEG56 test_16s::@4
+  b4:
   //SEG57 [29] (signed word) print_sword::w#2 ← (signed word) test_16s::divisor#0 -- vwsz1=vwsz2 
     lda divisor
     sta print_sword.w
     lda divisor+1
     sta print_sword.w+1
   //SEG58 [30] call print_sword 
-  //SEG59 [49] phi from test_16s::@5 to print_sword [phi:test_16s::@5->print_sword]
-  print_sword_from_b5:
-  //SEG60 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@5->print_sword#0] -- register_copy 
-  //SEG61 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#2 [phi:test_16s::@5->print_sword#1] -- register_copy 
+  //SEG59 [49] phi from test_16s::@4 to print_sword [phi:test_16s::@4->print_sword]
+  print_sword_from_b4:
+  //SEG60 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@4->print_sword#0] -- register_copy 
+  //SEG61 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#2 [phi:test_16s::@4->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG62 [31] phi from test_16s::@5 to test_16s::@6 [phi:test_16s::@5->test_16s::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG63 test_16s::@6
-  b6:
+  //SEG62 [31] phi from test_16s::@4 to test_16s::@5 [phi:test_16s::@4->test_16s::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG63 test_16s::@5
+  b5:
   //SEG64 [32] call print_str 
-  //SEG65 [76] phi from test_16s::@6 to print_str [phi:test_16s::@6->print_str]
-  print_str_from_b6:
-  //SEG66 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16s::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG65 [76] phi from test_16s::@5 to print_str [phi:test_16s::@5->print_str]
+  print_str_from_b5:
+  //SEG66 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16s::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b7
-  //SEG67 test_16s::@7
-  b7:
+    jmp b6
+  //SEG67 test_16s::@6
+  b6:
   //SEG68 [33] (signed word) print_sword::w#3 ← (signed word) test_16s::res#0 -- vwsz1=vwsz2 
     lda res
     sta print_sword.w
     lda res+1
     sta print_sword.w+1
   //SEG69 [34] call print_sword 
-  //SEG70 [49] phi from test_16s::@7 to print_sword [phi:test_16s::@7->print_sword]
-  print_sword_from_b7:
-  //SEG71 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@7->print_sword#0] -- register_copy 
-  //SEG72 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#3 [phi:test_16s::@7->print_sword#1] -- register_copy 
+  //SEG70 [49] phi from test_16s::@6 to print_sword [phi:test_16s::@6->print_sword]
+  print_sword_from_b6:
+  //SEG71 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@6->print_sword#0] -- register_copy 
+  //SEG72 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#3 [phi:test_16s::@6->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG73 [35] phi from test_16s::@7 to test_16s::@8 [phi:test_16s::@7->test_16s::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG74 test_16s::@8
-  b8:
+  //SEG73 [35] phi from test_16s::@6 to test_16s::@7 [phi:test_16s::@6->test_16s::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG74 test_16s::@7
+  b7:
   //SEG75 [36] call print_str 
-  //SEG76 [76] phi from test_16s::@8 to print_str [phi:test_16s::@8->print_str]
-  print_str_from_b8:
-  //SEG77 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16s::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG76 [76] phi from test_16s::@7 to print_str [phi:test_16s::@7->print_str]
+  print_str_from_b7:
+  //SEG77 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16s::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG78 test_16s::@9
-  b9:
+    jmp b8
+  //SEG78 test_16s::@8
+  b8:
   //SEG79 [37] (signed word) print_sword::w#4 ← (signed word) rem16s#11 -- vwsz1=vwsz2 
     lda rem16s
     sta print_sword.w
     lda rem16s+1
     sta print_sword.w+1
   //SEG80 [38] call print_sword 
-  //SEG81 [49] phi from test_16s::@9 to print_sword [phi:test_16s::@9->print_sword]
-  print_sword_from_b9:
-  //SEG82 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@9->print_sword#0] -- register_copy 
-  //SEG83 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:test_16s::@9->print_sword#1] -- register_copy 
+  //SEG81 [49] phi from test_16s::@8 to print_sword [phi:test_16s::@8->print_sword]
+  print_sword_from_b8:
+  //SEG82 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@8->print_sword#0] -- register_copy 
+  //SEG83 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:test_16s::@8->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG84 [39] phi from test_16s::@9 to test_16s::@10 [phi:test_16s::@9->test_16s::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG85 test_16s::@10
-  b10:
+  //SEG84 [39] phi from test_16s::@8 to test_16s::@9 [phi:test_16s::@8->test_16s::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG85 test_16s::@9
+  b9:
   //SEG86 [40] call print_ln 
-  //SEG87 [44] phi from test_16s::@10 to print_ln [phi:test_16s::@10->print_ln]
-  print_ln_from_b10:
-  //SEG88 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16s::@10->print_ln#0] -- register_copy 
+  //SEG87 [44] phi from test_16s::@9 to print_ln [phi:test_16s::@9->print_ln]
+  print_ln_from_b9:
+  //SEG88 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16s::@9->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b11
-  //SEG89 test_16s::@11
-  b11:
+    jmp b10
+  //SEG89 test_16s::@10
+  b10:
   //SEG90 [41] (byte) test_16s::i#1 ← (byte) test_16s::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
@@ -4741,7 +4794,7 @@ test_16s: {
   //SEG91 [42] if((byte) test_16s::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $c) goto test_16s::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c
     cmp i
-    bne b1_from_b11
+    bne b1_from_b10
     jmp breturn
   //SEG92 test_16s::@return
   breturn:
@@ -4804,9 +4857,9 @@ print_sword: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b4
-  //SEG110 print_sword::@4
-  b4:
+    jmp b3
+  //SEG110 print_sword::@3
+  b3:
   //SEG111 [53] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#5 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -4817,11 +4870,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG112 [54] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG112 [54] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG113 [54] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#131 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG114 [54] phi (signed word) print_sword::w#6 = (signed word) print_sword::w#5 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG113 [54] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#131 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG114 [54] phi (signed word) print_sword::w#6 = (signed word) print_sword::w#5 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG115 print_sword::@1
   b1:
@@ -5013,9 +5066,9 @@ div16s: {
     sta divr16s.return_3
     lda divr16s.return+1
     sta divr16s.return_3+1
-    jmp b2
-  //SEG175 div16s::@2
-  b2:
+    jmp b1
+  //SEG175 div16s::@1
+  b1:
   //SEG176 [87] (signed word) div16s::return#0 ← (signed word) divr16s::return#3 -- vwsz1=vwsz2 
     lda divr16s.return_3
     sta return
@@ -5050,23 +5103,23 @@ divr16s: {
   //SEG180 [89] if((signed word) divr16s::dividend#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@1 -- vwsz1_lt_0_then_la1 
     lda dividend+1
     bmi b1
-    jmp b17
-  //SEG181 divr16s::@17
-  b17:
+    jmp b7
+  //SEG181 divr16s::@7
+  b7:
   //SEG182 [90] (word~) divr16s::dividendu#8 ← (word)(signed word) divr16s::dividend#0 -- vwuz1=vwuz2 
     lda dividend
     sta dividendu
     lda dividend+1
     sta dividendu+1
-  //SEG183 [91] phi from divr16s::@17 to divr16s::@2 [phi:divr16s::@17->divr16s::@2]
-  b2_from_b17:
-  //SEG184 [91] phi (word) divr16s::remu#3 = ((word))(const signed word) divr16s::rem#0 [phi:divr16s::@17->divr16s::@2#0] -- vwuz1=vbuc1 
+  //SEG183 [91] phi from divr16s::@7 to divr16s::@2 [phi:divr16s::@7->divr16s::@2]
+  b2_from_b7:
+  //SEG184 [91] phi (word) divr16s::remu#3 = ((word))(const signed word) divr16s::rem#0 [phi:divr16s::@7->divr16s::@2#0] -- vwuz1=vbuc1 
     lda #rem
     sta remu
     lda #0
     sta remu+1
-  //SEG185 [91] phi (word) divr16s::dividendu#3 = (word~) divr16s::dividendu#8 [phi:divr16s::@17->divr16s::@2#1] -- register_copy 
-  //SEG186 [91] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@17->divr16s::@2#2] -- vbuz1=vbuc1 
+  //SEG185 [91] phi (word) divr16s::dividendu#3 = (word~) divr16s::dividendu#8 [phi:divr16s::@7->divr16s::@2#1] -- register_copy 
+  //SEG186 [91] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@7->divr16s::@2#2] -- vbuz1=vbuc1 
     lda #0
     sta neg
     jmp b2
@@ -5075,19 +5128,19 @@ divr16s: {
   //SEG188 [92] if((signed word) divr16s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@3 -- vwsz1_lt_0_then_la1 
     lda divisor+1
     bmi b3
-    jmp b18
-  //SEG189 divr16s::@18
-  b18:
+    jmp b8
+  //SEG189 divr16s::@8
+  b8:
   //SEG190 [93] (word~) divr16s::divisoru#5 ← (word)(signed word) divr16s::divisor#0 -- vwuz1=vwuz2 
     lda divisor
     sta divisoru
     lda divisor+1
     sta divisoru+1
-  //SEG191 [94] phi from divr16s::@18 divr16s::@3 to divr16s::@4 [phi:divr16s::@18/divr16s::@3->divr16s::@4]
-  b4_from_b18:
+  //SEG191 [94] phi from divr16s::@3 divr16s::@8 to divr16s::@4 [phi:divr16s::@3/divr16s::@8->divr16s::@4]
   b4_from_b3:
-  //SEG192 [94] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#3 [phi:divr16s::@18/divr16s::@3->divr16s::@4#0] -- register_copy 
-  //SEG193 [94] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#5 [phi:divr16s::@18/divr16s::@3->divr16s::@4#1] -- register_copy 
+  b4_from_b8:
+  //SEG192 [94] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#2 [phi:divr16s::@3/divr16s::@8->divr16s::@4#0] -- register_copy 
+  //SEG193 [94] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#4 [phi:divr16s::@3/divr16s::@8->divr16s::@4#1] -- register_copy 
     jmp b4
   //SEG194 divr16s::@4
   b4:
@@ -5118,21 +5171,21 @@ divr16s: {
     sta divr16u.return_3
     lda divr16u.return+1
     sta divr16u.return_3+1
-    jmp b15
-  //SEG204 divr16s::@15
-  b15:
+    jmp b6
+  //SEG204 divr16s::@6
+  b6:
   //SEG205 [100] (word) divr16s::resultu#0 ← (word) divr16u::return#3 -- vwuz1=vwuz2 
     lda divr16u.return_3
     sta resultu
     lda divr16u.return_3+1
     sta resultu+1
-  //SEG206 [101] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@19 -- vbuz1_eq_0_then_la1 
+  //SEG206 [101] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@9 -- vbuz1_eq_0_then_la1 
     lda neg
     cmp #0
-    beq b19
-    jmp b11
-  //SEG207 divr16s::@11
-  b11:
+    beq b9
+    jmp b5
+  //SEG207 divr16s::@5
+  b5:
   //SEG208 [102] (signed word) rem16s#2 ← - (signed word)(word) rem16u#1 -- vwsz1=_neg_vwsz2 
     sec
     lda rem16u
@@ -5153,18 +5206,18 @@ divr16s: {
     eor #$ff
     adc #0
     sta return+1
-  //SEG210 [104] phi from divr16s::@11 divr16s::@19 to divr16s::@return [phi:divr16s::@11/divr16s::@19->divr16s::@return]
-  breturn_from_b11:
-  breturn_from_b19:
-  //SEG211 [104] phi (signed word) rem16s#11 = (signed word) rem16s#2 [phi:divr16s::@11/divr16s::@19->divr16s::@return#0] -- register_copy 
-  //SEG212 [104] phi (signed word) divr16s::return#2 = (signed word) divr16s::return#1 [phi:divr16s::@11/divr16s::@19->divr16s::@return#1] -- register_copy 
+  //SEG210 [104] phi from divr16s::@5 divr16s::@9 to divr16s::@return [phi:divr16s::@5/divr16s::@9->divr16s::@return]
+  breturn_from_b5:
+  breturn_from_b9:
+  //SEG211 [104] phi (signed word) rem16s#11 = (signed word) rem16s#2 [phi:divr16s::@5/divr16s::@9->divr16s::@return#0] -- register_copy 
+  //SEG212 [104] phi (signed word) divr16s::return#2 = (signed word) divr16s::return#1 [phi:divr16s::@5/divr16s::@9->divr16s::@return#1] -- register_copy 
     jmp breturn
   //SEG213 divr16s::@return
   breturn:
   //SEG214 [105] return 
     rts
-  //SEG215 divr16s::@19
-  b19:
+  //SEG215 divr16s::@9
+  b9:
   //SEG216 [106] (signed word~) divr16s::return#7 ← (signed word)(word) divr16s::resultu#0 -- vwsz1=vwsz2 
     lda resultu
     sta return
@@ -5175,7 +5228,7 @@ divr16s: {
     sta rem16s
     lda rem16u+1
     sta rem16s+1
-    jmp breturn_from_b19
+    jmp breturn_from_b9
   //SEG218 divr16s::@3
   b3:
   //SEG219 [108] (signed word~) divr16s::$13 ← - (signed word) divr16s::divisor#0 -- vwsz1=_neg_vwsz2 
@@ -5366,9 +5419,9 @@ test_8s: {
     lda #0
     sta i
     jmp b1
-  //SEG269 [132] phi from test_8s::@11 to test_8s::@1 [phi:test_8s::@11->test_8s::@1]
-  b1_from_b11:
-  //SEG270 [132] phi (byte) test_8s::i#10 = (byte) test_8s::i#1 [phi:test_8s::@11->test_8s::@1#0] -- register_copy 
+  //SEG269 [132] phi from test_8s::@10 to test_8s::@1 [phi:test_8s::@10->test_8s::@1]
+  b1_from_b10:
+  //SEG270 [132] phi (byte) test_8s::i#10 = (byte) test_8s::i#1 [phi:test_8s::@10->test_8s::@1#0] -- register_copy 
     jmp b1
   //SEG271 test_8s::@1
   b1:
@@ -5391,9 +5444,9 @@ test_8s: {
   //SEG277 [138] (signed byte) div8s::return#3 ← (signed byte) div8s::return#2 -- vbsz1=vbsz2 
     lda div8s.return
     sta div8s.return_3
-    jmp b3
-  //SEG278 test_8s::@3
-  b3:
+    jmp b2
+  //SEG278 test_8s::@2
+  b2:
   //SEG279 [139] (signed byte) test_8s::res#0 ← (signed byte) div8s::return#3 -- vbsz1=vbsz2 
     lda div8s.return_3
     sta res
@@ -5406,108 +5459,108 @@ test_8s: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG282 [142] call print_sbyte 
-  //SEG283 [160] phi from test_8s::@3 to print_sbyte [phi:test_8s::@3->print_sbyte]
-  print_sbyte_from_b3:
-  //SEG284 [160] phi (byte*) print_char_cursor#132 = (byte*~) print_char_cursor#184 [phi:test_8s::@3->print_sbyte#0] -- register_copy 
-  //SEG285 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#1 [phi:test_8s::@3->print_sbyte#1] -- register_copy 
+  //SEG283 [160] phi from test_8s::@2 to print_sbyte [phi:test_8s::@2->print_sbyte]
+  print_sbyte_from_b2:
+  //SEG284 [160] phi (byte*) print_char_cursor#132 = (byte*~) print_char_cursor#184 [phi:test_8s::@2->print_sbyte#0] -- register_copy 
+  //SEG285 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#1 [phi:test_8s::@2->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG286 [143] phi from test_8s::@3 to test_8s::@4 [phi:test_8s::@3->test_8s::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG287 test_8s::@4
-  b4:
+  //SEG286 [143] phi from test_8s::@2 to test_8s::@3 [phi:test_8s::@2->test_8s::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG287 test_8s::@3
+  b3:
   //SEG288 [144] call print_str 
-  //SEG289 [76] phi from test_8s::@4 to print_str [phi:test_8s::@4->print_str]
-  print_str_from_b4:
-  //SEG290 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8s::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG289 [76] phi from test_8s::@3 to print_str [phi:test_8s::@3->print_str]
+  print_str_from_b3:
+  //SEG290 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8s::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b5
-  //SEG291 test_8s::@5
-  b5:
+    jmp b4
+  //SEG291 test_8s::@4
+  b4:
   //SEG292 [145] (signed byte) print_sbyte::b#2 ← (signed byte) test_8s::divisor#0 -- vbsz1=vbsz2 
     lda divisor
     sta print_sbyte.b
   //SEG293 [146] call print_sbyte 
-  //SEG294 [160] phi from test_8s::@5 to print_sbyte [phi:test_8s::@5->print_sbyte]
-  print_sbyte_from_b5:
-  //SEG295 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@5->print_sbyte#0] -- register_copy 
-  //SEG296 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#2 [phi:test_8s::@5->print_sbyte#1] -- register_copy 
+  //SEG294 [160] phi from test_8s::@4 to print_sbyte [phi:test_8s::@4->print_sbyte]
+  print_sbyte_from_b4:
+  //SEG295 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@4->print_sbyte#0] -- register_copy 
+  //SEG296 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#2 [phi:test_8s::@4->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG297 [147] phi from test_8s::@5 to test_8s::@6 [phi:test_8s::@5->test_8s::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG298 test_8s::@6
-  b6:
+  //SEG297 [147] phi from test_8s::@4 to test_8s::@5 [phi:test_8s::@4->test_8s::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG298 test_8s::@5
+  b5:
   //SEG299 [148] call print_str 
-  //SEG300 [76] phi from test_8s::@6 to print_str [phi:test_8s::@6->print_str]
-  print_str_from_b6:
-  //SEG301 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8s::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG300 [76] phi from test_8s::@5 to print_str [phi:test_8s::@5->print_str]
+  print_str_from_b5:
+  //SEG301 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8s::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b7
-  //SEG302 test_8s::@7
-  b7:
+    jmp b6
+  //SEG302 test_8s::@6
+  b6:
   //SEG303 [149] (signed byte) print_sbyte::b#3 ← (signed byte) test_8s::res#0 -- vbsz1=vbsz2 
     lda res
     sta print_sbyte.b
   //SEG304 [150] call print_sbyte 
-  //SEG305 [160] phi from test_8s::@7 to print_sbyte [phi:test_8s::@7->print_sbyte]
-  print_sbyte_from_b7:
-  //SEG306 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@7->print_sbyte#0] -- register_copy 
-  //SEG307 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#3 [phi:test_8s::@7->print_sbyte#1] -- register_copy 
+  //SEG305 [160] phi from test_8s::@6 to print_sbyte [phi:test_8s::@6->print_sbyte]
+  print_sbyte_from_b6:
+  //SEG306 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@6->print_sbyte#0] -- register_copy 
+  //SEG307 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#3 [phi:test_8s::@6->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG308 [151] phi from test_8s::@7 to test_8s::@8 [phi:test_8s::@7->test_8s::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG309 test_8s::@8
-  b8:
+  //SEG308 [151] phi from test_8s::@6 to test_8s::@7 [phi:test_8s::@6->test_8s::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG309 test_8s::@7
+  b7:
   //SEG310 [152] call print_str 
-  //SEG311 [76] phi from test_8s::@8 to print_str [phi:test_8s::@8->print_str]
-  print_str_from_b8:
-  //SEG312 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8s::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG311 [76] phi from test_8s::@7 to print_str [phi:test_8s::@7->print_str]
+  print_str_from_b7:
+  //SEG312 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8s::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG313 test_8s::@9
-  b9:
+    jmp b8
+  //SEG313 test_8s::@8
+  b8:
   //SEG314 [153] (signed byte) print_sbyte::b#4 ← (signed byte) rem8s#3 -- vbsz1=vbsz2 
     lda rem8s
     sta print_sbyte.b
   //SEG315 [154] call print_sbyte 
-  //SEG316 [160] phi from test_8s::@9 to print_sbyte [phi:test_8s::@9->print_sbyte]
-  print_sbyte_from_b9:
-  //SEG317 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@9->print_sbyte#0] -- register_copy 
-  //SEG318 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#4 [phi:test_8s::@9->print_sbyte#1] -- register_copy 
+  //SEG316 [160] phi from test_8s::@8 to print_sbyte [phi:test_8s::@8->print_sbyte]
+  print_sbyte_from_b8:
+  //SEG317 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@8->print_sbyte#0] -- register_copy 
+  //SEG318 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#4 [phi:test_8s::@8->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG319 [155] phi from test_8s::@9 to test_8s::@10 [phi:test_8s::@9->test_8s::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG320 test_8s::@10
-  b10:
+  //SEG319 [155] phi from test_8s::@8 to test_8s::@9 [phi:test_8s::@8->test_8s::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG320 test_8s::@9
+  b9:
   //SEG321 [156] call print_ln 
-  //SEG322 [44] phi from test_8s::@10 to print_ln [phi:test_8s::@10->print_ln]
-  print_ln_from_b10:
-  //SEG323 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_8s::@10->print_ln#0] -- register_copy 
+  //SEG322 [44] phi from test_8s::@9 to print_ln [phi:test_8s::@9->print_ln]
+  print_ln_from_b9:
+  //SEG323 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_8s::@9->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b11
-  //SEG324 test_8s::@11
-  b11:
+    jmp b10
+  //SEG324 test_8s::@10
+  b10:
   //SEG325 [157] (byte) test_8s::i#1 ← ++ (byte) test_8s::i#10 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG326 [158] if((byte) test_8s::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8s::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp i
-    bne b1_from_b11
+    bne b1_from_b10
     jmp breturn
   //SEG327 test_8s::@return
   breturn:
@@ -5537,10 +5590,10 @@ print_sbyte: {
     lda #' '
     sta print_char.ch
     jsr print_char
-  //SEG337 [164] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG337 [164] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG338 [164] phi (signed byte) print_sbyte::b#7 = (signed byte) print_sbyte::b#10 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG338 [164] phi (signed byte) print_sbyte::b#7 = (signed byte) print_sbyte::b#10 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG339 print_sbyte::@2
   b2:
@@ -5571,16 +5624,16 @@ print_sbyte: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b5
-  //SEG353 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG353 print_sbyte::@4
+  b4:
   //SEG354 [170] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#10 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG355 div8s
 // Perform division on two signed 8-bit numbers
@@ -5604,16 +5657,16 @@ div8s: {
   //SEG356 [171] if((signed byte) div8s::dividend#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@1 -- vbsz1_lt_0_then_la1 
     lda dividend
     bmi b1
-    jmp b16
-  //SEG357 div8s::@16
-  b16:
+    jmp b7
+  //SEG357 div8s::@7
+  b7:
   //SEG358 [172] (byte~) div8s::dividendu#8 ← (byte)(signed byte) div8s::dividend#0 -- vbuz1=vbuz2 
     lda dividend
     sta dividendu
-  //SEG359 [173] phi from div8s::@16 to div8s::@2 [phi:div8s::@16->div8s::@2]
-  b2_from_b16:
-  //SEG360 [173] phi (byte) div8s::dividendu#3 = (byte~) div8s::dividendu#8 [phi:div8s::@16->div8s::@2#0] -- register_copy 
-  //SEG361 [173] phi (byte) div8s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:div8s::@16->div8s::@2#1] -- vbuz1=vbuc1 
+  //SEG359 [173] phi from div8s::@7 to div8s::@2 [phi:div8s::@7->div8s::@2]
+  b2_from_b7:
+  //SEG360 [173] phi (byte) div8s::dividendu#3 = (byte~) div8s::dividendu#8 [phi:div8s::@7->div8s::@2#0] -- register_copy 
+  //SEG361 [173] phi (byte) div8s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:div8s::@7->div8s::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta neg
     jmp b2
@@ -5622,17 +5675,17 @@ div8s: {
   //SEG363 [174] if((signed byte) div8s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@3 -- vbsz1_lt_0_then_la1 
     lda divisor
     bmi b3
-    jmp b17
-  //SEG364 div8s::@17
-  b17:
+    jmp b8
+  //SEG364 div8s::@8
+  b8:
   //SEG365 [175] (byte~) div8s::divisoru#5 ← (byte)(signed byte) div8s::divisor#0 -- vbuz1=vbuz2 
     lda divisor
     sta divisoru
-  //SEG366 [176] phi from div8s::@17 div8s::@3 to div8s::@4 [phi:div8s::@17/div8s::@3->div8s::@4]
-  b4_from_b17:
+  //SEG366 [176] phi from div8s::@3 div8s::@8 to div8s::@4 [phi:div8s::@3/div8s::@8->div8s::@4]
   b4_from_b3:
-  //SEG367 [176] phi (byte) div8s::neg#4 = (byte) div8s::neg#3 [phi:div8s::@17/div8s::@3->div8s::@4#0] -- register_copy 
-  //SEG368 [176] phi (byte) div8s::divisoru#3 = (byte~) div8s::divisoru#5 [phi:div8s::@17/div8s::@3->div8s::@4#1] -- register_copy 
+  b4_from_b8:
+  //SEG367 [176] phi (byte) div8s::neg#4 = (byte) div8s::neg#2 [phi:div8s::@3/div8s::@8->div8s::@4#0] -- register_copy 
+  //SEG368 [176] phi (byte) div8s::divisoru#3 = (byte~) div8s::divisoru#4 [phi:div8s::@3/div8s::@8->div8s::@4#1] -- register_copy 
     jmp b4
   //SEG369 div8s::@4
   b4:
@@ -5651,19 +5704,19 @@ div8s: {
   //SEG376 [180] (byte) div8u::return#2 ← (byte) div8u::return#0 -- vbuz1=vbuz2 
     lda div8u.return
     sta div8u.return_2
-    jmp b15
-  //SEG377 div8s::@15
-  b15:
+    jmp b6
+  //SEG377 div8s::@6
+  b6:
   //SEG378 [181] (byte) div8s::resultu#0 ← (byte) div8u::return#2 -- vbuz1=vbuz2 
     lda div8u.return_2
     sta resultu
-  //SEG379 [182] if((byte) div8s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG379 [182] if((byte) div8s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@9 -- vbuz1_eq_0_then_la1 
     lda neg
     cmp #0
-    beq b18
-    jmp b11
-  //SEG380 div8s::@11
-  b11:
+    beq b9
+    jmp b5
+  //SEG380 div8s::@5
+  b5:
   //SEG381 [183] (signed byte) rem8s#2 ← - (signed byte)(byte) rem8u#17 -- vbsz1=_neg_vbsz2 
     lda rem8u
     eor #$ff
@@ -5676,25 +5729,25 @@ div8s: {
     clc
     adc #1
     sta return
-  //SEG383 [185] phi from div8s::@11 div8s::@18 to div8s::@return [phi:div8s::@11/div8s::@18->div8s::@return]
-  breturn_from_b11:
-  breturn_from_b18:
-  //SEG384 [185] phi (signed byte) rem8s#3 = (signed byte) rem8s#2 [phi:div8s::@11/div8s::@18->div8s::@return#0] -- register_copy 
-  //SEG385 [185] phi (signed byte) div8s::return#2 = (signed byte) div8s::return#1 [phi:div8s::@11/div8s::@18->div8s::@return#1] -- register_copy 
+  //SEG383 [185] phi from div8s::@5 div8s::@9 to div8s::@return [phi:div8s::@5/div8s::@9->div8s::@return]
+  breturn_from_b5:
+  breturn_from_b9:
+  //SEG384 [185] phi (signed byte) rem8s#3 = (signed byte) rem8s#2 [phi:div8s::@5/div8s::@9->div8s::@return#0] -- register_copy 
+  //SEG385 [185] phi (signed byte) div8s::return#2 = (signed byte) div8s::return#1 [phi:div8s::@5/div8s::@9->div8s::@return#1] -- register_copy 
     jmp breturn
   //SEG386 div8s::@return
   breturn:
   //SEG387 [186] return 
     rts
-  //SEG388 div8s::@18
-  b18:
+  //SEG388 div8s::@9
+  b9:
   //SEG389 [187] (signed byte~) div8s::return#7 ← (signed byte)(byte) div8s::resultu#0 -- vbsz1=vbsz2 
     lda resultu
     sta return
   //SEG390 [188] (signed byte~) rem8s#33 ← (signed byte)(byte) rem8u#17 -- vbsz1=vbsz2 
     lda rem8u
     sta rem8s
-    jmp breturn_from_b18
+    jmp breturn_from_b9
   //SEG391 div8s::@3
   b3:
   //SEG392 [189] (signed byte~) div8s::$8 ← - (signed byte) div8s::divisor#0 -- vbsz1=_neg_vbsz2 
@@ -5755,9 +5808,9 @@ div8u: {
   //SEG406 [198] (byte) divr8u::return#0 ← (byte) divr8u::return#1 -- vbuz1=vbuz2 
     lda divr8u.return_1
     sta divr8u.return
-    jmp b2
-  //SEG407 div8u::@2
-  b2:
+    jmp b1
+  //SEG407 div8u::@1
+  b1:
   //SEG408 [199] (byte) div8u::return#0 ← (byte) divr8u::return#0 -- vbuz1=vbuz2 
     lda divr8u.return
     sta return
@@ -5884,9 +5937,9 @@ test_16u: {
     lda #0
     sta i
     jmp b1
-  //SEG450 [219] phi from test_16u::@11 to test_16u::@1 [phi:test_16u::@11->test_16u::@1]
-  b1_from_b11:
-  //SEG451 [219] phi (byte) test_16u::i#10 = (byte) test_16u::i#1 [phi:test_16u::@11->test_16u::@1#0] -- register_copy 
+  //SEG450 [219] phi from test_16u::@10 to test_16u::@1 [phi:test_16u::@10->test_16u::@1]
+  b1_from_b10:
+  //SEG451 [219] phi (byte) test_16u::i#10 = (byte) test_16u::i#1 [phi:test_16u::@10->test_16u::@1#0] -- register_copy 
     jmp b1
   //SEG452 test_16u::@1
   b1:
@@ -5919,9 +5972,9 @@ test_16u: {
     sta div16u.return_2
     lda div16u.return+1
     sta div16u.return_2+1
-    jmp b3
-  //SEG459 test_16u::@3
-  b3:
+    jmp b2
+  //SEG459 test_16u::@2
+  b2:
   //SEG460 [226] (word) test_16u::res#0 ← (word) div16u::return#2 -- vwuz1=vwuz2 
     lda div16u.return_2
     sta res
@@ -5938,108 +5991,108 @@ test_16u: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG463 [229] call print_word 
-  //SEG464 [58] phi from test_16u::@3 to print_word [phi:test_16u::@3->print_word]
-  print_word_from_b3:
-  //SEG465 [58] phi (byte*) print_char_cursor#135 = (byte*~) print_char_cursor#166 [phi:test_16u::@3->print_word#0] -- register_copy 
-  //SEG466 [58] phi (word) print_word::w#5 = (word) print_word::w#1 [phi:test_16u::@3->print_word#1] -- register_copy 
+  //SEG464 [58] phi from test_16u::@2 to print_word [phi:test_16u::@2->print_word]
+  print_word_from_b2:
+  //SEG465 [58] phi (byte*) print_char_cursor#135 = (byte*~) print_char_cursor#166 [phi:test_16u::@2->print_word#0] -- register_copy 
+  //SEG466 [58] phi (word) print_word::w#5 = (word) print_word::w#1 [phi:test_16u::@2->print_word#1] -- register_copy 
     jsr print_word
-  //SEG467 [230] phi from test_16u::@3 to test_16u::@4 [phi:test_16u::@3->test_16u::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG468 test_16u::@4
-  b4:
+  //SEG467 [230] phi from test_16u::@2 to test_16u::@3 [phi:test_16u::@2->test_16u::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG468 test_16u::@3
+  b3:
   //SEG469 [231] call print_str 
-  //SEG470 [76] phi from test_16u::@4 to print_str [phi:test_16u::@4->print_str]
-  print_str_from_b4:
-  //SEG471 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16u::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG470 [76] phi from test_16u::@3 to print_str [phi:test_16u::@3->print_str]
+  print_str_from_b3:
+  //SEG471 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16u::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b5
-  //SEG472 test_16u::@5
-  b5:
+    jmp b4
+  //SEG472 test_16u::@4
+  b4:
   //SEG473 [232] (word) print_word::w#2 ← (word) test_16u::divisor#0 -- vwuz1=vwuz2 
     lda divisor
     sta print_word.w
     lda divisor+1
     sta print_word.w+1
   //SEG474 [233] call print_word 
-  //SEG475 [58] phi from test_16u::@5 to print_word [phi:test_16u::@5->print_word]
-  print_word_from_b5:
-  //SEG476 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@5->print_word#0] -- register_copy 
-  //SEG477 [58] phi (word) print_word::w#5 = (word) print_word::w#2 [phi:test_16u::@5->print_word#1] -- register_copy 
+  //SEG475 [58] phi from test_16u::@4 to print_word [phi:test_16u::@4->print_word]
+  print_word_from_b4:
+  //SEG476 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@4->print_word#0] -- register_copy 
+  //SEG477 [58] phi (word) print_word::w#5 = (word) print_word::w#2 [phi:test_16u::@4->print_word#1] -- register_copy 
     jsr print_word
-  //SEG478 [234] phi from test_16u::@5 to test_16u::@6 [phi:test_16u::@5->test_16u::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG479 test_16u::@6
-  b6:
+  //SEG478 [234] phi from test_16u::@4 to test_16u::@5 [phi:test_16u::@4->test_16u::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG479 test_16u::@5
+  b5:
   //SEG480 [235] call print_str 
-  //SEG481 [76] phi from test_16u::@6 to print_str [phi:test_16u::@6->print_str]
-  print_str_from_b6:
-  //SEG482 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16u::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG481 [76] phi from test_16u::@5 to print_str [phi:test_16u::@5->print_str]
+  print_str_from_b5:
+  //SEG482 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16u::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b7
-  //SEG483 test_16u::@7
-  b7:
+    jmp b6
+  //SEG483 test_16u::@6
+  b6:
   //SEG484 [236] (word) print_word::w#3 ← (word) test_16u::res#0 -- vwuz1=vwuz2 
     lda res
     sta print_word.w
     lda res+1
     sta print_word.w+1
   //SEG485 [237] call print_word 
-  //SEG486 [58] phi from test_16u::@7 to print_word [phi:test_16u::@7->print_word]
-  print_word_from_b7:
-  //SEG487 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@7->print_word#0] -- register_copy 
-  //SEG488 [58] phi (word) print_word::w#5 = (word) print_word::w#3 [phi:test_16u::@7->print_word#1] -- register_copy 
+  //SEG486 [58] phi from test_16u::@6 to print_word [phi:test_16u::@6->print_word]
+  print_word_from_b6:
+  //SEG487 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@6->print_word#0] -- register_copy 
+  //SEG488 [58] phi (word) print_word::w#5 = (word) print_word::w#3 [phi:test_16u::@6->print_word#1] -- register_copy 
     jsr print_word
-  //SEG489 [238] phi from test_16u::@7 to test_16u::@8 [phi:test_16u::@7->test_16u::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG490 test_16u::@8
-  b8:
+  //SEG489 [238] phi from test_16u::@6 to test_16u::@7 [phi:test_16u::@6->test_16u::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG490 test_16u::@7
+  b7:
   //SEG491 [239] call print_str 
-  //SEG492 [76] phi from test_16u::@8 to print_str [phi:test_16u::@8->print_str]
-  print_str_from_b8:
-  //SEG493 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16u::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG492 [76] phi from test_16u::@7 to print_str [phi:test_16u::@7->print_str]
+  print_str_from_b7:
+  //SEG493 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16u::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG494 test_16u::@9
-  b9:
+    jmp b8
+  //SEG494 test_16u::@8
+  b8:
   //SEG495 [240] (word) print_word::w#4 ← (word) rem16u#1 -- vwuz1=vwuz2 
     lda rem16u
     sta print_word.w
     lda rem16u+1
     sta print_word.w+1
   //SEG496 [241] call print_word 
-  //SEG497 [58] phi from test_16u::@9 to print_word [phi:test_16u::@9->print_word]
-  print_word_from_b9:
-  //SEG498 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@9->print_word#0] -- register_copy 
-  //SEG499 [58] phi (word) print_word::w#5 = (word) print_word::w#4 [phi:test_16u::@9->print_word#1] -- register_copy 
+  //SEG497 [58] phi from test_16u::@8 to print_word [phi:test_16u::@8->print_word]
+  print_word_from_b8:
+  //SEG498 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@8->print_word#0] -- register_copy 
+  //SEG499 [58] phi (word) print_word::w#5 = (word) print_word::w#4 [phi:test_16u::@8->print_word#1] -- register_copy 
     jsr print_word
-  //SEG500 [242] phi from test_16u::@9 to test_16u::@10 [phi:test_16u::@9->test_16u::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG501 test_16u::@10
-  b10:
+  //SEG500 [242] phi from test_16u::@8 to test_16u::@9 [phi:test_16u::@8->test_16u::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG501 test_16u::@9
+  b9:
   //SEG502 [243] call print_ln 
-  //SEG503 [44] phi from test_16u::@10 to print_ln [phi:test_16u::@10->print_ln]
-  print_ln_from_b10:
-  //SEG504 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16u::@10->print_ln#0] -- register_copy 
+  //SEG503 [44] phi from test_16u::@9 to print_ln [phi:test_16u::@9->print_ln]
+  print_ln_from_b9:
+  //SEG504 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16u::@9->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b11
-  //SEG505 test_16u::@11
-  b11:
+    jmp b10
+  //SEG505 test_16u::@10
+  b10:
   //SEG506 [244] (byte) test_16u::i#1 ← (byte) test_16u::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
@@ -6048,7 +6101,7 @@ test_16u: {
   //SEG507 [245] if((byte) test_16u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $c) goto test_16u::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c
     cmp i
-    bne b1_from_b11
+    bne b1_from_b10
     jmp breturn
   //SEG508 test_16u::@return
   breturn:
@@ -6094,9 +6147,9 @@ div16u: {
     sta divr16u.return_2
     lda divr16u.return+1
     sta divr16u.return_2+1
-    jmp b2
-  //SEG519 div16u::@2
-  b2:
+    jmp b1
+  //SEG519 div16u::@1
+  b1:
   //SEG520 [251] (word) div16u::return#0 ← (word) divr16u::return#2 -- vwuz1=vwuz2 
     lda divr16u.return_2
     sta return
@@ -6155,9 +6208,9 @@ test_8u: {
   //SEG537 [260] (byte) div8u::return#3 ← (byte) div8u::return#0 -- vbuz1=vbuz2 
     lda div8u.return
     sta div8u.return_3
-    jmp b3
-  //SEG538 test_8u::@3
-  b3:
+    jmp b2
+  //SEG538 test_8u::@2
+  b2:
   //SEG539 [261] (byte) test_8u::res#0 ← (byte) div8u::return#3 -- vbuz1=vbuz2 
     lda div8u.return_3
     sta res
@@ -6165,125 +6218,125 @@ test_8u: {
     lda dividend
     sta print_byte.b
   //SEG541 [263] call print_byte 
-  //SEG542 [64] phi from test_8u::@3 to print_byte [phi:test_8u::@3->print_byte]
-  print_byte_from_b3:
-  //SEG543 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#138 [phi:test_8u::@3->print_byte#0] -- register_copy 
-  //SEG544 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#3 [phi:test_8u::@3->print_byte#1] -- register_copy 
+  //SEG542 [64] phi from test_8u::@2 to print_byte [phi:test_8u::@2->print_byte]
+  print_byte_from_b2:
+  //SEG543 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#138 [phi:test_8u::@2->print_byte#0] -- register_copy 
+  //SEG544 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#3 [phi:test_8u::@2->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG545 [264] phi from test_8u::@3 to test_8u::@4 [phi:test_8u::@3->test_8u::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG546 test_8u::@4
-  b4:
+  //SEG545 [264] phi from test_8u::@2 to test_8u::@3 [phi:test_8u::@2->test_8u::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG546 test_8u::@3
+  b3:
   //SEG547 [265] call print_str 
-  //SEG548 [76] phi from test_8u::@4 to print_str [phi:test_8u::@4->print_str]
-  print_str_from_b4:
-  //SEG549 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8u::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG548 [76] phi from test_8u::@3 to print_str [phi:test_8u::@3->print_str]
+  print_str_from_b3:
+  //SEG549 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8u::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b5
-  //SEG550 test_8u::@5
-  b5:
+    jmp b4
+  //SEG550 test_8u::@4
+  b4:
   //SEG551 [266] (byte) print_byte::b#4 ← (byte) test_8u::divisor#0 -- vbuz1=vbuz2 
     lda divisor
     sta print_byte.b
   //SEG552 [267] call print_byte 
-  //SEG553 [64] phi from test_8u::@5 to print_byte [phi:test_8u::@5->print_byte]
-  print_byte_from_b5:
-  //SEG554 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@5->print_byte#0] -- register_copy 
-  //SEG555 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#4 [phi:test_8u::@5->print_byte#1] -- register_copy 
+  //SEG553 [64] phi from test_8u::@4 to print_byte [phi:test_8u::@4->print_byte]
+  print_byte_from_b4:
+  //SEG554 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@4->print_byte#0] -- register_copy 
+  //SEG555 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#4 [phi:test_8u::@4->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG556 [268] phi from test_8u::@5 to test_8u::@6 [phi:test_8u::@5->test_8u::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG557 test_8u::@6
-  b6:
+  //SEG556 [268] phi from test_8u::@4 to test_8u::@5 [phi:test_8u::@4->test_8u::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG557 test_8u::@5
+  b5:
   //SEG558 [269] call print_str 
-  //SEG559 [76] phi from test_8u::@6 to print_str [phi:test_8u::@6->print_str]
-  print_str_from_b6:
-  //SEG560 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8u::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG559 [76] phi from test_8u::@5 to print_str [phi:test_8u::@5->print_str]
+  print_str_from_b5:
+  //SEG560 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8u::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b7
-  //SEG561 test_8u::@7
-  b7:
+    jmp b6
+  //SEG561 test_8u::@6
+  b6:
   //SEG562 [270] (byte) print_byte::b#5 ← (byte) test_8u::res#0 -- vbuz1=vbuz2 
     lda res
     sta print_byte.b
   //SEG563 [271] call print_byte 
-  //SEG564 [64] phi from test_8u::@7 to print_byte [phi:test_8u::@7->print_byte]
-  print_byte_from_b7:
-  //SEG565 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@7->print_byte#0] -- register_copy 
-  //SEG566 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#5 [phi:test_8u::@7->print_byte#1] -- register_copy 
+  //SEG564 [64] phi from test_8u::@6 to print_byte [phi:test_8u::@6->print_byte]
+  print_byte_from_b6:
+  //SEG565 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@6->print_byte#0] -- register_copy 
+  //SEG566 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#5 [phi:test_8u::@6->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG567 [272] phi from test_8u::@7 to test_8u::@8 [phi:test_8u::@7->test_8u::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG568 test_8u::@8
-  b8:
+  //SEG567 [272] phi from test_8u::@6 to test_8u::@7 [phi:test_8u::@6->test_8u::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG568 test_8u::@7
+  b7:
   //SEG569 [273] call print_str 
-  //SEG570 [76] phi from test_8u::@8 to print_str [phi:test_8u::@8->print_str]
-  print_str_from_b8:
-  //SEG571 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8u::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG570 [76] phi from test_8u::@7 to print_str [phi:test_8u::@7->print_str]
+  print_str_from_b7:
+  //SEG571 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8u::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG572 test_8u::@9
-  b9:
+    jmp b8
+  //SEG572 test_8u::@8
+  b8:
   //SEG573 [274] (byte) print_byte::b#6 ← (byte) rem8u#17 -- vbuz1=vbuz2 
     lda rem8u
     sta print_byte.b
   //SEG574 [275] call print_byte 
-  //SEG575 [64] phi from test_8u::@9 to print_byte [phi:test_8u::@9->print_byte]
-  print_byte_from_b9:
-  //SEG576 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@9->print_byte#0] -- register_copy 
-  //SEG577 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#6 [phi:test_8u::@9->print_byte#1] -- register_copy 
+  //SEG575 [64] phi from test_8u::@8 to print_byte [phi:test_8u::@8->print_byte]
+  print_byte_from_b8:
+  //SEG576 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@8->print_byte#0] -- register_copy 
+  //SEG577 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#6 [phi:test_8u::@8->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG578 [276] phi from test_8u::@9 to test_8u::@10 [phi:test_8u::@9->test_8u::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG579 test_8u::@10
-  b10:
+  //SEG578 [276] phi from test_8u::@8 to test_8u::@9 [phi:test_8u::@8->test_8u::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG579 test_8u::@9
+  b9:
   //SEG580 [277] call print_ln 
-  //SEG581 [44] phi from test_8u::@10 to print_ln [phi:test_8u::@10->print_ln]
-  print_ln_from_b10:
-  //SEG582 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#41 [phi:test_8u::@10->print_ln#0] -- register_copy 
+  //SEG581 [44] phi from test_8u::@9 to print_ln [phi:test_8u::@9->print_ln]
+  print_ln_from_b9:
+  //SEG582 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#41 [phi:test_8u::@9->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b11
-  //SEG583 test_8u::@11
-  b11:
+    jmp b10
+  //SEG583 test_8u::@10
+  b10:
   //SEG584 [278] (byte) test_8u::i#1 ← ++ (byte) test_8u::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG585 [279] if((byte) test_8u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8u::@12 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG585 [279] if((byte) test_8u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8u::@11 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp i
-    bne b12
+    bne b11
     jmp breturn
   //SEG586 test_8u::@return
   breturn:
   //SEG587 [280] return 
     rts
-  //SEG588 test_8u::@12
-  b12:
+  //SEG588 test_8u::@11
+  b11:
   //SEG589 [281] (byte*~) print_char_cursor#188 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG590 [254] phi from test_8u::@12 to test_8u::@1 [phi:test_8u::@12->test_8u::@1]
-  b1_from_b12:
-  //SEG591 [254] phi (byte*) print_line_cursor#41 = (byte*) print_line_cursor#1 [phi:test_8u::@12->test_8u::@1#0] -- register_copy 
-  //SEG592 [254] phi (byte*) print_char_cursor#138 = (byte*~) print_char_cursor#188 [phi:test_8u::@12->test_8u::@1#1] -- register_copy 
-  //SEG593 [254] phi (byte) test_8u::i#10 = (byte) test_8u::i#1 [phi:test_8u::@12->test_8u::@1#2] -- register_copy 
+  //SEG590 [254] phi from test_8u::@11 to test_8u::@1 [phi:test_8u::@11->test_8u::@1]
+  b1_from_b11:
+  //SEG591 [254] phi (byte*) print_line_cursor#41 = (byte*) print_line_cursor#1 [phi:test_8u::@11->test_8u::@1#0] -- register_copy 
+  //SEG592 [254] phi (byte*) print_char_cursor#138 = (byte*~) print_char_cursor#188 [phi:test_8u::@11->test_8u::@1#1] -- register_copy 
+  //SEG593 [254] phi (byte) test_8u::i#10 = (byte) test_8u::i#1 [phi:test_8u::@11->test_8u::@1#2] -- register_copy 
     jmp b1
     dividends: .byte $ff, $ff, $ff, $ff, $ff, $ff
     divisors: .byte 5, 7, $b, $d, $11, $13
@@ -6848,17 +6901,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label rem16s = $a
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @32 [phi:@begin->@32]
-b32_from_bbegin:
-  jmp b32
-//SEG5 @32
-b32:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @32 to main [phi:@32->main]
-main_from_b32:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @32 to @end [phi:@32->@end]
-bend_from_b32:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -6922,9 +6975,9 @@ test_16s: {
     lda #0
     sta i
     jmp b1
-  //SEG34 [16] phi from test_16s::@11 to test_16s::@1 [phi:test_16s::@11->test_16s::@1]
-  b1_from_b11:
-  //SEG35 [16] phi (byte) test_16s::i#10 = (byte) test_16s::i#1 [phi:test_16s::@11->test_16s::@1#0] -- register_copy 
+  //SEG34 [16] phi from test_16s::@10 to test_16s::@1 [phi:test_16s::@10->test_16s::@1]
+  b1_from_b10:
+  //SEG35 [16] phi (byte) test_16s::i#10 = (byte) test_16s::i#1 [phi:test_16s::@10->test_16s::@1#0] -- register_copy 
     jmp b1
   //SEG36 test_16s::@1
   b1:
@@ -6945,9 +6998,9 @@ test_16s: {
   //SEG41 [21] call div16s 
     jsr div16s
   //SEG42 [22] (signed word) div16s::return#2 ← (signed word) div16s::return#0
-    jmp b3
-  //SEG43 test_16s::@3
-  b3:
+    jmp b2
+  //SEG43 test_16s::@2
+  b2:
   //SEG44 [23] (signed word) test_16s::res#0 ← (signed word) div16s::return#2
   //SEG45 [24] (signed word) print_sword::w#1 ← (signed word) test_16s::dividend#0
   //SEG46 [25] (byte*~) print_char_cursor#159 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
@@ -6956,108 +7009,108 @@ test_16s: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG47 [26] call print_sword 
-  //SEG48 [49] phi from test_16s::@3 to print_sword [phi:test_16s::@3->print_sword]
-  print_sword_from_b3:
-  //SEG49 [49] phi (byte*) print_char_cursor#131 = (byte*~) print_char_cursor#159 [phi:test_16s::@3->print_sword#0] -- register_copy 
-  //SEG50 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#1 [phi:test_16s::@3->print_sword#1] -- register_copy 
+  //SEG48 [49] phi from test_16s::@2 to print_sword [phi:test_16s::@2->print_sword]
+  print_sword_from_b2:
+  //SEG49 [49] phi (byte*) print_char_cursor#131 = (byte*~) print_char_cursor#159 [phi:test_16s::@2->print_sword#0] -- register_copy 
+  //SEG50 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#1 [phi:test_16s::@2->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG51 [27] phi from test_16s::@3 to test_16s::@4 [phi:test_16s::@3->test_16s::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG52 test_16s::@4
-  b4:
+  //SEG51 [27] phi from test_16s::@2 to test_16s::@3 [phi:test_16s::@2->test_16s::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG52 test_16s::@3
+  b3:
   //SEG53 [28] call print_str 
-  //SEG54 [76] phi from test_16s::@4 to print_str [phi:test_16s::@4->print_str]
-  print_str_from_b4:
-  //SEG55 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16s::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG54 [76] phi from test_16s::@3 to print_str [phi:test_16s::@3->print_str]
+  print_str_from_b3:
+  //SEG55 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16s::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b5
-  //SEG56 test_16s::@5
-  b5:
+    jmp b4
+  //SEG56 test_16s::@4
+  b4:
   //SEG57 [29] (signed word) print_sword::w#2 ← (signed word) test_16s::divisor#0 -- vwsz1=vwsz2 
     lda divisor
     sta print_sword.w
     lda divisor+1
     sta print_sword.w+1
   //SEG58 [30] call print_sword 
-  //SEG59 [49] phi from test_16s::@5 to print_sword [phi:test_16s::@5->print_sword]
-  print_sword_from_b5:
-  //SEG60 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@5->print_sword#0] -- register_copy 
-  //SEG61 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#2 [phi:test_16s::@5->print_sword#1] -- register_copy 
+  //SEG59 [49] phi from test_16s::@4 to print_sword [phi:test_16s::@4->print_sword]
+  print_sword_from_b4:
+  //SEG60 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@4->print_sword#0] -- register_copy 
+  //SEG61 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#2 [phi:test_16s::@4->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG62 [31] phi from test_16s::@5 to test_16s::@6 [phi:test_16s::@5->test_16s::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG63 test_16s::@6
-  b6:
+  //SEG62 [31] phi from test_16s::@4 to test_16s::@5 [phi:test_16s::@4->test_16s::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG63 test_16s::@5
+  b5:
   //SEG64 [32] call print_str 
-  //SEG65 [76] phi from test_16s::@6 to print_str [phi:test_16s::@6->print_str]
-  print_str_from_b6:
-  //SEG66 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16s::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG65 [76] phi from test_16s::@5 to print_str [phi:test_16s::@5->print_str]
+  print_str_from_b5:
+  //SEG66 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16s::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b7
-  //SEG67 test_16s::@7
-  b7:
+    jmp b6
+  //SEG67 test_16s::@6
+  b6:
   //SEG68 [33] (signed word) print_sword::w#3 ← (signed word) test_16s::res#0 -- vwsz1=vwsz2 
     lda res
     sta print_sword.w
     lda res+1
     sta print_sword.w+1
   //SEG69 [34] call print_sword 
-  //SEG70 [49] phi from test_16s::@7 to print_sword [phi:test_16s::@7->print_sword]
-  print_sword_from_b7:
-  //SEG71 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@7->print_sword#0] -- register_copy 
-  //SEG72 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#3 [phi:test_16s::@7->print_sword#1] -- register_copy 
+  //SEG70 [49] phi from test_16s::@6 to print_sword [phi:test_16s::@6->print_sword]
+  print_sword_from_b6:
+  //SEG71 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@6->print_sword#0] -- register_copy 
+  //SEG72 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#3 [phi:test_16s::@6->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG73 [35] phi from test_16s::@7 to test_16s::@8 [phi:test_16s::@7->test_16s::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG74 test_16s::@8
-  b8:
+  //SEG73 [35] phi from test_16s::@6 to test_16s::@7 [phi:test_16s::@6->test_16s::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG74 test_16s::@7
+  b7:
   //SEG75 [36] call print_str 
-  //SEG76 [76] phi from test_16s::@8 to print_str [phi:test_16s::@8->print_str]
-  print_str_from_b8:
-  //SEG77 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16s::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG76 [76] phi from test_16s::@7 to print_str [phi:test_16s::@7->print_str]
+  print_str_from_b7:
+  //SEG77 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16s::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG78 test_16s::@9
-  b9:
+    jmp b8
+  //SEG78 test_16s::@8
+  b8:
   //SEG79 [37] (signed word) print_sword::w#4 ← (signed word) rem16s#11 -- vwsz1=vwsz2 
     lda rem16s
     sta print_sword.w
     lda rem16s+1
     sta print_sword.w+1
   //SEG80 [38] call print_sword 
-  //SEG81 [49] phi from test_16s::@9 to print_sword [phi:test_16s::@9->print_sword]
-  print_sword_from_b9:
-  //SEG82 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@9->print_sword#0] -- register_copy 
-  //SEG83 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:test_16s::@9->print_sword#1] -- register_copy 
+  //SEG81 [49] phi from test_16s::@8 to print_sword [phi:test_16s::@8->print_sword]
+  print_sword_from_b8:
+  //SEG82 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@8->print_sword#0] -- register_copy 
+  //SEG83 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:test_16s::@8->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG84 [39] phi from test_16s::@9 to test_16s::@10 [phi:test_16s::@9->test_16s::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG85 test_16s::@10
-  b10:
+  //SEG84 [39] phi from test_16s::@8 to test_16s::@9 [phi:test_16s::@8->test_16s::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG85 test_16s::@9
+  b9:
   //SEG86 [40] call print_ln 
-  //SEG87 [44] phi from test_16s::@10 to print_ln [phi:test_16s::@10->print_ln]
-  print_ln_from_b10:
-  //SEG88 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16s::@10->print_ln#0] -- register_copy 
+  //SEG87 [44] phi from test_16s::@9 to print_ln [phi:test_16s::@9->print_ln]
+  print_ln_from_b9:
+  //SEG88 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16s::@9->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b11
-  //SEG89 test_16s::@11
-  b11:
+    jmp b10
+  //SEG89 test_16s::@10
+  b10:
   //SEG90 [41] (byte) test_16s::i#1 ← (byte) test_16s::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
@@ -7066,7 +7119,7 @@ test_16s: {
   //SEG91 [42] if((byte) test_16s::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $c) goto test_16s::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c
     cmp i
-    bne b1_from_b11
+    bne b1_from_b10
     jmp breturn
   //SEG92 test_16s::@return
   breturn:
@@ -7128,9 +7181,9 @@ print_sword: {
   //SEG109 [72] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b4
-  //SEG110 print_sword::@4
-  b4:
+    jmp b3
+  //SEG110 print_sword::@3
+  b3:
   //SEG111 [53] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#5 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -7141,11 +7194,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG112 [54] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG112 [54] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG113 [54] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#131 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG114 [54] phi (signed word) print_sword::w#6 = (signed word) print_sword::w#5 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG113 [54] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#131 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG114 [54] phi (signed word) print_sword::w#6 = (signed word) print_sword::w#5 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG115 print_sword::@1
   b1:
@@ -7320,9 +7373,9 @@ div16s: {
   //SEG173 [85] call divr16s 
     jsr divr16s
   //SEG174 [86] (signed word) divr16s::return#3 ← (signed word) divr16s::return#2
-    jmp b2
-  //SEG175 div16s::@2
-  b2:
+    jmp b1
+  //SEG175 div16s::@1
+  b1:
   //SEG176 [87] (signed word) div16s::return#0 ← (signed word) divr16s::return#3
     jmp breturn
   //SEG177 div16s::@return
@@ -7351,19 +7404,19 @@ divr16s: {
   //SEG180 [89] if((signed word) divr16s::dividend#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@1 -- vwsz1_lt_0_then_la1 
     lda dividend+1
     bmi b1
-    jmp b17
-  //SEG181 divr16s::@17
-  b17:
+    jmp b7
+  //SEG181 divr16s::@7
+  b7:
   //SEG182 [90] (word~) divr16s::dividendu#8 ← (word)(signed word) divr16s::dividend#0
-  //SEG183 [91] phi from divr16s::@17 to divr16s::@2 [phi:divr16s::@17->divr16s::@2]
-  b2_from_b17:
-  //SEG184 [91] phi (word) divr16s::remu#3 = ((word))(const signed word) divr16s::rem#0 [phi:divr16s::@17->divr16s::@2#0] -- vwuz1=vbuc1 
+  //SEG183 [91] phi from divr16s::@7 to divr16s::@2 [phi:divr16s::@7->divr16s::@2]
+  b2_from_b7:
+  //SEG184 [91] phi (word) divr16s::remu#3 = ((word))(const signed word) divr16s::rem#0 [phi:divr16s::@7->divr16s::@2#0] -- vwuz1=vbuc1 
     lda #rem
     sta remu
     lda #0
     sta remu+1
-  //SEG185 [91] phi (word) divr16s::dividendu#3 = (word~) divr16s::dividendu#8 [phi:divr16s::@17->divr16s::@2#1] -- register_copy 
-  //SEG186 [91] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@17->divr16s::@2#2] -- vbuyy=vbuc1 
+  //SEG185 [91] phi (word) divr16s::dividendu#3 = (word~) divr16s::dividendu#8 [phi:divr16s::@7->divr16s::@2#1] -- register_copy 
+  //SEG186 [91] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@7->divr16s::@2#2] -- vbuyy=vbuc1 
     ldy #0
     jmp b2
   //SEG187 divr16s::@2
@@ -7371,15 +7424,15 @@ divr16s: {
   //SEG188 [92] if((signed word) divr16s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@3 -- vwsz1_lt_0_then_la1 
     lda divisor+1
     bmi b3
-    jmp b18
-  //SEG189 divr16s::@18
-  b18:
+    jmp b8
+  //SEG189 divr16s::@8
+  b8:
   //SEG190 [93] (word~) divr16s::divisoru#5 ← (word)(signed word) divr16s::divisor#0
-  //SEG191 [94] phi from divr16s::@18 divr16s::@3 to divr16s::@4 [phi:divr16s::@18/divr16s::@3->divr16s::@4]
-  b4_from_b18:
+  //SEG191 [94] phi from divr16s::@3 divr16s::@8 to divr16s::@4 [phi:divr16s::@3/divr16s::@8->divr16s::@4]
   b4_from_b3:
-  //SEG192 [94] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#3 [phi:divr16s::@18/divr16s::@3->divr16s::@4#0] -- register_copy 
-  //SEG193 [94] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#5 [phi:divr16s::@18/divr16s::@3->divr16s::@4#1] -- register_copy 
+  b4_from_b8:
+  //SEG192 [94] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#2 [phi:divr16s::@3/divr16s::@8->divr16s::@4#0] -- register_copy 
+  //SEG193 [94] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#4 [phi:divr16s::@3/divr16s::@8->divr16s::@4#1] -- register_copy 
     jmp b4
   //SEG194 divr16s::@4
   b4:
@@ -7394,16 +7447,16 @@ divr16s: {
   //SEG202 [113] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:divr16s::@4->divr16u#2] -- register_copy 
     jsr divr16u
   //SEG203 [99] (word) divr16u::return#3 ← (word) divr16u::return#0
-    jmp b15
-  //SEG204 divr16s::@15
-  b15:
+    jmp b6
+  //SEG204 divr16s::@6
+  b6:
   //SEG205 [100] (word) divr16s::resultu#0 ← (word) divr16u::return#3
-  //SEG206 [101] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@19 -- vbuyy_eq_0_then_la1 
+  //SEG206 [101] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@9 -- vbuyy_eq_0_then_la1 
     cpy #0
-    beq b19
-    jmp b11
-  //SEG207 divr16s::@11
-  b11:
+    beq b9
+    jmp b5
+  //SEG207 divr16s::@5
+  b5:
   //SEG208 [102] (signed word) rem16s#2 ← - (signed word)(word) rem16u#1 -- vwsz1=_neg_vwsz1 
     sec
     lda rem16s
@@ -7424,21 +7477,21 @@ divr16s: {
     eor #$ff
     adc #0
     sta return+1
-  //SEG210 [104] phi from divr16s::@11 divr16s::@19 to divr16s::@return [phi:divr16s::@11/divr16s::@19->divr16s::@return]
-  breturn_from_b11:
-  breturn_from_b19:
-  //SEG211 [104] phi (signed word) rem16s#11 = (signed word) rem16s#2 [phi:divr16s::@11/divr16s::@19->divr16s::@return#0] -- register_copy 
-  //SEG212 [104] phi (signed word) divr16s::return#2 = (signed word) divr16s::return#1 [phi:divr16s::@11/divr16s::@19->divr16s::@return#1] -- register_copy 
+  //SEG210 [104] phi from divr16s::@5 divr16s::@9 to divr16s::@return [phi:divr16s::@5/divr16s::@9->divr16s::@return]
+  breturn_from_b5:
+  breturn_from_b9:
+  //SEG211 [104] phi (signed word) rem16s#11 = (signed word) rem16s#2 [phi:divr16s::@5/divr16s::@9->divr16s::@return#0] -- register_copy 
+  //SEG212 [104] phi (signed word) divr16s::return#2 = (signed word) divr16s::return#1 [phi:divr16s::@5/divr16s::@9->divr16s::@return#1] -- register_copy 
     jmp breturn
   //SEG213 divr16s::@return
   breturn:
   //SEG214 [105] return 
     rts
-  //SEG215 divr16s::@19
-  b19:
+  //SEG215 divr16s::@9
+  b9:
   //SEG216 [106] (signed word~) divr16s::return#7 ← (signed word)(word) divr16s::resultu#0
   //SEG217 [107] (signed word~) rem16s#37 ← (signed word)(word) rem16u#1
-    jmp breturn_from_b19
+    jmp breturn_from_b9
   //SEG218 divr16s::@3
   b3:
   //SEG219 [108] (signed word~) divr16s::$13 ← - (signed word) divr16s::divisor#0 -- vwsz1=_neg_vwsz1 
@@ -7605,9 +7658,9 @@ test_8s: {
     lda #0
     sta i
     jmp b1
-  //SEG269 [132] phi from test_8s::@11 to test_8s::@1 [phi:test_8s::@11->test_8s::@1]
-  b1_from_b11:
-  //SEG270 [132] phi (byte) test_8s::i#10 = (byte) test_8s::i#1 [phi:test_8s::@11->test_8s::@1#0] -- register_copy 
+  //SEG269 [132] phi from test_8s::@10 to test_8s::@1 [phi:test_8s::@10->test_8s::@1]
+  b1_from_b10:
+  //SEG270 [132] phi (byte) test_8s::i#10 = (byte) test_8s::i#1 [phi:test_8s::@10->test_8s::@1#0] -- register_copy 
     jmp b1
   //SEG271 test_8s::@1
   b1:
@@ -7626,9 +7679,9 @@ test_8s: {
   //SEG276 [137] call div8s 
     jsr div8s
   //SEG277 [138] (signed byte) div8s::return#3 ← (signed byte) div8s::return#2
-    jmp b3
-  //SEG278 test_8s::@3
-  b3:
+    jmp b2
+  //SEG278 test_8s::@2
+  b2:
   //SEG279 [139] (signed byte) test_8s::res#0 ← (signed byte) div8s::return#3 -- vbsz1=vbsaa 
     sta res
   //SEG280 [140] (signed byte) print_sbyte::b#1 ← (signed byte) test_8s::dividend#0
@@ -7638,107 +7691,107 @@ test_8s: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG282 [142] call print_sbyte 
-  //SEG283 [160] phi from test_8s::@3 to print_sbyte [phi:test_8s::@3->print_sbyte]
-  print_sbyte_from_b3:
-  //SEG284 [160] phi (byte*) print_char_cursor#132 = (byte*~) print_char_cursor#184 [phi:test_8s::@3->print_sbyte#0] -- register_copy 
-  //SEG285 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#1 [phi:test_8s::@3->print_sbyte#1] -- register_copy 
+  //SEG283 [160] phi from test_8s::@2 to print_sbyte [phi:test_8s::@2->print_sbyte]
+  print_sbyte_from_b2:
+  //SEG284 [160] phi (byte*) print_char_cursor#132 = (byte*~) print_char_cursor#184 [phi:test_8s::@2->print_sbyte#0] -- register_copy 
+  //SEG285 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#1 [phi:test_8s::@2->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG286 [143] phi from test_8s::@3 to test_8s::@4 [phi:test_8s::@3->test_8s::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG287 test_8s::@4
-  b4:
+  //SEG286 [143] phi from test_8s::@2 to test_8s::@3 [phi:test_8s::@2->test_8s::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG287 test_8s::@3
+  b3:
   //SEG288 [144] call print_str 
-  //SEG289 [76] phi from test_8s::@4 to print_str [phi:test_8s::@4->print_str]
-  print_str_from_b4:
-  //SEG290 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8s::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG289 [76] phi from test_8s::@3 to print_str [phi:test_8s::@3->print_str]
+  print_str_from_b3:
+  //SEG290 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8s::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b5
-  //SEG291 test_8s::@5
-  b5:
+    jmp b4
+  //SEG291 test_8s::@4
+  b4:
   //SEG292 [145] (signed byte) print_sbyte::b#2 ← (signed byte) test_8s::divisor#0 -- vbsz1=vbsz2 
     lda divisor
     sta print_sbyte.b
   //SEG293 [146] call print_sbyte 
-  //SEG294 [160] phi from test_8s::@5 to print_sbyte [phi:test_8s::@5->print_sbyte]
-  print_sbyte_from_b5:
-  //SEG295 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@5->print_sbyte#0] -- register_copy 
-  //SEG296 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#2 [phi:test_8s::@5->print_sbyte#1] -- register_copy 
+  //SEG294 [160] phi from test_8s::@4 to print_sbyte [phi:test_8s::@4->print_sbyte]
+  print_sbyte_from_b4:
+  //SEG295 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@4->print_sbyte#0] -- register_copy 
+  //SEG296 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#2 [phi:test_8s::@4->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG297 [147] phi from test_8s::@5 to test_8s::@6 [phi:test_8s::@5->test_8s::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG298 test_8s::@6
-  b6:
+  //SEG297 [147] phi from test_8s::@4 to test_8s::@5 [phi:test_8s::@4->test_8s::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG298 test_8s::@5
+  b5:
   //SEG299 [148] call print_str 
-  //SEG300 [76] phi from test_8s::@6 to print_str [phi:test_8s::@6->print_str]
-  print_str_from_b6:
-  //SEG301 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8s::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG300 [76] phi from test_8s::@5 to print_str [phi:test_8s::@5->print_str]
+  print_str_from_b5:
+  //SEG301 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8s::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b7
-  //SEG302 test_8s::@7
-  b7:
+    jmp b6
+  //SEG302 test_8s::@6
+  b6:
   //SEG303 [149] (signed byte) print_sbyte::b#3 ← (signed byte) test_8s::res#0 -- vbsz1=vbsz2 
     lda res
     sta print_sbyte.b
   //SEG304 [150] call print_sbyte 
-  //SEG305 [160] phi from test_8s::@7 to print_sbyte [phi:test_8s::@7->print_sbyte]
-  print_sbyte_from_b7:
-  //SEG306 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@7->print_sbyte#0] -- register_copy 
-  //SEG307 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#3 [phi:test_8s::@7->print_sbyte#1] -- register_copy 
+  //SEG305 [160] phi from test_8s::@6 to print_sbyte [phi:test_8s::@6->print_sbyte]
+  print_sbyte_from_b6:
+  //SEG306 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@6->print_sbyte#0] -- register_copy 
+  //SEG307 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#3 [phi:test_8s::@6->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG308 [151] phi from test_8s::@7 to test_8s::@8 [phi:test_8s::@7->test_8s::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG309 test_8s::@8
-  b8:
+  //SEG308 [151] phi from test_8s::@6 to test_8s::@7 [phi:test_8s::@6->test_8s::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG309 test_8s::@7
+  b7:
   //SEG310 [152] call print_str 
-  //SEG311 [76] phi from test_8s::@8 to print_str [phi:test_8s::@8->print_str]
-  print_str_from_b8:
-  //SEG312 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8s::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG311 [76] phi from test_8s::@7 to print_str [phi:test_8s::@7->print_str]
+  print_str_from_b7:
+  //SEG312 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8s::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG313 test_8s::@9
-  b9:
+    jmp b8
+  //SEG313 test_8s::@8
+  b8:
   //SEG314 [153] (signed byte) print_sbyte::b#4 ← (signed byte) rem8s#3 -- vbsz1=vbsxx 
     stx print_sbyte.b
   //SEG315 [154] call print_sbyte 
-  //SEG316 [160] phi from test_8s::@9 to print_sbyte [phi:test_8s::@9->print_sbyte]
-  print_sbyte_from_b9:
-  //SEG317 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@9->print_sbyte#0] -- register_copy 
-  //SEG318 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#4 [phi:test_8s::@9->print_sbyte#1] -- register_copy 
+  //SEG316 [160] phi from test_8s::@8 to print_sbyte [phi:test_8s::@8->print_sbyte]
+  print_sbyte_from_b8:
+  //SEG317 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@8->print_sbyte#0] -- register_copy 
+  //SEG318 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#4 [phi:test_8s::@8->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG319 [155] phi from test_8s::@9 to test_8s::@10 [phi:test_8s::@9->test_8s::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG320 test_8s::@10
-  b10:
+  //SEG319 [155] phi from test_8s::@8 to test_8s::@9 [phi:test_8s::@8->test_8s::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG320 test_8s::@9
+  b9:
   //SEG321 [156] call print_ln 
-  //SEG322 [44] phi from test_8s::@10 to print_ln [phi:test_8s::@10->print_ln]
-  print_ln_from_b10:
-  //SEG323 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_8s::@10->print_ln#0] -- register_copy 
+  //SEG322 [44] phi from test_8s::@9 to print_ln [phi:test_8s::@9->print_ln]
+  print_ln_from_b9:
+  //SEG323 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_8s::@9->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b11
-  //SEG324 test_8s::@11
-  b11:
+    jmp b10
+  //SEG324 test_8s::@10
+  b10:
   //SEG325 [157] (byte) test_8s::i#1 ← ++ (byte) test_8s::i#10 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG326 [158] if((byte) test_8s::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8s::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp i
-    bne b1_from_b11
+    bne b1_from_b10
     jmp breturn
   //SEG327 test_8s::@return
   breturn:
@@ -7767,10 +7820,10 @@ print_sbyte: {
   //SEG336 [72] phi (byte) print_char::ch#5 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG337 [164] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG337 [164] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG338 [164] phi (signed byte) print_sbyte::b#7 = (signed byte) print_sbyte::b#10 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG338 [164] phi (signed byte) print_sbyte::b#7 = (signed byte) print_sbyte::b#10 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG339 print_sbyte::@2
   b2:
@@ -7798,16 +7851,16 @@ print_sbyte: {
   //SEG352 [72] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b5
-  //SEG353 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG353 print_sbyte::@4
+  b4:
   //SEG354 [170] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#10 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG355 div8s
 // Perform division on two signed 8-bit numbers
@@ -7822,14 +7875,14 @@ div8s: {
   //SEG356 [171] if((signed byte) div8s::dividend#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@1 -- vbsyy_lt_0_then_la1 
     cpy #0
     bmi b1
-    jmp b16
-  //SEG357 div8s::@16
-  b16:
+    jmp b7
+  //SEG357 div8s::@7
+  b7:
   //SEG358 [172] (byte~) div8s::dividendu#8 ← (byte)(signed byte) div8s::dividend#0
-  //SEG359 [173] phi from div8s::@16 to div8s::@2 [phi:div8s::@16->div8s::@2]
-  b2_from_b16:
-  //SEG360 [173] phi (byte) div8s::dividendu#3 = (byte~) div8s::dividendu#8 [phi:div8s::@16->div8s::@2#0] -- register_copy 
-  //SEG361 [173] phi (byte) div8s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:div8s::@16->div8s::@2#1] -- vbuz1=vbuc1 
+  //SEG359 [173] phi from div8s::@7 to div8s::@2 [phi:div8s::@7->div8s::@2]
+  b2_from_b7:
+  //SEG360 [173] phi (byte) div8s::dividendu#3 = (byte~) div8s::dividendu#8 [phi:div8s::@7->div8s::@2#0] -- register_copy 
+  //SEG361 [173] phi (byte) div8s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:div8s::@7->div8s::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta neg
     jmp b2
@@ -7838,15 +7891,15 @@ div8s: {
   //SEG363 [174] if((signed byte) div8s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@3 -- vbsxx_lt_0_then_la1 
     cpx #0
     bmi b3
-    jmp b17
-  //SEG364 div8s::@17
-  b17:
+    jmp b8
+  //SEG364 div8s::@8
+  b8:
   //SEG365 [175] (byte~) div8s::divisoru#5 ← (byte)(signed byte) div8s::divisor#0
-  //SEG366 [176] phi from div8s::@17 div8s::@3 to div8s::@4 [phi:div8s::@17/div8s::@3->div8s::@4]
-  b4_from_b17:
+  //SEG366 [176] phi from div8s::@3 div8s::@8 to div8s::@4 [phi:div8s::@3/div8s::@8->div8s::@4]
   b4_from_b3:
-  //SEG367 [176] phi (byte) div8s::neg#4 = (byte) div8s::neg#3 [phi:div8s::@17/div8s::@3->div8s::@4#0] -- register_copy 
-  //SEG368 [176] phi (byte) div8s::divisoru#3 = (byte~) div8s::divisoru#5 [phi:div8s::@17/div8s::@3->div8s::@4#1] -- register_copy 
+  b4_from_b8:
+  //SEG367 [176] phi (byte) div8s::neg#4 = (byte) div8s::neg#2 [phi:div8s::@3/div8s::@8->div8s::@4#0] -- register_copy 
+  //SEG368 [176] phi (byte) div8s::divisoru#3 = (byte~) div8s::divisoru#4 [phi:div8s::@3/div8s::@8->div8s::@4#1] -- register_copy 
     jmp b4
   //SEG369 div8s::@4
   b4:
@@ -7860,18 +7913,18 @@ div8s: {
   //SEG375 [194] phi (byte) div8u::dividend#2 = (byte) div8u::dividend#0 [phi:div8s::@4->div8u#1] -- register_copy 
     jsr div8u
   //SEG376 [180] (byte) div8u::return#2 ← (byte) div8u::return#0
-    jmp b15
-  //SEG377 div8s::@15
-  b15:
+    jmp b6
+  //SEG377 div8s::@6
+  b6:
   //SEG378 [181] (byte) div8s::resultu#0 ← (byte) div8u::return#2 -- vbuyy=vbuaa 
     tay
-  //SEG379 [182] if((byte) div8s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG379 [182] if((byte) div8s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@9 -- vbuz1_eq_0_then_la1 
     lda neg
     cmp #0
-    beq b18
-    jmp b11
-  //SEG380 div8s::@11
-  b11:
+    beq b9
+    jmp b5
+  //SEG380 div8s::@5
+  b5:
   //SEG381 [183] (signed byte) rem8s#2 ← - (signed byte)(byte) rem8u#17 -- vbsxx=_neg_vbsxx 
     txa
     eor #$ff
@@ -7883,22 +7936,22 @@ div8s: {
     eor #$ff
     clc
     adc #1
-  //SEG383 [185] phi from div8s::@11 div8s::@18 to div8s::@return [phi:div8s::@11/div8s::@18->div8s::@return]
-  breturn_from_b11:
-  breturn_from_b18:
-  //SEG384 [185] phi (signed byte) rem8s#3 = (signed byte) rem8s#2 [phi:div8s::@11/div8s::@18->div8s::@return#0] -- register_copy 
-  //SEG385 [185] phi (signed byte) div8s::return#2 = (signed byte) div8s::return#1 [phi:div8s::@11/div8s::@18->div8s::@return#1] -- register_copy 
+  //SEG383 [185] phi from div8s::@5 div8s::@9 to div8s::@return [phi:div8s::@5/div8s::@9->div8s::@return]
+  breturn_from_b5:
+  breturn_from_b9:
+  //SEG384 [185] phi (signed byte) rem8s#3 = (signed byte) rem8s#2 [phi:div8s::@5/div8s::@9->div8s::@return#0] -- register_copy 
+  //SEG385 [185] phi (signed byte) div8s::return#2 = (signed byte) div8s::return#1 [phi:div8s::@5/div8s::@9->div8s::@return#1] -- register_copy 
     jmp breturn
   //SEG386 div8s::@return
   breturn:
   //SEG387 [186] return 
     rts
-  //SEG388 div8s::@18
-  b18:
+  //SEG388 div8s::@9
+  b9:
   //SEG389 [187] (signed byte~) div8s::return#7 ← (signed byte)(byte) div8s::resultu#0 -- vbsaa=vbsyy 
     tya
   //SEG390 [188] (signed byte~) rem8s#33 ← (signed byte)(byte) rem8u#17
-    jmp breturn_from_b18
+    jmp breturn_from_b9
   //SEG391 div8s::@3
   b3:
   //SEG392 [189] (signed byte~) div8s::$8 ← - (signed byte) div8s::divisor#0 -- vbsxx=_neg_vbsxx 
@@ -7947,9 +8000,9 @@ div8u: {
     jsr divr8u
   //SEG406 [198] (byte) divr8u::return#0 ← (byte) divr8u::return#1 -- vbuaa=vbuz1 
     lda divr8u.return
-    jmp b2
-  //SEG407 div8u::@2
-  b2:
+    jmp b1
+  //SEG407 div8u::@1
+  b1:
   //SEG408 [199] (byte) div8u::return#0 ← (byte) divr8u::return#0
     jmp breturn
   //SEG409 div8u::@return
@@ -8066,9 +8119,9 @@ test_16u: {
     lda #0
     sta i
     jmp b1
-  //SEG450 [219] phi from test_16u::@11 to test_16u::@1 [phi:test_16u::@11->test_16u::@1]
-  b1_from_b11:
-  //SEG451 [219] phi (byte) test_16u::i#10 = (byte) test_16u::i#1 [phi:test_16u::@11->test_16u::@1#0] -- register_copy 
+  //SEG450 [219] phi from test_16u::@10 to test_16u::@1 [phi:test_16u::@10->test_16u::@1]
+  b1_from_b10:
+  //SEG451 [219] phi (byte) test_16u::i#10 = (byte) test_16u::i#1 [phi:test_16u::@10->test_16u::@1#0] -- register_copy 
     jmp b1
   //SEG452 test_16u::@1
   b1:
@@ -8089,9 +8142,9 @@ test_16u: {
   //SEG457 [224] call div16u 
     jsr div16u
   //SEG458 [225] (word) div16u::return#2 ← (word) div16u::return#0
-    jmp b3
-  //SEG459 test_16u::@3
-  b3:
+    jmp b2
+  //SEG459 test_16u::@2
+  b2:
   //SEG460 [226] (word) test_16u::res#0 ← (word) div16u::return#2
   //SEG461 [227] (word) print_word::w#1 ← (word) test_16u::dividend#0
   //SEG462 [228] (byte*~) print_char_cursor#166 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
@@ -8100,108 +8153,108 @@ test_16u: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG463 [229] call print_word 
-  //SEG464 [58] phi from test_16u::@3 to print_word [phi:test_16u::@3->print_word]
-  print_word_from_b3:
-  //SEG465 [58] phi (byte*) print_char_cursor#135 = (byte*~) print_char_cursor#166 [phi:test_16u::@3->print_word#0] -- register_copy 
-  //SEG466 [58] phi (word) print_word::w#5 = (word) print_word::w#1 [phi:test_16u::@3->print_word#1] -- register_copy 
+  //SEG464 [58] phi from test_16u::@2 to print_word [phi:test_16u::@2->print_word]
+  print_word_from_b2:
+  //SEG465 [58] phi (byte*) print_char_cursor#135 = (byte*~) print_char_cursor#166 [phi:test_16u::@2->print_word#0] -- register_copy 
+  //SEG466 [58] phi (word) print_word::w#5 = (word) print_word::w#1 [phi:test_16u::@2->print_word#1] -- register_copy 
     jsr print_word
-  //SEG467 [230] phi from test_16u::@3 to test_16u::@4 [phi:test_16u::@3->test_16u::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG468 test_16u::@4
-  b4:
+  //SEG467 [230] phi from test_16u::@2 to test_16u::@3 [phi:test_16u::@2->test_16u::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG468 test_16u::@3
+  b3:
   //SEG469 [231] call print_str 
-  //SEG470 [76] phi from test_16u::@4 to print_str [phi:test_16u::@4->print_str]
-  print_str_from_b4:
-  //SEG471 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16u::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG470 [76] phi from test_16u::@3 to print_str [phi:test_16u::@3->print_str]
+  print_str_from_b3:
+  //SEG471 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16u::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b5
-  //SEG472 test_16u::@5
-  b5:
+    jmp b4
+  //SEG472 test_16u::@4
+  b4:
   //SEG473 [232] (word) print_word::w#2 ← (word) test_16u::divisor#0 -- vwuz1=vwuz2 
     lda divisor
     sta print_word.w
     lda divisor+1
     sta print_word.w+1
   //SEG474 [233] call print_word 
-  //SEG475 [58] phi from test_16u::@5 to print_word [phi:test_16u::@5->print_word]
-  print_word_from_b5:
-  //SEG476 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@5->print_word#0] -- register_copy 
-  //SEG477 [58] phi (word) print_word::w#5 = (word) print_word::w#2 [phi:test_16u::@5->print_word#1] -- register_copy 
+  //SEG475 [58] phi from test_16u::@4 to print_word [phi:test_16u::@4->print_word]
+  print_word_from_b4:
+  //SEG476 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@4->print_word#0] -- register_copy 
+  //SEG477 [58] phi (word) print_word::w#5 = (word) print_word::w#2 [phi:test_16u::@4->print_word#1] -- register_copy 
     jsr print_word
-  //SEG478 [234] phi from test_16u::@5 to test_16u::@6 [phi:test_16u::@5->test_16u::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG479 test_16u::@6
-  b6:
+  //SEG478 [234] phi from test_16u::@4 to test_16u::@5 [phi:test_16u::@4->test_16u::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG479 test_16u::@5
+  b5:
   //SEG480 [235] call print_str 
-  //SEG481 [76] phi from test_16u::@6 to print_str [phi:test_16u::@6->print_str]
-  print_str_from_b6:
-  //SEG482 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16u::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG481 [76] phi from test_16u::@5 to print_str [phi:test_16u::@5->print_str]
+  print_str_from_b5:
+  //SEG482 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16u::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b7
-  //SEG483 test_16u::@7
-  b7:
+    jmp b6
+  //SEG483 test_16u::@6
+  b6:
   //SEG484 [236] (word) print_word::w#3 ← (word) test_16u::res#0 -- vwuz1=vwuz2 
     lda res
     sta print_word.w
     lda res+1
     sta print_word.w+1
   //SEG485 [237] call print_word 
-  //SEG486 [58] phi from test_16u::@7 to print_word [phi:test_16u::@7->print_word]
-  print_word_from_b7:
-  //SEG487 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@7->print_word#0] -- register_copy 
-  //SEG488 [58] phi (word) print_word::w#5 = (word) print_word::w#3 [phi:test_16u::@7->print_word#1] -- register_copy 
+  //SEG486 [58] phi from test_16u::@6 to print_word [phi:test_16u::@6->print_word]
+  print_word_from_b6:
+  //SEG487 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@6->print_word#0] -- register_copy 
+  //SEG488 [58] phi (word) print_word::w#5 = (word) print_word::w#3 [phi:test_16u::@6->print_word#1] -- register_copy 
     jsr print_word
-  //SEG489 [238] phi from test_16u::@7 to test_16u::@8 [phi:test_16u::@7->test_16u::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG490 test_16u::@8
-  b8:
+  //SEG489 [238] phi from test_16u::@6 to test_16u::@7 [phi:test_16u::@6->test_16u::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG490 test_16u::@7
+  b7:
   //SEG491 [239] call print_str 
-  //SEG492 [76] phi from test_16u::@8 to print_str [phi:test_16u::@8->print_str]
-  print_str_from_b8:
-  //SEG493 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16u::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG492 [76] phi from test_16u::@7 to print_str [phi:test_16u::@7->print_str]
+  print_str_from_b7:
+  //SEG493 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16u::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG494 test_16u::@9
-  b9:
+    jmp b8
+  //SEG494 test_16u::@8
+  b8:
   //SEG495 [240] (word) print_word::w#4 ← (word) rem16u#1 -- vwuz1=vwuz2 
     lda rem16u
     sta print_word.w
     lda rem16u+1
     sta print_word.w+1
   //SEG496 [241] call print_word 
-  //SEG497 [58] phi from test_16u::@9 to print_word [phi:test_16u::@9->print_word]
-  print_word_from_b9:
-  //SEG498 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@9->print_word#0] -- register_copy 
-  //SEG499 [58] phi (word) print_word::w#5 = (word) print_word::w#4 [phi:test_16u::@9->print_word#1] -- register_copy 
+  //SEG497 [58] phi from test_16u::@8 to print_word [phi:test_16u::@8->print_word]
+  print_word_from_b8:
+  //SEG498 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@8->print_word#0] -- register_copy 
+  //SEG499 [58] phi (word) print_word::w#5 = (word) print_word::w#4 [phi:test_16u::@8->print_word#1] -- register_copy 
     jsr print_word
-  //SEG500 [242] phi from test_16u::@9 to test_16u::@10 [phi:test_16u::@9->test_16u::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG501 test_16u::@10
-  b10:
+  //SEG500 [242] phi from test_16u::@8 to test_16u::@9 [phi:test_16u::@8->test_16u::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG501 test_16u::@9
+  b9:
   //SEG502 [243] call print_ln 
-  //SEG503 [44] phi from test_16u::@10 to print_ln [phi:test_16u::@10->print_ln]
-  print_ln_from_b10:
-  //SEG504 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16u::@10->print_ln#0] -- register_copy 
+  //SEG503 [44] phi from test_16u::@9 to print_ln [phi:test_16u::@9->print_ln]
+  print_ln_from_b9:
+  //SEG504 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16u::@9->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b11
-  //SEG505 test_16u::@11
-  b11:
+    jmp b10
+  //SEG505 test_16u::@10
+  b10:
   //SEG506 [244] (byte) test_16u::i#1 ← (byte) test_16u::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
@@ -8210,7 +8263,7 @@ test_16u: {
   //SEG507 [245] if((byte) test_16u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $c) goto test_16u::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$c
     cmp i
-    bne b1_from_b11
+    bne b1_from_b10
     jmp breturn
   //SEG508 test_16u::@return
   breturn:
@@ -8247,9 +8300,9 @@ div16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG518 [250] (word) divr16u::return#2 ← (word) divr16u::return#0
-    jmp b2
-  //SEG519 div16u::@2
-  b2:
+    jmp b1
+  //SEG519 div16u::@1
+  b1:
   //SEG520 [251] (word) div16u::return#0 ← (word) divr16u::return#2
     jmp breturn
   //SEG521 div16u::@return
@@ -8300,131 +8353,131 @@ test_8u: {
   //SEG536 [194] phi (byte) div8u::dividend#2 = (byte) div8u::dividend#1 [phi:test_8u::@1->div8u#1] -- register_copy 
     jsr div8u
   //SEG537 [260] (byte) div8u::return#3 ← (byte) div8u::return#0
-    jmp b3
-  //SEG538 test_8u::@3
-  b3:
+    jmp b2
+  //SEG538 test_8u::@2
+  b2:
   //SEG539 [261] (byte) test_8u::res#0 ← (byte) div8u::return#3 -- vbuz1=vbuaa 
     sta res
   //SEG540 [262] (byte) print_byte::b#3 ← (byte) test_8u::dividend#0
   //SEG541 [263] call print_byte 
-  //SEG542 [64] phi from test_8u::@3 to print_byte [phi:test_8u::@3->print_byte]
-  print_byte_from_b3:
-  //SEG543 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#138 [phi:test_8u::@3->print_byte#0] -- register_copy 
-  //SEG544 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#3 [phi:test_8u::@3->print_byte#1] -- register_copy 
+  //SEG542 [64] phi from test_8u::@2 to print_byte [phi:test_8u::@2->print_byte]
+  print_byte_from_b2:
+  //SEG543 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#138 [phi:test_8u::@2->print_byte#0] -- register_copy 
+  //SEG544 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#3 [phi:test_8u::@2->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG545 [264] phi from test_8u::@3 to test_8u::@4 [phi:test_8u::@3->test_8u::@4]
-  b4_from_b3:
-    jmp b4
-  //SEG546 test_8u::@4
-  b4:
+  //SEG545 [264] phi from test_8u::@2 to test_8u::@3 [phi:test_8u::@2->test_8u::@3]
+  b3_from_b2:
+    jmp b3
+  //SEG546 test_8u::@3
+  b3:
   //SEG547 [265] call print_str 
-  //SEG548 [76] phi from test_8u::@4 to print_str [phi:test_8u::@4->print_str]
-  print_str_from_b4:
-  //SEG549 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8u::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG548 [76] phi from test_8u::@3 to print_str [phi:test_8u::@3->print_str]
+  print_str_from_b3:
+  //SEG549 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8u::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b5
-  //SEG550 test_8u::@5
-  b5:
+    jmp b4
+  //SEG550 test_8u::@4
+  b4:
   //SEG551 [266] (byte) print_byte::b#4 ← (byte) test_8u::divisor#0 -- vbuz1=vbuz2 
     lda divisor
     sta print_byte.b
   //SEG552 [267] call print_byte 
-  //SEG553 [64] phi from test_8u::@5 to print_byte [phi:test_8u::@5->print_byte]
-  print_byte_from_b5:
-  //SEG554 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@5->print_byte#0] -- register_copy 
-  //SEG555 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#4 [phi:test_8u::@5->print_byte#1] -- register_copy 
+  //SEG553 [64] phi from test_8u::@4 to print_byte [phi:test_8u::@4->print_byte]
+  print_byte_from_b4:
+  //SEG554 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@4->print_byte#0] -- register_copy 
+  //SEG555 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#4 [phi:test_8u::@4->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG556 [268] phi from test_8u::@5 to test_8u::@6 [phi:test_8u::@5->test_8u::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG557 test_8u::@6
-  b6:
+  //SEG556 [268] phi from test_8u::@4 to test_8u::@5 [phi:test_8u::@4->test_8u::@5]
+  b5_from_b4:
+    jmp b5
+  //SEG557 test_8u::@5
+  b5:
   //SEG558 [269] call print_str 
-  //SEG559 [76] phi from test_8u::@6 to print_str [phi:test_8u::@6->print_str]
-  print_str_from_b6:
-  //SEG560 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8u::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG559 [76] phi from test_8u::@5 to print_str [phi:test_8u::@5->print_str]
+  print_str_from_b5:
+  //SEG560 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8u::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b7
-  //SEG561 test_8u::@7
-  b7:
+    jmp b6
+  //SEG561 test_8u::@6
+  b6:
   //SEG562 [270] (byte) print_byte::b#5 ← (byte) test_8u::res#0 -- vbuz1=vbuz2 
     lda res
     sta print_byte.b
   //SEG563 [271] call print_byte 
-  //SEG564 [64] phi from test_8u::@7 to print_byte [phi:test_8u::@7->print_byte]
-  print_byte_from_b7:
-  //SEG565 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@7->print_byte#0] -- register_copy 
-  //SEG566 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#5 [phi:test_8u::@7->print_byte#1] -- register_copy 
+  //SEG564 [64] phi from test_8u::@6 to print_byte [phi:test_8u::@6->print_byte]
+  print_byte_from_b6:
+  //SEG565 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@6->print_byte#0] -- register_copy 
+  //SEG566 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#5 [phi:test_8u::@6->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG567 [272] phi from test_8u::@7 to test_8u::@8 [phi:test_8u::@7->test_8u::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG568 test_8u::@8
-  b8:
+  //SEG567 [272] phi from test_8u::@6 to test_8u::@7 [phi:test_8u::@6->test_8u::@7]
+  b7_from_b6:
+    jmp b7
+  //SEG568 test_8u::@7
+  b7:
   //SEG569 [273] call print_str 
-  //SEG570 [76] phi from test_8u::@8 to print_str [phi:test_8u::@8->print_str]
-  print_str_from_b8:
-  //SEG571 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8u::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG570 [76] phi from test_8u::@7 to print_str [phi:test_8u::@7->print_str]
+  print_str_from_b7:
+  //SEG571 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8u::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-    jmp b9
-  //SEG572 test_8u::@9
-  b9:
+    jmp b8
+  //SEG572 test_8u::@8
+  b8:
   //SEG573 [274] (byte) print_byte::b#6 ← (byte) rem8u#17 -- vbuz1=vbuxx 
     stx print_byte.b
   //SEG574 [275] call print_byte 
-  //SEG575 [64] phi from test_8u::@9 to print_byte [phi:test_8u::@9->print_byte]
-  print_byte_from_b9:
-  //SEG576 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@9->print_byte#0] -- register_copy 
-  //SEG577 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#6 [phi:test_8u::@9->print_byte#1] -- register_copy 
+  //SEG575 [64] phi from test_8u::@8 to print_byte [phi:test_8u::@8->print_byte]
+  print_byte_from_b8:
+  //SEG576 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@8->print_byte#0] -- register_copy 
+  //SEG577 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#6 [phi:test_8u::@8->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG578 [276] phi from test_8u::@9 to test_8u::@10 [phi:test_8u::@9->test_8u::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG579 test_8u::@10
-  b10:
+  //SEG578 [276] phi from test_8u::@8 to test_8u::@9 [phi:test_8u::@8->test_8u::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG579 test_8u::@9
+  b9:
   //SEG580 [277] call print_ln 
-  //SEG581 [44] phi from test_8u::@10 to print_ln [phi:test_8u::@10->print_ln]
-  print_ln_from_b10:
-  //SEG582 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#41 [phi:test_8u::@10->print_ln#0] -- register_copy 
+  //SEG581 [44] phi from test_8u::@9 to print_ln [phi:test_8u::@9->print_ln]
+  print_ln_from_b9:
+  //SEG582 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#41 [phi:test_8u::@9->print_ln#0] -- register_copy 
     jsr print_ln
-    jmp b11
-  //SEG583 test_8u::@11
-  b11:
+    jmp b10
+  //SEG583 test_8u::@10
+  b10:
   //SEG584 [278] (byte) test_8u::i#1 ← ++ (byte) test_8u::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG585 [279] if((byte) test_8u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8u::@12 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG585 [279] if((byte) test_8u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8u::@11 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp i
-    bne b12
+    bne b11
     jmp breturn
   //SEG586 test_8u::@return
   breturn:
   //SEG587 [280] return 
     rts
-  //SEG588 test_8u::@12
-  b12:
+  //SEG588 test_8u::@11
+  b11:
   //SEG589 [281] (byte*~) print_char_cursor#188 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG590 [254] phi from test_8u::@12 to test_8u::@1 [phi:test_8u::@12->test_8u::@1]
-  b1_from_b12:
-  //SEG591 [254] phi (byte*) print_line_cursor#41 = (byte*) print_line_cursor#1 [phi:test_8u::@12->test_8u::@1#0] -- register_copy 
-  //SEG592 [254] phi (byte*) print_char_cursor#138 = (byte*~) print_char_cursor#188 [phi:test_8u::@12->test_8u::@1#1] -- register_copy 
-  //SEG593 [254] phi (byte) test_8u::i#10 = (byte) test_8u::i#1 [phi:test_8u::@12->test_8u::@1#2] -- register_copy 
+  //SEG590 [254] phi from test_8u::@11 to test_8u::@1 [phi:test_8u::@11->test_8u::@1]
+  b1_from_b11:
+  //SEG591 [254] phi (byte*) print_line_cursor#41 = (byte*) print_line_cursor#1 [phi:test_8u::@11->test_8u::@1#0] -- register_copy 
+  //SEG592 [254] phi (byte*) print_char_cursor#138 = (byte*~) print_char_cursor#188 [phi:test_8u::@11->test_8u::@1#1] -- register_copy 
+  //SEG593 [254] phi (byte) test_8u::i#10 = (byte) test_8u::i#1 [phi:test_8u::@11->test_8u::@1#2] -- register_copy 
     jmp b1
     dividends: .byte $ff, $ff, $ff, $ff, $ff, $ff
     divisors: .byte 5, 7, $b, $d, $11, $13
@@ -8475,7 +8528,7 @@ print_cls: {
   str1: .text " = @"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b32
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -8483,6 +8536,7 @@ Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp breturn
 Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b5
@@ -8491,29 +8545,28 @@ Removing instruction jmp b7
 Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
-Removing instruction jmp b11
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b7
+Removing instruction jmp b2
+Removing instruction jmp b8
 Removing instruction jmp b4
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b17
-Removing instruction jmp b2
-Removing instruction jmp b18
-Removing instruction jmp b4
-Removing instruction jmp b15
-Removing instruction jmp b11
+Removing instruction jmp b6
+Removing instruction jmp b5
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -8523,6 +8576,7 @@ Removing instruction jmp b3
 Removing instruction jmp b6
 Removing instruction jmp breturn
 Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b5
@@ -8531,21 +8585,20 @@ Removing instruction jmp b7
 Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
-Removing instruction jmp b11
 Removing instruction jmp breturn
 Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b5
-Removing instruction jmp b16
-Removing instruction jmp b2
-Removing instruction jmp b17
 Removing instruction jmp b4
-Removing instruction jmp b15
-Removing instruction jmp b11
-Removing instruction jmp breturn
+Removing instruction jmp b7
 Removing instruction jmp b2
+Removing instruction jmp b8
+Removing instruction jmp b4
+Removing instruction jmp b6
+Removing instruction jmp b5
+Removing instruction jmp breturn
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -8555,6 +8608,7 @@ Removing instruction jmp b3
 Removing instruction jmp b6
 Removing instruction jmp breturn
 Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b5
@@ -8563,11 +8617,11 @@ Removing instruction jmp b7
 Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
-Removing instruction jmp b11
-Removing instruction jmp breturn
-Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b5
@@ -8576,7 +8630,6 @@ Removing instruction jmp b7
 Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
-Removing instruction jmp b11
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -8594,32 +8647,32 @@ Removing instruction ldy i
 Removing instruction lda #0
 Removing instruction ldy i
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b1_from_b11 with b1
+Replacing label b1_from_b10 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_print_sword with b1
 Replacing label b1_from_b2 with b1
-Replacing label breturn_from_b19 with breturn
+Replacing label breturn_from_b9 with breturn
 Replacing label b4_from_b3 with b4
 Replacing label b2_from_b1 with b2
 Replacing label b3_from_b2 with b3
 Replacing label b3_from_b2 with b3
 Replacing label b1_from_b3 with b1
-Replacing label b1_from_b11 with b1
+Replacing label b1_from_b10 with b1
 Replacing label b1_from_print_sbyte with b1
-Replacing label b2_from_b5 with b2
-Replacing label breturn_from_b18 with breturn
+Replacing label b2_from_b4 with b2
+Replacing label breturn_from_b9 with breturn
 Replacing label b4_from_b3 with b4
 Replacing label b2_from_b1 with b2
 Replacing label b3_from_b2 with b3
 Replacing label b1_from_b3 with b1
-Replacing label b1_from_b11 with b1
+Replacing label b1_from_b10 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b32_from_bbegin:
-Removing instruction b32:
-Removing instruction main_from_b32:
-Removing instruction bend_from_b32:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction test_8u_from_b1:
 Removing instruction b2_from_b1:
@@ -8628,84 +8681,84 @@ Removing instruction b3_from_b2:
 Removing instruction test_8s_from_b3:
 Removing instruction b4_from_b3:
 Removing instruction test_16s_from_b4:
-Removing instruction b1_from_b11:
-Removing instruction b4_from_b3:
-Removing instruction print_str_from_b4:
-Removing instruction b6_from_b5:
-Removing instruction print_str_from_b6:
-Removing instruction b8_from_b7:
-Removing instruction print_str_from_b8:
-Removing instruction b10_from_b9:
-Removing instruction print_ln_from_b10:
+Removing instruction b1_from_b10:
+Removing instruction b3_from_b2:
+Removing instruction print_str_from_b3:
+Removing instruction b5_from_b4:
+Removing instruction print_str_from_b5:
+Removing instruction b7_from_b6:
+Removing instruction print_str_from_b7:
+Removing instruction b9_from_b8:
+Removing instruction print_ln_from_b9:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction b2_from_print_sword:
 Removing instruction print_char_from_b2:
 Removing instruction b1_from_print_sword:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction print_word_from_b1:
 Removing instruction b1_from_print_str:
 Removing instruction b1_from_b2:
 Removing instruction breturn:
-Removing instruction b2_from_b17:
-Removing instruction b18:
-Removing instruction b4_from_b18:
+Removing instruction b2_from_b7:
+Removing instruction b8:
 Removing instruction b4_from_b3:
+Removing instruction b4_from_b8:
 Removing instruction divr16u_from_b4:
-Removing instruction breturn_from_b11:
-Removing instruction breturn_from_b19:
+Removing instruction breturn_from_b5:
+Removing instruction breturn_from_b9:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
 Removing instruction b3_from_b2:
 Removing instruction b3_from_b5:
 Removing instruction breturn:
-Removing instruction b1_from_b11:
-Removing instruction b4_from_b3:
-Removing instruction print_str_from_b4:
-Removing instruction b6_from_b5:
-Removing instruction print_str_from_b6:
-Removing instruction b8_from_b7:
-Removing instruction print_str_from_b8:
-Removing instruction b10_from_b9:
-Removing instruction print_ln_from_b10:
+Removing instruction b1_from_b10:
+Removing instruction b3_from_b2:
+Removing instruction print_str_from_b3:
+Removing instruction b5_from_b4:
+Removing instruction print_str_from_b5:
+Removing instruction b7_from_b6:
+Removing instruction print_str_from_b7:
+Removing instruction b9_from_b8:
+Removing instruction print_ln_from_b9:
 Removing instruction b3_from_print_sbyte:
 Removing instruction print_char_from_b3:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction print_byte_from_b2:
 Removing instruction b1_from_print_sbyte:
 Removing instruction print_char_from_b1:
-Removing instruction b2_from_b16:
-Removing instruction b17:
-Removing instruction b4_from_b17:
+Removing instruction b2_from_b7:
+Removing instruction b8:
 Removing instruction b4_from_b3:
-Removing instruction breturn_from_b11:
-Removing instruction breturn_from_b18:
+Removing instruction b4_from_b8:
+Removing instruction breturn_from_b5:
+Removing instruction breturn_from_b9:
 Removing instruction breturn:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
 Removing instruction b3_from_b2:
 Removing instruction b3_from_b5:
-Removing instruction b1_from_b11:
-Removing instruction b4_from_b3:
-Removing instruction print_str_from_b4:
-Removing instruction b6_from_b5:
-Removing instruction print_str_from_b6:
-Removing instruction b8_from_b7:
-Removing instruction print_str_from_b8:
-Removing instruction b10_from_b9:
-Removing instruction print_ln_from_b10:
+Removing instruction b1_from_b10:
+Removing instruction b3_from_b2:
+Removing instruction print_str_from_b3:
+Removing instruction b5_from_b4:
+Removing instruction print_str_from_b5:
+Removing instruction b7_from_b6:
+Removing instruction print_str_from_b7:
+Removing instruction b9_from_b8:
+Removing instruction print_ln_from_b9:
 Removing instruction breturn:
-Removing instruction b4_from_b3:
-Removing instruction print_str_from_b4:
-Removing instruction b6_from_b5:
-Removing instruction print_str_from_b6:
-Removing instruction b8_from_b7:
-Removing instruction print_str_from_b8:
-Removing instruction b10_from_b9:
-Removing instruction print_ln_from_b10:
+Removing instruction b3_from_b2:
+Removing instruction print_str_from_b3:
+Removing instruction b5_from_b4:
+Removing instruction print_str_from_b5:
+Removing instruction b7_from_b6:
+Removing instruction print_str_from_b7:
+Removing instruction b9_from_b8:
+Removing instruction print_ln_from_b9:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
@@ -8716,23 +8769,23 @@ Removing instruction b3:
 Removing instruction b4:
 Removing instruction breturn:
 Removing instruction b1_from_test_16s:
+Removing instruction b2:
+Removing instruction print_sword_from_b2:
 Removing instruction b3:
-Removing instruction print_sword_from_b3:
 Removing instruction b4:
+Removing instruction print_sword_from_b4:
 Removing instruction b5:
-Removing instruction print_sword_from_b5:
 Removing instruction b6:
+Removing instruction print_sword_from_b6:
 Removing instruction b7:
-Removing instruction print_sword_from_b7:
 Removing instruction b8:
+Removing instruction print_sword_from_b8:
 Removing instruction b9:
-Removing instruction print_sword_from_b9:
 Removing instruction b10:
-Removing instruction b11:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b2:
-Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn:
 Removing instruction print_byte_from_print_word:
 Removing instruction b1:
@@ -8744,86 +8797,86 @@ Removing instruction print_char_from_b1:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction breturn:
-Removing instruction b2:
-Removing instruction b17:
-Removing instruction b15:
-Removing instruction b11:
+Removing instruction b1:
+Removing instruction b7:
+Removing instruction b6:
+Removing instruction b5:
 Removing instruction b2_from_b1:
 Removing instruction b1_from_divr16u:
 Removing instruction b4:
 Removing instruction b5:
 Removing instruction b6:
 Removing instruction b1_from_test_8s:
+Removing instruction b2:
+Removing instruction print_sbyte_from_b2:
 Removing instruction b3:
-Removing instruction print_sbyte_from_b3:
 Removing instruction b4:
+Removing instruction print_sbyte_from_b4:
 Removing instruction b5:
-Removing instruction print_sbyte_from_b5:
 Removing instruction b6:
+Removing instruction print_sbyte_from_b6:
 Removing instruction b7:
-Removing instruction print_sbyte_from_b7:
 Removing instruction b8:
+Removing instruction print_sbyte_from_b8:
 Removing instruction b9:
-Removing instruction print_sbyte_from_b9:
 Removing instruction b10:
-Removing instruction b11:
 Removing instruction breturn:
 Removing instruction b3:
 Removing instruction breturn:
-Removing instruction b5:
-Removing instruction b16:
+Removing instruction b4:
+Removing instruction b7:
 Removing instruction div8u_from_b4:
-Removing instruction b15:
-Removing instruction b11:
+Removing instruction b6:
+Removing instruction b5:
 Removing instruction b2_from_b1:
 Removing instruction divr8u_from_div8u:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction b1_from_divr8u:
 Removing instruction b4:
 Removing instruction b5:
 Removing instruction b6:
 Removing instruction breturn:
 Removing instruction b1_from_test_16u:
+Removing instruction b2:
+Removing instruction print_word_from_b2:
 Removing instruction b3:
-Removing instruction print_word_from_b3:
 Removing instruction b4:
+Removing instruction print_word_from_b4:
 Removing instruction b5:
-Removing instruction print_word_from_b5:
 Removing instruction b6:
+Removing instruction print_word_from_b6:
 Removing instruction b7:
-Removing instruction print_word_from_b7:
 Removing instruction b8:
+Removing instruction print_word_from_b8:
 Removing instruction b9:
-Removing instruction print_word_from_b9:
 Removing instruction b10:
-Removing instruction b11:
 Removing instruction breturn:
 Removing instruction divr16u_from_div16u:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction b1_from_test_8u:
 Removing instruction div8u_from_b1:
+Removing instruction b2:
+Removing instruction print_byte_from_b2:
 Removing instruction b3:
-Removing instruction print_byte_from_b3:
 Removing instruction b4:
+Removing instruction print_byte_from_b4:
 Removing instruction b5:
-Removing instruction print_byte_from_b5:
 Removing instruction b6:
+Removing instruction print_byte_from_b6:
 Removing instruction b7:
-Removing instruction print_byte_from_b7:
 Removing instruction b8:
+Removing instruction print_byte_from_b8:
 Removing instruction b9:
-Removing instruction print_byte_from_b9:
 Removing instruction b10:
-Removing instruction b11:
 Removing instruction breturn:
-Removing instruction b1_from_b12:
+Removing instruction b1_from_b11:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to breturn in beq b19
+Skipping double jump to breturn in beq b9
 Succesful ASM optimization Pass5DoubleJumpElimination
 Removing instruction jmp b1
 Removing instruction jmp b1
@@ -8833,18 +8886,18 @@ Removing instruction jmp b1
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
-Removing instruction b19:
+Removing instruction b9:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp breturn
 Succesful ASM optimization Pass5UnreachableCodeElimination
 Fixing long branch [76] bne b1 to beq
 
 FINAL SYMBOL TABLE
-(label) @32
+(label) @1
 (label) @begin
 (label) @end
 (signed word()) div16s((signed word) div16s::dividend , (signed word) div16s::divisor)
-(label) div16s::@2
+(label) div16s::@1
 (label) div16s::@return
 (signed word) div16s::dividend
 (signed word) div16s::dividend#0 dividend zp ZP_WORD:5 6.5
@@ -8854,7 +8907,7 @@ FINAL SYMBOL TABLE
 (signed word) div16s::return#0 return zp ZP_WORD:14 4.333333333333333
 (signed word) div16s::return#2 return zp ZP_WORD:14 22.0
 (word()) div16u((word) div16u::dividend , (word) div16u::divisor)
-(label) div16u::@2
+(label) div16u::@1
 (label) div16u::@return
 (word) div16u::dividend
 (word) div16u::dividend#0 dividend zp ZP_WORD:5 6.5
@@ -8867,14 +8920,14 @@ FINAL SYMBOL TABLE
 (signed byte~) div8s::$5 reg byte a 2.0
 (signed byte~) div8s::$8 reg byte x 1.0
 (label) div8s::@1
-(label) div8s::@11
-(label) div8s::@15
-(label) div8s::@16
-(label) div8s::@17
-(label) div8s::@18
 (label) div8s::@2
 (label) div8s::@3
 (label) div8s::@4
+(label) div8s::@5
+(label) div8s::@6
+(label) div8s::@7
+(label) div8s::@8
+(label) div8s::@9
 (label) div8s::@return
 (signed byte) div8s::dividend
 (signed byte) div8s::dividend#0 reg byte y 5.0
@@ -8900,7 +8953,7 @@ FINAL SYMBOL TABLE
 (signed byte) div8s::return#3 reg byte a 22.0
 (signed byte~) div8s::return#7 reg byte a 2.0
 (byte()) div8u((byte) div8u::dividend , (byte) div8u::divisor)
-(label) div8u::@2
+(label) div8u::@1
 (label) div8u::@return
 (byte) div8u::dividend
 (byte) div8u::dividend#0 reg byte a 2.0
@@ -8918,14 +8971,14 @@ FINAL SYMBOL TABLE
 (signed word~) divr16s::$13 $13 zp ZP_WORD:12 1.0
 (signed word~) divr16s::$8 $8 zp ZP_WORD:8 2.0
 (label) divr16s::@1
-(label) divr16s::@11
-(label) divr16s::@15
-(label) divr16s::@17
-(label) divr16s::@18
-(label) divr16s::@19
 (label) divr16s::@2
 (label) divr16s::@3
 (label) divr16s::@4
+(label) divr16s::@5
+(label) divr16s::@6
+(label) divr16s::@7
+(label) divr16s::@8
+(label) divr16s::@9
 (label) divr16s::@return
 (signed word) divr16s::dividend
 (signed word) divr16s::dividend#0 dividend zp ZP_WORD:8 2.0
@@ -9087,7 +9140,7 @@ FINAL SYMBOL TABLE
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 b zp ZP_BYTE:7 4.0
@@ -9109,7 +9162,7 @@ FINAL SYMBOL TABLE
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:5 4.0
@@ -9147,7 +9200,7 @@ FINAL SYMBOL TABLE
 (void()) test_16s()
 (label) test_16s::@1
 (label) test_16s::@10
-(label) test_16s::@11
+(label) test_16s::@2
 (label) test_16s::@3
 (label) test_16s::@4
 (label) test_16s::@5
@@ -9172,7 +9225,7 @@ FINAL SYMBOL TABLE
 (void()) test_16u()
 (label) test_16u::@1
 (label) test_16u::@10
-(label) test_16u::@11
+(label) test_16u::@2
 (label) test_16u::@3
 (label) test_16u::@4
 (label) test_16u::@5
@@ -9197,7 +9250,7 @@ FINAL SYMBOL TABLE
 (void()) test_8s()
 (label) test_8s::@1
 (label) test_8s::@10
-(label) test_8s::@11
+(label) test_8s::@2
 (label) test_8s::@3
 (label) test_8s::@4
 (label) test_8s::@5
@@ -9223,7 +9276,7 @@ FINAL SYMBOL TABLE
 (label) test_8u::@1
 (label) test_8u::@10
 (label) test_8u::@11
-(label) test_8u::@12
+(label) test_8u::@2
 (label) test_8u::@3
 (label) test_8u::@4
 (label) test_8u::@5
@@ -9305,11 +9358,11 @@ Score: 32651
   .label rem16u = $a
   .label rem16s = $a
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @32 [phi:@begin->@32]
-//SEG5 @32
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @32 to main [phi:@32->main]
-//SEG8 [3] phi from @32 to @end [phi:@32->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -9350,8 +9403,8 @@ test_16s: {
   //SEG33 [16] phi (byte) test_16s::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:test_16s->test_16s::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG34 [16] phi from test_16s::@11 to test_16s::@1 [phi:test_16s::@11->test_16s::@1]
-  //SEG35 [16] phi (byte) test_16s::i#10 = (byte) test_16s::i#1 [phi:test_16s::@11->test_16s::@1#0] -- register_copy 
+  //SEG34 [16] phi from test_16s::@10 to test_16s::@1 [phi:test_16s::@10->test_16s::@1]
+  //SEG35 [16] phi (byte) test_16s::i#10 = (byte) test_16s::i#1 [phi:test_16s::@10->test_16s::@1#0] -- register_copy 
   //SEG36 test_16s::@1
   b1:
   //SEG37 [17] (signed word) test_16s::dividend#0 ← *((const signed word[]) test_16s::dividends#0 + (byte) test_16s::i#10) -- vwsz1=pwsc1_derefidx_vbuz2 
@@ -9370,7 +9423,7 @@ test_16s: {
   //SEG41 [21] call div16s 
     jsr div16s
   //SEG42 [22] (signed word) div16s::return#2 ← (signed word) div16s::return#0
-  //SEG43 test_16s::@3
+  //SEG43 test_16s::@2
   //SEG44 [23] (signed word) test_16s::res#0 ← (signed word) div16s::return#2
   //SEG45 [24] (signed word) print_sword::w#1 ← (signed word) test_16s::dividend#0
   //SEG46 [25] (byte*~) print_char_cursor#159 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
@@ -9379,80 +9432,80 @@ test_16s: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG47 [26] call print_sword 
-  //SEG48 [49] phi from test_16s::@3 to print_sword [phi:test_16s::@3->print_sword]
-  //SEG49 [49] phi (byte*) print_char_cursor#131 = (byte*~) print_char_cursor#159 [phi:test_16s::@3->print_sword#0] -- register_copy 
-  //SEG50 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#1 [phi:test_16s::@3->print_sword#1] -- register_copy 
+  //SEG48 [49] phi from test_16s::@2 to print_sword [phi:test_16s::@2->print_sword]
+  //SEG49 [49] phi (byte*) print_char_cursor#131 = (byte*~) print_char_cursor#159 [phi:test_16s::@2->print_sword#0] -- register_copy 
+  //SEG50 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#1 [phi:test_16s::@2->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG51 [27] phi from test_16s::@3 to test_16s::@4 [phi:test_16s::@3->test_16s::@4]
-  //SEG52 test_16s::@4
+  //SEG51 [27] phi from test_16s::@2 to test_16s::@3 [phi:test_16s::@2->test_16s::@3]
+  //SEG52 test_16s::@3
   //SEG53 [28] call print_str 
-  //SEG54 [76] phi from test_16s::@4 to print_str [phi:test_16s::@4->print_str]
-  //SEG55 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16s::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG54 [76] phi from test_16s::@3 to print_str [phi:test_16s::@3->print_str]
+  //SEG55 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16s::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG56 test_16s::@5
+  //SEG56 test_16s::@4
   //SEG57 [29] (signed word) print_sword::w#2 ← (signed word) test_16s::divisor#0 -- vwsz1=vwsz2 
     lda divisor
     sta print_sword.w
     lda divisor+1
     sta print_sword.w+1
   //SEG58 [30] call print_sword 
-  //SEG59 [49] phi from test_16s::@5 to print_sword [phi:test_16s::@5->print_sword]
-  //SEG60 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@5->print_sword#0] -- register_copy 
-  //SEG61 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#2 [phi:test_16s::@5->print_sword#1] -- register_copy 
+  //SEG59 [49] phi from test_16s::@4 to print_sword [phi:test_16s::@4->print_sword]
+  //SEG60 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@4->print_sword#0] -- register_copy 
+  //SEG61 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#2 [phi:test_16s::@4->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG62 [31] phi from test_16s::@5 to test_16s::@6 [phi:test_16s::@5->test_16s::@6]
-  //SEG63 test_16s::@6
+  //SEG62 [31] phi from test_16s::@4 to test_16s::@5 [phi:test_16s::@4->test_16s::@5]
+  //SEG63 test_16s::@5
   //SEG64 [32] call print_str 
-  //SEG65 [76] phi from test_16s::@6 to print_str [phi:test_16s::@6->print_str]
-  //SEG66 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16s::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG65 [76] phi from test_16s::@5 to print_str [phi:test_16s::@5->print_str]
+  //SEG66 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16s::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG67 test_16s::@7
+  //SEG67 test_16s::@6
   //SEG68 [33] (signed word) print_sword::w#3 ← (signed word) test_16s::res#0 -- vwsz1=vwsz2 
     lda res
     sta print_sword.w
     lda res+1
     sta print_sword.w+1
   //SEG69 [34] call print_sword 
-  //SEG70 [49] phi from test_16s::@7 to print_sword [phi:test_16s::@7->print_sword]
-  //SEG71 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@7->print_sword#0] -- register_copy 
-  //SEG72 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#3 [phi:test_16s::@7->print_sword#1] -- register_copy 
+  //SEG70 [49] phi from test_16s::@6 to print_sword [phi:test_16s::@6->print_sword]
+  //SEG71 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@6->print_sword#0] -- register_copy 
+  //SEG72 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#3 [phi:test_16s::@6->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG73 [35] phi from test_16s::@7 to test_16s::@8 [phi:test_16s::@7->test_16s::@8]
-  //SEG74 test_16s::@8
+  //SEG73 [35] phi from test_16s::@6 to test_16s::@7 [phi:test_16s::@6->test_16s::@7]
+  //SEG74 test_16s::@7
   //SEG75 [36] call print_str 
-  //SEG76 [76] phi from test_16s::@8 to print_str [phi:test_16s::@8->print_str]
-  //SEG77 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16s::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG76 [76] phi from test_16s::@7 to print_str [phi:test_16s::@7->print_str]
+  //SEG77 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16s::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-  //SEG78 test_16s::@9
+  //SEG78 test_16s::@8
   //SEG79 [37] (signed word) print_sword::w#4 ← (signed word) rem16s#11 -- vwsz1=vwsz2 
     lda rem16s
     sta print_sword.w
     lda rem16s+1
     sta print_sword.w+1
   //SEG80 [38] call print_sword 
-  //SEG81 [49] phi from test_16s::@9 to print_sword [phi:test_16s::@9->print_sword]
-  //SEG82 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@9->print_sword#0] -- register_copy 
-  //SEG83 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:test_16s::@9->print_sword#1] -- register_copy 
+  //SEG81 [49] phi from test_16s::@8 to print_sword [phi:test_16s::@8->print_sword]
+  //SEG82 [49] phi (byte*) print_char_cursor#131 = (byte*) print_char_cursor#128 [phi:test_16s::@8->print_sword#0] -- register_copy 
+  //SEG83 [49] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:test_16s::@8->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG84 [39] phi from test_16s::@9 to test_16s::@10 [phi:test_16s::@9->test_16s::@10]
-  //SEG85 test_16s::@10
+  //SEG84 [39] phi from test_16s::@8 to test_16s::@9 [phi:test_16s::@8->test_16s::@9]
+  //SEG85 test_16s::@9
   //SEG86 [40] call print_ln 
-  //SEG87 [44] phi from test_16s::@10 to print_ln [phi:test_16s::@10->print_ln]
-  //SEG88 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16s::@10->print_ln#0] -- register_copy 
+  //SEG87 [44] phi from test_16s::@9 to print_ln [phi:test_16s::@9->print_ln]
+  //SEG88 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16s::@9->print_ln#0] -- register_copy 
     jsr print_ln
-  //SEG89 test_16s::@11
+  //SEG89 test_16s::@10
   //SEG90 [41] (byte) test_16s::i#1 ← (byte) test_16s::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
@@ -9514,7 +9567,7 @@ print_sword: {
   //SEG109 [72] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG110 print_sword::@4
+  //SEG110 print_sword::@3
   //SEG111 [53] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#5 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -9525,9 +9578,9 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG112 [54] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
-  //SEG113 [54] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#131 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG114 [54] phi (signed word) print_sword::w#6 = (signed word) print_sword::w#5 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  //SEG112 [54] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
+  //SEG113 [54] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#131 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG114 [54] phi (signed word) print_sword::w#6 = (signed word) print_sword::w#5 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
   //SEG115 print_sword::@1
   b1:
   //SEG116 [55] (word~) print_word::w#7 ← (word)(signed word) print_sword::w#6
@@ -9678,7 +9731,7 @@ div16s: {
   //SEG173 [85] call divr16s 
     jsr divr16s
   //SEG174 [86] (signed word) divr16s::return#3 ← (signed word) divr16s::return#2
-  //SEG175 div16s::@2
+  //SEG175 div16s::@1
   //SEG176 [87] (signed word) div16s::return#0 ← (signed word) divr16s::return#3
   //SEG177 div16s::@return
   //SEG178 [88] return 
@@ -9705,27 +9758,27 @@ divr16s: {
   //SEG180 [89] if((signed word) divr16s::dividend#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@1 -- vwsz1_lt_0_then_la1 
     lda dividend+1
     bmi b1
-  //SEG181 divr16s::@17
+  //SEG181 divr16s::@7
   //SEG182 [90] (word~) divr16s::dividendu#8 ← (word)(signed word) divr16s::dividend#0
-  //SEG183 [91] phi from divr16s::@17 to divr16s::@2 [phi:divr16s::@17->divr16s::@2]
-  //SEG184 [91] phi (word) divr16s::remu#3 = ((word))(const signed word) divr16s::rem#0 [phi:divr16s::@17->divr16s::@2#0] -- vwuz1=vbuc1 
+  //SEG183 [91] phi from divr16s::@7 to divr16s::@2 [phi:divr16s::@7->divr16s::@2]
+  //SEG184 [91] phi (word) divr16s::remu#3 = ((word))(const signed word) divr16s::rem#0 [phi:divr16s::@7->divr16s::@2#0] -- vwuz1=vbuc1 
     lda #rem
     sta remu
     lda #0
     sta remu+1
-  //SEG185 [91] phi (word) divr16s::dividendu#3 = (word~) divr16s::dividendu#8 [phi:divr16s::@17->divr16s::@2#1] -- register_copy 
-  //SEG186 [91] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@17->divr16s::@2#2] -- vbuyy=vbuc1 
+  //SEG185 [91] phi (word) divr16s::dividendu#3 = (word~) divr16s::dividendu#8 [phi:divr16s::@7->divr16s::@2#1] -- register_copy 
+  //SEG186 [91] phi (byte) divr16s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:divr16s::@7->divr16s::@2#2] -- vbuyy=vbuc1 
     tay
   //SEG187 divr16s::@2
   b2:
   //SEG188 [92] if((signed word) divr16s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@3 -- vwsz1_lt_0_then_la1 
     lda divisor+1
     bmi b3
-  //SEG189 divr16s::@18
+  //SEG189 divr16s::@8
   //SEG190 [93] (word~) divr16s::divisoru#5 ← (word)(signed word) divr16s::divisor#0
-  //SEG191 [94] phi from divr16s::@18 divr16s::@3 to divr16s::@4 [phi:divr16s::@18/divr16s::@3->divr16s::@4]
-  //SEG192 [94] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#3 [phi:divr16s::@18/divr16s::@3->divr16s::@4#0] -- register_copy 
-  //SEG193 [94] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#5 [phi:divr16s::@18/divr16s::@3->divr16s::@4#1] -- register_copy 
+  //SEG191 [94] phi from divr16s::@3 divr16s::@8 to divr16s::@4 [phi:divr16s::@3/divr16s::@8->divr16s::@4]
+  //SEG192 [94] phi (byte) divr16s::neg#4 = (byte) divr16s::neg#2 [phi:divr16s::@3/divr16s::@8->divr16s::@4#0] -- register_copy 
+  //SEG193 [94] phi (word) divr16s::divisoru#3 = (word~) divr16s::divisoru#4 [phi:divr16s::@3/divr16s::@8->divr16s::@4#1] -- register_copy 
   //SEG194 divr16s::@4
   b4:
   //SEG195 [95] (word) divr16u::dividend#2 ← (word) divr16s::dividendu#3
@@ -9738,12 +9791,12 @@ divr16s: {
   //SEG202 [113] phi (word) divr16u::rem#10 = (word) divr16u::rem#4 [phi:divr16s::@4->divr16u#2] -- register_copy 
     jsr divr16u
   //SEG203 [99] (word) divr16u::return#3 ← (word) divr16u::return#0
-  //SEG204 divr16s::@15
+  //SEG204 divr16s::@6
   //SEG205 [100] (word) divr16s::resultu#0 ← (word) divr16u::return#3
-  //SEG206 [101] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@19 -- vbuyy_eq_0_then_la1 
+  //SEG206 [101] if((byte) divr16s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto divr16s::@9 -- vbuyy_eq_0_then_la1 
     cpy #0
     beq breturn
-  //SEG207 divr16s::@11
+  //SEG207 divr16s::@5
   //SEG208 [102] (signed word) rem16s#2 ← - (signed word)(word) rem16u#1 -- vwsz1=_neg_vwsz1 
     sec
     lda rem16s
@@ -9764,14 +9817,14 @@ divr16s: {
     eor #$ff
     adc #0
     sta return+1
-  //SEG210 [104] phi from divr16s::@11 divr16s::@19 to divr16s::@return [phi:divr16s::@11/divr16s::@19->divr16s::@return]
-  //SEG211 [104] phi (signed word) rem16s#11 = (signed word) rem16s#2 [phi:divr16s::@11/divr16s::@19->divr16s::@return#0] -- register_copy 
-  //SEG212 [104] phi (signed word) divr16s::return#2 = (signed word) divr16s::return#1 [phi:divr16s::@11/divr16s::@19->divr16s::@return#1] -- register_copy 
+  //SEG210 [104] phi from divr16s::@5 divr16s::@9 to divr16s::@return [phi:divr16s::@5/divr16s::@9->divr16s::@return]
+  //SEG211 [104] phi (signed word) rem16s#11 = (signed word) rem16s#2 [phi:divr16s::@5/divr16s::@9->divr16s::@return#0] -- register_copy 
+  //SEG212 [104] phi (signed word) divr16s::return#2 = (signed word) divr16s::return#1 [phi:divr16s::@5/divr16s::@9->divr16s::@return#1] -- register_copy 
   //SEG213 divr16s::@return
   breturn:
   //SEG214 [105] return 
     rts
-  //SEG215 divr16s::@19
+  //SEG215 divr16s::@9
   //SEG216 [106] (signed word~) divr16s::return#7 ← (signed word)(word) divr16s::resultu#0
   //SEG217 [107] (signed word~) rem16s#37 ← (signed word)(word) rem16u#1
   //SEG218 divr16s::@3
@@ -9918,8 +9971,8 @@ test_8s: {
   //SEG268 [132] phi (byte) test_8s::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:test_8s->test_8s::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG269 [132] phi from test_8s::@11 to test_8s::@1 [phi:test_8s::@11->test_8s::@1]
-  //SEG270 [132] phi (byte) test_8s::i#10 = (byte) test_8s::i#1 [phi:test_8s::@11->test_8s::@1#0] -- register_copy 
+  //SEG269 [132] phi from test_8s::@10 to test_8s::@1 [phi:test_8s::@10->test_8s::@1]
+  //SEG270 [132] phi (byte) test_8s::i#10 = (byte) test_8s::i#1 [phi:test_8s::@10->test_8s::@1#0] -- register_copy 
   //SEG271 test_8s::@1
   b1:
   //SEG272 [133] (signed byte) test_8s::dividend#0 ← *((const signed byte[]) test_8s::dividends#0 + (byte) test_8s::i#10) -- vbsz1=pbsc1_derefidx_vbuz2 
@@ -9936,7 +9989,7 @@ test_8s: {
   //SEG276 [137] call div8s 
     jsr div8s
   //SEG277 [138] (signed byte) div8s::return#3 ← (signed byte) div8s::return#2
-  //SEG278 test_8s::@3
+  //SEG278 test_8s::@2
   //SEG279 [139] (signed byte) test_8s::res#0 ← (signed byte) div8s::return#3 -- vbsz1=vbsaa 
     sta res
   //SEG280 [140] (signed byte) print_sbyte::b#1 ← (signed byte) test_8s::dividend#0
@@ -9946,73 +9999,73 @@ test_8s: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG282 [142] call print_sbyte 
-  //SEG283 [160] phi from test_8s::@3 to print_sbyte [phi:test_8s::@3->print_sbyte]
-  //SEG284 [160] phi (byte*) print_char_cursor#132 = (byte*~) print_char_cursor#184 [phi:test_8s::@3->print_sbyte#0] -- register_copy 
-  //SEG285 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#1 [phi:test_8s::@3->print_sbyte#1] -- register_copy 
+  //SEG283 [160] phi from test_8s::@2 to print_sbyte [phi:test_8s::@2->print_sbyte]
+  //SEG284 [160] phi (byte*) print_char_cursor#132 = (byte*~) print_char_cursor#184 [phi:test_8s::@2->print_sbyte#0] -- register_copy 
+  //SEG285 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#1 [phi:test_8s::@2->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG286 [143] phi from test_8s::@3 to test_8s::@4 [phi:test_8s::@3->test_8s::@4]
-  //SEG287 test_8s::@4
+  //SEG286 [143] phi from test_8s::@2 to test_8s::@3 [phi:test_8s::@2->test_8s::@3]
+  //SEG287 test_8s::@3
   //SEG288 [144] call print_str 
-  //SEG289 [76] phi from test_8s::@4 to print_str [phi:test_8s::@4->print_str]
-  //SEG290 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8s::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG289 [76] phi from test_8s::@3 to print_str [phi:test_8s::@3->print_str]
+  //SEG290 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8s::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG291 test_8s::@5
+  //SEG291 test_8s::@4
   //SEG292 [145] (signed byte) print_sbyte::b#2 ← (signed byte) test_8s::divisor#0 -- vbsz1=vbsz2 
     lda divisor
     sta print_sbyte.b
   //SEG293 [146] call print_sbyte 
-  //SEG294 [160] phi from test_8s::@5 to print_sbyte [phi:test_8s::@5->print_sbyte]
-  //SEG295 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@5->print_sbyte#0] -- register_copy 
-  //SEG296 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#2 [phi:test_8s::@5->print_sbyte#1] -- register_copy 
+  //SEG294 [160] phi from test_8s::@4 to print_sbyte [phi:test_8s::@4->print_sbyte]
+  //SEG295 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@4->print_sbyte#0] -- register_copy 
+  //SEG296 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#2 [phi:test_8s::@4->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG297 [147] phi from test_8s::@5 to test_8s::@6 [phi:test_8s::@5->test_8s::@6]
-  //SEG298 test_8s::@6
+  //SEG297 [147] phi from test_8s::@4 to test_8s::@5 [phi:test_8s::@4->test_8s::@5]
+  //SEG298 test_8s::@5
   //SEG299 [148] call print_str 
-  //SEG300 [76] phi from test_8s::@6 to print_str [phi:test_8s::@6->print_str]
-  //SEG301 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8s::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG300 [76] phi from test_8s::@5 to print_str [phi:test_8s::@5->print_str]
+  //SEG301 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8s::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG302 test_8s::@7
+  //SEG302 test_8s::@6
   //SEG303 [149] (signed byte) print_sbyte::b#3 ← (signed byte) test_8s::res#0 -- vbsz1=vbsz2 
     lda res
     sta print_sbyte.b
   //SEG304 [150] call print_sbyte 
-  //SEG305 [160] phi from test_8s::@7 to print_sbyte [phi:test_8s::@7->print_sbyte]
-  //SEG306 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@7->print_sbyte#0] -- register_copy 
-  //SEG307 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#3 [phi:test_8s::@7->print_sbyte#1] -- register_copy 
+  //SEG305 [160] phi from test_8s::@6 to print_sbyte [phi:test_8s::@6->print_sbyte]
+  //SEG306 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@6->print_sbyte#0] -- register_copy 
+  //SEG307 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#3 [phi:test_8s::@6->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG308 [151] phi from test_8s::@7 to test_8s::@8 [phi:test_8s::@7->test_8s::@8]
-  //SEG309 test_8s::@8
+  //SEG308 [151] phi from test_8s::@6 to test_8s::@7 [phi:test_8s::@6->test_8s::@7]
+  //SEG309 test_8s::@7
   //SEG310 [152] call print_str 
-  //SEG311 [76] phi from test_8s::@8 to print_str [phi:test_8s::@8->print_str]
-  //SEG312 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8s::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG311 [76] phi from test_8s::@7 to print_str [phi:test_8s::@7->print_str]
+  //SEG312 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8s::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-  //SEG313 test_8s::@9
+  //SEG313 test_8s::@8
   //SEG314 [153] (signed byte) print_sbyte::b#4 ← (signed byte) rem8s#3 -- vbsz1=vbsxx 
     stx print_sbyte.b
   //SEG315 [154] call print_sbyte 
-  //SEG316 [160] phi from test_8s::@9 to print_sbyte [phi:test_8s::@9->print_sbyte]
-  //SEG317 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@9->print_sbyte#0] -- register_copy 
-  //SEG318 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#4 [phi:test_8s::@9->print_sbyte#1] -- register_copy 
+  //SEG316 [160] phi from test_8s::@8 to print_sbyte [phi:test_8s::@8->print_sbyte]
+  //SEG317 [160] phi (byte*) print_char_cursor#132 = (byte*) print_char_cursor#128 [phi:test_8s::@8->print_sbyte#0] -- register_copy 
+  //SEG318 [160] phi (signed byte) print_sbyte::b#10 = (signed byte) print_sbyte::b#4 [phi:test_8s::@8->print_sbyte#1] -- register_copy 
     jsr print_sbyte
-  //SEG319 [155] phi from test_8s::@9 to test_8s::@10 [phi:test_8s::@9->test_8s::@10]
-  //SEG320 test_8s::@10
+  //SEG319 [155] phi from test_8s::@8 to test_8s::@9 [phi:test_8s::@8->test_8s::@9]
+  //SEG320 test_8s::@9
   //SEG321 [156] call print_ln 
-  //SEG322 [44] phi from test_8s::@10 to print_ln [phi:test_8s::@10->print_ln]
-  //SEG323 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_8s::@10->print_ln#0] -- register_copy 
+  //SEG322 [44] phi from test_8s::@9 to print_ln [phi:test_8s::@9->print_ln]
+  //SEG323 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_8s::@9->print_ln#0] -- register_copy 
     jsr print_ln
-  //SEG324 test_8s::@11
+  //SEG324 test_8s::@10
   //SEG325 [157] (byte) test_8s::i#1 ← ++ (byte) test_8s::i#10 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG326 [158] if((byte) test_8s::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8s::@1 -- vbuz1_neq_vbuc1_then_la1 
@@ -10041,8 +10094,8 @@ print_sbyte: {
   //SEG336 [72] phi (byte) print_char::ch#5 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG337 [164] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
-  //SEG338 [164] phi (signed byte) print_sbyte::b#7 = (signed byte) print_sbyte::b#10 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  //SEG337 [164] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
+  //SEG338 [164] phi (signed byte) print_sbyte::b#7 = (signed byte) print_sbyte::b#10 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
   //SEG339 print_sbyte::@2
   b2:
   //SEG340 [165] (byte~) print_byte::b#9 ← (byte)(signed byte) print_sbyte::b#7
@@ -10063,7 +10116,7 @@ print_sbyte: {
   //SEG352 [72] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG353 print_sbyte::@5
+  //SEG353 print_sbyte::@4
   //SEG354 [170] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#10 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
@@ -10085,11 +10138,11 @@ div8s: {
   //SEG356 [171] if((signed byte) div8s::dividend#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@1 -- vbsyy_lt_0_then_la1 
     cpy #0
     bmi b1
-  //SEG357 div8s::@16
+  //SEG357 div8s::@7
   //SEG358 [172] (byte~) div8s::dividendu#8 ← (byte)(signed byte) div8s::dividend#0
-  //SEG359 [173] phi from div8s::@16 to div8s::@2 [phi:div8s::@16->div8s::@2]
-  //SEG360 [173] phi (byte) div8s::dividendu#3 = (byte~) div8s::dividendu#8 [phi:div8s::@16->div8s::@2#0] -- register_copy 
-  //SEG361 [173] phi (byte) div8s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:div8s::@16->div8s::@2#1] -- vbuz1=vbuc1 
+  //SEG359 [173] phi from div8s::@7 to div8s::@2 [phi:div8s::@7->div8s::@2]
+  //SEG360 [173] phi (byte) div8s::dividendu#3 = (byte~) div8s::dividendu#8 [phi:div8s::@7->div8s::@2#0] -- register_copy 
+  //SEG361 [173] phi (byte) div8s::neg#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:div8s::@7->div8s::@2#1] -- vbuz1=vbuc1 
     lda #0
     sta neg
   //SEG362 div8s::@2
@@ -10097,11 +10150,11 @@ div8s: {
   //SEG363 [174] if((signed byte) div8s::divisor#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@3 -- vbsxx_lt_0_then_la1 
     cpx #0
     bmi b3
-  //SEG364 div8s::@17
+  //SEG364 div8s::@8
   //SEG365 [175] (byte~) div8s::divisoru#5 ← (byte)(signed byte) div8s::divisor#0
-  //SEG366 [176] phi from div8s::@17 div8s::@3 to div8s::@4 [phi:div8s::@17/div8s::@3->div8s::@4]
-  //SEG367 [176] phi (byte) div8s::neg#4 = (byte) div8s::neg#3 [phi:div8s::@17/div8s::@3->div8s::@4#0] -- register_copy 
-  //SEG368 [176] phi (byte) div8s::divisoru#3 = (byte~) div8s::divisoru#5 [phi:div8s::@17/div8s::@3->div8s::@4#1] -- register_copy 
+  //SEG366 [176] phi from div8s::@3 div8s::@8 to div8s::@4 [phi:div8s::@3/div8s::@8->div8s::@4]
+  //SEG367 [176] phi (byte) div8s::neg#4 = (byte) div8s::neg#2 [phi:div8s::@3/div8s::@8->div8s::@4#0] -- register_copy 
+  //SEG368 [176] phi (byte) div8s::divisoru#3 = (byte~) div8s::divisoru#4 [phi:div8s::@3/div8s::@8->div8s::@4#1] -- register_copy 
   //SEG369 div8s::@4
   b4:
   //SEG370 [177] (byte) div8u::dividend#0 ← (byte) div8s::dividendu#3 -- vbuaa=vbuyy 
@@ -10113,14 +10166,14 @@ div8s: {
   //SEG375 [194] phi (byte) div8u::dividend#2 = (byte) div8u::dividend#0 [phi:div8s::@4->div8u#1] -- register_copy 
     jsr div8u
   //SEG376 [180] (byte) div8u::return#2 ← (byte) div8u::return#0
-  //SEG377 div8s::@15
+  //SEG377 div8s::@6
   //SEG378 [181] (byte) div8s::resultu#0 ← (byte) div8u::return#2 -- vbuyy=vbuaa 
     tay
-  //SEG379 [182] if((byte) div8s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@18 -- vbuz1_eq_0_then_la1 
+  //SEG379 [182] if((byte) div8s::neg#4==(byte/signed byte/word/signed word/dword/signed dword) 0) goto div8s::@9 -- vbuz1_eq_0_then_la1 
     lda neg
     cmp #0
-    beq b18
-  //SEG380 div8s::@11
+    beq b9
+  //SEG380 div8s::@5
   //SEG381 [183] (signed byte) rem8s#2 ← - (signed byte)(byte) rem8u#17 -- vbsxx=_neg_vbsxx 
     txa
     eor #$ff
@@ -10132,15 +10185,15 @@ div8s: {
     eor #$ff
     clc
     adc #1
-  //SEG383 [185] phi from div8s::@11 div8s::@18 to div8s::@return [phi:div8s::@11/div8s::@18->div8s::@return]
-  //SEG384 [185] phi (signed byte) rem8s#3 = (signed byte) rem8s#2 [phi:div8s::@11/div8s::@18->div8s::@return#0] -- register_copy 
-  //SEG385 [185] phi (signed byte) div8s::return#2 = (signed byte) div8s::return#1 [phi:div8s::@11/div8s::@18->div8s::@return#1] -- register_copy 
+  //SEG383 [185] phi from div8s::@5 div8s::@9 to div8s::@return [phi:div8s::@5/div8s::@9->div8s::@return]
+  //SEG384 [185] phi (signed byte) rem8s#3 = (signed byte) rem8s#2 [phi:div8s::@5/div8s::@9->div8s::@return#0] -- register_copy 
+  //SEG385 [185] phi (signed byte) div8s::return#2 = (signed byte) div8s::return#1 [phi:div8s::@5/div8s::@9->div8s::@return#1] -- register_copy 
   //SEG386 div8s::@return
   breturn:
   //SEG387 [186] return 
     rts
-  //SEG388 div8s::@18
-  b18:
+  //SEG388 div8s::@9
+  b9:
   //SEG389 [187] (signed byte~) div8s::return#7 ← (signed byte)(byte) div8s::resultu#0 -- vbsaa=vbsyy 
     tya
   //SEG390 [188] (signed byte~) rem8s#33 ← (signed byte)(byte) rem8u#17
@@ -10191,7 +10244,7 @@ div8u: {
     jsr divr8u
   //SEG406 [198] (byte) divr8u::return#0 ← (byte) divr8u::return#1 -- vbuaa=vbuz1 
     lda divr8u.return
-  //SEG407 div8u::@2
+  //SEG407 div8u::@1
   //SEG408 [199] (byte) div8u::return#0 ← (byte) divr8u::return#0
   //SEG409 div8u::@return
   //SEG410 [200] return 
@@ -10286,8 +10339,8 @@ test_16u: {
   //SEG449 [219] phi (byte) test_16u::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:test_16u->test_16u::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG450 [219] phi from test_16u::@11 to test_16u::@1 [phi:test_16u::@11->test_16u::@1]
-  //SEG451 [219] phi (byte) test_16u::i#10 = (byte) test_16u::i#1 [phi:test_16u::@11->test_16u::@1#0] -- register_copy 
+  //SEG450 [219] phi from test_16u::@10 to test_16u::@1 [phi:test_16u::@10->test_16u::@1]
+  //SEG451 [219] phi (byte) test_16u::i#10 = (byte) test_16u::i#1 [phi:test_16u::@10->test_16u::@1#0] -- register_copy 
   //SEG452 test_16u::@1
   b1:
   //SEG453 [220] (word) test_16u::dividend#0 ← *((const word[]) test_16u::dividends#0 + (byte) test_16u::i#10) -- vwuz1=pwuc1_derefidx_vbuz2 
@@ -10306,7 +10359,7 @@ test_16u: {
   //SEG457 [224] call div16u 
     jsr div16u
   //SEG458 [225] (word) div16u::return#2 ← (word) div16u::return#0
-  //SEG459 test_16u::@3
+  //SEG459 test_16u::@2
   //SEG460 [226] (word) test_16u::res#0 ← (word) div16u::return#2
   //SEG461 [227] (word) print_word::w#1 ← (word) test_16u::dividend#0
   //SEG462 [228] (byte*~) print_char_cursor#166 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
@@ -10315,80 +10368,80 @@ test_16u: {
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG463 [229] call print_word 
-  //SEG464 [58] phi from test_16u::@3 to print_word [phi:test_16u::@3->print_word]
-  //SEG465 [58] phi (byte*) print_char_cursor#135 = (byte*~) print_char_cursor#166 [phi:test_16u::@3->print_word#0] -- register_copy 
-  //SEG466 [58] phi (word) print_word::w#5 = (word) print_word::w#1 [phi:test_16u::@3->print_word#1] -- register_copy 
+  //SEG464 [58] phi from test_16u::@2 to print_word [phi:test_16u::@2->print_word]
+  //SEG465 [58] phi (byte*) print_char_cursor#135 = (byte*~) print_char_cursor#166 [phi:test_16u::@2->print_word#0] -- register_copy 
+  //SEG466 [58] phi (word) print_word::w#5 = (word) print_word::w#1 [phi:test_16u::@2->print_word#1] -- register_copy 
     jsr print_word
-  //SEG467 [230] phi from test_16u::@3 to test_16u::@4 [phi:test_16u::@3->test_16u::@4]
-  //SEG468 test_16u::@4
+  //SEG467 [230] phi from test_16u::@2 to test_16u::@3 [phi:test_16u::@2->test_16u::@3]
+  //SEG468 test_16u::@3
   //SEG469 [231] call print_str 
-  //SEG470 [76] phi from test_16u::@4 to print_str [phi:test_16u::@4->print_str]
-  //SEG471 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16u::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG470 [76] phi from test_16u::@3 to print_str [phi:test_16u::@3->print_str]
+  //SEG471 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_16u::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG472 test_16u::@5
+  //SEG472 test_16u::@4
   //SEG473 [232] (word) print_word::w#2 ← (word) test_16u::divisor#0 -- vwuz1=vwuz2 
     lda divisor
     sta print_word.w
     lda divisor+1
     sta print_word.w+1
   //SEG474 [233] call print_word 
-  //SEG475 [58] phi from test_16u::@5 to print_word [phi:test_16u::@5->print_word]
-  //SEG476 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@5->print_word#0] -- register_copy 
-  //SEG477 [58] phi (word) print_word::w#5 = (word) print_word::w#2 [phi:test_16u::@5->print_word#1] -- register_copy 
+  //SEG475 [58] phi from test_16u::@4 to print_word [phi:test_16u::@4->print_word]
+  //SEG476 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@4->print_word#0] -- register_copy 
+  //SEG477 [58] phi (word) print_word::w#5 = (word) print_word::w#2 [phi:test_16u::@4->print_word#1] -- register_copy 
     jsr print_word
-  //SEG478 [234] phi from test_16u::@5 to test_16u::@6 [phi:test_16u::@5->test_16u::@6]
-  //SEG479 test_16u::@6
+  //SEG478 [234] phi from test_16u::@4 to test_16u::@5 [phi:test_16u::@4->test_16u::@5]
+  //SEG479 test_16u::@5
   //SEG480 [235] call print_str 
-  //SEG481 [76] phi from test_16u::@6 to print_str [phi:test_16u::@6->print_str]
-  //SEG482 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16u::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG481 [76] phi from test_16u::@5 to print_str [phi:test_16u::@5->print_str]
+  //SEG482 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_16u::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG483 test_16u::@7
+  //SEG483 test_16u::@6
   //SEG484 [236] (word) print_word::w#3 ← (word) test_16u::res#0 -- vwuz1=vwuz2 
     lda res
     sta print_word.w
     lda res+1
     sta print_word.w+1
   //SEG485 [237] call print_word 
-  //SEG486 [58] phi from test_16u::@7 to print_word [phi:test_16u::@7->print_word]
-  //SEG487 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@7->print_word#0] -- register_copy 
-  //SEG488 [58] phi (word) print_word::w#5 = (word) print_word::w#3 [phi:test_16u::@7->print_word#1] -- register_copy 
+  //SEG486 [58] phi from test_16u::@6 to print_word [phi:test_16u::@6->print_word]
+  //SEG487 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@6->print_word#0] -- register_copy 
+  //SEG488 [58] phi (word) print_word::w#5 = (word) print_word::w#3 [phi:test_16u::@6->print_word#1] -- register_copy 
     jsr print_word
-  //SEG489 [238] phi from test_16u::@7 to test_16u::@8 [phi:test_16u::@7->test_16u::@8]
-  //SEG490 test_16u::@8
+  //SEG489 [238] phi from test_16u::@6 to test_16u::@7 [phi:test_16u::@6->test_16u::@7]
+  //SEG490 test_16u::@7
   //SEG491 [239] call print_str 
-  //SEG492 [76] phi from test_16u::@8 to print_str [phi:test_16u::@8->print_str]
-  //SEG493 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16u::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG492 [76] phi from test_16u::@7 to print_str [phi:test_16u::@7->print_str]
+  //SEG493 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_16u::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-  //SEG494 test_16u::@9
+  //SEG494 test_16u::@8
   //SEG495 [240] (word) print_word::w#4 ← (word) rem16u#1 -- vwuz1=vwuz2 
     lda rem16u
     sta print_word.w
     lda rem16u+1
     sta print_word.w+1
   //SEG496 [241] call print_word 
-  //SEG497 [58] phi from test_16u::@9 to print_word [phi:test_16u::@9->print_word]
-  //SEG498 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@9->print_word#0] -- register_copy 
-  //SEG499 [58] phi (word) print_word::w#5 = (word) print_word::w#4 [phi:test_16u::@9->print_word#1] -- register_copy 
+  //SEG497 [58] phi from test_16u::@8 to print_word [phi:test_16u::@8->print_word]
+  //SEG498 [58] phi (byte*) print_char_cursor#135 = (byte*) print_char_cursor#128 [phi:test_16u::@8->print_word#0] -- register_copy 
+  //SEG499 [58] phi (word) print_word::w#5 = (word) print_word::w#4 [phi:test_16u::@8->print_word#1] -- register_copy 
     jsr print_word
-  //SEG500 [242] phi from test_16u::@9 to test_16u::@10 [phi:test_16u::@9->test_16u::@10]
-  //SEG501 test_16u::@10
+  //SEG500 [242] phi from test_16u::@8 to test_16u::@9 [phi:test_16u::@8->test_16u::@9]
+  //SEG501 test_16u::@9
   //SEG502 [243] call print_ln 
-  //SEG503 [44] phi from test_16u::@10 to print_ln [phi:test_16u::@10->print_ln]
-  //SEG504 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16u::@10->print_ln#0] -- register_copy 
+  //SEG503 [44] phi from test_16u::@9 to print_ln [phi:test_16u::@9->print_ln]
+  //SEG504 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#1 [phi:test_16u::@9->print_ln#0] -- register_copy 
     jsr print_ln
-  //SEG505 test_16u::@11
+  //SEG505 test_16u::@10
   //SEG506 [244] (byte) test_16u::i#1 ← (byte) test_16u::i#10 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda i
     clc
@@ -10430,7 +10483,7 @@ div16u: {
     sta divr16u.rem+1
     jsr divr16u
   //SEG518 [250] (word) divr16u::return#2 ← (word) divr16u::return#0
-  //SEG519 div16u::@2
+  //SEG519 div16u::@1
   //SEG520 [251] (word) div16u::return#0 ← (word) divr16u::return#2
   //SEG521 div16u::@return
   //SEG522 [252] return 
@@ -10475,98 +10528,98 @@ test_8u: {
   //SEG536 [194] phi (byte) div8u::dividend#2 = (byte) div8u::dividend#1 [phi:test_8u::@1->div8u#1] -- register_copy 
     jsr div8u
   //SEG537 [260] (byte) div8u::return#3 ← (byte) div8u::return#0
-  //SEG538 test_8u::@3
+  //SEG538 test_8u::@2
   //SEG539 [261] (byte) test_8u::res#0 ← (byte) div8u::return#3 -- vbuz1=vbuaa 
     sta res
   //SEG540 [262] (byte) print_byte::b#3 ← (byte) test_8u::dividend#0
   //SEG541 [263] call print_byte 
-  //SEG542 [64] phi from test_8u::@3 to print_byte [phi:test_8u::@3->print_byte]
-  //SEG543 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#138 [phi:test_8u::@3->print_byte#0] -- register_copy 
-  //SEG544 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#3 [phi:test_8u::@3->print_byte#1] -- register_copy 
+  //SEG542 [64] phi from test_8u::@2 to print_byte [phi:test_8u::@2->print_byte]
+  //SEG543 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#138 [phi:test_8u::@2->print_byte#0] -- register_copy 
+  //SEG544 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#3 [phi:test_8u::@2->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG545 [264] phi from test_8u::@3 to test_8u::@4 [phi:test_8u::@3->test_8u::@4]
-  //SEG546 test_8u::@4
+  //SEG545 [264] phi from test_8u::@2 to test_8u::@3 [phi:test_8u::@2->test_8u::@3]
+  //SEG546 test_8u::@3
   //SEG547 [265] call print_str 
-  //SEG548 [76] phi from test_8u::@4 to print_str [phi:test_8u::@4->print_str]
-  //SEG549 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8u::@4->print_str#0] -- pbuz1=pbuc1 
+  //SEG548 [76] phi from test_8u::@3 to print_str [phi:test_8u::@3->print_str]
+  //SEG549 [76] phi (byte*) print_str::str#15 = (const string) str [phi:test_8u::@3->print_str#0] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG550 test_8u::@5
+  //SEG550 test_8u::@4
   //SEG551 [266] (byte) print_byte::b#4 ← (byte) test_8u::divisor#0 -- vbuz1=vbuz2 
     lda divisor
     sta print_byte.b
   //SEG552 [267] call print_byte 
-  //SEG553 [64] phi from test_8u::@5 to print_byte [phi:test_8u::@5->print_byte]
-  //SEG554 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@5->print_byte#0] -- register_copy 
-  //SEG555 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#4 [phi:test_8u::@5->print_byte#1] -- register_copy 
+  //SEG553 [64] phi from test_8u::@4 to print_byte [phi:test_8u::@4->print_byte]
+  //SEG554 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@4->print_byte#0] -- register_copy 
+  //SEG555 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#4 [phi:test_8u::@4->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG556 [268] phi from test_8u::@5 to test_8u::@6 [phi:test_8u::@5->test_8u::@6]
-  //SEG557 test_8u::@6
+  //SEG556 [268] phi from test_8u::@4 to test_8u::@5 [phi:test_8u::@4->test_8u::@5]
+  //SEG557 test_8u::@5
   //SEG558 [269] call print_str 
-  //SEG559 [76] phi from test_8u::@6 to print_str [phi:test_8u::@6->print_str]
-  //SEG560 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8u::@6->print_str#0] -- pbuz1=pbuc1 
+  //SEG559 [76] phi from test_8u::@5 to print_str [phi:test_8u::@5->print_str]
+  //SEG560 [76] phi (byte*) print_str::str#15 = (const string) str1 [phi:test_8u::@5->print_str#0] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG561 test_8u::@7
+  //SEG561 test_8u::@6
   //SEG562 [270] (byte) print_byte::b#5 ← (byte) test_8u::res#0 -- vbuz1=vbuz2 
     lda res
     sta print_byte.b
   //SEG563 [271] call print_byte 
-  //SEG564 [64] phi from test_8u::@7 to print_byte [phi:test_8u::@7->print_byte]
-  //SEG565 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@7->print_byte#0] -- register_copy 
-  //SEG566 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#5 [phi:test_8u::@7->print_byte#1] -- register_copy 
+  //SEG564 [64] phi from test_8u::@6 to print_byte [phi:test_8u::@6->print_byte]
+  //SEG565 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@6->print_byte#0] -- register_copy 
+  //SEG566 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#5 [phi:test_8u::@6->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG567 [272] phi from test_8u::@7 to test_8u::@8 [phi:test_8u::@7->test_8u::@8]
-  //SEG568 test_8u::@8
+  //SEG567 [272] phi from test_8u::@6 to test_8u::@7 [phi:test_8u::@6->test_8u::@7]
+  //SEG568 test_8u::@7
   //SEG569 [273] call print_str 
-  //SEG570 [76] phi from test_8u::@8 to print_str [phi:test_8u::@8->print_str]
-  //SEG571 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8u::@8->print_str#0] -- pbuz1=pbuc1 
+  //SEG570 [76] phi from test_8u::@7 to print_str [phi:test_8u::@7->print_str]
+  //SEG571 [76] phi (byte*) print_str::str#15 = (const string) str2 [phi:test_8u::@7->print_str#0] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-  //SEG572 test_8u::@9
+  //SEG572 test_8u::@8
   //SEG573 [274] (byte) print_byte::b#6 ← (byte) rem8u#17 -- vbuz1=vbuxx 
     stx print_byte.b
   //SEG574 [275] call print_byte 
-  //SEG575 [64] phi from test_8u::@9 to print_byte [phi:test_8u::@9->print_byte]
-  //SEG576 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@9->print_byte#0] -- register_copy 
-  //SEG577 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#6 [phi:test_8u::@9->print_byte#1] -- register_copy 
+  //SEG575 [64] phi from test_8u::@8 to print_byte [phi:test_8u::@8->print_byte]
+  //SEG576 [64] phi (byte*) print_char_cursor#136 = (byte*) print_char_cursor#128 [phi:test_8u::@8->print_byte#0] -- register_copy 
+  //SEG577 [64] phi (byte) print_byte::b#7 = (byte) print_byte::b#6 [phi:test_8u::@8->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG578 [276] phi from test_8u::@9 to test_8u::@10 [phi:test_8u::@9->test_8u::@10]
-  //SEG579 test_8u::@10
+  //SEG578 [276] phi from test_8u::@8 to test_8u::@9 [phi:test_8u::@8->test_8u::@9]
+  //SEG579 test_8u::@9
   //SEG580 [277] call print_ln 
-  //SEG581 [44] phi from test_8u::@10 to print_ln [phi:test_8u::@10->print_ln]
-  //SEG582 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#41 [phi:test_8u::@10->print_ln#0] -- register_copy 
+  //SEG581 [44] phi from test_8u::@9 to print_ln [phi:test_8u::@9->print_ln]
+  //SEG582 [44] phi (byte*) print_line_cursor#39 = (byte*) print_line_cursor#41 [phi:test_8u::@9->print_ln#0] -- register_copy 
     jsr print_ln
-  //SEG583 test_8u::@11
+  //SEG583 test_8u::@10
   //SEG584 [278] (byte) test_8u::i#1 ← ++ (byte) test_8u::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG585 [279] if((byte) test_8u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8u::@12 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG585 [279] if((byte) test_8u::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto test_8u::@11 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp i
-    bne b12
+    bne b11
   //SEG586 test_8u::@return
   //SEG587 [280] return 
     rts
-  //SEG588 test_8u::@12
-  b12:
+  //SEG588 test_8u::@11
+  b11:
   //SEG589 [281] (byte*~) print_char_cursor#188 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG590 [254] phi from test_8u::@12 to test_8u::@1 [phi:test_8u::@12->test_8u::@1]
-  //SEG591 [254] phi (byte*) print_line_cursor#41 = (byte*) print_line_cursor#1 [phi:test_8u::@12->test_8u::@1#0] -- register_copy 
-  //SEG592 [254] phi (byte*) print_char_cursor#138 = (byte*~) print_char_cursor#188 [phi:test_8u::@12->test_8u::@1#1] -- register_copy 
-  //SEG593 [254] phi (byte) test_8u::i#10 = (byte) test_8u::i#1 [phi:test_8u::@12->test_8u::@1#2] -- register_copy 
+  //SEG590 [254] phi from test_8u::@11 to test_8u::@1 [phi:test_8u::@11->test_8u::@1]
+  //SEG591 [254] phi (byte*) print_line_cursor#41 = (byte*) print_line_cursor#1 [phi:test_8u::@11->test_8u::@1#0] -- register_copy 
+  //SEG592 [254] phi (byte*) print_char_cursor#138 = (byte*~) print_char_cursor#188 [phi:test_8u::@11->test_8u::@1#1] -- register_copy 
+  //SEG593 [254] phi (byte) test_8u::i#10 = (byte) test_8u::i#1 [phi:test_8u::@11->test_8u::@1#2] -- register_copy 
     jmp b1
     dividends: .byte $ff, $ff, $ff, $ff, $ff, $ff
     divisors: .byte 5, 7, $b, $d, $11, $13
diff --git a/src/test/ref/test-division.sym b/src/test/ref/test-division.sym
index 4abeca053..8d9bec13f 100644
--- a/src/test/ref/test-division.sym
+++ b/src/test/ref/test-division.sym
@@ -1,8 +1,8 @@
-(label) @32
+(label) @1
 (label) @begin
 (label) @end
 (signed word()) div16s((signed word) div16s::dividend , (signed word) div16s::divisor)
-(label) div16s::@2
+(label) div16s::@1
 (label) div16s::@return
 (signed word) div16s::dividend
 (signed word) div16s::dividend#0 dividend zp ZP_WORD:5 6.5
@@ -12,7 +12,7 @@
 (signed word) div16s::return#0 return zp ZP_WORD:14 4.333333333333333
 (signed word) div16s::return#2 return zp ZP_WORD:14 22.0
 (word()) div16u((word) div16u::dividend , (word) div16u::divisor)
-(label) div16u::@2
+(label) div16u::@1
 (label) div16u::@return
 (word) div16u::dividend
 (word) div16u::dividend#0 dividend zp ZP_WORD:5 6.5
@@ -25,14 +25,14 @@
 (signed byte~) div8s::$5 reg byte a 2.0
 (signed byte~) div8s::$8 reg byte x 1.0
 (label) div8s::@1
-(label) div8s::@11
-(label) div8s::@15
-(label) div8s::@16
-(label) div8s::@17
-(label) div8s::@18
 (label) div8s::@2
 (label) div8s::@3
 (label) div8s::@4
+(label) div8s::@5
+(label) div8s::@6
+(label) div8s::@7
+(label) div8s::@8
+(label) div8s::@9
 (label) div8s::@return
 (signed byte) div8s::dividend
 (signed byte) div8s::dividend#0 reg byte y 5.0
@@ -58,7 +58,7 @@
 (signed byte) div8s::return#3 reg byte a 22.0
 (signed byte~) div8s::return#7 reg byte a 2.0
 (byte()) div8u((byte) div8u::dividend , (byte) div8u::divisor)
-(label) div8u::@2
+(label) div8u::@1
 (label) div8u::@return
 (byte) div8u::dividend
 (byte) div8u::dividend#0 reg byte a 2.0
@@ -76,14 +76,14 @@
 (signed word~) divr16s::$13 $13 zp ZP_WORD:12 1.0
 (signed word~) divr16s::$8 $8 zp ZP_WORD:8 2.0
 (label) divr16s::@1
-(label) divr16s::@11
-(label) divr16s::@15
-(label) divr16s::@17
-(label) divr16s::@18
-(label) divr16s::@19
 (label) divr16s::@2
 (label) divr16s::@3
 (label) divr16s::@4
+(label) divr16s::@5
+(label) divr16s::@6
+(label) divr16s::@7
+(label) divr16s::@8
+(label) divr16s::@9
 (label) divr16s::@return
 (signed word) divr16s::dividend
 (signed word) divr16s::dividend#0 dividend zp ZP_WORD:8 2.0
@@ -245,7 +245,7 @@
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 b zp ZP_BYTE:7 4.0
@@ -267,7 +267,7 @@
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:5 4.0
@@ -305,7 +305,7 @@
 (void()) test_16s()
 (label) test_16s::@1
 (label) test_16s::@10
-(label) test_16s::@11
+(label) test_16s::@2
 (label) test_16s::@3
 (label) test_16s::@4
 (label) test_16s::@5
@@ -330,7 +330,7 @@
 (void()) test_16u()
 (label) test_16u::@1
 (label) test_16u::@10
-(label) test_16u::@11
+(label) test_16u::@2
 (label) test_16u::@3
 (label) test_16u::@4
 (label) test_16u::@5
@@ -355,7 +355,7 @@
 (void()) test_8s()
 (label) test_8s::@1
 (label) test_8s::@10
-(label) test_8s::@11
+(label) test_8s::@2
 (label) test_8s::@3
 (label) test_8s::@4
 (label) test_8s::@5
@@ -381,7 +381,7 @@
 (label) test_8u::@1
 (label) test_8u::@10
 (label) test_8u::@11
-(label) test_8u::@12
+(label) test_8u::@2
 (label) test_8u::@3
 (label) test_8u::@4
 (label) test_8u::@5
diff --git a/src/test/ref/test-interrupt-notype.asm b/src/test/ref/test-interrupt-notype.asm
index 012a2ed74..a16a2cefa 100644
--- a/src/test/ref/test-interrupt-notype.asm
+++ b/src/test/ref/test-interrupt-notype.asm
@@ -9,9 +9,9 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  b2:
+  b1:
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 irq: {
     inc BGCOL
diff --git a/src/test/ref/test-interrupt-notype.cfg b/src/test/ref/test-interrupt-notype.cfg
index 5ecf19fe3..a147b4ee2 100644
--- a/src/test/ref/test-interrupt-notype.cfg
+++ b/src/test/ref/test-interrupt-notype.cfg
@@ -1,18 +1,18 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [5] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0)
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [6] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   asm { lda$dc0d  }
diff --git a/src/test/ref/test-interrupt-notype.log b/src/test/ref/test-interrupt-notype.log
index dc18ef46c..292406ad6 100644
--- a/src/test/ref/test-interrupt-notype.log
+++ b/src/test/ref/test-interrupt-notype.log
@@ -75,26 +75,28 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
+Renumbering block main::@2 to main::@1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [5] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0)
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [6] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   asm { lda$dc0d  }
@@ -126,15 +128,15 @@ INITIAL ASM
   .label FGCOL = $d021
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -145,12 +147,12 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG13 irq
 irq: {
@@ -191,15 +193,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label FGCOL = $d021
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -210,12 +212,12 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG13 irq
 irq: {
@@ -232,14 +234,14 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction breturn:
@@ -251,7 +253,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -263,7 +265,7 @@ FINAL SYMBOL TABLE
 interrupt(KERNEL_MIN)(void()) irq()
 (label) irq::@return
 (void()) main()
-(label) main::@2
+(label) main::@1
 
 
 
@@ -280,10 +282,10 @@ Score: 115
   .label BGCOL = $d020
   .label FGCOL = $d021
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -292,11 +294,11 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  //SEG11 main::@2
-  b2:
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG13 irq
 irq: {
diff --git a/src/test/ref/test-interrupt-notype.sym b/src/test/ref/test-interrupt-notype.sym
index 4601bdd4e..92924f2f2 100644
--- a/src/test/ref/test-interrupt-notype.sym
+++ b/src/test/ref/test-interrupt-notype.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -10,5 +10,5 @@
 interrupt(KERNEL_MIN)(void()) irq()
 (label) irq::@return
 (void()) main()
-(label) main::@2
+(label) main::@1
 
diff --git a/src/test/ref/test-interrupt-volatile-write.cfg b/src/test/ref/test-interrupt-volatile-write.cfg
index 948bdbe1d..10f49ecbe 100644
--- a/src/test/ref/test-interrupt-volatile-write.cfg
+++ b/src/test/ref/test-interrupt-volatile-write.cfg
@@ -1,33 +1,33 @@
 @begin: scope:[]  from
   [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   to:main::@1
-main::@1: scope:[main]  from main main::@2 main::@6
-  [5] (byte) col#14 ← phi( main/(byte) col#0 main::@6/(byte) col#1 )
+main::@1: scope:[main]  from main main::@2 main::@3
+  [5] (byte) col#14 ← phi( main/(byte) col#0 main::@3/(byte) col#1 )
   to:main::@2
 main::@2: scope:[main]  from main::@1
   [6] if((byte) col#14<=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@1
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [7] (byte) col#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@1
 irq: scope:[irq]  from
   asm { lda$dc0d  }
   [9] *((const byte*) BGCOL#0) ← (byte) col#0
   [10] if((byte) col#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto irq::@1
-  to:irq::@3
-irq::@3: scope:[irq]  from irq
+  to:irq::@2
+irq::@2: scope:[irq]  from irq
   [11] (byte) col#4 ← (byte) col#0 + (byte/signed byte/word/signed word/dword/signed dword) 2
   to:irq::@return
-irq::@return: scope:[irq]  from irq::@1 irq::@3
+irq::@return: scope:[irq]  from irq::@1 irq::@2
   [12] return 
   to:@return
 irq::@1: scope:[irq]  from irq
diff --git a/src/test/ref/test-interrupt-volatile-write.log b/src/test/ref/test-interrupt-volatile-write.log
index 076aa642a..bbe32ac4d 100644
--- a/src/test/ref/test-interrupt-volatile-write.log
+++ b/src/test/ref/test-interrupt-volatile-write.log
@@ -145,40 +145,43 @@ Created 1 initial phi equivalence classes
 Coalesced [5] col#18 ← col#0
 Coalesced [9] col#19 ← col#1
 Coalesced down to 1 phi equivalence classes
-Adding NOP phi() at start of @2
+Renumbering block @2 to @1
+Renumbering block main::@6 to main::@3
+Renumbering block irq::@3 to irq::@2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   to:main::@1
-main::@1: scope:[main]  from main main::@2 main::@6
-  [5] (byte) col#14 ← phi( main/(byte) col#0 main::@6/(byte) col#1 )
+main::@1: scope:[main]  from main main::@2 main::@3
+  [5] (byte) col#14 ← phi( main/(byte) col#0 main::@3/(byte) col#1 )
   to:main::@2
 main::@2: scope:[main]  from main::@1
   [6] if((byte) col#14<=(byte/signed byte/word/signed word/dword/signed dword) $a) goto main::@1
-  to:main::@6
-main::@6: scope:[main]  from main::@2
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [7] (byte) col#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@1
 irq: scope:[irq]  from
   asm { lda$dc0d  }
   [9] *((const byte*) BGCOL#0) ← (byte) col#0
   [10] if((byte) col#0!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto irq::@1
-  to:irq::@3
-irq::@3: scope:[irq]  from irq
+  to:irq::@2
+irq::@2: scope:[irq]  from irq
   [11] (byte) col#4 ← (byte) col#0 + (byte/signed byte/word/signed word/dword/signed dword) 2
   to:irq::@return
-irq::@return: scope:[irq]  from irq::@1 irq::@3
+irq::@return: scope:[irq]  from irq::@1 irq::@2
   [12] return 
   to:@return
 irq::@1: scope:[irq]  from irq
@@ -229,15 +232,15 @@ bbegin:
 //SEG4 [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG6 @2
-b2:
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG6 @1
+b1:
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -248,10 +251,10 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  //SEG12 [5] phi from main main::@6 to main::@1 [phi:main/main::@6->main::@1]
+  //SEG12 [5] phi from main main::@3 to main::@1 [phi:main/main::@3->main::@1]
   b1_from_main:
-  b1_from_b6:
-  //SEG13 [5] phi (byte) col#14 = (byte) col#0 [phi:main/main::@6->main::@1#0] -- register_copy 
+  b1_from_b3:
+  //SEG13 [5] phi (byte) col#14 = (byte) col#0 [phi:main/main::@3->main::@1#0] -- register_copy 
     jmp b1
   //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
   b1_from_b2:
@@ -265,13 +268,13 @@ main: {
     lda #$a
     cmp col
     bcs b1_from_b2
-    jmp b6
-  //SEG18 main::@6
-  b6:
+    jmp b3
+  //SEG18 main::@3
+  b3:
   //SEG19 [7] (byte) col#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta col
-    jmp b1_from_b6
+    jmp b1_from_b3
 }
 //SEG20 irq
 irq: {
@@ -285,9 +288,9 @@ irq: {
     lda col
     cmp #0
     bne b1
-    jmp b3
-  //SEG25 irq::@3
-  b3:
+    jmp b2
+  //SEG25 irq::@2
+  b2:
   //SEG26 [11] (byte) col#4 ← (byte) col#0 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz2_plus_2 
     lda col
     clc
@@ -355,15 +358,15 @@ bbegin:
 //SEG4 [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG6 @2
-b2:
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG6 @1
+b1:
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -374,10 +377,10 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  //SEG12 [5] phi from main main::@6 to main::@1 [phi:main/main::@6->main::@1]
+  //SEG12 [5] phi from main main::@3 to main::@1 [phi:main/main::@3->main::@1]
   b1_from_main:
-  b1_from_b6:
-  //SEG13 [5] phi (byte) col#14 = (byte) col#0 [phi:main/main::@6->main::@1#0] -- register_copy 
+  b1_from_b3:
+  //SEG13 [5] phi (byte) col#14 = (byte) col#0 [phi:main/main::@3->main::@1#0] -- register_copy 
     jmp b1
   //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
   b1_from_b2:
@@ -391,13 +394,13 @@ main: {
     lda #$a
     cmp col
     bcs b1_from_b2
-    jmp b6
-  //SEG18 main::@6
-  b6:
+    jmp b3
+  //SEG18 main::@3
+  b3:
   //SEG19 [7] (byte) col#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta col
-    jmp b1_from_b6
+    jmp b1_from_b3
 }
 //SEG20 irq
 irq: {
@@ -411,9 +414,9 @@ irq: {
     lda col
     cmp #0
     bne b1
-    jmp b3
-  //SEG25 irq::@3
-  b3:
+    jmp b2
+  //SEG25 irq::@2
+  b2:
   //SEG26 [11] (byte) col#4 ← (byte) col#0 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     lda col
     clc
@@ -432,31 +435,31 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b6
 Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1 with b2
 Replacing label b1_from_b2 with b2
-Removing instruction b2_from_bbegin:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction b1_from_b2:
 Removing instruction b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction bend:
-Removing instruction b6:
 Removing instruction b3:
+Removing instruction b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
-Skipping double jump to b2 in jmp b1_from_b6
+Skipping double jump to b2 in jmp b1_from_b3
 Skipping double jump to $ea81 in jmp breturn
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b1_from_b6 to b1
+Relabelling long label b1_from_b3 to b1
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
@@ -468,7 +471,7 @@ Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -483,12 +486,12 @@ FINAL SYMBOL TABLE
 (byte) col#4 col zp ZP_BYTE:2 20.0
 interrupt(KERNEL_MIN)(void()) irq()
 (label) irq::@1
-(label) irq::@3
+(label) irq::@2
 (label) irq::@return
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
+(label) main::@3
 
 zp ZP_BYTE:2 [ col#14 col#0 col#1 col#4 col#3 ]
 
@@ -512,11 +515,11 @@ bbegin:
 //SEG4 [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG6 @2
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG6 @1
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -525,8 +528,8 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  //SEG12 [5] phi from main main::@6 to main::@1 [phi:main/main::@6->main::@1]
-  //SEG13 [5] phi (byte) col#14 = (byte) col#0 [phi:main/main::@6->main::@1#0] -- register_copy 
+  //SEG12 [5] phi from main main::@3 to main::@1 [phi:main/main::@3->main::@1]
+  //SEG13 [5] phi (byte) col#14 = (byte) col#0 [phi:main/main::@3->main::@1#0] -- register_copy 
   //SEG14 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
   //SEG15 main::@1
   //SEG16 main::@2
@@ -535,7 +538,7 @@ main: {
     lda #$a
     cmp col
     bcs b2
-  //SEG18 main::@6
+  //SEG18 main::@3
   //SEG19 [7] (byte) col#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
     lda #0
     sta col
@@ -553,7 +556,7 @@ irq: {
     lda col
     cmp #0
     bne b1
-  //SEG25 irq::@3
+  //SEG25 irq::@2
   //SEG26 [11] (byte) col#4 ← (byte) col#0 + (byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz1_plus_2 
     clc
     adc #2
diff --git a/src/test/ref/test-interrupt-volatile-write.sym b/src/test/ref/test-interrupt-volatile-write.sym
index 5bd91acae..0be5b265c 100644
--- a/src/test/ref/test-interrupt-volatile-write.sym
+++ b/src/test/ref/test-interrupt-volatile-write.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -13,11 +13,11 @@
 (byte) col#4 col zp ZP_BYTE:2 20.0
 interrupt(KERNEL_MIN)(void()) irq()
 (label) irq::@1
-(label) irq::@3
+(label) irq::@2
 (label) irq::@return
 (void()) main()
 (label) main::@1
 (label) main::@2
-(label) main::@6
+(label) main::@3
 
 zp ZP_BYTE:2 [ col#14 col#0 col#1 col#4 col#3 ]
diff --git a/src/test/ref/test-interrupt-volatile.cfg b/src/test/ref/test-interrupt-volatile.cfg
index 357299728..d55f414dc 100644
--- a/src/test/ref/test-interrupt-volatile.cfg
+++ b/src/test/ref/test-interrupt-volatile.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   to:main::@1
 main::@1: scope:[main]  from main main::@2
diff --git a/src/test/ref/test-interrupt-volatile.log b/src/test/ref/test-interrupt-volatile.log
index eaa0ebdaa..58d124ec8 100644
--- a/src/test/ref/test-interrupt-volatile.log
+++ b/src/test/ref/test-interrupt-volatile.log
@@ -100,20 +100,21 @@ Created 1 initial phi equivalence classes
 Coalesced [5] col#11 ← col#0
 Coalesced [8] col#12 ← col#1
 Coalesced down to 1 phi equivalence classes
-Adding NOP phi() at start of @2
+Renumbering block @2 to @1
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
   to:main::@1
 main::@1: scope:[main]  from main main::@2
@@ -162,15 +163,15 @@ bbegin:
 //SEG4 [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG6 @2
-b2:
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG6 @1
+b1:
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -243,15 +244,15 @@ bbegin:
 //SEG4 [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG6 @2
-b2:
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG6 @1
+b1:
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -292,26 +293,26 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b2 with b2
-Removing instruction b2_from_bbegin:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction b1_from_b2:
 Removing instruction b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction bend:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -348,11 +349,11 @@ bbegin:
 //SEG4 [0] (byte) col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- vbuz1=vbuc1 
   lda #0
   sta col
-//SEG5 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG6 @2
+//SEG5 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG6 @1
 //SEG7 [2] call main 
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/test-interrupt-volatile.sym b/src/test/ref/test-interrupt-volatile.sym
index 205ac614c..1cd137dd6 100644
--- a/src/test/ref/test-interrupt-volatile.sym
+++ b/src/test/ref/test-interrupt-volatile.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
diff --git a/src/test/ref/test-interrupt.asm b/src/test/ref/test-interrupt.asm
index 012a2ed74..a16a2cefa 100644
--- a/src/test/ref/test-interrupt.asm
+++ b/src/test/ref/test-interrupt.asm
@@ -9,9 +9,9 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  b2:
+  b1:
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 irq: {
     inc BGCOL
diff --git a/src/test/ref/test-interrupt.cfg b/src/test/ref/test-interrupt.cfg
index 5ecf19fe3..a147b4ee2 100644
--- a/src/test/ref/test-interrupt.cfg
+++ b/src/test/ref/test-interrupt.cfg
@@ -1,18 +1,18 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [5] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0)
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [6] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   asm { lda$dc0d  }
diff --git a/src/test/ref/test-interrupt.log b/src/test/ref/test-interrupt.log
index dc18ef46c..292406ad6 100644
--- a/src/test/ref/test-interrupt.log
+++ b/src/test/ref/test-interrupt.log
@@ -75,26 +75,28 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
+Renumbering block main::@2 to main::@1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const void()**) KERNEL_IRQ#0) ← &interrupt(KERNEL_MIN)(void()) irq()
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [5] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0)
-  to:main::@2
+  to:main::@1
 irq: scope:[irq]  from
   [6] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0)
   asm { lda$dc0d  }
@@ -126,15 +128,15 @@ INITIAL ASM
   .label FGCOL = $d021
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -145,12 +147,12 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG13 irq
 irq: {
@@ -191,15 +193,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label FGCOL = $d021
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -210,12 +212,12 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG13 irq
 irq: {
@@ -232,14 +234,14 @@ irq: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction breturn:
@@ -251,7 +253,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -263,7 +265,7 @@ FINAL SYMBOL TABLE
 interrupt(KERNEL_MIN)(void()) irq()
 (label) irq::@return
 (void()) main()
-(label) main::@2
+(label) main::@1
 
 
 
@@ -280,10 +282,10 @@ Score: 115
   .label BGCOL = $d020
   .label FGCOL = $d021
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -292,11 +294,11 @@ main: {
     sta KERNEL_IRQ
     lda #>irq
     sta KERNEL_IRQ+1
-  //SEG11 main::@2
-  b2:
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) FGCOL#0) ← ++ *((const byte*) FGCOL#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc FGCOL
-    jmp b2
+    jmp b1
 }
 //SEG13 irq
 irq: {
diff --git a/src/test/ref/test-interrupt.sym b/src/test/ref/test-interrupt.sym
index 4601bdd4e..92924f2f2 100644
--- a/src/test/ref/test-interrupt.sym
+++ b/src/test/ref/test-interrupt.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -10,5 +10,5 @@
 interrupt(KERNEL_MIN)(void()) irq()
 (label) irq::@return
 (void()) main()
-(label) main::@2
+(label) main::@1
 
diff --git a/src/test/ref/test-kasm.asm b/src/test/ref/test-kasm.asm
index f7bd21f33..7ed6c89df 100644
--- a/src/test/ref/test-kasm.asm
+++ b/src/test/ref/test-kasm.asm
@@ -5,8 +5,8 @@
   .byte 1, 2, 3
 
 main: {
-  b2:
+  b1:
     inc $d020
         
-    jmp b2
+    jmp b1
 }
diff --git a/src/test/ref/test-kasm.cfg b/src/test/ref/test-kasm.cfg
index a0292f689..266e4ec4c 100644
--- a/src/test/ref/test-kasm.cfg
+++ b/src/test/ref/test-kasm.cfg
@@ -10,8 +10,8 @@
   [3] phi()
 main: scope:[main]  from @1
   [4] phi()
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   kickasm() {{ inc $d020
          }}
-  to:main::@2
+  to:main::@1
diff --git a/src/test/ref/test-kasm.log b/src/test/ref/test-kasm.log
index 8ba54ee93..3b830595e 100644
--- a/src/test/ref/test-kasm.log
+++ b/src/test/ref/test-kasm.log
@@ -49,6 +49,7 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block main::@2 to main::@1
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
@@ -66,11 +67,11 @@ FINAL CONTROL FLOW GRAPH
   [3] phi()
 main: scope:[main]  from @1
   [4] phi()
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   kickasm() {{ inc $d020
          }}
-  to:main::@2
+  to:main::@1
 
 
 VARIABLE REGISTER WEIGHTS
@@ -106,13 +107,13 @@ bend_from_b1:
 bend:
 //SEG10 main
 main: {
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 kickasm() {{ inc $d020          }}
     inc $d020
         
-    jmp b2
+    jmp b1
 }
 
 REGISTER UPLIFT POTENTIAL REGISTERS
@@ -151,19 +152,19 @@ bend_from_b1:
 bend:
 //SEG10 main
 main: {
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 kickasm() {{ inc $d020          }}
     inc $d020
         
-    jmp b2
+    jmp b1
 }
 
 ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b2
+Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction b1:
 Removing instruction bend_from_b1:
@@ -182,7 +183,7 @@ FINAL SYMBOL TABLE
 (label) @begin
 (label) @end
 (void()) main()
-(label) main::@2
+(label) main::@1
 
 
 
@@ -207,11 +208,11 @@ Score: 2846
 //SEG9 @end
 //SEG10 main
 main: {
-  //SEG11 main::@2
-  b2:
+  //SEG11 main::@1
+  b1:
   //SEG12 kickasm() {{ inc $d020          }}
     inc $d020
         
-    jmp b2
+    jmp b1
 }
 
diff --git a/src/test/ref/test-kasm.sym b/src/test/ref/test-kasm.sym
index 06f7e962d..2beed4a4e 100644
--- a/src/test/ref/test-kasm.sym
+++ b/src/test/ref/test-kasm.sym
@@ -2,5 +2,5 @@
 (label) @begin
 (label) @end
 (void()) main()
-(label) main::@2
+(label) main::@1
 
diff --git a/src/test/ref/test-keyboard-space.asm b/src/test/ref/test-keyboard-space.asm
index 7ee1a5f93..c61be5230 100644
--- a/src/test/ref/test-keyboard-space.asm
+++ b/src/test/ref/test-keyboard-space.asm
@@ -17,20 +17,20 @@
   .const KEY_SPACE = $3c
 main: {
     jsr keyboard_init
-  b6:
+  b1:
     lda #$ff
     cmp RASTER
-    bne b6
+    bne b1
     jsr keyboard_key_pressed
     cmp #0
-    bne b10
+    bne b4
     lda #BLUE
     sta BGCOL
-    jmp b6
-  b10:
+    jmp b1
+  b4:
     lda #GREEN
     sta BGCOL
-    jmp b6
+    jmp b1
 }
 // Determines whether a specific key is currently pressed by accessing the matrix directly
 // The key is a keyboard code defined from the keyboard matrix by %00rrrccc, where rrr is the row ID (0-7) and ccc is the column ID (0-7)
diff --git a/src/test/ref/test-keyboard-space.cfg b/src/test/ref/test-keyboard-space.cfg
index fa78e1d89..74960bc8b 100644
--- a/src/test/ref/test-keyboard-space.cfg
+++ b/src/test/ref/test-keyboard-space.cfg
@@ -1,44 +1,44 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@12
-@12: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @12
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @12
+main: scope:[main]  from @1
   [4] phi()
   [5] call keyboard_init 
-  to:main::@6
-main::@6: scope:[main]  from main main::@10 main::@6 main::@8
-  [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@3 main::@4
+  [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [7] phi()
   [8] call keyboard_key_pressed 
   [9] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  to:main::@14
-main::@14: scope:[main]  from main::@7
+  to:main::@5
+main::@5: scope:[main]  from main::@2
   [10] (byte~) main::$2 ← (byte) keyboard_key_pressed::return#2
-  [11] if((byte~) main::$2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@10
-  to:main::@8
-main::@8: scope:[main]  from main::@14
+  [11] if((byte~) main::$2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@5
   [12] *((const byte*) BGCOL#0) ← (const byte) BLUE#0
-  to:main::@6
-main::@10: scope:[main]  from main::@14
+  to:main::@1
+main::@4: scope:[main]  from main::@5
   [13] *((const byte*) BGCOL#0) ← (const byte) GREEN#0
-  to:main::@6
-keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@7
+  to:main::@1
+keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@2
   [14] phi()
   [15] call keyboard_matrix_read 
   [16] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_key_pressed::@2
-keyboard_key_pressed::@2: scope:[keyboard_key_pressed]  from keyboard_key_pressed
+  to:keyboard_key_pressed::@1
+keyboard_key_pressed::@1: scope:[keyboard_key_pressed]  from keyboard_key_pressed
   [17] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   [18] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0+(const byte) keyboard_key_pressed::colidx#0)
   to:keyboard_key_pressed::@return
-keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@2
+keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@1
   [19] return 
   to:@return
 keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
diff --git a/src/test/ref/test-keyboard-space.log b/src/test/ref/test-keyboard-space.log
index 3186950a2..2f37303db 100644
--- a/src/test/ref/test-keyboard-space.log
+++ b/src/test/ref/test-keyboard-space.log
@@ -824,55 +824,62 @@ Calls in [keyboard_key_pressed] to keyboard_matrix_read:15
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @12 to @1
+Renumbering block keyboard_key_pressed::@2 to keyboard_key_pressed::@1
+Renumbering block main::@6 to main::@1
+Renumbering block main::@7 to main::@2
+Renumbering block main::@8 to main::@3
+Renumbering block main::@10 to main::@4
+Renumbering block main::@14 to main::@5
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @12
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@7
+Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of keyboard_key_pressed
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@12
-@12: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @12
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @12
+main: scope:[main]  from @1
   [4] phi()
   [5] call keyboard_init 
-  to:main::@6
-main::@6: scope:[main]  from main main::@10 main::@6 main::@8
-  [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  to:main::@1
+main::@1: scope:[main]  from main main::@1 main::@3 main::@4
+  [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [7] phi()
   [8] call keyboard_key_pressed 
   [9] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  to:main::@14
-main::@14: scope:[main]  from main::@7
+  to:main::@5
+main::@5: scope:[main]  from main::@2
   [10] (byte~) main::$2 ← (byte) keyboard_key_pressed::return#2
-  [11] if((byte~) main::$2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@10
-  to:main::@8
-main::@8: scope:[main]  from main::@14
+  [11] if((byte~) main::$2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@5
   [12] *((const byte*) BGCOL#0) ← (const byte) BLUE#0
-  to:main::@6
-main::@10: scope:[main]  from main::@14
+  to:main::@1
+main::@4: scope:[main]  from main::@5
   [13] *((const byte*) BGCOL#0) ← (const byte) GREEN#0
-  to:main::@6
-keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@7
+  to:main::@1
+keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@2
   [14] phi()
   [15] call keyboard_matrix_read 
   [16] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_key_pressed::@2
-keyboard_key_pressed::@2: scope:[keyboard_key_pressed]  from keyboard_key_pressed
+  to:keyboard_key_pressed::@1
+keyboard_key_pressed::@1: scope:[keyboard_key_pressed]  from keyboard_key_pressed
   [17] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   [18] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0+(const byte) keyboard_key_pressed::colidx#0)
   to:keyboard_key_pressed::@return
-keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@2
+keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@1
   [19] return 
   to:@return
 keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed
@@ -1109,17 +1116,17 @@ INITIAL ASM
   .const KEY_SPACE = $3c
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @12 [phi:@begin->@12]
-b12_from_bbegin:
-  jmp b12
-//SEG5 @12
-b12:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @12 to main [phi:@12->main]
-main_from_b12:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @12 to @end [phi:@12->@end]
-bend_from_b12:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1128,48 +1135,48 @@ main: {
     .label _2 = 3
   //SEG11 [5] call keyboard_init 
     jsr keyboard_init
-    jmp b6
-  //SEG12 main::@6
-  b6:
-  //SEG13 [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG12 main::@1
+  b1:
+  //SEG13 [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG14 [7] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG15 main::@7
-  b7:
+    bne b1
+  //SEG14 [7] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG15 main::@2
+  b2:
   //SEG16 [8] call keyboard_key_pressed 
-  //SEG17 [14] phi from main::@7 to keyboard_key_pressed [phi:main::@7->keyboard_key_pressed]
-  keyboard_key_pressed_from_b7:
+  //SEG17 [14] phi from main::@2 to keyboard_key_pressed [phi:main::@2->keyboard_key_pressed]
+  keyboard_key_pressed_from_b2:
     jsr keyboard_key_pressed
   //SEG18 [9] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_2
-    jmp b14
-  //SEG19 main::@14
-  b14:
+    jmp b5
+  //SEG19 main::@5
+  b5:
   //SEG20 [10] (byte~) main::$2 ← (byte) keyboard_key_pressed::return#2 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_2
     sta _2
-  //SEG21 [11] if((byte~) main::$2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@10 -- vbuz1_neq_0_then_la1 
+  //SEG21 [11] if((byte~) main::$2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4 -- vbuz1_neq_0_then_la1 
     lda _2
     cmp #0
-    bne b10
-    jmp b8
-  //SEG22 main::@8
-  b8:
+    bne b4
+    jmp b3
+  //SEG22 main::@3
+  b3:
   //SEG23 [12] *((const byte*) BGCOL#0) ← (const byte) BLUE#0 -- _deref_pbuc1=vbuc2 
     lda #BLUE
     sta BGCOL
-    jmp b6
-  //SEG24 main::@10
-  b10:
+    jmp b1
+  //SEG24 main::@4
+  b4:
   //SEG25 [13] *((const byte*) BGCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BGCOL
-    jmp b6
+    jmp b1
 }
 //SEG26 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -1187,9 +1194,9 @@ keyboard_key_pressed: {
   //SEG28 [16] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return
     sta keyboard_matrix_read.return_2
-    jmp b2
-  //SEG29 keyboard_key_pressed::@2
-  b2:
+    jmp b1
+  //SEG29 keyboard_key_pressed::@1
+  b1:
   //SEG30 [17] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return_2
     sta _2
@@ -1248,7 +1255,7 @@ keyboard_init: {
   keyboard_matrix_col_bitmask: .byte 1, 2, 4, 8, $10, $20, $40, $80
 
 REGISTER UPLIFT POTENTIAL REGISTERS
-Statement [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [12] *((const byte*) BGCOL#0) ← (const byte) BLUE#0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [13] *((const byte*) BGCOL#0) ← (const byte) GREEN#0 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [20] *((const byte*) CIA1_PORT_A#0) ← *((const byte[8]) keyboard_matrix_row_bitmask#0+(const byte) keyboard_key_pressed::rowidx#0) [ ] ( main:2::keyboard_key_pressed:8::keyboard_matrix_read:15 [ ] ) always clobbers reg byte a 
@@ -1298,17 +1305,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const KEY_SPACE = $3c
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @12 [phi:@begin->@12]
-b12_from_bbegin:
-  jmp b12
-//SEG5 @12
-b12:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @12 to main [phi:@12->main]
-main_from_b12:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @12 to @end [phi:@12->@end]
-bend_from_b12:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1316,43 +1323,43 @@ bend:
 main: {
   //SEG11 [5] call keyboard_init 
     jsr keyboard_init
-    jmp b6
-  //SEG12 main::@6
-  b6:
-  //SEG13 [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b1
+  //SEG12 main::@1
+  b1:
+  //SEG13 [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG14 [7] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG15 main::@7
-  b7:
+    bne b1
+  //SEG14 [7] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG15 main::@2
+  b2:
   //SEG16 [8] call keyboard_key_pressed 
-  //SEG17 [14] phi from main::@7 to keyboard_key_pressed [phi:main::@7->keyboard_key_pressed]
-  keyboard_key_pressed_from_b7:
+  //SEG17 [14] phi from main::@2 to keyboard_key_pressed [phi:main::@2->keyboard_key_pressed]
+  keyboard_key_pressed_from_b2:
     jsr keyboard_key_pressed
   //SEG18 [9] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-    jmp b14
-  //SEG19 main::@14
-  b14:
+    jmp b5
+  //SEG19 main::@5
+  b5:
   //SEG20 [10] (byte~) main::$2 ← (byte) keyboard_key_pressed::return#2
-  //SEG21 [11] if((byte~) main::$2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@10 -- vbuaa_neq_0_then_la1 
+  //SEG21 [11] if((byte~) main::$2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b10
-    jmp b8
-  //SEG22 main::@8
-  b8:
+    bne b4
+    jmp b3
+  //SEG22 main::@3
+  b3:
   //SEG23 [12] *((const byte*) BGCOL#0) ← (const byte) BLUE#0 -- _deref_pbuc1=vbuc2 
     lda #BLUE
     sta BGCOL
-    jmp b6
-  //SEG24 main::@10
-  b10:
+    jmp b1
+  //SEG24 main::@4
+  b4:
   //SEG25 [13] *((const byte*) BGCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BGCOL
-    jmp b6
+    jmp b1
 }
 //SEG26 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -1365,9 +1372,9 @@ keyboard_key_pressed: {
   //SEG27 [15] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG28 [16] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-    jmp b2
-  //SEG29 keyboard_key_pressed::@2
-  b2:
+    jmp b1
+  //SEG29 keyboard_key_pressed::@1
+  b1:
   //SEG30 [17] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   //SEG31 [18] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0+(const byte) keyboard_key_pressed::colidx#0) -- vbuaa=vbuaa_band__deref_pbuc1 
     and keyboard_matrix_col_bitmask+colidx
@@ -1419,29 +1426,29 @@ keyboard_init: {
   keyboard_matrix_col_bitmask: .byte 1, 2, 4, 8, $10, $20, $40, $80
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b12
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b14
-Removing instruction jmp b8
+Removing instruction jmp b1
 Removing instruction jmp b2
+Removing instruction jmp b5
+Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b12_from_bbegin:
-Removing instruction b12:
-Removing instruction main_from_b12:
-Removing instruction bend_from_b12:
-Removing instruction b7_from_b6:
-Removing instruction keyboard_key_pressed_from_b7:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b2_from_b1:
+Removing instruction keyboard_key_pressed_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b7:
-Removing instruction b14:
-Removing instruction b8:
 Removing instruction b2:
+Removing instruction b5:
+Removing instruction b3:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction breturn:
@@ -1453,7 +1460,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @12
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -1620,7 +1627,7 @@ FINAL SYMBOL TABLE
 (label) keyboard_init::@return
 (byte()) keyboard_key_pressed((byte) keyboard_key_pressed::key)
 (byte~) keyboard_key_pressed::$2 reg byte a 4.0
-(label) keyboard_key_pressed::@2
+(label) keyboard_key_pressed::@1
 (label) keyboard_key_pressed::@return
 (byte) keyboard_key_pressed::colidx
 (const byte) keyboard_key_pressed::colidx#0 colidx = (const byte) KEY_SPACE#0&(byte/signed byte/word/signed word/dword/signed dword) 7
@@ -1645,11 +1652,11 @@ FINAL SYMBOL TABLE
 (byte[8]) keyboard_scan_values
 (void()) main()
 (byte~) main::$2 reg byte a 22.0
-(label) main::@10
-(label) main::@14
-(label) main::@6
-(label) main::@7
-(label) main::@8
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 
 reg byte a [ keyboard_key_pressed::return#2 ]
 reg byte a [ main::$2 ]
@@ -1683,44 +1690,44 @@ Score: 1141
   .const BLUE = 6
   .const KEY_SPACE = $3c
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @12 [phi:@begin->@12]
-//SEG5 @12
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @12 to main [phi:@12->main]
-//SEG8 [3] phi from @12 to @end [phi:@12->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] call keyboard_init 
     jsr keyboard_init
-  //SEG12 main::@6
-  b6:
-  //SEG13 [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@6 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG12 main::@1
+  b1:
+  //SEG13 [6] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@1 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b6
-  //SEG14 [7] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  //SEG15 main::@7
+    bne b1
+  //SEG14 [7] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG15 main::@2
   //SEG16 [8] call keyboard_key_pressed 
-  //SEG17 [14] phi from main::@7 to keyboard_key_pressed [phi:main::@7->keyboard_key_pressed]
+  //SEG17 [14] phi from main::@2 to keyboard_key_pressed [phi:main::@2->keyboard_key_pressed]
     jsr keyboard_key_pressed
   //SEG18 [9] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  //SEG19 main::@14
+  //SEG19 main::@5
   //SEG20 [10] (byte~) main::$2 ← (byte) keyboard_key_pressed::return#2
-  //SEG21 [11] if((byte~) main::$2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@10 -- vbuaa_neq_0_then_la1 
+  //SEG21 [11] if((byte~) main::$2!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@4 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b10
-  //SEG22 main::@8
+    bne b4
+  //SEG22 main::@3
   //SEG23 [12] *((const byte*) BGCOL#0) ← (const byte) BLUE#0 -- _deref_pbuc1=vbuc2 
     lda #BLUE
     sta BGCOL
-    jmp b6
-  //SEG24 main::@10
-  b10:
+    jmp b1
+  //SEG24 main::@4
+  b4:
   //SEG25 [13] *((const byte*) BGCOL#0) ← (const byte) GREEN#0 -- _deref_pbuc1=vbuc2 
     lda #GREEN
     sta BGCOL
-    jmp b6
+    jmp b1
 }
 //SEG26 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -1733,7 +1740,7 @@ keyboard_key_pressed: {
   //SEG27 [15] call keyboard_matrix_read 
     jsr keyboard_matrix_read
   //SEG28 [16] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  //SEG29 keyboard_key_pressed::@2
+  //SEG29 keyboard_key_pressed::@1
   //SEG30 [17] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   //SEG31 [18] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0+(const byte) keyboard_key_pressed::colidx#0) -- vbuaa=vbuaa_band__deref_pbuc1 
     and keyboard_matrix_col_bitmask+colidx
diff --git a/src/test/ref/test-keyboard-space.sym b/src/test/ref/test-keyboard-space.sym
index 41793da1e..3ab92b664 100644
--- a/src/test/ref/test-keyboard-space.sym
+++ b/src/test/ref/test-keyboard-space.sym
@@ -1,4 +1,4 @@
-(label) @12
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -165,7 +165,7 @@
 (label) keyboard_init::@return
 (byte()) keyboard_key_pressed((byte) keyboard_key_pressed::key)
 (byte~) keyboard_key_pressed::$2 reg byte a 4.0
-(label) keyboard_key_pressed::@2
+(label) keyboard_key_pressed::@1
 (label) keyboard_key_pressed::@return
 (byte) keyboard_key_pressed::colidx
 (const byte) keyboard_key_pressed::colidx#0 colidx = (const byte) KEY_SPACE#0&(byte/signed byte/word/signed word/dword/signed dword) 7
@@ -190,11 +190,11 @@
 (byte[8]) keyboard_scan_values
 (void()) main()
 (byte~) main::$2 reg byte a 22.0
-(label) main::@10
-(label) main::@14
-(label) main::@6
-(label) main::@7
-(label) main::@8
+(label) main::@1
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 
 reg byte a [ keyboard_key_pressed::return#2 ]
 reg byte a [ main::$2 ]
diff --git a/src/test/ref/test-keyboard.asm b/src/test/ref/test-keyboard.asm
index cba84a345..0f8cb6a22 100644
--- a/src/test/ref/test-keyboard.asm
+++ b/src/test/ref/test-keyboard.asm
@@ -71,7 +71,7 @@ main: {
     lda #>$400
     sta sc+1
   // Clear screen
-  b6:
+  b1:
     lda #' '
     ldy #0
     sta (sc),y
@@ -81,17 +81,17 @@ main: {
   !:
     lda sc+1
     cmp #>$400+$3e8
-    bcc b6
+    bcc b1
     bne !+
     lda sc
     cmp #<$400+$3e8
-    bcc b6
+    bcc b1
   !:
     jsr keyboard_init
-  b8:
+  b3:
     lda #$ff
     cmp RASTER
-    bne b8
+    bne b3
     lda #<$400
     sta screen
     lda #>$400
@@ -99,25 +99,25 @@ main: {
     lda #0
     sta row
   // Read & print keyboard matrix
-  b10:
+  b4:
     ldy row
     jsr keyboard_matrix_read
     tax
     ldy #0
-  b11:
+  b5:
     txa
     and #$80
     cmp #0
-    bne b12
+    bne b6
     lda #'0'
     sta (screen),y
-  b13:
+  b7:
     txa
     asl
     tax
     iny
     cpy #8
-    bne b11
+    bne b5
     lda #$28
     clc
     adc screen
@@ -128,7 +128,7 @@ main: {
     inc row
     lda #8
     cmp row
-    bne b10
+    bne b4
     lda #$28
     clc
     adc screen
@@ -139,26 +139,26 @@ main: {
     ldx #0
     txa
     sta ch
-  b18:
+  b11:
     ldy ch
     jsr keyboard_get_keycode
     cmp #$3f
-    beq b19
+    beq b12
     tay
     jsr keyboard_key_pressed
     cmp #0
-    beq b19
+    beq b12
     txa
     tay
     lda ch
     sta (screen),y
     inx
-  b19:
+  b12:
     inc ch
     lda #$40
     cmp ch
-    bne b18
-  b1:
+    bne b11
+  b2:
   // Add some spaces
     txa
     tay
@@ -166,12 +166,12 @@ main: {
     sta (screen),y
     inx
     cpx #5
-    bcc b1
-    jmp b8
-  b12:
+    bcc b2
+    jmp b3
+  b6:
     lda #'1'
     sta (screen),y
-    jmp b13
+    jmp b7
 }
 // Determines whether a specific key is currently pressed by accessing the matrix directly
 // The key is a keyboard code defined from the keyboard matrix by %00rrrccc, where rrr is the row ID (0-7) and ccc is the column ID (0-7)
diff --git a/src/test/ref/test-keyboard.cfg b/src/test/ref/test-keyboard.cfg
index 9a00a9675..67b2e2577 100644
--- a/src/test/ref/test-keyboard.cfg
+++ b/src/test/ref/test-keyboard.cfg
@@ -1,127 +1,127 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@12
-@12: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @12
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @12
+main: scope:[main]  from @1
   [4] phi()
-  to:main::@6
-main::@6: scope:[main]  from main main::@6
-  [5] (byte*) main::sc#2 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(byte*) main::sc#1 )
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
+  [5] (byte*) main::sc#2 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@1/(byte*) main::sc#1 )
   [6] *((byte*) main::sc#2) ← (byte) ' '
   [7] (byte*) main::sc#1 ← ++ (byte*) main::sc#2
-  [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@6
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [9] phi()
   [10] call keyboard_init 
-  to:main::@8
-main::@8: scope:[main]  from main::@24 main::@7 main::@8
-  [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8
-  to:main::@10
-main::@10: scope:[main]  from main::@16 main::@8
-  [12] (byte*) main::screen#13 ← phi( main::@16/(byte*) main::screen#1 main::@8/((byte*))(word/signed word/dword/signed dword) $400 )
-  [12] (byte) main::row#2 ← phi( main::@16/(byte) main::row#1 main::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@3
+main::@3: scope:[main]  from main::@15 main::@2 main::@3
+  [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@9
+  [12] (byte*) main::screen#13 ← phi( main::@9/(byte*) main::screen#1 main::@3/((byte*))(word/signed word/dword/signed dword) $400 )
+  [12] (byte) main::row#2 ← phi( main::@9/(byte) main::row#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [13] (byte) keyboard_matrix_read::rowid#1 ← (byte) main::row#2
   [14] call keyboard_matrix_read 
   [15] (byte) keyboard_matrix_read::return#3 ← (byte) keyboard_matrix_read::return#0
-  to:main::@28
-main::@28: scope:[main]  from main::@10
+  to:main::@16
+main::@16: scope:[main]  from main::@4
   [16] (byte) main::row_pressed_bits#0 ← (byte) keyboard_matrix_read::return#3
-  to:main::@11
-main::@11: scope:[main]  from main::@13 main::@28
-  [17] (byte) main::col#2 ← phi( main::@13/(byte) main::col#1 main::@28/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [17] (byte) main::row_pressed_bits#2 ← phi( main::@13/(byte) main::row_pressed_bits#1 main::@28/(byte) main::row_pressed_bits#0 )
+  to:main::@5
+main::@5: scope:[main]  from main::@16 main::@7
+  [17] (byte) main::col#2 ← phi( main::@7/(byte) main::col#1 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [17] (byte) main::row_pressed_bits#2 ← phi( main::@7/(byte) main::row_pressed_bits#1 main::@16/(byte) main::row_pressed_bits#0 )
   [18] (byte~) main::$5 ← (byte) main::row_pressed_bits#2 & (byte/word/signed word/dword/signed dword) $80
-  [19] if((byte~) main::$5!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12
-  to:main::@14
-main::@14: scope:[main]  from main::@11
+  [19] if((byte~) main::$5!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@6
+  to:main::@8
+main::@8: scope:[main]  from main::@5
   [20] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '0'
-  to:main::@13
-main::@13: scope:[main]  from main::@12 main::@14
+  to:main::@7
+main::@7: scope:[main]  from main::@6 main::@8
   [21] (byte) main::row_pressed_bits#1 ← (byte) main::row_pressed_bits#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [22] (byte) main::col#1 ← ++ (byte) main::col#2
-  [23] if((byte) main::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@11
-  to:main::@16
-main::@16: scope:[main]  from main::@13
+  [23] if((byte) main::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@5
+  to:main::@9
+main::@9: scope:[main]  from main::@7
   [24] (byte*) main::screen#1 ← (byte*) main::screen#13 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [25] (byte) main::row#1 ← ++ (byte) main::row#2
-  [26] if((byte) main::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@10
-  to:main::@17
-main::@17: scope:[main]  from main::@16
+  [26] if((byte) main::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@4
+  to:main::@10
+main::@10: scope:[main]  from main::@9
   [27] (byte*) main::screen#2 ← (byte*) main::screen#1 + (byte/signed byte/word/signed word/dword/signed dword) $28
-  to:main::@18
-main::@18: scope:[main]  from main::@17 main::@19
-  [28] (byte) main::i#10 ← phi( main::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@19/(byte) main::i#6 )
-  [28] (byte) main::ch#2 ← phi( main::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@19/(byte) main::ch#1 )
+  to:main::@11
+main::@11: scope:[main]  from main::@10 main::@12
+  [28] (byte) main::i#10 ← phi( main::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@12/(byte) main::i#6 )
+  [28] (byte) main::ch#2 ← phi( main::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@12/(byte) main::ch#1 )
   [29] (byte) keyboard_get_keycode::ch#0 ← (byte) main::ch#2
   [30] call keyboard_get_keycode 
   [31] (byte) keyboard_get_keycode::return#2 ← (byte) keyboard_get_keycode::return#0
-  to:main::@29
-main::@29: scope:[main]  from main::@18
+  to:main::@17
+main::@17: scope:[main]  from main::@11
   [32] (byte) main::key#0 ← (byte) keyboard_get_keycode::return#2
-  [33] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@19
-  to:main::@21
-main::@21: scope:[main]  from main::@29
+  [33] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@12
+  to:main::@13
+main::@13: scope:[main]  from main::@17
   [34] (byte) keyboard_key_pressed::key#0 ← (byte) main::key#0
   [35] call keyboard_key_pressed 
   [36] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  to:main::@30
-main::@30: scope:[main]  from main::@21
+  to:main::@18
+main::@18: scope:[main]  from main::@13
   [37] (byte~) main::$15 ← (byte) keyboard_key_pressed::return#2
-  [38] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@19
-  to:main::@22
-main::@22: scope:[main]  from main::@30
+  [38] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12
+  to:main::@14
+main::@14: scope:[main]  from main::@18
   [39] *((byte*) main::screen#2 + (byte) main::i#10) ← (byte) main::ch#2
   [40] (byte) main::i#1 ← ++ (byte) main::i#10
-  to:main::@19
-main::@19: scope:[main]  from main::@22 main::@29 main::@30
-  [41] (byte) main::i#6 ← phi( main::@30/(byte) main::i#10 main::@22/(byte) main::i#1 main::@29/(byte) main::i#10 )
+  to:main::@12
+main::@12: scope:[main]  from main::@14 main::@17 main::@18
+  [41] (byte) main::i#6 ← phi( main::@18/(byte) main::i#10 main::@14/(byte) main::i#1 main::@17/(byte) main::i#10 )
   [42] (byte) main::ch#1 ← ++ (byte) main::ch#2
-  [43] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@18
-  to:main::@24
-main::@24: scope:[main]  from main::@19 main::@24
-  [44] (byte) main::i#4 ← phi( main::@19/(byte) main::i#6 main::@24/(byte) main::i#2 )
+  [43] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@11
+  to:main::@15
+main::@15: scope:[main]  from main::@12 main::@15
+  [44] (byte) main::i#4 ← phi( main::@12/(byte) main::i#6 main::@15/(byte) main::i#2 )
   [45] *((byte*) main::screen#2 + (byte) main::i#4) ← (byte) ' '
   [46] (byte) main::i#2 ← ++ (byte) main::i#4
-  [47] if((byte) main::i#2<(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@24
-  to:main::@8
-main::@12: scope:[main]  from main::@11
+  [47] if((byte) main::i#2<(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@15
+  to:main::@3
+main::@6: scope:[main]  from main::@5
   [48] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '1'
-  to:main::@13
-keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@21
+  to:main::@7
+keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@13
   [49] (byte) keyboard_key_pressed::colidx#0 ← (byte) keyboard_key_pressed::key#0 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [50] (byte) keyboard_key_pressed::rowidx#0 ← (byte) keyboard_key_pressed::key#0 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [51] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_key_pressed::rowidx#0
   [52] call keyboard_matrix_read 
   [53] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_key_pressed::@2
-keyboard_key_pressed::@2: scope:[keyboard_key_pressed]  from keyboard_key_pressed
+  to:keyboard_key_pressed::@1
+keyboard_key_pressed::@1: scope:[keyboard_key_pressed]  from keyboard_key_pressed
   [54] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   [55] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0)
   to:keyboard_key_pressed::@return
-keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@2
+keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@1
   [56] return 
   to:@return
-keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed main::@10
-  [57] (byte) keyboard_matrix_read::rowid#2 ← phi( keyboard_key_pressed/(byte) keyboard_matrix_read::rowid#0 main::@10/(byte) keyboard_matrix_read::rowid#1 )
+keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed main::@4
+  [57] (byte) keyboard_matrix_read::rowid#2 ← phi( keyboard_key_pressed/(byte) keyboard_matrix_read::rowid#0 main::@4/(byte) keyboard_matrix_read::rowid#1 )
   [58] *((const byte*) CIA1_PORT_A#0) ← *((const byte[8]) keyboard_matrix_row_bitmask#0 + (byte) keyboard_matrix_read::rowid#2)
   [59] (byte) keyboard_matrix_read::return#0 ← ~ *((const byte*) CIA1_PORT_B#0)
   to:keyboard_matrix_read::@return
 keyboard_matrix_read::@return: scope:[keyboard_matrix_read]  from keyboard_matrix_read
   [60] return 
   to:@return
-keyboard_get_keycode: scope:[keyboard_get_keycode]  from main::@18
+keyboard_get_keycode: scope:[keyboard_get_keycode]  from main::@11
   [61] (byte) keyboard_get_keycode::return#0 ← *((const byte[]) keyboard_char_keycodes#0 + (byte) keyboard_get_keycode::ch#0)
   to:keyboard_get_keycode::@return
 keyboard_get_keycode::@return: scope:[keyboard_get_keycode]  from keyboard_get_keycode
   [62] return 
   to:@return
-keyboard_init: scope:[keyboard_init]  from main::@7
+keyboard_init: scope:[keyboard_init]  from main::@2
   [63] *((const byte*) CIA1_PORT_A_DDR#0) ← (byte/word/signed word/dword/signed dword) $ff
   [64] *((const byte*) CIA1_PORT_B_DDR#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:keyboard_init::@return
diff --git a/src/test/ref/test-keyboard.log b/src/test/ref/test-keyboard.log
index 3ab35058c..67b29a785 100644
--- a/src/test/ref/test-keyboard.log
+++ b/src/test/ref/test-keyboard.log
@@ -1172,137 +1172,157 @@ Culled Empty Block (label) main::@36
 Culled Empty Block (label) main::@32
 Culled Empty Block (label) main::@33
 Culled Empty Block (label) main::@31
+Renumbering block @12 to @1
+Renumbering block keyboard_key_pressed::@2 to keyboard_key_pressed::@1
+Renumbering block main::@6 to main::@1
+Renumbering block main::@7 to main::@2
+Renumbering block main::@8 to main::@3
+Renumbering block main::@10 to main::@4
+Renumbering block main::@11 to main::@5
+Renumbering block main::@12 to main::@6
+Renumbering block main::@13 to main::@7
+Renumbering block main::@14 to main::@8
+Renumbering block main::@16 to main::@9
+Renumbering block main::@17 to main::@10
+Renumbering block main::@18 to main::@11
+Renumbering block main::@19 to main::@12
+Renumbering block main::@21 to main::@13
+Renumbering block main::@22 to main::@14
+Renumbering block main::@24 to main::@15
+Renumbering block main::@28 to main::@16
+Renumbering block main::@29 to main::@17
+Renumbering block main::@30 to main::@18
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @12
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
-Adding NOP phi() at start of main::@7
+Adding NOP phi() at start of main::@2
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@12
-@12: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @12
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @12
+main: scope:[main]  from @1
   [4] phi()
-  to:main::@6
-main::@6: scope:[main]  from main main::@6
-  [5] (byte*) main::sc#2 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(byte*) main::sc#1 )
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
+  [5] (byte*) main::sc#2 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@1/(byte*) main::sc#1 )
   [6] *((byte*) main::sc#2) ← (byte) ' '
   [7] (byte*) main::sc#1 ← ++ (byte*) main::sc#2
-  [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@6
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [9] phi()
   [10] call keyboard_init 
-  to:main::@8
-main::@8: scope:[main]  from main::@24 main::@7 main::@8
-  [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8
-  to:main::@10
-main::@10: scope:[main]  from main::@16 main::@8
-  [12] (byte*) main::screen#13 ← phi( main::@16/(byte*) main::screen#1 main::@8/((byte*))(word/signed word/dword/signed dword) $400 )
-  [12] (byte) main::row#2 ← phi( main::@16/(byte) main::row#1 main::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  to:main::@3
+main::@3: scope:[main]  from main::@15 main::@2 main::@3
+  [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@9
+  [12] (byte*) main::screen#13 ← phi( main::@9/(byte*) main::screen#1 main::@3/((byte*))(word/signed word/dword/signed dword) $400 )
+  [12] (byte) main::row#2 ← phi( main::@9/(byte) main::row#1 main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [13] (byte) keyboard_matrix_read::rowid#1 ← (byte) main::row#2
   [14] call keyboard_matrix_read 
   [15] (byte) keyboard_matrix_read::return#3 ← (byte) keyboard_matrix_read::return#0
-  to:main::@28
-main::@28: scope:[main]  from main::@10
+  to:main::@16
+main::@16: scope:[main]  from main::@4
   [16] (byte) main::row_pressed_bits#0 ← (byte) keyboard_matrix_read::return#3
-  to:main::@11
-main::@11: scope:[main]  from main::@13 main::@28
-  [17] (byte) main::col#2 ← phi( main::@13/(byte) main::col#1 main::@28/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [17] (byte) main::row_pressed_bits#2 ← phi( main::@13/(byte) main::row_pressed_bits#1 main::@28/(byte) main::row_pressed_bits#0 )
+  to:main::@5
+main::@5: scope:[main]  from main::@16 main::@7
+  [17] (byte) main::col#2 ← phi( main::@7/(byte) main::col#1 main::@16/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [17] (byte) main::row_pressed_bits#2 ← phi( main::@7/(byte) main::row_pressed_bits#1 main::@16/(byte) main::row_pressed_bits#0 )
   [18] (byte~) main::$5 ← (byte) main::row_pressed_bits#2 & (byte/word/signed word/dword/signed dword) $80
-  [19] if((byte~) main::$5!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12
-  to:main::@14
-main::@14: scope:[main]  from main::@11
+  [19] if((byte~) main::$5!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@6
+  to:main::@8
+main::@8: scope:[main]  from main::@5
   [20] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '0'
-  to:main::@13
-main::@13: scope:[main]  from main::@12 main::@14
+  to:main::@7
+main::@7: scope:[main]  from main::@6 main::@8
   [21] (byte) main::row_pressed_bits#1 ← (byte) main::row_pressed_bits#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   [22] (byte) main::col#1 ← ++ (byte) main::col#2
-  [23] if((byte) main::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@11
-  to:main::@16
-main::@16: scope:[main]  from main::@13
+  [23] if((byte) main::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@5
+  to:main::@9
+main::@9: scope:[main]  from main::@7
   [24] (byte*) main::screen#1 ← (byte*) main::screen#13 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [25] (byte) main::row#1 ← ++ (byte) main::row#2
-  [26] if((byte) main::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@10
-  to:main::@17
-main::@17: scope:[main]  from main::@16
+  [26] if((byte) main::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@4
+  to:main::@10
+main::@10: scope:[main]  from main::@9
   [27] (byte*) main::screen#2 ← (byte*) main::screen#1 + (byte/signed byte/word/signed word/dword/signed dword) $28
-  to:main::@18
-main::@18: scope:[main]  from main::@17 main::@19
-  [28] (byte) main::i#10 ← phi( main::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@19/(byte) main::i#6 )
-  [28] (byte) main::ch#2 ← phi( main::@17/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@19/(byte) main::ch#1 )
+  to:main::@11
+main::@11: scope:[main]  from main::@10 main::@12
+  [28] (byte) main::i#10 ← phi( main::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@12/(byte) main::i#6 )
+  [28] (byte) main::ch#2 ← phi( main::@10/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@12/(byte) main::ch#1 )
   [29] (byte) keyboard_get_keycode::ch#0 ← (byte) main::ch#2
   [30] call keyboard_get_keycode 
   [31] (byte) keyboard_get_keycode::return#2 ← (byte) keyboard_get_keycode::return#0
-  to:main::@29
-main::@29: scope:[main]  from main::@18
+  to:main::@17
+main::@17: scope:[main]  from main::@11
   [32] (byte) main::key#0 ← (byte) keyboard_get_keycode::return#2
-  [33] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@19
-  to:main::@21
-main::@21: scope:[main]  from main::@29
+  [33] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@12
+  to:main::@13
+main::@13: scope:[main]  from main::@17
   [34] (byte) keyboard_key_pressed::key#0 ← (byte) main::key#0
   [35] call keyboard_key_pressed 
   [36] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  to:main::@30
-main::@30: scope:[main]  from main::@21
+  to:main::@18
+main::@18: scope:[main]  from main::@13
   [37] (byte~) main::$15 ← (byte) keyboard_key_pressed::return#2
-  [38] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@19
-  to:main::@22
-main::@22: scope:[main]  from main::@30
+  [38] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12
+  to:main::@14
+main::@14: scope:[main]  from main::@18
   [39] *((byte*) main::screen#2 + (byte) main::i#10) ← (byte) main::ch#2
   [40] (byte) main::i#1 ← ++ (byte) main::i#10
-  to:main::@19
-main::@19: scope:[main]  from main::@22 main::@29 main::@30
-  [41] (byte) main::i#6 ← phi( main::@30/(byte) main::i#10 main::@22/(byte) main::i#1 main::@29/(byte) main::i#10 )
+  to:main::@12
+main::@12: scope:[main]  from main::@14 main::@17 main::@18
+  [41] (byte) main::i#6 ← phi( main::@18/(byte) main::i#10 main::@14/(byte) main::i#1 main::@17/(byte) main::i#10 )
   [42] (byte) main::ch#1 ← ++ (byte) main::ch#2
-  [43] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@18
-  to:main::@24
-main::@24: scope:[main]  from main::@19 main::@24
-  [44] (byte) main::i#4 ← phi( main::@19/(byte) main::i#6 main::@24/(byte) main::i#2 )
+  [43] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@11
+  to:main::@15
+main::@15: scope:[main]  from main::@12 main::@15
+  [44] (byte) main::i#4 ← phi( main::@12/(byte) main::i#6 main::@15/(byte) main::i#2 )
   [45] *((byte*) main::screen#2 + (byte) main::i#4) ← (byte) ' '
   [46] (byte) main::i#2 ← ++ (byte) main::i#4
-  [47] if((byte) main::i#2<(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@24
-  to:main::@8
-main::@12: scope:[main]  from main::@11
+  [47] if((byte) main::i#2<(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@15
+  to:main::@3
+main::@6: scope:[main]  from main::@5
   [48] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '1'
-  to:main::@13
-keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@21
+  to:main::@7
+keyboard_key_pressed: scope:[keyboard_key_pressed]  from main::@13
   [49] (byte) keyboard_key_pressed::colidx#0 ← (byte) keyboard_key_pressed::key#0 & (byte/signed byte/word/signed word/dword/signed dword) 7
   [50] (byte) keyboard_key_pressed::rowidx#0 ← (byte) keyboard_key_pressed::key#0 >> (byte/signed byte/word/signed word/dword/signed dword) 3
   [51] (byte) keyboard_matrix_read::rowid#0 ← (byte) keyboard_key_pressed::rowidx#0
   [52] call keyboard_matrix_read 
   [53] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  to:keyboard_key_pressed::@2
-keyboard_key_pressed::@2: scope:[keyboard_key_pressed]  from keyboard_key_pressed
+  to:keyboard_key_pressed::@1
+keyboard_key_pressed::@1: scope:[keyboard_key_pressed]  from keyboard_key_pressed
   [54] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   [55] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0)
   to:keyboard_key_pressed::@return
-keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@2
+keyboard_key_pressed::@return: scope:[keyboard_key_pressed]  from keyboard_key_pressed::@1
   [56] return 
   to:@return
-keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed main::@10
-  [57] (byte) keyboard_matrix_read::rowid#2 ← phi( keyboard_key_pressed/(byte) keyboard_matrix_read::rowid#0 main::@10/(byte) keyboard_matrix_read::rowid#1 )
+keyboard_matrix_read: scope:[keyboard_matrix_read]  from keyboard_key_pressed main::@4
+  [57] (byte) keyboard_matrix_read::rowid#2 ← phi( keyboard_key_pressed/(byte) keyboard_matrix_read::rowid#0 main::@4/(byte) keyboard_matrix_read::rowid#1 )
   [58] *((const byte*) CIA1_PORT_A#0) ← *((const byte[8]) keyboard_matrix_row_bitmask#0 + (byte) keyboard_matrix_read::rowid#2)
   [59] (byte) keyboard_matrix_read::return#0 ← ~ *((const byte*) CIA1_PORT_B#0)
   to:keyboard_matrix_read::@return
 keyboard_matrix_read::@return: scope:[keyboard_matrix_read]  from keyboard_matrix_read
   [60] return 
   to:@return
-keyboard_get_keycode: scope:[keyboard_get_keycode]  from main::@18
+keyboard_get_keycode: scope:[keyboard_get_keycode]  from main::@11
   [61] (byte) keyboard_get_keycode::return#0 ← *((const byte[]) keyboard_char_keycodes#0 + (byte) keyboard_get_keycode::ch#0)
   to:keyboard_get_keycode::@return
 keyboard_get_keycode::@return: scope:[keyboard_get_keycode]  from keyboard_get_keycode
   [62] return 
   to:@return
-keyboard_init: scope:[keyboard_init]  from main::@7
+keyboard_init: scope:[keyboard_init]  from main::@2
   [63] *((const byte*) CIA1_PORT_A_DDR#0) ← (byte/word/signed word/dword/signed dword) $ff
   [64] *((const byte*) CIA1_PORT_B_DDR#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:keyboard_init::@return
@@ -1671,17 +1691,17 @@ INITIAL ASM
   .const KEY_Q = $3e
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @12 [phi:@begin->@12]
-b12_from_bbegin:
-  jmp b12
-//SEG5 @12
-b12:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @12 to main [phi:@12->main]
-main_from_b12:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @12 to @end [phi:@12->@end]
-bend_from_b12:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1698,21 +1718,21 @@ main: {
     .label key = $12
     .label ch = 9
     .label i = $a
-  //SEG11 [5] phi from main to main::@6 [phi:main->main::@6]
-  b6_from_main:
-  //SEG12 [5] phi (byte*) main::sc#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@6#0] -- pbuz1=pbuc1 
+  //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG12 [5] phi (byte*) main::sc#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@1#0] -- pbuz1=pbuc1 
     lda #<$400
     sta sc
     lda #>$400
     sta sc+1
-    jmp b6
+    jmp b1
   // Clear screen
-  //SEG13 [5] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  b6_from_b6:
-  //SEG14 [5] phi (byte*) main::sc#2 = (byte*) main::sc#1 [phi:main::@6->main::@6#0] -- register_copy 
-    jmp b6
-  //SEG15 main::@6
-  b6:
+  //SEG13 [5] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+  //SEG14 [5] phi (byte*) main::sc#2 = (byte*) main::sc#1 [phi:main::@1->main::@1#0] -- register_copy 
+    jmp b1
+  //SEG15 main::@1
+  b1:
   //SEG16 [6] *((byte*) main::sc#2) ← (byte) ' ' -- _deref_pbuz1=vbuc1 
     lda #' '
     ldy #0
@@ -1722,108 +1742,108 @@ main: {
     bne !+
     inc sc+1
   !:
-  //SEG18 [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@6 -- pbuz1_lt_vwuc1_then_la1 
+  //SEG18 [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@1 -- pbuz1_lt_vwuc1_then_la1 
     lda sc+1
     cmp #>$400+$3e8
-    bcc b6_from_b6
+    bcc b1_from_b1
     bne !+
     lda sc
     cmp #<$400+$3e8
-    bcc b6_from_b6
+    bcc b1_from_b1
   !:
-  //SEG19 [9] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG20 main::@7
-  b7:
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG20 main::@2
+  b2:
   //SEG21 [10] call keyboard_init 
     jsr keyboard_init
-    jmp b8
-  //SEG22 main::@8
-  b8:
-  //SEG23 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b3
+  //SEG22 main::@3
+  b3:
+  //SEG23 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b8
-  //SEG24 [12] phi from main::@8 to main::@10 [phi:main::@8->main::@10]
-  b10_from_b8:
-  //SEG25 [12] phi (byte*) main::screen#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@8->main::@10#0] -- pbuz1=pbuc1 
+    bne b3
+  //SEG24 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG25 [12] phi (byte*) main::screen#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@3->main::@4#0] -- pbuz1=pbuc1 
     lda #<$400
     sta screen
     lda #>$400
     sta screen+1
-  //SEG26 [12] phi (byte) main::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@10#1] -- vbuz1=vbuc1 
+  //SEG26 [12] phi (byte) main::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#1] -- vbuz1=vbuc1 
     lda #0
     sta row
-    jmp b10
+    jmp b4
   // Read & print keyboard matrix
-  //SEG27 [12] phi from main::@16 to main::@10 [phi:main::@16->main::@10]
-  b10_from_b16:
-  //SEG28 [12] phi (byte*) main::screen#13 = (byte*) main::screen#1 [phi:main::@16->main::@10#0] -- register_copy 
-  //SEG29 [12] phi (byte) main::row#2 = (byte) main::row#1 [phi:main::@16->main::@10#1] -- register_copy 
-    jmp b10
-  //SEG30 main::@10
-  b10:
+  //SEG27 [12] phi from main::@9 to main::@4 [phi:main::@9->main::@4]
+  b4_from_b9:
+  //SEG28 [12] phi (byte*) main::screen#13 = (byte*) main::screen#1 [phi:main::@9->main::@4#0] -- register_copy 
+  //SEG29 [12] phi (byte) main::row#2 = (byte) main::row#1 [phi:main::@9->main::@4#1] -- register_copy 
+    jmp b4
+  //SEG30 main::@4
+  b4:
   //SEG31 [13] (byte) keyboard_matrix_read::rowid#1 ← (byte) main::row#2 -- vbuz1=vbuz2 
     lda row
     sta keyboard_matrix_read.rowid
   //SEG32 [14] call keyboard_matrix_read 
-  //SEG33 [57] phi from main::@10 to keyboard_matrix_read [phi:main::@10->keyboard_matrix_read]
-  keyboard_matrix_read_from_b10:
-  //SEG34 [57] phi (byte) keyboard_matrix_read::rowid#2 = (byte) keyboard_matrix_read::rowid#1 [phi:main::@10->keyboard_matrix_read#0] -- register_copy 
+  //SEG33 [57] phi from main::@4 to keyboard_matrix_read [phi:main::@4->keyboard_matrix_read]
+  keyboard_matrix_read_from_b4:
+  //SEG34 [57] phi (byte) keyboard_matrix_read::rowid#2 = (byte) keyboard_matrix_read::rowid#1 [phi:main::@4->keyboard_matrix_read#0] -- register_copy 
     jsr keyboard_matrix_read
   //SEG35 [15] (byte) keyboard_matrix_read::return#3 ← (byte) keyboard_matrix_read::return#0 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return
     sta keyboard_matrix_read.return_3
-    jmp b28
-  //SEG36 main::@28
-  b28:
+    jmp b16
+  //SEG36 main::@16
+  b16:
   //SEG37 [16] (byte) main::row_pressed_bits#0 ← (byte) keyboard_matrix_read::return#3 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return_3
     sta row_pressed_bits
-  //SEG38 [17] phi from main::@28 to main::@11 [phi:main::@28->main::@11]
-  b11_from_b28:
-  //SEG39 [17] phi (byte) main::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@28->main::@11#0] -- vbuz1=vbuc1 
+  //SEG38 [17] phi from main::@16 to main::@5 [phi:main::@16->main::@5]
+  b5_from_b16:
+  //SEG39 [17] phi (byte) main::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@5#0] -- vbuz1=vbuc1 
     lda #0
     sta col
-  //SEG40 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#0 [phi:main::@28->main::@11#1] -- register_copy 
-    jmp b11
-  //SEG41 [17] phi from main::@13 to main::@11 [phi:main::@13->main::@11]
-  b11_from_b13:
-  //SEG42 [17] phi (byte) main::col#2 = (byte) main::col#1 [phi:main::@13->main::@11#0] -- register_copy 
-  //SEG43 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#1 [phi:main::@13->main::@11#1] -- register_copy 
-    jmp b11
-  //SEG44 main::@11
-  b11:
+  //SEG40 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#0 [phi:main::@16->main::@5#1] -- register_copy 
+    jmp b5
+  //SEG41 [17] phi from main::@7 to main::@5 [phi:main::@7->main::@5]
+  b5_from_b7:
+  //SEG42 [17] phi (byte) main::col#2 = (byte) main::col#1 [phi:main::@7->main::@5#0] -- register_copy 
+  //SEG43 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#1 [phi:main::@7->main::@5#1] -- register_copy 
+    jmp b5
+  //SEG44 main::@5
+  b5:
   //SEG45 [18] (byte~) main::$5 ← (byte) main::row_pressed_bits#2 & (byte/word/signed word/dword/signed dword) $80 -- vbuz1=vbuz2_band_vbuc1 
     lda #$80
     and row_pressed_bits
     sta _5
-  //SEG46 [19] if((byte~) main::$5!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12 -- vbuz1_neq_0_then_la1 
+  //SEG46 [19] if((byte~) main::$5!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@6 -- vbuz1_neq_0_then_la1 
     lda _5
     cmp #0
-    bne b12
-    jmp b14
-  //SEG47 main::@14
-  b14:
+    bne b6
+    jmp b8
+  //SEG47 main::@8
+  b8:
   //SEG48 [20] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '0' -- pbuz1_derefidx_vbuz2=vbuc1 
     lda #'0'
     ldy col
     sta (screen),y
-    jmp b13
-  //SEG49 main::@13
-  b13:
+    jmp b7
+  //SEG49 main::@7
+  b7:
   //SEG50 [21] (byte) main::row_pressed_bits#1 ← (byte) main::row_pressed_bits#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_rol_1 
     asl row_pressed_bits
   //SEG51 [22] (byte) main::col#1 ← ++ (byte) main::col#2 -- vbuz1=_inc_vbuz1 
     inc col
-  //SEG52 [23] if((byte) main::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@11 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG52 [23] if((byte) main::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp col
-    bne b11_from_b13
-    jmp b16
-  //SEG53 main::@16
-  b16:
+    bne b5_from_b7
+    jmp b9
+  //SEG53 main::@9
+  b9:
   //SEG54 [24] (byte*) main::screen#1 ← (byte*) main::screen#13 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$28
     clc
@@ -1834,13 +1854,13 @@ main: {
   !:
   //SEG55 [25] (byte) main::row#1 ← ++ (byte) main::row#2 -- vbuz1=_inc_vbuz1 
     inc row
-  //SEG56 [26] if((byte) main::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG56 [26] if((byte) main::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp row
-    bne b10_from_b16
-    jmp b17
-  //SEG57 main::@17
-  b17:
+    bne b4_from_b9
+    jmp b10
+  //SEG57 main::@10
+  b10:
   //SEG58 [27] (byte*) main::screen#2 ← (byte*) main::screen#1 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz2_plus_vbuc1 
     lda #$28
     clc
@@ -1849,22 +1869,22 @@ main: {
     lda #0
     adc screen+1
     sta screen_2+1
-  //SEG59 [28] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
-  b18_from_b17:
-  //SEG60 [28] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@18#0] -- vbuz1=vbuc1 
+  //SEG59 [28] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
+  b11_from_b10:
+  //SEG60 [28] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@10->main::@11#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG61 [28] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@18#1] -- vbuz1=vbuc1 
+  //SEG61 [28] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@10->main::@11#1] -- vbuz1=vbuc1 
     lda #0
     sta ch
-    jmp b18
-  //SEG62 [28] phi from main::@19 to main::@18 [phi:main::@19->main::@18]
-  b18_from_b19:
-  //SEG63 [28] phi (byte) main::i#10 = (byte) main::i#6 [phi:main::@19->main::@18#0] -- register_copy 
-  //SEG64 [28] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@19->main::@18#1] -- register_copy 
-    jmp b18
-  //SEG65 main::@18
-  b18:
+    jmp b11
+  //SEG62 [28] phi from main::@12 to main::@11 [phi:main::@12->main::@11]
+  b11_from_b12:
+  //SEG63 [28] phi (byte) main::i#10 = (byte) main::i#6 [phi:main::@12->main::@11#0] -- register_copy 
+  //SEG64 [28] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@12->main::@11#1] -- register_copy 
+    jmp b11
+  //SEG65 main::@11
+  b11:
   //SEG66 [29] (byte) keyboard_get_keycode::ch#0 ← (byte) main::ch#2 -- vbuz1=vbuz2 
     lda ch
     sta keyboard_get_keycode.ch
@@ -1873,19 +1893,19 @@ main: {
   //SEG68 [31] (byte) keyboard_get_keycode::return#2 ← (byte) keyboard_get_keycode::return#0 -- vbuz1=vbuz2 
     lda keyboard_get_keycode.return
     sta keyboard_get_keycode.return_2
-    jmp b29
-  //SEG69 main::@29
-  b29:
+    jmp b17
+  //SEG69 main::@17
+  b17:
   //SEG70 [32] (byte) main::key#0 ← (byte) keyboard_get_keycode::return#2 -- vbuz1=vbuz2 
     lda keyboard_get_keycode.return_2
     sta key
-  //SEG71 [33] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@19 -- vbuz1_eq_vbuc1_then_la1 
+  //SEG71 [33] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@12 -- vbuz1_eq_vbuc1_then_la1 
     lda #$3f
     cmp key
-    beq b19_from_b29
-    jmp b21
-  //SEG72 main::@21
-  b21:
+    beq b12_from_b17
+    jmp b13
+  //SEG72 main::@13
+  b13:
   //SEG73 [34] (byte) keyboard_key_pressed::key#0 ← (byte) main::key#0 -- vbuz1=vbuz2 
     lda key
     sta keyboard_key_pressed.key
@@ -1894,65 +1914,65 @@ main: {
   //SEG75 [36] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return
     sta keyboard_key_pressed.return_2
-    jmp b30
-  //SEG76 main::@30
-  b30:
+    jmp b18
+  //SEG76 main::@18
+  b18:
   //SEG77 [37] (byte~) main::$15 ← (byte) keyboard_key_pressed::return#2 -- vbuz1=vbuz2 
     lda keyboard_key_pressed.return_2
     sta _15
-  //SEG78 [38] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@19 -- vbuz1_eq_0_then_la1 
+  //SEG78 [38] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12 -- vbuz1_eq_0_then_la1 
     lda _15
     cmp #0
-    beq b19_from_b30
-    jmp b22
-  //SEG79 main::@22
-  b22:
+    beq b12_from_b18
+    jmp b14
+  //SEG79 main::@14
+  b14:
   //SEG80 [39] *((byte*) main::screen#2 + (byte) main::i#10) ← (byte) main::ch#2 -- pbuz1_derefidx_vbuz2=vbuz3 
     lda ch
     ldy i
     sta (screen_2),y
   //SEG81 [40] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG82 [41] phi from main::@22 main::@29 main::@30 to main::@19 [phi:main::@22/main::@29/main::@30->main::@19]
-  b19_from_b22:
-  b19_from_b29:
-  b19_from_b30:
-  //SEG83 [41] phi (byte) main::i#6 = (byte) main::i#1 [phi:main::@22/main::@29/main::@30->main::@19#0] -- register_copy 
-    jmp b19
-  //SEG84 main::@19
-  b19:
+  //SEG82 [41] phi from main::@14 main::@17 main::@18 to main::@12 [phi:main::@14/main::@17/main::@18->main::@12]
+  b12_from_b14:
+  b12_from_b17:
+  b12_from_b18:
+  //SEG83 [41] phi (byte) main::i#6 = (byte) main::i#1 [phi:main::@14/main::@17/main::@18->main::@12#0] -- register_copy 
+    jmp b12
+  //SEG84 main::@12
+  b12:
   //SEG85 [42] (byte) main::ch#1 ← ++ (byte) main::ch#2 -- vbuz1=_inc_vbuz1 
     inc ch
-  //SEG86 [43] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@18 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG86 [43] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@11 -- vbuz1_neq_vbuc1_then_la1 
     lda #$40
     cmp ch
-    bne b18_from_b19
-  //SEG87 [44] phi from main::@19 main::@24 to main::@24 [phi:main::@19/main::@24->main::@24]
-  b24_from_b19:
-  b24_from_b24:
-  //SEG88 [44] phi (byte) main::i#4 = (byte) main::i#6 [phi:main::@19/main::@24->main::@24#0] -- register_copy 
-    jmp b24
+    bne b11_from_b12
+  //SEG87 [44] phi from main::@12 main::@15 to main::@15 [phi:main::@12/main::@15->main::@15]
+  b15_from_b12:
+  b15_from_b15:
+  //SEG88 [44] phi (byte) main::i#4 = (byte) main::i#6 [phi:main::@12/main::@15->main::@15#0] -- register_copy 
+    jmp b15
   // Add some spaces
-  //SEG89 main::@24
-  b24:
+  //SEG89 main::@15
+  b15:
   //SEG90 [45] *((byte*) main::screen#2 + (byte) main::i#4) ← (byte) ' ' -- pbuz1_derefidx_vbuz2=vbuc1 
     lda #' '
     ldy i
     sta (screen_2),y
   //SEG91 [46] (byte) main::i#2 ← ++ (byte) main::i#4 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG92 [47] if((byte) main::i#2<(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@24 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG92 [47] if((byte) main::i#2<(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@15 -- vbuz1_lt_vbuc1_then_la1 
     lda i
     cmp #5
-    bcc b24_from_b24
-    jmp b8
-  //SEG93 main::@12
-  b12:
+    bcc b15_from_b15
+    jmp b3
+  //SEG93 main::@6
+  b6:
   //SEG94 [48] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '1' -- pbuz1_derefidx_vbuz2=vbuc1 
     lda #'1'
     ldy col
     sta (screen),y
-    jmp b13
+    jmp b7
 }
 //SEG95 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -1988,9 +2008,9 @@ keyboard_key_pressed: {
   //SEG102 [53] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return
     sta keyboard_matrix_read.return_2
-    jmp b2
-  //SEG103 keyboard_key_pressed::@2
-  b2:
+    jmp b1
+  //SEG103 keyboard_key_pressed::@1
+  b1:
   //SEG104 [54] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2 -- vbuz1=vbuz2 
     lda keyboard_matrix_read.return_2
     sta _2
@@ -2078,8 +2098,8 @@ keyboard_init: {
 
 REGISTER UPLIFT POTENTIAL REGISTERS
 Statement [6] *((byte*) main::sc#2) ← (byte) ' ' [ main::sc#2 ] ( main:2 [ main::sc#2 ] ) always clobbers reg byte a reg byte y 
-Statement [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@6 [ main::sc#1 ] ( main:2 [ main::sc#1 ] ) always clobbers reg byte a 
-Statement [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@1 [ main::sc#1 ] ( main:2 [ main::sc#1 ] ) always clobbers reg byte a 
+Statement [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [20] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '0' [ main::row#2 main::screen#13 main::row_pressed_bits#2 main::col#2 ] ( main:2 [ main::row#2 main::screen#13 main::row_pressed_bits#2 main::col#2 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:4 [ main::row#2 main::row#1 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:7 [ main::row_pressed_bits#2 main::row_pressed_bits#1 main::row_pressed_bits#0 ]
@@ -2097,8 +2117,8 @@ Statement [59] (byte) keyboard_matrix_read::return#0 ← ~ *((const byte*) CIA1_
 Statement [63] *((const byte*) CIA1_PORT_A_DDR#0) ← (byte/word/signed word/dword/signed dword) $ff [ ] ( main:2::keyboard_init:10 [ ] ) always clobbers reg byte a 
 Statement [64] *((const byte*) CIA1_PORT_B_DDR#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 [ ] ( main:2::keyboard_init:10 [ ] ) always clobbers reg byte a 
 Statement [6] *((byte*) main::sc#2) ← (byte) ' ' [ main::sc#2 ] ( main:2 [ main::sc#2 ] ) always clobbers reg byte a reg byte y 
-Statement [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@6 [ main::sc#1 ] ( main:2 [ main::sc#1 ] ) always clobbers reg byte a 
-Statement [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8 [ ] ( main:2 [ ] ) always clobbers reg byte a 
+Statement [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@1 [ main::sc#1 ] ( main:2 [ main::sc#1 ] ) always clobbers reg byte a 
+Statement [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3 [ ] ( main:2 [ ] ) always clobbers reg byte a 
 Statement [18] (byte~) main::$5 ← (byte) main::row_pressed_bits#2 & (byte/word/signed word/dword/signed dword) $80 [ main::row#2 main::screen#13 main::row_pressed_bits#2 main::col#2 main::$5 ] ( main:2 [ main::row#2 main::screen#13 main::row_pressed_bits#2 main::col#2 main::$5 ] ) always clobbers reg byte a 
 Statement [20] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '0' [ main::row#2 main::screen#13 main::row_pressed_bits#2 main::col#2 ] ( main:2 [ main::row#2 main::screen#13 main::row_pressed_bits#2 main::col#2 ] ) always clobbers reg byte a 
 Statement [24] (byte*) main::screen#1 ← (byte*) main::screen#13 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ main::row#2 main::screen#1 ] ( main:2 [ main::row#2 main::screen#1 ] ) always clobbers reg byte a 
@@ -2239,17 +2259,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const KEY_Q = $3e
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @12 [phi:@begin->@12]
-b12_from_bbegin:
-  jmp b12
-//SEG5 @12
-b12:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @12 to main [phi:@12->main]
-main_from_b12:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @12 to @end [phi:@12->@end]
-bend_from_b12:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -2259,21 +2279,21 @@ main: {
     .label screen = 2
     .label row = 4
     .label ch = 4
-  //SEG11 [5] phi from main to main::@6 [phi:main->main::@6]
-  b6_from_main:
-  //SEG12 [5] phi (byte*) main::sc#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@6#0] -- pbuz1=pbuc1 
+  //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
+  b1_from_main:
+  //SEG12 [5] phi (byte*) main::sc#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@1#0] -- pbuz1=pbuc1 
     lda #<$400
     sta sc
     lda #>$400
     sta sc+1
-    jmp b6
+    jmp b1
   // Clear screen
-  //SEG13 [5] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  b6_from_b6:
-  //SEG14 [5] phi (byte*) main::sc#2 = (byte*) main::sc#1 [phi:main::@6->main::@6#0] -- register_copy 
-    jmp b6
-  //SEG15 main::@6
-  b6:
+  //SEG13 [5] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  b1_from_b1:
+  //SEG14 [5] phi (byte*) main::sc#2 = (byte*) main::sc#1 [phi:main::@1->main::@1#0] -- register_copy 
+    jmp b1
+  //SEG15 main::@1
+  b1:
   //SEG16 [6] *((byte*) main::sc#2) ← (byte) ' ' -- _deref_pbuz1=vbuc1 
     lda #' '
     ldy #0
@@ -2283,101 +2303,101 @@ main: {
     bne !+
     inc sc+1
   !:
-  //SEG18 [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@6 -- pbuz1_lt_vwuc1_then_la1 
+  //SEG18 [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@1 -- pbuz1_lt_vwuc1_then_la1 
     lda sc+1
     cmp #>$400+$3e8
-    bcc b6_from_b6
+    bcc b1_from_b1
     bne !+
     lda sc
     cmp #<$400+$3e8
-    bcc b6_from_b6
+    bcc b1_from_b1
   !:
-  //SEG19 [9] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG20 main::@7
-  b7:
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG20 main::@2
+  b2:
   //SEG21 [10] call keyboard_init 
     jsr keyboard_init
-    jmp b8
-  //SEG22 main::@8
-  b8:
-  //SEG23 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+    jmp b3
+  //SEG22 main::@3
+  b3:
+  //SEG23 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b8
-  //SEG24 [12] phi from main::@8 to main::@10 [phi:main::@8->main::@10]
-  b10_from_b8:
-  //SEG25 [12] phi (byte*) main::screen#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@8->main::@10#0] -- pbuz1=pbuc1 
+    bne b3
+  //SEG24 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG25 [12] phi (byte*) main::screen#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@3->main::@4#0] -- pbuz1=pbuc1 
     lda #<$400
     sta screen
     lda #>$400
     sta screen+1
-  //SEG26 [12] phi (byte) main::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@10#1] -- vbuz1=vbuc1 
+  //SEG26 [12] phi (byte) main::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#1] -- vbuz1=vbuc1 
     lda #0
     sta row
-    jmp b10
+    jmp b4
   // Read & print keyboard matrix
-  //SEG27 [12] phi from main::@16 to main::@10 [phi:main::@16->main::@10]
-  b10_from_b16:
-  //SEG28 [12] phi (byte*) main::screen#13 = (byte*) main::screen#1 [phi:main::@16->main::@10#0] -- register_copy 
-  //SEG29 [12] phi (byte) main::row#2 = (byte) main::row#1 [phi:main::@16->main::@10#1] -- register_copy 
-    jmp b10
-  //SEG30 main::@10
-  b10:
+  //SEG27 [12] phi from main::@9 to main::@4 [phi:main::@9->main::@4]
+  b4_from_b9:
+  //SEG28 [12] phi (byte*) main::screen#13 = (byte*) main::screen#1 [phi:main::@9->main::@4#0] -- register_copy 
+  //SEG29 [12] phi (byte) main::row#2 = (byte) main::row#1 [phi:main::@9->main::@4#1] -- register_copy 
+    jmp b4
+  //SEG30 main::@4
+  b4:
   //SEG31 [13] (byte) keyboard_matrix_read::rowid#1 ← (byte) main::row#2 -- vbuyy=vbuz1 
     ldy row
   //SEG32 [14] call keyboard_matrix_read 
-  //SEG33 [57] phi from main::@10 to keyboard_matrix_read [phi:main::@10->keyboard_matrix_read]
-  keyboard_matrix_read_from_b10:
-  //SEG34 [57] phi (byte) keyboard_matrix_read::rowid#2 = (byte) keyboard_matrix_read::rowid#1 [phi:main::@10->keyboard_matrix_read#0] -- register_copy 
+  //SEG33 [57] phi from main::@4 to keyboard_matrix_read [phi:main::@4->keyboard_matrix_read]
+  keyboard_matrix_read_from_b4:
+  //SEG34 [57] phi (byte) keyboard_matrix_read::rowid#2 = (byte) keyboard_matrix_read::rowid#1 [phi:main::@4->keyboard_matrix_read#0] -- register_copy 
     jsr keyboard_matrix_read
   //SEG35 [15] (byte) keyboard_matrix_read::return#3 ← (byte) keyboard_matrix_read::return#0
-    jmp b28
-  //SEG36 main::@28
-  b28:
+    jmp b16
+  //SEG36 main::@16
+  b16:
   //SEG37 [16] (byte) main::row_pressed_bits#0 ← (byte) keyboard_matrix_read::return#3 -- vbuxx=vbuaa 
     tax
-  //SEG38 [17] phi from main::@28 to main::@11 [phi:main::@28->main::@11]
-  b11_from_b28:
-  //SEG39 [17] phi (byte) main::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@28->main::@11#0] -- vbuyy=vbuc1 
+  //SEG38 [17] phi from main::@16 to main::@5 [phi:main::@16->main::@5]
+  b5_from_b16:
+  //SEG39 [17] phi (byte) main::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@5#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG40 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#0 [phi:main::@28->main::@11#1] -- register_copy 
-    jmp b11
-  //SEG41 [17] phi from main::@13 to main::@11 [phi:main::@13->main::@11]
-  b11_from_b13:
-  //SEG42 [17] phi (byte) main::col#2 = (byte) main::col#1 [phi:main::@13->main::@11#0] -- register_copy 
-  //SEG43 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#1 [phi:main::@13->main::@11#1] -- register_copy 
-    jmp b11
-  //SEG44 main::@11
-  b11:
+  //SEG40 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#0 [phi:main::@16->main::@5#1] -- register_copy 
+    jmp b5
+  //SEG41 [17] phi from main::@7 to main::@5 [phi:main::@7->main::@5]
+  b5_from_b7:
+  //SEG42 [17] phi (byte) main::col#2 = (byte) main::col#1 [phi:main::@7->main::@5#0] -- register_copy 
+  //SEG43 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#1 [phi:main::@7->main::@5#1] -- register_copy 
+    jmp b5
+  //SEG44 main::@5
+  b5:
   //SEG45 [18] (byte~) main::$5 ← (byte) main::row_pressed_bits#2 & (byte/word/signed word/dword/signed dword) $80 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #$80
-  //SEG46 [19] if((byte~) main::$5!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12 -- vbuaa_neq_0_then_la1 
+  //SEG46 [19] if((byte~) main::$5!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@6 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b12
-    jmp b14
-  //SEG47 main::@14
-  b14:
+    bne b6
+    jmp b8
+  //SEG47 main::@8
+  b8:
   //SEG48 [20] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '0' -- pbuz1_derefidx_vbuyy=vbuc1 
     lda #'0'
     sta (screen),y
-    jmp b13
-  //SEG49 main::@13
-  b13:
+    jmp b7
+  //SEG49 main::@7
+  b7:
   //SEG50 [21] (byte) main::row_pressed_bits#1 ← (byte) main::row_pressed_bits#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_rol_1 
     txa
     asl
     tax
   //SEG51 [22] (byte) main::col#1 ← ++ (byte) main::col#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG52 [23] if((byte) main::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@11 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG52 [23] if((byte) main::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@5 -- vbuyy_neq_vbuc1_then_la1 
     cpy #8
-    bne b11_from_b13
-    jmp b16
-  //SEG53 main::@16
-  b16:
+    bne b5_from_b7
+    jmp b9
+  //SEG53 main::@9
+  b9:
   //SEG54 [24] (byte*) main::screen#1 ← (byte*) main::screen#13 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$28
     clc
@@ -2388,13 +2408,13 @@ main: {
   !:
   //SEG55 [25] (byte) main::row#1 ← ++ (byte) main::row#2 -- vbuz1=_inc_vbuz1 
     inc row
-  //SEG56 [26] if((byte) main::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG56 [26] if((byte) main::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp row
-    bne b10_from_b16
-    jmp b17
-  //SEG57 main::@17
-  b17:
+    bne b4_from_b9
+    jmp b10
+  //SEG57 main::@10
+  b10:
   //SEG58 [27] (byte*) main::screen#2 ← (byte*) main::screen#1 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$28
     clc
@@ -2403,51 +2423,51 @@ main: {
     bcc !+
     inc screen+1
   !:
-  //SEG59 [28] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
-  b18_from_b17:
-  //SEG60 [28] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@18#0] -- vbuxx=vbuc1 
+  //SEG59 [28] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
+  b11_from_b10:
+  //SEG60 [28] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@10->main::@11#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG61 [28] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@18#1] -- vbuz1=vbuc1 
+  //SEG61 [28] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@10->main::@11#1] -- vbuz1=vbuc1 
     lda #0
     sta ch
-    jmp b18
-  //SEG62 [28] phi from main::@19 to main::@18 [phi:main::@19->main::@18]
-  b18_from_b19:
-  //SEG63 [28] phi (byte) main::i#10 = (byte) main::i#6 [phi:main::@19->main::@18#0] -- register_copy 
-  //SEG64 [28] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@19->main::@18#1] -- register_copy 
-    jmp b18
-  //SEG65 main::@18
-  b18:
+    jmp b11
+  //SEG62 [28] phi from main::@12 to main::@11 [phi:main::@12->main::@11]
+  b11_from_b12:
+  //SEG63 [28] phi (byte) main::i#10 = (byte) main::i#6 [phi:main::@12->main::@11#0] -- register_copy 
+  //SEG64 [28] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@12->main::@11#1] -- register_copy 
+    jmp b11
+  //SEG65 main::@11
+  b11:
   //SEG66 [29] (byte) keyboard_get_keycode::ch#0 ← (byte) main::ch#2 -- vbuyy=vbuz1 
     ldy ch
   //SEG67 [30] call keyboard_get_keycode 
     jsr keyboard_get_keycode
   //SEG68 [31] (byte) keyboard_get_keycode::return#2 ← (byte) keyboard_get_keycode::return#0
-    jmp b29
-  //SEG69 main::@29
-  b29:
+    jmp b17
+  //SEG69 main::@17
+  b17:
   //SEG70 [32] (byte) main::key#0 ← (byte) keyboard_get_keycode::return#2
-  //SEG71 [33] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@19 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG71 [33] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@12 -- vbuaa_eq_vbuc1_then_la1 
     cmp #$3f
-    beq b19_from_b29
-    jmp b21
-  //SEG72 main::@21
-  b21:
+    beq b12_from_b17
+    jmp b13
+  //SEG72 main::@13
+  b13:
   //SEG73 [34] (byte) keyboard_key_pressed::key#0 ← (byte) main::key#0 -- vbuyy=vbuaa 
     tay
   //SEG74 [35] call keyboard_key_pressed 
     jsr keyboard_key_pressed
   //SEG75 [36] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-    jmp b30
-  //SEG76 main::@30
-  b30:
+    jmp b18
+  //SEG76 main::@18
+  b18:
   //SEG77 [37] (byte~) main::$15 ← (byte) keyboard_key_pressed::return#2
-  //SEG78 [38] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@19 -- vbuaa_eq_0_then_la1 
+  //SEG78 [38] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b19_from_b30
-    jmp b22
-  //SEG79 main::@22
-  b22:
+    beq b12_from_b18
+    jmp b14
+  //SEG79 main::@14
+  b14:
   //SEG80 [39] *((byte*) main::screen#2 + (byte) main::i#10) ← (byte) main::ch#2 -- pbuz1_derefidx_vbuxx=vbuz2 
     txa
     tay
@@ -2455,28 +2475,28 @@ main: {
     sta (screen),y
   //SEG81 [40] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG82 [41] phi from main::@22 main::@29 main::@30 to main::@19 [phi:main::@22/main::@29/main::@30->main::@19]
-  b19_from_b22:
-  b19_from_b29:
-  b19_from_b30:
-  //SEG83 [41] phi (byte) main::i#6 = (byte) main::i#1 [phi:main::@22/main::@29/main::@30->main::@19#0] -- register_copy 
-    jmp b19
-  //SEG84 main::@19
-  b19:
+  //SEG82 [41] phi from main::@14 main::@17 main::@18 to main::@12 [phi:main::@14/main::@17/main::@18->main::@12]
+  b12_from_b14:
+  b12_from_b17:
+  b12_from_b18:
+  //SEG83 [41] phi (byte) main::i#6 = (byte) main::i#1 [phi:main::@14/main::@17/main::@18->main::@12#0] -- register_copy 
+    jmp b12
+  //SEG84 main::@12
+  b12:
   //SEG85 [42] (byte) main::ch#1 ← ++ (byte) main::ch#2 -- vbuz1=_inc_vbuz1 
     inc ch
-  //SEG86 [43] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@18 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG86 [43] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@11 -- vbuz1_neq_vbuc1_then_la1 
     lda #$40
     cmp ch
-    bne b18_from_b19
-  //SEG87 [44] phi from main::@19 main::@24 to main::@24 [phi:main::@19/main::@24->main::@24]
-  b24_from_b19:
-  b24_from_b24:
-  //SEG88 [44] phi (byte) main::i#4 = (byte) main::i#6 [phi:main::@19/main::@24->main::@24#0] -- register_copy 
-    jmp b24
+    bne b11_from_b12
+  //SEG87 [44] phi from main::@12 main::@15 to main::@15 [phi:main::@12/main::@15->main::@15]
+  b15_from_b12:
+  b15_from_b15:
+  //SEG88 [44] phi (byte) main::i#4 = (byte) main::i#6 [phi:main::@12/main::@15->main::@15#0] -- register_copy 
+    jmp b15
   // Add some spaces
-  //SEG89 main::@24
-  b24:
+  //SEG89 main::@15
+  b15:
   //SEG90 [45] *((byte*) main::screen#2 + (byte) main::i#4) ← (byte) ' ' -- pbuz1_derefidx_vbuxx=vbuc1 
     txa
     tay
@@ -2484,16 +2504,16 @@ main: {
     sta (screen),y
   //SEG91 [46] (byte) main::i#2 ← ++ (byte) main::i#4 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG92 [47] if((byte) main::i#2<(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@24 -- vbuxx_lt_vbuc1_then_la1 
+  //SEG92 [47] if((byte) main::i#2<(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@15 -- vbuxx_lt_vbuc1_then_la1 
     cpx #5
-    bcc b24_from_b24
-    jmp b8
-  //SEG93 main::@12
-  b12:
+    bcc b15_from_b15
+    jmp b3
+  //SEG93 main::@6
+  b6:
   //SEG94 [48] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '1' -- pbuz1_derefidx_vbuyy=vbuc1 
     lda #'1'
     sta (screen),y
-    jmp b13
+    jmp b7
 }
 //SEG95 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -2520,9 +2540,9 @@ keyboard_key_pressed: {
   //SEG101 [57] phi (byte) keyboard_matrix_read::rowid#2 = (byte) keyboard_matrix_read::rowid#0 [phi:keyboard_key_pressed->keyboard_matrix_read#0] -- register_copy 
     jsr keyboard_matrix_read
   //SEG102 [53] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-    jmp b2
-  //SEG103 keyboard_key_pressed::@2
-  b2:
+    jmp b1
+  //SEG103 keyboard_key_pressed::@1
+  b1:
   //SEG104 [54] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   //SEG105 [55] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuz1 
     ldy colidx
@@ -2594,71 +2614,71 @@ keyboard_init: {
   keyboard_char_keycodes: .byte KEY_AT, KEY_A, KEY_B, KEY_C, KEY_D, KEY_E, KEY_F, KEY_G, KEY_H, KEY_I, KEY_J, KEY_K, KEY_L, KEY_M, KEY_N, KEY_O, KEY_P, KEY_Q, KEY_R, KEY_S, KEY_T, KEY_U, KEY_V, KEY_W, KEY_X, KEY_Y, KEY_Z, $3f, KEY_POUND, $3f, KEY_ARROW_UP, KEY_ARROW_LEFT, KEY_SPACE, $3f, $3f, $3f, $3f, $3f, $3f, $3f, $3f, $3f, KEY_ASTERISK, KEY_PLUS, KEY_COMMA, KEY_MINUS, KEY_DOT, KEY_SLASH, KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_COLON, KEY_SEMICOLON, $3f, KEY_EQUALS, $3f, $3f
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b12
+Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b10
-Removing instruction jmp b28
-Removing instruction jmp b11
-Removing instruction jmp b14
-Removing instruction jmp b13
-Removing instruction jmp b16
-Removing instruction jmp b17
-Removing instruction jmp b18
-Removing instruction jmp b29
-Removing instruction jmp b21
-Removing instruction jmp b30
-Removing instruction jmp b22
-Removing instruction jmp b19
-Removing instruction jmp b24
+Removing instruction jmp b1
 Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b16
+Removing instruction jmp b5
+Removing instruction jmp b8
+Removing instruction jmp b7
+Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp b11
+Removing instruction jmp b17
+Removing instruction jmp b13
+Removing instruction jmp b18
+Removing instruction jmp b14
+Removing instruction jmp b12
+Removing instruction jmp b15
+Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing instruction lda #0 with TXA
-Replacing label b6_from_b6 with b6
-Replacing label b6_from_b6 with b6
-Replacing label b11_from_b13 with b11
-Replacing label b10_from_b16 with b10
-Replacing label b19_from_b29 with b19
-Replacing label b19_from_b30 with b19
-Replacing label b18_from_b19 with b18
-Removing instruction b12_from_bbegin:
-Removing instruction b12:
-Removing instruction main_from_b12:
-Removing instruction bend_from_b12:
-Removing instruction b6_from_b6:
-Removing instruction b7_from_b6:
-Removing instruction b10_from_b16:
-Removing instruction b11_from_b13:
-Removing instruction b18_from_b19:
-Removing instruction b19_from_b22:
-Removing instruction b19_from_b29:
-Removing instruction b19_from_b30:
-Removing instruction b24_from_b19:
+Replacing label b1_from_b1 with b1
+Replacing label b1_from_b1 with b1
+Replacing label b5_from_b7 with b5
+Replacing label b4_from_b9 with b4
+Replacing label b12_from_b17 with b12
+Replacing label b12_from_b18 with b12
+Replacing label b11_from_b12 with b11
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b1:
+Removing instruction b2_from_b1:
+Removing instruction b4_from_b9:
+Removing instruction b5_from_b7:
+Removing instruction b11_from_b12:
+Removing instruction b12_from_b14:
+Removing instruction b12_from_b17:
+Removing instruction b12_from_b18:
+Removing instruction b15_from_b12:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b6_from_main:
-Removing instruction b7:
-Removing instruction b10_from_b8:
-Removing instruction keyboard_matrix_read_from_b10:
-Removing instruction b28:
-Removing instruction b11_from_b28:
-Removing instruction b14:
-Removing instruction b16:
-Removing instruction b17:
-Removing instruction b18_from_b17:
-Removing instruction b29:
-Removing instruction b21:
-Removing instruction b30:
-Removing instruction b22:
-Removing instruction b24:
-Removing instruction keyboard_matrix_read_from_keyboard_key_pressed:
+Removing instruction b1_from_main:
 Removing instruction b2:
+Removing instruction b4_from_b3:
+Removing instruction keyboard_matrix_read_from_b4:
+Removing instruction b16:
+Removing instruction b5_from_b16:
+Removing instruction b8:
+Removing instruction b9:
+Removing instruction b10:
+Removing instruction b11_from_b10:
+Removing instruction b17:
+Removing instruction b13:
+Removing instruction b18:
+Removing instruction b14:
+Removing instruction b15:
+Removing instruction keyboard_matrix_read_from_keyboard_key_pressed:
+Removing instruction b1:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction breturn:
@@ -2667,18 +2687,18 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Relabelling long label b24_from_b24 to b1
+Relabelling long label b15_from_b15 to b2
 Succesful ASM optimization Pass5RelabelLongLabels
-Removing instruction jmp b6
-Removing instruction jmp b10
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b5
 Removing instruction jmp b11
-Removing instruction jmp b18
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @12
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -2899,7 +2919,7 @@ FINAL SYMBOL TABLE
 (label) keyboard_init::@return
 (byte()) keyboard_key_pressed((byte) keyboard_key_pressed::key)
 (byte~) keyboard_key_pressed::$2 reg byte a 4.0
-(label) keyboard_key_pressed::@2
+(label) keyboard_key_pressed::@1
 (label) keyboard_key_pressed::@return
 (byte) keyboard_key_pressed::colidx
 (byte) keyboard_key_pressed::colidx#0 colidx zp ZP_BYTE:5 0.6666666666666666
@@ -2930,24 +2950,24 @@ FINAL SYMBOL TABLE
 (void()) main()
 (byte~) main::$15 reg byte a 202.0
 (byte~) main::$5 reg byte a 2002.0
+(label) main::@1
 (label) main::@10
 (label) main::@11
 (label) main::@12
 (label) main::@13
 (label) main::@14
+(label) main::@15
 (label) main::@16
 (label) main::@17
 (label) main::@18
-(label) main::@19
-(label) main::@21
-(label) main::@22
-(label) main::@24
-(label) main::@28
-(label) main::@29
-(label) main::@30
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
 (label) main::@7
 (label) main::@8
+(label) main::@9
 (byte) main::ch
 (byte) main::ch#1 ch zp ZP_BYTE:4 151.5
 (byte) main::ch#2 ch zp ZP_BYTE:4 28.857142857142858
@@ -3070,11 +3090,11 @@ Score: 56821
   .const KEY_SPACE = $3c
   .const KEY_Q = $3e
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @12 [phi:@begin->@12]
-//SEG5 @12
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @12 to main [phi:@12->main]
-//SEG8 [3] phi from @12 to @end [phi:@12->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -3082,17 +3102,17 @@ main: {
     .label screen = 2
     .label row = 4
     .label ch = 4
-  //SEG11 [5] phi from main to main::@6 [phi:main->main::@6]
-  //SEG12 [5] phi (byte*) main::sc#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@6#0] -- pbuz1=pbuc1 
+  //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
+  //SEG12 [5] phi (byte*) main::sc#2 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main->main::@1#0] -- pbuz1=pbuc1 
     lda #<$400
     sta sc
     lda #>$400
     sta sc+1
   // Clear screen
-  //SEG13 [5] phi from main::@6 to main::@6 [phi:main::@6->main::@6]
-  //SEG14 [5] phi (byte*) main::sc#2 = (byte*) main::sc#1 [phi:main::@6->main::@6#0] -- register_copy 
-  //SEG15 main::@6
-  b6:
+  //SEG13 [5] phi from main::@1 to main::@1 [phi:main::@1->main::@1]
+  //SEG14 [5] phi (byte*) main::sc#2 = (byte*) main::sc#1 [phi:main::@1->main::@1#0] -- register_copy 
+  //SEG15 main::@1
+  b1:
   //SEG16 [6] *((byte*) main::sc#2) ← (byte) ' ' -- _deref_pbuz1=vbuc1 
     lda #' '
     ldy #0
@@ -3102,81 +3122,81 @@ main: {
     bne !+
     inc sc+1
   !:
-  //SEG18 [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@6 -- pbuz1_lt_vwuc1_then_la1 
+  //SEG18 [8] if((byte*) main::sc#1<(word/signed word/dword/signed dword) $400+(word/signed word/dword/signed dword) $3e8) goto main::@1 -- pbuz1_lt_vwuc1_then_la1 
     lda sc+1
     cmp #>$400+$3e8
-    bcc b6
+    bcc b1
     bne !+
     lda sc
     cmp #<$400+$3e8
-    bcc b6
+    bcc b1
   !:
-  //SEG19 [9] phi from main::@6 to main::@7 [phi:main::@6->main::@7]
-  //SEG20 main::@7
+  //SEG19 [9] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG20 main::@2
   //SEG21 [10] call keyboard_init 
     jsr keyboard_init
-  //SEG22 main::@8
-  b8:
-  //SEG23 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@8 -- _deref_pbuc1_neq_vbuc2_then_la1 
+  //SEG22 main::@3
+  b3:
+  //SEG23 [11] if(*((const byte*) RASTER#0)!=(byte/word/signed word/dword/signed dword) $ff) goto main::@3 -- _deref_pbuc1_neq_vbuc2_then_la1 
     lda #$ff
     cmp RASTER
-    bne b8
-  //SEG24 [12] phi from main::@8 to main::@10 [phi:main::@8->main::@10]
-  //SEG25 [12] phi (byte*) main::screen#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@8->main::@10#0] -- pbuz1=pbuc1 
+    bne b3
+  //SEG24 [12] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG25 [12] phi (byte*) main::screen#13 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:main::@3->main::@4#0] -- pbuz1=pbuc1 
     lda #<$400
     sta screen
     lda #>$400
     sta screen+1
-  //SEG26 [12] phi (byte) main::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@8->main::@10#1] -- vbuz1=vbuc1 
+  //SEG26 [12] phi (byte) main::row#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#1] -- vbuz1=vbuc1 
     lda #0
     sta row
   // Read & print keyboard matrix
-  //SEG27 [12] phi from main::@16 to main::@10 [phi:main::@16->main::@10]
-  //SEG28 [12] phi (byte*) main::screen#13 = (byte*) main::screen#1 [phi:main::@16->main::@10#0] -- register_copy 
-  //SEG29 [12] phi (byte) main::row#2 = (byte) main::row#1 [phi:main::@16->main::@10#1] -- register_copy 
-  //SEG30 main::@10
-  b10:
+  //SEG27 [12] phi from main::@9 to main::@4 [phi:main::@9->main::@4]
+  //SEG28 [12] phi (byte*) main::screen#13 = (byte*) main::screen#1 [phi:main::@9->main::@4#0] -- register_copy 
+  //SEG29 [12] phi (byte) main::row#2 = (byte) main::row#1 [phi:main::@9->main::@4#1] -- register_copy 
+  //SEG30 main::@4
+  b4:
   //SEG31 [13] (byte) keyboard_matrix_read::rowid#1 ← (byte) main::row#2 -- vbuyy=vbuz1 
     ldy row
   //SEG32 [14] call keyboard_matrix_read 
-  //SEG33 [57] phi from main::@10 to keyboard_matrix_read [phi:main::@10->keyboard_matrix_read]
-  //SEG34 [57] phi (byte) keyboard_matrix_read::rowid#2 = (byte) keyboard_matrix_read::rowid#1 [phi:main::@10->keyboard_matrix_read#0] -- register_copy 
+  //SEG33 [57] phi from main::@4 to keyboard_matrix_read [phi:main::@4->keyboard_matrix_read]
+  //SEG34 [57] phi (byte) keyboard_matrix_read::rowid#2 = (byte) keyboard_matrix_read::rowid#1 [phi:main::@4->keyboard_matrix_read#0] -- register_copy 
     jsr keyboard_matrix_read
   //SEG35 [15] (byte) keyboard_matrix_read::return#3 ← (byte) keyboard_matrix_read::return#0
-  //SEG36 main::@28
+  //SEG36 main::@16
   //SEG37 [16] (byte) main::row_pressed_bits#0 ← (byte) keyboard_matrix_read::return#3 -- vbuxx=vbuaa 
     tax
-  //SEG38 [17] phi from main::@28 to main::@11 [phi:main::@28->main::@11]
-  //SEG39 [17] phi (byte) main::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@28->main::@11#0] -- vbuyy=vbuc1 
+  //SEG38 [17] phi from main::@16 to main::@5 [phi:main::@16->main::@5]
+  //SEG39 [17] phi (byte) main::col#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@16->main::@5#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG40 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#0 [phi:main::@28->main::@11#1] -- register_copy 
-  //SEG41 [17] phi from main::@13 to main::@11 [phi:main::@13->main::@11]
-  //SEG42 [17] phi (byte) main::col#2 = (byte) main::col#1 [phi:main::@13->main::@11#0] -- register_copy 
-  //SEG43 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#1 [phi:main::@13->main::@11#1] -- register_copy 
-  //SEG44 main::@11
-  b11:
+  //SEG40 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#0 [phi:main::@16->main::@5#1] -- register_copy 
+  //SEG41 [17] phi from main::@7 to main::@5 [phi:main::@7->main::@5]
+  //SEG42 [17] phi (byte) main::col#2 = (byte) main::col#1 [phi:main::@7->main::@5#0] -- register_copy 
+  //SEG43 [17] phi (byte) main::row_pressed_bits#2 = (byte) main::row_pressed_bits#1 [phi:main::@7->main::@5#1] -- register_copy 
+  //SEG44 main::@5
+  b5:
   //SEG45 [18] (byte~) main::$5 ← (byte) main::row_pressed_bits#2 & (byte/word/signed word/dword/signed dword) $80 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #$80
-  //SEG46 [19] if((byte~) main::$5!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12 -- vbuaa_neq_0_then_la1 
+  //SEG46 [19] if((byte~) main::$5!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@6 -- vbuaa_neq_0_then_la1 
     cmp #0
-    bne b12
-  //SEG47 main::@14
+    bne b6
+  //SEG47 main::@8
   //SEG48 [20] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '0' -- pbuz1_derefidx_vbuyy=vbuc1 
     lda #'0'
     sta (screen),y
-  //SEG49 main::@13
-  b13:
+  //SEG49 main::@7
+  b7:
   //SEG50 [21] (byte) main::row_pressed_bits#1 ← (byte) main::row_pressed_bits#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_rol_1 
     txa
     asl
     tax
   //SEG51 [22] (byte) main::col#1 ← ++ (byte) main::col#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG52 [23] if((byte) main::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@11 -- vbuyy_neq_vbuc1_then_la1 
+  //SEG52 [23] if((byte) main::col#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@5 -- vbuyy_neq_vbuc1_then_la1 
     cpy #8
-    bne b11
-  //SEG53 main::@16
+    bne b5
+  //SEG53 main::@9
   //SEG54 [24] (byte*) main::screen#1 ← (byte*) main::screen#13 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$28
     clc
@@ -3187,11 +3207,11 @@ main: {
   !:
   //SEG55 [25] (byte) main::row#1 ← ++ (byte) main::row#2 -- vbuz1=_inc_vbuz1 
     inc row
-  //SEG56 [26] if((byte) main::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@10 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG56 [26] if((byte) main::row#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto main::@4 -- vbuz1_neq_vbuc1_then_la1 
     lda #8
     cmp row
-    bne b10
-  //SEG57 main::@17
+    bne b4
+  //SEG57 main::@10
   //SEG58 [27] (byte*) main::screen#2 ← (byte*) main::screen#1 + (byte/signed byte/word/signed word/dword/signed dword) $28 -- pbuz1=pbuz1_plus_vbuc1 
     lda #$28
     clc
@@ -3200,39 +3220,39 @@ main: {
     bcc !+
     inc screen+1
   !:
-  //SEG59 [28] phi from main::@17 to main::@18 [phi:main::@17->main::@18]
-  //SEG60 [28] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@18#0] -- vbuxx=vbuc1 
+  //SEG59 [28] phi from main::@10 to main::@11 [phi:main::@10->main::@11]
+  //SEG60 [28] phi (byte) main::i#10 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@10->main::@11#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG61 [28] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@17->main::@18#1] -- vbuz1=vbuc1 
+  //SEG61 [28] phi (byte) main::ch#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@10->main::@11#1] -- vbuz1=vbuc1 
     txa
     sta ch
-  //SEG62 [28] phi from main::@19 to main::@18 [phi:main::@19->main::@18]
-  //SEG63 [28] phi (byte) main::i#10 = (byte) main::i#6 [phi:main::@19->main::@18#0] -- register_copy 
-  //SEG64 [28] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@19->main::@18#1] -- register_copy 
-  //SEG65 main::@18
-  b18:
+  //SEG62 [28] phi from main::@12 to main::@11 [phi:main::@12->main::@11]
+  //SEG63 [28] phi (byte) main::i#10 = (byte) main::i#6 [phi:main::@12->main::@11#0] -- register_copy 
+  //SEG64 [28] phi (byte) main::ch#2 = (byte) main::ch#1 [phi:main::@12->main::@11#1] -- register_copy 
+  //SEG65 main::@11
+  b11:
   //SEG66 [29] (byte) keyboard_get_keycode::ch#0 ← (byte) main::ch#2 -- vbuyy=vbuz1 
     ldy ch
   //SEG67 [30] call keyboard_get_keycode 
     jsr keyboard_get_keycode
   //SEG68 [31] (byte) keyboard_get_keycode::return#2 ← (byte) keyboard_get_keycode::return#0
-  //SEG69 main::@29
+  //SEG69 main::@17
   //SEG70 [32] (byte) main::key#0 ← (byte) keyboard_get_keycode::return#2
-  //SEG71 [33] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@19 -- vbuaa_eq_vbuc1_then_la1 
+  //SEG71 [33] if((byte) main::key#0==(byte/signed byte/word/signed word/dword/signed dword) $3f) goto main::@12 -- vbuaa_eq_vbuc1_then_la1 
     cmp #$3f
-    beq b19
-  //SEG72 main::@21
+    beq b12
+  //SEG72 main::@13
   //SEG73 [34] (byte) keyboard_key_pressed::key#0 ← (byte) main::key#0 -- vbuyy=vbuaa 
     tay
   //SEG74 [35] call keyboard_key_pressed 
     jsr keyboard_key_pressed
   //SEG75 [36] (byte) keyboard_key_pressed::return#2 ← (byte) keyboard_key_pressed::return#0
-  //SEG76 main::@30
+  //SEG76 main::@18
   //SEG77 [37] (byte~) main::$15 ← (byte) keyboard_key_pressed::return#2
-  //SEG78 [38] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@19 -- vbuaa_eq_0_then_la1 
+  //SEG78 [38] if((byte~) main::$15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto main::@12 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b19
-  //SEG79 main::@22
+    beq b12
+  //SEG79 main::@14
   //SEG80 [39] *((byte*) main::screen#2 + (byte) main::i#10) ← (byte) main::ch#2 -- pbuz1_derefidx_vbuxx=vbuz2 
     txa
     tay
@@ -3240,21 +3260,21 @@ main: {
     sta (screen),y
   //SEG81 [40] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG82 [41] phi from main::@22 main::@29 main::@30 to main::@19 [phi:main::@22/main::@29/main::@30->main::@19]
-  //SEG83 [41] phi (byte) main::i#6 = (byte) main::i#1 [phi:main::@22/main::@29/main::@30->main::@19#0] -- register_copy 
-  //SEG84 main::@19
-  b19:
+  //SEG82 [41] phi from main::@14 main::@17 main::@18 to main::@12 [phi:main::@14/main::@17/main::@18->main::@12]
+  //SEG83 [41] phi (byte) main::i#6 = (byte) main::i#1 [phi:main::@14/main::@17/main::@18->main::@12#0] -- register_copy 
+  //SEG84 main::@12
+  b12:
   //SEG85 [42] (byte) main::ch#1 ← ++ (byte) main::ch#2 -- vbuz1=_inc_vbuz1 
     inc ch
-  //SEG86 [43] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@18 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG86 [43] if((byte) main::ch#1!=(byte/signed byte/word/signed word/dword/signed dword) $40) goto main::@11 -- vbuz1_neq_vbuc1_then_la1 
     lda #$40
     cmp ch
-    bne b18
-  //SEG87 [44] phi from main::@19 main::@24 to main::@24 [phi:main::@19/main::@24->main::@24]
-  b1:
-  //SEG88 [44] phi (byte) main::i#4 = (byte) main::i#6 [phi:main::@19/main::@24->main::@24#0] -- register_copy 
+    bne b11
+  //SEG87 [44] phi from main::@12 main::@15 to main::@15 [phi:main::@12/main::@15->main::@15]
+  b2:
+  //SEG88 [44] phi (byte) main::i#4 = (byte) main::i#6 [phi:main::@12/main::@15->main::@15#0] -- register_copy 
   // Add some spaces
-  //SEG89 main::@24
+  //SEG89 main::@15
   //SEG90 [45] *((byte*) main::screen#2 + (byte) main::i#4) ← (byte) ' ' -- pbuz1_derefidx_vbuxx=vbuc1 
     txa
     tay
@@ -3262,16 +3282,16 @@ main: {
     sta (screen),y
   //SEG91 [46] (byte) main::i#2 ← ++ (byte) main::i#4 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG92 [47] if((byte) main::i#2<(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@24 -- vbuxx_lt_vbuc1_then_la1 
+  //SEG92 [47] if((byte) main::i#2<(byte/signed byte/word/signed word/dword/signed dword) 5) goto main::@15 -- vbuxx_lt_vbuc1_then_la1 
     cpx #5
-    bcc b1
-    jmp b8
-  //SEG93 main::@12
-  b12:
+    bcc b2
+    jmp b3
+  //SEG93 main::@6
+  b6:
   //SEG94 [48] *((byte*) main::screen#13 + (byte) main::col#2) ← (byte) '1' -- pbuz1_derefidx_vbuyy=vbuc1 
     lda #'1'
     sta (screen),y
-    jmp b13
+    jmp b7
 }
 //SEG95 keyboard_key_pressed
 // Determines whether a specific key is currently pressed by accessing the matrix directly
@@ -3297,7 +3317,7 @@ keyboard_key_pressed: {
   //SEG101 [57] phi (byte) keyboard_matrix_read::rowid#2 = (byte) keyboard_matrix_read::rowid#0 [phi:keyboard_key_pressed->keyboard_matrix_read#0] -- register_copy 
     jsr keyboard_matrix_read
   //SEG102 [53] (byte) keyboard_matrix_read::return#2 ← (byte) keyboard_matrix_read::return#0
-  //SEG103 keyboard_key_pressed::@2
+  //SEG103 keyboard_key_pressed::@1
   //SEG104 [54] (byte~) keyboard_key_pressed::$2 ← (byte) keyboard_matrix_read::return#2
   //SEG105 [55] (byte) keyboard_key_pressed::return#0 ← (byte~) keyboard_key_pressed::$2 & *((const byte[8]) keyboard_matrix_col_bitmask#0 + (byte) keyboard_key_pressed::colidx#0) -- vbuaa=vbuaa_band_pbuc1_derefidx_vbuz1 
     ldy colidx
diff --git a/src/test/ref/test-keyboard.sym b/src/test/ref/test-keyboard.sym
index dd6754fd8..9034f7685 100644
--- a/src/test/ref/test-keyboard.sym
+++ b/src/test/ref/test-keyboard.sym
@@ -1,4 +1,4 @@
-(label) @12
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -219,7 +219,7 @@
 (label) keyboard_init::@return
 (byte()) keyboard_key_pressed((byte) keyboard_key_pressed::key)
 (byte~) keyboard_key_pressed::$2 reg byte a 4.0
-(label) keyboard_key_pressed::@2
+(label) keyboard_key_pressed::@1
 (label) keyboard_key_pressed::@return
 (byte) keyboard_key_pressed::colidx
 (byte) keyboard_key_pressed::colidx#0 colidx zp ZP_BYTE:5 0.6666666666666666
@@ -250,24 +250,24 @@
 (void()) main()
 (byte~) main::$15 reg byte a 202.0
 (byte~) main::$5 reg byte a 2002.0
+(label) main::@1
 (label) main::@10
 (label) main::@11
 (label) main::@12
 (label) main::@13
 (label) main::@14
+(label) main::@15
 (label) main::@16
 (label) main::@17
 (label) main::@18
-(label) main::@19
-(label) main::@21
-(label) main::@22
-(label) main::@24
-(label) main::@28
-(label) main::@29
-(label) main::@30
+(label) main::@2
+(label) main::@3
+(label) main::@4
+(label) main::@5
 (label) main::@6
 (label) main::@7
 (label) main::@8
+(label) main::@9
 (byte) main::ch
 (byte) main::ch#1 ch zp ZP_BYTE:4 151.5
 (byte) main::ch#2 ch zp ZP_BYTE:4 28.857142857142858
diff --git a/src/test/ref/test-lowhigh.asm b/src/test/ref/test-lowhigh.asm
index a2fe9fba4..1ef318cda 100644
--- a/src/test/ref/test-lowhigh.asm
+++ b/src/test/ref/test-lowhigh.asm
@@ -126,18 +126,18 @@ main: {
   !:
     lda dw+3
     cmp #>$12345690>>$10
-    bne b18
+    bne b16
     lda dw+2
     cmp #<$12345690>>$10
-    bne b18
+    bne b16
     lda dw+1
     cmp #>$12345690
-    bne b18
+    bne b16
     lda dw
     cmp #<$12345690
-    bne b18
+    bne b16
     rts
-  b18:
+  b16:
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
diff --git a/src/test/ref/test-lowhigh.cfg b/src/test/ref/test-lowhigh.cfg
index 7a703860b..a6643302c 100644
--- a/src/test/ref/test-lowhigh.cfg
+++ b/src/test/ref/test-lowhigh.cfg
@@ -1,20 +1,20 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main main::@18
-  [6] (byte*) print_line_cursor#19 ← phi( main::@18/(byte*) print_line_cursor#1 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (byte*) print_char_cursor#69 ← phi( main::@18/(byte*~) print_char_cursor#72 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (dword) main::dw#10 ← phi( main::@18/(dword) main::dw#1 main/(dword/signed dword) $12345678 )
+main::@1: scope:[main]  from main main::@16
+  [6] (byte*) print_line_cursor#19 ← phi( main::@16/(byte*) print_line_cursor#1 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (byte*) print_char_cursor#69 ← phi( main::@16/(byte*~) print_char_cursor#72 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (dword) main::dw#10 ← phi( main::@16/(dword) main::dw#1 main/(dword/signed dword) $12345678 )
   [7] (word~) main::$2 ← > (dword) main::dw#10
   [8] (word/signed dword/dword~) main::$32 ← (word~) main::$2 + (word/signed word/dword/signed dword) $1111
   [9] (dword) main::dw2#1 ← (dword) main::dw#10 hi= (word/signed dword/dword~) main::$32
@@ -23,74 +23,74 @@ main::@1: scope:[main]  from main main::@18
   [12] (dword) main::dw2#10 ← (dword) main::dw2#1 lo= (word/signed dword/dword~) main::$33
   [13] (dword) print_dword::dw#0 ← (dword) main::dw2#10
   [14] call print_dword 
-  to:main::@4
-main::@4: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [15] phi()
   [16] call print_char 
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [17] (word) print_word::w#2 ← > (dword) main::dw2#10
   [18] call print_word 
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [19] phi()
   [20] call print_char 
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [21] (word) print_word::w#3 ← < (dword) main::dw2#10
   [22] call print_word 
-  to:main::@8
-main::@8: scope:[main]  from main::@7
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [23] phi()
   [24] call print_char 
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [25] (word~) main::$15 ← > (dword) main::dw2#10
   [26] (byte) print_byte::b#2 ← > (word~) main::$15
   [27] call print_byte 
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [28] phi()
   [29] call print_char 
-  to:main::@11
-main::@11: scope:[main]  from main::@10
+  to:main::@9
+main::@9: scope:[main]  from main::@8
   [30] (word~) main::$19 ← > (dword) main::dw2#10
   [31] (byte) print_byte::b#3 ← < (word~) main::$19
   [32] call print_byte 
-  to:main::@12
-main::@12: scope:[main]  from main::@11
+  to:main::@10
+main::@10: scope:[main]  from main::@9
   [33] phi()
   [34] call print_char 
-  to:main::@13
-main::@13: scope:[main]  from main::@12
+  to:main::@11
+main::@11: scope:[main]  from main::@10
   [35] (word~) main::$23 ← < (dword) main::dw2#10
   [36] (byte) print_byte::b#4 ← > (word~) main::$23
   [37] call print_byte 
-  to:main::@14
-main::@14: scope:[main]  from main::@13
+  to:main::@12
+main::@12: scope:[main]  from main::@11
   [38] phi()
   [39] call print_char 
-  to:main::@15
-main::@15: scope:[main]  from main::@14
+  to:main::@13
+main::@13: scope:[main]  from main::@12
   [40] (word~) main::$27 ← < (dword) main::dw2#10
   [41] (byte) print_byte::b#5 ← < (word~) main::$27
   [42] call print_byte 
-  to:main::@16
-main::@16: scope:[main]  from main::@15
+  to:main::@14
+main::@14: scope:[main]  from main::@13
   [43] phi()
   [44] call print_ln 
-  to:main::@17
-main::@17: scope:[main]  from main::@16
+  to:main::@15
+main::@15: scope:[main]  from main::@14
   [45] (dword) main::dw#1 ← ++ (dword) main::dw#10
-  [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@18
+  [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@16
   to:main::@return
-main::@return: scope:[main]  from main::@17
+main::@return: scope:[main]  from main::@15
   [47] return 
   to:@return
-main::@18: scope:[main]  from main::@17
+main::@16: scope:[main]  from main::@15
   [48] (byte*~) print_char_cursor#72 ← (byte*) print_line_cursor#1
   to:main::@1
-print_ln: scope:[print_ln]  from main::@16
+print_ln: scope:[print_ln]  from main::@14
   [49] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -101,9 +101,9 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [53] return 
   to:@return
-print_byte: scope:[print_byte]  from main::@11 main::@13 main::@15 main::@9 print_word print_word::@1
-  [54] (byte*) print_char_cursor#67 ← phi( main::@11/(byte*) print_char_cursor#12 main::@13/(byte*) print_char_cursor#12 main::@15/(byte*) print_char_cursor#12 main::@9/(byte*) print_char_cursor#12 print_word/(byte*) print_char_cursor#65 print_word::@1/(byte*) print_char_cursor#12 )
-  [54] (byte) print_byte::b#6 ← phi( main::@11/(byte) print_byte::b#3 main::@13/(byte) print_byte::b#4 main::@15/(byte) print_byte::b#5 main::@9/(byte) print_byte::b#2 print_word/(byte) print_byte::b#0 print_word::@1/(byte) print_byte::b#1 )
+print_byte: scope:[print_byte]  from main::@11 main::@13 main::@7 main::@9 print_word print_word::@1
+  [54] (byte*) print_char_cursor#67 ← phi( main::@9/(byte*) print_char_cursor#12 main::@11/(byte*) print_char_cursor#12 main::@13/(byte*) print_char_cursor#12 main::@7/(byte*) print_char_cursor#12 print_word/(byte*) print_char_cursor#65 print_word::@1/(byte*) print_char_cursor#12 )
+  [54] (byte) print_byte::b#6 ← phi( main::@9/(byte) print_byte::b#3 main::@11/(byte) print_byte::b#4 main::@13/(byte) print_byte::b#5 main::@7/(byte) print_byte::b#2 print_word/(byte) print_byte::b#0 print_word::@1/(byte) print_byte::b#1 )
   [55] (byte~) print_byte::$0 ← (byte) print_byte::b#6 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [56] (byte) print_char::ch#0 ← *((const byte[]) print_hextab#0 + (byte~) print_byte::$0)
   [57] call print_char 
@@ -116,18 +116,18 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [61] return 
   to:@return
-print_char: scope:[print_char]  from main::@10 main::@12 main::@14 main::@4 main::@6 main::@8 print_byte print_byte::@1
-  [62] (byte*) print_char_cursor#44 ← phi( main::@10/(byte*) print_char_cursor#12 main::@12/(byte*) print_char_cursor#12 main::@14/(byte*) print_char_cursor#12 main::@4/(byte*) print_char_cursor#12 main::@6/(byte*) print_char_cursor#12 main::@8/(byte*) print_char_cursor#12 print_byte/(byte*) print_char_cursor#67 print_byte::@1/(byte*) print_char_cursor#12 )
-  [62] (byte) print_char::ch#8 ← phi( main::@10/(byte) ' ' main::@12/(byte) ' ' main::@14/(byte) ' ' main::@4/(byte) ' ' main::@6/(byte) ' ' main::@8/(byte) ' ' print_byte/(byte) print_char::ch#0 print_byte::@1/(byte) print_char::ch#1 )
+print_char: scope:[print_char]  from main::@10 main::@12 main::@2 main::@4 main::@6 main::@8 print_byte print_byte::@1
+  [62] (byte*) print_char_cursor#44 ← phi( main::@8/(byte*) print_char_cursor#12 main::@10/(byte*) print_char_cursor#12 main::@12/(byte*) print_char_cursor#12 main::@2/(byte*) print_char_cursor#12 main::@4/(byte*) print_char_cursor#12 main::@6/(byte*) print_char_cursor#12 print_byte/(byte*) print_char_cursor#67 print_byte::@1/(byte*) print_char_cursor#12 )
+  [62] (byte) print_char::ch#8 ← phi( main::@8/(byte) ' ' main::@10/(byte) ' ' main::@12/(byte) ' ' main::@2/(byte) ' ' main::@4/(byte) ' ' main::@6/(byte) ' ' print_byte/(byte) print_char::ch#0 print_byte::@1/(byte) print_char::ch#1 )
   [63] *((byte*) print_char_cursor#44) ← (byte) print_char::ch#8
   [64] (byte*) print_char_cursor#12 ← ++ (byte*) print_char_cursor#44
   to:print_char::@return
 print_char::@return: scope:[print_char]  from print_char
   [65] return 
   to:@return
-print_word: scope:[print_word]  from main::@5 main::@7 print_dword print_dword::@1
-  [66] (byte*) print_char_cursor#65 ← phi( main::@5/(byte*) print_char_cursor#12 main::@7/(byte*) print_char_cursor#12 print_dword/(byte*) print_char_cursor#69 print_dword::@1/(byte*) print_char_cursor#12 )
-  [66] (word) print_word::w#4 ← phi( main::@5/(word) print_word::w#2 main::@7/(word) print_word::w#3 print_dword/(word) print_word::w#0 print_dword::@1/(word) print_word::w#1 )
+print_word: scope:[print_word]  from main::@3 main::@5 print_dword print_dword::@1
+  [66] (byte*) print_char_cursor#65 ← phi( main::@3/(byte*) print_char_cursor#12 main::@5/(byte*) print_char_cursor#12 print_dword/(byte*) print_char_cursor#69 print_dword::@1/(byte*) print_char_cursor#12 )
+  [66] (word) print_word::w#4 ← phi( main::@3/(word) print_word::w#2 main::@5/(word) print_word::w#3 print_dword/(word) print_word::w#0 print_dword::@1/(word) print_word::w#1 )
   [67] (byte) print_byte::b#0 ← > (word) print_word::w#4
   [68] call print_byte 
   to:print_word::@1
diff --git a/src/test/ref/test-lowhigh.log b/src/test/ref/test-lowhigh.log
index 2205a0467..387096ca3 100644
--- a/src/test/ref/test-lowhigh.log
+++ b/src/test/ref/test-lowhigh.log
@@ -779,38 +779,54 @@ Coalesced [110] print_cls::sc#3 ← print_cls::sc#1
 Coalesced down to 7 phi equivalence classes
 Culled Empty Block (label) print_ln::@3
 Culled Empty Block (label) print_cls::@3
+Renumbering block @20 to @1
+Renumbering block main::@4 to main::@2
+Renumbering block main::@5 to main::@3
+Renumbering block main::@6 to main::@4
+Renumbering block main::@7 to main::@5
+Renumbering block main::@8 to main::@6
+Renumbering block main::@9 to main::@7
+Renumbering block main::@10 to main::@8
+Renumbering block main::@11 to main::@9
+Renumbering block main::@12 to main::@10
+Renumbering block main::@13 to main::@11
+Renumbering block main::@14 to main::@12
+Renumbering block main::@15 to main::@13
+Renumbering block main::@16 to main::@14
+Renumbering block main::@17 to main::@15
+Renumbering block main::@18 to main::@16
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @20
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
+Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of main::@4
 Adding NOP phi() at start of main::@6
 Adding NOP phi() at start of main::@8
 Adding NOP phi() at start of main::@10
 Adding NOP phi() at start of main::@12
 Adding NOP phi() at start of main::@14
-Adding NOP phi() at start of main::@16
 Adding NOP phi() at start of print_ln
 Adding NOP phi() at start of print_cls
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main main::@18
-  [6] (byte*) print_line_cursor#19 ← phi( main::@18/(byte*) print_line_cursor#1 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (byte*) print_char_cursor#69 ← phi( main::@18/(byte*~) print_char_cursor#72 main/((byte*))(word/signed word/dword/signed dword) $400 )
-  [6] (dword) main::dw#10 ← phi( main::@18/(dword) main::dw#1 main/(dword/signed dword) $12345678 )
+main::@1: scope:[main]  from main main::@16
+  [6] (byte*) print_line_cursor#19 ← phi( main::@16/(byte*) print_line_cursor#1 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (byte*) print_char_cursor#69 ← phi( main::@16/(byte*~) print_char_cursor#72 main/((byte*))(word/signed word/dword/signed dword) $400 )
+  [6] (dword) main::dw#10 ← phi( main::@16/(dword) main::dw#1 main/(dword/signed dword) $12345678 )
   [7] (word~) main::$2 ← > (dword) main::dw#10
   [8] (word/signed dword/dword~) main::$32 ← (word~) main::$2 + (word/signed word/dword/signed dword) $1111
   [9] (dword) main::dw2#1 ← (dword) main::dw#10 hi= (word/signed dword/dword~) main::$32
@@ -819,74 +835,74 @@ main::@1: scope:[main]  from main main::@18
   [12] (dword) main::dw2#10 ← (dword) main::dw2#1 lo= (word/signed dword/dword~) main::$33
   [13] (dword) print_dword::dw#0 ← (dword) main::dw2#10
   [14] call print_dword 
-  to:main::@4
-main::@4: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [15] phi()
   [16] call print_char 
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [17] (word) print_word::w#2 ← > (dword) main::dw2#10
   [18] call print_word 
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [19] phi()
   [20] call print_char 
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [21] (word) print_word::w#3 ← < (dword) main::dw2#10
   [22] call print_word 
-  to:main::@8
-main::@8: scope:[main]  from main::@7
+  to:main::@6
+main::@6: scope:[main]  from main::@5
   [23] phi()
   [24] call print_char 
-  to:main::@9
-main::@9: scope:[main]  from main::@8
+  to:main::@7
+main::@7: scope:[main]  from main::@6
   [25] (word~) main::$15 ← > (dword) main::dw2#10
   [26] (byte) print_byte::b#2 ← > (word~) main::$15
   [27] call print_byte 
-  to:main::@10
-main::@10: scope:[main]  from main::@9
+  to:main::@8
+main::@8: scope:[main]  from main::@7
   [28] phi()
   [29] call print_char 
-  to:main::@11
-main::@11: scope:[main]  from main::@10
+  to:main::@9
+main::@9: scope:[main]  from main::@8
   [30] (word~) main::$19 ← > (dword) main::dw2#10
   [31] (byte) print_byte::b#3 ← < (word~) main::$19
   [32] call print_byte 
-  to:main::@12
-main::@12: scope:[main]  from main::@11
+  to:main::@10
+main::@10: scope:[main]  from main::@9
   [33] phi()
   [34] call print_char 
-  to:main::@13
-main::@13: scope:[main]  from main::@12
+  to:main::@11
+main::@11: scope:[main]  from main::@10
   [35] (word~) main::$23 ← < (dword) main::dw2#10
   [36] (byte) print_byte::b#4 ← > (word~) main::$23
   [37] call print_byte 
-  to:main::@14
-main::@14: scope:[main]  from main::@13
+  to:main::@12
+main::@12: scope:[main]  from main::@11
   [38] phi()
   [39] call print_char 
-  to:main::@15
-main::@15: scope:[main]  from main::@14
+  to:main::@13
+main::@13: scope:[main]  from main::@12
   [40] (word~) main::$27 ← < (dword) main::dw2#10
   [41] (byte) print_byte::b#5 ← < (word~) main::$27
   [42] call print_byte 
-  to:main::@16
-main::@16: scope:[main]  from main::@15
+  to:main::@14
+main::@14: scope:[main]  from main::@13
   [43] phi()
   [44] call print_ln 
-  to:main::@17
-main::@17: scope:[main]  from main::@16
+  to:main::@15
+main::@15: scope:[main]  from main::@14
   [45] (dword) main::dw#1 ← ++ (dword) main::dw#10
-  [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@18
+  [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@16
   to:main::@return
-main::@return: scope:[main]  from main::@17
+main::@return: scope:[main]  from main::@15
   [47] return 
   to:@return
-main::@18: scope:[main]  from main::@17
+main::@16: scope:[main]  from main::@15
   [48] (byte*~) print_char_cursor#72 ← (byte*) print_line_cursor#1
   to:main::@1
-print_ln: scope:[print_ln]  from main::@16
+print_ln: scope:[print_ln]  from main::@14
   [49] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -897,9 +913,9 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [53] return 
   to:@return
-print_byte: scope:[print_byte]  from main::@11 main::@13 main::@15 main::@9 print_word print_word::@1
-  [54] (byte*) print_char_cursor#67 ← phi( main::@11/(byte*) print_char_cursor#12 main::@13/(byte*) print_char_cursor#12 main::@15/(byte*) print_char_cursor#12 main::@9/(byte*) print_char_cursor#12 print_word/(byte*) print_char_cursor#65 print_word::@1/(byte*) print_char_cursor#12 )
-  [54] (byte) print_byte::b#6 ← phi( main::@11/(byte) print_byte::b#3 main::@13/(byte) print_byte::b#4 main::@15/(byte) print_byte::b#5 main::@9/(byte) print_byte::b#2 print_word/(byte) print_byte::b#0 print_word::@1/(byte) print_byte::b#1 )
+print_byte: scope:[print_byte]  from main::@11 main::@13 main::@7 main::@9 print_word print_word::@1
+  [54] (byte*) print_char_cursor#67 ← phi( main::@9/(byte*) print_char_cursor#12 main::@11/(byte*) print_char_cursor#12 main::@13/(byte*) print_char_cursor#12 main::@7/(byte*) print_char_cursor#12 print_word/(byte*) print_char_cursor#65 print_word::@1/(byte*) print_char_cursor#12 )
+  [54] (byte) print_byte::b#6 ← phi( main::@9/(byte) print_byte::b#3 main::@11/(byte) print_byte::b#4 main::@13/(byte) print_byte::b#5 main::@7/(byte) print_byte::b#2 print_word/(byte) print_byte::b#0 print_word::@1/(byte) print_byte::b#1 )
   [55] (byte~) print_byte::$0 ← (byte) print_byte::b#6 >> (byte/signed byte/word/signed word/dword/signed dword) 4
   [56] (byte) print_char::ch#0 ← *((const byte[]) print_hextab#0 + (byte~) print_byte::$0)
   [57] call print_char 
@@ -912,18 +928,18 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [61] return 
   to:@return
-print_char: scope:[print_char]  from main::@10 main::@12 main::@14 main::@4 main::@6 main::@8 print_byte print_byte::@1
-  [62] (byte*) print_char_cursor#44 ← phi( main::@10/(byte*) print_char_cursor#12 main::@12/(byte*) print_char_cursor#12 main::@14/(byte*) print_char_cursor#12 main::@4/(byte*) print_char_cursor#12 main::@6/(byte*) print_char_cursor#12 main::@8/(byte*) print_char_cursor#12 print_byte/(byte*) print_char_cursor#67 print_byte::@1/(byte*) print_char_cursor#12 )
-  [62] (byte) print_char::ch#8 ← phi( main::@10/(byte) ' ' main::@12/(byte) ' ' main::@14/(byte) ' ' main::@4/(byte) ' ' main::@6/(byte) ' ' main::@8/(byte) ' ' print_byte/(byte) print_char::ch#0 print_byte::@1/(byte) print_char::ch#1 )
+print_char: scope:[print_char]  from main::@10 main::@12 main::@2 main::@4 main::@6 main::@8 print_byte print_byte::@1
+  [62] (byte*) print_char_cursor#44 ← phi( main::@8/(byte*) print_char_cursor#12 main::@10/(byte*) print_char_cursor#12 main::@12/(byte*) print_char_cursor#12 main::@2/(byte*) print_char_cursor#12 main::@4/(byte*) print_char_cursor#12 main::@6/(byte*) print_char_cursor#12 print_byte/(byte*) print_char_cursor#67 print_byte::@1/(byte*) print_char_cursor#12 )
+  [62] (byte) print_char::ch#8 ← phi( main::@8/(byte) ' ' main::@10/(byte) ' ' main::@12/(byte) ' ' main::@2/(byte) ' ' main::@4/(byte) ' ' main::@6/(byte) ' ' print_byte/(byte) print_char::ch#0 print_byte::@1/(byte) print_char::ch#1 )
   [63] *((byte*) print_char_cursor#44) ← (byte) print_char::ch#8
   [64] (byte*) print_char_cursor#12 ← ++ (byte*) print_char_cursor#44
   to:print_char::@return
 print_char::@return: scope:[print_char]  from print_char
   [65] return 
   to:@return
-print_word: scope:[print_word]  from main::@5 main::@7 print_dword print_dword::@1
-  [66] (byte*) print_char_cursor#65 ← phi( main::@5/(byte*) print_char_cursor#12 main::@7/(byte*) print_char_cursor#12 print_dword/(byte*) print_char_cursor#69 print_dword::@1/(byte*) print_char_cursor#12 )
-  [66] (word) print_word::w#4 ← phi( main::@5/(word) print_word::w#2 main::@7/(word) print_word::w#3 print_dword/(word) print_word::w#0 print_dword::@1/(word) print_word::w#1 )
+print_word: scope:[print_word]  from main::@3 main::@5 print_dword print_dword::@1
+  [66] (byte*) print_char_cursor#65 ← phi( main::@3/(byte*) print_char_cursor#12 main::@5/(byte*) print_char_cursor#12 print_dword/(byte*) print_char_cursor#69 print_dword::@1/(byte*) print_char_cursor#12 )
+  [66] (word) print_word::w#4 ← phi( main::@3/(word) print_word::w#2 main::@5/(word) print_word::w#3 print_dword/(word) print_word::w#0 print_dword::@1/(word) print_word::w#1 )
   [67] (byte) print_byte::b#0 ← > (word) print_word::w#4
   [68] call print_byte 
   to:print_word::@1
@@ -1094,17 +1110,17 @@ INITIAL ASM
   .label print_char_cursor = $a
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1204,76 +1220,76 @@ main: {
     sta print_dword.dw+3
   //SEG25 [14] call print_dword 
     jsr print_dword
-  //SEG26 [15] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  b4_from_b1:
-    jmp b4
-  //SEG27 main::@4
-  b4:
+  //SEG26 [15] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG27 main::@2
+  b2:
   //SEG28 [16] call print_char 
-  //SEG29 [62] phi from main::@4 to print_char [phi:main::@4->print_char]
-  print_char_from_b4:
-  //SEG30 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@4->print_char#0] -- register_copy 
-  //SEG31 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@4->print_char#1] -- vbuz1=vbuc1 
+  //SEG29 [62] phi from main::@2 to print_char [phi:main::@2->print_char]
+  print_char_from_b2:
+  //SEG30 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@2->print_char#0] -- register_copy 
+  //SEG31 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@2->print_char#1] -- vbuz1=vbuc1 
     lda #' '
     sta print_char.ch
     jsr print_char
-    jmp b5
-  //SEG32 main::@5
-  b5:
+    jmp b3
+  //SEG32 main::@3
+  b3:
   //SEG33 [17] (word) print_word::w#2 ← > (dword) main::dw2#10 -- vwuz1=_hi_vduz2 
     lda dw2_10+2
     sta print_word.w
     lda dw2_10+3
     sta print_word.w+1
   //SEG34 [18] call print_word 
-  //SEG35 [66] phi from main::@5 to print_word [phi:main::@5->print_word]
-  print_word_from_b5:
-  //SEG36 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@5->print_word#0] -- register_copy 
-  //SEG37 [66] phi (word) print_word::w#4 = (word) print_word::w#2 [phi:main::@5->print_word#1] -- register_copy 
+  //SEG35 [66] phi from main::@3 to print_word [phi:main::@3->print_word]
+  print_word_from_b3:
+  //SEG36 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@3->print_word#0] -- register_copy 
+  //SEG37 [66] phi (word) print_word::w#4 = (word) print_word::w#2 [phi:main::@3->print_word#1] -- register_copy 
     jsr print_word
-  //SEG38 [19] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG39 main::@6
-  b6:
+  //SEG38 [19] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG39 main::@4
+  b4:
   //SEG40 [20] call print_char 
-  //SEG41 [62] phi from main::@6 to print_char [phi:main::@6->print_char]
-  print_char_from_b6:
-  //SEG42 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@6->print_char#0] -- register_copy 
-  //SEG43 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@6->print_char#1] -- vbuz1=vbuc1 
+  //SEG41 [62] phi from main::@4 to print_char [phi:main::@4->print_char]
+  print_char_from_b4:
+  //SEG42 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@4->print_char#0] -- register_copy 
+  //SEG43 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@4->print_char#1] -- vbuz1=vbuc1 
     lda #' '
     sta print_char.ch
     jsr print_char
-    jmp b7
-  //SEG44 main::@7
-  b7:
+    jmp b5
+  //SEG44 main::@5
+  b5:
   //SEG45 [21] (word) print_word::w#3 ← < (dword) main::dw2#10 -- vwuz1=_lo_vduz2 
     lda dw2_10
     sta print_word.w
     lda dw2_10+1
     sta print_word.w+1
   //SEG46 [22] call print_word 
-  //SEG47 [66] phi from main::@7 to print_word [phi:main::@7->print_word]
-  print_word_from_b7:
-  //SEG48 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@7->print_word#0] -- register_copy 
-  //SEG49 [66] phi (word) print_word::w#4 = (word) print_word::w#3 [phi:main::@7->print_word#1] -- register_copy 
+  //SEG47 [66] phi from main::@5 to print_word [phi:main::@5->print_word]
+  print_word_from_b5:
+  //SEG48 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@5->print_word#0] -- register_copy 
+  //SEG49 [66] phi (word) print_word::w#4 = (word) print_word::w#3 [phi:main::@5->print_word#1] -- register_copy 
     jsr print_word
-  //SEG50 [23] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG51 main::@8
-  b8:
+  //SEG50 [23] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG51 main::@6
+  b6:
   //SEG52 [24] call print_char 
-  //SEG53 [62] phi from main::@8 to print_char [phi:main::@8->print_char]
-  print_char_from_b8:
-  //SEG54 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@8->print_char#0] -- register_copy 
-  //SEG55 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@8->print_char#1] -- vbuz1=vbuc1 
+  //SEG53 [62] phi from main::@6 to print_char [phi:main::@6->print_char]
+  print_char_from_b6:
+  //SEG54 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@6->print_char#0] -- register_copy 
+  //SEG55 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@6->print_char#1] -- vbuz1=vbuc1 
     lda #' '
     sta print_char.ch
     jsr print_char
-    jmp b9
-  //SEG56 main::@9
-  b9:
+    jmp b7
+  //SEG56 main::@7
+  b7:
   //SEG57 [25] (word~) main::$15 ← > (dword) main::dw2#10 -- vwuz1=_hi_vduz2 
     lda dw2_10+2
     sta _15
@@ -1283,27 +1299,27 @@ main: {
     lda _15+1
     sta print_byte.b
   //SEG59 [27] call print_byte 
-  //SEG60 [54] phi from main::@9 to print_byte [phi:main::@9->print_byte]
-  print_byte_from_b9:
-  //SEG61 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@9->print_byte#0] -- register_copy 
-  //SEG62 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#2 [phi:main::@9->print_byte#1] -- register_copy 
+  //SEG60 [54] phi from main::@7 to print_byte [phi:main::@7->print_byte]
+  print_byte_from_b7:
+  //SEG61 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@7->print_byte#0] -- register_copy 
+  //SEG62 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#2 [phi:main::@7->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG63 [28] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG64 main::@10
-  b10:
+  //SEG63 [28] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG64 main::@8
+  b8:
   //SEG65 [29] call print_char 
-  //SEG66 [62] phi from main::@10 to print_char [phi:main::@10->print_char]
-  print_char_from_b10:
-  //SEG67 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@10->print_char#0] -- register_copy 
-  //SEG68 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@10->print_char#1] -- vbuz1=vbuc1 
+  //SEG66 [62] phi from main::@8 to print_char [phi:main::@8->print_char]
+  print_char_from_b8:
+  //SEG67 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@8->print_char#0] -- register_copy 
+  //SEG68 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@8->print_char#1] -- vbuz1=vbuc1 
     lda #' '
     sta print_char.ch
     jsr print_char
-    jmp b11
-  //SEG69 main::@11
-  b11:
+    jmp b9
+  //SEG69 main::@9
+  b9:
   //SEG70 [30] (word~) main::$19 ← > (dword) main::dw2#10 -- vwuz1=_hi_vduz2 
     lda dw2_10+2
     sta _19
@@ -1313,27 +1329,27 @@ main: {
     lda _19
     sta print_byte.b
   //SEG72 [32] call print_byte 
-  //SEG73 [54] phi from main::@11 to print_byte [phi:main::@11->print_byte]
-  print_byte_from_b11:
-  //SEG74 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@11->print_byte#0] -- register_copy 
-  //SEG75 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#3 [phi:main::@11->print_byte#1] -- register_copy 
+  //SEG73 [54] phi from main::@9 to print_byte [phi:main::@9->print_byte]
+  print_byte_from_b9:
+  //SEG74 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@9->print_byte#0] -- register_copy 
+  //SEG75 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#3 [phi:main::@9->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG76 [33] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG77 main::@12
-  b12:
+  //SEG76 [33] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG77 main::@10
+  b10:
   //SEG78 [34] call print_char 
-  //SEG79 [62] phi from main::@12 to print_char [phi:main::@12->print_char]
-  print_char_from_b12:
-  //SEG80 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@12->print_char#0] -- register_copy 
-  //SEG81 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@12->print_char#1] -- vbuz1=vbuc1 
+  //SEG79 [62] phi from main::@10 to print_char [phi:main::@10->print_char]
+  print_char_from_b10:
+  //SEG80 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@10->print_char#0] -- register_copy 
+  //SEG81 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@10->print_char#1] -- vbuz1=vbuc1 
     lda #' '
     sta print_char.ch
     jsr print_char
-    jmp b13
-  //SEG82 main::@13
-  b13:
+    jmp b11
+  //SEG82 main::@11
+  b11:
   //SEG83 [35] (word~) main::$23 ← < (dword) main::dw2#10 -- vwuz1=_lo_vduz2 
     lda dw2_10
     sta _23
@@ -1343,27 +1359,27 @@ main: {
     lda _23+1
     sta print_byte.b
   //SEG85 [37] call print_byte 
-  //SEG86 [54] phi from main::@13 to print_byte [phi:main::@13->print_byte]
-  print_byte_from_b13:
-  //SEG87 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@13->print_byte#0] -- register_copy 
-  //SEG88 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#4 [phi:main::@13->print_byte#1] -- register_copy 
+  //SEG86 [54] phi from main::@11 to print_byte [phi:main::@11->print_byte]
+  print_byte_from_b11:
+  //SEG87 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@11->print_byte#0] -- register_copy 
+  //SEG88 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#4 [phi:main::@11->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG89 [38] phi from main::@13 to main::@14 [phi:main::@13->main::@14]
-  b14_from_b13:
-    jmp b14
-  //SEG90 main::@14
-  b14:
+  //SEG89 [38] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG90 main::@12
+  b12:
   //SEG91 [39] call print_char 
-  //SEG92 [62] phi from main::@14 to print_char [phi:main::@14->print_char]
-  print_char_from_b14:
-  //SEG93 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@14->print_char#0] -- register_copy 
-  //SEG94 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@14->print_char#1] -- vbuz1=vbuc1 
+  //SEG92 [62] phi from main::@12 to print_char [phi:main::@12->print_char]
+  print_char_from_b12:
+  //SEG93 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@12->print_char#0] -- register_copy 
+  //SEG94 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@12->print_char#1] -- vbuz1=vbuc1 
     lda #' '
     sta print_char.ch
     jsr print_char
-    jmp b15
-  //SEG95 main::@15
-  b15:
+    jmp b13
+  //SEG95 main::@13
+  b13:
   //SEG96 [40] (word~) main::$27 ← < (dword) main::dw2#10 -- vwuz1=_lo_vduz2 
     lda dw2_10
     sta _27
@@ -1373,23 +1389,23 @@ main: {
     lda _27
     sta print_byte.b
   //SEG98 [42] call print_byte 
-  //SEG99 [54] phi from main::@15 to print_byte [phi:main::@15->print_byte]
-  print_byte_from_b15:
-  //SEG100 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@15->print_byte#0] -- register_copy 
-  //SEG101 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#5 [phi:main::@15->print_byte#1] -- register_copy 
+  //SEG99 [54] phi from main::@13 to print_byte [phi:main::@13->print_byte]
+  print_byte_from_b13:
+  //SEG100 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@13->print_byte#0] -- register_copy 
+  //SEG101 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#5 [phi:main::@13->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG102 [43] phi from main::@15 to main::@16 [phi:main::@15->main::@16]
-  b16_from_b15:
-    jmp b16
-  //SEG103 main::@16
-  b16:
+  //SEG102 [43] phi from main::@13 to main::@14 [phi:main::@13->main::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG103 main::@14
+  b14:
   //SEG104 [44] call print_ln 
-  //SEG105 [49] phi from main::@16 to print_ln [phi:main::@16->print_ln]
-  print_ln_from_b16:
+  //SEG105 [49] phi from main::@14 to print_ln [phi:main::@14->print_ln]
+  print_ln_from_b14:
     jsr print_ln
-    jmp b17
-  //SEG106 main::@17
-  b17:
+    jmp b15
+  //SEG106 main::@15
+  b15:
   //SEG107 [45] (dword) main::dw#1 ← ++ (dword) main::dw#10 -- vduz1=_inc_vduz1 
     inc dw
     bne !+
@@ -1399,36 +1415,36 @@ main: {
     bne !+
     inc dw+3
   !:
-  //SEG108 [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@18 -- vduz1_neq_vduc1_then_la1 
+  //SEG108 [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@16 -- vduz1_neq_vduc1_then_la1 
     lda dw+3
     cmp #>$12345690>>$10
-    bne b18
+    bne b16
     lda dw+2
     cmp #<$12345690>>$10
-    bne b18
+    bne b16
     lda dw+1
     cmp #>$12345690
-    bne b18
+    bne b16
     lda dw
     cmp #<$12345690
-    bne b18
+    bne b16
     jmp breturn
   //SEG109 main::@return
   breturn:
   //SEG110 [47] return 
     rts
-  //SEG111 main::@18
-  b18:
+  //SEG111 main::@16
+  b16:
   //SEG112 [48] (byte*~) print_char_cursor#72 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG113 [6] phi from main::@18 to main::@1 [phi:main::@18->main::@1]
-  b1_from_b18:
-  //SEG114 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@18->main::@1#0] -- register_copy 
-  //SEG115 [6] phi (byte*) print_char_cursor#69 = (byte*~) print_char_cursor#72 [phi:main::@18->main::@1#1] -- register_copy 
-  //SEG116 [6] phi (dword) main::dw#10 = (dword) main::dw#1 [phi:main::@18->main::@1#2] -- register_copy 
+  //SEG113 [6] phi from main::@16 to main::@1 [phi:main::@16->main::@1]
+  b1_from_b16:
+  //SEG114 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@16->main::@1#0] -- register_copy 
+  //SEG115 [6] phi (byte*) print_char_cursor#69 = (byte*~) print_char_cursor#72 [phi:main::@16->main::@1#1] -- register_copy 
+  //SEG116 [6] phi (dword) main::dw#10 = (dword) main::dw#1 [phi:main::@16->main::@1#2] -- register_copy 
     jmp b1
 }
 //SEG117 print_ln
@@ -1659,7 +1675,7 @@ Statement [35] (word~) main::$23 ← < (dword) main::dw2#10 [ main::dw#10 print_
 Statement [36] (byte) print_byte::b#4 ← > (word~) main::$23 [ main::dw#10 print_line_cursor#19 main::dw2#10 print_byte::b#4 print_char_cursor#12 ] ( main:2 [ main::dw#10 print_line_cursor#19 main::dw2#10 print_byte::b#4 print_char_cursor#12 ] ) always clobbers reg byte a 
 Statement [40] (word~) main::$27 ← < (dword) main::dw2#10 [ main::dw#10 print_line_cursor#19 main::$27 print_char_cursor#12 ] ( main:2 [ main::dw#10 print_line_cursor#19 main::$27 print_char_cursor#12 ] ) always clobbers reg byte a 
 Statement [41] (byte) print_byte::b#5 ← < (word~) main::$27 [ main::dw#10 print_line_cursor#19 print_byte::b#5 print_char_cursor#12 ] ( main:2 [ main::dw#10 print_line_cursor#19 print_byte::b#5 print_char_cursor#12 ] ) always clobbers reg byte a 
-Statement [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@18 [ main::dw#1 print_line_cursor#1 ] ( main:2 [ main::dw#1 print_line_cursor#1 ] ) always clobbers reg byte a 
+Statement [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@16 [ main::dw#1 print_line_cursor#1 ] ( main:2 [ main::dw#1 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [48] (byte*~) print_char_cursor#72 ← (byte*) print_line_cursor#1 [ main::dw#1 print_char_cursor#72 print_line_cursor#1 ] ( main:2 [ main::dw#1 print_char_cursor#72 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [51] (byte*) print_line_cursor#1 ← (byte*) print_line_cursor#9 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#1 print_char_cursor#12 ] ( main:2::print_ln:44 [ main::dw#10 print_line_cursor#1 print_char_cursor#12 ] ) always clobbers reg byte a 
 Statement [52] if((byte*) print_line_cursor#1<(byte*) print_char_cursor#12) goto print_ln::@1 [ print_line_cursor#1 print_char_cursor#12 ] ( main:2::print_ln:44 [ main::dw#10 print_line_cursor#1 print_char_cursor#12 ] ) always clobbers reg byte a 
@@ -1689,7 +1705,7 @@ Statement [35] (word~) main::$23 ← < (dword) main::dw2#10 [ main::dw#10 print_
 Statement [36] (byte) print_byte::b#4 ← > (word~) main::$23 [ main::dw#10 print_line_cursor#19 main::dw2#10 print_byte::b#4 print_char_cursor#12 ] ( main:2 [ main::dw#10 print_line_cursor#19 main::dw2#10 print_byte::b#4 print_char_cursor#12 ] ) always clobbers reg byte a 
 Statement [40] (word~) main::$27 ← < (dword) main::dw2#10 [ main::dw#10 print_line_cursor#19 main::$27 print_char_cursor#12 ] ( main:2 [ main::dw#10 print_line_cursor#19 main::$27 print_char_cursor#12 ] ) always clobbers reg byte a 
 Statement [41] (byte) print_byte::b#5 ← < (word~) main::$27 [ main::dw#10 print_line_cursor#19 print_byte::b#5 print_char_cursor#12 ] ( main:2 [ main::dw#10 print_line_cursor#19 print_byte::b#5 print_char_cursor#12 ] ) always clobbers reg byte a 
-Statement [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@18 [ main::dw#1 print_line_cursor#1 ] ( main:2 [ main::dw#1 print_line_cursor#1 ] ) always clobbers reg byte a 
+Statement [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@16 [ main::dw#1 print_line_cursor#1 ] ( main:2 [ main::dw#1 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [48] (byte*~) print_char_cursor#72 ← (byte*) print_line_cursor#1 [ main::dw#1 print_char_cursor#72 print_line_cursor#1 ] ( main:2 [ main::dw#1 print_char_cursor#72 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [51] (byte*) print_line_cursor#1 ← (byte*) print_line_cursor#9 + (byte/signed byte/word/signed word/dword/signed dword) $28 [ print_line_cursor#1 print_char_cursor#12 ] ( main:2::print_ln:44 [ main::dw#10 print_line_cursor#1 print_char_cursor#12 ] ) always clobbers reg byte a 
 Statement [52] if((byte*) print_line_cursor#1<(byte*) print_char_cursor#12) goto print_ln::@1 [ print_line_cursor#1 print_char_cursor#12 ] ( main:2::print_ln:44 [ main::dw#10 print_line_cursor#1 print_char_cursor#12 ] ) always clobbers reg byte a 
@@ -1767,17 +1783,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_char_cursor = 8
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1864,73 +1880,73 @@ main: {
   //SEG24 [13] (dword) print_dword::dw#0 ← (dword) main::dw2#10
   //SEG25 [14] call print_dword 
     jsr print_dword
-  //SEG26 [15] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  b4_from_b1:
-    jmp b4
-  //SEG27 main::@4
-  b4:
+  //SEG26 [15] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG27 main::@2
+  b2:
   //SEG28 [16] call print_char 
-  //SEG29 [62] phi from main::@4 to print_char [phi:main::@4->print_char]
-  print_char_from_b4:
-  //SEG30 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@4->print_char#0] -- register_copy 
-  //SEG31 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@4->print_char#1] -- vbuaa=vbuc1 
+  //SEG29 [62] phi from main::@2 to print_char [phi:main::@2->print_char]
+  print_char_from_b2:
+  //SEG30 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@2->print_char#0] -- register_copy 
+  //SEG31 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@2->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-    jmp b5
-  //SEG32 main::@5
-  b5:
+    jmp b3
+  //SEG32 main::@3
+  b3:
   //SEG33 [17] (word) print_word::w#2 ← > (dword) main::dw2#10 -- vwuz1=_hi_vduz2 
     lda dw2+2
     sta print_word.w
     lda dw2+3
     sta print_word.w+1
   //SEG34 [18] call print_word 
-  //SEG35 [66] phi from main::@5 to print_word [phi:main::@5->print_word]
-  print_word_from_b5:
-  //SEG36 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@5->print_word#0] -- register_copy 
-  //SEG37 [66] phi (word) print_word::w#4 = (word) print_word::w#2 [phi:main::@5->print_word#1] -- register_copy 
+  //SEG35 [66] phi from main::@3 to print_word [phi:main::@3->print_word]
+  print_word_from_b3:
+  //SEG36 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@3->print_word#0] -- register_copy 
+  //SEG37 [66] phi (word) print_word::w#4 = (word) print_word::w#2 [phi:main::@3->print_word#1] -- register_copy 
     jsr print_word
-  //SEG38 [19] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG39 main::@6
-  b6:
+  //SEG38 [19] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG39 main::@4
+  b4:
   //SEG40 [20] call print_char 
-  //SEG41 [62] phi from main::@6 to print_char [phi:main::@6->print_char]
-  print_char_from_b6:
-  //SEG42 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@6->print_char#0] -- register_copy 
-  //SEG43 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@6->print_char#1] -- vbuaa=vbuc1 
+  //SEG41 [62] phi from main::@4 to print_char [phi:main::@4->print_char]
+  print_char_from_b4:
+  //SEG42 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@4->print_char#0] -- register_copy 
+  //SEG43 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@4->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-    jmp b7
-  //SEG44 main::@7
-  b7:
+    jmp b5
+  //SEG44 main::@5
+  b5:
   //SEG45 [21] (word) print_word::w#3 ← < (dword) main::dw2#10 -- vwuz1=_lo_vduz2 
     lda dw2
     sta print_word.w
     lda dw2+1
     sta print_word.w+1
   //SEG46 [22] call print_word 
-  //SEG47 [66] phi from main::@7 to print_word [phi:main::@7->print_word]
-  print_word_from_b7:
-  //SEG48 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@7->print_word#0] -- register_copy 
-  //SEG49 [66] phi (word) print_word::w#4 = (word) print_word::w#3 [phi:main::@7->print_word#1] -- register_copy 
+  //SEG47 [66] phi from main::@5 to print_word [phi:main::@5->print_word]
+  print_word_from_b5:
+  //SEG48 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@5->print_word#0] -- register_copy 
+  //SEG49 [66] phi (word) print_word::w#4 = (word) print_word::w#3 [phi:main::@5->print_word#1] -- register_copy 
     jsr print_word
-  //SEG50 [23] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  b8_from_b7:
-    jmp b8
-  //SEG51 main::@8
-  b8:
+  //SEG50 [23] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG51 main::@6
+  b6:
   //SEG52 [24] call print_char 
-  //SEG53 [62] phi from main::@8 to print_char [phi:main::@8->print_char]
-  print_char_from_b8:
-  //SEG54 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@8->print_char#0] -- register_copy 
-  //SEG55 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@8->print_char#1] -- vbuaa=vbuc1 
+  //SEG53 [62] phi from main::@6 to print_char [phi:main::@6->print_char]
+  print_char_from_b6:
+  //SEG54 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@6->print_char#0] -- register_copy 
+  //SEG55 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@6->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-    jmp b9
-  //SEG56 main::@9
-  b9:
+    jmp b7
+  //SEG56 main::@7
+  b7:
   //SEG57 [25] (word~) main::$15 ← > (dword) main::dw2#10 -- vwuz1=_hi_vduz2 
     lda dw2+2
     sta _15
@@ -1940,26 +1956,26 @@ main: {
     lda _15+1
     tax
   //SEG59 [27] call print_byte 
-  //SEG60 [54] phi from main::@9 to print_byte [phi:main::@9->print_byte]
-  print_byte_from_b9:
-  //SEG61 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@9->print_byte#0] -- register_copy 
-  //SEG62 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#2 [phi:main::@9->print_byte#1] -- register_copy 
+  //SEG60 [54] phi from main::@7 to print_byte [phi:main::@7->print_byte]
+  print_byte_from_b7:
+  //SEG61 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@7->print_byte#0] -- register_copy 
+  //SEG62 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#2 [phi:main::@7->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG63 [28] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  b10_from_b9:
-    jmp b10
-  //SEG64 main::@10
-  b10:
+  //SEG63 [28] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
+  b8_from_b7:
+    jmp b8
+  //SEG64 main::@8
+  b8:
   //SEG65 [29] call print_char 
-  //SEG66 [62] phi from main::@10 to print_char [phi:main::@10->print_char]
-  print_char_from_b10:
-  //SEG67 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@10->print_char#0] -- register_copy 
-  //SEG68 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@10->print_char#1] -- vbuaa=vbuc1 
+  //SEG66 [62] phi from main::@8 to print_char [phi:main::@8->print_char]
+  print_char_from_b8:
+  //SEG67 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@8->print_char#0] -- register_copy 
+  //SEG68 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@8->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-    jmp b11
-  //SEG69 main::@11
-  b11:
+    jmp b9
+  //SEG69 main::@9
+  b9:
   //SEG70 [30] (word~) main::$19 ← > (dword) main::dw2#10 -- vwuz1=_hi_vduz2 
     lda dw2+2
     sta _19
@@ -1969,26 +1985,26 @@ main: {
     lda _19
     tax
   //SEG72 [32] call print_byte 
-  //SEG73 [54] phi from main::@11 to print_byte [phi:main::@11->print_byte]
-  print_byte_from_b11:
-  //SEG74 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@11->print_byte#0] -- register_copy 
-  //SEG75 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#3 [phi:main::@11->print_byte#1] -- register_copy 
+  //SEG73 [54] phi from main::@9 to print_byte [phi:main::@9->print_byte]
+  print_byte_from_b9:
+  //SEG74 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@9->print_byte#0] -- register_copy 
+  //SEG75 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#3 [phi:main::@9->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG76 [33] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  b12_from_b11:
-    jmp b12
-  //SEG77 main::@12
-  b12:
+  //SEG76 [33] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  b10_from_b9:
+    jmp b10
+  //SEG77 main::@10
+  b10:
   //SEG78 [34] call print_char 
-  //SEG79 [62] phi from main::@12 to print_char [phi:main::@12->print_char]
-  print_char_from_b12:
-  //SEG80 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@12->print_char#0] -- register_copy 
-  //SEG81 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@12->print_char#1] -- vbuaa=vbuc1 
+  //SEG79 [62] phi from main::@10 to print_char [phi:main::@10->print_char]
+  print_char_from_b10:
+  //SEG80 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@10->print_char#0] -- register_copy 
+  //SEG81 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@10->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-    jmp b13
-  //SEG82 main::@13
-  b13:
+    jmp b11
+  //SEG82 main::@11
+  b11:
   //SEG83 [35] (word~) main::$23 ← < (dword) main::dw2#10 -- vwuz1=_lo_vduz2 
     lda dw2
     sta _23
@@ -1998,26 +2014,26 @@ main: {
     lda _23+1
     tax
   //SEG85 [37] call print_byte 
-  //SEG86 [54] phi from main::@13 to print_byte [phi:main::@13->print_byte]
-  print_byte_from_b13:
-  //SEG87 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@13->print_byte#0] -- register_copy 
-  //SEG88 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#4 [phi:main::@13->print_byte#1] -- register_copy 
+  //SEG86 [54] phi from main::@11 to print_byte [phi:main::@11->print_byte]
+  print_byte_from_b11:
+  //SEG87 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@11->print_byte#0] -- register_copy 
+  //SEG88 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#4 [phi:main::@11->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG89 [38] phi from main::@13 to main::@14 [phi:main::@13->main::@14]
-  b14_from_b13:
-    jmp b14
-  //SEG90 main::@14
-  b14:
+  //SEG89 [38] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
+  b12_from_b11:
+    jmp b12
+  //SEG90 main::@12
+  b12:
   //SEG91 [39] call print_char 
-  //SEG92 [62] phi from main::@14 to print_char [phi:main::@14->print_char]
-  print_char_from_b14:
-  //SEG93 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@14->print_char#0] -- register_copy 
-  //SEG94 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@14->print_char#1] -- vbuaa=vbuc1 
+  //SEG92 [62] phi from main::@12 to print_char [phi:main::@12->print_char]
+  print_char_from_b12:
+  //SEG93 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@12->print_char#0] -- register_copy 
+  //SEG94 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@12->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-    jmp b15
-  //SEG95 main::@15
-  b15:
+    jmp b13
+  //SEG95 main::@13
+  b13:
   //SEG96 [40] (word~) main::$27 ← < (dword) main::dw2#10 -- vwuz1=_lo_vduz2 
     lda dw2
     sta _27
@@ -2027,23 +2043,23 @@ main: {
     lda _27
     tax
   //SEG98 [42] call print_byte 
-  //SEG99 [54] phi from main::@15 to print_byte [phi:main::@15->print_byte]
-  print_byte_from_b15:
-  //SEG100 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@15->print_byte#0] -- register_copy 
-  //SEG101 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#5 [phi:main::@15->print_byte#1] -- register_copy 
+  //SEG99 [54] phi from main::@13 to print_byte [phi:main::@13->print_byte]
+  print_byte_from_b13:
+  //SEG100 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@13->print_byte#0] -- register_copy 
+  //SEG101 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#5 [phi:main::@13->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG102 [43] phi from main::@15 to main::@16 [phi:main::@15->main::@16]
-  b16_from_b15:
-    jmp b16
-  //SEG103 main::@16
-  b16:
+  //SEG102 [43] phi from main::@13 to main::@14 [phi:main::@13->main::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG103 main::@14
+  b14:
   //SEG104 [44] call print_ln 
-  //SEG105 [49] phi from main::@16 to print_ln [phi:main::@16->print_ln]
-  print_ln_from_b16:
+  //SEG105 [49] phi from main::@14 to print_ln [phi:main::@14->print_ln]
+  print_ln_from_b14:
     jsr print_ln
-    jmp b17
-  //SEG106 main::@17
-  b17:
+    jmp b15
+  //SEG106 main::@15
+  b15:
   //SEG107 [45] (dword) main::dw#1 ← ++ (dword) main::dw#10 -- vduz1=_inc_vduz1 
     inc dw
     bne !+
@@ -2053,36 +2069,36 @@ main: {
     bne !+
     inc dw+3
   !:
-  //SEG108 [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@18 -- vduz1_neq_vduc1_then_la1 
+  //SEG108 [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@16 -- vduz1_neq_vduc1_then_la1 
     lda dw+3
     cmp #>$12345690>>$10
-    bne b18
+    bne b16
     lda dw+2
     cmp #<$12345690>>$10
-    bne b18
+    bne b16
     lda dw+1
     cmp #>$12345690
-    bne b18
+    bne b16
     lda dw
     cmp #<$12345690
-    bne b18
+    bne b16
     jmp breturn
   //SEG109 main::@return
   breturn:
   //SEG110 [47] return 
     rts
-  //SEG111 main::@18
-  b18:
+  //SEG111 main::@16
+  b16:
   //SEG112 [48] (byte*~) print_char_cursor#72 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG113 [6] phi from main::@18 to main::@1 [phi:main::@18->main::@1]
-  b1_from_b18:
-  //SEG114 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@18->main::@1#0] -- register_copy 
-  //SEG115 [6] phi (byte*) print_char_cursor#69 = (byte*~) print_char_cursor#72 [phi:main::@18->main::@1#1] -- register_copy 
-  //SEG116 [6] phi (dword) main::dw#10 = (dword) main::dw#1 [phi:main::@18->main::@1#2] -- register_copy 
+  //SEG113 [6] phi from main::@16 to main::@1 [phi:main::@16->main::@1]
+  b1_from_b16:
+  //SEG114 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@16->main::@1#0] -- register_copy 
+  //SEG115 [6] phi (byte*) print_char_cursor#69 = (byte*~) print_char_cursor#72 [phi:main::@16->main::@1#1] -- register_copy 
+  //SEG116 [6] phi (dword) main::dw#10 = (dword) main::dw#1 [phi:main::@16->main::@1#2] -- register_copy 
     jmp b1
 }
 //SEG117 print_ln
@@ -2286,9 +2302,11 @@ print_cls: {
   print_hextab: .text "0123456789abcdef"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b20
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp b6
@@ -2301,8 +2319,6 @@ Removing instruction jmp b12
 Removing instruction jmp b13
 Removing instruction jmp b14
 Removing instruction jmp b15
-Removing instruction jmp b16
-Removing instruction jmp b17
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
@@ -2323,11 +2339,13 @@ Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b20_from_bbegin:
-Removing instruction b20:
-Removing instruction main_from_b20:
-Removing instruction bend_from_b20:
-Removing instruction b4_from_b1:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b2_from_b1:
+Removing instruction print_char_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction print_char_from_b4:
 Removing instruction b6_from_b5:
 Removing instruction print_char_from_b6:
@@ -2338,9 +2356,7 @@ Removing instruction print_char_from_b10:
 Removing instruction b12_from_b11:
 Removing instruction print_char_from_b12:
 Removing instruction b14_from_b13:
-Removing instruction print_char_from_b14:
-Removing instruction b16_from_b15:
-Removing instruction print_ln_from_b16:
+Removing instruction print_ln_from_b14:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction b1_from_b1:
@@ -2348,12 +2364,15 @@ Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction print_cls_from_main:
 Removing instruction b1_from_main:
+Removing instruction b2:
+Removing instruction b3:
+Removing instruction print_word_from_b3:
 Removing instruction b4:
 Removing instruction b5:
 Removing instruction print_word_from_b5:
 Removing instruction b6:
 Removing instruction b7:
-Removing instruction print_word_from_b7:
+Removing instruction print_byte_from_b7:
 Removing instruction b8:
 Removing instruction b9:
 Removing instruction print_byte_from_b9:
@@ -2365,11 +2384,8 @@ Removing instruction b13:
 Removing instruction print_byte_from_b13:
 Removing instruction b14:
 Removing instruction b15:
-Removing instruction print_byte_from_b15:
-Removing instruction b16:
-Removing instruction b17:
 Removing instruction breturn:
-Removing instruction b1_from_b18:
+Removing instruction b1_from_b16:
 Removing instruction breturn:
 Removing instruction print_char_from_print_byte:
 Removing instruction b1:
@@ -2396,7 +2412,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -2416,8 +2432,8 @@ FINAL SYMBOL TABLE
 (label) main::@14
 (label) main::@15
 (label) main::@16
-(label) main::@17
-(label) main::@18
+(label) main::@2
+(label) main::@3
 (label) main::@4
 (label) main::@5
 (label) main::@6
@@ -2511,11 +2527,11 @@ Score: 7432
   .label print_line_cursor = 6
   .label print_char_cursor = 8
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-//SEG5 @20
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -2597,53 +2613,53 @@ main: {
   //SEG24 [13] (dword) print_dword::dw#0 ← (dword) main::dw2#10
   //SEG25 [14] call print_dword 
     jsr print_dword
-  //SEG26 [15] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  //SEG27 main::@4
+  //SEG26 [15] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG27 main::@2
   //SEG28 [16] call print_char 
-  //SEG29 [62] phi from main::@4 to print_char [phi:main::@4->print_char]
-  //SEG30 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@4->print_char#0] -- register_copy 
-  //SEG31 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@4->print_char#1] -- vbuaa=vbuc1 
+  //SEG29 [62] phi from main::@2 to print_char [phi:main::@2->print_char]
+  //SEG30 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@2->print_char#0] -- register_copy 
+  //SEG31 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@2->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG32 main::@5
+  //SEG32 main::@3
   //SEG33 [17] (word) print_word::w#2 ← > (dword) main::dw2#10 -- vwuz1=_hi_vduz2 
     lda dw2+2
     sta print_word.w
     lda dw2+3
     sta print_word.w+1
   //SEG34 [18] call print_word 
-  //SEG35 [66] phi from main::@5 to print_word [phi:main::@5->print_word]
-  //SEG36 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@5->print_word#0] -- register_copy 
-  //SEG37 [66] phi (word) print_word::w#4 = (word) print_word::w#2 [phi:main::@5->print_word#1] -- register_copy 
+  //SEG35 [66] phi from main::@3 to print_word [phi:main::@3->print_word]
+  //SEG36 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@3->print_word#0] -- register_copy 
+  //SEG37 [66] phi (word) print_word::w#4 = (word) print_word::w#2 [phi:main::@3->print_word#1] -- register_copy 
     jsr print_word
-  //SEG38 [19] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  //SEG39 main::@6
+  //SEG38 [19] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG39 main::@4
   //SEG40 [20] call print_char 
-  //SEG41 [62] phi from main::@6 to print_char [phi:main::@6->print_char]
-  //SEG42 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@6->print_char#0] -- register_copy 
-  //SEG43 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@6->print_char#1] -- vbuaa=vbuc1 
+  //SEG41 [62] phi from main::@4 to print_char [phi:main::@4->print_char]
+  //SEG42 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@4->print_char#0] -- register_copy 
+  //SEG43 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@4->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG44 main::@7
+  //SEG44 main::@5
   //SEG45 [21] (word) print_word::w#3 ← < (dword) main::dw2#10 -- vwuz1=_lo_vduz2 
     lda dw2
     sta print_word.w
     lda dw2+1
     sta print_word.w+1
   //SEG46 [22] call print_word 
-  //SEG47 [66] phi from main::@7 to print_word [phi:main::@7->print_word]
-  //SEG48 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@7->print_word#0] -- register_copy 
-  //SEG49 [66] phi (word) print_word::w#4 = (word) print_word::w#3 [phi:main::@7->print_word#1] -- register_copy 
+  //SEG47 [66] phi from main::@5 to print_word [phi:main::@5->print_word]
+  //SEG48 [66] phi (byte*) print_char_cursor#65 = (byte*) print_char_cursor#12 [phi:main::@5->print_word#0] -- register_copy 
+  //SEG49 [66] phi (word) print_word::w#4 = (word) print_word::w#3 [phi:main::@5->print_word#1] -- register_copy 
     jsr print_word
-  //SEG50 [23] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
-  //SEG51 main::@8
+  //SEG50 [23] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
+  //SEG51 main::@6
   //SEG52 [24] call print_char 
-  //SEG53 [62] phi from main::@8 to print_char [phi:main::@8->print_char]
-  //SEG54 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@8->print_char#0] -- register_copy 
-  //SEG55 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@8->print_char#1] -- vbuaa=vbuc1 
+  //SEG53 [62] phi from main::@6 to print_char [phi:main::@6->print_char]
+  //SEG54 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@6->print_char#0] -- register_copy 
+  //SEG55 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@6->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG56 main::@9
+  //SEG56 main::@7
   //SEG57 [25] (word~) main::$15 ← > (dword) main::dw2#10 -- vwuz1=_hi_vduz2 
     lda dw2+2
     sta _15
@@ -2652,19 +2668,19 @@ main: {
   //SEG58 [26] (byte) print_byte::b#2 ← > (word~) main::$15 -- vbuxx=_hi_vwuz1 
     tax
   //SEG59 [27] call print_byte 
-  //SEG60 [54] phi from main::@9 to print_byte [phi:main::@9->print_byte]
-  //SEG61 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@9->print_byte#0] -- register_copy 
-  //SEG62 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#2 [phi:main::@9->print_byte#1] -- register_copy 
+  //SEG60 [54] phi from main::@7 to print_byte [phi:main::@7->print_byte]
+  //SEG61 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@7->print_byte#0] -- register_copy 
+  //SEG62 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#2 [phi:main::@7->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG63 [28] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
-  //SEG64 main::@10
+  //SEG63 [28] phi from main::@7 to main::@8 [phi:main::@7->main::@8]
+  //SEG64 main::@8
   //SEG65 [29] call print_char 
-  //SEG66 [62] phi from main::@10 to print_char [phi:main::@10->print_char]
-  //SEG67 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@10->print_char#0] -- register_copy 
-  //SEG68 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@10->print_char#1] -- vbuaa=vbuc1 
+  //SEG66 [62] phi from main::@8 to print_char [phi:main::@8->print_char]
+  //SEG67 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@8->print_char#0] -- register_copy 
+  //SEG68 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@8->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG69 main::@11
+  //SEG69 main::@9
   //SEG70 [30] (word~) main::$19 ← > (dword) main::dw2#10 -- vwuz1=_hi_vduz2 
     lda dw2+2
     sta _19
@@ -2674,19 +2690,19 @@ main: {
     lda _19
     tax
   //SEG72 [32] call print_byte 
-  //SEG73 [54] phi from main::@11 to print_byte [phi:main::@11->print_byte]
-  //SEG74 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@11->print_byte#0] -- register_copy 
-  //SEG75 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#3 [phi:main::@11->print_byte#1] -- register_copy 
+  //SEG73 [54] phi from main::@9 to print_byte [phi:main::@9->print_byte]
+  //SEG74 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@9->print_byte#0] -- register_copy 
+  //SEG75 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#3 [phi:main::@9->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG76 [33] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
-  //SEG77 main::@12
+  //SEG76 [33] phi from main::@9 to main::@10 [phi:main::@9->main::@10]
+  //SEG77 main::@10
   //SEG78 [34] call print_char 
-  //SEG79 [62] phi from main::@12 to print_char [phi:main::@12->print_char]
-  //SEG80 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@12->print_char#0] -- register_copy 
-  //SEG81 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@12->print_char#1] -- vbuaa=vbuc1 
+  //SEG79 [62] phi from main::@10 to print_char [phi:main::@10->print_char]
+  //SEG80 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@10->print_char#0] -- register_copy 
+  //SEG81 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@10->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG82 main::@13
+  //SEG82 main::@11
   //SEG83 [35] (word~) main::$23 ← < (dword) main::dw2#10 -- vwuz1=_lo_vduz2 
     lda dw2
     sta _23
@@ -2695,19 +2711,19 @@ main: {
   //SEG84 [36] (byte) print_byte::b#4 ← > (word~) main::$23 -- vbuxx=_hi_vwuz1 
     tax
   //SEG85 [37] call print_byte 
-  //SEG86 [54] phi from main::@13 to print_byte [phi:main::@13->print_byte]
-  //SEG87 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@13->print_byte#0] -- register_copy 
-  //SEG88 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#4 [phi:main::@13->print_byte#1] -- register_copy 
+  //SEG86 [54] phi from main::@11 to print_byte [phi:main::@11->print_byte]
+  //SEG87 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@11->print_byte#0] -- register_copy 
+  //SEG88 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#4 [phi:main::@11->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG89 [38] phi from main::@13 to main::@14 [phi:main::@13->main::@14]
-  //SEG90 main::@14
+  //SEG89 [38] phi from main::@11 to main::@12 [phi:main::@11->main::@12]
+  //SEG90 main::@12
   //SEG91 [39] call print_char 
-  //SEG92 [62] phi from main::@14 to print_char [phi:main::@14->print_char]
-  //SEG93 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@14->print_char#0] -- register_copy 
-  //SEG94 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@14->print_char#1] -- vbuaa=vbuc1 
+  //SEG92 [62] phi from main::@12 to print_char [phi:main::@12->print_char]
+  //SEG93 [62] phi (byte*) print_char_cursor#44 = (byte*) print_char_cursor#12 [phi:main::@12->print_char#0] -- register_copy 
+  //SEG94 [62] phi (byte) print_char::ch#8 = (byte) ' ' [phi:main::@12->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG95 main::@15
+  //SEG95 main::@13
   //SEG96 [40] (word~) main::$27 ← < (dword) main::dw2#10 -- vwuz1=_lo_vduz2 
     lda dw2
     sta _27
@@ -2717,16 +2733,16 @@ main: {
     lda _27
     tax
   //SEG98 [42] call print_byte 
-  //SEG99 [54] phi from main::@15 to print_byte [phi:main::@15->print_byte]
-  //SEG100 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@15->print_byte#0] -- register_copy 
-  //SEG101 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#5 [phi:main::@15->print_byte#1] -- register_copy 
+  //SEG99 [54] phi from main::@13 to print_byte [phi:main::@13->print_byte]
+  //SEG100 [54] phi (byte*) print_char_cursor#67 = (byte*) print_char_cursor#12 [phi:main::@13->print_byte#0] -- register_copy 
+  //SEG101 [54] phi (byte) print_byte::b#6 = (byte) print_byte::b#5 [phi:main::@13->print_byte#1] -- register_copy 
     jsr print_byte
-  //SEG102 [43] phi from main::@15 to main::@16 [phi:main::@15->main::@16]
-  //SEG103 main::@16
+  //SEG102 [43] phi from main::@13 to main::@14 [phi:main::@13->main::@14]
+  //SEG103 main::@14
   //SEG104 [44] call print_ln 
-  //SEG105 [49] phi from main::@16 to print_ln [phi:main::@16->print_ln]
+  //SEG105 [49] phi from main::@14 to print_ln [phi:main::@14->print_ln]
     jsr print_ln
-  //SEG106 main::@17
+  //SEG106 main::@15
   //SEG107 [45] (dword) main::dw#1 ← ++ (dword) main::dw#10 -- vduz1=_inc_vduz1 
     inc dw
     bne !+
@@ -2736,33 +2752,33 @@ main: {
     bne !+
     inc dw+3
   !:
-  //SEG108 [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@18 -- vduz1_neq_vduc1_then_la1 
+  //SEG108 [46] if((dword) main::dw#1!=(dword/signed dword) $12345690) goto main::@16 -- vduz1_neq_vduc1_then_la1 
     lda dw+3
     cmp #>$12345690>>$10
-    bne b18
+    bne b16
     lda dw+2
     cmp #<$12345690>>$10
-    bne b18
+    bne b16
     lda dw+1
     cmp #>$12345690
-    bne b18
+    bne b16
     lda dw
     cmp #<$12345690
-    bne b18
+    bne b16
   //SEG109 main::@return
   //SEG110 [47] return 
     rts
-  //SEG111 main::@18
-  b18:
+  //SEG111 main::@16
+  b16:
   //SEG112 [48] (byte*~) print_char_cursor#72 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG113 [6] phi from main::@18 to main::@1 [phi:main::@18->main::@1]
-  //SEG114 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@18->main::@1#0] -- register_copy 
-  //SEG115 [6] phi (byte*) print_char_cursor#69 = (byte*~) print_char_cursor#72 [phi:main::@18->main::@1#1] -- register_copy 
-  //SEG116 [6] phi (dword) main::dw#10 = (dword) main::dw#1 [phi:main::@18->main::@1#2] -- register_copy 
+  //SEG113 [6] phi from main::@16 to main::@1 [phi:main::@16->main::@1]
+  //SEG114 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@16->main::@1#0] -- register_copy 
+  //SEG115 [6] phi (byte*) print_char_cursor#69 = (byte*~) print_char_cursor#72 [phi:main::@16->main::@1#1] -- register_copy 
+  //SEG116 [6] phi (dword) main::dw#10 = (dword) main::dw#1 [phi:main::@16->main::@1#2] -- register_copy 
     jmp b1
 }
 //SEG117 print_ln
diff --git a/src/test/ref/test-lowhigh.sym b/src/test/ref/test-lowhigh.sym
index 8a4d3cc36..fc905aa56 100644
--- a/src/test/ref/test-lowhigh.sym
+++ b/src/test/ref/test-lowhigh.sym
@@ -1,4 +1,4 @@
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -18,8 +18,8 @@
 (label) main::@14
 (label) main::@15
 (label) main::@16
-(label) main::@17
-(label) main::@18
+(label) main::@2
+(label) main::@3
 (label) main::@4
 (label) main::@5
 (label) main::@6
diff --git a/src/test/ref/test-multiply-16bit.asm b/src/test/ref/test-multiply-16bit.asm
index 1ffee4f2b..0758d0a22 100644
--- a/src/test/ref/test-multiply-16bit.asm
+++ b/src/test/ref/test-multiply-16bit.asm
@@ -603,7 +603,7 @@ mul16u: {
     lda a
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -617,7 +617,7 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  b8:
+  b4:
     clc
     ror a+1
     ror a
@@ -638,11 +638,11 @@ muls16s: {
     .label a = 3
     .label b = 5
     lda a+1
-    bmi b4
-    bmi b2
+    bmi b6
+    bmi b5
     bne !+
     lda a
-    beq b2
+    beq b5
   !:
     lda #0
     sta j
@@ -651,7 +651,7 @@ muls16s: {
     sta m+1
     sta m+2
     sta m+3
-  b8:
+  b3:
     lda b+1
     ora #$7f
     bmi !+
@@ -677,20 +677,20 @@ muls16s: {
   !:
     lda j+1
     cmp a+1
-    bne b8
+    bne b3
     lda j
     cmp a
-    bne b8
-    jmp b3
-  b2:
+    bne b3
+    jmp b1
+  b5:
     lda #0
     sta return
     sta return+1
     sta return+2
     sta return+3
-  b3:
+  b1:
     rts
-  b4:
+  b6:
     lda #0
     sta i
     sta i+1
@@ -698,7 +698,7 @@ muls16s: {
     sta m+1
     sta m+2
     sta m+3
-  b10:
+  b4:
     lda b+1
     ora #$7f
     bmi !+
@@ -725,11 +725,11 @@ muls16s: {
     dec i
     lda i+1
     cmp a+1
-    bne b10
+    bne b4
     lda i
     cmp a
-    bne b10
-    jmp b3
+    bne b4
+    jmp b1
 }
 // Perform many possible word multiplications (slow and fast) and compare the results
 mul16u_compare: {
@@ -927,7 +927,7 @@ muls16u: {
     lda a
     bne !+
     lda a+1
-    beq b2
+    beq b3
   !:
     lda #0
     sta i
@@ -936,7 +936,7 @@ muls16u: {
     sta m+1
     sta m+2
     sta m+3
-  b4:
+  b2:
     lda m
     clc
     adc b
@@ -956,12 +956,12 @@ muls16u: {
   !:
     lda i+1
     cmp a+1
-    bne b4
+    bne b2
     lda i
     cmp a
-    bne b4
+    bne b2
     jmp b1
-  b2:
+  b3:
     lda #0
     sta return
     sta return+1
@@ -1042,7 +1042,7 @@ mulf_init: {
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
     ldx #-1
-  b5:
+  b4:
     lda mulf_sqr1_lo,x
     ldy #0
     sta (sqr2_lo),y
@@ -1057,20 +1057,20 @@ mulf_init: {
     adc dir
     tax
     cpx #0
-    bne b6
+    bne b5
     lda #1
     sta dir
-  b6:
+  b5:
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
     sta mulf_sqr2_lo+$1ff
diff --git a/src/test/ref/test-multiply-16bit.cfg b/src/test/ref/test-multiply-16bit.cfg
index 705a65ee2..84ac88739 100644
--- a/src/test/ref/test-multiply-16bit.cfg
+++ b/src/test/ref/test-multiply-16bit.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@40
-@40: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @40
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @40
+main: scope:[main]  from @1
   [4] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 5
   [5] call print_cls 
   to:main::@1
@@ -29,11 +29,11 @@ main::@return: scope:[main]  from main::@3
 mul16s_compare: scope:[mul16s_compare]  from main::@3
   [13] (byte*~) print_char_cursor#176 ← (byte*) print_line_cursor#1
   to:mul16s_compare::@1
-mul16s_compare::@1: scope:[mul16s_compare]  from mul16s_compare mul16s_compare::@10
-  [14] (byte) mul16s_compare::i#12 ← phi( mul16s_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16s_compare::@10/(byte) mul16s_compare::i#1 )
-  [14] (signed word) mul16s_compare::b#6 ← phi( mul16s_compare/-(word/signed word/dword/signed dword) $7fff mul16s_compare::@10/(signed word) mul16s_compare::b#1 )
-  [14] (signed word) mul16s_compare::a#6 ← phi( mul16s_compare/-(word/signed word/dword/signed dword) $7fff mul16s_compare::@10/(signed word) mul16s_compare::a#1 )
-  [14] (byte*) print_char_cursor#143 ← phi( mul16s_compare/(byte*~) print_char_cursor#176 mul16s_compare::@10/(byte*) print_char_cursor#128 )
+mul16s_compare::@1: scope:[mul16s_compare]  from mul16s_compare mul16s_compare::@8
+  [14] (byte) mul16s_compare::i#12 ← phi( mul16s_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16s_compare::@8/(byte) mul16s_compare::i#1 )
+  [14] (signed word) mul16s_compare::b#6 ← phi( mul16s_compare/-(word/signed word/dword/signed dword) $7fff mul16s_compare::@8/(signed word) mul16s_compare::b#1 )
+  [14] (signed word) mul16s_compare::a#6 ← phi( mul16s_compare/-(word/signed word/dword/signed dword) $7fff mul16s_compare::@8/(signed word) mul16s_compare::a#1 )
+  [14] (byte*) print_char_cursor#143 ← phi( mul16s_compare/(byte*~) print_char_cursor#176 mul16s_compare::@8/(byte*) print_char_cursor#128 )
   [15] call print_str 
   to:mul16s_compare::@2
 mul16s_compare::@2: scope:[mul16s_compare]  from mul16s_compare::@1 mul16s_compare::@5
@@ -46,37 +46,37 @@ mul16s_compare::@2: scope:[mul16s_compare]  from mul16s_compare::@1 mul16s_compa
   [20] (signed word) muls16s::b#0 ← (signed word) mul16s_compare::b#1
   [21] call muls16s 
   [22] (signed dword) muls16s::return#2 ← (signed dword) muls16s::return#0
-  to:mul16s_compare::@13
-mul16s_compare::@13: scope:[mul16s_compare]  from mul16s_compare::@2
+  to:mul16s_compare::@10
+mul16s_compare::@10: scope:[mul16s_compare]  from mul16s_compare::@2
   [23] (signed dword) mul16s_compare::ms#0 ← (signed dword) muls16s::return#2
   [24] (signed word) mul16s::a#0 ← (signed word) mul16s_compare::a#1
   [25] (signed word) mul16s::b#0 ← (signed word) mul16s_compare::b#1
   [26] call mul16s 
   [27] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-  to:mul16s_compare::@14
-mul16s_compare::@14: scope:[mul16s_compare]  from mul16s_compare::@13
+  to:mul16s_compare::@11
+mul16s_compare::@11: scope:[mul16s_compare]  from mul16s_compare::@10
   [28] (signed dword) mul16s_compare::mn#0 ← (signed dword) mul16s::return#2
   [29] (signed word) mulf16s::a#0 ← (signed word) mul16s_compare::a#1
   [30] (signed word) mulf16s::b#0 ← (signed word) mul16s_compare::b#1
   [31] call mulf16s 
   [32] (signed dword) mulf16s::return#2 ← (signed dword) mulf16s::return#0
-  to:mul16s_compare::@15
-mul16s_compare::@15: scope:[mul16s_compare]  from mul16s_compare::@14
+  to:mul16s_compare::@12
+mul16s_compare::@12: scope:[mul16s_compare]  from mul16s_compare::@11
   [33] (signed dword) mul16s_compare::mf#0 ← (signed dword) mulf16s::return#2
   [34] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mf#0) goto mul16s_compare::@3
   to:mul16s_compare::@6
-mul16s_compare::@6: scope:[mul16s_compare]  from mul16s_compare::@15
+mul16s_compare::@6: scope:[mul16s_compare]  from mul16s_compare::@12
   [35] phi()
   to:mul16s_compare::@3
-mul16s_compare::@3: scope:[mul16s_compare]  from mul16s_compare::@15 mul16s_compare::@6
-  [36] (byte) mul16s_compare::ok#4 ← phi( mul16s_compare::@15/(byte/signed byte/word/signed word/dword/signed dword) 1 mul16s_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@22
+mul16s_compare::@3: scope:[mul16s_compare]  from mul16s_compare::@12 mul16s_compare::@6
+  [36] (byte) mul16s_compare::ok#4 ← phi( mul16s_compare::@12/(byte/signed byte/word/signed word/dword/signed dword) 1 mul16s_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@15
   to:mul16s_compare::@4
-mul16s_compare::@4: scope:[mul16s_compare]  from mul16s_compare::@22 mul16s_compare::@3
-  [38] (byte) mul16s_compare::ok#3 ← phi( mul16s_compare::@22/(byte) mul16s_compare::ok#4 mul16s_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+mul16s_compare::@4: scope:[mul16s_compare]  from mul16s_compare::@15 mul16s_compare::@3
+  [38] (byte) mul16s_compare::ok#3 ← phi( mul16s_compare::@15/(byte) mul16s_compare::ok#4 mul16s_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [39] if((byte) mul16s_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s_compare::@5
-  to:mul16s_compare::@8
-mul16s_compare::@8: scope:[mul16s_compare]  from mul16s_compare::@4
+  to:mul16s_compare::@7
+mul16s_compare::@7: scope:[mul16s_compare]  from mul16s_compare::@4
   [40] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   [41] (signed word) mul16s_error::a#0 ← (signed word) mul16s_compare::a#1
   [42] (signed word) mul16s_error::b#0 ← (signed word) mul16s_compare::b#1
@@ -85,35 +85,35 @@ mul16s_compare::@8: scope:[mul16s_compare]  from mul16s_compare::@4
   [45] (signed dword) mul16s_error::mf#0 ← (signed dword) mul16s_compare::mf#0
   [46] call mul16s_error 
   to:mul16s_compare::@return
-mul16s_compare::@return: scope:[mul16s_compare]  from mul16s_compare::@18 mul16s_compare::@8
+mul16s_compare::@return: scope:[mul16s_compare]  from mul16s_compare::@14 mul16s_compare::@7
   [47] return 
   to:@return
 mul16s_compare::@5: scope:[mul16s_compare]  from mul16s_compare::@4
   [48] (byte) mul16s_compare::j#1 ← ++ (byte) mul16s_compare::j#10
   [49] if((byte) mul16s_compare::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16s_compare::@2
-  to:mul16s_compare::@10
-mul16s_compare::@10: scope:[mul16s_compare]  from mul16s_compare::@5
+  to:mul16s_compare::@8
+mul16s_compare::@8: scope:[mul16s_compare]  from mul16s_compare::@5
   [50] (byte) mul16s_compare::i#1 ← ++ (byte) mul16s_compare::i#12
   [51] if((byte) mul16s_compare::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16s_compare::@1
-  to:mul16s_compare::@11
-mul16s_compare::@11: scope:[mul16s_compare]  from mul16s_compare::@10
+  to:mul16s_compare::@9
+mul16s_compare::@9: scope:[mul16s_compare]  from mul16s_compare::@8
   [52] phi()
   [53] call print_ln 
-  to:mul16s_compare::@17
-mul16s_compare::@17: scope:[mul16s_compare]  from mul16s_compare::@11
+  to:mul16s_compare::@13
+mul16s_compare::@13: scope:[mul16s_compare]  from mul16s_compare::@9
   [54] (byte*~) print_char_cursor#185 ← (byte*) print_line_cursor#1
   [55] call print_str 
-  to:mul16s_compare::@18
-mul16s_compare::@18: scope:[mul16s_compare]  from mul16s_compare::@17
+  to:mul16s_compare::@14
+mul16s_compare::@14: scope:[mul16s_compare]  from mul16s_compare::@13
   [56] phi()
   [57] call print_ln 
   to:mul16s_compare::@return
-mul16s_compare::@22: scope:[mul16s_compare]  from mul16s_compare::@3
+mul16s_compare::@15: scope:[mul16s_compare]  from mul16s_compare::@3
   [58] phi()
   to:mul16s_compare::@4
-print_ln: scope:[print_ln]  from mul16s_compare::@11 mul16s_compare::@18 mul16s_error::@10 mul16u_compare::@11 mul16u_compare::@18 mul16u_error::@10
-  [59] (byte*) print_char_cursor#129 ← phi( mul16s_compare::@11/(byte*) print_char_cursor#128 mul16s_compare::@18/(byte*) print_char_cursor#128 mul16s_error::@10/(byte*) print_char_cursor#20 mul16u_compare::@11/(byte*) print_char_cursor#128 mul16u_compare::@18/(byte*) print_char_cursor#128 mul16u_error::@10/(byte*) print_char_cursor#20 )
-  [59] (byte*) print_line_cursor#43 ← phi( mul16s_compare::@11/(byte*) print_line_cursor#1 mul16s_compare::@18/(byte*) print_line_cursor#1 mul16s_error::@10/(byte*) print_line_cursor#1 mul16u_compare::@11/((byte*))(word/signed word/dword/signed dword) $400 mul16u_compare::@18/(byte*) print_line_cursor#1 mul16u_error::@10/((byte*))(word/signed word/dword/signed dword) $400 )
+print_ln: scope:[print_ln]  from mul16s_compare::@14 mul16s_compare::@9 mul16s_error::@10 mul16u_compare::@14 mul16u_compare::@9 mul16u_error::@10
+  [59] (byte*) print_char_cursor#129 ← phi( mul16s_compare::@9/(byte*) print_char_cursor#128 mul16s_compare::@14/(byte*) print_char_cursor#128 mul16s_error::@10/(byte*) print_char_cursor#20 mul16u_compare::@9/(byte*) print_char_cursor#128 mul16u_compare::@14/(byte*) print_char_cursor#128 mul16u_error::@10/(byte*) print_char_cursor#20 )
+  [59] (byte*) print_line_cursor#43 ← phi( mul16s_compare::@9/(byte*) print_line_cursor#1 mul16s_compare::@14/(byte*) print_line_cursor#1 mul16s_error::@10/(byte*) print_line_cursor#1 mul16u_compare::@9/((byte*))(word/signed word/dword/signed dword) $400 mul16u_compare::@14/(byte*) print_line_cursor#1 mul16u_error::@10/((byte*))(word/signed word/dword/signed dword) $400 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [60] (byte*) print_line_cursor#22 ← phi( print_ln/(byte*) print_line_cursor#43 print_ln::@1/(byte*) print_line_cursor#1 )
@@ -123,9 +123,9 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [63] return 
   to:@return
-print_str: scope:[print_str]  from mul16s_compare::@1 mul16s_compare::@17 mul16s_error mul16s_error::@2 mul16s_error::@4 mul16s_error::@6 mul16s_error::@8 mul16u_compare::@1 mul16u_compare::@17 mul16u_error mul16u_error::@2 mul16u_error::@4 mul16u_error::@6 mul16u_error::@8
-  [64] (byte*) print_char_cursor#148 ← phi( mul16s_compare::@1/(byte*) print_char_cursor#143 mul16s_compare::@17/(byte*~) print_char_cursor#185 mul16s_error/(byte*) print_char_cursor#128 mul16s_error::@2/(byte*) print_char_cursor#20 mul16s_error::@4/(byte*) print_char_cursor#20 mul16s_error::@6/(byte*) print_char_cursor#20 mul16s_error::@8/(byte*) print_char_cursor#20 mul16u_compare::@1/(byte*) print_char_cursor#139 mul16u_compare::@17/(byte*~) print_char_cursor#192 mul16u_error/(byte*) print_char_cursor#128 mul16u_error::@2/(byte*) print_char_cursor#20 mul16u_error::@4/(byte*) print_char_cursor#20 mul16u_error::@6/(byte*) print_char_cursor#20 mul16u_error::@8/(byte*) print_char_cursor#20 )
-  [64] (byte*) print_str::str#17 ← phi( mul16s_compare::@1/(const string) str mul16s_compare::@17/(const string) mul16s_compare::str1 mul16s_error/(const string) mul16s_error::str mul16s_error::@2/(const string) str1 mul16s_error::@4/(const string) str2 mul16s_error::@6/(const string) str3 mul16s_error::@8/(const string) str4 mul16u_compare::@1/(const string) str mul16u_compare::@17/(const string) mul16u_compare::str1 mul16u_error/(const string) mul16u_error::str mul16u_error::@2/(const string) str1 mul16u_error::@4/(const string) str2 mul16u_error::@6/(const string) str3 mul16u_error::@8/(const string) str4 )
+print_str: scope:[print_str]  from mul16s_compare::@1 mul16s_compare::@13 mul16s_error mul16s_error::@2 mul16s_error::@4 mul16s_error::@6 mul16s_error::@8 mul16u_compare::@1 mul16u_compare::@13 mul16u_error mul16u_error::@2 mul16u_error::@4 mul16u_error::@6 mul16u_error::@8
+  [64] (byte*) print_char_cursor#148 ← phi( mul16s_compare::@1/(byte*) print_char_cursor#143 mul16s_compare::@13/(byte*~) print_char_cursor#185 mul16s_error/(byte*) print_char_cursor#128 mul16s_error::@2/(byte*) print_char_cursor#20 mul16s_error::@4/(byte*) print_char_cursor#20 mul16s_error::@6/(byte*) print_char_cursor#20 mul16s_error::@8/(byte*) print_char_cursor#20 mul16u_compare::@1/(byte*) print_char_cursor#139 mul16u_compare::@13/(byte*~) print_char_cursor#192 mul16u_error/(byte*) print_char_cursor#128 mul16u_error::@2/(byte*) print_char_cursor#20 mul16u_error::@4/(byte*) print_char_cursor#20 mul16u_error::@6/(byte*) print_char_cursor#20 mul16u_error::@8/(byte*) print_char_cursor#20 )
+  [64] (byte*) print_str::str#17 ← phi( mul16s_compare::@1/(const string) str mul16s_compare::@13/(const string) mul16s_compare::str1 mul16s_error/(const string) mul16s_error::str mul16s_error::@2/(const string) str1 mul16s_error::@4/(const string) str2 mul16s_error::@6/(const string) str3 mul16s_error::@8/(const string) str4 mul16u_compare::@1/(const string) str mul16u_compare::@13/(const string) mul16u_compare::str1 mul16u_error/(const string) mul16u_error::str mul16u_error::@2/(const string) str1 mul16u_error::@4/(const string) str2 mul16u_error::@6/(const string) str3 mul16u_error::@8/(const string) str4 )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [65] (byte*) print_char_cursor#128 ← phi( print_str/(byte*) print_char_cursor#148 print_str::@2/(byte*) print_char_cursor#1 )
@@ -140,7 +140,7 @@ print_str::@2: scope:[print_str]  from print_str::@1
   [69] (byte*) print_char_cursor#1 ← ++ (byte*) print_char_cursor#128
   [70] (byte*) print_str::str#0 ← ++ (byte*) print_str::str#15
   to:print_str::@1
-mul16s_error: scope:[mul16s_error]  from mul16s_compare::@8
+mul16s_error: scope:[mul16s_error]  from mul16s_compare::@7
   [71] phi()
   [72] call print_str 
   to:mul16s_error::@1
@@ -194,13 +194,13 @@ print_sdword: scope:[print_sdword]  from mul16s_error::@5 mul16s_error::@7 mul16
 print_sdword::@2: scope:[print_sdword]  from print_sdword
   [96] phi()
   [97] call print_char 
-  to:print_sdword::@4
-print_sdword::@4: scope:[print_sdword]  from print_sdword::@2
+  to:print_sdword::@3
+print_sdword::@3: scope:[print_sdword]  from print_sdword::@2
   [98] (signed dword) print_sdword::dw#0 ← - (signed dword) print_sdword::dw#4
   to:print_sdword::@1
-print_sdword::@1: scope:[print_sdword]  from print_sdword print_sdword::@4
-  [99] (byte*) print_char_cursor#134 ← phi( print_sdword/(byte*) print_char_cursor#128 print_sdword::@4/(byte*) print_char_cursor#20 )
-  [99] (signed dword) print_sdword::dw#5 ← phi( print_sdword/(signed dword) print_sdword::dw#4 print_sdword::@4/(signed dword) print_sdword::dw#0 )
+print_sdword::@1: scope:[print_sdword]  from print_sdword print_sdword::@3
+  [99] (byte*) print_char_cursor#134 ← phi( print_sdword/(byte*) print_char_cursor#128 print_sdword::@3/(byte*) print_char_cursor#20 )
+  [99] (signed dword) print_sdword::dw#5 ← phi( print_sdword/(signed dword) print_sdword::dw#4 print_sdword::@3/(signed dword) print_sdword::dw#0 )
   [100] (dword) print_dword::dw#0 ← ((dword)) (signed dword) print_sdword::dw#5
   [101] call print_dword 
   to:print_sdword::@return
@@ -264,36 +264,36 @@ print_sword: scope:[print_sword]  from mul16s_error::@1 mul16s_error::@3
 print_sword::@2: scope:[print_sword]  from print_sword
   [129] phi()
   [130] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [131] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [132] (byte*) print_char_cursor#130 ← phi( print_sword/(byte*) print_char_cursor#128 print_sword::@4/(byte*) print_char_cursor#20 )
-  [132] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [132] (byte*) print_char_cursor#130 ← phi( print_sword/(byte*) print_char_cursor#128 print_sword::@3/(byte*) print_char_cursor#20 )
+  [132] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@3/(signed word) print_sword::w#0 )
   [133] (word~) print_word::w#11 ← (word)(signed word) print_sword::w#4
   [134] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
   [135] return 
   to:@return
-mulf16s: scope:[mulf16s]  from mul16s_compare::@14
+mulf16s: scope:[mulf16s]  from mul16s_compare::@11
   [136] (word~) mulf16u::a#4 ← (word)(signed word) mulf16s::a#0
   [137] (word~) mulf16u::b#4 ← (word)(signed word) mulf16s::b#0
   [138] call mulf16u 
   [139] (dword) mulf16u::return#2 ← (dword) mulf16u::return#0
-  to:mulf16s::@6
-mulf16s::@6: scope:[mulf16s]  from mulf16s
+  to:mulf16s::@5
+mulf16s::@5: scope:[mulf16s]  from mulf16s
   [140] (dword) mulf16s::m#0 ← (dword) mulf16u::return#2
   [141] if((signed word) mulf16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf16s::@1
   to:mulf16s::@3
-mulf16s::@3: scope:[mulf16s]  from mulf16s::@6
+mulf16s::@3: scope:[mulf16s]  from mulf16s::@5
   [142] (word~) mulf16s::$9 ← > (dword) mulf16s::m#0
   [143] (word~) mulf16s::$16 ← (word~) mulf16s::$9 - (word)(signed word) mulf16s::b#0
   [144] (dword) mulf16s::m#1 ← (dword) mulf16s::m#0 hi= (word~) mulf16s::$16
   to:mulf16s::@1
-mulf16s::@1: scope:[mulf16s]  from mulf16s::@3 mulf16s::@6
-  [145] (dword) mulf16s::m#5 ← phi( mulf16s::@3/(dword) mulf16s::m#1 mulf16s::@6/(dword) mulf16s::m#0 )
+mulf16s::@1: scope:[mulf16s]  from mulf16s::@3 mulf16s::@5
+  [145] (dword) mulf16s::m#5 ← phi( mulf16s::@3/(dword) mulf16s::m#1 mulf16s::@5/(dword) mulf16s::m#0 )
   [146] if((signed word) mulf16s::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf16s::@2
   to:mulf16s::@4
 mulf16s::@4: scope:[mulf16s]  from mulf16s::@1
@@ -308,9 +308,9 @@ mulf16s::@2: scope:[mulf16s]  from mulf16s::@1 mulf16s::@4
 mulf16s::@return: scope:[mulf16s]  from mulf16s::@2
   [152] return 
   to:@return
-mulf16u: scope:[mulf16u]  from mul16u_compare::@14 mulf16s
-  [153] (word) mulf16u::b#2 ← phi( mul16u_compare::@14/(word) mulf16u::b#1 mulf16s/(word~) mulf16u::b#4 )
-  [153] (word) mulf16u::a#2 ← phi( mul16u_compare::@14/(word) mulf16u::a#1 mulf16s/(word~) mulf16u::a#4 )
+mulf16u: scope:[mulf16u]  from mul16u_compare::@11 mulf16s
+  [153] (word) mulf16u::b#2 ← phi( mul16u_compare::@11/(word) mulf16u::b#1 mulf16s/(word~) mulf16u::b#4 )
+  [153] (word) mulf16u::a#2 ← phi( mul16u_compare::@11/(word) mulf16u::a#1 mulf16s/(word~) mulf16u::a#4 )
   [154] *((const word*) mulf16u::memA#0) ← (word) mulf16u::a#2
   [155] *((const word*) mulf16u::memB#0) ← (word) mulf16u::b#2
   asm { ldamemA stasm1a+1 stasm3a+1 stasm5a+1 stasm7a+1 eor#$ff stasm2a+1 stasm4a+1 stasm6a+1 stasm8a+1 ldamemA+1 stasm1b+1 stasm3b+1 stasm5b+1 stasm7b+1 eor#$ff stasm2b+1 stasm4b+1 stasm6b+1 stasm8b+1 ldxmemB sec sm1a: ldamulf_sqr1_lo,x sm2a: sbcmulf_sqr2_lo,x stamemR+0 sm3a: ldamulf_sqr1_hi,x sm4a: sbcmulf_sqr2_hi,x sta_AA+1 sec sm1b: ldamulf_sqr1_lo,x sm2b: sbcmulf_sqr2_lo,x sta_cc+1 sm3b: ldamulf_sqr1_hi,x sm4b: sbcmulf_sqr2_hi,x sta_CC+1 ldxmemB+1 sec sm5a: ldamulf_sqr1_lo,x sm6a: sbcmulf_sqr2_lo,x sta_bb+1 sm7a: ldamulf_sqr1_hi,x sm8a: sbcmulf_sqr2_hi,x sta_BB+1 sec sm5b: ldamulf_sqr1_lo,x sm6b: sbcmulf_sqr2_lo,x sta_dd+1 sm7b: ldamulf_sqr1_hi,x sm8b: sbcmulf_sqr2_hi,x stamemR+3 clc _AA: lda#0 _bb: adc#0 stamemR+1 _BB: lda#0 _CC: adc#0 stamemR+2 bcc!+ incmemR+3 clc !: _cc: lda#0 adcmemR+1 stamemR+1 _dd: lda#0 adcmemR+2 stamemR+2 bcc!+ incmemR+3 !:  }
@@ -319,23 +319,23 @@ mulf16u: scope:[mulf16u]  from mul16u_compare::@14 mulf16s
 mulf16u::@return: scope:[mulf16u]  from mulf16u
   [158] return 
   to:@return
-mul16s: scope:[mul16s]  from mul16s_compare::@13
+mul16s: scope:[mul16s]  from mul16s_compare::@10
   [159] (word~) mul16u::b#3 ← (word)(signed word) mul16s::b#0
   [160] (word~) mul16u::a#8 ← (word)(signed word) mul16s::a#0
   [161] call mul16u 
   [162] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mul16s::@6
-mul16s::@6: scope:[mul16s]  from mul16s
+  to:mul16s::@5
+mul16s::@5: scope:[mul16s]  from mul16s
   [163] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   [164] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1
   to:mul16s::@3
-mul16s::@3: scope:[mul16s]  from mul16s::@6
+mul16s::@3: scope:[mul16s]  from mul16s::@5
   [165] (word~) mul16s::$9 ← > (dword) mul16s::m#0
   [166] (word~) mul16s::$16 ← (word~) mul16s::$9 - (word)(signed word) mul16s::b#0
   [167] (dword) mul16s::m#1 ← (dword) mul16s::m#0 hi= (word~) mul16s::$16
   to:mul16s::@1
-mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@6
-  [168] (dword) mul16s::m#5 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@6/(dword) mul16s::m#0 )
+mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@5
+  [168] (dword) mul16s::m#5 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@5/(dword) mul16s::m#0 )
   [169] if((signed word) mul16s::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@2
   to:mul16s::@4
 mul16s::@4: scope:[mul16s]  from mul16s::@1
@@ -350,15 +350,15 @@ mul16s::@2: scope:[mul16s]  from mul16s::@1 mul16s::@4
 mul16s::@return: scope:[mul16s]  from mul16s::@2
   [175] return 
   to:@return
-mul16u: scope:[mul16u]  from mul16s mul16u_compare::@13
-  [176] (word) mul16u::a#6 ← phi( mul16s/(word~) mul16u::a#8 mul16u_compare::@13/(word) mul16u::a#2 )
-  [176] (word) mul16u::b#2 ← phi( mul16s/(word~) mul16u::b#3 mul16u_compare::@13/(word) mul16u::b#1 )
+mul16u: scope:[mul16u]  from mul16s mul16u_compare::@10
+  [176] (word) mul16u::a#6 ← phi( mul16s/(word~) mul16u::a#8 mul16u_compare::@10/(word) mul16u::a#2 )
+  [176] (word) mul16u::b#2 ← phi( mul16s/(word~) mul16u::b#3 mul16u_compare::@10/(word) mul16u::b#1 )
   [177] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#2
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [178] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [178] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [178] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [178] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [178] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [178] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@4/(word) mul16u::a#0 )
   [179] if((word) mul16u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -366,50 +366,50 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [181] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [182] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [182] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [183] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [184] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [184] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [185] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [186] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
 muls16s: scope:[muls16s]  from mul16s_compare::@2
-  [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@10
-  to:muls16s::@4
-muls16s::@4: scope:[muls16s]  from muls16s
-  [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@3
-  to:muls16s::@8
-muls16s::@8: scope:[muls16s]  from muls16s::@4 muls16s::@8
-  [189] (signed word) muls16s::j#2 ← phi( muls16s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@8/(signed word) muls16s::j#1 )
-  [189] (signed dword) muls16s::m#3 ← phi( muls16s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@8/(signed dword) muls16s::m#1 )
+  [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@4
+  to:muls16s::@2
+muls16s::@2: scope:[muls16s]  from muls16s
+  [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@1
+  to:muls16s::@3
+muls16s::@3: scope:[muls16s]  from muls16s::@2 muls16s::@3
+  [189] (signed word) muls16s::j#2 ← phi( muls16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@3/(signed word) muls16s::j#1 )
+  [189] (signed dword) muls16s::m#3 ← phi( muls16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@3/(signed dword) muls16s::m#1 )
   [190] (signed dword) muls16s::m#1 ← (signed dword) muls16s::m#3 + (signed word) muls16s::b#0
   [191] (signed word) muls16s::j#1 ← ++ (signed word) muls16s::j#2
-  [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@8
-  to:muls16s::@3
-muls16s::@3: scope:[muls16s]  from muls16s::@10 muls16s::@4 muls16s::@8
-  [193] (signed dword) muls16s::return#0 ← phi( muls16s::@10/(signed dword) muls16s::m#2 muls16s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@8/(signed dword) muls16s::m#1 )
+  [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@3
+  to:muls16s::@1
+muls16s::@1: scope:[muls16s]  from muls16s::@2 muls16s::@3 muls16s::@4
+  [193] (signed dword) muls16s::return#0 ← phi( muls16s::@4/(signed dword) muls16s::m#2 muls16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@3/(signed dword) muls16s::m#1 )
   to:muls16s::@return
-muls16s::@return: scope:[muls16s]  from muls16s::@3
+muls16s::@return: scope:[muls16s]  from muls16s::@1
   [194] return 
   to:@return
-muls16s::@10: scope:[muls16s]  from muls16s muls16s::@10
-  [195] (signed word) muls16s::i#2 ← phi( muls16s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@10/(signed word) muls16s::i#1 )
-  [195] (signed dword) muls16s::m#5 ← phi( muls16s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@10/(signed dword) muls16s::m#2 )
+muls16s::@4: scope:[muls16s]  from muls16s muls16s::@4
+  [195] (signed word) muls16s::i#2 ← phi( muls16s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@4/(signed word) muls16s::i#1 )
+  [195] (signed dword) muls16s::m#5 ← phi( muls16s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@4/(signed dword) muls16s::m#2 )
   [196] (signed dword) muls16s::m#2 ← (signed dword) muls16s::m#5 - (signed word) muls16s::b#0
   [197] (signed word) muls16s::i#1 ← -- (signed word) muls16s::i#2
-  [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@10
-  to:muls16s::@3
+  [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@4
+  to:muls16s::@1
 mul16u_compare: scope:[mul16u_compare]  from main::@2
   [199] phi()
   to:mul16u_compare::@1
-mul16u_compare::@1: scope:[mul16u_compare]  from mul16u_compare mul16u_compare::@10
-  [200] (byte) mul16u_compare::i#12 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@10/(byte) mul16u_compare::i#1 )
-  [200] (word) mul16u_compare::b#6 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@10/(word) mul16u_compare::b#1 )
-  [200] (word) mul16u_compare::a#6 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@10/(word) mul16u_compare::a#1 )
-  [200] (byte*) print_char_cursor#139 ← phi( mul16u_compare/((byte*))(word/signed word/dword/signed dword) $400 mul16u_compare::@10/(byte*) print_char_cursor#128 )
+mul16u_compare::@1: scope:[mul16u_compare]  from mul16u_compare mul16u_compare::@8
+  [200] (byte) mul16u_compare::i#12 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@8/(byte) mul16u_compare::i#1 )
+  [200] (word) mul16u_compare::b#6 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@8/(word) mul16u_compare::b#1 )
+  [200] (word) mul16u_compare::a#6 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@8/(word) mul16u_compare::a#1 )
+  [200] (byte*) print_char_cursor#139 ← phi( mul16u_compare/((byte*))(word/signed word/dword/signed dword) $400 mul16u_compare::@8/(byte*) print_char_cursor#128 )
   [201] call print_str 
   to:mul16u_compare::@2
 mul16u_compare::@2: scope:[mul16u_compare]  from mul16u_compare::@1 mul16u_compare::@5
@@ -422,37 +422,37 @@ mul16u_compare::@2: scope:[mul16u_compare]  from mul16u_compare::@1 mul16u_compa
   [206] (word) muls16u::b#0 ← (word) mul16u_compare::b#1
   [207] call muls16u 
   [208] (dword) muls16u::return#2 ← (dword) muls16u::return#0
-  to:mul16u_compare::@13
-mul16u_compare::@13: scope:[mul16u_compare]  from mul16u_compare::@2
+  to:mul16u_compare::@10
+mul16u_compare::@10: scope:[mul16u_compare]  from mul16u_compare::@2
   [209] (dword) mul16u_compare::ms#0 ← (dword) muls16u::return#2
   [210] (word) mul16u::a#2 ← (word) mul16u_compare::a#1
   [211] (word) mul16u::b#1 ← (word) mul16u_compare::b#1
   [212] call mul16u 
   [213] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-  to:mul16u_compare::@14
-mul16u_compare::@14: scope:[mul16u_compare]  from mul16u_compare::@13
+  to:mul16u_compare::@11
+mul16u_compare::@11: scope:[mul16u_compare]  from mul16u_compare::@10
   [214] (dword) mul16u_compare::mn#0 ← (dword) mul16u::return#3
   [215] (word) mulf16u::a#1 ← (word) mul16u_compare::a#1
   [216] (word) mulf16u::b#1 ← (word) mul16u_compare::b#1
   [217] call mulf16u 
   [218] (dword) mulf16u::return#3 ← (dword) mulf16u::return#0
-  to:mul16u_compare::@15
-mul16u_compare::@15: scope:[mul16u_compare]  from mul16u_compare::@14
+  to:mul16u_compare::@12
+mul16u_compare::@12: scope:[mul16u_compare]  from mul16u_compare::@11
   [219] (dword) mul16u_compare::mf#0 ← (dword) mulf16u::return#3
   [220] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mf#0) goto mul16u_compare::@3
   to:mul16u_compare::@6
-mul16u_compare::@6: scope:[mul16u_compare]  from mul16u_compare::@15
+mul16u_compare::@6: scope:[mul16u_compare]  from mul16u_compare::@12
   [221] phi()
   to:mul16u_compare::@3
-mul16u_compare::@3: scope:[mul16u_compare]  from mul16u_compare::@15 mul16u_compare::@6
-  [222] (byte) mul16u_compare::ok#4 ← phi( mul16u_compare::@15/(byte/signed byte/word/signed word/dword/signed dword) 1 mul16u_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@22
+mul16u_compare::@3: scope:[mul16u_compare]  from mul16u_compare::@12 mul16u_compare::@6
+  [222] (byte) mul16u_compare::ok#4 ← phi( mul16u_compare::@12/(byte/signed byte/word/signed word/dword/signed dword) 1 mul16u_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@15
   to:mul16u_compare::@4
-mul16u_compare::@4: scope:[mul16u_compare]  from mul16u_compare::@22 mul16u_compare::@3
-  [224] (byte) mul16u_compare::ok#3 ← phi( mul16u_compare::@22/(byte) mul16u_compare::ok#4 mul16u_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+mul16u_compare::@4: scope:[mul16u_compare]  from mul16u_compare::@15 mul16u_compare::@3
+  [224] (byte) mul16u_compare::ok#3 ← phi( mul16u_compare::@15/(byte) mul16u_compare::ok#4 mul16u_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [225] if((byte) mul16u_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u_compare::@5
-  to:mul16u_compare::@8
-mul16u_compare::@8: scope:[mul16u_compare]  from mul16u_compare::@4
+  to:mul16u_compare::@7
+mul16u_compare::@7: scope:[mul16u_compare]  from mul16u_compare::@4
   [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   [227] (word) mul16u_error::a#0 ← (word) mul16u_compare::a#1
   [228] (word) mul16u_error::b#0 ← (word) mul16u_compare::b#1
@@ -461,33 +461,33 @@ mul16u_compare::@8: scope:[mul16u_compare]  from mul16u_compare::@4
   [231] (dword) mul16u_error::mf#0 ← (dword) mul16u_compare::mf#0
   [232] call mul16u_error 
   to:mul16u_compare::@return
-mul16u_compare::@return: scope:[mul16u_compare]  from mul16u_compare::@18 mul16u_compare::@8
+mul16u_compare::@return: scope:[mul16u_compare]  from mul16u_compare::@14 mul16u_compare::@7
   [233] return 
   to:@return
 mul16u_compare::@5: scope:[mul16u_compare]  from mul16u_compare::@4
   [234] (byte) mul16u_compare::j#1 ← ++ (byte) mul16u_compare::j#10
   [235] if((byte) mul16u_compare::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16u_compare::@2
-  to:mul16u_compare::@10
-mul16u_compare::@10: scope:[mul16u_compare]  from mul16u_compare::@5
+  to:mul16u_compare::@8
+mul16u_compare::@8: scope:[mul16u_compare]  from mul16u_compare::@5
   [236] (byte) mul16u_compare::i#1 ← ++ (byte) mul16u_compare::i#12
   [237] if((byte) mul16u_compare::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16u_compare::@1
-  to:mul16u_compare::@11
-mul16u_compare::@11: scope:[mul16u_compare]  from mul16u_compare::@10
+  to:mul16u_compare::@9
+mul16u_compare::@9: scope:[mul16u_compare]  from mul16u_compare::@8
   [238] phi()
   [239] call print_ln 
-  to:mul16u_compare::@17
-mul16u_compare::@17: scope:[mul16u_compare]  from mul16u_compare::@11
+  to:mul16u_compare::@13
+mul16u_compare::@13: scope:[mul16u_compare]  from mul16u_compare::@9
   [240] (byte*~) print_char_cursor#192 ← (byte*) print_line_cursor#1
   [241] call print_str 
-  to:mul16u_compare::@18
-mul16u_compare::@18: scope:[mul16u_compare]  from mul16u_compare::@17
+  to:mul16u_compare::@14
+mul16u_compare::@14: scope:[mul16u_compare]  from mul16u_compare::@13
   [242] phi()
   [243] call print_ln 
   to:mul16u_compare::@return
-mul16u_compare::@22: scope:[mul16u_compare]  from mul16u_compare::@3
+mul16u_compare::@15: scope:[mul16u_compare]  from mul16u_compare::@3
   [244] phi()
   to:mul16u_compare::@4
-mul16u_error: scope:[mul16u_error]  from mul16u_compare::@8
+mul16u_error: scope:[mul16u_error]  from mul16u_compare::@7
   [245] phi()
   [246] call print_str 
   to:mul16u_error::@1
@@ -536,16 +536,16 @@ mul16u_error::@return: scope:[mul16u_error]  from mul16u_error::@10
   to:@return
 muls16u: scope:[muls16u]  from mul16u_compare::@2
   [268] if((word) muls16u::a#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16u::@1
-  to:muls16u::@4
-muls16u::@4: scope:[muls16u]  from muls16u muls16u::@4
-  [269] (word) muls16u::i#2 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@4/(word) muls16u::i#1 )
-  [269] (dword) muls16u::m#3 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@4/(dword) muls16u::m#1 )
+  to:muls16u::@2
+muls16u::@2: scope:[muls16u]  from muls16u muls16u::@2
+  [269] (word) muls16u::i#2 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@2/(word) muls16u::i#1 )
+  [269] (dword) muls16u::m#3 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@2/(dword) muls16u::m#1 )
   [270] (dword) muls16u::m#1 ← (dword) muls16u::m#3 + (word) muls16u::b#0
   [271] (word) muls16u::i#1 ← ++ (word) muls16u::i#2
-  [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@4
+  [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@2
   to:muls16u::@1
-muls16u::@1: scope:[muls16u]  from muls16u muls16u::@4
-  [273] (dword) muls16u::return#0 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@4/(dword) muls16u::m#1 )
+muls16u::@1: scope:[muls16u]  from muls16u muls16u::@2
+  [273] (dword) muls16u::return#0 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@2/(dword) muls16u::m#1 )
   to:muls16u::@return
 muls16u::@return: scope:[muls16u]  from muls16u::@1
   [274] return 
@@ -578,33 +578,33 @@ mulf_init::@2: scope:[mulf_init]  from mulf_init::@1 mulf_init::@3
   [288] (word) mulf_init::sqr#1 ← (word) mulf_init::sqr#3 + (byte) mulf_init::x_2#2
   [289] (byte*) mulf_init::sqr1_lo#1 ← ++ (byte*) mulf_init::sqr1_lo#2
   [290] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $200) goto mulf_init::@1
-  to:mulf_init::@5
-mulf_init::@5: scope:[mulf_init]  from mulf_init::@2 mulf_init::@6
-  [291] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@6/(byte) mulf_init::dir#3 )
-  [291] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@6/(byte*) mulf_init::sqr2_hi#1 )
-  [291] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@6/(byte*) mulf_init::sqr2_lo#1 )
-  [291] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@6/(byte) mulf_init::x_255#1 )
+  to:mulf_init::@4
+mulf_init::@4: scope:[mulf_init]  from mulf_init::@2 mulf_init::@5
+  [291] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@5/(byte) mulf_init::dir#3 )
+  [291] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@5/(byte*) mulf_init::sqr2_hi#1 )
+  [291] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@5/(byte*) mulf_init::sqr2_lo#1 )
+  [291] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@5/(byte) mulf_init::x_255#1 )
   [292] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2)
   [293] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2)
   [294] (byte*) mulf_init::sqr2_hi#1 ← ++ (byte*) mulf_init::sqr2_hi#2
   [295] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2
-  [296] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12
-  to:mulf_init::@6
-mulf_init::@6: scope:[mulf_init]  from mulf_init::@12 mulf_init::@5
-  [297] (byte) mulf_init::dir#3 ← phi( mulf_init::@12/(byte) mulf_init::dir#2 mulf_init::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [296] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7
+  to:mulf_init::@5
+mulf_init::@5: scope:[mulf_init]  from mulf_init::@4 mulf_init::@7
+  [297] (byte) mulf_init::dir#3 ← phi( mulf_init::@7/(byte) mulf_init::dir#2 mulf_init::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [298] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2
-  [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5
-  to:mulf_init::@8
-mulf_init::@8: scope:[mulf_init]  from mulf_init::@6
+  [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4
+  to:mulf_init::@6
+mulf_init::@6: scope:[mulf_init]  from mulf_init::@5
   [300] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100)
   [301] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100)
   to:mulf_init::@return
-mulf_init::@return: scope:[mulf_init]  from mulf_init::@8
+mulf_init::@return: scope:[mulf_init]  from mulf_init::@6
   [302] return 
   to:@return
-mulf_init::@12: scope:[mulf_init]  from mulf_init::@5
+mulf_init::@7: scope:[mulf_init]  from mulf_init::@4
   [303] phi()
-  to:mulf_init::@6
+  to:mulf_init::@5
 print_cls: scope:[print_cls]  from main
   [304] phi()
   to:print_cls::@1
diff --git a/src/test/ref/test-multiply-16bit.log b/src/test/ref/test-multiply-16bit.log
index bf2965c8f..a16233171 100644
--- a/src/test/ref/test-multiply-16bit.log
+++ b/src/test/ref/test-multiply-16bit.log
@@ -3383,16 +3383,50 @@ Culled Empty Block (label) mulf_init::@11
 Culled Empty Block (label) mulf_init::@9
 Culled Empty Block (label) mulf_init::@10
 Culled Empty Block (label) print_cls::@3
+Renumbering block @40 to @1
+Renumbering block print_sword::@4 to print_sword::@3
+Renumbering block print_sdword::@4 to print_sdword::@3
+Renumbering block mul16u::@6 to mul16u::@3
+Renumbering block mul16u::@8 to mul16u::@4
+Renumbering block mul16s::@6 to mul16s::@5
+Renumbering block mulf_init::@5 to mulf_init::@4
+Renumbering block mulf_init::@6 to mulf_init::@5
+Renumbering block mulf_init::@8 to mulf_init::@6
+Renumbering block mulf_init::@12 to mulf_init::@7
+Renumbering block mulf16s::@6 to mulf16s::@5
+Renumbering block muls16u::@4 to muls16u::@2
+Renumbering block muls16s::@3 to muls16s::@1
+Renumbering block muls16s::@4 to muls16s::@2
+Renumbering block muls16s::@8 to muls16s::@3
+Renumbering block muls16s::@10 to muls16s::@4
+Renumbering block mul16u_compare::@8 to mul16u_compare::@7
+Renumbering block mul16u_compare::@10 to mul16u_compare::@8
+Renumbering block mul16u_compare::@11 to mul16u_compare::@9
+Renumbering block mul16u_compare::@13 to mul16u_compare::@10
+Renumbering block mul16u_compare::@14 to mul16u_compare::@11
+Renumbering block mul16u_compare::@15 to mul16u_compare::@12
+Renumbering block mul16u_compare::@17 to mul16u_compare::@13
+Renumbering block mul16u_compare::@18 to mul16u_compare::@14
+Renumbering block mul16u_compare::@22 to mul16u_compare::@15
+Renumbering block mul16s_compare::@8 to mul16s_compare::@7
+Renumbering block mul16s_compare::@10 to mul16s_compare::@8
+Renumbering block mul16s_compare::@11 to mul16s_compare::@9
+Renumbering block mul16s_compare::@13 to mul16s_compare::@10
+Renumbering block mul16s_compare::@14 to mul16s_compare::@11
+Renumbering block mul16s_compare::@15 to mul16s_compare::@12
+Renumbering block mul16s_compare::@17 to mul16s_compare::@13
+Renumbering block mul16s_compare::@18 to mul16s_compare::@14
+Renumbering block mul16s_compare::@22 to mul16s_compare::@15
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @40
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of main::@3
 Adding NOP phi() at start of mul16s_compare::@6
-Adding NOP phi() at start of mul16s_compare::@11
-Adding NOP phi() at start of mul16s_compare::@18
-Adding NOP phi() at start of mul16s_compare::@22
+Adding NOP phi() at start of mul16s_compare::@9
+Adding NOP phi() at start of mul16s_compare::@14
+Adding NOP phi() at start of mul16s_compare::@15
 Adding NOP phi() at start of mul16s_error
 Adding NOP phi() at start of mul16s_error::@2
 Adding NOP phi() at start of mul16s_error::@4
@@ -3403,9 +3437,9 @@ Adding NOP phi() at start of print_sdword::@2
 Adding NOP phi() at start of print_sword::@2
 Adding NOP phi() at start of mul16u_compare
 Adding NOP phi() at start of mul16u_compare::@6
-Adding NOP phi() at start of mul16u_compare::@11
-Adding NOP phi() at start of mul16u_compare::@18
-Adding NOP phi() at start of mul16u_compare::@22
+Adding NOP phi() at start of mul16u_compare::@9
+Adding NOP phi() at start of mul16u_compare::@14
+Adding NOP phi() at start of mul16u_compare::@15
 Adding NOP phi() at start of mul16u_error
 Adding NOP phi() at start of mul16u_error::@2
 Adding NOP phi() at start of mul16u_error::@4
@@ -3413,20 +3447,20 @@ Adding NOP phi() at start of mul16u_error::@6
 Adding NOP phi() at start of mul16u_error::@8
 Adding NOP phi() at start of mul16u_error::@10
 Adding NOP phi() at start of mulf_init
-Adding NOP phi() at start of mulf_init::@12
+Adding NOP phi() at start of mulf_init::@7
 Adding NOP phi() at start of print_cls
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@40
-@40: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @40
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @40
+main: scope:[main]  from @1
   [4] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 5
   [5] call print_cls 
   to:main::@1
@@ -3448,11 +3482,11 @@ main::@return: scope:[main]  from main::@3
 mul16s_compare: scope:[mul16s_compare]  from main::@3
   [13] (byte*~) print_char_cursor#176 ← (byte*) print_line_cursor#1
   to:mul16s_compare::@1
-mul16s_compare::@1: scope:[mul16s_compare]  from mul16s_compare mul16s_compare::@10
-  [14] (byte) mul16s_compare::i#12 ← phi( mul16s_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16s_compare::@10/(byte) mul16s_compare::i#1 )
-  [14] (signed word) mul16s_compare::b#6 ← phi( mul16s_compare/-(word/signed word/dword/signed dword) $7fff mul16s_compare::@10/(signed word) mul16s_compare::b#1 )
-  [14] (signed word) mul16s_compare::a#6 ← phi( mul16s_compare/-(word/signed word/dword/signed dword) $7fff mul16s_compare::@10/(signed word) mul16s_compare::a#1 )
-  [14] (byte*) print_char_cursor#143 ← phi( mul16s_compare/(byte*~) print_char_cursor#176 mul16s_compare::@10/(byte*) print_char_cursor#128 )
+mul16s_compare::@1: scope:[mul16s_compare]  from mul16s_compare mul16s_compare::@8
+  [14] (byte) mul16s_compare::i#12 ← phi( mul16s_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16s_compare::@8/(byte) mul16s_compare::i#1 )
+  [14] (signed word) mul16s_compare::b#6 ← phi( mul16s_compare/-(word/signed word/dword/signed dword) $7fff mul16s_compare::@8/(signed word) mul16s_compare::b#1 )
+  [14] (signed word) mul16s_compare::a#6 ← phi( mul16s_compare/-(word/signed word/dword/signed dword) $7fff mul16s_compare::@8/(signed word) mul16s_compare::a#1 )
+  [14] (byte*) print_char_cursor#143 ← phi( mul16s_compare/(byte*~) print_char_cursor#176 mul16s_compare::@8/(byte*) print_char_cursor#128 )
   [15] call print_str 
   to:mul16s_compare::@2
 mul16s_compare::@2: scope:[mul16s_compare]  from mul16s_compare::@1 mul16s_compare::@5
@@ -3465,37 +3499,37 @@ mul16s_compare::@2: scope:[mul16s_compare]  from mul16s_compare::@1 mul16s_compa
   [20] (signed word) muls16s::b#0 ← (signed word) mul16s_compare::b#1
   [21] call muls16s 
   [22] (signed dword) muls16s::return#2 ← (signed dword) muls16s::return#0
-  to:mul16s_compare::@13
-mul16s_compare::@13: scope:[mul16s_compare]  from mul16s_compare::@2
+  to:mul16s_compare::@10
+mul16s_compare::@10: scope:[mul16s_compare]  from mul16s_compare::@2
   [23] (signed dword) mul16s_compare::ms#0 ← (signed dword) muls16s::return#2
   [24] (signed word) mul16s::a#0 ← (signed word) mul16s_compare::a#1
   [25] (signed word) mul16s::b#0 ← (signed word) mul16s_compare::b#1
   [26] call mul16s 
   [27] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-  to:mul16s_compare::@14
-mul16s_compare::@14: scope:[mul16s_compare]  from mul16s_compare::@13
+  to:mul16s_compare::@11
+mul16s_compare::@11: scope:[mul16s_compare]  from mul16s_compare::@10
   [28] (signed dword) mul16s_compare::mn#0 ← (signed dword) mul16s::return#2
   [29] (signed word) mulf16s::a#0 ← (signed word) mul16s_compare::a#1
   [30] (signed word) mulf16s::b#0 ← (signed word) mul16s_compare::b#1
   [31] call mulf16s 
   [32] (signed dword) mulf16s::return#2 ← (signed dword) mulf16s::return#0
-  to:mul16s_compare::@15
-mul16s_compare::@15: scope:[mul16s_compare]  from mul16s_compare::@14
+  to:mul16s_compare::@12
+mul16s_compare::@12: scope:[mul16s_compare]  from mul16s_compare::@11
   [33] (signed dword) mul16s_compare::mf#0 ← (signed dword) mulf16s::return#2
   [34] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mf#0) goto mul16s_compare::@3
   to:mul16s_compare::@6
-mul16s_compare::@6: scope:[mul16s_compare]  from mul16s_compare::@15
+mul16s_compare::@6: scope:[mul16s_compare]  from mul16s_compare::@12
   [35] phi()
   to:mul16s_compare::@3
-mul16s_compare::@3: scope:[mul16s_compare]  from mul16s_compare::@15 mul16s_compare::@6
-  [36] (byte) mul16s_compare::ok#4 ← phi( mul16s_compare::@15/(byte/signed byte/word/signed word/dword/signed dword) 1 mul16s_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@22
+mul16s_compare::@3: scope:[mul16s_compare]  from mul16s_compare::@12 mul16s_compare::@6
+  [36] (byte) mul16s_compare::ok#4 ← phi( mul16s_compare::@12/(byte/signed byte/word/signed word/dword/signed dword) 1 mul16s_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@15
   to:mul16s_compare::@4
-mul16s_compare::@4: scope:[mul16s_compare]  from mul16s_compare::@22 mul16s_compare::@3
-  [38] (byte) mul16s_compare::ok#3 ← phi( mul16s_compare::@22/(byte) mul16s_compare::ok#4 mul16s_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+mul16s_compare::@4: scope:[mul16s_compare]  from mul16s_compare::@15 mul16s_compare::@3
+  [38] (byte) mul16s_compare::ok#3 ← phi( mul16s_compare::@15/(byte) mul16s_compare::ok#4 mul16s_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [39] if((byte) mul16s_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s_compare::@5
-  to:mul16s_compare::@8
-mul16s_compare::@8: scope:[mul16s_compare]  from mul16s_compare::@4
+  to:mul16s_compare::@7
+mul16s_compare::@7: scope:[mul16s_compare]  from mul16s_compare::@4
   [40] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   [41] (signed word) mul16s_error::a#0 ← (signed word) mul16s_compare::a#1
   [42] (signed word) mul16s_error::b#0 ← (signed word) mul16s_compare::b#1
@@ -3504,35 +3538,35 @@ mul16s_compare::@8: scope:[mul16s_compare]  from mul16s_compare::@4
   [45] (signed dword) mul16s_error::mf#0 ← (signed dword) mul16s_compare::mf#0
   [46] call mul16s_error 
   to:mul16s_compare::@return
-mul16s_compare::@return: scope:[mul16s_compare]  from mul16s_compare::@18 mul16s_compare::@8
+mul16s_compare::@return: scope:[mul16s_compare]  from mul16s_compare::@14 mul16s_compare::@7
   [47] return 
   to:@return
 mul16s_compare::@5: scope:[mul16s_compare]  from mul16s_compare::@4
   [48] (byte) mul16s_compare::j#1 ← ++ (byte) mul16s_compare::j#10
   [49] if((byte) mul16s_compare::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16s_compare::@2
-  to:mul16s_compare::@10
-mul16s_compare::@10: scope:[mul16s_compare]  from mul16s_compare::@5
+  to:mul16s_compare::@8
+mul16s_compare::@8: scope:[mul16s_compare]  from mul16s_compare::@5
   [50] (byte) mul16s_compare::i#1 ← ++ (byte) mul16s_compare::i#12
   [51] if((byte) mul16s_compare::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16s_compare::@1
-  to:mul16s_compare::@11
-mul16s_compare::@11: scope:[mul16s_compare]  from mul16s_compare::@10
+  to:mul16s_compare::@9
+mul16s_compare::@9: scope:[mul16s_compare]  from mul16s_compare::@8
   [52] phi()
   [53] call print_ln 
-  to:mul16s_compare::@17
-mul16s_compare::@17: scope:[mul16s_compare]  from mul16s_compare::@11
+  to:mul16s_compare::@13
+mul16s_compare::@13: scope:[mul16s_compare]  from mul16s_compare::@9
   [54] (byte*~) print_char_cursor#185 ← (byte*) print_line_cursor#1
   [55] call print_str 
-  to:mul16s_compare::@18
-mul16s_compare::@18: scope:[mul16s_compare]  from mul16s_compare::@17
+  to:mul16s_compare::@14
+mul16s_compare::@14: scope:[mul16s_compare]  from mul16s_compare::@13
   [56] phi()
   [57] call print_ln 
   to:mul16s_compare::@return
-mul16s_compare::@22: scope:[mul16s_compare]  from mul16s_compare::@3
+mul16s_compare::@15: scope:[mul16s_compare]  from mul16s_compare::@3
   [58] phi()
   to:mul16s_compare::@4
-print_ln: scope:[print_ln]  from mul16s_compare::@11 mul16s_compare::@18 mul16s_error::@10 mul16u_compare::@11 mul16u_compare::@18 mul16u_error::@10
-  [59] (byte*) print_char_cursor#129 ← phi( mul16s_compare::@11/(byte*) print_char_cursor#128 mul16s_compare::@18/(byte*) print_char_cursor#128 mul16s_error::@10/(byte*) print_char_cursor#20 mul16u_compare::@11/(byte*) print_char_cursor#128 mul16u_compare::@18/(byte*) print_char_cursor#128 mul16u_error::@10/(byte*) print_char_cursor#20 )
-  [59] (byte*) print_line_cursor#43 ← phi( mul16s_compare::@11/(byte*) print_line_cursor#1 mul16s_compare::@18/(byte*) print_line_cursor#1 mul16s_error::@10/(byte*) print_line_cursor#1 mul16u_compare::@11/((byte*))(word/signed word/dword/signed dword) $400 mul16u_compare::@18/(byte*) print_line_cursor#1 mul16u_error::@10/((byte*))(word/signed word/dword/signed dword) $400 )
+print_ln: scope:[print_ln]  from mul16s_compare::@14 mul16s_compare::@9 mul16s_error::@10 mul16u_compare::@14 mul16u_compare::@9 mul16u_error::@10
+  [59] (byte*) print_char_cursor#129 ← phi( mul16s_compare::@9/(byte*) print_char_cursor#128 mul16s_compare::@14/(byte*) print_char_cursor#128 mul16s_error::@10/(byte*) print_char_cursor#20 mul16u_compare::@9/(byte*) print_char_cursor#128 mul16u_compare::@14/(byte*) print_char_cursor#128 mul16u_error::@10/(byte*) print_char_cursor#20 )
+  [59] (byte*) print_line_cursor#43 ← phi( mul16s_compare::@9/(byte*) print_line_cursor#1 mul16s_compare::@14/(byte*) print_line_cursor#1 mul16s_error::@10/(byte*) print_line_cursor#1 mul16u_compare::@9/((byte*))(word/signed word/dword/signed dword) $400 mul16u_compare::@14/(byte*) print_line_cursor#1 mul16u_error::@10/((byte*))(word/signed word/dword/signed dword) $400 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [60] (byte*) print_line_cursor#22 ← phi( print_ln/(byte*) print_line_cursor#43 print_ln::@1/(byte*) print_line_cursor#1 )
@@ -3542,9 +3576,9 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [63] return 
   to:@return
-print_str: scope:[print_str]  from mul16s_compare::@1 mul16s_compare::@17 mul16s_error mul16s_error::@2 mul16s_error::@4 mul16s_error::@6 mul16s_error::@8 mul16u_compare::@1 mul16u_compare::@17 mul16u_error mul16u_error::@2 mul16u_error::@4 mul16u_error::@6 mul16u_error::@8
-  [64] (byte*) print_char_cursor#148 ← phi( mul16s_compare::@1/(byte*) print_char_cursor#143 mul16s_compare::@17/(byte*~) print_char_cursor#185 mul16s_error/(byte*) print_char_cursor#128 mul16s_error::@2/(byte*) print_char_cursor#20 mul16s_error::@4/(byte*) print_char_cursor#20 mul16s_error::@6/(byte*) print_char_cursor#20 mul16s_error::@8/(byte*) print_char_cursor#20 mul16u_compare::@1/(byte*) print_char_cursor#139 mul16u_compare::@17/(byte*~) print_char_cursor#192 mul16u_error/(byte*) print_char_cursor#128 mul16u_error::@2/(byte*) print_char_cursor#20 mul16u_error::@4/(byte*) print_char_cursor#20 mul16u_error::@6/(byte*) print_char_cursor#20 mul16u_error::@8/(byte*) print_char_cursor#20 )
-  [64] (byte*) print_str::str#17 ← phi( mul16s_compare::@1/(const string) str mul16s_compare::@17/(const string) mul16s_compare::str1 mul16s_error/(const string) mul16s_error::str mul16s_error::@2/(const string) str1 mul16s_error::@4/(const string) str2 mul16s_error::@6/(const string) str3 mul16s_error::@8/(const string) str4 mul16u_compare::@1/(const string) str mul16u_compare::@17/(const string) mul16u_compare::str1 mul16u_error/(const string) mul16u_error::str mul16u_error::@2/(const string) str1 mul16u_error::@4/(const string) str2 mul16u_error::@6/(const string) str3 mul16u_error::@8/(const string) str4 )
+print_str: scope:[print_str]  from mul16s_compare::@1 mul16s_compare::@13 mul16s_error mul16s_error::@2 mul16s_error::@4 mul16s_error::@6 mul16s_error::@8 mul16u_compare::@1 mul16u_compare::@13 mul16u_error mul16u_error::@2 mul16u_error::@4 mul16u_error::@6 mul16u_error::@8
+  [64] (byte*) print_char_cursor#148 ← phi( mul16s_compare::@1/(byte*) print_char_cursor#143 mul16s_compare::@13/(byte*~) print_char_cursor#185 mul16s_error/(byte*) print_char_cursor#128 mul16s_error::@2/(byte*) print_char_cursor#20 mul16s_error::@4/(byte*) print_char_cursor#20 mul16s_error::@6/(byte*) print_char_cursor#20 mul16s_error::@8/(byte*) print_char_cursor#20 mul16u_compare::@1/(byte*) print_char_cursor#139 mul16u_compare::@13/(byte*~) print_char_cursor#192 mul16u_error/(byte*) print_char_cursor#128 mul16u_error::@2/(byte*) print_char_cursor#20 mul16u_error::@4/(byte*) print_char_cursor#20 mul16u_error::@6/(byte*) print_char_cursor#20 mul16u_error::@8/(byte*) print_char_cursor#20 )
+  [64] (byte*) print_str::str#17 ← phi( mul16s_compare::@1/(const string) str mul16s_compare::@13/(const string) mul16s_compare::str1 mul16s_error/(const string) mul16s_error::str mul16s_error::@2/(const string) str1 mul16s_error::@4/(const string) str2 mul16s_error::@6/(const string) str3 mul16s_error::@8/(const string) str4 mul16u_compare::@1/(const string) str mul16u_compare::@13/(const string) mul16u_compare::str1 mul16u_error/(const string) mul16u_error::str mul16u_error::@2/(const string) str1 mul16u_error::@4/(const string) str2 mul16u_error::@6/(const string) str3 mul16u_error::@8/(const string) str4 )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [65] (byte*) print_char_cursor#128 ← phi( print_str/(byte*) print_char_cursor#148 print_str::@2/(byte*) print_char_cursor#1 )
@@ -3559,7 +3593,7 @@ print_str::@2: scope:[print_str]  from print_str::@1
   [69] (byte*) print_char_cursor#1 ← ++ (byte*) print_char_cursor#128
   [70] (byte*) print_str::str#0 ← ++ (byte*) print_str::str#15
   to:print_str::@1
-mul16s_error: scope:[mul16s_error]  from mul16s_compare::@8
+mul16s_error: scope:[mul16s_error]  from mul16s_compare::@7
   [71] phi()
   [72] call print_str 
   to:mul16s_error::@1
@@ -3613,13 +3647,13 @@ print_sdword: scope:[print_sdword]  from mul16s_error::@5 mul16s_error::@7 mul16
 print_sdword::@2: scope:[print_sdword]  from print_sdword
   [96] phi()
   [97] call print_char 
-  to:print_sdword::@4
-print_sdword::@4: scope:[print_sdword]  from print_sdword::@2
+  to:print_sdword::@3
+print_sdword::@3: scope:[print_sdword]  from print_sdword::@2
   [98] (signed dword) print_sdword::dw#0 ← - (signed dword) print_sdword::dw#4
   to:print_sdword::@1
-print_sdword::@1: scope:[print_sdword]  from print_sdword print_sdword::@4
-  [99] (byte*) print_char_cursor#134 ← phi( print_sdword/(byte*) print_char_cursor#128 print_sdword::@4/(byte*) print_char_cursor#20 )
-  [99] (signed dword) print_sdword::dw#5 ← phi( print_sdword/(signed dword) print_sdword::dw#4 print_sdword::@4/(signed dword) print_sdword::dw#0 )
+print_sdword::@1: scope:[print_sdword]  from print_sdword print_sdword::@3
+  [99] (byte*) print_char_cursor#134 ← phi( print_sdword/(byte*) print_char_cursor#128 print_sdword::@3/(byte*) print_char_cursor#20 )
+  [99] (signed dword) print_sdword::dw#5 ← phi( print_sdword/(signed dword) print_sdword::dw#4 print_sdword::@3/(signed dword) print_sdword::dw#0 )
   [100] (dword) print_dword::dw#0 ← ((dword)) (signed dword) print_sdword::dw#5
   [101] call print_dword 
   to:print_sdword::@return
@@ -3683,36 +3717,36 @@ print_sword: scope:[print_sword]  from mul16s_error::@1 mul16s_error::@3
 print_sword::@2: scope:[print_sword]  from print_sword
   [129] phi()
   [130] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [131] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [132] (byte*) print_char_cursor#130 ← phi( print_sword/(byte*) print_char_cursor#128 print_sword::@4/(byte*) print_char_cursor#20 )
-  [132] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [132] (byte*) print_char_cursor#130 ← phi( print_sword/(byte*) print_char_cursor#128 print_sword::@3/(byte*) print_char_cursor#20 )
+  [132] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@3/(signed word) print_sword::w#0 )
   [133] (word~) print_word::w#11 ← (word)(signed word) print_sword::w#4
   [134] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
   [135] return 
   to:@return
-mulf16s: scope:[mulf16s]  from mul16s_compare::@14
+mulf16s: scope:[mulf16s]  from mul16s_compare::@11
   [136] (word~) mulf16u::a#4 ← (word)(signed word) mulf16s::a#0
   [137] (word~) mulf16u::b#4 ← (word)(signed word) mulf16s::b#0
   [138] call mulf16u 
   [139] (dword) mulf16u::return#2 ← (dword) mulf16u::return#0
-  to:mulf16s::@6
-mulf16s::@6: scope:[mulf16s]  from mulf16s
+  to:mulf16s::@5
+mulf16s::@5: scope:[mulf16s]  from mulf16s
   [140] (dword) mulf16s::m#0 ← (dword) mulf16u::return#2
   [141] if((signed word) mulf16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf16s::@1
   to:mulf16s::@3
-mulf16s::@3: scope:[mulf16s]  from mulf16s::@6
+mulf16s::@3: scope:[mulf16s]  from mulf16s::@5
   [142] (word~) mulf16s::$9 ← > (dword) mulf16s::m#0
   [143] (word~) mulf16s::$16 ← (word~) mulf16s::$9 - (word)(signed word) mulf16s::b#0
   [144] (dword) mulf16s::m#1 ← (dword) mulf16s::m#0 hi= (word~) mulf16s::$16
   to:mulf16s::@1
-mulf16s::@1: scope:[mulf16s]  from mulf16s::@3 mulf16s::@6
-  [145] (dword) mulf16s::m#5 ← phi( mulf16s::@3/(dword) mulf16s::m#1 mulf16s::@6/(dword) mulf16s::m#0 )
+mulf16s::@1: scope:[mulf16s]  from mulf16s::@3 mulf16s::@5
+  [145] (dword) mulf16s::m#5 ← phi( mulf16s::@3/(dword) mulf16s::m#1 mulf16s::@5/(dword) mulf16s::m#0 )
   [146] if((signed word) mulf16s::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf16s::@2
   to:mulf16s::@4
 mulf16s::@4: scope:[mulf16s]  from mulf16s::@1
@@ -3727,9 +3761,9 @@ mulf16s::@2: scope:[mulf16s]  from mulf16s::@1 mulf16s::@4
 mulf16s::@return: scope:[mulf16s]  from mulf16s::@2
   [152] return 
   to:@return
-mulf16u: scope:[mulf16u]  from mul16u_compare::@14 mulf16s
-  [153] (word) mulf16u::b#2 ← phi( mul16u_compare::@14/(word) mulf16u::b#1 mulf16s/(word~) mulf16u::b#4 )
-  [153] (word) mulf16u::a#2 ← phi( mul16u_compare::@14/(word) mulf16u::a#1 mulf16s/(word~) mulf16u::a#4 )
+mulf16u: scope:[mulf16u]  from mul16u_compare::@11 mulf16s
+  [153] (word) mulf16u::b#2 ← phi( mul16u_compare::@11/(word) mulf16u::b#1 mulf16s/(word~) mulf16u::b#4 )
+  [153] (word) mulf16u::a#2 ← phi( mul16u_compare::@11/(word) mulf16u::a#1 mulf16s/(word~) mulf16u::a#4 )
   [154] *((const word*) mulf16u::memA#0) ← (word) mulf16u::a#2
   [155] *((const word*) mulf16u::memB#0) ← (word) mulf16u::b#2
   asm { ldamemA stasm1a+1 stasm3a+1 stasm5a+1 stasm7a+1 eor#$ff stasm2a+1 stasm4a+1 stasm6a+1 stasm8a+1 ldamemA+1 stasm1b+1 stasm3b+1 stasm5b+1 stasm7b+1 eor#$ff stasm2b+1 stasm4b+1 stasm6b+1 stasm8b+1 ldxmemB sec sm1a: ldamulf_sqr1_lo,x sm2a: sbcmulf_sqr2_lo,x stamemR+0 sm3a: ldamulf_sqr1_hi,x sm4a: sbcmulf_sqr2_hi,x sta_AA+1 sec sm1b: ldamulf_sqr1_lo,x sm2b: sbcmulf_sqr2_lo,x sta_cc+1 sm3b: ldamulf_sqr1_hi,x sm4b: sbcmulf_sqr2_hi,x sta_CC+1 ldxmemB+1 sec sm5a: ldamulf_sqr1_lo,x sm6a: sbcmulf_sqr2_lo,x sta_bb+1 sm7a: ldamulf_sqr1_hi,x sm8a: sbcmulf_sqr2_hi,x sta_BB+1 sec sm5b: ldamulf_sqr1_lo,x sm6b: sbcmulf_sqr2_lo,x sta_dd+1 sm7b: ldamulf_sqr1_hi,x sm8b: sbcmulf_sqr2_hi,x stamemR+3 clc _AA: lda#0 _bb: adc#0 stamemR+1 _BB: lda#0 _CC: adc#0 stamemR+2 bcc!+ incmemR+3 clc !: _cc: lda#0 adcmemR+1 stamemR+1 _dd: lda#0 adcmemR+2 stamemR+2 bcc!+ incmemR+3 !:  }
@@ -3738,23 +3772,23 @@ mulf16u: scope:[mulf16u]  from mul16u_compare::@14 mulf16s
 mulf16u::@return: scope:[mulf16u]  from mulf16u
   [158] return 
   to:@return
-mul16s: scope:[mul16s]  from mul16s_compare::@13
+mul16s: scope:[mul16s]  from mul16s_compare::@10
   [159] (word~) mul16u::b#3 ← (word)(signed word) mul16s::b#0
   [160] (word~) mul16u::a#8 ← (word)(signed word) mul16s::a#0
   [161] call mul16u 
   [162] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  to:mul16s::@6
-mul16s::@6: scope:[mul16s]  from mul16s
+  to:mul16s::@5
+mul16s::@5: scope:[mul16s]  from mul16s
   [163] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   [164] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1
   to:mul16s::@3
-mul16s::@3: scope:[mul16s]  from mul16s::@6
+mul16s::@3: scope:[mul16s]  from mul16s::@5
   [165] (word~) mul16s::$9 ← > (dword) mul16s::m#0
   [166] (word~) mul16s::$16 ← (word~) mul16s::$9 - (word)(signed word) mul16s::b#0
   [167] (dword) mul16s::m#1 ← (dword) mul16s::m#0 hi= (word~) mul16s::$16
   to:mul16s::@1
-mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@6
-  [168] (dword) mul16s::m#5 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@6/(dword) mul16s::m#0 )
+mul16s::@1: scope:[mul16s]  from mul16s::@3 mul16s::@5
+  [168] (dword) mul16s::m#5 ← phi( mul16s::@3/(dword) mul16s::m#1 mul16s::@5/(dword) mul16s::m#0 )
   [169] if((signed word) mul16s::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@2
   to:mul16s::@4
 mul16s::@4: scope:[mul16s]  from mul16s::@1
@@ -3769,15 +3803,15 @@ mul16s::@2: scope:[mul16s]  from mul16s::@1 mul16s::@4
 mul16s::@return: scope:[mul16s]  from mul16s::@2
   [175] return 
   to:@return
-mul16u: scope:[mul16u]  from mul16s mul16u_compare::@13
-  [176] (word) mul16u::a#6 ← phi( mul16s/(word~) mul16u::a#8 mul16u_compare::@13/(word) mul16u::a#2 )
-  [176] (word) mul16u::b#2 ← phi( mul16s/(word~) mul16u::b#3 mul16u_compare::@13/(word) mul16u::b#1 )
+mul16u: scope:[mul16u]  from mul16s mul16u_compare::@10
+  [176] (word) mul16u::a#6 ← phi( mul16s/(word~) mul16u::a#8 mul16u_compare::@10/(word) mul16u::a#2 )
+  [176] (word) mul16u::b#2 ← phi( mul16s/(word~) mul16u::b#3 mul16u_compare::@10/(word) mul16u::b#1 )
   [177] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#2
   to:mul16u::@1
-mul16u::@1: scope:[mul16u]  from mul16u mul16u::@8
-  [178] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@8/(dword) mul16u::mb#1 )
-  [178] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@8/(dword) mul16u::res#6 )
-  [178] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@8/(word) mul16u::a#0 )
+mul16u::@1: scope:[mul16u]  from mul16u mul16u::@4
+  [178] (dword) mul16u::mb#2 ← phi( mul16u/(dword) mul16u::mb#0 mul16u::@4/(dword) mul16u::mb#1 )
+  [178] (dword) mul16u::res#2 ← phi( mul16u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u::@4/(dword) mul16u::res#6 )
+  [178] (word) mul16u::a#3 ← phi( mul16u/(word) mul16u::a#6 mul16u::@4/(word) mul16u::a#0 )
   [179] if((word) mul16u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2
   to:mul16u::@return
 mul16u::@return: scope:[mul16u]  from mul16u::@1
@@ -3785,50 +3819,50 @@ mul16u::@return: scope:[mul16u]  from mul16u::@1
   to:@return
 mul16u::@2: scope:[mul16u]  from mul16u::@1
   [181] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [182] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8
-  to:mul16u::@6
-mul16u::@6: scope:[mul16u]  from mul16u::@2
+  [182] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4
+  to:mul16u::@3
+mul16u::@3: scope:[mul16u]  from mul16u::@2
   [183] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2
-  to:mul16u::@8
-mul16u::@8: scope:[mul16u]  from mul16u::@2 mul16u::@6
-  [184] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@6/(dword) mul16u::res#1 )
+  to:mul16u::@4
+mul16u::@4: scope:[mul16u]  from mul16u::@2 mul16u::@3
+  [184] (dword) mul16u::res#6 ← phi( mul16u::@2/(dword) mul16u::res#2 mul16u::@3/(dword) mul16u::res#1 )
   [185] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [186] (dword) mul16u::mb#1 ← (dword) mul16u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul16u::@1
 muls16s: scope:[muls16s]  from mul16s_compare::@2
-  [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@10
-  to:muls16s::@4
-muls16s::@4: scope:[muls16s]  from muls16s
-  [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@3
-  to:muls16s::@8
-muls16s::@8: scope:[muls16s]  from muls16s::@4 muls16s::@8
-  [189] (signed word) muls16s::j#2 ← phi( muls16s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@8/(signed word) muls16s::j#1 )
-  [189] (signed dword) muls16s::m#3 ← phi( muls16s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@8/(signed dword) muls16s::m#1 )
+  [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@4
+  to:muls16s::@2
+muls16s::@2: scope:[muls16s]  from muls16s
+  [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@1
+  to:muls16s::@3
+muls16s::@3: scope:[muls16s]  from muls16s::@2 muls16s::@3
+  [189] (signed word) muls16s::j#2 ← phi( muls16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@3/(signed word) muls16s::j#1 )
+  [189] (signed dword) muls16s::m#3 ← phi( muls16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@3/(signed dword) muls16s::m#1 )
   [190] (signed dword) muls16s::m#1 ← (signed dword) muls16s::m#3 + (signed word) muls16s::b#0
   [191] (signed word) muls16s::j#1 ← ++ (signed word) muls16s::j#2
-  [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@8
-  to:muls16s::@3
-muls16s::@3: scope:[muls16s]  from muls16s::@10 muls16s::@4 muls16s::@8
-  [193] (signed dword) muls16s::return#0 ← phi( muls16s::@10/(signed dword) muls16s::m#2 muls16s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@8/(signed dword) muls16s::m#1 )
+  [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@3
+  to:muls16s::@1
+muls16s::@1: scope:[muls16s]  from muls16s::@2 muls16s::@3 muls16s::@4
+  [193] (signed dword) muls16s::return#0 ← phi( muls16s::@4/(signed dword) muls16s::m#2 muls16s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@3/(signed dword) muls16s::m#1 )
   to:muls16s::@return
-muls16s::@return: scope:[muls16s]  from muls16s::@3
+muls16s::@return: scope:[muls16s]  from muls16s::@1
   [194] return 
   to:@return
-muls16s::@10: scope:[muls16s]  from muls16s muls16s::@10
-  [195] (signed word) muls16s::i#2 ← phi( muls16s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@10/(signed word) muls16s::i#1 )
-  [195] (signed dword) muls16s::m#5 ← phi( muls16s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@10/(signed dword) muls16s::m#2 )
+muls16s::@4: scope:[muls16s]  from muls16s muls16s::@4
+  [195] (signed word) muls16s::i#2 ← phi( muls16s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@4/(signed word) muls16s::i#1 )
+  [195] (signed dword) muls16s::m#5 ← phi( muls16s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16s::@4/(signed dword) muls16s::m#2 )
   [196] (signed dword) muls16s::m#2 ← (signed dword) muls16s::m#5 - (signed word) muls16s::b#0
   [197] (signed word) muls16s::i#1 ← -- (signed word) muls16s::i#2
-  [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@10
-  to:muls16s::@3
+  [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@4
+  to:muls16s::@1
 mul16u_compare: scope:[mul16u_compare]  from main::@2
   [199] phi()
   to:mul16u_compare::@1
-mul16u_compare::@1: scope:[mul16u_compare]  from mul16u_compare mul16u_compare::@10
-  [200] (byte) mul16u_compare::i#12 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@10/(byte) mul16u_compare::i#1 )
-  [200] (word) mul16u_compare::b#6 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@10/(word) mul16u_compare::b#1 )
-  [200] (word) mul16u_compare::a#6 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@10/(word) mul16u_compare::a#1 )
-  [200] (byte*) print_char_cursor#139 ← phi( mul16u_compare/((byte*))(word/signed word/dword/signed dword) $400 mul16u_compare::@10/(byte*) print_char_cursor#128 )
+mul16u_compare::@1: scope:[mul16u_compare]  from mul16u_compare mul16u_compare::@8
+  [200] (byte) mul16u_compare::i#12 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@8/(byte) mul16u_compare::i#1 )
+  [200] (word) mul16u_compare::b#6 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@8/(word) mul16u_compare::b#1 )
+  [200] (word) mul16u_compare::a#6 ← phi( mul16u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul16u_compare::@8/(word) mul16u_compare::a#1 )
+  [200] (byte*) print_char_cursor#139 ← phi( mul16u_compare/((byte*))(word/signed word/dword/signed dword) $400 mul16u_compare::@8/(byte*) print_char_cursor#128 )
   [201] call print_str 
   to:mul16u_compare::@2
 mul16u_compare::@2: scope:[mul16u_compare]  from mul16u_compare::@1 mul16u_compare::@5
@@ -3841,37 +3875,37 @@ mul16u_compare::@2: scope:[mul16u_compare]  from mul16u_compare::@1 mul16u_compa
   [206] (word) muls16u::b#0 ← (word) mul16u_compare::b#1
   [207] call muls16u 
   [208] (dword) muls16u::return#2 ← (dword) muls16u::return#0
-  to:mul16u_compare::@13
-mul16u_compare::@13: scope:[mul16u_compare]  from mul16u_compare::@2
+  to:mul16u_compare::@10
+mul16u_compare::@10: scope:[mul16u_compare]  from mul16u_compare::@2
   [209] (dword) mul16u_compare::ms#0 ← (dword) muls16u::return#2
   [210] (word) mul16u::a#2 ← (word) mul16u_compare::a#1
   [211] (word) mul16u::b#1 ← (word) mul16u_compare::b#1
   [212] call mul16u 
   [213] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-  to:mul16u_compare::@14
-mul16u_compare::@14: scope:[mul16u_compare]  from mul16u_compare::@13
+  to:mul16u_compare::@11
+mul16u_compare::@11: scope:[mul16u_compare]  from mul16u_compare::@10
   [214] (dword) mul16u_compare::mn#0 ← (dword) mul16u::return#3
   [215] (word) mulf16u::a#1 ← (word) mul16u_compare::a#1
   [216] (word) mulf16u::b#1 ← (word) mul16u_compare::b#1
   [217] call mulf16u 
   [218] (dword) mulf16u::return#3 ← (dword) mulf16u::return#0
-  to:mul16u_compare::@15
-mul16u_compare::@15: scope:[mul16u_compare]  from mul16u_compare::@14
+  to:mul16u_compare::@12
+mul16u_compare::@12: scope:[mul16u_compare]  from mul16u_compare::@11
   [219] (dword) mul16u_compare::mf#0 ← (dword) mulf16u::return#3
   [220] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mf#0) goto mul16u_compare::@3
   to:mul16u_compare::@6
-mul16u_compare::@6: scope:[mul16u_compare]  from mul16u_compare::@15
+mul16u_compare::@6: scope:[mul16u_compare]  from mul16u_compare::@12
   [221] phi()
   to:mul16u_compare::@3
-mul16u_compare::@3: scope:[mul16u_compare]  from mul16u_compare::@15 mul16u_compare::@6
-  [222] (byte) mul16u_compare::ok#4 ← phi( mul16u_compare::@15/(byte/signed byte/word/signed word/dword/signed dword) 1 mul16u_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@22
+mul16u_compare::@3: scope:[mul16u_compare]  from mul16u_compare::@12 mul16u_compare::@6
+  [222] (byte) mul16u_compare::ok#4 ← phi( mul16u_compare::@12/(byte/signed byte/word/signed word/dword/signed dword) 1 mul16u_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@15
   to:mul16u_compare::@4
-mul16u_compare::@4: scope:[mul16u_compare]  from mul16u_compare::@22 mul16u_compare::@3
-  [224] (byte) mul16u_compare::ok#3 ← phi( mul16u_compare::@22/(byte) mul16u_compare::ok#4 mul16u_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+mul16u_compare::@4: scope:[mul16u_compare]  from mul16u_compare::@15 mul16u_compare::@3
+  [224] (byte) mul16u_compare::ok#3 ← phi( mul16u_compare::@15/(byte) mul16u_compare::ok#4 mul16u_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [225] if((byte) mul16u_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u_compare::@5
-  to:mul16u_compare::@8
-mul16u_compare::@8: scope:[mul16u_compare]  from mul16u_compare::@4
+  to:mul16u_compare::@7
+mul16u_compare::@7: scope:[mul16u_compare]  from mul16u_compare::@4
   [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   [227] (word) mul16u_error::a#0 ← (word) mul16u_compare::a#1
   [228] (word) mul16u_error::b#0 ← (word) mul16u_compare::b#1
@@ -3880,33 +3914,33 @@ mul16u_compare::@8: scope:[mul16u_compare]  from mul16u_compare::@4
   [231] (dword) mul16u_error::mf#0 ← (dword) mul16u_compare::mf#0
   [232] call mul16u_error 
   to:mul16u_compare::@return
-mul16u_compare::@return: scope:[mul16u_compare]  from mul16u_compare::@18 mul16u_compare::@8
+mul16u_compare::@return: scope:[mul16u_compare]  from mul16u_compare::@14 mul16u_compare::@7
   [233] return 
   to:@return
 mul16u_compare::@5: scope:[mul16u_compare]  from mul16u_compare::@4
   [234] (byte) mul16u_compare::j#1 ← ++ (byte) mul16u_compare::j#10
   [235] if((byte) mul16u_compare::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16u_compare::@2
-  to:mul16u_compare::@10
-mul16u_compare::@10: scope:[mul16u_compare]  from mul16u_compare::@5
+  to:mul16u_compare::@8
+mul16u_compare::@8: scope:[mul16u_compare]  from mul16u_compare::@5
   [236] (byte) mul16u_compare::i#1 ← ++ (byte) mul16u_compare::i#12
   [237] if((byte) mul16u_compare::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16u_compare::@1
-  to:mul16u_compare::@11
-mul16u_compare::@11: scope:[mul16u_compare]  from mul16u_compare::@10
+  to:mul16u_compare::@9
+mul16u_compare::@9: scope:[mul16u_compare]  from mul16u_compare::@8
   [238] phi()
   [239] call print_ln 
-  to:mul16u_compare::@17
-mul16u_compare::@17: scope:[mul16u_compare]  from mul16u_compare::@11
+  to:mul16u_compare::@13
+mul16u_compare::@13: scope:[mul16u_compare]  from mul16u_compare::@9
   [240] (byte*~) print_char_cursor#192 ← (byte*) print_line_cursor#1
   [241] call print_str 
-  to:mul16u_compare::@18
-mul16u_compare::@18: scope:[mul16u_compare]  from mul16u_compare::@17
+  to:mul16u_compare::@14
+mul16u_compare::@14: scope:[mul16u_compare]  from mul16u_compare::@13
   [242] phi()
   [243] call print_ln 
   to:mul16u_compare::@return
-mul16u_compare::@22: scope:[mul16u_compare]  from mul16u_compare::@3
+mul16u_compare::@15: scope:[mul16u_compare]  from mul16u_compare::@3
   [244] phi()
   to:mul16u_compare::@4
-mul16u_error: scope:[mul16u_error]  from mul16u_compare::@8
+mul16u_error: scope:[mul16u_error]  from mul16u_compare::@7
   [245] phi()
   [246] call print_str 
   to:mul16u_error::@1
@@ -3955,16 +3989,16 @@ mul16u_error::@return: scope:[mul16u_error]  from mul16u_error::@10
   to:@return
 muls16u: scope:[muls16u]  from mul16u_compare::@2
   [268] if((word) muls16u::a#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16u::@1
-  to:muls16u::@4
-muls16u::@4: scope:[muls16u]  from muls16u muls16u::@4
-  [269] (word) muls16u::i#2 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@4/(word) muls16u::i#1 )
-  [269] (dword) muls16u::m#3 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@4/(dword) muls16u::m#1 )
+  to:muls16u::@2
+muls16u::@2: scope:[muls16u]  from muls16u muls16u::@2
+  [269] (word) muls16u::i#2 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@2/(word) muls16u::i#1 )
+  [269] (dword) muls16u::m#3 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@2/(dword) muls16u::m#1 )
   [270] (dword) muls16u::m#1 ← (dword) muls16u::m#3 + (word) muls16u::b#0
   [271] (word) muls16u::i#1 ← ++ (word) muls16u::i#2
-  [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@4
+  [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@2
   to:muls16u::@1
-muls16u::@1: scope:[muls16u]  from muls16u muls16u::@4
-  [273] (dword) muls16u::return#0 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@4/(dword) muls16u::m#1 )
+muls16u::@1: scope:[muls16u]  from muls16u muls16u::@2
+  [273] (dword) muls16u::return#0 ← phi( muls16u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls16u::@2/(dword) muls16u::m#1 )
   to:muls16u::@return
 muls16u::@return: scope:[muls16u]  from muls16u::@1
   [274] return 
@@ -3997,33 +4031,33 @@ mulf_init::@2: scope:[mulf_init]  from mulf_init::@1 mulf_init::@3
   [288] (word) mulf_init::sqr#1 ← (word) mulf_init::sqr#3 + (byte) mulf_init::x_2#2
   [289] (byte*) mulf_init::sqr1_lo#1 ← ++ (byte*) mulf_init::sqr1_lo#2
   [290] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $200) goto mulf_init::@1
-  to:mulf_init::@5
-mulf_init::@5: scope:[mulf_init]  from mulf_init::@2 mulf_init::@6
-  [291] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@6/(byte) mulf_init::dir#3 )
-  [291] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@6/(byte*) mulf_init::sqr2_hi#1 )
-  [291] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@6/(byte*) mulf_init::sqr2_lo#1 )
-  [291] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@6/(byte) mulf_init::x_255#1 )
+  to:mulf_init::@4
+mulf_init::@4: scope:[mulf_init]  from mulf_init::@2 mulf_init::@5
+  [291] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@5/(byte) mulf_init::dir#3 )
+  [291] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@5/(byte*) mulf_init::sqr2_hi#1 )
+  [291] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@5/(byte*) mulf_init::sqr2_lo#1 )
+  [291] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@5/(byte) mulf_init::x_255#1 )
   [292] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2)
   [293] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2)
   [294] (byte*) mulf_init::sqr2_hi#1 ← ++ (byte*) mulf_init::sqr2_hi#2
   [295] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2
-  [296] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12
-  to:mulf_init::@6
-mulf_init::@6: scope:[mulf_init]  from mulf_init::@12 mulf_init::@5
-  [297] (byte) mulf_init::dir#3 ← phi( mulf_init::@12/(byte) mulf_init::dir#2 mulf_init::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [296] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7
+  to:mulf_init::@5
+mulf_init::@5: scope:[mulf_init]  from mulf_init::@4 mulf_init::@7
+  [297] (byte) mulf_init::dir#3 ← phi( mulf_init::@7/(byte) mulf_init::dir#2 mulf_init::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [298] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2
-  [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5
-  to:mulf_init::@8
-mulf_init::@8: scope:[mulf_init]  from mulf_init::@6
+  [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4
+  to:mulf_init::@6
+mulf_init::@6: scope:[mulf_init]  from mulf_init::@5
   [300] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100)
   [301] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100)
   to:mulf_init::@return
-mulf_init::@return: scope:[mulf_init]  from mulf_init::@8
+mulf_init::@return: scope:[mulf_init]  from mulf_init::@6
   [302] return 
   to:@return
-mulf_init::@12: scope:[mulf_init]  from mulf_init::@5
+mulf_init::@7: scope:[mulf_init]  from mulf_init::@4
   [303] phi()
-  to:mulf_init::@6
+  to:mulf_init::@5
 print_cls: scope:[print_cls]  from main
   [304] phi()
   to:print_cls::@1
@@ -4622,15 +4656,15 @@ INITIAL ASM
   .label print_line_cursor = 9
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-b40_from_bbegin:
-  jmp b40
-//SEG5 @40
-b40:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @40 to @end [phi:@40->@end]
-bend_from_b40:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -4707,12 +4741,12 @@ mul16s_compare: {
     sta a+1
   //SEG32 [14] phi (byte*) print_char_cursor#143 = (byte*~) print_char_cursor#176 [phi:mul16s_compare->mul16s_compare::@1#3] -- register_copy 
     jmp b1
-  //SEG33 [14] phi from mul16s_compare::@10 to mul16s_compare::@1 [phi:mul16s_compare::@10->mul16s_compare::@1]
-  b1_from_b10:
-  //SEG34 [14] phi (byte) mul16s_compare::i#12 = (byte) mul16s_compare::i#1 [phi:mul16s_compare::@10->mul16s_compare::@1#0] -- register_copy 
-  //SEG35 [14] phi (signed word) mul16s_compare::b#6 = (signed word) mul16s_compare::b#1 [phi:mul16s_compare::@10->mul16s_compare::@1#1] -- register_copy 
-  //SEG36 [14] phi (signed word) mul16s_compare::a#6 = (signed word) mul16s_compare::a#1 [phi:mul16s_compare::@10->mul16s_compare::@1#2] -- register_copy 
-  //SEG37 [14] phi (byte*) print_char_cursor#143 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@10->mul16s_compare::@1#3] -- register_copy 
+  //SEG33 [14] phi from mul16s_compare::@8 to mul16s_compare::@1 [phi:mul16s_compare::@8->mul16s_compare::@1]
+  b1_from_b8:
+  //SEG34 [14] phi (byte) mul16s_compare::i#12 = (byte) mul16s_compare::i#1 [phi:mul16s_compare::@8->mul16s_compare::@1#0] -- register_copy 
+  //SEG35 [14] phi (signed word) mul16s_compare::b#6 = (signed word) mul16s_compare::b#1 [phi:mul16s_compare::@8->mul16s_compare::@1#1] -- register_copy 
+  //SEG36 [14] phi (signed word) mul16s_compare::a#6 = (signed word) mul16s_compare::a#1 [phi:mul16s_compare::@8->mul16s_compare::@1#2] -- register_copy 
+  //SEG37 [14] phi (byte*) print_char_cursor#143 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@8->mul16s_compare::@1#3] -- register_copy 
     jmp b1
   //SEG38 mul16s_compare::@1
   b1:
@@ -4779,9 +4813,9 @@ mul16s_compare: {
     sta muls16s.return_2+2
     lda muls16s.return+3
     sta muls16s.return_2+3
-    jmp b13
-  //SEG58 mul16s_compare::@13
-  b13:
+    jmp b10
+  //SEG58 mul16s_compare::@10
+  b10:
   //SEG59 [23] (signed dword) mul16s_compare::ms#0 ← (signed dword) muls16s::return#2 -- vdsz1=vdsz2 
     lda muls16s.return_2
     sta ms
@@ -4812,9 +4846,9 @@ mul16s_compare: {
     sta mul16s.return_2+2
     lda mul16s.return+3
     sta mul16s.return_2+3
-    jmp b14
-  //SEG64 mul16s_compare::@14
-  b14:
+    jmp b11
+  //SEG64 mul16s_compare::@11
+  b11:
   //SEG65 [28] (signed dword) mul16s_compare::mn#0 ← (signed dword) mul16s::return#2 -- vdsz1=vdsz2 
     lda mul16s.return_2
     sta mn
@@ -4845,9 +4879,9 @@ mul16s_compare: {
     sta mulf16s.return_2+2
     lda mulf16s.return+3
     sta mulf16s.return_2+3
-    jmp b15
-  //SEG70 mul16s_compare::@15
-  b15:
+    jmp b12
+  //SEG70 mul16s_compare::@12
+  b12:
   //SEG71 [33] (signed dword) mul16s_compare::mf#0 ← (signed dword) mulf16s::return#2 -- vdsz1=vdsz2 
     lda mulf16s.return_2
     sta mf
@@ -4869,10 +4903,10 @@ mul16s_compare: {
     bne !+
     lda ms+3
     cmp mf+3
-    beq b3_from_b15
+    beq b3_from_b12
   !:
-  //SEG73 [35] phi from mul16s_compare::@15 to mul16s_compare::@6 [phi:mul16s_compare::@15->mul16s_compare::@6]
-  b6_from_b15:
+  //SEG73 [35] phi from mul16s_compare::@12 to mul16s_compare::@6 [phi:mul16s_compare::@12->mul16s_compare::@6]
+  b6_from_b12:
     jmp b6
   //SEG74 mul16s_compare::@6
   b6:
@@ -4882,15 +4916,15 @@ mul16s_compare: {
     lda #0
     sta ok
     jmp b3
-  //SEG77 [36] phi from mul16s_compare::@15 to mul16s_compare::@3 [phi:mul16s_compare::@15->mul16s_compare::@3]
-  b3_from_b15:
-  //SEG78 [36] phi (byte) mul16s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16s_compare::@15->mul16s_compare::@3#0] -- vbuz1=vbuc1 
+  //SEG77 [36] phi from mul16s_compare::@12 to mul16s_compare::@3 [phi:mul16s_compare::@12->mul16s_compare::@3]
+  b3_from_b12:
+  //SEG78 [36] phi (byte) mul16s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16s_compare::@12->mul16s_compare::@3#0] -- vbuz1=vbuc1 
     lda #1
     sta ok
     jmp b3
   //SEG79 mul16s_compare::@3
   b3:
-  //SEG80 [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@22 -- vdsz1_eq_vdsz2_then_la1 
+  //SEG80 [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@15 -- vdsz1_eq_vdsz2_then_la1 
     lda ms
     cmp mn
     bne !+
@@ -4902,7 +4936,7 @@ mul16s_compare: {
     bne !+
     lda ms+3
     cmp mn+3
-    beq b22_from_b3
+    beq b15_from_b3
   !:
   //SEG81 [38] phi from mul16s_compare::@3 to mul16s_compare::@4 [phi:mul16s_compare::@3->mul16s_compare::@4]
   b4_from_b3:
@@ -4916,9 +4950,9 @@ mul16s_compare: {
     lda ok
     cmp #0
     bne b5
-    jmp b8
-  //SEG85 mul16s_compare::@8
-  b8:
+    jmp b7
+  //SEG85 mul16s_compare::@7
+  b7:
   //SEG86 [40] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -4960,8 +4994,8 @@ mul16s_compare: {
     lda mf+3
     sta mul16s_error.mf+3
   //SEG92 [46] call mul16s_error 
-  //SEG93 [71] phi from mul16s_compare::@8 to mul16s_error [phi:mul16s_compare::@8->mul16s_error]
-  mul16s_error_from_b8:
+  //SEG93 [71] phi from mul16s_compare::@7 to mul16s_error [phi:mul16s_compare::@7->mul16s_error]
+  mul16s_error_from_b7:
     jsr mul16s_error
     jmp breturn
   //SEG94 mul16s_compare::@return
@@ -4976,64 +5010,64 @@ mul16s_compare: {
     lda #$10
     cmp j
     bne b2_from_b5
-    jmp b10
-  //SEG99 mul16s_compare::@10
-  b10:
+    jmp b8
+  //SEG99 mul16s_compare::@8
+  b8:
   //SEG100 [50] (byte) mul16s_compare::i#1 ← ++ (byte) mul16s_compare::i#12 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG101 [51] if((byte) mul16s_compare::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16s_compare::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$10
     cmp i
-    bne b1_from_b10
-  //SEG102 [52] phi from mul16s_compare::@10 to mul16s_compare::@11 [phi:mul16s_compare::@10->mul16s_compare::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG103 mul16s_compare::@11
-  b11:
+    bne b1_from_b8
+  //SEG102 [52] phi from mul16s_compare::@8 to mul16s_compare::@9 [phi:mul16s_compare::@8->mul16s_compare::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG103 mul16s_compare::@9
+  b9:
   //SEG104 [53] call print_ln 
-  //SEG105 [59] phi from mul16s_compare::@11 to print_ln [phi:mul16s_compare::@11->print_ln]
-  print_ln_from_b11:
-  //SEG106 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@11->print_ln#0] -- register_copy 
-  //SEG107 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@11->print_ln#1] -- register_copy 
+  //SEG105 [59] phi from mul16s_compare::@9 to print_ln [phi:mul16s_compare::@9->print_ln]
+  print_ln_from_b9:
+  //SEG106 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@9->print_ln#0] -- register_copy 
+  //SEG107 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@9->print_ln#1] -- register_copy 
     jsr print_ln
-    jmp b17
-  //SEG108 mul16s_compare::@17
-  b17:
+    jmp b13
+  //SEG108 mul16s_compare::@13
+  b13:
   //SEG109 [54] (byte*~) print_char_cursor#185 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG110 [55] call print_str 
-  //SEG111 [64] phi from mul16s_compare::@17 to print_str [phi:mul16s_compare::@17->print_str]
-  print_str_from_b17:
-  //SEG112 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#185 [phi:mul16s_compare::@17->print_str#0] -- register_copy 
-  //SEG113 [64] phi (byte*) print_str::str#17 = (const string) mul16s_compare::str1 [phi:mul16s_compare::@17->print_str#1] -- pbuz1=pbuc1 
+  //SEG111 [64] phi from mul16s_compare::@13 to print_str [phi:mul16s_compare::@13->print_str]
+  print_str_from_b13:
+  //SEG112 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#185 [phi:mul16s_compare::@13->print_str#0] -- register_copy 
+  //SEG113 [64] phi (byte*) print_str::str#17 = (const string) mul16s_compare::str1 [phi:mul16s_compare::@13->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG114 [56] phi from mul16s_compare::@17 to mul16s_compare::@18 [phi:mul16s_compare::@17->mul16s_compare::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG115 mul16s_compare::@18
-  b18:
+  //SEG114 [56] phi from mul16s_compare::@13 to mul16s_compare::@14 [phi:mul16s_compare::@13->mul16s_compare::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG115 mul16s_compare::@14
+  b14:
   //SEG116 [57] call print_ln 
-  //SEG117 [59] phi from mul16s_compare::@18 to print_ln [phi:mul16s_compare::@18->print_ln]
-  print_ln_from_b18:
-  //SEG118 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@18->print_ln#0] -- register_copy 
-  //SEG119 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@18->print_ln#1] -- register_copy 
+  //SEG117 [59] phi from mul16s_compare::@14 to print_ln [phi:mul16s_compare::@14->print_ln]
+  print_ln_from_b14:
+  //SEG118 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@14->print_ln#0] -- register_copy 
+  //SEG119 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@14->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG120 [58] phi from mul16s_compare::@3 to mul16s_compare::@22 [phi:mul16s_compare::@3->mul16s_compare::@22]
-  b22_from_b3:
-    jmp b22
-  //SEG121 mul16s_compare::@22
-  b22:
-  //SEG122 [38] phi from mul16s_compare::@22 to mul16s_compare::@4 [phi:mul16s_compare::@22->mul16s_compare::@4]
-  b4_from_b22:
-  //SEG123 [38] phi (byte) mul16s_compare::ok#3 = (byte) mul16s_compare::ok#4 [phi:mul16s_compare::@22->mul16s_compare::@4#0] -- register_copy 
+  //SEG120 [58] phi from mul16s_compare::@3 to mul16s_compare::@15 [phi:mul16s_compare::@3->mul16s_compare::@15]
+  b15_from_b3:
+    jmp b15
+  //SEG121 mul16s_compare::@15
+  b15:
+  //SEG122 [38] phi from mul16s_compare::@15 to mul16s_compare::@4 [phi:mul16s_compare::@15->mul16s_compare::@4]
+  b4_from_b15:
+  //SEG123 [38] phi (byte) mul16s_compare::ok#3 = (byte) mul16s_compare::ok#4 [phi:mul16s_compare::@15->mul16s_compare::@4#0] -- register_copy 
     jmp b4
     str1: .text "signed word multiply results match!@"
 }
@@ -5306,9 +5340,9 @@ print_sdword: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b4
-  //SEG214 print_sdword::@4
-  b4:
+    jmp b3
+  //SEG214 print_sdword::@3
+  b3:
   //SEG215 [98] (signed dword) print_sdword::dw#0 ← - (signed dword) print_sdword::dw#4 -- vdsz1=_neg_vdsz1 
     sec
     lda dw
@@ -5327,11 +5361,11 @@ print_sdword: {
     eor #$ff
     adc #0
     sta dw+3
-  //SEG216 [99] phi from print_sdword print_sdword::@4 to print_sdword::@1 [phi:print_sdword/print_sdword::@4->print_sdword::@1]
+  //SEG216 [99] phi from print_sdword print_sdword::@3 to print_sdword::@1 [phi:print_sdword/print_sdword::@3->print_sdword::@1]
   b1_from_print_sdword:
-  b1_from_b4:
-  //SEG217 [99] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#128 [phi:print_sdword/print_sdword::@4->print_sdword::@1#0] -- register_copy 
-  //SEG218 [99] phi (signed dword) print_sdword::dw#5 = (signed dword) print_sdword::dw#4 [phi:print_sdword/print_sdword::@4->print_sdword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG217 [99] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#128 [phi:print_sdword/print_sdword::@3->print_sdword::@1#0] -- register_copy 
+  //SEG218 [99] phi (signed dword) print_sdword::dw#5 = (signed dword) print_sdword::dw#4 [phi:print_sdword/print_sdword::@3->print_sdword::@1#1] -- register_copy 
     jmp b1
   //SEG219 print_sdword::@1
   b1:
@@ -5512,9 +5546,9 @@ print_sword: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b4
-  //SEG284 print_sword::@4
-  b4:
+    jmp b3
+  //SEG284 print_sword::@3
+  b3:
   //SEG285 [131] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -5525,11 +5559,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG286 [132] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG286 [132] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG287 [132] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#128 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG288 [132] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG287 [132] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#128 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG288 [132] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG289 print_sword::@1
   b1:
@@ -5589,9 +5623,9 @@ mulf16s: {
     sta mulf16u.return_2+2
     lda mulf16u.return+3
     sta mulf16u.return_2+3
-    jmp b6
-  //SEG305 mulf16s::@6
-  b6:
+    jmp b5
+  //SEG305 mulf16s::@5
+  b5:
   //SEG306 [140] (dword) mulf16s::m#0 ← (dword) mulf16u::return#2 -- vduz1=vduz2 
     lda mulf16u.return_2
     sta m
@@ -5603,7 +5637,7 @@ mulf16s: {
     sta m+3
   //SEG307 [141] if((signed word) mulf16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
-    bpl b1_from_b6
+    bpl b1_from_b5
     jmp b3
   //SEG308 mulf16s::@3
   b3:
@@ -5625,10 +5659,10 @@ mulf16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG312 [145] phi from mulf16s::@3 mulf16s::@6 to mulf16s::@1 [phi:mulf16s::@3/mulf16s::@6->mulf16s::@1]
+  //SEG312 [145] phi from mulf16s::@3 mulf16s::@5 to mulf16s::@1 [phi:mulf16s::@3/mulf16s::@5->mulf16s::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG313 [145] phi (dword) mulf16s::m#5 = (dword) mulf16s::m#1 [phi:mulf16s::@3/mulf16s::@6->mulf16s::@1#0] -- register_copy 
+  b1_from_b5:
+  //SEG313 [145] phi (dword) mulf16s::m#5 = (dword) mulf16s::m#1 [phi:mulf16s::@3/mulf16s::@5->mulf16s::@1#0] -- register_copy 
     jmp b1
   //SEG314 mulf16s::@1
   b1:
@@ -5848,9 +5882,9 @@ mul16s: {
     sta mul16u.return+2
     lda mul16u.res+3
     sta mul16u.return+3
-    jmp b6
-  //SEG341 mul16s::@6
-  b6:
+    jmp b5
+  //SEG341 mul16s::@5
+  b5:
   //SEG342 [163] (dword) mul16s::m#0 ← (dword) mul16u::return#2 -- vduz1=vduz2 
     lda mul16u.return
     sta m
@@ -5862,7 +5896,7 @@ mul16s: {
     sta m+3
   //SEG343 [164] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
-    bpl b1_from_b6
+    bpl b1_from_b5
     jmp b3
   //SEG344 mul16s::@3
   b3:
@@ -5884,10 +5918,10 @@ mul16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG348 [168] phi from mul16s::@3 mul16s::@6 to mul16s::@1 [phi:mul16s::@3/mul16s::@6->mul16s::@1]
+  //SEG348 [168] phi from mul16s::@3 mul16s::@5 to mul16s::@1 [phi:mul16s::@3/mul16s::@5->mul16s::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG349 [168] phi (dword) mul16s::m#5 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@6->mul16s::@1#0] -- register_copy 
+  b1_from_b5:
+  //SEG349 [168] phi (dword) mul16s::m#5 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@5->mul16s::@1#0] -- register_copy 
     jmp b1
   //SEG350 mul16s::@1
   b1:
@@ -5986,13 +6020,13 @@ mul16u: {
     lda a
     and #1
     sta _1
-  //SEG374 [182] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG374 [182] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG375 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG375 mul16u::@3
+  b3:
   //SEG376 [183] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -6007,13 +6041,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG377 [184] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG378 [184] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG379 mul16u::@8
-  b8:
+  //SEG377 [184] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG378 [184] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG379 mul16u::@4
+  b4:
   //SEG380 [185] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -6023,11 +6057,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG382 [178] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG383 [178] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG384 [178] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG385 [178] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG382 [178] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG383 [178] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG384 [178] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG385 [178] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG386 muls16s
@@ -6042,41 +6076,41 @@ muls16s: {
     .label a = $5a
     .label b = $5c
     .label return_2 = $5e
-  //SEG387 [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@10 -- vwsz1_lt_0_then_la1 
+  //SEG387 [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@4 -- vwsz1_lt_0_then_la1 
     lda a+1
-    bmi b10_from_muls16s
-    jmp b4
-  //SEG388 muls16s::@4
-  b4:
-  //SEG389 [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@3 -- vwsz1_le_0_then_la1 
+    bmi b4_from_muls16s
+    jmp b2
+  //SEG388 muls16s::@2
+  b2:
+  //SEG389 [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@1 -- vwsz1_le_0_then_la1 
     lda a+1
-    bmi b3_from_b4
+    bmi b1_from_b2
     bne !+
     lda a
-    beq b3_from_b4
+    beq b1_from_b2
   !:
-  //SEG390 [189] phi from muls16s::@4 to muls16s::@8 [phi:muls16s::@4->muls16s::@8]
-  b8_from_b4:
-  //SEG391 [189] phi (signed word) muls16s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@4->muls16s::@8#0] -- vwsz1=vbuc1 
+  //SEG390 [189] phi from muls16s::@2 to muls16s::@3 [phi:muls16s::@2->muls16s::@3]
+  b3_from_b2:
+  //SEG391 [189] phi (signed word) muls16s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@2->muls16s::@3#0] -- vwsz1=vbuc1 
     lda #0
     sta j
     lda #0
     sta j+1
-  //SEG392 [189] phi (signed dword) muls16s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@4->muls16s::@8#1] -- vdsz1=vbsc1 
+  //SEG392 [189] phi (signed dword) muls16s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@2->muls16s::@3#1] -- vdsz1=vbsc1 
     lda #0
     sta m
     lda #0
     sta m+1
     sta m+2
     sta m+3
-    jmp b8
-  //SEG393 [189] phi from muls16s::@8 to muls16s::@8 [phi:muls16s::@8->muls16s::@8]
-  b8_from_b8:
-  //SEG394 [189] phi (signed word) muls16s::j#2 = (signed word) muls16s::j#1 [phi:muls16s::@8->muls16s::@8#0] -- register_copy 
-  //SEG395 [189] phi (signed dword) muls16s::m#3 = (signed dword) muls16s::m#1 [phi:muls16s::@8->muls16s::@8#1] -- register_copy 
-    jmp b8
-  //SEG396 muls16s::@8
-  b8:
+    jmp b3
+  //SEG393 [189] phi from muls16s::@3 to muls16s::@3 [phi:muls16s::@3->muls16s::@3]
+  b3_from_b3:
+  //SEG394 [189] phi (signed word) muls16s::j#2 = (signed word) muls16s::j#1 [phi:muls16s::@3->muls16s::@3#0] -- register_copy 
+  //SEG395 [189] phi (signed dword) muls16s::m#3 = (signed dword) muls16s::m#1 [phi:muls16s::@3->muls16s::@3#1] -- register_copy 
+    jmp b3
+  //SEG396 muls16s::@3
+  b3:
   //SEG397 [190] (signed dword) muls16s::m#1 ← (signed dword) muls16s::m#3 + (signed word) muls16s::b#0 -- vdsz1=vdsz1_plus_vwsz2 
     lda b+1
     ora #$7f
@@ -6102,57 +6136,57 @@ muls16s: {
     bne !+
     inc j+1
   !:
-  //SEG399 [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@8 -- vwsz1_neq_vwsz2_then_la1 
+  //SEG399 [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@3 -- vwsz1_neq_vwsz2_then_la1 
     lda j+1
     cmp a+1
-    bne b8_from_b8
+    bne b3_from_b3
     lda j
     cmp a
-    bne b8_from_b8
-  //SEG400 [193] phi from muls16s::@10 muls16s::@8 to muls16s::@3 [phi:muls16s::@10/muls16s::@8->muls16s::@3]
-  b3_from_b10:
-  b3_from_b8:
-  //SEG401 [193] phi (signed dword) muls16s::return#0 = (signed dword) muls16s::m#2 [phi:muls16s::@10/muls16s::@8->muls16s::@3#0] -- register_copy 
-    jmp b3
-  //SEG402 [193] phi from muls16s::@4 to muls16s::@3 [phi:muls16s::@4->muls16s::@3]
-  b3_from_b4:
-  //SEG403 [193] phi (signed dword) muls16s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@4->muls16s::@3#0] -- vdsz1=vbsc1 
+    bne b3_from_b3
+  //SEG400 [193] phi from muls16s::@3 muls16s::@4 to muls16s::@1 [phi:muls16s::@3/muls16s::@4->muls16s::@1]
+  b1_from_b3:
+  b1_from_b4:
+  //SEG401 [193] phi (signed dword) muls16s::return#0 = (signed dword) muls16s::m#1 [phi:muls16s::@3/muls16s::@4->muls16s::@1#0] -- register_copy 
+    jmp b1
+  //SEG402 [193] phi from muls16s::@2 to muls16s::@1 [phi:muls16s::@2->muls16s::@1]
+  b1_from_b2:
+  //SEG403 [193] phi (signed dword) muls16s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@2->muls16s::@1#0] -- vdsz1=vbsc1 
     lda #0
     sta return
     lda #0
     sta return+1
     sta return+2
     sta return+3
-    jmp b3
-  //SEG404 muls16s::@3
-  b3:
+    jmp b1
+  //SEG404 muls16s::@1
+  b1:
     jmp breturn
   //SEG405 muls16s::@return
   breturn:
   //SEG406 [194] return 
     rts
-  //SEG407 [195] phi from muls16s to muls16s::@10 [phi:muls16s->muls16s::@10]
-  b10_from_muls16s:
-  //SEG408 [195] phi (signed word) muls16s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@10#0] -- vwsz1=vbuc1 
+  //SEG407 [195] phi from muls16s to muls16s::@4 [phi:muls16s->muls16s::@4]
+  b4_from_muls16s:
+  //SEG408 [195] phi (signed word) muls16s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@4#0] -- vwsz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG409 [195] phi (signed dword) muls16s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@10#1] -- vdsz1=vbsc1 
+  //SEG409 [195] phi (signed dword) muls16s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@4#1] -- vdsz1=vbsc1 
     lda #0
     sta m
     lda #0
     sta m+1
     sta m+2
     sta m+3
-    jmp b10
-  //SEG410 [195] phi from muls16s::@10 to muls16s::@10 [phi:muls16s::@10->muls16s::@10]
-  b10_from_b10:
-  //SEG411 [195] phi (signed word) muls16s::i#2 = (signed word) muls16s::i#1 [phi:muls16s::@10->muls16s::@10#0] -- register_copy 
-  //SEG412 [195] phi (signed dword) muls16s::m#5 = (signed dword) muls16s::m#2 [phi:muls16s::@10->muls16s::@10#1] -- register_copy 
-    jmp b10
-  //SEG413 muls16s::@10
-  b10:
+    jmp b4
+  //SEG410 [195] phi from muls16s::@4 to muls16s::@4 [phi:muls16s::@4->muls16s::@4]
+  b4_from_b4:
+  //SEG411 [195] phi (signed word) muls16s::i#2 = (signed word) muls16s::i#1 [phi:muls16s::@4->muls16s::@4#0] -- register_copy 
+  //SEG412 [195] phi (signed dword) muls16s::m#5 = (signed dword) muls16s::m#2 [phi:muls16s::@4->muls16s::@4#1] -- register_copy 
+    jmp b4
+  //SEG413 muls16s::@4
+  b4:
   //SEG414 [196] (signed dword) muls16s::m#2 ← (signed dword) muls16s::m#5 - (signed word) muls16s::b#0 -- vdsz1=vdsz1_minus_vwsz2 
     lda b+1
     ora #$7f
@@ -6179,14 +6213,14 @@ muls16s: {
     dec i+1
   !:
     dec i
-  //SEG416 [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@10 -- vwsz1_neq_vwsz2_then_la1 
+  //SEG416 [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@4 -- vwsz1_neq_vwsz2_then_la1 
     lda i+1
     cmp a+1
-    bne b10_from_b10
+    bne b4_from_b4
     lda i
     cmp a
-    bne b10_from_b10
-    jmp b3_from_b10
+    bne b4_from_b4
+    jmp b1_from_b4
 }
 //SEG417 mul16u_compare
 // Perform many possible word multiplications (slow and fast) and compare the results
@@ -6220,12 +6254,12 @@ mul16u_compare: {
     lda #>$400
     sta print_char_cursor+1
     jmp b1
-  //SEG423 [200] phi from mul16u_compare::@10 to mul16u_compare::@1 [phi:mul16u_compare::@10->mul16u_compare::@1]
-  b1_from_b10:
-  //SEG424 [200] phi (byte) mul16u_compare::i#12 = (byte) mul16u_compare::i#1 [phi:mul16u_compare::@10->mul16u_compare::@1#0] -- register_copy 
-  //SEG425 [200] phi (word) mul16u_compare::b#6 = (word) mul16u_compare::b#1 [phi:mul16u_compare::@10->mul16u_compare::@1#1] -- register_copy 
-  //SEG426 [200] phi (word) mul16u_compare::a#6 = (word) mul16u_compare::a#1 [phi:mul16u_compare::@10->mul16u_compare::@1#2] -- register_copy 
-  //SEG427 [200] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@10->mul16u_compare::@1#3] -- register_copy 
+  //SEG423 [200] phi from mul16u_compare::@8 to mul16u_compare::@1 [phi:mul16u_compare::@8->mul16u_compare::@1]
+  b1_from_b8:
+  //SEG424 [200] phi (byte) mul16u_compare::i#12 = (byte) mul16u_compare::i#1 [phi:mul16u_compare::@8->mul16u_compare::@1#0] -- register_copy 
+  //SEG425 [200] phi (word) mul16u_compare::b#6 = (word) mul16u_compare::b#1 [phi:mul16u_compare::@8->mul16u_compare::@1#1] -- register_copy 
+  //SEG426 [200] phi (word) mul16u_compare::a#6 = (word) mul16u_compare::a#1 [phi:mul16u_compare::@8->mul16u_compare::@1#2] -- register_copy 
+  //SEG427 [200] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@8->mul16u_compare::@1#3] -- register_copy 
     jmp b1
   //SEG428 mul16u_compare::@1
   b1:
@@ -6292,9 +6326,9 @@ mul16u_compare: {
     sta muls16u.return_2+2
     lda muls16u.return+3
     sta muls16u.return_2+3
-    jmp b13
-  //SEG448 mul16u_compare::@13
-  b13:
+    jmp b10
+  //SEG448 mul16u_compare::@10
+  b10:
   //SEG449 [209] (dword) mul16u_compare::ms#0 ← (dword) muls16u::return#2 -- vduz1=vduz2 
     lda muls16u.return_2
     sta ms
@@ -6315,10 +6349,10 @@ mul16u_compare: {
     lda b+1
     sta mul16u.b+1
   //SEG452 [212] call mul16u 
-  //SEG453 [176] phi from mul16u_compare::@13 to mul16u [phi:mul16u_compare::@13->mul16u]
-  mul16u_from_b13:
-  //SEG454 [176] phi (word) mul16u::a#6 = (word) mul16u::a#2 [phi:mul16u_compare::@13->mul16u#0] -- register_copy 
-  //SEG455 [176] phi (word) mul16u::b#2 = (word) mul16u::b#1 [phi:mul16u_compare::@13->mul16u#1] -- register_copy 
+  //SEG453 [176] phi from mul16u_compare::@10 to mul16u [phi:mul16u_compare::@10->mul16u]
+  mul16u_from_b10:
+  //SEG454 [176] phi (word) mul16u::a#6 = (word) mul16u::a#2 [phi:mul16u_compare::@10->mul16u#0] -- register_copy 
+  //SEG455 [176] phi (word) mul16u::b#2 = (word) mul16u::b#1 [phi:mul16u_compare::@10->mul16u#1] -- register_copy 
     jsr mul16u
   //SEG456 [213] (dword) mul16u::return#3 ← (dword) mul16u::res#2 -- vduz1=vduz2 
     lda mul16u.res
@@ -6329,9 +6363,9 @@ mul16u_compare: {
     sta mul16u.return_3+2
     lda mul16u.res+3
     sta mul16u.return_3+3
-    jmp b14
-  //SEG457 mul16u_compare::@14
-  b14:
+    jmp b11
+  //SEG457 mul16u_compare::@11
+  b11:
   //SEG458 [214] (dword) mul16u_compare::mn#0 ← (dword) mul16u::return#3 -- vduz1=vduz2 
     lda mul16u.return_3
     sta mn
@@ -6352,10 +6386,10 @@ mul16u_compare: {
     lda b+1
     sta mulf16u.b+1
   //SEG461 [217] call mulf16u 
-  //SEG462 [153] phi from mul16u_compare::@14 to mulf16u [phi:mul16u_compare::@14->mulf16u]
-  mulf16u_from_b14:
-  //SEG463 [153] phi (word) mulf16u::b#2 = (word) mulf16u::b#1 [phi:mul16u_compare::@14->mulf16u#0] -- register_copy 
-  //SEG464 [153] phi (word) mulf16u::a#2 = (word) mulf16u::a#1 [phi:mul16u_compare::@14->mulf16u#1] -- register_copy 
+  //SEG462 [153] phi from mul16u_compare::@11 to mulf16u [phi:mul16u_compare::@11->mulf16u]
+  mulf16u_from_b11:
+  //SEG463 [153] phi (word) mulf16u::b#2 = (word) mulf16u::b#1 [phi:mul16u_compare::@11->mulf16u#0] -- register_copy 
+  //SEG464 [153] phi (word) mulf16u::a#2 = (word) mulf16u::a#1 [phi:mul16u_compare::@11->mulf16u#1] -- register_copy 
     jsr mulf16u
   //SEG465 [218] (dword) mulf16u::return#3 ← (dword) mulf16u::return#0 -- vduz1=vduz2 
     lda mulf16u.return
@@ -6366,9 +6400,9 @@ mul16u_compare: {
     sta mulf16u.return_3+2
     lda mulf16u.return+3
     sta mulf16u.return_3+3
-    jmp b15
-  //SEG466 mul16u_compare::@15
-  b15:
+    jmp b12
+  //SEG466 mul16u_compare::@12
+  b12:
   //SEG467 [219] (dword) mul16u_compare::mf#0 ← (dword) mulf16u::return#3 -- vduz1=vduz2 
     lda mulf16u.return_3
     sta mf
@@ -6390,10 +6424,10 @@ mul16u_compare: {
     bne !+
     lda ms+3
     cmp mf+3
-    beq b3_from_b15
+    beq b3_from_b12
   !:
-  //SEG469 [221] phi from mul16u_compare::@15 to mul16u_compare::@6 [phi:mul16u_compare::@15->mul16u_compare::@6]
-  b6_from_b15:
+  //SEG469 [221] phi from mul16u_compare::@12 to mul16u_compare::@6 [phi:mul16u_compare::@12->mul16u_compare::@6]
+  b6_from_b12:
     jmp b6
   //SEG470 mul16u_compare::@6
   b6:
@@ -6403,15 +6437,15 @@ mul16u_compare: {
     lda #0
     sta ok
     jmp b3
-  //SEG473 [222] phi from mul16u_compare::@15 to mul16u_compare::@3 [phi:mul16u_compare::@15->mul16u_compare::@3]
-  b3_from_b15:
-  //SEG474 [222] phi (byte) mul16u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16u_compare::@15->mul16u_compare::@3#0] -- vbuz1=vbuc1 
+  //SEG473 [222] phi from mul16u_compare::@12 to mul16u_compare::@3 [phi:mul16u_compare::@12->mul16u_compare::@3]
+  b3_from_b12:
+  //SEG474 [222] phi (byte) mul16u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16u_compare::@12->mul16u_compare::@3#0] -- vbuz1=vbuc1 
     lda #1
     sta ok
     jmp b3
   //SEG475 mul16u_compare::@3
   b3:
-  //SEG476 [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@22 -- vduz1_eq_vduz2_then_la1 
+  //SEG476 [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@15 -- vduz1_eq_vduz2_then_la1 
     lda ms
     cmp mn
     bne !+
@@ -6423,7 +6457,7 @@ mul16u_compare: {
     bne !+
     lda ms+3
     cmp mn+3
-    beq b22_from_b3
+    beq b15_from_b3
   !:
   //SEG477 [224] phi from mul16u_compare::@3 to mul16u_compare::@4 [phi:mul16u_compare::@3->mul16u_compare::@4]
   b4_from_b3:
@@ -6437,9 +6471,9 @@ mul16u_compare: {
     lda ok
     cmp #0
     bne b5
-    jmp b8
-  //SEG481 mul16u_compare::@8
-  b8:
+    jmp b7
+  //SEG481 mul16u_compare::@7
+  b7:
   //SEG482 [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -6481,8 +6515,8 @@ mul16u_compare: {
     lda mf+3
     sta mul16u_error.mf+3
   //SEG488 [232] call mul16u_error 
-  //SEG489 [245] phi from mul16u_compare::@8 to mul16u_error [phi:mul16u_compare::@8->mul16u_error]
-  mul16u_error_from_b8:
+  //SEG489 [245] phi from mul16u_compare::@7 to mul16u_error [phi:mul16u_compare::@7->mul16u_error]
+  mul16u_error_from_b7:
     jsr mul16u_error
     jmp breturn
   //SEG490 mul16u_compare::@return
@@ -6497,68 +6531,68 @@ mul16u_compare: {
     lda #$10
     cmp j
     bne b2_from_b5
-    jmp b10
-  //SEG495 mul16u_compare::@10
-  b10:
+    jmp b8
+  //SEG495 mul16u_compare::@8
+  b8:
   //SEG496 [236] (byte) mul16u_compare::i#1 ← ++ (byte) mul16u_compare::i#12 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG497 [237] if((byte) mul16u_compare::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16u_compare::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$10
     cmp i
-    bne b1_from_b10
-  //SEG498 [238] phi from mul16u_compare::@10 to mul16u_compare::@11 [phi:mul16u_compare::@10->mul16u_compare::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG499 mul16u_compare::@11
-  b11:
+    bne b1_from_b8
+  //SEG498 [238] phi from mul16u_compare::@8 to mul16u_compare::@9 [phi:mul16u_compare::@8->mul16u_compare::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG499 mul16u_compare::@9
+  b9:
   //SEG500 [239] call print_ln 
-  //SEG501 [59] phi from mul16u_compare::@11 to print_ln [phi:mul16u_compare::@11->print_ln]
-  print_ln_from_b11:
-  //SEG502 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@11->print_ln#0] -- register_copy 
-  //SEG503 [59] phi (byte*) print_line_cursor#43 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mul16u_compare::@11->print_ln#1] -- pbuz1=pbuc1 
+  //SEG501 [59] phi from mul16u_compare::@9 to print_ln [phi:mul16u_compare::@9->print_ln]
+  print_ln_from_b9:
+  //SEG502 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@9->print_ln#0] -- register_copy 
+  //SEG503 [59] phi (byte*) print_line_cursor#43 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mul16u_compare::@9->print_ln#1] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
     jsr print_ln
-    jmp b17
-  //SEG504 mul16u_compare::@17
-  b17:
+    jmp b13
+  //SEG504 mul16u_compare::@13
+  b13:
   //SEG505 [240] (byte*~) print_char_cursor#192 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG506 [241] call print_str 
-  //SEG507 [64] phi from mul16u_compare::@17 to print_str [phi:mul16u_compare::@17->print_str]
-  print_str_from_b17:
-  //SEG508 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#192 [phi:mul16u_compare::@17->print_str#0] -- register_copy 
-  //SEG509 [64] phi (byte*) print_str::str#17 = (const string) mul16u_compare::str1 [phi:mul16u_compare::@17->print_str#1] -- pbuz1=pbuc1 
+  //SEG507 [64] phi from mul16u_compare::@13 to print_str [phi:mul16u_compare::@13->print_str]
+  print_str_from_b13:
+  //SEG508 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#192 [phi:mul16u_compare::@13->print_str#0] -- register_copy 
+  //SEG509 [64] phi (byte*) print_str::str#17 = (const string) mul16u_compare::str1 [phi:mul16u_compare::@13->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG510 [242] phi from mul16u_compare::@17 to mul16u_compare::@18 [phi:mul16u_compare::@17->mul16u_compare::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG511 mul16u_compare::@18
-  b18:
+  //SEG510 [242] phi from mul16u_compare::@13 to mul16u_compare::@14 [phi:mul16u_compare::@13->mul16u_compare::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG511 mul16u_compare::@14
+  b14:
   //SEG512 [243] call print_ln 
-  //SEG513 [59] phi from mul16u_compare::@18 to print_ln [phi:mul16u_compare::@18->print_ln]
-  print_ln_from_b18:
-  //SEG514 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@18->print_ln#0] -- register_copy 
-  //SEG515 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16u_compare::@18->print_ln#1] -- register_copy 
+  //SEG513 [59] phi from mul16u_compare::@14 to print_ln [phi:mul16u_compare::@14->print_ln]
+  print_ln_from_b14:
+  //SEG514 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@14->print_ln#0] -- register_copy 
+  //SEG515 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16u_compare::@14->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG516 [244] phi from mul16u_compare::@3 to mul16u_compare::@22 [phi:mul16u_compare::@3->mul16u_compare::@22]
-  b22_from_b3:
-    jmp b22
-  //SEG517 mul16u_compare::@22
-  b22:
-  //SEG518 [224] phi from mul16u_compare::@22 to mul16u_compare::@4 [phi:mul16u_compare::@22->mul16u_compare::@4]
-  b4_from_b22:
-  //SEG519 [224] phi (byte) mul16u_compare::ok#3 = (byte) mul16u_compare::ok#4 [phi:mul16u_compare::@22->mul16u_compare::@4#0] -- register_copy 
+  //SEG516 [244] phi from mul16u_compare::@3 to mul16u_compare::@15 [phi:mul16u_compare::@3->mul16u_compare::@15]
+  b15_from_b3:
+    jmp b15
+  //SEG517 mul16u_compare::@15
+  b15:
+  //SEG518 [224] phi from mul16u_compare::@15 to mul16u_compare::@4 [phi:mul16u_compare::@15->mul16u_compare::@4]
+  b4_from_b15:
+  //SEG519 [224] phi (byte) mul16u_compare::ok#3 = (byte) mul16u_compare::ok#4 [phi:mul16u_compare::@15->mul16u_compare::@4#0] -- register_copy 
     jmp b4
     str1: .text "word multiply results match!@"
 }
@@ -6761,28 +6795,28 @@ muls16u: {
     lda a+1
     beq b1_from_muls16u
   !:
-  //SEG589 [269] phi from muls16u to muls16u::@4 [phi:muls16u->muls16u::@4]
-  b4_from_muls16u:
-  //SEG590 [269] phi (word) muls16u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@4#0] -- vwuz1=vbuc1 
+  //SEG589 [269] phi from muls16u to muls16u::@2 [phi:muls16u->muls16u::@2]
+  b2_from_muls16u:
+  //SEG590 [269] phi (word) muls16u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@2#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG591 [269] phi (dword) muls16u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@4#1] -- vduz1=vbuc1 
+  //SEG591 [269] phi (dword) muls16u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@2#1] -- vduz1=vbuc1 
     lda #0
     sta m
     lda #0
     sta m+1
     sta m+2
     sta m+3
-    jmp b4
-  //SEG592 [269] phi from muls16u::@4 to muls16u::@4 [phi:muls16u::@4->muls16u::@4]
-  b4_from_b4:
-  //SEG593 [269] phi (word) muls16u::i#2 = (word) muls16u::i#1 [phi:muls16u::@4->muls16u::@4#0] -- register_copy 
-  //SEG594 [269] phi (dword) muls16u::m#3 = (dword) muls16u::m#1 [phi:muls16u::@4->muls16u::@4#1] -- register_copy 
-    jmp b4
-  //SEG595 muls16u::@4
-  b4:
+    jmp b2
+  //SEG592 [269] phi from muls16u::@2 to muls16u::@2 [phi:muls16u::@2->muls16u::@2]
+  b2_from_b2:
+  //SEG593 [269] phi (word) muls16u::i#2 = (word) muls16u::i#1 [phi:muls16u::@2->muls16u::@2#0] -- register_copy 
+  //SEG594 [269] phi (dword) muls16u::m#3 = (dword) muls16u::m#1 [phi:muls16u::@2->muls16u::@2#1] -- register_copy 
+    jmp b2
+  //SEG595 muls16u::@2
+  b2:
   //SEG596 [270] (dword) muls16u::m#1 ← (dword) muls16u::m#3 + (word) muls16u::b#0 -- vduz1=vduz1_plus_vwuz2 
     lda m
     clc
@@ -6802,16 +6836,16 @@ muls16u: {
     bne !+
     inc i+1
   !:
-  //SEG598 [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@4 -- vwuz1_neq_vwuz2_then_la1 
+  //SEG598 [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@2 -- vwuz1_neq_vwuz2_then_la1 
     lda i+1
     cmp a+1
-    bne b4_from_b4
+    bne b2_from_b2
     lda i
     cmp a
-    bne b4_from_b4
-  //SEG599 [273] phi from muls16u::@4 to muls16u::@1 [phi:muls16u::@4->muls16u::@1]
-  b1_from_b4:
-  //SEG600 [273] phi (dword) muls16u::return#0 = (dword) muls16u::m#1 [phi:muls16u::@4->muls16u::@1#0] -- register_copy 
+    bne b2_from_b2
+  //SEG599 [273] phi from muls16u::@2 to muls16u::@1 [phi:muls16u::@2->muls16u::@1]
+  b1_from_b2:
+  //SEG600 [273] phi (dword) muls16u::return#0 = (dword) muls16u::m#1 [phi:muls16u::@2->muls16u::@1#0] -- register_copy 
     jmp b1
   //SEG601 [273] phi from muls16u to muls16u::@1 [phi:muls16u->muls16u::@1]
   b1_from_muls16u:
@@ -6947,34 +6981,34 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1_from_b2
-  //SEG638 [291] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  b5_from_b2:
-  //SEG639 [291] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG638 [291] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  b4_from_b2:
+  //SEG639 [291] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG640 [291] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG640 [291] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG641 [291] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG641 [291] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG642 [291] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuz1=vbuc1 
+  //SEG642 [291] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuz1=vbuc1 
     lda #-1
     sta x_255
-    jmp b5
-  //SEG643 [291] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  b5_from_b6:
-  //SEG644 [291] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG645 [291] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG646 [291] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG647 [291] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-    jmp b5
-  //SEG648 mulf_init::@5
-  b5:
+    jmp b4
+  //SEG643 [291] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  b4_from_b5:
+  //SEG644 [291] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG645 [291] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG646 [291] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG647 [291] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+    jmp b4
+  //SEG648 mulf_init::@4
+  b4:
   //SEG649 [292] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuz2 
     ldy x_255
     lda mulf_sqr1_lo,y
@@ -6995,33 +7029,33 @@ mulf_init: {
     clc
     adc dir
     sta x_255
-  //SEG653 [296] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuz1_neq_0_then_la1 
+  //SEG653 [296] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuz1_neq_0_then_la1 
     lda x_255
     cmp #0
-    bne b12_from_b5
-  //SEG654 [297] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  b6_from_b5:
-  //SEG655 [297] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b7_from_b4
+  //SEG654 [297] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  b5_from_b4:
+  //SEG655 [297] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-    jmp b6
-  //SEG656 mulf_init::@6
-  b6:
+    jmp b5
+  //SEG656 mulf_init::@5
+  b5:
   //SEG657 [298] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG658 [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG658 [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5_from_b6
+    bne b4_from_b5
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5_from_b6
-    jmp b8
-  //SEG659 mulf_init::@8
-  b8:
+    bne b4_from_b5
+    jmp b6
+  //SEG659 mulf_init::@6
+  b6:
   //SEG660 [300] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -7034,15 +7068,15 @@ mulf_init: {
   breturn:
   //SEG663 [302] return 
     rts
-  //SEG664 [303] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  b12_from_b5:
-    jmp b12
-  //SEG665 mulf_init::@12
-  b12:
-  //SEG666 [297] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  b6_from_b12:
-  //SEG667 [297] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
-    jmp b6
+  //SEG664 [303] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  b7_from_b4:
+    jmp b7
+  //SEG665 mulf_init::@7
+  b7:
+  //SEG666 [297] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  b5_from_b7:
+  //SEG667 [297] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
+    jmp b5
 }
 //SEG668 print_cls
 // Clear the screen. Also resets current line/char cursor.
@@ -7124,7 +7158,7 @@ Statement [30] (signed word) mulf16s::b#0 ← (signed word) mul16s_compare::b#1
 Statement [32] (signed dword) mulf16s::return#2 ← (signed dword) mulf16s::return#0 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mulf16s::return#2 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mulf16s::return#2 ] ) always clobbers reg byte a 
 Statement [33] (signed dword) mul16s_compare::mf#0 ← (signed dword) mulf16s::return#2 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ) always clobbers reg byte a 
 Statement [34] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mf#0) goto mul16s_compare::@3 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ) always clobbers reg byte a 
-Statement [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@22 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_compare::ok#4 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_compare::ok#4 ] ) always clobbers reg byte a 
+Statement [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@15 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_compare::ok#4 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_compare::ok#4 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:8 [ mul16s_compare::ok#3 mul16s_compare::ok#4 ]
 Statement [40] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 [ print_line_cursor#1 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ) always clobbers reg byte a 
 Statement [41] (signed word) mul16s_error::a#0 ← (signed word) mul16s_compare::a#1 [ print_line_cursor#1 print_char_cursor#128 mul16s_compare::b#1 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_error::a#0 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 print_char_cursor#128 mul16s_compare::b#1 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_error::a#0 ] ) always clobbers reg byte a 
@@ -7199,13 +7233,13 @@ Statement [177] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#2 [ mul16u::
 Statement [179] if((word) mul16u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2 [ mul16u::res#2 mul16u::a#3 mul16u::mb#2 ] ( main:2::mul16s_compare:11::mul16s:26::mul16u:161 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s::a#0 mul16s::b#0 mul16u::res#2 mul16u::a#3 mul16u::mb#2 ] main:2::mul16u_compare:9::mul16u:212 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u::res#2 mul16u::a#3 mul16u::mb#2 ] ) always clobbers reg byte a 
 Statement [181] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 [ mul16u::res#2 mul16u::a#3 mul16u::mb#2 mul16u::$1 ] ( main:2::mul16s_compare:11::mul16s:26::mul16u:161 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s::a#0 mul16s::b#0 mul16u::res#2 mul16u::a#3 mul16u::mb#2 mul16u::$1 ] main:2::mul16u_compare:9::mul16u:212 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u::res#2 mul16u::a#3 mul16u::mb#2 mul16u::$1 ] ) always clobbers reg byte a 
 Statement [183] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 [ mul16u::a#3 mul16u::mb#2 mul16u::res#1 ] ( main:2::mul16s_compare:11::mul16s:26::mul16u:161 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s::a#0 mul16s::b#0 mul16u::a#3 mul16u::mb#2 mul16u::res#1 ] main:2::mul16u_compare:9::mul16u:212 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u::a#3 mul16u::mb#2 mul16u::res#1 ] ) always clobbers reg byte a 
-Statement [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@10 [ muls16s::a#0 muls16s::b#0 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 ] ) always clobbers reg byte a 
-Statement [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@3 [ muls16s::a#0 muls16s::b#0 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 ] ) always clobbers reg byte a 
+Statement [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@4 [ muls16s::a#0 muls16s::b#0 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 ] ) always clobbers reg byte a 
+Statement [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@1 [ muls16s::a#0 muls16s::b#0 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 ] ) always clobbers reg byte a 
 Statement [190] (signed dword) muls16s::m#1 ← (signed dword) muls16s::m#3 + (signed word) muls16s::b#0 [ muls16s::a#0 muls16s::b#0 muls16s::j#2 muls16s::m#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::j#2 muls16s::m#1 ] ) always clobbers reg byte a 
-Statement [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@8 [ muls16s::a#0 muls16s::b#0 muls16s::m#1 muls16s::j#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#1 muls16s::j#1 ] ) always clobbers reg byte a 
+Statement [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@3 [ muls16s::a#0 muls16s::b#0 muls16s::m#1 muls16s::j#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#1 muls16s::j#1 ] ) always clobbers reg byte a 
 Statement [196] (signed dword) muls16s::m#2 ← (signed dword) muls16s::m#5 - (signed word) muls16s::b#0 [ muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#2 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#2 ] ) always clobbers reg byte a 
 Statement [197] (signed word) muls16s::i#1 ← -- (signed word) muls16s::i#2 [ muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ) always clobbers reg byte a 
-Statement [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@10 [ muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ) always clobbers reg byte a 
+Statement [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@4 [ muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ) always clobbers reg byte a 
 Statement [203] (word) mul16u_compare::a#1 ← (word) mul16u_compare::a#2 + (word/signed word/dword/signed dword) $d2b [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#2 mul16u_compare::j#10 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#2 mul16u_compare::j#10 ] ) always clobbers reg byte a 
 Statement [204] (word) mul16u_compare::b#1 ← (word) mul16u_compare::b#2 + (word/signed word/dword/signed dword) $ffd [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 ] ) always clobbers reg byte a 
 Statement [205] (word) muls16u::a#0 ← (word) mul16u_compare::a#1 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 ] ) always clobbers reg byte a 
@@ -7221,7 +7255,7 @@ Statement [216] (word) mulf16u::b#1 ← (word) mul16u_compare::b#1 [ print_char_
 Statement [218] (dword) mulf16u::return#3 ← (dword) mulf16u::return#0 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mulf16u::return#3 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mulf16u::return#3 ] ) always clobbers reg byte a 
 Statement [219] (dword) mul16u_compare::mf#0 ← (dword) mulf16u::return#3 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ) always clobbers reg byte a 
 Statement [220] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mf#0) goto mul16u_compare::@3 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ) always clobbers reg byte a 
-Statement [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@22 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_compare::ok#4 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_compare::ok#4 ] ) always clobbers reg byte a 
+Statement [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@15 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_compare::ok#4 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_compare::ok#4 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:67 [ mul16u_compare::ok#3 mul16u_compare::ok#4 ]
 Statement [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 [ print_char_cursor#128 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ) always clobbers reg byte a 
 Statement [227] (word) mul16u_error::a#0 ← (word) mul16u_compare::a#1 [ print_char_cursor#128 mul16u_compare::b#1 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_error::a#0 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::b#1 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_error::a#0 ] ) always clobbers reg byte a 
@@ -7238,7 +7272,7 @@ Statement [259] (dword) print_dword::dw#2 ← (dword) mul16u_error::mn#0 [ print
 Statement [263] (dword) print_dword::dw#3 ← (dword) mul16u_error::mf#0 [ print_char_cursor#128 print_dword::dw#3 ] ( main:2::mul16u_compare:9::mul16u_error:232 [ print_char_cursor#128 print_dword::dw#3 ] ) always clobbers reg byte a 
 Statement [268] if((word) muls16u::a#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16u::@1 [ muls16u::a#0 muls16u::b#0 ] ( main:2::mul16u_compare:9::muls16u:207 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 muls16u::b#0 ] ) always clobbers reg byte a 
 Statement [270] (dword) muls16u::m#1 ← (dword) muls16u::m#3 + (word) muls16u::b#0 [ muls16u::a#0 muls16u::b#0 muls16u::i#2 muls16u::m#1 ] ( main:2::mul16u_compare:9::muls16u:207 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 muls16u::b#0 muls16u::i#2 muls16u::m#1 ] ) always clobbers reg byte a 
-Statement [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@4 [ muls16u::a#0 muls16u::b#0 muls16u::m#1 muls16u::i#1 ] ( main:2::mul16u_compare:9::muls16u:207 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 muls16u::b#0 muls16u::m#1 muls16u::i#1 ] ) always clobbers reg byte a 
+Statement [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@2 [ muls16u::a#0 muls16u::b#0 muls16u::m#1 muls16u::i#1 ] ( main:2::mul16u_compare:9::muls16u:207 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 muls16u::b#0 muls16u::m#1 muls16u::i#1 ] ) always clobbers reg byte a 
 Statement [283] (byte~) mulf_init::$11 ← < (word) mulf_init::sqr#3 [ mulf_init::sqr1_lo#2 mulf_init::sqr1_hi#2 mulf_init::c#1 mulf_init::x_2#2 mulf_init::sqr#3 mulf_init::$11 ] ( main:2::mulf_init:7 [ mulf_init::sqr1_lo#2 mulf_init::sqr1_hi#2 mulf_init::c#1 mulf_init::x_2#2 mulf_init::sqr#3 mulf_init::$11 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:74 [ mulf_init::c#2 mulf_init::c#1 ]
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:79 [ mulf_init::x_2#3 mulf_init::x_2#2 mulf_init::x_2#1 ]
@@ -7256,7 +7290,7 @@ Removing always clobbered register reg byte a as potential for zp ZP_BYTE:87 [ m
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:87 [ mulf_init::dir#2 mulf_init::dir#3 ]
 Statement [293] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:2::mulf_init:7 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [295] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ( main:2::mulf_init:7 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ) always clobbers reg byte a 
-Statement [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:7 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
+Statement [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:7 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
 Statement [300] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:7 [ ] ) always clobbers reg byte a 
 Statement [301] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:7 [ ] ) always clobbers reg byte a 
 Statement [306] *((byte*) print_cls::sc#2) ← (byte) ' ' [ print_cls::sc#2 ] ( main:2::print_cls:5 [ print_cls::sc#2 ] ) always clobbers reg byte a reg byte y 
@@ -7278,7 +7312,7 @@ Statement [30] (signed word) mulf16s::b#0 ← (signed word) mul16s_compare::b#1
 Statement [32] (signed dword) mulf16s::return#2 ← (signed dword) mulf16s::return#0 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mulf16s::return#2 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mulf16s::return#2 ] ) always clobbers reg byte a 
 Statement [33] (signed dword) mul16s_compare::mf#0 ← (signed dword) mulf16s::return#2 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ) always clobbers reg byte a 
 Statement [34] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mf#0) goto mul16s_compare::@3 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ) always clobbers reg byte a 
-Statement [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@22 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_compare::ok#4 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_compare::ok#4 ] ) always clobbers reg byte a 
+Statement [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@15 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_compare::ok#4 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_compare::ok#4 ] ) always clobbers reg byte a 
 Statement [40] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 [ print_line_cursor#1 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 ] ) always clobbers reg byte a 
 Statement [41] (signed word) mul16s_error::a#0 ← (signed word) mul16s_compare::a#1 [ print_line_cursor#1 print_char_cursor#128 mul16s_compare::b#1 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_error::a#0 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 print_char_cursor#128 mul16s_compare::b#1 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_error::a#0 ] ) always clobbers reg byte a 
 Statement [42] (signed word) mul16s_error::b#0 ← (signed word) mul16s_compare::b#1 [ print_line_cursor#1 print_char_cursor#128 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_error::a#0 mul16s_error::b#0 ] ( main:2::mul16s_compare:11 [ print_line_cursor#1 print_char_cursor#128 mul16s_compare::ms#0 mul16s_compare::mn#0 mul16s_compare::mf#0 mul16s_error::a#0 mul16s_error::b#0 ] ) always clobbers reg byte a 
@@ -7343,13 +7377,13 @@ Statement [177] (dword) mul16u::mb#0 ← ((dword)) (word) mul16u::b#2 [ mul16u::
 Statement [179] if((word) mul16u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@2 [ mul16u::res#2 mul16u::a#3 mul16u::mb#2 ] ( main:2::mul16s_compare:11::mul16s:26::mul16u:161 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s::a#0 mul16s::b#0 mul16u::res#2 mul16u::a#3 mul16u::mb#2 ] main:2::mul16u_compare:9::mul16u:212 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u::res#2 mul16u::a#3 mul16u::mb#2 ] ) always clobbers reg byte a 
 Statement [181] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 [ mul16u::res#2 mul16u::a#3 mul16u::mb#2 mul16u::$1 ] ( main:2::mul16s_compare:11::mul16s:26::mul16u:161 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s::a#0 mul16s::b#0 mul16u::res#2 mul16u::a#3 mul16u::mb#2 mul16u::$1 ] main:2::mul16u_compare:9::mul16u:212 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u::res#2 mul16u::a#3 mul16u::mb#2 mul16u::$1 ] ) always clobbers reg byte a 
 Statement [183] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 [ mul16u::a#3 mul16u::mb#2 mul16u::res#1 ] ( main:2::mul16s_compare:11::mul16s:26::mul16u:161 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 mul16s_compare::ms#0 mul16s::a#0 mul16s::b#0 mul16u::a#3 mul16u::mb#2 mul16u::res#1 ] main:2::mul16u_compare:9::mul16u:212 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u::a#3 mul16u::mb#2 mul16u::res#1 ] ) always clobbers reg byte a 
-Statement [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@10 [ muls16s::a#0 muls16s::b#0 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 ] ) always clobbers reg byte a 
-Statement [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@3 [ muls16s::a#0 muls16s::b#0 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 ] ) always clobbers reg byte a 
+Statement [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@4 [ muls16s::a#0 muls16s::b#0 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 ] ) always clobbers reg byte a 
+Statement [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@1 [ muls16s::a#0 muls16s::b#0 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 ] ) always clobbers reg byte a 
 Statement [190] (signed dword) muls16s::m#1 ← (signed dword) muls16s::m#3 + (signed word) muls16s::b#0 [ muls16s::a#0 muls16s::b#0 muls16s::j#2 muls16s::m#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::j#2 muls16s::m#1 ] ) always clobbers reg byte a 
-Statement [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@8 [ muls16s::a#0 muls16s::b#0 muls16s::m#1 muls16s::j#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#1 muls16s::j#1 ] ) always clobbers reg byte a 
+Statement [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@3 [ muls16s::a#0 muls16s::b#0 muls16s::m#1 muls16s::j#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#1 muls16s::j#1 ] ) always clobbers reg byte a 
 Statement [196] (signed dword) muls16s::m#2 ← (signed dword) muls16s::m#5 - (signed word) muls16s::b#0 [ muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#2 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#2 ] ) always clobbers reg byte a 
 Statement [197] (signed word) muls16s::i#1 ← -- (signed word) muls16s::i#2 [ muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ) always clobbers reg byte a 
-Statement [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@10 [ muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ) always clobbers reg byte a 
+Statement [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@4 [ muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ( main:2::mul16s_compare:11::muls16s:21 [ print_line_cursor#1 mul16s_compare::i#12 print_char_cursor#128 mul16s_compare::a#1 mul16s_compare::b#1 mul16s_compare::j#10 muls16s::a#0 muls16s::b#0 muls16s::m#2 muls16s::i#1 ] ) always clobbers reg byte a 
 Statement [203] (word) mul16u_compare::a#1 ← (word) mul16u_compare::a#2 + (word/signed word/dword/signed dword) $d2b [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#2 mul16u_compare::j#10 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#2 mul16u_compare::j#10 ] ) always clobbers reg byte a 
 Statement [204] (word) mul16u_compare::b#1 ← (word) mul16u_compare::b#2 + (word/signed word/dword/signed dword) $ffd [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 ] ) always clobbers reg byte a 
 Statement [205] (word) muls16u::a#0 ← (word) mul16u_compare::a#1 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 ] ) always clobbers reg byte a 
@@ -7365,7 +7399,7 @@ Statement [216] (word) mulf16u::b#1 ← (word) mul16u_compare::b#1 [ print_char_
 Statement [218] (dword) mulf16u::return#3 ← (dword) mulf16u::return#0 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mulf16u::return#3 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mulf16u::return#3 ] ) always clobbers reg byte a 
 Statement [219] (dword) mul16u_compare::mf#0 ← (dword) mulf16u::return#3 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ) always clobbers reg byte a 
 Statement [220] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mf#0) goto mul16u_compare::@3 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ) always clobbers reg byte a 
-Statement [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@22 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_compare::ok#4 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_compare::ok#4 ] ) always clobbers reg byte a 
+Statement [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@15 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_compare::ok#4 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_compare::ok#4 ] ) always clobbers reg byte a 
 Statement [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 [ print_char_cursor#128 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 ] ) always clobbers reg byte a 
 Statement [227] (word) mul16u_error::a#0 ← (word) mul16u_compare::a#1 [ print_char_cursor#128 mul16u_compare::b#1 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_error::a#0 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::b#1 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_error::a#0 ] ) always clobbers reg byte a 
 Statement [228] (word) mul16u_error::b#0 ← (word) mul16u_compare::b#1 [ print_char_cursor#128 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_error::a#0 mul16u_error::b#0 ] ( main:2::mul16u_compare:9 [ print_char_cursor#128 mul16u_compare::ms#0 mul16u_compare::mn#0 mul16u_compare::mf#0 mul16u_error::a#0 mul16u_error::b#0 ] ) always clobbers reg byte a 
@@ -7381,7 +7415,7 @@ Statement [259] (dword) print_dword::dw#2 ← (dword) mul16u_error::mn#0 [ print
 Statement [263] (dword) print_dword::dw#3 ← (dword) mul16u_error::mf#0 [ print_char_cursor#128 print_dword::dw#3 ] ( main:2::mul16u_compare:9::mul16u_error:232 [ print_char_cursor#128 print_dword::dw#3 ] ) always clobbers reg byte a 
 Statement [268] if((word) muls16u::a#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16u::@1 [ muls16u::a#0 muls16u::b#0 ] ( main:2::mul16u_compare:9::muls16u:207 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 muls16u::b#0 ] ) always clobbers reg byte a 
 Statement [270] (dword) muls16u::m#1 ← (dword) muls16u::m#3 + (word) muls16u::b#0 [ muls16u::a#0 muls16u::b#0 muls16u::i#2 muls16u::m#1 ] ( main:2::mul16u_compare:9::muls16u:207 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 muls16u::b#0 muls16u::i#2 muls16u::m#1 ] ) always clobbers reg byte a 
-Statement [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@4 [ muls16u::a#0 muls16u::b#0 muls16u::m#1 muls16u::i#1 ] ( main:2::mul16u_compare:9::muls16u:207 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 muls16u::b#0 muls16u::m#1 muls16u::i#1 ] ) always clobbers reg byte a 
+Statement [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@2 [ muls16u::a#0 muls16u::b#0 muls16u::m#1 muls16u::i#1 ] ( main:2::mul16u_compare:9::muls16u:207 [ print_char_cursor#128 mul16u_compare::i#12 mul16u_compare::a#1 mul16u_compare::b#1 mul16u_compare::j#10 muls16u::a#0 muls16u::b#0 muls16u::m#1 muls16u::i#1 ] ) always clobbers reg byte a 
 Statement [278] (byte~) mulf_init::$8 ← (byte) mulf_init::c#1 & (byte/signed byte/word/signed word/dword/signed dword) 1 [ mulf_init::sqr#4 mulf_init::sqr1_lo#2 mulf_init::sqr1_hi#2 mulf_init::x_2#3 mulf_init::c#1 mulf_init::$8 ] ( main:2::mulf_init:7 [ mulf_init::sqr#4 mulf_init::sqr1_lo#2 mulf_init::sqr1_hi#2 mulf_init::x_2#3 mulf_init::c#1 mulf_init::$8 ] ) always clobbers reg byte a 
 Statement [283] (byte~) mulf_init::$11 ← < (word) mulf_init::sqr#3 [ mulf_init::sqr1_lo#2 mulf_init::sqr1_hi#2 mulf_init::c#1 mulf_init::x_2#2 mulf_init::sqr#3 mulf_init::$11 ] ( main:2::mulf_init:7 [ mulf_init::sqr1_lo#2 mulf_init::sqr1_hi#2 mulf_init::c#1 mulf_init::x_2#2 mulf_init::sqr#3 mulf_init::$11 ] ) always clobbers reg byte a 
 Statement [284] *((byte*) mulf_init::sqr1_lo#2) ← (byte~) mulf_init::$11 [ mulf_init::sqr1_lo#2 mulf_init::sqr1_hi#2 mulf_init::c#1 mulf_init::x_2#2 mulf_init::sqr#3 ] ( main:2::mulf_init:7 [ mulf_init::sqr1_lo#2 mulf_init::sqr1_hi#2 mulf_init::c#1 mulf_init::x_2#2 mulf_init::sqr#3 ] ) always clobbers reg byte y 
@@ -7392,7 +7426,7 @@ Statement [290] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo
 Statement [292] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:2::mulf_init:7 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [293] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:2::mulf_init:7 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [295] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ( main:2::mulf_init:7 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ) always clobbers reg byte a 
-Statement [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:7 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
+Statement [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:7 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
 Statement [300] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:7 [ ] ) always clobbers reg byte a 
 Statement [301] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:7 [ ] ) always clobbers reg byte a 
 Statement [306] *((byte*) print_cls::sc#2) ← (byte) ' ' [ print_cls::sc#2 ] ( main:2::print_cls:5 [ print_cls::sc#2 ] ) always clobbers reg byte a reg byte y 
@@ -7634,15 +7668,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 7
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-b40_from_bbegin:
-  jmp b40
-//SEG5 @40
-b40:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @40 to @end [phi:@40->@end]
-bend_from_b40:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -7717,12 +7751,12 @@ mul16s_compare: {
     sta a+1
   //SEG32 [14] phi (byte*) print_char_cursor#143 = (byte*~) print_char_cursor#176 [phi:mul16s_compare->mul16s_compare::@1#3] -- register_copy 
     jmp b1
-  //SEG33 [14] phi from mul16s_compare::@10 to mul16s_compare::@1 [phi:mul16s_compare::@10->mul16s_compare::@1]
-  b1_from_b10:
-  //SEG34 [14] phi (byte) mul16s_compare::i#12 = (byte) mul16s_compare::i#1 [phi:mul16s_compare::@10->mul16s_compare::@1#0] -- register_copy 
-  //SEG35 [14] phi (signed word) mul16s_compare::b#6 = (signed word) mul16s_compare::b#1 [phi:mul16s_compare::@10->mul16s_compare::@1#1] -- register_copy 
-  //SEG36 [14] phi (signed word) mul16s_compare::a#6 = (signed word) mul16s_compare::a#1 [phi:mul16s_compare::@10->mul16s_compare::@1#2] -- register_copy 
-  //SEG37 [14] phi (byte*) print_char_cursor#143 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@10->mul16s_compare::@1#3] -- register_copy 
+  //SEG33 [14] phi from mul16s_compare::@8 to mul16s_compare::@1 [phi:mul16s_compare::@8->mul16s_compare::@1]
+  b1_from_b8:
+  //SEG34 [14] phi (byte) mul16s_compare::i#12 = (byte) mul16s_compare::i#1 [phi:mul16s_compare::@8->mul16s_compare::@1#0] -- register_copy 
+  //SEG35 [14] phi (signed word) mul16s_compare::b#6 = (signed word) mul16s_compare::b#1 [phi:mul16s_compare::@8->mul16s_compare::@1#1] -- register_copy 
+  //SEG36 [14] phi (signed word) mul16s_compare::a#6 = (signed word) mul16s_compare::a#1 [phi:mul16s_compare::@8->mul16s_compare::@1#2] -- register_copy 
+  //SEG37 [14] phi (byte*) print_char_cursor#143 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@8->mul16s_compare::@1#3] -- register_copy 
     jmp b1
   //SEG38 mul16s_compare::@1
   b1:
@@ -7772,27 +7806,27 @@ mul16s_compare: {
   //SEG56 [21] call muls16s 
     jsr muls16s
   //SEG57 [22] (signed dword) muls16s::return#2 ← (signed dword) muls16s::return#0
-    jmp b13
-  //SEG58 mul16s_compare::@13
-  b13:
+    jmp b10
+  //SEG58 mul16s_compare::@10
+  b10:
   //SEG59 [23] (signed dword) mul16s_compare::ms#0 ← (signed dword) muls16s::return#2
   //SEG60 [24] (signed word) mul16s::a#0 ← (signed word) mul16s_compare::a#1
   //SEG61 [25] (signed word) mul16s::b#0 ← (signed word) mul16s_compare::b#1
   //SEG62 [26] call mul16s 
     jsr mul16s
   //SEG63 [27] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-    jmp b14
-  //SEG64 mul16s_compare::@14
-  b14:
+    jmp b11
+  //SEG64 mul16s_compare::@11
+  b11:
   //SEG65 [28] (signed dword) mul16s_compare::mn#0 ← (signed dword) mul16s::return#2
   //SEG66 [29] (signed word) mulf16s::a#0 ← (signed word) mul16s_compare::a#1
   //SEG67 [30] (signed word) mulf16s::b#0 ← (signed word) mul16s_compare::b#1
   //SEG68 [31] call mulf16s 
     jsr mulf16s
   //SEG69 [32] (signed dword) mulf16s::return#2 ← (signed dword) mulf16s::return#0
-    jmp b15
-  //SEG70 mul16s_compare::@15
-  b15:
+    jmp b12
+  //SEG70 mul16s_compare::@12
+  b12:
   //SEG71 [33] (signed dword) mul16s_compare::mf#0 ← (signed dword) mulf16s::return#2
   //SEG72 [34] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mf#0) goto mul16s_compare::@3 -- vdsz1_eq_vdsz2_then_la1 
     lda ms
@@ -7806,10 +7840,10 @@ mul16s_compare: {
     bne !+
     lda ms+3
     cmp mf+3
-    beq b3_from_b15
+    beq b3_from_b12
   !:
-  //SEG73 [35] phi from mul16s_compare::@15 to mul16s_compare::@6 [phi:mul16s_compare::@15->mul16s_compare::@6]
-  b6_from_b15:
+  //SEG73 [35] phi from mul16s_compare::@12 to mul16s_compare::@6 [phi:mul16s_compare::@12->mul16s_compare::@6]
+  b6_from_b12:
     jmp b6
   //SEG74 mul16s_compare::@6
   b6:
@@ -7818,14 +7852,14 @@ mul16s_compare: {
   //SEG76 [36] phi (byte) mul16s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mul16s_compare::@6->mul16s_compare::@3#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b3
-  //SEG77 [36] phi from mul16s_compare::@15 to mul16s_compare::@3 [phi:mul16s_compare::@15->mul16s_compare::@3]
-  b3_from_b15:
-  //SEG78 [36] phi (byte) mul16s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16s_compare::@15->mul16s_compare::@3#0] -- vbuxx=vbuc1 
+  //SEG77 [36] phi from mul16s_compare::@12 to mul16s_compare::@3 [phi:mul16s_compare::@12->mul16s_compare::@3]
+  b3_from_b12:
+  //SEG78 [36] phi (byte) mul16s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16s_compare::@12->mul16s_compare::@3#0] -- vbuxx=vbuc1 
     ldx #1
     jmp b3
   //SEG79 mul16s_compare::@3
   b3:
-  //SEG80 [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@22 -- vdsz1_eq_vdsz2_then_la1 
+  //SEG80 [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@15 -- vdsz1_eq_vdsz2_then_la1 
     lda ms
     cmp mn
     bne !+
@@ -7837,7 +7871,7 @@ mul16s_compare: {
     bne !+
     lda ms+3
     cmp mn+3
-    beq b22_from_b3
+    beq b15_from_b3
   !:
   //SEG81 [38] phi from mul16s_compare::@3 to mul16s_compare::@4 [phi:mul16s_compare::@3->mul16s_compare::@4]
   b4_from_b3:
@@ -7849,9 +7883,9 @@ mul16s_compare: {
   //SEG84 [39] if((byte) mul16s_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s_compare::@5 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b5
-    jmp b8
-  //SEG85 mul16s_compare::@8
-  b8:
+    jmp b7
+  //SEG85 mul16s_compare::@7
+  b7:
   //SEG86 [40] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -7861,8 +7895,8 @@ mul16s_compare: {
   //SEG90 [44] (signed dword) mul16s_error::mn#0 ← (signed dword) mul16s_compare::mn#0
   //SEG91 [45] (signed dword) mul16s_error::mf#0 ← (signed dword) mul16s_compare::mf#0
   //SEG92 [46] call mul16s_error 
-  //SEG93 [71] phi from mul16s_compare::@8 to mul16s_error [phi:mul16s_compare::@8->mul16s_error]
-  mul16s_error_from_b8:
+  //SEG93 [71] phi from mul16s_compare::@7 to mul16s_error [phi:mul16s_compare::@7->mul16s_error]
+  mul16s_error_from_b7:
     jsr mul16s_error
     jmp breturn
   //SEG94 mul16s_compare::@return
@@ -7876,64 +7910,64 @@ mul16s_compare: {
   //SEG98 [49] if((byte) mul16s_compare::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16s_compare::@2 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$10
     bne b2_from_b5
-    jmp b10
-  //SEG99 mul16s_compare::@10
-  b10:
+    jmp b8
+  //SEG99 mul16s_compare::@8
+  b8:
   //SEG100 [50] (byte) mul16s_compare::i#1 ← ++ (byte) mul16s_compare::i#12 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG101 [51] if((byte) mul16s_compare::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16s_compare::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$10
     cmp i
-    bne b1_from_b10
-  //SEG102 [52] phi from mul16s_compare::@10 to mul16s_compare::@11 [phi:mul16s_compare::@10->mul16s_compare::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG103 mul16s_compare::@11
-  b11:
+    bne b1_from_b8
+  //SEG102 [52] phi from mul16s_compare::@8 to mul16s_compare::@9 [phi:mul16s_compare::@8->mul16s_compare::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG103 mul16s_compare::@9
+  b9:
   //SEG104 [53] call print_ln 
-  //SEG105 [59] phi from mul16s_compare::@11 to print_ln [phi:mul16s_compare::@11->print_ln]
-  print_ln_from_b11:
-  //SEG106 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@11->print_ln#0] -- register_copy 
-  //SEG107 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@11->print_ln#1] -- register_copy 
+  //SEG105 [59] phi from mul16s_compare::@9 to print_ln [phi:mul16s_compare::@9->print_ln]
+  print_ln_from_b9:
+  //SEG106 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@9->print_ln#0] -- register_copy 
+  //SEG107 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@9->print_ln#1] -- register_copy 
     jsr print_ln
-    jmp b17
-  //SEG108 mul16s_compare::@17
-  b17:
+    jmp b13
+  //SEG108 mul16s_compare::@13
+  b13:
   //SEG109 [54] (byte*~) print_char_cursor#185 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG110 [55] call print_str 
-  //SEG111 [64] phi from mul16s_compare::@17 to print_str [phi:mul16s_compare::@17->print_str]
-  print_str_from_b17:
-  //SEG112 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#185 [phi:mul16s_compare::@17->print_str#0] -- register_copy 
-  //SEG113 [64] phi (byte*) print_str::str#17 = (const string) mul16s_compare::str1 [phi:mul16s_compare::@17->print_str#1] -- pbuz1=pbuc1 
+  //SEG111 [64] phi from mul16s_compare::@13 to print_str [phi:mul16s_compare::@13->print_str]
+  print_str_from_b13:
+  //SEG112 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#185 [phi:mul16s_compare::@13->print_str#0] -- register_copy 
+  //SEG113 [64] phi (byte*) print_str::str#17 = (const string) mul16s_compare::str1 [phi:mul16s_compare::@13->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG114 [56] phi from mul16s_compare::@17 to mul16s_compare::@18 [phi:mul16s_compare::@17->mul16s_compare::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG115 mul16s_compare::@18
-  b18:
+  //SEG114 [56] phi from mul16s_compare::@13 to mul16s_compare::@14 [phi:mul16s_compare::@13->mul16s_compare::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG115 mul16s_compare::@14
+  b14:
   //SEG116 [57] call print_ln 
-  //SEG117 [59] phi from mul16s_compare::@18 to print_ln [phi:mul16s_compare::@18->print_ln]
-  print_ln_from_b18:
-  //SEG118 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@18->print_ln#0] -- register_copy 
-  //SEG119 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@18->print_ln#1] -- register_copy 
+  //SEG117 [59] phi from mul16s_compare::@14 to print_ln [phi:mul16s_compare::@14->print_ln]
+  print_ln_from_b14:
+  //SEG118 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@14->print_ln#0] -- register_copy 
+  //SEG119 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@14->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG120 [58] phi from mul16s_compare::@3 to mul16s_compare::@22 [phi:mul16s_compare::@3->mul16s_compare::@22]
-  b22_from_b3:
-    jmp b22
-  //SEG121 mul16s_compare::@22
-  b22:
-  //SEG122 [38] phi from mul16s_compare::@22 to mul16s_compare::@4 [phi:mul16s_compare::@22->mul16s_compare::@4]
-  b4_from_b22:
-  //SEG123 [38] phi (byte) mul16s_compare::ok#3 = (byte) mul16s_compare::ok#4 [phi:mul16s_compare::@22->mul16s_compare::@4#0] -- register_copy 
+  //SEG120 [58] phi from mul16s_compare::@3 to mul16s_compare::@15 [phi:mul16s_compare::@3->mul16s_compare::@15]
+  b15_from_b3:
+    jmp b15
+  //SEG121 mul16s_compare::@15
+  b15:
+  //SEG122 [38] phi from mul16s_compare::@15 to mul16s_compare::@4 [phi:mul16s_compare::@15->mul16s_compare::@4]
+  b4_from_b15:
+  //SEG123 [38] phi (byte) mul16s_compare::ok#3 = (byte) mul16s_compare::ok#4 [phi:mul16s_compare::@15->mul16s_compare::@4#0] -- register_copy 
     jmp b4
     str1: .text "signed word multiply results match!@"
 }
@@ -8193,9 +8227,9 @@ print_sdword: {
   //SEG213 [123] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sdword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b4
-  //SEG214 print_sdword::@4
-  b4:
+    jmp b3
+  //SEG214 print_sdword::@3
+  b3:
   //SEG215 [98] (signed dword) print_sdword::dw#0 ← - (signed dword) print_sdword::dw#4 -- vdsz1=_neg_vdsz1 
     sec
     lda dw
@@ -8214,11 +8248,11 @@ print_sdword: {
     eor #$ff
     adc #0
     sta dw+3
-  //SEG216 [99] phi from print_sdword print_sdword::@4 to print_sdword::@1 [phi:print_sdword/print_sdword::@4->print_sdword::@1]
+  //SEG216 [99] phi from print_sdword print_sdword::@3 to print_sdword::@1 [phi:print_sdword/print_sdword::@3->print_sdword::@1]
   b1_from_print_sdword:
-  b1_from_b4:
-  //SEG217 [99] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#128 [phi:print_sdword/print_sdword::@4->print_sdword::@1#0] -- register_copy 
-  //SEG218 [99] phi (signed dword) print_sdword::dw#5 = (signed dword) print_sdword::dw#4 [phi:print_sdword/print_sdword::@4->print_sdword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG217 [99] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#128 [phi:print_sdword/print_sdword::@3->print_sdword::@1#0] -- register_copy 
+  //SEG218 [99] phi (signed dword) print_sdword::dw#5 = (signed dword) print_sdword::dw#4 [phi:print_sdword/print_sdword::@3->print_sdword::@1#1] -- register_copy 
     jmp b1
   //SEG219 print_sdword::@1
   b1:
@@ -8380,9 +8414,9 @@ print_sword: {
   //SEG283 [123] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b4
-  //SEG284 print_sword::@4
-  b4:
+    jmp b3
+  //SEG284 print_sword::@3
+  b3:
   //SEG285 [131] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -8393,11 +8427,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG286 [132] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG286 [132] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG287 [132] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#128 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG288 [132] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG287 [132] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#128 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG288 [132] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG289 print_sword::@1
   b1:
@@ -8444,13 +8478,13 @@ mulf16s: {
   //SEG303 [153] phi (word) mulf16u::a#2 = (word~) mulf16u::a#4 [phi:mulf16s->mulf16u#1] -- register_copy 
     jsr mulf16u
   //SEG304 [139] (dword) mulf16u::return#2 ← (dword) mulf16u::return#0
-    jmp b6
-  //SEG305 mulf16s::@6
-  b6:
+    jmp b5
+  //SEG305 mulf16s::@5
+  b5:
   //SEG306 [140] (dword) mulf16s::m#0 ← (dword) mulf16u::return#2
   //SEG307 [141] if((signed word) mulf16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
-    bpl b1_from_b6
+    bpl b1_from_b5
     jmp b3
   //SEG308 mulf16s::@3
   b3:
@@ -8472,10 +8506,10 @@ mulf16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG312 [145] phi from mulf16s::@3 mulf16s::@6 to mulf16s::@1 [phi:mulf16s::@3/mulf16s::@6->mulf16s::@1]
+  //SEG312 [145] phi from mulf16s::@3 mulf16s::@5 to mulf16s::@1 [phi:mulf16s::@3/mulf16s::@5->mulf16s::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG313 [145] phi (dword) mulf16s::m#5 = (dword) mulf16s::m#1 [phi:mulf16s::@3/mulf16s::@6->mulf16s::@1#0] -- register_copy 
+  b1_from_b5:
+  //SEG313 [145] phi (dword) mulf16s::m#5 = (dword) mulf16s::m#1 [phi:mulf16s::@3/mulf16s::@5->mulf16s::@1#0] -- register_copy 
     jmp b1
   //SEG314 mulf16s::@1
   b1:
@@ -8676,13 +8710,13 @@ mul16s: {
   //SEG339 [176] phi (word) mul16u::b#2 = (word~) mul16u::b#3 [phi:mul16s->mul16u#1] -- register_copy 
     jsr mul16u
   //SEG340 [162] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-    jmp b6
-  //SEG341 mul16s::@6
-  b6:
+    jmp b5
+  //SEG341 mul16s::@5
+  b5:
   //SEG342 [163] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   //SEG343 [164] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
-    bpl b1_from_b6
+    bpl b1_from_b5
     jmp b3
   //SEG344 mul16s::@3
   b3:
@@ -8704,10 +8738,10 @@ mul16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG348 [168] phi from mul16s::@3 mul16s::@6 to mul16s::@1 [phi:mul16s::@3/mul16s::@6->mul16s::@1]
+  //SEG348 [168] phi from mul16s::@3 mul16s::@5 to mul16s::@1 [phi:mul16s::@3/mul16s::@5->mul16s::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG349 [168] phi (dword) mul16s::m#5 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@6->mul16s::@1#0] -- register_copy 
+  b1_from_b5:
+  //SEG349 [168] phi (dword) mul16s::m#5 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@5->mul16s::@1#0] -- register_copy 
     jmp b1
   //SEG350 mul16s::@1
   b1:
@@ -8795,12 +8829,12 @@ mul16u: {
   //SEG373 [181] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG374 [182] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG374 [182] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG375 mul16u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG375 mul16u::@3
+  b3:
   //SEG376 [183] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -8815,13 +8849,13 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG377 [184] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG378 [184] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-    jmp b8
-  //SEG379 mul16u::@8
-  b8:
+  //SEG377 [184] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG378 [184] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+    jmp b4
+  //SEG379 mul16u::@4
+  b4:
   //SEG380 [185] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -8831,11 +8865,11 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG382 [178] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  b1_from_b8:
-  //SEG383 [178] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG384 [178] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG385 [178] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG382 [178] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  b1_from_b4:
+  //SEG383 [178] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG384 [178] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG385 [178] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG386 muls16s
@@ -8849,41 +8883,41 @@ muls16s: {
     .label i = 9
     .label a = 3
     .label b = 5
-  //SEG387 [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@10 -- vwsz1_lt_0_then_la1 
+  //SEG387 [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@4 -- vwsz1_lt_0_then_la1 
     lda a+1
-    bmi b10_from_muls16s
-    jmp b4
-  //SEG388 muls16s::@4
-  b4:
-  //SEG389 [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@3 -- vwsz1_le_0_then_la1 
+    bmi b4_from_muls16s
+    jmp b2
+  //SEG388 muls16s::@2
+  b2:
+  //SEG389 [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@1 -- vwsz1_le_0_then_la1 
     lda a+1
-    bmi b3_from_b4
+    bmi b1_from_b2
     bne !+
     lda a
-    beq b3_from_b4
+    beq b1_from_b2
   !:
-  //SEG390 [189] phi from muls16s::@4 to muls16s::@8 [phi:muls16s::@4->muls16s::@8]
-  b8_from_b4:
-  //SEG391 [189] phi (signed word) muls16s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@4->muls16s::@8#0] -- vwsz1=vbuc1 
+  //SEG390 [189] phi from muls16s::@2 to muls16s::@3 [phi:muls16s::@2->muls16s::@3]
+  b3_from_b2:
+  //SEG391 [189] phi (signed word) muls16s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@2->muls16s::@3#0] -- vwsz1=vbuc1 
     lda #0
     sta j
     lda #0
     sta j+1
-  //SEG392 [189] phi (signed dword) muls16s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@4->muls16s::@8#1] -- vdsz1=vbsc1 
+  //SEG392 [189] phi (signed dword) muls16s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@2->muls16s::@3#1] -- vdsz1=vbsc1 
     lda #0
     sta m
     lda #0
     sta m+1
     sta m+2
     sta m+3
-    jmp b8
-  //SEG393 [189] phi from muls16s::@8 to muls16s::@8 [phi:muls16s::@8->muls16s::@8]
-  b8_from_b8:
-  //SEG394 [189] phi (signed word) muls16s::j#2 = (signed word) muls16s::j#1 [phi:muls16s::@8->muls16s::@8#0] -- register_copy 
-  //SEG395 [189] phi (signed dword) muls16s::m#3 = (signed dword) muls16s::m#1 [phi:muls16s::@8->muls16s::@8#1] -- register_copy 
-    jmp b8
-  //SEG396 muls16s::@8
-  b8:
+    jmp b3
+  //SEG393 [189] phi from muls16s::@3 to muls16s::@3 [phi:muls16s::@3->muls16s::@3]
+  b3_from_b3:
+  //SEG394 [189] phi (signed word) muls16s::j#2 = (signed word) muls16s::j#1 [phi:muls16s::@3->muls16s::@3#0] -- register_copy 
+  //SEG395 [189] phi (signed dword) muls16s::m#3 = (signed dword) muls16s::m#1 [phi:muls16s::@3->muls16s::@3#1] -- register_copy 
+    jmp b3
+  //SEG396 muls16s::@3
+  b3:
   //SEG397 [190] (signed dword) muls16s::m#1 ← (signed dword) muls16s::m#3 + (signed word) muls16s::b#0 -- vdsz1=vdsz1_plus_vwsz2 
     lda b+1
     ora #$7f
@@ -8909,57 +8943,57 @@ muls16s: {
     bne !+
     inc j+1
   !:
-  //SEG399 [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@8 -- vwsz1_neq_vwsz2_then_la1 
+  //SEG399 [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@3 -- vwsz1_neq_vwsz2_then_la1 
     lda j+1
     cmp a+1
-    bne b8_from_b8
+    bne b3_from_b3
     lda j
     cmp a
-    bne b8_from_b8
-  //SEG400 [193] phi from muls16s::@10 muls16s::@8 to muls16s::@3 [phi:muls16s::@10/muls16s::@8->muls16s::@3]
-  b3_from_b10:
-  b3_from_b8:
-  //SEG401 [193] phi (signed dword) muls16s::return#0 = (signed dword) muls16s::m#2 [phi:muls16s::@10/muls16s::@8->muls16s::@3#0] -- register_copy 
-    jmp b3
-  //SEG402 [193] phi from muls16s::@4 to muls16s::@3 [phi:muls16s::@4->muls16s::@3]
-  b3_from_b4:
-  //SEG403 [193] phi (signed dword) muls16s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@4->muls16s::@3#0] -- vdsz1=vbsc1 
+    bne b3_from_b3
+  //SEG400 [193] phi from muls16s::@3 muls16s::@4 to muls16s::@1 [phi:muls16s::@3/muls16s::@4->muls16s::@1]
+  b1_from_b3:
+  b1_from_b4:
+  //SEG401 [193] phi (signed dword) muls16s::return#0 = (signed dword) muls16s::m#1 [phi:muls16s::@3/muls16s::@4->muls16s::@1#0] -- register_copy 
+    jmp b1
+  //SEG402 [193] phi from muls16s::@2 to muls16s::@1 [phi:muls16s::@2->muls16s::@1]
+  b1_from_b2:
+  //SEG403 [193] phi (signed dword) muls16s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@2->muls16s::@1#0] -- vdsz1=vbsc1 
     lda #0
     sta return
     lda #0
     sta return+1
     sta return+2
     sta return+3
-    jmp b3
-  //SEG404 muls16s::@3
-  b3:
+    jmp b1
+  //SEG404 muls16s::@1
+  b1:
     jmp breturn
   //SEG405 muls16s::@return
   breturn:
   //SEG406 [194] return 
     rts
-  //SEG407 [195] phi from muls16s to muls16s::@10 [phi:muls16s->muls16s::@10]
-  b10_from_muls16s:
-  //SEG408 [195] phi (signed word) muls16s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@10#0] -- vwsz1=vbuc1 
+  //SEG407 [195] phi from muls16s to muls16s::@4 [phi:muls16s->muls16s::@4]
+  b4_from_muls16s:
+  //SEG408 [195] phi (signed word) muls16s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@4#0] -- vwsz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG409 [195] phi (signed dword) muls16s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@10#1] -- vdsz1=vbsc1 
+  //SEG409 [195] phi (signed dword) muls16s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@4#1] -- vdsz1=vbsc1 
     lda #0
     sta m
     lda #0
     sta m+1
     sta m+2
     sta m+3
-    jmp b10
-  //SEG410 [195] phi from muls16s::@10 to muls16s::@10 [phi:muls16s::@10->muls16s::@10]
-  b10_from_b10:
-  //SEG411 [195] phi (signed word) muls16s::i#2 = (signed word) muls16s::i#1 [phi:muls16s::@10->muls16s::@10#0] -- register_copy 
-  //SEG412 [195] phi (signed dword) muls16s::m#5 = (signed dword) muls16s::m#2 [phi:muls16s::@10->muls16s::@10#1] -- register_copy 
-    jmp b10
-  //SEG413 muls16s::@10
-  b10:
+    jmp b4
+  //SEG410 [195] phi from muls16s::@4 to muls16s::@4 [phi:muls16s::@4->muls16s::@4]
+  b4_from_b4:
+  //SEG411 [195] phi (signed word) muls16s::i#2 = (signed word) muls16s::i#1 [phi:muls16s::@4->muls16s::@4#0] -- register_copy 
+  //SEG412 [195] phi (signed dword) muls16s::m#5 = (signed dword) muls16s::m#2 [phi:muls16s::@4->muls16s::@4#1] -- register_copy 
+    jmp b4
+  //SEG413 muls16s::@4
+  b4:
   //SEG414 [196] (signed dword) muls16s::m#2 ← (signed dword) muls16s::m#5 - (signed word) muls16s::b#0 -- vdsz1=vdsz1_minus_vwsz2 
     lda b+1
     ora #$7f
@@ -8986,14 +9020,14 @@ muls16s: {
     dec i+1
   !:
     dec i
-  //SEG416 [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@10 -- vwsz1_neq_vwsz2_then_la1 
+  //SEG416 [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@4 -- vwsz1_neq_vwsz2_then_la1 
     lda i+1
     cmp a+1
-    bne b10_from_b10
+    bne b4_from_b4
     lda i
     cmp a
-    bne b10_from_b10
-    jmp b3_from_b10
+    bne b4_from_b4
+    jmp b1_from_b4
 }
 //SEG417 mul16u_compare
 // Perform many possible word multiplications (slow and fast) and compare the results
@@ -9025,12 +9059,12 @@ mul16u_compare: {
     lda #>$400
     sta print_char_cursor+1
     jmp b1
-  //SEG423 [200] phi from mul16u_compare::@10 to mul16u_compare::@1 [phi:mul16u_compare::@10->mul16u_compare::@1]
-  b1_from_b10:
-  //SEG424 [200] phi (byte) mul16u_compare::i#12 = (byte) mul16u_compare::i#1 [phi:mul16u_compare::@10->mul16u_compare::@1#0] -- register_copy 
-  //SEG425 [200] phi (word) mul16u_compare::b#6 = (word) mul16u_compare::b#1 [phi:mul16u_compare::@10->mul16u_compare::@1#1] -- register_copy 
-  //SEG426 [200] phi (word) mul16u_compare::a#6 = (word) mul16u_compare::a#1 [phi:mul16u_compare::@10->mul16u_compare::@1#2] -- register_copy 
-  //SEG427 [200] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@10->mul16u_compare::@1#3] -- register_copy 
+  //SEG423 [200] phi from mul16u_compare::@8 to mul16u_compare::@1 [phi:mul16u_compare::@8->mul16u_compare::@1]
+  b1_from_b8:
+  //SEG424 [200] phi (byte) mul16u_compare::i#12 = (byte) mul16u_compare::i#1 [phi:mul16u_compare::@8->mul16u_compare::@1#0] -- register_copy 
+  //SEG425 [200] phi (word) mul16u_compare::b#6 = (word) mul16u_compare::b#1 [phi:mul16u_compare::@8->mul16u_compare::@1#1] -- register_copy 
+  //SEG426 [200] phi (word) mul16u_compare::a#6 = (word) mul16u_compare::a#1 [phi:mul16u_compare::@8->mul16u_compare::@1#2] -- register_copy 
+  //SEG427 [200] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@8->mul16u_compare::@1#3] -- register_copy 
     jmp b1
   //SEG428 mul16u_compare::@1
   b1:
@@ -9080,9 +9114,9 @@ mul16u_compare: {
   //SEG446 [207] call muls16u 
     jsr muls16u
   //SEG447 [208] (dword) muls16u::return#2 ← (dword) muls16u::return#0
-    jmp b13
-  //SEG448 mul16u_compare::@13
-  b13:
+    jmp b10
+  //SEG448 mul16u_compare::@10
+  b10:
   //SEG449 [209] (dword) mul16u_compare::ms#0 ← (dword) muls16u::return#2
   //SEG450 [210] (word) mul16u::a#2 ← (word) mul16u_compare::a#1 -- vwuz1=vwuz2 
     lda a
@@ -9091,28 +9125,28 @@ mul16u_compare: {
     sta mul16u.a+1
   //SEG451 [211] (word) mul16u::b#1 ← (word) mul16u_compare::b#1
   //SEG452 [212] call mul16u 
-  //SEG453 [176] phi from mul16u_compare::@13 to mul16u [phi:mul16u_compare::@13->mul16u]
-  mul16u_from_b13:
-  //SEG454 [176] phi (word) mul16u::a#6 = (word) mul16u::a#2 [phi:mul16u_compare::@13->mul16u#0] -- register_copy 
-  //SEG455 [176] phi (word) mul16u::b#2 = (word) mul16u::b#1 [phi:mul16u_compare::@13->mul16u#1] -- register_copy 
+  //SEG453 [176] phi from mul16u_compare::@10 to mul16u [phi:mul16u_compare::@10->mul16u]
+  mul16u_from_b10:
+  //SEG454 [176] phi (word) mul16u::a#6 = (word) mul16u::a#2 [phi:mul16u_compare::@10->mul16u#0] -- register_copy 
+  //SEG455 [176] phi (word) mul16u::b#2 = (word) mul16u::b#1 [phi:mul16u_compare::@10->mul16u#1] -- register_copy 
     jsr mul16u
   //SEG456 [213] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-    jmp b14
-  //SEG457 mul16u_compare::@14
-  b14:
+    jmp b11
+  //SEG457 mul16u_compare::@11
+  b11:
   //SEG458 [214] (dword) mul16u_compare::mn#0 ← (dword) mul16u::return#3
   //SEG459 [215] (word) mulf16u::a#1 ← (word) mul16u_compare::a#1
   //SEG460 [216] (word) mulf16u::b#1 ← (word) mul16u_compare::b#1
   //SEG461 [217] call mulf16u 
-  //SEG462 [153] phi from mul16u_compare::@14 to mulf16u [phi:mul16u_compare::@14->mulf16u]
-  mulf16u_from_b14:
-  //SEG463 [153] phi (word) mulf16u::b#2 = (word) mulf16u::b#1 [phi:mul16u_compare::@14->mulf16u#0] -- register_copy 
-  //SEG464 [153] phi (word) mulf16u::a#2 = (word) mulf16u::a#1 [phi:mul16u_compare::@14->mulf16u#1] -- register_copy 
+  //SEG462 [153] phi from mul16u_compare::@11 to mulf16u [phi:mul16u_compare::@11->mulf16u]
+  mulf16u_from_b11:
+  //SEG463 [153] phi (word) mulf16u::b#2 = (word) mulf16u::b#1 [phi:mul16u_compare::@11->mulf16u#0] -- register_copy 
+  //SEG464 [153] phi (word) mulf16u::a#2 = (word) mulf16u::a#1 [phi:mul16u_compare::@11->mulf16u#1] -- register_copy 
     jsr mulf16u
   //SEG465 [218] (dword) mulf16u::return#3 ← (dword) mulf16u::return#0
-    jmp b15
-  //SEG466 mul16u_compare::@15
-  b15:
+    jmp b12
+  //SEG466 mul16u_compare::@12
+  b12:
   //SEG467 [219] (dword) mul16u_compare::mf#0 ← (dword) mulf16u::return#3
   //SEG468 [220] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mf#0) goto mul16u_compare::@3 -- vduz1_eq_vduz2_then_la1 
     lda ms
@@ -9126,10 +9160,10 @@ mul16u_compare: {
     bne !+
     lda ms+3
     cmp mf+3
-    beq b3_from_b15
+    beq b3_from_b12
   !:
-  //SEG469 [221] phi from mul16u_compare::@15 to mul16u_compare::@6 [phi:mul16u_compare::@15->mul16u_compare::@6]
-  b6_from_b15:
+  //SEG469 [221] phi from mul16u_compare::@12 to mul16u_compare::@6 [phi:mul16u_compare::@12->mul16u_compare::@6]
+  b6_from_b12:
     jmp b6
   //SEG470 mul16u_compare::@6
   b6:
@@ -9138,14 +9172,14 @@ mul16u_compare: {
   //SEG472 [222] phi (byte) mul16u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mul16u_compare::@6->mul16u_compare::@3#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b3
-  //SEG473 [222] phi from mul16u_compare::@15 to mul16u_compare::@3 [phi:mul16u_compare::@15->mul16u_compare::@3]
-  b3_from_b15:
-  //SEG474 [222] phi (byte) mul16u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16u_compare::@15->mul16u_compare::@3#0] -- vbuxx=vbuc1 
+  //SEG473 [222] phi from mul16u_compare::@12 to mul16u_compare::@3 [phi:mul16u_compare::@12->mul16u_compare::@3]
+  b3_from_b12:
+  //SEG474 [222] phi (byte) mul16u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16u_compare::@12->mul16u_compare::@3#0] -- vbuxx=vbuc1 
     ldx #1
     jmp b3
   //SEG475 mul16u_compare::@3
   b3:
-  //SEG476 [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@22 -- vduz1_eq_vduz2_then_la1 
+  //SEG476 [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@15 -- vduz1_eq_vduz2_then_la1 
     lda ms
     cmp mn
     bne !+
@@ -9157,7 +9191,7 @@ mul16u_compare: {
     bne !+
     lda ms+3
     cmp mn+3
-    beq b22_from_b3
+    beq b15_from_b3
   !:
   //SEG477 [224] phi from mul16u_compare::@3 to mul16u_compare::@4 [phi:mul16u_compare::@3->mul16u_compare::@4]
   b4_from_b3:
@@ -9169,9 +9203,9 @@ mul16u_compare: {
   //SEG480 [225] if((byte) mul16u_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u_compare::@5 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b5
-    jmp b8
-  //SEG481 mul16u_compare::@8
-  b8:
+    jmp b7
+  //SEG481 mul16u_compare::@7
+  b7:
   //SEG482 [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -9185,8 +9219,8 @@ mul16u_compare: {
   //SEG486 [230] (dword) mul16u_error::mn#0 ← (dword) mul16u_compare::mn#0
   //SEG487 [231] (dword) mul16u_error::mf#0 ← (dword) mul16u_compare::mf#0
   //SEG488 [232] call mul16u_error 
-  //SEG489 [245] phi from mul16u_compare::@8 to mul16u_error [phi:mul16u_compare::@8->mul16u_error]
-  mul16u_error_from_b8:
+  //SEG489 [245] phi from mul16u_compare::@7 to mul16u_error [phi:mul16u_compare::@7->mul16u_error]
+  mul16u_error_from_b7:
     jsr mul16u_error
     jmp breturn
   //SEG490 mul16u_compare::@return
@@ -9200,68 +9234,68 @@ mul16u_compare: {
   //SEG494 [235] if((byte) mul16u_compare::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16u_compare::@2 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$10
     bne b2_from_b5
-    jmp b10
-  //SEG495 mul16u_compare::@10
-  b10:
+    jmp b8
+  //SEG495 mul16u_compare::@8
+  b8:
   //SEG496 [236] (byte) mul16u_compare::i#1 ← ++ (byte) mul16u_compare::i#12 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG497 [237] if((byte) mul16u_compare::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16u_compare::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$10
     cmp i
-    bne b1_from_b10
-  //SEG498 [238] phi from mul16u_compare::@10 to mul16u_compare::@11 [phi:mul16u_compare::@10->mul16u_compare::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG499 mul16u_compare::@11
-  b11:
+    bne b1_from_b8
+  //SEG498 [238] phi from mul16u_compare::@8 to mul16u_compare::@9 [phi:mul16u_compare::@8->mul16u_compare::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG499 mul16u_compare::@9
+  b9:
   //SEG500 [239] call print_ln 
-  //SEG501 [59] phi from mul16u_compare::@11 to print_ln [phi:mul16u_compare::@11->print_ln]
-  print_ln_from_b11:
-  //SEG502 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@11->print_ln#0] -- register_copy 
-  //SEG503 [59] phi (byte*) print_line_cursor#43 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mul16u_compare::@11->print_ln#1] -- pbuz1=pbuc1 
+  //SEG501 [59] phi from mul16u_compare::@9 to print_ln [phi:mul16u_compare::@9->print_ln]
+  print_ln_from_b9:
+  //SEG502 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@9->print_ln#0] -- register_copy 
+  //SEG503 [59] phi (byte*) print_line_cursor#43 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mul16u_compare::@9->print_ln#1] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
     jsr print_ln
-    jmp b17
-  //SEG504 mul16u_compare::@17
-  b17:
+    jmp b13
+  //SEG504 mul16u_compare::@13
+  b13:
   //SEG505 [240] (byte*~) print_char_cursor#192 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG506 [241] call print_str 
-  //SEG507 [64] phi from mul16u_compare::@17 to print_str [phi:mul16u_compare::@17->print_str]
-  print_str_from_b17:
-  //SEG508 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#192 [phi:mul16u_compare::@17->print_str#0] -- register_copy 
-  //SEG509 [64] phi (byte*) print_str::str#17 = (const string) mul16u_compare::str1 [phi:mul16u_compare::@17->print_str#1] -- pbuz1=pbuc1 
+  //SEG507 [64] phi from mul16u_compare::@13 to print_str [phi:mul16u_compare::@13->print_str]
+  print_str_from_b13:
+  //SEG508 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#192 [phi:mul16u_compare::@13->print_str#0] -- register_copy 
+  //SEG509 [64] phi (byte*) print_str::str#17 = (const string) mul16u_compare::str1 [phi:mul16u_compare::@13->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG510 [242] phi from mul16u_compare::@17 to mul16u_compare::@18 [phi:mul16u_compare::@17->mul16u_compare::@18]
-  b18_from_b17:
-    jmp b18
-  //SEG511 mul16u_compare::@18
-  b18:
+  //SEG510 [242] phi from mul16u_compare::@13 to mul16u_compare::@14 [phi:mul16u_compare::@13->mul16u_compare::@14]
+  b14_from_b13:
+    jmp b14
+  //SEG511 mul16u_compare::@14
+  b14:
   //SEG512 [243] call print_ln 
-  //SEG513 [59] phi from mul16u_compare::@18 to print_ln [phi:mul16u_compare::@18->print_ln]
-  print_ln_from_b18:
-  //SEG514 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@18->print_ln#0] -- register_copy 
-  //SEG515 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16u_compare::@18->print_ln#1] -- register_copy 
+  //SEG513 [59] phi from mul16u_compare::@14 to print_ln [phi:mul16u_compare::@14->print_ln]
+  print_ln_from_b14:
+  //SEG514 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@14->print_ln#0] -- register_copy 
+  //SEG515 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16u_compare::@14->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG516 [244] phi from mul16u_compare::@3 to mul16u_compare::@22 [phi:mul16u_compare::@3->mul16u_compare::@22]
-  b22_from_b3:
-    jmp b22
-  //SEG517 mul16u_compare::@22
-  b22:
-  //SEG518 [224] phi from mul16u_compare::@22 to mul16u_compare::@4 [phi:mul16u_compare::@22->mul16u_compare::@4]
-  b4_from_b22:
-  //SEG519 [224] phi (byte) mul16u_compare::ok#3 = (byte) mul16u_compare::ok#4 [phi:mul16u_compare::@22->mul16u_compare::@4#0] -- register_copy 
+  //SEG516 [244] phi from mul16u_compare::@3 to mul16u_compare::@15 [phi:mul16u_compare::@3->mul16u_compare::@15]
+  b15_from_b3:
+    jmp b15
+  //SEG517 mul16u_compare::@15
+  b15:
+  //SEG518 [224] phi from mul16u_compare::@15 to mul16u_compare::@4 [phi:mul16u_compare::@15->mul16u_compare::@4]
+  b4_from_b15:
+  //SEG519 [224] phi (byte) mul16u_compare::ok#3 = (byte) mul16u_compare::ok#4 [phi:mul16u_compare::@15->mul16u_compare::@4#0] -- register_copy 
     jmp b4
     str1: .text "word multiply results match!@"
 }
@@ -9451,28 +9485,28 @@ muls16u: {
     lda a+1
     beq b1_from_muls16u
   !:
-  //SEG589 [269] phi from muls16u to muls16u::@4 [phi:muls16u->muls16u::@4]
-  b4_from_muls16u:
-  //SEG590 [269] phi (word) muls16u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@4#0] -- vwuz1=vbuc1 
+  //SEG589 [269] phi from muls16u to muls16u::@2 [phi:muls16u->muls16u::@2]
+  b2_from_muls16u:
+  //SEG590 [269] phi (word) muls16u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@2#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     lda #0
     sta i+1
-  //SEG591 [269] phi (dword) muls16u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@4#1] -- vduz1=vbuc1 
+  //SEG591 [269] phi (dword) muls16u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@2#1] -- vduz1=vbuc1 
     lda #0
     sta m
     lda #0
     sta m+1
     sta m+2
     sta m+3
-    jmp b4
-  //SEG592 [269] phi from muls16u::@4 to muls16u::@4 [phi:muls16u::@4->muls16u::@4]
-  b4_from_b4:
-  //SEG593 [269] phi (word) muls16u::i#2 = (word) muls16u::i#1 [phi:muls16u::@4->muls16u::@4#0] -- register_copy 
-  //SEG594 [269] phi (dword) muls16u::m#3 = (dword) muls16u::m#1 [phi:muls16u::@4->muls16u::@4#1] -- register_copy 
-    jmp b4
-  //SEG595 muls16u::@4
-  b4:
+    jmp b2
+  //SEG592 [269] phi from muls16u::@2 to muls16u::@2 [phi:muls16u::@2->muls16u::@2]
+  b2_from_b2:
+  //SEG593 [269] phi (word) muls16u::i#2 = (word) muls16u::i#1 [phi:muls16u::@2->muls16u::@2#0] -- register_copy 
+  //SEG594 [269] phi (dword) muls16u::m#3 = (dword) muls16u::m#1 [phi:muls16u::@2->muls16u::@2#1] -- register_copy 
+    jmp b2
+  //SEG595 muls16u::@2
+  b2:
   //SEG596 [270] (dword) muls16u::m#1 ← (dword) muls16u::m#3 + (word) muls16u::b#0 -- vduz1=vduz1_plus_vwuz2 
     lda m
     clc
@@ -9492,16 +9526,16 @@ muls16u: {
     bne !+
     inc i+1
   !:
-  //SEG598 [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@4 -- vwuz1_neq_vwuz2_then_la1 
+  //SEG598 [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@2 -- vwuz1_neq_vwuz2_then_la1 
     lda i+1
     cmp a+1
-    bne b4_from_b4
+    bne b2_from_b2
     lda i
     cmp a
-    bne b4_from_b4
-  //SEG599 [273] phi from muls16u::@4 to muls16u::@1 [phi:muls16u::@4->muls16u::@1]
-  b1_from_b4:
-  //SEG600 [273] phi (dword) muls16u::return#0 = (dword) muls16u::m#1 [phi:muls16u::@4->muls16u::@1#0] -- register_copy 
+    bne b2_from_b2
+  //SEG599 [273] phi from muls16u::@2 to muls16u::@1 [phi:muls16u::@2->muls16u::@1]
+  b1_from_b2:
+  //SEG600 [273] phi (dword) muls16u::return#0 = (dword) muls16u::m#1 [phi:muls16u::@2->muls16u::@1#0] -- register_copy 
     jmp b1
   //SEG601 [273] phi from muls16u to muls16u::@1 [phi:muls16u->muls16u::@1]
   b1_from_muls16u:
@@ -9625,33 +9659,33 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1_from_b2
-  //SEG638 [291] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  b5_from_b2:
-  //SEG639 [291] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG638 [291] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  b4_from_b2:
+  //SEG639 [291] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG640 [291] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG640 [291] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG641 [291] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG641 [291] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG642 [291] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuxx=vbuc1 
+  //SEG642 [291] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuxx=vbuc1 
     ldx #-1
-    jmp b5
-  //SEG643 [291] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  b5_from_b6:
-  //SEG644 [291] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG645 [291] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG646 [291] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG647 [291] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-    jmp b5
-  //SEG648 mulf_init::@5
-  b5:
+    jmp b4
+  //SEG643 [291] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  b4_from_b5:
+  //SEG644 [291] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG645 [291] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG646 [291] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG647 [291] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+    jmp b4
+  //SEG648 mulf_init::@4
+  b4:
   //SEG649 [292] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuxx 
     lda mulf_sqr1_lo,x
     ldy #0
@@ -9670,32 +9704,32 @@ mulf_init: {
     clc
     adc dir
     tax
-  //SEG653 [296] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuxx_neq_0_then_la1 
+  //SEG653 [296] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b12_from_b5
-  //SEG654 [297] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  b6_from_b5:
-  //SEG655 [297] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b7_from_b4
+  //SEG654 [297] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  b5_from_b4:
+  //SEG655 [297] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-    jmp b6
-  //SEG656 mulf_init::@6
-  b6:
+    jmp b5
+  //SEG656 mulf_init::@5
+  b5:
   //SEG657 [298] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG658 [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG658 [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5_from_b6
+    bne b4_from_b5
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5_from_b6
-    jmp b8
-  //SEG659 mulf_init::@8
-  b8:
+    bne b4_from_b5
+    jmp b6
+  //SEG659 mulf_init::@6
+  b6:
   //SEG660 [300] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -9708,15 +9742,15 @@ mulf_init: {
   breturn:
   //SEG663 [302] return 
     rts
-  //SEG664 [303] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  b12_from_b5:
-    jmp b12
-  //SEG665 mulf_init::@12
-  b12:
-  //SEG666 [297] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  b6_from_b12:
-  //SEG667 [297] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
-    jmp b6
+  //SEG664 [303] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  b7_from_b4:
+    jmp b7
+  //SEG665 mulf_init::@7
+  b7:
+  //SEG666 [297] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  b5_from_b7:
+  //SEG667 [297] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
+    jmp b5
 }
 //SEG668 print_cls
 // Clear the screen. Also resets current line/char cursor.
@@ -9779,7 +9813,7 @@ print_cls: {
   str2: .text " slow:@"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b40
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -9787,108 +9821,108 @@ Removing instruction jmp b3
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b13
-Removing instruction jmp b14
-Removing instruction jmp b15
-Removing instruction jmp b6
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b8
-Removing instruction jmp breturn
 Removing instruction jmp b10
 Removing instruction jmp b11
-Removing instruction jmp b17
-Removing instruction jmp b18
-Removing instruction jmp b22
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b10
-Removing instruction jmp breturn
-Removing instruction jmp b2
-Removing instruction jmp b4
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp b2
-Removing instruction jmp b4
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b3
-Removing instruction jmp b1
-Removing instruction jmp b4
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b3
-Removing instruction jmp b1
-Removing instruction jmp b4
-Removing instruction jmp b2
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp b4
-Removing instruction jmp b8
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b10
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b13
-Removing instruction jmp b14
-Removing instruction jmp b15
-Removing instruction jmp b6
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b8
-Removing instruction jmp breturn
-Removing instruction jmp b10
-Removing instruction jmp b11
-Removing instruction jmp b17
-Removing instruction jmp b18
-Removing instruction jmp b22
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp b7
-Removing instruction jmp b8
-Removing instruction jmp b9
-Removing instruction jmp b10
-Removing instruction jmp breturn
-Removing instruction jmp b4
-Removing instruction jmp b1
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b3
-Removing instruction jmp b2
-Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp b8
-Removing instruction jmp breturn
 Removing instruction jmp b12
+Removing instruction jmp b6
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b7
+Removing instruction jmp breturn
+Removing instruction jmp b8
+Removing instruction jmp b9
+Removing instruction jmp b13
+Removing instruction jmp b14
+Removing instruction jmp b15
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b5
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp breturn
+Removing instruction jmp b5
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp b4
+Removing instruction jmp b2
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b4
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b10
+Removing instruction jmp b11
+Removing instruction jmp b12
+Removing instruction jmp b6
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b7
+Removing instruction jmp breturn
+Removing instruction jmp b8
+Removing instruction jmp b9
+Removing instruction jmp b13
+Removing instruction jmp b14
+Removing instruction jmp b15
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp b7
+Removing instruction jmp b8
+Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp breturn
+Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b3
+Removing instruction jmp b2
+Removing instruction jmp b4
+Removing instruction jmp b5
+Removing instruction jmp b6
+Removing instruction jmp breturn
+Removing instruction jmp b7
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
@@ -9914,56 +9948,55 @@ Replacing instruction ldx #0 with TAX
 Removing instruction ldy #0
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b22_from_b3 with b22
+Replacing label b15_from_b3 with b15
 Replacing label b2_from_b5 with b2
-Replacing label b1_from_b10 with b1
+Replacing label b1_from_b8 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_print_sdword with b1
 Replacing label b1_from_print_sword with b1
-Replacing label b1_from_b6 with b1
+Replacing label b1_from_b5 with b1
 Replacing label b2_from_b1 with b2
-Replacing label b1_from_b6 with b1
+Replacing label b1_from_b5 with b1
 Replacing label b2_from_b1 with b2
-Replacing label b8_from_b2 with b8
-Replacing label b8_from_b8 with b8
-Replacing label b8_from_b8 with b8
-Replacing label b10_from_b10 with b10
-Replacing label b10_from_b10 with b10
-Replacing label b3_from_b10 with b3_from_b8
-Replacing label b22_from_b3 with b22
+Replacing label b4_from_b2 with b4
+Replacing label b3_from_b3 with b3
+Replacing label b3_from_b3 with b3
+Replacing label b4_from_b4 with b4
+Replacing label b4_from_b4 with b4
+Replacing label b15_from_b3 with b15
 Replacing label b2_from_b5 with b2
-Replacing label b1_from_b10 with b1
-Replacing label b4_from_b4 with b4
-Replacing label b4_from_b4 with b4
+Replacing label b1_from_b8 with b1
+Replacing label b2_from_b2 with b2
+Replacing label b2_from_b2 with b2
 Replacing label b2_from_b1 with b2
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b2 with b1
-Replacing label b12_from_b5 with b12
-Replacing label b5_from_b6 with b5
-Replacing label b5_from_b6 with b5
+Replacing label b7_from_b4 with b7
+Replacing label b4_from_b5 with b4
+Replacing label b4_from_b5 with b4
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b40_from_bbegin:
-Removing instruction b40:
-Removing instruction bend_from_b40:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction mulf_init_from_b1:
 Removing instruction b2_from_b1:
 Removing instruction mul16u_compare_from_b2:
 Removing instruction b3_from_b2:
-Removing instruction b1_from_b10:
+Removing instruction b1_from_b8:
 Removing instruction print_str_from_b1:
 Removing instruction b2_from_b5:
-Removing instruction b6_from_b15:
+Removing instruction b6_from_b12:
 Removing instruction b3_from_b6:
-Removing instruction b11_from_b10:
-Removing instruction print_ln_from_b11:
-Removing instruction b18_from_b17:
-Removing instruction print_ln_from_b18:
-Removing instruction b22_from_b3:
-Removing instruction b4_from_b22:
+Removing instruction b9_from_b8:
+Removing instruction print_ln_from_b9:
+Removing instruction b14_from_b13:
+Removing instruction print_ln_from_b14:
+Removing instruction b15_from_b3:
+Removing instruction b4_from_b15:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction b1_from_print_str:
@@ -9983,41 +10016,41 @@ Removing instruction print_ln_from_b10:
 Removing instruction b2_from_print_sdword:
 Removing instruction print_char_from_b2:
 Removing instruction b1_from_print_sdword:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction print_dword_from_b1:
 Removing instruction b2_from_print_sword:
 Removing instruction print_char_from_b2:
 Removing instruction b1_from_print_sword:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction print_word_from_b1:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b6:
+Removing instruction b1_from_b5:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
 Removing instruction breturn:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b6:
+Removing instruction b1_from_b5:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
 Removing instruction breturn:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
-Removing instruction b8_from_b8:
-Removing instruction b3_from_b10:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
+Removing instruction b3_from_b3:
+Removing instruction b1_from_b3:
 Removing instruction breturn:
-Removing instruction b10_from_b10:
-Removing instruction b1_from_b10:
+Removing instruction b4_from_b4:
+Removing instruction b1_from_b8:
 Removing instruction print_str_from_b1:
 Removing instruction b2_from_b5:
-Removing instruction mulf16u_from_b14:
-Removing instruction b6_from_b15:
+Removing instruction mulf16u_from_b11:
+Removing instruction b6_from_b12:
 Removing instruction b3_from_b6:
-Removing instruction b11_from_b10:
-Removing instruction print_ln_from_b11:
-Removing instruction b18_from_b17:
-Removing instruction print_ln_from_b18:
-Removing instruction b22_from_b3:
-Removing instruction b4_from_b22:
+Removing instruction b9_from_b8:
+Removing instruction print_ln_from_b9:
+Removing instruction b14_from_b13:
+Removing instruction print_ln_from_b14:
+Removing instruction b15_from_b3:
+Removing instruction b4_from_b15:
 Removing instruction print_word_from_b1:
 Removing instruction b2_from_b1:
 Removing instruction print_str_from_b2:
@@ -10030,14 +10063,14 @@ Removing instruction b8_from_b7:
 Removing instruction print_str_from_b8:
 Removing instruction b10_from_b9:
 Removing instruction print_ln_from_b10:
-Removing instruction b4_from_b4:
+Removing instruction b2_from_b2:
 Removing instruction breturn:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b3:
-Removing instruction b5_from_b6:
-Removing instruction b12_from_b5:
-Removing instruction b6_from_b12:
+Removing instruction b4_from_b5:
+Removing instruction b7_from_b4:
+Removing instruction b5_from_b7:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
@@ -10048,18 +10081,18 @@ Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_mul16s_compare:
 Removing instruction b2_from_b1:
-Removing instruction b13:
-Removing instruction b14:
-Removing instruction b15:
-Removing instruction b6:
-Removing instruction b4_from_b3:
-Removing instruction b8:
-Removing instruction mul16s_error_from_b8:
 Removing instruction b10:
 Removing instruction b11:
-Removing instruction b17:
-Removing instruction print_str_from_b17:
-Removing instruction b18:
+Removing instruction b12:
+Removing instruction b6:
+Removing instruction b4_from_b3:
+Removing instruction b7:
+Removing instruction mul16s_error_from_b7:
+Removing instruction b8:
+Removing instruction b9:
+Removing instruction b13:
+Removing instruction print_str_from_b13:
+Removing instruction b14:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction print_str_from_mul16s_error:
@@ -10078,7 +10111,7 @@ Removing instruction print_sdword_from_b9:
 Removing instruction b10:
 Removing instruction breturn:
 Removing instruction b2:
-Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn:
 Removing instruction print_word_from_print_dword:
 Removing instruction b1:
@@ -10094,38 +10127,38 @@ Removing instruction print_char_from_b1:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b2:
-Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn:
 Removing instruction mulf16u_from_mulf16s:
-Removing instruction b6:
+Removing instruction b5:
 Removing instruction b3:
 Removing instruction b4:
 Removing instruction breturn:
 Removing instruction mul16u_from_mul16s:
-Removing instruction b6:
+Removing instruction b5:
 Removing instruction b3:
 Removing instruction b4:
 Removing instruction b1_from_mul16u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
-Removing instruction b4:
-Removing instruction b8_from_b4:
+Removing instruction b3:
+Removing instruction b1_from_b4:
+Removing instruction b2:
+Removing instruction b3_from_b2:
 Removing instruction b1_from_mul16u_compare:
 Removing instruction b2_from_b1:
-Removing instruction b13:
-Removing instruction mul16u_from_b13:
-Removing instruction b14:
-Removing instruction b15:
+Removing instruction b10:
+Removing instruction mul16u_from_b10:
+Removing instruction b11:
+Removing instruction b12:
 Removing instruction b6:
 Removing instruction b4_from_b3:
+Removing instruction b7:
+Removing instruction mul16u_error_from_b7:
 Removing instruction b8:
-Removing instruction mul16u_error_from_b8:
-Removing instruction b10:
-Removing instruction b11:
-Removing instruction b17:
-Removing instruction print_str_from_b17:
-Removing instruction b18:
+Removing instruction b9:
+Removing instruction b13:
+Removing instruction print_str_from_b13:
+Removing instruction b14:
 Removing instruction print_str_from_mul16u_error:
 Removing instruction b1:
 Removing instruction b2:
@@ -10141,13 +10174,13 @@ Removing instruction b9:
 Removing instruction print_dword_from_b9:
 Removing instruction b10:
 Removing instruction breturn:
-Removing instruction b4_from_muls16u:
-Removing instruction b1_from_b4:
+Removing instruction b2_from_muls16u:
+Removing instruction b1_from_b2:
 Removing instruction b1_from_mulf_init:
 Removing instruction b3:
-Removing instruction b5_from_b2:
-Removing instruction b6_from_b5:
-Removing instruction b8:
+Removing instruction b4_from_b2:
+Removing instruction b5_from_b4:
+Removing instruction b6:
 Removing instruction breturn:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
@@ -10155,47 +10188,47 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b4 in beq b22
-Skipping double jump to b3 in jmp b3_from_b8
-Skipping double jump to b4 in beq b22
-Skipping double jump to b6 in bne b12
+Skipping double jump to b4 in beq b15
+Skipping double jump to b1 in jmp b1_from_b4
+Skipping double jump to b4 in beq b15
+Skipping double jump to b5 in bne b7
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b3_from_b15 to b6
-Relabelling long label b3_from_b8 to b1
-Relabelling long label b3_from_b4 to b2
-Relabelling long label b10_from_muls16s to b4
-Relabelling long label b3_from_b15 to b6
-Relabelling long label b1_from_muls16u to b2
+Relabelling long label b3_from_b12 to b6
+Relabelling long label b1_from_b4 to b2
+Relabelling long label b1_from_b2 to b5
+Relabelling long label b4_from_muls16s to b6
+Relabelling long label b3_from_b12 to b6
+Relabelling long label b1_from_muls16u to b3
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b8
-Removing instruction jmp b10
-Removing instruction jmp b1
-Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b2
+Removing instruction jmp b2
+Removing instruction jmp b1
+Removing instruction jmp b4
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
 Removing instruction lda a+1
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
-Removing instruction b22:
-Removing instruction b1:
-Removing instruction b22:
-Removing instruction b12:
+Removing instruction b15:
+Removing instruction b2:
+Removing instruction b15:
+Removing instruction b7:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b4
 Removing unreachable instruction jmp b4
-Removing unreachable instruction jmp b6
+Removing unreachable instruction jmp b5
 Succesful ASM optimization Pass5UnreachableCodeElimination
 Fixing long branch [110] bne b1 to beq
 Fixing long branch [831] bne b1 to beq
 
 FINAL SYMBOL TABLE
-(label) @40
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -10214,7 +10247,7 @@ FINAL SYMBOL TABLE
 (label) mul16s::@2
 (label) mul16s::@3
 (label) mul16s::@4
-(label) mul16s::@6
+(label) mul16s::@5
 (label) mul16s::@return
 (signed word) mul16s::a
 (signed word) mul16s::a#0 a zp ZP_WORD:3 7.357142857142858
@@ -10233,18 +10266,18 @@ FINAL SYMBOL TABLE
 (label) mul16s_compare::@1
 (label) mul16s_compare::@10
 (label) mul16s_compare::@11
+(label) mul16s_compare::@12
 (label) mul16s_compare::@13
 (label) mul16s_compare::@14
 (label) mul16s_compare::@15
-(label) mul16s_compare::@17
-(label) mul16s_compare::@18
 (label) mul16s_compare::@2
-(label) mul16s_compare::@22
 (label) mul16s_compare::@3
 (label) mul16s_compare::@4
 (label) mul16s_compare::@5
 (label) mul16s_compare::@6
+(label) mul16s_compare::@7
 (label) mul16s_compare::@8
+(label) mul16s_compare::@9
 (label) mul16s_compare::@return
 (signed word) mul16s_compare::a
 (signed word) mul16s_compare::a#1 a zp ZP_WORD:3 17.862068965517242
@@ -10297,8 +10330,8 @@ FINAL SYMBOL TABLE
 (byte/word~) mul16u::$1 reg byte a 2002.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:9 1001.0
@@ -10325,18 +10358,18 @@ FINAL SYMBOL TABLE
 (label) mul16u_compare::@1
 (label) mul16u_compare::@10
 (label) mul16u_compare::@11
+(label) mul16u_compare::@12
 (label) mul16u_compare::@13
 (label) mul16u_compare::@14
 (label) mul16u_compare::@15
-(label) mul16u_compare::@17
-(label) mul16u_compare::@18
 (label) mul16u_compare::@2
-(label) mul16u_compare::@22
 (label) mul16u_compare::@3
 (label) mul16u_compare::@4
 (label) mul16u_compare::@5
 (label) mul16u_compare::@6
+(label) mul16u_compare::@7
 (label) mul16u_compare::@8
+(label) mul16u_compare::@9
 (label) mul16u_compare::@return
 (word) mul16u_compare::a
 (word) mul16u_compare::a#1 a zp ZP_WORD:21 17.862068965517242
@@ -10394,7 +10427,7 @@ FINAL SYMBOL TABLE
 (label) mulf16s::@2
 (label) mulf16s::@3
 (label) mulf16s::@4
-(label) mulf16s::@6
+(label) mulf16s::@5
 (label) mulf16s::@return
 (signed word) mulf16s::a
 (signed word) mulf16s::a#0 a zp ZP_WORD:3 7.357142857142858
@@ -10434,12 +10467,12 @@ FINAL SYMBOL TABLE
 (byte~) mulf_init::$12 reg byte a 22.0
 (byte~) mulf_init::$8 reg byte a 22.0
 (label) mulf_init::@1
-(label) mulf_init::@12
 (label) mulf_init::@2
 (label) mulf_init::@3
+(label) mulf_init::@4
 (label) mulf_init::@5
 (label) mulf_init::@6
-(label) mulf_init::@8
+(label) mulf_init::@7
 (label) mulf_init::@return
 (byte) mulf_init::c
 (byte) mulf_init::c#1 reg byte x 2.357142857142857
@@ -10480,10 +10513,10 @@ FINAL SYMBOL TABLE
 (byte[$200]) mulf_sqr2_lo
 (const byte[$200]) mulf_sqr2_lo#0 mulf_sqr2_lo = { fill( $200, 0) }
 (signed dword()) muls16s((signed word) muls16s::a , (signed word) muls16s::b)
-(label) muls16s::@10
+(label) muls16s::@1
+(label) muls16s::@2
 (label) muls16s::@3
 (label) muls16s::@4
-(label) muls16s::@8
 (label) muls16s::@return
 (signed word) muls16s::a
 (signed word) muls16s::a#0 a zp ZP_WORD:3 175.58333333333334
@@ -10505,7 +10538,7 @@ FINAL SYMBOL TABLE
 (signed dword) muls16s::return#2 return zp ZP_DWORD:11 202.0
 (dword()) muls16u((word) muls16u::a , (word) muls16u::b)
 (label) muls16u::@1
-(label) muls16u::@4
+(label) muls16u::@2
 (label) muls16u::@return
 (word) muls16u::a
 (word) muls16u::a#0 a zp ZP_WORD:21 157.71428571428572
@@ -10580,7 +10613,7 @@ FINAL SYMBOL TABLE
 (void()) print_sdword((signed dword) print_sdword::dw)
 (label) print_sdword::@1
 (label) print_sdword::@2
-(label) print_sdword::@4
+(label) print_sdword::@3
 (label) print_sdword::@return
 (signed dword) print_sdword::dw
 (signed dword) print_sdword::dw#0 dw zp ZP_DWORD:11 4.0
@@ -10600,7 +10633,7 @@ FINAL SYMBOL TABLE
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:3 4.0
@@ -10665,10 +10698,10 @@ Score: 436908
   .label print_char_cursor = $f
   .label print_line_cursor = 7
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @40 [phi:@begin->@40]
-//SEG5 @40
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @40 to @end [phi:@40->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -10725,11 +10758,11 @@ mul16s_compare: {
     lda #>-$7fff
     sta a+1
   //SEG32 [14] phi (byte*) print_char_cursor#143 = (byte*~) print_char_cursor#176 [phi:mul16s_compare->mul16s_compare::@1#3] -- register_copy 
-  //SEG33 [14] phi from mul16s_compare::@10 to mul16s_compare::@1 [phi:mul16s_compare::@10->mul16s_compare::@1]
-  //SEG34 [14] phi (byte) mul16s_compare::i#12 = (byte) mul16s_compare::i#1 [phi:mul16s_compare::@10->mul16s_compare::@1#0] -- register_copy 
-  //SEG35 [14] phi (signed word) mul16s_compare::b#6 = (signed word) mul16s_compare::b#1 [phi:mul16s_compare::@10->mul16s_compare::@1#1] -- register_copy 
-  //SEG36 [14] phi (signed word) mul16s_compare::a#6 = (signed word) mul16s_compare::a#1 [phi:mul16s_compare::@10->mul16s_compare::@1#2] -- register_copy 
-  //SEG37 [14] phi (byte*) print_char_cursor#143 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@10->mul16s_compare::@1#3] -- register_copy 
+  //SEG33 [14] phi from mul16s_compare::@8 to mul16s_compare::@1 [phi:mul16s_compare::@8->mul16s_compare::@1]
+  //SEG34 [14] phi (byte) mul16s_compare::i#12 = (byte) mul16s_compare::i#1 [phi:mul16s_compare::@8->mul16s_compare::@1#0] -- register_copy 
+  //SEG35 [14] phi (signed word) mul16s_compare::b#6 = (signed word) mul16s_compare::b#1 [phi:mul16s_compare::@8->mul16s_compare::@1#1] -- register_copy 
+  //SEG36 [14] phi (signed word) mul16s_compare::a#6 = (signed word) mul16s_compare::a#1 [phi:mul16s_compare::@8->mul16s_compare::@1#2] -- register_copy 
+  //SEG37 [14] phi (byte*) print_char_cursor#143 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@8->mul16s_compare::@1#3] -- register_copy 
   //SEG38 mul16s_compare::@1
   b1:
   //SEG39 [15] call print_str 
@@ -10773,21 +10806,21 @@ mul16s_compare: {
   //SEG56 [21] call muls16s 
     jsr muls16s
   //SEG57 [22] (signed dword) muls16s::return#2 ← (signed dword) muls16s::return#0
-  //SEG58 mul16s_compare::@13
+  //SEG58 mul16s_compare::@10
   //SEG59 [23] (signed dword) mul16s_compare::ms#0 ← (signed dword) muls16s::return#2
   //SEG60 [24] (signed word) mul16s::a#0 ← (signed word) mul16s_compare::a#1
   //SEG61 [25] (signed word) mul16s::b#0 ← (signed word) mul16s_compare::b#1
   //SEG62 [26] call mul16s 
     jsr mul16s
   //SEG63 [27] (signed dword) mul16s::return#2 ← (signed dword) mul16s::return#0
-  //SEG64 mul16s_compare::@14
+  //SEG64 mul16s_compare::@11
   //SEG65 [28] (signed dword) mul16s_compare::mn#0 ← (signed dword) mul16s::return#2
   //SEG66 [29] (signed word) mulf16s::a#0 ← (signed word) mul16s_compare::a#1
   //SEG67 [30] (signed word) mulf16s::b#0 ← (signed word) mul16s_compare::b#1
   //SEG68 [31] call mulf16s 
     jsr mulf16s
   //SEG69 [32] (signed dword) mulf16s::return#2 ← (signed dword) mulf16s::return#0
-  //SEG70 mul16s_compare::@15
+  //SEG70 mul16s_compare::@12
   //SEG71 [33] (signed dword) mul16s_compare::mf#0 ← (signed dword) mulf16s::return#2
   //SEG72 [34] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mf#0) goto mul16s_compare::@3 -- vdsz1_eq_vdsz2_then_la1 
     lda ms
@@ -10803,19 +10836,19 @@ mul16s_compare: {
     cmp mf+3
     beq b6
   !:
-  //SEG73 [35] phi from mul16s_compare::@15 to mul16s_compare::@6 [phi:mul16s_compare::@15->mul16s_compare::@6]
+  //SEG73 [35] phi from mul16s_compare::@12 to mul16s_compare::@6 [phi:mul16s_compare::@12->mul16s_compare::@6]
   //SEG74 mul16s_compare::@6
   //SEG75 [36] phi from mul16s_compare::@6 to mul16s_compare::@3 [phi:mul16s_compare::@6->mul16s_compare::@3]
   //SEG76 [36] phi (byte) mul16s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mul16s_compare::@6->mul16s_compare::@3#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b3
-  //SEG77 [36] phi from mul16s_compare::@15 to mul16s_compare::@3 [phi:mul16s_compare::@15->mul16s_compare::@3]
+  //SEG77 [36] phi from mul16s_compare::@12 to mul16s_compare::@3 [phi:mul16s_compare::@12->mul16s_compare::@3]
   b6:
-  //SEG78 [36] phi (byte) mul16s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16s_compare::@15->mul16s_compare::@3#0] -- vbuxx=vbuc1 
+  //SEG78 [36] phi (byte) mul16s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16s_compare::@12->mul16s_compare::@3#0] -- vbuxx=vbuc1 
     ldx #1
   //SEG79 mul16s_compare::@3
   b3:
-  //SEG80 [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@22 -- vdsz1_eq_vdsz2_then_la1 
+  //SEG80 [37] if((signed dword) mul16s_compare::ms#0==(signed dword) mul16s_compare::mn#0) goto mul16s_compare::@15 -- vdsz1_eq_vdsz2_then_la1 
     lda ms
     cmp mn
     bne !+
@@ -10837,7 +10870,7 @@ mul16s_compare: {
   //SEG84 [39] if((byte) mul16s_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s_compare::@5 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b5
-  //SEG85 mul16s_compare::@8
+  //SEG85 mul16s_compare::@7
   //SEG86 [40] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -10847,7 +10880,7 @@ mul16s_compare: {
   //SEG90 [44] (signed dword) mul16s_error::mn#0 ← (signed dword) mul16s_compare::mn#0
   //SEG91 [45] (signed dword) mul16s_error::mf#0 ← (signed dword) mul16s_compare::mf#0
   //SEG92 [46] call mul16s_error 
-  //SEG93 [71] phi from mul16s_compare::@8 to mul16s_error [phi:mul16s_compare::@8->mul16s_error]
+  //SEG93 [71] phi from mul16s_compare::@7 to mul16s_error [phi:mul16s_compare::@7->mul16s_error]
     jsr mul16s_error
   //SEG94 mul16s_compare::@return
   breturn:
@@ -10860,7 +10893,7 @@ mul16s_compare: {
   //SEG98 [49] if((byte) mul16s_compare::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16s_compare::@2 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$10
     bne b2
-  //SEG99 mul16s_compare::@10
+  //SEG99 mul16s_compare::@8
   //SEG100 [50] (byte) mul16s_compare::i#1 ← ++ (byte) mul16s_compare::i#12 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG101 [51] if((byte) mul16s_compare::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16s_compare::@1 -- vbuz1_neq_vbuc1_then_la1 
@@ -10869,40 +10902,40 @@ mul16s_compare: {
     beq !b1+
     jmp b1
   !b1:
-  //SEG102 [52] phi from mul16s_compare::@10 to mul16s_compare::@11 [phi:mul16s_compare::@10->mul16s_compare::@11]
-  //SEG103 mul16s_compare::@11
+  //SEG102 [52] phi from mul16s_compare::@8 to mul16s_compare::@9 [phi:mul16s_compare::@8->mul16s_compare::@9]
+  //SEG103 mul16s_compare::@9
   //SEG104 [53] call print_ln 
-  //SEG105 [59] phi from mul16s_compare::@11 to print_ln [phi:mul16s_compare::@11->print_ln]
-  //SEG106 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@11->print_ln#0] -- register_copy 
-  //SEG107 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@11->print_ln#1] -- register_copy 
+  //SEG105 [59] phi from mul16s_compare::@9 to print_ln [phi:mul16s_compare::@9->print_ln]
+  //SEG106 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@9->print_ln#0] -- register_copy 
+  //SEG107 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@9->print_ln#1] -- register_copy 
     jsr print_ln
-  //SEG108 mul16s_compare::@17
+  //SEG108 mul16s_compare::@13
   //SEG109 [54] (byte*~) print_char_cursor#185 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG110 [55] call print_str 
-  //SEG111 [64] phi from mul16s_compare::@17 to print_str [phi:mul16s_compare::@17->print_str]
-  //SEG112 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#185 [phi:mul16s_compare::@17->print_str#0] -- register_copy 
-  //SEG113 [64] phi (byte*) print_str::str#17 = (const string) mul16s_compare::str1 [phi:mul16s_compare::@17->print_str#1] -- pbuz1=pbuc1 
+  //SEG111 [64] phi from mul16s_compare::@13 to print_str [phi:mul16s_compare::@13->print_str]
+  //SEG112 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#185 [phi:mul16s_compare::@13->print_str#0] -- register_copy 
+  //SEG113 [64] phi (byte*) print_str::str#17 = (const string) mul16s_compare::str1 [phi:mul16s_compare::@13->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG114 [56] phi from mul16s_compare::@17 to mul16s_compare::@18 [phi:mul16s_compare::@17->mul16s_compare::@18]
-  //SEG115 mul16s_compare::@18
+  //SEG114 [56] phi from mul16s_compare::@13 to mul16s_compare::@14 [phi:mul16s_compare::@13->mul16s_compare::@14]
+  //SEG115 mul16s_compare::@14
   //SEG116 [57] call print_ln 
-  //SEG117 [59] phi from mul16s_compare::@18 to print_ln [phi:mul16s_compare::@18->print_ln]
-  //SEG118 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@18->print_ln#0] -- register_copy 
-  //SEG119 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@18->print_ln#1] -- register_copy 
+  //SEG117 [59] phi from mul16s_compare::@14 to print_ln [phi:mul16s_compare::@14->print_ln]
+  //SEG118 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16s_compare::@14->print_ln#0] -- register_copy 
+  //SEG119 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16s_compare::@14->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG120 [58] phi from mul16s_compare::@3 to mul16s_compare::@22 [phi:mul16s_compare::@3->mul16s_compare::@22]
-  //SEG121 mul16s_compare::@22
-  //SEG122 [38] phi from mul16s_compare::@22 to mul16s_compare::@4 [phi:mul16s_compare::@22->mul16s_compare::@4]
-  //SEG123 [38] phi (byte) mul16s_compare::ok#3 = (byte) mul16s_compare::ok#4 [phi:mul16s_compare::@22->mul16s_compare::@4#0] -- register_copy 
+  //SEG120 [58] phi from mul16s_compare::@3 to mul16s_compare::@15 [phi:mul16s_compare::@3->mul16s_compare::@15]
+  //SEG121 mul16s_compare::@15
+  //SEG122 [38] phi from mul16s_compare::@15 to mul16s_compare::@4 [phi:mul16s_compare::@15->mul16s_compare::@4]
+  //SEG123 [38] phi (byte) mul16s_compare::ok#3 = (byte) mul16s_compare::ok#4 [phi:mul16s_compare::@15->mul16s_compare::@4#0] -- register_copy 
     str1: .text "signed word multiply results match!@"
 }
 //SEG124 print_ln
@@ -11108,7 +11141,7 @@ print_sdword: {
   //SEG213 [123] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sdword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG214 print_sdword::@4
+  //SEG214 print_sdword::@3
   //SEG215 [98] (signed dword) print_sdword::dw#0 ← - (signed dword) print_sdword::dw#4 -- vdsz1=_neg_vdsz1 
     sec
     lda dw
@@ -11127,9 +11160,9 @@ print_sdword: {
     eor #$ff
     adc #0
     sta dw+3
-  //SEG216 [99] phi from print_sdword print_sdword::@4 to print_sdword::@1 [phi:print_sdword/print_sdword::@4->print_sdword::@1]
-  //SEG217 [99] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#128 [phi:print_sdword/print_sdword::@4->print_sdword::@1#0] -- register_copy 
-  //SEG218 [99] phi (signed dword) print_sdword::dw#5 = (signed dword) print_sdword::dw#4 [phi:print_sdword/print_sdword::@4->print_sdword::@1#1] -- register_copy 
+  //SEG216 [99] phi from print_sdword print_sdword::@3 to print_sdword::@1 [phi:print_sdword/print_sdword::@3->print_sdword::@1]
+  //SEG217 [99] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#128 [phi:print_sdword/print_sdword::@3->print_sdword::@1#0] -- register_copy 
+  //SEG218 [99] phi (signed dword) print_sdword::dw#5 = (signed dword) print_sdword::dw#4 [phi:print_sdword/print_sdword::@3->print_sdword::@1#1] -- register_copy 
   //SEG219 print_sdword::@1
   b1:
   //SEG220 [100] (dword) print_dword::dw#0 ← ((dword)) (signed dword) print_sdword::dw#5 -- vduz1=_dword_vdsz1 
@@ -11263,7 +11296,7 @@ print_sword: {
   //SEG283 [123] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG284 print_sword::@4
+  //SEG284 print_sword::@3
   //SEG285 [131] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -11274,9 +11307,9 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG286 [132] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
-  //SEG287 [132] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#128 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG288 [132] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  //SEG286 [132] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
+  //SEG287 [132] phi (byte*) print_char_cursor#130 = (byte*) print_char_cursor#128 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG288 [132] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
   //SEG289 print_sword::@1
   b1:
   //SEG290 [133] (word~) print_word::w#11 ← (word)(signed word) print_sword::w#4
@@ -11318,7 +11351,7 @@ mulf16s: {
   //SEG303 [153] phi (word) mulf16u::a#2 = (word~) mulf16u::a#4 [phi:mulf16s->mulf16u#1] -- register_copy 
     jsr mulf16u
   //SEG304 [139] (dword) mulf16u::return#2 ← (dword) mulf16u::return#0
-  //SEG305 mulf16s::@6
+  //SEG305 mulf16s::@5
   //SEG306 [140] (dword) mulf16s::m#0 ← (dword) mulf16u::return#2
   //SEG307 [141] if((signed word) mulf16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
@@ -11342,8 +11375,8 @@ mulf16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG312 [145] phi from mulf16s::@3 mulf16s::@6 to mulf16s::@1 [phi:mulf16s::@3/mulf16s::@6->mulf16s::@1]
-  //SEG313 [145] phi (dword) mulf16s::m#5 = (dword) mulf16s::m#1 [phi:mulf16s::@3/mulf16s::@6->mulf16s::@1#0] -- register_copy 
+  //SEG312 [145] phi from mulf16s::@3 mulf16s::@5 to mulf16s::@1 [phi:mulf16s::@3/mulf16s::@5->mulf16s::@1]
+  //SEG313 [145] phi (dword) mulf16s::m#5 = (dword) mulf16s::m#1 [phi:mulf16s::@3/mulf16s::@5->mulf16s::@1#0] -- register_copy 
   //SEG314 mulf16s::@1
   b1:
   //SEG315 [146] if((signed word) mulf16s::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf16s::@2 -- vwsz1_ge_0_then_la1 
@@ -11533,7 +11566,7 @@ mul16s: {
   //SEG339 [176] phi (word) mul16u::b#2 = (word~) mul16u::b#3 [phi:mul16s->mul16u#1] -- register_copy 
     jsr mul16u
   //SEG340 [162] (dword) mul16u::return#2 ← (dword) mul16u::res#2
-  //SEG341 mul16s::@6
+  //SEG341 mul16s::@5
   //SEG342 [163] (dword) mul16s::m#0 ← (dword) mul16u::return#2
   //SEG343 [164] if((signed word) mul16s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@1 -- vwsz1_ge_0_then_la1 
     lda a+1
@@ -11557,8 +11590,8 @@ mul16s: {
     sta m+2
     lda _16+1
     sta m+3
-  //SEG348 [168] phi from mul16s::@3 mul16s::@6 to mul16s::@1 [phi:mul16s::@3/mul16s::@6->mul16s::@1]
-  //SEG349 [168] phi (dword) mul16s::m#5 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@6->mul16s::@1#0] -- register_copy 
+  //SEG348 [168] phi from mul16s::@3 mul16s::@5 to mul16s::@1 [phi:mul16s::@3/mul16s::@5->mul16s::@1]
+  //SEG349 [168] phi (dword) mul16s::m#5 = (dword) mul16s::m#1 [phi:mul16s::@3/mul16s::@5->mul16s::@1#0] -- register_copy 
   //SEG350 mul16s::@1
   b1:
   //SEG351 [169] if((signed word) mul16s::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16s::@2 -- vwsz1_ge_0_then_la1 
@@ -11632,10 +11665,10 @@ mul16u: {
   //SEG373 [181] (byte/word~) mul16u::$1 ← (word) mul16u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vwuz1_band_vbuc1 
     lda a
     and #1
-  //SEG374 [182] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG374 [182] if((byte/word~) mul16u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG375 mul16u::@6
+    beq b4
+  //SEG375 mul16u::@3
   //SEG376 [183] (dword) mul16u::res#1 ← (dword) mul16u::res#2 + (dword) mul16u::mb#2 -- vduz1=vduz1_plus_vduz2 
     lda res
     clc
@@ -11650,10 +11683,10 @@ mul16u: {
     lda res+3
     adc mb+3
     sta res+3
-  //SEG377 [184] phi from mul16u::@2 mul16u::@6 to mul16u::@8 [phi:mul16u::@2/mul16u::@6->mul16u::@8]
-  //SEG378 [184] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@6->mul16u::@8#0] -- register_copy 
-  //SEG379 mul16u::@8
-  b8:
+  //SEG377 [184] phi from mul16u::@2 mul16u::@3 to mul16u::@4 [phi:mul16u::@2/mul16u::@3->mul16u::@4]
+  //SEG378 [184] phi (dword) mul16u::res#6 = (dword) mul16u::res#2 [phi:mul16u::@2/mul16u::@3->mul16u::@4#0] -- register_copy 
+  //SEG379 mul16u::@4
+  b4:
   //SEG380 [185] (word) mul16u::a#0 ← (word) mul16u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_ror_1 
     clc
     ror a+1
@@ -11663,10 +11696,10 @@ mul16u: {
     rol mb+1
     rol mb+2
     rol mb+3
-  //SEG382 [178] phi from mul16u::@8 to mul16u::@1 [phi:mul16u::@8->mul16u::@1]
-  //SEG383 [178] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@8->mul16u::@1#0] -- register_copy 
-  //SEG384 [178] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@8->mul16u::@1#1] -- register_copy 
-  //SEG385 [178] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@8->mul16u::@1#2] -- register_copy 
+  //SEG382 [178] phi from mul16u::@4 to mul16u::@1 [phi:mul16u::@4->mul16u::@1]
+  //SEG383 [178] phi (dword) mul16u::mb#2 = (dword) mul16u::mb#1 [phi:mul16u::@4->mul16u::@1#0] -- register_copy 
+  //SEG384 [178] phi (dword) mul16u::res#2 = (dword) mul16u::res#6 [phi:mul16u::@4->mul16u::@1#1] -- register_copy 
+  //SEG385 [178] phi (word) mul16u::a#3 = (word) mul16u::a#0 [phi:mul16u::@4->mul16u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG386 muls16s
@@ -11680,31 +11713,31 @@ muls16s: {
     .label i = 9
     .label a = 3
     .label b = 5
-  //SEG387 [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@10 -- vwsz1_lt_0_then_la1 
+  //SEG387 [187] if((signed word) muls16s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@4 -- vwsz1_lt_0_then_la1 
     lda a+1
-    bmi b4
-  //SEG388 muls16s::@4
-  //SEG389 [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@3 -- vwsz1_le_0_then_la1 
-    bmi b2
+    bmi b6
+  //SEG388 muls16s::@2
+  //SEG389 [188] if((signed word) muls16s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls16s::@1 -- vwsz1_le_0_then_la1 
+    bmi b5
     bne !+
     lda a
-    beq b2
+    beq b5
   !:
-  //SEG390 [189] phi from muls16s::@4 to muls16s::@8 [phi:muls16s::@4->muls16s::@8]
-  //SEG391 [189] phi (signed word) muls16s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@4->muls16s::@8#0] -- vwsz1=vbuc1 
+  //SEG390 [189] phi from muls16s::@2 to muls16s::@3 [phi:muls16s::@2->muls16s::@3]
+  //SEG391 [189] phi (signed word) muls16s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@2->muls16s::@3#0] -- vwsz1=vbuc1 
     lda #0
     sta j
     sta j+1
-  //SEG392 [189] phi (signed dword) muls16s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@4->muls16s::@8#1] -- vdsz1=vbsc1 
+  //SEG392 [189] phi (signed dword) muls16s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@2->muls16s::@3#1] -- vdsz1=vbsc1 
     sta m
     sta m+1
     sta m+2
     sta m+3
-  //SEG393 [189] phi from muls16s::@8 to muls16s::@8 [phi:muls16s::@8->muls16s::@8]
-  //SEG394 [189] phi (signed word) muls16s::j#2 = (signed word) muls16s::j#1 [phi:muls16s::@8->muls16s::@8#0] -- register_copy 
-  //SEG395 [189] phi (signed dword) muls16s::m#3 = (signed dword) muls16s::m#1 [phi:muls16s::@8->muls16s::@8#1] -- register_copy 
-  //SEG396 muls16s::@8
-  b8:
+  //SEG393 [189] phi from muls16s::@3 to muls16s::@3 [phi:muls16s::@3->muls16s::@3]
+  //SEG394 [189] phi (signed word) muls16s::j#2 = (signed word) muls16s::j#1 [phi:muls16s::@3->muls16s::@3#0] -- register_copy 
+  //SEG395 [189] phi (signed dword) muls16s::m#3 = (signed dword) muls16s::m#1 [phi:muls16s::@3->muls16s::@3#1] -- register_copy 
+  //SEG396 muls16s::@3
+  b3:
   //SEG397 [190] (signed dword) muls16s::m#1 ← (signed dword) muls16s::m#3 + (signed word) muls16s::b#0 -- vdsz1=vdsz1_plus_vwsz2 
     lda b+1
     ora #$7f
@@ -11730,45 +11763,45 @@ muls16s: {
     bne !+
     inc j+1
   !:
-  //SEG399 [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@8 -- vwsz1_neq_vwsz2_then_la1 
+  //SEG399 [192] if((signed word) muls16s::j#1!=(signed word) muls16s::a#0) goto muls16s::@3 -- vwsz1_neq_vwsz2_then_la1 
     lda j+1
     cmp a+1
-    bne b8
+    bne b3
     lda j
     cmp a
-    bne b8
-  //SEG400 [193] phi from muls16s::@10 muls16s::@8 to muls16s::@3 [phi:muls16s::@10/muls16s::@8->muls16s::@3]
-  //SEG401 [193] phi (signed dword) muls16s::return#0 = (signed dword) muls16s::m#2 [phi:muls16s::@10/muls16s::@8->muls16s::@3#0] -- register_copy 
-    jmp b3
-  //SEG402 [193] phi from muls16s::@4 to muls16s::@3 [phi:muls16s::@4->muls16s::@3]
-  b2:
-  //SEG403 [193] phi (signed dword) muls16s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@4->muls16s::@3#0] -- vdsz1=vbsc1 
+    bne b3
+  //SEG400 [193] phi from muls16s::@3 muls16s::@4 to muls16s::@1 [phi:muls16s::@3/muls16s::@4->muls16s::@1]
+  //SEG401 [193] phi (signed dword) muls16s::return#0 = (signed dword) muls16s::m#1 [phi:muls16s::@3/muls16s::@4->muls16s::@1#0] -- register_copy 
+    jmp b1
+  //SEG402 [193] phi from muls16s::@2 to muls16s::@1 [phi:muls16s::@2->muls16s::@1]
+  b5:
+  //SEG403 [193] phi (signed dword) muls16s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s::@2->muls16s::@1#0] -- vdsz1=vbsc1 
     lda #0
     sta return
     sta return+1
     sta return+2
     sta return+3
-  //SEG404 muls16s::@3
-  b3:
+  //SEG404 muls16s::@1
+  b1:
   //SEG405 muls16s::@return
   //SEG406 [194] return 
     rts
-  //SEG407 [195] phi from muls16s to muls16s::@10 [phi:muls16s->muls16s::@10]
-  b4:
-  //SEG408 [195] phi (signed word) muls16s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@10#0] -- vwsz1=vbuc1 
+  //SEG407 [195] phi from muls16s to muls16s::@4 [phi:muls16s->muls16s::@4]
+  b6:
+  //SEG408 [195] phi (signed word) muls16s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@4#0] -- vwsz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG409 [195] phi (signed dword) muls16s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@10#1] -- vdsz1=vbsc1 
+  //SEG409 [195] phi (signed dword) muls16s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16s->muls16s::@4#1] -- vdsz1=vbsc1 
     sta m
     sta m+1
     sta m+2
     sta m+3
-  //SEG410 [195] phi from muls16s::@10 to muls16s::@10 [phi:muls16s::@10->muls16s::@10]
-  //SEG411 [195] phi (signed word) muls16s::i#2 = (signed word) muls16s::i#1 [phi:muls16s::@10->muls16s::@10#0] -- register_copy 
-  //SEG412 [195] phi (signed dword) muls16s::m#5 = (signed dword) muls16s::m#2 [phi:muls16s::@10->muls16s::@10#1] -- register_copy 
-  //SEG413 muls16s::@10
-  b10:
+  //SEG410 [195] phi from muls16s::@4 to muls16s::@4 [phi:muls16s::@4->muls16s::@4]
+  //SEG411 [195] phi (signed word) muls16s::i#2 = (signed word) muls16s::i#1 [phi:muls16s::@4->muls16s::@4#0] -- register_copy 
+  //SEG412 [195] phi (signed dword) muls16s::m#5 = (signed dword) muls16s::m#2 [phi:muls16s::@4->muls16s::@4#1] -- register_copy 
+  //SEG413 muls16s::@4
+  b4:
   //SEG414 [196] (signed dword) muls16s::m#2 ← (signed dword) muls16s::m#5 - (signed word) muls16s::b#0 -- vdsz1=vdsz1_minus_vwsz2 
     lda b+1
     ora #$7f
@@ -11795,14 +11828,14 @@ muls16s: {
     dec i+1
   !:
     dec i
-  //SEG416 [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@10 -- vwsz1_neq_vwsz2_then_la1 
+  //SEG416 [198] if((signed word) muls16s::i#1!=(signed word) muls16s::a#0) goto muls16s::@4 -- vwsz1_neq_vwsz2_then_la1 
     lda i+1
     cmp a+1
-    bne b10
+    bne b4
     lda i
     cmp a
-    bne b10
-    jmp b3
+    bne b4
+    jmp b1
 }
 //SEG417 mul16u_compare
 // Perform many possible word multiplications (slow and fast) and compare the results
@@ -11828,11 +11861,11 @@ mul16u_compare: {
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG423 [200] phi from mul16u_compare::@10 to mul16u_compare::@1 [phi:mul16u_compare::@10->mul16u_compare::@1]
-  //SEG424 [200] phi (byte) mul16u_compare::i#12 = (byte) mul16u_compare::i#1 [phi:mul16u_compare::@10->mul16u_compare::@1#0] -- register_copy 
-  //SEG425 [200] phi (word) mul16u_compare::b#6 = (word) mul16u_compare::b#1 [phi:mul16u_compare::@10->mul16u_compare::@1#1] -- register_copy 
-  //SEG426 [200] phi (word) mul16u_compare::a#6 = (word) mul16u_compare::a#1 [phi:mul16u_compare::@10->mul16u_compare::@1#2] -- register_copy 
-  //SEG427 [200] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@10->mul16u_compare::@1#3] -- register_copy 
+  //SEG423 [200] phi from mul16u_compare::@8 to mul16u_compare::@1 [phi:mul16u_compare::@8->mul16u_compare::@1]
+  //SEG424 [200] phi (byte) mul16u_compare::i#12 = (byte) mul16u_compare::i#1 [phi:mul16u_compare::@8->mul16u_compare::@1#0] -- register_copy 
+  //SEG425 [200] phi (word) mul16u_compare::b#6 = (word) mul16u_compare::b#1 [phi:mul16u_compare::@8->mul16u_compare::@1#1] -- register_copy 
+  //SEG426 [200] phi (word) mul16u_compare::a#6 = (word) mul16u_compare::a#1 [phi:mul16u_compare::@8->mul16u_compare::@1#2] -- register_copy 
+  //SEG427 [200] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@8->mul16u_compare::@1#3] -- register_copy 
   //SEG428 mul16u_compare::@1
   b1:
   //SEG429 [201] call print_str 
@@ -11876,7 +11909,7 @@ mul16u_compare: {
   //SEG446 [207] call muls16u 
     jsr muls16u
   //SEG447 [208] (dword) muls16u::return#2 ← (dword) muls16u::return#0
-  //SEG448 mul16u_compare::@13
+  //SEG448 mul16u_compare::@10
   //SEG449 [209] (dword) mul16u_compare::ms#0 ← (dword) muls16u::return#2
   //SEG450 [210] (word) mul16u::a#2 ← (word) mul16u_compare::a#1 -- vwuz1=vwuz2 
     lda a
@@ -11885,22 +11918,22 @@ mul16u_compare: {
     sta mul16u.a+1
   //SEG451 [211] (word) mul16u::b#1 ← (word) mul16u_compare::b#1
   //SEG452 [212] call mul16u 
-  //SEG453 [176] phi from mul16u_compare::@13 to mul16u [phi:mul16u_compare::@13->mul16u]
-  //SEG454 [176] phi (word) mul16u::a#6 = (word) mul16u::a#2 [phi:mul16u_compare::@13->mul16u#0] -- register_copy 
-  //SEG455 [176] phi (word) mul16u::b#2 = (word) mul16u::b#1 [phi:mul16u_compare::@13->mul16u#1] -- register_copy 
+  //SEG453 [176] phi from mul16u_compare::@10 to mul16u [phi:mul16u_compare::@10->mul16u]
+  //SEG454 [176] phi (word) mul16u::a#6 = (word) mul16u::a#2 [phi:mul16u_compare::@10->mul16u#0] -- register_copy 
+  //SEG455 [176] phi (word) mul16u::b#2 = (word) mul16u::b#1 [phi:mul16u_compare::@10->mul16u#1] -- register_copy 
     jsr mul16u
   //SEG456 [213] (dword) mul16u::return#3 ← (dword) mul16u::res#2
-  //SEG457 mul16u_compare::@14
+  //SEG457 mul16u_compare::@11
   //SEG458 [214] (dword) mul16u_compare::mn#0 ← (dword) mul16u::return#3
   //SEG459 [215] (word) mulf16u::a#1 ← (word) mul16u_compare::a#1
   //SEG460 [216] (word) mulf16u::b#1 ← (word) mul16u_compare::b#1
   //SEG461 [217] call mulf16u 
-  //SEG462 [153] phi from mul16u_compare::@14 to mulf16u [phi:mul16u_compare::@14->mulf16u]
-  //SEG463 [153] phi (word) mulf16u::b#2 = (word) mulf16u::b#1 [phi:mul16u_compare::@14->mulf16u#0] -- register_copy 
-  //SEG464 [153] phi (word) mulf16u::a#2 = (word) mulf16u::a#1 [phi:mul16u_compare::@14->mulf16u#1] -- register_copy 
+  //SEG462 [153] phi from mul16u_compare::@11 to mulf16u [phi:mul16u_compare::@11->mulf16u]
+  //SEG463 [153] phi (word) mulf16u::b#2 = (word) mulf16u::b#1 [phi:mul16u_compare::@11->mulf16u#0] -- register_copy 
+  //SEG464 [153] phi (word) mulf16u::a#2 = (word) mulf16u::a#1 [phi:mul16u_compare::@11->mulf16u#1] -- register_copy 
     jsr mulf16u
   //SEG465 [218] (dword) mulf16u::return#3 ← (dword) mulf16u::return#0
-  //SEG466 mul16u_compare::@15
+  //SEG466 mul16u_compare::@12
   //SEG467 [219] (dword) mul16u_compare::mf#0 ← (dword) mulf16u::return#3
   //SEG468 [220] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mf#0) goto mul16u_compare::@3 -- vduz1_eq_vduz2_then_la1 
     lda ms
@@ -11916,19 +11949,19 @@ mul16u_compare: {
     cmp mf+3
     beq b6
   !:
-  //SEG469 [221] phi from mul16u_compare::@15 to mul16u_compare::@6 [phi:mul16u_compare::@15->mul16u_compare::@6]
+  //SEG469 [221] phi from mul16u_compare::@12 to mul16u_compare::@6 [phi:mul16u_compare::@12->mul16u_compare::@6]
   //SEG470 mul16u_compare::@6
   //SEG471 [222] phi from mul16u_compare::@6 to mul16u_compare::@3 [phi:mul16u_compare::@6->mul16u_compare::@3]
   //SEG472 [222] phi (byte) mul16u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mul16u_compare::@6->mul16u_compare::@3#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b3
-  //SEG473 [222] phi from mul16u_compare::@15 to mul16u_compare::@3 [phi:mul16u_compare::@15->mul16u_compare::@3]
+  //SEG473 [222] phi from mul16u_compare::@12 to mul16u_compare::@3 [phi:mul16u_compare::@12->mul16u_compare::@3]
   b6:
-  //SEG474 [222] phi (byte) mul16u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16u_compare::@15->mul16u_compare::@3#0] -- vbuxx=vbuc1 
+  //SEG474 [222] phi (byte) mul16u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul16u_compare::@12->mul16u_compare::@3#0] -- vbuxx=vbuc1 
     ldx #1
   //SEG475 mul16u_compare::@3
   b3:
-  //SEG476 [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@22 -- vduz1_eq_vduz2_then_la1 
+  //SEG476 [223] if((dword) mul16u_compare::ms#0==(dword) mul16u_compare::mn#0) goto mul16u_compare::@15 -- vduz1_eq_vduz2_then_la1 
     lda ms
     cmp mn
     bne !+
@@ -11950,7 +11983,7 @@ mul16u_compare: {
   //SEG480 [225] if((byte) mul16u_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul16u_compare::@5 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b5
-  //SEG481 mul16u_compare::@8
+  //SEG481 mul16u_compare::@7
   //SEG482 [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -11964,7 +11997,7 @@ mul16u_compare: {
   //SEG486 [230] (dword) mul16u_error::mn#0 ← (dword) mul16u_compare::mn#0
   //SEG487 [231] (dword) mul16u_error::mf#0 ← (dword) mul16u_compare::mf#0
   //SEG488 [232] call mul16u_error 
-  //SEG489 [245] phi from mul16u_compare::@8 to mul16u_error [phi:mul16u_compare::@8->mul16u_error]
+  //SEG489 [245] phi from mul16u_compare::@7 to mul16u_error [phi:mul16u_compare::@7->mul16u_error]
     jsr mul16u_error
   //SEG490 mul16u_compare::@return
   breturn:
@@ -11977,7 +12010,7 @@ mul16u_compare: {
   //SEG494 [235] if((byte) mul16u_compare::j#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16u_compare::@2 -- vbuyy_neq_vbuc1_then_la1 
     cpy #$10
     bne b2
-  //SEG495 mul16u_compare::@10
+  //SEG495 mul16u_compare::@8
   //SEG496 [236] (byte) mul16u_compare::i#1 ← ++ (byte) mul16u_compare::i#12 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG497 [237] if((byte) mul16u_compare::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $10) goto mul16u_compare::@1 -- vbuz1_neq_vbuc1_then_la1 
@@ -11986,44 +12019,44 @@ mul16u_compare: {
     beq !b1+
     jmp b1
   !b1:
-  //SEG498 [238] phi from mul16u_compare::@10 to mul16u_compare::@11 [phi:mul16u_compare::@10->mul16u_compare::@11]
-  //SEG499 mul16u_compare::@11
+  //SEG498 [238] phi from mul16u_compare::@8 to mul16u_compare::@9 [phi:mul16u_compare::@8->mul16u_compare::@9]
+  //SEG499 mul16u_compare::@9
   //SEG500 [239] call print_ln 
-  //SEG501 [59] phi from mul16u_compare::@11 to print_ln [phi:mul16u_compare::@11->print_ln]
-  //SEG502 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@11->print_ln#0] -- register_copy 
-  //SEG503 [59] phi (byte*) print_line_cursor#43 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mul16u_compare::@11->print_ln#1] -- pbuz1=pbuc1 
+  //SEG501 [59] phi from mul16u_compare::@9 to print_ln [phi:mul16u_compare::@9->print_ln]
+  //SEG502 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@9->print_ln#0] -- register_copy 
+  //SEG503 [59] phi (byte*) print_line_cursor#43 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mul16u_compare::@9->print_ln#1] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
     jsr print_ln
-  //SEG504 mul16u_compare::@17
+  //SEG504 mul16u_compare::@13
   //SEG505 [240] (byte*~) print_char_cursor#192 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG506 [241] call print_str 
-  //SEG507 [64] phi from mul16u_compare::@17 to print_str [phi:mul16u_compare::@17->print_str]
-  //SEG508 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#192 [phi:mul16u_compare::@17->print_str#0] -- register_copy 
-  //SEG509 [64] phi (byte*) print_str::str#17 = (const string) mul16u_compare::str1 [phi:mul16u_compare::@17->print_str#1] -- pbuz1=pbuc1 
+  //SEG507 [64] phi from mul16u_compare::@13 to print_str [phi:mul16u_compare::@13->print_str]
+  //SEG508 [64] phi (byte*) print_char_cursor#148 = (byte*~) print_char_cursor#192 [phi:mul16u_compare::@13->print_str#0] -- register_copy 
+  //SEG509 [64] phi (byte*) print_str::str#17 = (const string) mul16u_compare::str1 [phi:mul16u_compare::@13->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG510 [242] phi from mul16u_compare::@17 to mul16u_compare::@18 [phi:mul16u_compare::@17->mul16u_compare::@18]
-  //SEG511 mul16u_compare::@18
+  //SEG510 [242] phi from mul16u_compare::@13 to mul16u_compare::@14 [phi:mul16u_compare::@13->mul16u_compare::@14]
+  //SEG511 mul16u_compare::@14
   //SEG512 [243] call print_ln 
-  //SEG513 [59] phi from mul16u_compare::@18 to print_ln [phi:mul16u_compare::@18->print_ln]
-  //SEG514 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@18->print_ln#0] -- register_copy 
-  //SEG515 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16u_compare::@18->print_ln#1] -- register_copy 
+  //SEG513 [59] phi from mul16u_compare::@14 to print_ln [phi:mul16u_compare::@14->print_ln]
+  //SEG514 [59] phi (byte*) print_char_cursor#129 = (byte*) print_char_cursor#128 [phi:mul16u_compare::@14->print_ln#0] -- register_copy 
+  //SEG515 [59] phi (byte*) print_line_cursor#43 = (byte*) print_line_cursor#1 [phi:mul16u_compare::@14->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG516 [244] phi from mul16u_compare::@3 to mul16u_compare::@22 [phi:mul16u_compare::@3->mul16u_compare::@22]
-  //SEG517 mul16u_compare::@22
-  //SEG518 [224] phi from mul16u_compare::@22 to mul16u_compare::@4 [phi:mul16u_compare::@22->mul16u_compare::@4]
-  //SEG519 [224] phi (byte) mul16u_compare::ok#3 = (byte) mul16u_compare::ok#4 [phi:mul16u_compare::@22->mul16u_compare::@4#0] -- register_copy 
+  //SEG516 [244] phi from mul16u_compare::@3 to mul16u_compare::@15 [phi:mul16u_compare::@3->mul16u_compare::@15]
+  //SEG517 mul16u_compare::@15
+  //SEG518 [224] phi from mul16u_compare::@15 to mul16u_compare::@4 [phi:mul16u_compare::@15->mul16u_compare::@4]
+  //SEG519 [224] phi (byte) mul16u_compare::ok#3 = (byte) mul16u_compare::ok#4 [phi:mul16u_compare::@15->mul16u_compare::@4#0] -- register_copy 
     str1: .text "word multiply results match!@"
 }
 //SEG520 mul16u_error
@@ -12172,23 +12205,23 @@ muls16u: {
     lda a
     bne !+
     lda a+1
-    beq b2
+    beq b3
   !:
-  //SEG589 [269] phi from muls16u to muls16u::@4 [phi:muls16u->muls16u::@4]
-  //SEG590 [269] phi (word) muls16u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@4#0] -- vwuz1=vbuc1 
+  //SEG589 [269] phi from muls16u to muls16u::@2 [phi:muls16u->muls16u::@2]
+  //SEG590 [269] phi (word) muls16u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@2#0] -- vwuz1=vbuc1 
     lda #0
     sta i
     sta i+1
-  //SEG591 [269] phi (dword) muls16u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@4#1] -- vduz1=vbuc1 
+  //SEG591 [269] phi (dword) muls16u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@2#1] -- vduz1=vbuc1 
     sta m
     sta m+1
     sta m+2
     sta m+3
-  //SEG592 [269] phi from muls16u::@4 to muls16u::@4 [phi:muls16u::@4->muls16u::@4]
-  //SEG593 [269] phi (word) muls16u::i#2 = (word) muls16u::i#1 [phi:muls16u::@4->muls16u::@4#0] -- register_copy 
-  //SEG594 [269] phi (dword) muls16u::m#3 = (dword) muls16u::m#1 [phi:muls16u::@4->muls16u::@4#1] -- register_copy 
-  //SEG595 muls16u::@4
-  b4:
+  //SEG592 [269] phi from muls16u::@2 to muls16u::@2 [phi:muls16u::@2->muls16u::@2]
+  //SEG593 [269] phi (word) muls16u::i#2 = (word) muls16u::i#1 [phi:muls16u::@2->muls16u::@2#0] -- register_copy 
+  //SEG594 [269] phi (dword) muls16u::m#3 = (dword) muls16u::m#1 [phi:muls16u::@2->muls16u::@2#1] -- register_copy 
+  //SEG595 muls16u::@2
+  b2:
   //SEG596 [270] (dword) muls16u::m#1 ← (dword) muls16u::m#3 + (word) muls16u::b#0 -- vduz1=vduz1_plus_vwuz2 
     lda m
     clc
@@ -12208,18 +12241,18 @@ muls16u: {
     bne !+
     inc i+1
   !:
-  //SEG598 [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@4 -- vwuz1_neq_vwuz2_then_la1 
+  //SEG598 [272] if((word) muls16u::i#1!=(word) muls16u::a#0) goto muls16u::@2 -- vwuz1_neq_vwuz2_then_la1 
     lda i+1
     cmp a+1
-    bne b4
+    bne b2
     lda i
     cmp a
-    bne b4
-  //SEG599 [273] phi from muls16u::@4 to muls16u::@1 [phi:muls16u::@4->muls16u::@1]
-  //SEG600 [273] phi (dword) muls16u::return#0 = (dword) muls16u::m#1 [phi:muls16u::@4->muls16u::@1#0] -- register_copy 
+    bne b2
+  //SEG599 [273] phi from muls16u::@2 to muls16u::@1 [phi:muls16u::@2->muls16u::@1]
+  //SEG600 [273] phi (dword) muls16u::return#0 = (dword) muls16u::m#1 [phi:muls16u::@2->muls16u::@1#0] -- register_copy 
     jmp b1
   //SEG601 [273] phi from muls16u to muls16u::@1 [phi:muls16u->muls16u::@1]
-  b2:
+  b3:
   //SEG602 [273] phi (dword) muls16u::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls16u->muls16u::@1#0] -- vduz1=vbuc1 
     lda #0
     sta return
@@ -12325,29 +12358,29 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1
-  //SEG638 [291] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  //SEG639 [291] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG638 [291] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  //SEG639 [291] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG640 [291] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG640 [291] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG641 [291] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG641 [291] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG642 [291] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuxx=vbuc1 
+  //SEG642 [291] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuxx=vbuc1 
     ldx #-1
-  //SEG643 [291] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  //SEG644 [291] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG645 [291] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG646 [291] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG647 [291] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-  //SEG648 mulf_init::@5
-  b5:
+  //SEG643 [291] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  //SEG644 [291] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG645 [291] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG646 [291] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG647 [291] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+  //SEG648 mulf_init::@4
+  b4:
   //SEG649 [292] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuxx 
     lda mulf_sqr1_lo,x
     ldy #0
@@ -12365,28 +12398,28 @@ mulf_init: {
     clc
     adc dir
     tax
-  //SEG653 [296] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuxx_neq_0_then_la1 
+  //SEG653 [296] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b6
-  //SEG654 [297] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  //SEG655 [297] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b5
+  //SEG654 [297] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  //SEG655 [297] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-  //SEG656 mulf_init::@6
-  b6:
+  //SEG656 mulf_init::@5
+  b5:
   //SEG657 [298] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG658 [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG658 [299] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5
-  //SEG659 mulf_init::@8
+    bne b4
+  //SEG659 mulf_init::@6
   //SEG660 [300] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -12397,10 +12430,10 @@ mulf_init: {
   //SEG662 mulf_init::@return
   //SEG663 [302] return 
     rts
-  //SEG664 [303] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  //SEG665 mulf_init::@12
-  //SEG666 [297] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  //SEG667 [297] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
+  //SEG664 [303] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  //SEG665 mulf_init::@7
+  //SEG666 [297] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  //SEG667 [297] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
 }
 //SEG668 print_cls
 // Clear the screen. Also resets current line/char cursor.
diff --git a/src/test/ref/test-multiply-16bit.sym b/src/test/ref/test-multiply-16bit.sym
index 6ec02564d..d41780fe4 100644
--- a/src/test/ref/test-multiply-16bit.sym
+++ b/src/test/ref/test-multiply-16bit.sym
@@ -1,4 +1,4 @@
-(label) @40
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -17,7 +17,7 @@
 (label) mul16s::@2
 (label) mul16s::@3
 (label) mul16s::@4
-(label) mul16s::@6
+(label) mul16s::@5
 (label) mul16s::@return
 (signed word) mul16s::a
 (signed word) mul16s::a#0 a zp ZP_WORD:3 7.357142857142858
@@ -36,18 +36,18 @@
 (label) mul16s_compare::@1
 (label) mul16s_compare::@10
 (label) mul16s_compare::@11
+(label) mul16s_compare::@12
 (label) mul16s_compare::@13
 (label) mul16s_compare::@14
 (label) mul16s_compare::@15
-(label) mul16s_compare::@17
-(label) mul16s_compare::@18
 (label) mul16s_compare::@2
-(label) mul16s_compare::@22
 (label) mul16s_compare::@3
 (label) mul16s_compare::@4
 (label) mul16s_compare::@5
 (label) mul16s_compare::@6
+(label) mul16s_compare::@7
 (label) mul16s_compare::@8
+(label) mul16s_compare::@9
 (label) mul16s_compare::@return
 (signed word) mul16s_compare::a
 (signed word) mul16s_compare::a#1 a zp ZP_WORD:3 17.862068965517242
@@ -100,8 +100,8 @@
 (byte/word~) mul16u::$1 reg byte a 2002.0
 (label) mul16u::@1
 (label) mul16u::@2
-(label) mul16u::@6
-(label) mul16u::@8
+(label) mul16u::@3
+(label) mul16u::@4
 (label) mul16u::@return
 (word) mul16u::a
 (word) mul16u::a#0 a zp ZP_WORD:9 1001.0
@@ -128,18 +128,18 @@
 (label) mul16u_compare::@1
 (label) mul16u_compare::@10
 (label) mul16u_compare::@11
+(label) mul16u_compare::@12
 (label) mul16u_compare::@13
 (label) mul16u_compare::@14
 (label) mul16u_compare::@15
-(label) mul16u_compare::@17
-(label) mul16u_compare::@18
 (label) mul16u_compare::@2
-(label) mul16u_compare::@22
 (label) mul16u_compare::@3
 (label) mul16u_compare::@4
 (label) mul16u_compare::@5
 (label) mul16u_compare::@6
+(label) mul16u_compare::@7
 (label) mul16u_compare::@8
+(label) mul16u_compare::@9
 (label) mul16u_compare::@return
 (word) mul16u_compare::a
 (word) mul16u_compare::a#1 a zp ZP_WORD:21 17.862068965517242
@@ -197,7 +197,7 @@
 (label) mulf16s::@2
 (label) mulf16s::@3
 (label) mulf16s::@4
-(label) mulf16s::@6
+(label) mulf16s::@5
 (label) mulf16s::@return
 (signed word) mulf16s::a
 (signed word) mulf16s::a#0 a zp ZP_WORD:3 7.357142857142858
@@ -237,12 +237,12 @@
 (byte~) mulf_init::$12 reg byte a 22.0
 (byte~) mulf_init::$8 reg byte a 22.0
 (label) mulf_init::@1
-(label) mulf_init::@12
 (label) mulf_init::@2
 (label) mulf_init::@3
+(label) mulf_init::@4
 (label) mulf_init::@5
 (label) mulf_init::@6
-(label) mulf_init::@8
+(label) mulf_init::@7
 (label) mulf_init::@return
 (byte) mulf_init::c
 (byte) mulf_init::c#1 reg byte x 2.357142857142857
@@ -283,10 +283,10 @@
 (byte[$200]) mulf_sqr2_lo
 (const byte[$200]) mulf_sqr2_lo#0 mulf_sqr2_lo = { fill( $200, 0) }
 (signed dword()) muls16s((signed word) muls16s::a , (signed word) muls16s::b)
-(label) muls16s::@10
+(label) muls16s::@1
+(label) muls16s::@2
 (label) muls16s::@3
 (label) muls16s::@4
-(label) muls16s::@8
 (label) muls16s::@return
 (signed word) muls16s::a
 (signed word) muls16s::a#0 a zp ZP_WORD:3 175.58333333333334
@@ -308,7 +308,7 @@
 (signed dword) muls16s::return#2 return zp ZP_DWORD:11 202.0
 (dword()) muls16u((word) muls16u::a , (word) muls16u::b)
 (label) muls16u::@1
-(label) muls16u::@4
+(label) muls16u::@2
 (label) muls16u::@return
 (word) muls16u::a
 (word) muls16u::a#0 a zp ZP_WORD:21 157.71428571428572
@@ -383,7 +383,7 @@
 (void()) print_sdword((signed dword) print_sdword::dw)
 (label) print_sdword::@1
 (label) print_sdword::@2
-(label) print_sdword::@4
+(label) print_sdword::@3
 (label) print_sdword::@return
 (signed dword) print_sdword::dw
 (signed dword) print_sdword::dw#0 dw zp ZP_DWORD:11 4.0
@@ -403,7 +403,7 @@
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:3 4.0
diff --git a/src/test/ref/test-multiply-8bit.asm b/src/test/ref/test-multiply-8bit.asm
index 9d8915e2e..8a515f4e2 100644
--- a/src/test/ref/test-multiply-8bit.asm
+++ b/src/test/ref/test-multiply-8bit.asm
@@ -311,7 +311,7 @@ mul8u: {
     txa
     and #1
     cmp #0
-    beq b8
+    beq b4
     lda res
     clc
     adc mb
@@ -319,7 +319,7 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  b8:
+  b4:
     txa
     lsr
     tax
@@ -409,14 +409,14 @@ muls8s: {
     .label return = 8
     .label a = 2
     lda a
-    bmi b4
+    bmi b6
     cmp #1
-    bmi b2
+    bmi b5
     lda #0
     tay
     sta m
     sta m+1
-  b8:
+  b3:
     txa
     sta $fe
     ora #$7f
@@ -433,20 +433,20 @@ muls8s: {
     sta m+1
     iny
     cpy a
-    bne b8
-    jmp b3
-  b2:
+    bne b3
+    jmp b1
+  b5:
     lda #0
     sta return
     sta return+1
-  b3:
+  b1:
     rts
-  b4:
+  b6:
     lda #0
     tay
     sta m
     sta m+1
-  b10:
+  b4:
     txa
     sta $fe
     ora #$7f
@@ -463,8 +463,8 @@ muls8s: {
     sta m+1
     dey
     cpy a
-    bne b10
-    jmp b3
+    bne b4
+    jmp b1
 }
 // Perform all possible byte multiplications (slow and fast) and compare the results
 mul8u_compare: {
@@ -600,12 +600,12 @@ muls8u: {
     .label a = 2
     lda a
     cmp #0
-    beq b2
+    beq b3
     ldy #0
     tya
     sta m
     sta m+1
-  b4:
+  b2:
     txa
     clc
     adc m
@@ -615,9 +615,9 @@ muls8u: {
   !:
     iny
     cpy a
-    bne b4
+    bne b2
     jmp b1
-  b2:
+  b3:
     lda #0
     sta return
     sta return+1
@@ -835,7 +835,7 @@ mulf_init: {
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
     ldx #-1
-  b5:
+  b4:
     lda mulf_sqr1_lo,x
     ldy #0
     sta (sqr2_lo),y
@@ -850,20 +850,20 @@ mulf_init: {
     adc dir
     tax
     cpx #0
-    bne b6
+    bne b5
     lda #1
     sta dir
-  b6:
+  b5:
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
     sta mulf_sqr2_lo+$1ff
diff --git a/src/test/ref/test-multiply-8bit.cfg b/src/test/ref/test-multiply-8bit.cfg
index 7dabbc8cc..f7b4f21ba 100644
--- a/src/test/ref/test-multiply-8bit.cfg
+++ b/src/test/ref/test-multiply-8bit.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@42
-@42: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @42
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @42
+main: scope:[main]  from @1
   [4] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 5
   [5] call print_cls 
   to:main::@1
@@ -37,8 +37,8 @@ main::@return: scope:[main]  from main::@5
 mul8s_compare: scope:[mul8s_compare]  from main::@5
   [17] phi()
   to:mul8s_compare::@1
-mul8s_compare::@1: scope:[mul8s_compare]  from mul8s_compare mul8s_compare::@10
-  [18] (signed byte) mul8s_compare::a#7 ← phi( mul8s_compare/-(byte/word/signed word/dword/signed dword) $80 mul8s_compare::@10/(signed byte) mul8s_compare::a#1 )
+mul8s_compare::@1: scope:[mul8s_compare]  from mul8s_compare mul8s_compare::@8
+  [18] (signed byte) mul8s_compare::a#7 ← phi( mul8s_compare/-(byte/word/signed word/dword/signed dword) $80 mul8s_compare::@8/(signed byte) mul8s_compare::a#1 )
   to:mul8s_compare::@2
 mul8s_compare::@2: scope:[mul8s_compare]  from mul8s_compare::@1 mul8s_compare::@5
   [19] (signed byte) mul8s_compare::b#10 ← phi( mul8s_compare::@1/-(byte/word/signed word/dword/signed dword) $80 mul8s_compare::@5/(signed byte) mul8s_compare::b#1 )
@@ -46,37 +46,37 @@ mul8s_compare::@2: scope:[mul8s_compare]  from mul8s_compare::@1 mul8s_compare::
   [21] (signed byte) muls8s::b#0 ← (signed byte) mul8s_compare::b#10
   [22] call muls8s 
   [23] (signed word) muls8s::return#2 ← (signed word) muls8s::return#0
-  to:mul8s_compare::@12
-mul8s_compare::@12: scope:[mul8s_compare]  from mul8s_compare::@2
+  to:mul8s_compare::@10
+mul8s_compare::@10: scope:[mul8s_compare]  from mul8s_compare::@2
   [24] (signed word) mul8s_compare::ms#0 ← (signed word) muls8s::return#2
   [25] (signed byte) mulf8s::a#0 ← (signed byte) mul8s_compare::a#7
   [26] (signed byte) mulf8s::b#0 ← (signed byte) mul8s_compare::b#10
   [27] call mulf8s 
   [28] (signed word) mulf8s::return#2 ← (signed word) mulf8s::return#0
-  to:mul8s_compare::@13
-mul8s_compare::@13: scope:[mul8s_compare]  from mul8s_compare::@12
+  to:mul8s_compare::@11
+mul8s_compare::@11: scope:[mul8s_compare]  from mul8s_compare::@10
   [29] (signed word) mul8s_compare::mf#0 ← (signed word) mulf8s::return#2
   [30] (signed byte) mul8s::a#0 ← (signed byte) mul8s_compare::a#7
   [31] (signed byte) mul8s::b#0 ← (signed byte) mul8s_compare::b#10
   [32] call mul8s 
   [33] (signed word) mul8s::return#2 ← (signed word)(word) mul8s::m#4
-  to:mul8s_compare::@14
-mul8s_compare::@14: scope:[mul8s_compare]  from mul8s_compare::@13
+  to:mul8s_compare::@12
+mul8s_compare::@12: scope:[mul8s_compare]  from mul8s_compare::@11
   [34] (signed word) mul8s_compare::mn#0 ← (signed word) mul8s::return#2
   [35] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mf#0) goto mul8s_compare::@3
   to:mul8s_compare::@6
-mul8s_compare::@6: scope:[mul8s_compare]  from mul8s_compare::@14
+mul8s_compare::@6: scope:[mul8s_compare]  from mul8s_compare::@12
   [36] phi()
   to:mul8s_compare::@3
-mul8s_compare::@3: scope:[mul8s_compare]  from mul8s_compare::@14 mul8s_compare::@6
-  [37] (byte) mul8s_compare::ok#4 ← phi( mul8s_compare::@14/(byte/signed byte/word/signed word/dword/signed dword) 1 mul8s_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@20
+mul8s_compare::@3: scope:[mul8s_compare]  from mul8s_compare::@12 mul8s_compare::@6
+  [37] (byte) mul8s_compare::ok#4 ← phi( mul8s_compare::@12/(byte/signed byte/word/signed word/dword/signed dword) 1 mul8s_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@14
   to:mul8s_compare::@4
-mul8s_compare::@4: scope:[mul8s_compare]  from mul8s_compare::@20 mul8s_compare::@3
-  [39] (byte) mul8s_compare::ok#3 ← phi( mul8s_compare::@20/(byte) mul8s_compare::ok#4 mul8s_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+mul8s_compare::@4: scope:[mul8s_compare]  from mul8s_compare::@14 mul8s_compare::@3
+  [39] (byte) mul8s_compare::ok#3 ← phi( mul8s_compare::@14/(byte) mul8s_compare::ok#4 mul8s_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [40] if((byte) mul8s_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s_compare::@5
-  to:mul8s_compare::@8
-mul8s_compare::@8: scope:[mul8s_compare]  from mul8s_compare::@4
+  to:mul8s_compare::@7
+mul8s_compare::@7: scope:[mul8s_compare]  from mul8s_compare::@4
   [41] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   [42] (signed byte) mul8s_error::a#0 ← (signed byte) mul8s_compare::a#7
   [43] (signed byte) mul8s_error::b#0 ← (signed byte) mul8s_compare::b#10
@@ -85,31 +85,31 @@ mul8s_compare::@8: scope:[mul8s_compare]  from mul8s_compare::@4
   [46] (signed word) mul8s_error::mf#0 ← (signed word) mul8s_compare::mf#0
   [47] call mul8s_error 
   to:mul8s_compare::@return
-mul8s_compare::@return: scope:[mul8s_compare]  from mul8s_compare::@16 mul8s_compare::@8
+mul8s_compare::@return: scope:[mul8s_compare]  from mul8s_compare::@13 mul8s_compare::@7
   [48] return 
   to:@return
 mul8s_compare::@5: scope:[mul8s_compare]  from mul8s_compare::@4
   [49] (signed byte) mul8s_compare::b#1 ← ++ (signed byte) mul8s_compare::b#10
   [50] if((signed byte) mul8s_compare::b#1!=-(byte/word/signed word/dword/signed dword) $80) goto mul8s_compare::@2
-  to:mul8s_compare::@10
-mul8s_compare::@10: scope:[mul8s_compare]  from mul8s_compare::@5
+  to:mul8s_compare::@8
+mul8s_compare::@8: scope:[mul8s_compare]  from mul8s_compare::@5
   [51] (signed byte) mul8s_compare::a#1 ← ++ (signed byte) mul8s_compare::a#7
   [52] if((signed byte) mul8s_compare::a#1!=-(byte/word/signed word/dword/signed dword) $80) goto mul8s_compare::@1
-  to:mul8s_compare::@11
-mul8s_compare::@11: scope:[mul8s_compare]  from mul8s_compare::@10
+  to:mul8s_compare::@9
+mul8s_compare::@9: scope:[mul8s_compare]  from mul8s_compare::@8
   [53] (byte*~) print_char_cursor#192 ← (byte*) print_line_cursor#1
   [54] call print_str 
-  to:mul8s_compare::@16
-mul8s_compare::@16: scope:[mul8s_compare]  from mul8s_compare::@11
+  to:mul8s_compare::@13
+mul8s_compare::@13: scope:[mul8s_compare]  from mul8s_compare::@9
   [55] phi()
   [56] call print_ln 
   to:mul8s_compare::@return
-mul8s_compare::@20: scope:[mul8s_compare]  from mul8s_compare::@3
+mul8s_compare::@14: scope:[mul8s_compare]  from mul8s_compare::@3
   [57] phi()
   to:mul8s_compare::@4
-print_ln: scope:[print_ln]  from mul8s_compare::@16 mul8s_error::@10 mul8u_compare::@16 mul8u_error::@10 mulf_tables_cmp::@10
-  [58] (byte*) print_char_cursor#133 ← phi( mul8s_compare::@16/(byte*) print_char_cursor#132 mul8s_error::@10/(byte*) print_char_cursor#18 mul8u_compare::@16/(byte*) print_char_cursor#132 mul8u_error::@10/(byte*) print_char_cursor#18 mulf_tables_cmp::@10/(byte*) print_char_cursor#132 )
-  [58] (byte*) print_line_cursor#45 ← phi( mul8s_compare::@16/(byte*) print_line_cursor#1 mul8s_error::@10/(byte*) print_line_cursor#1 mul8u_compare::@16/(byte*) print_line_cursor#10 mul8u_error::@10/(byte*) print_line_cursor#10 mulf_tables_cmp::@10/((byte*))(word/signed word/dword/signed dword) $400 )
+print_ln: scope:[print_ln]  from mul8s_compare::@13 mul8s_error::@10 mul8u_compare::@13 mul8u_error::@10 mulf_tables_cmp::@8
+  [58] (byte*) print_char_cursor#133 ← phi( mul8s_compare::@13/(byte*) print_char_cursor#132 mul8s_error::@10/(byte*) print_char_cursor#18 mul8u_compare::@13/(byte*) print_char_cursor#132 mul8u_error::@10/(byte*) print_char_cursor#18 mulf_tables_cmp::@8/(byte*) print_char_cursor#132 )
+  [58] (byte*) print_line_cursor#45 ← phi( mul8s_compare::@13/(byte*) print_line_cursor#1 mul8s_error::@10/(byte*) print_line_cursor#1 mul8u_compare::@13/(byte*) print_line_cursor#10 mul8u_error::@10/(byte*) print_line_cursor#10 mulf_tables_cmp::@8/((byte*))(word/signed word/dword/signed dword) $400 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [59] (byte*) print_line_cursor#23 ← phi( print_ln/(byte*) print_line_cursor#45 print_ln::@1/(byte*) print_line_cursor#1 )
@@ -119,9 +119,9 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [62] return 
   to:@return
-print_str: scope:[print_str]  from mul8s_compare::@11 mul8s_error mul8s_error::@2 mul8s_error::@4 mul8s_error::@6 mul8s_error::@8 mul8u_compare::@11 mul8u_error mul8u_error::@2 mul8u_error::@4 mul8u_error::@6 mul8u_error::@8 mulf_tables_cmp::@3 mulf_tables_cmp::@5 mulf_tables_cmp::@7
-  [63] (byte*) print_char_cursor#152 ← phi( mul8s_compare::@11/(byte*~) print_char_cursor#192 mul8s_error/(byte*~) print_char_cursor#193 mul8s_error::@2/(byte*) print_char_cursor#18 mul8s_error::@4/(byte*) print_char_cursor#18 mul8s_error::@6/(byte*) print_char_cursor#18 mul8s_error::@8/(byte*) print_char_cursor#18 mul8u_compare::@11/(byte*) print_char_cursor#31 mul8u_error/(byte*) print_char_cursor#31 mul8u_error::@2/(byte*) print_char_cursor#18 mul8u_error::@4/(byte*) print_char_cursor#18 mul8u_error::@6/(byte*) print_char_cursor#18 mul8u_error::@8/(byte*) print_char_cursor#18 mulf_tables_cmp::@3/((byte*))(word/signed word/dword/signed dword) $400 mulf_tables_cmp::@5/((byte*))(word/signed word/dword/signed dword) $400 mulf_tables_cmp::@7/(byte*) print_char_cursor#18 )
-  [63] (byte*) print_str::str#18 ← phi( mul8s_compare::@11/(const string) mul8s_compare::str mul8s_error/(const string) mul8s_error::str mul8s_error::@2/(const string) str1 mul8s_error::@4/(const string) str2 mul8s_error::@6/(const string) str3 mul8s_error::@8/(const string) str4 mul8u_compare::@11/(const string) mul8u_compare::str mul8u_error/(const string) mul8u_error::str mul8u_error::@2/(const string) str1 mul8u_error::@4/(const string) str2 mul8u_error::@6/(const string) str3 mul8u_error::@8/(const string) str4 mulf_tables_cmp::@3/(const string) mulf_tables_cmp::str mulf_tables_cmp::@5/(const string) mulf_tables_cmp::str2 mulf_tables_cmp::@7/(const string) mulf_tables_cmp::str1 )
+print_str: scope:[print_str]  from mul8s_compare::@9 mul8s_error mul8s_error::@2 mul8s_error::@4 mul8s_error::@6 mul8s_error::@8 mul8u_compare::@9 mul8u_error mul8u_error::@2 mul8u_error::@4 mul8u_error::@6 mul8u_error::@8 mulf_tables_cmp::@3 mulf_tables_cmp::@4 mulf_tables_cmp::@6
+  [63] (byte*) print_char_cursor#152 ← phi( mul8s_compare::@9/(byte*~) print_char_cursor#192 mul8s_error/(byte*~) print_char_cursor#193 mul8s_error::@2/(byte*) print_char_cursor#18 mul8s_error::@4/(byte*) print_char_cursor#18 mul8s_error::@6/(byte*) print_char_cursor#18 mul8s_error::@8/(byte*) print_char_cursor#18 mul8u_compare::@9/(byte*) print_char_cursor#31 mul8u_error/(byte*) print_char_cursor#31 mul8u_error::@2/(byte*) print_char_cursor#18 mul8u_error::@4/(byte*) print_char_cursor#18 mul8u_error::@6/(byte*) print_char_cursor#18 mul8u_error::@8/(byte*) print_char_cursor#18 mulf_tables_cmp::@3/((byte*))(word/signed word/dword/signed dword) $400 mulf_tables_cmp::@4/((byte*))(word/signed word/dword/signed dword) $400 mulf_tables_cmp::@6/(byte*) print_char_cursor#18 )
+  [63] (byte*) print_str::str#18 ← phi( mul8s_compare::@9/(const string) mul8s_compare::str mul8s_error/(const string) mul8s_error::str mul8s_error::@2/(const string) str1 mul8s_error::@4/(const string) str2 mul8s_error::@6/(const string) str3 mul8s_error::@8/(const string) str4 mul8u_compare::@9/(const string) mul8u_compare::str mul8u_error/(const string) mul8u_error::str mul8u_error::@2/(const string) str1 mul8u_error::@4/(const string) str2 mul8u_error::@6/(const string) str3 mul8u_error::@8/(const string) str4 mulf_tables_cmp::@3/(const string) mulf_tables_cmp::str mulf_tables_cmp::@4/(const string) mulf_tables_cmp::str2 mulf_tables_cmp::@6/(const string) mulf_tables_cmp::str1 )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [64] (byte*) print_char_cursor#132 ← phi( print_str/(byte*) print_char_cursor#152 print_str::@2/(byte*) print_char_cursor#1 )
@@ -136,7 +136,7 @@ print_str::@2: scope:[print_str]  from print_str::@1
   [68] (byte*) print_char_cursor#1 ← ++ (byte*) print_char_cursor#132
   [69] (byte*) print_str::str#0 ← ++ (byte*) print_str::str#16
   to:print_str::@1
-mul8s_error: scope:[mul8s_error]  from mul8s_compare::@8
+mul8s_error: scope:[mul8s_error]  from mul8s_compare::@7
   [70] (byte*~) print_char_cursor#193 ← (byte*) print_line_cursor#1
   [71] call print_str 
   to:mul8s_error::@1
@@ -190,22 +190,22 @@ print_sword: scope:[print_sword]  from mul8s_error::@5 mul8s_error::@7 mul8s_err
 print_sword::@2: scope:[print_sword]  from print_sword
   [95] phi()
   [96] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [97] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#4
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [98] (byte*) print_char_cursor#134 ← phi( print_sword/(byte*) print_char_cursor#132 print_sword::@4/(byte*) print_char_cursor#18 )
-  [98] (signed word) print_sword::w#5 ← phi( print_sword/(signed word) print_sword::w#4 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [98] (byte*) print_char_cursor#134 ← phi( print_sword/(byte*) print_char_cursor#132 print_sword::@3/(byte*) print_char_cursor#18 )
+  [98] (signed word) print_sword::w#5 ← phi( print_sword/(signed word) print_sword::w#4 print_sword::@3/(signed word) print_sword::w#0 )
   [99] (word~) print_word::w#13 ← (word)(signed word) print_sword::w#5
   [100] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
   [101] return 
   to:@return
-print_word: scope:[print_word]  from mul8u_error::@5 mul8u_error::@7 mul8u_error::@9 mulf_tables_cmp::@6 mulf_tables_cmp::@8 print_sword::@1
-  [102] (byte*) print_char_cursor#139 ← phi( mul8u_error::@5/(byte*) print_char_cursor#132 mul8u_error::@7/(byte*) print_char_cursor#132 mul8u_error::@9/(byte*) print_char_cursor#132 mulf_tables_cmp::@6/(byte*) print_char_cursor#132 mulf_tables_cmp::@8/(byte*) print_char_cursor#132 print_sword::@1/(byte*) print_char_cursor#134 )
-  [102] (word) print_word::w#6 ← phi( mul8u_error::@5/(word) print_word::w#3 mul8u_error::@7/(word) print_word::w#4 mul8u_error::@9/(word) print_word::w#5 mulf_tables_cmp::@6/(word~) print_word::w#11 mulf_tables_cmp::@8/(word~) print_word::w#12 print_sword::@1/(word~) print_word::w#13 )
+print_word: scope:[print_word]  from mul8u_error::@5 mul8u_error::@7 mul8u_error::@9 mulf_tables_cmp::@5 mulf_tables_cmp::@7 print_sword::@1
+  [102] (byte*) print_char_cursor#139 ← phi( mul8u_error::@5/(byte*) print_char_cursor#132 mul8u_error::@7/(byte*) print_char_cursor#132 mul8u_error::@9/(byte*) print_char_cursor#132 mulf_tables_cmp::@5/(byte*) print_char_cursor#132 mulf_tables_cmp::@7/(byte*) print_char_cursor#132 print_sword::@1/(byte*) print_char_cursor#134 )
+  [102] (word) print_word::w#6 ← phi( mul8u_error::@5/(word) print_word::w#3 mul8u_error::@7/(word) print_word::w#4 mul8u_error::@9/(word) print_word::w#5 mulf_tables_cmp::@5/(word~) print_word::w#11 mulf_tables_cmp::@7/(word~) print_word::w#12 print_sword::@1/(word~) print_word::w#13 )
   [103] (byte) print_byte::b#1 ← > (word) print_word::w#6
   [104] call print_byte 
   to:print_word::@1
@@ -248,8 +248,8 @@ print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [122] phi()
   [123] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [124] (signed byte) print_sbyte::b#5 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#3 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [124] (signed byte) print_sbyte::b#5 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#3 )
   [125] (byte~) print_byte::b#9 ← (byte)(signed byte) print_sbyte::b#5
   [126] call print_byte 
   to:print_sbyte::@return
@@ -259,27 +259,27 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [128] phi()
   [129] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [130] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#3
   to:print_sbyte::@2
-mul8s: scope:[mul8s]  from mul8s_compare::@13
+mul8s: scope:[mul8s]  from mul8s_compare::@11
   [131] (byte~) mul8u::b#3 ← (byte)(signed byte) mul8s::b#0
   [132] (byte~) mul8u::a#8 ← (byte)(signed byte) mul8s::a#0
   [133] call mul8u 
   [134] (word) mul8u::return#2 ← (word) mul8u::res#2
-  to:mul8s::@6
-mul8s::@6: scope:[mul8s]  from mul8s
+  to:mul8s::@5
+mul8s::@5: scope:[mul8s]  from mul8s
   [135] (word) mul8s::m#0 ← (word) mul8u::return#2
   [136] if((signed byte) mul8s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s::@1
   to:mul8s::@3
-mul8s::@3: scope:[mul8s]  from mul8s::@6
+mul8s::@3: scope:[mul8s]  from mul8s::@5
   [137] (byte~) mul8s::$9 ← > (word) mul8s::m#0
   [138] (byte~) mul8s::$16 ← (byte~) mul8s::$9 - (byte)(signed byte) mul8s::b#0
   [139] (word) mul8s::m#1 ← (word) mul8s::m#0 hi= (byte~) mul8s::$16
   to:mul8s::@1
-mul8s::@1: scope:[mul8s]  from mul8s::@3 mul8s::@6
-  [140] (word) mul8s::m#5 ← phi( mul8s::@3/(word) mul8s::m#1 mul8s::@6/(word) mul8s::m#0 )
+mul8s::@1: scope:[mul8s]  from mul8s::@3 mul8s::@5
+  [140] (word) mul8s::m#5 ← phi( mul8s::@3/(word) mul8s::m#1 mul8s::@5/(word) mul8s::m#0 )
   [141] if((signed byte) mul8s::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s::@2
   to:mul8s::@4
 mul8s::@4: scope:[mul8s]  from mul8s::@1
@@ -293,15 +293,15 @@ mul8s::@2: scope:[mul8s]  from mul8s::@1 mul8s::@4
 mul8s::@return: scope:[mul8s]  from mul8s::@2
   [146] return 
   to:@return
-mul8u: scope:[mul8u]  from mul8s mul8u_compare::@13
-  [147] (byte) mul8u::a#6 ← phi( mul8s/(byte~) mul8u::a#8 mul8u_compare::@13/(byte) mul8u::a#2 )
-  [147] (byte) mul8u::b#2 ← phi( mul8s/(byte~) mul8u::b#3 mul8u_compare::@13/(byte) mul8u::b#1 )
+mul8u: scope:[mul8u]  from mul8s mul8u_compare::@11
+  [147] (byte) mul8u::a#6 ← phi( mul8s/(byte~) mul8u::a#8 mul8u_compare::@11/(byte) mul8u::a#2 )
+  [147] (byte) mul8u::b#2 ← phi( mul8s/(byte~) mul8u::b#3 mul8u_compare::@11/(byte) mul8u::b#1 )
   [148] (word) mul8u::mb#0 ← ((word)) (byte) mul8u::b#2
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [149] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@8/(word) mul8u::mb#1 )
-  [149] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [149] (byte) mul8u::a#3 ← phi( mul8u/(byte) mul8u::a#6 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [149] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@4/(word) mul8u::mb#1 )
+  [149] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [149] (byte) mul8u::a#3 ← phi( mul8u/(byte) mul8u::a#6 mul8u::@4/(byte) mul8u::a#0 )
   [150] if((byte) mul8u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -309,50 +309,50 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [152] (byte~) mul8u::$1 ← (byte) mul8u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [153] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [153] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [154] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [155] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [155] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [156] (byte) mul8u::a#0 ← (byte) mul8u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [157] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
-mulf8s: scope:[mulf8s]  from mul8s_compare::@12
+mulf8s: scope:[mulf8s]  from mul8s_compare::@10
   [158] phi()
   to:mulf8s::mulf8s_prepare1
 mulf8s::mulf8s_prepare1: scope:[mulf8s]  from mulf8s
   [159] (byte~) mulf8u_prepare::a#3 ← (byte)(signed byte) mulf8s::a#0
   [160] call mulf8u_prepare 
-  to:mulf8s::@2
-mulf8s::@2: scope:[mulf8s]  from mulf8s::mulf8s_prepare1
+  to:mulf8s::@1
+mulf8s::@1: scope:[mulf8s]  from mulf8s::mulf8s_prepare1
   [161] (signed byte) mulf8s_prepared::b#0 ← (signed byte) mulf8s::b#0
   [162] call mulf8s_prepared 
   [163] (signed word) mulf8s_prepared::return#2 ← (signed word)(word) mulf8s_prepared::m#4
-  to:mulf8s::@4
-mulf8s::@4: scope:[mulf8s]  from mulf8s::@2
+  to:mulf8s::@2
+mulf8s::@2: scope:[mulf8s]  from mulf8s::@1
   [164] (signed word) mulf8s::return#0 ← (signed word) mulf8s_prepared::return#2
   to:mulf8s::@return
-mulf8s::@return: scope:[mulf8s]  from mulf8s::@4
+mulf8s::@return: scope:[mulf8s]  from mulf8s::@2
   [165] return 
   to:@return
-mulf8s_prepared: scope:[mulf8s_prepared]  from mulf8s::@2
+mulf8s_prepared: scope:[mulf8s_prepared]  from mulf8s::@1
   [166] (byte~) mulf8u_prepared::b#3 ← (byte)(signed byte) mulf8s_prepared::b#0
   [167] call mulf8u_prepared 
   [168] (word) mulf8u_prepared::return#3 ← (word) mulf8u_prepared::return#0
-  to:mulf8s_prepared::@6
-mulf8s_prepared::@6: scope:[mulf8s_prepared]  from mulf8s_prepared
+  to:mulf8s_prepared::@5
+mulf8s_prepared::@5: scope:[mulf8s_prepared]  from mulf8s_prepared
   [169] (word) mulf8s_prepared::m#0 ← (word) mulf8u_prepared::return#3
   [170] if(*((const signed byte*) mulf8s_prepared::memA#0)>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@1
   to:mulf8s_prepared::@3
-mulf8s_prepared::@3: scope:[mulf8s_prepared]  from mulf8s_prepared::@6
+mulf8s_prepared::@3: scope:[mulf8s_prepared]  from mulf8s_prepared::@5
   [171] (byte~) mulf8s_prepared::$8 ← > (word) mulf8s_prepared::m#0
   [172] (byte~) mulf8s_prepared::$15 ← (byte~) mulf8s_prepared::$8 - (byte)(signed byte) mulf8s_prepared::b#0
   [173] (word) mulf8s_prepared::m#1 ← (word) mulf8s_prepared::m#0 hi= (byte~) mulf8s_prepared::$15
   to:mulf8s_prepared::@1
-mulf8s_prepared::@1: scope:[mulf8s_prepared]  from mulf8s_prepared::@3 mulf8s_prepared::@6
-  [174] (word) mulf8s_prepared::m#5 ← phi( mulf8s_prepared::@3/(word) mulf8s_prepared::m#1 mulf8s_prepared::@6/(word) mulf8s_prepared::m#0 )
+mulf8s_prepared::@1: scope:[mulf8s_prepared]  from mulf8s_prepared::@3 mulf8s_prepared::@5
+  [174] (word) mulf8s_prepared::m#5 ← phi( mulf8s_prepared::@3/(word) mulf8s_prepared::m#1 mulf8s_prepared::@5/(word) mulf8s_prepared::m#0 )
   [175] if((signed byte) mulf8s_prepared::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@2
   to:mulf8s_prepared::@4
 mulf8s_prepared::@4: scope:[mulf8s_prepared]  from mulf8s_prepared::@1
@@ -366,8 +366,8 @@ mulf8s_prepared::@2: scope:[mulf8s_prepared]  from mulf8s_prepared::@1 mulf8s_pr
 mulf8s_prepared::@return: scope:[mulf8s_prepared]  from mulf8s_prepared::@2
   [180] return 
   to:@return
-mulf8u_prepared: scope:[mulf8u_prepared]  from mulf8s_prepared mulf8u::@2
-  [181] (byte) mulf8u_prepared::b#2 ← phi( mulf8s_prepared/(byte~) mulf8u_prepared::b#3 mulf8u::@2/(byte) mulf8u_prepared::b#0 )
+mulf8u_prepared: scope:[mulf8u_prepared]  from mulf8s_prepared mulf8u::@1
+  [181] (byte) mulf8u_prepared::b#2 ← phi( mulf8s_prepared/(byte~) mulf8u_prepared::b#3 mulf8u::@1/(byte) mulf8u_prepared::b#0 )
   [182] *((const byte*) mulf8u_prepared::memB#0) ← (byte) mulf8u_prepared::b#2
   asm { ldxmemB sec sm1: ldamulf_sqr1_lo,x sm2: sbcmulf_sqr2_lo,x staresL sm3: ldamulf_sqr1_hi,x sm4: sbcmulf_sqr2_hi,x stamemB  }
   [184] (word) mulf8u_prepared::return#0 ← *((const byte*) mulf8u_prepared::memB#0) w= *((const byte*) mulf8u_prepared::resL#0)
@@ -384,36 +384,36 @@ mulf8u_prepare::@return: scope:[mulf8u_prepare]  from mulf8u_prepare
   [189] return 
   to:@return
 muls8s: scope:[muls8s]  from mul8s_compare::@2
-  [190] if((signed byte) muls8s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@10
-  to:muls8s::@4
-muls8s::@4: scope:[muls8s]  from muls8s
-  [191] if((signed byte) muls8s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@3
-  to:muls8s::@8
-muls8s::@8: scope:[muls8s]  from muls8s::@4 muls8s::@8
-  [192] (signed byte) muls8s::j#2 ← phi( muls8s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@8/(signed byte) muls8s::j#1 )
-  [192] (signed word) muls8s::m#3 ← phi( muls8s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@8/(signed word) muls8s::m#1 )
+  [190] if((signed byte) muls8s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@4
+  to:muls8s::@2
+muls8s::@2: scope:[muls8s]  from muls8s
+  [191] if((signed byte) muls8s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@1
+  to:muls8s::@3
+muls8s::@3: scope:[muls8s]  from muls8s::@2 muls8s::@3
+  [192] (signed byte) muls8s::j#2 ← phi( muls8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@3/(signed byte) muls8s::j#1 )
+  [192] (signed word) muls8s::m#3 ← phi( muls8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@3/(signed word) muls8s::m#1 )
   [193] (signed word) muls8s::m#1 ← (signed word) muls8s::m#3 + (signed byte) muls8s::b#0
   [194] (signed byte) muls8s::j#1 ← ++ (signed byte) muls8s::j#2
-  [195] if((signed byte) muls8s::j#1!=(signed byte) muls8s::a#0) goto muls8s::@8
-  to:muls8s::@3
-muls8s::@3: scope:[muls8s]  from muls8s::@10 muls8s::@4 muls8s::@8
-  [196] (signed word) muls8s::return#0 ← phi( muls8s::@10/(signed word) muls8s::m#2 muls8s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@8/(signed word) muls8s::m#1 )
+  [195] if((signed byte) muls8s::j#1!=(signed byte) muls8s::a#0) goto muls8s::@3
+  to:muls8s::@1
+muls8s::@1: scope:[muls8s]  from muls8s::@2 muls8s::@3 muls8s::@4
+  [196] (signed word) muls8s::return#0 ← phi( muls8s::@4/(signed word) muls8s::m#2 muls8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@3/(signed word) muls8s::m#1 )
   to:muls8s::@return
-muls8s::@return: scope:[muls8s]  from muls8s::@3
+muls8s::@return: scope:[muls8s]  from muls8s::@1
   [197] return 
   to:@return
-muls8s::@10: scope:[muls8s]  from muls8s muls8s::@10
-  [198] (signed byte) muls8s::i#2 ← phi( muls8s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@10/(signed byte) muls8s::i#1 )
-  [198] (signed word) muls8s::m#5 ← phi( muls8s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@10/(signed word) muls8s::m#2 )
+muls8s::@4: scope:[muls8s]  from muls8s muls8s::@4
+  [198] (signed byte) muls8s::i#2 ← phi( muls8s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@4/(signed byte) muls8s::i#1 )
+  [198] (signed word) muls8s::m#5 ← phi( muls8s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@4/(signed word) muls8s::m#2 )
   [199] (signed word) muls8s::m#2 ← (signed word) muls8s::m#5 - (signed byte) muls8s::b#0
   [200] (signed byte) muls8s::i#1 ← -- (signed byte) muls8s::i#2
-  [201] if((signed byte) muls8s::i#1!=(signed byte) muls8s::a#0) goto muls8s::@10
-  to:muls8s::@3
+  [201] if((signed byte) muls8s::i#1!=(signed byte) muls8s::a#0) goto muls8s::@4
+  to:muls8s::@1
 mul8u_compare: scope:[mul8u_compare]  from main::@4
   [202] phi()
   to:mul8u_compare::@1
-mul8u_compare::@1: scope:[mul8u_compare]  from mul8u_compare mul8u_compare::@10
-  [203] (byte) mul8u_compare::a#7 ← phi( mul8u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u_compare::@10/(byte) mul8u_compare::a#1 )
+mul8u_compare::@1: scope:[mul8u_compare]  from mul8u_compare mul8u_compare::@8
+  [203] (byte) mul8u_compare::a#7 ← phi( mul8u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u_compare::@8/(byte) mul8u_compare::a#1 )
   to:mul8u_compare::@2
 mul8u_compare::@2: scope:[mul8u_compare]  from mul8u_compare::@1 mul8u_compare::@5
   [204] (byte) mul8u_compare::b#10 ← phi( mul8u_compare::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u_compare::@5/(byte) mul8u_compare::b#1 )
@@ -421,37 +421,37 @@ mul8u_compare::@2: scope:[mul8u_compare]  from mul8u_compare::@1 mul8u_compare::
   [206] (byte) muls8u::b#0 ← (byte) mul8u_compare::b#10
   [207] call muls8u 
   [208] (word) muls8u::return#2 ← (word) muls8u::return#0
-  to:mul8u_compare::@12
-mul8u_compare::@12: scope:[mul8u_compare]  from mul8u_compare::@2
+  to:mul8u_compare::@10
+mul8u_compare::@10: scope:[mul8u_compare]  from mul8u_compare::@2
   [209] (word) mul8u_compare::ms#0 ← (word) muls8u::return#2
   [210] (byte) mulf8u::a#0 ← (byte) mul8u_compare::a#7
   [211] (byte) mulf8u::b#0 ← (byte) mul8u_compare::b#10
   [212] call mulf8u 
   [213] (word) mulf8u::return#2 ← (word) mulf8u::return#0
-  to:mul8u_compare::@13
-mul8u_compare::@13: scope:[mul8u_compare]  from mul8u_compare::@12
+  to:mul8u_compare::@11
+mul8u_compare::@11: scope:[mul8u_compare]  from mul8u_compare::@10
   [214] (word) mul8u_compare::mf#0 ← (word) mulf8u::return#2
   [215] (byte) mul8u::a#2 ← (byte) mul8u_compare::a#7
   [216] (byte) mul8u::b#1 ← (byte) mul8u_compare::b#10
   [217] call mul8u 
   [218] (word) mul8u::return#3 ← (word) mul8u::res#2
-  to:mul8u_compare::@14
-mul8u_compare::@14: scope:[mul8u_compare]  from mul8u_compare::@13
+  to:mul8u_compare::@12
+mul8u_compare::@12: scope:[mul8u_compare]  from mul8u_compare::@11
   [219] (word) mul8u_compare::mn#0 ← (word) mul8u::return#3
   [220] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mf#0) goto mul8u_compare::@3
   to:mul8u_compare::@6
-mul8u_compare::@6: scope:[mul8u_compare]  from mul8u_compare::@14
+mul8u_compare::@6: scope:[mul8u_compare]  from mul8u_compare::@12
   [221] phi()
   to:mul8u_compare::@3
-mul8u_compare::@3: scope:[mul8u_compare]  from mul8u_compare::@14 mul8u_compare::@6
-  [222] (byte) mul8u_compare::ok#4 ← phi( mul8u_compare::@14/(byte/signed byte/word/signed word/dword/signed dword) 1 mul8u_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@20
+mul8u_compare::@3: scope:[mul8u_compare]  from mul8u_compare::@12 mul8u_compare::@6
+  [222] (byte) mul8u_compare::ok#4 ← phi( mul8u_compare::@12/(byte/signed byte/word/signed word/dword/signed dword) 1 mul8u_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@14
   to:mul8u_compare::@4
-mul8u_compare::@4: scope:[mul8u_compare]  from mul8u_compare::@20 mul8u_compare::@3
-  [224] (byte) mul8u_compare::ok#3 ← phi( mul8u_compare::@20/(byte) mul8u_compare::ok#4 mul8u_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+mul8u_compare::@4: scope:[mul8u_compare]  from mul8u_compare::@14 mul8u_compare::@3
+  [224] (byte) mul8u_compare::ok#3 ← phi( mul8u_compare::@14/(byte) mul8u_compare::ok#4 mul8u_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [225] if((byte) mul8u_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u_compare::@5
-  to:mul8u_compare::@8
-mul8u_compare::@8: scope:[mul8u_compare]  from mul8u_compare::@4
+  to:mul8u_compare::@7
+mul8u_compare::@7: scope:[mul8u_compare]  from mul8u_compare::@4
   [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   [227] (byte) mul8u_error::a#0 ← (byte) mul8u_compare::a#7
   [228] (byte) mul8u_error::b#0 ← (byte) mul8u_compare::b#10
@@ -460,29 +460,29 @@ mul8u_compare::@8: scope:[mul8u_compare]  from mul8u_compare::@4
   [231] (word) mul8u_error::mf#0 ← (word) mul8u_compare::mf#0
   [232] call mul8u_error 
   to:mul8u_compare::@return
-mul8u_compare::@return: scope:[mul8u_compare]  from mul8u_compare::@16 mul8u_compare::@8
+mul8u_compare::@return: scope:[mul8u_compare]  from mul8u_compare::@13 mul8u_compare::@7
   [233] return 
   to:@return
 mul8u_compare::@5: scope:[mul8u_compare]  from mul8u_compare::@4
   [234] (byte) mul8u_compare::b#1 ← ++ (byte) mul8u_compare::b#10
   [235] if((byte) mul8u_compare::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u_compare::@2
-  to:mul8u_compare::@10
-mul8u_compare::@10: scope:[mul8u_compare]  from mul8u_compare::@5
+  to:mul8u_compare::@8
+mul8u_compare::@8: scope:[mul8u_compare]  from mul8u_compare::@5
   [236] (byte) mul8u_compare::a#1 ← ++ (byte) mul8u_compare::a#7
   [237] if((byte) mul8u_compare::a#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u_compare::@1
-  to:mul8u_compare::@11
-mul8u_compare::@11: scope:[mul8u_compare]  from mul8u_compare::@10
+  to:mul8u_compare::@9
+mul8u_compare::@9: scope:[mul8u_compare]  from mul8u_compare::@8
   [238] phi()
   [239] call print_str 
-  to:mul8u_compare::@16
-mul8u_compare::@16: scope:[mul8u_compare]  from mul8u_compare::@11
+  to:mul8u_compare::@13
+mul8u_compare::@13: scope:[mul8u_compare]  from mul8u_compare::@9
   [240] phi()
   [241] call print_ln 
   to:mul8u_compare::@return
-mul8u_compare::@20: scope:[mul8u_compare]  from mul8u_compare::@3
+mul8u_compare::@14: scope:[mul8u_compare]  from mul8u_compare::@3
   [242] phi()
   to:mul8u_compare::@4
-mul8u_error: scope:[mul8u_error]  from mul8u_compare::@8
+mul8u_error: scope:[mul8u_error]  from mul8u_compare::@7
   [243] phi()
   [244] call print_str 
   to:mul8u_error::@1
@@ -529,33 +529,33 @@ mul8u_error::@10: scope:[mul8u_error]  from mul8u_error::@9
 mul8u_error::@return: scope:[mul8u_error]  from mul8u_error::@10
   [265] return 
   to:@return
-mulf8u: scope:[mulf8u]  from mul8u_compare::@12
+mulf8u: scope:[mulf8u]  from mul8u_compare::@10
   [266] (byte) mulf8u_prepare::a#0 ← (byte) mulf8u::a#0
   [267] call mulf8u_prepare 
-  to:mulf8u::@2
-mulf8u::@2: scope:[mulf8u]  from mulf8u
+  to:mulf8u::@1
+mulf8u::@1: scope:[mulf8u]  from mulf8u
   [268] (byte) mulf8u_prepared::b#0 ← (byte) mulf8u::b#0
   [269] call mulf8u_prepared 
   [270] (word) mulf8u_prepared::return#2 ← (word) mulf8u_prepared::return#0
-  to:mulf8u::@3
-mulf8u::@3: scope:[mulf8u]  from mulf8u::@2
+  to:mulf8u::@2
+mulf8u::@2: scope:[mulf8u]  from mulf8u::@1
   [271] (word) mulf8u::return#0 ← (word) mulf8u_prepared::return#2
   to:mulf8u::@return
-mulf8u::@return: scope:[mulf8u]  from mulf8u::@3
+mulf8u::@return: scope:[mulf8u]  from mulf8u::@2
   [272] return 
   to:@return
 muls8u: scope:[muls8u]  from mul8u_compare::@2
   [273] if((byte) muls8u::a#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8u::@1
-  to:muls8u::@4
-muls8u::@4: scope:[muls8u]  from muls8u muls8u::@4
-  [274] (byte) muls8u::i#2 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@4/(byte) muls8u::i#1 )
-  [274] (word) muls8u::m#3 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@4/(word) muls8u::m#1 )
+  to:muls8u::@2
+muls8u::@2: scope:[muls8u]  from muls8u muls8u::@2
+  [274] (byte) muls8u::i#2 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@2/(byte) muls8u::i#1 )
+  [274] (word) muls8u::m#3 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@2/(word) muls8u::m#1 )
   [275] (word) muls8u::m#1 ← (word) muls8u::m#3 + (byte) muls8u::b#0
   [276] (byte) muls8u::i#1 ← ++ (byte) muls8u::i#2
-  [277] if((byte) muls8u::i#1!=(byte) muls8u::a#0) goto muls8u::@4
+  [277] if((byte) muls8u::i#1!=(byte) muls8u::a#0) goto muls8u::@2
   to:muls8u::@1
-muls8u::@1: scope:[muls8u]  from muls8u muls8u::@4
-  [278] (word) muls8u::return#0 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@4/(word) muls8u::m#1 )
+muls8u::@1: scope:[muls8u]  from muls8u muls8u::@2
+  [278] (word) muls8u::return#0 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@2/(word) muls8u::m#1 )
   to:muls8u::@return
 muls8u::@return: scope:[muls8u]  from muls8u::@1
   [279] return 
@@ -571,34 +571,34 @@ mulf_tables_cmp::@1: scope:[mulf_tables_cmp]  from mulf_tables_cmp mulf_tables_c
 mulf_tables_cmp::@3: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@1
   [283] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   [284] call print_str 
-  to:mulf_tables_cmp::@6
-mulf_tables_cmp::@6: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@3
+  to:mulf_tables_cmp::@5
+mulf_tables_cmp::@5: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@3
   [285] (word~) print_word::w#11 ← (word)(byte*) mulf_tables_cmp::asm_sqr#2
   [286] call print_word 
-  to:mulf_tables_cmp::@7
-mulf_tables_cmp::@7: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@6
+  to:mulf_tables_cmp::@6
+mulf_tables_cmp::@6: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@5
   [287] phi()
   [288] call print_str 
-  to:mulf_tables_cmp::@8
-mulf_tables_cmp::@8: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@7
+  to:mulf_tables_cmp::@7
+mulf_tables_cmp::@7: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@6
   [289] (word~) print_word::w#12 ← (word)(byte*) mulf_tables_cmp::kc_sqr#2
   [290] call print_word 
   to:mulf_tables_cmp::@return
-mulf_tables_cmp::@return: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@10 mulf_tables_cmp::@8
-  [291] (byte*) print_line_cursor#10 ← phi( mulf_tables_cmp::@10/(byte*) print_line_cursor#1 mulf_tables_cmp::@8/((byte*))(word/signed word/dword/signed dword) $400 )
-  [291] (byte*) print_char_cursor#31 ← phi( mulf_tables_cmp::@10/(byte*~) print_char_cursor#225 mulf_tables_cmp::@8/(byte*) print_char_cursor#18 )
+mulf_tables_cmp::@return: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@7 mulf_tables_cmp::@8
+  [291] (byte*) print_line_cursor#10 ← phi( mulf_tables_cmp::@8/(byte*) print_line_cursor#1 mulf_tables_cmp::@7/((byte*))(word/signed word/dword/signed dword) $400 )
+  [291] (byte*) print_char_cursor#31 ← phi( mulf_tables_cmp::@8/(byte*~) print_char_cursor#225 mulf_tables_cmp::@7/(byte*) print_char_cursor#18 )
   [292] return 
   to:@return
 mulf_tables_cmp::@2: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@1
   [293] (byte*) mulf_tables_cmp::asm_sqr#1 ← ++ (byte*) mulf_tables_cmp::asm_sqr#2
   [294] (byte*) mulf_tables_cmp::kc_sqr#1 ← ++ (byte*) mulf_tables_cmp::kc_sqr#2
   [295] if((byte*) mulf_tables_cmp::kc_sqr#1<(const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $200*(byte/signed byte/word/signed word/dword/signed dword) 4) goto mulf_tables_cmp::@1
-  to:mulf_tables_cmp::@5
-mulf_tables_cmp::@5: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@2
+  to:mulf_tables_cmp::@4
+mulf_tables_cmp::@4: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@2
   [296] phi()
   [297] call print_str 
-  to:mulf_tables_cmp::@10
-mulf_tables_cmp::@10: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@5
+  to:mulf_tables_cmp::@8
+mulf_tables_cmp::@8: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@4
   [298] phi()
   [299] call print_ln 
   [300] (byte*~) print_char_cursor#225 ← (byte*) print_line_cursor#1
@@ -641,33 +641,33 @@ mulf_init::@2: scope:[mulf_init]  from mulf_init::@1 mulf_init::@3
   [320] (word) mulf_init::sqr#1 ← (word) mulf_init::sqr#3 + (byte) mulf_init::x_2#2
   [321] (byte*) mulf_init::sqr1_lo#1 ← ++ (byte*) mulf_init::sqr1_lo#2
   [322] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $200) goto mulf_init::@1
-  to:mulf_init::@5
-mulf_init::@5: scope:[mulf_init]  from mulf_init::@2 mulf_init::@6
-  [323] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@6/(byte) mulf_init::dir#3 )
-  [323] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@6/(byte*) mulf_init::sqr2_hi#1 )
-  [323] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@6/(byte*) mulf_init::sqr2_lo#1 )
-  [323] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@6/(byte) mulf_init::x_255#1 )
+  to:mulf_init::@4
+mulf_init::@4: scope:[mulf_init]  from mulf_init::@2 mulf_init::@5
+  [323] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@5/(byte) mulf_init::dir#3 )
+  [323] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@5/(byte*) mulf_init::sqr2_hi#1 )
+  [323] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@5/(byte*) mulf_init::sqr2_lo#1 )
+  [323] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@5/(byte) mulf_init::x_255#1 )
   [324] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2)
   [325] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2)
   [326] (byte*) mulf_init::sqr2_hi#1 ← ++ (byte*) mulf_init::sqr2_hi#2
   [327] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2
-  [328] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12
-  to:mulf_init::@6
-mulf_init::@6: scope:[mulf_init]  from mulf_init::@12 mulf_init::@5
-  [329] (byte) mulf_init::dir#3 ← phi( mulf_init::@12/(byte) mulf_init::dir#2 mulf_init::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [328] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7
+  to:mulf_init::@5
+mulf_init::@5: scope:[mulf_init]  from mulf_init::@4 mulf_init::@7
+  [329] (byte) mulf_init::dir#3 ← phi( mulf_init::@7/(byte) mulf_init::dir#2 mulf_init::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [330] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2
-  [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5
-  to:mulf_init::@8
-mulf_init::@8: scope:[mulf_init]  from mulf_init::@6
+  [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4
+  to:mulf_init::@6
+mulf_init::@6: scope:[mulf_init]  from mulf_init::@5
   [332] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100)
   [333] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100)
   to:mulf_init::@return
-mulf_init::@return: scope:[mulf_init]  from mulf_init::@8
+mulf_init::@return: scope:[mulf_init]  from mulf_init::@6
   [334] return 
   to:@return
-mulf_init::@12: scope:[mulf_init]  from mulf_init::@5
+mulf_init::@7: scope:[mulf_init]  from mulf_init::@4
   [335] phi()
-  to:mulf_init::@6
+  to:mulf_init::@5
 print_cls: scope:[print_cls]  from main
   [336] phi()
   to:print_cls::@1
diff --git a/src/test/ref/test-multiply-8bit.log b/src/test/ref/test-multiply-8bit.log
index bb492ecb0..bc1769422 100644
--- a/src/test/ref/test-multiply-8bit.log
+++ b/src/test/ref/test-multiply-8bit.log
@@ -3520,8 +3520,49 @@ Culled Empty Block (label) mulf_init::@11
 Culled Empty Block (label) mulf_init::@9
 Culled Empty Block (label) mulf_init::@10
 Culled Empty Block (label) print_cls::@3
+Renumbering block @42 to @1
+Renumbering block print_sword::@4 to print_sword::@3
+Renumbering block print_sbyte::@5 to print_sbyte::@4
+Renumbering block mul8u::@6 to mul8u::@3
+Renumbering block mul8u::@8 to mul8u::@4
+Renumbering block mul8s::@6 to mul8s::@5
+Renumbering block mulf_init::@5 to mulf_init::@4
+Renumbering block mulf_init::@6 to mulf_init::@5
+Renumbering block mulf_init::@8 to mulf_init::@6
+Renumbering block mulf_init::@12 to mulf_init::@7
+Renumbering block mulf8u::@2 to mulf8u::@1
+Renumbering block mulf8u::@3 to mulf8u::@2
+Renumbering block mulf8s_prepared::@6 to mulf8s_prepared::@5
+Renumbering block mulf8s::@2 to mulf8s::@1
+Renumbering block mulf8s::@4 to mulf8s::@2
+Renumbering block muls8u::@4 to muls8u::@2
+Renumbering block muls8s::@3 to muls8s::@1
+Renumbering block muls8s::@4 to muls8s::@2
+Renumbering block muls8s::@8 to muls8s::@3
+Renumbering block muls8s::@10 to muls8s::@4
+Renumbering block mulf_tables_cmp::@5 to mulf_tables_cmp::@4
+Renumbering block mulf_tables_cmp::@6 to mulf_tables_cmp::@5
+Renumbering block mulf_tables_cmp::@7 to mulf_tables_cmp::@6
+Renumbering block mulf_tables_cmp::@8 to mulf_tables_cmp::@7
+Renumbering block mulf_tables_cmp::@10 to mulf_tables_cmp::@8
+Renumbering block mul8u_compare::@8 to mul8u_compare::@7
+Renumbering block mul8u_compare::@10 to mul8u_compare::@8
+Renumbering block mul8u_compare::@11 to mul8u_compare::@9
+Renumbering block mul8u_compare::@12 to mul8u_compare::@10
+Renumbering block mul8u_compare::@13 to mul8u_compare::@11
+Renumbering block mul8u_compare::@14 to mul8u_compare::@12
+Renumbering block mul8u_compare::@16 to mul8u_compare::@13
+Renumbering block mul8u_compare::@20 to mul8u_compare::@14
+Renumbering block mul8s_compare::@8 to mul8s_compare::@7
+Renumbering block mul8s_compare::@10 to mul8s_compare::@8
+Renumbering block mul8s_compare::@11 to mul8s_compare::@9
+Renumbering block mul8s_compare::@12 to mul8s_compare::@10
+Renumbering block mul8s_compare::@13 to mul8s_compare::@11
+Renumbering block mul8s_compare::@14 to mul8s_compare::@12
+Renumbering block mul8s_compare::@16 to mul8s_compare::@13
+Renumbering block mul8s_compare::@20 to mul8s_compare::@14
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @42
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main::@1
 Adding NOP phi() at start of main::@2
@@ -3530,8 +3571,8 @@ Adding NOP phi() at start of main::@4
 Adding NOP phi() at start of main::@5
 Adding NOP phi() at start of mul8s_compare
 Adding NOP phi() at start of mul8s_compare::@6
-Adding NOP phi() at start of mul8s_compare::@16
-Adding NOP phi() at start of mul8s_compare::@20
+Adding NOP phi() at start of mul8s_compare::@13
+Adding NOP phi() at start of mul8s_compare::@14
 Adding NOP phi() at start of mul8s_error::@2
 Adding NOP phi() at start of mul8s_error::@4
 Adding NOP phi() at start of mul8s_error::@6
@@ -3543,9 +3584,9 @@ Adding NOP phi() at start of print_sbyte::@1
 Adding NOP phi() at start of mulf8s
 Adding NOP phi() at start of mul8u_compare
 Adding NOP phi() at start of mul8u_compare::@6
-Adding NOP phi() at start of mul8u_compare::@11
-Adding NOP phi() at start of mul8u_compare::@16
-Adding NOP phi() at start of mul8u_compare::@20
+Adding NOP phi() at start of mul8u_compare::@9
+Adding NOP phi() at start of mul8u_compare::@13
+Adding NOP phi() at start of mul8u_compare::@14
 Adding NOP phi() at start of mul8u_error
 Adding NOP phi() at start of mul8u_error::@2
 Adding NOP phi() at start of mul8u_error::@4
@@ -3553,24 +3594,24 @@ Adding NOP phi() at start of mul8u_error::@6
 Adding NOP phi() at start of mul8u_error::@8
 Adding NOP phi() at start of mul8u_error::@10
 Adding NOP phi() at start of mulf_tables_cmp
-Adding NOP phi() at start of mulf_tables_cmp::@7
-Adding NOP phi() at start of mulf_tables_cmp::@5
-Adding NOP phi() at start of mulf_tables_cmp::@10
+Adding NOP phi() at start of mulf_tables_cmp::@6
+Adding NOP phi() at start of mulf_tables_cmp::@4
+Adding NOP phi() at start of mulf_tables_cmp::@8
 Adding NOP phi() at start of mulf_init
-Adding NOP phi() at start of mulf_init::@12
+Adding NOP phi() at start of mulf_init::@7
 Adding NOP phi() at start of print_cls
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@42
-@42: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @42
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @42
+main: scope:[main]  from @1
   [4] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 5
   [5] call print_cls 
   to:main::@1
@@ -3600,8 +3641,8 @@ main::@return: scope:[main]  from main::@5
 mul8s_compare: scope:[mul8s_compare]  from main::@5
   [17] phi()
   to:mul8s_compare::@1
-mul8s_compare::@1: scope:[mul8s_compare]  from mul8s_compare mul8s_compare::@10
-  [18] (signed byte) mul8s_compare::a#7 ← phi( mul8s_compare/-(byte/word/signed word/dword/signed dword) $80 mul8s_compare::@10/(signed byte) mul8s_compare::a#1 )
+mul8s_compare::@1: scope:[mul8s_compare]  from mul8s_compare mul8s_compare::@8
+  [18] (signed byte) mul8s_compare::a#7 ← phi( mul8s_compare/-(byte/word/signed word/dword/signed dword) $80 mul8s_compare::@8/(signed byte) mul8s_compare::a#1 )
   to:mul8s_compare::@2
 mul8s_compare::@2: scope:[mul8s_compare]  from mul8s_compare::@1 mul8s_compare::@5
   [19] (signed byte) mul8s_compare::b#10 ← phi( mul8s_compare::@1/-(byte/word/signed word/dword/signed dword) $80 mul8s_compare::@5/(signed byte) mul8s_compare::b#1 )
@@ -3609,37 +3650,37 @@ mul8s_compare::@2: scope:[mul8s_compare]  from mul8s_compare::@1 mul8s_compare::
   [21] (signed byte) muls8s::b#0 ← (signed byte) mul8s_compare::b#10
   [22] call muls8s 
   [23] (signed word) muls8s::return#2 ← (signed word) muls8s::return#0
-  to:mul8s_compare::@12
-mul8s_compare::@12: scope:[mul8s_compare]  from mul8s_compare::@2
+  to:mul8s_compare::@10
+mul8s_compare::@10: scope:[mul8s_compare]  from mul8s_compare::@2
   [24] (signed word) mul8s_compare::ms#0 ← (signed word) muls8s::return#2
   [25] (signed byte) mulf8s::a#0 ← (signed byte) mul8s_compare::a#7
   [26] (signed byte) mulf8s::b#0 ← (signed byte) mul8s_compare::b#10
   [27] call mulf8s 
   [28] (signed word) mulf8s::return#2 ← (signed word) mulf8s::return#0
-  to:mul8s_compare::@13
-mul8s_compare::@13: scope:[mul8s_compare]  from mul8s_compare::@12
+  to:mul8s_compare::@11
+mul8s_compare::@11: scope:[mul8s_compare]  from mul8s_compare::@10
   [29] (signed word) mul8s_compare::mf#0 ← (signed word) mulf8s::return#2
   [30] (signed byte) mul8s::a#0 ← (signed byte) mul8s_compare::a#7
   [31] (signed byte) mul8s::b#0 ← (signed byte) mul8s_compare::b#10
   [32] call mul8s 
   [33] (signed word) mul8s::return#2 ← (signed word)(word) mul8s::m#4
-  to:mul8s_compare::@14
-mul8s_compare::@14: scope:[mul8s_compare]  from mul8s_compare::@13
+  to:mul8s_compare::@12
+mul8s_compare::@12: scope:[mul8s_compare]  from mul8s_compare::@11
   [34] (signed word) mul8s_compare::mn#0 ← (signed word) mul8s::return#2
   [35] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mf#0) goto mul8s_compare::@3
   to:mul8s_compare::@6
-mul8s_compare::@6: scope:[mul8s_compare]  from mul8s_compare::@14
+mul8s_compare::@6: scope:[mul8s_compare]  from mul8s_compare::@12
   [36] phi()
   to:mul8s_compare::@3
-mul8s_compare::@3: scope:[mul8s_compare]  from mul8s_compare::@14 mul8s_compare::@6
-  [37] (byte) mul8s_compare::ok#4 ← phi( mul8s_compare::@14/(byte/signed byte/word/signed word/dword/signed dword) 1 mul8s_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@20
+mul8s_compare::@3: scope:[mul8s_compare]  from mul8s_compare::@12 mul8s_compare::@6
+  [37] (byte) mul8s_compare::ok#4 ← phi( mul8s_compare::@12/(byte/signed byte/word/signed word/dword/signed dword) 1 mul8s_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@14
   to:mul8s_compare::@4
-mul8s_compare::@4: scope:[mul8s_compare]  from mul8s_compare::@20 mul8s_compare::@3
-  [39] (byte) mul8s_compare::ok#3 ← phi( mul8s_compare::@20/(byte) mul8s_compare::ok#4 mul8s_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+mul8s_compare::@4: scope:[mul8s_compare]  from mul8s_compare::@14 mul8s_compare::@3
+  [39] (byte) mul8s_compare::ok#3 ← phi( mul8s_compare::@14/(byte) mul8s_compare::ok#4 mul8s_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [40] if((byte) mul8s_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s_compare::@5
-  to:mul8s_compare::@8
-mul8s_compare::@8: scope:[mul8s_compare]  from mul8s_compare::@4
+  to:mul8s_compare::@7
+mul8s_compare::@7: scope:[mul8s_compare]  from mul8s_compare::@4
   [41] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   [42] (signed byte) mul8s_error::a#0 ← (signed byte) mul8s_compare::a#7
   [43] (signed byte) mul8s_error::b#0 ← (signed byte) mul8s_compare::b#10
@@ -3648,31 +3689,31 @@ mul8s_compare::@8: scope:[mul8s_compare]  from mul8s_compare::@4
   [46] (signed word) mul8s_error::mf#0 ← (signed word) mul8s_compare::mf#0
   [47] call mul8s_error 
   to:mul8s_compare::@return
-mul8s_compare::@return: scope:[mul8s_compare]  from mul8s_compare::@16 mul8s_compare::@8
+mul8s_compare::@return: scope:[mul8s_compare]  from mul8s_compare::@13 mul8s_compare::@7
   [48] return 
   to:@return
 mul8s_compare::@5: scope:[mul8s_compare]  from mul8s_compare::@4
   [49] (signed byte) mul8s_compare::b#1 ← ++ (signed byte) mul8s_compare::b#10
   [50] if((signed byte) mul8s_compare::b#1!=-(byte/word/signed word/dword/signed dword) $80) goto mul8s_compare::@2
-  to:mul8s_compare::@10
-mul8s_compare::@10: scope:[mul8s_compare]  from mul8s_compare::@5
+  to:mul8s_compare::@8
+mul8s_compare::@8: scope:[mul8s_compare]  from mul8s_compare::@5
   [51] (signed byte) mul8s_compare::a#1 ← ++ (signed byte) mul8s_compare::a#7
   [52] if((signed byte) mul8s_compare::a#1!=-(byte/word/signed word/dword/signed dword) $80) goto mul8s_compare::@1
-  to:mul8s_compare::@11
-mul8s_compare::@11: scope:[mul8s_compare]  from mul8s_compare::@10
+  to:mul8s_compare::@9
+mul8s_compare::@9: scope:[mul8s_compare]  from mul8s_compare::@8
   [53] (byte*~) print_char_cursor#192 ← (byte*) print_line_cursor#1
   [54] call print_str 
-  to:mul8s_compare::@16
-mul8s_compare::@16: scope:[mul8s_compare]  from mul8s_compare::@11
+  to:mul8s_compare::@13
+mul8s_compare::@13: scope:[mul8s_compare]  from mul8s_compare::@9
   [55] phi()
   [56] call print_ln 
   to:mul8s_compare::@return
-mul8s_compare::@20: scope:[mul8s_compare]  from mul8s_compare::@3
+mul8s_compare::@14: scope:[mul8s_compare]  from mul8s_compare::@3
   [57] phi()
   to:mul8s_compare::@4
-print_ln: scope:[print_ln]  from mul8s_compare::@16 mul8s_error::@10 mul8u_compare::@16 mul8u_error::@10 mulf_tables_cmp::@10
-  [58] (byte*) print_char_cursor#133 ← phi( mul8s_compare::@16/(byte*) print_char_cursor#132 mul8s_error::@10/(byte*) print_char_cursor#18 mul8u_compare::@16/(byte*) print_char_cursor#132 mul8u_error::@10/(byte*) print_char_cursor#18 mulf_tables_cmp::@10/(byte*) print_char_cursor#132 )
-  [58] (byte*) print_line_cursor#45 ← phi( mul8s_compare::@16/(byte*) print_line_cursor#1 mul8s_error::@10/(byte*) print_line_cursor#1 mul8u_compare::@16/(byte*) print_line_cursor#10 mul8u_error::@10/(byte*) print_line_cursor#10 mulf_tables_cmp::@10/((byte*))(word/signed word/dword/signed dword) $400 )
+print_ln: scope:[print_ln]  from mul8s_compare::@13 mul8s_error::@10 mul8u_compare::@13 mul8u_error::@10 mulf_tables_cmp::@8
+  [58] (byte*) print_char_cursor#133 ← phi( mul8s_compare::@13/(byte*) print_char_cursor#132 mul8s_error::@10/(byte*) print_char_cursor#18 mul8u_compare::@13/(byte*) print_char_cursor#132 mul8u_error::@10/(byte*) print_char_cursor#18 mulf_tables_cmp::@8/(byte*) print_char_cursor#132 )
+  [58] (byte*) print_line_cursor#45 ← phi( mul8s_compare::@13/(byte*) print_line_cursor#1 mul8s_error::@10/(byte*) print_line_cursor#1 mul8u_compare::@13/(byte*) print_line_cursor#10 mul8u_error::@10/(byte*) print_line_cursor#10 mulf_tables_cmp::@8/((byte*))(word/signed word/dword/signed dword) $400 )
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
   [59] (byte*) print_line_cursor#23 ← phi( print_ln/(byte*) print_line_cursor#45 print_ln::@1/(byte*) print_line_cursor#1 )
@@ -3682,9 +3723,9 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [62] return 
   to:@return
-print_str: scope:[print_str]  from mul8s_compare::@11 mul8s_error mul8s_error::@2 mul8s_error::@4 mul8s_error::@6 mul8s_error::@8 mul8u_compare::@11 mul8u_error mul8u_error::@2 mul8u_error::@4 mul8u_error::@6 mul8u_error::@8 mulf_tables_cmp::@3 mulf_tables_cmp::@5 mulf_tables_cmp::@7
-  [63] (byte*) print_char_cursor#152 ← phi( mul8s_compare::@11/(byte*~) print_char_cursor#192 mul8s_error/(byte*~) print_char_cursor#193 mul8s_error::@2/(byte*) print_char_cursor#18 mul8s_error::@4/(byte*) print_char_cursor#18 mul8s_error::@6/(byte*) print_char_cursor#18 mul8s_error::@8/(byte*) print_char_cursor#18 mul8u_compare::@11/(byte*) print_char_cursor#31 mul8u_error/(byte*) print_char_cursor#31 mul8u_error::@2/(byte*) print_char_cursor#18 mul8u_error::@4/(byte*) print_char_cursor#18 mul8u_error::@6/(byte*) print_char_cursor#18 mul8u_error::@8/(byte*) print_char_cursor#18 mulf_tables_cmp::@3/((byte*))(word/signed word/dword/signed dword) $400 mulf_tables_cmp::@5/((byte*))(word/signed word/dword/signed dword) $400 mulf_tables_cmp::@7/(byte*) print_char_cursor#18 )
-  [63] (byte*) print_str::str#18 ← phi( mul8s_compare::@11/(const string) mul8s_compare::str mul8s_error/(const string) mul8s_error::str mul8s_error::@2/(const string) str1 mul8s_error::@4/(const string) str2 mul8s_error::@6/(const string) str3 mul8s_error::@8/(const string) str4 mul8u_compare::@11/(const string) mul8u_compare::str mul8u_error/(const string) mul8u_error::str mul8u_error::@2/(const string) str1 mul8u_error::@4/(const string) str2 mul8u_error::@6/(const string) str3 mul8u_error::@8/(const string) str4 mulf_tables_cmp::@3/(const string) mulf_tables_cmp::str mulf_tables_cmp::@5/(const string) mulf_tables_cmp::str2 mulf_tables_cmp::@7/(const string) mulf_tables_cmp::str1 )
+print_str: scope:[print_str]  from mul8s_compare::@9 mul8s_error mul8s_error::@2 mul8s_error::@4 mul8s_error::@6 mul8s_error::@8 mul8u_compare::@9 mul8u_error mul8u_error::@2 mul8u_error::@4 mul8u_error::@6 mul8u_error::@8 mulf_tables_cmp::@3 mulf_tables_cmp::@4 mulf_tables_cmp::@6
+  [63] (byte*) print_char_cursor#152 ← phi( mul8s_compare::@9/(byte*~) print_char_cursor#192 mul8s_error/(byte*~) print_char_cursor#193 mul8s_error::@2/(byte*) print_char_cursor#18 mul8s_error::@4/(byte*) print_char_cursor#18 mul8s_error::@6/(byte*) print_char_cursor#18 mul8s_error::@8/(byte*) print_char_cursor#18 mul8u_compare::@9/(byte*) print_char_cursor#31 mul8u_error/(byte*) print_char_cursor#31 mul8u_error::@2/(byte*) print_char_cursor#18 mul8u_error::@4/(byte*) print_char_cursor#18 mul8u_error::@6/(byte*) print_char_cursor#18 mul8u_error::@8/(byte*) print_char_cursor#18 mulf_tables_cmp::@3/((byte*))(word/signed word/dword/signed dword) $400 mulf_tables_cmp::@4/((byte*))(word/signed word/dword/signed dword) $400 mulf_tables_cmp::@6/(byte*) print_char_cursor#18 )
+  [63] (byte*) print_str::str#18 ← phi( mul8s_compare::@9/(const string) mul8s_compare::str mul8s_error/(const string) mul8s_error::str mul8s_error::@2/(const string) str1 mul8s_error::@4/(const string) str2 mul8s_error::@6/(const string) str3 mul8s_error::@8/(const string) str4 mul8u_compare::@9/(const string) mul8u_compare::str mul8u_error/(const string) mul8u_error::str mul8u_error::@2/(const string) str1 mul8u_error::@4/(const string) str2 mul8u_error::@6/(const string) str3 mul8u_error::@8/(const string) str4 mulf_tables_cmp::@3/(const string) mulf_tables_cmp::str mulf_tables_cmp::@4/(const string) mulf_tables_cmp::str2 mulf_tables_cmp::@6/(const string) mulf_tables_cmp::str1 )
   to:print_str::@1
 print_str::@1: scope:[print_str]  from print_str print_str::@2
   [64] (byte*) print_char_cursor#132 ← phi( print_str/(byte*) print_char_cursor#152 print_str::@2/(byte*) print_char_cursor#1 )
@@ -3699,7 +3740,7 @@ print_str::@2: scope:[print_str]  from print_str::@1
   [68] (byte*) print_char_cursor#1 ← ++ (byte*) print_char_cursor#132
   [69] (byte*) print_str::str#0 ← ++ (byte*) print_str::str#16
   to:print_str::@1
-mul8s_error: scope:[mul8s_error]  from mul8s_compare::@8
+mul8s_error: scope:[mul8s_error]  from mul8s_compare::@7
   [70] (byte*~) print_char_cursor#193 ← (byte*) print_line_cursor#1
   [71] call print_str 
   to:mul8s_error::@1
@@ -3753,22 +3794,22 @@ print_sword: scope:[print_sword]  from mul8s_error::@5 mul8s_error::@7 mul8s_err
 print_sword::@2: scope:[print_sword]  from print_sword
   [95] phi()
   [96] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [97] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#4
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [98] (byte*) print_char_cursor#134 ← phi( print_sword/(byte*) print_char_cursor#132 print_sword::@4/(byte*) print_char_cursor#18 )
-  [98] (signed word) print_sword::w#5 ← phi( print_sword/(signed word) print_sword::w#4 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [98] (byte*) print_char_cursor#134 ← phi( print_sword/(byte*) print_char_cursor#132 print_sword::@3/(byte*) print_char_cursor#18 )
+  [98] (signed word) print_sword::w#5 ← phi( print_sword/(signed word) print_sword::w#4 print_sword::@3/(signed word) print_sword::w#0 )
   [99] (word~) print_word::w#13 ← (word)(signed word) print_sword::w#5
   [100] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
   [101] return 
   to:@return
-print_word: scope:[print_word]  from mul8u_error::@5 mul8u_error::@7 mul8u_error::@9 mulf_tables_cmp::@6 mulf_tables_cmp::@8 print_sword::@1
-  [102] (byte*) print_char_cursor#139 ← phi( mul8u_error::@5/(byte*) print_char_cursor#132 mul8u_error::@7/(byte*) print_char_cursor#132 mul8u_error::@9/(byte*) print_char_cursor#132 mulf_tables_cmp::@6/(byte*) print_char_cursor#132 mulf_tables_cmp::@8/(byte*) print_char_cursor#132 print_sword::@1/(byte*) print_char_cursor#134 )
-  [102] (word) print_word::w#6 ← phi( mul8u_error::@5/(word) print_word::w#3 mul8u_error::@7/(word) print_word::w#4 mul8u_error::@9/(word) print_word::w#5 mulf_tables_cmp::@6/(word~) print_word::w#11 mulf_tables_cmp::@8/(word~) print_word::w#12 print_sword::@1/(word~) print_word::w#13 )
+print_word: scope:[print_word]  from mul8u_error::@5 mul8u_error::@7 mul8u_error::@9 mulf_tables_cmp::@5 mulf_tables_cmp::@7 print_sword::@1
+  [102] (byte*) print_char_cursor#139 ← phi( mul8u_error::@5/(byte*) print_char_cursor#132 mul8u_error::@7/(byte*) print_char_cursor#132 mul8u_error::@9/(byte*) print_char_cursor#132 mulf_tables_cmp::@5/(byte*) print_char_cursor#132 mulf_tables_cmp::@7/(byte*) print_char_cursor#132 print_sword::@1/(byte*) print_char_cursor#134 )
+  [102] (word) print_word::w#6 ← phi( mul8u_error::@5/(word) print_word::w#3 mul8u_error::@7/(word) print_word::w#4 mul8u_error::@9/(word) print_word::w#5 mulf_tables_cmp::@5/(word~) print_word::w#11 mulf_tables_cmp::@7/(word~) print_word::w#12 print_sword::@1/(word~) print_word::w#13 )
   [103] (byte) print_byte::b#1 ← > (word) print_word::w#6
   [104] call print_byte 
   to:print_word::@1
@@ -3811,8 +3852,8 @@ print_sbyte::@3: scope:[print_sbyte]  from print_sbyte
   [122] phi()
   [123] call print_char 
   to:print_sbyte::@2
-print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@5
-  [124] (signed byte) print_sbyte::b#5 ← phi( print_sbyte::@5/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#3 )
+print_sbyte::@2: scope:[print_sbyte]  from print_sbyte::@3 print_sbyte::@4
+  [124] (signed byte) print_sbyte::b#5 ← phi( print_sbyte::@4/(signed byte) print_sbyte::b#0 print_sbyte::@3/(signed byte) print_sbyte::b#3 )
   [125] (byte~) print_byte::b#9 ← (byte)(signed byte) print_sbyte::b#5
   [126] call print_byte 
   to:print_sbyte::@return
@@ -3822,27 +3863,27 @@ print_sbyte::@return: scope:[print_sbyte]  from print_sbyte::@2
 print_sbyte::@1: scope:[print_sbyte]  from print_sbyte
   [128] phi()
   [129] call print_char 
-  to:print_sbyte::@5
-print_sbyte::@5: scope:[print_sbyte]  from print_sbyte::@1
+  to:print_sbyte::@4
+print_sbyte::@4: scope:[print_sbyte]  from print_sbyte::@1
   [130] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#3
   to:print_sbyte::@2
-mul8s: scope:[mul8s]  from mul8s_compare::@13
+mul8s: scope:[mul8s]  from mul8s_compare::@11
   [131] (byte~) mul8u::b#3 ← (byte)(signed byte) mul8s::b#0
   [132] (byte~) mul8u::a#8 ← (byte)(signed byte) mul8s::a#0
   [133] call mul8u 
   [134] (word) mul8u::return#2 ← (word) mul8u::res#2
-  to:mul8s::@6
-mul8s::@6: scope:[mul8s]  from mul8s
+  to:mul8s::@5
+mul8s::@5: scope:[mul8s]  from mul8s
   [135] (word) mul8s::m#0 ← (word) mul8u::return#2
   [136] if((signed byte) mul8s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s::@1
   to:mul8s::@3
-mul8s::@3: scope:[mul8s]  from mul8s::@6
+mul8s::@3: scope:[mul8s]  from mul8s::@5
   [137] (byte~) mul8s::$9 ← > (word) mul8s::m#0
   [138] (byte~) mul8s::$16 ← (byte~) mul8s::$9 - (byte)(signed byte) mul8s::b#0
   [139] (word) mul8s::m#1 ← (word) mul8s::m#0 hi= (byte~) mul8s::$16
   to:mul8s::@1
-mul8s::@1: scope:[mul8s]  from mul8s::@3 mul8s::@6
-  [140] (word) mul8s::m#5 ← phi( mul8s::@3/(word) mul8s::m#1 mul8s::@6/(word) mul8s::m#0 )
+mul8s::@1: scope:[mul8s]  from mul8s::@3 mul8s::@5
+  [140] (word) mul8s::m#5 ← phi( mul8s::@3/(word) mul8s::m#1 mul8s::@5/(word) mul8s::m#0 )
   [141] if((signed byte) mul8s::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s::@2
   to:mul8s::@4
 mul8s::@4: scope:[mul8s]  from mul8s::@1
@@ -3856,15 +3897,15 @@ mul8s::@2: scope:[mul8s]  from mul8s::@1 mul8s::@4
 mul8s::@return: scope:[mul8s]  from mul8s::@2
   [146] return 
   to:@return
-mul8u: scope:[mul8u]  from mul8s mul8u_compare::@13
-  [147] (byte) mul8u::a#6 ← phi( mul8s/(byte~) mul8u::a#8 mul8u_compare::@13/(byte) mul8u::a#2 )
-  [147] (byte) mul8u::b#2 ← phi( mul8s/(byte~) mul8u::b#3 mul8u_compare::@13/(byte) mul8u::b#1 )
+mul8u: scope:[mul8u]  from mul8s mul8u_compare::@11
+  [147] (byte) mul8u::a#6 ← phi( mul8s/(byte~) mul8u::a#8 mul8u_compare::@11/(byte) mul8u::a#2 )
+  [147] (byte) mul8u::b#2 ← phi( mul8s/(byte~) mul8u::b#3 mul8u_compare::@11/(byte) mul8u::b#1 )
   [148] (word) mul8u::mb#0 ← ((word)) (byte) mul8u::b#2
   to:mul8u::@1
-mul8u::@1: scope:[mul8u]  from mul8u mul8u::@8
-  [149] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@8/(word) mul8u::mb#1 )
-  [149] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@8/(word) mul8u::res#6 )
-  [149] (byte) mul8u::a#3 ← phi( mul8u/(byte) mul8u::a#6 mul8u::@8/(byte) mul8u::a#0 )
+mul8u::@1: scope:[mul8u]  from mul8u mul8u::@4
+  [149] (word) mul8u::mb#2 ← phi( mul8u/(word) mul8u::mb#0 mul8u::@4/(word) mul8u::mb#1 )
+  [149] (word) mul8u::res#2 ← phi( mul8u/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u::@4/(word) mul8u::res#6 )
+  [149] (byte) mul8u::a#3 ← phi( mul8u/(byte) mul8u::a#6 mul8u::@4/(byte) mul8u::a#0 )
   [150] if((byte) mul8u::a#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@2
   to:mul8u::@return
 mul8u::@return: scope:[mul8u]  from mul8u::@1
@@ -3872,50 +3913,50 @@ mul8u::@return: scope:[mul8u]  from mul8u::@1
   to:@return
 mul8u::@2: scope:[mul8u]  from mul8u::@1
   [152] (byte~) mul8u::$1 ← (byte) mul8u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1
-  [153] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8
-  to:mul8u::@6
-mul8u::@6: scope:[mul8u]  from mul8u::@2
+  [153] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4
+  to:mul8u::@3
+mul8u::@3: scope:[mul8u]  from mul8u::@2
   [154] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2
-  to:mul8u::@8
-mul8u::@8: scope:[mul8u]  from mul8u::@2 mul8u::@6
-  [155] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@6/(word) mul8u::res#1 )
+  to:mul8u::@4
+mul8u::@4: scope:[mul8u]  from mul8u::@2 mul8u::@3
+  [155] (word) mul8u::res#6 ← phi( mul8u::@2/(word) mul8u::res#2 mul8u::@3/(word) mul8u::res#1 )
   [156] (byte) mul8u::a#0 ← (byte) mul8u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1
   [157] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1
   to:mul8u::@1
-mulf8s: scope:[mulf8s]  from mul8s_compare::@12
+mulf8s: scope:[mulf8s]  from mul8s_compare::@10
   [158] phi()
   to:mulf8s::mulf8s_prepare1
 mulf8s::mulf8s_prepare1: scope:[mulf8s]  from mulf8s
   [159] (byte~) mulf8u_prepare::a#3 ← (byte)(signed byte) mulf8s::a#0
   [160] call mulf8u_prepare 
-  to:mulf8s::@2
-mulf8s::@2: scope:[mulf8s]  from mulf8s::mulf8s_prepare1
+  to:mulf8s::@1
+mulf8s::@1: scope:[mulf8s]  from mulf8s::mulf8s_prepare1
   [161] (signed byte) mulf8s_prepared::b#0 ← (signed byte) mulf8s::b#0
   [162] call mulf8s_prepared 
   [163] (signed word) mulf8s_prepared::return#2 ← (signed word)(word) mulf8s_prepared::m#4
-  to:mulf8s::@4
-mulf8s::@4: scope:[mulf8s]  from mulf8s::@2
+  to:mulf8s::@2
+mulf8s::@2: scope:[mulf8s]  from mulf8s::@1
   [164] (signed word) mulf8s::return#0 ← (signed word) mulf8s_prepared::return#2
   to:mulf8s::@return
-mulf8s::@return: scope:[mulf8s]  from mulf8s::@4
+mulf8s::@return: scope:[mulf8s]  from mulf8s::@2
   [165] return 
   to:@return
-mulf8s_prepared: scope:[mulf8s_prepared]  from mulf8s::@2
+mulf8s_prepared: scope:[mulf8s_prepared]  from mulf8s::@1
   [166] (byte~) mulf8u_prepared::b#3 ← (byte)(signed byte) mulf8s_prepared::b#0
   [167] call mulf8u_prepared 
   [168] (word) mulf8u_prepared::return#3 ← (word) mulf8u_prepared::return#0
-  to:mulf8s_prepared::@6
-mulf8s_prepared::@6: scope:[mulf8s_prepared]  from mulf8s_prepared
+  to:mulf8s_prepared::@5
+mulf8s_prepared::@5: scope:[mulf8s_prepared]  from mulf8s_prepared
   [169] (word) mulf8s_prepared::m#0 ← (word) mulf8u_prepared::return#3
   [170] if(*((const signed byte*) mulf8s_prepared::memA#0)>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@1
   to:mulf8s_prepared::@3
-mulf8s_prepared::@3: scope:[mulf8s_prepared]  from mulf8s_prepared::@6
+mulf8s_prepared::@3: scope:[mulf8s_prepared]  from mulf8s_prepared::@5
   [171] (byte~) mulf8s_prepared::$8 ← > (word) mulf8s_prepared::m#0
   [172] (byte~) mulf8s_prepared::$15 ← (byte~) mulf8s_prepared::$8 - (byte)(signed byte) mulf8s_prepared::b#0
   [173] (word) mulf8s_prepared::m#1 ← (word) mulf8s_prepared::m#0 hi= (byte~) mulf8s_prepared::$15
   to:mulf8s_prepared::@1
-mulf8s_prepared::@1: scope:[mulf8s_prepared]  from mulf8s_prepared::@3 mulf8s_prepared::@6
-  [174] (word) mulf8s_prepared::m#5 ← phi( mulf8s_prepared::@3/(word) mulf8s_prepared::m#1 mulf8s_prepared::@6/(word) mulf8s_prepared::m#0 )
+mulf8s_prepared::@1: scope:[mulf8s_prepared]  from mulf8s_prepared::@3 mulf8s_prepared::@5
+  [174] (word) mulf8s_prepared::m#5 ← phi( mulf8s_prepared::@3/(word) mulf8s_prepared::m#1 mulf8s_prepared::@5/(word) mulf8s_prepared::m#0 )
   [175] if((signed byte) mulf8s_prepared::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@2
   to:mulf8s_prepared::@4
 mulf8s_prepared::@4: scope:[mulf8s_prepared]  from mulf8s_prepared::@1
@@ -3929,8 +3970,8 @@ mulf8s_prepared::@2: scope:[mulf8s_prepared]  from mulf8s_prepared::@1 mulf8s_pr
 mulf8s_prepared::@return: scope:[mulf8s_prepared]  from mulf8s_prepared::@2
   [180] return 
   to:@return
-mulf8u_prepared: scope:[mulf8u_prepared]  from mulf8s_prepared mulf8u::@2
-  [181] (byte) mulf8u_prepared::b#2 ← phi( mulf8s_prepared/(byte~) mulf8u_prepared::b#3 mulf8u::@2/(byte) mulf8u_prepared::b#0 )
+mulf8u_prepared: scope:[mulf8u_prepared]  from mulf8s_prepared mulf8u::@1
+  [181] (byte) mulf8u_prepared::b#2 ← phi( mulf8s_prepared/(byte~) mulf8u_prepared::b#3 mulf8u::@1/(byte) mulf8u_prepared::b#0 )
   [182] *((const byte*) mulf8u_prepared::memB#0) ← (byte) mulf8u_prepared::b#2
   asm { ldxmemB sec sm1: ldamulf_sqr1_lo,x sm2: sbcmulf_sqr2_lo,x staresL sm3: ldamulf_sqr1_hi,x sm4: sbcmulf_sqr2_hi,x stamemB  }
   [184] (word) mulf8u_prepared::return#0 ← *((const byte*) mulf8u_prepared::memB#0) w= *((const byte*) mulf8u_prepared::resL#0)
@@ -3947,36 +3988,36 @@ mulf8u_prepare::@return: scope:[mulf8u_prepare]  from mulf8u_prepare
   [189] return 
   to:@return
 muls8s: scope:[muls8s]  from mul8s_compare::@2
-  [190] if((signed byte) muls8s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@10
-  to:muls8s::@4
-muls8s::@4: scope:[muls8s]  from muls8s
-  [191] if((signed byte) muls8s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@3
-  to:muls8s::@8
-muls8s::@8: scope:[muls8s]  from muls8s::@4 muls8s::@8
-  [192] (signed byte) muls8s::j#2 ← phi( muls8s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@8/(signed byte) muls8s::j#1 )
-  [192] (signed word) muls8s::m#3 ← phi( muls8s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@8/(signed word) muls8s::m#1 )
+  [190] if((signed byte) muls8s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@4
+  to:muls8s::@2
+muls8s::@2: scope:[muls8s]  from muls8s
+  [191] if((signed byte) muls8s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@1
+  to:muls8s::@3
+muls8s::@3: scope:[muls8s]  from muls8s::@2 muls8s::@3
+  [192] (signed byte) muls8s::j#2 ← phi( muls8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@3/(signed byte) muls8s::j#1 )
+  [192] (signed word) muls8s::m#3 ← phi( muls8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@3/(signed word) muls8s::m#1 )
   [193] (signed word) muls8s::m#1 ← (signed word) muls8s::m#3 + (signed byte) muls8s::b#0
   [194] (signed byte) muls8s::j#1 ← ++ (signed byte) muls8s::j#2
-  [195] if((signed byte) muls8s::j#1!=(signed byte) muls8s::a#0) goto muls8s::@8
-  to:muls8s::@3
-muls8s::@3: scope:[muls8s]  from muls8s::@10 muls8s::@4 muls8s::@8
-  [196] (signed word) muls8s::return#0 ← phi( muls8s::@10/(signed word) muls8s::m#2 muls8s::@4/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@8/(signed word) muls8s::m#1 )
+  [195] if((signed byte) muls8s::j#1!=(signed byte) muls8s::a#0) goto muls8s::@3
+  to:muls8s::@1
+muls8s::@1: scope:[muls8s]  from muls8s::@2 muls8s::@3 muls8s::@4
+  [196] (signed word) muls8s::return#0 ← phi( muls8s::@4/(signed word) muls8s::m#2 muls8s::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@3/(signed word) muls8s::m#1 )
   to:muls8s::@return
-muls8s::@return: scope:[muls8s]  from muls8s::@3
+muls8s::@return: scope:[muls8s]  from muls8s::@1
   [197] return 
   to:@return
-muls8s::@10: scope:[muls8s]  from muls8s muls8s::@10
-  [198] (signed byte) muls8s::i#2 ← phi( muls8s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@10/(signed byte) muls8s::i#1 )
-  [198] (signed word) muls8s::m#5 ← phi( muls8s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@10/(signed word) muls8s::m#2 )
+muls8s::@4: scope:[muls8s]  from muls8s muls8s::@4
+  [198] (signed byte) muls8s::i#2 ← phi( muls8s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@4/(signed byte) muls8s::i#1 )
+  [198] (signed word) muls8s::m#5 ← phi( muls8s/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8s::@4/(signed word) muls8s::m#2 )
   [199] (signed word) muls8s::m#2 ← (signed word) muls8s::m#5 - (signed byte) muls8s::b#0
   [200] (signed byte) muls8s::i#1 ← -- (signed byte) muls8s::i#2
-  [201] if((signed byte) muls8s::i#1!=(signed byte) muls8s::a#0) goto muls8s::@10
-  to:muls8s::@3
+  [201] if((signed byte) muls8s::i#1!=(signed byte) muls8s::a#0) goto muls8s::@4
+  to:muls8s::@1
 mul8u_compare: scope:[mul8u_compare]  from main::@4
   [202] phi()
   to:mul8u_compare::@1
-mul8u_compare::@1: scope:[mul8u_compare]  from mul8u_compare mul8u_compare::@10
-  [203] (byte) mul8u_compare::a#7 ← phi( mul8u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u_compare::@10/(byte) mul8u_compare::a#1 )
+mul8u_compare::@1: scope:[mul8u_compare]  from mul8u_compare mul8u_compare::@8
+  [203] (byte) mul8u_compare::a#7 ← phi( mul8u_compare/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u_compare::@8/(byte) mul8u_compare::a#1 )
   to:mul8u_compare::@2
 mul8u_compare::@2: scope:[mul8u_compare]  from mul8u_compare::@1 mul8u_compare::@5
   [204] (byte) mul8u_compare::b#10 ← phi( mul8u_compare::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 mul8u_compare::@5/(byte) mul8u_compare::b#1 )
@@ -3984,37 +4025,37 @@ mul8u_compare::@2: scope:[mul8u_compare]  from mul8u_compare::@1 mul8u_compare::
   [206] (byte) muls8u::b#0 ← (byte) mul8u_compare::b#10
   [207] call muls8u 
   [208] (word) muls8u::return#2 ← (word) muls8u::return#0
-  to:mul8u_compare::@12
-mul8u_compare::@12: scope:[mul8u_compare]  from mul8u_compare::@2
+  to:mul8u_compare::@10
+mul8u_compare::@10: scope:[mul8u_compare]  from mul8u_compare::@2
   [209] (word) mul8u_compare::ms#0 ← (word) muls8u::return#2
   [210] (byte) mulf8u::a#0 ← (byte) mul8u_compare::a#7
   [211] (byte) mulf8u::b#0 ← (byte) mul8u_compare::b#10
   [212] call mulf8u 
   [213] (word) mulf8u::return#2 ← (word) mulf8u::return#0
-  to:mul8u_compare::@13
-mul8u_compare::@13: scope:[mul8u_compare]  from mul8u_compare::@12
+  to:mul8u_compare::@11
+mul8u_compare::@11: scope:[mul8u_compare]  from mul8u_compare::@10
   [214] (word) mul8u_compare::mf#0 ← (word) mulf8u::return#2
   [215] (byte) mul8u::a#2 ← (byte) mul8u_compare::a#7
   [216] (byte) mul8u::b#1 ← (byte) mul8u_compare::b#10
   [217] call mul8u 
   [218] (word) mul8u::return#3 ← (word) mul8u::res#2
-  to:mul8u_compare::@14
-mul8u_compare::@14: scope:[mul8u_compare]  from mul8u_compare::@13
+  to:mul8u_compare::@12
+mul8u_compare::@12: scope:[mul8u_compare]  from mul8u_compare::@11
   [219] (word) mul8u_compare::mn#0 ← (word) mul8u::return#3
   [220] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mf#0) goto mul8u_compare::@3
   to:mul8u_compare::@6
-mul8u_compare::@6: scope:[mul8u_compare]  from mul8u_compare::@14
+mul8u_compare::@6: scope:[mul8u_compare]  from mul8u_compare::@12
   [221] phi()
   to:mul8u_compare::@3
-mul8u_compare::@3: scope:[mul8u_compare]  from mul8u_compare::@14 mul8u_compare::@6
-  [222] (byte) mul8u_compare::ok#4 ← phi( mul8u_compare::@14/(byte/signed byte/word/signed word/dword/signed dword) 1 mul8u_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
-  [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@20
+mul8u_compare::@3: scope:[mul8u_compare]  from mul8u_compare::@12 mul8u_compare::@6
+  [222] (byte) mul8u_compare::ok#4 ← phi( mul8u_compare::@12/(byte/signed byte/word/signed word/dword/signed dword) 1 mul8u_compare::@6/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+  [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@14
   to:mul8u_compare::@4
-mul8u_compare::@4: scope:[mul8u_compare]  from mul8u_compare::@20 mul8u_compare::@3
-  [224] (byte) mul8u_compare::ok#3 ← phi( mul8u_compare::@20/(byte) mul8u_compare::ok#4 mul8u_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
+mul8u_compare::@4: scope:[mul8u_compare]  from mul8u_compare::@14 mul8u_compare::@3
+  [224] (byte) mul8u_compare::ok#3 ← phi( mul8u_compare::@14/(byte) mul8u_compare::ok#4 mul8u_compare::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 )
   [225] if((byte) mul8u_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u_compare::@5
-  to:mul8u_compare::@8
-mul8u_compare::@8: scope:[mul8u_compare]  from mul8u_compare::@4
+  to:mul8u_compare::@7
+mul8u_compare::@7: scope:[mul8u_compare]  from mul8u_compare::@4
   [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   [227] (byte) mul8u_error::a#0 ← (byte) mul8u_compare::a#7
   [228] (byte) mul8u_error::b#0 ← (byte) mul8u_compare::b#10
@@ -4023,29 +4064,29 @@ mul8u_compare::@8: scope:[mul8u_compare]  from mul8u_compare::@4
   [231] (word) mul8u_error::mf#0 ← (word) mul8u_compare::mf#0
   [232] call mul8u_error 
   to:mul8u_compare::@return
-mul8u_compare::@return: scope:[mul8u_compare]  from mul8u_compare::@16 mul8u_compare::@8
+mul8u_compare::@return: scope:[mul8u_compare]  from mul8u_compare::@13 mul8u_compare::@7
   [233] return 
   to:@return
 mul8u_compare::@5: scope:[mul8u_compare]  from mul8u_compare::@4
   [234] (byte) mul8u_compare::b#1 ← ++ (byte) mul8u_compare::b#10
   [235] if((byte) mul8u_compare::b#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u_compare::@2
-  to:mul8u_compare::@10
-mul8u_compare::@10: scope:[mul8u_compare]  from mul8u_compare::@5
+  to:mul8u_compare::@8
+mul8u_compare::@8: scope:[mul8u_compare]  from mul8u_compare::@5
   [236] (byte) mul8u_compare::a#1 ← ++ (byte) mul8u_compare::a#7
   [237] if((byte) mul8u_compare::a#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u_compare::@1
-  to:mul8u_compare::@11
-mul8u_compare::@11: scope:[mul8u_compare]  from mul8u_compare::@10
+  to:mul8u_compare::@9
+mul8u_compare::@9: scope:[mul8u_compare]  from mul8u_compare::@8
   [238] phi()
   [239] call print_str 
-  to:mul8u_compare::@16
-mul8u_compare::@16: scope:[mul8u_compare]  from mul8u_compare::@11
+  to:mul8u_compare::@13
+mul8u_compare::@13: scope:[mul8u_compare]  from mul8u_compare::@9
   [240] phi()
   [241] call print_ln 
   to:mul8u_compare::@return
-mul8u_compare::@20: scope:[mul8u_compare]  from mul8u_compare::@3
+mul8u_compare::@14: scope:[mul8u_compare]  from mul8u_compare::@3
   [242] phi()
   to:mul8u_compare::@4
-mul8u_error: scope:[mul8u_error]  from mul8u_compare::@8
+mul8u_error: scope:[mul8u_error]  from mul8u_compare::@7
   [243] phi()
   [244] call print_str 
   to:mul8u_error::@1
@@ -4092,33 +4133,33 @@ mul8u_error::@10: scope:[mul8u_error]  from mul8u_error::@9
 mul8u_error::@return: scope:[mul8u_error]  from mul8u_error::@10
   [265] return 
   to:@return
-mulf8u: scope:[mulf8u]  from mul8u_compare::@12
+mulf8u: scope:[mulf8u]  from mul8u_compare::@10
   [266] (byte) mulf8u_prepare::a#0 ← (byte) mulf8u::a#0
   [267] call mulf8u_prepare 
-  to:mulf8u::@2
-mulf8u::@2: scope:[mulf8u]  from mulf8u
+  to:mulf8u::@1
+mulf8u::@1: scope:[mulf8u]  from mulf8u
   [268] (byte) mulf8u_prepared::b#0 ← (byte) mulf8u::b#0
   [269] call mulf8u_prepared 
   [270] (word) mulf8u_prepared::return#2 ← (word) mulf8u_prepared::return#0
-  to:mulf8u::@3
-mulf8u::@3: scope:[mulf8u]  from mulf8u::@2
+  to:mulf8u::@2
+mulf8u::@2: scope:[mulf8u]  from mulf8u::@1
   [271] (word) mulf8u::return#0 ← (word) mulf8u_prepared::return#2
   to:mulf8u::@return
-mulf8u::@return: scope:[mulf8u]  from mulf8u::@3
+mulf8u::@return: scope:[mulf8u]  from mulf8u::@2
   [272] return 
   to:@return
 muls8u: scope:[muls8u]  from mul8u_compare::@2
   [273] if((byte) muls8u::a#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8u::@1
-  to:muls8u::@4
-muls8u::@4: scope:[muls8u]  from muls8u muls8u::@4
-  [274] (byte) muls8u::i#2 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@4/(byte) muls8u::i#1 )
-  [274] (word) muls8u::m#3 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@4/(word) muls8u::m#1 )
+  to:muls8u::@2
+muls8u::@2: scope:[muls8u]  from muls8u muls8u::@2
+  [274] (byte) muls8u::i#2 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@2/(byte) muls8u::i#1 )
+  [274] (word) muls8u::m#3 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@2/(word) muls8u::m#1 )
   [275] (word) muls8u::m#1 ← (word) muls8u::m#3 + (byte) muls8u::b#0
   [276] (byte) muls8u::i#1 ← ++ (byte) muls8u::i#2
-  [277] if((byte) muls8u::i#1!=(byte) muls8u::a#0) goto muls8u::@4
+  [277] if((byte) muls8u::i#1!=(byte) muls8u::a#0) goto muls8u::@2
   to:muls8u::@1
-muls8u::@1: scope:[muls8u]  from muls8u muls8u::@4
-  [278] (word) muls8u::return#0 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@4/(word) muls8u::m#1 )
+muls8u::@1: scope:[muls8u]  from muls8u muls8u::@2
+  [278] (word) muls8u::return#0 ← phi( muls8u/(byte/signed byte/word/signed word/dword/signed dword) 0 muls8u::@2/(word) muls8u::m#1 )
   to:muls8u::@return
 muls8u::@return: scope:[muls8u]  from muls8u::@1
   [279] return 
@@ -4134,34 +4175,34 @@ mulf_tables_cmp::@1: scope:[mulf_tables_cmp]  from mulf_tables_cmp mulf_tables_c
 mulf_tables_cmp::@3: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@1
   [283] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   [284] call print_str 
-  to:mulf_tables_cmp::@6
-mulf_tables_cmp::@6: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@3
+  to:mulf_tables_cmp::@5
+mulf_tables_cmp::@5: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@3
   [285] (word~) print_word::w#11 ← (word)(byte*) mulf_tables_cmp::asm_sqr#2
   [286] call print_word 
-  to:mulf_tables_cmp::@7
-mulf_tables_cmp::@7: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@6
+  to:mulf_tables_cmp::@6
+mulf_tables_cmp::@6: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@5
   [287] phi()
   [288] call print_str 
-  to:mulf_tables_cmp::@8
-mulf_tables_cmp::@8: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@7
+  to:mulf_tables_cmp::@7
+mulf_tables_cmp::@7: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@6
   [289] (word~) print_word::w#12 ← (word)(byte*) mulf_tables_cmp::kc_sqr#2
   [290] call print_word 
   to:mulf_tables_cmp::@return
-mulf_tables_cmp::@return: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@10 mulf_tables_cmp::@8
-  [291] (byte*) print_line_cursor#10 ← phi( mulf_tables_cmp::@10/(byte*) print_line_cursor#1 mulf_tables_cmp::@8/((byte*))(word/signed word/dword/signed dword) $400 )
-  [291] (byte*) print_char_cursor#31 ← phi( mulf_tables_cmp::@10/(byte*~) print_char_cursor#225 mulf_tables_cmp::@8/(byte*) print_char_cursor#18 )
+mulf_tables_cmp::@return: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@7 mulf_tables_cmp::@8
+  [291] (byte*) print_line_cursor#10 ← phi( mulf_tables_cmp::@8/(byte*) print_line_cursor#1 mulf_tables_cmp::@7/((byte*))(word/signed word/dword/signed dword) $400 )
+  [291] (byte*) print_char_cursor#31 ← phi( mulf_tables_cmp::@8/(byte*~) print_char_cursor#225 mulf_tables_cmp::@7/(byte*) print_char_cursor#18 )
   [292] return 
   to:@return
 mulf_tables_cmp::@2: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@1
   [293] (byte*) mulf_tables_cmp::asm_sqr#1 ← ++ (byte*) mulf_tables_cmp::asm_sqr#2
   [294] (byte*) mulf_tables_cmp::kc_sqr#1 ← ++ (byte*) mulf_tables_cmp::kc_sqr#2
   [295] if((byte*) mulf_tables_cmp::kc_sqr#1<(const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $200*(byte/signed byte/word/signed word/dword/signed dword) 4) goto mulf_tables_cmp::@1
-  to:mulf_tables_cmp::@5
-mulf_tables_cmp::@5: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@2
+  to:mulf_tables_cmp::@4
+mulf_tables_cmp::@4: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@2
   [296] phi()
   [297] call print_str 
-  to:mulf_tables_cmp::@10
-mulf_tables_cmp::@10: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@5
+  to:mulf_tables_cmp::@8
+mulf_tables_cmp::@8: scope:[mulf_tables_cmp]  from mulf_tables_cmp::@4
   [298] phi()
   [299] call print_ln 
   [300] (byte*~) print_char_cursor#225 ← (byte*) print_line_cursor#1
@@ -4204,33 +4245,33 @@ mulf_init::@2: scope:[mulf_init]  from mulf_init::@1 mulf_init::@3
   [320] (word) mulf_init::sqr#1 ← (word) mulf_init::sqr#3 + (byte) mulf_init::x_2#2
   [321] (byte*) mulf_init::sqr1_lo#1 ← ++ (byte*) mulf_init::sqr1_lo#2
   [322] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $200) goto mulf_init::@1
-  to:mulf_init::@5
-mulf_init::@5: scope:[mulf_init]  from mulf_init::@2 mulf_init::@6
-  [323] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@6/(byte) mulf_init::dir#3 )
-  [323] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@6/(byte*) mulf_init::sqr2_hi#1 )
-  [323] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@6/(byte*) mulf_init::sqr2_lo#1 )
-  [323] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@6/(byte) mulf_init::x_255#1 )
+  to:mulf_init::@4
+mulf_init::@4: scope:[mulf_init]  from mulf_init::@2 mulf_init::@5
+  [323] (byte) mulf_init::dir#2 ← phi( mulf_init::@2/(byte/word/signed word/dword/signed dword) $ff mulf_init::@5/(byte) mulf_init::dir#3 )
+  [323] (byte*) mulf_init::sqr2_hi#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_hi#0 mulf_init::@5/(byte*) mulf_init::sqr2_hi#1 )
+  [323] (byte*) mulf_init::sqr2_lo#2 ← phi( mulf_init::@2/(const byte[$200]) mulf_sqr2_lo#0 mulf_init::@5/(byte*) mulf_init::sqr2_lo#1 )
+  [323] (byte) mulf_init::x_255#2 ← phi( mulf_init::@2/((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 mulf_init::@5/(byte) mulf_init::x_255#1 )
   [324] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2)
   [325] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2)
   [326] (byte*) mulf_init::sqr2_hi#1 ← ++ (byte*) mulf_init::sqr2_hi#2
   [327] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2
-  [328] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12
-  to:mulf_init::@6
-mulf_init::@6: scope:[mulf_init]  from mulf_init::@12 mulf_init::@5
-  [329] (byte) mulf_init::dir#3 ← phi( mulf_init::@12/(byte) mulf_init::dir#2 mulf_init::@5/(byte/signed byte/word/signed word/dword/signed dword) 1 )
+  [328] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7
+  to:mulf_init::@5
+mulf_init::@5: scope:[mulf_init]  from mulf_init::@4 mulf_init::@7
+  [329] (byte) mulf_init::dir#3 ← phi( mulf_init::@7/(byte) mulf_init::dir#2 mulf_init::@4/(byte/signed byte/word/signed word/dword/signed dword) 1 )
   [330] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2
-  [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5
-  to:mulf_init::@8
-mulf_init::@8: scope:[mulf_init]  from mulf_init::@6
+  [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4
+  to:mulf_init::@6
+mulf_init::@6: scope:[mulf_init]  from mulf_init::@5
   [332] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100)
   [333] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100)
   to:mulf_init::@return
-mulf_init::@return: scope:[mulf_init]  from mulf_init::@8
+mulf_init::@return: scope:[mulf_init]  from mulf_init::@6
   [334] return 
   to:@return
-mulf_init::@12: scope:[mulf_init]  from mulf_init::@5
+mulf_init::@7: scope:[mulf_init]  from mulf_init::@4
   [335] phi()
-  to:mulf_init::@6
+  to:mulf_init::@5
 print_cls: scope:[print_cls]  from main
   [336] phi()
   to:print_cls::@1
@@ -4843,15 +4884,15 @@ INITIAL ASM
   .label print_line_cursor = 5
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @42 [phi:@begin->@42]
-b42_from_bbegin:
-  jmp b42
-//SEG5 @42
-b42:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @42 to @end [phi:@42->@end]
-bend_from_b42:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -4928,9 +4969,9 @@ mul8s_compare: {
     lda #-$80
     sta a
     jmp b1
-  //SEG37 [18] phi from mul8s_compare::@10 to mul8s_compare::@1 [phi:mul8s_compare::@10->mul8s_compare::@1]
-  b1_from_b10:
-  //SEG38 [18] phi (signed byte) mul8s_compare::a#7 = (signed byte) mul8s_compare::a#1 [phi:mul8s_compare::@10->mul8s_compare::@1#0] -- register_copy 
+  //SEG37 [18] phi from mul8s_compare::@8 to mul8s_compare::@1 [phi:mul8s_compare::@8->mul8s_compare::@1]
+  b1_from_b8:
+  //SEG38 [18] phi (signed byte) mul8s_compare::a#7 = (signed byte) mul8s_compare::a#1 [phi:mul8s_compare::@8->mul8s_compare::@1#0] -- register_copy 
     jmp b1
   //SEG39 mul8s_compare::@1
   b1:
@@ -4959,9 +5000,9 @@ mul8s_compare: {
     sta muls8s.return_2
     lda muls8s.return+1
     sta muls8s.return_2+1
-    jmp b12
-  //SEG49 mul8s_compare::@12
-  b12:
+    jmp b10
+  //SEG49 mul8s_compare::@10
+  b10:
   //SEG50 [24] (signed word) mul8s_compare::ms#0 ← (signed word) muls8s::return#2 -- vwsz1=vwsz2 
     lda muls8s.return_2
     sta ms
@@ -4974,17 +5015,17 @@ mul8s_compare: {
     lda b
     sta mulf8s.b
   //SEG53 [27] call mulf8s 
-  //SEG54 [158] phi from mul8s_compare::@12 to mulf8s [phi:mul8s_compare::@12->mulf8s]
-  mulf8s_from_b12:
+  //SEG54 [158] phi from mul8s_compare::@10 to mulf8s [phi:mul8s_compare::@10->mulf8s]
+  mulf8s_from_b10:
     jsr mulf8s
   //SEG55 [28] (signed word) mulf8s::return#2 ← (signed word) mulf8s::return#0 -- vwsz1=vwsz2 
     lda mulf8s.return
     sta mulf8s.return_2
     lda mulf8s.return+1
     sta mulf8s.return_2+1
-    jmp b13
-  //SEG56 mul8s_compare::@13
-  b13:
+    jmp b11
+  //SEG56 mul8s_compare::@11
+  b11:
   //SEG57 [29] (signed word) mul8s_compare::mf#0 ← (signed word) mulf8s::return#2 -- vwsz1=vwsz2 
     lda mulf8s.return_2
     sta mf
@@ -5003,9 +5044,9 @@ mul8s_compare: {
     sta mul8s.return
     lda mul8s.m+1
     sta mul8s.return+1
-    jmp b14
-  //SEG62 mul8s_compare::@14
-  b14:
+    jmp b12
+  //SEG62 mul8s_compare::@12
+  b12:
   //SEG63 [34] (signed word) mul8s_compare::mn#0 ← (signed word) mul8s::return#2 -- vwsz1=vwsz2 
     lda mul8s.return
     sta mn
@@ -5017,10 +5058,10 @@ mul8s_compare: {
     bne !+
     lda ms+1
     cmp mf+1
-    beq b3_from_b14
+    beq b3_from_b12
   !:
-  //SEG65 [36] phi from mul8s_compare::@14 to mul8s_compare::@6 [phi:mul8s_compare::@14->mul8s_compare::@6]
-  b6_from_b14:
+  //SEG65 [36] phi from mul8s_compare::@12 to mul8s_compare::@6 [phi:mul8s_compare::@12->mul8s_compare::@6]
+  b6_from_b12:
     jmp b6
   //SEG66 mul8s_compare::@6
   b6:
@@ -5030,21 +5071,21 @@ mul8s_compare: {
     lda #0
     sta ok
     jmp b3
-  //SEG69 [37] phi from mul8s_compare::@14 to mul8s_compare::@3 [phi:mul8s_compare::@14->mul8s_compare::@3]
-  b3_from_b14:
-  //SEG70 [37] phi (byte) mul8s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8s_compare::@14->mul8s_compare::@3#0] -- vbuz1=vbuc1 
+  //SEG69 [37] phi from mul8s_compare::@12 to mul8s_compare::@3 [phi:mul8s_compare::@12->mul8s_compare::@3]
+  b3_from_b12:
+  //SEG70 [37] phi (byte) mul8s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8s_compare::@12->mul8s_compare::@3#0] -- vbuz1=vbuc1 
     lda #1
     sta ok
     jmp b3
   //SEG71 mul8s_compare::@3
   b3:
-  //SEG72 [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@20 -- vwsz1_eq_vwsz2_then_la1 
+  //SEG72 [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@14 -- vwsz1_eq_vwsz2_then_la1 
     lda ms
     cmp mn
     bne !+
     lda ms+1
     cmp mn+1
-    beq b20_from_b3
+    beq b14_from_b3
   !:
   //SEG73 [39] phi from mul8s_compare::@3 to mul8s_compare::@4 [phi:mul8s_compare::@3->mul8s_compare::@4]
   b4_from_b3:
@@ -5058,9 +5099,9 @@ mul8s_compare: {
     lda ok
     cmp #0
     bne b5
-    jmp b8
-  //SEG77 mul8s_compare::@8
-  b8:
+    jmp b7
+  //SEG77 mul8s_compare::@7
+  b7:
   //SEG78 [41] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -5100,53 +5141,53 @@ mul8s_compare: {
     lda #-$80
     cmp b
     bne b2_from_b5
-    jmp b10
-  //SEG90 mul8s_compare::@10
-  b10:
+    jmp b8
+  //SEG90 mul8s_compare::@8
+  b8:
   //SEG91 [51] (signed byte) mul8s_compare::a#1 ← ++ (signed byte) mul8s_compare::a#7 -- vbsz1=_inc_vbsz1 
     inc a
   //SEG92 [52] if((signed byte) mul8s_compare::a#1!=-(byte/word/signed word/dword/signed dword) $80) goto mul8s_compare::@1 -- vbsz1_neq_vbsc1_then_la1 
     lda #-$80
     cmp a
-    bne b1_from_b10
-    jmp b11
-  //SEG93 mul8s_compare::@11
-  b11:
+    bne b1_from_b8
+    jmp b9
+  //SEG93 mul8s_compare::@9
+  b9:
   //SEG94 [53] (byte*~) print_char_cursor#192 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG95 [54] call print_str 
-  //SEG96 [63] phi from mul8s_compare::@11 to print_str [phi:mul8s_compare::@11->print_str]
-  print_str_from_b11:
-  //SEG97 [63] phi (byte*) print_char_cursor#152 = (byte*~) print_char_cursor#192 [phi:mul8s_compare::@11->print_str#0] -- register_copy 
-  //SEG98 [63] phi (byte*) print_str::str#18 = (const string) mul8s_compare::str [phi:mul8s_compare::@11->print_str#1] -- pbuz1=pbuc1 
+  //SEG96 [63] phi from mul8s_compare::@9 to print_str [phi:mul8s_compare::@9->print_str]
+  print_str_from_b9:
+  //SEG97 [63] phi (byte*) print_char_cursor#152 = (byte*~) print_char_cursor#192 [phi:mul8s_compare::@9->print_str#0] -- register_copy 
+  //SEG98 [63] phi (byte*) print_str::str#18 = (const string) mul8s_compare::str [phi:mul8s_compare::@9->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG99 [55] phi from mul8s_compare::@11 to mul8s_compare::@16 [phi:mul8s_compare::@11->mul8s_compare::@16]
-  b16_from_b11:
-    jmp b16
-  //SEG100 mul8s_compare::@16
-  b16:
+  //SEG99 [55] phi from mul8s_compare::@9 to mul8s_compare::@13 [phi:mul8s_compare::@9->mul8s_compare::@13]
+  b13_from_b9:
+    jmp b13
+  //SEG100 mul8s_compare::@13
+  b13:
   //SEG101 [56] call print_ln 
-  //SEG102 [58] phi from mul8s_compare::@16 to print_ln [phi:mul8s_compare::@16->print_ln]
-  print_ln_from_b16:
-  //SEG103 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8s_compare::@16->print_ln#0] -- register_copy 
-  //SEG104 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#1 [phi:mul8s_compare::@16->print_ln#1] -- register_copy 
+  //SEG102 [58] phi from mul8s_compare::@13 to print_ln [phi:mul8s_compare::@13->print_ln]
+  print_ln_from_b13:
+  //SEG103 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8s_compare::@13->print_ln#0] -- register_copy 
+  //SEG104 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#1 [phi:mul8s_compare::@13->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG105 [57] phi from mul8s_compare::@3 to mul8s_compare::@20 [phi:mul8s_compare::@3->mul8s_compare::@20]
-  b20_from_b3:
-    jmp b20
-  //SEG106 mul8s_compare::@20
-  b20:
-  //SEG107 [39] phi from mul8s_compare::@20 to mul8s_compare::@4 [phi:mul8s_compare::@20->mul8s_compare::@4]
-  b4_from_b20:
-  //SEG108 [39] phi (byte) mul8s_compare::ok#3 = (byte) mul8s_compare::ok#4 [phi:mul8s_compare::@20->mul8s_compare::@4#0] -- register_copy 
+  //SEG105 [57] phi from mul8s_compare::@3 to mul8s_compare::@14 [phi:mul8s_compare::@3->mul8s_compare::@14]
+  b14_from_b3:
+    jmp b14
+  //SEG106 mul8s_compare::@14
+  b14:
+  //SEG107 [39] phi from mul8s_compare::@14 to mul8s_compare::@4 [phi:mul8s_compare::@14->mul8s_compare::@4]
+  b4_from_b14:
+  //SEG108 [39] phi (byte) mul8s_compare::ok#3 = (byte) mul8s_compare::ok#4 [phi:mul8s_compare::@14->mul8s_compare::@4#0] -- register_copy 
     jmp b4
     str: .text "signed multiply results match!@"
 }
@@ -5408,9 +5449,9 @@ print_sword: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b4
-  //SEG200 print_sword::@4
-  b4:
+    jmp b3
+  //SEG200 print_sword::@3
+  b3:
   //SEG201 [97] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#4 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -5421,11 +5462,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG202 [98] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG202 [98] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG203 [98] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#132 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG204 [98] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG203 [98] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#132 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG204 [98] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG205 print_sword::@1
   b1:
@@ -5566,10 +5607,10 @@ print_sbyte: {
     lda #' '
     sta print_char.ch
     jsr print_char
-  //SEG256 [124] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG256 [124] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG257 [124] phi (signed byte) print_sbyte::b#5 = (signed byte) print_sbyte::b#3 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG257 [124] phi (signed byte) print_sbyte::b#5 = (signed byte) print_sbyte::b#3 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG258 print_sbyte::@2
   b2:
@@ -5600,16 +5641,16 @@ print_sbyte: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b5
-  //SEG272 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG272 print_sbyte::@4
+  b4:
   //SEG273 [130] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#3 -- vbsz1=_neg_vbsz1 
     lda b
     eor #$ff
     clc
     adc #1
     sta b
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG274 mul8s
 // Multiply of two signed bytes to a signed word
@@ -5641,9 +5682,9 @@ mul8s: {
     sta mul8u.return
     lda mul8u.res+1
     sta mul8u.return+1
-    jmp b6
-  //SEG282 mul8s::@6
-  b6:
+    jmp b5
+  //SEG282 mul8s::@5
+  b5:
   //SEG283 [135] (word) mul8s::m#0 ← (word) mul8u::return#2 -- vwuz1=vwuz2 
     lda mul8u.return
     sta m
@@ -5652,7 +5693,7 @@ mul8s: {
   //SEG284 [136] if((signed byte) mul8s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s::@1 -- vbsz1_ge_0_then_la1 
     lda a
     cmp #0
-    bpl b1_from_b6
+    bpl b1_from_b5
     jmp b3
   //SEG285 mul8s::@3
   b3:
@@ -5667,10 +5708,10 @@ mul8s: {
   //SEG288 [139] (word) mul8s::m#1 ← (word) mul8s::m#0 hi= (byte~) mul8s::$16 -- vwuz1=vwuz1_sethi_vbuz2 
     lda _16
     sta m+1
-  //SEG289 [140] phi from mul8s::@3 mul8s::@6 to mul8s::@1 [phi:mul8s::@3/mul8s::@6->mul8s::@1]
+  //SEG289 [140] phi from mul8s::@3 mul8s::@5 to mul8s::@1 [phi:mul8s::@3/mul8s::@5->mul8s::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG290 [140] phi (word) mul8s::m#5 = (word) mul8s::m#1 [phi:mul8s::@3/mul8s::@6->mul8s::@1#0] -- register_copy 
+  b1_from_b5:
+  //SEG290 [140] phi (word) mul8s::m#5 = (word) mul8s::m#1 [phi:mul8s::@3/mul8s::@5->mul8s::@1#0] -- register_copy 
     jmp b1
   //SEG291 mul8s::@1
   b1:
@@ -5748,13 +5789,13 @@ mul8u: {
     lda #1
     and a
     sta _1
-  //SEG314 [153] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuz1_eq_0_then_la1 
+  //SEG314 [153] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuz1_eq_0_then_la1 
     lda _1
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG315 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG315 mul8u::@3
+  b3:
   //SEG316 [154] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -5763,23 +5804,23 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG317 [155] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG318 [155] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG319 mul8u::@8
-  b8:
+  //SEG317 [155] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG318 [155] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG319 mul8u::@4
+  b4:
   //SEG320 [156] (byte) mul8u::a#0 ← (byte) mul8u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz1_ror_1 
     lsr a
   //SEG321 [157] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG322 [149] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG323 [149] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG324 [149] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG325 [149] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG322 [149] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG323 [149] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG324 [149] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG325 [149] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG326 mulf8s
@@ -5801,9 +5842,9 @@ mulf8s: {
   mulf8u_prepare_from_mulf8s_prepare1:
   //SEG331 [186] phi (byte) mulf8u_prepare::a#2 = (byte~) mulf8u_prepare::a#3 [phi:mulf8s::mulf8s_prepare1->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-    jmp b2
-  //SEG332 mulf8s::@2
-  b2:
+    jmp b1
+  //SEG332 mulf8s::@1
+  b1:
   //SEG333 [161] (signed byte) mulf8s_prepared::b#0 ← (signed byte) mulf8s::b#0 -- vbsz1=vbsz2 
     lda b
     sta mulf8s_prepared.b
@@ -5814,9 +5855,9 @@ mulf8s: {
     sta mulf8s_prepared.return
     lda mulf8s_prepared.m+1
     sta mulf8s_prepared.return+1
-    jmp b4
-  //SEG336 mulf8s::@4
-  b4:
+    jmp b2
+  //SEG336 mulf8s::@2
+  b2:
   //SEG337 [164] (signed word) mulf8s::return#0 ← (signed word) mulf8s_prepared::return#2 -- vwsz1=vwsz2 
     lda mulf8s_prepared.return
     sta return
@@ -5854,9 +5895,9 @@ mulf8s_prepared: {
     sta mulf8u_prepared.return_3
     lda mulf8u_prepared.return+1
     sta mulf8u_prepared.return_3+1
-    jmp b6
-  //SEG346 mulf8s_prepared::@6
-  b6:
+    jmp b5
+  //SEG346 mulf8s_prepared::@5
+  b5:
   //SEG347 [169] (word) mulf8s_prepared::m#0 ← (word) mulf8u_prepared::return#3 -- vwuz1=vwuz2 
     lda mulf8u_prepared.return_3
     sta m
@@ -5865,7 +5906,7 @@ mulf8s_prepared: {
   //SEG348 [170] if(*((const signed byte*) mulf8s_prepared::memA#0)>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@1 -- _deref_pbsc1_ge_0_then_la1 
     lda memA
     cmp #0
-    bpl b1_from_b6
+    bpl b1_from_b5
     jmp b3
   //SEG349 mulf8s_prepared::@3
   b3:
@@ -5880,10 +5921,10 @@ mulf8s_prepared: {
   //SEG352 [173] (word) mulf8s_prepared::m#1 ← (word) mulf8s_prepared::m#0 hi= (byte~) mulf8s_prepared::$15 -- vwuz1=vwuz1_sethi_vbuz2 
     lda _15
     sta m+1
-  //SEG353 [174] phi from mulf8s_prepared::@3 mulf8s_prepared::@6 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1]
+  //SEG353 [174] phi from mulf8s_prepared::@3 mulf8s_prepared::@5 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG354 [174] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1#0] -- register_copy 
+  b1_from_b5:
+  //SEG354 [174] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1#0] -- register_copy 
     jmp b1
   //SEG355 mulf8s_prepared::@1
   b1:
@@ -5990,34 +6031,34 @@ muls8s: {
     .label a = $3c
     .label b = $3d
     .label return_2 = $3e
-  //SEG378 [190] if((signed byte) muls8s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@10 -- vbsz1_lt_0_then_la1 
+  //SEG378 [190] if((signed byte) muls8s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@4 -- vbsz1_lt_0_then_la1 
     lda a
-    bmi b10_from_muls8s
-    jmp b4
-  //SEG379 muls8s::@4
-  b4:
-  //SEG380 [191] if((signed byte) muls8s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@3 -- vbsz1_le_0_then_la1 
+    bmi b4_from_muls8s
+    jmp b2
+  //SEG379 muls8s::@2
+  b2:
+  //SEG380 [191] if((signed byte) muls8s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@1 -- vbsz1_le_0_then_la1 
     lda a
     cmp #1
-    bmi b3_from_b4
-  //SEG381 [192] phi from muls8s::@4 to muls8s::@8 [phi:muls8s::@4->muls8s::@8]
-  b8_from_b4:
-  //SEG382 [192] phi (signed byte) muls8s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@4->muls8s::@8#0] -- vbsz1=vbuc1 
+    bmi b1_from_b2
+  //SEG381 [192] phi from muls8s::@2 to muls8s::@3 [phi:muls8s::@2->muls8s::@3]
+  b3_from_b2:
+  //SEG382 [192] phi (signed byte) muls8s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@2->muls8s::@3#0] -- vbsz1=vbuc1 
     lda #0
     sta j
-  //SEG383 [192] phi (signed word) muls8s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@4->muls8s::@8#1] -- vwsz1=vbuc1 
+  //SEG383 [192] phi (signed word) muls8s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@2->muls8s::@3#1] -- vwsz1=vbuc1 
     lda #0
     sta m
     lda #0
     sta m+1
-    jmp b8
-  //SEG384 [192] phi from muls8s::@8 to muls8s::@8 [phi:muls8s::@8->muls8s::@8]
-  b8_from_b8:
-  //SEG385 [192] phi (signed byte) muls8s::j#2 = (signed byte) muls8s::j#1 [phi:muls8s::@8->muls8s::@8#0] -- register_copy 
-  //SEG386 [192] phi (signed word) muls8s::m#3 = (signed word) muls8s::m#1 [phi:muls8s::@8->muls8s::@8#1] -- register_copy 
-    jmp b8
-  //SEG387 muls8s::@8
-  b8:
+    jmp b3
+  //SEG384 [192] phi from muls8s::@3 to muls8s::@3 [phi:muls8s::@3->muls8s::@3]
+  b3_from_b3:
+  //SEG385 [192] phi (signed byte) muls8s::j#2 = (signed byte) muls8s::j#1 [phi:muls8s::@3->muls8s::@3#0] -- register_copy 
+  //SEG386 [192] phi (signed word) muls8s::m#3 = (signed word) muls8s::m#1 [phi:muls8s::@3->muls8s::@3#1] -- register_copy 
+    jmp b3
+  //SEG387 muls8s::@3
+  b3:
   //SEG388 [193] (signed word) muls8s::m#1 ← (signed word) muls8s::m#3 + (signed byte) muls8s::b#0 -- vwsz1=vwsz1_plus_vbsz2 
     lda b
     sta $fe
@@ -6035,48 +6076,48 @@ muls8s: {
     sta m+1
   //SEG389 [194] (signed byte) muls8s::j#1 ← ++ (signed byte) muls8s::j#2 -- vbsz1=_inc_vbsz1 
     inc j
-  //SEG390 [195] if((signed byte) muls8s::j#1!=(signed byte) muls8s::a#0) goto muls8s::@8 -- vbsz1_neq_vbsz2_then_la1 
+  //SEG390 [195] if((signed byte) muls8s::j#1!=(signed byte) muls8s::a#0) goto muls8s::@3 -- vbsz1_neq_vbsz2_then_la1 
     lda j
     cmp a
-    bne b8_from_b8
-  //SEG391 [196] phi from muls8s::@10 muls8s::@8 to muls8s::@3 [phi:muls8s::@10/muls8s::@8->muls8s::@3]
-  b3_from_b10:
-  b3_from_b8:
-  //SEG392 [196] phi (signed word) muls8s::return#0 = (signed word) muls8s::m#2 [phi:muls8s::@10/muls8s::@8->muls8s::@3#0] -- register_copy 
-    jmp b3
-  //SEG393 [196] phi from muls8s::@4 to muls8s::@3 [phi:muls8s::@4->muls8s::@3]
-  b3_from_b4:
-  //SEG394 [196] phi (signed word) muls8s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@4->muls8s::@3#0] -- vwsz1=vbuc1 
+    bne b3_from_b3
+  //SEG391 [196] phi from muls8s::@3 muls8s::@4 to muls8s::@1 [phi:muls8s::@3/muls8s::@4->muls8s::@1]
+  b1_from_b3:
+  b1_from_b4:
+  //SEG392 [196] phi (signed word) muls8s::return#0 = (signed word) muls8s::m#1 [phi:muls8s::@3/muls8s::@4->muls8s::@1#0] -- register_copy 
+    jmp b1
+  //SEG393 [196] phi from muls8s::@2 to muls8s::@1 [phi:muls8s::@2->muls8s::@1]
+  b1_from_b2:
+  //SEG394 [196] phi (signed word) muls8s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@2->muls8s::@1#0] -- vwsz1=vbuc1 
     lda #0
     sta return
     lda #0
     sta return+1
-    jmp b3
-  //SEG395 muls8s::@3
-  b3:
+    jmp b1
+  //SEG395 muls8s::@1
+  b1:
     jmp breturn
   //SEG396 muls8s::@return
   breturn:
   //SEG397 [197] return 
     rts
-  //SEG398 [198] phi from muls8s to muls8s::@10 [phi:muls8s->muls8s::@10]
-  b10_from_muls8s:
-  //SEG399 [198] phi (signed byte) muls8s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@10#0] -- vbsz1=vbuc1 
+  //SEG398 [198] phi from muls8s to muls8s::@4 [phi:muls8s->muls8s::@4]
+  b4_from_muls8s:
+  //SEG399 [198] phi (signed byte) muls8s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@4#0] -- vbsz1=vbuc1 
     lda #0
     sta i
-  //SEG400 [198] phi (signed word) muls8s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@10#1] -- vwsz1=vbuc1 
+  //SEG400 [198] phi (signed word) muls8s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@4#1] -- vwsz1=vbuc1 
     lda #0
     sta m
     lda #0
     sta m+1
-    jmp b10
-  //SEG401 [198] phi from muls8s::@10 to muls8s::@10 [phi:muls8s::@10->muls8s::@10]
-  b10_from_b10:
-  //SEG402 [198] phi (signed byte) muls8s::i#2 = (signed byte) muls8s::i#1 [phi:muls8s::@10->muls8s::@10#0] -- register_copy 
-  //SEG403 [198] phi (signed word) muls8s::m#5 = (signed word) muls8s::m#2 [phi:muls8s::@10->muls8s::@10#1] -- register_copy 
-    jmp b10
-  //SEG404 muls8s::@10
-  b10:
+    jmp b4
+  //SEG401 [198] phi from muls8s::@4 to muls8s::@4 [phi:muls8s::@4->muls8s::@4]
+  b4_from_b4:
+  //SEG402 [198] phi (signed byte) muls8s::i#2 = (signed byte) muls8s::i#1 [phi:muls8s::@4->muls8s::@4#0] -- register_copy 
+  //SEG403 [198] phi (signed word) muls8s::m#5 = (signed word) muls8s::m#2 [phi:muls8s::@4->muls8s::@4#1] -- register_copy 
+    jmp b4
+  //SEG404 muls8s::@4
+  b4:
   //SEG405 [199] (signed word) muls8s::m#2 ← (signed word) muls8s::m#5 - (signed byte) muls8s::b#0 -- vwsz1=vwsz1_minus_vbsz2 
     lda b
     sta $fe
@@ -6094,11 +6135,11 @@ muls8s: {
     sta m+1
   //SEG406 [200] (signed byte) muls8s::i#1 ← -- (signed byte) muls8s::i#2 -- vbsz1=_dec_vbsz1 
     dec i
-  //SEG407 [201] if((signed byte) muls8s::i#1!=(signed byte) muls8s::a#0) goto muls8s::@10 -- vbsz1_neq_vbsz2_then_la1 
+  //SEG407 [201] if((signed byte) muls8s::i#1!=(signed byte) muls8s::a#0) goto muls8s::@4 -- vbsz1_neq_vbsz2_then_la1 
     lda i
     cmp a
-    bne b10_from_b10
-    jmp b3_from_b10
+    bne b4_from_b4
+    jmp b1_from_b4
 }
 //SEG408 mul8u_compare
 // Perform all possible byte multiplications (slow and fast) and compare the results
@@ -6115,9 +6156,9 @@ mul8u_compare: {
     lda #0
     sta a
     jmp b1
-  //SEG411 [203] phi from mul8u_compare::@10 to mul8u_compare::@1 [phi:mul8u_compare::@10->mul8u_compare::@1]
-  b1_from_b10:
-  //SEG412 [203] phi (byte) mul8u_compare::a#7 = (byte) mul8u_compare::a#1 [phi:mul8u_compare::@10->mul8u_compare::@1#0] -- register_copy 
+  //SEG411 [203] phi from mul8u_compare::@8 to mul8u_compare::@1 [phi:mul8u_compare::@8->mul8u_compare::@1]
+  b1_from_b8:
+  //SEG412 [203] phi (byte) mul8u_compare::a#7 = (byte) mul8u_compare::a#1 [phi:mul8u_compare::@8->mul8u_compare::@1#0] -- register_copy 
     jmp b1
   //SEG413 mul8u_compare::@1
   b1:
@@ -6146,9 +6187,9 @@ mul8u_compare: {
     sta muls8u.return_2
     lda muls8u.return+1
     sta muls8u.return_2+1
-    jmp b12
-  //SEG423 mul8u_compare::@12
-  b12:
+    jmp b10
+  //SEG423 mul8u_compare::@10
+  b10:
   //SEG424 [209] (word) mul8u_compare::ms#0 ← (word) muls8u::return#2 -- vwuz1=vwuz2 
     lda muls8u.return_2
     sta ms
@@ -6167,9 +6208,9 @@ mul8u_compare: {
     sta mulf8u.return_2
     lda mulf8u.return+1
     sta mulf8u.return_2+1
-    jmp b13
-  //SEG429 mul8u_compare::@13
-  b13:
+    jmp b11
+  //SEG429 mul8u_compare::@11
+  b11:
   //SEG430 [214] (word) mul8u_compare::mf#0 ← (word) mulf8u::return#2 -- vwuz1=vwuz2 
     lda mulf8u.return_2
     sta mf
@@ -6182,19 +6223,19 @@ mul8u_compare: {
     lda b
     sta mul8u.b
   //SEG433 [217] call mul8u 
-  //SEG434 [147] phi from mul8u_compare::@13 to mul8u [phi:mul8u_compare::@13->mul8u]
-  mul8u_from_b13:
-  //SEG435 [147] phi (byte) mul8u::a#6 = (byte) mul8u::a#2 [phi:mul8u_compare::@13->mul8u#0] -- register_copy 
-  //SEG436 [147] phi (byte) mul8u::b#2 = (byte) mul8u::b#1 [phi:mul8u_compare::@13->mul8u#1] -- register_copy 
+  //SEG434 [147] phi from mul8u_compare::@11 to mul8u [phi:mul8u_compare::@11->mul8u]
+  mul8u_from_b11:
+  //SEG435 [147] phi (byte) mul8u::a#6 = (byte) mul8u::a#2 [phi:mul8u_compare::@11->mul8u#0] -- register_copy 
+  //SEG436 [147] phi (byte) mul8u::b#2 = (byte) mul8u::b#1 [phi:mul8u_compare::@11->mul8u#1] -- register_copy 
     jsr mul8u
   //SEG437 [218] (word) mul8u::return#3 ← (word) mul8u::res#2 -- vwuz1=vwuz2 
     lda mul8u.res
     sta mul8u.return_3
     lda mul8u.res+1
     sta mul8u.return_3+1
-    jmp b14
-  //SEG438 mul8u_compare::@14
-  b14:
+    jmp b12
+  //SEG438 mul8u_compare::@12
+  b12:
   //SEG439 [219] (word) mul8u_compare::mn#0 ← (word) mul8u::return#3 -- vwuz1=vwuz2 
     lda mul8u.return_3
     sta mn
@@ -6206,10 +6247,10 @@ mul8u_compare: {
     bne !+
     lda ms+1
     cmp mf+1
-    beq b3_from_b14
+    beq b3_from_b12
   !:
-  //SEG441 [221] phi from mul8u_compare::@14 to mul8u_compare::@6 [phi:mul8u_compare::@14->mul8u_compare::@6]
-  b6_from_b14:
+  //SEG441 [221] phi from mul8u_compare::@12 to mul8u_compare::@6 [phi:mul8u_compare::@12->mul8u_compare::@6]
+  b6_from_b12:
     jmp b6
   //SEG442 mul8u_compare::@6
   b6:
@@ -6219,21 +6260,21 @@ mul8u_compare: {
     lda #0
     sta ok
     jmp b3
-  //SEG445 [222] phi from mul8u_compare::@14 to mul8u_compare::@3 [phi:mul8u_compare::@14->mul8u_compare::@3]
-  b3_from_b14:
-  //SEG446 [222] phi (byte) mul8u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8u_compare::@14->mul8u_compare::@3#0] -- vbuz1=vbuc1 
+  //SEG445 [222] phi from mul8u_compare::@12 to mul8u_compare::@3 [phi:mul8u_compare::@12->mul8u_compare::@3]
+  b3_from_b12:
+  //SEG446 [222] phi (byte) mul8u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8u_compare::@12->mul8u_compare::@3#0] -- vbuz1=vbuc1 
     lda #1
     sta ok
     jmp b3
   //SEG447 mul8u_compare::@3
   b3:
-  //SEG448 [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@20 -- vwuz1_eq_vwuz2_then_la1 
+  //SEG448 [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@14 -- vwuz1_eq_vwuz2_then_la1 
     lda ms
     cmp mn
     bne !+
     lda ms+1
     cmp mn+1
-    beq b20_from_b3
+    beq b14_from_b3
   !:
   //SEG449 [224] phi from mul8u_compare::@3 to mul8u_compare::@4 [phi:mul8u_compare::@3->mul8u_compare::@4]
   b4_from_b3:
@@ -6247,9 +6288,9 @@ mul8u_compare: {
     lda ok
     cmp #0
     bne b5
-    jmp b8
-  //SEG453 mul8u_compare::@8
-  b8:
+    jmp b7
+  //SEG453 mul8u_compare::@7
+  b7:
   //SEG454 [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -6275,8 +6316,8 @@ mul8u_compare: {
     lda mf+1
     sta mul8u_error.mf+1
   //SEG460 [232] call mul8u_error 
-  //SEG461 [243] phi from mul8u_compare::@8 to mul8u_error [phi:mul8u_compare::@8->mul8u_error]
-  mul8u_error_from_b8:
+  //SEG461 [243] phi from mul8u_compare::@7 to mul8u_error [phi:mul8u_compare::@7->mul8u_error]
+  mul8u_error_from_b7:
     jsr mul8u_error
     jmp breturn
   //SEG462 mul8u_compare::@return
@@ -6291,50 +6332,50 @@ mul8u_compare: {
     lda b
     cmp #0
     bne b2_from_b5
-    jmp b10
-  //SEG467 mul8u_compare::@10
-  b10:
+    jmp b8
+  //SEG467 mul8u_compare::@8
+  b8:
   //SEG468 [236] (byte) mul8u_compare::a#1 ← ++ (byte) mul8u_compare::a#7 -- vbuz1=_inc_vbuz1 
     inc a
   //SEG469 [237] if((byte) mul8u_compare::a#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u_compare::@1 -- vbuz1_neq_0_then_la1 
     lda a
     cmp #0
-    bne b1_from_b10
-  //SEG470 [238] phi from mul8u_compare::@10 to mul8u_compare::@11 [phi:mul8u_compare::@10->mul8u_compare::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG471 mul8u_compare::@11
-  b11:
+    bne b1_from_b8
+  //SEG470 [238] phi from mul8u_compare::@8 to mul8u_compare::@9 [phi:mul8u_compare::@8->mul8u_compare::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG471 mul8u_compare::@9
+  b9:
   //SEG472 [239] call print_str 
-  //SEG473 [63] phi from mul8u_compare::@11 to print_str [phi:mul8u_compare::@11->print_str]
-  print_str_from_b11:
-  //SEG474 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#31 [phi:mul8u_compare::@11->print_str#0] -- register_copy 
-  //SEG475 [63] phi (byte*) print_str::str#18 = (const string) mul8u_compare::str [phi:mul8u_compare::@11->print_str#1] -- pbuz1=pbuc1 
+  //SEG473 [63] phi from mul8u_compare::@9 to print_str [phi:mul8u_compare::@9->print_str]
+  print_str_from_b9:
+  //SEG474 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#31 [phi:mul8u_compare::@9->print_str#0] -- register_copy 
+  //SEG475 [63] phi (byte*) print_str::str#18 = (const string) mul8u_compare::str [phi:mul8u_compare::@9->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG476 [240] phi from mul8u_compare::@11 to mul8u_compare::@16 [phi:mul8u_compare::@11->mul8u_compare::@16]
-  b16_from_b11:
-    jmp b16
-  //SEG477 mul8u_compare::@16
-  b16:
+  //SEG476 [240] phi from mul8u_compare::@9 to mul8u_compare::@13 [phi:mul8u_compare::@9->mul8u_compare::@13]
+  b13_from_b9:
+    jmp b13
+  //SEG477 mul8u_compare::@13
+  b13:
   //SEG478 [241] call print_ln 
-  //SEG479 [58] phi from mul8u_compare::@16 to print_ln [phi:mul8u_compare::@16->print_ln]
-  print_ln_from_b16:
-  //SEG480 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8u_compare::@16->print_ln#0] -- register_copy 
-  //SEG481 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#10 [phi:mul8u_compare::@16->print_ln#1] -- register_copy 
+  //SEG479 [58] phi from mul8u_compare::@13 to print_ln [phi:mul8u_compare::@13->print_ln]
+  print_ln_from_b13:
+  //SEG480 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8u_compare::@13->print_ln#0] -- register_copy 
+  //SEG481 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#10 [phi:mul8u_compare::@13->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG482 [242] phi from mul8u_compare::@3 to mul8u_compare::@20 [phi:mul8u_compare::@3->mul8u_compare::@20]
-  b20_from_b3:
-    jmp b20
-  //SEG483 mul8u_compare::@20
-  b20:
-  //SEG484 [224] phi from mul8u_compare::@20 to mul8u_compare::@4 [phi:mul8u_compare::@20->mul8u_compare::@4]
-  b4_from_b20:
-  //SEG485 [224] phi (byte) mul8u_compare::ok#3 = (byte) mul8u_compare::ok#4 [phi:mul8u_compare::@20->mul8u_compare::@4#0] -- register_copy 
+  //SEG482 [242] phi from mul8u_compare::@3 to mul8u_compare::@14 [phi:mul8u_compare::@3->mul8u_compare::@14]
+  b14_from_b3:
+    jmp b14
+  //SEG483 mul8u_compare::@14
+  b14:
+  //SEG484 [224] phi from mul8u_compare::@14 to mul8u_compare::@4 [phi:mul8u_compare::@14->mul8u_compare::@4]
+  b4_from_b14:
+  //SEG485 [224] phi (byte) mul8u_compare::ok#3 = (byte) mul8u_compare::ok#4 [phi:mul8u_compare::@14->mul8u_compare::@4#0] -- register_copy 
     jmp b4
     str: .text "multiply results match!@"
 }
@@ -6516,25 +6557,25 @@ mulf8u: {
   mulf8u_prepare_from_mulf8u:
   //SEG557 [186] phi (byte) mulf8u_prepare::a#2 = (byte) mulf8u_prepare::a#0 [phi:mulf8u->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-    jmp b2
-  //SEG558 mulf8u::@2
-  b2:
+    jmp b1
+  //SEG558 mulf8u::@1
+  b1:
   //SEG559 [268] (byte) mulf8u_prepared::b#0 ← (byte) mulf8u::b#0 -- vbuz1=vbuz2 
     lda b
     sta mulf8u_prepared.b
   //SEG560 [269] call mulf8u_prepared 
-  //SEG561 [181] phi from mulf8u::@2 to mulf8u_prepared [phi:mulf8u::@2->mulf8u_prepared]
-  mulf8u_prepared_from_b2:
-  //SEG562 [181] phi (byte) mulf8u_prepared::b#2 = (byte) mulf8u_prepared::b#0 [phi:mulf8u::@2->mulf8u_prepared#0] -- register_copy 
+  //SEG561 [181] phi from mulf8u::@1 to mulf8u_prepared [phi:mulf8u::@1->mulf8u_prepared]
+  mulf8u_prepared_from_b1:
+  //SEG562 [181] phi (byte) mulf8u_prepared::b#2 = (byte) mulf8u_prepared::b#0 [phi:mulf8u::@1->mulf8u_prepared#0] -- register_copy 
     jsr mulf8u_prepared
   //SEG563 [270] (word) mulf8u_prepared::return#2 ← (word) mulf8u_prepared::return#0 -- vwuz1=vwuz2 
     lda mulf8u_prepared.return
     sta mulf8u_prepared.return_2
     lda mulf8u_prepared.return+1
     sta mulf8u_prepared.return_2+1
-    jmp b3
-  //SEG564 mulf8u::@3
-  b3:
+    jmp b2
+  //SEG564 mulf8u::@2
+  b2:
   //SEG565 [271] (word) mulf8u::return#0 ← (word) mulf8u_prepared::return#2 -- vwuz1=vwuz2 
     lda mulf8u_prepared.return_2
     sta return
@@ -6561,24 +6602,24 @@ muls8u: {
     lda a
     cmp #0
     beq b1_from_muls8u
-  //SEG570 [274] phi from muls8u to muls8u::@4 [phi:muls8u->muls8u::@4]
-  b4_from_muls8u:
-  //SEG571 [274] phi (byte) muls8u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@4#0] -- vbuz1=vbuc1 
+  //SEG570 [274] phi from muls8u to muls8u::@2 [phi:muls8u->muls8u::@2]
+  b2_from_muls8u:
+  //SEG571 [274] phi (byte) muls8u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG572 [274] phi (word) muls8u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@4#1] -- vwuz1=vbuc1 
+  //SEG572 [274] phi (word) muls8u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@2#1] -- vwuz1=vbuc1 
     lda #0
     sta m
     lda #0
     sta m+1
-    jmp b4
-  //SEG573 [274] phi from muls8u::@4 to muls8u::@4 [phi:muls8u::@4->muls8u::@4]
-  b4_from_b4:
-  //SEG574 [274] phi (byte) muls8u::i#2 = (byte) muls8u::i#1 [phi:muls8u::@4->muls8u::@4#0] -- register_copy 
-  //SEG575 [274] phi (word) muls8u::m#3 = (word) muls8u::m#1 [phi:muls8u::@4->muls8u::@4#1] -- register_copy 
-    jmp b4
-  //SEG576 muls8u::@4
-  b4:
+    jmp b2
+  //SEG573 [274] phi from muls8u::@2 to muls8u::@2 [phi:muls8u::@2->muls8u::@2]
+  b2_from_b2:
+  //SEG574 [274] phi (byte) muls8u::i#2 = (byte) muls8u::i#1 [phi:muls8u::@2->muls8u::@2#0] -- register_copy 
+  //SEG575 [274] phi (word) muls8u::m#3 = (word) muls8u::m#1 [phi:muls8u::@2->muls8u::@2#1] -- register_copy 
+    jmp b2
+  //SEG576 muls8u::@2
+  b2:
   //SEG577 [275] (word) muls8u::m#1 ← (word) muls8u::m#3 + (byte) muls8u::b#0 -- vwuz1=vwuz1_plus_vbuz2 
     lda b
     clc
@@ -6589,13 +6630,13 @@ muls8u: {
   !:
   //SEG578 [276] (byte) muls8u::i#1 ← ++ (byte) muls8u::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG579 [277] if((byte) muls8u::i#1!=(byte) muls8u::a#0) goto muls8u::@4 -- vbuz1_neq_vbuz2_then_la1 
+  //SEG579 [277] if((byte) muls8u::i#1!=(byte) muls8u::a#0) goto muls8u::@2 -- vbuz1_neq_vbuz2_then_la1 
     lda i
     cmp a
-    bne b4_from_b4
-  //SEG580 [278] phi from muls8u::@4 to muls8u::@1 [phi:muls8u::@4->muls8u::@1]
-  b1_from_b4:
-  //SEG581 [278] phi (word) muls8u::return#0 = (word) muls8u::m#1 [phi:muls8u::@4->muls8u::@1#0] -- register_copy 
+    bne b2_from_b2
+  //SEG580 [278] phi from muls8u::@2 to muls8u::@1 [phi:muls8u::@2->muls8u::@1]
+  b1_from_b2:
+  //SEG581 [278] phi (word) muls8u::return#0 = (word) muls8u::m#1 [phi:muls8u::@2->muls8u::@1#0] -- register_copy 
     jmp b1
   //SEG582 [278] phi from muls8u to muls8u::@1 [phi:muls8u->muls8u::@1]
   b1_from_muls8u:
@@ -6665,57 +6706,57 @@ mulf_tables_cmp: {
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b6
-  //SEG602 mulf_tables_cmp::@6
-  b6:
+    jmp b5
+  //SEG602 mulf_tables_cmp::@5
+  b5:
   //SEG603 [285] (word~) print_word::w#11 ← (word)(byte*) mulf_tables_cmp::asm_sqr#2 -- vwuz1=vwuz2 
     lda asm_sqr
     sta print_word.w
     lda asm_sqr+1
     sta print_word.w+1
   //SEG604 [286] call print_word 
-  //SEG605 [102] phi from mulf_tables_cmp::@6 to print_word [phi:mulf_tables_cmp::@6->print_word]
-  print_word_from_b6:
-  //SEG606 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@6->print_word#0] -- register_copy 
-  //SEG607 [102] phi (word) print_word::w#6 = (word~) print_word::w#11 [phi:mulf_tables_cmp::@6->print_word#1] -- register_copy 
+  //SEG605 [102] phi from mulf_tables_cmp::@5 to print_word [phi:mulf_tables_cmp::@5->print_word]
+  print_word_from_b5:
+  //SEG606 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@5->print_word#0] -- register_copy 
+  //SEG607 [102] phi (word) print_word::w#6 = (word~) print_word::w#11 [phi:mulf_tables_cmp::@5->print_word#1] -- register_copy 
     jsr print_word
-  //SEG608 [287] phi from mulf_tables_cmp::@6 to mulf_tables_cmp::@7 [phi:mulf_tables_cmp::@6->mulf_tables_cmp::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG609 mulf_tables_cmp::@7
-  b7:
+  //SEG608 [287] phi from mulf_tables_cmp::@5 to mulf_tables_cmp::@6 [phi:mulf_tables_cmp::@5->mulf_tables_cmp::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG609 mulf_tables_cmp::@6
+  b6:
   //SEG610 [288] call print_str 
-  //SEG611 [63] phi from mulf_tables_cmp::@7 to print_str [phi:mulf_tables_cmp::@7->print_str]
-  print_str_from_b7:
-  //SEG612 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@7->print_str#0] -- register_copy 
-  //SEG613 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str1 [phi:mulf_tables_cmp::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG611 [63] phi from mulf_tables_cmp::@6 to print_str [phi:mulf_tables_cmp::@6->print_str]
+  print_str_from_b6:
+  //SEG612 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@6->print_str#0] -- register_copy 
+  //SEG613 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str1 [phi:mulf_tables_cmp::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b8
-  //SEG614 mulf_tables_cmp::@8
-  b8:
+    jmp b7
+  //SEG614 mulf_tables_cmp::@7
+  b7:
   //SEG615 [289] (word~) print_word::w#12 ← (word)(byte*) mulf_tables_cmp::kc_sqr#2 -- vwuz1=vwuz2 
     lda kc_sqr
     sta print_word.w
     lda kc_sqr+1
     sta print_word.w+1
   //SEG616 [290] call print_word 
-  //SEG617 [102] phi from mulf_tables_cmp::@8 to print_word [phi:mulf_tables_cmp::@8->print_word]
-  print_word_from_b8:
-  //SEG618 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@8->print_word#0] -- register_copy 
-  //SEG619 [102] phi (word) print_word::w#6 = (word~) print_word::w#12 [phi:mulf_tables_cmp::@8->print_word#1] -- register_copy 
+  //SEG617 [102] phi from mulf_tables_cmp::@7 to print_word [phi:mulf_tables_cmp::@7->print_word]
+  print_word_from_b7:
+  //SEG618 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@7->print_word#0] -- register_copy 
+  //SEG619 [102] phi (word) print_word::w#6 = (word~) print_word::w#12 [phi:mulf_tables_cmp::@7->print_word#1] -- register_copy 
     jsr print_word
-  //SEG620 [291] phi from mulf_tables_cmp::@8 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return]
-  breturn_from_b8:
-  //SEG621 [291] phi (byte*) print_line_cursor#10 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#0] -- pbuz1=pbuc1 
+  //SEG620 [291] phi from mulf_tables_cmp::@7 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@7->mulf_tables_cmp::@return]
+  breturn_from_b7:
+  //SEG621 [291] phi (byte*) print_line_cursor#10 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@7->mulf_tables_cmp::@return#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG622 [291] phi (byte*) print_char_cursor#31 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#1] -- register_copy 
+  //SEG622 [291] phi (byte*) print_char_cursor#31 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@7->mulf_tables_cmp::@return#1] -- register_copy 
     jmp breturn
   //SEG623 mulf_tables_cmp::@return
   breturn:
@@ -6742,35 +6783,35 @@ mulf_tables_cmp: {
     cmp #<mulf_sqr1_lo+$200*4
     bcc b1_from_b2
   !:
-  //SEG629 [296] phi from mulf_tables_cmp::@2 to mulf_tables_cmp::@5 [phi:mulf_tables_cmp::@2->mulf_tables_cmp::@5]
-  b5_from_b2:
-    jmp b5
-  //SEG630 mulf_tables_cmp::@5
-  b5:
+  //SEG629 [296] phi from mulf_tables_cmp::@2 to mulf_tables_cmp::@4 [phi:mulf_tables_cmp::@2->mulf_tables_cmp::@4]
+  b4_from_b2:
+    jmp b4
+  //SEG630 mulf_tables_cmp::@4
+  b4:
   //SEG631 [297] call print_str 
-  //SEG632 [63] phi from mulf_tables_cmp::@5 to print_str [phi:mulf_tables_cmp::@5->print_str]
-  print_str_from_b5:
-  //SEG633 [63] phi (byte*) print_char_cursor#152 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@5->print_str#0] -- pbuz1=pbuc1 
+  //SEG632 [63] phi from mulf_tables_cmp::@4 to print_str [phi:mulf_tables_cmp::@4->print_str]
+  print_str_from_b4:
+  //SEG633 [63] phi (byte*) print_char_cursor#152 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@4->print_str#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG634 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str2 [phi:mulf_tables_cmp::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG634 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str2 [phi:mulf_tables_cmp::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-  //SEG635 [298] phi from mulf_tables_cmp::@5 to mulf_tables_cmp::@10 [phi:mulf_tables_cmp::@5->mulf_tables_cmp::@10]
-  b10_from_b5:
-    jmp b10
-  //SEG636 mulf_tables_cmp::@10
-  b10:
+  //SEG635 [298] phi from mulf_tables_cmp::@4 to mulf_tables_cmp::@8 [phi:mulf_tables_cmp::@4->mulf_tables_cmp::@8]
+  b8_from_b4:
+    jmp b8
+  //SEG636 mulf_tables_cmp::@8
+  b8:
   //SEG637 [299] call print_ln 
-  //SEG638 [58] phi from mulf_tables_cmp::@10 to print_ln [phi:mulf_tables_cmp::@10->print_ln]
-  print_ln_from_b10:
-  //SEG639 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@10->print_ln#0] -- register_copy 
-  //SEG640 [58] phi (byte*) print_line_cursor#45 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@10->print_ln#1] -- pbuz1=pbuc1 
+  //SEG638 [58] phi from mulf_tables_cmp::@8 to print_ln [phi:mulf_tables_cmp::@8->print_ln]
+  print_ln_from_b8:
+  //SEG639 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@8->print_ln#0] -- register_copy 
+  //SEG640 [58] phi (byte*) print_line_cursor#45 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@8->print_ln#1] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
@@ -6781,10 +6822,10 @@ mulf_tables_cmp: {
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG642 [291] phi from mulf_tables_cmp::@10 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@10->mulf_tables_cmp::@return]
-  breturn_from_b10:
-  //SEG643 [291] phi (byte*) print_line_cursor#10 = (byte*) print_line_cursor#1 [phi:mulf_tables_cmp::@10->mulf_tables_cmp::@return#0] -- register_copy 
-  //SEG644 [291] phi (byte*) print_char_cursor#31 = (byte*~) print_char_cursor#225 [phi:mulf_tables_cmp::@10->mulf_tables_cmp::@return#1] -- register_copy 
+  //SEG642 [291] phi from mulf_tables_cmp::@8 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return]
+  breturn_from_b8:
+  //SEG643 [291] phi (byte*) print_line_cursor#10 = (byte*) print_line_cursor#1 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#0] -- register_copy 
+  //SEG644 [291] phi (byte*) print_char_cursor#31 = (byte*~) print_char_cursor#225 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#1] -- register_copy 
     jmp breturn
     str: .text "multiply table mismatch at @"
     str1: .text " / @"
@@ -6969,34 +7010,34 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1_from_b2
-  //SEG685 [323] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  b5_from_b2:
-  //SEG686 [323] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG685 [323] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  b4_from_b2:
+  //SEG686 [323] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG687 [323] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG687 [323] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG688 [323] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG688 [323] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG689 [323] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuz1=vbuc1 
+  //SEG689 [323] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuz1=vbuc1 
     lda #-1
     sta x_255
-    jmp b5
-  //SEG690 [323] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  b5_from_b6:
-  //SEG691 [323] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG692 [323] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG693 [323] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG694 [323] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-    jmp b5
-  //SEG695 mulf_init::@5
-  b5:
+    jmp b4
+  //SEG690 [323] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  b4_from_b5:
+  //SEG691 [323] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG692 [323] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG693 [323] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG694 [323] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+    jmp b4
+  //SEG695 mulf_init::@4
+  b4:
   //SEG696 [324] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuz2 
     ldy x_255
     lda mulf_sqr1_lo,y
@@ -7017,33 +7058,33 @@ mulf_init: {
     clc
     adc dir
     sta x_255
-  //SEG700 [328] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuz1_neq_0_then_la1 
+  //SEG700 [328] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuz1_neq_0_then_la1 
     lda x_255
     cmp #0
-    bne b12_from_b5
-  //SEG701 [329] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  b6_from_b5:
-  //SEG702 [329] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b7_from_b4
+  //SEG701 [329] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  b5_from_b4:
+  //SEG702 [329] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-    jmp b6
-  //SEG703 mulf_init::@6
-  b6:
+    jmp b5
+  //SEG703 mulf_init::@5
+  b5:
   //SEG704 [330] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG705 [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG705 [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5_from_b6
+    bne b4_from_b5
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5_from_b6
-    jmp b8
-  //SEG706 mulf_init::@8
-  b8:
+    bne b4_from_b5
+    jmp b6
+  //SEG706 mulf_init::@6
+  b6:
   //SEG707 [332] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -7056,15 +7097,15 @@ mulf_init: {
   breturn:
   //SEG710 [334] return 
     rts
-  //SEG711 [335] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  b12_from_b5:
-    jmp b12
-  //SEG712 mulf_init::@12
-  b12:
-  //SEG713 [329] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  b6_from_b12:
-  //SEG714 [329] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
-    jmp b6
+  //SEG711 [335] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  b7_from_b4:
+    jmp b7
+  //SEG712 mulf_init::@7
+  b7:
+  //SEG713 [329] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  b5_from_b7:
+  //SEG714 [329] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
+    jmp b5
 }
 //SEG715 print_cls
 // Clear the screen. Also resets current line/char cursor.
@@ -7149,7 +7190,7 @@ Statement [29] (signed word) mul8s_compare::mf#0 ← (signed word) mulf8s::retur
 Statement [33] (signed word) mul8s::return#2 ← (signed word)(word) mul8s::m#4 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s::return#2 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s::return#2 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [34] (signed word) mul8s_compare::mn#0 ← (signed word) mul8s::return#2 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [35] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mf#0) goto mul8s_compare::@3 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ) always clobbers reg byte a 
-Statement [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@20 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_compare::ok#4 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_compare::ok#4 print_line_cursor#1 ] ) always clobbers reg byte a 
+Statement [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@14 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_compare::ok#4 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_compare::ok#4 print_line_cursor#1 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:4 [ mul8s_compare::ok#3 mul8s_compare::ok#4 ]
 Statement [41] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [44] (signed word) mul8s_error::ms#0 ← (signed word) mul8s_compare::ms#0 [ mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_error::a#0 mul8s_error::b#0 mul8s_error::ms#0 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_error::a#0 mul8s_error::b#0 mul8s_error::ms#0 print_line_cursor#1 ] ) always clobbers reg byte a 
@@ -7231,7 +7272,7 @@ Statement [214] (word) mul8u_compare::mf#0 ← (word) mulf8u::return#2 [ print_l
 Statement [218] (word) mul8u::return#3 ← (word) mul8u::res#2 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u::return#3 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u::return#3 ] ) always clobbers reg byte a 
 Statement [219] (word) mul8u_compare::mn#0 ← (word) mul8u::return#3 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ) always clobbers reg byte a 
 Statement [220] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mf#0) goto mul8u_compare::@3 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ) always clobbers reg byte a 
-Statement [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@20 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_compare::ok#4 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_compare::ok#4 ] ) always clobbers reg byte a 
+Statement [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@14 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_compare::ok#4 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_compare::ok#4 ] ) always clobbers reg byte a 
 Removing always clobbered register reg byte a as potential for zp ZP_BYTE:36 [ mul8u_compare::ok#3 mul8u_compare::ok#4 ]
 Statement [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ) always clobbers reg byte a 
 Statement [229] (word) mul8u_error::ms#0 ← (word) mul8u_compare::ms#0 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_error::a#0 mul8u_error::b#0 mul8u_error::ms#0 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_error::a#0 mul8u_error::b#0 mul8u_error::ms#0 ] ) always clobbers reg byte a 
@@ -7274,7 +7315,7 @@ Removing always clobbered register reg byte a as potential for zp ZP_BYTE:57 [ m
 Removing always clobbered register reg byte y as potential for zp ZP_BYTE:57 [ mulf_init::dir#2 mulf_init::dir#3 ]
 Statement [325] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:2::mulf_init:7 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [327] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ( main:2::mulf_init:7 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ) always clobbers reg byte a 
-Statement [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:7 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
+Statement [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:7 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
 Statement [332] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:7 [ ] ) always clobbers reg byte a 
 Statement [333] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:7 [ ] ) always clobbers reg byte a 
 Statement [338] *((byte*) print_cls::sc#2) ← (byte) ' ' [ print_cls::sc#2 ] ( main:2::print_cls:5 [ print_cls::sc#2 ] ) always clobbers reg byte a reg byte y 
@@ -7287,7 +7328,7 @@ Statement [29] (signed word) mul8s_compare::mf#0 ← (signed word) mulf8s::retur
 Statement [33] (signed word) mul8s::return#2 ← (signed word)(word) mul8s::m#4 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s::return#2 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s::return#2 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [34] (signed word) mul8s_compare::mn#0 ← (signed word) mul8s::return#2 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [35] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mf#0) goto mul8s_compare::@3 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ) always clobbers reg byte a 
-Statement [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@20 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_compare::ok#4 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_compare::ok#4 print_line_cursor#1 ] ) always clobbers reg byte a 
+Statement [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@14 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_compare::ok#4 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_compare::ok#4 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [41] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::a#7 mul8s_compare::b#10 mul8s_compare::ms#0 mul8s_compare::mf#0 mul8s_compare::mn#0 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [44] (signed word) mul8s_error::ms#0 ← (signed word) mul8s_compare::ms#0 [ mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_error::a#0 mul8s_error::b#0 mul8s_error::ms#0 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::mf#0 mul8s_compare::mn#0 mul8s_error::a#0 mul8s_error::b#0 mul8s_error::ms#0 print_line_cursor#1 ] ) always clobbers reg byte a 
 Statement [45] (signed word) mul8s_error::mn#0 ← (signed word) mul8s_compare::mn#0 [ mul8s_compare::mf#0 mul8s_error::a#0 mul8s_error::b#0 mul8s_error::ms#0 mul8s_error::mn#0 print_line_cursor#1 ] ( main:2::mul8s_compare:15 [ mul8s_compare::mf#0 mul8s_error::a#0 mul8s_error::b#0 mul8s_error::ms#0 mul8s_error::mn#0 print_line_cursor#1 ] ) always clobbers reg byte a 
@@ -7340,7 +7381,7 @@ Statement [214] (word) mul8u_compare::mf#0 ← (word) mulf8u::return#2 [ print_l
 Statement [218] (word) mul8u::return#3 ← (word) mul8u::res#2 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u::return#3 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u::return#3 ] ) always clobbers reg byte a 
 Statement [219] (word) mul8u_compare::mn#0 ← (word) mul8u::return#3 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ) always clobbers reg byte a 
 Statement [220] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mf#0) goto mul8u_compare::@3 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ) always clobbers reg byte a 
-Statement [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@20 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_compare::ok#4 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_compare::ok#4 ] ) always clobbers reg byte a 
+Statement [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@14 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_compare::ok#4 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_compare::ok#4 ] ) always clobbers reg byte a 
 Statement [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::a#7 mul8u_compare::b#10 mul8u_compare::ms#0 mul8u_compare::mf#0 mul8u_compare::mn#0 ] ) always clobbers reg byte a 
 Statement [229] (word) mul8u_error::ms#0 ← (word) mul8u_compare::ms#0 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_error::a#0 mul8u_error::b#0 mul8u_error::ms#0 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::mf#0 mul8u_compare::mn#0 mul8u_error::a#0 mul8u_error::b#0 mul8u_error::ms#0 ] ) always clobbers reg byte a 
 Statement [230] (word) mul8u_error::mn#0 ← (word) mul8u_compare::mn#0 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::mf#0 mul8u_error::a#0 mul8u_error::b#0 mul8u_error::ms#0 mul8u_error::mn#0 ] ( main:2::mul8u_compare:13 [ print_line_cursor#10 print_char_cursor#31 mul8u_compare::mf#0 mul8u_error::a#0 mul8u_error::b#0 mul8u_error::ms#0 mul8u_error::mn#0 ] ) always clobbers reg byte a 
@@ -7372,7 +7413,7 @@ Statement [322] if((byte*) mulf_init::sqr1_lo#1!=(const byte[$200]) mulf_sqr1_lo
 Statement [324] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:2::mulf_init:7 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [325] *((byte*) mulf_init::sqr2_hi#2) ← *((const byte[$200]) mulf_sqr1_hi#0 + (byte) mulf_init::x_255#2) [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ( main:2::mulf_init:7 [ mulf_init::x_255#2 mulf_init::sqr2_lo#2 mulf_init::sqr2_hi#2 mulf_init::dir#2 ] ) always clobbers reg byte a reg byte y 
 Statement [327] (byte) mulf_init::x_255#1 ← (byte) mulf_init::x_255#2 + (byte) mulf_init::dir#2 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ( main:2::mulf_init:7 [ mulf_init::sqr2_lo#2 mulf_init::dir#2 mulf_init::x_255#1 mulf_init::sqr2_hi#1 ] ) always clobbers reg byte a 
-Statement [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:7 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
+Statement [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ( main:2::mulf_init:7 [ mulf_init::x_255#1 mulf_init::sqr2_lo#1 mulf_init::sqr2_hi#1 mulf_init::dir#3 ] ) always clobbers reg byte a 
 Statement [332] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:7 [ ] ) always clobbers reg byte a 
 Statement [333] *((const byte[$200]) mulf_sqr2_hi#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_hi#0+(word/signed word/dword/signed dword) $100) [ ] ( main:2::mulf_init:7 [ ] ) always clobbers reg byte a 
 Statement [338] *((byte*) print_cls::sc#2) ← (byte) ' ' [ print_cls::sc#2 ] ( main:2::print_cls:5 [ print_cls::sc#2 ] ) always clobbers reg byte a reg byte y 
@@ -7626,15 +7667,15 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 4
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @42 [phi:@begin->@42]
-b42_from_bbegin:
-  jmp b42
-//SEG5 @42
-b42:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @42 to @end [phi:@42->@end]
-bend_from_b42:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -7710,9 +7751,9 @@ mul8s_compare: {
     lda #-$80
     sta a
     jmp b1
-  //SEG37 [18] phi from mul8s_compare::@10 to mul8s_compare::@1 [phi:mul8s_compare::@10->mul8s_compare::@1]
-  b1_from_b10:
-  //SEG38 [18] phi (signed byte) mul8s_compare::a#7 = (signed byte) mul8s_compare::a#1 [phi:mul8s_compare::@10->mul8s_compare::@1#0] -- register_copy 
+  //SEG37 [18] phi from mul8s_compare::@8 to mul8s_compare::@1 [phi:mul8s_compare::@8->mul8s_compare::@1]
+  b1_from_b8:
+  //SEG38 [18] phi (signed byte) mul8s_compare::a#7 = (signed byte) mul8s_compare::a#1 [phi:mul8s_compare::@8->mul8s_compare::@1#0] -- register_copy 
     jmp b1
   //SEG39 mul8s_compare::@1
   b1:
@@ -7734,22 +7775,22 @@ mul8s_compare: {
   //SEG47 [22] call muls8s 
     jsr muls8s
   //SEG48 [23] (signed word) muls8s::return#2 ← (signed word) muls8s::return#0
-    jmp b12
-  //SEG49 mul8s_compare::@12
-  b12:
+    jmp b10
+  //SEG49 mul8s_compare::@10
+  b10:
   //SEG50 [24] (signed word) mul8s_compare::ms#0 ← (signed word) muls8s::return#2
   //SEG51 [25] (signed byte) mulf8s::a#0 ← (signed byte) mul8s_compare::a#7 -- vbsaa=vbsz1 
     lda a
   //SEG52 [26] (signed byte) mulf8s::b#0 ← (signed byte) mul8s_compare::b#10 -- vbsxx=vbsz1 
     ldx b
   //SEG53 [27] call mulf8s 
-  //SEG54 [158] phi from mul8s_compare::@12 to mulf8s [phi:mul8s_compare::@12->mulf8s]
-  mulf8s_from_b12:
+  //SEG54 [158] phi from mul8s_compare::@10 to mulf8s [phi:mul8s_compare::@10->mulf8s]
+  mulf8s_from_b10:
     jsr mulf8s
   //SEG55 [28] (signed word) mulf8s::return#2 ← (signed word) mulf8s::return#0
-    jmp b13
-  //SEG56 mul8s_compare::@13
-  b13:
+    jmp b11
+  //SEG56 mul8s_compare::@11
+  b11:
   //SEG57 [29] (signed word) mul8s_compare::mf#0 ← (signed word) mulf8s::return#2
   //SEG58 [30] (signed byte) mul8s::a#0 ← (signed byte) mul8s_compare::a#7
   //SEG59 [31] (signed byte) mul8s::b#0 ← (signed byte) mul8s_compare::b#10 -- vbsyy=vbsz1 
@@ -7757,9 +7798,9 @@ mul8s_compare: {
   //SEG60 [32] call mul8s 
     jsr mul8s
   //SEG61 [33] (signed word) mul8s::return#2 ← (signed word)(word) mul8s::m#4
-    jmp b14
-  //SEG62 mul8s_compare::@14
-  b14:
+    jmp b12
+  //SEG62 mul8s_compare::@12
+  b12:
   //SEG63 [34] (signed word) mul8s_compare::mn#0 ← (signed word) mul8s::return#2
   //SEG64 [35] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mf#0) goto mul8s_compare::@3 -- vwsz1_eq_vwsz2_then_la1 
     lda ms
@@ -7767,10 +7808,10 @@ mul8s_compare: {
     bne !+
     lda ms+1
     cmp mf+1
-    beq b3_from_b14
+    beq b3_from_b12
   !:
-  //SEG65 [36] phi from mul8s_compare::@14 to mul8s_compare::@6 [phi:mul8s_compare::@14->mul8s_compare::@6]
-  b6_from_b14:
+  //SEG65 [36] phi from mul8s_compare::@12 to mul8s_compare::@6 [phi:mul8s_compare::@12->mul8s_compare::@6]
+  b6_from_b12:
     jmp b6
   //SEG66 mul8s_compare::@6
   b6:
@@ -7779,20 +7820,20 @@ mul8s_compare: {
   //SEG68 [37] phi (byte) mul8s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mul8s_compare::@6->mul8s_compare::@3#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b3
-  //SEG69 [37] phi from mul8s_compare::@14 to mul8s_compare::@3 [phi:mul8s_compare::@14->mul8s_compare::@3]
-  b3_from_b14:
-  //SEG70 [37] phi (byte) mul8s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8s_compare::@14->mul8s_compare::@3#0] -- vbuxx=vbuc1 
+  //SEG69 [37] phi from mul8s_compare::@12 to mul8s_compare::@3 [phi:mul8s_compare::@12->mul8s_compare::@3]
+  b3_from_b12:
+  //SEG70 [37] phi (byte) mul8s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8s_compare::@12->mul8s_compare::@3#0] -- vbuxx=vbuc1 
     ldx #1
     jmp b3
   //SEG71 mul8s_compare::@3
   b3:
-  //SEG72 [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@20 -- vwsz1_eq_vwsz2_then_la1 
+  //SEG72 [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@14 -- vwsz1_eq_vwsz2_then_la1 
     lda ms
     cmp mn
     bne !+
     lda ms+1
     cmp mn+1
-    beq b20_from_b3
+    beq b14_from_b3
   !:
   //SEG73 [39] phi from mul8s_compare::@3 to mul8s_compare::@4 [phi:mul8s_compare::@3->mul8s_compare::@4]
   b4_from_b3:
@@ -7804,9 +7845,9 @@ mul8s_compare: {
   //SEG76 [40] if((byte) mul8s_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s_compare::@5 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b5
-    jmp b8
-  //SEG77 mul8s_compare::@8
-  b8:
+    jmp b7
+  //SEG77 mul8s_compare::@7
+  b7:
   //SEG78 [41] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -7831,53 +7872,53 @@ mul8s_compare: {
     lda #-$80
     cmp b
     bne b2_from_b5
-    jmp b10
-  //SEG90 mul8s_compare::@10
-  b10:
+    jmp b8
+  //SEG90 mul8s_compare::@8
+  b8:
   //SEG91 [51] (signed byte) mul8s_compare::a#1 ← ++ (signed byte) mul8s_compare::a#7 -- vbsz1=_inc_vbsz1 
     inc a
   //SEG92 [52] if((signed byte) mul8s_compare::a#1!=-(byte/word/signed word/dword/signed dword) $80) goto mul8s_compare::@1 -- vbsz1_neq_vbsc1_then_la1 
     lda #-$80
     cmp a
-    bne b1_from_b10
-    jmp b11
-  //SEG93 mul8s_compare::@11
-  b11:
+    bne b1_from_b8
+    jmp b9
+  //SEG93 mul8s_compare::@9
+  b9:
   //SEG94 [53] (byte*~) print_char_cursor#192 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG95 [54] call print_str 
-  //SEG96 [63] phi from mul8s_compare::@11 to print_str [phi:mul8s_compare::@11->print_str]
-  print_str_from_b11:
-  //SEG97 [63] phi (byte*) print_char_cursor#152 = (byte*~) print_char_cursor#192 [phi:mul8s_compare::@11->print_str#0] -- register_copy 
-  //SEG98 [63] phi (byte*) print_str::str#18 = (const string) mul8s_compare::str [phi:mul8s_compare::@11->print_str#1] -- pbuz1=pbuc1 
+  //SEG96 [63] phi from mul8s_compare::@9 to print_str [phi:mul8s_compare::@9->print_str]
+  print_str_from_b9:
+  //SEG97 [63] phi (byte*) print_char_cursor#152 = (byte*~) print_char_cursor#192 [phi:mul8s_compare::@9->print_str#0] -- register_copy 
+  //SEG98 [63] phi (byte*) print_str::str#18 = (const string) mul8s_compare::str [phi:mul8s_compare::@9->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG99 [55] phi from mul8s_compare::@11 to mul8s_compare::@16 [phi:mul8s_compare::@11->mul8s_compare::@16]
-  b16_from_b11:
-    jmp b16
-  //SEG100 mul8s_compare::@16
-  b16:
+  //SEG99 [55] phi from mul8s_compare::@9 to mul8s_compare::@13 [phi:mul8s_compare::@9->mul8s_compare::@13]
+  b13_from_b9:
+    jmp b13
+  //SEG100 mul8s_compare::@13
+  b13:
   //SEG101 [56] call print_ln 
-  //SEG102 [58] phi from mul8s_compare::@16 to print_ln [phi:mul8s_compare::@16->print_ln]
-  print_ln_from_b16:
-  //SEG103 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8s_compare::@16->print_ln#0] -- register_copy 
-  //SEG104 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#1 [phi:mul8s_compare::@16->print_ln#1] -- register_copy 
+  //SEG102 [58] phi from mul8s_compare::@13 to print_ln [phi:mul8s_compare::@13->print_ln]
+  print_ln_from_b13:
+  //SEG103 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8s_compare::@13->print_ln#0] -- register_copy 
+  //SEG104 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#1 [phi:mul8s_compare::@13->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG105 [57] phi from mul8s_compare::@3 to mul8s_compare::@20 [phi:mul8s_compare::@3->mul8s_compare::@20]
-  b20_from_b3:
-    jmp b20
-  //SEG106 mul8s_compare::@20
-  b20:
-  //SEG107 [39] phi from mul8s_compare::@20 to mul8s_compare::@4 [phi:mul8s_compare::@20->mul8s_compare::@4]
-  b4_from_b20:
-  //SEG108 [39] phi (byte) mul8s_compare::ok#3 = (byte) mul8s_compare::ok#4 [phi:mul8s_compare::@20->mul8s_compare::@4#0] -- register_copy 
+  //SEG105 [57] phi from mul8s_compare::@3 to mul8s_compare::@14 [phi:mul8s_compare::@3->mul8s_compare::@14]
+  b14_from_b3:
+    jmp b14
+  //SEG106 mul8s_compare::@14
+  b14:
+  //SEG107 [39] phi from mul8s_compare::@14 to mul8s_compare::@4 [phi:mul8s_compare::@14->mul8s_compare::@4]
+  b4_from_b14:
+  //SEG108 [39] phi (byte) mul8s_compare::ok#3 = (byte) mul8s_compare::ok#4 [phi:mul8s_compare::@14->mul8s_compare::@4#0] -- register_copy 
     jmp b4
     str: .text "signed multiply results match!@"
 }
@@ -8130,9 +8171,9 @@ print_sword: {
   //SEG199 [116] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b4
-  //SEG200 print_sword::@4
-  b4:
+    jmp b3
+  //SEG200 print_sword::@3
+  b3:
   //SEG201 [97] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#4 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -8143,11 +8184,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG202 [98] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG202 [98] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG203 [98] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#132 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG204 [98] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG203 [98] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#132 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG204 [98] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG205 print_sword::@1
   b1:
@@ -8272,10 +8313,10 @@ print_sbyte: {
   //SEG255 [116] phi (byte) print_char::ch#5 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG256 [124] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
+  //SEG256 [124] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
   b2_from_b3:
-  b2_from_b5:
-  //SEG257 [124] phi (signed byte) print_sbyte::b#5 = (signed byte) print_sbyte::b#3 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  b2_from_b4:
+  //SEG257 [124] phi (signed byte) print_sbyte::b#5 = (signed byte) print_sbyte::b#3 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
     jmp b2
   //SEG258 print_sbyte::@2
   b2:
@@ -8303,16 +8344,16 @@ print_sbyte: {
   //SEG271 [116] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b5
-  //SEG272 print_sbyte::@5
-  b5:
+    jmp b4
+  //SEG272 print_sbyte::@4
+  b4:
   //SEG273 [130] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#3 -- vbsxx=_neg_vbsxx 
     txa
     eor #$ff
     clc
     adc #1
     tax
-    jmp b2_from_b5
+    jmp b2_from_b4
 }
 //SEG274 mul8s
 // Multiply of two signed bytes to a signed word
@@ -8333,14 +8374,14 @@ mul8s: {
   //SEG280 [147] phi (byte) mul8u::b#2 = (byte~) mul8u::b#3 [phi:mul8s->mul8u#1] -- register_copy 
     jsr mul8u
   //SEG281 [134] (word) mul8u::return#2 ← (word) mul8u::res#2
-    jmp b6
-  //SEG282 mul8s::@6
-  b6:
+    jmp b5
+  //SEG282 mul8s::@5
+  b5:
   //SEG283 [135] (word) mul8s::m#0 ← (word) mul8u::return#2
   //SEG284 [136] if((signed byte) mul8s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s::@1 -- vbsz1_ge_0_then_la1 
     lda a
     cmp #0
-    bpl b1_from_b6
+    bpl b1_from_b5
     jmp b3
   //SEG285 mul8s::@3
   b3:
@@ -8352,10 +8393,10 @@ mul8s: {
     sbc $ff
   //SEG288 [139] (word) mul8s::m#1 ← (word) mul8s::m#0 hi= (byte~) mul8s::$16 -- vwuz1=vwuz1_sethi_vbuaa 
     sta m+1
-  //SEG289 [140] phi from mul8s::@3 mul8s::@6 to mul8s::@1 [phi:mul8s::@3/mul8s::@6->mul8s::@1]
+  //SEG289 [140] phi from mul8s::@3 mul8s::@5 to mul8s::@1 [phi:mul8s::@3/mul8s::@5->mul8s::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG290 [140] phi (word) mul8s::m#5 = (word) mul8s::m#1 [phi:mul8s::@3/mul8s::@6->mul8s::@1#0] -- register_copy 
+  b1_from_b5:
+  //SEG290 [140] phi (word) mul8s::m#5 = (word) mul8s::m#1 [phi:mul8s::@3/mul8s::@5->mul8s::@1#0] -- register_copy 
     jmp b1
   //SEG291 mul8s::@1
   b1:
@@ -8421,12 +8462,12 @@ mul8u: {
   //SEG313 [152] (byte~) mul8u::$1 ← (byte) mul8u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG314 [153] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG314 [153] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8_from_b2
-    jmp b6
-  //SEG315 mul8u::@6
-  b6:
+    beq b4_from_b2
+    jmp b3
+  //SEG315 mul8u::@3
+  b3:
   //SEG316 [154] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -8435,13 +8476,13 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG317 [155] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  b8_from_b2:
-  b8_from_b6:
-  //SEG318 [155] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-    jmp b8
-  //SEG319 mul8u::@8
-  b8:
+  //SEG317 [155] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  b4_from_b2:
+  b4_from_b3:
+  //SEG318 [155] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+    jmp b4
+  //SEG319 mul8u::@4
+  b4:
   //SEG320 [156] (byte) mul8u::a#0 ← (byte) mul8u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -8449,11 +8490,11 @@ mul8u: {
   //SEG321 [157] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG322 [149] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  b1_from_b8:
-  //SEG323 [149] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG324 [149] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG325 [149] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG322 [149] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  b1_from_b4:
+  //SEG323 [149] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG324 [149] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG325 [149] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG326 mulf8s
@@ -8470,17 +8511,17 @@ mulf8s: {
   mulf8u_prepare_from_mulf8s_prepare1:
   //SEG331 [186] phi (byte) mulf8u_prepare::a#2 = (byte~) mulf8u_prepare::a#3 [phi:mulf8s::mulf8s_prepare1->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-    jmp b2
-  //SEG332 mulf8s::@2
-  b2:
+    jmp b1
+  //SEG332 mulf8s::@1
+  b1:
   //SEG333 [161] (signed byte) mulf8s_prepared::b#0 ← (signed byte) mulf8s::b#0 -- vbsz1=vbsxx 
     stx mulf8s_prepared.b
   //SEG334 [162] call mulf8s_prepared 
     jsr mulf8s_prepared
   //SEG335 [163] (signed word) mulf8s_prepared::return#2 ← (signed word)(word) mulf8s_prepared::m#4
-    jmp b4
-  //SEG336 mulf8s::@4
-  b4:
+    jmp b2
+  //SEG336 mulf8s::@2
+  b2:
   //SEG337 [164] (signed word) mulf8s::return#0 ← (signed word) mulf8s_prepared::return#2
     jmp breturn
   //SEG338 mulf8s::@return
@@ -8505,14 +8546,14 @@ mulf8s_prepared: {
   //SEG344 [181] phi (byte) mulf8u_prepared::b#2 = (byte~) mulf8u_prepared::b#3 [phi:mulf8s_prepared->mulf8u_prepared#0] -- register_copy 
     jsr mulf8u_prepared
   //SEG345 [168] (word) mulf8u_prepared::return#3 ← (word) mulf8u_prepared::return#0
-    jmp b6
-  //SEG346 mulf8s_prepared::@6
-  b6:
+    jmp b5
+  //SEG346 mulf8s_prepared::@5
+  b5:
   //SEG347 [169] (word) mulf8s_prepared::m#0 ← (word) mulf8u_prepared::return#3
   //SEG348 [170] if(*((const signed byte*) mulf8s_prepared::memA#0)>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@1 -- _deref_pbsc1_ge_0_then_la1 
     lda memA
     cmp #0
-    bpl b1_from_b6
+    bpl b1_from_b5
     jmp b3
   //SEG349 mulf8s_prepared::@3
   b3:
@@ -8523,10 +8564,10 @@ mulf8s_prepared: {
     sbc b
   //SEG352 [173] (word) mulf8s_prepared::m#1 ← (word) mulf8s_prepared::m#0 hi= (byte~) mulf8s_prepared::$15 -- vwuz1=vwuz1_sethi_vbuaa 
     sta m+1
-  //SEG353 [174] phi from mulf8s_prepared::@3 mulf8s_prepared::@6 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1]
+  //SEG353 [174] phi from mulf8s_prepared::@3 mulf8s_prepared::@5 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1]
   b1_from_b3:
-  b1_from_b6:
-  //SEG354 [174] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1#0] -- register_copy 
+  b1_from_b5:
+  //SEG354 [174] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1#0] -- register_copy 
     jmp b1
   //SEG355 mulf8s_prepared::@1
   b1:
@@ -8619,34 +8660,34 @@ muls8s: {
     .label m = 8
     .label return = 8
     .label a = 2
-  //SEG378 [190] if((signed byte) muls8s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@10 -- vbsz1_lt_0_then_la1 
+  //SEG378 [190] if((signed byte) muls8s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@4 -- vbsz1_lt_0_then_la1 
     lda a
-    bmi b10_from_muls8s
-    jmp b4
-  //SEG379 muls8s::@4
-  b4:
-  //SEG380 [191] if((signed byte) muls8s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@3 -- vbsz1_le_0_then_la1 
+    bmi b4_from_muls8s
+    jmp b2
+  //SEG379 muls8s::@2
+  b2:
+  //SEG380 [191] if((signed byte) muls8s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@1 -- vbsz1_le_0_then_la1 
     lda a
     cmp #1
-    bmi b3_from_b4
-  //SEG381 [192] phi from muls8s::@4 to muls8s::@8 [phi:muls8s::@4->muls8s::@8]
-  b8_from_b4:
-  //SEG382 [192] phi (signed byte) muls8s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@4->muls8s::@8#0] -- vbsyy=vbuc1 
+    bmi b1_from_b2
+  //SEG381 [192] phi from muls8s::@2 to muls8s::@3 [phi:muls8s::@2->muls8s::@3]
+  b3_from_b2:
+  //SEG382 [192] phi (signed byte) muls8s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@2->muls8s::@3#0] -- vbsyy=vbuc1 
     lda #0
     tay
-  //SEG383 [192] phi (signed word) muls8s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@4->muls8s::@8#1] -- vwsz1=vbuc1 
+  //SEG383 [192] phi (signed word) muls8s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@2->muls8s::@3#1] -- vwsz1=vbuc1 
     lda #0
     sta m
     lda #0
     sta m+1
-    jmp b8
-  //SEG384 [192] phi from muls8s::@8 to muls8s::@8 [phi:muls8s::@8->muls8s::@8]
-  b8_from_b8:
-  //SEG385 [192] phi (signed byte) muls8s::j#2 = (signed byte) muls8s::j#1 [phi:muls8s::@8->muls8s::@8#0] -- register_copy 
-  //SEG386 [192] phi (signed word) muls8s::m#3 = (signed word) muls8s::m#1 [phi:muls8s::@8->muls8s::@8#1] -- register_copy 
-    jmp b8
-  //SEG387 muls8s::@8
-  b8:
+    jmp b3
+  //SEG384 [192] phi from muls8s::@3 to muls8s::@3 [phi:muls8s::@3->muls8s::@3]
+  b3_from_b3:
+  //SEG385 [192] phi (signed byte) muls8s::j#2 = (signed byte) muls8s::j#1 [phi:muls8s::@3->muls8s::@3#0] -- register_copy 
+  //SEG386 [192] phi (signed word) muls8s::m#3 = (signed word) muls8s::m#1 [phi:muls8s::@3->muls8s::@3#1] -- register_copy 
+    jmp b3
+  //SEG387 muls8s::@3
+  b3:
   //SEG388 [193] (signed word) muls8s::m#1 ← (signed word) muls8s::m#3 + (signed byte) muls8s::b#0 -- vwsz1=vwsz1_plus_vbsxx 
     txa
     sta $fe
@@ -8664,47 +8705,47 @@ muls8s: {
     sta m+1
   //SEG389 [194] (signed byte) muls8s::j#1 ← ++ (signed byte) muls8s::j#2 -- vbsyy=_inc_vbsyy 
     iny
-  //SEG390 [195] if((signed byte) muls8s::j#1!=(signed byte) muls8s::a#0) goto muls8s::@8 -- vbsyy_neq_vbsz1_then_la1 
+  //SEG390 [195] if((signed byte) muls8s::j#1!=(signed byte) muls8s::a#0) goto muls8s::@3 -- vbsyy_neq_vbsz1_then_la1 
     cpy a
-    bne b8_from_b8
-  //SEG391 [196] phi from muls8s::@10 muls8s::@8 to muls8s::@3 [phi:muls8s::@10/muls8s::@8->muls8s::@3]
-  b3_from_b10:
-  b3_from_b8:
-  //SEG392 [196] phi (signed word) muls8s::return#0 = (signed word) muls8s::m#2 [phi:muls8s::@10/muls8s::@8->muls8s::@3#0] -- register_copy 
-    jmp b3
-  //SEG393 [196] phi from muls8s::@4 to muls8s::@3 [phi:muls8s::@4->muls8s::@3]
-  b3_from_b4:
-  //SEG394 [196] phi (signed word) muls8s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@4->muls8s::@3#0] -- vwsz1=vbuc1 
+    bne b3_from_b3
+  //SEG391 [196] phi from muls8s::@3 muls8s::@4 to muls8s::@1 [phi:muls8s::@3/muls8s::@4->muls8s::@1]
+  b1_from_b3:
+  b1_from_b4:
+  //SEG392 [196] phi (signed word) muls8s::return#0 = (signed word) muls8s::m#1 [phi:muls8s::@3/muls8s::@4->muls8s::@1#0] -- register_copy 
+    jmp b1
+  //SEG393 [196] phi from muls8s::@2 to muls8s::@1 [phi:muls8s::@2->muls8s::@1]
+  b1_from_b2:
+  //SEG394 [196] phi (signed word) muls8s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@2->muls8s::@1#0] -- vwsz1=vbuc1 
     lda #0
     sta return
     lda #0
     sta return+1
-    jmp b3
-  //SEG395 muls8s::@3
-  b3:
+    jmp b1
+  //SEG395 muls8s::@1
+  b1:
     jmp breturn
   //SEG396 muls8s::@return
   breturn:
   //SEG397 [197] return 
     rts
-  //SEG398 [198] phi from muls8s to muls8s::@10 [phi:muls8s->muls8s::@10]
-  b10_from_muls8s:
-  //SEG399 [198] phi (signed byte) muls8s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@10#0] -- vbsyy=vbuc1 
+  //SEG398 [198] phi from muls8s to muls8s::@4 [phi:muls8s->muls8s::@4]
+  b4_from_muls8s:
+  //SEG399 [198] phi (signed byte) muls8s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@4#0] -- vbsyy=vbuc1 
     lda #0
     tay
-  //SEG400 [198] phi (signed word) muls8s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@10#1] -- vwsz1=vbuc1 
+  //SEG400 [198] phi (signed word) muls8s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@4#1] -- vwsz1=vbuc1 
     lda #0
     sta m
     lda #0
     sta m+1
-    jmp b10
-  //SEG401 [198] phi from muls8s::@10 to muls8s::@10 [phi:muls8s::@10->muls8s::@10]
-  b10_from_b10:
-  //SEG402 [198] phi (signed byte) muls8s::i#2 = (signed byte) muls8s::i#1 [phi:muls8s::@10->muls8s::@10#0] -- register_copy 
-  //SEG403 [198] phi (signed word) muls8s::m#5 = (signed word) muls8s::m#2 [phi:muls8s::@10->muls8s::@10#1] -- register_copy 
-    jmp b10
-  //SEG404 muls8s::@10
-  b10:
+    jmp b4
+  //SEG401 [198] phi from muls8s::@4 to muls8s::@4 [phi:muls8s::@4->muls8s::@4]
+  b4_from_b4:
+  //SEG402 [198] phi (signed byte) muls8s::i#2 = (signed byte) muls8s::i#1 [phi:muls8s::@4->muls8s::@4#0] -- register_copy 
+  //SEG403 [198] phi (signed word) muls8s::m#5 = (signed word) muls8s::m#2 [phi:muls8s::@4->muls8s::@4#1] -- register_copy 
+    jmp b4
+  //SEG404 muls8s::@4
+  b4:
   //SEG405 [199] (signed word) muls8s::m#2 ← (signed word) muls8s::m#5 - (signed byte) muls8s::b#0 -- vwsz1=vwsz1_minus_vbsxx 
     txa
     sta $fe
@@ -8722,10 +8763,10 @@ muls8s: {
     sta m+1
   //SEG406 [200] (signed byte) muls8s::i#1 ← -- (signed byte) muls8s::i#2 -- vbsyy=_dec_vbsyy 
     dey
-  //SEG407 [201] if((signed byte) muls8s::i#1!=(signed byte) muls8s::a#0) goto muls8s::@10 -- vbsyy_neq_vbsz1_then_la1 
+  //SEG407 [201] if((signed byte) muls8s::i#1!=(signed byte) muls8s::a#0) goto muls8s::@4 -- vbsyy_neq_vbsz1_then_la1 
     cpy a
-    bne b10_from_b10
-    jmp b3_from_b10
+    bne b4_from_b4
+    jmp b1_from_b4
 }
 //SEG408 mul8u_compare
 // Perform all possible byte multiplications (slow and fast) and compare the results
@@ -8741,9 +8782,9 @@ mul8u_compare: {
     lda #0
     sta a
     jmp b1
-  //SEG411 [203] phi from mul8u_compare::@10 to mul8u_compare::@1 [phi:mul8u_compare::@10->mul8u_compare::@1]
-  b1_from_b10:
-  //SEG412 [203] phi (byte) mul8u_compare::a#7 = (byte) mul8u_compare::a#1 [phi:mul8u_compare::@10->mul8u_compare::@1#0] -- register_copy 
+  //SEG411 [203] phi from mul8u_compare::@8 to mul8u_compare::@1 [phi:mul8u_compare::@8->mul8u_compare::@1]
+  b1_from_b8:
+  //SEG412 [203] phi (byte) mul8u_compare::a#7 = (byte) mul8u_compare::a#1 [phi:mul8u_compare::@8->mul8u_compare::@1#0] -- register_copy 
     jmp b1
   //SEG413 mul8u_compare::@1
   b1:
@@ -8765,9 +8806,9 @@ mul8u_compare: {
   //SEG421 [207] call muls8u 
     jsr muls8u
   //SEG422 [208] (word) muls8u::return#2 ← (word) muls8u::return#0
-    jmp b12
-  //SEG423 mul8u_compare::@12
-  b12:
+    jmp b10
+  //SEG423 mul8u_compare::@10
+  b10:
   //SEG424 [209] (word) mul8u_compare::ms#0 ← (word) muls8u::return#2
   //SEG425 [210] (byte) mulf8u::a#0 ← (byte) mul8u_compare::a#7 -- vbuaa=vbuz1 
     lda a
@@ -8776,24 +8817,24 @@ mul8u_compare: {
   //SEG427 [212] call mulf8u 
     jsr mulf8u
   //SEG428 [213] (word) mulf8u::return#2 ← (word) mulf8u::return#0
-    jmp b13
-  //SEG429 mul8u_compare::@13
-  b13:
+    jmp b11
+  //SEG429 mul8u_compare::@11
+  b11:
   //SEG430 [214] (word) mul8u_compare::mf#0 ← (word) mulf8u::return#2
   //SEG431 [215] (byte) mul8u::a#2 ← (byte) mul8u_compare::a#7 -- vbuxx=vbuz1 
     ldx a
   //SEG432 [216] (byte) mul8u::b#1 ← (byte) mul8u_compare::b#10 -- vbuaa=vbuz1 
     lda b
   //SEG433 [217] call mul8u 
-  //SEG434 [147] phi from mul8u_compare::@13 to mul8u [phi:mul8u_compare::@13->mul8u]
-  mul8u_from_b13:
-  //SEG435 [147] phi (byte) mul8u::a#6 = (byte) mul8u::a#2 [phi:mul8u_compare::@13->mul8u#0] -- register_copy 
-  //SEG436 [147] phi (byte) mul8u::b#2 = (byte) mul8u::b#1 [phi:mul8u_compare::@13->mul8u#1] -- register_copy 
+  //SEG434 [147] phi from mul8u_compare::@11 to mul8u [phi:mul8u_compare::@11->mul8u]
+  mul8u_from_b11:
+  //SEG435 [147] phi (byte) mul8u::a#6 = (byte) mul8u::a#2 [phi:mul8u_compare::@11->mul8u#0] -- register_copy 
+  //SEG436 [147] phi (byte) mul8u::b#2 = (byte) mul8u::b#1 [phi:mul8u_compare::@11->mul8u#1] -- register_copy 
     jsr mul8u
   //SEG437 [218] (word) mul8u::return#3 ← (word) mul8u::res#2
-    jmp b14
-  //SEG438 mul8u_compare::@14
-  b14:
+    jmp b12
+  //SEG438 mul8u_compare::@12
+  b12:
   //SEG439 [219] (word) mul8u_compare::mn#0 ← (word) mul8u::return#3
   //SEG440 [220] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mf#0) goto mul8u_compare::@3 -- vwuz1_eq_vwuz2_then_la1 
     lda ms
@@ -8801,10 +8842,10 @@ mul8u_compare: {
     bne !+
     lda ms+1
     cmp mf+1
-    beq b3_from_b14
+    beq b3_from_b12
   !:
-  //SEG441 [221] phi from mul8u_compare::@14 to mul8u_compare::@6 [phi:mul8u_compare::@14->mul8u_compare::@6]
-  b6_from_b14:
+  //SEG441 [221] phi from mul8u_compare::@12 to mul8u_compare::@6 [phi:mul8u_compare::@12->mul8u_compare::@6]
+  b6_from_b12:
     jmp b6
   //SEG442 mul8u_compare::@6
   b6:
@@ -8813,20 +8854,20 @@ mul8u_compare: {
   //SEG444 [222] phi (byte) mul8u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mul8u_compare::@6->mul8u_compare::@3#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b3
-  //SEG445 [222] phi from mul8u_compare::@14 to mul8u_compare::@3 [phi:mul8u_compare::@14->mul8u_compare::@3]
-  b3_from_b14:
-  //SEG446 [222] phi (byte) mul8u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8u_compare::@14->mul8u_compare::@3#0] -- vbuxx=vbuc1 
+  //SEG445 [222] phi from mul8u_compare::@12 to mul8u_compare::@3 [phi:mul8u_compare::@12->mul8u_compare::@3]
+  b3_from_b12:
+  //SEG446 [222] phi (byte) mul8u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8u_compare::@12->mul8u_compare::@3#0] -- vbuxx=vbuc1 
     ldx #1
     jmp b3
   //SEG447 mul8u_compare::@3
   b3:
-  //SEG448 [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@20 -- vwuz1_eq_vwuz2_then_la1 
+  //SEG448 [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@14 -- vwuz1_eq_vwuz2_then_la1 
     lda ms
     cmp mn
     bne !+
     lda ms+1
     cmp mn+1
-    beq b20_from_b3
+    beq b14_from_b3
   !:
   //SEG449 [224] phi from mul8u_compare::@3 to mul8u_compare::@4 [phi:mul8u_compare::@3->mul8u_compare::@4]
   b4_from_b3:
@@ -8838,9 +8879,9 @@ mul8u_compare: {
   //SEG452 [225] if((byte) mul8u_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u_compare::@5 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b5
-    jmp b8
-  //SEG453 mul8u_compare::@8
-  b8:
+    jmp b7
+  //SEG453 mul8u_compare::@7
+  b7:
   //SEG454 [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -8851,8 +8892,8 @@ mul8u_compare: {
   //SEG458 [230] (word) mul8u_error::mn#0 ← (word) mul8u_compare::mn#0
   //SEG459 [231] (word) mul8u_error::mf#0 ← (word) mul8u_compare::mf#0
   //SEG460 [232] call mul8u_error 
-  //SEG461 [243] phi from mul8u_compare::@8 to mul8u_error [phi:mul8u_compare::@8->mul8u_error]
-  mul8u_error_from_b8:
+  //SEG461 [243] phi from mul8u_compare::@7 to mul8u_error [phi:mul8u_compare::@7->mul8u_error]
+  mul8u_error_from_b7:
     jsr mul8u_error
     jmp breturn
   //SEG462 mul8u_compare::@return
@@ -8867,50 +8908,50 @@ mul8u_compare: {
     lda b
     cmp #0
     bne b2_from_b5
-    jmp b10
-  //SEG467 mul8u_compare::@10
-  b10:
+    jmp b8
+  //SEG467 mul8u_compare::@8
+  b8:
   //SEG468 [236] (byte) mul8u_compare::a#1 ← ++ (byte) mul8u_compare::a#7 -- vbuz1=_inc_vbuz1 
     inc a
   //SEG469 [237] if((byte) mul8u_compare::a#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u_compare::@1 -- vbuz1_neq_0_then_la1 
     lda a
     cmp #0
-    bne b1_from_b10
-  //SEG470 [238] phi from mul8u_compare::@10 to mul8u_compare::@11 [phi:mul8u_compare::@10->mul8u_compare::@11]
-  b11_from_b10:
-    jmp b11
-  //SEG471 mul8u_compare::@11
-  b11:
+    bne b1_from_b8
+  //SEG470 [238] phi from mul8u_compare::@8 to mul8u_compare::@9 [phi:mul8u_compare::@8->mul8u_compare::@9]
+  b9_from_b8:
+    jmp b9
+  //SEG471 mul8u_compare::@9
+  b9:
   //SEG472 [239] call print_str 
-  //SEG473 [63] phi from mul8u_compare::@11 to print_str [phi:mul8u_compare::@11->print_str]
-  print_str_from_b11:
-  //SEG474 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#31 [phi:mul8u_compare::@11->print_str#0] -- register_copy 
-  //SEG475 [63] phi (byte*) print_str::str#18 = (const string) mul8u_compare::str [phi:mul8u_compare::@11->print_str#1] -- pbuz1=pbuc1 
+  //SEG473 [63] phi from mul8u_compare::@9 to print_str [phi:mul8u_compare::@9->print_str]
+  print_str_from_b9:
+  //SEG474 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#31 [phi:mul8u_compare::@9->print_str#0] -- register_copy 
+  //SEG475 [63] phi (byte*) print_str::str#18 = (const string) mul8u_compare::str [phi:mul8u_compare::@9->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG476 [240] phi from mul8u_compare::@11 to mul8u_compare::@16 [phi:mul8u_compare::@11->mul8u_compare::@16]
-  b16_from_b11:
-    jmp b16
-  //SEG477 mul8u_compare::@16
-  b16:
+  //SEG476 [240] phi from mul8u_compare::@9 to mul8u_compare::@13 [phi:mul8u_compare::@9->mul8u_compare::@13]
+  b13_from_b9:
+    jmp b13
+  //SEG477 mul8u_compare::@13
+  b13:
   //SEG478 [241] call print_ln 
-  //SEG479 [58] phi from mul8u_compare::@16 to print_ln [phi:mul8u_compare::@16->print_ln]
-  print_ln_from_b16:
-  //SEG480 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8u_compare::@16->print_ln#0] -- register_copy 
-  //SEG481 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#10 [phi:mul8u_compare::@16->print_ln#1] -- register_copy 
+  //SEG479 [58] phi from mul8u_compare::@13 to print_ln [phi:mul8u_compare::@13->print_ln]
+  print_ln_from_b13:
+  //SEG480 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8u_compare::@13->print_ln#0] -- register_copy 
+  //SEG481 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#10 [phi:mul8u_compare::@13->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG482 [242] phi from mul8u_compare::@3 to mul8u_compare::@20 [phi:mul8u_compare::@3->mul8u_compare::@20]
-  b20_from_b3:
-    jmp b20
-  //SEG483 mul8u_compare::@20
-  b20:
-  //SEG484 [224] phi from mul8u_compare::@20 to mul8u_compare::@4 [phi:mul8u_compare::@20->mul8u_compare::@4]
-  b4_from_b20:
-  //SEG485 [224] phi (byte) mul8u_compare::ok#3 = (byte) mul8u_compare::ok#4 [phi:mul8u_compare::@20->mul8u_compare::@4#0] -- register_copy 
+  //SEG482 [242] phi from mul8u_compare::@3 to mul8u_compare::@14 [phi:mul8u_compare::@3->mul8u_compare::@14]
+  b14_from_b3:
+    jmp b14
+  //SEG483 mul8u_compare::@14
+  b14:
+  //SEG484 [224] phi from mul8u_compare::@14 to mul8u_compare::@4 [phi:mul8u_compare::@14->mul8u_compare::@4]
+  b4_from_b14:
+  //SEG485 [224] phi (byte) mul8u_compare::ok#3 = (byte) mul8u_compare::ok#4 [phi:mul8u_compare::@14->mul8u_compare::@4#0] -- register_copy 
     jmp b4
     str: .text "multiply results match!@"
 }
@@ -9079,19 +9120,19 @@ mulf8u: {
   mulf8u_prepare_from_mulf8u:
   //SEG557 [186] phi (byte) mulf8u_prepare::a#2 = (byte) mulf8u_prepare::a#0 [phi:mulf8u->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-    jmp b2
-  //SEG558 mulf8u::@2
-  b2:
+    jmp b1
+  //SEG558 mulf8u::@1
+  b1:
   //SEG559 [268] (byte) mulf8u_prepared::b#0 ← (byte) mulf8u::b#0
   //SEG560 [269] call mulf8u_prepared 
-  //SEG561 [181] phi from mulf8u::@2 to mulf8u_prepared [phi:mulf8u::@2->mulf8u_prepared]
-  mulf8u_prepared_from_b2:
-  //SEG562 [181] phi (byte) mulf8u_prepared::b#2 = (byte) mulf8u_prepared::b#0 [phi:mulf8u::@2->mulf8u_prepared#0] -- register_copy 
+  //SEG561 [181] phi from mulf8u::@1 to mulf8u_prepared [phi:mulf8u::@1->mulf8u_prepared]
+  mulf8u_prepared_from_b1:
+  //SEG562 [181] phi (byte) mulf8u_prepared::b#2 = (byte) mulf8u_prepared::b#0 [phi:mulf8u::@1->mulf8u_prepared#0] -- register_copy 
     jsr mulf8u_prepared
   //SEG563 [270] (word) mulf8u_prepared::return#2 ← (word) mulf8u_prepared::return#0
-    jmp b3
-  //SEG564 mulf8u::@3
-  b3:
+    jmp b2
+  //SEG564 mulf8u::@2
+  b2:
   //SEG565 [271] (word) mulf8u::return#0 ← (word) mulf8u_prepared::return#2
     jmp breturn
   //SEG566 mulf8u::@return
@@ -9111,23 +9152,23 @@ muls8u: {
     lda a
     cmp #0
     beq b1_from_muls8u
-  //SEG570 [274] phi from muls8u to muls8u::@4 [phi:muls8u->muls8u::@4]
-  b4_from_muls8u:
-  //SEG571 [274] phi (byte) muls8u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@4#0] -- vbuyy=vbuc1 
+  //SEG570 [274] phi from muls8u to muls8u::@2 [phi:muls8u->muls8u::@2]
+  b2_from_muls8u:
+  //SEG571 [274] phi (byte) muls8u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@2#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG572 [274] phi (word) muls8u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@4#1] -- vwuz1=vbuc1 
+  //SEG572 [274] phi (word) muls8u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@2#1] -- vwuz1=vbuc1 
     lda #0
     sta m
     lda #0
     sta m+1
-    jmp b4
-  //SEG573 [274] phi from muls8u::@4 to muls8u::@4 [phi:muls8u::@4->muls8u::@4]
-  b4_from_b4:
-  //SEG574 [274] phi (byte) muls8u::i#2 = (byte) muls8u::i#1 [phi:muls8u::@4->muls8u::@4#0] -- register_copy 
-  //SEG575 [274] phi (word) muls8u::m#3 = (word) muls8u::m#1 [phi:muls8u::@4->muls8u::@4#1] -- register_copy 
-    jmp b4
-  //SEG576 muls8u::@4
-  b4:
+    jmp b2
+  //SEG573 [274] phi from muls8u::@2 to muls8u::@2 [phi:muls8u::@2->muls8u::@2]
+  b2_from_b2:
+  //SEG574 [274] phi (byte) muls8u::i#2 = (byte) muls8u::i#1 [phi:muls8u::@2->muls8u::@2#0] -- register_copy 
+  //SEG575 [274] phi (word) muls8u::m#3 = (word) muls8u::m#1 [phi:muls8u::@2->muls8u::@2#1] -- register_copy 
+    jmp b2
+  //SEG576 muls8u::@2
+  b2:
   //SEG577 [275] (word) muls8u::m#1 ← (word) muls8u::m#3 + (byte) muls8u::b#0 -- vwuz1=vwuz1_plus_vbuxx 
     txa
     clc
@@ -9138,12 +9179,12 @@ muls8u: {
   !:
   //SEG578 [276] (byte) muls8u::i#1 ← ++ (byte) muls8u::i#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG579 [277] if((byte) muls8u::i#1!=(byte) muls8u::a#0) goto muls8u::@4 -- vbuyy_neq_vbuz1_then_la1 
+  //SEG579 [277] if((byte) muls8u::i#1!=(byte) muls8u::a#0) goto muls8u::@2 -- vbuyy_neq_vbuz1_then_la1 
     cpy a
-    bne b4_from_b4
-  //SEG580 [278] phi from muls8u::@4 to muls8u::@1 [phi:muls8u::@4->muls8u::@1]
-  b1_from_b4:
-  //SEG581 [278] phi (word) muls8u::return#0 = (word) muls8u::m#1 [phi:muls8u::@4->muls8u::@1#0] -- register_copy 
+    bne b2_from_b2
+  //SEG580 [278] phi from muls8u::@2 to muls8u::@1 [phi:muls8u::@2->muls8u::@1]
+  b1_from_b2:
+  //SEG581 [278] phi (word) muls8u::return#0 = (word) muls8u::m#1 [phi:muls8u::@2->muls8u::@1#0] -- register_copy 
     jmp b1
   //SEG582 [278] phi from muls8u to muls8u::@1 [phi:muls8u->muls8u::@1]
   b1_from_muls8u:
@@ -9213,53 +9254,53 @@ mulf_tables_cmp: {
     lda #>str
     sta print_str.str+1
     jsr print_str
-    jmp b6
-  //SEG602 mulf_tables_cmp::@6
-  b6:
+    jmp b5
+  //SEG602 mulf_tables_cmp::@5
+  b5:
   //SEG603 [285] (word~) print_word::w#11 ← (word)(byte*) mulf_tables_cmp::asm_sqr#2
   //SEG604 [286] call print_word 
-  //SEG605 [102] phi from mulf_tables_cmp::@6 to print_word [phi:mulf_tables_cmp::@6->print_word]
-  print_word_from_b6:
-  //SEG606 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@6->print_word#0] -- register_copy 
-  //SEG607 [102] phi (word) print_word::w#6 = (word~) print_word::w#11 [phi:mulf_tables_cmp::@6->print_word#1] -- register_copy 
+  //SEG605 [102] phi from mulf_tables_cmp::@5 to print_word [phi:mulf_tables_cmp::@5->print_word]
+  print_word_from_b5:
+  //SEG606 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@5->print_word#0] -- register_copy 
+  //SEG607 [102] phi (word) print_word::w#6 = (word~) print_word::w#11 [phi:mulf_tables_cmp::@5->print_word#1] -- register_copy 
     jsr print_word
-  //SEG608 [287] phi from mulf_tables_cmp::@6 to mulf_tables_cmp::@7 [phi:mulf_tables_cmp::@6->mulf_tables_cmp::@7]
-  b7_from_b6:
-    jmp b7
-  //SEG609 mulf_tables_cmp::@7
-  b7:
+  //SEG608 [287] phi from mulf_tables_cmp::@5 to mulf_tables_cmp::@6 [phi:mulf_tables_cmp::@5->mulf_tables_cmp::@6]
+  b6_from_b5:
+    jmp b6
+  //SEG609 mulf_tables_cmp::@6
+  b6:
   //SEG610 [288] call print_str 
-  //SEG611 [63] phi from mulf_tables_cmp::@7 to print_str [phi:mulf_tables_cmp::@7->print_str]
-  print_str_from_b7:
-  //SEG612 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@7->print_str#0] -- register_copy 
-  //SEG613 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str1 [phi:mulf_tables_cmp::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG611 [63] phi from mulf_tables_cmp::@6 to print_str [phi:mulf_tables_cmp::@6->print_str]
+  print_str_from_b6:
+  //SEG612 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@6->print_str#0] -- register_copy 
+  //SEG613 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str1 [phi:mulf_tables_cmp::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-    jmp b8
-  //SEG614 mulf_tables_cmp::@8
-  b8:
+    jmp b7
+  //SEG614 mulf_tables_cmp::@7
+  b7:
   //SEG615 [289] (word~) print_word::w#12 ← (word)(byte*) mulf_tables_cmp::kc_sqr#2 -- vwuz1=vwuz2 
     lda kc_sqr
     sta print_word.w
     lda kc_sqr+1
     sta print_word.w+1
   //SEG616 [290] call print_word 
-  //SEG617 [102] phi from mulf_tables_cmp::@8 to print_word [phi:mulf_tables_cmp::@8->print_word]
-  print_word_from_b8:
-  //SEG618 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@8->print_word#0] -- register_copy 
-  //SEG619 [102] phi (word) print_word::w#6 = (word~) print_word::w#12 [phi:mulf_tables_cmp::@8->print_word#1] -- register_copy 
+  //SEG617 [102] phi from mulf_tables_cmp::@7 to print_word [phi:mulf_tables_cmp::@7->print_word]
+  print_word_from_b7:
+  //SEG618 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@7->print_word#0] -- register_copy 
+  //SEG619 [102] phi (word) print_word::w#6 = (word~) print_word::w#12 [phi:mulf_tables_cmp::@7->print_word#1] -- register_copy 
     jsr print_word
-  //SEG620 [291] phi from mulf_tables_cmp::@8 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return]
-  breturn_from_b8:
-  //SEG621 [291] phi (byte*) print_line_cursor#10 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#0] -- pbuz1=pbuc1 
+  //SEG620 [291] phi from mulf_tables_cmp::@7 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@7->mulf_tables_cmp::@return]
+  breturn_from_b7:
+  //SEG621 [291] phi (byte*) print_line_cursor#10 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@7->mulf_tables_cmp::@return#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG622 [291] phi (byte*) print_char_cursor#31 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#1] -- register_copy 
+  //SEG622 [291] phi (byte*) print_char_cursor#31 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@7->mulf_tables_cmp::@return#1] -- register_copy 
     jmp breturn
   //SEG623 mulf_tables_cmp::@return
   breturn:
@@ -9286,35 +9327,35 @@ mulf_tables_cmp: {
     cmp #<mulf_sqr1_lo+$200*4
     bcc b1_from_b2
   !:
-  //SEG629 [296] phi from mulf_tables_cmp::@2 to mulf_tables_cmp::@5 [phi:mulf_tables_cmp::@2->mulf_tables_cmp::@5]
-  b5_from_b2:
-    jmp b5
-  //SEG630 mulf_tables_cmp::@5
-  b5:
+  //SEG629 [296] phi from mulf_tables_cmp::@2 to mulf_tables_cmp::@4 [phi:mulf_tables_cmp::@2->mulf_tables_cmp::@4]
+  b4_from_b2:
+    jmp b4
+  //SEG630 mulf_tables_cmp::@4
+  b4:
   //SEG631 [297] call print_str 
-  //SEG632 [63] phi from mulf_tables_cmp::@5 to print_str [phi:mulf_tables_cmp::@5->print_str]
-  print_str_from_b5:
-  //SEG633 [63] phi (byte*) print_char_cursor#152 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@5->print_str#0] -- pbuz1=pbuc1 
+  //SEG632 [63] phi from mulf_tables_cmp::@4 to print_str [phi:mulf_tables_cmp::@4->print_str]
+  print_str_from_b4:
+  //SEG633 [63] phi (byte*) print_char_cursor#152 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@4->print_str#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG634 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str2 [phi:mulf_tables_cmp::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG634 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str2 [phi:mulf_tables_cmp::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-  //SEG635 [298] phi from mulf_tables_cmp::@5 to mulf_tables_cmp::@10 [phi:mulf_tables_cmp::@5->mulf_tables_cmp::@10]
-  b10_from_b5:
-    jmp b10
-  //SEG636 mulf_tables_cmp::@10
-  b10:
+  //SEG635 [298] phi from mulf_tables_cmp::@4 to mulf_tables_cmp::@8 [phi:mulf_tables_cmp::@4->mulf_tables_cmp::@8]
+  b8_from_b4:
+    jmp b8
+  //SEG636 mulf_tables_cmp::@8
+  b8:
   //SEG637 [299] call print_ln 
-  //SEG638 [58] phi from mulf_tables_cmp::@10 to print_ln [phi:mulf_tables_cmp::@10->print_ln]
-  print_ln_from_b10:
-  //SEG639 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@10->print_ln#0] -- register_copy 
-  //SEG640 [58] phi (byte*) print_line_cursor#45 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@10->print_ln#1] -- pbuz1=pbuc1 
+  //SEG638 [58] phi from mulf_tables_cmp::@8 to print_ln [phi:mulf_tables_cmp::@8->print_ln]
+  print_ln_from_b8:
+  //SEG639 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@8->print_ln#0] -- register_copy 
+  //SEG640 [58] phi (byte*) print_line_cursor#45 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@8->print_ln#1] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
@@ -9325,10 +9366,10 @@ mulf_tables_cmp: {
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG642 [291] phi from mulf_tables_cmp::@10 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@10->mulf_tables_cmp::@return]
-  breturn_from_b10:
-  //SEG643 [291] phi (byte*) print_line_cursor#10 = (byte*) print_line_cursor#1 [phi:mulf_tables_cmp::@10->mulf_tables_cmp::@return#0] -- register_copy 
-  //SEG644 [291] phi (byte*) print_char_cursor#31 = (byte*~) print_char_cursor#225 [phi:mulf_tables_cmp::@10->mulf_tables_cmp::@return#1] -- register_copy 
+  //SEG642 [291] phi from mulf_tables_cmp::@8 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return]
+  breturn_from_b8:
+  //SEG643 [291] phi (byte*) print_line_cursor#10 = (byte*) print_line_cursor#1 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#0] -- register_copy 
+  //SEG644 [291] phi (byte*) print_char_cursor#31 = (byte*~) print_char_cursor#225 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#1] -- register_copy 
     jmp breturn
     str: .text "multiply table mismatch at @"
     str1: .text " / @"
@@ -9501,33 +9542,33 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1_from_b2
-  //SEG685 [323] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  b5_from_b2:
-  //SEG686 [323] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG685 [323] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  b4_from_b2:
+  //SEG686 [323] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG687 [323] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG687 [323] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG688 [323] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG688 [323] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG689 [323] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuxx=vbuc1 
+  //SEG689 [323] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuxx=vbuc1 
     ldx #-1
-    jmp b5
-  //SEG690 [323] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  b5_from_b6:
-  //SEG691 [323] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG692 [323] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG693 [323] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG694 [323] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-    jmp b5
-  //SEG695 mulf_init::@5
-  b5:
+    jmp b4
+  //SEG690 [323] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  b4_from_b5:
+  //SEG691 [323] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG692 [323] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG693 [323] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG694 [323] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+    jmp b4
+  //SEG695 mulf_init::@4
+  b4:
   //SEG696 [324] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuxx 
     lda mulf_sqr1_lo,x
     ldy #0
@@ -9546,32 +9587,32 @@ mulf_init: {
     clc
     adc dir
     tax
-  //SEG700 [328] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuxx_neq_0_then_la1 
+  //SEG700 [328] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b12_from_b5
-  //SEG701 [329] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  b6_from_b5:
-  //SEG702 [329] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b7_from_b4
+  //SEG701 [329] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  b5_from_b4:
+  //SEG702 [329] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-    jmp b6
-  //SEG703 mulf_init::@6
-  b6:
+    jmp b5
+  //SEG703 mulf_init::@5
+  b5:
   //SEG704 [330] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG705 [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG705 [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5_from_b6
+    bne b4_from_b5
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5_from_b6
-    jmp b8
-  //SEG706 mulf_init::@8
-  b8:
+    bne b4_from_b5
+    jmp b6
+  //SEG706 mulf_init::@6
+  b6:
   //SEG707 [332] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -9584,15 +9625,15 @@ mulf_init: {
   breturn:
   //SEG710 [334] return 
     rts
-  //SEG711 [335] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  b12_from_b5:
-    jmp b12
-  //SEG712 mulf_init::@12
-  b12:
-  //SEG713 [329] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  b6_from_b12:
-  //SEG714 [329] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
-    jmp b6
+  //SEG711 [335] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  b7_from_b4:
+    jmp b7
+  //SEG712 mulf_init::@7
+  b7:
+  //SEG713 [329] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  b5_from_b7:
+  //SEG714 [329] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
+    jmp b5
 }
 //SEG715 print_cls
 // Clear the screen. Also resets current line/char cursor.
@@ -9667,7 +9708,7 @@ print_cls: {
   str2: .text " slow:@"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b42
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -9677,18 +9718,18 @@ Removing instruction jmp b5
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b2
+Removing instruction jmp b10
+Removing instruction jmp b11
 Removing instruction jmp b12
-Removing instruction jmp b13
-Removing instruction jmp b14
 Removing instruction jmp b6
 Removing instruction jmp b3
 Removing instruction jmp b4
-Removing instruction jmp b8
+Removing instruction jmp b7
 Removing instruction jmp breturn
-Removing instruction jmp b10
-Removing instruction jmp b11
-Removing instruction jmp b16
-Removing instruction jmp b20
+Removing instruction jmp b8
+Removing instruction jmp b9
+Removing instruction jmp b13
+Removing instruction jmp b14
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -9705,7 +9746,7 @@ Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp breturn
 Removing instruction jmp b2
-Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -9717,8 +9758,8 @@ Removing instruction jmp b3
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
+Removing instruction jmp b4
 Removing instruction jmp b5
-Removing instruction jmp b6
 Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -9726,13 +9767,13 @@ Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b6
-Removing instruction jmp b8
+Removing instruction jmp b3
+Removing instruction jmp b4
 Removing instruction jmp mulf8s_prepare1
+Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b4
 Removing instruction jmp breturn
-Removing instruction jmp b6
+Removing instruction jmp b5
 Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp b4
@@ -9740,25 +9781,25 @@ Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
-Removing instruction jmp b4
-Removing instruction jmp b8
+Removing instruction jmp b2
 Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp breturn
-Removing instruction jmp b10
+Removing instruction jmp b4
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b12
-Removing instruction jmp b13
-Removing instruction jmp b14
-Removing instruction jmp b6
-Removing instruction jmp b3
-Removing instruction jmp b4
-Removing instruction jmp b8
-Removing instruction jmp breturn
 Removing instruction jmp b10
 Removing instruction jmp b11
-Removing instruction jmp b16
-Removing instruction jmp b20
+Removing instruction jmp b12
+Removing instruction jmp b6
+Removing instruction jmp b3
+Removing instruction jmp b4
+Removing instruction jmp b7
+Removing instruction jmp breturn
+Removing instruction jmp b8
+Removing instruction jmp b9
+Removing instruction jmp b13
+Removing instruction jmp b14
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
@@ -9770,29 +9811,29 @@ Removing instruction jmp b8
 Removing instruction jmp b9
 Removing instruction jmp b10
 Removing instruction jmp breturn
+Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b3
 Removing instruction jmp breturn
-Removing instruction jmp b4
+Removing instruction jmp b2
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b3
+Removing instruction jmp b5
 Removing instruction jmp b6
 Removing instruction jmp b7
-Removing instruction jmp b8
 Removing instruction jmp breturn
-Removing instruction jmp b5
-Removing instruction jmp b10
+Removing instruction jmp b4
+Removing instruction jmp b8
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp b3
 Removing instruction jmp b2
+Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp b6
-Removing instruction jmp b8
 Removing instruction jmp breturn
-Removing instruction jmp b12
+Removing instruction jmp b7
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
@@ -9814,40 +9855,39 @@ Replacing instruction ldx #0 with TAX
 Removing instruction ldy #0
 Removing instruction ldy #0
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b20_from_b3 with b20
+Replacing label b14_from_b3 with b14
 Replacing label b2_from_b5 with b2
-Replacing label b1_from_b10 with b1
+Replacing label b1_from_b8 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_print_sword with b1
 Replacing label b1_from_print_sbyte with b1
-Replacing label b2_from_b5 with b2
-Replacing label b1_from_b6 with b1
+Replacing label b2_from_b4 with b2
+Replacing label b1_from_b5 with b1
 Replacing label b2_from_b1 with b2
-Replacing label b8_from_b2 with b8
-Replacing label b1_from_b6 with b1
+Replacing label b4_from_b2 with b4
+Replacing label b1_from_b5 with b1
 Replacing label b2_from_b1 with b2
-Replacing label b8_from_b8 with b8
-Replacing label b10_from_b10 with b10
-Replacing label b3_from_b10 with b3_from_b8
-Replacing label b20_from_b3 with b20
-Replacing label b2_from_b5 with b2
-Replacing label b1_from_b10 with b1
+Replacing label b3_from_b3 with b3
 Replacing label b4_from_b4 with b4
+Replacing label b14_from_b3 with b14
+Replacing label b2_from_b5 with b2
+Replacing label b1_from_b8 with b1
+Replacing label b2_from_b2 with b2
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b2 with b1
 Replacing label b2_from_b1 with b2
 Replacing label b1_from_b2 with b1
 Replacing label b1_from_b2 with b1
-Replacing label b12_from_b5 with b12
-Replacing label b5_from_b6 with b5
-Replacing label b5_from_b6 with b5
+Replacing label b7_from_b4 with b7
+Replacing label b4_from_b5 with b4
+Replacing label b4_from_b5 with b4
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b42_from_bbegin:
-Removing instruction b42:
-Removing instruction bend_from_b42:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction mulf_init_from_b1:
 Removing instruction b2_from_b1:
@@ -9857,15 +9897,15 @@ Removing instruction b4_from_b3:
 Removing instruction mul8u_compare_from_b4:
 Removing instruction b5_from_b4:
 Removing instruction mul8s_compare_from_b5:
-Removing instruction b1_from_b10:
+Removing instruction b1_from_b8:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b5:
-Removing instruction b6_from_b14:
+Removing instruction b6_from_b12:
 Removing instruction b3_from_b6:
-Removing instruction b16_from_b11:
-Removing instruction print_ln_from_b16:
-Removing instruction b20_from_b3:
-Removing instruction b4_from_b20:
+Removing instruction b13_from_b9:
+Removing instruction print_ln_from_b13:
+Removing instruction b14_from_b3:
+Removing instruction b4_from_b14:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction b1_from_print_str:
@@ -9885,44 +9925,44 @@ Removing instruction print_ln_from_b10:
 Removing instruction b2_from_print_sword:
 Removing instruction print_char_from_b2:
 Removing instruction b1_from_print_sword:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction print_word_from_b1:
 Removing instruction b3_from_print_sbyte:
 Removing instruction print_char_from_b3:
 Removing instruction b2_from_b3:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction print_byte_from_b2:
 Removing instruction b1_from_print_sbyte:
 Removing instruction print_char_from_b1:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b6:
+Removing instruction b1_from_b5:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
 Removing instruction breturn:
-Removing instruction b8_from_b2:
-Removing instruction b8_from_b6:
+Removing instruction b4_from_b2:
+Removing instruction b4_from_b3:
 Removing instruction mulf8u_prepare_from_mulf8s_prepare1:
 Removing instruction breturn:
 Removing instruction b1_from_b3:
-Removing instruction b1_from_b6:
+Removing instruction b1_from_b5:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
 Removing instruction breturn:
-Removing instruction b8_from_b8:
-Removing instruction b3_from_b10:
+Removing instruction b3_from_b3:
+Removing instruction b1_from_b3:
 Removing instruction breturn:
-Removing instruction b10_from_b10:
-Removing instruction b1_from_b10:
+Removing instruction b4_from_b4:
+Removing instruction b1_from_b8:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b5:
-Removing instruction b6_from_b14:
+Removing instruction b6_from_b12:
 Removing instruction b3_from_b6:
-Removing instruction b11_from_b10:
-Removing instruction print_str_from_b11:
-Removing instruction b16_from_b11:
-Removing instruction print_ln_from_b16:
-Removing instruction b20_from_b3:
-Removing instruction b4_from_b20:
+Removing instruction b9_from_b8:
+Removing instruction print_str_from_b9:
+Removing instruction b13_from_b9:
+Removing instruction print_ln_from_b13:
+Removing instruction b14_from_b3:
+Removing instruction b4_from_b14:
 Removing instruction print_byte_from_b1:
 Removing instruction b2_from_b1:
 Removing instruction print_str_from_b2:
@@ -9935,24 +9975,24 @@ Removing instruction b8_from_b7:
 Removing instruction print_str_from_b8:
 Removing instruction b10_from_b9:
 Removing instruction print_ln_from_b10:
-Removing instruction mulf8u_prepared_from_b2:
+Removing instruction mulf8u_prepared_from_b1:
 Removing instruction breturn:
-Removing instruction b4_from_b4:
+Removing instruction b2_from_b2:
 Removing instruction breturn:
 Removing instruction b1_from_b2:
-Removing instruction print_word_from_b6:
-Removing instruction b7_from_b6:
-Removing instruction print_str_from_b7:
-Removing instruction b5_from_b2:
-Removing instruction print_str_from_b5:
-Removing instruction b10_from_b5:
-Removing instruction print_ln_from_b10:
+Removing instruction print_word_from_b5:
+Removing instruction b6_from_b5:
+Removing instruction print_str_from_b6:
+Removing instruction b4_from_b2:
+Removing instruction print_str_from_b4:
+Removing instruction b8_from_b4:
+Removing instruction print_ln_from_b8:
 Removing instruction b1_from_b2:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b3:
-Removing instruction b5_from_b6:
-Removing instruction b12_from_b5:
-Removing instruction b6_from_b12:
+Removing instruction b4_from_b5:
+Removing instruction b7_from_b4:
+Removing instruction b5_from_b7:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
@@ -9964,17 +10004,17 @@ Removing instruction b4:
 Removing instruction b5:
 Removing instruction breturn:
 Removing instruction b1_from_mul8s_compare:
+Removing instruction b10:
+Removing instruction mulf8s_from_b10:
+Removing instruction b11:
 Removing instruction b12:
-Removing instruction mulf8s_from_b12:
-Removing instruction b13:
-Removing instruction b14:
 Removing instruction b6:
 Removing instruction b4_from_b3:
+Removing instruction b7:
 Removing instruction b8:
-Removing instruction b10:
-Removing instruction b11:
-Removing instruction print_str_from_b11:
-Removing instruction b16:
+Removing instruction b9:
+Removing instruction print_str_from_b9:
+Removing instruction b13:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction print_str_from_mul8s_error:
@@ -9993,7 +10033,7 @@ Removing instruction print_sword_from_b9:
 Removing instruction b10:
 Removing instruction breturn:
 Removing instruction b2:
-Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn:
 Removing instruction print_byte_from_print_word:
 Removing instruction b1:
@@ -10006,38 +10046,38 @@ Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b3:
 Removing instruction breturn:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction mul8u_from_mul8s:
-Removing instruction b6:
+Removing instruction b5:
 Removing instruction b3:
 Removing instruction b4:
 Removing instruction b1_from_mul8u:
 Removing instruction breturn:
-Removing instruction b6:
-Removing instruction b1_from_b8:
+Removing instruction b3:
+Removing instruction b1_from_b4:
 Removing instruction mulf8s_prepare1:
+Removing instruction b1:
 Removing instruction b2:
-Removing instruction b4:
 Removing instruction mulf8u_prepared_from_mulf8s_prepared:
-Removing instruction b6:
+Removing instruction b5:
 Removing instruction b3:
 Removing instruction b4:
 Removing instruction breturn:
 Removing instruction breturn:
-Removing instruction b4:
-Removing instruction b8_from_b4:
+Removing instruction b2:
+Removing instruction b3_from_b2:
 Removing instruction b1_from_mul8u_compare:
-Removing instruction b12:
-Removing instruction b13:
-Removing instruction mul8u_from_b13:
-Removing instruction b14:
-Removing instruction b6:
-Removing instruction b4_from_b3:
-Removing instruction b8:
-Removing instruction mul8u_error_from_b8:
 Removing instruction b10:
 Removing instruction b11:
-Removing instruction b16:
+Removing instruction mul8u_from_b11:
+Removing instruction b12:
+Removing instruction b6:
+Removing instruction b4_from_b3:
+Removing instruction b7:
+Removing instruction mul8u_error_from_b7:
+Removing instruction b8:
+Removing instruction b9:
+Removing instruction b13:
 Removing instruction print_str_from_mul8u_error:
 Removing instruction b1:
 Removing instruction b2:
@@ -10054,27 +10094,27 @@ Removing instruction print_word_from_b9:
 Removing instruction b10:
 Removing instruction breturn:
 Removing instruction mulf8u_prepare_from_mulf8u:
+Removing instruction b1:
 Removing instruction b2:
-Removing instruction b3:
-Removing instruction b4_from_muls8u:
-Removing instruction b1_from_b4:
+Removing instruction b2_from_muls8u:
+Removing instruction b1_from_b2:
 Removing instruction b1_from_mulf_tables_cmp:
 Removing instruction b3:
 Removing instruction print_str_from_b3:
+Removing instruction b5:
 Removing instruction b6:
 Removing instruction b7:
+Removing instruction print_word_from_b7:
+Removing instruction breturn_from_b7:
+Removing instruction b4:
 Removing instruction b8:
-Removing instruction print_word_from_b8:
 Removing instruction breturn_from_b8:
-Removing instruction b5:
-Removing instruction b10:
-Removing instruction breturn_from_b10:
 Removing instruction breturn:
 Removing instruction b1_from_mulf_init:
 Removing instruction b3:
-Removing instruction b5_from_b2:
-Removing instruction b6_from_b5:
-Removing instruction b8:
+Removing instruction b4_from_b2:
+Removing instruction b5_from_b4:
+Removing instruction b6:
 Removing instruction breturn:
 Removing instruction b1_from_print_cls:
 Removing instruction breturn:
@@ -10082,28 +10122,28 @@ Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b4 in beq b20
-Skipping double jump to b3 in jmp b3_from_b8
-Skipping double jump to b4 in beq b20
-Skipping double jump to b6 in bne b12
+Skipping double jump to b4 in beq b14
+Skipping double jump to b1 in jmp b1_from_b4
+Skipping double jump to b4 in beq b14
+Skipping double jump to b5 in bne b7
 Succesful ASM optimization Pass5DoubleJumpElimination
-Relabelling long label b3_from_b14 to b6
-Relabelling long label b3_from_b8 to b1
-Relabelling long label b3_from_b4 to b2
-Relabelling long label b10_from_muls8s to b4
-Relabelling long label b3_from_b14 to b6
-Relabelling long label b1_from_muls8u to b2
+Relabelling long label b3_from_b12 to b6
+Relabelling long label b1_from_b4 to b2
+Relabelling long label b1_from_b2 to b5
+Relabelling long label b4_from_muls8s to b6
+Relabelling long label b3_from_b12 to b6
+Relabelling long label b1_from_muls8u to b3
 Succesful ASM optimization Pass5RelabelLongLabels
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b8
-Removing instruction jmp b10
-Removing instruction jmp b1
-Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b2
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b1
+Removing instruction jmp b4
 Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #-$80
@@ -10111,18 +10151,18 @@ Removing instruction lda #0
 Removing instruction lda a
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Removing instruction bbegin:
-Removing instruction b20:
-Removing instruction b1:
-Removing instruction b20:
-Removing instruction b12:
+Removing instruction b14:
+Removing instruction b2:
+Removing instruction b14:
+Removing instruction b7:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b4
 Removing unreachable instruction jmp b4
-Removing unreachable instruction jmp b6
+Removing unreachable instruction jmp b5
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @42
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -10143,7 +10183,7 @@ FINAL SYMBOL TABLE
 (label) mul8s::@2
 (label) mul8s::@3
 (label) mul8s::@4
-(label) mul8s::@6
+(label) mul8s::@5
 (label) mul8s::@return
 (signed byte) mul8s::a
 (signed byte) mul8s::a#0 a zp ZP_BYTE:2 7.357142857142858
@@ -10164,14 +10204,14 @@ FINAL SYMBOL TABLE
 (label) mul8s_compare::@12
 (label) mul8s_compare::@13
 (label) mul8s_compare::@14
-(label) mul8s_compare::@16
 (label) mul8s_compare::@2
-(label) mul8s_compare::@20
 (label) mul8s_compare::@3
 (label) mul8s_compare::@4
 (label) mul8s_compare::@5
 (label) mul8s_compare::@6
+(label) mul8s_compare::@7
 (label) mul8s_compare::@8
+(label) mul8s_compare::@9
 (label) mul8s_compare::@return
 (signed byte) mul8s_compare::a
 (signed byte) mul8s_compare::a#1 a zp ZP_BYTE:2 16.5
@@ -10216,8 +10256,8 @@ FINAL SYMBOL TABLE
 (byte~) mul8u::$1 reg byte a 2002.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 1001.0
@@ -10247,14 +10287,14 @@ FINAL SYMBOL TABLE
 (label) mul8u_compare::@12
 (label) mul8u_compare::@13
 (label) mul8u_compare::@14
-(label) mul8u_compare::@16
 (label) mul8u_compare::@2
-(label) mul8u_compare::@20
 (label) mul8u_compare::@3
 (label) mul8u_compare::@4
 (label) mul8u_compare::@5
 (label) mul8u_compare::@6
+(label) mul8u_compare::@7
 (label) mul8u_compare::@8
+(label) mul8u_compare::@9
 (label) mul8u_compare::@return
 (byte) mul8u_compare::a
 (byte) mul8u_compare::a#1 a zp ZP_BYTE:2 16.5
@@ -10304,8 +10344,8 @@ FINAL SYMBOL TABLE
 (byte[$200]) mula_sqr2_lo
 (const byte[$200]) mula_sqr2_lo#0 mula_sqr2_lo = { fill( $200, 0) }
 (signed word()) mulf8s((signed byte) mulf8s::a , (signed byte) mulf8s::b)
+(label) mulf8s::@1
 (label) mulf8s::@2
-(label) mulf8s::@4
 (label) mulf8s::@return
 (signed byte) mulf8s::a
 (signed byte) mulf8s::a#0 reg byte a 33.666666666666664
@@ -10326,7 +10366,7 @@ FINAL SYMBOL TABLE
 (label) mulf8s_prepared::@2
 (label) mulf8s_prepared::@3
 (label) mulf8s_prepared::@4
-(label) mulf8s_prepared::@6
+(label) mulf8s_prepared::@5
 (label) mulf8s_prepared::@return
 (signed byte) mulf8s_prepared::b
 (signed byte) mulf8s_prepared::b#0 b zp ZP_BYTE:3 0.4
@@ -10341,8 +10381,8 @@ FINAL SYMBOL TABLE
 (signed word) mulf8s_prepared::return
 (signed word) mulf8s_prepared::return#2 return zp ZP_WORD:14 4.0
 (word()) mulf8u((byte) mulf8u::a , (byte) mulf8u::b)
+(label) mulf8u::@1
 (label) mulf8u::@2
-(label) mulf8u::@3
 (label) mulf8u::@return
 (byte) mulf8u::a
 (byte) mulf8u::a#0 reg byte a 51.5
@@ -10378,12 +10418,12 @@ FINAL SYMBOL TABLE
 (byte~) mulf_init::$12 reg byte a 22.0
 (byte~) mulf_init::$8 reg byte a 22.0
 (label) mulf_init::@1
-(label) mulf_init::@12
 (label) mulf_init::@2
 (label) mulf_init::@3
+(label) mulf_init::@4
 (label) mulf_init::@5
 (label) mulf_init::@6
-(label) mulf_init::@8
+(label) mulf_init::@7
 (label) mulf_init::@return
 (byte) mulf_init::c
 (byte) mulf_init::c#1 reg byte x 2.357142857142857
@@ -10429,9 +10469,9 @@ FINAL SYMBOL TABLE
 (const byte[$200]) mulf_sqr2_lo#0 mulf_sqr2_lo = { fill( $200, 0) }
 (void()) mulf_tables_cmp()
 (label) mulf_tables_cmp::@1
-(label) mulf_tables_cmp::@10
 (label) mulf_tables_cmp::@2
 (label) mulf_tables_cmp::@3
+(label) mulf_tables_cmp::@4
 (label) mulf_tables_cmp::@5
 (label) mulf_tables_cmp::@6
 (label) mulf_tables_cmp::@7
@@ -10447,10 +10487,10 @@ FINAL SYMBOL TABLE
 (const string) mulf_tables_cmp::str1 str1 = (string) " / @"
 (const string) mulf_tables_cmp::str2 str2 = (string) "multiply tables match!@"
 (signed word()) muls8s((signed byte) muls8s::a , (signed byte) muls8s::b)
-(label) muls8s::@10
+(label) muls8s::@1
+(label) muls8s::@2
 (label) muls8s::@3
 (label) muls8s::@4
-(label) muls8s::@8
 (label) muls8s::@return
 (signed byte) muls8s::a
 (signed byte) muls8s::a#0 a zp ZP_BYTE:2 175.58333333333334
@@ -10472,7 +10512,7 @@ FINAL SYMBOL TABLE
 (signed word) muls8s::return#2 return zp ZP_WORD:8 202.0
 (word()) muls8u((byte) muls8u::a , (byte) muls8u::b)
 (label) muls8u::@1
-(label) muls8u::@4
+(label) muls8u::@2
 (label) muls8u::@return
 (byte) muls8u::a
 (byte) muls8u::a#0 a zp ZP_BYTE:2 157.71428571428572
@@ -10539,7 +10579,7 @@ FINAL SYMBOL TABLE
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 reg byte x 4.0
@@ -10559,7 +10599,7 @@ FINAL SYMBOL TABLE
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:8 4.0
@@ -10645,10 +10685,10 @@ Score: 224367
   .label print_char_cursor = $a
   .label print_line_cursor = 4
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @42 [phi:@begin->@42]
-//SEG5 @42
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @42 to @end [phi:@42->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
@@ -10698,8 +10738,8 @@ mul8s_compare: {
   //SEG36 [18] phi (signed byte) mul8s_compare::a#7 = -(byte/word/signed word/dword/signed dword) $80 [phi:mul8s_compare->mul8s_compare::@1#0] -- vbsz1=vbsc1 
     lda #-$80
     sta a
-  //SEG37 [18] phi from mul8s_compare::@10 to mul8s_compare::@1 [phi:mul8s_compare::@10->mul8s_compare::@1]
-  //SEG38 [18] phi (signed byte) mul8s_compare::a#7 = (signed byte) mul8s_compare::a#1 [phi:mul8s_compare::@10->mul8s_compare::@1#0] -- register_copy 
+  //SEG37 [18] phi from mul8s_compare::@8 to mul8s_compare::@1 [phi:mul8s_compare::@8->mul8s_compare::@1]
+  //SEG38 [18] phi (signed byte) mul8s_compare::a#7 = (signed byte) mul8s_compare::a#1 [phi:mul8s_compare::@8->mul8s_compare::@1#0] -- register_copy 
   //SEG39 mul8s_compare::@1
   b1:
   //SEG40 [19] phi from mul8s_compare::@1 to mul8s_compare::@2 [phi:mul8s_compare::@1->mul8s_compare::@2]
@@ -10716,17 +10756,17 @@ mul8s_compare: {
   //SEG47 [22] call muls8s 
     jsr muls8s
   //SEG48 [23] (signed word) muls8s::return#2 ← (signed word) muls8s::return#0
-  //SEG49 mul8s_compare::@12
+  //SEG49 mul8s_compare::@10
   //SEG50 [24] (signed word) mul8s_compare::ms#0 ← (signed word) muls8s::return#2
   //SEG51 [25] (signed byte) mulf8s::a#0 ← (signed byte) mul8s_compare::a#7 -- vbsaa=vbsz1 
     lda a
   //SEG52 [26] (signed byte) mulf8s::b#0 ← (signed byte) mul8s_compare::b#10 -- vbsxx=vbsz1 
     ldx b
   //SEG53 [27] call mulf8s 
-  //SEG54 [158] phi from mul8s_compare::@12 to mulf8s [phi:mul8s_compare::@12->mulf8s]
+  //SEG54 [158] phi from mul8s_compare::@10 to mulf8s [phi:mul8s_compare::@10->mulf8s]
     jsr mulf8s
   //SEG55 [28] (signed word) mulf8s::return#2 ← (signed word) mulf8s::return#0
-  //SEG56 mul8s_compare::@13
+  //SEG56 mul8s_compare::@11
   //SEG57 [29] (signed word) mul8s_compare::mf#0 ← (signed word) mulf8s::return#2
   //SEG58 [30] (signed byte) mul8s::a#0 ← (signed byte) mul8s_compare::a#7
   //SEG59 [31] (signed byte) mul8s::b#0 ← (signed byte) mul8s_compare::b#10 -- vbsyy=vbsz1 
@@ -10734,7 +10774,7 @@ mul8s_compare: {
   //SEG60 [32] call mul8s 
     jsr mul8s
   //SEG61 [33] (signed word) mul8s::return#2 ← (signed word)(word) mul8s::m#4
-  //SEG62 mul8s_compare::@14
+  //SEG62 mul8s_compare::@12
   //SEG63 [34] (signed word) mul8s_compare::mn#0 ← (signed word) mul8s::return#2
   //SEG64 [35] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mf#0) goto mul8s_compare::@3 -- vwsz1_eq_vwsz2_then_la1 
     lda ms
@@ -10744,19 +10784,19 @@ mul8s_compare: {
     cmp mf+1
     beq b6
   !:
-  //SEG65 [36] phi from mul8s_compare::@14 to mul8s_compare::@6 [phi:mul8s_compare::@14->mul8s_compare::@6]
+  //SEG65 [36] phi from mul8s_compare::@12 to mul8s_compare::@6 [phi:mul8s_compare::@12->mul8s_compare::@6]
   //SEG66 mul8s_compare::@6
   //SEG67 [37] phi from mul8s_compare::@6 to mul8s_compare::@3 [phi:mul8s_compare::@6->mul8s_compare::@3]
   //SEG68 [37] phi (byte) mul8s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mul8s_compare::@6->mul8s_compare::@3#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b3
-  //SEG69 [37] phi from mul8s_compare::@14 to mul8s_compare::@3 [phi:mul8s_compare::@14->mul8s_compare::@3]
+  //SEG69 [37] phi from mul8s_compare::@12 to mul8s_compare::@3 [phi:mul8s_compare::@12->mul8s_compare::@3]
   b6:
-  //SEG70 [37] phi (byte) mul8s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8s_compare::@14->mul8s_compare::@3#0] -- vbuxx=vbuc1 
+  //SEG70 [37] phi (byte) mul8s_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8s_compare::@12->mul8s_compare::@3#0] -- vbuxx=vbuc1 
     ldx #1
   //SEG71 mul8s_compare::@3
   b3:
-  //SEG72 [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@20 -- vwsz1_eq_vwsz2_then_la1 
+  //SEG72 [38] if((signed word) mul8s_compare::ms#0==(signed word) mul8s_compare::mn#0) goto mul8s_compare::@14 -- vwsz1_eq_vwsz2_then_la1 
     lda ms
     cmp mn
     bne !+
@@ -10772,7 +10812,7 @@ mul8s_compare: {
   //SEG76 [40] if((byte) mul8s_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s_compare::@5 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b5
-  //SEG77 mul8s_compare::@8
+  //SEG77 mul8s_compare::@7
   //SEG78 [41] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -10796,39 +10836,39 @@ mul8s_compare: {
     lda #-$80
     cmp b
     bne b2
-  //SEG90 mul8s_compare::@10
+  //SEG90 mul8s_compare::@8
   //SEG91 [51] (signed byte) mul8s_compare::a#1 ← ++ (signed byte) mul8s_compare::a#7 -- vbsz1=_inc_vbsz1 
     inc a
   //SEG92 [52] if((signed byte) mul8s_compare::a#1!=-(byte/word/signed word/dword/signed dword) $80) goto mul8s_compare::@1 -- vbsz1_neq_vbsc1_then_la1 
     cmp a
     bne b1
-  //SEG93 mul8s_compare::@11
+  //SEG93 mul8s_compare::@9
   //SEG94 [53] (byte*~) print_char_cursor#192 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
   //SEG95 [54] call print_str 
-  //SEG96 [63] phi from mul8s_compare::@11 to print_str [phi:mul8s_compare::@11->print_str]
-  //SEG97 [63] phi (byte*) print_char_cursor#152 = (byte*~) print_char_cursor#192 [phi:mul8s_compare::@11->print_str#0] -- register_copy 
-  //SEG98 [63] phi (byte*) print_str::str#18 = (const string) mul8s_compare::str [phi:mul8s_compare::@11->print_str#1] -- pbuz1=pbuc1 
+  //SEG96 [63] phi from mul8s_compare::@9 to print_str [phi:mul8s_compare::@9->print_str]
+  //SEG97 [63] phi (byte*) print_char_cursor#152 = (byte*~) print_char_cursor#192 [phi:mul8s_compare::@9->print_str#0] -- register_copy 
+  //SEG98 [63] phi (byte*) print_str::str#18 = (const string) mul8s_compare::str [phi:mul8s_compare::@9->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG99 [55] phi from mul8s_compare::@11 to mul8s_compare::@16 [phi:mul8s_compare::@11->mul8s_compare::@16]
-  //SEG100 mul8s_compare::@16
+  //SEG99 [55] phi from mul8s_compare::@9 to mul8s_compare::@13 [phi:mul8s_compare::@9->mul8s_compare::@13]
+  //SEG100 mul8s_compare::@13
   //SEG101 [56] call print_ln 
-  //SEG102 [58] phi from mul8s_compare::@16 to print_ln [phi:mul8s_compare::@16->print_ln]
-  //SEG103 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8s_compare::@16->print_ln#0] -- register_copy 
-  //SEG104 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#1 [phi:mul8s_compare::@16->print_ln#1] -- register_copy 
+  //SEG102 [58] phi from mul8s_compare::@13 to print_ln [phi:mul8s_compare::@13->print_ln]
+  //SEG103 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8s_compare::@13->print_ln#0] -- register_copy 
+  //SEG104 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#1 [phi:mul8s_compare::@13->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG105 [57] phi from mul8s_compare::@3 to mul8s_compare::@20 [phi:mul8s_compare::@3->mul8s_compare::@20]
-  //SEG106 mul8s_compare::@20
-  //SEG107 [39] phi from mul8s_compare::@20 to mul8s_compare::@4 [phi:mul8s_compare::@20->mul8s_compare::@4]
-  //SEG108 [39] phi (byte) mul8s_compare::ok#3 = (byte) mul8s_compare::ok#4 [phi:mul8s_compare::@20->mul8s_compare::@4#0] -- register_copy 
+  //SEG105 [57] phi from mul8s_compare::@3 to mul8s_compare::@14 [phi:mul8s_compare::@3->mul8s_compare::@14]
+  //SEG106 mul8s_compare::@14
+  //SEG107 [39] phi from mul8s_compare::@14 to mul8s_compare::@4 [phi:mul8s_compare::@14->mul8s_compare::@4]
+  //SEG108 [39] phi (byte) mul8s_compare::ok#3 = (byte) mul8s_compare::ok#4 [phi:mul8s_compare::@14->mul8s_compare::@4#0] -- register_copy 
     str: .text "signed multiply results match!@"
 }
 //SEG109 print_ln
@@ -11027,7 +11067,7 @@ print_sword: {
   //SEG199 [116] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG200 print_sword::@4
+  //SEG200 print_sword::@3
   //SEG201 [97] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#4 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -11038,9 +11078,9 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG202 [98] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
-  //SEG203 [98] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#132 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG204 [98] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  //SEG202 [98] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
+  //SEG203 [98] phi (byte*) print_char_cursor#134 = (byte*) print_char_cursor#132 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG204 [98] phi (signed word) print_sword::w#5 = (signed word) print_sword::w#4 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
   //SEG205 print_sword::@1
   b1:
   //SEG206 [99] (word~) print_word::w#13 ← (word)(signed word) print_sword::w#5
@@ -11143,8 +11183,8 @@ print_sbyte: {
   //SEG255 [116] phi (byte) print_char::ch#5 = (byte) ' ' [phi:print_sbyte::@3->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG256 [124] phi from print_sbyte::@3 print_sbyte::@5 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2]
-  //SEG257 [124] phi (signed byte) print_sbyte::b#5 = (signed byte) print_sbyte::b#3 [phi:print_sbyte::@3/print_sbyte::@5->print_sbyte::@2#0] -- register_copy 
+  //SEG256 [124] phi from print_sbyte::@3 print_sbyte::@4 to print_sbyte::@2 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2]
+  //SEG257 [124] phi (signed byte) print_sbyte::b#5 = (signed byte) print_sbyte::b#3 [phi:print_sbyte::@3/print_sbyte::@4->print_sbyte::@2#0] -- register_copy 
   //SEG258 print_sbyte::@2
   b2:
   //SEG259 [125] (byte~) print_byte::b#9 ← (byte)(signed byte) print_sbyte::b#5
@@ -11165,7 +11205,7 @@ print_sbyte: {
   //SEG271 [116] phi (byte) print_char::ch#5 = (byte) '-' [phi:print_sbyte::@1->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG272 print_sbyte::@5
+  //SEG272 print_sbyte::@4
   //SEG273 [130] (signed byte) print_sbyte::b#0 ← - (signed byte) print_sbyte::b#3 -- vbsxx=_neg_vbsxx 
     txa
     eor #$ff
@@ -11192,7 +11232,7 @@ mul8s: {
   //SEG280 [147] phi (byte) mul8u::b#2 = (byte~) mul8u::b#3 [phi:mul8s->mul8u#1] -- register_copy 
     jsr mul8u
   //SEG281 [134] (word) mul8u::return#2 ← (word) mul8u::res#2
-  //SEG282 mul8s::@6
+  //SEG282 mul8s::@5
   //SEG283 [135] (word) mul8s::m#0 ← (word) mul8u::return#2
   //SEG284 [136] if((signed byte) mul8s::a#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s::@1 -- vbsz1_ge_0_then_la1 
     lda a
@@ -11207,8 +11247,8 @@ mul8s: {
     sbc $ff
   //SEG288 [139] (word) mul8s::m#1 ← (word) mul8s::m#0 hi= (byte~) mul8s::$16 -- vwuz1=vwuz1_sethi_vbuaa 
     sta m+1
-  //SEG289 [140] phi from mul8s::@3 mul8s::@6 to mul8s::@1 [phi:mul8s::@3/mul8s::@6->mul8s::@1]
-  //SEG290 [140] phi (word) mul8s::m#5 = (word) mul8s::m#1 [phi:mul8s::@3/mul8s::@6->mul8s::@1#0] -- register_copy 
+  //SEG289 [140] phi from mul8s::@3 mul8s::@5 to mul8s::@1 [phi:mul8s::@3/mul8s::@5->mul8s::@1]
+  //SEG290 [140] phi (word) mul8s::m#5 = (word) mul8s::m#1 [phi:mul8s::@3/mul8s::@5->mul8s::@1#0] -- register_copy 
   //SEG291 mul8s::@1
   b1:
   //SEG292 [141] if((signed byte) mul8s::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8s::@2 -- vbsyy_ge_0_then_la1 
@@ -11260,10 +11300,10 @@ mul8u: {
   //SEG313 [152] (byte~) mul8u::$1 ← (byte) mul8u::a#3 & (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuxx_band_vbuc1 
     txa
     and #1
-  //SEG314 [153] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@8 -- vbuaa_eq_0_then_la1 
+  //SEG314 [153] if((byte~) mul8u::$1==(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u::@4 -- vbuaa_eq_0_then_la1 
     cmp #0
-    beq b8
-  //SEG315 mul8u::@6
+    beq b4
+  //SEG315 mul8u::@3
   //SEG316 [154] (word) mul8u::res#1 ← (word) mul8u::res#2 + (word) mul8u::mb#2 -- vwuz1=vwuz1_plus_vwuz2 
     lda res
     clc
@@ -11272,10 +11312,10 @@ mul8u: {
     lda res+1
     adc mb+1
     sta res+1
-  //SEG317 [155] phi from mul8u::@2 mul8u::@6 to mul8u::@8 [phi:mul8u::@2/mul8u::@6->mul8u::@8]
-  //SEG318 [155] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@6->mul8u::@8#0] -- register_copy 
-  //SEG319 mul8u::@8
-  b8:
+  //SEG317 [155] phi from mul8u::@2 mul8u::@3 to mul8u::@4 [phi:mul8u::@2/mul8u::@3->mul8u::@4]
+  //SEG318 [155] phi (word) mul8u::res#6 = (word) mul8u::res#2 [phi:mul8u::@2/mul8u::@3->mul8u::@4#0] -- register_copy 
+  //SEG319 mul8u::@4
+  b4:
   //SEG320 [156] (byte) mul8u::a#0 ← (byte) mul8u::a#3 >> (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuxx=vbuxx_ror_1 
     txa
     lsr
@@ -11283,10 +11323,10 @@ mul8u: {
   //SEG321 [157] (word) mul8u::mb#1 ← (word) mul8u::mb#2 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vwuz1=vwuz1_rol_1 
     asl mb
     rol mb+1
-  //SEG322 [149] phi from mul8u::@8 to mul8u::@1 [phi:mul8u::@8->mul8u::@1]
-  //SEG323 [149] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@8->mul8u::@1#0] -- register_copy 
-  //SEG324 [149] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@8->mul8u::@1#1] -- register_copy 
-  //SEG325 [149] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@8->mul8u::@1#2] -- register_copy 
+  //SEG322 [149] phi from mul8u::@4 to mul8u::@1 [phi:mul8u::@4->mul8u::@1]
+  //SEG323 [149] phi (word) mul8u::mb#2 = (word) mul8u::mb#1 [phi:mul8u::@4->mul8u::@1#0] -- register_copy 
+  //SEG324 [149] phi (word) mul8u::res#2 = (word) mul8u::res#6 [phi:mul8u::@4->mul8u::@1#1] -- register_copy 
+  //SEG325 [149] phi (byte) mul8u::a#3 = (byte) mul8u::a#0 [phi:mul8u::@4->mul8u::@1#2] -- register_copy 
     jmp b1
 }
 //SEG326 mulf8s
@@ -11300,13 +11340,13 @@ mulf8s: {
   //SEG330 [186] phi from mulf8s::mulf8s_prepare1 to mulf8u_prepare [phi:mulf8s::mulf8s_prepare1->mulf8u_prepare]
   //SEG331 [186] phi (byte) mulf8u_prepare::a#2 = (byte~) mulf8u_prepare::a#3 [phi:mulf8s::mulf8s_prepare1->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-  //SEG332 mulf8s::@2
+  //SEG332 mulf8s::@1
   //SEG333 [161] (signed byte) mulf8s_prepared::b#0 ← (signed byte) mulf8s::b#0 -- vbsz1=vbsxx 
     stx mulf8s_prepared.b
   //SEG334 [162] call mulf8s_prepared 
     jsr mulf8s_prepared
   //SEG335 [163] (signed word) mulf8s_prepared::return#2 ← (signed word)(word) mulf8s_prepared::m#4
-  //SEG336 mulf8s::@4
+  //SEG336 mulf8s::@2
   //SEG337 [164] (signed word) mulf8s::return#0 ← (signed word) mulf8s_prepared::return#2
   //SEG338 mulf8s::@return
   //SEG339 [165] return 
@@ -11328,7 +11368,7 @@ mulf8s_prepared: {
   //SEG344 [181] phi (byte) mulf8u_prepared::b#2 = (byte~) mulf8u_prepared::b#3 [phi:mulf8s_prepared->mulf8u_prepared#0] -- register_copy 
     jsr mulf8u_prepared
   //SEG345 [168] (word) mulf8u_prepared::return#3 ← (word) mulf8u_prepared::return#0
-  //SEG346 mulf8s_prepared::@6
+  //SEG346 mulf8s_prepared::@5
   //SEG347 [169] (word) mulf8s_prepared::m#0 ← (word) mulf8u_prepared::return#3
   //SEG348 [170] if(*((const signed byte*) mulf8s_prepared::memA#0)>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@1 -- _deref_pbsc1_ge_0_then_la1 
     lda memA
@@ -11342,8 +11382,8 @@ mulf8s_prepared: {
     sbc b
   //SEG352 [173] (word) mulf8s_prepared::m#1 ← (word) mulf8s_prepared::m#0 hi= (byte~) mulf8s_prepared::$15 -- vwuz1=vwuz1_sethi_vbuaa 
     sta m+1
-  //SEG353 [174] phi from mulf8s_prepared::@3 mulf8s_prepared::@6 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1]
-  //SEG354 [174] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@6->mulf8s_prepared::@1#0] -- register_copy 
+  //SEG353 [174] phi from mulf8s_prepared::@3 mulf8s_prepared::@5 to mulf8s_prepared::@1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1]
+  //SEG354 [174] phi (word) mulf8s_prepared::m#5 = (word) mulf8s_prepared::m#1 [phi:mulf8s_prepared::@3/mulf8s_prepared::@5->mulf8s_prepared::@1#0] -- register_copy 
   //SEG355 mulf8s_prepared::@1
   b1:
   //SEG356 [175] if((signed byte) mulf8s_prepared::b#0>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf8s_prepared::@2 -- vbsz1_ge_0_then_la1 
@@ -11422,25 +11462,25 @@ muls8s: {
     .label m = 8
     .label return = 8
     .label a = 2
-  //SEG378 [190] if((signed byte) muls8s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@10 -- vbsz1_lt_0_then_la1 
+  //SEG378 [190] if((signed byte) muls8s::a#0<(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@4 -- vbsz1_lt_0_then_la1 
     lda a
-    bmi b4
-  //SEG379 muls8s::@4
-  //SEG380 [191] if((signed byte) muls8s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@3 -- vbsz1_le_0_then_la1 
+    bmi b6
+  //SEG379 muls8s::@2
+  //SEG380 [191] if((signed byte) muls8s::a#0<=(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8s::@1 -- vbsz1_le_0_then_la1 
     cmp #1
-    bmi b2
-  //SEG381 [192] phi from muls8s::@4 to muls8s::@8 [phi:muls8s::@4->muls8s::@8]
-  //SEG382 [192] phi (signed byte) muls8s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@4->muls8s::@8#0] -- vbsyy=vbuc1 
+    bmi b5
+  //SEG381 [192] phi from muls8s::@2 to muls8s::@3 [phi:muls8s::@2->muls8s::@3]
+  //SEG382 [192] phi (signed byte) muls8s::j#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@2->muls8s::@3#0] -- vbsyy=vbuc1 
     lda #0
     tay
-  //SEG383 [192] phi (signed word) muls8s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@4->muls8s::@8#1] -- vwsz1=vbuc1 
+  //SEG383 [192] phi (signed word) muls8s::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@2->muls8s::@3#1] -- vwsz1=vbuc1 
     sta m
     sta m+1
-  //SEG384 [192] phi from muls8s::@8 to muls8s::@8 [phi:muls8s::@8->muls8s::@8]
-  //SEG385 [192] phi (signed byte) muls8s::j#2 = (signed byte) muls8s::j#1 [phi:muls8s::@8->muls8s::@8#0] -- register_copy 
-  //SEG386 [192] phi (signed word) muls8s::m#3 = (signed word) muls8s::m#1 [phi:muls8s::@8->muls8s::@8#1] -- register_copy 
-  //SEG387 muls8s::@8
-  b8:
+  //SEG384 [192] phi from muls8s::@3 to muls8s::@3 [phi:muls8s::@3->muls8s::@3]
+  //SEG385 [192] phi (signed byte) muls8s::j#2 = (signed byte) muls8s::j#1 [phi:muls8s::@3->muls8s::@3#0] -- register_copy 
+  //SEG386 [192] phi (signed word) muls8s::m#3 = (signed word) muls8s::m#1 [phi:muls8s::@3->muls8s::@3#1] -- register_copy 
+  //SEG387 muls8s::@3
+  b3:
   //SEG388 [193] (signed word) muls8s::m#1 ← (signed word) muls8s::m#3 + (signed byte) muls8s::b#0 -- vwsz1=vwsz1_plus_vbsxx 
     txa
     sta $fe
@@ -11458,36 +11498,36 @@ muls8s: {
     sta m+1
   //SEG389 [194] (signed byte) muls8s::j#1 ← ++ (signed byte) muls8s::j#2 -- vbsyy=_inc_vbsyy 
     iny
-  //SEG390 [195] if((signed byte) muls8s::j#1!=(signed byte) muls8s::a#0) goto muls8s::@8 -- vbsyy_neq_vbsz1_then_la1 
+  //SEG390 [195] if((signed byte) muls8s::j#1!=(signed byte) muls8s::a#0) goto muls8s::@3 -- vbsyy_neq_vbsz1_then_la1 
     cpy a
-    bne b8
-  //SEG391 [196] phi from muls8s::@10 muls8s::@8 to muls8s::@3 [phi:muls8s::@10/muls8s::@8->muls8s::@3]
-  //SEG392 [196] phi (signed word) muls8s::return#0 = (signed word) muls8s::m#2 [phi:muls8s::@10/muls8s::@8->muls8s::@3#0] -- register_copy 
-    jmp b3
-  //SEG393 [196] phi from muls8s::@4 to muls8s::@3 [phi:muls8s::@4->muls8s::@3]
-  b2:
-  //SEG394 [196] phi (signed word) muls8s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@4->muls8s::@3#0] -- vwsz1=vbuc1 
+    bne b3
+  //SEG391 [196] phi from muls8s::@3 muls8s::@4 to muls8s::@1 [phi:muls8s::@3/muls8s::@4->muls8s::@1]
+  //SEG392 [196] phi (signed word) muls8s::return#0 = (signed word) muls8s::m#1 [phi:muls8s::@3/muls8s::@4->muls8s::@1#0] -- register_copy 
+    jmp b1
+  //SEG393 [196] phi from muls8s::@2 to muls8s::@1 [phi:muls8s::@2->muls8s::@1]
+  b5:
+  //SEG394 [196] phi (signed word) muls8s::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s::@2->muls8s::@1#0] -- vwsz1=vbuc1 
     lda #0
     sta return
     sta return+1
-  //SEG395 muls8s::@3
-  b3:
+  //SEG395 muls8s::@1
+  b1:
   //SEG396 muls8s::@return
   //SEG397 [197] return 
     rts
-  //SEG398 [198] phi from muls8s to muls8s::@10 [phi:muls8s->muls8s::@10]
-  b4:
-  //SEG399 [198] phi (signed byte) muls8s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@10#0] -- vbsyy=vbuc1 
+  //SEG398 [198] phi from muls8s to muls8s::@4 [phi:muls8s->muls8s::@4]
+  b6:
+  //SEG399 [198] phi (signed byte) muls8s::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@4#0] -- vbsyy=vbuc1 
     lda #0
     tay
-  //SEG400 [198] phi (signed word) muls8s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@10#1] -- vwsz1=vbuc1 
+  //SEG400 [198] phi (signed word) muls8s::m#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8s->muls8s::@4#1] -- vwsz1=vbuc1 
     sta m
     sta m+1
-  //SEG401 [198] phi from muls8s::@10 to muls8s::@10 [phi:muls8s::@10->muls8s::@10]
-  //SEG402 [198] phi (signed byte) muls8s::i#2 = (signed byte) muls8s::i#1 [phi:muls8s::@10->muls8s::@10#0] -- register_copy 
-  //SEG403 [198] phi (signed word) muls8s::m#5 = (signed word) muls8s::m#2 [phi:muls8s::@10->muls8s::@10#1] -- register_copy 
-  //SEG404 muls8s::@10
-  b10:
+  //SEG401 [198] phi from muls8s::@4 to muls8s::@4 [phi:muls8s::@4->muls8s::@4]
+  //SEG402 [198] phi (signed byte) muls8s::i#2 = (signed byte) muls8s::i#1 [phi:muls8s::@4->muls8s::@4#0] -- register_copy 
+  //SEG403 [198] phi (signed word) muls8s::m#5 = (signed word) muls8s::m#2 [phi:muls8s::@4->muls8s::@4#1] -- register_copy 
+  //SEG404 muls8s::@4
+  b4:
   //SEG405 [199] (signed word) muls8s::m#2 ← (signed word) muls8s::m#5 - (signed byte) muls8s::b#0 -- vwsz1=vwsz1_minus_vbsxx 
     txa
     sta $fe
@@ -11505,10 +11545,10 @@ muls8s: {
     sta m+1
   //SEG406 [200] (signed byte) muls8s::i#1 ← -- (signed byte) muls8s::i#2 -- vbsyy=_dec_vbsyy 
     dey
-  //SEG407 [201] if((signed byte) muls8s::i#1!=(signed byte) muls8s::a#0) goto muls8s::@10 -- vbsyy_neq_vbsz1_then_la1 
+  //SEG407 [201] if((signed byte) muls8s::i#1!=(signed byte) muls8s::a#0) goto muls8s::@4 -- vbsyy_neq_vbsz1_then_la1 
     cpy a
-    bne b10
-    jmp b3
+    bne b4
+    jmp b1
 }
 //SEG408 mul8u_compare
 // Perform all possible byte multiplications (slow and fast) and compare the results
@@ -11522,8 +11562,8 @@ mul8u_compare: {
   //SEG410 [203] phi (byte) mul8u_compare::a#7 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mul8u_compare->mul8u_compare::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta a
-  //SEG411 [203] phi from mul8u_compare::@10 to mul8u_compare::@1 [phi:mul8u_compare::@10->mul8u_compare::@1]
-  //SEG412 [203] phi (byte) mul8u_compare::a#7 = (byte) mul8u_compare::a#1 [phi:mul8u_compare::@10->mul8u_compare::@1#0] -- register_copy 
+  //SEG411 [203] phi from mul8u_compare::@8 to mul8u_compare::@1 [phi:mul8u_compare::@8->mul8u_compare::@1]
+  //SEG412 [203] phi (byte) mul8u_compare::a#7 = (byte) mul8u_compare::a#1 [phi:mul8u_compare::@8->mul8u_compare::@1#0] -- register_copy 
   //SEG413 mul8u_compare::@1
   b1:
   //SEG414 [204] phi from mul8u_compare::@1 to mul8u_compare::@2 [phi:mul8u_compare::@1->mul8u_compare::@2]
@@ -11540,7 +11580,7 @@ mul8u_compare: {
   //SEG421 [207] call muls8u 
     jsr muls8u
   //SEG422 [208] (word) muls8u::return#2 ← (word) muls8u::return#0
-  //SEG423 mul8u_compare::@12
+  //SEG423 mul8u_compare::@10
   //SEG424 [209] (word) mul8u_compare::ms#0 ← (word) muls8u::return#2
   //SEG425 [210] (byte) mulf8u::a#0 ← (byte) mul8u_compare::a#7 -- vbuaa=vbuz1 
     lda a
@@ -11549,19 +11589,19 @@ mul8u_compare: {
   //SEG427 [212] call mulf8u 
     jsr mulf8u
   //SEG428 [213] (word) mulf8u::return#2 ← (word) mulf8u::return#0
-  //SEG429 mul8u_compare::@13
+  //SEG429 mul8u_compare::@11
   //SEG430 [214] (word) mul8u_compare::mf#0 ← (word) mulf8u::return#2
   //SEG431 [215] (byte) mul8u::a#2 ← (byte) mul8u_compare::a#7 -- vbuxx=vbuz1 
     ldx a
   //SEG432 [216] (byte) mul8u::b#1 ← (byte) mul8u_compare::b#10 -- vbuaa=vbuz1 
     lda b
   //SEG433 [217] call mul8u 
-  //SEG434 [147] phi from mul8u_compare::@13 to mul8u [phi:mul8u_compare::@13->mul8u]
-  //SEG435 [147] phi (byte) mul8u::a#6 = (byte) mul8u::a#2 [phi:mul8u_compare::@13->mul8u#0] -- register_copy 
-  //SEG436 [147] phi (byte) mul8u::b#2 = (byte) mul8u::b#1 [phi:mul8u_compare::@13->mul8u#1] -- register_copy 
+  //SEG434 [147] phi from mul8u_compare::@11 to mul8u [phi:mul8u_compare::@11->mul8u]
+  //SEG435 [147] phi (byte) mul8u::a#6 = (byte) mul8u::a#2 [phi:mul8u_compare::@11->mul8u#0] -- register_copy 
+  //SEG436 [147] phi (byte) mul8u::b#2 = (byte) mul8u::b#1 [phi:mul8u_compare::@11->mul8u#1] -- register_copy 
     jsr mul8u
   //SEG437 [218] (word) mul8u::return#3 ← (word) mul8u::res#2
-  //SEG438 mul8u_compare::@14
+  //SEG438 mul8u_compare::@12
   //SEG439 [219] (word) mul8u_compare::mn#0 ← (word) mul8u::return#3
   //SEG440 [220] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mf#0) goto mul8u_compare::@3 -- vwuz1_eq_vwuz2_then_la1 
     lda ms
@@ -11571,19 +11611,19 @@ mul8u_compare: {
     cmp mf+1
     beq b6
   !:
-  //SEG441 [221] phi from mul8u_compare::@14 to mul8u_compare::@6 [phi:mul8u_compare::@14->mul8u_compare::@6]
+  //SEG441 [221] phi from mul8u_compare::@12 to mul8u_compare::@6 [phi:mul8u_compare::@12->mul8u_compare::@6]
   //SEG442 mul8u_compare::@6
   //SEG443 [222] phi from mul8u_compare::@6 to mul8u_compare::@3 [phi:mul8u_compare::@6->mul8u_compare::@3]
   //SEG444 [222] phi (byte) mul8u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:mul8u_compare::@6->mul8u_compare::@3#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b3
-  //SEG445 [222] phi from mul8u_compare::@14 to mul8u_compare::@3 [phi:mul8u_compare::@14->mul8u_compare::@3]
+  //SEG445 [222] phi from mul8u_compare::@12 to mul8u_compare::@3 [phi:mul8u_compare::@12->mul8u_compare::@3]
   b6:
-  //SEG446 [222] phi (byte) mul8u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8u_compare::@14->mul8u_compare::@3#0] -- vbuxx=vbuc1 
+  //SEG446 [222] phi (byte) mul8u_compare::ok#4 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mul8u_compare::@12->mul8u_compare::@3#0] -- vbuxx=vbuc1 
     ldx #1
   //SEG447 mul8u_compare::@3
   b3:
-  //SEG448 [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@20 -- vwuz1_eq_vwuz2_then_la1 
+  //SEG448 [223] if((word) mul8u_compare::ms#0==(word) mul8u_compare::mn#0) goto mul8u_compare::@14 -- vwuz1_eq_vwuz2_then_la1 
     lda ms
     cmp mn
     bne !+
@@ -11599,7 +11639,7 @@ mul8u_compare: {
   //SEG452 [225] if((byte) mul8u_compare::ok#3!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u_compare::@5 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b5
-  //SEG453 mul8u_compare::@8
+  //SEG453 mul8u_compare::@7
   //SEG454 [226] *((const byte*) BGCOL#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta BGCOL
@@ -11610,7 +11650,7 @@ mul8u_compare: {
   //SEG458 [230] (word) mul8u_error::mn#0 ← (word) mul8u_compare::mn#0
   //SEG459 [231] (word) mul8u_error::mf#0 ← (word) mul8u_compare::mf#0
   //SEG460 [232] call mul8u_error 
-  //SEG461 [243] phi from mul8u_compare::@8 to mul8u_error [phi:mul8u_compare::@8->mul8u_error]
+  //SEG461 [243] phi from mul8u_compare::@7 to mul8u_error [phi:mul8u_compare::@7->mul8u_error]
     jsr mul8u_error
   //SEG462 mul8u_compare::@return
   breturn:
@@ -11624,36 +11664,36 @@ mul8u_compare: {
     lda b
     cmp #0
     bne b2
-  //SEG467 mul8u_compare::@10
+  //SEG467 mul8u_compare::@8
   //SEG468 [236] (byte) mul8u_compare::a#1 ← ++ (byte) mul8u_compare::a#7 -- vbuz1=_inc_vbuz1 
     inc a
   //SEG469 [237] if((byte) mul8u_compare::a#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mul8u_compare::@1 -- vbuz1_neq_0_then_la1 
     lda a
     cmp #0
     bne b1
-  //SEG470 [238] phi from mul8u_compare::@10 to mul8u_compare::@11 [phi:mul8u_compare::@10->mul8u_compare::@11]
-  //SEG471 mul8u_compare::@11
+  //SEG470 [238] phi from mul8u_compare::@8 to mul8u_compare::@9 [phi:mul8u_compare::@8->mul8u_compare::@9]
+  //SEG471 mul8u_compare::@9
   //SEG472 [239] call print_str 
-  //SEG473 [63] phi from mul8u_compare::@11 to print_str [phi:mul8u_compare::@11->print_str]
-  //SEG474 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#31 [phi:mul8u_compare::@11->print_str#0] -- register_copy 
-  //SEG475 [63] phi (byte*) print_str::str#18 = (const string) mul8u_compare::str [phi:mul8u_compare::@11->print_str#1] -- pbuz1=pbuc1 
+  //SEG473 [63] phi from mul8u_compare::@9 to print_str [phi:mul8u_compare::@9->print_str]
+  //SEG474 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#31 [phi:mul8u_compare::@9->print_str#0] -- register_copy 
+  //SEG475 [63] phi (byte*) print_str::str#18 = (const string) mul8u_compare::str [phi:mul8u_compare::@9->print_str#1] -- pbuz1=pbuc1 
     lda #<str
     sta print_str.str
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG476 [240] phi from mul8u_compare::@11 to mul8u_compare::@16 [phi:mul8u_compare::@11->mul8u_compare::@16]
-  //SEG477 mul8u_compare::@16
+  //SEG476 [240] phi from mul8u_compare::@9 to mul8u_compare::@13 [phi:mul8u_compare::@9->mul8u_compare::@13]
+  //SEG477 mul8u_compare::@13
   //SEG478 [241] call print_ln 
-  //SEG479 [58] phi from mul8u_compare::@16 to print_ln [phi:mul8u_compare::@16->print_ln]
-  //SEG480 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8u_compare::@16->print_ln#0] -- register_copy 
-  //SEG481 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#10 [phi:mul8u_compare::@16->print_ln#1] -- register_copy 
+  //SEG479 [58] phi from mul8u_compare::@13 to print_ln [phi:mul8u_compare::@13->print_ln]
+  //SEG480 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mul8u_compare::@13->print_ln#0] -- register_copy 
+  //SEG481 [58] phi (byte*) print_line_cursor#45 = (byte*) print_line_cursor#10 [phi:mul8u_compare::@13->print_ln#1] -- register_copy 
     jsr print_ln
     jmp breturn
-  //SEG482 [242] phi from mul8u_compare::@3 to mul8u_compare::@20 [phi:mul8u_compare::@3->mul8u_compare::@20]
-  //SEG483 mul8u_compare::@20
-  //SEG484 [224] phi from mul8u_compare::@20 to mul8u_compare::@4 [phi:mul8u_compare::@20->mul8u_compare::@4]
-  //SEG485 [224] phi (byte) mul8u_compare::ok#3 = (byte) mul8u_compare::ok#4 [phi:mul8u_compare::@20->mul8u_compare::@4#0] -- register_copy 
+  //SEG482 [242] phi from mul8u_compare::@3 to mul8u_compare::@14 [phi:mul8u_compare::@3->mul8u_compare::@14]
+  //SEG483 mul8u_compare::@14
+  //SEG484 [224] phi from mul8u_compare::@14 to mul8u_compare::@4 [phi:mul8u_compare::@14->mul8u_compare::@4]
+  //SEG485 [224] phi (byte) mul8u_compare::ok#3 = (byte) mul8u_compare::ok#4 [phi:mul8u_compare::@14->mul8u_compare::@4#0] -- register_copy 
     str: .text "multiply results match!@"
 }
 //SEG486 mul8u_error
@@ -11782,14 +11822,14 @@ mulf8u: {
   //SEG556 [186] phi from mulf8u to mulf8u_prepare [phi:mulf8u->mulf8u_prepare]
   //SEG557 [186] phi (byte) mulf8u_prepare::a#2 = (byte) mulf8u_prepare::a#0 [phi:mulf8u->mulf8u_prepare#0] -- register_copy 
     jsr mulf8u_prepare
-  //SEG558 mulf8u::@2
+  //SEG558 mulf8u::@1
   //SEG559 [268] (byte) mulf8u_prepared::b#0 ← (byte) mulf8u::b#0
   //SEG560 [269] call mulf8u_prepared 
-  //SEG561 [181] phi from mulf8u::@2 to mulf8u_prepared [phi:mulf8u::@2->mulf8u_prepared]
-  //SEG562 [181] phi (byte) mulf8u_prepared::b#2 = (byte) mulf8u_prepared::b#0 [phi:mulf8u::@2->mulf8u_prepared#0] -- register_copy 
+  //SEG561 [181] phi from mulf8u::@1 to mulf8u_prepared [phi:mulf8u::@1->mulf8u_prepared]
+  //SEG562 [181] phi (byte) mulf8u_prepared::b#2 = (byte) mulf8u_prepared::b#0 [phi:mulf8u::@1->mulf8u_prepared#0] -- register_copy 
     jsr mulf8u_prepared
   //SEG563 [270] (word) mulf8u_prepared::return#2 ← (word) mulf8u_prepared::return#0
-  //SEG564 mulf8u::@3
+  //SEG564 mulf8u::@2
   //SEG565 [271] (word) mulf8u::return#0 ← (word) mulf8u_prepared::return#2
   //SEG566 mulf8u::@return
   //SEG567 [272] return 
@@ -11806,19 +11846,19 @@ muls8u: {
   //SEG569 [273] if((byte) muls8u::a#0==(byte/signed byte/word/signed word/dword/signed dword) 0) goto muls8u::@1 -- vbuz1_eq_0_then_la1 
     lda a
     cmp #0
-    beq b2
-  //SEG570 [274] phi from muls8u to muls8u::@4 [phi:muls8u->muls8u::@4]
-  //SEG571 [274] phi (byte) muls8u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@4#0] -- vbuyy=vbuc1 
+    beq b3
+  //SEG570 [274] phi from muls8u to muls8u::@2 [phi:muls8u->muls8u::@2]
+  //SEG571 [274] phi (byte) muls8u::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@2#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG572 [274] phi (word) muls8u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@4#1] -- vwuz1=vbuc1 
+  //SEG572 [274] phi (word) muls8u::m#3 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@2#1] -- vwuz1=vbuc1 
     tya
     sta m
     sta m+1
-  //SEG573 [274] phi from muls8u::@4 to muls8u::@4 [phi:muls8u::@4->muls8u::@4]
-  //SEG574 [274] phi (byte) muls8u::i#2 = (byte) muls8u::i#1 [phi:muls8u::@4->muls8u::@4#0] -- register_copy 
-  //SEG575 [274] phi (word) muls8u::m#3 = (word) muls8u::m#1 [phi:muls8u::@4->muls8u::@4#1] -- register_copy 
-  //SEG576 muls8u::@4
-  b4:
+  //SEG573 [274] phi from muls8u::@2 to muls8u::@2 [phi:muls8u::@2->muls8u::@2]
+  //SEG574 [274] phi (byte) muls8u::i#2 = (byte) muls8u::i#1 [phi:muls8u::@2->muls8u::@2#0] -- register_copy 
+  //SEG575 [274] phi (word) muls8u::m#3 = (word) muls8u::m#1 [phi:muls8u::@2->muls8u::@2#1] -- register_copy 
+  //SEG576 muls8u::@2
+  b2:
   //SEG577 [275] (word) muls8u::m#1 ← (word) muls8u::m#3 + (byte) muls8u::b#0 -- vwuz1=vwuz1_plus_vbuxx 
     txa
     clc
@@ -11829,14 +11869,14 @@ muls8u: {
   !:
   //SEG578 [276] (byte) muls8u::i#1 ← ++ (byte) muls8u::i#2 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG579 [277] if((byte) muls8u::i#1!=(byte) muls8u::a#0) goto muls8u::@4 -- vbuyy_neq_vbuz1_then_la1 
+  //SEG579 [277] if((byte) muls8u::i#1!=(byte) muls8u::a#0) goto muls8u::@2 -- vbuyy_neq_vbuz1_then_la1 
     cpy a
-    bne b4
-  //SEG580 [278] phi from muls8u::@4 to muls8u::@1 [phi:muls8u::@4->muls8u::@1]
-  //SEG581 [278] phi (word) muls8u::return#0 = (word) muls8u::m#1 [phi:muls8u::@4->muls8u::@1#0] -- register_copy 
+    bne b2
+  //SEG580 [278] phi from muls8u::@2 to muls8u::@1 [phi:muls8u::@2->muls8u::@1]
+  //SEG581 [278] phi (word) muls8u::return#0 = (word) muls8u::m#1 [phi:muls8u::@2->muls8u::@1#0] -- register_copy 
     jmp b1
   //SEG582 [278] phi from muls8u to muls8u::@1 [phi:muls8u->muls8u::@1]
-  b2:
+  b3:
   //SEG583 [278] phi (word) muls8u::return#0 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:muls8u->muls8u::@1#0] -- vwuz1=vbuc1 
     lda #0
     sta return
@@ -11891,42 +11931,42 @@ mulf_tables_cmp: {
     lda #>str
     sta print_str.str+1
     jsr print_str
-  //SEG602 mulf_tables_cmp::@6
+  //SEG602 mulf_tables_cmp::@5
   //SEG603 [285] (word~) print_word::w#11 ← (word)(byte*) mulf_tables_cmp::asm_sqr#2
   //SEG604 [286] call print_word 
-  //SEG605 [102] phi from mulf_tables_cmp::@6 to print_word [phi:mulf_tables_cmp::@6->print_word]
-  //SEG606 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@6->print_word#0] -- register_copy 
-  //SEG607 [102] phi (word) print_word::w#6 = (word~) print_word::w#11 [phi:mulf_tables_cmp::@6->print_word#1] -- register_copy 
+  //SEG605 [102] phi from mulf_tables_cmp::@5 to print_word [phi:mulf_tables_cmp::@5->print_word]
+  //SEG606 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@5->print_word#0] -- register_copy 
+  //SEG607 [102] phi (word) print_word::w#6 = (word~) print_word::w#11 [phi:mulf_tables_cmp::@5->print_word#1] -- register_copy 
     jsr print_word
-  //SEG608 [287] phi from mulf_tables_cmp::@6 to mulf_tables_cmp::@7 [phi:mulf_tables_cmp::@6->mulf_tables_cmp::@7]
-  //SEG609 mulf_tables_cmp::@7
+  //SEG608 [287] phi from mulf_tables_cmp::@5 to mulf_tables_cmp::@6 [phi:mulf_tables_cmp::@5->mulf_tables_cmp::@6]
+  //SEG609 mulf_tables_cmp::@6
   //SEG610 [288] call print_str 
-  //SEG611 [63] phi from mulf_tables_cmp::@7 to print_str [phi:mulf_tables_cmp::@7->print_str]
-  //SEG612 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@7->print_str#0] -- register_copy 
-  //SEG613 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str1 [phi:mulf_tables_cmp::@7->print_str#1] -- pbuz1=pbuc1 
+  //SEG611 [63] phi from mulf_tables_cmp::@6 to print_str [phi:mulf_tables_cmp::@6->print_str]
+  //SEG612 [63] phi (byte*) print_char_cursor#152 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@6->print_str#0] -- register_copy 
+  //SEG613 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str1 [phi:mulf_tables_cmp::@6->print_str#1] -- pbuz1=pbuc1 
     lda #<str1
     sta print_str.str
     lda #>str1
     sta print_str.str+1
     jsr print_str
-  //SEG614 mulf_tables_cmp::@8
+  //SEG614 mulf_tables_cmp::@7
   //SEG615 [289] (word~) print_word::w#12 ← (word)(byte*) mulf_tables_cmp::kc_sqr#2 -- vwuz1=vwuz2 
     lda kc_sqr
     sta print_word.w
     lda kc_sqr+1
     sta print_word.w+1
   //SEG616 [290] call print_word 
-  //SEG617 [102] phi from mulf_tables_cmp::@8 to print_word [phi:mulf_tables_cmp::@8->print_word]
-  //SEG618 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@8->print_word#0] -- register_copy 
-  //SEG619 [102] phi (word) print_word::w#6 = (word~) print_word::w#12 [phi:mulf_tables_cmp::@8->print_word#1] -- register_copy 
+  //SEG617 [102] phi from mulf_tables_cmp::@7 to print_word [phi:mulf_tables_cmp::@7->print_word]
+  //SEG618 [102] phi (byte*) print_char_cursor#139 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@7->print_word#0] -- register_copy 
+  //SEG619 [102] phi (word) print_word::w#6 = (word~) print_word::w#12 [phi:mulf_tables_cmp::@7->print_word#1] -- register_copy 
     jsr print_word
-  //SEG620 [291] phi from mulf_tables_cmp::@8 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return]
-  //SEG621 [291] phi (byte*) print_line_cursor#10 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#0] -- pbuz1=pbuc1 
+  //SEG620 [291] phi from mulf_tables_cmp::@7 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@7->mulf_tables_cmp::@return]
+  //SEG621 [291] phi (byte*) print_line_cursor#10 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@7->mulf_tables_cmp::@return#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
     sta print_line_cursor+1
-  //SEG622 [291] phi (byte*) print_char_cursor#31 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#1] -- register_copy 
+  //SEG622 [291] phi (byte*) print_char_cursor#31 = (byte*) print_char_cursor#18 [phi:mulf_tables_cmp::@7->mulf_tables_cmp::@return#1] -- register_copy 
   //SEG623 mulf_tables_cmp::@return
   breturn:
   //SEG624 [292] return 
@@ -11952,27 +11992,27 @@ mulf_tables_cmp: {
     cmp #<mulf_sqr1_lo+$200*4
     bcc b1
   !:
-  //SEG629 [296] phi from mulf_tables_cmp::@2 to mulf_tables_cmp::@5 [phi:mulf_tables_cmp::@2->mulf_tables_cmp::@5]
-  //SEG630 mulf_tables_cmp::@5
+  //SEG629 [296] phi from mulf_tables_cmp::@2 to mulf_tables_cmp::@4 [phi:mulf_tables_cmp::@2->mulf_tables_cmp::@4]
+  //SEG630 mulf_tables_cmp::@4
   //SEG631 [297] call print_str 
-  //SEG632 [63] phi from mulf_tables_cmp::@5 to print_str [phi:mulf_tables_cmp::@5->print_str]
-  //SEG633 [63] phi (byte*) print_char_cursor#152 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@5->print_str#0] -- pbuz1=pbuc1 
+  //SEG632 [63] phi from mulf_tables_cmp::@4 to print_str [phi:mulf_tables_cmp::@4->print_str]
+  //SEG633 [63] phi (byte*) print_char_cursor#152 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@4->print_str#0] -- pbuz1=pbuc1 
     lda #<$400
     sta print_char_cursor
     lda #>$400
     sta print_char_cursor+1
-  //SEG634 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str2 [phi:mulf_tables_cmp::@5->print_str#1] -- pbuz1=pbuc1 
+  //SEG634 [63] phi (byte*) print_str::str#18 = (const string) mulf_tables_cmp::str2 [phi:mulf_tables_cmp::@4->print_str#1] -- pbuz1=pbuc1 
     lda #<str2
     sta print_str.str
     lda #>str2
     sta print_str.str+1
     jsr print_str
-  //SEG635 [298] phi from mulf_tables_cmp::@5 to mulf_tables_cmp::@10 [phi:mulf_tables_cmp::@5->mulf_tables_cmp::@10]
-  //SEG636 mulf_tables_cmp::@10
+  //SEG635 [298] phi from mulf_tables_cmp::@4 to mulf_tables_cmp::@8 [phi:mulf_tables_cmp::@4->mulf_tables_cmp::@8]
+  //SEG636 mulf_tables_cmp::@8
   //SEG637 [299] call print_ln 
-  //SEG638 [58] phi from mulf_tables_cmp::@10 to print_ln [phi:mulf_tables_cmp::@10->print_ln]
-  //SEG639 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@10->print_ln#0] -- register_copy 
-  //SEG640 [58] phi (byte*) print_line_cursor#45 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@10->print_ln#1] -- pbuz1=pbuc1 
+  //SEG638 [58] phi from mulf_tables_cmp::@8 to print_ln [phi:mulf_tables_cmp::@8->print_ln]
+  //SEG639 [58] phi (byte*) print_char_cursor#133 = (byte*) print_char_cursor#132 [phi:mulf_tables_cmp::@8->print_ln#0] -- register_copy 
+  //SEG640 [58] phi (byte*) print_line_cursor#45 = ((byte*))(word/signed word/dword/signed dword) $400 [phi:mulf_tables_cmp::@8->print_ln#1] -- pbuz1=pbuc1 
     lda #<$400
     sta print_line_cursor
     lda #>$400
@@ -11983,9 +12023,9 @@ mulf_tables_cmp: {
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG642 [291] phi from mulf_tables_cmp::@10 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@10->mulf_tables_cmp::@return]
-  //SEG643 [291] phi (byte*) print_line_cursor#10 = (byte*) print_line_cursor#1 [phi:mulf_tables_cmp::@10->mulf_tables_cmp::@return#0] -- register_copy 
-  //SEG644 [291] phi (byte*) print_char_cursor#31 = (byte*~) print_char_cursor#225 [phi:mulf_tables_cmp::@10->mulf_tables_cmp::@return#1] -- register_copy 
+  //SEG642 [291] phi from mulf_tables_cmp::@8 to mulf_tables_cmp::@return [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return]
+  //SEG643 [291] phi (byte*) print_line_cursor#10 = (byte*) print_line_cursor#1 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#0] -- register_copy 
+  //SEG644 [291] phi (byte*) print_char_cursor#31 = (byte*~) print_char_cursor#225 [phi:mulf_tables_cmp::@8->mulf_tables_cmp::@return#1] -- register_copy 
     jmp breturn
     str: .text "multiply table mismatch at @"
     str1: .text " / @"
@@ -12145,29 +12185,29 @@ mulf_init: {
     lda sqr1_lo
     cmp #<mulf_sqr1_lo+$200
     bne b1
-  //SEG685 [323] phi from mulf_init::@2 to mulf_init::@5 [phi:mulf_init::@2->mulf_init::@5]
-  //SEG686 [323] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@5#0] -- vbuz1=vbuc1 
+  //SEG685 [323] phi from mulf_init::@2 to mulf_init::@4 [phi:mulf_init::@2->mulf_init::@4]
+  //SEG686 [323] phi (byte) mulf_init::dir#2 = (byte/word/signed word/dword/signed dword) $ff [phi:mulf_init::@2->mulf_init::@4#0] -- vbuz1=vbuc1 
     lda #$ff
     sta dir
-  //SEG687 [323] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@5#1] -- pbuz1=pbuc1 
+  //SEG687 [323] phi (byte*) mulf_init::sqr2_hi#2 = (const byte[$200]) mulf_sqr2_hi#0 [phi:mulf_init::@2->mulf_init::@4#1] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_hi
     sta sqr2_hi
     lda #>mulf_sqr2_hi
     sta sqr2_hi+1
-  //SEG688 [323] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@5#2] -- pbuz1=pbuc1 
+  //SEG688 [323] phi (byte*) mulf_init::sqr2_lo#2 = (const byte[$200]) mulf_sqr2_lo#0 [phi:mulf_init::@2->mulf_init::@4#2] -- pbuz1=pbuc1 
     lda #<mulf_sqr2_lo
     sta sqr2_lo
     lda #>mulf_sqr2_lo
     sta sqr2_lo+1
-  //SEG689 [323] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@5#3] -- vbuxx=vbuc1 
+  //SEG689 [323] phi (byte) mulf_init::x_255#2 = ((byte))-(byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@2->mulf_init::@4#3] -- vbuxx=vbuc1 
     ldx #-1
-  //SEG690 [323] phi from mulf_init::@6 to mulf_init::@5 [phi:mulf_init::@6->mulf_init::@5]
-  //SEG691 [323] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@6->mulf_init::@5#0] -- register_copy 
-  //SEG692 [323] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@6->mulf_init::@5#1] -- register_copy 
-  //SEG693 [323] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@6->mulf_init::@5#2] -- register_copy 
-  //SEG694 [323] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@6->mulf_init::@5#3] -- register_copy 
-  //SEG695 mulf_init::@5
-  b5:
+  //SEG690 [323] phi from mulf_init::@5 to mulf_init::@4 [phi:mulf_init::@5->mulf_init::@4]
+  //SEG691 [323] phi (byte) mulf_init::dir#2 = (byte) mulf_init::dir#3 [phi:mulf_init::@5->mulf_init::@4#0] -- register_copy 
+  //SEG692 [323] phi (byte*) mulf_init::sqr2_hi#2 = (byte*) mulf_init::sqr2_hi#1 [phi:mulf_init::@5->mulf_init::@4#1] -- register_copy 
+  //SEG693 [323] phi (byte*) mulf_init::sqr2_lo#2 = (byte*) mulf_init::sqr2_lo#1 [phi:mulf_init::@5->mulf_init::@4#2] -- register_copy 
+  //SEG694 [323] phi (byte) mulf_init::x_255#2 = (byte) mulf_init::x_255#1 [phi:mulf_init::@5->mulf_init::@4#3] -- register_copy 
+  //SEG695 mulf_init::@4
+  b4:
   //SEG696 [324] *((byte*) mulf_init::sqr2_lo#2) ← *((const byte[$200]) mulf_sqr1_lo#0 + (byte) mulf_init::x_255#2) -- _deref_pbuz1=pbuc1_derefidx_vbuxx 
     lda mulf_sqr1_lo,x
     ldy #0
@@ -12185,28 +12225,28 @@ mulf_init: {
     clc
     adc dir
     tax
-  //SEG700 [328] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@12 -- vbuxx_neq_0_then_la1 
+  //SEG700 [328] if((byte) mulf_init::x_255#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto mulf_init::@7 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b6
-  //SEG701 [329] phi from mulf_init::@5 to mulf_init::@6 [phi:mulf_init::@5->mulf_init::@6]
-  //SEG702 [329] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@5->mulf_init::@6#0] -- vbuz1=vbuc1 
+    bne b5
+  //SEG701 [329] phi from mulf_init::@4 to mulf_init::@5 [phi:mulf_init::@4->mulf_init::@5]
+  //SEG702 [329] phi (byte) mulf_init::dir#3 = (byte/signed byte/word/signed word/dword/signed dword) 1 [phi:mulf_init::@4->mulf_init::@5#0] -- vbuz1=vbuc1 
     lda #1
     sta dir
-  //SEG703 mulf_init::@6
-  b6:
+  //SEG703 mulf_init::@5
+  b5:
   //SEG704 [330] (byte*) mulf_init::sqr2_lo#1 ← ++ (byte*) mulf_init::sqr2_lo#2 -- pbuz1=_inc_pbuz1 
     inc sqr2_lo
     bne !+
     inc sqr2_lo+1
   !:
-  //SEG705 [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@5 -- pbuz1_neq_pbuc1_then_la1 
+  //SEG705 [331] if((byte*) mulf_init::sqr2_lo#1!=(const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) goto mulf_init::@4 -- pbuz1_neq_pbuc1_then_la1 
     lda sqr2_lo+1
     cmp #>mulf_sqr2_lo+$1ff
-    bne b5
+    bne b4
     lda sqr2_lo
     cmp #<mulf_sqr2_lo+$1ff
-    bne b5
-  //SEG706 mulf_init::@8
+    bne b4
+  //SEG706 mulf_init::@6
   //SEG707 [332] *((const byte[$200]) mulf_sqr2_lo#0+(word/signed word/dword/signed dword) $1ff) ← *((const byte[$200]) mulf_sqr1_lo#0+(word/signed word/dword/signed dword) $100) -- _deref_pbuc1=_deref_pbuc2 
     // Set the very last value g(511) = f(256)
     lda mulf_sqr1_lo+$100
@@ -12217,10 +12257,10 @@ mulf_init: {
   //SEG709 mulf_init::@return
   //SEG710 [334] return 
     rts
-  //SEG711 [335] phi from mulf_init::@5 to mulf_init::@12 [phi:mulf_init::@5->mulf_init::@12]
-  //SEG712 mulf_init::@12
-  //SEG713 [329] phi from mulf_init::@12 to mulf_init::@6 [phi:mulf_init::@12->mulf_init::@6]
-  //SEG714 [329] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@12->mulf_init::@6#0] -- register_copy 
+  //SEG711 [335] phi from mulf_init::@4 to mulf_init::@7 [phi:mulf_init::@4->mulf_init::@7]
+  //SEG712 mulf_init::@7
+  //SEG713 [329] phi from mulf_init::@7 to mulf_init::@5 [phi:mulf_init::@7->mulf_init::@5]
+  //SEG714 [329] phi (byte) mulf_init::dir#3 = (byte) mulf_init::dir#2 [phi:mulf_init::@7->mulf_init::@5#0] -- register_copy 
 }
 //SEG715 print_cls
 // Clear the screen. Also resets current line/char cursor.
diff --git a/src/test/ref/test-multiply-8bit.sym b/src/test/ref/test-multiply-8bit.sym
index 24c987580..2ebb50882 100644
--- a/src/test/ref/test-multiply-8bit.sym
+++ b/src/test/ref/test-multiply-8bit.sym
@@ -1,4 +1,4 @@
-(label) @42
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -19,7 +19,7 @@
 (label) mul8s::@2
 (label) mul8s::@3
 (label) mul8s::@4
-(label) mul8s::@6
+(label) mul8s::@5
 (label) mul8s::@return
 (signed byte) mul8s::a
 (signed byte) mul8s::a#0 a zp ZP_BYTE:2 7.357142857142858
@@ -40,14 +40,14 @@
 (label) mul8s_compare::@12
 (label) mul8s_compare::@13
 (label) mul8s_compare::@14
-(label) mul8s_compare::@16
 (label) mul8s_compare::@2
-(label) mul8s_compare::@20
 (label) mul8s_compare::@3
 (label) mul8s_compare::@4
 (label) mul8s_compare::@5
 (label) mul8s_compare::@6
+(label) mul8s_compare::@7
 (label) mul8s_compare::@8
+(label) mul8s_compare::@9
 (label) mul8s_compare::@return
 (signed byte) mul8s_compare::a
 (signed byte) mul8s_compare::a#1 a zp ZP_BYTE:2 16.5
@@ -92,8 +92,8 @@
 (byte~) mul8u::$1 reg byte a 2002.0
 (label) mul8u::@1
 (label) mul8u::@2
-(label) mul8u::@6
-(label) mul8u::@8
+(label) mul8u::@3
+(label) mul8u::@4
 (label) mul8u::@return
 (byte) mul8u::a
 (byte) mul8u::a#0 reg byte x 1001.0
@@ -123,14 +123,14 @@
 (label) mul8u_compare::@12
 (label) mul8u_compare::@13
 (label) mul8u_compare::@14
-(label) mul8u_compare::@16
 (label) mul8u_compare::@2
-(label) mul8u_compare::@20
 (label) mul8u_compare::@3
 (label) mul8u_compare::@4
 (label) mul8u_compare::@5
 (label) mul8u_compare::@6
+(label) mul8u_compare::@7
 (label) mul8u_compare::@8
+(label) mul8u_compare::@9
 (label) mul8u_compare::@return
 (byte) mul8u_compare::a
 (byte) mul8u_compare::a#1 a zp ZP_BYTE:2 16.5
@@ -180,8 +180,8 @@
 (byte[$200]) mula_sqr2_lo
 (const byte[$200]) mula_sqr2_lo#0 mula_sqr2_lo = { fill( $200, 0) }
 (signed word()) mulf8s((signed byte) mulf8s::a , (signed byte) mulf8s::b)
+(label) mulf8s::@1
 (label) mulf8s::@2
-(label) mulf8s::@4
 (label) mulf8s::@return
 (signed byte) mulf8s::a
 (signed byte) mulf8s::a#0 reg byte a 33.666666666666664
@@ -202,7 +202,7 @@
 (label) mulf8s_prepared::@2
 (label) mulf8s_prepared::@3
 (label) mulf8s_prepared::@4
-(label) mulf8s_prepared::@6
+(label) mulf8s_prepared::@5
 (label) mulf8s_prepared::@return
 (signed byte) mulf8s_prepared::b
 (signed byte) mulf8s_prepared::b#0 b zp ZP_BYTE:3 0.4
@@ -217,8 +217,8 @@
 (signed word) mulf8s_prepared::return
 (signed word) mulf8s_prepared::return#2 return zp ZP_WORD:14 4.0
 (word()) mulf8u((byte) mulf8u::a , (byte) mulf8u::b)
+(label) mulf8u::@1
 (label) mulf8u::@2
-(label) mulf8u::@3
 (label) mulf8u::@return
 (byte) mulf8u::a
 (byte) mulf8u::a#0 reg byte a 51.5
@@ -254,12 +254,12 @@
 (byte~) mulf_init::$12 reg byte a 22.0
 (byte~) mulf_init::$8 reg byte a 22.0
 (label) mulf_init::@1
-(label) mulf_init::@12
 (label) mulf_init::@2
 (label) mulf_init::@3
+(label) mulf_init::@4
 (label) mulf_init::@5
 (label) mulf_init::@6
-(label) mulf_init::@8
+(label) mulf_init::@7
 (label) mulf_init::@return
 (byte) mulf_init::c
 (byte) mulf_init::c#1 reg byte x 2.357142857142857
@@ -305,9 +305,9 @@
 (const byte[$200]) mulf_sqr2_lo#0 mulf_sqr2_lo = { fill( $200, 0) }
 (void()) mulf_tables_cmp()
 (label) mulf_tables_cmp::@1
-(label) mulf_tables_cmp::@10
 (label) mulf_tables_cmp::@2
 (label) mulf_tables_cmp::@3
+(label) mulf_tables_cmp::@4
 (label) mulf_tables_cmp::@5
 (label) mulf_tables_cmp::@6
 (label) mulf_tables_cmp::@7
@@ -323,10 +323,10 @@
 (const string) mulf_tables_cmp::str1 str1 = (string) " / @"
 (const string) mulf_tables_cmp::str2 str2 = (string) "multiply tables match!@"
 (signed word()) muls8s((signed byte) muls8s::a , (signed byte) muls8s::b)
-(label) muls8s::@10
+(label) muls8s::@1
+(label) muls8s::@2
 (label) muls8s::@3
 (label) muls8s::@4
-(label) muls8s::@8
 (label) muls8s::@return
 (signed byte) muls8s::a
 (signed byte) muls8s::a#0 a zp ZP_BYTE:2 175.58333333333334
@@ -348,7 +348,7 @@
 (signed word) muls8s::return#2 return zp ZP_WORD:8 202.0
 (word()) muls8u((byte) muls8u::a , (byte) muls8u::b)
 (label) muls8u::@1
-(label) muls8u::@4
+(label) muls8u::@2
 (label) muls8u::@return
 (byte) muls8u::a
 (byte) muls8u::a#0 a zp ZP_BYTE:2 157.71428571428572
@@ -415,7 +415,7 @@
 (label) print_sbyte::@1
 (label) print_sbyte::@2
 (label) print_sbyte::@3
-(label) print_sbyte::@5
+(label) print_sbyte::@4
 (label) print_sbyte::@return
 (signed byte) print_sbyte::b
 (signed byte) print_sbyte::b#0 reg byte x 4.0
@@ -435,7 +435,7 @@
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:8 4.0
diff --git a/src/test/ref/test-scroll-up.cfg b/src/test/ref/test-scroll-up.cfg
index 6d8adf2f0..606ec6649 100644
--- a/src/test/ref/test-scroll-up.cfg
+++ b/src/test/ref/test-scroll-up.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @4
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @4
+main: scope:[main]  from @1
   [4] phi()
   [5] call scrollup1 
   to:main::@1
diff --git a/src/test/ref/test-scroll-up.log b/src/test/ref/test-scroll-up.log
index c55f5c33c..767060ece 100644
--- a/src/test/ref/test-scroll-up.log
+++ b/src/test/ref/test-scroll-up.log
@@ -314,8 +314,9 @@ Culled Empty Block (label) scrollup2::@5
 Culled Empty Block (label) scrollup2::@6
 Culled Empty Block (label) scrollup1::@5
 Culled Empty Block (label) scrollup1::@6
+Renumbering block @4 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @4
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
@@ -327,14 +328,14 @@ Adding NOP phi() at start of scrollup1
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@4
-@4: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @4
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @4
+main: scope:[main]  from @1
   [4] phi()
   [5] call scrollup1 
   to:main::@1
@@ -505,17 +506,17 @@ INITIAL ASM
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-b4_from_bbegin:
-  jmp b4
-//SEG5 @4
-b4:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @4 to main [phi:@4->main]
-main_from_b4:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @4 to @end [phi:@4->@end]
-bend_from_b4:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -899,17 +900,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label screen = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-b4_from_bbegin:
-  jmp b4
-//SEG5 @4
-b4:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @4 to main [phi:@4->main]
-main_from_b4:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @4 to @end [phi:@4->@end]
-bend_from_b4:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1214,7 +1215,7 @@ scrollup1: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b4
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
@@ -1244,10 +1245,10 @@ Replacing label b1_from_b3 with b1
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
 Replacing label b1_from_b3 with b1
-Removing instruction b4_from_bbegin:
-Removing instruction b4:
-Removing instruction main_from_b4:
-Removing instruction bend_from_b4:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
 Removing instruction scrollup2_from_b1:
 Removing instruction b2_from_b1:
@@ -1291,7 +1292,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @4
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -1369,11 +1370,11 @@ Score: 22247
 //SEG2 Global Constants & labels
   .label screen = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @4 [phi:@begin->@4]
-//SEG5 @4
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @4 to main [phi:@4->main]
-//SEG8 [3] phi from @4 to @end [phi:@4->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/test-scroll-up.sym b/src/test/ref/test-scroll-up.sym
index 4793bbc63..5a0c85229 100644
--- a/src/test/ref/test-scroll-up.sym
+++ b/src/test/ref/test-scroll-up.sym
@@ -1,4 +1,4 @@
-(label) @4
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/test-signed-word-minus-byte.asm b/src/test/ref/test-signed-word-minus-byte.asm
index 2444104b2..7323f8d14 100644
--- a/src/test/ref/test-signed-word-minus-byte.asm
+++ b/src/test/ref/test-signed-word-minus-byte.asm
@@ -51,9 +51,9 @@ main: {
     jsr print_ln
     inx
     cpx #$b
-    bne b8
+    bne b6
     rts
-  b8:
+  b6:
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
diff --git a/src/test/ref/test-signed-word-minus-byte.cfg b/src/test/ref/test-signed-word-minus-byte.cfg
index e53fe6c74..254096a73 100644
--- a/src/test/ref/test-signed-word-minus-byte.cfg
+++ b/src/test/ref/test-signed-word-minus-byte.cfg
@@ -1,49 +1,49 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main main::@8
-  [6] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::i#1 )
-  [6] (byte*) print_line_cursor#19 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@8/(byte*) print_line_cursor#1 )
-  [6] (byte*) print_char_cursor#50 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@8/(byte*~) print_char_cursor#54 )
-  [6] (signed word) main::w1#2 ← phi( main/(word/signed word/dword/signed dword) $4d2 main::@8/(signed word) main::w1#1 )
+main::@1: scope:[main]  from main main::@6
+  [6] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::i#1 )
+  [6] (byte*) print_line_cursor#19 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(byte*) print_line_cursor#1 )
+  [6] (byte*) print_char_cursor#50 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(byte*~) print_char_cursor#54 )
+  [6] (signed word) main::w1#2 ← phi( main/(word/signed word/dword/signed dword) $4d2 main::@6/(signed word) main::w1#1 )
   [7] (signed word) main::w2#0 ← (signed word) main::w1#2 - (byte/signed byte/word/signed word/dword/signed dword) $5b
   [8] (signed word) main::w1#1 ← (signed word) main::w2#0 - (byte/signed byte/word/signed word/dword/signed dword) $29
   [9] (signed word) print_sword::w#1 ← (signed word) main::w1#1
   [10] call print_sword 
-  to:main::@4
-main::@4: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [11] phi()
   [12] call print_char 
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [13] (signed word) print_sword::w#2 ← (signed word) main::w2#0
   [14] call print_sword 
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [15] phi()
   [16] call print_ln 
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [17] (byte) main::i#1 ← ++ (byte) main::i#2
-  [18] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8
+  [18] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6
   to:main::@return
-main::@return: scope:[main]  from main::@7
+main::@return: scope:[main]  from main::@5
   [19] return 
   to:@return
-main::@8: scope:[main]  from main::@7
+main::@6: scope:[main]  from main::@5
   [20] (byte*~) print_char_cursor#54 ← (byte*) print_line_cursor#1
   to:main::@1
-print_ln: scope:[print_ln]  from main::@6
+print_ln: scope:[print_ln]  from main::@4
   [21] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -54,21 +54,21 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [25] return 
   to:@return
-print_sword: scope:[print_sword]  from main::@1 main::@5
-  [26] (byte*) print_char_cursor#46 ← phi( main::@1/(byte*) print_char_cursor#50 main::@5/(byte*) print_char_cursor#12 )
-  [26] (signed word) print_sword::w#3 ← phi( main::@1/(signed word) print_sword::w#1 main::@5/(signed word) print_sword::w#2 )
+print_sword: scope:[print_sword]  from main::@1 main::@3
+  [26] (byte*) print_char_cursor#46 ← phi( main::@1/(byte*) print_char_cursor#50 main::@3/(byte*) print_char_cursor#12 )
+  [26] (signed word) print_sword::w#3 ← phi( main::@1/(signed word) print_sword::w#1 main::@3/(signed word) print_sword::w#2 )
   [27] if((signed word) print_sword::w#3>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sword::@1
   to:print_sword::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [28] phi()
   [29] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [30] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [31] (byte*) print_char_cursor#45 ← phi( print_sword/(byte*) print_char_cursor#46 print_sword::@4/(byte*) print_char_cursor#12 )
-  [31] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [31] (byte*) print_char_cursor#45 ← phi( print_sword/(byte*) print_char_cursor#46 print_sword::@3/(byte*) print_char_cursor#12 )
+  [31] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@3/(signed word) print_sword::w#0 )
   [32] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
@@ -100,9 +100,9 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [46] return 
   to:@return
-print_char: scope:[print_char]  from main::@4 print_byte print_byte::@1 print_sword::@2
-  [47] (byte*) print_char_cursor#34 ← phi( main::@4/(byte*) print_char_cursor#12 print_byte/(byte*) print_char_cursor#48 print_byte::@1/(byte*) print_char_cursor#12 print_sword::@2/(byte*) print_char_cursor#46 )
-  [47] (byte) print_char::ch#4 ← phi( main::@4/(byte) ' ' print_byte/(byte) print_char::ch#1 print_byte::@1/(byte) print_char::ch#2 print_sword::@2/(byte) '-' )
+print_char: scope:[print_char]  from main::@2 print_byte print_byte::@1 print_sword::@2
+  [47] (byte*) print_char_cursor#34 ← phi( main::@2/(byte*) print_char_cursor#12 print_byte/(byte*) print_char_cursor#48 print_byte::@1/(byte*) print_char_cursor#12 print_sword::@2/(byte*) print_char_cursor#46 )
+  [47] (byte) print_char::ch#4 ← phi( main::@2/(byte) ' ' print_byte/(byte) print_char::ch#1 print_byte::@1/(byte) print_char::ch#2 print_sword::@2/(byte) '-' )
   [48] *((byte*) print_char_cursor#34) ← (byte) print_char::ch#4
   [49] (byte*) print_char_cursor#12 ← ++ (byte*) print_char_cursor#34
   to:print_char::@return
diff --git a/src/test/ref/test-signed-word-minus-byte.log b/src/test/ref/test-signed-word-minus-byte.log
index c342beb20..891d138e4 100644
--- a/src/test/ref/test-signed-word-minus-byte.log
+++ b/src/test/ref/test-signed-word-minus-byte.log
@@ -589,12 +589,19 @@ Coalesced down to 8 phi equivalence classes
 Culled Empty Block (label) print_ln::@3
 Culled Empty Block (label) print_sword::@5
 Culled Empty Block (label) print_cls::@3
+Renumbering block @20 to @1
+Renumbering block print_sword::@4 to print_sword::@3
+Renumbering block main::@4 to main::@2
+Renumbering block main::@5 to main::@3
+Renumbering block main::@6 to main::@4
+Renumbering block main::@7 to main::@5
+Renumbering block main::@8 to main::@6
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @20
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
+Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of main::@4
-Adding NOP phi() at start of main::@6
 Adding NOP phi() at start of print_ln
 Adding NOP phi() at start of print_sword::@2
 Adding NOP phi() at start of print_cls
@@ -602,50 +609,50 @@ Adding NOP phi() at start of print_cls
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@20
-@20: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @20
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @20
+main: scope:[main]  from @1
   [4] phi()
   [5] call print_cls 
   to:main::@1
-main::@1: scope:[main]  from main main::@8
-  [6] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@8/(byte) main::i#1 )
-  [6] (byte*) print_line_cursor#19 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@8/(byte*) print_line_cursor#1 )
-  [6] (byte*) print_char_cursor#50 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@8/(byte*~) print_char_cursor#54 )
-  [6] (signed word) main::w1#2 ← phi( main/(word/signed word/dword/signed dword) $4d2 main::@8/(signed word) main::w1#1 )
+main::@1: scope:[main]  from main main::@6
+  [6] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::i#1 )
+  [6] (byte*) print_line_cursor#19 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(byte*) print_line_cursor#1 )
+  [6] (byte*) print_char_cursor#50 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@6/(byte*~) print_char_cursor#54 )
+  [6] (signed word) main::w1#2 ← phi( main/(word/signed word/dword/signed dword) $4d2 main::@6/(signed word) main::w1#1 )
   [7] (signed word) main::w2#0 ← (signed word) main::w1#2 - (byte/signed byte/word/signed word/dword/signed dword) $5b
   [8] (signed word) main::w1#1 ← (signed word) main::w2#0 - (byte/signed byte/word/signed word/dword/signed dword) $29
   [9] (signed word) print_sword::w#1 ← (signed word) main::w1#1
   [10] call print_sword 
-  to:main::@4
-main::@4: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [11] phi()
   [12] call print_char 
-  to:main::@5
-main::@5: scope:[main]  from main::@4
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [13] (signed word) print_sword::w#2 ← (signed word) main::w2#0
   [14] call print_sword 
-  to:main::@6
-main::@6: scope:[main]  from main::@5
+  to:main::@4
+main::@4: scope:[main]  from main::@3
   [15] phi()
   [16] call print_ln 
-  to:main::@7
-main::@7: scope:[main]  from main::@6
+  to:main::@5
+main::@5: scope:[main]  from main::@4
   [17] (byte) main::i#1 ← ++ (byte) main::i#2
-  [18] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8
+  [18] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6
   to:main::@return
-main::@return: scope:[main]  from main::@7
+main::@return: scope:[main]  from main::@5
   [19] return 
   to:@return
-main::@8: scope:[main]  from main::@7
+main::@6: scope:[main]  from main::@5
   [20] (byte*~) print_char_cursor#54 ← (byte*) print_line_cursor#1
   to:main::@1
-print_ln: scope:[print_ln]  from main::@6
+print_ln: scope:[print_ln]  from main::@4
   [21] phi()
   to:print_ln::@1
 print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
@@ -656,21 +663,21 @@ print_ln::@1: scope:[print_ln]  from print_ln print_ln::@1
 print_ln::@return: scope:[print_ln]  from print_ln::@1
   [25] return 
   to:@return
-print_sword: scope:[print_sword]  from main::@1 main::@5
-  [26] (byte*) print_char_cursor#46 ← phi( main::@1/(byte*) print_char_cursor#50 main::@5/(byte*) print_char_cursor#12 )
-  [26] (signed word) print_sword::w#3 ← phi( main::@1/(signed word) print_sword::w#1 main::@5/(signed word) print_sword::w#2 )
+print_sword: scope:[print_sword]  from main::@1 main::@3
+  [26] (byte*) print_char_cursor#46 ← phi( main::@1/(byte*) print_char_cursor#50 main::@3/(byte*) print_char_cursor#12 )
+  [26] (signed word) print_sword::w#3 ← phi( main::@1/(signed word) print_sword::w#1 main::@3/(signed word) print_sword::w#2 )
   [27] if((signed word) print_sword::w#3>=(byte/signed byte/word/signed word/dword/signed dword) 0) goto print_sword::@1
   to:print_sword::@2
 print_sword::@2: scope:[print_sword]  from print_sword
   [28] phi()
   [29] call print_char 
-  to:print_sword::@4
-print_sword::@4: scope:[print_sword]  from print_sword::@2
+  to:print_sword::@3
+print_sword::@3: scope:[print_sword]  from print_sword::@2
   [30] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3
   to:print_sword::@1
-print_sword::@1: scope:[print_sword]  from print_sword print_sword::@4
-  [31] (byte*) print_char_cursor#45 ← phi( print_sword/(byte*) print_char_cursor#46 print_sword::@4/(byte*) print_char_cursor#12 )
-  [31] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@4/(signed word) print_sword::w#0 )
+print_sword::@1: scope:[print_sword]  from print_sword print_sword::@3
+  [31] (byte*) print_char_cursor#45 ← phi( print_sword/(byte*) print_char_cursor#46 print_sword::@3/(byte*) print_char_cursor#12 )
+  [31] (signed word) print_sword::w#4 ← phi( print_sword/(signed word) print_sword::w#3 print_sword::@3/(signed word) print_sword::w#0 )
   [32] call print_word 
   to:print_sword::@return
 print_sword::@return: scope:[print_sword]  from print_sword::@1
@@ -702,9 +709,9 @@ print_byte::@1: scope:[print_byte]  from print_byte
 print_byte::@return: scope:[print_byte]  from print_byte::@1
   [46] return 
   to:@return
-print_char: scope:[print_char]  from main::@4 print_byte print_byte::@1 print_sword::@2
-  [47] (byte*) print_char_cursor#34 ← phi( main::@4/(byte*) print_char_cursor#12 print_byte/(byte*) print_char_cursor#48 print_byte::@1/(byte*) print_char_cursor#12 print_sword::@2/(byte*) print_char_cursor#46 )
-  [47] (byte) print_char::ch#4 ← phi( main::@4/(byte) ' ' print_byte/(byte) print_char::ch#1 print_byte::@1/(byte) print_char::ch#2 print_sword::@2/(byte) '-' )
+print_char: scope:[print_char]  from main::@2 print_byte print_byte::@1 print_sword::@2
+  [47] (byte*) print_char_cursor#34 ← phi( main::@2/(byte*) print_char_cursor#12 print_byte/(byte*) print_char_cursor#48 print_byte::@1/(byte*) print_char_cursor#12 print_sword::@2/(byte*) print_char_cursor#46 )
+  [47] (byte) print_char::ch#4 ← phi( main::@2/(byte) ' ' print_byte/(byte) print_char::ch#1 print_byte::@1/(byte) print_char::ch#2 print_sword::@2/(byte) '-' )
   [48] *((byte*) print_char_cursor#34) ← (byte) print_char::ch#4
   [49] (byte*) print_char_cursor#12 ← ++ (byte*) print_char_cursor#34
   to:print_char::@return
@@ -824,17 +831,17 @@ INITIAL ASM
   .label print_char_cursor = $b
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -897,69 +904,69 @@ main: {
   //SEG24 [26] phi (byte*) print_char_cursor#46 = (byte*) print_char_cursor#50 [phi:main::@1->print_sword#0] -- register_copy 
   //SEG25 [26] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:main::@1->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG26 [11] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  b4_from_b1:
-    jmp b4
-  //SEG27 main::@4
-  b4:
+  //SEG26 [11] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG27 main::@2
+  b2:
   //SEG28 [12] call print_char 
-  //SEG29 [47] phi from main::@4 to print_char [phi:main::@4->print_char]
-  print_char_from_b4:
-  //SEG30 [47] phi (byte*) print_char_cursor#34 = (byte*) print_char_cursor#12 [phi:main::@4->print_char#0] -- register_copy 
-  //SEG31 [47] phi (byte) print_char::ch#4 = (byte) ' ' [phi:main::@4->print_char#1] -- vbuz1=vbuc1 
+  //SEG29 [47] phi from main::@2 to print_char [phi:main::@2->print_char]
+  print_char_from_b2:
+  //SEG30 [47] phi (byte*) print_char_cursor#34 = (byte*) print_char_cursor#12 [phi:main::@2->print_char#0] -- register_copy 
+  //SEG31 [47] phi (byte) print_char::ch#4 = (byte) ' ' [phi:main::@2->print_char#1] -- vbuz1=vbuc1 
     lda #' '
     sta print_char.ch
     jsr print_char
-    jmp b5
-  //SEG32 main::@5
-  b5:
+    jmp b3
+  //SEG32 main::@3
+  b3:
   //SEG33 [13] (signed word) print_sword::w#2 ← (signed word) main::w2#0 -- vwsz1=vwsz2 
     lda w2
     sta print_sword.w
     lda w2+1
     sta print_sword.w+1
   //SEG34 [14] call print_sword 
-  //SEG35 [26] phi from main::@5 to print_sword [phi:main::@5->print_sword]
-  print_sword_from_b5:
-  //SEG36 [26] phi (byte*) print_char_cursor#46 = (byte*) print_char_cursor#12 [phi:main::@5->print_sword#0] -- register_copy 
-  //SEG37 [26] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:main::@5->print_sword#1] -- register_copy 
+  //SEG35 [26] phi from main::@3 to print_sword [phi:main::@3->print_sword]
+  print_sword_from_b3:
+  //SEG36 [26] phi (byte*) print_char_cursor#46 = (byte*) print_char_cursor#12 [phi:main::@3->print_sword#0] -- register_copy 
+  //SEG37 [26] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:main::@3->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG38 [15] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG39 main::@6
-  b6:
+  //SEG38 [15] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG39 main::@4
+  b4:
   //SEG40 [16] call print_ln 
-  //SEG41 [21] phi from main::@6 to print_ln [phi:main::@6->print_ln]
-  print_ln_from_b6:
+  //SEG41 [21] phi from main::@4 to print_ln [phi:main::@4->print_ln]
+  print_ln_from_b4:
     jsr print_ln
-    jmp b7
-  //SEG42 main::@7
-  b7:
+    jmp b5
+  //SEG42 main::@5
+  b5:
   //SEG43 [17] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG44 [18] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG44 [18] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp i
-    bne b8
+    bne b6
     jmp breturn
   //SEG45 main::@return
   breturn:
   //SEG46 [19] return 
     rts
-  //SEG47 main::@8
-  b8:
+  //SEG47 main::@6
+  b6:
   //SEG48 [20] (byte*~) print_char_cursor#54 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG49 [6] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  b1_from_b8:
-  //SEG50 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG51 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@8->main::@1#1] -- register_copy 
-  //SEG52 [6] phi (byte*) print_char_cursor#50 = (byte*~) print_char_cursor#54 [phi:main::@8->main::@1#2] -- register_copy 
-  //SEG53 [6] phi (signed word) main::w1#2 = (signed word) main::w1#1 [phi:main::@8->main::@1#3] -- register_copy 
+  //SEG49 [6] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG50 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG51 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@6->main::@1#1] -- register_copy 
+  //SEG52 [6] phi (byte*) print_char_cursor#50 = (byte*~) print_char_cursor#54 [phi:main::@6->main::@1#2] -- register_copy 
+  //SEG53 [6] phi (signed word) main::w1#2 = (signed word) main::w1#1 [phi:main::@6->main::@1#3] -- register_copy 
     jmp b1
 }
 //SEG54 print_ln
@@ -1016,9 +1023,9 @@ print_sword: {
     lda #'-'
     sta print_char.ch
     jsr print_char
-    jmp b4
-  //SEG70 print_sword::@4
-  b4:
+    jmp b3
+  //SEG70 print_sword::@3
+  b3:
   //SEG71 [30] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -1029,11 +1036,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG72 [31] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG72 [31] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG73 [31] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG74 [31] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG73 [31] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG74 [31] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG75 print_sword::@1
   b1:
@@ -1272,17 +1279,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_char_cursor = 9
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-b20_from_bbegin:
-  jmp b20
-//SEG5 @20
-b20:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-main_from_b20:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
-bend_from_b20:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1343,67 +1350,67 @@ main: {
   //SEG24 [26] phi (byte*) print_char_cursor#46 = (byte*) print_char_cursor#50 [phi:main::@1->print_sword#0] -- register_copy 
   //SEG25 [26] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:main::@1->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG26 [11] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  b4_from_b1:
-    jmp b4
-  //SEG27 main::@4
-  b4:
+  //SEG26 [11] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG27 main::@2
+  b2:
   //SEG28 [12] call print_char 
-  //SEG29 [47] phi from main::@4 to print_char [phi:main::@4->print_char]
-  print_char_from_b4:
-  //SEG30 [47] phi (byte*) print_char_cursor#34 = (byte*) print_char_cursor#12 [phi:main::@4->print_char#0] -- register_copy 
-  //SEG31 [47] phi (byte) print_char::ch#4 = (byte) ' ' [phi:main::@4->print_char#1] -- vbuaa=vbuc1 
+  //SEG29 [47] phi from main::@2 to print_char [phi:main::@2->print_char]
+  print_char_from_b2:
+  //SEG30 [47] phi (byte*) print_char_cursor#34 = (byte*) print_char_cursor#12 [phi:main::@2->print_char#0] -- register_copy 
+  //SEG31 [47] phi (byte) print_char::ch#4 = (byte) ' ' [phi:main::@2->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-    jmp b5
-  //SEG32 main::@5
-  b5:
+    jmp b3
+  //SEG32 main::@3
+  b3:
   //SEG33 [13] (signed word) print_sword::w#2 ← (signed word) main::w2#0 -- vwsz1=vwsz2 
     lda w2
     sta print_sword.w
     lda w2+1
     sta print_sword.w+1
   //SEG34 [14] call print_sword 
-  //SEG35 [26] phi from main::@5 to print_sword [phi:main::@5->print_sword]
-  print_sword_from_b5:
-  //SEG36 [26] phi (byte*) print_char_cursor#46 = (byte*) print_char_cursor#12 [phi:main::@5->print_sword#0] -- register_copy 
-  //SEG37 [26] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:main::@5->print_sword#1] -- register_copy 
+  //SEG35 [26] phi from main::@3 to print_sword [phi:main::@3->print_sword]
+  print_sword_from_b3:
+  //SEG36 [26] phi (byte*) print_char_cursor#46 = (byte*) print_char_cursor#12 [phi:main::@3->print_sword#0] -- register_copy 
+  //SEG37 [26] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:main::@3->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG38 [15] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  b6_from_b5:
-    jmp b6
-  //SEG39 main::@6
-  b6:
+  //SEG38 [15] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+    jmp b4
+  //SEG39 main::@4
+  b4:
   //SEG40 [16] call print_ln 
-  //SEG41 [21] phi from main::@6 to print_ln [phi:main::@6->print_ln]
-  print_ln_from_b6:
+  //SEG41 [21] phi from main::@4 to print_ln [phi:main::@4->print_ln]
+  print_ln_from_b4:
     jsr print_ln
-    jmp b7
-  //SEG42 main::@7
-  b7:
+    jmp b5
+  //SEG42 main::@5
+  b5:
   //SEG43 [17] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG44 [18] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG44 [18] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b8
+    bne b6
     jmp breturn
   //SEG45 main::@return
   breturn:
   //SEG46 [19] return 
     rts
-  //SEG47 main::@8
-  b8:
+  //SEG47 main::@6
+  b6:
   //SEG48 [20] (byte*~) print_char_cursor#54 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG49 [6] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  b1_from_b8:
-  //SEG50 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG51 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@8->main::@1#1] -- register_copy 
-  //SEG52 [6] phi (byte*) print_char_cursor#50 = (byte*~) print_char_cursor#54 [phi:main::@8->main::@1#2] -- register_copy 
-  //SEG53 [6] phi (signed word) main::w1#2 = (signed word) main::w1#1 [phi:main::@8->main::@1#3] -- register_copy 
+  //SEG49 [6] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  b1_from_b6:
+  //SEG50 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG51 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@6->main::@1#1] -- register_copy 
+  //SEG52 [6] phi (byte*) print_char_cursor#50 = (byte*~) print_char_cursor#54 [phi:main::@6->main::@1#2] -- register_copy 
+  //SEG53 [6] phi (signed word) main::w1#2 = (signed word) main::w1#1 [phi:main::@6->main::@1#3] -- register_copy 
     jmp b1
 }
 //SEG54 print_ln
@@ -1459,9 +1466,9 @@ print_sword: {
   //SEG69 [47] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-    jmp b4
-  //SEG70 print_sword::@4
-  b4:
+    jmp b3
+  //SEG70 print_sword::@3
+  b3:
   //SEG71 [30] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -1472,11 +1479,11 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG72 [31] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
+  //SEG72 [31] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
   b1_from_print_sword:
-  b1_from_b4:
-  //SEG73 [31] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG74 [31] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  b1_from_b3:
+  //SEG73 [31] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG74 [31] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
     jmp b1
   //SEG75 print_sword::@1
   b1:
@@ -1620,18 +1627,18 @@ print_cls: {
   print_hextab: .text "0123456789abcdef"
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b20
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b3
 Removing instruction jmp b4
 Removing instruction jmp b5
-Removing instruction jmp b6
-Removing instruction jmp b7
 Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b2
-Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -1647,36 +1654,36 @@ Replacing label b1_from_b1 with b1
 Replacing label b1_from_print_sword with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b20_from_bbegin:
-Removing instruction b20:
-Removing instruction main_from_b20:
-Removing instruction bend_from_b20:
-Removing instruction b4_from_b1:
-Removing instruction print_char_from_b4:
-Removing instruction b6_from_b5:
-Removing instruction print_ln_from_b6:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b2_from_b1:
+Removing instruction print_char_from_b2:
+Removing instruction b4_from_b3:
+Removing instruction print_ln_from_b4:
 Removing instruction b1_from_print_ln:
 Removing instruction b1_from_b1:
 Removing instruction b2_from_print_sword:
 Removing instruction print_char_from_b2:
 Removing instruction b1_from_print_sword:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction print_cls_from_main:
 Removing instruction b1_from_main:
 Removing instruction print_sword_from_b1:
+Removing instruction b2:
+Removing instruction b3:
+Removing instruction print_sword_from_b3:
 Removing instruction b4:
 Removing instruction b5:
-Removing instruction print_sword_from_b5:
-Removing instruction b6:
-Removing instruction b7:
 Removing instruction breturn:
-Removing instruction b1_from_b8:
+Removing instruction b1_from_b6:
 Removing instruction breturn:
 Removing instruction b2:
-Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn:
 Removing instruction print_byte_from_print_word:
 Removing instruction b1:
@@ -1699,16 +1706,16 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
 (label) main::@1
+(label) main::@2
+(label) main::@3
 (label) main::@4
 (label) main::@5
 (label) main::@6
-(label) main::@7
-(label) main::@8
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 11.0
@@ -1760,7 +1767,7 @@ FINAL SYMBOL TABLE
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:6 4.0
@@ -1798,11 +1805,11 @@ Score: 5509
   .label print_line_cursor = 4
   .label print_char_cursor = 9
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @20 [phi:@begin->@20]
-//SEG5 @20
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @20 to main [phi:@20->main]
-//SEG8 [3] phi from @20 to @end [phi:@20->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -1857,51 +1864,51 @@ main: {
   //SEG24 [26] phi (byte*) print_char_cursor#46 = (byte*) print_char_cursor#50 [phi:main::@1->print_sword#0] -- register_copy 
   //SEG25 [26] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#1 [phi:main::@1->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG26 [11] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  //SEG27 main::@4
+  //SEG26 [11] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG27 main::@2
   //SEG28 [12] call print_char 
-  //SEG29 [47] phi from main::@4 to print_char [phi:main::@4->print_char]
-  //SEG30 [47] phi (byte*) print_char_cursor#34 = (byte*) print_char_cursor#12 [phi:main::@4->print_char#0] -- register_copy 
-  //SEG31 [47] phi (byte) print_char::ch#4 = (byte) ' ' [phi:main::@4->print_char#1] -- vbuaa=vbuc1 
+  //SEG29 [47] phi from main::@2 to print_char [phi:main::@2->print_char]
+  //SEG30 [47] phi (byte*) print_char_cursor#34 = (byte*) print_char_cursor#12 [phi:main::@2->print_char#0] -- register_copy 
+  //SEG31 [47] phi (byte) print_char::ch#4 = (byte) ' ' [phi:main::@2->print_char#1] -- vbuaa=vbuc1 
     lda #' '
     jsr print_char
-  //SEG32 main::@5
+  //SEG32 main::@3
   //SEG33 [13] (signed word) print_sword::w#2 ← (signed word) main::w2#0 -- vwsz1=vwsz2 
     lda w2
     sta print_sword.w
     lda w2+1
     sta print_sword.w+1
   //SEG34 [14] call print_sword 
-  //SEG35 [26] phi from main::@5 to print_sword [phi:main::@5->print_sword]
-  //SEG36 [26] phi (byte*) print_char_cursor#46 = (byte*) print_char_cursor#12 [phi:main::@5->print_sword#0] -- register_copy 
-  //SEG37 [26] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:main::@5->print_sword#1] -- register_copy 
+  //SEG35 [26] phi from main::@3 to print_sword [phi:main::@3->print_sword]
+  //SEG36 [26] phi (byte*) print_char_cursor#46 = (byte*) print_char_cursor#12 [phi:main::@3->print_sword#0] -- register_copy 
+  //SEG37 [26] phi (signed word) print_sword::w#3 = (signed word) print_sword::w#2 [phi:main::@3->print_sword#1] -- register_copy 
     jsr print_sword
-  //SEG38 [15] phi from main::@5 to main::@6 [phi:main::@5->main::@6]
-  //SEG39 main::@6
+  //SEG38 [15] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG39 main::@4
   //SEG40 [16] call print_ln 
-  //SEG41 [21] phi from main::@6 to print_ln [phi:main::@6->print_ln]
+  //SEG41 [21] phi from main::@4 to print_ln [phi:main::@4->print_ln]
     jsr print_ln
-  //SEG42 main::@7
+  //SEG42 main::@5
   //SEG43 [17] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG44 [18] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@8 -- vbuxx_neq_vbuc1_then_la1 
+  //SEG44 [18] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@6 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$b
-    bne b8
+    bne b6
   //SEG45 main::@return
   //SEG46 [19] return 
     rts
-  //SEG47 main::@8
-  b8:
+  //SEG47 main::@6
+  b6:
   //SEG48 [20] (byte*~) print_char_cursor#54 ← (byte*) print_line_cursor#1 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG49 [6] phi from main::@8 to main::@1 [phi:main::@8->main::@1]
-  //SEG50 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@8->main::@1#0] -- register_copy 
-  //SEG51 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@8->main::@1#1] -- register_copy 
-  //SEG52 [6] phi (byte*) print_char_cursor#50 = (byte*~) print_char_cursor#54 [phi:main::@8->main::@1#2] -- register_copy 
-  //SEG53 [6] phi (signed word) main::w1#2 = (signed word) main::w1#1 [phi:main::@8->main::@1#3] -- register_copy 
+  //SEG49 [6] phi from main::@6 to main::@1 [phi:main::@6->main::@1]
+  //SEG50 [6] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@6->main::@1#0] -- register_copy 
+  //SEG51 [6] phi (byte*) print_line_cursor#19 = (byte*) print_line_cursor#1 [phi:main::@6->main::@1#1] -- register_copy 
+  //SEG52 [6] phi (byte*) print_char_cursor#50 = (byte*~) print_char_cursor#54 [phi:main::@6->main::@1#2] -- register_copy 
+  //SEG53 [6] phi (signed word) main::w1#2 = (signed word) main::w1#1 [phi:main::@6->main::@1#3] -- register_copy 
     jmp b1
 }
 //SEG54 print_ln
@@ -1948,7 +1955,7 @@ print_sword: {
   //SEG69 [47] phi (byte) print_char::ch#4 = (byte) '-' [phi:print_sword::@2->print_char#1] -- vbuaa=vbuc1 
     lda #'-'
     jsr print_char
-  //SEG70 print_sword::@4
+  //SEG70 print_sword::@3
   //SEG71 [30] (signed word) print_sword::w#0 ← - (signed word) print_sword::w#3 -- vwsz1=_neg_vwsz1 
     sec
     lda w
@@ -1959,9 +1966,9 @@ print_sword: {
     eor #$ff
     adc #0
     sta w+1
-  //SEG72 [31] phi from print_sword print_sword::@4 to print_sword::@1 [phi:print_sword/print_sword::@4->print_sword::@1]
-  //SEG73 [31] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@4->print_sword::@1#0] -- register_copy 
-  //SEG74 [31] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@4->print_sword::@1#1] -- register_copy 
+  //SEG72 [31] phi from print_sword print_sword::@3 to print_sword::@1 [phi:print_sword/print_sword::@3->print_sword::@1]
+  //SEG73 [31] phi (byte*) print_char_cursor#45 = (byte*) print_char_cursor#46 [phi:print_sword/print_sword::@3->print_sword::@1#0] -- register_copy 
+  //SEG74 [31] phi (signed word) print_sword::w#4 = (signed word) print_sword::w#3 [phi:print_sword/print_sword::@3->print_sword::@1#1] -- register_copy 
   //SEG75 print_sword::@1
   b1:
   //SEG76 [32] call print_word 
diff --git a/src/test/ref/test-signed-word-minus-byte.sym b/src/test/ref/test-signed-word-minus-byte.sym
index 4e2b09d2f..8ed8043b7 100644
--- a/src/test/ref/test-signed-word-minus-byte.sym
+++ b/src/test/ref/test-signed-word-minus-byte.sym
@@ -1,13 +1,13 @@
-(label) @20
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
 (label) main::@1
+(label) main::@2
+(label) main::@3
 (label) main::@4
 (label) main::@5
 (label) main::@6
-(label) main::@7
-(label) main::@8
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte x 11.0
@@ -59,7 +59,7 @@
 (void()) print_sword((signed word) print_sword::w)
 (label) print_sword::@1
 (label) print_sword::@2
-(label) print_sword::@4
+(label) print_sword::@3
 (label) print_sword::@return
 (signed word) print_sword::w
 (signed word) print_sword::w#0 w zp ZP_WORD:6 4.0
diff --git a/src/test/ref/test-word-size-arrays.asm b/src/test/ref/test-word-size-arrays.asm
index e62e3d5d2..7e8b83320 100644
--- a/src/test/ref/test-word-size-arrays.asm
+++ b/src/test/ref/test-word-size-arrays.asm
@@ -65,7 +65,7 @@ main: {
   !:
     ldx #0
   // Cleare the bottom line
-  b5:
+  b4:
     txa
     clc
     adc line
@@ -85,6 +85,6 @@ main: {
     sta screen
     inx
     cpx #$28
-    bcc b5
+    bcc b4
     rts
 }
diff --git a/src/test/ref/test-word-size-arrays.cfg b/src/test/ref/test-word-size-arrays.cfg
index f7ab26aad..5582f3716 100644
--- a/src/test/ref/test-word-size-arrays.cfg
+++ b/src/test/ref/test-word-size-arrays.cfg
@@ -24,14 +24,14 @@ main::@2: scope:[main]  from main::@1 main::@2
 main::@3: scope:[main]  from main::@2
   [12] (word) main::line#2 ← (word) main::line#6 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [13] if((word) main::line#2<(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18) goto main::@1
-  to:main::@5
-main::@5: scope:[main]  from main::@3 main::@5
-  [14] (byte) main::c1#2 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::c1#1 )
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@4
+  [14] (byte) main::c1#2 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::c1#1 )
   [15] (word~) main::$6 ← (word) main::line#2 + (byte) main::c1#2
   [16] *((const byte*) main::screen#0 + (word~) main::$6) ← (byte) ' '
   [17] (byte) main::c1#1 ← ++ (byte) main::c1#2
-  [18] if((byte) main::c1#1<(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@5
+  [18] if((byte) main::c1#1<(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@4
   to:main::@return
-main::@return: scope:[main]  from main::@5
+main::@return: scope:[main]  from main::@4
   [19] return 
   to:@return
diff --git a/src/test/ref/test-word-size-arrays.log b/src/test/ref/test-word-size-arrays.log
index 8ba32ad69..58e9fc256 100644
--- a/src/test/ref/test-word-size-arrays.log
+++ b/src/test/ref/test-word-size-arrays.log
@@ -149,6 +149,7 @@ Coalesced down to 3 phi equivalence classes
 Culled Empty Block (label) main::@9
 Culled Empty Block (label) main::@7
 Culled Empty Block (label) main::@8
+Renumbering block main::@5 to main::@4
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -181,15 +182,15 @@ main::@2: scope:[main]  from main::@1 main::@2
 main::@3: scope:[main]  from main::@2
   [12] (word) main::line#2 ← (word) main::line#6 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [13] if((word) main::line#2<(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) $18) goto main::@1
-  to:main::@5
-main::@5: scope:[main]  from main::@3 main::@5
-  [14] (byte) main::c1#2 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::c1#1 )
+  to:main::@4
+main::@4: scope:[main]  from main::@3 main::@4
+  [14] (byte) main::c1#2 ← phi( main::@3/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::c1#1 )
   [15] (word~) main::$6 ← (word) main::line#2 + (byte) main::c1#2
   [16] *((const byte*) main::screen#0 + (word~) main::$6) ← (byte) ' '
   [17] (byte) main::c1#1 ← ++ (byte) main::c1#2
-  [18] if((byte) main::c1#1<(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@5
+  [18] if((byte) main::c1#1<(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@4
   to:main::@return
-main::@return: scope:[main]  from main::@5
+main::@return: scope:[main]  from main::@4
   [19] return 
   to:@return
 
@@ -350,19 +351,19 @@ main: {
     cmp #<$28*$18
     bcc b1_from_b3
   !:
-  //SEG29 [14] phi from main::@3 to main::@5 [phi:main::@3->main::@5]
-  b5_from_b3:
-  //SEG30 [14] phi (byte) main::c1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@5#0] -- vbuz1=vbuc1 
+  //SEG29 [14] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG30 [14] phi (byte) main::c1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuz1=vbuc1 
     lda #0
     sta c1
-    jmp b5
+    jmp b4
   // Cleare the bottom line
-  //SEG31 [14] phi from main::@5 to main::@5 [phi:main::@5->main::@5]
-  b5_from_b5:
-  //SEG32 [14] phi (byte) main::c1#2 = (byte) main::c1#1 [phi:main::@5->main::@5#0] -- register_copy 
-    jmp b5
-  //SEG33 main::@5
-  b5:
+  //SEG31 [14] phi from main::@4 to main::@4 [phi:main::@4->main::@4]
+  b4_from_b4:
+  //SEG32 [14] phi (byte) main::c1#2 = (byte) main::c1#1 [phi:main::@4->main::@4#0] -- register_copy 
+    jmp b4
+  //SEG33 main::@4
+  b4:
   //SEG34 [15] (word~) main::$6 ← (word) main::line#2 + (byte) main::c1#2 -- vwuz1=vwuz2_plus_vbuz3 
     lda c1
     clc
@@ -384,10 +385,10 @@ main: {
     sta screen
   //SEG36 [17] (byte) main::c1#1 ← ++ (byte) main::c1#2 -- vbuz1=_inc_vbuz1 
     inc c1
-  //SEG37 [18] if((byte) main::c1#1<(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@5 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG37 [18] if((byte) main::c1#1<(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@4 -- vbuz1_lt_vbuc1_then_la1 
     lda c1
     cmp #$28
-    bcc b5_from_b5
+    bcc b4_from_b4
     jmp breturn
   //SEG38 main::@return
   breturn:
@@ -544,18 +545,18 @@ main: {
     cmp #<$28*$18
     bcc b1_from_b3
   !:
-  //SEG29 [14] phi from main::@3 to main::@5 [phi:main::@3->main::@5]
-  b5_from_b3:
-  //SEG30 [14] phi (byte) main::c1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@5#0] -- vbuxx=vbuc1 
+  //SEG29 [14] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  b4_from_b3:
+  //SEG30 [14] phi (byte) main::c1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuxx=vbuc1 
     ldx #0
-    jmp b5
+    jmp b4
   // Cleare the bottom line
-  //SEG31 [14] phi from main::@5 to main::@5 [phi:main::@5->main::@5]
-  b5_from_b5:
-  //SEG32 [14] phi (byte) main::c1#2 = (byte) main::c1#1 [phi:main::@5->main::@5#0] -- register_copy 
-    jmp b5
-  //SEG33 main::@5
-  b5:
+  //SEG31 [14] phi from main::@4 to main::@4 [phi:main::@4->main::@4]
+  b4_from_b4:
+  //SEG32 [14] phi (byte) main::c1#2 = (byte) main::c1#1 [phi:main::@4->main::@4#0] -- register_copy 
+    jmp b4
+  //SEG33 main::@4
+  b4:
   //SEG34 [15] (word~) main::$6 ← (word) main::line#2 + (byte) main::c1#2 -- vwuz1=vwuz2_plus_vbuxx 
     txa
     clc
@@ -577,9 +578,9 @@ main: {
     sta screen
   //SEG36 [17] (byte) main::c1#1 ← ++ (byte) main::c1#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG37 [18] if((byte) main::c1#1<(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@5 -- vbuxx_lt_vbuc1_then_la1 
+  //SEG37 [18] if((byte) main::c1#1<(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@4 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$28
-    bcc b5_from_b5
+    bcc b4_from_b4
     jmp breturn
   //SEG38 main::@return
   breturn:
@@ -593,7 +594,7 @@ Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda #0
@@ -601,7 +602,7 @@ Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b2_from_b2 with b2
 Replacing label b1_from_b3 with b1
 Replacing label b1_from_b3 with b1
-Replacing label b5_from_b5 with b5
+Replacing label b4_from_b4 with b4
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
@@ -609,12 +610,12 @@ Removing instruction bend_from_b1:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b2:
-Removing instruction b5_from_b5:
+Removing instruction b4_from_b4:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
 Removing instruction b3:
-Removing instruction b5_from_b3:
+Removing instruction b4_from_b3:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
@@ -622,7 +623,7 @@ Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
 Removing instruction jmp b1
 Removing instruction jmp b2
-Removing instruction jmp b5
+Removing instruction jmp b4
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -638,7 +639,7 @@ FINAL SYMBOL TABLE
 (label) main::@1
 (label) main::@2
 (label) main::@3
-(label) main::@5
+(label) main::@4
 (label) main::@return
 (byte) main::c
 (byte) main::c#1 reg byte x 151.5
@@ -756,14 +757,14 @@ main: {
     cmp #<$28*$18
     bcc b1
   !:
-  //SEG29 [14] phi from main::@3 to main::@5 [phi:main::@3->main::@5]
-  //SEG30 [14] phi (byte) main::c1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@5#0] -- vbuxx=vbuc1 
+  //SEG29 [14] phi from main::@3 to main::@4 [phi:main::@3->main::@4]
+  //SEG30 [14] phi (byte) main::c1#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@3->main::@4#0] -- vbuxx=vbuc1 
     ldx #0
   // Cleare the bottom line
-  //SEG31 [14] phi from main::@5 to main::@5 [phi:main::@5->main::@5]
-  //SEG32 [14] phi (byte) main::c1#2 = (byte) main::c1#1 [phi:main::@5->main::@5#0] -- register_copy 
-  //SEG33 main::@5
-  b5:
+  //SEG31 [14] phi from main::@4 to main::@4 [phi:main::@4->main::@4]
+  //SEG32 [14] phi (byte) main::c1#2 = (byte) main::c1#1 [phi:main::@4->main::@4#0] -- register_copy 
+  //SEG33 main::@4
+  b4:
   //SEG34 [15] (word~) main::$6 ← (word) main::line#2 + (byte) main::c1#2 -- vwuz1=vwuz2_plus_vbuxx 
     txa
     clc
@@ -785,9 +786,9 @@ main: {
     sta screen
   //SEG36 [17] (byte) main::c1#1 ← ++ (byte) main::c1#2 -- vbuxx=_inc_vbuxx 
     inx
-  //SEG37 [18] if((byte) main::c1#1<(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@5 -- vbuxx_lt_vbuc1_then_la1 
+  //SEG37 [18] if((byte) main::c1#1<(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@4 -- vbuxx_lt_vbuc1_then_la1 
     cpx #$28
-    bcc b5
+    bcc b4
   //SEG38 main::@return
   //SEG39 [19] return 
     rts
diff --git a/src/test/ref/test-word-size-arrays.sym b/src/test/ref/test-word-size-arrays.sym
index deda6d836..5fe9e9bee 100644
--- a/src/test/ref/test-word-size-arrays.sym
+++ b/src/test/ref/test-word-size-arrays.sym
@@ -8,7 +8,7 @@
 (label) main::@1
 (label) main::@2
 (label) main::@3
-(label) main::@5
+(label) main::@4
 (label) main::@return
 (byte) main::c
 (byte) main::c#1 reg byte x 151.5
diff --git a/src/test/ref/travis1.asm b/src/test/ref/travis1.asm
index 417fdd79b..a73fc4f30 100644
--- a/src/test/ref/travis1.asm
+++ b/src/test/ref/travis1.asm
@@ -26,9 +26,9 @@ main: {
     inc i
     lda #6
     cmp i
-    bne b7
+    bne b5
     rts
-  b7:
+  b5:
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
diff --git a/src/test/ref/travis1.cfg b/src/test/ref/travis1.cfg
index a8b7bfeb7..ae59e18b9 100644
--- a/src/test/ref/travis1.cfg
+++ b/src/test/ref/travis1.cfg
@@ -1,38 +1,38 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@21
-@21: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @21
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @21
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@7
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
-  [5] (byte) action_count#13 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) action_count#11 )
-  [5] (byte*) print_line_cursor#24 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@7/(byte*) print_line_cursor#14 )
-  [5] (byte*) print_char_cursor#30 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@7/(byte*~) print_char_cursor#41 )
+main::@1: scope:[main]  from main main::@5
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::i#1 )
+  [5] (byte) action_count#13 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) action_count#11 )
+  [5] (byte*) print_line_cursor#24 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@5/(byte*) print_line_cursor#14 )
+  [5] (byte*) print_char_cursor#30 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@5/(byte*~) print_char_cursor#41 )
   [6] call game_ready 
   [7] (bool) game_ready::return#0 ← (bool) game_ready::return#1
-  to:main::@5
-main::@5: scope:[main]  from main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@1
   [8] (bool~) main::$0 ← (bool) game_ready::return#0
   [9] if((bool~) main::$0) goto main::@3
   to:main::@2
-main::@2: scope:[main]  from main::@3 main::@5
+main::@2: scope:[main]  from main::@3 main::@4
   [10] (byte) main::i#1 ← ++ (byte) main::i#2
-  [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@7
+  [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@5
   to:main::@return
 main::@return: scope:[main]  from main::@2
   [12] return 
   to:@return
-main::@7: scope:[main]  from main::@2
+main::@5: scope:[main]  from main::@2
   [13] (byte*~) print_char_cursor#41 ← (byte*) print_line_cursor#14
   to:main::@1
-main::@3: scope:[main]  from main::@5
+main::@3: scope:[main]  from main::@4
   [14] (byte*~) print_char_cursor#43 ← (byte*) print_line_cursor#14
   [15] call print_str_ln 
   to:main::@2
@@ -78,19 +78,19 @@ print_str::@2: scope:[print_str]  from print_str::@1
   [33] (byte*) print_str::str#1 ← ++ (byte*) print_str::str#2
   to:print_str::@1
 game_ready: scope:[game_ready]  from main::@1
-  [34] if((byte) action_count#13!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto game_ready::@5
+  [34] if((byte) action_count#13!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto game_ready::@3
   to:game_ready::@1
-game_ready::@1: scope:[game_ready]  from game_ready game_ready::@5
-  [35] (byte) action_count#10 ← phi( game_ready::@5/(byte) action_count#13 game_ready/(const byte) READY_FRAMES#0 )
+game_ready::@1: scope:[game_ready]  from game_ready game_ready::@3
+  [35] (byte) action_count#10 ← phi( game_ready::@3/(byte) action_count#13 game_ready/(const byte) READY_FRAMES#0 )
   [36] call print_str_ln 
-  to:game_ready::@4
-game_ready::@4: scope:[game_ready]  from game_ready::@1
+  to:game_ready::@2
+game_ready::@2: scope:[game_ready]  from game_ready::@1
   [37] (byte) action_count#11 ← -- (byte) action_count#10
   [38] (bool) game_ready::return#1 ← (byte) action_count#11 == (byte/signed byte/word/signed word/dword/signed dword) 0
   to:game_ready::@return
-game_ready::@return: scope:[game_ready]  from game_ready::@4
+game_ready::@return: scope:[game_ready]  from game_ready::@2
   [39] return 
   to:@return
-game_ready::@5: scope:[game_ready]  from game_ready
+game_ready::@3: scope:[game_ready]  from game_ready
   [40] phi()
   to:game_ready::@1
diff --git a/src/test/ref/travis1.log b/src/test/ref/travis1.log
index ccd7657ea..7d5894031 100644
--- a/src/test/ref/travis1.log
+++ b/src/test/ref/travis1.log
@@ -520,51 +520,56 @@ Coalesced [51] action_count#21 ← action_count#13
 Coalesced down to 6 phi equivalence classes
 Culled Empty Block (label) print_ln::@3
 Culled Empty Block (label) game_ready::@2
+Renumbering block @21 to @1
+Renumbering block main::@5 to main::@4
+Renumbering block main::@7 to main::@5
+Renumbering block game_ready::@4 to game_ready::@2
+Renumbering block game_ready::@5 to game_ready::@3
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @21
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of print_str_ln::@1
 Adding NOP phi() at start of print_ln
 Adding NOP phi() at start of print_str
-Adding NOP phi() at start of game_ready::@5
+Adding NOP phi() at start of game_ready::@3
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@21
-@21: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @21
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @21
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@7
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::i#1 )
-  [5] (byte) action_count#13 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) action_count#11 )
-  [5] (byte*) print_line_cursor#24 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@7/(byte*) print_line_cursor#14 )
-  [5] (byte*) print_char_cursor#30 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@7/(byte*~) print_char_cursor#41 )
+main::@1: scope:[main]  from main main::@5
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) main::i#1 )
+  [5] (byte) action_count#13 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@5/(byte) action_count#11 )
+  [5] (byte*) print_line_cursor#24 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@5/(byte*) print_line_cursor#14 )
+  [5] (byte*) print_char_cursor#30 ← phi( main/((byte*))(word/signed word/dword/signed dword) $400 main::@5/(byte*~) print_char_cursor#41 )
   [6] call game_ready 
   [7] (bool) game_ready::return#0 ← (bool) game_ready::return#1
-  to:main::@5
-main::@5: scope:[main]  from main::@1
+  to:main::@4
+main::@4: scope:[main]  from main::@1
   [8] (bool~) main::$0 ← (bool) game_ready::return#0
   [9] if((bool~) main::$0) goto main::@3
   to:main::@2
-main::@2: scope:[main]  from main::@3 main::@5
+main::@2: scope:[main]  from main::@3 main::@4
   [10] (byte) main::i#1 ← ++ (byte) main::i#2
-  [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@7
+  [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@5
   to:main::@return
 main::@return: scope:[main]  from main::@2
   [12] return 
   to:@return
-main::@7: scope:[main]  from main::@2
+main::@5: scope:[main]  from main::@2
   [13] (byte*~) print_char_cursor#41 ← (byte*) print_line_cursor#14
   to:main::@1
-main::@3: scope:[main]  from main::@5
+main::@3: scope:[main]  from main::@4
   [14] (byte*~) print_char_cursor#43 ← (byte*) print_line_cursor#14
   [15] call print_str_ln 
   to:main::@2
@@ -610,20 +615,20 @@ print_str::@2: scope:[print_str]  from print_str::@1
   [33] (byte*) print_str::str#1 ← ++ (byte*) print_str::str#2
   to:print_str::@1
 game_ready: scope:[game_ready]  from main::@1
-  [34] if((byte) action_count#13!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto game_ready::@5
+  [34] if((byte) action_count#13!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto game_ready::@3
   to:game_ready::@1
-game_ready::@1: scope:[game_ready]  from game_ready game_ready::@5
-  [35] (byte) action_count#10 ← phi( game_ready::@5/(byte) action_count#13 game_ready/(const byte) READY_FRAMES#0 )
+game_ready::@1: scope:[game_ready]  from game_ready game_ready::@3
+  [35] (byte) action_count#10 ← phi( game_ready::@3/(byte) action_count#13 game_ready/(const byte) READY_FRAMES#0 )
   [36] call print_str_ln 
-  to:game_ready::@4
-game_ready::@4: scope:[game_ready]  from game_ready::@1
+  to:game_ready::@2
+game_ready::@2: scope:[game_ready]  from game_ready::@1
   [37] (byte) action_count#11 ← -- (byte) action_count#10
   [38] (bool) game_ready::return#1 ← (byte) action_count#11 == (byte/signed byte/word/signed word/dword/signed dword) 0
   to:game_ready::@return
-game_ready::@return: scope:[game_ready]  from game_ready::@4
+game_ready::@return: scope:[game_ready]  from game_ready::@2
   [39] return 
   to:@return
-game_ready::@5: scope:[game_ready]  from game_ready
+game_ready::@3: scope:[game_ready]  from game_ready
   [40] phi()
   to:game_ready::@1
 
@@ -711,17 +716,17 @@ INITIAL ASM
   .label action_count = $b
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-b21_from_bbegin:
-  jmp b21
-//SEG5 @21
-b21:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-main_from_b21:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
-bend_from_b21:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -755,9 +760,9 @@ main: {
   //SEG18 [7] (bool) game_ready::return#0 ← (bool) game_ready::return#1 -- vboz1=vboz2 
     lda game_ready.return_1
     sta game_ready.return
-    jmp b5
-  //SEG19 main::@5
-  b5:
+    jmp b4
+  //SEG19 main::@4
+  b4:
   //SEG20 [8] (bool~) main::$0 ← (bool) game_ready::return#0 -- vboz1=vboz2 
     lda game_ready.return
     sta _0
@@ -770,28 +775,28 @@ main: {
   b2:
   //SEG23 [10] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG24 [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG24 [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp i
-    bne b7
+    bne b5
     jmp breturn
   //SEG25 main::@return
   breturn:
   //SEG26 [12] return 
     rts
-  //SEG27 main::@7
-  b7:
+  //SEG27 main::@5
+  b5:
   //SEG28 [13] (byte*~) print_char_cursor#41 ← (byte*) print_line_cursor#14 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG29 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG30 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
-  //SEG31 [5] phi (byte) action_count#13 = (byte) action_count#11 [phi:main::@7->main::@1#1] -- register_copy 
-  //SEG32 [5] phi (byte*) print_line_cursor#24 = (byte*) print_line_cursor#14 [phi:main::@7->main::@1#2] -- register_copy 
-  //SEG33 [5] phi (byte*) print_char_cursor#30 = (byte*~) print_char_cursor#41 [phi:main::@7->main::@1#3] -- register_copy 
+  //SEG29 [5] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG30 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG31 [5] phi (byte) action_count#13 = (byte) action_count#11 [phi:main::@5->main::@1#1] -- register_copy 
+  //SEG32 [5] phi (byte*) print_line_cursor#24 = (byte*) print_line_cursor#14 [phi:main::@5->main::@1#2] -- register_copy 
+  //SEG33 [5] phi (byte*) print_char_cursor#30 = (byte*~) print_char_cursor#41 [phi:main::@5->main::@1#3] -- register_copy 
     jmp b1
   //SEG34 main::@3
   b3:
@@ -922,10 +927,10 @@ print_str: {
 game_ready: {
     .label return = $c
     .label return_1 = $e
-  //SEG72 [34] if((byte) action_count#13!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto game_ready::@5 -- vbuz1_neq_0_then_la1 
+  //SEG72 [34] if((byte) action_count#13!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto game_ready::@3 -- vbuz1_neq_0_then_la1 
     lda action_count
     cmp #0
-    bne b5_from_game_ready
+    bne b3_from_game_ready
   //SEG73 [35] phi from game_ready to game_ready::@1 [phi:game_ready->game_ready::@1]
   b1_from_game_ready:
   //SEG74 [35] phi (byte) action_count#10 = (const byte) READY_FRAMES#0 [phi:game_ready->game_ready::@1#0] -- vbuz1=vbuc1 
@@ -945,9 +950,9 @@ game_ready: {
     lda #>str
     sta print_str_ln.str+1
     jsr print_str_ln
-    jmp b4
-  //SEG81 game_ready::@4
-  b4:
+    jmp b2
+  //SEG81 game_ready::@2
+  b2:
   //SEG82 [37] (byte) action_count#11 ← -- (byte) action_count#10 -- vbuz1=_dec_vbuz1 
     dec action_count
   //SEG83 [38] (bool) game_ready::return#1 ← (byte) action_count#11 == (byte/signed byte/word/signed word/dword/signed dword) 0 -- vboz1=vbuz2_eq_vbuc1 
@@ -963,14 +968,14 @@ game_ready: {
   breturn:
   //SEG85 [39] return 
     rts
-  //SEG86 [40] phi from game_ready to game_ready::@5 [phi:game_ready->game_ready::@5]
-  b5_from_game_ready:
-    jmp b5
-  //SEG87 game_ready::@5
-  b5:
-  //SEG88 [35] phi from game_ready::@5 to game_ready::@1 [phi:game_ready::@5->game_ready::@1]
-  b1_from_b5:
-  //SEG89 [35] phi (byte) action_count#10 = (byte) action_count#13 [phi:game_ready::@5->game_ready::@1#0] -- register_copy 
+  //SEG86 [40] phi from game_ready to game_ready::@3 [phi:game_ready->game_ready::@3]
+  b3_from_game_ready:
+    jmp b3
+  //SEG87 game_ready::@3
+  b3:
+  //SEG88 [35] phi from game_ready::@3 to game_ready::@1 [phi:game_ready::@3->game_ready::@1]
+  b1_from_b3:
+  //SEG89 [35] phi (byte) action_count#10 = (byte) action_count#13 [phi:game_ready::@3->game_ready::@1#0] -- register_copy 
     jmp b1
     str: .text "ready@"
 }
@@ -1038,17 +1043,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label print_line_cursor = 5
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-b21_from_bbegin:
-  jmp b21
-//SEG5 @21
-b21:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-main_from_b21:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
-bend_from_b21:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1078,9 +1083,9 @@ main: {
   //SEG17 [6] call game_ready 
     jsr game_ready
   //SEG18 [7] (bool) game_ready::return#0 ← (bool) game_ready::return#1
-    jmp b5
-  //SEG19 main::@5
-  b5:
+    jmp b4
+  //SEG19 main::@4
+  b4:
   //SEG20 [8] (bool~) main::$0 ← (bool) game_ready::return#0
   //SEG21 [9] if((bool~) main::$0) goto main::@3 -- vboaa_then_la1 
     cmp #0
@@ -1090,28 +1095,28 @@ main: {
   b2:
   //SEG23 [10] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG24 [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG24 [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp i
-    bne b7
+    bne b5
     jmp breturn
   //SEG25 main::@return
   breturn:
   //SEG26 [12] return 
     rts
-  //SEG27 main::@7
-  b7:
+  //SEG27 main::@5
+  b5:
   //SEG28 [13] (byte*~) print_char_cursor#41 ← (byte*) print_line_cursor#14 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG29 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  b1_from_b7:
-  //SEG30 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
-  //SEG31 [5] phi (byte) action_count#13 = (byte) action_count#11 [phi:main::@7->main::@1#1] -- register_copy 
-  //SEG32 [5] phi (byte*) print_line_cursor#24 = (byte*) print_line_cursor#14 [phi:main::@7->main::@1#2] -- register_copy 
-  //SEG33 [5] phi (byte*) print_char_cursor#30 = (byte*~) print_char_cursor#41 [phi:main::@7->main::@1#3] -- register_copy 
+  //SEG29 [5] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  b1_from_b5:
+  //SEG30 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG31 [5] phi (byte) action_count#13 = (byte) action_count#11 [phi:main::@5->main::@1#1] -- register_copy 
+  //SEG32 [5] phi (byte*) print_line_cursor#24 = (byte*) print_line_cursor#14 [phi:main::@5->main::@1#2] -- register_copy 
+  //SEG33 [5] phi (byte*) print_char_cursor#30 = (byte*~) print_char_cursor#41 [phi:main::@5->main::@1#3] -- register_copy 
     jmp b1
   //SEG34 main::@3
   b3:
@@ -1236,9 +1241,9 @@ print_str: {
 }
 //SEG71 game_ready
 game_ready: {
-  //SEG72 [34] if((byte) action_count#13!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto game_ready::@5 -- vbuxx_neq_0_then_la1 
+  //SEG72 [34] if((byte) action_count#13!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto game_ready::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
-    bne b5_from_game_ready
+    bne b3_from_game_ready
   //SEG73 [35] phi from game_ready to game_ready::@1 [phi:game_ready->game_ready::@1]
   b1_from_game_ready:
   //SEG74 [35] phi (byte) action_count#10 = (const byte) READY_FRAMES#0 [phi:game_ready->game_ready::@1#0] -- vbuxx=vbuc1 
@@ -1257,9 +1262,9 @@ game_ready: {
     lda #>str
     sta print_str_ln.str+1
     jsr print_str_ln
-    jmp b4
-  //SEG81 game_ready::@4
-  b4:
+    jmp b2
+  //SEG81 game_ready::@2
+  b2:
   //SEG82 [37] (byte) action_count#11 ← -- (byte) action_count#10 -- vbuxx=_dec_vbuxx 
     dex
   //SEG83 [38] (bool) game_ready::return#1 ← (byte) action_count#11 == (byte/signed byte/word/signed word/dword/signed dword) 0 -- vboaa=vbuxx_eq_vbuc1 
@@ -1273,23 +1278,23 @@ game_ready: {
   breturn:
   //SEG85 [39] return 
     rts
-  //SEG86 [40] phi from game_ready to game_ready::@5 [phi:game_ready->game_ready::@5]
-  b5_from_game_ready:
-    jmp b5
-  //SEG87 game_ready::@5
-  b5:
-  //SEG88 [35] phi from game_ready::@5 to game_ready::@1 [phi:game_ready::@5->game_ready::@1]
-  b1_from_b5:
-  //SEG89 [35] phi (byte) action_count#10 = (byte) action_count#13 [phi:game_ready::@5->game_ready::@1#0] -- register_copy 
+  //SEG86 [40] phi from game_ready to game_ready::@3 [phi:game_ready->game_ready::@3]
+  b3_from_game_ready:
+    jmp b3
+  //SEG87 game_ready::@3
+  b3:
+  //SEG88 [35] phi from game_ready::@3 to game_ready::@1 [phi:game_ready::@3->game_ready::@1]
+  b1_from_b3:
+  //SEG89 [35] phi (byte) action_count#10 = (byte) action_count#13 [phi:game_ready::@3->game_ready::@1#0] -- register_copy 
     jmp b1
     str: .text "ready@"
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b21
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b5
+Removing instruction jmp b4
 Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp b1
@@ -1299,9 +1304,9 @@ Removing instruction jmp breturn
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp b1
-Removing instruction jmp b4
+Removing instruction jmp b2
 Removing instruction jmp breturn
-Removing instruction jmp b5
+Removing instruction jmp b3
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing instruction ldx #0 with TAX
 Removing instruction ldy #0
@@ -1309,11 +1314,11 @@ Succesful ASM optimization Pass5UnnecesaryLoadElimination
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b2 with b1
-Replacing label b5_from_game_ready with b5
-Removing instruction b21_from_bbegin:
-Removing instruction b21:
-Removing instruction main_from_b21:
-Removing instruction bend_from_b21:
+Replacing label b3_from_game_ready with b3
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_print_str_ln:
 Removing instruction print_ln_from_b1:
 Removing instruction b1_from_print_ln:
@@ -1321,14 +1326,14 @@ Removing instruction b1_from_b1:
 Removing instruction b1_from_print_str:
 Removing instruction b1_from_b2:
 Removing instruction print_str_ln_from_b1:
-Removing instruction b5_from_game_ready:
-Removing instruction b1_from_b5:
+Removing instruction b3_from_game_ready:
+Removing instruction b1_from_b3:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction breturn:
-Removing instruction b1_from_b7:
+Removing instruction b1_from_b5:
 Removing instruction print_str_ln_from_b3:
 Removing instruction print_str_from_print_str_ln:
 Removing instruction b1:
@@ -1336,22 +1341,22 @@ Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction b1_from_game_ready:
-Removing instruction b4:
+Removing instruction b2:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Skipping double jump to b1 in bne b5
+Skipping double jump to b1 in bne b3
 Succesful ASM optimization Pass5DoubleJumpElimination
 Removing instruction bbegin:
-Removing instruction b5:
+Removing instruction b3:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Removing unreachable instruction jmp b1
 Succesful ASM optimization Pass5UnreachableCodeElimination
 
 FINAL SYMBOL TABLE
-(label) @21
+(label) @1
 (label) @begin
 (label) @end
 (byte) READY_FRAMES
@@ -1362,8 +1367,8 @@ FINAL SYMBOL TABLE
 (byte) action_count#13 reg byte x 5.0
 (bool()) game_ready()
 (label) game_ready::@1
-(label) game_ready::@4
-(label) game_ready::@5
+(label) game_ready::@2
+(label) game_ready::@3
 (label) game_ready::@return
 (bool) game_ready::return
 (bool) game_ready::return#0 reg byte a 22.0
@@ -1374,8 +1379,8 @@ FINAL SYMBOL TABLE
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@7
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 i zp ZP_BYTE:2 11.0
@@ -1436,11 +1441,11 @@ Score: 9913
   .label print_char_cursor = 7
   .label print_line_cursor = 5
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @21 [phi:@begin->@21]
-//SEG5 @21
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @21 to main [phi:@21->main]
-//SEG8 [3] phi from @21 to @end [phi:@21->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -1466,7 +1471,7 @@ main: {
   //SEG17 [6] call game_ready 
     jsr game_ready
   //SEG18 [7] (bool) game_ready::return#0 ← (bool) game_ready::return#1
-  //SEG19 main::@5
+  //SEG19 main::@4
   //SEG20 [8] (bool~) main::$0 ← (bool) game_ready::return#0
   //SEG21 [9] if((bool~) main::$0) goto main::@3 -- vboaa_then_la1 
     cmp #0
@@ -1475,25 +1480,25 @@ main: {
   b2:
   //SEG23 [10] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG24 [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@7 -- vbuz1_neq_vbuc1_then_la1 
+  //SEG24 [11] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@5 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp i
-    bne b7
+    bne b5
   //SEG25 main::@return
   //SEG26 [12] return 
     rts
-  //SEG27 main::@7
-  b7:
+  //SEG27 main::@5
+  b5:
   //SEG28 [13] (byte*~) print_char_cursor#41 ← (byte*) print_line_cursor#14 -- pbuz1=pbuz2 
     lda print_line_cursor
     sta print_char_cursor
     lda print_line_cursor+1
     sta print_char_cursor+1
-  //SEG29 [5] phi from main::@7 to main::@1 [phi:main::@7->main::@1]
-  //SEG30 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@7->main::@1#0] -- register_copy 
-  //SEG31 [5] phi (byte) action_count#13 = (byte) action_count#11 [phi:main::@7->main::@1#1] -- register_copy 
-  //SEG32 [5] phi (byte*) print_line_cursor#24 = (byte*) print_line_cursor#14 [phi:main::@7->main::@1#2] -- register_copy 
-  //SEG33 [5] phi (byte*) print_char_cursor#30 = (byte*~) print_char_cursor#41 [phi:main::@7->main::@1#3] -- register_copy 
+  //SEG29 [5] phi from main::@5 to main::@1 [phi:main::@5->main::@1]
+  //SEG30 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@5->main::@1#0] -- register_copy 
+  //SEG31 [5] phi (byte) action_count#13 = (byte) action_count#11 [phi:main::@5->main::@1#1] -- register_copy 
+  //SEG32 [5] phi (byte*) print_line_cursor#24 = (byte*) print_line_cursor#14 [phi:main::@5->main::@1#2] -- register_copy 
+  //SEG33 [5] phi (byte*) print_char_cursor#30 = (byte*~) print_char_cursor#41 [phi:main::@5->main::@1#3] -- register_copy 
     jmp b1
   //SEG34 main::@3
   b3:
@@ -1599,7 +1604,7 @@ print_str: {
 }
 //SEG71 game_ready
 game_ready: {
-  //SEG72 [34] if((byte) action_count#13!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto game_ready::@5 -- vbuxx_neq_0_then_la1 
+  //SEG72 [34] if((byte) action_count#13!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto game_ready::@3 -- vbuxx_neq_0_then_la1 
     cpx #0
     bne b1
   //SEG73 [35] phi from game_ready to game_ready::@1 [phi:game_ready->game_ready::@1]
@@ -1617,7 +1622,7 @@ game_ready: {
     lda #>str
     sta print_str_ln.str+1
     jsr print_str_ln
-  //SEG81 game_ready::@4
+  //SEG81 game_ready::@2
   //SEG82 [37] (byte) action_count#11 ← -- (byte) action_count#10 -- vbuxx=_dec_vbuxx 
     dex
   //SEG83 [38] (bool) game_ready::return#1 ← (byte) action_count#11 == (byte/signed byte/word/signed word/dword/signed dword) 0 -- vboaa=vbuxx_eq_vbuc1 
@@ -1629,10 +1634,10 @@ game_ready: {
   //SEG84 game_ready::@return
   //SEG85 [39] return 
     rts
-  //SEG86 [40] phi from game_ready to game_ready::@5 [phi:game_ready->game_ready::@5]
-  //SEG87 game_ready::@5
-  //SEG88 [35] phi from game_ready::@5 to game_ready::@1 [phi:game_ready::@5->game_ready::@1]
-  //SEG89 [35] phi (byte) action_count#10 = (byte) action_count#13 [phi:game_ready::@5->game_ready::@1#0] -- register_copy 
+  //SEG86 [40] phi from game_ready to game_ready::@3 [phi:game_ready->game_ready::@3]
+  //SEG87 game_ready::@3
+  //SEG88 [35] phi from game_ready::@3 to game_ready::@1 [phi:game_ready::@3->game_ready::@1]
+  //SEG89 [35] phi (byte) action_count#10 = (byte) action_count#13 [phi:game_ready::@3->game_ready::@1#0] -- register_copy 
     str: .text "ready@"
 }
 
diff --git a/src/test/ref/travis1.sym b/src/test/ref/travis1.sym
index 3480e22ad..c35972816 100644
--- a/src/test/ref/travis1.sym
+++ b/src/test/ref/travis1.sym
@@ -1,4 +1,4 @@
-(label) @21
+(label) @1
 (label) @begin
 (label) @end
 (byte) READY_FRAMES
@@ -9,8 +9,8 @@
 (byte) action_count#13 reg byte x 5.0
 (bool()) game_ready()
 (label) game_ready::@1
-(label) game_ready::@4
-(label) game_ready::@5
+(label) game_ready::@2
+(label) game_ready::@3
 (label) game_ready::@return
 (bool) game_ready::return
 (bool) game_ready::return#0 reg byte a 22.0
@@ -21,8 +21,8 @@
 (label) main::@1
 (label) main::@2
 (label) main::@3
+(label) main::@4
 (label) main::@5
-(label) main::@7
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 i zp ZP_BYTE:2 11.0
diff --git a/src/test/ref/true-inline-words.cfg b/src/test/ref/true-inline-words.cfg
index b9ebfac2a..502f1dc2f 100644
--- a/src/test/ref/true-inline-words.cfg
+++ b/src/test/ref/true-inline-words.cfg
@@ -10,11 +10,11 @@
 main: scope:[main]  from @1
   [4] *((byte*)(const word) main::w2#0) ← *((const byte[]) main::bs#0+(byte/signed byte/word/signed word/dword/signed dword) 1)
   [5] if(*((const byte*) main::pos#0)==(byte) 'm') goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main
+  to:main::@2
+main::@2: scope:[main]  from main
   [6] *((const byte*) main::bgcol#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   to:main::@return
-main::@return: scope:[main]  from main::@1 main::@3
+main::@return: scope:[main]  from main::@1 main::@2
   [7] return 
   to:@return
 main::@1: scope:[main]  from main
diff --git a/src/test/ref/true-inline-words.log b/src/test/ref/true-inline-words.log
index 7406d75b6..7d1807b2b 100644
--- a/src/test/ref/true-inline-words.log
+++ b/src/test/ref/true-inline-words.log
@@ -110,6 +110,7 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -127,11 +128,11 @@ FINAL CONTROL FLOW GRAPH
 main: scope:[main]  from @1
   [4] *((byte*)(const word) main::w2#0) ← *((const byte[]) main::bs#0+(byte/signed byte/word/signed word/dword/signed dword) 1)
   [5] if(*((const byte*) main::pos#0)==(byte) 'm') goto main::@1
-  to:main::@3
-main::@3: scope:[main]  from main
+  to:main::@2
+main::@2: scope:[main]  from main
   [6] *((const byte*) main::bgcol#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2
   to:main::@return
-main::@return: scope:[main]  from main::@1 main::@3
+main::@return: scope:[main]  from main::@1 main::@2
   [7] return 
   to:@return
 main::@1: scope:[main]  from main
@@ -190,9 +191,9 @@ main: {
     lda #'m'
     cmp pos
     beq b1
-    jmp b3
-  //SEG12 main::@3
-  b3:
+    jmp b2
+  //SEG12 main::@2
+  b2:
   //SEG13 [6] *((const byte*) main::bgcol#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta bgcol
@@ -261,9 +262,9 @@ main: {
     lda #'m'
     cmp pos
     beq b1
-    jmp b3
-  //SEG12 main::@3
-  b3:
+    jmp b2
+  //SEG12 main::@2
+  b2:
   //SEG13 [6] *((const byte*) main::bgcol#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta bgcol
@@ -284,7 +285,7 @@ main: {
 ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction b1_from_bbegin:
@@ -292,7 +293,7 @@ Removing instruction b1:
 Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b3:
+Removing instruction b2:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
@@ -306,7 +307,7 @@ FINAL SYMBOL TABLE
 (label) @end
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::b
 (const byte) main::b#0 b = (byte/signed byte/word/signed word/dword/signed dword) 4
@@ -356,7 +357,7 @@ main: {
     lda #'m'
     cmp pos
     beq b1
-  //SEG12 main::@3
+  //SEG12 main::@2
   //SEG13 [6] *((const byte*) main::bgcol#0) ← (byte/signed byte/word/signed word/dword/signed dword) 2 -- _deref_pbuc1=vbuc2 
     lda #2
     sta bgcol
diff --git a/src/test/ref/true-inline-words.sym b/src/test/ref/true-inline-words.sym
index aa2fef23e..d5d9c5f36 100644
--- a/src/test/ref/true-inline-words.sym
+++ b/src/test/ref/true-inline-words.sym
@@ -3,7 +3,7 @@
 (label) @end
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::b
 (const byte) main::b#0 b = (byte/signed byte/word/signed word/dword/signed dword) 4
diff --git a/src/test/ref/unroll-screenfill-for-double.cfg b/src/test/ref/unroll-screenfill-for-double.cfg
index 788bc52a4..fe6676922 100644
--- a/src/test/ref/unroll-screenfill-for-double.cfg
+++ b/src/test/ref/unroll-screenfill-for-double.cfg
@@ -9,11 +9,11 @@
   [3] phi()
 main: scope:[main]  from @1
   [4] phi()
-  to:main::@2
-main::@2: scope:[main]  from main
+  to:main::@1
+main::@1: scope:[main]  from main
   [5] *((const byte*) main::SCREEN#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@2_1
-main::@2_1: scope:[main]  from main::@2
+main::@2_1: scope:[main]  from main::@1
   [6] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1*(byte/signed byte/word/signed word/dword/signed dword) $28) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@2_2
 main::@2_2: scope:[main]  from main::@2_1
diff --git a/src/test/ref/unroll-screenfill-for-double.log b/src/test/ref/unroll-screenfill-for-double.log
index 6c92642cc..d81b6ca00 100644
--- a/src/test/ref/unroll-screenfill-for-double.log
+++ b/src/test/ref/unroll-screenfill-for-double.log
@@ -832,6 +832,7 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block main::@2 to main::@1
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -849,11 +850,11 @@ FINAL CONTROL FLOW GRAPH
   [3] phi()
 main: scope:[main]  from @1
   [4] phi()
-  to:main::@2
-main::@2: scope:[main]  from main
+  to:main::@1
+main::@1: scope:[main]  from main
   [5] *((const byte*) main::SCREEN#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@2_1
-main::@2_1: scope:[main]  from main::@2
+main::@2_1: scope:[main]  from main::@1
   [6] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1*(byte/signed byte/word/signed word/dword/signed dword) $28) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:main::@2_2
 main::@2_2: scope:[main]  from main::@2_1
@@ -1254,9 +1255,9 @@ bend:
 //SEG10 main
 main: {
     .label SCREEN = $400
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) main::SCREEN#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta SCREEN
@@ -2144,9 +2145,9 @@ bend:
 //SEG10 main
 main: {
     .label SCREEN = $400
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) main::SCREEN#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta SCREEN
@@ -2880,7 +2881,7 @@ main: {
 ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp b2_1
 Removing instruction jmp b2_2
 Removing instruction jmp b2_3
@@ -3009,7 +3010,7 @@ Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
-Removing instruction b2:
+Removing instruction b1:
 Removing instruction b2_1:
 Removing instruction b2_2:
 Removing instruction b2_3:
@@ -3254,7 +3255,7 @@ FINAL SYMBOL TABLE
 (label) @begin
 (label) @end
 (void()) main()
-(label) main::@2
+(label) main::@1
 (label) main::@2_1
 (label) main::@2_10
 (label) main::@2_100
@@ -3403,7 +3404,7 @@ Score: 512
 //SEG10 main
 main: {
     .label SCREEN = $400
-  //SEG11 main::@2
+  //SEG11 main::@1
   //SEG12 [5] *((const byte*) main::SCREEN#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta SCREEN
diff --git a/src/test/ref/unroll-screenfill-for-double.sym b/src/test/ref/unroll-screenfill-for-double.sym
index e6edf2722..1018112a1 100644
--- a/src/test/ref/unroll-screenfill-for-double.sym
+++ b/src/test/ref/unroll-screenfill-for-double.sym
@@ -2,7 +2,7 @@
 (label) @begin
 (label) @end
 (void()) main()
-(label) main::@2
+(label) main::@1
 (label) main::@2_1
 (label) main::@2_10
 (label) main::@2_100
diff --git a/src/test/ref/unroll-screenfill-while.asm b/src/test/ref/unroll-screenfill-while.asm
index 53ad5e160..5952688c8 100644
--- a/src/test/ref/unroll-screenfill-while.asm
+++ b/src/test/ref/unroll-screenfill-while.asm
@@ -5,7 +5,7 @@
 main: {
     .label SCREEN = $400
     ldx #0
-  b3:
+  b2:
     txa
     sta SCREEN,x
     txa
@@ -58,6 +58,6 @@ main: {
     sta SCREEN+$18*$28,x
     inx
     cpx #$28
-    bne b3
+    bne b2
     rts
 }
diff --git a/src/test/ref/unroll-screenfill-while.cfg b/src/test/ref/unroll-screenfill-while.cfg
index 05f73f29e..688e96e9d 100644
--- a/src/test/ref/unroll-screenfill-while.cfg
+++ b/src/test/ref/unroll-screenfill-while.cfg
@@ -10,13 +10,13 @@
 main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@4
-  [5] (byte) main::x#5 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::x#1 )
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+main::@1: scope:[main]  from main main::@3
+  [5] (byte) main::x#5 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::x#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [6] *((const byte*) main::SCREEN#0 + (byte) main::x#5) ← (byte) main::x#5
   to:main::@3_1
-main::@3_1: scope:[main]  from main::@3
+main::@3_1: scope:[main]  from main::@2
   [7] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1*(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::x#5) ← (byte) main::x#5
   to:main::@3_2
 main::@3_2: scope:[main]  from main::@3_1
@@ -87,11 +87,11 @@ main::@3_23: scope:[main]  from main::@3_22
   to:main::@3_24
 main::@3_24: scope:[main]  from main::@3_23
   [30] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $18*(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::x#5) ← (byte) main::x#5
-  to:main::@4
-main::@4: scope:[main]  from main::@3_24
+  to:main::@3
+main::@3: scope:[main]  from main::@3_24
   [31] (byte) main::x#1 ← ++ (byte) main::x#5
   [32] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@4
+main::@return: scope:[main]  from main::@3
   [33] return 
   to:@return
diff --git a/src/test/ref/unroll-screenfill-while.log b/src/test/ref/unroll-screenfill-while.log
index 1c7a1c7da..01ba02137 100644
--- a/src/test/ref/unroll-screenfill-while.log
+++ b/src/test/ref/unroll-screenfill-while.log
@@ -605,6 +605,8 @@ Created 1 initial phi equivalence classes
 Coalesced [34] main::x#6 ← main::x#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) main::@9
+Renumbering block main::@3 to main::@2
+Renumbering block main::@4 to main::@3
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -623,13 +625,13 @@ FINAL CONTROL FLOW GRAPH
 main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@4
-  [5] (byte) main::x#5 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::x#1 )
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+main::@1: scope:[main]  from main main::@3
+  [5] (byte) main::x#5 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::x#1 )
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [6] *((const byte*) main::SCREEN#0 + (byte) main::x#5) ← (byte) main::x#5
   to:main::@3_1
-main::@3_1: scope:[main]  from main::@3
+main::@3_1: scope:[main]  from main::@2
   [7] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) 1*(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::x#5) ← (byte) main::x#5
   to:main::@3_2
 main::@3_2: scope:[main]  from main::@3_1
@@ -700,12 +702,12 @@ main::@3_23: scope:[main]  from main::@3_22
   to:main::@3_24
 main::@3_24: scope:[main]  from main::@3_23
   [30] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $18*(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::x#5) ← (byte) main::x#5
-  to:main::@4
-main::@4: scope:[main]  from main::@3_24
+  to:main::@3
+main::@3: scope:[main]  from main::@3_24
   [31] (byte) main::x#1 ← ++ (byte) main::x#5
   [32] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@4
+main::@return: scope:[main]  from main::@3
   [33] return 
   to:@return
 
@@ -758,15 +760,15 @@ main: {
     lda #0
     sta x
     jmp b1
-  //SEG13 [5] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
-  b1_from_b4:
-  //SEG14 [5] phi (byte) main::x#5 = (byte) main::x#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG14 [5] phi (byte) main::x#5 = (byte) main::x#1 [phi:main::@3->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
-    jmp b3
-  //SEG16 main::@3
-  b3:
+    jmp b2
+  //SEG16 main::@2
+  b2:
   //SEG17 [6] *((const byte*) main::SCREEN#0 + (byte) main::x#5) ← (byte) main::x#5 -- pbuc1_derefidx_vbuz1=vbuz1 
     ldy x
     tya
@@ -939,15 +941,15 @@ main: {
     ldy x
     tya
     sta SCREEN+$18*$28,y
-    jmp b4
-  //SEG66 main::@4
-  b4:
+    jmp b3
+  //SEG66 main::@3
+  b3:
   //SEG67 [31] (byte) main::x#1 ← ++ (byte) main::x#5 -- vbuz1=_inc_vbuz1 
     inc x
   //SEG68 [32] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp x
-    bne b1_from_b4
+    bne b1_from_b3
     jmp breturn
   //SEG69 main::@return
   breturn:
@@ -997,15 +999,15 @@ main: {
   //SEG12 [5] phi (byte) main::x#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
     jmp b1
-  //SEG13 [5] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
-  b1_from_b4:
-  //SEG14 [5] phi (byte) main::x#5 = (byte) main::x#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG14 [5] phi (byte) main::x#5 = (byte) main::x#1 [phi:main::@3->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
-    jmp b3
-  //SEG16 main::@3
-  b3:
+    jmp b2
+  //SEG16 main::@2
+  b2:
   //SEG17 [6] *((const byte*) main::SCREEN#0 + (byte) main::x#5) ← (byte) main::x#5 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta SCREEN,x
@@ -1153,14 +1155,14 @@ main: {
   //SEG65 [30] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $18*(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::x#5) ← (byte) main::x#5 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta SCREEN+$18*$28,x
-    jmp b4
-  //SEG66 main::@4
-  b4:
+    jmp b3
+  //SEG66 main::@3
+  b3:
   //SEG67 [31] (byte) main::x#1 ← ++ (byte) main::x#5 -- vbuxx=_inc_vbuxx 
     inx
   //SEG68 [32] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b1_from_b4
+    bne b1_from_b3
     jmp breturn
   //SEG69 main::@return
   breturn:
@@ -1172,7 +1174,7 @@ ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp b3_1
 Removing instruction jmp b3_2
 Removing instruction jmp b3_3
@@ -1197,16 +1199,16 @@ Removing instruction jmp b3_21
 Removing instruction jmp b3_22
 Removing instruction jmp b3_23
 Removing instruction jmp b3_24
-Removing instruction jmp b4
+Removing instruction jmp b3
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1 with b3
-Replacing label b1_from_b4 with b3
+Replacing label b1 with b2
+Replacing label b1_from_b3 with b2
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
 Removing instruction main_from_b1:
 Removing instruction bend_from_b1:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b3:
 Removing instruction b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
@@ -1235,13 +1237,13 @@ Removing instruction b3_21:
 Removing instruction b3_22:
 Removing instruction b3_23:
 Removing instruction b3_24:
-Removing instruction b4:
+Removing instruction b3:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
 Updating BasicUpstart to call main directly
 Removing instruction jsr main
 Succesful ASM optimization Pass5SkipBegin
-Removing instruction jmp b3
+Removing instruction jmp b2
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -1252,6 +1254,7 @@ FINAL SYMBOL TABLE
 (label) @end
 (void()) main()
 (label) main::@1
+(label) main::@2
 (label) main::@3
 (label) main::@3_1
 (label) main::@3_10
@@ -1277,7 +1280,6 @@ FINAL SYMBOL TABLE
 (label) main::@3_7
 (label) main::@3_8
 (label) main::@3_9
-(label) main::@4
 (label) main::@return
 (byte*) main::SCREEN
 (const byte*) main::SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
@@ -1312,11 +1314,11 @@ main: {
   //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
   //SEG12 [5] phi (byte) main::x#5 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuxx=vbuc1 
     ldx #0
-  //SEG13 [5] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
-  //SEG14 [5] phi (byte) main::x#5 = (byte) main::x#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  //SEG14 [5] phi (byte) main::x#5 = (byte) main::x#1 [phi:main::@3->main::@1#0] -- register_copy 
   //SEG15 main::@1
-  //SEG16 main::@3
-  b3:
+  //SEG16 main::@2
+  b2:
   //SEG17 [6] *((const byte*) main::SCREEN#0 + (byte) main::x#5) ← (byte) main::x#5 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta SCREEN,x
@@ -1416,12 +1418,12 @@ main: {
   //SEG65 [30] *((const byte*) main::SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $18*(byte/signed byte/word/signed word/dword/signed dword) $28 + (byte) main::x#5) ← (byte) main::x#5 -- pbuc1_derefidx_vbuxx=vbuxx 
     txa
     sta SCREEN+$18*$28,x
-  //SEG66 main::@4
+  //SEG66 main::@3
   //SEG67 [31] (byte) main::x#1 ← ++ (byte) main::x#5 -- vbuxx=_inc_vbuxx 
     inx
   //SEG68 [32] if((byte) main::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto main::@1 -- vbuxx_neq_vbuc1_then_la1 
     cpx #$28
-    bne b3
+    bne b2
   //SEG69 main::@return
   //SEG70 [33] return 
     rts
diff --git a/src/test/ref/unroll-screenfill-while.sym b/src/test/ref/unroll-screenfill-while.sym
index 627a3f99d..1bb632924 100644
--- a/src/test/ref/unroll-screenfill-while.sym
+++ b/src/test/ref/unroll-screenfill-while.sym
@@ -3,6 +3,7 @@
 (label) @end
 (void()) main()
 (label) main::@1
+(label) main::@2
 (label) main::@3
 (label) main::@3_1
 (label) main::@3_10
@@ -28,7 +29,6 @@
 (label) main::@3_7
 (label) main::@3_8
 (label) main::@3_9
-(label) main::@4
 (label) main::@return
 (byte*) main::SCREEN
 (const byte*) main::SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
diff --git a/src/test/ref/unused-method.cfg b/src/test/ref/unused-method.cfg
index c6dbd72c1..6a6be9c33 100644
--- a/src/test/ref/unused-method.cfg
+++ b/src/test/ref/unused-method.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const byte*) main::screen#0) ← (byte/signed byte/word/signed word/dword/signed dword) 1
   to:main::@return
 main::@return: scope:[main]  from main
diff --git a/src/test/ref/unused-method.log b/src/test/ref/unused-method.log
index 8bdb4965f..b27e93273 100644
--- a/src/test/ref/unused-method.log
+++ b/src/test/ref/unused-method.log
@@ -42,21 +42,22 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] *((const byte*) main::screen#0) ← (byte/signed byte/word/signed word/dword/signed dword) 1
   to:main::@return
 main::@return: scope:[main]  from main
@@ -80,15 +81,15 @@ INITIAL ASM
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -124,15 +125,15 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
   jsr main
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG8 @end
 bend:
@@ -150,13 +151,13 @@ main: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction bend_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction breturn:
@@ -168,7 +169,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -188,10 +189,10 @@ Score: 12
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [3] phi from @1 to @end [phi:@1->@end]
 //SEG8 @end
 //SEG9 main
 main: {
diff --git a/src/test/ref/unused-method.sym b/src/test/ref/unused-method.sym
index 0a03cd6c2..85cd5c223 100644
--- a/src/test/ref/unused-method.sym
+++ b/src/test/ref/unused-method.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
diff --git a/src/test/ref/unused-vars.cfg b/src/test/ref/unused-vars.cfg
index b5bbd80ba..027de7abc 100644
--- a/src/test/ref/unused-vars.cfg
+++ b/src/test/ref/unused-vars.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call s 
   to:main::@1
diff --git a/src/test/ref/unused-vars.log b/src/test/ref/unused-vars.log
index c4ceb03a6..abd5394fa 100644
--- a/src/test/ref/unused-vars.log
+++ b/src/test/ref/unused-vars.log
@@ -238,8 +238,9 @@ Created 1 initial phi equivalence classes
 Coalesced [12] main::i#3 ← main::i#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) main::@4
+Renumbering block @2 to @1
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of s
@@ -247,14 +248,14 @@ Adding NOP phi() at start of s
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   [5] call s 
   to:main::@1
@@ -316,17 +317,17 @@ INITIAL ASM
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -409,17 +410,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN = $400
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -470,17 +471,17 @@ s: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Replacing label b1_from_b1 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
@@ -498,7 +499,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
@@ -544,11 +545,11 @@ Score: 243
 //SEG2 Global Constants & labels
   .label SCREEN = $400
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
diff --git a/src/test/ref/unused-vars.sym b/src/test/ref/unused-vars.sym
index be61b00e0..5450a043b 100644
--- a/src/test/ref/unused-vars.sym
+++ b/src/test/ref/unused-vars.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (byte*) BGCOL
diff --git a/src/test/ref/unusedblockproblem.asm b/src/test/ref/unusedblockproblem.asm
index c98010eeb..df8b27a7f 100644
--- a/src/test/ref/unusedblockproblem.asm
+++ b/src/test/ref/unusedblockproblem.asm
@@ -4,7 +4,7 @@
 .pc = $80d "Program"
 main: {
     .label SCREEN = $400
-  b2:
+  b1:
     inc SCREEN
-    jmp b2
+    jmp b1
 }
diff --git a/src/test/ref/unusedblockproblem.cfg b/src/test/ref/unusedblockproblem.cfg
index 026509b1f..14c12f2b7 100644
--- a/src/test/ref/unusedblockproblem.cfg
+++ b/src/test/ref/unusedblockproblem.cfg
@@ -9,7 +9,7 @@
   [3] phi()
 main: scope:[main]  from @1
   [4] phi()
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [5] *((const byte*) main::SCREEN#0) ← ++ *((const byte*) main::SCREEN#0)
-  to:main::@2
+  to:main::@1
diff --git a/src/test/ref/unusedblockproblem.log b/src/test/ref/unusedblockproblem.log
index 8fe022c9f..2c6e370ec 100644
--- a/src/test/ref/unusedblockproblem.log
+++ b/src/test/ref/unusedblockproblem.log
@@ -79,6 +79,7 @@ Calls in [] to main:2
 
 Created 0 initial phi equivalence classes
 Coalesced down to 0 phi equivalence classes
+Renumbering block main::@2 to main::@1
 Adding NOP phi() at start of @begin
 Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
@@ -96,10 +97,10 @@ FINAL CONTROL FLOW GRAPH
   [3] phi()
 main: scope:[main]  from @1
   [4] phi()
-  to:main::@2
-main::@2: scope:[main]  from main main::@2
+  to:main::@1
+main::@1: scope:[main]  from main main::@1
   [5] *((const byte*) main::SCREEN#0) ← ++ *((const byte*) main::SCREEN#0)
-  to:main::@2
+  to:main::@1
 
 
 VARIABLE REGISTER WEIGHTS
@@ -137,12 +138,12 @@ bend:
 //SEG10 main
 main: {
     .label SCREEN = $400
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) main::SCREEN#0) ← ++ *((const byte*) main::SCREEN#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc SCREEN
-    jmp b2
+    jmp b1
 }
 
 REGISTER UPLIFT POTENTIAL REGISTERS
@@ -181,18 +182,18 @@ bend:
 //SEG10 main
 main: {
     .label SCREEN = $400
-    jmp b2
-  //SEG11 main::@2
-  b2:
+    jmp b1
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) main::SCREEN#0) ← ++ *((const byte*) main::SCREEN#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc SCREEN
-    jmp b2
+    jmp b1
 }
 
 ASSEMBLER OPTIMIZATIONS
 Removing instruction jmp b1
 Removing instruction jmp bend
-Removing instruction jmp b2
+Removing instruction jmp b1
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction b1_from_bbegin:
 Removing instruction b1:
@@ -212,7 +213,7 @@ FINAL SYMBOL TABLE
 (label) @begin
 (label) @end
 (void()) main()
-(label) main::@2
+(label) main::@1
 (byte*) main::SCREEN
 (const byte*) main::SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (byte) main::line
@@ -239,10 +240,10 @@ Score: 90
 //SEG10 main
 main: {
     .label SCREEN = $400
-  //SEG11 main::@2
-  b2:
+  //SEG11 main::@1
+  b1:
   //SEG12 [5] *((const byte*) main::SCREEN#0) ← ++ *((const byte*) main::SCREEN#0) -- _deref_pbuc1=_inc__deref_pbuc1 
     inc SCREEN
-    jmp b2
+    jmp b1
 }
 
diff --git a/src/test/ref/unusedblockproblem.sym b/src/test/ref/unusedblockproblem.sym
index 888e51948..2b06d126a 100644
--- a/src/test/ref/unusedblockproblem.sym
+++ b/src/test/ref/unusedblockproblem.sym
@@ -2,7 +2,7 @@
 (label) @begin
 (label) @end
 (void()) main()
-(label) main::@2
+(label) main::@1
 (byte*) main::SCREEN
 (const byte*) main::SCREEN#0 SCREEN = ((byte*))(word/signed word/dword/signed dword) $400
 (byte) main::line
diff --git a/src/test/ref/var-register.cfg b/src/test/ref/var-register.cfg
index dea83691e..c12b122c2 100644
--- a/src/test/ref/var-register.cfg
+++ b/src/test/ref/var-register.cfg
@@ -1,13 +1,13 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@5
@@ -16,18 +16,18 @@ main::@1: scope:[main]  from main main::@5
 main::@2: scope:[main]  from main::@1 main::@4
   [6] (byte) main::y#4 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::y#1 )
   to:main::@3
-main::@3: scope:[main]  from main::@2 main::@7
-  [7] (byte) main::a#2 ← phi( main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::a#1 )
+main::@3: scope:[main]  from main::@2 main::@6
+  [7] (byte) main::a#2 ← phi( main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::a#1 )
   [8] (byte) main::val1#0 ← (byte) main::a#2 + (byte) main::x#7
   [9] (byte) print::idx#0 ← (byte) main::y#4
   [10] (byte) print::val#0 ← (byte) main::val1#0
   [11] call print 
-  to:main::@7
-main::@7: scope:[main]  from main::@3
+  to:main::@6
+main::@6: scope:[main]  from main::@3
   [12] (byte) main::a#1 ← ++ (byte) main::a#2
   [13] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@3
   to:main::@4
-main::@4: scope:[main]  from main::@7
+main::@4: scope:[main]  from main::@6
   [14] (byte) main::y#1 ← ++ (byte) main::y#4
   [15] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@2
   to:main::@5
diff --git a/src/test/ref/var-register.log b/src/test/ref/var-register.log
index 6a614f2e2..418b3032f 100644
--- a/src/test/ref/var-register.log
+++ b/src/test/ref/var-register.log
@@ -176,22 +176,24 @@ Coalesced down to 3 phi equivalence classes
 Culled Empty Block (label) main::@8
 Culled Empty Block (label) main::@9
 Culled Empty Block (label) main::@10
+Renumbering block @2 to @1
+Renumbering block main::@7 to main::@6
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @2
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@2
-@2: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @2
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @2
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
 main::@1: scope:[main]  from main main::@5
@@ -200,18 +202,18 @@ main::@1: scope:[main]  from main main::@5
 main::@2: scope:[main]  from main::@1 main::@4
   [6] (byte) main::y#4 ← phi( main::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::y#1 )
   to:main::@3
-main::@3: scope:[main]  from main::@2 main::@7
-  [7] (byte) main::a#2 ← phi( main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@7/(byte) main::a#1 )
+main::@3: scope:[main]  from main::@2 main::@6
+  [7] (byte) main::a#2 ← phi( main::@2/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@6/(byte) main::a#1 )
   [8] (byte) main::val1#0 ← (byte) main::a#2 + (byte) main::x#7
   [9] (byte) print::idx#0 ← (byte) main::y#4
   [10] (byte) print::val#0 ← (byte) main::val1#0
   [11] call print 
-  to:main::@7
-main::@7: scope:[main]  from main::@3
+  to:main::@6
+main::@6: scope:[main]  from main::@3
   [12] (byte) main::a#1 ← ++ (byte) main::a#2
   [13] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@3
   to:main::@4
-main::@4: scope:[main]  from main::@7
+main::@4: scope:[main]  from main::@6
   [14] (byte) main::y#1 ← ++ (byte) main::y#4
   [15] if((byte) main::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@2
   to:main::@5
@@ -277,17 +279,17 @@ INITIAL ASM
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -324,9 +326,9 @@ main: {
     lda #0
     sta a
     jmp b3
-  //SEG23 [7] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
-  b3_from_b7:
-  //SEG24 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG23 [7] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
+  b3_from_b6:
+  //SEG24 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@6->main::@3#0] -- register_copy 
     jmp b3
   //SEG25 main::@3
   b3:
@@ -340,15 +342,15 @@ main: {
     sta print.val
   //SEG29 [11] call print 
     jsr print
-    jmp b7
-  //SEG30 main::@7
-  b7:
+    jmp b6
+  //SEG30 main::@6
+  b6:
   //SEG31 [12] (byte) main::a#1 ← ++ (byte) main::a#2 -- vbuz1=_inc_vbuz1 
     inc a
   //SEG32 [13] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #$65
     cmp a
-    bne b3_from_b7
+    bne b3_from_b6
     jmp b4
   //SEG33 main::@4
   b4:
@@ -422,17 +424,17 @@ ASSEMBLER BEFORE OPTIMIZATION
 //SEG2 Global Constants & labels
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-b2_from_bbegin:
-  jmp b2
-//SEG5 @2
-b2:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-main_from_b2:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
-bend_from_b2:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -467,9 +469,9 @@ main: {
     lda #0
     sta a
     jmp b3
-  //SEG23 [7] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
-  b3_from_b7:
-  //SEG24 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG23 [7] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
+  b3_from_b6:
+  //SEG24 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@6->main::@3#0] -- register_copy 
     jmp b3
   //SEG25 main::@3
   b3:
@@ -481,15 +483,15 @@ main: {
   //SEG28 [10] (byte) print::val#0 ← (byte) main::val1#0
   //SEG29 [11] call print 
     jsr print
-    jmp b7
-  //SEG30 main::@7
-  b7:
+    jmp b6
+  //SEG30 main::@6
+  b6:
   //SEG31 [12] (byte) main::a#1 ← ++ (byte) main::a#2 -- vbuz1=_inc_vbuz1 
     inc a
   //SEG32 [13] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
     lda #$65
     cmp a
-    bne b3_from_b7
+    bne b3_from_b6
     jmp b4
   //SEG33 main::@4
   b4:
@@ -526,33 +528,33 @@ print: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b2
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
 Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp b7
+Removing instruction jmp b6
 Removing instruction jmp b4
 Removing instruction jmp b5
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b3_from_b7 with b3
+Replacing label b3_from_b6 with b3
 Replacing label b2_from_b4 with b2
 Replacing label b1_from_b5 with b1
-Removing instruction b2_from_bbegin:
-Removing instruction b2:
-Removing instruction main_from_b2:
-Removing instruction bend_from_b2:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_b5:
 Removing instruction b2_from_b1:
 Removing instruction b2_from_b4:
 Removing instruction b3_from_b2:
-Removing instruction b3_from_b7:
+Removing instruction b3_from_b6:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b7:
+Removing instruction b6:
 Removing instruction b4:
 Removing instruction b5:
 Removing instruction breturn:
@@ -569,7 +571,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -578,7 +580,7 @@ FINAL SYMBOL TABLE
 (label) main::@3
 (label) main::@4
 (label) main::@5
-(label) main::@7
+(label) main::@6
 (label) main::@return
 (byte) main::a
 (byte) main::a#1 a zp ZP_BYTE:2 1501.5
@@ -618,11 +620,11 @@ Score: 31452
 .pc = $80d "Program"
 //SEG2 Global Constants & labels
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @2 [phi:@begin->@2]
-//SEG5 @2
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @2 to main [phi:@2->main]
-//SEG8 [3] phi from @2 to @end [phi:@2->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -645,8 +647,8 @@ main: {
   //SEG22 [7] phi (byte) main::a#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main::@2->main::@3#0] -- vbuz1=vbuc1 
     lda #0
     sta a
-  //SEG23 [7] phi from main::@7 to main::@3 [phi:main::@7->main::@3]
-  //SEG24 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@7->main::@3#0] -- register_copy 
+  //SEG23 [7] phi from main::@6 to main::@3 [phi:main::@6->main::@3]
+  //SEG24 [7] phi (byte) main::a#2 = (byte) main::a#1 [phi:main::@6->main::@3#0] -- register_copy 
   //SEG25 main::@3
   b3:
   //SEG26 [8] (byte) main::val1#0 ← (byte) main::a#2 + (byte) main::x#7 -- vbuaa=vbuz1_plus_vbuyy 
@@ -657,7 +659,7 @@ main: {
   //SEG28 [10] (byte) print::val#0 ← (byte) main::val1#0
   //SEG29 [11] call print 
     jsr print
-  //SEG30 main::@7
+  //SEG30 main::@6
   //SEG31 [12] (byte) main::a#1 ← ++ (byte) main::a#2 -- vbuz1=_inc_vbuz1 
     inc a
   //SEG32 [13] if((byte) main::a#1!=(byte/signed byte/word/signed word/dword/signed dword) $65) goto main::@3 -- vbuz1_neq_vbuc1_then_la1 
diff --git a/src/test/ref/var-register.sym b/src/test/ref/var-register.sym
index 56d653e80..900785cd5 100644
--- a/src/test/ref/var-register.sym
+++ b/src/test/ref/var-register.sym
@@ -1,4 +1,4 @@
-(label) @2
+(label) @1
 (label) @begin
 (label) @end
 (void()) main()
@@ -7,7 +7,7 @@
 (label) main::@3
 (label) main::@4
 (label) main::@5
-(label) main::@7
+(label) main::@6
 (label) main::@return
 (byte) main::a
 (byte) main::a#1 a zp ZP_BYTE:2 1501.5
diff --git a/src/test/ref/voronoi.asm b/src/test/ref/voronoi.asm
index 0fa5ca80d..e395a3a28 100644
--- a/src/test/ref/voronoi.asm
+++ b/src/test/ref/voronoi.asm
@@ -137,40 +137,40 @@ findcol: {
     txa
     cmp x
     beq !+
-    bcs b4
+    bcs b3
   !:
     txa
     eor #$ff
     sec
     adc x
     tax
-  b5:
+  b4:
     lda y
     cmp yp
-    bcc b6
+    bcc b5
     sec
     sbc yp
     stx $ff
     clc
     adc $ff
     tax
-  b7:
+  b6:
     cpx mindiff
-    bcs b21
+    bcs b13
     lda COLS,y
     sta mincol
-  b8:
+  b7:
     iny
     cpy #numpoints
-    bcc b19
+    bcc b12
     jmp breturn
-  b19:
+  b12:
     stx mindiff
     jmp b1
-  b21:
+  b13:
     ldx mindiff
-    jmp b8
-  b6:
+    jmp b7
+  b5:
     lda yp
     sec
     sbc y
@@ -178,13 +178,13 @@ findcol: {
     clc
     adc $ff
     tax
-    jmp b7
-  b4:
+    jmp b6
+  b3:
     txa
     sec
     sbc x
     tax
-    jmp b5
+    jmp b4
 }
 initscreen: {
     .label screen = 3
diff --git a/src/test/ref/voronoi.cfg b/src/test/ref/voronoi.cfg
index 7d4053a98..ac9c44ac5 100644
--- a/src/test/ref/voronoi.cfg
+++ b/src/test/ref/voronoi.cfg
@@ -1,72 +1,72 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] phi()
   [5] call initscreen 
   to:main::@1
-main::@1: scope:[main]  from main main::@4
+main::@1: scope:[main]  from main main::@2
   [6] phi()
   [7] call render 
-  to:main::@4
-main::@4: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] phi()
   [9] call animate 
   to:main::@1
-animate: scope:[animate]  from main::@4
+animate: scope:[animate]  from main::@2
   [10] (byte/signed word/word/dword/signed dword~) animate::$0 ← *((const byte[]) XPOS#0) + (byte/signed byte/word/signed word/dword/signed dword) 1
   [11] *((const byte[]) XPOS#0) ← (byte/signed word/word/dword/signed dword~) animate::$0
   [12] if(*((const byte[]) XPOS#0)!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto animate::@1
-  to:animate::@6
-animate::@6: scope:[animate]  from animate
+  to:animate::@5
+animate::@5: scope:[animate]  from animate
   [13] *((const byte[]) XPOS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:animate::@1
-animate::@1: scope:[animate]  from animate animate::@6
+animate::@1: scope:[animate]  from animate animate::@5
   [14] (byte/signed word/word/dword/signed dword~) animate::$3 ← *((const byte[]) YPOS#0) + (byte/signed byte/word/signed word/dword/signed dword) 1
   [15] *((const byte[]) YPOS#0) ← (byte/signed word/word/dword/signed dword~) animate::$3
   [16] if(*((const byte[]) YPOS#0)!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto animate::@2
-  to:animate::@7
-animate::@7: scope:[animate]  from animate::@1
+  to:animate::@6
+animate::@6: scope:[animate]  from animate::@1
   [17] *((const byte[]) YPOS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:animate::@2
-animate::@2: scope:[animate]  from animate::@1 animate::@7
+animate::@2: scope:[animate]  from animate::@1 animate::@6
   [18] (byte/signed word/word/dword/signed dword~) animate::$6 ← *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 1) - (byte/signed byte/word/signed word/dword/signed dword) 1
   [19] *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte/signed word/word/dword/signed dword~) animate::$6
   [20] if(*((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 1)!=(byte/word/signed word/dword/signed dword) $ff) goto animate::@3
-  to:animate::@8
-animate::@8: scope:[animate]  from animate::@2
+  to:animate::@7
+animate::@7: scope:[animate]  from animate::@2
   [21] *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte/signed byte/word/signed word/dword/signed dword) $28
   to:animate::@3
-animate::@3: scope:[animate]  from animate::@2 animate::@8
+animate::@3: scope:[animate]  from animate::@2 animate::@7
   [22] (byte/signed word/word/dword/signed dword~) animate::$9 ← *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 2) + (byte/signed byte/word/signed word/dword/signed dword) 1
   [23] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte/signed word/word/dword/signed dword~) animate::$9
   [24] if(*((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 2)!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto animate::@4
-  to:animate::@9
-animate::@9: scope:[animate]  from animate::@3
+  to:animate::@8
+animate::@8: scope:[animate]  from animate::@3
   [25] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:animate::@4
-animate::@4: scope:[animate]  from animate::@3 animate::@9
+animate::@4: scope:[animate]  from animate::@3 animate::@8
   [26] (byte/signed word/word/dword/signed dword~) animate::$12 ← *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) - (byte/signed byte/word/signed word/dword/signed dword) 1
   [27] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed word/word/dword/signed dword~) animate::$12
   [28] if(*((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3)!=(byte/word/signed word/dword/signed dword) $ff) goto animate::@return
-  to:animate::@10
-animate::@10: scope:[animate]  from animate::@4
+  to:animate::@9
+animate::@9: scope:[animate]  from animate::@4
   [29] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed byte/word/signed word/dword/signed dword) $19
   [30] (byte/signed word/word/dword/signed dword~) animate::$15 ← *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) + (byte/signed byte/word/signed word/dword/signed dword) 7
   [31] *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed word/word/dword/signed dword~) animate::$15
   [32] if(*((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3)<(byte/signed byte/word/signed word/dword/signed dword) $28) goto animate::@return
-  to:animate::@11
-animate::@11: scope:[animate]  from animate::@10
+  to:animate::@10
+animate::@10: scope:[animate]  from animate::@9
   [33] (byte/signed word/word/dword/signed dword~) animate::$18 ← *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) - (byte/signed byte/word/signed word/dword/signed dword) $28
   [34] *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed word/word/dword/signed dword~) animate::$18
   to:animate::@return
-animate::@return: scope:[animate]  from animate::@10 animate::@11 animate::@4
+animate::@return: scope:[animate]  from animate::@10 animate::@4 animate::@9
   [35] return 
   to:@return
 render: scope:[render]  from main::@1
@@ -76,20 +76,20 @@ render::@1: scope:[render]  from render render::@3
   [37] (byte*) render::colline#5 ← phi( render/(const byte*) COLORS#0 render::@3/(byte*) render::colline#1 )
   [37] (byte) render::y#4 ← phi( render/(byte/signed byte/word/signed word/dword/signed dword) 0 render::@3/(byte) render::y#1 )
   to:render::@2
-render::@2: scope:[render]  from render::@1 render::@5
-  [38] (byte) render::x#2 ← phi( render::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render::@5/(byte) render::x#1 )
+render::@2: scope:[render]  from render::@1 render::@4
+  [38] (byte) render::x#2 ← phi( render::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render::@4/(byte) render::x#1 )
   [39] (byte) findcol::x#0 ← (byte) render::x#2
   [40] (byte) findcol::y#0 ← (byte) render::y#4
   [41] call findcol 
   [42] (byte) findcol::return#0 ← (byte) findcol::return#2
-  to:render::@5
-render::@5: scope:[render]  from render::@2
+  to:render::@4
+render::@4: scope:[render]  from render::@2
   [43] (byte) render::col#0 ← (byte) findcol::return#0
   [44] *((byte*) render::colline#5 + (byte) render::x#2) ← (byte) render::col#0
   [45] (byte) render::x#1 ← ++ (byte) render::x#2
   [46] if((byte) render::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render::@2
   to:render::@3
-render::@3: scope:[render]  from render::@5
+render::@3: scope:[render]  from render::@4
   [47] (byte*) render::colline#1 ← (byte*) render::colline#5 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [48] (byte) render::y#1 ← ++ (byte) render::y#4
   [49] if((byte) render::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto render::@1
@@ -100,61 +100,61 @@ render::@return: scope:[render]  from render::@3
 findcol: scope:[findcol]  from render::@2
   [51] phi()
   to:findcol::@1
-findcol::@1: scope:[findcol]  from findcol findcol::@19
-  [52] (byte) findcol::mincol#10 ← phi( findcol/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@19/(byte) findcol::mincol#2 )
-  [52] (byte) findcol::mindiff#10 ← phi( findcol/(byte/word/signed word/dword/signed dword) $ff findcol::@19/(byte~) findcol::mindiff#13 )
-  [52] (byte) findcol::i#10 ← phi( findcol/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@19/(byte) findcol::i#1 )
+findcol::@1: scope:[findcol]  from findcol findcol::@12
+  [52] (byte) findcol::mincol#10 ← phi( findcol/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@12/(byte) findcol::mincol#2 )
+  [52] (byte) findcol::mindiff#10 ← phi( findcol/(byte/word/signed word/dword/signed dword) $ff findcol::@12/(byte~) findcol::mindiff#13 )
+  [52] (byte) findcol::i#10 ← phi( findcol/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@12/(byte) findcol::i#1 )
   [53] (byte) findcol::xp#0 ← *((const byte[]) XPOS#0 + (byte) findcol::i#10)
   [54] (byte) findcol::yp#0 ← *((const byte[]) YPOS#0 + (byte) findcol::i#10)
   [55] if((byte) findcol::x#0!=(byte) findcol::xp#0) goto findcol::@2
-  to:findcol::@9
-findcol::@9: scope:[findcol]  from findcol::@1
+  to:findcol::@8
+findcol::@8: scope:[findcol]  from findcol::@1
   [56] if((byte) findcol::y#0!=(byte) findcol::yp#0) goto findcol::@2
   to:findcol::@return
-findcol::@return: scope:[findcol]  from findcol::@8 findcol::@9
-  [57] (byte) findcol::return#2 ← phi( findcol::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@8/(byte) findcol::mincol#2 )
+findcol::@return: scope:[findcol]  from findcol::@7 findcol::@8
+  [57] (byte) findcol::return#2 ← phi( findcol::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@7/(byte) findcol::mincol#2 )
   [58] return 
   to:@return
-findcol::@2: scope:[findcol]  from findcol::@1 findcol::@9
-  [59] if((byte) findcol::x#0<(byte) findcol::xp#0) goto findcol::@4
-  to:findcol::@12
-findcol::@12: scope:[findcol]  from findcol::@2
+findcol::@2: scope:[findcol]  from findcol::@1 findcol::@8
+  [59] if((byte) findcol::x#0<(byte) findcol::xp#0) goto findcol::@3
+  to:findcol::@9
+findcol::@9: scope:[findcol]  from findcol::@2
   [60] (byte) findcol::diff#2 ← (byte) findcol::x#0 - (byte) findcol::xp#0
-  to:findcol::@5
-findcol::@5: scope:[findcol]  from findcol::@12 findcol::@4
-  [61] (byte) findcol::diff#5 ← phi( findcol::@12/(byte) findcol::diff#2 findcol::@4/(byte) findcol::diff#1 )
-  [62] if((byte) findcol::y#0<(byte) findcol::yp#0) goto findcol::@6
-  to:findcol::@14
-findcol::@14: scope:[findcol]  from findcol::@5
+  to:findcol::@4
+findcol::@4: scope:[findcol]  from findcol::@3 findcol::@9
+  [61] (byte) findcol::diff#5 ← phi( findcol::@9/(byte) findcol::diff#2 findcol::@3/(byte) findcol::diff#1 )
+  [62] if((byte) findcol::y#0<(byte) findcol::yp#0) goto findcol::@5
+  to:findcol::@10
+findcol::@10: scope:[findcol]  from findcol::@4
   [63] (byte~) findcol::$8 ← (byte) findcol::y#0 - (byte) findcol::yp#0
   [64] (byte) findcol::diff#4 ← (byte) findcol::diff#5 + (byte~) findcol::$8
-  to:findcol::@7
-findcol::@7: scope:[findcol]  from findcol::@14 findcol::@6
-  [65] (byte) findcol::diff#7 ← phi( findcol::@14/(byte) findcol::diff#4 findcol::@6/(byte) findcol::diff#3 )
-  [66] if((byte) findcol::diff#7>=(byte) findcol::mindiff#10) goto findcol::@21
-  to:findcol::@16
-findcol::@16: scope:[findcol]  from findcol::@7
+  to:findcol::@6
+findcol::@6: scope:[findcol]  from findcol::@10 findcol::@5
+  [65] (byte) findcol::diff#7 ← phi( findcol::@10/(byte) findcol::diff#4 findcol::@5/(byte) findcol::diff#3 )
+  [66] if((byte) findcol::diff#7>=(byte) findcol::mindiff#10) goto findcol::@13
+  to:findcol::@11
+findcol::@11: scope:[findcol]  from findcol::@6
   [67] (byte) findcol::mincol#1 ← *((const byte[]) COLS#0 + (byte) findcol::i#10)
-  to:findcol::@8
-findcol::@8: scope:[findcol]  from findcol::@16 findcol::@21
-  [68] (byte) findcol::mindiff#11 ← phi( findcol::@16/(byte) findcol::diff#7 findcol::@21/(byte~) findcol::mindiff#15 )
-  [68] (byte) findcol::mincol#2 ← phi( findcol::@16/(byte) findcol::mincol#1 findcol::@21/(byte) findcol::mincol#10 )
+  to:findcol::@7
+findcol::@7: scope:[findcol]  from findcol::@11 findcol::@13
+  [68] (byte) findcol::mindiff#11 ← phi( findcol::@11/(byte) findcol::diff#7 findcol::@13/(byte~) findcol::mindiff#15 )
+  [68] (byte) findcol::mincol#2 ← phi( findcol::@11/(byte) findcol::mincol#1 findcol::@13/(byte) findcol::mincol#10 )
   [69] (byte) findcol::i#1 ← ++ (byte) findcol::i#10
-  [70] if((byte) findcol::i#1<(const byte) numpoints#0) goto findcol::@19
+  [70] if((byte) findcol::i#1<(const byte) numpoints#0) goto findcol::@12
   to:findcol::@return
-findcol::@19: scope:[findcol]  from findcol::@8
+findcol::@12: scope:[findcol]  from findcol::@7
   [71] (byte~) findcol::mindiff#13 ← (byte) findcol::mindiff#11
   to:findcol::@1
-findcol::@21: scope:[findcol]  from findcol::@7
+findcol::@13: scope:[findcol]  from findcol::@6
   [72] (byte~) findcol::mindiff#15 ← (byte) findcol::mindiff#10
-  to:findcol::@8
-findcol::@6: scope:[findcol]  from findcol::@5
+  to:findcol::@7
+findcol::@5: scope:[findcol]  from findcol::@4
   [73] (byte~) findcol::$10 ← (byte) findcol::yp#0 - (byte) findcol::y#0
   [74] (byte) findcol::diff#3 ← (byte) findcol::diff#5 + (byte~) findcol::$10
-  to:findcol::@7
-findcol::@4: scope:[findcol]  from findcol::@2
+  to:findcol::@6
+findcol::@3: scope:[findcol]  from findcol::@2
   [75] (byte) findcol::diff#1 ← (byte) findcol::xp#0 - (byte) findcol::x#0
-  to:findcol::@5
+  to:findcol::@4
 initscreen: scope:[initscreen]  from main
   [76] phi()
   to:initscreen::@1
diff --git a/src/test/ref/voronoi.log b/src/test/ref/voronoi.log
index d10bea749..d915bf4e5 100644
--- a/src/test/ref/voronoi.log
+++ b/src/test/ref/voronoi.log
@@ -764,12 +764,32 @@ Culled Empty Block (label) render::@6
 Culled Empty Block (label) render::@7
 Culled Empty Block (label) findcol::@20
 Culled Empty Block (label) initscreen::@3
+Renumbering block @5 to @1
+Renumbering block main::@4 to main::@2
+Renumbering block animate::@6 to animate::@5
+Renumbering block animate::@7 to animate::@6
+Renumbering block animate::@8 to animate::@7
+Renumbering block animate::@9 to animate::@8
+Renumbering block animate::@10 to animate::@9
+Renumbering block animate::@11 to animate::@10
+Renumbering block render::@5 to render::@4
+Renumbering block findcol::@4 to findcol::@3
+Renumbering block findcol::@5 to findcol::@4
+Renumbering block findcol::@6 to findcol::@5
+Renumbering block findcol::@7 to findcol::@6
+Renumbering block findcol::@8 to findcol::@7
+Renumbering block findcol::@9 to findcol::@8
+Renumbering block findcol::@12 to findcol::@9
+Renumbering block findcol::@14 to findcol::@10
+Renumbering block findcol::@16 to findcol::@11
+Renumbering block findcol::@19 to findcol::@12
+Renumbering block findcol::@21 to findcol::@13
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @5
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 Adding NOP phi() at start of main::@1
-Adding NOP phi() at start of main::@4
+Adding NOP phi() at start of main::@2
 Adding NOP phi() at start of render
 Adding NOP phi() at start of findcol
 Adding NOP phi() at start of initscreen
@@ -777,73 +797,73 @@ Adding NOP phi() at start of initscreen
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@5
-@5: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @5
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @5
+main: scope:[main]  from @1
   [4] phi()
   [5] call initscreen 
   to:main::@1
-main::@1: scope:[main]  from main main::@4
+main::@1: scope:[main]  from main main::@2
   [6] phi()
   [7] call render 
-  to:main::@4
-main::@4: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] phi()
   [9] call animate 
   to:main::@1
-animate: scope:[animate]  from main::@4
+animate: scope:[animate]  from main::@2
   [10] (byte/signed word/word/dword/signed dword~) animate::$0 ← *((const byte[]) XPOS#0) + (byte/signed byte/word/signed word/dword/signed dword) 1
   [11] *((const byte[]) XPOS#0) ← (byte/signed word/word/dword/signed dword~) animate::$0
   [12] if(*((const byte[]) XPOS#0)!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto animate::@1
-  to:animate::@6
-animate::@6: scope:[animate]  from animate
+  to:animate::@5
+animate::@5: scope:[animate]  from animate
   [13] *((const byte[]) XPOS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:animate::@1
-animate::@1: scope:[animate]  from animate animate::@6
+animate::@1: scope:[animate]  from animate animate::@5
   [14] (byte/signed word/word/dword/signed dword~) animate::$3 ← *((const byte[]) YPOS#0) + (byte/signed byte/word/signed word/dword/signed dword) 1
   [15] *((const byte[]) YPOS#0) ← (byte/signed word/word/dword/signed dword~) animate::$3
   [16] if(*((const byte[]) YPOS#0)!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto animate::@2
-  to:animate::@7
-animate::@7: scope:[animate]  from animate::@1
+  to:animate::@6
+animate::@6: scope:[animate]  from animate::@1
   [17] *((const byte[]) YPOS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:animate::@2
-animate::@2: scope:[animate]  from animate::@1 animate::@7
+animate::@2: scope:[animate]  from animate::@1 animate::@6
   [18] (byte/signed word/word/dword/signed dword~) animate::$6 ← *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 1) - (byte/signed byte/word/signed word/dword/signed dword) 1
   [19] *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte/signed word/word/dword/signed dword~) animate::$6
   [20] if(*((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 1)!=(byte/word/signed word/dword/signed dword) $ff) goto animate::@3
-  to:animate::@8
-animate::@8: scope:[animate]  from animate::@2
+  to:animate::@7
+animate::@7: scope:[animate]  from animate::@2
   [21] *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte/signed byte/word/signed word/dword/signed dword) $28
   to:animate::@3
-animate::@3: scope:[animate]  from animate::@2 animate::@8
+animate::@3: scope:[animate]  from animate::@2 animate::@7
   [22] (byte/signed word/word/dword/signed dword~) animate::$9 ← *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 2) + (byte/signed byte/word/signed word/dword/signed dword) 1
   [23] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte/signed word/word/dword/signed dword~) animate::$9
   [24] if(*((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 2)!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto animate::@4
-  to:animate::@9
-animate::@9: scope:[animate]  from animate::@3
+  to:animate::@8
+animate::@8: scope:[animate]  from animate::@3
   [25] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte/signed byte/word/signed word/dword/signed dword) 0
   to:animate::@4
-animate::@4: scope:[animate]  from animate::@3 animate::@9
+animate::@4: scope:[animate]  from animate::@3 animate::@8
   [26] (byte/signed word/word/dword/signed dword~) animate::$12 ← *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) - (byte/signed byte/word/signed word/dword/signed dword) 1
   [27] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed word/word/dword/signed dword~) animate::$12
   [28] if(*((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3)!=(byte/word/signed word/dword/signed dword) $ff) goto animate::@return
-  to:animate::@10
-animate::@10: scope:[animate]  from animate::@4
+  to:animate::@9
+animate::@9: scope:[animate]  from animate::@4
   [29] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed byte/word/signed word/dword/signed dword) $19
   [30] (byte/signed word/word/dword/signed dword~) animate::$15 ← *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) + (byte/signed byte/word/signed word/dword/signed dword) 7
   [31] *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed word/word/dword/signed dword~) animate::$15
   [32] if(*((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3)<(byte/signed byte/word/signed word/dword/signed dword) $28) goto animate::@return
-  to:animate::@11
-animate::@11: scope:[animate]  from animate::@10
+  to:animate::@10
+animate::@10: scope:[animate]  from animate::@9
   [33] (byte/signed word/word/dword/signed dword~) animate::$18 ← *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) - (byte/signed byte/word/signed word/dword/signed dword) $28
   [34] *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed word/word/dword/signed dword~) animate::$18
   to:animate::@return
-animate::@return: scope:[animate]  from animate::@10 animate::@11 animate::@4
+animate::@return: scope:[animate]  from animate::@10 animate::@4 animate::@9
   [35] return 
   to:@return
 render: scope:[render]  from main::@1
@@ -853,20 +873,20 @@ render::@1: scope:[render]  from render render::@3
   [37] (byte*) render::colline#5 ← phi( render/(const byte*) COLORS#0 render::@3/(byte*) render::colline#1 )
   [37] (byte) render::y#4 ← phi( render/(byte/signed byte/word/signed word/dword/signed dword) 0 render::@3/(byte) render::y#1 )
   to:render::@2
-render::@2: scope:[render]  from render::@1 render::@5
-  [38] (byte) render::x#2 ← phi( render::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render::@5/(byte) render::x#1 )
+render::@2: scope:[render]  from render::@1 render::@4
+  [38] (byte) render::x#2 ← phi( render::@1/(byte/signed byte/word/signed word/dword/signed dword) 0 render::@4/(byte) render::x#1 )
   [39] (byte) findcol::x#0 ← (byte) render::x#2
   [40] (byte) findcol::y#0 ← (byte) render::y#4
   [41] call findcol 
   [42] (byte) findcol::return#0 ← (byte) findcol::return#2
-  to:render::@5
-render::@5: scope:[render]  from render::@2
+  to:render::@4
+render::@4: scope:[render]  from render::@2
   [43] (byte) render::col#0 ← (byte) findcol::return#0
   [44] *((byte*) render::colline#5 + (byte) render::x#2) ← (byte) render::col#0
   [45] (byte) render::x#1 ← ++ (byte) render::x#2
   [46] if((byte) render::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render::@2
   to:render::@3
-render::@3: scope:[render]  from render::@5
+render::@3: scope:[render]  from render::@4
   [47] (byte*) render::colline#1 ← (byte*) render::colline#5 + (byte/signed byte/word/signed word/dword/signed dword) $28
   [48] (byte) render::y#1 ← ++ (byte) render::y#4
   [49] if((byte) render::y#1!=(byte/signed byte/word/signed word/dword/signed dword) $19) goto render::@1
@@ -877,61 +897,61 @@ render::@return: scope:[render]  from render::@3
 findcol: scope:[findcol]  from render::@2
   [51] phi()
   to:findcol::@1
-findcol::@1: scope:[findcol]  from findcol findcol::@19
-  [52] (byte) findcol::mincol#10 ← phi( findcol/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@19/(byte) findcol::mincol#2 )
-  [52] (byte) findcol::mindiff#10 ← phi( findcol/(byte/word/signed word/dword/signed dword) $ff findcol::@19/(byte~) findcol::mindiff#13 )
-  [52] (byte) findcol::i#10 ← phi( findcol/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@19/(byte) findcol::i#1 )
+findcol::@1: scope:[findcol]  from findcol findcol::@12
+  [52] (byte) findcol::mincol#10 ← phi( findcol/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@12/(byte) findcol::mincol#2 )
+  [52] (byte) findcol::mindiff#10 ← phi( findcol/(byte/word/signed word/dword/signed dword) $ff findcol::@12/(byte~) findcol::mindiff#13 )
+  [52] (byte) findcol::i#10 ← phi( findcol/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@12/(byte) findcol::i#1 )
   [53] (byte) findcol::xp#0 ← *((const byte[]) XPOS#0 + (byte) findcol::i#10)
   [54] (byte) findcol::yp#0 ← *((const byte[]) YPOS#0 + (byte) findcol::i#10)
   [55] if((byte) findcol::x#0!=(byte) findcol::xp#0) goto findcol::@2
-  to:findcol::@9
-findcol::@9: scope:[findcol]  from findcol::@1
+  to:findcol::@8
+findcol::@8: scope:[findcol]  from findcol::@1
   [56] if((byte) findcol::y#0!=(byte) findcol::yp#0) goto findcol::@2
   to:findcol::@return
-findcol::@return: scope:[findcol]  from findcol::@8 findcol::@9
-  [57] (byte) findcol::return#2 ← phi( findcol::@9/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@8/(byte) findcol::mincol#2 )
+findcol::@return: scope:[findcol]  from findcol::@7 findcol::@8
+  [57] (byte) findcol::return#2 ← phi( findcol::@8/(byte/signed byte/word/signed word/dword/signed dword) 0 findcol::@7/(byte) findcol::mincol#2 )
   [58] return 
   to:@return
-findcol::@2: scope:[findcol]  from findcol::@1 findcol::@9
-  [59] if((byte) findcol::x#0<(byte) findcol::xp#0) goto findcol::@4
-  to:findcol::@12
-findcol::@12: scope:[findcol]  from findcol::@2
+findcol::@2: scope:[findcol]  from findcol::@1 findcol::@8
+  [59] if((byte) findcol::x#0<(byte) findcol::xp#0) goto findcol::@3
+  to:findcol::@9
+findcol::@9: scope:[findcol]  from findcol::@2
   [60] (byte) findcol::diff#2 ← (byte) findcol::x#0 - (byte) findcol::xp#0
-  to:findcol::@5
-findcol::@5: scope:[findcol]  from findcol::@12 findcol::@4
-  [61] (byte) findcol::diff#5 ← phi( findcol::@12/(byte) findcol::diff#2 findcol::@4/(byte) findcol::diff#1 )
-  [62] if((byte) findcol::y#0<(byte) findcol::yp#0) goto findcol::@6
-  to:findcol::@14
-findcol::@14: scope:[findcol]  from findcol::@5
+  to:findcol::@4
+findcol::@4: scope:[findcol]  from findcol::@3 findcol::@9
+  [61] (byte) findcol::diff#5 ← phi( findcol::@9/(byte) findcol::diff#2 findcol::@3/(byte) findcol::diff#1 )
+  [62] if((byte) findcol::y#0<(byte) findcol::yp#0) goto findcol::@5
+  to:findcol::@10
+findcol::@10: scope:[findcol]  from findcol::@4
   [63] (byte~) findcol::$8 ← (byte) findcol::y#0 - (byte) findcol::yp#0
   [64] (byte) findcol::diff#4 ← (byte) findcol::diff#5 + (byte~) findcol::$8
-  to:findcol::@7
-findcol::@7: scope:[findcol]  from findcol::@14 findcol::@6
-  [65] (byte) findcol::diff#7 ← phi( findcol::@14/(byte) findcol::diff#4 findcol::@6/(byte) findcol::diff#3 )
-  [66] if((byte) findcol::diff#7>=(byte) findcol::mindiff#10) goto findcol::@21
-  to:findcol::@16
-findcol::@16: scope:[findcol]  from findcol::@7
+  to:findcol::@6
+findcol::@6: scope:[findcol]  from findcol::@10 findcol::@5
+  [65] (byte) findcol::diff#7 ← phi( findcol::@10/(byte) findcol::diff#4 findcol::@5/(byte) findcol::diff#3 )
+  [66] if((byte) findcol::diff#7>=(byte) findcol::mindiff#10) goto findcol::@13
+  to:findcol::@11
+findcol::@11: scope:[findcol]  from findcol::@6
   [67] (byte) findcol::mincol#1 ← *((const byte[]) COLS#0 + (byte) findcol::i#10)
-  to:findcol::@8
-findcol::@8: scope:[findcol]  from findcol::@16 findcol::@21
-  [68] (byte) findcol::mindiff#11 ← phi( findcol::@16/(byte) findcol::diff#7 findcol::@21/(byte~) findcol::mindiff#15 )
-  [68] (byte) findcol::mincol#2 ← phi( findcol::@16/(byte) findcol::mincol#1 findcol::@21/(byte) findcol::mincol#10 )
+  to:findcol::@7
+findcol::@7: scope:[findcol]  from findcol::@11 findcol::@13
+  [68] (byte) findcol::mindiff#11 ← phi( findcol::@11/(byte) findcol::diff#7 findcol::@13/(byte~) findcol::mindiff#15 )
+  [68] (byte) findcol::mincol#2 ← phi( findcol::@11/(byte) findcol::mincol#1 findcol::@13/(byte) findcol::mincol#10 )
   [69] (byte) findcol::i#1 ← ++ (byte) findcol::i#10
-  [70] if((byte) findcol::i#1<(const byte) numpoints#0) goto findcol::@19
+  [70] if((byte) findcol::i#1<(const byte) numpoints#0) goto findcol::@12
   to:findcol::@return
-findcol::@19: scope:[findcol]  from findcol::@8
+findcol::@12: scope:[findcol]  from findcol::@7
   [71] (byte~) findcol::mindiff#13 ← (byte) findcol::mindiff#11
   to:findcol::@1
-findcol::@21: scope:[findcol]  from findcol::@7
+findcol::@13: scope:[findcol]  from findcol::@6
   [72] (byte~) findcol::mindiff#15 ← (byte) findcol::mindiff#10
-  to:findcol::@8
-findcol::@6: scope:[findcol]  from findcol::@5
+  to:findcol::@7
+findcol::@5: scope:[findcol]  from findcol::@4
   [73] (byte~) findcol::$10 ← (byte) findcol::yp#0 - (byte) findcol::y#0
   [74] (byte) findcol::diff#3 ← (byte) findcol::diff#5 + (byte~) findcol::$10
-  to:findcol::@7
-findcol::@4: scope:[findcol]  from findcol::@2
+  to:findcol::@6
+findcol::@3: scope:[findcol]  from findcol::@2
   [75] (byte) findcol::diff#1 ← (byte) findcol::xp#0 - (byte) findcol::x#0
-  to:findcol::@5
+  to:findcol::@4
 initscreen: scope:[initscreen]  from main
   [76] phi()
   to:initscreen::@1
@@ -1103,17 +1123,17 @@ INITIAL ASM
   .const numpoints = 6
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-main_from_b5:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1123,9 +1143,9 @@ main: {
   //SEG12 [76] phi from main to initscreen [phi:main->initscreen]
   initscreen_from_main:
     jsr initscreen
-  //SEG13 [6] phi from main main::@4 to main::@1 [phi:main/main::@4->main::@1]
+  //SEG13 [6] phi from main main::@2 to main::@1 [phi:main/main::@2->main::@1]
   b1_from_main:
-  b1_from_b4:
+  b1_from_b2:
     jmp b1
   //SEG14 main::@1
   b1:
@@ -1133,14 +1153,14 @@ main: {
   //SEG16 [36] phi from main::@1 to render [phi:main::@1->render]
   render_from_b1:
     jsr render
-  //SEG17 [8] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  b4_from_b1:
-    jmp b4
-  //SEG18 main::@4
-  b4:
+  //SEG17 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG18 main::@2
+  b2:
   //SEG19 [9] call animate 
     jsr animate
-    jmp b1_from_b4
+    jmp b1_from_b2
 }
 //SEG20 animate
 animate: {
@@ -1162,9 +1182,9 @@ animate: {
     lda #$28
     cmp XPOS
     bne b1
-    jmp b6
-  //SEG24 animate::@6
-  b6:
+    jmp b5
+  //SEG24 animate::@5
+  b5:
   //SEG25 [13] *((const byte[]) XPOS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta XPOS
@@ -1182,9 +1202,9 @@ animate: {
     lda #$19
     cmp YPOS
     bne b2
-    jmp b7
-  //SEG30 animate::@7
-  b7:
+    jmp b6
+  //SEG30 animate::@6
+  b6:
   //SEG31 [17] *((const byte[]) YPOS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta YPOS
@@ -1202,9 +1222,9 @@ animate: {
     lda #$ff
     cmp XPOS+1
     bne b3
-    jmp b8
-  //SEG36 animate::@8
-  b8:
+    jmp b7
+  //SEG36 animate::@7
+  b7:
   //SEG37 [21] *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte/signed byte/word/signed word/dword/signed dword) $28 -- _deref_pbuc1=vbuc2 
     lda #$28
     sta XPOS+1
@@ -1222,9 +1242,9 @@ animate: {
     lda #$19
     cmp YPOS+2
     bne b4
-    jmp b9
-  //SEG42 animate::@9
-  b9:
+    jmp b8
+  //SEG42 animate::@8
+  b8:
   //SEG43 [25] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta YPOS+2
@@ -1242,9 +1262,9 @@ animate: {
     lda #$ff
     cmp YPOS+3
     bne breturn
-    jmp b10
-  //SEG48 animate::@10
-  b10:
+    jmp b9
+  //SEG48 animate::@9
+  b9:
   //SEG49 [29] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed byte/word/signed word/dword/signed dword) $19 -- _deref_pbuc1=vbuc2 
     lda #$19
     sta YPOS+3
@@ -1260,9 +1280,9 @@ animate: {
     lda XPOS+3
     cmp #$28
     bcc breturn
-    jmp b11
-  //SEG53 animate::@11
-  b11:
+    jmp b10
+  //SEG53 animate::@10
+  b10:
   //SEG54 [33] (byte/signed word/word/dword/signed dword~) animate::$18 ← *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) - (byte/signed byte/word/signed word/dword/signed dword) $28 -- vbuz1=_deref_pbuc1_minus_vbuc2 
     lda XPOS+3
     sec
@@ -1307,9 +1327,9 @@ render: {
     lda #0
     sta x
     jmp b2
-  //SEG68 [38] phi from render::@5 to render::@2 [phi:render::@5->render::@2]
-  b2_from_b5:
-  //SEG69 [38] phi (byte) render::x#2 = (byte) render::x#1 [phi:render::@5->render::@2#0] -- register_copy 
+  //SEG68 [38] phi from render::@4 to render::@2 [phi:render::@4->render::@2]
+  b2_from_b4:
+  //SEG69 [38] phi (byte) render::x#2 = (byte) render::x#1 [phi:render::@4->render::@2#0] -- register_copy 
     jmp b2
   //SEG70 render::@2
   b2:
@@ -1326,9 +1346,9 @@ render: {
   //SEG75 [42] (byte) findcol::return#0 ← (byte) findcol::return#2 -- vbuz1=vbuz2 
     lda findcol.return_2
     sta findcol.return
-    jmp b5
-  //SEG76 render::@5
-  b5:
+    jmp b4
+  //SEG76 render::@4
+  b4:
   //SEG77 [43] (byte) render::col#0 ← (byte) findcol::return#0 -- vbuz1=vbuz2 
     lda findcol.return
     sta col
@@ -1341,7 +1361,7 @@ render: {
   //SEG80 [46] if((byte) render::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp x
-    bne b2_from_b5
+    bne b2_from_b4
     jmp b3
   //SEG81 render::@3
   b3:
@@ -1411,16 +1431,16 @@ findcol: {
     lda x
     cmp xp
     bne b2
-    jmp b9
-  //SEG96 findcol::@9
-  b9:
+    jmp b8
+  //SEG96 findcol::@8
+  b8:
   //SEG97 [56] if((byte) findcol::y#0!=(byte) findcol::yp#0) goto findcol::@2 -- vbuz1_neq_vbuz2_then_la1 
     lda y
     cmp yp
     bne b2
-  //SEG98 [57] phi from findcol::@9 to findcol::@return [phi:findcol::@9->findcol::@return]
-  breturn_from_b9:
-  //SEG99 [57] phi (byte) findcol::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:findcol::@9->findcol::@return#0] -- vbuz1=vbuc1 
+  //SEG98 [57] phi from findcol::@8 to findcol::@return [phi:findcol::@8->findcol::@return]
+  breturn_from_b8:
+  //SEG99 [57] phi (byte) findcol::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:findcol::@8->findcol::@return#0] -- vbuz1=vbuc1 
     lda #0
     sta return_2
     jmp breturn
@@ -1430,32 +1450,32 @@ findcol: {
     rts
   //SEG102 findcol::@2
   b2:
-  //SEG103 [59] if((byte) findcol::x#0<(byte) findcol::xp#0) goto findcol::@4 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG103 [59] if((byte) findcol::x#0<(byte) findcol::xp#0) goto findcol::@3 -- vbuz1_lt_vbuz2_then_la1 
     lda x
     cmp xp
-    bcc b4
-    jmp b12
-  //SEG104 findcol::@12
-  b12:
+    bcc b3
+    jmp b9
+  //SEG104 findcol::@9
+  b9:
   //SEG105 [60] (byte) findcol::diff#2 ← (byte) findcol::x#0 - (byte) findcol::xp#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda x
     sec
     sbc xp
     sta diff
-  //SEG106 [61] phi from findcol::@12 findcol::@4 to findcol::@5 [phi:findcol::@12/findcol::@4->findcol::@5]
-  b5_from_b12:
-  b5_from_b4:
-  //SEG107 [61] phi (byte) findcol::diff#5 = (byte) findcol::diff#2 [phi:findcol::@12/findcol::@4->findcol::@5#0] -- register_copy 
-    jmp b5
-  //SEG108 findcol::@5
-  b5:
-  //SEG109 [62] if((byte) findcol::y#0<(byte) findcol::yp#0) goto findcol::@6 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG106 [61] phi from findcol::@3 findcol::@9 to findcol::@4 [phi:findcol::@3/findcol::@9->findcol::@4]
+  b4_from_b3:
+  b4_from_b9:
+  //SEG107 [61] phi (byte) findcol::diff#5 = (byte) findcol::diff#1 [phi:findcol::@3/findcol::@9->findcol::@4#0] -- register_copy 
+    jmp b4
+  //SEG108 findcol::@4
+  b4:
+  //SEG109 [62] if((byte) findcol::y#0<(byte) findcol::yp#0) goto findcol::@5 -- vbuz1_lt_vbuz2_then_la1 
     lda y
     cmp yp
-    bcc b6
-    jmp b14
-  //SEG110 findcol::@14
-  b14:
+    bcc b5
+    jmp b10
+  //SEG110 findcol::@10
+  b10:
   //SEG111 [63] (byte~) findcol::$8 ← (byte) findcol::y#0 - (byte) findcol::yp#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda y
     sec
@@ -1466,61 +1486,61 @@ findcol: {
     clc
     adc _8
     sta diff_4
-  //SEG113 [65] phi from findcol::@14 findcol::@6 to findcol::@7 [phi:findcol::@14/findcol::@6->findcol::@7]
-  b7_from_b14:
-  b7_from_b6:
-  //SEG114 [65] phi (byte) findcol::diff#7 = (byte) findcol::diff#4 [phi:findcol::@14/findcol::@6->findcol::@7#0] -- register_copy 
-    jmp b7
-  //SEG115 findcol::@7
-  b7:
-  //SEG116 [66] if((byte) findcol::diff#7>=(byte) findcol::mindiff#10) goto findcol::@21 -- vbuz1_ge_vbuz2_then_la1 
+  //SEG113 [65] phi from findcol::@10 findcol::@5 to findcol::@6 [phi:findcol::@10/findcol::@5->findcol::@6]
+  b6_from_b10:
+  b6_from_b5:
+  //SEG114 [65] phi (byte) findcol::diff#7 = (byte) findcol::diff#4 [phi:findcol::@10/findcol::@5->findcol::@6#0] -- register_copy 
+    jmp b6
+  //SEG115 findcol::@6
+  b6:
+  //SEG116 [66] if((byte) findcol::diff#7>=(byte) findcol::mindiff#10) goto findcol::@13 -- vbuz1_ge_vbuz2_then_la1 
     lda diff_7
     cmp mindiff
-    bcs b21
-    jmp b16
-  //SEG117 findcol::@16
-  b16:
+    bcs b13
+    jmp b11
+  //SEG117 findcol::@11
+  b11:
   //SEG118 [67] (byte) findcol::mincol#1 ← *((const byte[]) COLS#0 + (byte) findcol::i#10) -- vbuz1=pbuc1_derefidx_vbuz2 
     ldy i
     lda COLS,y
     sta mincol
-  //SEG119 [68] phi from findcol::@16 findcol::@21 to findcol::@8 [phi:findcol::@16/findcol::@21->findcol::@8]
-  b8_from_b16:
-  b8_from_b21:
-  //SEG120 [68] phi (byte) findcol::mindiff#11 = (byte) findcol::diff#7 [phi:findcol::@16/findcol::@21->findcol::@8#0] -- register_copy 
-  //SEG121 [68] phi (byte) findcol::mincol#2 = (byte) findcol::mincol#1 [phi:findcol::@16/findcol::@21->findcol::@8#1] -- register_copy 
-    jmp b8
-  //SEG122 findcol::@8
-  b8:
+  //SEG119 [68] phi from findcol::@11 findcol::@13 to findcol::@7 [phi:findcol::@11/findcol::@13->findcol::@7]
+  b7_from_b11:
+  b7_from_b13:
+  //SEG120 [68] phi (byte) findcol::mindiff#11 = (byte) findcol::diff#7 [phi:findcol::@11/findcol::@13->findcol::@7#0] -- register_copy 
+  //SEG121 [68] phi (byte) findcol::mincol#2 = (byte) findcol::mincol#1 [phi:findcol::@11/findcol::@13->findcol::@7#1] -- register_copy 
+    jmp b7
+  //SEG122 findcol::@7
+  b7:
   //SEG123 [69] (byte) findcol::i#1 ← ++ (byte) findcol::i#10 -- vbuz1=_inc_vbuz1 
     inc i
-  //SEG124 [70] if((byte) findcol::i#1<(const byte) numpoints#0) goto findcol::@19 -- vbuz1_lt_vbuc1_then_la1 
+  //SEG124 [70] if((byte) findcol::i#1<(const byte) numpoints#0) goto findcol::@12 -- vbuz1_lt_vbuc1_then_la1 
     lda i
     cmp #numpoints
-    bcc b19
-  //SEG125 [57] phi from findcol::@8 to findcol::@return [phi:findcol::@8->findcol::@return]
-  breturn_from_b8:
-  //SEG126 [57] phi (byte) findcol::return#2 = (byte) findcol::mincol#2 [phi:findcol::@8->findcol::@return#0] -- register_copy 
+    bcc b12
+  //SEG125 [57] phi from findcol::@7 to findcol::@return [phi:findcol::@7->findcol::@return]
+  breturn_from_b7:
+  //SEG126 [57] phi (byte) findcol::return#2 = (byte) findcol::mincol#2 [phi:findcol::@7->findcol::@return#0] -- register_copy 
     jmp breturn
-  //SEG127 findcol::@19
-  b19:
+  //SEG127 findcol::@12
+  b12:
   //SEG128 [71] (byte~) findcol::mindiff#13 ← (byte) findcol::mindiff#11 -- vbuz1=vbuz2 
     lda mindiff_11
     sta mindiff
-  //SEG129 [52] phi from findcol::@19 to findcol::@1 [phi:findcol::@19->findcol::@1]
-  b1_from_b19:
-  //SEG130 [52] phi (byte) findcol::mincol#10 = (byte) findcol::mincol#2 [phi:findcol::@19->findcol::@1#0] -- register_copy 
-  //SEG131 [52] phi (byte) findcol::mindiff#10 = (byte~) findcol::mindiff#13 [phi:findcol::@19->findcol::@1#1] -- register_copy 
-  //SEG132 [52] phi (byte) findcol::i#10 = (byte) findcol::i#1 [phi:findcol::@19->findcol::@1#2] -- register_copy 
+  //SEG129 [52] phi from findcol::@12 to findcol::@1 [phi:findcol::@12->findcol::@1]
+  b1_from_b12:
+  //SEG130 [52] phi (byte) findcol::mincol#10 = (byte) findcol::mincol#2 [phi:findcol::@12->findcol::@1#0] -- register_copy 
+  //SEG131 [52] phi (byte) findcol::mindiff#10 = (byte~) findcol::mindiff#13 [phi:findcol::@12->findcol::@1#1] -- register_copy 
+  //SEG132 [52] phi (byte) findcol::i#10 = (byte) findcol::i#1 [phi:findcol::@12->findcol::@1#2] -- register_copy 
     jmp b1
-  //SEG133 findcol::@21
-  b21:
+  //SEG133 findcol::@13
+  b13:
   //SEG134 [72] (byte~) findcol::mindiff#15 ← (byte) findcol::mindiff#10 -- vbuz1=vbuz2 
     lda mindiff
     sta mindiff_15
-    jmp b8_from_b21
-  //SEG135 findcol::@6
-  b6:
+    jmp b7_from_b13
+  //SEG135 findcol::@5
+  b5:
   //SEG136 [73] (byte~) findcol::$10 ← (byte) findcol::yp#0 - (byte) findcol::y#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda yp
     sec
@@ -1531,15 +1551,15 @@ findcol: {
     clc
     adc _10
     sta diff_3
-    jmp b7_from_b6
-  //SEG138 findcol::@4
-  b4:
+    jmp b6_from_b5
+  //SEG138 findcol::@3
+  b3:
   //SEG139 [75] (byte) findcol::diff#1 ← (byte) findcol::xp#0 - (byte) findcol::x#0 -- vbuz1=vbuz2_minus_vbuz3 
     lda xp
     sec
     sbc x
     sta diff
-    jmp b5_from_b4
+    jmp b4_from_b3
 }
 //SEG140 initscreen
 initscreen: {
@@ -1734,17 +1754,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const numpoints = 6
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-b5_from_bbegin:
-  jmp b5
-//SEG5 @5
-b5:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-main_from_b5:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
-bend_from_b5:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -1754,9 +1774,9 @@ main: {
   //SEG12 [76] phi from main to initscreen [phi:main->initscreen]
   initscreen_from_main:
     jsr initscreen
-  //SEG13 [6] phi from main main::@4 to main::@1 [phi:main/main::@4->main::@1]
+  //SEG13 [6] phi from main main::@2 to main::@1 [phi:main/main::@2->main::@1]
   b1_from_main:
-  b1_from_b4:
+  b1_from_b2:
     jmp b1
   //SEG14 main::@1
   b1:
@@ -1764,14 +1784,14 @@ main: {
   //SEG16 [36] phi from main::@1 to render [phi:main::@1->render]
   render_from_b1:
     jsr render
-  //SEG17 [8] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  b4_from_b1:
-    jmp b4
-  //SEG18 main::@4
-  b4:
+  //SEG17 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  b2_from_b1:
+    jmp b2
+  //SEG18 main::@2
+  b2:
   //SEG19 [9] call animate 
     jsr animate
-    jmp b1_from_b4
+    jmp b1_from_b2
 }
 //SEG20 animate
 animate: {
@@ -1784,9 +1804,9 @@ animate: {
     lda #$28
     cmp XPOS
     bne b1
-    jmp b6
-  //SEG24 animate::@6
-  b6:
+    jmp b5
+  //SEG24 animate::@5
+  b5:
   //SEG25 [13] *((const byte[]) XPOS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta XPOS
@@ -1802,9 +1822,9 @@ animate: {
     lda #$19
     cmp YPOS
     bne b2
-    jmp b7
-  //SEG30 animate::@7
-  b7:
+    jmp b6
+  //SEG30 animate::@6
+  b6:
   //SEG31 [17] *((const byte[]) YPOS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta YPOS
@@ -1821,9 +1841,9 @@ animate: {
     lda #$ff
     cmp XPOS+1
     bne b3
-    jmp b8
-  //SEG36 animate::@8
-  b8:
+    jmp b7
+  //SEG36 animate::@7
+  b7:
   //SEG37 [21] *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte/signed byte/word/signed word/dword/signed dword) $28 -- _deref_pbuc1=vbuc2 
     lda #$28
     sta XPOS+1
@@ -1840,9 +1860,9 @@ animate: {
     lda #$19
     cmp YPOS+2
     bne b4
-    jmp b9
-  //SEG42 animate::@9
-  b9:
+    jmp b8
+  //SEG42 animate::@8
+  b8:
   //SEG43 [25] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta YPOS+2
@@ -1858,9 +1878,9 @@ animate: {
     lda #$ff
     cmp YPOS+3
     bne breturn
-    jmp b10
-  //SEG48 animate::@10
-  b10:
+    jmp b9
+  //SEG48 animate::@9
+  b9:
   //SEG49 [29] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed byte/word/signed word/dword/signed dword) $19 -- _deref_pbuc1=vbuc2 
     lda #$19
     sta YPOS+3
@@ -1874,9 +1894,9 @@ animate: {
     lda XPOS+3
     cmp #$28
     bcc breturn
-    jmp b11
-  //SEG53 animate::@11
-  b11:
+    jmp b10
+  //SEG53 animate::@10
+  b10:
   //SEG54 [33] (byte/signed word/word/dword/signed dword~) animate::$18 ← *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) - (byte/signed byte/word/signed word/dword/signed dword) $28 -- vbuaa=_deref_pbuc1_minus_vbuc2 
     lda XPOS+3
     sec
@@ -1918,9 +1938,9 @@ render: {
     lda #0
     sta x
     jmp b2
-  //SEG68 [38] phi from render::@5 to render::@2 [phi:render::@5->render::@2]
-  b2_from_b5:
-  //SEG69 [38] phi (byte) render::x#2 = (byte) render::x#1 [phi:render::@5->render::@2#0] -- register_copy 
+  //SEG68 [38] phi from render::@4 to render::@2 [phi:render::@4->render::@2]
+  b2_from_b4:
+  //SEG69 [38] phi (byte) render::x#2 = (byte) render::x#1 [phi:render::@4->render::@2#0] -- register_copy 
     jmp b2
   //SEG70 render::@2
   b2:
@@ -1932,9 +1952,9 @@ render: {
     jsr findcol
   //SEG75 [42] (byte) findcol::return#0 ← (byte) findcol::return#2 -- vbuaa=vbuz1 
     lda findcol.return
-    jmp b5
-  //SEG76 render::@5
-  b5:
+    jmp b4
+  //SEG76 render::@4
+  b4:
   //SEG77 [43] (byte) render::col#0 ← (byte) findcol::return#0
   //SEG78 [44] *((byte*) render::colline#5 + (byte) render::x#2) ← (byte) render::col#0 -- pbuz1_derefidx_vbuz2=vbuaa 
     ldy x
@@ -1944,7 +1964,7 @@ render: {
   //SEG80 [46] if((byte) render::x#1!=(byte/signed byte/word/signed word/dword/signed dword) $28) goto render::@2 -- vbuz1_neq_vbuc1_then_la1 
     lda #$28
     cmp x
-    bne b2_from_b5
+    bne b2_from_b4
     jmp b3
   //SEG81 render::@3
   b3:
@@ -1998,16 +2018,16 @@ findcol: {
   //SEG95 [55] if((byte) findcol::x#0!=(byte) findcol::xp#0) goto findcol::@2 -- vbuz1_neq_vbuxx_then_la1 
     cpx x
     bne b2
-    jmp b9
-  //SEG96 findcol::@9
-  b9:
+    jmp b8
+  //SEG96 findcol::@8
+  b8:
   //SEG97 [56] if((byte) findcol::y#0!=(byte) findcol::yp#0) goto findcol::@2 -- vbuz1_neq_vbuz2_then_la1 
     lda y
     cmp yp
     bne b2
-  //SEG98 [57] phi from findcol::@9 to findcol::@return [phi:findcol::@9->findcol::@return]
-  breturn_from_b9:
-  //SEG99 [57] phi (byte) findcol::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:findcol::@9->findcol::@return#0] -- vbuz1=vbuc1 
+  //SEG98 [57] phi from findcol::@8 to findcol::@return [phi:findcol::@8->findcol::@return]
+  breturn_from_b8:
+  //SEG99 [57] phi (byte) findcol::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:findcol::@8->findcol::@return#0] -- vbuz1=vbuc1 
     lda #0
     sta return
     jmp breturn
@@ -2017,35 +2037,35 @@ findcol: {
     rts
   //SEG102 findcol::@2
   b2:
-  //SEG103 [59] if((byte) findcol::x#0<(byte) findcol::xp#0) goto findcol::@4 -- vbuz1_lt_vbuxx_then_la1 
+  //SEG103 [59] if((byte) findcol::x#0<(byte) findcol::xp#0) goto findcol::@3 -- vbuz1_lt_vbuxx_then_la1 
     txa
     cmp x
     beq !+
-    bcs b4
+    bcs b3
   !:
-    jmp b12
-  //SEG104 findcol::@12
-  b12:
+    jmp b9
+  //SEG104 findcol::@9
+  b9:
   //SEG105 [60] (byte) findcol::diff#2 ← (byte) findcol::x#0 - (byte) findcol::xp#0 -- vbuxx=vbuz1_minus_vbuxx 
     txa
     eor #$ff
     sec
     adc x
     tax
-  //SEG106 [61] phi from findcol::@12 findcol::@4 to findcol::@5 [phi:findcol::@12/findcol::@4->findcol::@5]
-  b5_from_b12:
-  b5_from_b4:
-  //SEG107 [61] phi (byte) findcol::diff#5 = (byte) findcol::diff#2 [phi:findcol::@12/findcol::@4->findcol::@5#0] -- register_copy 
-    jmp b5
-  //SEG108 findcol::@5
-  b5:
-  //SEG109 [62] if((byte) findcol::y#0<(byte) findcol::yp#0) goto findcol::@6 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG106 [61] phi from findcol::@3 findcol::@9 to findcol::@4 [phi:findcol::@3/findcol::@9->findcol::@4]
+  b4_from_b3:
+  b4_from_b9:
+  //SEG107 [61] phi (byte) findcol::diff#5 = (byte) findcol::diff#1 [phi:findcol::@3/findcol::@9->findcol::@4#0] -- register_copy 
+    jmp b4
+  //SEG108 findcol::@4
+  b4:
+  //SEG109 [62] if((byte) findcol::y#0<(byte) findcol::yp#0) goto findcol::@5 -- vbuz1_lt_vbuz2_then_la1 
     lda y
     cmp yp
-    bcc b6
-    jmp b14
-  //SEG110 findcol::@14
-  b14:
+    bcc b5
+    jmp b10
+  //SEG110 findcol::@10
+  b10:
   //SEG111 [63] (byte~) findcol::$8 ← (byte) findcol::y#0 - (byte) findcol::yp#0 -- vbuaa=vbuz1_minus_vbuz2 
     lda y
     sec
@@ -2055,56 +2075,56 @@ findcol: {
     clc
     adc $ff
     tax
-  //SEG113 [65] phi from findcol::@14 findcol::@6 to findcol::@7 [phi:findcol::@14/findcol::@6->findcol::@7]
-  b7_from_b14:
-  b7_from_b6:
-  //SEG114 [65] phi (byte) findcol::diff#7 = (byte) findcol::diff#4 [phi:findcol::@14/findcol::@6->findcol::@7#0] -- register_copy 
-    jmp b7
-  //SEG115 findcol::@7
-  b7:
-  //SEG116 [66] if((byte) findcol::diff#7>=(byte) findcol::mindiff#10) goto findcol::@21 -- vbuxx_ge_vbuz1_then_la1 
+  //SEG113 [65] phi from findcol::@10 findcol::@5 to findcol::@6 [phi:findcol::@10/findcol::@5->findcol::@6]
+  b6_from_b10:
+  b6_from_b5:
+  //SEG114 [65] phi (byte) findcol::diff#7 = (byte) findcol::diff#4 [phi:findcol::@10/findcol::@5->findcol::@6#0] -- register_copy 
+    jmp b6
+  //SEG115 findcol::@6
+  b6:
+  //SEG116 [66] if((byte) findcol::diff#7>=(byte) findcol::mindiff#10) goto findcol::@13 -- vbuxx_ge_vbuz1_then_la1 
     cpx mindiff
-    bcs b21
-    jmp b16
-  //SEG117 findcol::@16
-  b16:
+    bcs b13
+    jmp b11
+  //SEG117 findcol::@11
+  b11:
   //SEG118 [67] (byte) findcol::mincol#1 ← *((const byte[]) COLS#0 + (byte) findcol::i#10) -- vbuz1=pbuc1_derefidx_vbuyy 
     lda COLS,y
     sta mincol
-  //SEG119 [68] phi from findcol::@16 findcol::@21 to findcol::@8 [phi:findcol::@16/findcol::@21->findcol::@8]
-  b8_from_b16:
-  b8_from_b21:
-  //SEG120 [68] phi (byte) findcol::mindiff#11 = (byte) findcol::diff#7 [phi:findcol::@16/findcol::@21->findcol::@8#0] -- register_copy 
-  //SEG121 [68] phi (byte) findcol::mincol#2 = (byte) findcol::mincol#1 [phi:findcol::@16/findcol::@21->findcol::@8#1] -- register_copy 
-    jmp b8
-  //SEG122 findcol::@8
-  b8:
+  //SEG119 [68] phi from findcol::@11 findcol::@13 to findcol::@7 [phi:findcol::@11/findcol::@13->findcol::@7]
+  b7_from_b11:
+  b7_from_b13:
+  //SEG120 [68] phi (byte) findcol::mindiff#11 = (byte) findcol::diff#7 [phi:findcol::@11/findcol::@13->findcol::@7#0] -- register_copy 
+  //SEG121 [68] phi (byte) findcol::mincol#2 = (byte) findcol::mincol#1 [phi:findcol::@11/findcol::@13->findcol::@7#1] -- register_copy 
+    jmp b7
+  //SEG122 findcol::@7
+  b7:
   //SEG123 [69] (byte) findcol::i#1 ← ++ (byte) findcol::i#10 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG124 [70] if((byte) findcol::i#1<(const byte) numpoints#0) goto findcol::@19 -- vbuyy_lt_vbuc1_then_la1 
+  //SEG124 [70] if((byte) findcol::i#1<(const byte) numpoints#0) goto findcol::@12 -- vbuyy_lt_vbuc1_then_la1 
     cpy #numpoints
-    bcc b19
-  //SEG125 [57] phi from findcol::@8 to findcol::@return [phi:findcol::@8->findcol::@return]
-  breturn_from_b8:
-  //SEG126 [57] phi (byte) findcol::return#2 = (byte) findcol::mincol#2 [phi:findcol::@8->findcol::@return#0] -- register_copy 
+    bcc b12
+  //SEG125 [57] phi from findcol::@7 to findcol::@return [phi:findcol::@7->findcol::@return]
+  breturn_from_b7:
+  //SEG126 [57] phi (byte) findcol::return#2 = (byte) findcol::mincol#2 [phi:findcol::@7->findcol::@return#0] -- register_copy 
     jmp breturn
-  //SEG127 findcol::@19
-  b19:
+  //SEG127 findcol::@12
+  b12:
   //SEG128 [71] (byte~) findcol::mindiff#13 ← (byte) findcol::mindiff#11 -- vbuz1=vbuxx 
     stx mindiff
-  //SEG129 [52] phi from findcol::@19 to findcol::@1 [phi:findcol::@19->findcol::@1]
-  b1_from_b19:
-  //SEG130 [52] phi (byte) findcol::mincol#10 = (byte) findcol::mincol#2 [phi:findcol::@19->findcol::@1#0] -- register_copy 
-  //SEG131 [52] phi (byte) findcol::mindiff#10 = (byte~) findcol::mindiff#13 [phi:findcol::@19->findcol::@1#1] -- register_copy 
-  //SEG132 [52] phi (byte) findcol::i#10 = (byte) findcol::i#1 [phi:findcol::@19->findcol::@1#2] -- register_copy 
+  //SEG129 [52] phi from findcol::@12 to findcol::@1 [phi:findcol::@12->findcol::@1]
+  b1_from_b12:
+  //SEG130 [52] phi (byte) findcol::mincol#10 = (byte) findcol::mincol#2 [phi:findcol::@12->findcol::@1#0] -- register_copy 
+  //SEG131 [52] phi (byte) findcol::mindiff#10 = (byte~) findcol::mindiff#13 [phi:findcol::@12->findcol::@1#1] -- register_copy 
+  //SEG132 [52] phi (byte) findcol::i#10 = (byte) findcol::i#1 [phi:findcol::@12->findcol::@1#2] -- register_copy 
     jmp b1
-  //SEG133 findcol::@21
-  b21:
+  //SEG133 findcol::@13
+  b13:
   //SEG134 [72] (byte~) findcol::mindiff#15 ← (byte) findcol::mindiff#10 -- vbuxx=vbuz1 
     ldx mindiff
-    jmp b8_from_b21
-  //SEG135 findcol::@6
-  b6:
+    jmp b7_from_b13
+  //SEG135 findcol::@5
+  b5:
   //SEG136 [73] (byte~) findcol::$10 ← (byte) findcol::yp#0 - (byte) findcol::y#0 -- vbuaa=vbuz1_minus_vbuz2 
     lda yp
     sec
@@ -2114,15 +2134,15 @@ findcol: {
     clc
     adc $ff
     tax
-    jmp b7_from_b6
-  //SEG138 findcol::@4
-  b4:
+    jmp b6_from_b5
+  //SEG138 findcol::@3
+  b3:
   //SEG139 [75] (byte) findcol::diff#1 ← (byte) findcol::xp#0 - (byte) findcol::x#0 -- vbuxx=vbuxx_minus_vbuz1 
     txa
     sec
     sbc x
     tax
-    jmp b5_from_b4
+    jmp b4_from_b3
 }
 //SEG140 initscreen
 initscreen: {
@@ -2171,89 +2191,89 @@ initscreen: {
   COLS: .byte 1, 2, 3, 4, 5, 7
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b5
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b4
-Removing instruction jmp b6
-Removing instruction jmp b1
-Removing instruction jmp b7
 Removing instruction jmp b2
-Removing instruction jmp b8
+Removing instruction jmp b5
+Removing instruction jmp b1
+Removing instruction jmp b6
+Removing instruction jmp b2
+Removing instruction jmp b7
 Removing instruction jmp b3
+Removing instruction jmp b8
+Removing instruction jmp b4
+Removing instruction jmp b9
+Removing instruction jmp b10
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b2
+Removing instruction jmp b4
+Removing instruction jmp b3
+Removing instruction jmp breturn
+Removing instruction jmp b1
+Removing instruction jmp b8
+Removing instruction jmp breturn
 Removing instruction jmp b9
 Removing instruction jmp b4
 Removing instruction jmp b10
+Removing instruction jmp b6
 Removing instruction jmp b11
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b2
-Removing instruction jmp b5
-Removing instruction jmp b3
-Removing instruction jmp breturn
-Removing instruction jmp b1
-Removing instruction jmp b9
-Removing instruction jmp breturn
-Removing instruction jmp b12
-Removing instruction jmp b5
-Removing instruction jmp b14
 Removing instruction jmp b7
-Removing instruction jmp b16
-Removing instruction jmp b8
 Removing instruction jmp b1
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
 Removing instruction lda XPOS+3
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b1_from_b4 with b1
-Replacing label b2_from_b5 with b2
+Replacing label b1_from_b2 with b1
+Replacing label b2_from_b4 with b2
 Replacing label b1_from_b3 with b1
-Replacing label b8_from_b21 with b8
-Replacing label b7_from_b6 with b7
-Replacing label b5_from_b4 with b5
+Replacing label b7_from_b13 with b7
+Replacing label b6_from_b5 with b6
+Replacing label b4_from_b3 with b4
 Replacing label b1_from_b1 with b1
 Replacing label b1_from_b1 with b1
-Removing instruction b5_from_bbegin:
-Removing instruction b5:
-Removing instruction main_from_b5:
-Removing instruction bend_from_b5:
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
 Removing instruction b1_from_main:
-Removing instruction b1_from_b4:
+Removing instruction b1_from_b2:
 Removing instruction render_from_b1:
-Removing instruction b4_from_b1:
+Removing instruction b2_from_b1:
 Removing instruction b1_from_b3:
 Removing instruction b2_from_b1:
-Removing instruction b2_from_b5:
+Removing instruction b2_from_b4:
 Removing instruction findcol_from_b2:
-Removing instruction b5_from_b12:
-Removing instruction b5_from_b4:
-Removing instruction b7_from_b14:
-Removing instruction b7_from_b6:
-Removing instruction b8_from_b16:
-Removing instruction b8_from_b21:
+Removing instruction b4_from_b3:
+Removing instruction b4_from_b9:
+Removing instruction b6_from_b10:
+Removing instruction b6_from_b5:
+Removing instruction b7_from_b11:
+Removing instruction b7_from_b13:
 Removing instruction b1_from_b1:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction initscreen_from_main:
-Removing instruction b4:
+Removing instruction b2:
+Removing instruction b5:
 Removing instruction b6:
 Removing instruction b7:
 Removing instruction b8:
 Removing instruction b9:
 Removing instruction b10:
-Removing instruction b11:
 Removing instruction b1_from_render:
-Removing instruction b5:
+Removing instruction b4:
 Removing instruction b3:
 Removing instruction breturn:
 Removing instruction b1_from_findcol:
-Removing instruction b9:
-Removing instruction breturn_from_b9:
-Removing instruction b12:
-Removing instruction b14:
-Removing instruction b16:
+Removing instruction b8:
 Removing instruction breturn_from_b8:
-Removing instruction b1_from_b19:
+Removing instruction b9:
+Removing instruction b10:
+Removing instruction b11:
+Removing instruction breturn_from_b7:
+Removing instruction b1_from_b12:
 Removing instruction b1_from_initscreen:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -2272,7 +2292,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (byte*) COLORS
@@ -2297,10 +2317,10 @@ FINAL SYMBOL TABLE
 (byte/signed word/word/dword/signed dword~) animate::$9 reg byte a 4.0
 (label) animate::@1
 (label) animate::@10
-(label) animate::@11
 (label) animate::@2
 (label) animate::@3
 (label) animate::@4
+(label) animate::@5
 (label) animate::@6
 (label) animate::@7
 (label) animate::@8
@@ -2310,12 +2330,12 @@ FINAL SYMBOL TABLE
 (byte~) findcol::$10 reg byte a 20002.0
 (byte~) findcol::$8 reg byte a 20002.0
 (label) findcol::@1
+(label) findcol::@10
+(label) findcol::@11
 (label) findcol::@12
-(label) findcol::@14
-(label) findcol::@16
-(label) findcol::@19
+(label) findcol::@13
 (label) findcol::@2
-(label) findcol::@21
+(label) findcol::@3
 (label) findcol::@4
 (label) findcol::@5
 (label) findcol::@6
@@ -2361,14 +2381,14 @@ FINAL SYMBOL TABLE
 (byte*) initscreen::screen#2 screen zp ZP_WORD:3 16.5
 (void()) main()
 (label) main::@1
-(label) main::@4
+(label) main::@2
 (byte) numpoints
 (const byte) numpoints#0 numpoints = (byte/signed byte/word/signed word/dword/signed dword) 6
 (void()) render()
 (label) render::@1
 (label) render::@2
 (label) render::@3
-(label) render::@5
+(label) render::@4
 (label) render::@return
 (byte) render::col
 (byte) render::col#0 reg byte a 2002.0
@@ -2421,25 +2441,25 @@ Score: 1504588
   // The total number of voronoi points
   .const numpoints = 6
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @5 [phi:@begin->@5]
-//SEG5 @5
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @5 to main [phi:@5->main]
-//SEG8 [3] phi from @5 to @end [phi:@5->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] call initscreen 
   //SEG12 [76] phi from main to initscreen [phi:main->initscreen]
     jsr initscreen
-  //SEG13 [6] phi from main main::@4 to main::@1 [phi:main/main::@4->main::@1]
+  //SEG13 [6] phi from main main::@2 to main::@1 [phi:main/main::@2->main::@1]
   //SEG14 main::@1
   b1:
   //SEG15 [7] call render 
   //SEG16 [36] phi from main::@1 to render [phi:main::@1->render]
     jsr render
-  //SEG17 [8] phi from main::@1 to main::@4 [phi:main::@1->main::@4]
-  //SEG18 main::@4
+  //SEG17 [8] phi from main::@1 to main::@2 [phi:main::@1->main::@2]
+  //SEG18 main::@2
   //SEG19 [9] call animate 
     jsr animate
     jmp b1
@@ -2455,7 +2475,7 @@ animate: {
     lda #$28
     cmp XPOS
     bne b1
-  //SEG24 animate::@6
+  //SEG24 animate::@5
   //SEG25 [13] *((const byte[]) XPOS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta XPOS
@@ -2470,7 +2490,7 @@ animate: {
     lda #$19
     cmp YPOS
     bne b2
-  //SEG30 animate::@7
+  //SEG30 animate::@6
   //SEG31 [17] *((const byte[]) YPOS#0) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta YPOS
@@ -2486,7 +2506,7 @@ animate: {
     lda #$ff
     cmp XPOS+1
     bne b3
-  //SEG36 animate::@8
+  //SEG36 animate::@7
   //SEG37 [21] *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 1) ← (byte/signed byte/word/signed word/dword/signed dword) $28 -- _deref_pbuc1=vbuc2 
     lda #$28
     sta XPOS+1
@@ -2502,7 +2522,7 @@ animate: {
     lda #$19
     cmp YPOS+2
     bne b4
-  //SEG42 animate::@9
+  //SEG42 animate::@8
   //SEG43 [25] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 2) ← (byte/signed byte/word/signed word/dword/signed dword) 0 -- _deref_pbuc1=vbuc2 
     lda #0
     sta YPOS+2
@@ -2517,7 +2537,7 @@ animate: {
     lda #$ff
     cmp YPOS+3
     bne breturn
-  //SEG48 animate::@10
+  //SEG48 animate::@9
   //SEG49 [29] *((const byte[]) YPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) ← (byte/signed byte/word/signed word/dword/signed dword) $19 -- _deref_pbuc1=vbuc2 
     lda #$19
     sta YPOS+3
@@ -2530,7 +2550,7 @@ animate: {
   //SEG52 [32] if(*((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3)<(byte/signed byte/word/signed word/dword/signed dword) $28) goto animate::@return -- _deref_pbuc1_lt_vbuc2_then_la1 
     cmp #$28
     bcc breturn
-  //SEG53 animate::@11
+  //SEG53 animate::@10
   //SEG54 [33] (byte/signed word/word/dword/signed dword~) animate::$18 ← *((const byte[]) XPOS#0+(byte/signed byte/word/signed word/dword/signed dword) 3) - (byte/signed byte/word/signed word/dword/signed dword) $28 -- vbuaa=_deref_pbuc1_minus_vbuc2 
     sec
     sbc #$28
@@ -2564,8 +2584,8 @@ render: {
   //SEG67 [38] phi (byte) render::x#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:render::@1->render::@2#0] -- vbuz1=vbuc1 
     lda #0
     sta x
-  //SEG68 [38] phi from render::@5 to render::@2 [phi:render::@5->render::@2]
-  //SEG69 [38] phi (byte) render::x#2 = (byte) render::x#1 [phi:render::@5->render::@2#0] -- register_copy 
+  //SEG68 [38] phi from render::@4 to render::@2 [phi:render::@4->render::@2]
+  //SEG69 [38] phi (byte) render::x#2 = (byte) render::x#1 [phi:render::@4->render::@2#0] -- register_copy 
   //SEG70 render::@2
   b2:
   //SEG71 [39] (byte) findcol::x#0 ← (byte) render::x#2
@@ -2575,7 +2595,7 @@ render: {
     jsr findcol
   //SEG75 [42] (byte) findcol::return#0 ← (byte) findcol::return#2 -- vbuaa=vbuz1 
     lda findcol.return
-  //SEG76 render::@5
+  //SEG76 render::@4
   //SEG77 [43] (byte) render::col#0 ← (byte) findcol::return#0
   //SEG78 [44] *((byte*) render::colline#5 + (byte) render::x#2) ← (byte) render::col#0 -- pbuz1_derefidx_vbuz2=vbuaa 
     ldy x
@@ -2632,13 +2652,13 @@ findcol: {
   //SEG95 [55] if((byte) findcol::x#0!=(byte) findcol::xp#0) goto findcol::@2 -- vbuz1_neq_vbuxx_then_la1 
     cpx x
     bne b2
-  //SEG96 findcol::@9
+  //SEG96 findcol::@8
   //SEG97 [56] if((byte) findcol::y#0!=(byte) findcol::yp#0) goto findcol::@2 -- vbuz1_neq_vbuz2_then_la1 
     lda y
     cmp yp
     bne b2
-  //SEG98 [57] phi from findcol::@9 to findcol::@return [phi:findcol::@9->findcol::@return]
-  //SEG99 [57] phi (byte) findcol::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:findcol::@9->findcol::@return#0] -- vbuz1=vbuc1 
+  //SEG98 [57] phi from findcol::@8 to findcol::@return [phi:findcol::@8->findcol::@return]
+  //SEG99 [57] phi (byte) findcol::return#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:findcol::@8->findcol::@return#0] -- vbuz1=vbuc1 
     lda #0
     sta return
   //SEG100 findcol::@return
@@ -2647,28 +2667,28 @@ findcol: {
     rts
   //SEG102 findcol::@2
   b2:
-  //SEG103 [59] if((byte) findcol::x#0<(byte) findcol::xp#0) goto findcol::@4 -- vbuz1_lt_vbuxx_then_la1 
+  //SEG103 [59] if((byte) findcol::x#0<(byte) findcol::xp#0) goto findcol::@3 -- vbuz1_lt_vbuxx_then_la1 
     txa
     cmp x
     beq !+
-    bcs b4
+    bcs b3
   !:
-  //SEG104 findcol::@12
+  //SEG104 findcol::@9
   //SEG105 [60] (byte) findcol::diff#2 ← (byte) findcol::x#0 - (byte) findcol::xp#0 -- vbuxx=vbuz1_minus_vbuxx 
     txa
     eor #$ff
     sec
     adc x
     tax
-  //SEG106 [61] phi from findcol::@12 findcol::@4 to findcol::@5 [phi:findcol::@12/findcol::@4->findcol::@5]
-  //SEG107 [61] phi (byte) findcol::diff#5 = (byte) findcol::diff#2 [phi:findcol::@12/findcol::@4->findcol::@5#0] -- register_copy 
-  //SEG108 findcol::@5
-  b5:
-  //SEG109 [62] if((byte) findcol::y#0<(byte) findcol::yp#0) goto findcol::@6 -- vbuz1_lt_vbuz2_then_la1 
+  //SEG106 [61] phi from findcol::@3 findcol::@9 to findcol::@4 [phi:findcol::@3/findcol::@9->findcol::@4]
+  //SEG107 [61] phi (byte) findcol::diff#5 = (byte) findcol::diff#1 [phi:findcol::@3/findcol::@9->findcol::@4#0] -- register_copy 
+  //SEG108 findcol::@4
+  b4:
+  //SEG109 [62] if((byte) findcol::y#0<(byte) findcol::yp#0) goto findcol::@5 -- vbuz1_lt_vbuz2_then_la1 
     lda y
     cmp yp
-    bcc b6
-  //SEG110 findcol::@14
+    bcc b5
+  //SEG110 findcol::@10
   //SEG111 [63] (byte~) findcol::$8 ← (byte) findcol::y#0 - (byte) findcol::yp#0 -- vbuaa=vbuz1_minus_vbuz2 
     sec
     sbc yp
@@ -2677,46 +2697,46 @@ findcol: {
     clc
     adc $ff
     tax
-  //SEG113 [65] phi from findcol::@14 findcol::@6 to findcol::@7 [phi:findcol::@14/findcol::@6->findcol::@7]
-  //SEG114 [65] phi (byte) findcol::diff#7 = (byte) findcol::diff#4 [phi:findcol::@14/findcol::@6->findcol::@7#0] -- register_copy 
-  //SEG115 findcol::@7
-  b7:
-  //SEG116 [66] if((byte) findcol::diff#7>=(byte) findcol::mindiff#10) goto findcol::@21 -- vbuxx_ge_vbuz1_then_la1 
+  //SEG113 [65] phi from findcol::@10 findcol::@5 to findcol::@6 [phi:findcol::@10/findcol::@5->findcol::@6]
+  //SEG114 [65] phi (byte) findcol::diff#7 = (byte) findcol::diff#4 [phi:findcol::@10/findcol::@5->findcol::@6#0] -- register_copy 
+  //SEG115 findcol::@6
+  b6:
+  //SEG116 [66] if((byte) findcol::diff#7>=(byte) findcol::mindiff#10) goto findcol::@13 -- vbuxx_ge_vbuz1_then_la1 
     cpx mindiff
-    bcs b21
-  //SEG117 findcol::@16
+    bcs b13
+  //SEG117 findcol::@11
   //SEG118 [67] (byte) findcol::mincol#1 ← *((const byte[]) COLS#0 + (byte) findcol::i#10) -- vbuz1=pbuc1_derefidx_vbuyy 
     lda COLS,y
     sta mincol
-  //SEG119 [68] phi from findcol::@16 findcol::@21 to findcol::@8 [phi:findcol::@16/findcol::@21->findcol::@8]
-  //SEG120 [68] phi (byte) findcol::mindiff#11 = (byte) findcol::diff#7 [phi:findcol::@16/findcol::@21->findcol::@8#0] -- register_copy 
-  //SEG121 [68] phi (byte) findcol::mincol#2 = (byte) findcol::mincol#1 [phi:findcol::@16/findcol::@21->findcol::@8#1] -- register_copy 
-  //SEG122 findcol::@8
-  b8:
+  //SEG119 [68] phi from findcol::@11 findcol::@13 to findcol::@7 [phi:findcol::@11/findcol::@13->findcol::@7]
+  //SEG120 [68] phi (byte) findcol::mindiff#11 = (byte) findcol::diff#7 [phi:findcol::@11/findcol::@13->findcol::@7#0] -- register_copy 
+  //SEG121 [68] phi (byte) findcol::mincol#2 = (byte) findcol::mincol#1 [phi:findcol::@11/findcol::@13->findcol::@7#1] -- register_copy 
+  //SEG122 findcol::@7
+  b7:
   //SEG123 [69] (byte) findcol::i#1 ← ++ (byte) findcol::i#10 -- vbuyy=_inc_vbuyy 
     iny
-  //SEG124 [70] if((byte) findcol::i#1<(const byte) numpoints#0) goto findcol::@19 -- vbuyy_lt_vbuc1_then_la1 
+  //SEG124 [70] if((byte) findcol::i#1<(const byte) numpoints#0) goto findcol::@12 -- vbuyy_lt_vbuc1_then_la1 
     cpy #numpoints
-    bcc b19
-  //SEG125 [57] phi from findcol::@8 to findcol::@return [phi:findcol::@8->findcol::@return]
-  //SEG126 [57] phi (byte) findcol::return#2 = (byte) findcol::mincol#2 [phi:findcol::@8->findcol::@return#0] -- register_copy 
+    bcc b12
+  //SEG125 [57] phi from findcol::@7 to findcol::@return [phi:findcol::@7->findcol::@return]
+  //SEG126 [57] phi (byte) findcol::return#2 = (byte) findcol::mincol#2 [phi:findcol::@7->findcol::@return#0] -- register_copy 
     jmp breturn
-  //SEG127 findcol::@19
-  b19:
+  //SEG127 findcol::@12
+  b12:
   //SEG128 [71] (byte~) findcol::mindiff#13 ← (byte) findcol::mindiff#11 -- vbuz1=vbuxx 
     stx mindiff
-  //SEG129 [52] phi from findcol::@19 to findcol::@1 [phi:findcol::@19->findcol::@1]
-  //SEG130 [52] phi (byte) findcol::mincol#10 = (byte) findcol::mincol#2 [phi:findcol::@19->findcol::@1#0] -- register_copy 
-  //SEG131 [52] phi (byte) findcol::mindiff#10 = (byte~) findcol::mindiff#13 [phi:findcol::@19->findcol::@1#1] -- register_copy 
-  //SEG132 [52] phi (byte) findcol::i#10 = (byte) findcol::i#1 [phi:findcol::@19->findcol::@1#2] -- register_copy 
+  //SEG129 [52] phi from findcol::@12 to findcol::@1 [phi:findcol::@12->findcol::@1]
+  //SEG130 [52] phi (byte) findcol::mincol#10 = (byte) findcol::mincol#2 [phi:findcol::@12->findcol::@1#0] -- register_copy 
+  //SEG131 [52] phi (byte) findcol::mindiff#10 = (byte~) findcol::mindiff#13 [phi:findcol::@12->findcol::@1#1] -- register_copy 
+  //SEG132 [52] phi (byte) findcol::i#10 = (byte) findcol::i#1 [phi:findcol::@12->findcol::@1#2] -- register_copy 
     jmp b1
-  //SEG133 findcol::@21
-  b21:
+  //SEG133 findcol::@13
+  b13:
   //SEG134 [72] (byte~) findcol::mindiff#15 ← (byte) findcol::mindiff#10 -- vbuxx=vbuz1 
     ldx mindiff
-    jmp b8
-  //SEG135 findcol::@6
-  b6:
+    jmp b7
+  //SEG135 findcol::@5
+  b5:
   //SEG136 [73] (byte~) findcol::$10 ← (byte) findcol::yp#0 - (byte) findcol::y#0 -- vbuaa=vbuz1_minus_vbuz2 
     lda yp
     sec
@@ -2726,15 +2746,15 @@ findcol: {
     clc
     adc $ff
     tax
-    jmp b7
-  //SEG138 findcol::@4
-  b4:
+    jmp b6
+  //SEG138 findcol::@3
+  b3:
   //SEG139 [75] (byte) findcol::diff#1 ← (byte) findcol::xp#0 - (byte) findcol::x#0 -- vbuxx=vbuxx_minus_vbuz1 
     txa
     sec
     sbc x
     tax
-    jmp b5
+    jmp b4
 }
 //SEG140 initscreen
 initscreen: {
diff --git a/src/test/ref/voronoi.sym b/src/test/ref/voronoi.sym
index 146e7edd9..92575b5f4 100644
--- a/src/test/ref/voronoi.sym
+++ b/src/test/ref/voronoi.sym
@@ -1,4 +1,4 @@
-(label) @5
+(label) @1
 (label) @begin
 (label) @end
 (byte*) COLORS
@@ -23,10 +23,10 @@
 (byte/signed word/word/dword/signed dword~) animate::$9 reg byte a 4.0
 (label) animate::@1
 (label) animate::@10
-(label) animate::@11
 (label) animate::@2
 (label) animate::@3
 (label) animate::@4
+(label) animate::@5
 (label) animate::@6
 (label) animate::@7
 (label) animate::@8
@@ -36,12 +36,12 @@
 (byte~) findcol::$10 reg byte a 20002.0
 (byte~) findcol::$8 reg byte a 20002.0
 (label) findcol::@1
+(label) findcol::@10
+(label) findcol::@11
 (label) findcol::@12
-(label) findcol::@14
-(label) findcol::@16
-(label) findcol::@19
+(label) findcol::@13
 (label) findcol::@2
-(label) findcol::@21
+(label) findcol::@3
 (label) findcol::@4
 (label) findcol::@5
 (label) findcol::@6
@@ -87,14 +87,14 @@
 (byte*) initscreen::screen#2 screen zp ZP_WORD:3 16.5
 (void()) main()
 (label) main::@1
-(label) main::@4
+(label) main::@2
 (byte) numpoints
 (const byte) numpoints#0 numpoints = (byte/signed byte/word/signed word/dword/signed dword) 6
 (void()) render()
 (label) render::@1
 (label) render::@2
 (label) render::@3
-(label) render::@5
+(label) render::@4
 (label) render::@return
 (byte) render::col
 (byte) render::col#0 reg byte a 2002.0
diff --git a/src/test/ref/wfragment1.cfg b/src/test/ref/wfragment1.cfg
index 3a99d8479..a77b28b42 100644
--- a/src/test/ref/wfragment1.cfg
+++ b/src/test/ref/wfragment1.cfg
@@ -1,25 +1,25 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@22
-@22: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @22
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @22
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#1 )
   [6] (byte) move_enemy::obj_slot#0 ← (byte) main::i#2
   [7] call move_enemy 
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] (byte) main::i#1 ← ++ (byte) main::i#2
   [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [10] return 
   to:@return
 move_enemy: scope:[move_enemy]  from main::@1
diff --git a/src/test/ref/wfragment1.log b/src/test/ref/wfragment1.log
index f72188e56..38415670d 100644
--- a/src/test/ref/wfragment1.log
+++ b/src/test/ref/wfragment1.log
@@ -138,34 +138,36 @@ Created 1 initial phi equivalence classes
 Coalesced [11] main::i#4 ← main::i#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) main::@4
+Renumbering block @22 to @1
+Renumbering block main::@3 to main::@2
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @22
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@22
-@22: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @22
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @22
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@3
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@2
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@2/(byte) main::i#1 )
   [6] (byte) move_enemy::obj_slot#0 ← (byte) main::i#2
   [7] call move_enemy 
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [8] (byte) main::i#1 ← ++ (byte) main::i#2
   [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@3
+main::@return: scope:[main]  from main::@2
   [10] return 
   to:@return
 move_enemy: scope:[move_enemy]  from main::@1
@@ -214,17 +216,17 @@ INITIAL ASM
   .const MAX_OBJECTS = $10
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @22 [phi:@begin->@22]
-b22_from_bbegin:
-  jmp b22
-//SEG5 @22
-b22:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @22 to main [phi:@22->main]
-main_from_b22:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @22 to @end [phi:@22->@end]
-bend_from_b22:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -237,9 +239,9 @@ main: {
     lda #0
     sta i
     jmp b1
-  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -248,15 +250,15 @@ main: {
     sta move_enemy.obj_slot
   //SEG17 [7] call move_enemy 
     jsr move_enemy
-    jmp b3
-  //SEG18 main::@3
-  b3:
+    jmp b2
+  //SEG18 main::@2
+  b2:
   //SEG19 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuz1=_inc_vbuz1 
     inc i
   //SEG20 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #6
     cmp i
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG21 main::@return
   breturn:
@@ -309,17 +311,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .const MAX_OBJECTS = $10
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @22 [phi:@begin->@22]
-b22_from_bbegin:
-  jmp b22
-//SEG5 @22
-b22:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @22 to main [phi:@22->main]
-main_from_b22:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @22 to @end [phi:@22->@end]
-bend_from_b22:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -330,23 +332,23 @@ main: {
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuyy=vbuc1 
     ldy #0
     jmp b1
-  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  b1_from_b3:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  b1_from_b2:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
   //SEG16 [6] (byte) move_enemy::obj_slot#0 ← (byte) main::i#2
   //SEG17 [7] call move_enemy 
     jsr move_enemy
-    jmp b3
-  //SEG18 main::@3
-  b3:
+    jmp b2
+  //SEG18 main::@2
+  b2:
   //SEG19 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuyy=_inc_vbuyy 
     iny
   //SEG20 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@1 -- vbuyy_neq_vbuc1_then_la1 
     cpy #6
-    bne b1_from_b3
+    bne b1_from_b2
     jmp breturn
   //SEG21 main::@return
   breturn:
@@ -373,23 +375,23 @@ move_enemy: {
   OBJ_WORLD_X: .fill 2*MAX_OBJECTS, 0
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b22
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
-Removing instruction jmp b3
+Removing instruction jmp b2
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Succesful ASM optimization Pass5NextJumpElimination
-Replacing label b1_from_b3 with b1
-Removing instruction b22_from_bbegin:
-Removing instruction b22:
-Removing instruction main_from_b22:
-Removing instruction bend_from_b22:
-Removing instruction b1_from_b3:
+Replacing label b1_from_b2 with b1
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b2:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
-Removing instruction b3:
+Removing instruction b2:
 Removing instruction breturn:
 Removing instruction breturn:
 Succesful ASM optimization Pass5UnusedLabelElimination
@@ -402,7 +404,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @22
+(label) @1
 (label) @begin
 (label) @end
 (byte) MAX_OBJECTS
@@ -413,7 +415,7 @@ FINAL SYMBOL TABLE
 (byte) action_count
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte y 16.5
@@ -444,25 +446,25 @@ Score: 182
 //SEG2 Global Constants & labels
   .const MAX_OBJECTS = $10
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @22 [phi:@begin->@22]
-//SEG5 @22
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @22 to main [phi:@22->main]
-//SEG8 [3] phi from @22 to @end [phi:@22->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
   //SEG11 [5] phi from main to main::@1 [phi:main->main::@1]
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuyy=vbuc1 
     ldy #0
-  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@2 to main::@1 [phi:main::@2->main::@1]
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@2->main::@1#0] -- register_copy 
   //SEG15 main::@1
   b1:
   //SEG16 [6] (byte) move_enemy::obj_slot#0 ← (byte) main::i#2
   //SEG17 [7] call move_enemy 
     jsr move_enemy
-  //SEG18 main::@3
+  //SEG18 main::@2
   //SEG19 [8] (byte) main::i#1 ← ++ (byte) main::i#2 -- vbuyy=_inc_vbuyy 
     iny
   //SEG20 [9] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) 6) goto main::@1 -- vbuyy_neq_vbuc1_then_la1 
diff --git a/src/test/ref/wfragment1.sym b/src/test/ref/wfragment1.sym
index 31481fee2..1c2222e4a 100644
--- a/src/test/ref/wfragment1.sym
+++ b/src/test/ref/wfragment1.sym
@@ -1,4 +1,4 @@
-(label) @22
+(label) @1
 (label) @begin
 (label) @end
 (byte) MAX_OBJECTS
@@ -9,7 +9,7 @@
 (byte) action_count
 (void()) main()
 (label) main::@1
-(label) main::@3
+(label) main::@2
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 reg byte y 16.5
diff --git a/src/test/ref/zpparammin.cfg b/src/test/ref/zpparammin.cfg
index 06b81b2ea..8a05e87f0 100644
--- a/src/test/ref/zpparammin.cfg
+++ b/src/test/ref/zpparammin.cfg
@@ -1,24 +1,24 @@
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@4
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@3
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
   [6] (byte) sum::b#0 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [7] (byte) sum::c#0 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [8] (byte) sum::a#0 ← (byte) main::i#2
   [9] call sum 
   [10] (byte) sum::return#0 ← (byte) sum::return#1
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [11] (byte~) main::$2 ← (byte) sum::return#0
   [12] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$2
   [13] (byte) sum2::b#0 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 1
@@ -26,17 +26,17 @@ main::@3: scope:[main]  from main::@1
   [15] (byte) sum2::a#0 ← (byte) main::i#2
   [16] call sum2 
   [17] (byte) sum2::return#0 ← (byte) sum2::return#1
-  to:main::@4
-main::@4: scope:[main]  from main::@3
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [18] (byte~) main::$5 ← (byte) sum2::return#0
   [19] *((const byte*) SCREEN2#0 + (byte) main::i#2) ← (byte~) main::$5
   [20] (byte) main::i#1 ← ++ (byte) main::i#2
   [21] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@4
+main::@return: scope:[main]  from main::@3
   [22] return 
   to:@return
-sum2: scope:[sum2]  from main::@3
+sum2: scope:[sum2]  from main::@2
   [23] (byte~) sum2::$0 ← (byte) sum2::a#0 + (byte) sum2::b#0
   [24] (byte) sum2::return#1 ← (byte~) sum2::$0 + (byte) sum2::c#0
   to:sum2::@return
diff --git a/src/test/ref/zpparammin.log b/src/test/ref/zpparammin.log
index a927c65d3..791c0bdca 100644
--- a/src/test/ref/zpparammin.log
+++ b/src/test/ref/zpparammin.log
@@ -206,33 +206,36 @@ Created 1 initial phi equivalence classes
 Coalesced [23] main::i#5 ← main::i#1
 Coalesced down to 1 phi equivalence classes
 Culled Empty Block (label) main::@5
+Renumbering block @3 to @1
+Renumbering block main::@3 to main::@2
+Renumbering block main::@4 to main::@3
 Adding NOP phi() at start of @begin
-Adding NOP phi() at start of @3
+Adding NOP phi() at start of @1
 Adding NOP phi() at start of @end
 Adding NOP phi() at start of main
 
 FINAL CONTROL FLOW GRAPH
 @begin: scope:[]  from
   [0] phi()
-  to:@3
-@3: scope:[]  from @begin
+  to:@1
+@1: scope:[]  from @begin
   [1] phi()
   [2] call main 
   to:@end
-@end: scope:[]  from @3
+@end: scope:[]  from @1
   [3] phi()
-main: scope:[main]  from @3
+main: scope:[main]  from @1
   [4] phi()
   to:main::@1
-main::@1: scope:[main]  from main main::@4
-  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@4/(byte) main::i#1 )
+main::@1: scope:[main]  from main main::@3
+  [5] (byte) main::i#2 ← phi( main/(byte/signed byte/word/signed word/dword/signed dword) 0 main::@3/(byte) main::i#1 )
   [6] (byte) sum::b#0 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 1
   [7] (byte) sum::c#0 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 2
   [8] (byte) sum::a#0 ← (byte) main::i#2
   [9] call sum 
   [10] (byte) sum::return#0 ← (byte) sum::return#1
-  to:main::@3
-main::@3: scope:[main]  from main::@1
+  to:main::@2
+main::@2: scope:[main]  from main::@1
   [11] (byte~) main::$2 ← (byte) sum::return#0
   [12] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$2
   [13] (byte) sum2::b#0 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 1
@@ -240,17 +243,17 @@ main::@3: scope:[main]  from main::@1
   [15] (byte) sum2::a#0 ← (byte) main::i#2
   [16] call sum2 
   [17] (byte) sum2::return#0 ← (byte) sum2::return#1
-  to:main::@4
-main::@4: scope:[main]  from main::@3
+  to:main::@3
+main::@3: scope:[main]  from main::@2
   [18] (byte~) main::$5 ← (byte) sum2::return#0
   [19] *((const byte*) SCREEN2#0 + (byte) main::i#2) ← (byte~) main::$5
   [20] (byte) main::i#1 ← ++ (byte) main::i#2
   [21] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1
   to:main::@return
-main::@return: scope:[main]  from main::@4
+main::@return: scope:[main]  from main::@3
   [22] return 
   to:@return
-sum2: scope:[sum2]  from main::@3
+sum2: scope:[sum2]  from main::@2
   [23] (byte~) sum2::$0 ← (byte) sum2::a#0 + (byte) sum2::b#0
   [24] (byte) sum2::return#1 ← (byte~) sum2::$0 + (byte) sum2::c#0
   to:sum2::@return
@@ -357,17 +360,17 @@ INITIAL ASM
   .label SCREEN2 = $400+$28
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -382,9 +385,9 @@ main: {
     lda #0
     sta i
     jmp b1
-  //SEG13 [5] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
-  b1_from_b4:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -405,9 +408,9 @@ main: {
   //SEG20 [10] (byte) sum::return#0 ← (byte) sum::return#1 -- vbuz1=vbuz2 
     lda sum.return_1
     sta sum.return
-    jmp b3
-  //SEG21 main::@3
-  b3:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [11] (byte~) main::$2 ← (byte) sum::return#0 -- vbuz1=vbuz2 
     lda sum.return
     sta _2
@@ -432,9 +435,9 @@ main: {
   //SEG28 [17] (byte) sum2::return#0 ← (byte) sum2::return#1 -- vbuz1=vbuz2 
     lda sum2.return_1
     sta sum2.return
-    jmp b4
-  //SEG29 main::@4
-  b4:
+    jmp b3
+  //SEG29 main::@3
+  b3:
   //SEG30 [18] (byte~) main::$5 ← (byte) sum2::return#0 -- vbuz1=vbuz2 
     lda sum2.return
     sta _5
@@ -447,7 +450,7 @@ main: {
   //SEG33 [21] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp i
-    bne b1_from_b4
+    bne b1_from_b3
     jmp breturn
   //SEG34 main::@return
   breturn:
@@ -567,17 +570,17 @@ ASSEMBLER BEFORE OPTIMIZATION
   .label SCREEN2 = $400+$28
 //SEG3 @begin
 bbegin:
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-b3_from_bbegin:
-  jmp b3
-//SEG5 @3
-b3:
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+b1_from_bbegin:
+  jmp b1
+//SEG5 @1
+b1:
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-main_from_b3:
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+main_from_b1:
   jsr main
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
-bend_from_b3:
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
+bend_from_b1:
   jmp bend
 //SEG9 @end
 bend:
@@ -590,9 +593,9 @@ main: {
     lda #0
     sta i
     jmp b1
-  //SEG13 [5] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
-  b1_from_b4:
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  b1_from_b3:
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
     jmp b1
   //SEG15 main::@1
   b1:
@@ -609,9 +612,9 @@ main: {
   //SEG19 [9] call sum 
     jsr sum
   //SEG20 [10] (byte) sum::return#0 ← (byte) sum::return#1
-    jmp b3
-  //SEG21 main::@3
-  b3:
+    jmp b2
+  //SEG21 main::@2
+  b2:
   //SEG22 [11] (byte~) main::$2 ← (byte) sum::return#0
   //SEG23 [12] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$2 -- pbuc1_derefidx_vbuz1=vbuaa 
     ldy i
@@ -629,9 +632,9 @@ main: {
   //SEG27 [16] call sum2 
     jsr sum2
   //SEG28 [17] (byte) sum2::return#0 ← (byte) sum2::return#1
-    jmp b4
-  //SEG29 main::@4
-  b4:
+    jmp b3
+  //SEG29 main::@3
+  b3:
   //SEG30 [18] (byte~) main::$5 ← (byte) sum2::return#0
   //SEG31 [19] *((const byte*) SCREEN2#0 + (byte) main::i#2) ← (byte~) main::$5 -- pbuc1_derefidx_vbuz1=vbuaa 
     ldy i
@@ -641,7 +644,7 @@ main: {
   //SEG33 [21] if((byte) main::i#1!=(byte/signed byte/word/signed word/dword/signed dword) $b) goto main::@1 -- vbuz1_neq_vbuc1_then_la1 
     lda #$b
     cmp i
-    bne b1_from_b4
+    bne b1_from_b3
     jmp breturn
   //SEG34 main::@return
   breturn:
@@ -684,11 +687,11 @@ sum: {
 }
 
 ASSEMBLER OPTIMIZATIONS
-Removing instruction jmp b3
+Removing instruction jmp b1
 Removing instruction jmp bend
 Removing instruction jmp b1
+Removing instruction jmp b2
 Removing instruction jmp b3
-Removing instruction jmp b4
 Removing instruction jmp breturn
 Removing instruction jmp breturn
 Removing instruction jmp breturn
@@ -696,17 +699,17 @@ Succesful ASM optimization Pass5NextJumpElimination
 Replacing instruction lda i with TYA
 Removing instruction ldy i
 Succesful ASM optimization Pass5UnnecesaryLoadElimination
-Replacing label b1_from_b4 with b1
-Removing instruction b3_from_bbegin:
-Removing instruction b3:
-Removing instruction main_from_b3:
-Removing instruction bend_from_b3:
-Removing instruction b1_from_b4:
+Replacing label b1_from_b3 with b1
+Removing instruction b1_from_bbegin:
+Removing instruction b1:
+Removing instruction main_from_b1:
+Removing instruction bend_from_b1:
+Removing instruction b1_from_b3:
 Succesful ASM optimization Pass5RedundantLabelElimination
 Removing instruction bend:
 Removing instruction b1_from_main:
+Removing instruction b2:
 Removing instruction b3:
-Removing instruction b4:
 Removing instruction breturn:
 Removing instruction breturn:
 Removing instruction breturn:
@@ -720,7 +723,7 @@ Removing instruction bbegin:
 Succesful ASM optimization Pass5UnusedLabelElimination
 
 FINAL SYMBOL TABLE
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -731,8 +734,8 @@ FINAL SYMBOL TABLE
 (byte~) main::$2 reg byte a 22.0
 (byte~) main::$5 reg byte a 22.0
 (label) main::@1
+(label) main::@2
 (label) main::@3
-(label) main::@4
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 i zp ZP_BYTE:2 16.5
@@ -791,11 +794,11 @@ Score: 805
   .label SCREEN = $400
   .label SCREEN2 = $400+$28
 //SEG3 @begin
-//SEG4 [1] phi from @begin to @3 [phi:@begin->@3]
-//SEG5 @3
+//SEG4 [1] phi from @begin to @1 [phi:@begin->@1]
+//SEG5 @1
 //SEG6 [2] call main 
-//SEG7 [4] phi from @3 to main [phi:@3->main]
-//SEG8 [3] phi from @3 to @end [phi:@3->@end]
+//SEG7 [4] phi from @1 to main [phi:@1->main]
+//SEG8 [3] phi from @1 to @end [phi:@1->@end]
 //SEG9 @end
 //SEG10 main
 main: {
@@ -804,8 +807,8 @@ main: {
   //SEG12 [5] phi (byte) main::i#2 = (byte/signed byte/word/signed word/dword/signed dword) 0 [phi:main->main::@1#0] -- vbuz1=vbuc1 
     lda #0
     sta i
-  //SEG13 [5] phi from main::@4 to main::@1 [phi:main::@4->main::@1]
-  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@4->main::@1#0] -- register_copy 
+  //SEG13 [5] phi from main::@3 to main::@1 [phi:main::@3->main::@1]
+  //SEG14 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@3->main::@1#0] -- register_copy 
   //SEG15 main::@1
   b1:
   //SEG16 [6] (byte) sum::b#0 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuaa=vbuz1_plus_1 
@@ -821,7 +824,7 @@ main: {
   //SEG19 [9] call sum 
     jsr sum
   //SEG20 [10] (byte) sum::return#0 ← (byte) sum::return#1
-  //SEG21 main::@3
+  //SEG21 main::@2
   //SEG22 [11] (byte~) main::$2 ← (byte) sum::return#0
   //SEG23 [12] *((const byte*) SCREEN#0 + (byte) main::i#2) ← (byte~) main::$2 -- pbuc1_derefidx_vbuz1=vbuaa 
     ldy i
@@ -838,7 +841,7 @@ main: {
   //SEG27 [16] call sum2 
     jsr sum2
   //SEG28 [17] (byte) sum2::return#0 ← (byte) sum2::return#1
-  //SEG29 main::@4
+  //SEG29 main::@3
   //SEG30 [18] (byte~) main::$5 ← (byte) sum2::return#0
   //SEG31 [19] *((const byte*) SCREEN2#0 + (byte) main::i#2) ← (byte~) main::$5 -- pbuc1_derefidx_vbuz1=vbuaa 
     ldy i
diff --git a/src/test/ref/zpparammin.sym b/src/test/ref/zpparammin.sym
index b2f524f4f..7e36119e5 100644
--- a/src/test/ref/zpparammin.sym
+++ b/src/test/ref/zpparammin.sym
@@ -1,4 +1,4 @@
-(label) @3
+(label) @1
 (label) @begin
 (label) @end
 (byte*) SCREEN
@@ -9,8 +9,8 @@
 (byte~) main::$2 reg byte a 22.0
 (byte~) main::$5 reg byte a 22.0
 (label) main::@1
+(label) main::@2
 (label) main::@3
-(label) main::@4
 (label) main::@return
 (byte) main::i
 (byte) main::i#1 i zp ZP_BYTE:2 16.5